[Pkg-cli-libs-commits] [SCM] gtk-sharp2 branch, master, updated. debian/2.12.10-2ubuntu4-7-g1a8ebc7

[Iain Lane]

The following commit has been merged in the master branch:
commit 236a8a8ec88f50a10fbddc94f9849205b583d26d
Author: Iain Lane <laney at debian.org>
Date:   Wed Apr 11 11:59:59 2012 +0100

    Convert to 3.0 (quilt)

diff --git a/debian/control b/debian/control
index 04c1f3b..cfaf844 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: libs
 Priority: optional
 Maintainer: Debian CLI Libraries Team <pkg-cli-libs-team at lists.alioth.debian.org>
 Uploaders: Mirco Bauer <meebey at debian.org>, Sebastian Dröge <slomo at debian.org>
-Build-Depends: debhelper (>= 5), cli-common-dev (>= 0.5.7), dpatch, mono-devel (>= 2.4.2.3), monodoc-base (>= 1.0), pkg-config, libglib2.0-dev (>= 2.12.0), libgtk2.0-dev (>= 2.12.0), libpango1.0-dev, libglade2-dev (>= 2.3.6), libmono-cairo2.0-cil, dh-autoreconf,
+Build-Depends: debhelper (>= 5), cli-common-dev (>= 0.5.7), mono-devel (>= 2.4.2.3), monodoc-base (>= 1.0), pkg-config, libglib2.0-dev (>= 2.12.0), libgtk2.0-dev (>= 2.12.0), libpango1.0-dev, libglade2-dev (>= 2.3.6), libmono-cairo2.0-cil, dh-autoreconf,
 Standards-Version: 3.8.4
 Homepage: http://www.mono-project.com/GtkSharp
 Vcs-Git: git://git.debian.org/git/pkg-cli-libs/packages/gtk-sharp2.git
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 6c60560..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,5 +0,0 @@
-01_dllmaps.dpatch
-02_pcfiles.dpatch
-04_fix_glib_2.31_threading.dpatch
-05_glib_single_include.dpatch
-
diff --git a/debian/patches/01_dllmaps.dpatch b/debian/patches/01_dllmaps
similarity index 100%
rename from debian/patches/01_dllmaps.dpatch
rename to debian/patches/01_dllmaps
diff --git a/debian/patches/02_pcfiles.dpatch b/debian/patches/02_pcfiles
similarity index 100%
rename from debian/patches/02_pcfiles.dpatch
rename to debian/patches/02_pcfiles
diff --git a/debian/patches/04_fix_glib_2.31_threading.dpatch b/debian/patches/04_fix_glib_2.31_threading
similarity index 100%
rename from debian/patches/04_fix_glib_2.31_threading.dpatch
rename to debian/patches/04_fix_glib_2.31_threading
diff --git a/debian/patches/05_glib_single_include.dpatch b/debian/patches/05_glib_single_include
similarity index 100%
rename from debian/patches/05_glib_single_include.dpatch
rename to debian/patches/05_glib_single_include
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..eb7e3db
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,5 @@
+01_dllmaps
+02_pcfiles
+04_fix_glib_2.31_threading
+05_glib_single_include
+
diff --git a/debian/rules b/debian/rules
index 3a55d8b..9deafe0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,8 +4,6 @@
 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
 
@@ -33,7 +31,7 @@ get-orig-source:
 		--rename
 
 config: config-stamp
-config-stamp: patch-stamp
+config-stamp:
 	dh_testdir
 	dh_autoreconf --as-needed
 	CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" ./configure --prefix=/usr RUNTIME=/usr/bin/cli CSC=/usr/bin/mono-csc MONO_CAIRO_LIBS=-r:Mono.Cairo MONO_CAIRO_CFLAGS=" "
@@ -53,7 +51,7 @@ build-arch-stamp: config-stamp
 	$(MAKE) RUNTIME=/usr/bin/cli
 	touch build-arch-stamp
 
-clean: unpatch
+clean:
 	dh_testdir
 	dh_testroot
 	[ ! -f Makefile ] || $(MAKE) distclean RUNTIME=/usr/bin/cli
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)

-- 
gtk-sharp2