From 7244717f08de9f063d7684da80e69f7f803af433 Mon Sep 17 00:00:00 2001 From: Andrea Zagli Date: Sun, 29 May 2016 11:34:36 +0200 Subject: [PATCH] Debian pkg: adjustments for wheezy. --- debian/control | 2 +- debian/gbp.conf | 4 ++-- .../patches/0001-Added-DESTDIR-support.patch | 22 +++++++++---------- debian/patches/0002-Gladeui-old-version.patch | 21 ++++++++++++++++++ debian/patches/series | 1 + 5 files changed, 36 insertions(+), 14 deletions(-) create mode 100644 debian/patches/0002-Gladeui-old-version.patch diff --git a/debian/control b/debian/control index 29f78e0..3cc22f2 100644 --- a/debian/control +++ b/debian/control @@ -19,6 +19,6 @@ Description: GObject library to manage forms - development files Package: libgtkform Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, libxml2, libgdaex, libgladeui-2-6 +Depends: ${shlibs:Depends}, ${misc:Depends}, libxml2, libgdaex, libgladeui-2-0 Description: GObject library to manage forms GObject library to manage forms, based on plugins. diff --git a/debian/gbp.conf b/debian/gbp.conf index f0b4454..f10a522 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=gtk3 force-create=True export=WC -dist=sid +dist=wheezy pbuilder=True diff --git a/debian/patches/0001-Added-DESTDIR-support.patch b/debian/patches/0001-Added-DESTDIR-support.patch index e0ddc91..3a1a44c 100644 --- a/debian/patches/0001-Added-DESTDIR-support.patch +++ b/debian/patches/0001-Added-DESTDIR-support.patch @@ -14,11 +14,11 @@ index ea9eb53..587b649 100644 +++ b/libgtkform/Makefile.am @@ -48,7 +48,7 @@ libgtkform_include_HEADERS = form.h \ libgtkform_includedir = $(includedir)/libgtkform - + install-exec-hook: - mkdir -p "$(libdir)/$(PACKAGE)/modules" + mkdir -p "$(DESTDIR)$(libdir)/$(PACKAGE)/modules" - + uninstall-hook: - rm -rf "$(libdir)/$(PACKAGE)" + rm -rf "$(DESTDIR)$(libdir)/$(PACKAGE)" @@ -28,12 +28,12 @@ index 1e3b1b5..b80803e 100644 +++ b/libgtkformui/Makefile.am @@ -41,8 +41,8 @@ libgtkformui_include_HEADERS = gtkformdecoder.h \ libgtkformui_includedir = $(includedir)/libgtkformui - + install-exec-hook: - cd $(libdir)/$(PACKAGE)/modules && \ + cd $(DESTDIR)$(libdir)/$(PACKAGE)/modules && \ ln -s -f $(libmodulesdir)/libgtkformui$(libmodulesext) . - + uninstall-hook: - rm -f $(libdir)/$(PACKAGE)/modules/libgtkformui$(libmodulesext) + rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/modules/libgtkformui$(libmodulesext) @@ -43,23 +43,23 @@ index 5ecb3e7..a159f54 100644 +++ b/libgtkformui/glade/Makefile.am @@ -1,8 +1,8 @@ SUBDIRS = icons - + -glademodulesdir = $(GLADE_MODULE_DIR) +glademodulesdir = $(DESTDIR)$(GLADE_MODULE_DIR) - + -gladecatalogsdir = $(GLADE_CATALOG_DIR) -+gladecatalogsdir = $(DESTDIR)$(GLADE_CATALOG_DIR) - ++gladecatalogsdir = $(GLADE_CATALOG_DIR) + gladecatalogs_DATA = gtkformui.xml - + @@ -19,8 +19,9 @@ libmodulesdir = $(libdir) endif - + install-exec-hook: + mkdir -p $(glademodulesdir) && \ cd $(glademodulesdir) && \ - ln -s -f $(libmodulesdir)/libgtkformui$(libmodulesext) libgtkformui$(libmodulesextglade) + ln -s -f $(DESTDIR)$(libmodulesdir)/libgtkformui$(libmodulesext) libgtkformui$(libmodulesextglade) - + uninstall-hook: rm -f $(glademodulesdir)/libgtkformui$(libmodulesextglade) diff --git a/debian/patches/0002-Gladeui-old-version.patch b/debian/patches/0002-Gladeui-old-version.patch new file mode 100644 index 0000000..214342c --- /dev/null +++ b/debian/patches/0002-Gladeui-old-version.patch @@ -0,0 +1,21 @@ +From: Andrea Zagli +Date: Sun, 29 May 2016 10:46:30 +0200 +Subject: Gladeui old version. + +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index ffe3a97..5194f48 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -44,7 +44,7 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", + AM_GLIB_GNU_GETTEXT + + # Checks for libraries. +-PKG_CHECK_EXISTS(gladeui-2.0 >= 3.14.0, [GLADEUI_FOUND=yes], [GLADEUI_FOUND=no]) ++PKG_CHECK_EXISTS(gladeui-2.0 >= 3.12.0, [GLADEUI_FOUND=yes], [GLADEUI_FOUND=no]) + + if test "x$GLADEUI_FOUND" = "xyes"; then + GLADE_CATALOG_DIR=`$PKG_CONFIG --variable=catalogdir gladeui-2.0` diff --git a/debian/patches/series b/debian/patches/series index 6382560..6f17f36 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ 0001-Added-DESTDIR-support.patch +0002-Gladeui-old-version.patch -- 2.49.0