[Pkg-cli-libs-commits] [SCM] gnome-sharp2 branch, master, updated. upstream/2.24.1-23-g863308e

[Julian Taylor]

The following commit has been merged in the master branch:
commit f1ea36b1cde016e7d68d7ba416d0ed2861d20bcb
Author: Julian Taylor <jtaylor.debian at googlemail.com>
Date:   Fri Jun 3 13:54:21 2011 +0000

    change to dh 7 tiny rules

diff --git a/debian/rules b/debian/rules
index 67b12c4..30333a6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,120 +1,19 @@
 #!/usr/bin/make -f
+# -*- makefile -*-
 
-#export DH_VERBOSE=1
+export DH_VERBOSE=1
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 export MONO_SHARED_DIR=$(CURDIR)
-
-include /usr/share/dpatch/dpatch.make
-
-CFLAGS ?= -O2 -Wall -g
 LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
 
-API_VERSION = 2.24.0
-
-UPVERSION = $(shell dpkg-parsechangelog | grep ^Vers | cut -d\  -f2 | sed 's,-.*,,')
-NEXT_UPVERSION = $(shell perl -e '$$_=pop; s/(\d+)$$/$$1+1/e; print' $(UPVERSION))
-
-autoreconf: autoreconf-stamp
-autoreconf-stamp: patch-stamp
-	autoreconf -f -i
-	patch -p3 < debian/ltmain-add-as-needed.patch
-	touch $@
-
-config: config-stamp
-config-stamp: autoreconf-stamp
-	dh_testdir
-	CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" ./configure \
-		--prefix=/usr \
-		CSC=/usr/bin/mono-csc
-	touch $@
-
-build-indep: build-indep-stamp
-build-indep-stamp: config-stamp
-	dh_testdir
-	$(MAKE)
-	touch $@
-
-build-arch: build-arch-stamp
-build-arch-stamp: config-stamp
-	dh_testdir
-	$(MAKE)
-	touch $@
-
-clean: unpatch
-	dh_testdir
-	dh_testroot
-
-	rm -f autoreconf-stamp config-stamp build-indep-stamp build-arch-stamp
-	[ ! -f Makefile ] || $(MAKE) distclean 
+include /usr/share/cli-common/cli.make
 
-	# delete generated autofoo stuff from above
-	find . -name "Makefile.in" | xargs rm -rf
-	rm -f config.status config.sub config.guess configure ltmain.sh
-
-	# gconf clean target is less than perfect
-	-cd gconf && find -name "*.exe" -or -name "*.dll" -delete
-
-	rm -rf $(MONO_SHARED_DIR)/.wapi
-
-	dh_clean
-
-install:
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+API_VERSION = 2.24.0
 
-binary-indep: build-indep install
-	dh_testdir
-	dh_testroot
-	dh_installdirs -i
-	dh_link -i
-        # HACK: we must install arch dep and indep here!
-        # dh_clideps needs the clilibs files of all packages
-	dh_install
-	install -m755 $(CURDIR)/debian/list-examples $(CURDIR)/debian/gnome-sharp2-examples/usr/bin/gnome-sharp2-examples-list
-	dh_installchangelogs -i ChangeLog
-	dh_installdocs -i
-	dh_installcligac -i
-	dh_compress -i
-	dh_fixperms -i
-	dh_clifixperms -i
-	dh_installdeb -i
-	# HACK: we must generate clilibs of arch:all and arch:any here!
-	# else dh_clideps can't catch up inner source package dependencies
-	dh_makeclilibs -m $(API_VERSION)
-	dh_clideps -i -d
-	dh_gencontrol -i
-	dh_md5sums -i
-	dh_builddeb -i
+%:
+	dh $@
 
-binary-arch: build-arch install
-	dh_testdir
-	dh_testroot
-	dh_installdirs -a
-	dh_link -a
-        # HACK: we must install arch dep and indep here!
-        # dh_clideps needs the clilibs files of all packages
-	dh_install
-	dh_installchangelogs -a ChangeLog
-	dh_installdocs -a
-	dh_installcligac -a
-	dh_strip -a
-	dh_compress -a
-	dh_fixperms -a
-	dh_clifixperms -a
-	dh_installdeb -a
-	dh_shlibdeps -a
+override_dh_makeclilibs:
 	# HACK: we must generate clilibs of arch:all and arch:any here!
 	# else dh_clideps can't catch up inner source package dependencies
 	dh_makeclilibs -m $(API_VERSION)
-	dh_clideps -a -d
-	dh_gencontrol -a
-	dh_md5sums -a
-	dh_builddeb -a
-
-build: build-indep build-arch
-binary: binary-indep binary-arch
-
-.PHONY: autoreconf config build-indep build-arch clean install binary-indep binary-arch build binary patch

-- 
gnome-sharp2