From 3a99a7ea612426777475507000bddde3a2010b87 Mon Sep 17 00:00:00 2001 From: Andrea Zagli Date: Wed, 1 Mar 2017 15:33:19 +0100 Subject: [PATCH] Debian pkg: update from upstream. --- debian/changelog | 16 +++++++++++++--- debian/gbp.conf | 2 +- debian/patches/0001-m4-spec.patch | 21 +++++++++++++++++++++ debian/patches/series | 1 + 4 files changed, 36 insertions(+), 4 deletions(-) create mode 100644 debian/patches/0001-m4-spec.patch create mode 100644 debian/patches/series diff --git a/debian/changelog b/debian/changelog index cf020c2..28e90fc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,20 @@ -libreptool (0.5.0-1~2.gbpc31542) UNRELEASED; urgency=medium +libreptool (0.5.0-1~3.gbp6a90d1) UNRELEASED; urgency=medium - ** SNAPSHOT build @c315425058715515fac8a8e59004169c68707740 ** + ** SNAPSHOT build @6a90d18d116faaed3f24ef60a6b353db8f1d2683 ** [ Andrea Zagli ] * Initial release [ tux ] - -- Andrea Zagli Sun, 27 Nov 2016 09:59:40 +0100 + [ Andrea Zagli ] + * New autogen.sh. + * Removed from rep files generated during build. + * Use of g_strcmp0 instead of strcmp. + * Missing ref of rptmarshal.h in autotools. + * Enabled gtkdocize in autogen. + * Reordering genereated files in makefile. + + [ tux ] + + -- tux Wed, 01 Mar 2017 15:25:52 +0100 diff --git a/debian/gbp.conf b/debian/gbp.conf index f36585b..05c3cab 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -3,7 +3,7 @@ export-dir=./build/wheezy debian-branch=debian/wheezy ignore-new=True upstream-tree=BRANCH -upstream-branch=master +upstream-branch=develop force-create=True export=WC dist=wheezy diff --git a/debian/patches/0001-m4-spec.patch b/debian/patches/0001-m4-spec.patch new file mode 100644 index 0000000..1961674 --- /dev/null +++ b/debian/patches/0001-m4-spec.patch @@ -0,0 +1,21 @@ +From: Andrea Zagli +Date: Wed, 1 Mar 2017 15:29:59 +0100 +Subject: m4 spec. + +--- + autogen.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/autogen.sh b/autogen.sh +index c32ddd7..2529218 100755 +--- a/autogen.sh ++++ b/autogen.sh +@@ -22,7 +22,7 @@ if [ "$#" = 0 -a "x$NOCONFIGURE" = "x" ]; then + fi + + set -x +-aclocal --install || exit 1 ++aclocal --install -I m4 || exit 1 + glib-gettextize --force --copy || exit 1 + gtkdocize --copy || exit 1 + intltoolize --force --copy --automake || exit 1 diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..0aae0e0 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +0001-m4-spec.patch -- 2.49.0