* debian/rules:

  + Removed the workaround for removed and modified files during build. The
    former was for svn-buildpackage that I don't use anymore, and the latter
    for a file that isn't in the .orig.tar.gz anymore.
  + Bump shlibs to current version, since a new symbol was added.
* debian/libxml2.symbols: Reference the new symbol.

3 files changed, 8 insertions, 14 deletions

diff --git a/debian/changelog b/debian/changelog
index 91cfe5d..ec6fbc0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,12 @@ libxml2 (2.6.32.dfsg-1) UNRELEASED; urgency=low
   * New upstream release.
   * debian/control: Bumped Standards-Version to 3.7.3.0. No changes.
   * debian/rules:
-    - Make dpkg-shlibdeps fail when symbols are missing.
+    + Make dpkg-shlibdeps fail when symbols are missing.
+    + Removed the workaround for removed and modified files during build. The
+      former was for svn-buildpackage that I don't use anymore, and the latter
+      for a file that isn't in the .orig.tar.gz anymore.
+    + Bump shlibs to current version, since a new symbol was added.
+  * debian/libxml2.symbols: Reference the new symbol.
 
  -- Mike Hommey <glandium@debian.org>  Wed, 09 Apr 2008 10:45:37 +0200
 
diff --git a/debian/libxml2.symbols b/debian/libxml2.symbols
index 3dde3d1..1780d84 100644
--- a/debian/libxml2.symbols
+++ b/debian/libxml2.symbols
@@ -1053,6 +1053,7 @@ libxml2.so.2 libxml2 #MINVER#
  xmlSchematronNewParserCtxt@Base 2.6.27
  xmlSchematronNewValidCtxt@Base 2.6.27
  xmlSchematronParse@Base 2.6.27
+ xmlSchematronSetValidStructuredErrors@Base 2.6.32
  xmlSchematronValidateDoc@Base 2.6.27
  xmlSearchNs@Base 2.6.27
  xmlSearchNsByHref@Base 2.6.27
diff --git a/debian/rules b/debian/rules
index ed65fef..4143965 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,9 +20,6 @@ PYVERS=$(shell pyversions -s)
 # The current default version of python
 PYVER=$(shell pyversions -d)
 
-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
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -35,10 +32,6 @@ build: build-stamp
 build-stamp:
 	dh_testdir
 
-	# Workaround backups because of non-idempotent upstream:
-	$(foreach file, $(WORKAROUND_REMOVED_FILES) $(WORKAROUND_MODIFIED_FILES), \
-	  cp -f -a $(file) $(file)-tmp;)
-
 	# ./configure
 	LDFLAGS="-Wl,--as-needed" CFLAGS="$(CFLAGS)" ./configure $(confflags) --prefix=/usr --with-history
 	echo "all:" > example/Makefile
@@ -63,11 +56,6 @@ clean:
 	-rm -f example/Makefile
 	rm COPYING && cp Copyright COPYING
 
-	# Restore workaround backups of removed and modified files
-	-$(foreach file, $(WORKAROUND_REMOVED_FILES) $(WORKAROUND_MODIFIED_FILES), \
-	  test -r $(file)-tmp && \
-	  mv -f $(file)-tmp $(file);)
-
 	-test -r /usr/share/misc/config.sub && \
 	cp -f /usr/share/misc/config.sub config.sub
 	-test -r /usr/share/misc/config.guess && \
@@ -173,7 +161,7 @@ binary-arch: build install
 		fi;)
 	dh_compress -a -Xexamples/
 	dh_fixperms -a
-	dh_makeshlibs -a -V 'libxml2 (>= 2.6.31)' -- -c4
+	dh_makeshlibs -a -V 'libxml2 (>= 2.6.32)' -- -c4
 	dh_installdeb -a
 	dh_shlibdeps -a
 	dh_gencontrol -a