Commit f6e180df authored by Sergei Golovan's avatar Sergei Golovan Committed by Sergei Golovan

* Fixed links and dependencies.

parent 638ebc08
......@@ -11,7 +11,7 @@ expect (5.45-6) unstable; urgency=low
* Bumped the debhelper compatibility version to 9.
* Bumped standards version to 3.9.5.
-- Sergei Golovan <sgolovan@debian.org> Sun, 13 Jul 2014 21:02:52 +0400
-- Sergei Golovan <sgolovan@debian.org> Mon, 14 Jul 2014 08:30:57 +0400
expect (5.45-5) unstable; urgency=low
......
......@@ -14,6 +14,7 @@ Depends: ${misc:Depends}, ${shlibs:Depends}
Conflicts: expectk (<< 5.45), expect-dev
Provides: expect-dev
Replaces: expect-dev
Recommends: tcl8.6, tk8.6
Multi-Arch: foreign
Description: Automates interactive applications
Expect is a tool for automating interactive applications according to a script.
......@@ -28,7 +29,7 @@ Description: Automates interactive applications
Package: tcl-expect
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
Depends: libtcl8.6, ${misc:Depends}, ${shlibs:Depends}
Conflicts: expectk (<< 5.45)
Replaces: expect
Suggests: expect
......@@ -49,7 +50,6 @@ Section: devel
Architecture: any
Depends: ${misc:Depends}, tcl-expect (= ${binary:Version}), tcl8.6-dev
Replaces: expect (<< 5.44.1.14)
Recommends: tk8.5-dev
Multi-Arch: same
Description: Automates interactive applications (development)
Expect is a tool for automating interactive applications according to a script.
......
......@@ -19,7 +19,6 @@
#/usr/bin/expect_weather /usr/bin/weather
/usr/bin/expect_xkibitz /usr/bin/xkibitz
/usr/bin/expect_xpstat /usr/bin/xpstat
/usr/lib/libexpect.so.5.45 /usr/lib/libexpect.so.5
/usr/share/man/man1/expect_autoexpect.1.gz /usr/share/man/man1/autoexpect.1.gz
/usr/share/man/man1/expect_cryptdir.1.gz /usr/share/man/man1/cryptdir.1.gz
/usr/share/man/man1/expect_decryptdir.1.gz /usr/share/man/man1/decryptdir.1.gz
......
......@@ -11,8 +11,14 @@ include /usr/share/dpkg/default.mk
CFLAGS += -Wall -g -D_BSD_SOURCE -ansi -D_SVID_SOURCE -D_POSIX_SOURCE
LINKS = debian/expect.links debian/tcl-expect.links debian/tcl-expect-dev.links
debian/%.links: debian/%.links.in
sed 's/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/g' $< > $@
override_dh_auto_clean:
dh_auto_clean
rm -f debian/*.links
rm -f *.a *.o
rm -rf shared
rm -f expect_cf.h tcldbgcf.h
......@@ -41,13 +47,14 @@ override_dh_auto_build:
override_dh_auto_install:
$(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
# Renaming expect scripts
# Rename expect scripts
for SCRIPT in debian/tmp/usr/bin/*; do \
if [ "`basename $$SCRIPT`" != "expect" ] ; then \
sed -e 's/^exec tclsh /exec tclsh$(tclv) /' $$SCRIPT >`dirname $$SCRIPT`/expect_`basename $$SCRIPT`; \
rm $$SCRIPT ; \
fi; \
done
# Fix manpages
for MANPAGE in debian/tmp/usr/share/man/man1/*; do \
if [ "`basename $$MANPAGE`" != "expect.1" ] ; then \
mv $$MANPAGE `dirname $$MANPAGE`/expect_`basename $$MANPAGE`; \
......@@ -55,13 +62,18 @@ override_dh_auto_install:
done
cp debian/tmp/usr/share/man/man1/expect.1 debian/tmp/usr/share/man/man3/Expect.3tcl
sed -i -e's:\.TH EXPECT 1:.TH EXPECT 3tcl:' debian/tmp/usr/share/man/man3/Expect.3tcl
# Fixing library name
# Fix library name
mv debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/expect$(v)/libexpect$(v).so debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libexpect.so.$(v)
mkdir -p -m 755 debian/tmp/usr/lib/tcltk/$(DEB_HOST_MULTIARCH)
mv debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/expect$(v) debian/tmp/usr/lib/tcltk/$(DEB_HOST_MULTIARCH)
# Fixing permissions
# Fix pkgIndex.tcl
sed -i -e's:usr lib:usr lib $(DEB_HOST_MULTIARCH):' debian/tmp/usr/lib/tcltk/$(DEB_HOST_MULTIARCH)/expect$(v)/pkgIndex.tcl
# Fix permissions
chmod 0644 debian/tmp/usr/lib/tcltk/$(DEB_HOST_MULTIARCH)/expect$(v)/pkgIndex.tcl
override_dh_link: $(LINKS)
dh_link
override_dh_install:
dh_install --fail-missing
......
/usr/lib/libexpect.so.5.45 /usr/lib/libexpect.so
/usr/lib/@DEB_HOST_MULTIARCH@/libexpect.so.5.45 /usr/lib/@DEB_HOST_MULTIARCH@/libexpect.so
/usr/lib/@DEB_HOST_MULTIARCH@/libexpect.so.5.45 /usr/lib/@DEB_HOST_MULTIARCH@/libexpect.so.5
expect: package-name-doesnt-match-sonames
tcl-expect: package-name-doesnt-match-sonames
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment