Debian pkg: added file gbp.conf and adjustments resulting from branch develop.

diff --git a/debian/changelog b/debian/changelog
index efd62c63430c7e74d5ea8c902a97c19d94ec14e3..1a4b0225ac34b75982183a7b4ffb5349d05bac37 100644 (file)
--- 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 <azagli@libero.it>  Sun, 22 May 2016 09:49:11 +0200

diff --git a/debian/control b/debian/control
index 33552fd3530f07007eacea0dd22e78d3a3e49fdd..57f54d6978e6e330e97d0808e11b1a2ae54fa193 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
 Source: libzakcgi
 Priority: optional
 Maintainer: Andrea Zagli <azagli@libero.it>
-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 (file)
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 ecc1988562287eda1ccb8a116961e33c8196a20a..3ddde584198421f0d2a3fef9d36cc110f3b8b76d 100644 (file)
--- 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 (file)
index 2e41ec1..0000000
--- a/debian/patches/0001-DESTDIR-support.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From: Andrea Zagli <azagli@libero.it>
-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 (file)
index c779459..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-DESTDIR-support.patch