[Pkg-tcltk-commits] r1778 - in tcl8.5/trunk/debian: . patches

[sgolovan at alioth.debian.org]

Author: sgolovan
Date: 2016-01-16 10:03:42 +0000 (Sat, 16 Jan 2016)
New Revision: 1778

Modified:
   tcl8.5/trunk/debian/changelog
   tcl8.5/trunk/debian/patches/confsearch.diff
   tcl8.5/trunk/debian/rules
Log:
[tcl8.5]
  * Replaced calling ldconfig in postinst/postrm scripts by a trigger
    (closes: #811121).
  * Fixed the tclConfig.sh serach path in the tcl8.5.m4 (closes: #777085).


Modified: tcl8.5/trunk/debian/changelog
===================================================================
--- tcl8.5/trunk/debian/changelog	2016-01-16 09:54:54 UTC (rev 1777)
+++ tcl8.5/trunk/debian/changelog	2016-01-16 10:03:42 UTC (rev 1778)
@@ -1,8 +1,10 @@
-tcl8.5 (8.5.18-3) UNRELEASED; urgency=medium
+tcl8.5 (8.5.18-3) unstable; urgency=medium
 
-  * NOT RELEASED YET
+  * Replaced calling ldconfig in postinst/postrm scripts by a trigger
+    (closes: #811121).
+  * Fixed the tclConfig.sh serach path in the tcl8.5.m4 (closes: #777085).
 
- -- Sergei Golovan <sgolovan at debian.org>  Tue, 05 May 2015 14:19:44 +0300
+ -- Sergei Golovan <sgolovan at debian.org>  Sat, 16 Jan 2016 12:59:47 +0300
 
 tcl8.5 (8.5.18-2) unstable; urgency=medium
 

Modified: tcl8.5/trunk/debian/patches/confsearch.diff
===================================================================
--- tcl8.5/trunk/debian/patches/confsearch.diff	2016-01-16 09:54:54 UTC (rev 1777)
+++ tcl8.5/trunk/debian/patches/confsearch.diff	2016-01-16 10:03:42 UTC (rev 1778)
@@ -1,5 +1,5 @@
-Patch by Sergei Golovan allows to find tclConfig.sh in /usr/share/tcltk/tcl8.5
-and tkConfig.sh in /usr/share/tcltk/tk8.5 where they are located in Debian
+Patch by Sergei Golovan allows to find tclConfig.sh in /usr/lib/tcl8.5
+and tkConfig.sh in /usr/lib/tk8.5 where they are located in Debian
 installation.
 
 --- a/unix/tcl.m4
@@ -8,7 +8,7 @@
  			`ls -d ${prefix}/lib 2>/dev/null` \
  			`ls -d /usr/local/lib 2>/dev/null` \
  			`ls -d /usr/contrib/lib 2>/dev/null` \
-+			`ls -d /usr/share/tcltk/tcl8.5 2>/dev/null` \
++			`ls -d /usr/lib/tcl8.5 2>/dev/null` \
  			`ls -d /usr/lib 2>/dev/null` \
  			`ls -d /usr/lib64 2>/dev/null` \
  			; do
@@ -16,7 +16,7 @@
  			`ls -d ${prefix}/lib 2>/dev/null` \
  			`ls -d /usr/local/lib 2>/dev/null` \
  			`ls -d /usr/contrib/lib 2>/dev/null` \
-+			`ls -d /usr/share/tcltk/tk8.5 2>/dev/null` \
++			`ls -d /usr/lib/tk8.5 2>/dev/null` \
  			`ls -d /usr/lib 2>/dev/null` \
  			`ls -d /usr/lib64 2>/dev/null` \
  			; do

Modified: tcl8.5/trunk/debian/rules
===================================================================
--- tcl8.5/trunk/debian/rules	2016-01-16 09:54:54 UTC (rev 1777)
+++ tcl8.5/trunk/debian/rules	2016-01-16 10:03:42 UTC (rev 1778)
@@ -118,10 +118,9 @@
 	dh_strip -plibtcl$(v) --dbg-package=libtcl$(v)-dbg
 	dh_strip -a -Nlibtcl$(v)
 
-override_dh_makeshlibs: /usr/share/debhelper/autoscripts/postinst-makeshlibs /usr/share/debhelper/autoscripts/postrm-makeshlibs
+override_dh_makeshlibs:
 	dh_makeshlibs -a -Xtcltest
-	cat /usr/share/debhelper/autoscripts/postinst-makeshlibs >>debian/libtcl$(v).postinst.debhelper
-	cat /usr/share/debhelper/autoscripts/postrm-makeshlibs >>debian/libtcl$(v).postrm.debhelper
+	echo 'activate-noawait ldconfig' >>debian/libtcl$(v).triggers
 
 override_dh_shlibdeps:
 	dh_shlibdeps -a -ldebian/libtcl$(v)/usr/lib/$(DEB_HOST_MULTIARCH)