From: Andrea Zagli <azagli@libero.it>
Date: Sat, 11 Mar 2017 10:15:11 +0000 (+0100)
Subject: Debian pkg: updated from upstream.
X-Git-Url: https://saetta.ns0.it/gitweb?a=commitdiff_plain;h=e93b7ddb9bf6aaf5cf0a0046b14ab4bb3b031a4d;p=zakform%2Fgdaex

Debian pkg: updated from upstream.
---

diff --git a/.gitignore b/.gitignore
index 8129d06..6f00395 100644
--- 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 c18aa34..bb0c341 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,15 @@
-libzakformgdaex (0.0.1-1~1.gbp001666) UNRELEASED; urgency=medium
+libzakformgdaex (0.0.1-1~2.gbp3cb6e3) UNRELEASED; urgency=medium
 
-  ** SNAPSHOT build @00166615b8f3d75eecbecf7cdb8cbd43caeefcf6 **
+  ** SNAPSHOT build @3cb6e3d0f335747eb8a2e29a7f42214509230030 **
 
   [ Andrea Zagli ]
   * Initial release
 
   [ tux ]
 
- -- Andrea Zagli <azagli@libero.it>  Sat, 10 Dec 2016 12:08:43 +0100
+  [ Andrea Zagli ]
+  * Added FormElement extension.
+
+  [ tux ]
+
+ -- tux <tux@develop64.comune.scandicci.fi.it>  Sat, 11 Mar 2017 11:12:06 +0100
diff --git a/debian/gbp.conf b/debian/gbp.conf
index c9db2dd..e412b7b 100644
--- 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