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

[Mike Hommey]

Author: glandium-guest
Date: 2004-07-31 14:55:48 -0600 (Sat, 31 Jul 2004)
New Revision: 211

Modified:
   packages/libxml2/trunk/debian/changelog
   packages/libxml2/trunk/debian/rules
Log:
Note to self: never assume you're done with something, especially when you had to leave 5 minutes after doing it.
NOW, the workarounds work for svn-buildpackage AND dpkg-buildpackage.
So, THIS ONE is 2.6.11-3.


Modified: packages/libxml2/trunk/debian/changelog
===================================================================
--- packages/libxml2/trunk/debian/changelog	2004-07-31 08:38:10 UTC (rev 210)
+++ packages/libxml2/trunk/debian/changelog	2004-07-31 20:55:48 UTC (rev 211)
@@ -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 17:34:22 +0900
+ -- Mike Hommey <mh@glandium.org>  Sun,  1 Aug 2004 05:02:14 +0900
 
 libxml2 (2.6.11-2) unstable; urgency=medium
 

Modified: packages/libxml2/trunk/debian/rules
===================================================================
--- packages/libxml2/trunk/debian/rules	2004-07-31 08:38:10 UTC (rev 210)
+++ packages/libxml2/trunk/debian/rules	2004-07-31 20:55:48 UTC (rev 211)
@@ -48,8 +48,8 @@
 	-rm -f example/Makefile
 	rm COPYING && cp Copyright COPYING
 
-	# Restore workaround backups of removed files
-	-for file in $(WORKAROUND_REMOVED_FILES); do \
+	# Restore workaround backups of removed and modified files
+	-for file in $(WORKAROUND_REMOVED_FILES) $(WORKAROUND_MODIFIED_FILES); do \
 	  test -r $${file}-tmp && \
 	  mv -f $${file}-tmp $${file}; \
 	done
@@ -77,12 +77,11 @@
 
 	mv debian/tmp/usr/share/aclocal/libxml.m4 debian/tmp/usr/share/aclocal/libxml2.m4
 
+	# Special workaround for svn-buildpackage:
 	# 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; \
+	  cat $${file}-tmp > $${file}; \
 	done
 
 	touch install-stamp