Debian pkg: patches from wheezy.
authorAndrea Zagli <azagli@libero.it>
Mon, 22 May 2017 17:11:38 +0000 (19:11 +0200)
committerAndrea Zagli <azagli@libero.it>
Fri, 26 May 2017 08:40:43 +0000 (10:40 +0200)
.gitignore
debian/changelog
debian/control
debian/libzakformcgi.install
debian/patches/0001-DESTDIR-support.patch
debian/patches/0002-Old-Glib-version.patch [new file with mode: 0644]
debian/patches/0003-Glib-old-object-macro.patch [new file with mode: 0644]
debian/patches/0004-Glib-old-version-dependency-in-pkg-config-file.patch [new file with mode: 0644]
debian/patches/series

index 817193a42a2c66de3938dc5a0b11132a55fb6b1f..6685db92bb98a630904c934e1e3b97266570357f 100644 (file)
@@ -51,3 +51,4 @@ intltool-*
 Rules-quot
 *.exe
 *.csv
+build/
\ No newline at end of file
index 5d86b64d9978171ff6d258d3ead1715db9d55129..c3b8b89b589f2b78269da60683eff3c0b8c94622 100644 (file)
@@ -1,8 +1,26 @@
-libzakformcgi (0.0.1-1~2.gbp8ba02f) UNRELEASED; urgency=medium
+libzakformcgi (0.0.1-1~6.gbp356cb6) UNRELEASED; urgency=medium
 
-  ** SNAPSHOT build @8ba02f58feca04d66fe2fa89339049c9044631ca **
+  ** SNAPSHOT build @356cb65f830e249ea0037ece3d328e542d0ecf0a **
 
   [ Andrea Zagli ]
   * Initial release
+  * Debian pkg: added debian files for wheezy.
 
- -- tux <tux@develop64.comune.scandicci.fi.it>  Mon, 22 May 2017 18:20:02 +0200
+  [ tux ]
+
+  [ Andrea Zagli ]
+  * Debian pkg: patches from wheezy.
+
+  [ tux ]
+
+  [ Andrea Zagli ]
+  * Debian pkg: patches from wheezy.
+
+  [ tux ]
+
+  [ Andrea Zagli ]
+  * Debian pkg: patches from wheezy.
+
+  [ tux ]
+
+ -- tux <tux@develop64.comune.scandicci.fi.it>  Fri, 26 May 2017 10:40:26 +0200
index 7cb159f3083dd2137998bfe21d5ea63f25ab7251..13089bfff64da7ee7c5de17abfa4f4e8c6a35f14 100644 (file)
@@ -1,7 +1,7 @@
 Source: libzakformcgi
 Priority: optional
 Maintainer: Andrea Zagli <azagli@libero.it>
-Build-Depends: debhelper (>= 9), intltool, pkg-config, gnome-common, gtk-doc-tools, libzakcgi-dev, libzakform-dev
+Build-Depends: debhelper (>= 9), intltool, pkg-config, gnome-common, gtk-doc-tools, libzakcgi-dev, libzakform-dev, libzakformini-dev
 Standards-Version: 3.9.8
 Section: libs
 Homepage: http://saetta.ns0.it
@@ -11,7 +11,7 @@ Homepage: http://saetta.ns0.it
 Package: libzakformcgi-dev
 Section: libdevel
 Architecture: any
-Depends: libzakformcgi (= ${binary:Version}), ${misc:Depends}, libzakcgi-dev, libzakform-dev
+Depends: libzakformcgi (= ${binary:Version}), ${misc:Depends}, libzakcgi-dev, libzakform-dev, libzakformini-dev
 Description: Bind to libzakform for libzakcgi - development files.
  Bind to libzakform for libzakcgi.
  .
@@ -19,6 +19,6 @@ Description: Bind to libzakform for libzakcgi - development files.
 
 Package: libzakformcgi
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libzakcgi, libzakform
+Depends: ${shlibs:Depends}, ${misc:Depends}, libzakcgi, libzakform, libzakformini
 Description: Bind to libzakform for libzakcgi.
  Bind to libzakform to libzakcgi.
index caf03e44767802ea1578eb54a92c5e1cc8584d2f..84e1c427c38a215752b7b5e93539ce95805a85bb 100644 (file)
@@ -1 +1,2 @@
 usr/lib/*/libzakformcgi*.so.*
+usr/lib/*/libzakform
index a077d6cd4c1b94bae360d65117147a54d5bc270a..28f51317183e7405b7f2b6be9aebc2f107be8759 100644 (file)
@@ -7,7 +7,7 @@ Subject: DESTDIR support.
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/src/Makefile.am b/src/Makefile.am
-index 7ed3a3d..c225457 100644
+index 6b733e0..536a2a3 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
 @@ -6,7 +6,7 @@ libmodulesext = .so
@@ -19,7 +19,7 @@ index 7ed3a3d..c225457 100644
  
  LIBS = $(ZAKFORMCGI_LIBS)
  
-@@ -48,8 +48,8 @@ libzakformcgi_include_HEADERS = \
+@@ -53,8 +53,8 @@ libzakformcgi_include_HEADERS = \
  libzakformcgi_includedir = $(includedir)/libzakformcgi
  
  install-exec-hook:
diff --git a/debian/patches/0002-Old-Glib-version.patch b/debian/patches/0002-Old-Glib-version.patch
new file mode 100644 (file)
index 0000000..0506462
--- /dev/null
@@ -0,0 +1,27 @@
+From: Andrea Zagli <azagli@libero.it>
+Date: Mon, 22 May 2017 18:35:59 +0200
+Subject: Old Glib version.
+
+---
+ configure.ac | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index b831410..2e5e889 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -41,10 +41,10 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",
+ AM_GLIB_GNU_GETTEXT
+ # Checks for libraries.
+-PKG_CHECK_MODULES(ZAKFORMCGI, [glib-2.0 >= 2.36
+-                               gobject-2.0 >= 2.36
+-                               gio-2.0 >= 2.36
+-                               gio-unix-2.0 >= 2.36
++PKG_CHECK_MODULES(ZAKFORMCGI, [glib-2.0 >= 2.32
++                               gobject-2.0 >= 2.32
++                               gio-2.0 >= 2.32
++                               gio-unix-2.0 >= 2.32
+                                libzakcgi
+                                libzakform >= 0.0.1
+                                libzakformini])
diff --git a/debian/patches/0003-Glib-old-object-macro.patch b/debian/patches/0003-Glib-old-object-macro.patch
new file mode 100644 (file)
index 0000000..2ec867f
--- /dev/null
@@ -0,0 +1,82 @@
+From: Andrea Zagli <azagli@libero.it>
+Date: Mon, 22 May 2017 18:52:02 +0200
+Subject: Glib old object macro.
+
+---
+ src/form.h        | 24 +++++++++++++++++++-----
+ src/formelement.h | 17 +++++++++++++++--
+ 2 files changed, 34 insertions(+), 7 deletions(-)
+
+diff --git a/src/form.h b/src/form.h
+index bb988c8..8225d5d 100644
+--- a/src/form.h
++++ b/src/form.h
+@@ -31,14 +31,28 @@
+ G_BEGIN_DECLS
+-#define ZAK_FORM_CGI_TYPE_FORM zak_form_cgi_form_get_type ()
+-G_DECLARE_DERIVABLE_TYPE (ZakFormCgiForm, zak_form_cgi_form, ZAK_FORM_CGI, FORM, ZakFormForm)
++#define ZAK_FORM_CGI_TYPE_FORM                 (zak_form_cgi_form_get_type ())
++#define ZAK_FORM_CGI_FORM(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), ZAK_FORM_CGI_TYPE_FORM, ZakFormCgiForm))
++#define ZAK_FORM_CGI_FORM_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), ZAK_FORM_CGI_TYPE_FORM, ZakFormCgiFormClass))
++#define ZAK_FORM_CGI_IS_FORM(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ZAK_FORM_CGI_TYPE_FORM))
++#define ZAK_FORM_CGI_IS_FORM_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), ZAK_FORM_CGI_TYPE_FORM))
++#define ZAK_FORM_CGI_FORM_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), ZAK_FORM_CGI_TYPE_FORM, ZakFormCgiFormClass))
++
++typedef struct _ZakFormCgiForm ZakFormCgiForm;
++typedef struct _ZakFormCgiFormClass ZakFormCgiFormClass;
++
++struct _ZakFormCgiForm
++      {
++              ZakFormForm parent_instance;
++      };
+ struct _ZakFormCgiFormClass
+-{
+-      ZakFormFormClass parent_class;
+-};
++      {
++              ZakFormFormClass parent_class;
++      };
++
++GType zak_form_cgi_form_get_type (void);
+ ZakFormCgiForm *zak_form_cgi_form_new (ZakCgiMain *zakcgimain, ...);
+diff --git a/src/formelement.h b/src/formelement.h
+index 7908571..7786189 100644
+--- a/src/formelement.h
++++ b/src/formelement.h
+@@ -28,8 +28,20 @@
+ G_BEGIN_DECLS
+-#define ZAK_FORM_CGI_TYPE_FORM_ELEMENT zak_form_cgi_form_element_get_type ()
+-G_DECLARE_DERIVABLE_TYPE (ZakFormCgiFormElement, zak_form_cgi_form_element, ZAK_FORM_CGI, FORM_ELEMENT, ZakFormElement)
++#define ZAK_FORM_CGI_TYPE_FORM_ELEMENT                 (zak_form_cgi_form_element_get_type ())
++#define ZAK_FORM_CGI_FORM_ELEMENT(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), ZAK_FORM_CGI_TYPE_FORM_ELEMENT, ZakFormCgiFormElement))
++#define ZAK_FORM_CGI_FORM_ELEMENT_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), ZAK_FORM_CGI_TYPE_FORM_ELEMENT, ZakFormCgiFormElementClass))
++#define ZAK_FORM_CGI_IS_FORM_ELEMENT(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ZAK_FORM_CGI_TYPE_FORM_ELEMENT))
++#define ZAK_FORM_CGI_IS_FORM_ELEMENT_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), ZAK_FORM_CGI_TYPE_FORM_ELEMENT))
++#define ZAK_FORM_CGI_FORM_ELEMENT_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), ZAK_FORM_CGI_TYPE_FORM_ELEMENT, ZakFormCgiFormElementClass))
++
++typedef struct _ZakFormCgiFormElement ZakFormCgiFormElement;
++typedef struct _ZakFormCgiFormElementClass ZakFormCgiFormElementClass;
++
++struct _ZakFormCgiFormElement
++      {
++              ZakFormElement parent_instance;
++      };
+ struct _ZakFormCgiFormElementClass
+       {
+@@ -45,6 +57,7 @@ struct _ZakFormCgiFormElementClass
+               gchar *(*render) (ZakFormCgiFormElement *element);
+       };
++GType zak_form_cgi_form_element_get_type (void);
+ gchar *zak_form_cgi_form_element_get_id (ZakFormCgiFormElement *element);
diff --git a/debian/patches/0004-Glib-old-version-dependency-in-pkg-config-file.patch b/debian/patches/0004-Glib-old-version-dependency-in-pkg-config-file.patch
new file mode 100644 (file)
index 0000000..f8d61b5
--- /dev/null
@@ -0,0 +1,20 @@
+From: Andrea Zagli <azagli@libero.it>
+Date: Thu, 25 May 2017 16:32:09 +0200
+Subject: Glib old version dependency in pkg-config file.
+
+---
+ libzakformcgi.pc.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libzakformcgi.pc.in b/libzakformcgi.pc.in
+index 066fd05..27c459c 100644
+--- a/libzakformcgi.pc.in
++++ b/libzakformcgi.pc.in
+@@ -6,6 +6,6 @@ includedir=@includedir@
+ Name: @PACKAGE_NAME@
+ Description: Plugin for libzakform to interface with libzakcgi.
+ Version: @PACKAGE_VERSION@
+-Requires: glib-2.0 >= 2.36 gobject-2.0 gio-2.0 gio-unix-2.0 libzakform libzakformini
++Requires: glib-2.0 >= 2.32 gobject-2.0 gio-2.0 gio-unix-2.0 libzakform libzakformini
+ Libs: -L${libdir} -lzakformcgi
+ Cflags: -I${includedir}
index c779459925dba51938c10d322a1283a24aba6f19..4b891e55561f49d3fe764623780ba876da41bfbb 100644 (file)
@@ -1 +1,4 @@
 0001-DESTDIR-support.patch
+0002-Old-Glib-version.patch
+0003-Glib-old-object-macro.patch
+0004-Glib-old-version-dependency-in-pkg-config-file.patch