[Pkg-cli-apps-commits] [bless] 01/02: Convert from CBDS to DH7

[Jo Shields]

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

directhex pushed a commit to annotated tag debian/0.6.0-5
in repository bless.

commit 6357a2e06f925a35bd961c1ea9f3f208d32597d8
Author: Jo Shields <jo.shields at xamarin.com>
Date:   Wed Sep 9 14:39:49 2015 +0100

    Convert from CBDS to DH7
---
 debian/control        |  3 +--
 debian/patches/series |  2 ++
 debian/rules          | 31 +++++++++----------------------
 debian/source/format  |  1 +
 4 files changed, 13 insertions(+), 24 deletions(-)

diff --git a/debian/control b/debian/control
index 3d59660..8b9a2be 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,7 @@ Section: editors
 Priority: optional
 Maintainer: Debian CLI Applications Team <pkg-cli-apps-team at lists.alioth.debian.org>
 Uploaders: Iain Lane <laney at debian.org>
-Build-Depends: cdbs,
-               debhelper (>= 5.0.0),
+Build-Depends: debhelper (>= 7.0.50~),
                pkg-config,
                rarian-compat | scrollkeeper
 Build-Depends-Indep: cli-common-dev (>= 0.4.4),
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..0fe1f1e
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+use_default_compiler.patch
+force_gtk_action_namespace.patch
diff --git a/debian/rules b/debian/rules
index 8d56caf..a0a7c4c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,28 +7,15 @@
 VERSION = $(shell dpkg-parsechangelog | grep ^Vers | cut -d\  -f2)
 UPVERSION = $(shell echo $(VERSION) | sed 's,-.*,,' | sed 's,+dfsg.*,,') 
 
-# Mono Shared directory redirection
-export MONO_SHARED_DIR=$(CURDIR)
+override_dh_auto_configure:
+	dh_auto_configure -- --prefix=/usr --without-scrollkeeper --disable-nls MCS=/usr/bin/mono-csc
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+override_dh_auto_test:
+	
 
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/usr --without-scrollkeeper --disable-nls MCS=/usr/bin/mono-csc
-DEB_MAKE_INSTALL_TARGET := install prefix=$(CURDIR)/debian/bless/usr
-DEB_COMPRESS_EXCLUDE := .xmi .xml
-
-pkgname:=$(shell basename $(CURDIR))
-
-common-configure-indep::
-	mkdir -p $(MONO_SHARED_DIR)/.wapi
-
-binary-install/bless::
-	dh_clideps -d
-	dh_scrollkeeper
-
-install/bless::
+override_dh_install:
 # remove extra doc-files
+	dh_install
 	rm -f $(CURDIR)/debian/bless/usr/share/doc/bless/bless.spec
 	rm -f $(curdir)/debian/bless/usr/share/doc/bless/copying
 	rm -f $(curdir)/debian/bless/usr/share/doc/bless/ChangeLog
@@ -36,9 +23,6 @@ install/bless::
 	rm -f $(CURDIR)/debian/bless/usr/share/doc/bless/README
 	rm -f $(CURDIR)/debian/bless/usr/share/doc/bless/README.packaging
 
-clean::
-	rm -rf $(MONO_SHARED_DIR)/.wapi
-
 get-orig-source:
 	[ -d ../tarballs ] || mkdir ../tarballs
 	uscan \
@@ -46,3 +30,6 @@ get-orig-source:
 		--download-version $(UPVERSION) \
 		--rename \
 		--destdir ../tarballs
+
+%:
+	dh $@ --with cli
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cli-apps/packages/bless.git