[Pkg-tcltk-commits] r1737 - in tk8.6/trunk/debian: . patches

[sgolovan at alioth.debian.org]

Author: sgolovan
Date: 2015-05-05 11:36:17 +0000 (Tue, 05 May 2015)
New Revision: 1737

Modified:
   tk8.6/trunk/debian/changelog
   tk8.6/trunk/debian/control
   tk8.6/trunk/debian/patches/tklibrary.diff
   tk8.6/trunk/debian/patches/xft.diff
   tk8.6/trunk/debian/rules
   tk8.6/trunk/debian/watch
Log:
[tk8.6]
  * Upload to unstable.


Modified: tk8.6/trunk/debian/changelog
===================================================================
--- tk8.6/trunk/debian/changelog	2015-05-05 11:33:54 UTC (rev 1736)
+++ tk8.6/trunk/debian/changelog	2015-05-05 11:36:17 UTC (rev 1737)
@@ -1,9 +1,25 @@
-tk8.6 (8.6.2-2) UNRELEASED; urgency=medium
+tk8.6 (8.6.4+dfsg-2) unstable; urgency=medium
 
-  * NOT RELEASED YET
+  * Upload to unstable.
 
- -- Sergei Golovan <sgolovan at debian.org>  Wed, 27 Aug 2014 23:10:49 +0400
+ -- Sergei Golovan <sgolovan at debian.org>  Tue, 05 May 2015 14:35:20 +0300
 
+tk8.6 (8.6.4+dfsg-1) experimental; urgency=medium
+
+  * New upstream release.
+  * Upload to experimental because of the jessie freeze.
+
+ -- Sergei Golovan <sgolovan at debian.org>  Fri, 13 Mar 2015 13:51:24 +0300
+
+tk8.6 (8.6.3+dfsg-1) experimental; urgency=medium
+
+  * New upstream release.
+  * Upload to experimental because of the jessie freeze.
+  * Bumped standards version to 3.9.6.
+  * Removed non-free image library/images/lamp.svg from the source code.
+
+ -- Sergei Golovan <sgolovan at debian.org>  Mon, 09 Mar 2015 11:38:34 +0300
+
 tk8.6 (8.6.2-1) unstable; urgency=medium
 
   * New upstream release.

Modified: tk8.6/trunk/debian/control
===================================================================
--- tk8.6/trunk/debian/control	2015-05-05 11:33:54 UTC (rev 1736)
+++ tk8.6/trunk/debian/control	2015-05-05 11:36:17 UTC (rev 1737)
@@ -6,7 +6,7 @@
 Build-Depends: debhelper (>= 9.0.0), dpkg-dev (>= 1.16.1~), x11proto-core-dev,
  libx11-dev, libxt-dev, libxss-dev, libxext-dev, libxft-dev,
  tcl8.6-dev (>= 8.6.0-2)
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
 Homepage: http://www.tcl.tk/
 
 Package: tk8.6

Modified: tk8.6/trunk/debian/patches/tklibrary.diff
===================================================================
--- tk8.6/trunk/debian/patches/tklibrary.diff	2015-05-05 11:33:54 UTC (rev 1736)
+++ tk8.6/trunk/debian/patches/tklibrary.diff	2015-05-05 11:36:17 UTC (rev 1737)
@@ -1,6 +1,6 @@
 --- a/unix/configure
 +++ b/unix/configure
-@@ -11227,7 +11227,7 @@
+@@ -11232,7 +11232,7 @@
      TCL_STUB_FLAGS="-DUSE_TCL_STUBS"
  fi
  

Modified: tk8.6/trunk/debian/patches/xft.diff
===================================================================
--- tk8.6/trunk/debian/patches/xft.diff	2015-05-05 11:33:54 UTC (rev 1736)
+++ tk8.6/trunk/debian/patches/xft.diff	2015-05-05 11:36:17 UTC (rev 1737)
@@ -19,7 +19,7 @@
  	dnl make sure that compiling against Xft header file doesn't bomb
 --- a/unix/configure
 +++ b/unix/configure
-@@ -10306,8 +10306,8 @@
+@@ -10311,8 +10311,8 @@
  	XFT_LIBS=`xft-config --libs 2>/dev/null` || found_xft="no"
  	if test "$found_xft" = "no" ; then
  	    found_xft=yes

Modified: tk8.6/trunk/debian/rules
===================================================================
--- tk8.6/trunk/debian/rules	2015-05-05 11:33:54 UTC (rev 1736)
+++ tk8.6/trunk/debian/rules	2015-05-05 11:36:17 UTC (rev 1737)
@@ -118,8 +118,16 @@
 	dh_shlibdeps -ldebian/libtk$(v)/usr/lib/$(DEB_HOST_MULTIARCH)
 
 get-orig-source:
-	wget -O tk$(v)_$(v).2.orig.tar.gz \
-	     http://prdownloads.sourceforge.net/tcl/tk$(v).2-src.tar.gz
+	CURDIR=`pwd` && \
+	TMPDIR=`mktemp -d /tmp/tk8.6.XXXXXX` && \
+	cd $$TMPDIR && \
+	wget -O - \
+	    http://prdownloads.sourceforge.net/tcl/tk$(v).4-src.tar.gz | tar -zx && \
+	for f in `find . -name *.svg` ; do \
+	    echo "REMOVING NON-FREE FILE $$f" ; rm -f $$f ; \
+	done && \
+	tar -zcf $$CURDIR/tk$(v)_$(v).4+dfsg.orig.tar.gz tk$(v).4 && \
+	rm -rf $$TMPDIR
 
 .PHONY: override_dh_auto_clean override_dh_auto_configure override_dh_auto_build \
 	override_dh_auto_install override_dh_compress override_dh_strip \

Modified: tk8.6/trunk/debian/watch
===================================================================
--- tk8.6/trunk/debian/watch	2015-05-05 11:33:54 UTC (rev 1736)
+++ tk8.6/trunk/debian/watch	2015-05-05 11:36:17 UTC (rev 1737)
@@ -1,2 +1,3 @@
 version=3
-http://sf.net/tcl/tk(8\.6\.\d+)-src\.tar\.gz
+opts=dversionmangle=s/\+dfsg\d*$// \
+  http://sf.net/tcl/tk(8\.6\.\d+)-src\.tar\.gz