[xml/sgml-commit] r1226 - in /packages/libxml2: ./ trunk/debian/changelog trunk/debian/rules trunk/xstc/Makefile.am trunk/xstc/Makefile.in

[glandium at users.alioth.debian.org]

Author: glandium
Date: Sat Sep 13 07:34:05 2008
New Revision: 1226

URL: http://svn.debian.org/wsvn/debian-xml-sgml/?sc=1&rev=1226
Log:
 r1329 at jigen:  mh | 2008-03-04 22:36:22 +0100
 * debian/rules: Brown paper bag: uncomment $(MAKE) distclean.
   Closes: #442656.
 * xstc/Makefile.am, xstc/Makefile.in: Properly clean generated files.

Modified:
    packages/libxml2/   (props changed)
    packages/libxml2/trunk/debian/changelog
    packages/libxml2/trunk/debian/rules
    packages/libxml2/trunk/xstc/Makefile.am
    packages/libxml2/trunk/xstc/Makefile.in

Propchange: packages/libxml2/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Sat Sep 13 07:34:05 2008
@@ -1,2 +1,2 @@
 85a06573-1206-0410-a182-ce9117885d71:/local/libxml2:296
-a066b643-3b0a-0410-a6ba-ed4cca522822:/local/libxml2:1328
+a066b643-3b0a-0410-a6ba-ed4cca522822:/local/libxml2:1329

Modified: packages/libxml2/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/libxml2/trunk/debian/changelog?rev=1226&op=diff
==============================================================================
--- packages/libxml2/trunk/debian/changelog (original)
+++ packages/libxml2/trunk/debian/changelog Sat Sep 13 07:34:05 2008
@@ -1,3 +1,11 @@
+libxml2 (2.6.31.dfsg-2) UNRELEASED; urgency=low
+
+  * debian/rules: Brown paper bag: uncomment $(MAKE) distclean.
+    Closes: #442656.
+  * xstc/Makefile.am, xstc/Makefile.in: Properly clean generated files.
+
+ -- Mike Hommey <glandium at debian.org>  Tue, 04 Mar 2008 22:02:17 +0100
+
 libxml2 (2.6.31.dfsg-1) unstable; urgency=low
 
   * New upstream release.

Modified: packages/libxml2/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/libxml2/trunk/debian/rules?rev=1226&op=diff
==============================================================================
--- packages/libxml2/trunk/debian/rules (original)
+++ packages/libxml2/trunk/debian/rules Sat Sep 13 07:34:05 2008
@@ -59,7 +59,7 @@
 	dh_testroot
 	rm -f build-stamp install*-stamp
 
-	#-$(MAKE) distclean
+	-$(MAKE) distclean
 	-rm -f example/Makefile
 	rm COPYING && cp Copyright COPYING
 

Modified: packages/libxml2/trunk/xstc/Makefile.am
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/libxml2/trunk/xstc/Makefile.am?rev=1226&op=diff
==============================================================================
--- packages/libxml2/trunk/xstc/Makefile.am (original)
+++ packages/libxml2/trunk/xstc/Makefile.am Sat Sep 13 07:34:05 2008
@@ -128,8 +128,4 @@
 	   echo '## Running the regression tests under Valgrind' ;	\
 	   $(MAKE) CHECKER='valgrind -q' MAKEFLAGS+=--silent pytests ; fi);
 
-clean:
-	rm -f $(PYSCRIPTS) test.log
-
-distclean:
-	rm -rf $(PYSCRIPTS) test.log # TESTDIRS
+CLEANFILES=$(PYSCRIPTS) test.log

Modified: packages/libxml2/trunk/xstc/Makefile.in
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/libxml2/trunk/xstc/Makefile.in?rev=1226&op=diff
==============================================================================
--- packages/libxml2/trunk/xstc/Makefile.in (original)
+++ packages/libxml2/trunk/xstc/Makefile.in Sat Sep 13 07:34:05 2008
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -72,6 +72,7 @@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
 DOCB_OBJ = @DOCB_OBJ@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -113,6 +114,7 @@
 MODULE_PLATFORM_LIBS = @MODULE_PLATFORM_LIBS@
 MV = @MV@
 M_LIBS = @M_LIBS@
+NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
@@ -282,6 +284,7 @@
 # The local data and scripts
 #
 EXTRA_DIST = xstc.py xstc-to-python.xsl
+CLEANFILES = $(PYSCRIPTS) test.log
 all: all-am
 
 .SUFFIXES:
@@ -374,6 +377,7 @@
 mostlyclean-generic:
 
 clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -381,8 +385,12 @@
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
 clean-am: clean-generic clean-libtool mostlyclean-am
 
+distclean: distclean-am
+	-rm -f Makefile
 distclean-am: clean-am distclean-generic
 
 dvi: dvi-am
@@ -552,12 +560,6 @@
 	-@(if [ -x $(PYTHON) ] ; then 					\
 	   echo '## Running the regression tests under Valgrind' ;	\
 	   $(MAKE) CHECKER='valgrind -q' MAKEFLAGS+=--silent pytests ; fi);
-
-clean:
-	rm -f $(PYSCRIPTS) test.log
-
-distclean:
-	rm -rf $(PYSCRIPTS) test.log # TESTDIRS
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT: