Debian pkg: updated from upstream.

diff --git a/.gitignore b/.gitignore
index 25fce6b4355cb4362f45143fdd594869da2ae0a6..3629bccd322e3affd09c1182bddd228c691a29de 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -73,3 +73,4 @@ docs/reference/*.hierarchy
 docs/reference/*.interfaces
 docs/reference/*.prerequisites
 docs/reference/*.signals
+build/

diff --git a/debian/changelog b/debian/changelog
index 1173e49531c660a4785141986868ec15d5de1ba9..cd559bba60ff9373bee1cddd2db15e8c3083f923 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
-libzakcgi (0.0.1-1~3.gbp85eefa) UNRELEASED; urgency=medium
+libzakcgi (0.1.1-1~1.gbpc296a5) UNRELEASED; urgency=medium
 
-  ** SNAPSHOT build @85eefa849c28fe8c6aa7689c51ad9abf4419b912 **
+  ** SNAPSHOT build @c296a5c2fc3df501ec3652340a1f2a2d50d2c2eb **
 
   [ Andrea Zagli ]
   * Initial release
@@ -16,4 +16,12 @@ libzakcgi (0.0.1-1~3.gbp85eefa) UNRELEASED; urgency=medium
 
   [ tux ]
 
- -- tux <tux@develop64.comune.scandicci.fi.it>  Mon, 22 May 2017 17:35:10 +0200
+  [ Andrea Zagli ]
+  * Debian pgk: updated from upstream.
+  * Enabled gir.
+  * Enabled gtk-doc.
+  * Specific includes for gir.
+  * Setted version 0.1.1.
+  * Bugfix test url.
+
+ -- andreaz <andreaz@ghost.zagli-it.it>  Mon, 25 Sep 2017 21:36:07 +0200

diff --git a/debian/control b/debian/control
index 57f54d6978e6e330e97d0808e11b1a2ae54fa193..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, gnome-common, gtk-doc-tools, libzakformini-dev, gnome-common
+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
@@ -11,7 +11,7 @@ Homepage: http://saetta.ns0.it
 Package: libzakcgi-dev
 Section: libdevel
 Architecture: any
-Depends: libzakcgi (= ${binary:Version}), ${misc:Depends}, libzakformini-dev
+Depends: libzakcgi (= ${binary:Version}), ${misc:Depends}, libglib2.0-dev
 Description: A GLib framework to create (Fast)CGI programs - dev files
  A library that is a mini-framework, based on gobject/glib, to create CGI (and FastCGI) programs.
  .
@@ -19,6 +19,6 @@ Description: A GLib framework to create (Fast)CGI programs - dev files
 
 Package: libzakcgi
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libzakformini
+Depends: ${shlibs:Depends}, ${misc:Depends}, libglib2.0-0
 Description: A GLib framework to create (Fast)CGI programs
  A library that is a mini-framework, based on gobject/glib, to create CGI (and FastCGI) programs.

diff --git a/debian/gbp.conf b/debian/gbp.conf
index e91316515acc100bdba2c48f951a3a5ee9d52ecd..e412b7b699cdc8bb6edef1a7247014d62e03a395 100644 (file)
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,5 +1,5 @@
 [buildpackage]
-export-dir=../build_area/sid
+export-dir=./build/sid
 debian-branch=debian/sid
 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..0d600e9feba89bcbef175a61bde774f85011ae17 100644 (file)
--- a/debian/libzakcgi.install
+++ b/debian/libzakcgi.install
@@ -1 +1,2 @@
 usr/lib/*/lib*.so.*
+usr/lib/*/girepository-1.0/*

diff --git a/debian/rules b/debian/rules
index 14552b7a4ed50f0f99a105c9ba2477151fe184a1..22d7c0d9a817f76e1a29985f7053accda391eff6 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -25,11 +25,13 @@ 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
 
+override_dh_auto_test:
+
 
 # dh_make generated override targets
 # This is example for Cmake (See https://bugs.debian.org/641051 )