[Pkg-mono-svn-commits] [SCM] libgdiplus branch, master, updated. debian/2.6.7-3

[Jo Shields]

The following commit has been merged in the master branch:
commit 1254b8203f937719d7ccdf1c276e01c3e7a76390
Author: Jo Shields <directhex at apebox.org>
Date:   Thu May 20 10:25:09 2010 +0100

    Port to DH7, removing dpatch along the way

diff --git a/debian/changelog b/debian/changelog
index 0844ccc..bbfdbbb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+libgdiplus (2.6.4-2) UNRELEASED; urgency=low
+
+  * debian/control,
+    debian/rules:
+    + Remove dpatch
+    + Port to Debhelper 7
+
+ -- Jo Shields <directhex at apebox.org>  Thu, 20 May 2010 09:07:26 +0100
+
 libgdiplus (2.6.4-1) experimental; urgency=low
 
   * New upstream release
diff --git a/debian/control b/debian/control
index 002b711..076da82 100644
--- a/debian/control
+++ b/debian/control
@@ -4,8 +4,7 @@ Priority: optional
 Maintainer: Debian Mono Group <pkg-mono-group at lists.alioth.debian.org>
 Uploaders: Mirco Bauer <meebey at debian.org>, Sebastian Dröge <slomo at debian.org>, Jo Shields <directhex at apebox.org>
 Build-Depends: 
- debhelper (>= 5), 
- dpatch, 
+ debhelper (>= 7.0.50~), 
  libglib2.0-dev (>= 2.2.3), 
  libx11-dev, 
  libxt-dev, 
diff --git a/debian/libgdiplus.dirs b/debian/libgdiplus.dirs
deleted file mode 100644
index 6845771..0000000
--- a/debian/libgdiplus.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib
diff --git a/debian/libgdiplus.install b/debian/libgdiplus.install
deleted file mode 100644
index e4751d4..0000000
--- a/debian/libgdiplus.install
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/tmp/usr/lib/lib*.so*
-debian/tmp/usr/lib/pkgconfig
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index e69de29..0000000
diff --git a/debian/rules b/debian/rules
index 36c819f..1b61f01 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,8 +13,6 @@ VERSION = $(shell echo $(DEB_VERSION) | cut -d"-" -f1 | sed 's/+dfsg.*//')
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
-include /usr/share/dpatch/dpatch.make
-
 CFLAGS = -Wall -g
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -40,58 +38,25 @@ get-orig-source:
 		gzip -9fn -c - > ../tarballs/$(DEB_SOURCE_NAME)_$(VERSION).orig.tar.gz
 	rm ../tarballs/$(DEB_SOURCE_NAME)_$(VERSION).orig.tar.bz2
 
-
-config.status: patch-stamp configure
-	dh_testdir
+override_dh_auto_configure:
 	CFLAGS="$(CFLAGS)" ./configure \
 	  --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
 	  --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info \
 	  --with-cairo=system
 	perl -pe 's/-Werror//' -i src/Makefile
-
-build: build-stamp
-build-stamp: config.status
-	dh_testdir
+	
+override_dh_auto_build:
 	$(MAKE)
 	perl -pe 's,^Requires:.*,,; s,^Libs:.*,,; s,^Cflags:.*,,;' -i libgdiplus.pc
-	touch build-stamp
 
-clean: clean-patched unpatch
-clean-patched:
-	dh_testdir
-	dh_testroot
+override_dh_auto_install:
+	dh_auto_install
+	rm debian/libgdiplus/usr/lib/lib*.*a
+
+override_dh_auto_clean:
 	[ ! -f Makefile ] || $(MAKE) clean
 	rm -f config.status config.log
 	rm -f cairo/config.status cairo/config.log
-	dh_clean 
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k 
-	dh_installdirs
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-
-binary-indep: build install
-
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs ChangeLog
-	dh_installdocs
-	dh_installexamples
-	dh_install
-	dh_installman
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-#	dh_makeshlibs
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
 
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install 
+%:
+	dh $@

-- 
libgdiplus