From 8cd8f08759537a29515f98f3dfd3de576d6fcca6 Mon Sep 17 00:00:00 2001 From: Andrea Zagli Date: Sat, 27 May 2017 12:15:18 +0200 Subject: [PATCH] Debian pkg: updated from upstream. --- .gitignore | 1 + debian/changelog | 12 +++++++++--- debian/gbp.conf | 2 +- .../0001-Glib-old-version-gobject-macro.patch | 10 +++++----- 4 files changed, 16 insertions(+), 9 deletions(-) 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 b722381..8205576 100644 --- 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 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 Sat, 27 May 2017 12:04:41 +0200 diff --git a/debian/gbp.conf b/debian/gbp.conf index e58b4ba..f36585b 100644 --- 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 9ef6617..016c0bc 100644 --- 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); -- 2.49.0