[Pkg-tcltk-commits] r592 - tk8.3/trunk/debian

[sgolovan-guest at alioth.debian.org]

Author: sgolovan-guest
Date: 2008-05-01 08:31:08 +0000 (Thu, 01 May 2008)
New Revision: 592

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


Modified: tk8.3/trunk/debian/changelog
===================================================================
--- tk8.3/trunk/debian/changelog	2008-05-01 08:28:58 UTC (rev 591)
+++ tk8.3/trunk/debian/changelog	2008-05-01 08:31:08 UTC (rev 592)
@@ -1,8 +1,9 @@
 tk8.3 (8.3.5-14) 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>  Mon, 14 Apr 2008 22:52:02 +0400
+ -- Sergei Golovan <sgolovan at debian.org>  Thu, 01 May 2008 12:29:22 +0400
 
 tk8.3 (8.3.5-13) unstable; urgency=low
 

Modified: tk8.3/trunk/debian/rules
===================================================================
--- tk8.3/trunk/debian/rules	2008-05-01 08:28:58 UTC (rev 591)
+++ tk8.3/trunk/debian/rules	2008-05-01 08:31:08 UTC (rev 592)
@@ -30,7 +30,6 @@
 build: build-stamp
 build-stamp: patch-stamp
 	dh_testdir
-
 	cd unix && \
 	  ./configure --host=$(DEB_HOST_GNU_TYPE) \
 		      --build=$(DEB_BUILD_GNU_TYPE) \
@@ -40,31 +39,29 @@
 		      --enable-shared && \
 	  $(MAKE) CFLAGS="$(CFLAGS)" \
 		  TK_LIBRARY="/usr/share/tcltk/tk$(v)"
-
 # 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) TK_LIBRARY="/usr/share/tcltk/tk$(v)" distclean
 
-	dh_clean
-
 install: install-stamp
 install-stamp: build-stamp
 	dh_testdir
 	dh_testroot
 	dh_installdirs
-
 	mkdir -p debian/tmp/usr
 	cd unix && \
 	  $(MAKE) INSTALL_ROOT=`pwd`/../debian/tmp \
@@ -116,7 +113,6 @@
 	  done
 	rm -rf `pwd`/debian/tmp/usr/share/tcltk/tk$(v)/demos
 	ln -sf ../../doc/tk$(v)/examples `pwd`/debian/tmp/usr/share/tcltk/tk$(v)/demos 
-
 	touch install-stamp
 
 # Build architecture-independent files here.
@@ -143,7 +139,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