[Pkg-tcltk-commits] r585 - tcl8.3/trunk/debian

[sgolovan-guest at alioth.debian.org]

Author: sgolovan-guest
Date: 2008-05-01 08:16:53 +0000 (Thu, 01 May 2008)
New Revision: 585

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


Modified: tcl8.3/trunk/debian/changelog
===================================================================
--- tcl8.3/trunk/debian/changelog	2008-04-19 15:36:03 UTC (rev 584)
+++ tcl8.3/trunk/debian/changelog	2008-05-01 08:16:53 UTC (rev 585)
@@ -1,8 +1,9 @@
-tcl8.3 (8.3.5-12) UNRELEASED; urgency=low
+tcl8.3 (8.3.5-12) unstable; 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:36:30 +0400
+ -- Sergei Golovan <sgolovan at debian.org>  Thu, 01 May 2008 12:11:02 +0400
 
 tcl8.3 (8.3.5-11) unstable; urgency=low
 

Modified: tcl8.3/trunk/debian/rules
===================================================================
--- tcl8.3/trunk/debian/rules	2008-04-19 15:36:03 UTC (rev 584)
+++ tcl8.3/trunk/debian/rules	2008-05-01 08:16:53 UTC (rev 585)
@@ -30,7 +30,6 @@
 build: build-stamp
 build-stamp: patch-stamp
 	dh_testdir
-
 # So so ugly but it works...
 	touch generic/tclStubInit.c
 	cd unix && \
@@ -44,32 +43,32 @@
 	  touch ../generic/tclStubInit.c && \
 	  $(MAKE) CFLAGS="$(CFLAGS)" \
 		  TCL_LIBRARY="/usr/share/tcltk/tcl$(v)"
-
 # 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) TCL_LIBRARY="/usr/share/tcltk/tcl$(v)" 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 && \
 	  $(MAKE) INSTALL_ROOT=`pwd`/../debian/tmp \
 		  MAN_INSTALL_DIR=`pwd`/../debian/tmp/usr/share/man \
@@ -118,7 +117,6 @@
 		rm $$f ; \
 	     fi ; \
 	  done
-
 	touch install-stamp
 
 # Build architecture-independent files here.