[Pkg-tcltk-commits] r1862 - in tcl8.6/trunk/debian: . patches

[sgolovan at alioth.debian.org]

Author: sgolovan
Date: 2017-08-10 09:26:56 +0000 (Thu, 10 Aug 2017)
New Revision: 1862

Modified:
   tcl8.6/trunk/debian/changelog
   tcl8.6/trunk/debian/libtcl8.6.symbols
   tcl8.6/trunk/debian/patches/confsearch.diff
   tcl8.6/trunk/debian/patches/non-linux.diff
   tcl8.6/trunk/debian/patches/tcllibrary.diff
   tcl8.6/trunk/debian/patches/tclpackagepath.diff
   tcl8.6/trunk/debian/rules
Log:
[tcl8.6]
  * Refreshed patches and the symbols table.
  * Don't add ldconfig trigger manually since dh_makeshlibs can do it iself.


Modified: tcl8.6/trunk/debian/changelog
===================================================================
--- tcl8.6/trunk/debian/changelog	2017-08-10 09:01:57 UTC (rev 1861)
+++ tcl8.6/trunk/debian/changelog	2017-08-10 09:26:56 UTC (rev 1862)
@@ -1,10 +1,12 @@
 tcl8.6 (8.6.7+dfsg-1) unstable; urgency=medium
 
   * New upstream release.
+  * Refreshed patches and the symbols table.
   * Arch-qualify TCL_CC. (closes: #870853).
+  * Don't add ldconfig trigger manually since dh_makeshlibs can do it iself.
   * Bumped standards version to 4.0.1.
 
- -- Sergei Golovan <sgolovan at debian.org>  Thu, 10 Aug 2017 11:55:41 +0300
+ -- Sergei Golovan <sgolovan at debian.org>  Thu, 10 Aug 2017 12:20:14 +0300
 
 tcl8.6 (8.6.6+dfsg-1) unstable; urgency=medium
 

Modified: tcl8.6/trunk/debian/libtcl8.6.symbols
===================================================================
--- tcl8.6/trunk/debian/libtcl8.6.symbols	2017-08-10 09:01:57 UTC (rev 1861)
+++ tcl8.6/trunk/debian/libtcl8.6.symbols	2017-08-10 09:26:56 UTC (rev 1862)
@@ -151,7 +151,12 @@
  TclProcCleanupProc at Base 8.6.0
  TclProcCompileProc at Base 8.6.0
  TclProcDeleteProc at Base 8.6.0
+ TclPtrGetVar at Base 8.6.7
+ TclPtrIncrObjVar at Base 8.6.7
  TclPtrMakeUpvar at Base 8.6.0
+ TclPtrObjMakeUpvar at Base 8.6.7
+ TclPtrSetVar at Base 8.6.7
+ TclPtrUnsetVar at Base 8.6.7
  TclPushStackFrame at Base 8.6.0
  TclRegAbout at Base 8.6.0
  TclRegError at Base 8.6.0
@@ -341,6 +346,7 @@
  Tcl_DontCallWhenDeleted at Base 8.6.0
  Tcl_DumpActiveMemory at Base 8.6.0
  Tcl_DuplicateObj at Base 8.6.0
+ Tcl_EncodingObjCmd at Base 8.6.7
  Tcl_Eof at Base 8.6.0
  Tcl_ErrnoId at Base 8.6.0
  Tcl_ErrnoMsg at Base 8.6.0
@@ -870,5 +876,5 @@
  TclpUnloadFile at Base 8.6.2
  TclpUtfNcmp2 at Base 8.6.0
  _LIB_VERSION at Base 8.6.0
- notifierInitMutex at Base 8.6.5
- notifierMutex at Base 8.6.5
+#MISSING: 8.6.7# notifierInitMutex at Base 8.6.5
+#MISSING: 8.6.7# notifierMutex at Base 8.6.5

Modified: tcl8.6/trunk/debian/patches/confsearch.diff
===================================================================
--- tcl8.6/trunk/debian/patches/confsearch.diff	2017-08-10 09:01:57 UTC (rev 1861)
+++ tcl8.6/trunk/debian/patches/confsearch.diff	2017-08-10 09:26:56 UTC (rev 1862)
@@ -4,18 +4,11 @@
 
 --- a/unix/tcl.m4
 +++ b/unix/tcl.m4
-@@ -93,6 +93,7 @@
+@@ -224,6 +224,8 @@
  			`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/lib/tcl8.6 2>/dev/null` \
- 			`ls -d /usr/lib 2>/dev/null` \
- 			`ls -d /usr/lib64 2>/dev/null` \
- 			; do
-@@ -223,6 +224,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/lib/tk8.6 2>/dev/null` \
  			`ls -d /usr/lib 2>/dev/null` \
  			`ls -d /usr/lib64 2>/dev/null` \

Modified: tcl8.6/trunk/debian/patches/non-linux.diff
===================================================================
--- tcl8.6/trunk/debian/patches/non-linux.diff	2017-08-10 09:01:57 UTC (rev 1861)
+++ tcl8.6/trunk/debian/patches/non-linux.diff	2017-08-10 09:26:56 UTC (rev 1862)
@@ -3,7 +3,7 @@
 
 --- a/unix/configure
 +++ b/unix/configure
-@@ -6604,6 +6604,9 @@
+@@ -6452,6 +6452,9 @@
  		if test "`uname -s`" = "AIX" ; then
  		    tcl_cv_sys_version=AIX-`uname -v`.`uname -r`
  		fi
@@ -25,7 +25,7 @@
  SHLIB_SUFFIX		= @SHLIB_SUFFIX@
 --- a/unix/tcl.m4
 +++ b/unix/tcl.m4
-@@ -926,6 +926,9 @@
+@@ -925,6 +925,9 @@
  		if test "`uname -s`" = "AIX" ; then
  		    tcl_cv_sys_version=AIX-`uname -v`.`uname -r`
  		fi

Modified: tcl8.6/trunk/debian/patches/tcllibrary.diff
===================================================================
--- tcl8.6/trunk/debian/patches/tcllibrary.diff	2017-08-10 09:01:57 UTC (rev 1861)
+++ tcl8.6/trunk/debian/patches/tcllibrary.diff	2017-08-10 09:26:56 UTC (rev 1862)
@@ -1,6 +1,6 @@
 --- a/unix/configure
 +++ b/unix/configure
-@@ -19074,7 +19074,7 @@
+@@ -18901,7 +18901,7 @@
  
  eval "TCL_LIB_FILE=${TCL_LIB_FILE}"
  

Modified: tcl8.6/trunk/debian/patches/tclpackagepath.diff
===================================================================
--- tcl8.6/trunk/debian/patches/tclpackagepath.diff	2017-08-10 09:01:57 UTC (rev 1861)
+++ tcl8.6/trunk/debian/patches/tclpackagepath.diff	2017-08-10 09:26:56 UTC (rev 1862)
@@ -4,7 +4,7 @@
 
 --- a/unix/configure
 +++ b/unix/configure
-@@ -19205,9 +19205,9 @@
+@@ -19032,9 +19032,9 @@
      test -z "$TCL_MODULE_PATH"  && \
  	TCL_MODULE_PATH="~/Library/Tcl /Library/Tcl /System/Library/Tcl"
  elif test "$prefix/lib" != "$libdir"; then

Modified: tcl8.6/trunk/debian/rules
===================================================================
--- tcl8.6/trunk/debian/rules	2017-08-10 09:01:57 UTC (rev 1861)
+++ tcl8.6/trunk/debian/rules	2017-08-10 09:26:56 UTC (rev 1862)
@@ -123,7 +123,6 @@
 
 override_dh_makeshlibs:
 	dh_makeshlibs -a -Xtcltest
-	echo 'activate-noawait ldconfig' >>debian/libtcl$(v).triggers
 
 override_dh_shlibdeps:
 	dh_shlibdeps -a -ldebian/libtcl$(v)/usr/lib/$(DEB_HOST_MULTIARCH)