Package: src:expat
Tags: patch
The testsuites of the pythonX.Y packages currently fail with two errors, caused
by an issue in expat. See https://bugs.python.org/issue31170 for the details.
Upstream changed the build system a little bit, so some changes were needed.
There's also
- align_limit_to_full_utf8_characters@Base 2.2.0
+ _INTERNAL_trim_to_complete_utf8_characters@Base 2.2.5
so you might want to rename the library packages, although this seems to be an
internal symbol.
diff -urN expat-2.2.3/debian/autoreconf expat-2.2.5/debian/autoreconf
--- expat-2.2.3/debian/autoreconf 1970-01-01 00:00:00.000000000 +0000
+++ expat-2.2.5/debian/autoreconf 2017-12-06 17:03:09.405709164 +0000
@@ -0,0 +1,2 @@
+.
+src-w
diff -urN expat-2.2.3/debian/changelog expat-2.2.5/debian/changelog
--- expat-2.2.3/debian/changelog 2017-11-05 13:01:19.000000000 +0000
+++ expat-2.2.5/debian/changelog 2017-12-06 17:38:22.012732837 +0000
@@ -1,3 +1,11 @@
+expat (2.2.5-0ubuntu2) bionic; urgency=medium
+
+ * New upstream version.
+ * Bump standards version.
+ * Adjust build system for upstream change to autotools.
+
+ -- Matthias Klose <d...@ubuntu.com> Wed, 06 Dec 2017 17:40:35 +0100
+
expat (2.2.3-2) unstable; urgency=medium
* Do not install .la files (closes: #880110).
diff -urN expat-2.2.3/debian/control expat-2.2.5/debian/control
--- expat-2.2.3/debian/control 2017-11-05 13:01:19.000000000 +0000
+++ expat-2.2.5/debian/control 2017-12-06 17:16:11.414931259 +0000
@@ -2,7 +2,7 @@
Section: text
Priority: optional
Maintainer: Laszlo Boszormenyi (GCS) <g...@debian.org>
-Standards-Version: 4.1.1
+Standards-Version: 4.1.2
Build-Depends: debhelper (>= 10), docbook-to-man,
libbsd-dev [kfreebsd-amd64 kfreebsd-i386 hurd-i386],
gcc-multilib [i386 powerpc sparc s390]
diff -urN expat-2.2.3/debian/files expat-2.2.5/debian/files
--- expat-2.2.3/debian/files 1970-01-01 00:00:00.000000000 +0000
+++ expat-2.2.5/debian/files 2017-12-06 17:38:24.672745294 +0000
@@ -0,0 +1 @@
+expat_2.2.5-0ubuntu2_source.buildinfo text optional
diff -urN expat-2.2.3/debian/libexpat1.symbols
expat-2.2.5/debian/libexpat1.symbols
--- expat-2.2.3/debian/libexpat1.symbols 2016-06-21 15:36:38.000000000
+0000
+++ expat-2.2.5/debian/libexpat1.symbols 2017-12-06 17:13:07.089666738
+0000
@@ -80,7 +80,7 @@
XmlSizeOfUnknownEncoding@Base 2.0.1
XmlUtf16Encode@Base 2.0.1
XmlUtf8Encode@Base 2.0.1
- align_limit_to_full_utf8_characters@Base 2.2.0
+ _INTERNAL_trim_to_complete_utf8_characters@Base 2.2.5
libexpatw.so.1 libexpat1 #MINVER#
XML_DefaultCurrent@Base 2.0.1
XML_ErrorString@Base 2.0.1
@@ -163,4 +163,4 @@
XmlSizeOfUnknownEncoding@Base 2.0.1
XmlUtf16Encode@Base 2.0.1
XmlUtf8Encode@Base 2.0.1
- align_limit_to_full_utf8_characters@Base 2.2.0
+ _INTERNAL_trim_to_complete_utf8_characters@Base 2.2.5
diff -urN expat-2.2.3/debian/rules expat-2.2.5/debian/rules
--- expat-2.2.3/debian/rules 2017-07-16 14:23:03.000000000 +0000
+++ expat-2.2.5/debian/rules 2017-12-06 17:37:37.652527620 +0000
@@ -55,7 +55,12 @@
config-common-stamp:
dh_testdir
- dh_autoreconf
+ rm -rf src-w
+ mkdir -p src-w
+ tar cf - $(filter-out debian build buildw src-w, $(wildcard *)) | tar
-C src-w -x -f -
+ sed -i -e "s,libexpat\.la,libexpatw.la," -e
"s,libexpat_la,libexpatw_la," \
+ $$(find src-w -name Makefile.am)
+ dh_autoreconf -v
touch $@
build/config.status: config-common-stamp
@@ -66,7 +71,7 @@
buildw/config.status: config-common-stamp
dh_testdir
(mkdir -p $(@D); cd $(@D); CFLAGS="$(CFLAGS) -DXML_UNICODE"
CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" \
- ../configure $(CONFFLAGS) --prefix=/usr --mandir=\$${prefix}/share/man
--libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH))
+ ../src-w/configure $(CONFFLAGS) --without-xmlwf --prefix=/usr
--mandir=\$${prefix}/share/man --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH))
build64/config.status: config-common-stamp
dh_testdir
@@ -77,13 +82,13 @@
buildw64/config.status: config-common-stamp
dh_testdir
(mkdir -p $(@D); cd $(@D); CFLAGS="-m64 $(CFLAGS) -DXML_UNICODE"
CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" \
- ../configure $(CONFFLAGS) $(HOST64FLAG) --prefix=/usr
--mandir=\$${prefix}/share/man \
+ ../src-w/configure $(CONFFLAGS) $(HOST64FLAG) --without-xmlwf
--prefix=/usr --mandir=\$${prefix}/share/man \
--libdir=\$${prefix}/lib64)
clean:
dh_testdir
dh_testroot
- rm -rf build/ build64/ buildw/ buildw64/
+ rm -rf build/ build64/ buildw/ buildw64/ src-w/
rm -rf debian/tmp/
dh_autoreconf_clean
dh_clean config-common-stamp build-stamp debian/xmlwf.1
@@ -94,10 +99,10 @@
build-stamp: build/config.status buildw/config.status $(if $(BUILD64),
build64/config.status buildw64/config.status)
dh_testdir
$(MAKE) $(NJOBS) -C build/
- $(MAKE) $(NJOBS) -C buildw/ buildlib LIBRARY=libexpatw.la
+ $(MAKE) $(NJOBS) -C buildw/lib all
ifneq ($(BUILD64),)
- $(MAKE) $(NJOBS) -C build64/ buildlib
- $(MAKE) $(NJOBS) -C buildw64/ buildlib LIBRARY=libexpatw.la
+ $(MAKE) $(NJOBS) -C build64/lib all
+ $(MAKE) $(NJOBS) -C buildw64/lib all
endif
# docbook-to-man doc/xmlwf.sgml > debian/xmlwf.1
touch $@
@@ -108,10 +113,10 @@
dh_prep
dh_installdirs
$(MAKE) -C build/ install DESTDIR=$(CURDIR)/debian/tmp
- $(MAKE) -C buildw/ installlib LIBRARY=libexpatw.la
DESTDIR=$(CURDIR)/debian/tmp APIHEADER=
+ $(MAKE) -C buildw/lib install DESTDIR=$(CURDIR)/debian/tmp APIHEADER=
ifneq ($(BUILD64),)
- $(MAKE) -C build64/ installlib DESTDIR=$(CURDIR)/debian/tmp
- $(MAKE) -C buildw64/ installlib LIBRARY=libexpatw.la
DESTDIR=$(CURDIR)/debian/tmp APIHEADER=
+ $(MAKE) -C build64/lib install DESTDIR=$(CURDIR)/debian/tmp
+ $(MAKE) -C buildw64/lib install DESTDIR=$(CURDIR)/debian/tmp APIHEADER=
endif
# Move libexpat.so.* to /lib so that zfsutils can use it.
mkdir -p $(CURDIR)/debian/tmp/lib/$(DEB_HOST_MULTIARCH)
