[Pkg-cli-apps-commits] [SCM] monodevelop-java branch, master-experimental, updated. debian/2.4-3-9-g85dd83b

[Jo Shields]

The following commit has been merged in the master-experimental branch:
commit c2d6759df27022cd21a406a09ffaf82a1d5d1cf9
Author: Jo Shields <directhex at apebox.org>
Date:   Tue Jun 28 22:04:23 2011 +0100

    Remove standalone Quilt, use DebSrc 3.0 (quilt) instead.

diff --git a/debian/control b/debian/control
index 5dc3aaf..d48461c 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: cli-mono
 Priority: optional
 Maintainer: Debian CLI Applications Team <pkg-cli-apps-team at lists.alioth.debian.org>
 Uploaders: Mirco Bauer <meebey at debian.org>, Jo Shields <directhex at apebox.org>
-Build-Depends: debhelper (>= 7.0.50~), quilt (>= 0.46-7~)
+Build-Depends: debhelper (>= 7.0.50~)
 Build-Depends-Indep: cli-common-dev (>= 0.5.4),
  monodevelop (>= 2.4),
  mono-devel (>= 2.4.3),
diff --git a/debian/rules b/debian/rules
index cd32247..b23431a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,7 +12,6 @@ VERSION = $(shell echo $(DEB_VERSION) | cut -d"-" -f1 | sed 's/+dfsg.*//')
 MDVERSION = 2.4.1
 
 include /usr/share/cli-common/cli.make
-include /usr/share/quilt/quilt.make
 
 override_dh_gencontrol:
 	dh_gencontrol -i -- -Vmisc:Version=$(MDVERSION)
@@ -21,11 +20,9 @@ override_dh_auto_configure:
 	./configure --prefix=/usr
 
 override_dh_auto_clean:
-	dh_quilt_patch
 	./configure --clean-only
 	dh_clean
 	rm -f config.log config.make
-	dh_quilt_unpatch
 
 get-orig-source:
 	uscan \
@@ -38,6 +35,6 @@ get-orig-source:
 		--rename
 
 %:
-	dh --with-quilt $@
+	dh $@
 
 .PHONY: get-orig-source
diff --git a/debian/source/format b/debian/source/format
index d3827e7..163aaf8 100644
--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +1 @@
-1.0
+3.0 (quilt)

-- 
monodevelop-java