Debian pkg: updates from upstream (enabled gir).

diff --git a/.gitignore b/.gitignore
index 7f925fa8f87a4ed5ae6bf5898e94a918366d9671..4d8da1d47ab9f6c5f4427f9e5d8f6c2e0f83788d 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -51,4 +51,5 @@ Rules-quot
 *.exe
 *.csv
 *.gir
-*.typelib
\ No newline at end of file
+*.typelib
+build/
\ No newline at end of file

diff --git a/debian/changelog b/debian/changelog
index 4dd26e85074b613dd3ec1575e7c2598428b713f5..0ebb764340e3700f607a97871dd90eb4ef5568b6 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,21 @@
-libzakformgtk (0.0.1-1~1.gbp745740) UNRELEASED; urgency=medium
+libzakformgtk (0.0.1-1~3.gbp114e75) UNRELEASED; urgency=medium
 
-  ** SNAPSHOT build @745740d9765d79c15516bd8295ebcd16634bc589 **
+  ** SNAPSHOT build @114e75d718c2927a0a74865a73ebdb04acc7b83c **
 
   [ Andrea Zagli ]
   * Initial release
 
   [ tux ]
 
- -- Andrea Zagli <azagli@libero.it>  Sun, 29 May 2016 11:44:29 +0200
+  [ Andrea Zagli ]
+  * Debian pkg: updates from master.
+  * Migration to GValue for element value.
+  * Bugfix: wrong value test.
+  * Enabled gir.
+  * Typo from previous commit.
+  * Make public function ZakFormElement::xml_parsing.
+  * Use of ZakUtils::string_to_boolean in ZakFormGtkFormElementCheck::set_value.
+
+  [ tux ]
+
+ -- tux <tux@develop64.example.tst>  Sat, 24 Jun 2017 11:42:46 +0200

diff --git a/debian/control b/debian/control
index a695bb16fd2d69d2bb537299cf95472908638f25..5d34c4a9d39a7c5c5a9e1fe4da1c47f2a60e711d 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
 Source: libzakformgtk
 Priority: optional
 Maintainer: Andrea Zagli <azagli@libero.it>
-Build-Depends: debhelper (>=9), libzakutils-dev, intltool, pkg-config, gtk-doc-tools, libzakform-dev, libgtk-3-dev
+Build-Depends: debhelper (>=9), libzakutils-dev, intltool, pkg-config, gtk-doc-tools, gobject-introspection, libgirepository1.0-dev, libzakform-dev, libgtk-3-dev
 Standards-Version: 3.9.8
 Section: libs
 Homepage: https://saetta.ns0.it

diff --git a/debian/gbp.conf b/debian/gbp.conf
index e58b4ba1a816758dcb7e7e724f2d52631b6944a3..05c3cab43c1421ca005f743b5cf34d507a720292 100644 (file)
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,9 +1,9 @@
 [buildpackage]
-export-dir=../build_area/wheezy
+export-dir=./build/wheezy
 debian-branch=debian/wheezy
 ignore-new=True
 upstream-tree=BRANCH
-upstream-branch=master
+upstream-branch=develop
 force-create=True
 export=WC
 dist=wheezy

diff --git a/debian/libzakformgtk-dev.install b/debian/libzakformgtk-dev.install
index 7df81cd9f2a1282cd8d7222dd9b841258c579f78..9815ff72a80aee98126cb4f3f2545a8f6179e95d 100644 (file)
--- a/debian/libzakformgtk-dev.install
+++ b/debian/libzakformgtk-dev.install
@@ -1,3 +1,4 @@
 usr/include/*
 usr/lib/*/lib*.so
 usr/lib/*/pkgconfig/*
+usr/share/gir-1.0/*
\ No newline at end of file

diff --git a/debian/libzakformgtk.install b/debian/libzakformgtk.install
index 5b1546ba9522653e3bba6172c743dfc2351b22f7..00a743aa54f8020fa82c73431c4de5caf3e9cb51 100644 (file)
--- a/debian/libzakformgtk.install
+++ b/debian/libzakformgtk.install
@@ -1,2 +1,3 @@
 usr/lib/*/lib*.so.*
-usr/lib/*/libzakform
\ No newline at end of file
+usr/lib/*/libzakform
+usr/lib/*/girepository-1.0/*
\ No newline at end of file

diff --git a/debian/rules b/debian/rules
index c319441ad21de02cc1d4d61a2ed0cdfc845f852f..a689e0f882b0b50f4cd5c75d533f96e0b2267e54 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -15,6 +15,8 @@
 
 
 export DEB_CFLAGS_MAINT_STRIP = -Werror=format-security
+export DEB_CPPFLAGS_MAINT_STRIP = -Werror=format-security
+export DEB_CXXFLAGS_MAINT_STRIP = -Werror=format-security
 
 
 %:
@@ -23,7 +25,7 @@ export DEB_CFLAGS_MAINT_STRIP = -Werror=format-security
 
 override_dh_auto_configure:
        NOCONFIGURE="X" ./autogen.sh
-       dh_auto_configure
+       dh_auto_configure -- --enable-introspection
 
 override_dh_auto_install:
        $(MAKE) DESTDIR=$$(pwd)/debian/tmp prefix=/usr install