[Pkg-tcltk-commits] r1658 - in tk8.5/trunk/debian: . patches

sgolovan at alioth.debian.org sgolovan at alioth.debian.org
Mon Aug 25 15:33:02 UTC 2014 

Author: sgolovan
Date: 2014-08-25 15:33:02 +0000 (Mon, 25 Aug 2014)
New Revision: 1658

Modified:
   tk8.5/trunk/debian/changelog
   tk8.5/trunk/debian/patches/confsearch.diff
   tk8.5/trunk/debian/patches/manpages.diff
   tk8.5/trunk/debian/patches/non-linux.diff
   tk8.5/trunk/debian/patches/tklibrary.diff
   tk8.5/trunk/debian/patches/tkprivate.diff
   tk8.5/trunk/debian/patches/xft.diff
   tk8.5/trunk/debian/rules
Log:
[tk8.5]
  * New upstream release.
  * Refreshed patches.


Modified: tk8.5/trunk/debian/changelog
===================================================================
--- tk8.5/trunk/debian/changelog	2014-08-25 15:22:09 UTC (rev 1657)
+++ tk8.5/trunk/debian/changelog	2014-08-25 15:33:02 UTC (rev 1658)
@@ -1,8 +1,9 @@
-tk8.5 (8.5.15-5) UNRELEASED; urgency=low
+tk8.5 (8.5.16-1) unstable; urgency=low
 
-  * NOT RELEASED YET
+  * New upstream release.
+  * Refreshed patches.
 
- -- Sergei Golovan <sgolovan at debian.org>  Sat, 08 Mar 2014 13:35:14 +0400
+ -- Sergei Golovan <sgolovan at debian.org>  Mon, 25 Aug 2014 19:23:03 +0400
 
 tk8.5 (8.5.15-4) unstable; urgency=low
 

Modified: tk8.5/trunk/debian/patches/confsearch.diff
===================================================================
--- tk8.5/trunk/debian/patches/confsearch.diff	2014-08-25 15:22:09 UTC (rev 1657)
+++ tk8.5/trunk/debian/patches/confsearch.diff	2014-08-25 15:33:02 UTC (rev 1658)
@@ -2,8 +2,8 @@
 and tkConfig.sh in /usr/share/tcltk/tk8.5 where they are located in Debian
 installation.
 
---- tk8.5-8.5.15.orig/unix/configure
-+++ tk8.5-8.5.15/unix/configure
+--- a/unix/configure
++++ b/unix/configure
 @@ -1431,6 +1431,7 @@
  			`ls -d ${prefix}/lib 2>/dev/null` \
  			`ls -d /usr/local/lib 2>/dev/null` \
@@ -12,8 +12,8 @@
  			`ls -d /usr/lib 2>/dev/null` \
  			`ls -d /usr/lib64 2>/dev/null` \
  			; do
---- tk8.5-8.5.15.orig/unix/tcl.m4
-+++ tk8.5-8.5.15/unix/tcl.m4
+--- a/unix/tcl.m4
++++ b/unix/tcl.m4
 @@ -93,6 +93,7 @@
  			`ls -d ${prefix}/lib 2>/dev/null` \
  			`ls -d /usr/local/lib 2>/dev/null` \

Modified: tk8.5/trunk/debian/patches/manpages.diff
===================================================================
--- tk8.5/trunk/debian/patches/manpages.diff	2014-08-25 15:22:09 UTC (rev 1657)
+++ tk8.5/trunk/debian/patches/manpages.diff	2014-08-25 15:33:02 UTC (rev 1658)
@@ -2,8 +2,8 @@
 aren't installed by upstream script but are referenced inside other
 manual pages.
 
---- tk8.5-8.5.15.orig/unix/installManPage
-+++ tk8.5-8.5.15/unix/installManPage
+--- a/unix/installManPage
++++ b/unix/installManPage
 @@ -91,8 +91,16 @@
  	exit 2 ;;
  esac

Modified: tk8.5/trunk/debian/patches/non-linux.diff
===================================================================
--- tk8.5/trunk/debian/patches/non-linux.diff	2014-08-25 15:22:09 UTC (rev 1657)
+++ tk8.5/trunk/debian/patches/non-linux.diff	2014-08-25 15:33:02 UTC (rev 1658)
@@ -1,8 +1,8 @@
 Patch by Sergei Golovan (originally by Mike Markley and Chris Waters) fixes
 building on non-linux Debian architectures.
 
---- tk8.5-8.5.15.orig/unix/configure
-+++ tk8.5-8.5.15/unix/configure
+--- a/unix/configure
++++ b/unix/configure
 @@ -4744,6 +4744,9 @@
  		if test "`uname -s`" = "AIX" ; then
  		    tcl_cv_sys_version=AIX-`uname -v`.`uname -r`
@@ -13,8 +13,8 @@
  	    fi
  	fi
  
---- tk8.5-8.5.15.orig/unix/tcl.m4
-+++ tk8.5-8.5.15/unix/tcl.m4
+--- a/unix/tcl.m4
++++ b/unix/tcl.m4
 @@ -961,6 +961,9 @@
  		if test "`uname -s`" = "AIX" ; then
  		    tcl_cv_sys_version=AIX-`uname -v`.`uname -r`

Modified: tk8.5/trunk/debian/patches/tklibrary.diff
===================================================================
--- tk8.5/trunk/debian/patches/tklibrary.diff	2014-08-25 15:22:09 UTC (rev 1657)
+++ tk8.5/trunk/debian/patches/tklibrary.diff	2014-08-25 15:33:02 UTC (rev 1658)
@@ -1,6 +1,6 @@
---- tk8.5-8.5.15.orig/unix/configure
-+++ tk8.5-8.5.15/unix/configure
-@@ -11326,7 +11326,7 @@
+--- a/unix/configure
++++ b/unix/configure
+@@ -11407,7 +11407,7 @@
      TCL_STUB_FLAGS="-DUSE_TCL_STUBS"
  fi
  
@@ -9,9 +9,9 @@
  PRIVATE_INCLUDE_DIR='$(includedir)'
  HTML_DIR='$(DISTDIR)/html'
  TK_PKG_DIR='tk$(VERSION)'
---- tk8.5-8.5.15.orig/unix/configure.in
-+++ tk8.5-8.5.15/unix/configure.in
-@@ -641,7 +641,7 @@
+--- a/unix/configure.in
++++ b/unix/configure.in
+@@ -653,7 +653,7 @@
      TCL_STUB_FLAGS="-DUSE_TCL_STUBS"
  fi
  

Modified: tk8.5/trunk/debian/patches/tkprivate.diff
===================================================================
--- tk8.5/trunk/debian/patches/tkprivate.diff	2014-08-25 15:22:09 UTC (rev 1657)
+++ tk8.5/trunk/debian/patches/tkprivate.diff	2014-08-25 15:33:02 UTC (rev 1658)
@@ -2,8 +2,8 @@
 with Tk sources to a subdirectory of /usr/include/tcl8.4 (debian/rules
 puts private Tk headers there).
 
---- tk8.5-8.5.15.orig/unix/tkConfig.sh.in
-+++ tk8.5-8.5.15/unix/tkConfig.sh.in
+--- a/unix/tkConfig.sh.in
++++ b/unix/tkConfig.sh.in
 @@ -53,7 +53,7 @@
  
  # String to pass to linker to pick up the Tk library from its

Modified: tk8.5/trunk/debian/patches/xft.diff
===================================================================
--- tk8.5/trunk/debian/patches/xft.diff	2014-08-25 15:22:09 UTC (rev 1657)
+++ tk8.5/trunk/debian/patches/xft.diff	2014-08-25 15:33:02 UTC (rev 1658)
@@ -4,8 +4,8 @@
 Bug: https://sourceforge.net/tracker/?func=detail&aid=3184834&group_id=12997&atid=112997
 Last-updated: Sun, 26 Jun 2011 12:14:01 +0400
 
---- tk8.5-8.5.15.orig/unix/configure.in
-+++ tk8.5-8.5.15/unix/configure.in
+--- a/unix/configure.in
++++ b/unix/configure.in
 @@ -481,8 +481,8 @@
  	XFT_LIBS=`xft-config --libs 2>/dev/null` || found_xft="no"
  	if test "$found_xft" = "no" ; then
@@ -17,9 +17,9 @@
  	fi
  	AC_MSG_RESULT([$found_xft])
  	dnl make sure that compiling against Xft header file doesn't bomb
---- tk8.5-8.5.15.orig/unix/configure
-+++ tk8.5-8.5.15/unix/configure
-@@ -10552,8 +10552,8 @@
+--- a/unix/configure
++++ b/unix/configure
+@@ -10555,8 +10555,8 @@
  	XFT_LIBS=`xft-config --libs 2>/dev/null` || found_xft="no"
  	if test "$found_xft" = "no" ; then
  	    found_xft=yes

Modified: tk8.5/trunk/debian/rules
===================================================================
--- tk8.5/trunk/debian/rules	2014-08-25 15:22:09 UTC (rev 1657)
+++ tk8.5/trunk/debian/rules	2014-08-25 15:33:02 UTC (rev 1658)
@@ -122,8 +122,8 @@
 	dh_shlibdeps -ldebian/libtk$(v)/usr/lib/$(DEB_HOST_MULTIARCH)
 
 get-orig-source:
-	wget -O tk$(v)_$(v).15.orig.tar.gz \
-	     http://prdownloads.sourceforge.net/tcl/tk$(v).15-src.tar.gz
+	wget -O tk$(v)_$(v).16.orig.tar.gz \
+	     http://prdownloads.sourceforge.net/tcl/tk$(v).16-src.tar.gz
 
 .PHONY: override_dh_auto_clean override_dh_auto_configure override_dh_auto_build \
 	override_dh_auto_install override_dh_compress  override_dh_strip \

More information about the Pkg-tcltk-commits mailing list