From fb5871df07d0ad5c9ca9f45b983f22a505d9c650 Mon Sep 17 00:00:00 2001 From: Andrea Zagli Date: Sat, 1 Jun 2019 11:37:51 +0200 Subject: [PATCH] Debian pkg: updates from upstream. --- .gitignore | 3 ++- debian/changelog | 16 +++++++++++++--- debian/control | 2 +- debian/gbp.conf | 4 ++-- debian/rules | 2 +- src/Makefile.am | 6 +++--- 6 files changed, 22 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 7f925fa..51a5ade 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 45caae6..425d0fc 100644 --- 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 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 Sat, 01 Jun 2019 11:13:58 +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 c9db2dd..e412b7b 100644 --- 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 c319441..4518753 100755 --- 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 be24327..e713e91 100644 --- 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) -- 2.49.0