Debian pkg: updates from upstream.

diff --git a/.gitignore b/.gitignore
index 25fce6b4355cb4362f45143fdd594869da2ae0a6..e2ef73d914cf8e7cd00a901b311cf6252e219e8b 100644 (file)
--- 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 235e523b51b3c854fb595e7b37ca0061f2ebcfde..5f0150d6dca5b1724cce4149d91ef4d1cbfe306b 100644 (file)
--- 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 <tux@develop64.comune.scandicci.fi.it>  Mon, 22 May 2017 17:38:13 +0200
+  [ Andrea Zagli ]
+  * Debian pgk: updated from upstream.
+  * Enabled gir.
+  * Enabled gtk-doc.
+
+  [ tux ]
+
+ -- tux <tux@develop64.example.tst>  Sat, 24 Jun 2017 14:55:39 +0200

diff --git a/debian/control b/debian/control
index 5450ee114343dbf8e466b47f934b61b61c288e71..b39d870a26fb5812e1039b7642c75732b11bb165 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
 Source: libzakcgi
 Priority: optional
 Maintainer: Andrea Zagli <azagli@libero.it>
-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 c4115314560cbd11452fb175f9c756398f9994eb..05c3cab43c1421ca005f743b5cf34d507a720292 100644 (file)
--- 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 7df81cd9f2a1282cd8d7222dd9b841258c579f78..2757b2c3501fc834fbc632bfc0b36d1fe1a60d70 100644 (file)
--- 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 3ddde584198421f0d2a3fef9d36cc110f3b8b76d..4829ebb6317c6ac57a8331b4329d3c1d6eef0432 100644 (file)
--- 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 fdda155a2a5f1ccdb3841d76f378f1fca57de45b..d9ae3ed049144c03c986b27a56888562046d0a64 100644 (file)
--- 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 f2d52d1ba50044c09e9b8160196a677314e5ce74..accc0cb529c0887894dd274dd8555003d251a1be 100644 (file)
--- 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 14552b7a4ed50f0f99a105c9ba2477151fe184a1..b7397a630deb1ccae401c4258cbae47a8d6a174f 100755 (executable)
--- 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