From 297f41cb85a41cc15d25a4c441efcacbf864deee Mon Sep 17 00:00:00 2001 From: Andrea Zagli Date: Sat, 24 Jun 2017 11:53:30 +0200 Subject: [PATCH] Debian pkg: updates from upstream (enabled gir). --- .gitignore | 3 ++- debian/changelog | 17 ++++++++++++++--- debian/control | 2 +- debian/gbp.conf | 4 ++-- debian/libzakformgtk-dev.install | 1 + debian/libzakformgtk.install | 3 ++- debian/rules | 4 +++- 7 files changed, 25 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 7f925fa..4d8da1d 100644 --- 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 4dd26e8..0ebb764 100644 --- 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 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 Sat, 24 Jun 2017 11:42:46 +0200 diff --git a/debian/control b/debian/control index a695bb1..5d34c4a 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,7 @@ Source: libzakformgtk Priority: optional Maintainer: Andrea Zagli -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 e58b4ba..05c3cab 100644 --- 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 7df81cd..9815ff7 100644 --- 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 5b1546b..00a743a 100644 --- 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 c319441..a689e0f 100755 --- 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 -- 2.49.0