[Pkg-cli-libs-commits] [gnome-keyring-sharp] 02/06: dh7 yay

[Jo Shields]

This is an automated email from the git hooks/post-receive script.

directhex pushed a commit to annotated tag debian/1.0.0%7Esvn.r87622-2
in repository gnome-keyring-sharp.

commit ef3ddd3f7e5502f2ddee7fd69df470bc065219a5
Author: Mirco Bauer <meebey at debian.org>
Date:   Thu May 8 21:44:17 2008 +0000

    dh7 yay
---
 debian/changelog                                   | 14 ++++++++++
 debian/compat                                      |  2 +-
 debian/control                                     | 10 +++++--
 debian/libgnome-keyring1.0-cil.install             |  4 +--
 debian/patches/00list                              |  1 +
 ...kgconfig-path.patch => 01pkgconfig-path.dpatch} |  7 +++++
 debian/rules                                       | 32 +++++++++++++---------
 7 files changed, 52 insertions(+), 18 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d531c8a..ff2932b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+gnome-keyring-sharp (1.0.0~svn.r87622-2~pre1) unstable; urgency=low
+
+  * debian/rules:
+    + Migrated from cdbs to debhelper v7 minimalistic style.
+  * debian/control:
+    + Replaced cdbs build-dependency with debhelper >= 7 and
+      cli-common-dev >= 0.5.7.
+  * debian/compat:
+    + Bumped to 7
+  * debian/patches/01pkgconfig-path.dpatch:
+    + Converted patch to dpatch.
+
+ -- Mirco Bauer <meebey at debian.org>  Thu, 08 May 2008 22:39:38 +0200
+
 gnome-keyring-sharp (1.0.0~svn.r87622-1) unstable; urgency=low
 
   * Initial release. (Closes: #442121)
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+7
diff --git a/debian/control b/debian/control
index aa3839e..c377465 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,14 @@ Source: gnome-keyring-sharp
 Section: gnome
 Priority: optional
 Maintainer: Debian CLI Libraries Team <pkg-cli-libs-team at lists.alioth.debian.org>
-Uploaders: Laurent Bigonville <bigon at bigon.be>
-Build-Depends: cdbs, debhelper (>= 5), pkg-config (>= 0.9.0), mono-gmcs (>= 1.1.8) | c-sharp-2.0-compiler, mono-gac, libndesk-dbus1.0-cil (>= 0.4), cli-common-dev (>= 0.4.4), monodoc-base
+Uploaders: Laurent Bigonville <bigon at bigon.be>, Mirco Bauer <meebey at debian.org>
+Build-Depends: debhelper (>= 7),
+ cli-common-dev (>= 0.5.7),
+ pkg-config (>= 0.9.0),
+ mono-gmcs (>= 1.1.8) | c-sharp-2.0-compiler,
+ mono-gac,
+ libndesk-dbus1.0-cil (>= 0.4),
+ monodoc-base
 Standards-Version: 3.7.3
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-cli-libs/packages/gnome-keyring-sharp/trunk/
 Vcs-Svn: ssh://svn.debian.org/svn/pkg-cli-libs/packages/gnome-keyring-sharp/trunk
diff --git a/debian/libgnome-keyring1.0-cil.install b/debian/libgnome-keyring1.0-cil.install
index 65c5755..bf1b458 100644
--- a/debian/libgnome-keyring1.0-cil.install
+++ b/debian/libgnome-keyring1.0-cil.install
@@ -1,2 +1,2 @@
-debian/tmp/usr/lib/mono/gac/Gnome.Keyring/*/Gnome.Keyring.dll usr/lib/cli/gnome-keyring-sharp-1.0/
-debian/tmp/usr/lib/pkgconfig/gnome-keyring-sharp-1.0.pc
+/usr/lib/mono/gac/Gnome.Keyring/1.0.*/Gnome.Keyring.dll	/usr/lib/cli/gnome-keyring-sharp-1.0/
+/usr/lib/pkgconfig/gnome-keyring-sharp-1.0.pc
diff --git a/debian/patches/00list b/debian/patches/00list
new file mode 100644
index 0000000..450a359
--- /dev/null
+++ b/debian/patches/00list
@@ -0,0 +1 @@
+01pkgconfig-path
diff --git a/debian/patches/01pkgconfig-path.patch b/debian/patches/01pkgconfig-path.dpatch
similarity index 73%
rename from debian/patches/01pkgconfig-path.patch
rename to debian/patches/01pkgconfig-path.dpatch
index b714fe2..8520d41 100644
--- a/debian/patches/01pkgconfig-path.patch
+++ b/debian/patches/01pkgconfig-path.dpatch
@@ -1,3 +1,10 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01pkgconfig-path.dpatch
+##
+## All lines beginning with ## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
 --- gnome-keyring-sharp-1.0.0~svn20080110/src/gnome-keyring-sharp-1.0.pc.in	2007-10-14 03:53:29.000000000 +1000
 +++ gnome-keyring-sharp-1.0.0~svn20080110.new/src/gnome-keyring-sharp-1.0.pc.in	2008-01-10 18:04:26.000000000 +1100
 @@ -5,4 +5,4 @@
diff --git a/debian/rules b/debian/rules
index 28a93b9..f59e31f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,25 +1,31 @@
 #!/usr/bin/make -f
+export DH_VERBOSE=1
 
-export MONO_SHARED_DIR=$(CURDIR)
+DEB_CLI_API_VERSION = 1.0.0~svn.r87622
 
-include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cli-common/cli.make
+include /usr/share/dpatch/dpatch.make
 
-DEB_DESTDIR = $(CURDIR)/debian/tmp
+build: patch-stamp
+	dh $@
 
-clean::
-	rm -rf .wapi
+install: build
+	dh $@
 
-binary-install/libgnome-keyring1.0-cil::
-	dh_clifixperms
-	dh_makeclilibs -V
-	dh_installcligac
-	dh_clideps -d
+binary: binary-indep
+binary-indep: install
+	dh $@ --before dh_makeclilibs
+	dh_makeclilibs -i -m $(DEB_CLI_API_VERSION)
+	dh $@ --after dh_makeclilibs
 
+clean: clean-patched unpatch
+clean-patched:
+	dh clean
 
-GKS_VER = $(shell ls gnome-keyring-sharp/gnome-keyring-sharp-*.tar.gz | egrep -o "([[:digit:]]+\.)+[[:digit:]]")
+%:
+	dh $@
 
+GKS_VER = $(shell ls gnome-keyring-sharp/gnome-keyring-sharp-*.tar.gz | egrep -o "([[:digit:]]+\.)+[[:digit:]]")
 gnome-keyring-sharp.tar.gz:
 	wget -O gnome-keyring-sharp.tar.gz http://anonsvn.mono-project.com/viewcvs/trunk/gnome-keyring-sharp.tar.gz?view=tar
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cli-libs/packages/gnome-keyring-sharp.git