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

[sgolovan at alioth.debian.org]

Author: sgolovan
Date: 2015-05-05 11:21:15 +0000 (Tue, 05 May 2015)
New Revision: 1731

Modified:
   tk8.5/trunk/debian/changelog
   tk8.5/trunk/debian/patches/confsearch.diff
   tk8.5/trunk/debian/patches/non-linux.diff
   tk8.5/trunk/debian/patches/tklibrary.diff
   tk8.5/trunk/debian/patches/xft.diff
   tk8.5/trunk/debian/rules
Log:
[tk8.5]
  * Upload to unstable.


Modified: tk8.5/trunk/debian/changelog
===================================================================
--- tk8.5/trunk/debian/changelog	2015-05-05 11:19:46 UTC (rev 1730)
+++ tk8.5/trunk/debian/changelog	2015-05-05 11:21:15 UTC (rev 1731)
@@ -1,9 +1,16 @@
-tk8.5 (8.5.17-2) UNRELEASED; urgency=medium
+tk8.5 (8.5.18-2) unstable; urgency=medium
 
-  * NOT RELEASED YET
+  * Upload to unstable.
 
- -- Sergei Golovan <sgolovan at debian.org>  Fri, 24 Oct 2014 23:56:48 +0400
+ -- Sergei Golovan <sgolovan at debian.org>  Tue, 05 May 2015 14:20:52 +0300
 
+tk8.5 (8.5.18-1) experimental; urgency=medium
+
+  * New upstream release.
+  * Upload to experimental because of the jessie freeze.
+
+ -- Sergei Golovan <sgolovan at debian.org>  Mon, 09 Mar 2015 10:17:31 +0300
+
 tk8.5 (8.5.17-1) unstable; urgency=medium
 
   * New upstream release.

Modified: tk8.5/trunk/debian/patches/confsearch.diff
===================================================================
--- tk8.5/trunk/debian/patches/confsearch.diff	2015-05-05 11:19:46 UTC (rev 1730)
+++ tk8.5/trunk/debian/patches/confsearch.diff	2015-05-05 11:21:15 UTC (rev 1731)
@@ -4,7 +4,7 @@
 
 --- a/unix/configure
 +++ b/unix/configure
-@@ -1431,6 +1431,7 @@
+@@ -2372,6 +2372,7 @@
  			`ls -d ${prefix}/lib 2>/dev/null` \
  			`ls -d /usr/local/lib 2>/dev/null` \
  			`ls -d /usr/contrib/lib 2>/dev/null` \

Modified: tk8.5/trunk/debian/patches/non-linux.diff
===================================================================
--- tk8.5/trunk/debian/patches/non-linux.diff	2015-05-05 11:19:46 UTC (rev 1730)
+++ tk8.5/trunk/debian/patches/non-linux.diff	2015-05-05 11:21:15 UTC (rev 1731)
@@ -3,7 +3,7 @@
 
 --- a/unix/configure
 +++ b/unix/configure
-@@ -4744,6 +4744,9 @@
+@@ -4579,6 +4579,9 @@
  		if test "`uname -s`" = "AIX" ; then
  		    tcl_cv_sys_version=AIX-`uname -v`.`uname -r`
  		fi

Modified: tk8.5/trunk/debian/patches/tklibrary.diff
===================================================================
--- tk8.5/trunk/debian/patches/tklibrary.diff	2015-05-05 11:19:46 UTC (rev 1730)
+++ tk8.5/trunk/debian/patches/tklibrary.diff	2015-05-05 11:21:15 UTC (rev 1731)
@@ -1,6 +1,6 @@
 --- a/unix/configure
 +++ b/unix/configure
-@@ -11412,7 +11412,7 @@
+@@ -8649,7 +8649,7 @@
      TCL_STUB_FLAGS="-DUSE_TCL_STUBS"
  fi
  

Modified: tk8.5/trunk/debian/patches/xft.diff
===================================================================
--- tk8.5/trunk/debian/patches/xft.diff	2015-05-05 11:19:46 UTC (rev 1730)
+++ tk8.5/trunk/debian/patches/xft.diff	2015-05-05 11:21:15 UTC (rev 1731)
@@ -19,7 +19,7 @@
  	dnl make sure that compiling against Xft header file doesn't bomb
 --- a/unix/configure
 +++ b/unix/configure
-@@ -10560,8 +10560,8 @@
+@@ -8201,8 +8201,8 @@
  	XFT_LIBS=`xft-config --libs 2>/dev/null` || found_xft="no"
  	if test "$found_xft" = "no" ; then
  	    found_xft=yes
@@ -28,5 +28,5 @@
 +	    XFT_CFLAGS=`pkg-config --cflags xft fontconfig 2>/dev/null` || found_xft="no"
 +	    XFT_LIBS=`pkg-config --libs xft fontconfig 2>/dev/null` || found_xft="no"
  	fi
- 	echo "$as_me:$LINENO: result: $found_xft" >&5
- echo "${ECHO_T}$found_xft" >&6
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $found_xft" >&5
+ $as_echo "$found_xft" >&6; }

Modified: tk8.5/trunk/debian/rules
===================================================================
--- tk8.5/trunk/debian/rules	2015-05-05 11:19:46 UTC (rev 1730)
+++ tk8.5/trunk/debian/rules	2015-05-05 11:21:15 UTC (rev 1731)
@@ -122,8 +122,8 @@
 	dh_shlibdeps -ldebian/libtk$(v)/usr/lib/$(DEB_HOST_MULTIARCH)
 
 get-orig-source:
-	wget -O tk$(v)_$(v).17.orig.tar.gz \
-	     http://prdownloads.sourceforge.net/tcl/tk$(v).17-src.tar.gz
+	wget -O tk$(v)_$(v).18.orig.tar.gz \
+	     http://prdownloads.sourceforge.net/tcl/tk$(v).18-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 \