[Pkg-tcltk-commits] r635 - tclreadline/trunk/debian

[sgolovan-guest at alioth.debian.org]

Author: sgolovan-guest
Date: 2008-06-09 16:59:13 +0000 (Mon, 09 Jun 2008)
New Revision: 635

Modified:
   tclreadline/trunk/debian/changelog
   tclreadline/trunk/debian/rules
Log:
[tclreadline]
  * Protected quilt invocation in debian/rules to make it possible to convert
    bwidget source package to 3.0 (quilt) format (closes: #484921).
  * Cleaned up debian/rules.


Modified: tclreadline/trunk/debian/changelog
===================================================================
--- tclreadline/trunk/debian/changelog	2008-06-08 11:33:12 UTC (rev 634)
+++ tclreadline/trunk/debian/changelog	2008-06-09 16:59:13 UTC (rev 635)
@@ -1,8 +1,10 @@
-tclreadline (2.1.0-7) UNRELEASED; urgency=low
+tclreadline (2.1.0-7) unstable; urgency=low
 
-  * NOT RELEASED YET
+  * Protected quilt invocation in debian/rules to make it possible to convert
+    bwidget source package to 3.0 (quilt) format (closes: #484921).
+  * Cleaned up debian/rules.
 
- -- Sergei Golovan <sgolovan at debian.org>  Mon, 14 Apr 2008 15:09:11 +0400
+ -- Sergei Golovan <sgolovan at debian.org>  Mon, 09 Jun 2008 20:50:45 +0400
 
 tclreadline (2.1.0-6) unstable; urgency=low
 

Modified: tclreadline/trunk/debian/rules
===================================================================
--- tclreadline/trunk/debian/rules	2008-06-08 11:33:12 UTC (rev 634)
+++ tclreadline/trunk/debian/rules	2008-06-09 16:59:13 UTC (rev 635)
@@ -24,13 +24,13 @@
 	dh_testdir
 	-mv -f aux/config.guess.backup aux/config.guess
 	-mv -f aux/config.sub.backup aux/config.sub
-	-quilt pop -a
+	quilt pop -a || test $$? = 2
 	rm -rf patch-stamp .pc
 
 patch: patch-stamp
 patch-stamp:
 	dh_testdir
-	quilt push -a
+	quilt push -a || test $$? = 2
 	mv aux/config.guess aux/config.guess.backup
 	mv aux/config.sub aux/config.sub.backup
 	cp /usr/share/misc/config.guess aux/
@@ -54,31 +54,35 @@
 	touch build-stamp
 
 clean: clean-patched unpatch
+	dh_testdir
+	dh_testroot
+	dh_clean
+
 clean-patched:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp install-stamp
-
+	#
 	[ ! -f Makefile ] || $(MAKE) distclean
+	#
+	rm -f tclreadline.h tclreadline.n
 
-	dh_clean tclreadline.h tclreadline.n
-
 install: install-stamp
 install-stamp: build-stamp
 	dh_testdir
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
-
+	#
 	$(MAKE) DESTDIR=$(DESTDIR) install
-
-# Fix up the manpages.
+	#
+	# Fix up the manpages.
 	mv $(DESTDIR)/usr/share/man/mann $(DESTDIR)/usr/share/man/man3
 	cd $(DESTDIR)/usr/share/man/man3 && mv tclreadline.n tclreadline.3tcl
-
-# Remove empty directories
+	#
+	# Remove empty directories
 	find $(DESTDIR) -empty -prune -exec rmdir \{\} \;
-
+	#
 	touch install-stamp
 
 # Build architecture-independent files here.