Debian pkg: updates from upstream.

diff --git a/.gitignore b/.gitignore
index 7f925fa8f87a4ed5ae6bf5898e94a918366d9671..51a5adea5b385ae00bba2a6f58ac456a700323b3 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 45caae632d1cef6e766dd91fb9ce3d25c0faab10..425d0fcf5c8f04dfb70a9d85109d43cefa402d1f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,20 @@
-libzakformgtk (0.0.1-1~1.gbpe6d9f3) UNRELEASED; urgency=medium
+libzakformgtk (0.1.0-1~3.gbpc0c22a) UNRELEASED; urgency=medium
 
-  ** SNAPSHOT build @e6d9f356331f3bda15ba3823510db7f3eb5cf28e **
+  ** SNAPSHOT build @c0c22a19f635136213af91a62e3015c93880dd4a **
 
   [ 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.
+  * Setted version 0.1.0.
+
+ -- andreaz <andreaz@ghost.zagli-it.it>  Sat, 01 Jun 2019 11:13:58 +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 c9db2dd72ca0ef10cbace29c7e3593839d9a4e3b..e412b7b699cdc8bb6edef1a7247014d62e03a395 100644 (file)
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,9 +1,9 @@
 [buildpackage]
-export-dir=../build_area/sid
+export-dir=./build/sid
 debian-branch=debian/sid
 ignore-new=True
 upstream-tree=BRANCH
-upstream-branch=master
+upstream-branch=develop
 force-create=True
 export=WC
 dist=sid

diff --git a/debian/rules b/debian/rules
index c319441ad21de02cc1d4d61a2ed0cdfc845f852f..4518753982c01d4b83193f74a875016000b8e32c 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -23,7 +23,7 @@ export DEB_CFLAGS_MAINT_STRIP = -Werror=format-security
 
 override_dh_auto_configure:
        NOCONFIGURE="X" ./autogen.sh
-       dh_auto_configure
+       dh_auto_configure -- --disable-introspection
 
 override_dh_auto_install:
        $(MAKE) DESTDIR=$$(pwd)/debian/tmp prefix=/usr install

diff --git a/src/Makefile.am b/src/Makefile.am
index be24327167c54864d609e1938a4438677ebbe71a..e713e91bd67a8c01080ffb0e852403bd0053c32f 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -6,7 +6,7 @@ libmodulesext = .so
 libmodulesdir = $(libdir)
 endif
 
-libzakformmodulesdir = `pkg-config --variable=modulesdir libzakform`
+libzakformmodulesdir = $(DESTDIR)`pkg-config --variable=modulesdir libzakform`
 
 LIBS = $(ZAKFORMGTK_LIBS)
 
@@ -47,8 +47,8 @@ libzakformgtk_include_HEADERS = \
 libzakformgtk_includedir = $(includedir)/libzakformgtk
 
 install-exec-hook:
-       cd $(libzakformmodulesdir) && \
-       ln -s -f $(libmodulesdir)/libzakformgtk$(libmodulesext) .
+       mkdir -p $(libzakformmodulesdir)
+       ln -s -f -t $(libzakformmodulesdir) $(libmodulesdir)/libzakformgtk$(libmodulesext)
 
 uninstall-hook:
        rm -f $(libzakformmodulesdir)/libzakformgtk$(libmodulesext)