From: Andrea Zagli Date: Sun, 20 Nov 2016 15:13:24 +0000 (+0100) Subject: Debian pkg: added file gbp.conf and adjustments resulting from branch develop. X-Git-Url: https://saetta.ns0.it/gitweb?a=commitdiff_plain;h=880a337c3789021b3af4a27f2114975ac5aabddd;p=libzakcgi Debian pkg: added file gbp.conf and adjustments resulting from branch develop. --- diff --git a/debian/changelog b/debian/changelog index efd62c6..1a4b022 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,10 @@ -libzakcgi (0.0.1-1) UNRELEASED; urgency=medium +libzakcgi (0.0.1-1~1.gbp33521d) UNRELEASED; urgency=medium + ** SNAPSHOT build @33521d0eb5d132d76a779f714d022165cf0ec88c ** + + [ Andrea Zagli ] * Initial release + [ tux ] + -- Andrea Zagli Sun, 22 May 2016 09:49:11 +0200 diff --git a/debian/control b/debian/control index 33552fd..57f54d6 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,7 @@ Source: libzakcgi Priority: optional Maintainer: Andrea Zagli -Build-Depends: debhelper (>=9), intltool, pkg-config, gtk-doc-tools, libzakformini-dev, gnome-common +Build-Depends: debhelper (>=9), intltool, pkg-config, gnome-common, gtk-doc-tools, libzakformini-dev, gnome-common Standards-Version: 3.9.8 Section: libs Homepage: http://saetta.ns0.it diff --git a/debian/gbp.conf b/debian/gbp.conf new file mode 100644 index 0000000..e913165 --- /dev/null +++ b/debian/gbp.conf @@ -0,0 +1,10 @@ +[buildpackage] +export-dir=../build_area/sid +debian-branch=debian/sid +ignore-new=True +upstream-tree=BRANCH +upstream-branch=develop +force-create=True +export=WC +dist=sid +pbuilder=True diff --git a/debian/libzakcgi.install b/debian/libzakcgi.install index ecc1988..3ddde58 100644 --- a/debian/libzakcgi.install +++ b/debian/libzakcgi.install @@ -1,2 +1 @@ usr/lib/*/lib*.so.* -usr/lib/*/libzakform/modules/* diff --git a/debian/patches/0001-DESTDIR-support.patch b/debian/patches/0001-DESTDIR-support.patch deleted file mode 100644 index 2e41ec1..0000000 --- a/debian/patches/0001-DESTDIR-support.patch +++ /dev/null @@ -1,32 +0,0 @@ -From: Andrea Zagli -Date: Sun, 22 May 2016 11:09:20 +0200 -Subject: DESTDIR support. - ---- - src/Makefile.am | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/Makefile.am b/src/Makefile.am -index 51b4a6a..d309397 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 = $(ZAKCGI_LIBS) - -@@ -56,8 +56,8 @@ libzakcgi_include_HEADERS = \ - libzakcgi_includedir = $(includedir)/libzakcgi - - install-exec-hook: -- cd $(libzakformmodulesdir) && \ -- ln -s -f $(libmodulesdir)/libzakcgi$(libmodulesext) . -+ mkdir -p $(libzakformmodulesdir) -+ ln -s -f -t $(libzakformmodulesdir) $(libmodulesdir)/libzakcgi$(libmodulesext) - - uninstall-hook: - rm -f $(libzakformmodulesdir)/libzakcgi$(libmodulesext) diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index c779459..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -0001-DESTDIR-support.patch