Debian pkg: updates from upstream develop.

diff --git a/debian/changelog b/debian/changelog
index 59b3f095b3028235869e6cc7268c51f554338852..f0e46055bfb632ae9e74aefdf0203d1200e05f05 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
-libzakform (0.0.1-4~9.gbpfc0c6b) UNRELEASED; urgency=medium
+libzakform (0.0.1-4~10.gbp768291) UNRELEASED; urgency=medium
 
-  ** SNAPSHOT build @fc0c6b499f9e7418dad46f232f29732652836929 **
+  ** SNAPSHOT build @7682910f985d31d9e3ab082726a77dd101876619 **
 
   [ Andrea Zagli ]
   * Initial release
@@ -94,4 +94,13 @@ libzakform (0.0.1-4~9.gbpfc0c6b) UNRELEASED; urgency=medium
 
   [ tux ]
 
- -- tux <tux@develop64.example.tst>  Mon, 26 Jun 2017 15:20:26 +0200
+  [ Andrea Zagli ]
+  * Debian pkg: updates from upstream.
+  * Added function ZakForm::remove_element_by_id (refs #1104).
+  * Added function ZakForm::remove_element (refs #1104).
+  * Added function ZakForm::get_element_idx_by_id.
+  * Added function ZakForm::remove_element_by_idx (closes #1104).
+  * Setted version 0.1.0.
+  * Added property regex to ZakFormElementValidatorRegex.
+
+ -- tux <tux@develop64.example.tst>  Sat, 06 Jan 2018 12:05:54 +0100

diff --git a/debian/patches/0003-Glib-old-version.patch b/debian/patches/0003-Glib-old-version.patch
index d8c18ae6a69784275c33ad11c9e2dedd64633f8c..1c562cbdf471c7153c391d558b3ad2825a825b06 100644 (file)
--- a/debian/patches/0003-Glib-old-version.patch
+++ b/debian/patches/0003-Glib-old-version.patch
@@ -8,7 +8,7 @@ Subject: Glib old version.
  2 files changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index e9e8e77..c155161 100644
+index 73f7225..0e869f8 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -50,8 +50,8 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",

diff --git a/debian/patches/0004-Glib-old-version-gobject-macro.patch b/debian/patches/0004-Glib-old-version-gobject-macro.patch
index 78bbf88fb1aa2c3647929f0e7db567b513b5cf03..5c8e6cdaa37d862219fb3095ca1f860bc5e07d22 100644 (file)
--- a/debian/patches/0004-Glib-old-version-gobject-macro.patch
+++ b/debian/patches/0004-Glib-old-version-gobject-macro.patch
@@ -19,7 +19,7 @@ Subject: Glib old version - gobject macro.
  13 files changed, 214 insertions(+), 27 deletions(-)
 
 diff --git a/src/form.h b/src/form.h
-index dacd822..d28a332 100644
+index 9a6e90d..230d46d 100644
 --- a/src/form.h
 +++ b/src/form.h
 @@ -32,9 +32,20 @@

diff --git a/debian/patches/0005-Glib-old-version-private.patch b/debian/patches/0005-Glib-old-version-private.patch
index 0f4a8df0853bd4d96fff4ba30d813a3f3e2c14f5..4d14adb5d55075dd0321fee5e29a3bfad5a09938 100644 (file)
--- a/debian/patches/0005-Glib-old-version-private.patch
+++ b/debian/patches/0005-Glib-old-version-private.patch
@@ -23,7 +23,7 @@ Subject: Glib old version - private.
  17 files changed, 90 insertions(+), 123 deletions(-)
 
 diff --git a/src/form.c b/src/form.c
-index 7fd21a0..ff60b3c 100644
+index 7358f1c..435cb9f 100644
 --- a/src/form.c
 +++ b/src/form.c
 @@ -51,6 +51,8 @@ static void zak_form_form_get_property (GObject *object,
@@ -62,7 +62,7 @@ index 7fd21a0..ff60b3c 100644
  
        g_ptr_array_add (priv->ar_elements, g_object_ref (element));
        ret = TRUE;
-@@ -321,7 +325,7 @@ ZakFormElement
+@@ -390,7 +394,7 @@ ZakFormElement
  
        guint i;
  
@@ -71,7 +71,7 @@ index 7fd21a0..ff60b3c 100644
  
        ret = NULL;
        for (i = 0; i < priv->ar_elements->len; i++)
-@@ -396,7 +400,7 @@ zak_form_form_add_validator (ZakFormForm *zakform, ZakFormValidator *validator)
+@@ -498,7 +502,7 @@ zak_form_form_add_validator (ZakFormForm *zakform, ZakFormValidator *validator)
  
        ZakFormFormPrivate *priv;
  
@@ -80,7 +80,7 @@ index 7fd21a0..ff60b3c 100644
  
        g_ptr_array_add (priv->ar_validators, g_object_ref (validator));
        ret = TRUE;
-@@ -492,7 +496,7 @@ zak_form_form_clear (ZakFormForm *zakform)
+@@ -594,7 +598,7 @@ zak_form_form_clear (ZakFormForm *zakform)
  
        g_return_if_fail (ZAK_FORM_IS_FORM (zakform));
  
@@ -89,7 +89,7 @@ index 7fd21a0..ff60b3c 100644
  
        for (i = 0; i < priv->ar_elements->len; i++)
                {
-@@ -516,7 +520,7 @@ zak_form_form_set_as_original (ZakFormForm *zakform)
+@@ -618,7 +622,7 @@ zak_form_form_set_as_original (ZakFormForm *zakform)
  
        g_return_if_fail (ZAK_FORM_IS_FORM (zakform));
  
@@ -98,7 +98,7 @@ index 7fd21a0..ff60b3c 100644
  
        for (i = 0; i < priv->ar_elements->len; i++)
                {
-@@ -541,7 +545,7 @@ zak_form_form_set_editable (ZakFormForm *zakform, gboolean editable)
+@@ -643,7 +647,7 @@ zak_form_form_set_editable (ZakFormForm *zakform, gboolean editable)
  
        g_return_if_fail (ZAK_FORM_IS_FORM (zakform));
  
@@ -107,7 +107,7 @@ index 7fd21a0..ff60b3c 100644
  
        for (i = 0; i < priv->ar_elements->len; i++)
                {
-@@ -568,7 +572,7 @@ zak_form_form_is_valid (ZakFormForm *zakform)
+@@ -670,7 +674,7 @@ zak_form_form_is_valid (ZakFormForm *zakform)
  
        GPtrArray *ar_messages;
  
@@ -116,7 +116,7 @@ index 7fd21a0..ff60b3c 100644
  
        ret = TRUE;
  
-@@ -605,7 +609,7 @@ GPtrArray
+@@ -707,7 +711,7 @@ GPtrArray
  {
        ZakFormFormPrivate *priv;
  
@@ -125,7 +125,7 @@ index 7fd21a0..ff60b3c 100644
  
        return priv->ar_messages;
  }
-@@ -625,7 +629,7 @@ zak_form_form_is_changed (ZakFormForm *zakform)
+@@ -727,7 +731,7 @@ zak_form_form_is_changed (ZakFormForm *zakform)
  
        ZakFormFormPrivate *priv;
  
@@ -134,7 +134,7 @@ index 7fd21a0..ff60b3c 100644
  
        ret = FALSE;
  
-@@ -653,7 +657,7 @@ zak_form_form_load (ZakFormForm *zakform, ZakFormIProvider *provider)
+@@ -755,7 +759,7 @@ zak_form_form_load (ZakFormForm *zakform, ZakFormIProvider *provider)
  {
        ZakFormFormPrivate *priv;
  
@@ -143,7 +143,7 @@ index 7fd21a0..ff60b3c 100644
  
        return zak_form_iprovider_load (provider, priv->ar_elements);
  }
-@@ -669,7 +673,7 @@ zak_form_form_insert (ZakFormForm *zakform, ZakFormIProvider *provider)
+@@ -771,7 +775,7 @@ zak_form_form_insert (ZakFormForm *zakform, ZakFormIProvider *provider)
  {
        ZakFormFormPrivate *priv;
  
@@ -152,7 +152,7 @@ index 7fd21a0..ff60b3c 100644
  
        return zak_form_iprovider_insert (provider, priv->ar_elements);
  }
-@@ -685,7 +689,7 @@ zak_form_form_update (ZakFormForm *zakform, ZakFormIProvider *provider)
+@@ -787,7 +791,7 @@ zak_form_form_update (ZakFormForm *zakform, ZakFormIProvider *provider)
  {
        ZakFormFormPrivate *priv;
  
@@ -161,7 +161,7 @@ index 7fd21a0..ff60b3c 100644
  
        return zak_form_iprovider_update (provider, priv->ar_elements);
  }
-@@ -701,7 +705,7 @@ zak_form_form_delete (ZakFormForm *zakform, ZakFormIProvider *provider)
+@@ -803,7 +807,7 @@ zak_form_form_delete (ZakFormForm *zakform, ZakFormIProvider *provider)
  {
        ZakFormFormPrivate *priv;
  
@@ -170,7 +170,7 @@ index 7fd21a0..ff60b3c 100644
  
        return zak_form_iprovider_delete (provider, priv->ar_elements);
  }
-@@ -714,7 +718,7 @@ zak_form_form_set_property (GObject *object,
+@@ -816,7 +820,7 @@ zak_form_form_set_property (GObject *object,
                     GParamSpec *pspec)
  {
        ZakFormForm *zak_form_form = (ZakFormForm *)object;
@@ -179,7 +179,7 @@ index 7fd21a0..ff60b3c 100644
  
        switch (property_id)
                {
-@@ -731,7 +735,7 @@ zak_form_form_get_property (GObject *object,
+@@ -833,7 +837,7 @@ zak_form_form_get_property (GObject *object,
                     GParamSpec *pspec)
  {
        ZakFormForm *zak_form_form = (ZakFormForm *)object;
@@ -188,7 +188,7 @@ index 7fd21a0..ff60b3c 100644
  
        switch (property_id)
                {
-@@ -745,7 +749,7 @@ static void
+@@ -847,7 +851,7 @@ static void
  zak_form_form_dispose (GObject *gobject)
  {
        ZakFormForm *zak_form_form = (ZakFormForm *)gobject;
@@ -197,7 +197,7 @@ index 7fd21a0..ff60b3c 100644
  
  
  
-@@ -757,7 +761,7 @@ static void
+@@ -859,7 +863,7 @@ static void
  zak_form_form_finalize (GObject *gobject)
  {
        ZakFormForm *zak_form_form = (ZakFormForm *)gobject;
@@ -709,7 +709,7 @@ index 2fba186..0f7ed77 100644
  #define ZAK_FORM_IS_ELEMENT_VALIDATOR_NOTEMPTY(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ZAK_FORM_TYPE_ELEMENT_VALIDATOR_NOTEMPTY))
  #define ZAK_FORM_IS_ELEMENT_VALIDATOR_NOTEMPTY_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), ZAK_FORM_TYPE_ELEMENT_VALIDATOR_NOTEMPTY))
 diff --git a/src/formelementvalidatorregex.c b/src/formelementvalidatorregex.c
-index 8614ebf..934426e 100644
+index ddce8a5..a280fbe 100644
 --- a/src/formelementvalidatorregex.c
 +++ b/src/formelementvalidatorregex.c
 @@ -47,13 +47,6 @@ static void zak_form_element_validator_regex_finalize (GObject *gobject);

diff --git a/debian/patches/0006-Some-new-functions-not-replaced.patch b/debian/patches/0006-Some-new-functions-not-replaced.patch
index d113f7e87041efb2d31bfbdc2e14314ee5e6f403..939f34bb5a950f2992dca39b6b0a0130309dbe5c 100644 (file)
--- a/debian/patches/0006-Some-new-functions-not-replaced.patch
+++ b/debian/patches/0006-Some-new-functions-not-replaced.patch
@@ -10,7 +10,7 @@ Subject: Some new functions not replaced.
  4 files changed, 10 insertions(+), 8 deletions(-)
 
 diff --git a/src/form.c b/src/form.c
-index ff60b3c..ed889e8 100644
+index 435cb9f..ce8e138 100644
 --- a/src/form.c
 +++ b/src/form.c
 @@ -106,7 +106,7 @@ zak_form_form_init (ZakFormForm *zak_form_form)

diff --git a/debian/patches/0007-Glib-old-version-private.patch b/debian/patches/0007-Glib-old-version-private.patch
index fdad06db5b9888656edb40dfe6b3b506806d6250..ac8c733ef8e3630d38b73a10e7d3beb198fea3df 100644 (file)
--- a/debian/patches/0007-Glib-old-version-private.patch
+++ b/debian/patches/0007-Glib-old-version-private.patch
@@ -11,10 +11,10 @@ Subject: Glib old version private.
  5 files changed, 22 insertions(+), 20 deletions(-)
 
 diff --git a/src/form.c b/src/form.c
-index ed889e8..b5917b4 100644
+index ce8e138..35ad4c5 100644
 --- a/src/form.c
 +++ b/src/form.c
-@@ -351,7 +351,7 @@ ZakFormElement
+@@ -453,7 +453,7 @@ zak_form_form_get_element_idx_by_id (ZakFormForm *zakform, const gchar *id)
  GPtrArray
  *zak_form_form_get_elements (ZakFormForm *zakform)
  {
@@ -23,7 +23,7 @@ index ed889e8..b5917b4 100644
  
        return priv->ar_elements;
  }
-@@ -371,7 +371,7 @@ GPtrArray
+@@ -473,7 +473,7 @@ GPtrArray
  
        guint i;
  
@@ -32,7 +32,7 @@ index ed889e8..b5917b4 100644
  
        ar = g_ptr_array_new ();
        for (i = 0; i < priv->ar_elements->len; i++)
-@@ -447,7 +447,7 @@ ZakFormValidator
+@@ -549,7 +549,7 @@ ZakFormValidator
  GPtrArray
  *zak_form_form_get_validators (ZakFormForm *zakform)
  {
@@ -41,7 +41,7 @@ index ed889e8..b5917b4 100644
  
        return priv->ar_validators;
  }
-@@ -467,7 +467,7 @@ GPtrArray
+@@ -569,7 +569,7 @@ GPtrArray
  
        guint i;
  

diff --git a/debian/patches/0009-Glib-old-version-private.patch b/debian/patches/0009-Glib-old-version-private.patch
index 9a27b3af57e2f3999fae44b5d353a2983955de22..3e2d031671d9653b0a6a0dd7c29cbb9bf0ddcb8a 100644 (file)
--- a/debian/patches/0009-Glib-old-version-private.patch
+++ b/debian/patches/0009-Glib-old-version-private.patch
@@ -11,10 +11,10 @@ Subject: Glib old version private.
  5 files changed, 9 insertions(+), 9 deletions(-)
 
 diff --git a/src/form.c b/src/form.c
-index b5917b4..ea86cc8 100644
+index 35ad4c5..ac025bd 100644
 --- a/src/form.c
 +++ b/src/form.c
-@@ -422,7 +422,7 @@ ZakFormValidator
+@@ -524,7 +524,7 @@ ZakFormValidator
  
        guint i;
  

diff --git a/debian/patches/0010-Glib-old-version-private.patch b/debian/patches/0010-Glib-old-version-private.patch
index a19ed2b83b425c33b2bcb03f26d700f4ca119296..10249bc4d21edaaf669b7b0b5d03175dd5ca3071 100644 (file)
--- a/debian/patches/0010-Glib-old-version-private.patch
+++ b/debian/patches/0010-Glib-old-version-private.patch
@@ -8,7 +8,7 @@ Subject: Glib old version private.
  2 files changed, 24 insertions(+), 8 deletions(-)
 
 diff --git a/src/formelementextension.c b/src/formelementextension.c
-index 7a9f964..e82aea6 100644
+index 7a9f964..16e2e45 100644
 --- a/src/formelementextension.c
 +++ b/src/formelementextension.c
 @@ -50,12 +50,14 @@ static void zak_form_element_extension_get_property (GObject *object,

diff --git a/debian/patches/0011-Glib-old-version-private.patch b/debian/patches/0011-Glib-old-version-private.patch
new file mode 100644 (file)
index 0000000..0859a61
--- /dev/null
+++ b/debian/patches/0011-Glib-old-version-private.patch
@@ -0,0 +1,48 @@
+From: Andrea Zagli <azagli@libero.it>
+Date: Sat, 6 Jan 2018 12:12:59 +0100
+Subject: Glib old version private.
+
+---
+ src/form.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/form.c b/src/form.c
+index ac025bd..a89928b 100644
+--- a/src/form.c
++++ b/src/form.c
+@@ -321,7 +321,7 @@ zak_form_form_remove_element (ZakFormForm *zakform, ZakFormElement *element)
+ {
+       ZakFormFormPrivate *priv;
+ 
+-      priv = zak_form_form_get_instance_private (zakform);
++      priv = ZAK_FORM_FORM_GET_PRIVATE (zakform);
+ 
+       return g_ptr_array_remove (priv->ar_elements, (gpointer)element);
+ }
+@@ -342,7 +342,7 @@ zak_form_form_remove_element_by_id (ZakFormForm *zakform, const gchar *id)
+ 
+       guint i;
+ 
+-      priv = zak_form_form_get_instance_private (zakform);
++      priv = ZAK_FORM_FORM_GET_PRIVATE (zakform);
+ 
+       ret = FALSE;
+ 
+@@ -373,7 +373,7 @@ zak_form_form_remove_element_by_idx (ZakFormForm *zakform, guint idx)
+ {
+       ZakFormFormPrivate *priv;
+ 
+-      priv = zak_form_form_get_instance_private (zakform);
++      priv = ZAK_FORM_FORM_GET_PRIVATE (zakform);
+ 
+       return (g_ptr_array_remove_index (priv->ar_elements, idx) != NULL);
+ }
+@@ -427,7 +427,7 @@ zak_form_form_get_element_idx_by_id (ZakFormForm *zakform, const gchar *id)
+ 
+       guint i;
+ 
+-      priv = zak_form_form_get_instance_private (zakform);
++      priv = ZAK_FORM_FORM_GET_PRIVATE (zakform);
+ 
+       ret = -1;
+       for (i = 0; i < priv->ar_elements->len; i++)

diff --git a/debian/patches/series b/debian/patches/series
index 717ea2cdce62545d4b89a97b00f9e0fcb963d612..a3e589c386efe729bcb89cef76ebe65bb89306e2 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@
 0008-Glib-old-macro-for-ZakFormValidatorComposite.patch
 0009-Glib-old-version-private.patch
 0010-Glib-old-version-private.patch
+0011-Glib-old-version-private.patch