[Pkg-cli-apps-commits] [SCM] gnome-rdp branch, master, updated. upstream/0.2.3-14-gd27f3b9

[Julian Taylor]

The following commit has been merged in the master branch:
commit dfadb8a148d6b4a6d657c0b89e88880c24e60e30
Author: Julian Taylor <jtaylor.debian at googlemail.com>
Date:   Tue Jun 7 17:12:03 2011 +0200

    use dh 7 tiny rule
      - b-d on dh-autoreconf, remove nant b-d, bump debhelper version

diff --git a/debian/control b/debian/control
index 1009193..c7af976 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,9 @@ Section: gnome
 Priority: optional
 Maintainer: Debian CLI Applications Team <pkg-cli-apps-team at lists.alioth.debian.org>
 Uploaders: David Paleino <dapal at debian.org>
-Build-Depends: debhelper (>= 6)
+Build-Depends: debhelper (>= 7.0.50~)
 Build-Depends-Indep: cli-common-dev (>= 0.4.4),
+                     dh-autoreconf,
                      libglade2.0-cil-dev,
                      libgnome-keyring1.0-cil-dev,
                      libgnome2.0-cil-dev,
@@ -13,7 +14,6 @@ Build-Depends-Indep: cli-common-dev (>= 0.4.4),
                      libvte0.16-cil-dev,
                      libxml-parser-perl,
                      mono-devel (>= 2.4.3),
-                     nant,
                      pkg-config
 Standards-Version: 3.8.3
 Homepage: http://gnome-rdp.sourceforge.net
diff --git a/debian/rules b/debian/rules
index 395442a..a080420 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,64 +1,16 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-include /usr/share/quilt/quilt.make
-
-export MONO_SHARED_DIR=$(CURDIR)
 
 CURVER=$(shell dpkg-parsechangelog | grep ^Version | cut -d" " -f2 | cut -d"-" -f1 )
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	DEBUG = -D:debug=true
-else
-	DEBUG = -D:debug=false
-endif
-
-build: build-stamp
-build-stamp: patch
-	dh_testdir
-	mkdir -p $(MONO_SHARED_DIR)/.wapi
-	nant build
-	touch $@
 
-clean: unpatch
-	dh_testdir
-	dh_testroot
-	nant clean
-	rm -rf $(MONO_SHARED_DIR)/.wapi
-	dh_clean build-stamp
+%:
+	dh $@ --with cli,autoreconf
 
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k 
-	nant -D:DESTDIR=$(CURDIR)/debian/gnome-rdp $(DEBUG) install
+override_dh_install:
+	dh_install
 	install -m644 $(CURDIR)/debian/gnome-rdp.xpm \
 		$(CURDIR)/debian/gnome-rdp/usr/share/pixmaps/
 	sed -i 's/^.*\#/\#/' $(CURDIR)/debian/gnome-rdp/usr/bin/gnome-rdp
 
-binary-arch: build install
-binary-indep: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs ChangeLog
-	dh_installdocs
-	dh_installmenu
-	dh_installman
-	dh_link
-	dh_clistrip
-	dh_compress
-	dh_fixperms
-	dh_clifixperms
-	dh_installdeb
-	dh_clideps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-
 get-orig-source:
 	[ -d ../tarballs ] || mkdir ../tarballs
 	uscan \
@@ -66,5 +18,3 @@ get-orig-source:
 		--rename \
 		--download-version $(CURVER) \
 		--force-download
-
-.PHONY: build clean binary-indep binary-arch binary install 

-- 
gnome-rdp