[xml/sgml-commit] r1234 - in /packages/libxml2: ./ trunk/debian/changelog trunk/debian/libxml2.symbols trunk/debian/rules

[glandium at users.alioth.debian.org]

Author: glandium
Date: Sat Sep 13 07:35:23 2008
New Revision: 1234

URL: http://svn.debian.org/wsvn/debian-xml-sgml/?sc=1&rev=1234
Log:
 r1337 at jigen:  mh | 2008-04-09 11:14:46 +0200
 * 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.

Modified:
    packages/libxml2/   (props changed)
    packages/libxml2/trunk/debian/changelog
    packages/libxml2/trunk/debian/libxml2.symbols
    packages/libxml2/trunk/debian/rules

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

Modified: packages/libxml2/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/libxml2/trunk/debian/changelog?rev=1234&op=diff
==============================================================================
--- packages/libxml2/trunk/debian/changelog (original)
+++ packages/libxml2/trunk/debian/changelog Sat Sep 13 07:35:23 2008
@@ -3,7 +3,12 @@
   * 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 at debian.org>  Wed, 09 Apr 2008 10:45:37 +0200
 

Modified: packages/libxml2/trunk/debian/libxml2.symbols
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/libxml2/trunk/debian/libxml2.symbols?rev=1234&op=diff
==============================================================================
--- packages/libxml2/trunk/debian/libxml2.symbols (original)
+++ packages/libxml2/trunk/debian/libxml2.symbols Sat Sep 13 07:35:23 2008
@@ -1053,6 +1053,7 @@
  xmlSchematronNewParserCtxt at Base 2.6.27
  xmlSchematronNewValidCtxt at Base 2.6.27
  xmlSchematronParse at Base 2.6.27
+ xmlSchematronSetValidStructuredErrors at Base 2.6.32
  xmlSchematronValidateDoc at Base 2.6.27
  xmlSearchNs at Base 2.6.27
  xmlSearchNsByHref at Base 2.6.27

Modified: packages/libxml2/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/libxml2/trunk/debian/rules?rev=1234&op=diff
==============================================================================
--- packages/libxml2/trunk/debian/rules (original)
+++ packages/libxml2/trunk/debian/rules Sat Sep 13 07:35:23 2008
@@ -20,9 +20,6 @@
 # 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)))
@@ -34,10 +31,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
@@ -62,11 +55,6 @@
 	-$(MAKE) distclean
 	-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
@@ -173,7 +161,7 @@
 		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