Debian pkg: update from upstream.

diff --git a/debian/changelog b/debian/changelog
index cf020c2d3c4c5c7d543a60f381f8235ace0309c3..28e90fc9a611db2fa1a8f2bf25862b4ef38b2bc1 100644 (file)
--- 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 <azagli@libero.it>  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 <tux@develop64.comune.scandicci.fi.it>  Wed, 01 Mar 2017 15:25:52 +0100

diff --git a/debian/gbp.conf b/debian/gbp.conf
index f36585ba1e995ac892be4a001ce17bb7c4c3d0bf..05c3cab43c1421ca005f743b5cf34d507a720292 100644 (file)
--- 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 (file)
index 0000000..1961674
--- /dev/null
+++ b/debian/patches/0001-m4-spec.patch
@@ -0,0 +1,21 @@
+From: Andrea Zagli <azagli@libero.it>
+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 (file)
index 0000000..0aae0e0
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-m4-spec.patch