[xml/sgml-commit] r209 - packages/libxml2/trunk/debian

[Mike Hommey]

Author: glandium-guest
Date: 2004-07-31 02:35:29 -0600 (Sat, 31 Jul 2004)
New Revision: 209

Modified:
   packages/libxml2/trunk/debian/changelog
   packages/libxml2/trunk/debian/rules
Log:
NOW, it must be okay

Modified: packages/libxml2/trunk/debian/changelog
===================================================================
--- packages/libxml2/trunk/debian/changelog	2004-07-31 08:13:19 UTC (rev 208)
+++ packages/libxml2/trunk/debian/changelog	2004-07-31 08:35:29 UTC (rev 209)
@@ -6,7 +6,7 @@
     system and restore them so that calling the clean target actually gives
     the same tree as before a build.
 
- -- Mike Hommey <mh@glandium.org>  Sat, 31 Jul 2004 16:44:06 +0900
+ -- Mike Hommey <mh@glandium.org>  Sat, 31 Jul 2004 17:34:22 +0900
 
 libxml2 (2.6.11-2) unstable; urgency=medium
 

Modified: packages/libxml2/trunk/debian/rules
===================================================================
--- packages/libxml2/trunk/debian/rules	2004-07-31 08:13:19 UTC (rev 208)
+++ packages/libxml2/trunk/debian/rules	2004-07-31 08:35:29 UTC (rev 209)
@@ -3,7 +3,8 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-WORKAROUND_BACKUP_FILES=python/libxml2-py.c include/libxml/xmlversion.h libxml2.spec python/setup.py doc/xmlcatalog.1
+WORKAROUND_REMOVED_FILES=include/libxml/xmlversion.h libxml2.spec python/setup.py doc/xmlcatalog.1
+WORKAROUND_MODIFIED_FILES=python/libxml2-py.c
 
 CFLAGS = -Wall -g
 
@@ -22,7 +23,7 @@
 	dh_testdir
 
 	# Workaround backups because of non-idempotent upstream:
-	for file in $(WORKAROUND_BACKUP_FILES); do \
+	for file in $(WORKAROUND_REMOVED_FILES) $(WORKAROUND_MODIFIED_FILES); do \
 	  cp -f -a $${file} $${file}-tmp; \
 	done
 
@@ -47,6 +48,11 @@
 	-rm -f example/Makefile
 	rm COPYING && cp Copyright COPYING
 
+	# Restore workaround backups of removed files
+	-for file in $(WORKAROUND_REMOVED_FILES); do \
+	  mv -f $${file}-tmp $${file}; \
+	done
+
 	-test -r /usr/share/misc/config.sub && \
 	cp -f /usr/share/misc/config.sub config.sub
 	-test -r /usr/share/misc/config.guess && \
@@ -70,8 +76,9 @@
 
 	mv debian/tmp/usr/share/aclocal/libxml.m4 debian/tmp/usr/share/aclocal/libxml2.m4
 
-	# Restore workaround backups
-	-for file in $(WORKAROUND_BACKUP_FILES); do \
+	# Restore workaround backups of modified files.
+	# Use cat instead of mv for svn-buildpackage.
+	-for file in $(WORKAROUND_MODIFIED_FILES); do \
 	  test -r $${file}-tmp && \
 	  cat $${file}-tmp > $${file} && \
 	  rm -f $${file}-tmp; \