Debian pkg: updated 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 b7223810b637f47597582117447a88a6187d9497..8205576df3b115ecb2bc3e58e78fa47fa29b7e2f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,16 @@
-libzakformini (0.0.1-1~1.gbp56d512) UNRELEASED; urgency=medium
+libzakformini (0.0.1-1~2.gbpb8210a) UNRELEASED; urgency=medium
 
-  ** SNAPSHOT build @56d51240951a64d1d8045ad121e26e4eb5f2cb62 **
+  ** SNAPSHOT build @b8210ae3413b479d94f099f0d95b765e7470ed25 **
 
   [ Andrea Zagli ]
   * Initial release
 
   [ tux ]
 
- -- Andrea Zagli <azagli@libero.it>  Sun, 22 May 2016 09:31:14 +0200
+  [ Andrea Zagli ]
+  * Debian pkg: added file gbp.conf and version snapshotted.
+  * Bug in ZakFormElement::unformat: returns null when value is null.
+
+  [ tux ]
+
+ -- tux <tux@develop64.comune.scandicci.fi.it>  Sat, 27 May 2017 12:04:41 +0200

diff --git a/debian/gbp.conf b/debian/gbp.conf
index e58b4ba1a816758dcb7e7e724f2d52631b6944a3..f36585ba1e995ac892be4a001ce17bb7c4c3d0bf 100644 (file)
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,5 +1,5 @@
 [buildpackage]
-export-dir=../build_area/wheezy
+export-dir=./build/wheezy
 debian-branch=debian/wheezy
 ignore-new=True
 upstream-tree=BRANCH

diff --git a/debian/patches/0001-Glib-old-version-gobject-macro.patch b/debian/patches/0001-Glib-old-version-gobject-macro.patch
index 9ef6617c839ed127d1d21b1525af74902e3a8e38..016c0bc88a841b405adb53aeb27bcdf866ac9ce5 100644 (file)
--- a/debian/patches/0001-Glib-old-version-gobject-macro.patch
+++ b/debian/patches/0001-Glib-old-version-gobject-macro.patch
@@ -29,9 +29,9 @@ index 86d2daa..6842171 100644
 -};
 -
  G_DEFINE_TYPE_WITH_CODE (ZakFormIniProvider, zak_form_ini_provider, G_TYPE_OBJECT,
--                                               G_ADD_PRIVATE (ZakFormIniProvider)
-                                                G_IMPLEMENT_INTERFACE (ZAK_FORM_TYPE_IPROVIDER,
-                                                                                               zak_form_iprovider_interface_init))
+-                         G_ADD_PRIVATE (ZakFormIniProvider)
+                          G_IMPLEMENT_INTERFACE (ZAK_FORM_TYPE_IPROVIDER,
+                                                 zak_form_iprovider_interface_init))
  
 @@ -75,12 +71,14 @@ zak_form_ini_provider_class_init (ZakFormIniProviderClass *class)
        object_class->get_property = zak_form_ini_provider_get_property;
@@ -59,7 +59,7 @@ index 86d2daa..6842171 100644
        priv->kfile = g_key_file_ref (kfile);
        priv->filename = g_strdup (filename);
 @@ -175,7 +173,7 @@ zak_form_ini_provider_set_property (GObject *object,
-                    GParamSpec *pspec)
+                                     GParamSpec *pspec)
  {
        ZakFormIniProvider *zak_form_ini_provider = (ZakFormIniProvider *)object;
 -      ZakFormIniProviderPrivate *priv = zak_form_ini_provider_get_instance_private (zak_form_ini_provider);
@@ -68,7 +68,7 @@ index 86d2daa..6842171 100644
        switch (property_id)
                {
 @@ -192,7 +190,7 @@ zak_form_ini_provider_get_property (GObject *object,
-                    GParamSpec *pspec)
+                                     GParamSpec *pspec)
  {
        ZakFormIniProvider *zak_form_ini_provider = (ZakFormIniProvider *)object;
 -      ZakFormIniProviderPrivate *priv = zak_form_ini_provider_get_instance_private (zak_form_ini_provider);