Initial commit on migrating to 3.0 source format (not complete).

7 files changed, 76 insertions, 12 deletions

diff --git a/debian/control b/debian/control
index d9f88f4..94ad55a 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Section: libs
 Maintainer: Debian XML/SGML Group <debian-xml-sgml-pkgs@lists.alioth.debian.org>
 Uploaders: Aron Xu <aron@debian.org>, YunQiang Su <wzssyqa@gmail.com>
 Standards-Version: 3.9.3
-Build-Depends: debhelper (>= 7.0.50~), zlib1g-dev | libz-dev, python-all-dev (>= 2.6.6-3~), python-all-dbg, autotools-dev, libreadline-dev | libreadline5-dev, binutils (>= 2.14.90.0.7), dpkg-dev (>= 1.14.9), perl
+Build-Depends: debhelper (>= 9), zlib1g-dev | libz-dev, python-all-dev (>= 2.6.6-3~), python-all-dbg, autotools-dev, libreadline-dev | libreadline5-dev, binutils (>= 2.14.90.0.7), perl, dh-autoreconf
 Homepage: http://xmlsoft.org/
 Vcs-Git: git://git.debian.org/debian-xml-sgml/libxml2.git
 Vcs-Browser: http://git.debian.org/?p=debian-xml-sgml/libxml2.git
@@ -13,8 +13,10 @@ Package: libxml2
 Priority: standard
 Architecture: any
 Section: libs
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Recommends: xml-core
+Multi-Arch: same
 Description: GNOME XML library
  XML is a metalanguage to let you design your own markup language.
  A regular markup language defines a way to describe information in
@@ -30,6 +32,7 @@ Package: libxml2-utils
 Architecture: any
 Section: text
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Multi-Arch: foreign
 Description: XML utilities
  XML is a metalanguage to let you design your own markup language.
  A regular markup language defines a way to describe information in
@@ -62,6 +65,7 @@ Architecture: any
 Section: debug
 Priority: extra
 Depends: libxml2 (= ${binary:Version}), ${misc:Depends}
+Multi-Arch: same
 Description: Debugging symbols for the GNOME XML library
  XML is a metalanguage to let you design your own markup language.
  A regular markup language defines a way to describe information in
diff --git a/debian/libxml2-dev.install b/debian/libxml2-dev.install
index 44c9bb9..aa09d9e 100644
--- a/debian/libxml2-dev.install
+++ b/debian/libxml2-dev.install
@@ -1,7 +1,7 @@
 usr/bin/xml2-config
-usr/lib/libxml2.so
-usr/lib/libxml2.a
-usr/lib/xml2Conf.sh
+usr/lib/*/libxml2.so
+usr/lib/*/libxml2.a
+usr/lib/*/xml2Conf.sh
 usr/share/aclocal
-usr/lib/pkgconfig
+usr/lib/*/pkgconfig
 usr/include/libxml2
diff --git a/debian/libxml2.install b/debian/libxml2.install
index 59ed997..d1a994c 100644
--- a/debian/libxml2.install
+++ b/debian/libxml2.install
@@ -1 +1 @@
-usr/lib/libxml2.so.*
+usr/lib/*/libxml2.so.*
diff --git a/debian/patches/01_build-system.patch b/debian/patches/01_build-system.patch
new file mode 100644
index 0000000..16a9c9f
--- /dev/null
+++ b/debian/patches/01_build-system.patch
@@ -0,0 +1,55 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -8,10 +8,10 @@
+ 
+ INCLUDES = -I$(top_builddir)/include -I@srcdir@/include @THREAD_CFLAGS@ @Z_CFLAGS@ 
+ 
+-noinst_PROGRAMS=testSchemas testRelax testSAX testHTML testXPath testURI \
+-                testThreads testC14N testAutomata testRegexp \
+-                testReader testapi testModule runtest runsuite testchar \
+-		testdict runxmlconf testrecurse
++#noinst_PROGRAMS=testSchemas testRelax testSAX testHTML testXPath testURI \
++#                testThreads testC14N testAutomata testRegexp \
++#                testReader testapi testModule runtest runsuite testchar \
++#		testdict runxmlconf testrecurse
+ 
+ bin_PROGRAMS = xmllint xmlcatalog
+ 
+@@ -157,7 +157,7 @@
+ testModule_DEPENDENCIES = $(DEPS)
+ testModule_LDADD= $(LDADDS)
+ 
+-noinst_LTLIBRARIES = testdso.la
++#noinst_LTLIBRARIES = testdso.la
+ testdso_la_SOURCES = testdso.c
+ testdso_la_LDFLAGS = -module -no-undefined -avoid-version -rpath $(libdir)
+ 
+--- a/configure.in
++++ b/configure.in
+@@ -70,6 +70,8 @@
+ AC_LIBTOOL_WIN32_DLL
+ AM_PROG_LIBTOOL
+ 
++AM_MAINTAINER_MODE
++
+ dnl
+ dnl if the system support linker version scripts for symbol versioning
+ dnl then add it
+@@ -84,7 +86,7 @@
+   esac
+ fi
+ AC_SUBST(VERSION_SCRIPT_FLAGS)
+-AM_CONDITIONAL([USE_VERSION_SCRIPT], [test -z "$VERSION_SCRIPT_FLAGS"])
++AM_CONDITIONAL([USE_VERSION_SCRIPT], [test -n "$VERSION_SCRIPT_FLAGS"])
+ 
+ dnl
+ dnl We process the AC_ARG_WITH first so that later we can modify
+@@ -1319,7 +1321,7 @@
+ 	*) M_LIBS="-lm"
+ 	;;
+ esac
+-XML_LIBS="-lxml2 $Z_LIBS $THREAD_LIBS $ICONV_LIBS $M_LIBS $LIBS"
++XML_LIBS="-lxml2"
+ XML_LIBTOOLLIBS="libxml2.la"
+ AC_SUBST(WITH_ICONV)
+ 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..56dd302
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01_build-system.patch
diff --git a/debian/rules b/debian/rules
index 59c4ebe..832457c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,4 +1,5 @@
 #!/usr/bin/make -f
+export DH_VERBOSE=1
 
 # The versions of python currently supported
 PYVERS=$(shell pyversions -s)
@@ -7,7 +8,7 @@ PYVER=$(shell pyversions -d)
 
 CFLAGS = `dpkg-buildflags --get CFLAGS`
 CFLAGS += -Wall
-LDFLAGS = `dpkg-buildflags --get LDFLAGS`
+LDFLAGS = `dpkg-buildflags --get LDFLAGS` -Wl,--as-needed
 CPPFLAGS = `dpkg-buildflags --get CPPFLAGS`
 
 ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -26,14 +27,14 @@ $(if $(shell grep -q libxml2-udeb debian/control && echo yes),$(shell sed -i /li
 export DH_OPTIONS = -Nlibxml2-udeb
 endif
 
-CONFIGURE_FLAGS := --with-history CC="$(CC) -Wl,--as-needed" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" --cache-file="$(CURDIR)/build/config.cache"
+CONFIGURE_FLAGS := --with-history CC="$(CC)" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" --cache-file="$(CURDIR)/build/config.cache"
 
 override_dh_auto_configure: $(TARGETS:%=configure-%)
 
 configure-%:
 	dh_auto_configure --builddirectory=build/$* -- $(CONFIGURE_FLAGS)
 
-configure-main: CONFIGURE_FLAGS += --without-python
+configure-main: CONFIGURE_FLAGS += --without-python --libdir=/usr/lib/$(DEB_HOST_MULTIARCH)
 configure-python%: CONFIGURE_FLAGS += --with-python=/usr/bin/$*
 configure-udeb: CONFIGURE_FLAGS += --without-history --with-minimum --with-tree --with-output
 
@@ -46,7 +47,8 @@ build-%:
 
 build-python%: BUILD_DIR=build/main/$*
 build-python%: BUILD_FLAGS = libxml2mod_la_LIBADD='$$(mylibs)'
-build-python%-dbg: BUILD_FLAGS += PYTHON_INCLUDES=/usr/include/$(*:-dbg=_d) LDFLAGS="-L$(CURDIR)/debian/tmp/usr/lib" CFLAGS="-Wall -g -O0"
+build-python%-dbg: BUILD_FLAGS += PYTHON_INCLUDES=/usr/include/$(*:-dbg=_d) \
+ LDFLAGS="-L$(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)" CFLAGS="-Wall -g -O0"
 
 override_dh_auto_clean:
 	rm -rf build debian/tmp-dbg
@@ -103,7 +105,8 @@ override_dh_install:
 	dh_install -Npython-libxml2-dbg -Nlibxml2-udeb
 	dh_install -ppython-libxml2-dbg --sourcedir=debian/tmp-dbg
 	dh_install -plibxml2-udeb --sourcedir=debian/tmp-udeb
-	sed "/dependency_libs/ s/'.*'/''/" debian/tmp/usr/lib/libxml2.la > debian/libxml2-dev/usr/lib/libxml2.la
+	#sed "/dependency_libs/ s/'.*'/''/" debian/tmp/usr/lib/libxml2.la > debian/libxml2-dev/usr/lib/libxml2.la
+	find debian/ -name *.la -delete
 
 override_dh_strip:
 	dh_strip -a --dbg-package=libxml2-dbg -Npython-libxml2 -Npython-libxml2-dbg
@@ -119,4 +122,4 @@ override_dh_makeshlibs:
 	dh_makeshlibs -a $(if $(WITH_UDEB),--add-udeb=libxml2-udeb )-V 'libxml2 (>= 2.7.4)' -- -c4
 
 %:
-	dh --with python2 $@
+	dh $@ --with autoreconf --with python2
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)