[Pkg-tcltk-commits] r594 - tk8.5/trunk/debian

[sgolovan-guest at alioth.debian.org]

Author: sgolovan-guest
Date: 2008-05-01 08:34:44 +0000 (Thu, 01 May 2008)
New Revision: 594

Modified:
   tk8.5/trunk/debian/changelog
   tk8.5/trunk/debian/rules
Log:
[tk8.5]
  * Fixed clean target to work with debhelper 7.0 (made dh_clean the last
    command, so debhelper logs are removed now).


Modified: tk8.5/trunk/debian/changelog
===================================================================
--- tk8.5/trunk/debian/changelog	2008-05-01 08:33:03 UTC (rev 593)
+++ tk8.5/trunk/debian/changelog	2008-05-01 08:34:44 UTC (rev 594)
@@ -1,8 +1,9 @@
 tk8.5 (8.5.2-2) UNRELEASED; urgency=low
 
-  * NOT RELEASED YET
+  * Fixed clean target to work with debhelper 7.0 (made dh_clean the last
+    command, so debhelper logs are removed now).
 
- -- Sergei Golovan <sgolovan at debian.org>  Tue,  1 Apr 2008 20:30:50 +0400
+ -- Sergei Golovan <sgolovan at debian.org>  Thu, 01 May 2008 12:33:38 +0400
 
 tk8.5 (8.5.2-1) unstable; urgency=low
 

Modified: tk8.5/trunk/debian/rules
===================================================================
--- tk8.5/trunk/debian/rules	2008-05-01 08:33:03 UTC (rev 593)
+++ tk8.5/trunk/debian/rules	2008-05-01 08:34:44 UTC (rev 594)
@@ -32,7 +32,6 @@
 build: build-stamp
 build-stamp: patch-stamp
 	dh_testdir
-
 	cd unix && \
 	  TK_LIBRARY="/usr/share/tcltk/tk$(v)" \
 	  ./configure --host=$(DEB_HOST_GNU_TYPE) \
@@ -47,31 +46,29 @@
 		      --enable-man-symlinks \
 		      --enable-man-compression=gzip && \
 	  $(MAKE) CFLAGS="$(CFLAGS)"
-
 # Build the static library.
 	cd unix && \
 	  ar cr libtk$(v).a *.o && \
 	  ar d libtk$(v).a tkAppInit.o && \
 	  ranlib libtk$(v).a
-
 	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
-
 	cd unix && [ ! -f Makefile ] || $(MAKE) distclean
 
-	dh_clean
-
 install: install-stamp
 install-stamp: build-stamp
 	dh_testdir
 	dh_testroot
 	dh_installdirs
-
 	mkdir -p debian/tmp/usr
 	cd unix && \
 	  GZIP=-9 \
@@ -150,7 +147,6 @@
 	   debian/tk$(v)-dev/usr/share/tcltk/tk$(v)
 	ln -s ../../share/tcltk/tk$(v)/tkConfig.sh \
 	      debian/tk$(v)-dev/usr/lib/tk$(v)/tkConfig.sh
-
 	dh_installdocs -a
 	install -d `pwd`/debian/tk$(v)/usr/share/doc/tk$(v)/examples/
 # move around the demos