From ad37280acdfbb6126425a90687e92e33d060f423 Mon Sep 17 00:00:00 2001 From: Andrea Zagli Date: Sun, 29 May 2016 13:03:35 +0200 Subject: [PATCH] Debian pkg: adjustments for wheezy. --- debian/gbp.conf | 4 +- debian/patches/0002-Aclocal-old-version.patch | 21 ++++++ .../0003-Glib-old-version-macro-gobject.patch | 65 +++++++++++++++++++ debian/patches/series | 2 + 4 files changed, 90 insertions(+), 2 deletions(-) create mode 100644 debian/patches/0002-Aclocal-old-version.patch create mode 100644 debian/patches/0003-Glib-old-version-macro-gobject.patch diff --git a/debian/gbp.conf b/debian/gbp.conf index c2af90c..f4bff04 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -1,10 +1,10 @@ [buildpackage] export-dir=../build_area -debian-branch=debian/sid +debian-branch=debian/wheezy ignore-new=True upstream-tree=BRANCH upstream-branch=master force-create=True export=WC -dist=sid +dist=wheezy pbuilder=True diff --git a/debian/patches/0002-Aclocal-old-version.patch b/debian/patches/0002-Aclocal-old-version.patch new file mode 100644 index 0000000..7498de1 --- /dev/null +++ b/debian/patches/0002-Aclocal-old-version.patch @@ -0,0 +1,21 @@ +From: Andrea Zagli +Date: Sun, 29 May 2016 12:10:02 +0200 +Subject: Aclocal old version. + +--- + autogen.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/autogen.sh b/autogen.sh +index 83f5de2..9e5ebc4 100755 +--- a/autogen.sh ++++ b/autogen.sh +@@ -22,7 +22,7 @@ if [ "$#" = 0 -a "x$NOCONFIGURE" = "x" ]; then + fi + + set -x +-aclocal --install || exit 1 ++aclocal --install -I m4 || exit 1 + glib-gettextize --force --copy || exit 1 + #gtkdocize --copy || exit 1 + intltoolize --force --copy --automake || exit 1 diff --git a/debian/patches/0003-Glib-old-version-macro-gobject.patch b/debian/patches/0003-Glib-old-version-macro-gobject.patch new file mode 100644 index 0000000..5e04db0 --- /dev/null +++ b/debian/patches/0003-Glib-old-version-macro-gobject.patch @@ -0,0 +1,65 @@ +From: Andrea Zagli +Date: Sun, 29 May 2016 12:23:13 +0200 +Subject: Glib old version - macro gobject. + +--- + 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 381251b..427a8f7 100644 +--- a/src/form.h ++++ b/src/form.h +@@ -30,8 +30,21 @@ + G_BEGIN_DECLS + + +-#define ZAK_FORM_GTK_TYPE_FORM zak_form_gtk_form_get_type () +-G_DECLARE_DERIVABLE_TYPE (ZakFormGtkForm, zak_form_gtk_form, ZAK_FORM_GTK, FORM, ZakFormForm) ++#define ZAK_FORM_GTK_TYPE_FORM (zak_form_gtk_form_get_type ()) ++#define ZAK_FORM_GTK_FORM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ZAK_FORM_GTK_TYPE_FORM, ZakFormGtkForm)) ++#define ZAK_FORM_GTK_FORM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ZAK_FORM_GTK_TYPE_FORM, ZakFormGtkFormClass)) ++#define ZAK_FORM_GTK_IS_FORM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ZAK_FORM_GTK_TYPE_FORM)) ++#define ZAK_FORM_GTK_IS_FORM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ZAK_FORM_GTK_TYPE_FORM)) ++#define ZAK_FORM_GTK_FORM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ZAK_FORM_GTK_TYPE_FORM, ZakFormGtkFormClass)) ++ ++ ++typedef struct _ZakFormGtkForm ZakFormGtkForm; ++typedef struct _ZakFormGtkFormClass ZakFormGtkFormClass; ++ ++struct _ZakFormGtkForm ++ { ++ ZakFormForm parent; ++ }; + + struct _ZakFormGtkFormClass + { +diff --git a/src/formelement.h b/src/formelement.h +index 91a71cb..f72217b 100644 +--- a/src/formelement.h ++++ b/src/formelement.h +@@ -33,8 +33,21 @@ + G_BEGIN_DECLS + + +-#define ZAK_FORM_GTK_TYPE_FORM_ELEMENT zak_form_gtk_form_element_get_type () +-G_DECLARE_DERIVABLE_TYPE (ZakFormGtkFormElement, zak_form_gtk_form_element, ZAK_FORM_GTK, FORM_ELEMENT, ZakFormElement) ++#define ZAK_FORM_GTK_TYPE_FORM_ELEMENT (zak_form_gtk_form_element_get_type ()) ++#define ZAK_FORM_GTK_FORM_ELEMENT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ZAK_FORM_GTK_TYPE_FORM_ELEMENT, ZakFormGtkFormElement)) ++#define ZAK_FORM_GTK_FORM_ELEMENT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ZAK_FORM_GTK_TYPE_FORM_ELEMENT, ZakFormGtkFormElementClass)) ++#define ZAK_FORM_GTK_IS_FORM_ELEMENT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ZAK_FORM_GTK_TYPE_FORM_ELEMENT)) ++#define ZAK_FORM_GTK_IS_FORM_ELEMENT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ZAK_FORM_GTK_TYPE_FORM_ELEMENT)) ++#define ZAK_FORM_GTK_FORM_ELEMENT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ZAK_FORM_GTK_TYPE_FORM_ELEMENT, ZakFormGtkFormElementClass)) ++ ++ ++typedef struct _ZakFormGtkFormElement ZakFormGtkFormElement; ++typedef struct _ZakFormGtkFormElementClass ZakFormGtkFormElementClass; ++ ++struct _ZakFormGtkFormElement ++ { ++ ZakFormElement parent; ++ }; + + struct _ZakFormGtkFormElementClass + { diff --git a/debian/patches/series b/debian/patches/series index 6382560..628c69b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,3 @@ 0001-Added-DESTDIR-support.patch +0002-Aclocal-old-version.patch +0003-Glib-old-version-macro-gobject.patch -- 2.49.0