From 780b4d566fae95204647afeb4d0dae22e40e8930 Mon Sep 17 00:00:00 2001 From: Andrea Zagli Date: Mon, 23 May 2016 16:13:33 +0200 Subject: [PATCH] Debian package: adjustments for wheezy. --- debian/control | 2 +- debian/patches/0001-aclocal-wheezy.patch | 21 ++++++++++++++++ debian/patches/0002-glib-old-version.patch | 25 +++++++++++++++++++ .../0003-glib-old-version-in-pkgconfig.patch | 20 +++++++++++++++ debian/patches/series | 3 +++ 5 files changed, 70 insertions(+), 1 deletion(-) create mode 100644 debian/patches/0001-aclocal-wheezy.patch create mode 100644 debian/patches/0002-glib-old-version.patch create mode 100644 debian/patches/0003-glib-old-version-in-pkgconfig.patch create mode 100644 debian/patches/series diff --git a/debian/control b/debian/control index c1392fa..2a25b27 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,7 @@ Source: libzakutils Priority: optional Maintainer: Andrea Zagli -Build-Depends: debhelper (>=9), libglib2.0-dev, intltool, pkg-config +Build-Depends: debhelper (>=9), libglib2.0-dev, intltool, pkg-config, libtool Standards-Version: 3.9.8 Section: libs Homepage: http://saetta.ns0.it diff --git a/debian/patches/0001-aclocal-wheezy.patch b/debian/patches/0001-aclocal-wheezy.patch new file mode 100644 index 0000000..5d6ada2 --- /dev/null +++ b/debian/patches/0001-aclocal-wheezy.patch @@ -0,0 +1,21 @@ +From: Andrea Zagli +Date: Sun, 22 May 2016 19:53:21 +0200 +Subject: aclocal wheezy. + +--- + 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/0002-glib-old-version.patch b/debian/patches/0002-glib-old-version.patch new file mode 100644 index 0000000..ca4db6a --- /dev/null +++ b/debian/patches/0002-glib-old-version.patch @@ -0,0 +1,25 @@ +From: Andrea Zagli +Date: Sun, 22 May 2016 20:02:51 +0200 +Subject: glib old version. + +--- + configure.ac | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 54ac6d4..7c751ed 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -39,9 +39,9 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", + AM_GLIB_GNU_GETTEXT + + # Checks for libraries. +-PKG_CHECK_MODULES(ZAKUTILS, [glib-2.0 >= 2.36 +- gobject-2.0 >= 2.36 +- gio-2.0 >= 2.36]) ++PKG_CHECK_MODULES(ZAKUTILS, [glib-2.0 >= 2.32 ++ gobject-2.0 >= 2.32 ++ gio-2.0 >= 2.32]) + + AC_SUBST(ZAKUTILS_CFLAGS) + AC_SUBST(ZAKUTILS_LIBS) diff --git a/debian/patches/0003-glib-old-version-in-pkgconfig.patch b/debian/patches/0003-glib-old-version-in-pkgconfig.patch new file mode 100644 index 0000000..47acc7a --- /dev/null +++ b/debian/patches/0003-glib-old-version-in-pkgconfig.patch @@ -0,0 +1,20 @@ +From: Andrea Zagli +Date: Mon, 23 May 2016 16:09:17 +0200 +Subject: glib old version in pkgconfig. + +--- + libzakutils.pc.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libzakutils.pc.in b/libzakutils.pc.in +index 4d07037..4a53041 100644 +--- a/libzakutils.pc.in ++++ b/libzakutils.pc.in +@@ -7,6 +7,6 @@ modulesdir=@libdir@/@PACKAGE@/modules + Name: @PACKAGE_NAME@ + Description: Utility functions. + Version: @PACKAGE_VERSION@ +-Requires: glib-2.0 >= 2.36 gobject-2.0 >= 2.36 gio-2.0 >= 2.36 ++Requires: glib-2.0 >= 2.32 gobject-2.0 >= 2.32 gio-2.0 >= 2.32 + Libs: -L${libdir} -lzakutils + Cflags: -I${includedir} diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..fd5812e --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,3 @@ +0001-aclocal-wheezy.patch +0002-glib-old-version.patch +0003-glib-old-version-in-pkgconfig.patch -- 2.49.0