From e5e698ec88909057a20151cb97d5706035e9ee5d Mon Sep 17 00:00:00 2001 From: Andrea Zagli Date: Sat, 24 Jun 2017 15:19:31 +0200 Subject: [PATCH] Debian pkg: updates from upstream. --- .gitignore | 1 + debian/changelog | 13 ++++++++++--- debian/control | 2 +- debian/gbp.conf | 2 +- debian/libzakcgi-dev.install | 2 ++ debian/libzakcgi.install | 1 + ...-Backport-function-g_key_file_save_to_file.patch | 2 +- debian/patches/0005-No-tests.patch | 8 +++++--- debian/rules | 2 +- 9 files changed, 23 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 25fce6b..e2ef73d 100644 --- a/.gitignore +++ b/.gitignore @@ -73,3 +73,4 @@ docs/reference/*.hierarchy docs/reference/*.interfaces docs/reference/*.prerequisites docs/reference/*.signals +build/ \ No newline at end of file diff --git a/debian/changelog b/debian/changelog index 235e523..5f0150d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ -libzakcgi (0.0.1-1~2.gbp412e6a) UNRELEASED; urgency=medium +libzakcgi (0.0.1-1~3.gbpe9bfb4) UNRELEASED; urgency=medium - ** SNAPSHOT build @412e6af48ee5998d1b7699ccbf005f6e612ec5ca ** + ** SNAPSHOT build @e9bfb4bea9d362b39ae7269a16dbf654445dd9e7 ** [ Andrea Zagli ] * Initial release @@ -16,4 +16,11 @@ libzakcgi (0.0.1-1~2.gbp412e6a) UNRELEASED; urgency=medium [ tux ] - -- tux Mon, 22 May 2017 17:38:13 +0200 + [ Andrea Zagli ] + * Debian pgk: updated from upstream. + * Enabled gir. + * Enabled gtk-doc. + + [ tux ] + + -- tux Sat, 24 Jun 2017 14:55:39 +0200 diff --git a/debian/control b/debian/control index 5450ee1..b39d870 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, gnome-common, libglib2.0-dev +Build-Depends: debhelper (>=9), intltool, pkg-config, gtk-doc-tools, gnome-common, gobject-introspection, libgirepository1.0-dev, libglib2.0-dev Standards-Version: 3.9.8 Section: libs Homepage: http://saetta.ns0.it diff --git a/debian/gbp.conf b/debian/gbp.conf index c411531..05c3cab 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -1,5 +1,5 @@ [buildpackage] -export-dir=../build_area/wheezy +export-dir=./build/wheezy debian-branch=debian/wheezy ignore-new=True upstream-tree=BRANCH diff --git a/debian/libzakcgi-dev.install b/debian/libzakcgi-dev.install index 7df81cd..2757b2c 100644 --- a/debian/libzakcgi-dev.install +++ b/debian/libzakcgi-dev.install @@ -1,3 +1,5 @@ usr/include/* usr/lib/*/lib*.so usr/lib/*/pkgconfig/* +usr/share/gtk-doc/* +usr/share/gir-1.0/* \ No newline at end of file diff --git a/debian/libzakcgi.install b/debian/libzakcgi.install index 3ddde58..4829ebb 100644 --- a/debian/libzakcgi.install +++ b/debian/libzakcgi.install @@ -1 +1,2 @@ usr/lib/*/lib*.so.* +usr/lib/*/girepository-1.0/* \ No newline at end of file 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 fdda155..d9ae3ed 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 @@ -37,5 +37,5 @@ index 2c064f0..89403c3 100644 +} + /** - * zak_cgi_session_new: + * zak_cgi_session_new_minutes: * @zakcgimain: diff --git a/debian/patches/0005-No-tests.patch b/debian/patches/0005-No-tests.patch index f2d52d1..accc0cb 100644 --- a/debian/patches/0005-No-tests.patch +++ b/debian/patches/0005-No-tests.patch @@ -10,9 +10,11 @@ diff --git a/Makefile.am b/Makefile.am index c87fc2b..72c9b28 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -1,4 +1,4 @@ --SUBDIRS = src tests -+SUBDIRS = src +@@ -1,6 +1,6 @@ + DISTCHECK_CONFIGURE_FLAGS = --enable-introspection --enable-gtk-doc + +-SUBDIRS = src tests docs ++SUBDIRS = src docs ACLOCAL_AMFLAGS = -I m4 diff --git a/debian/rules b/debian/rules index 14552b7..b7397a6 100755 --- a/debian/rules +++ b/debian/rules @@ -25,7 +25,7 @@ export DEB_CXXFLAGS_MAINT_STRIP = -Werror=format-security override_dh_auto_configure: NOCONFIGURE="X" ./autogen.sh - dh_auto_configure + dh_auto_configure -- --enable-introspection --enable-gtk-doc override_dh_auto_install: $(MAKE) DESTDIR=$$(pwd)/debian/tmp prefix=/usr install -- 2.49.0