From 0b7319a3dabd06c060a5c265d0b2311b2b778253 Mon Sep 17 00:00:00 2001 From: Andrea Zagli Date: Sun, 20 Nov 2016 17:20:46 +0100 Subject: [PATCH] Debian pkg: adjustments resulting from branch develop. --- debian/changelog | 7 +- debian/control | 6 +- debian/gbp.conf | 4 +- debian/libzakcgi.install | 1 - debian/patches/0001-DESTDIR-support.patch | 32 --------- .../0003-Glib-old-version-gobject-macro.patch | 65 ------------------- ...sion.patch => 0003-Glib-old-version.patch} | 20 +++--- ...ort-function-g_key_file_save_to_file.patch | 4 +- debian/patches/series | 4 +- 9 files changed, 24 insertions(+), 119 deletions(-) delete mode 100644 debian/patches/0001-DESTDIR-support.patch delete mode 100644 debian/patches/0003-Glib-old-version-gobject-macro.patch rename debian/patches/{0002-Glib-old-version.patch => 0003-Glib-old-version.patch} (63%) diff --git a/debian/changelog b/debian/changelog index efd62c6..dff23ee 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,10 @@ -libzakcgi (0.0.1-1) UNRELEASED; urgency=medium +libzakcgi (0.0.1-1~1.gbp355c78) UNRELEASED; urgency=medium + ** SNAPSHOT build @355c78403baf915bf08ac6764fc1a4edd6661304 ** + + [ Andrea Zagli ] * Initial release + [ tux ] + -- Andrea Zagli Sun, 22 May 2016 09:49:11 +0200 diff --git a/debian/control b/debian/control index 33552fd..5450ee1 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,7 @@ Source: libzakcgi Priority: optional Maintainer: Andrea Zagli -Build-Depends: debhelper (>=9), intltool, pkg-config, gtk-doc-tools, libzakformini-dev, gnome-common +Build-Depends: debhelper (>=9), intltool, pkg-config, gtk-doc-tools, gnome-common, libglib2.0-dev Standards-Version: 3.9.8 Section: libs Homepage: http://saetta.ns0.it @@ -11,7 +11,7 @@ Homepage: http://saetta.ns0.it Package: libzakcgi-dev Section: libdevel Architecture: any -Depends: libzakcgi (= ${binary:Version}), ${misc:Depends}, libzakformini-dev +Depends: libzakcgi (= ${binary:Version}), ${misc:Depends}, libglib2.0-dev Description: A GLib framework to create (Fast)CGI programs - dev files A library that is a mini-framework, based on gobject/glib, to create CGI (and FastCGI) programs. . @@ -19,6 +19,6 @@ Description: A GLib framework to create (Fast)CGI programs - dev files Package: libzakcgi Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, libzakformini +Depends: ${shlibs:Depends}, ${misc:Depends}, libglib2.0-0 Description: A GLib framework to create (Fast)CGI programs A library that is a mini-framework, based on gobject/glib, to create CGI (and FastCGI) programs. diff --git a/debian/gbp.conf b/debian/gbp.conf index b5f0c7a..c411531 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -1,9 +1,9 @@ [buildpackage] -export-dir=../build_area +export-dir=../build_area/wheezy debian-branch=debian/wheezy ignore-new=True upstream-tree=BRANCH -upstream-branch=form_libzakform +upstream-branch=develop force-create=True export=WC dist=wheezy diff --git a/debian/libzakcgi.install b/debian/libzakcgi.install index ecc1988..3ddde58 100644 --- a/debian/libzakcgi.install +++ b/debian/libzakcgi.install @@ -1,2 +1 @@ usr/lib/*/lib*.so.* -usr/lib/*/libzakform/modules/* diff --git a/debian/patches/0001-DESTDIR-support.patch b/debian/patches/0001-DESTDIR-support.patch deleted file mode 100644 index 2e41ec1..0000000 --- a/debian/patches/0001-DESTDIR-support.patch +++ /dev/null @@ -1,32 +0,0 @@ -From: Andrea Zagli -Date: Sun, 22 May 2016 11:09:20 +0200 -Subject: DESTDIR support. - ---- - src/Makefile.am | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/Makefile.am b/src/Makefile.am -index 51b4a6a..d309397 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -6,7 +6,7 @@ libmodulesext = .so - libmodulesdir = $(libdir) - endif - --libzakformmodulesdir = `pkg-config --variable=modulesdir libzakform` -+libzakformmodulesdir = $(DESTDIR)`pkg-config --variable=modulesdir libzakform` - - LIBS = $(ZAKCGI_LIBS) - -@@ -56,8 +56,8 @@ libzakcgi_include_HEADERS = \ - libzakcgi_includedir = $(includedir)/libzakcgi - - install-exec-hook: -- cd $(libzakformmodulesdir) && \ -- ln -s -f $(libmodulesdir)/libzakcgi$(libmodulesext) . -+ mkdir -p $(libzakformmodulesdir) -+ ln -s -f -t $(libzakformmodulesdir) $(libmodulesdir)/libzakcgi$(libmodulesext) - - uninstall-hook: - rm -f $(libzakformmodulesdir)/libzakcgi$(libmodulesext) diff --git a/debian/patches/0003-Glib-old-version-gobject-macro.patch b/debian/patches/0003-Glib-old-version-gobject-macro.patch deleted file mode 100644 index a0215ec..0000000 --- a/debian/patches/0003-Glib-old-version-gobject-macro.patch +++ /dev/null @@ -1,65 +0,0 @@ -From: Andrea Zagli -Date: Mon, 30 May 2016 09:09:16 +0200 -Subject: Glib old version - gobject macro. - ---- - src/form.h | 17 +++++++++++++++-- - src/formelement.h | 17 +++++++++++++++-- - 2 files changed, 30 insertions(+), 4 deletions(-) - -diff --git a/src/form.h b/src/form.h -index 01fb475..416903a 100644 ---- a/src/form.h -+++ b/src/form.h -@@ -31,8 +31,21 @@ - G_BEGIN_DECLS - - --#define ZAK_CGI_TYPE_FORM zak_cgi_form_get_type () --G_DECLARE_DERIVABLE_TYPE (ZakCgiForm, zak_cgi_form, ZAK_CGI, FORM, ZakFormForm) -+#define ZAK_CGI_TYPE_FORM (zak_cgi_form_get_type ()) -+#define ZAK_CGI_FORM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ZAK_CGI_TYPE_FORM, ZakCgiForm)) -+#define ZAK_CGI_FORM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ZAK_CGI_TYPE_FORM, ZakCgiFormClass)) -+#define ZAK_CGI_IS_FORM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ZAK_CGI_TYPE_FORM)) -+#define ZAK_CGI_IS_FORM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ZAK_CGI_TYPE_FORM)) -+#define ZAK_CGI_FORM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ZAK_CGI_TYPE_FORM, ZakCgiFormClass)) -+ -+ -+typedef struct _ZakCgiForm ZakCgiForm; -+typedef struct _ZakCgiFormClass ZakCgiFormClass; -+ -+struct _ZakCgiForm -+ { -+ ZakFormForm parent; -+ }; - - struct _ZakCgiFormClass - { -diff --git a/src/formelement.h b/src/formelement.h -index 50d5822..a6d9004 100644 ---- a/src/formelement.h -+++ b/src/formelement.h -@@ -30,8 +30,21 @@ - G_BEGIN_DECLS - - --#define ZAK_CGI_TYPE_FORM_ELEMENT zak_cgi_form_element_get_type () --G_DECLARE_DERIVABLE_TYPE (ZakCgiFormElement, zak_cgi_form_element, ZAK_CGI, FORM_ELEMENT, ZakFormElement) -+#define ZAK_CGI_TYPE_FORM_ELEMENT (zak_cgi_form_element_get_type ()) -+#define ZAK_CGI_FORM_ELEMENT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ZAK_CGI_TYPE_FORM_ELEMENT, ZakCgiFormElement)) -+#define ZAK_CGI_FORM_ELEMENT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ZAK_CGI_TYPE_FORM_ELEMENT, ZakCgiFormElementClass)) -+#define ZAK_CGI_IS_FORM_ELEMENT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ZAK_CGI_TYPE_FORM_ELEMENT)) -+#define ZAK_CGI_IS_FORM_ELEMENT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ZAK_CGI_TYPE_FORM_ELEMENT)) -+#define ZAK_CGI_FORM_ELEMENT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ZAK_CGI_TYPE_FORM_ELEMENT, ZakCgiFormElementClass)) -+ -+ -+typedef struct _ZakCgiFormElement ZakCgiFormElement; -+typedef struct _ZakCgiFormElementClass ZakCgiFormElementClass; -+ -+struct _ZakCgiFormElement -+ { -+ ZakFormElement parent; -+ }; - - struct _ZakCgiFormElementClass - { diff --git a/debian/patches/0002-Glib-old-version.patch b/debian/patches/0003-Glib-old-version.patch similarity index 63% rename from debian/patches/0002-Glib-old-version.patch rename to debian/patches/0003-Glib-old-version.patch index 5b6d8fe..0e6ae23 100644 --- a/debian/patches/0002-Glib-old-version.patch +++ b/debian/patches/0003-Glib-old-version.patch @@ -1,5 +1,5 @@ From: Andrea Zagli -Date: Wed, 25 May 2016 16:43:59 +0200 +Date: Sun, 20 Nov 2016 17:11:55 +0100 Subject: Glib old version. --- @@ -8,7 +8,7 @@ Subject: Glib old version. 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac -index a02bbbf..b4aaa88 100644 +index df5a82b..ab4e67d 100644 --- a/configure.ac +++ b/configure.ac @@ -30,10 +30,10 @@ AC_PROG_LIBTOOL @@ -18,23 +18,23 @@ index a02bbbf..b4aaa88 100644 -PKG_CHECK_MODULES(ZAKCGI, [glib-2.0 >= 2.36 - gobject-2.0 >= 2.36 - gio-2.0 >= 2.36 -- gio-unix-2.0 >= 2.36 +- gio-unix-2.0 >= 2.36]) +PKG_CHECK_MODULES(ZAKCGI, [glib-2.0 >= 2.32 + gobject-2.0 >= 2.32 + gio-2.0 >= 2.32 -+ gio-unix-2.0 >= 2.32 - libzakform >= 0.0.1 - libzakformini]) ++ gio-unix-2.0 >= 2.32]) + AC_SUBST(ZAKCGI_CFLAGS) + AC_SUBST(ZAKCGI_LIBS) diff --git a/libzakcgi.pc.in b/libzakcgi.pc.in -index 5b736f5..4b9bac0 100644 +index 8711cfb..8135ac7 100644 --- a/libzakcgi.pc.in +++ b/libzakcgi.pc.in @@ -6,6 +6,6 @@ includedir=@includedir@ Name: @PACKAGE_NAME@ - Description: Class for CGI. + Description: GObject class to implement CGI softwares. 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 +-Requires: glib-2.0 >= 2.36 gobject-2.0 gio-2.0 gio-unix-2.0 ++Requires: glib-2.0 >= 2.32 gobject-2.0 gio-2.0 gio-unix-2.0 Libs: -L${libdir} -lzakcgi Cflags: -I${includedir} diff --git a/debian/patches/0004-Backport-function-g_key_file_save_to_file.patch b/debian/patches/0004-Backport-function-g_key_file_save_to_file.patch index 0f7cecc..fdda155 100644 --- a/debian/patches/0004-Backport-function-g_key_file_save_to_file.patch +++ b/debian/patches/0004-Backport-function-g_key_file_save_to_file.patch @@ -7,10 +7,10 @@ Subject: Backport function g_key_file_save_to_file. 1 file changed, 22 insertions(+) diff --git a/src/session.c b/src/session.c -index aa8d0bc..81100a7 100644 +index 2c064f0..89403c3 100644 --- a/src/session.c +++ b/src/session.c -@@ -116,6 +116,28 @@ zak_cgi_session_init (ZakCgiSession *zak_cgi_session) +@@ -112,6 +112,28 @@ zak_cgi_session_init (ZakCgiSession *zak_cgi_session) priv->minutes = MINUTES_DEFAULT; } diff --git a/debian/patches/series b/debian/patches/series index 1112385..b054482 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,3 @@ -0001-DESTDIR-support.patch -0002-Glib-old-version.patch -0003-Glib-old-version-gobject-macro.patch 0004-Backport-function-g_key_file_save_to_file.patch 0005-No-tests.patch +0003-Glib-old-version.patch -- 2.49.0