[Pkg-tcltk-commits] r1643 - expect/trunk/debian

sgolovan at alioth.debian.org sgolovan at alioth.debian.org
Mon Jul 14 04:36:51 UTC 2014 

Author: sgolovan
Date: 2014-07-14 04:36:36 +0000 (Mon, 14 Jul 2014)
New Revision: 1643

Added:
   expect/trunk/debian/expect.links.in
   expect/trunk/debian/tcl-expect-dev.links.in
   expect/trunk/debian/tcl-expect.links.in
Removed:
   expect/trunk/debian/expect.links
   expect/trunk/debian/tcl-expect-dev.links
Modified:
   expect/trunk/debian/changelog
   expect/trunk/debian/control
   expect/trunk/debian/rules
   expect/trunk/debian/tcl-expect.lintian-overrides
Log:
[expect]
  * Fixed links and dependencies.


Modified: expect/trunk/debian/changelog
===================================================================
--- expect/trunk/debian/changelog	2014-07-13 17:03:29 UTC (rev 1642)
+++ expect/trunk/debian/changelog	2014-07-14 04:36:36 UTC (rev 1643)
@@ -11,7 +11,7 @@
   * Bumped the debhelper compatibility version to 9.
   * Bumped standards version to 3.9.5.
 
- -- Sergei Golovan <sgolovan at debian.org>  Sun, 13 Jul 2014 21:02:52 +0400
+ -- Sergei Golovan <sgolovan at debian.org>  Mon, 14 Jul 2014 08:30:57 +0400
 
 expect (5.45-5) unstable; urgency=low
 

Modified: expect/trunk/debian/control
===================================================================
--- expect/trunk/debian/control	2014-07-13 17:03:29 UTC (rev 1642)
+++ expect/trunk/debian/control	2014-07-14 04:36:36 UTC (rev 1643)
@@ -14,6 +14,7 @@
 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 @@
 
 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 @@
 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.

Deleted: expect/trunk/debian/expect.links
===================================================================
--- expect/trunk/debian/expect.links	2014-07-13 17:03:29 UTC (rev 1642)
+++ expect/trunk/debian/expect.links	2014-07-14 04:36:36 UTC (rev 1643)
@@ -1,33 +0,0 @@
-/usr/bin/expect_autoexpect /usr/bin/autoexpect
-/usr/bin/expect_autopasswd /usr/bin/autopasswd
-/usr/bin/expect_cryptdir /usr/bin/cryptdir
-/usr/bin/expect_decryptdir /usr/bin/decryptdir
-/usr/bin/expect_dislocate /usr/bin/dislocate
-/usr/bin/expect_ftp-rfc /usr/bin/ftp-rfc
-/usr/bin/expect_kibitz /usr/bin/kibitz
-/usr/bin/expect_lpunlock /usr/bin/lpunlock
-#/usr/bin/expect_mkpasswd /usr/bin/mkpasswd
-/usr/bin/expect_multixterm /usr/bin/multixterm
-/usr/bin/expect_passmass /usr/bin/passmass
-#/usr/bin/expect_rftp /usr/bin/rftp
-/usr/bin/expect_rlogin-cwd /usr/bin/rlogin-cwd
-/usr/bin/expect_timed-read /usr/bin/timed-read
-/usr/bin/expect_timed-run /usr/bin/timed-run
-/usr/bin/expect_tknewsbiff /usr/bin/tknewsbiff
-/usr/bin/expect_tkpasswd /usr/bin/tkpasswd
-/usr/bin/expect_unbuffer /usr/bin/unbuffer
-#/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
-/usr/share/man/man1/expect_dislocate.1.gz /usr/share/man/man1/dislocate.1.gz
-/usr/share/man/man1/expect_kibitz.1.gz /usr/share/man/man1/kibitz.1.gz
-#/usr/share/man/man1/expect_mkpasswd.1.gz /usr/share/man/man1/mkpasswd.1.gz
-/usr/share/man/man1/expect_multixterm.1.gz /usr/share/man/man1/multixterm.1.gz
-/usr/share/man/man1/expect_passmass.1.gz /usr/share/man/man1/passmass.1.gz
-/usr/share/man/man1/expect_tknewsbiff.1.gz /usr/share/man/man1/tknewsbiff.1.gz
-/usr/share/man/man1/expect_unbuffer.1.gz /usr/share/man/man1/unbuffer.1.gz
-/usr/share/man/man1/expect_xkibitz.1.gz /usr/share/man/man1/xkibitz.1.gz

Copied: expect/trunk/debian/expect.links.in (from rev 1642, expect/trunk/debian/expect.links)
===================================================================
--- expect/trunk/debian/expect.links.in	                        (rev 0)
+++ expect/trunk/debian/expect.links.in	2014-07-14 04:36:36 UTC (rev 1643)
@@ -0,0 +1,32 @@
+/usr/bin/expect_autoexpect /usr/bin/autoexpect
+/usr/bin/expect_autopasswd /usr/bin/autopasswd
+/usr/bin/expect_cryptdir /usr/bin/cryptdir
+/usr/bin/expect_decryptdir /usr/bin/decryptdir
+/usr/bin/expect_dislocate /usr/bin/dislocate
+/usr/bin/expect_ftp-rfc /usr/bin/ftp-rfc
+/usr/bin/expect_kibitz /usr/bin/kibitz
+/usr/bin/expect_lpunlock /usr/bin/lpunlock
+#/usr/bin/expect_mkpasswd /usr/bin/mkpasswd
+/usr/bin/expect_multixterm /usr/bin/multixterm
+/usr/bin/expect_passmass /usr/bin/passmass
+#/usr/bin/expect_rftp /usr/bin/rftp
+/usr/bin/expect_rlogin-cwd /usr/bin/rlogin-cwd
+/usr/bin/expect_timed-read /usr/bin/timed-read
+/usr/bin/expect_timed-run /usr/bin/timed-run
+/usr/bin/expect_tknewsbiff /usr/bin/tknewsbiff
+/usr/bin/expect_tkpasswd /usr/bin/tkpasswd
+/usr/bin/expect_unbuffer /usr/bin/unbuffer
+#/usr/bin/expect_weather /usr/bin/weather
+/usr/bin/expect_xkibitz /usr/bin/xkibitz
+/usr/bin/expect_xpstat /usr/bin/xpstat
+/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
+/usr/share/man/man1/expect_dislocate.1.gz /usr/share/man/man1/dislocate.1.gz
+/usr/share/man/man1/expect_kibitz.1.gz /usr/share/man/man1/kibitz.1.gz
+#/usr/share/man/man1/expect_mkpasswd.1.gz /usr/share/man/man1/mkpasswd.1.gz
+/usr/share/man/man1/expect_multixterm.1.gz /usr/share/man/man1/multixterm.1.gz
+/usr/share/man/man1/expect_passmass.1.gz /usr/share/man/man1/passmass.1.gz
+/usr/share/man/man1/expect_tknewsbiff.1.gz /usr/share/man/man1/tknewsbiff.1.gz
+/usr/share/man/man1/expect_unbuffer.1.gz /usr/share/man/man1/unbuffer.1.gz
+/usr/share/man/man1/expect_xkibitz.1.gz /usr/share/man/man1/xkibitz.1.gz

Modified: expect/trunk/debian/rules
===================================================================
--- expect/trunk/debian/rules	2014-07-13 17:03:29 UTC (rev 1642)
+++ expect/trunk/debian/rules	2014-07-14 04:36:36 UTC (rev 1643)
@@ -11,8 +11,14 @@
 
 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_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 @@
 	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
 

Deleted: expect/trunk/debian/tcl-expect-dev.links
===================================================================
--- expect/trunk/debian/tcl-expect-dev.links	2014-07-13 17:03:29 UTC (rev 1642)
+++ expect/trunk/debian/tcl-expect-dev.links	2014-07-14 04:36:36 UTC (rev 1643)
@@ -1 +0,0 @@
-/usr/lib/libexpect.so.5.45 /usr/lib/libexpect.so

Copied: expect/trunk/debian/tcl-expect-dev.links.in (from rev 1642, expect/trunk/debian/tcl-expect-dev.links)
===================================================================
--- expect/trunk/debian/tcl-expect-dev.links.in	                        (rev 0)
+++ expect/trunk/debian/tcl-expect-dev.links.in	2014-07-14 04:36:36 UTC (rev 1643)
@@ -0,0 +1 @@
+/usr/lib/@DEB_HOST_MULTIARCH@/libexpect.so.5.45 /usr/lib/@DEB_HOST_MULTIARCH@/libexpect.so

Copied: expect/trunk/debian/tcl-expect.links.in (from rev 1642, expect/trunk/debian/expect.links)
===================================================================
--- expect/trunk/debian/tcl-expect.links.in	                        (rev 0)
+++ expect/trunk/debian/tcl-expect.links.in	2014-07-14 04:36:36 UTC (rev 1643)
@@ -0,0 +1 @@
+/usr/lib/@DEB_HOST_MULTIARCH@/libexpect.so.5.45 /usr/lib/@DEB_HOST_MULTIARCH@/libexpect.so.5

Modified: expect/trunk/debian/tcl-expect.lintian-overrides
===================================================================
--- expect/trunk/debian/tcl-expect.lintian-overrides	2014-07-13 17:03:29 UTC (rev 1642)
+++ expect/trunk/debian/tcl-expect.lintian-overrides	2014-07-14 04:36:36 UTC (rev 1643)
@@ -1 +1 @@
-expect: package-name-doesnt-match-sonames
+tcl-expect: package-name-doesnt-match-sonames

More information about the Pkg-tcltk-commits mailing list