Package: src:libwpd Version: 0.10.1-1 Tags: patch User: [email protected] Usertags: multiarch
The attached patch updates the packaging, and makes the library packages M-A: same.
* Bump the standards version. * Enable parallel builds. * Honor nocheck in DEB_BUILD_OPTIONS. * debian/rules: Cleanup unused macros, don't run configure on install. * Multiarchify the library packages. diff -Nru libwpd-0.10.1/debian/control libwpd-0.10.1/debian/control --- libwpd-0.10.1/debian/control 2014-05-23 20:19:01.000000000 +0200 +++ libwpd-0.10.1/debian/control 2016-02-16 07:13:59.000000000 +0100 @@ -4,11 +4,12 @@ Maintainer: Rene Engelhard <[email protected]> Uploaders: Masayuki Hatta (mhatta) <[email protected]> Build-Depends: debhelper (>= 9), doxygen, libcppunit-dev, dh-autoreconf, zlib1g-dev, pkg-config, dpkg-dev (>= 1.16.1), librevenge-dev -Standards-Version: 3.7.2 +Standards-Version: 3.9.7 Package: libwpd-dev Section: libdevel Architecture: any +Multi-Arch: same Depends: libwpd-0.10-10 (= ${binary:Version}), ${misc:Depends} Description: Library for handling WordPerfect documents (development) libwpd is a library for reading and writing WordPerfect(TM) documents. @@ -21,6 +22,8 @@ Package: libwpd-0.10-10 Section: libs Architecture: any +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} Replaces: libwpd0, libwpd2, libwpd3, libwpd4, libwpd5, libwpd6, libwpd8 Conflicts: libwpd0, libwpd2, libwpd3, libwpd4, libwpd5, libwpd6, libwpd8 diff -Nru libwpd-0.10.1/debian/libwpd-0.10-10.dirs libwpd-0.10.1/debian/libwpd-0.10-10.dirs --- libwpd-0.10.1/debian/libwpd-0.10-10.dirs 2010-11-16 18:21:30.000000000 +0100 +++ libwpd-0.10.1/debian/libwpd-0.10-10.dirs 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -usr/lib - diff -Nru libwpd-0.10.1/debian/libwpd-0.10-10.install libwpd-0.10.1/debian/libwpd-0.10-10.install --- libwpd-0.10.1/debian/libwpd-0.10-10.install 2014-05-23 20:19:47.000000000 +0200 +++ libwpd-0.10.1/debian/libwpd-0.10-10.install 2016-02-16 06:55:37.000000000 +0100 @@ -1 +1 @@ -usr/lib/libwpd-0.10.so.* +usr/lib/*/libwpd-0.10.so.* diff -Nru libwpd-0.10.1/debian/libwpd-dev.install libwpd-0.10.1/debian/libwpd-dev.install --- libwpd-0.10.1/debian/libwpd-dev.install 2010-11-16 18:47:24.000000000 +0100 +++ libwpd-0.10.1/debian/libwpd-dev.install 2016-02-16 06:55:37.000000000 +0100 @@ -1,4 +1,4 @@ usr/include/* -usr/lib/lib*.a -usr/lib/lib*.so -usr/lib/pkgconfig/* +usr/lib/*/lib*.a +usr/lib/*/lib*.so +usr/lib/*/pkgconfig/* diff -Nru libwpd-0.10.1/debian/rules libwpd-0.10.1/debian/rules --- libwpd-0.10.1/debian/rules 2014-05-24 18:06:54.000000000 +0200 +++ libwpd-0.10.1/debian/rules 2016-02-16 07:11:20.000000000 +0100 @@ -9,26 +9,34 @@ include /usr/share/dpkg/architecture.mk include /usr/share/dpkg/buildflags.mk -ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) - INSTALL_PROGRAM += -s +COMMA = , +ifneq (,$(filter parallel=%,$(subst $(COMMA), ,$(DEB_BUILD_OPTIONS)))) + NJOBS := -j $(subst parallel=,,$(filter parallel=%,$(subst $(COMMA), ,$(DEB_BUILD_OPTIONS)))) endif #DEBHELPER_OPTIONS = -N libwpd-tools -config.status: +configure-stamp: dh_testdir # Add here commands to configure the package. - dh_autoreconf && \ - ./configure CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info \ - --disable-werror --enable-static --disable-silent-rules + dh_autoreconf + ./configure \ + CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" \ + --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \ + --prefix=/usr --libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \ + --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info \ + --disable-werror --enable-static --disable-silent-rules + touch configure-stamp build: build-stamp -build-stamp: config.status +build-stamp: configure-stamp dh_testdir - $(MAKE) + $(MAKE) $(NJOBS) +ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS))) cd src/test; $(MAKE) check +endif touch build-stamp
