From 2fdf61f2c85a447b9d222b914ab44fc26ad95023 Mon Sep 17 00:00:00 2001 From: Andrea Zagli Date: Mon, 23 May 2016 18:09:42 +0200 Subject: [PATCH] Debian package: started adjustments from wheezy. --- debian/patches/0002-aclocal-old-version.patch | 21 +++++++++++ debian/patches/0003-Glib-old-version.patch | 36 +++++++++++++++++++ debian/patches/series | 2 ++ 3 files changed, 59 insertions(+) create mode 100644 debian/patches/0002-aclocal-old-version.patch create mode 100644 debian/patches/0003-Glib-old-version.patch diff --git a/debian/patches/0002-aclocal-old-version.patch b/debian/patches/0002-aclocal-old-version.patch new file mode 100644 index 0000000..bb3a293 --- /dev/null +++ b/debian/patches/0002-aclocal-old-version.patch @@ -0,0 +1,21 @@ +From: Andrea Zagli +Date: Mon, 23 May 2016 17:47:03 +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.patch b/debian/patches/0003-Glib-old-version.patch new file mode 100644 index 0000000..3c61a75 --- /dev/null +++ b/debian/patches/0003-Glib-old-version.patch @@ -0,0 +1,36 @@ +From: Andrea Zagli +Date: Mon, 23 May 2016 17:52:05 +0200 +Subject: Glib old version. + +--- + configure.ac | 4 ++-- + libzakform.pc.in | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index d86c09b..3e41632 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -42,8 +42,8 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", + AM_GLIB_GNU_GETTEXT + + # Checks for libraries. +-PKG_CHECK_MODULES(ZAKFORM, [glib-2.0 >= 2.36 +- gobject-2.0 >= 2.36 ++PKG_CHECK_MODULES(ZAKFORM, [glib-2.0 >= 2.32 ++ gobject-2.0 >= 2.32 + gmodule-2.0 >= 2.0.0 + libxml-2.0 >= 2.0.0 + libzakutils]) +diff --git a/libzakform.pc.in b/libzakform.pc.in +index c3ac34d..1d57757 100644 +--- a/libzakform.pc.in ++++ b/libzakform.pc.in +@@ -7,6 +7,6 @@ modulesdir=@libdir@/@PACKAGE@/modules + Name: @PACKAGE_NAME@ + Description: Class for form. + Version: @PACKAGE_VERSION@ +-Requires: glib-2.0 >= 2.36 gobject-2.0 gmodule-2.0 libxml-2.0 libzakutils ++Requires: glib-2.0 >= 2.32 gobject-2.0 gmodule-2.0 libxml-2.0 libzakutils + Libs: -L${libdir} -lzakform + Cflags: -I${includedir} diff --git a/debian/patches/series b/debian/patches/series index c779459..48a5dfc 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,3 @@ 0001-DESTDIR-support.patch +0002-aclocal-old-version.patch +0003-Glib-old-version.patch -- 2.49.0