Debian pkg: updates from upstream.

diff --git a/.gitignore b/.gitignore
index 8129d065c7f857c37bb7f0e653878e9baf5e5522..6f0039519e176f797529c84f6082a95badd535c5 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -50,3 +50,4 @@ intltool-*
 Rules-quot
 *.exe
 *.csv
+build/
\ No newline at end of file

diff --git a/debian/changelog b/debian/changelog
index db5c0b63a89692640f24e7d4663c21dc4b085e4e..d685017bbeeed88e0eb206b6d024a624c967249f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
-libzakform (0.0.1-3~2.gbp1b8b64) UNRELEASED; urgency=medium
+libzakform (0.0.1-3~3.gbpfb26fd) UNRELEASED; urgency=medium
 
-  ** SNAPSHOT build @1b8b64d80377c2532dc7fe4baa1a9ef4cacd04b8 **
+  ** SNAPSHOT build @fb26fd705f097693c531d17d5f26ae8c53cd1e43 **
 
   [ Andrea Zagli ]
   * Initial release
@@ -11,4 +11,10 @@ libzakform (0.0.1-3~2.gbp1b8b64) UNRELEASED; urgency=medium
 
   [ tux ]
 
- -- Andrea Zagli <azagli@libero.it>  Sat, 21 May 2016 15:55:12 +0200
+  [ Andrea Zagli ]
+  * Added FormElement extensions.
+  * Missing file for translation.
+
+  [ tux ]
+
+ -- tux <tux@develop64.comune.scandicci.fi.it>  Sat, 11 Mar 2017 10:55:21 +0100

diff --git a/debian/gbp.conf b/debian/gbp.conf
index c9db2dd72ca0ef10cbace29c7e3593839d9a4e3b..e412b7b699cdc8bb6edef1a7247014d62e03a395 100644 (file)
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,9 +1,9 @@
 [buildpackage]
-export-dir=../build_area/sid
+export-dir=./build/sid
 debian-branch=debian/sid
 ignore-new=True
 upstream-tree=BRANCH
-upstream-branch=master
+upstream-branch=develop
 force-create=True
 export=WC
 dist=sid