From e9027886a508655b4b5de693c8b968076381c915 Mon Sep 17 00:00:00 2001 From: Mike Hommey Date: Thu, 25 Mar 2004 09:39:13 +0000 Subject: Added the Debian specific changes into trunk. --- debian/libxml2-dev.install | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 debian/libxml2-dev.install (limited to 'debian/libxml2-dev.install') diff --git a/debian/libxml2-dev.install b/debian/libxml2-dev.install new file mode 100644 index 0000000..311fe4f --- /dev/null +++ b/debian/libxml2-dev.install @@ -0,0 +1,8 @@ +usr/bin/xml2-config +usr/lib/libxml2.so +usr/lib/libxml2.la +usr/lib/libxml2.a +usr/lib/xml2Conf.sh +usr/share/aclocal +usr/lib/pkgconfig +usr/include/libxml2 -- cgit v1.2.3 From 696a915a0b4065d7604e865e06ec5eeaafa8e8ea Mon Sep 17 00:00:00 2001 From: Mike Hommey Date: Thu, 27 Jul 2006 19:41:28 +0200 Subject: * debian/rules, debian/libxml2-dev.install: Don't install libxml2.la directly and sed it to remove the dependency_libs. Note that will break linking statically libxml2 with libtool, we recommend to use pkg-config --static --libs libxml-2.0 instead of relying on libtool. Closes: #379807, #378511. * xml2-config.in: Fixed usage alignment of the new option introduced in previous upload. --- debian/changelog | 14 ++++++++++++++ debian/libxml2-dev.install | 1 - debian/rules | 1 + xml2-config.in | 2 +- 4 files changed, 16 insertions(+), 2 deletions(-) (limited to 'debian/libxml2-dev.install') diff --git a/debian/changelog b/debian/changelog index 1ffaebd..4c3442c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +libxml2 (2.6.26.dfsg-3) unstable; urgency=medium + + * debian/rules, debian/libxml2-dev.install: Don't install libxml2.la + directly and sed it to remove the dependency_libs. Note that will break + linking statically libxml2 with libtool, we recommend to use pkg-config + --static --libs libxml-2.0 instead of relying on libtool. + Closes: #379807, #378511. + * xml2-config.in: Fixed usage alignment of the new option introduced in + previous upload. + + -- Mike Hommey Thu, 27 Jul 2006 19:40:27 +0200 + libxml2 (2.6.26.dfsg-2) unstable; urgency=low * The slithering release. @@ -30,6 +42,8 @@ libxml2 (2.6.26.dfsg-2) unstable; urgency=low * debian/control: Made libxml2-doc suggest devhelper. * libxml-2.0.pc.in, libxml-2.0-uninstalled.pc.in: Split Libs in Libs and Libs.private. + * configure.in, configure: Adapted to fill the variables correctly for + libraries. * xml2-config.in, xml2-config.1: Added a --static option to add to --libs so that we can split what is needed when building statically and what is needed when building dynamically. Closes: #374017. diff --git a/debian/libxml2-dev.install b/debian/libxml2-dev.install index 311fe4f..44c9bb9 100644 --- a/debian/libxml2-dev.install +++ b/debian/libxml2-dev.install @@ -1,6 +1,5 @@ usr/bin/xml2-config usr/lib/libxml2.so -usr/lib/libxml2.la usr/lib/libxml2.a usr/lib/xml2Conf.sh usr/share/aclocal diff --git a/debian/rules b/debian/rules index 666856e..0ceecc8 100755 --- a/debian/rules +++ b/debian/rules @@ -152,6 +152,7 @@ binary-arch: build install dh_installman -a dh_installchangelogs -plibxml2 ChangeLog dh_install -a --sourcedir=debian/tmp + sed "/dependency_libs/ s/'.*'/''/" debian/tmp/usr/lib/libxml2.la > debian/libxml2-dev/usr/lib/libxml2.la dh_pysupport -a dh_python -a dh_link -a diff --git a/xml2-config.in b/xml2-config.in index e7fdec1..2078224 100644 --- a/xml2-config.in +++ b/xml2-config.in @@ -15,7 +15,7 @@ Known values for OPTION are: --prefix=DIR change libxml prefix [default $prefix] --exec-prefix=DIR change libxml exec prefix [default $exec_prefix] --libs print library linking information - add --static to print static library linking information + add --static to print static library linking information --cflags print pre-processor and compiler flags --modules module support enabled --help display this help and exit -- cgit v1.2.3 From 6205aa529c62396b509525bc4283e765ae0ebee8 Mon Sep 17 00:00:00 2001 From: Aron Xu Date: Sat, 14 Apr 2012 01:34:28 +0800 Subject: Initial commit on migrating to 3.0 source format (not complete). --- debian/control | 6 +++- debian/libxml2-dev.install | 8 +++--- debian/libxml2.install | 2 +- debian/patches/01_build-system.patch | 55 ++++++++++++++++++++++++++++++++++++ debian/patches/series | 1 + debian/rules | 15 ++++++---- debian/source/format | 1 + 7 files changed, 76 insertions(+), 12 deletions(-) create mode 100644 debian/patches/01_build-system.patch create mode 100644 debian/patches/series create mode 100644 debian/source/format (limited to 'debian/libxml2-dev.install') 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 Uploaders: Aron Xu , YunQiang Su 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) -- cgit v1.2.3