Package: src:mxml
Version: 2.9-2
Tags: patch
User: [email protected]
Usertags: multiarch
- Multiarchify the library packages.
- Enable parallel builds.
- Let the tests fail on error.
- Multiarchify the library packages.
- Enable parallel builds.
- Let the tests fail on error.
diff -Nru mxml-2.9/debian/control mxml-2.9/debian/control
--- mxml-2.9/debian/control 2016-06-11 08:31:34.000000000 +0200
+++ mxml-2.9/debian/control 2016-08-24 13:04:47.000000000 +0200
@@ -10,6 +10,7 @@
Package: libmxml-dev
Section: libdevel
Architecture: any
+Multi-Arch: same
Depends: libmxml1 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
Description: small XML parsing library (development)
Mini-XML is a small XML parsing library that you can use to read XML and
@@ -34,6 +35,8 @@
Package: libmxml1
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: small XML parsing library (runtime)
Mini-XML is a small XML parsing library that you can use to read XML and
diff -Nru mxml-2.9/debian/libmxml1.dirs mxml-2.9/debian/libmxml1.dirs
--- mxml-2.9/debian/libmxml1.dirs 2016-06-11 08:31:34.000000000 +0200
+++ mxml-2.9/debian/libmxml1.dirs 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-usr/lib
diff -Nru mxml-2.9/debian/libmxml1.install mxml-2.9/debian/libmxml1.install
--- mxml-2.9/debian/libmxml1.install 2016-06-11 08:31:34.000000000 +0200
+++ mxml-2.9/debian/libmxml1.install 2016-08-24 13:04:47.000000000 +0200
@@ -1 +1 @@
-usr/lib/lib*.so.*
+usr/lib/*/lib*.so.*
diff -Nru mxml-2.9/debian/libmxml-dev.dirs mxml-2.9/debian/libmxml-dev.dirs
--- mxml-2.9/debian/libmxml-dev.dirs 2016-06-11 08:31:34.000000000 +0200
+++ mxml-2.9/debian/libmxml-dev.dirs 1970-01-01 01:00:00.000000000 +0100
@@ -1,3 +0,0 @@
-usr/bin
-usr/include
-usr/lib/pkgconfig
diff -Nru mxml-2.9/debian/libmxml-dev.install
mxml-2.9/debian/libmxml-dev.install
--- mxml-2.9/debian/libmxml-dev.install 2016-06-11 08:31:34.000000000 +0200
+++ mxml-2.9/debian/libmxml-dev.install 2016-08-24 13:04:47.000000000 +0200
@@ -1,7 +1,7 @@
usr/bin/mxmldoc
usr/include/mxml.h
-usr/lib/libmxml.a
-usr/lib/libmxml.so
-usr/lib/pkgconfig/mxml.pc
+usr/lib/*/libmxml.a
+usr/lib/*/libmxml.so
+usr/lib/*/pkgconfig/mxml.pc
usr/share/man/man1/mxmldoc.1
usr/share/man/man3/mxml.3
diff -Nru mxml-2.9/debian/patches/series mxml-2.9/debian/patches/series
--- mxml-2.9/debian/patches/series 2016-06-11 08:31:34.000000000 +0200
+++ mxml-2.9/debian/patches/series 2016-08-24 13:04:47.000000000 +0200
@@ -3,3 +3,4 @@
03_link_ldflags.diff
04_minor_version.diff
05_stack_recursion_fix.diff
+tests-fail-on-error.diff
diff -Nru mxml-2.9/debian/patches/tests-fail-on-error.diff
mxml-2.9/debian/patches/tests-fail-on-error.diff
--- mxml-2.9/debian/patches/tests-fail-on-error.diff 1970-01-01
01:00:00.000000000 +0100
+++ mxml-2.9/debian/patches/tests-fail-on-error.diff 2016-08-24
13:04:47.000000000 +0200
@@ -0,0 +1,26 @@
+Index: b/Makefile.in
+===================================================================
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -359,18 +359,21 @@ testmxml: libmxml.a testmxml.o
+ $(RM) temp2.xml temp2s.xml; \
+ else \
+ echo Stdio file test failed!; \
++ false; \
+ fi
+ @if cmp temp1.xml temp1s.xml; then \
+ echo String test passed!; \
+ $(RM) temp1.xml temp1s.xml; \
+ else \
+ echo String test failed!; \
++ false; \
+ fi
+ @if cmp test.xml test.xmlfd; then \
+ echo File descriptor test passed!; \
+ $(RM) test.xmlfd; \
+ else \
+ echo File descriptor test failed!; \
++ false; \
+ fi
+
+ testmxml-vg: $(LIBOBJS) testmxml.o
diff -Nru mxml-2.9/debian/rules mxml-2.9/debian/rules
--- mxml-2.9/debian/rules 2016-06-11 08:31:34.000000000 +0200
+++ mxml-2.9/debian/rules 2016-08-24 13:04:47.000000000 +0200
@@ -1,16 +1,17 @@
#!/usr/bin/make -f
%:
- dh $@
+ dh $@ --parallel
override_dh_auto_configure:
- ./configure \
+ dh_auto_configure -- \
--host=$(DEB_HOST_GNU_TYPE) \
--build=$(DEB_BUILD_GNU_TYPE) \
--prefix=/usr \
+ --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
--mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info
override_dh_auto_install:
$(MAKE) BUILDROOT=$(CURDIR)/debian/tmp install
- cp debian/mxml.man ./debian/tmp/usr/share/man/man3/mxml.3
\ No newline at end of file
+ cp debian/mxml.man ./debian/tmp/usr/share/man/man3/mxml.3
diff -Nru mxml-2.9/debian/watch mxml-2.9/debian/watch
--- mxml-2.9/debian/watch 2016-06-11 08:31:34.000000000 +0200
+++ mxml-2.9/debian/watch 2016-08-24 13:04:47.000000000 +0200
@@ -1,3 +1,2 @@
version=3
-http://www.msweet.org/projects.php?Z3 \
-(?:|.*/)mxml-(\d\S*)\.(?:tar\.xz|txz|tar\.bz2|tbz2|tar\.gz|tgz)
+http://ftp.easysw.com/pub/mxml/([\d\.]+)/mxml-(.*)\.tar.gz
