[Pkg-tcltk-commits] r1754 - in blt/trunk/debian: . patches

[sgolovan at alioth.debian.org]

Author: sgolovan
Date: 2015-11-25 08:34:10 +0000 (Wed, 25 Nov 2015)
New Revision: 1754

Added:
   blt/trunk/debian/patches/distclean.patch
Modified:
   blt/trunk/debian/changelog
   blt/trunk/debian/patches/series
   blt/trunk/debian/rules
Log:
[blt]
  * Fixed the distclean target in Makefile.in which fixes FTBFS when build
    twice in a row (closes: #791601).
  * Fixed the override_dh_installdoc target in debian/rules to fix FTBFS
    when dpkg-buildpackage -A is called for building the architecture-
    independent packages only (closes: #805999).


Modified: blt/trunk/debian/changelog
===================================================================
--- blt/trunk/debian/changelog	2015-11-20 10:16:51 UTC (rev 1753)
+++ blt/trunk/debian/changelog	2015-11-25 08:34:10 UTC (rev 1754)
@@ -1,8 +1,12 @@
-blt (2.5.3+dfsg-2) UNRELEASED; urgency=medium
+blt (2.5.3+dfsg-2) unstable; urgency=medium
 
-  * NOT RELEASED YET
+  * Fixed the distclean target in Makefile.in which fixes FTBFS when build
+    twice in a row (closes: #791601).
+  * Fixed the override_dh_installdoc target in debian/rules to fix FTBFS
+    when dpkg-buildpackage -A is called for building the architecture-
+    independent packages only (closes: #805999).
 
- -- Sergei Golovan <sgolovan at debian.org>  Fri, 21 Nov 2014 17:16:57 +0300
+ -- Sergei Golovan <sgolovan at debian.org>  Wed, 25 Nov 2015 11:28:10 +0300
 
 blt (2.5.3+dfsg-1) unstable; urgency=medium
 

Added: blt/trunk/debian/patches/distclean.patch
===================================================================
--- blt/trunk/debian/patches/distclean.patch	                        (rev 0)
+++ blt/trunk/debian/patches/distclean.patch	2015-11-25 08:34:10 UTC (rev 1754)
@@ -0,0 +1,15 @@
+Author: Sergei Golovan
+Description: Patch fixes recursion in the distclean target of Makefile.in.
+Last-Modified: Wed, 25 Nov 2015 11:23:52 +0300
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -72,7 +72,7 @@
+ 	config.status config.cache config.log Makefile 
+ 
+ distclean: clean
+-	(cd src; $(MAKE) distclean)
++	(cd generic; $(MAKE) distclean)
+ 	(cd library; $(MAKE) distclean)
+ 	(cd man; $(MAKE) distclean)
+ 	(cd demos; $(MAKE) distclean)

Modified: blt/trunk/debian/patches/series
===================================================================
--- blt/trunk/debian/patches/series	2015-11-20 10:16:51 UTC (rev 1753)
+++ blt/trunk/debian/patches/series	2015-11-25 08:34:10 UTC (rev 1754)
@@ -18,3 +18,4 @@
 uninitialized.patch
 unused.patch
 pointertoint.patch
+distclean.patch

Modified: blt/trunk/debian/rules
===================================================================
--- blt/trunk/debian/rules	2015-11-20 10:16:51 UTC (rev 1753)
+++ blt/trunk/debian/rules	2015-11-25 08:34:10 UTC (rev 1754)
@@ -66,7 +66,7 @@
 
 override_dh_installdocs:
 	dh_installdocs
-	rm debian/blt-dev/usr/share/doc/blt-dev/html/*.vc
+	rm -f debian/blt-dev/usr/share/doc/blt-dev/html/*.vc
 
 override_dh_makeshlibs:
 	dh_makeshlibs -V 'tk8.6-blt2.5 (>= 2.5.3)'