[Pkg-tcltk-commits] r591 - tcl8.5/trunk/debian

[sgolovan-guest at alioth.debian.org]

Author: sgolovan-guest
Date: 2008-05-01 08:28:58 +0000 (Thu, 01 May 2008)
New Revision: 591

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


Modified: tcl8.5/trunk/debian/changelog
===================================================================
--- tcl8.5/trunk/debian/changelog	2008-05-01 08:25:59 UTC (rev 590)
+++ tcl8.5/trunk/debian/changelog	2008-05-01 08:28:58 UTC (rev 591)
@@ -1,8 +1,9 @@
 tcl8.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:08 +0400
+ -- Sergei Golovan <sgolovan at debian.org>  Thu, 01 May 2008 12:27:35 +0400
 
 tcl8.5 (8.5.2-1) unstable; urgency=low
 

Modified: tcl8.5/trunk/debian/rules
===================================================================
--- tcl8.5/trunk/debian/rules	2008-05-01 08:25:59 UTC (rev 590)
+++ tcl8.5/trunk/debian/rules	2008-05-01 08:28:58 UTC (rev 591)
@@ -38,7 +38,6 @@
 build: build-stamp
 build-stamp: patch-stamp
 	dh_testdir
-
 # So so ugly but it works...
 	touch generic/tclStubInit.c
 	cd unix && \
@@ -56,32 +55,32 @@
 		      --enable-man-compression=gzip && \
 	  touch ../generic/tclStubInit.c && \
 	  $(MAKE) CFLAGS="$(CFLAGS)"
-
 # Build the static library.
 	cd unix && \
 	  ar cr libtcl$(v).a *.o && \
 	  ar d libtcl$(v).a tclAppInit.o && \
 	  ranlib libtcl$(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
+# Remove forgotten files
+	rm -f tests/pkg/pkga.so unix/config.log unix/Tcltest.so
 
-	dh_clean tests/pkg/pkga.so unix/config.log unix/Tcltest.so
-
 install: install-stamp
 install-stamp: build-stamp
 	dh_testdir
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
-
 	cd unix && \
 	  GZIP=-9 \
 	  $(MAKE) INSTALL_ROOT=`pwd`/../debian/tmp \
@@ -128,7 +127,6 @@
 		rm $$f ; \
 	     fi ; \
 	  done
-
 	touch install-stamp
 
 # Build architecture-independent files here.
@@ -157,7 +155,6 @@
 	   debian/tcl$(v)-dev/usr/share/tcltk/tcl$(v)
 	ln -s ../../share/tcltk/tcl$(v)/tclConfig.sh \
 	      debian/tcl$(v)-dev/usr/lib/tcl$(v)/tclConfig.sh
-
 	dh_installdocs -a
 	dh_installmenu -a
 	dh_installchangelogs -a ChangeLog