diff -Nru mythes-1.2.4/debian/changelog mythes-1.2.4/debian/changelog --- mythes-1.2.4/debian/changelog 2015-09-11 00:33:44.000000000 +0000 +++ mythes-1.2.4/debian/changelog 2016-09-13 05:05:12.000000000 +0000 @@ -1,25 +1,23 @@ -mythes (2:1.2.4-1ubuntu3) wily; urgency=medium +mythes (2:1.2.4-3) unstable; urgency=medium - * Multiarchify the library packages. - * Enable parallel builds. + * [4fbeca0] touch NEWS if it doesn't exist before autoreconf - -- Matthias Klose Fri, 11 Sep 2015 02:30:20 +0200 + -- Rene Engelhard Tue, 13 Sep 2016 07:05:12 +0200 -mythes (2:1.2.4-1ubuntu2) vivid; urgency=medium +mythes (2:1.2.4-2) unstable; urgency=medium - * No change rebuild to get debug symbols on all architectures. + * [22cdf2c] fix Maintainer: + * [76ef204] use dh compat 9; dh_clean -k -> dh_prep + * [2806148] use dh_auto_configure instead of manual ./configure + (closes: #836549) + * [afa5a68] include /usr/share/dpkg/buildflags.mk + * [ec1ab11] use autoreconf instead of autotools-dev + * [260956b] fix changelog + * [3f68401] multiarchify - -- Brian Murray Wed, 14 Jan 2015 14:06:44 -0800 + -- Rene Engelhard Tue, 06 Sep 2016 08:14:04 +0200 -mythes (2:1.2.4-1ubuntu1) utopic; urgency=medium - - * Merge with Debian; remaining changes: - - Use dpkg-buildflags. - * Build using dh-autoreconf. - - -- Matthias Klose Tue, 05 Aug 2014 15:44:53 +0200 - -mythes (2:1.2.4-1) unstable; urgency=ilow +mythes (2:1.2.4-1) unstable; urgency=low * New upstream release @@ -27,25 +25,6 @@ -- Rene Engelhard Fri, 27 Jun 2014 10:10:40 +0000 -mythes (2:1.2.2-1ubuntu2) trusty; urgency=medium - - * Patch m4/libtool.m4 and configure to support ppc64el. - - -- Matthias Klose Sun, 22 Dec 2013 12:04:57 +0100 - -mythes (2:1.2.2-1ubuntu1) saucy; urgency=low - - * Use dh_autotools-dev to update config.{sub,guess} for AArch64. - * Use dpkg-buildflags. - - -- Matthias Klose Thu, 10 Oct 2013 14:39:42 +0200 - -mythes (2:1.2.2-1build1) quantal; urgency=low - - * Rebuild for new armel compiler default of ARMv5t. - - -- Colin Watson Mon, 08 Oct 2012 08:32:13 +0100 - mythes (2:1.2.2-1) unstable; urgency=low * New upstream release diff -Nru mythes-1.2.4/debian/compat mythes-1.2.4/debian/compat --- mythes-1.2.4/debian/compat 2010-04-25 21:22:22.000000000 +0000 +++ mythes-1.2.4/debian/compat 2016-09-06 05:59:15.000000000 +0000 @@ -1 +1 @@ -5 +9 diff -Nru mythes-1.2.4/debian/control mythes-1.2.4/debian/control --- mythes-1.2.4/debian/control 2015-09-11 00:32:05.000000000 +0000 +++ mythes-1.2.4/debian/control 2016-09-06 06:16:09.000000000 +0000 @@ -1,10 +1,9 @@ Source: mythes Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Debian OpenOffice Team +Maintainer: Debian LibreOffice Maintainers Uploaders: Rene Engelhard -Build-Depends: debhelper (>= 6.0.7~), pkg-config (>= 0.9.0), libhunspell-dev, dh-autoreconf -Standards-Version: 3.9.6 +Build-Depends: debhelper (>= 9), pkg-config (>= 0.9.0), libhunspell-dev, dh-autoreconf +Standards-Version: 3.6.1 Section: libs Package: libmythes-dev diff -Nru mythes-1.2.4/debian/patches/autotools-update.diff mythes-1.2.4/debian/patches/autotools-update.diff --- mythes-1.2.4/debian/patches/autotools-update.diff 2014-08-05 13:52:18.000000000 +0000 +++ mythes-1.2.4/debian/patches/autotools-update.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -Index: b/NEWS -=================================================================== ---- /dev/null -+++ b/NEWS -@@ -0,0 +1 @@ -+# empty file diff -Nru mythes-1.2.4/debian/patches/series mythes-1.2.4/debian/patches/series --- mythes-1.2.4/debian/patches/series 2014-08-05 13:51:14.000000000 +0000 +++ mythes-1.2.4/debian/patches/series 2016-09-06 05:58:17.000000000 +0000 @@ -1,2 +1 @@ th-gen-idx-pl-from-OOo.diff -autotools-update.diff diff -Nru mythes-1.2.4/debian/rules mythes-1.2.4/debian/rules --- mythes-1.2.4/debian/rules 2015-09-11 00:33:30.000000000 +0000 +++ mythes-1.2.4/debian/rules 2016-09-13 05:04:48.000000000 +0000 @@ -3,28 +3,14 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -CFLAGS = -Wall $(shell dpkg-buildflags --get CFLAGS) -CPPFLAGS = $(shell dpkg-buildflags --get CPPFLAGS) -LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS) - -COMMA = , -ifneq (,$(filter parallel=%,$(subst $(COMMA), ,$(DEB_BUILD_OPTIONS)))) - NJOBS := -j $(subst parallel=,,$(filter parallel=%,$(subst $(COMMA), ,$(DEB_BUILD_OPTIONS)))) -endif - -# shared library versions, option 1 -version=2.0.5 -major=2 -# option 2, assuming the library is created as src/.libs/libfoo.so.2.0.5 or so -#version=`ls src/.libs/lib*.so.* | \ -# awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'` -#major=`ls src/.libs/lib*.so.* | \ -# awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'` +include /usr/share/dpkg/buildflags.mk +configure: configure-stamp configure-stamp: dh_testdir + if [ ! -f NEWS ]; then touch NEWS; fi dh_autoreconf - ./configure --prefix=/usr --libdir=/usr/lib/$(DEB_HOST_MULTIARCH) --enable-static + dh_auto_configure -- --enable-static touch configure-stamp @@ -32,7 +18,7 @@ build-stamp: configure-stamp dh_testdir - $(MAKE) $(NJOBS) + $(MAKE) touch build-stamp @@ -49,7 +35,7 @@ install: build dh_testdir dh_testroot - dh_clean -k + dh_prep dh_installdirs $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp