[Pkg-cli-libs-commits] [SCM] gnome-desktop-sharp2 branch, master, updated. debian/2.26.0-7

[Iain Lane]

The following commit has been merged in the master branch:
commit e20aca8e13b341398f911da62013ed93b8281dbe
Author: Iain Lane <laney at debian.org>
Date:   Mon Dec 5 18:36:12 2011 +0000

    Convert to 3.0 (quilt)

diff --git a/debian/control b/debian/control
index e48c59d..8763eaa 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,6 @@ Build-Depends: autoconf,
                automake,
                cli-common-dev (>= 0.5.4),
                debhelper (>= 7),
-               dpatch,
                gtk-sharp2-gapi (>= 2.12.7),
                libart2.0-cil-dev,
                libglade2.0-cil-dev,
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_gtkhtml-version b/debian/patches/02_gtkhtml-version
new file mode 100644
index 0000000..44c9be9
--- /dev/null
+++ b/debian/patches/02_gtkhtml-version
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_gtkhtml-version.dpatch by Sebastian Dröge <slomo at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Patch to correct desired GTKHTML version in configure script
+ at DPATCH@
+
+Index: gnome-desktop-sharp2/configure.in
+===================================================================
+--- gnome-desktop-sharp2.orig/configure.in	2011-12-05 18:45:45.441857354 +0000
++++ gnome-desktop-sharp2/configure.in	2011-12-05 18:46:03.917122932 +0000
+@@ -189,7 +189,7 @@
+ AC_SUBST(GNOME_PRINT_CFLAGS)
+ AC_SUBST(GNOME_PRINT_LIBS)
+ 
+-GTKHTML_REQUIRED_VERSION=3.23.5
++GTKHTML_REQUIRED_VERSION=3.18.0
+ 
+ PKG_CHECK_MODULES(GTKHTML, libgtkhtml-3.14 >= $GTKHTML_REQUIRED_VERSION, enable_gtkhtml=yes, enable_gtkhtml=no)
+ AC_SUBST(GTKHTML_CFLAGS)
diff --git a/debian/patches/02_gtkhtml-version.dpatch b/debian/patches/02_gtkhtml-version.dpatch
deleted file mode 100755
index e387ff6..0000000
--- a/debian/patches/02_gtkhtml-version.dpatch
+++ /dev/null
@@ -1,16 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_gtkhtml-version.dpatch by Sebastian Dröge <slomo at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Patch to correct desired GTKHTML version in configure script
- at DPATCH@
-
---- gnome-desktop-sharp/configure.in.old	2009-01-19 10:11:28.000000000 +0100
-+++ gnome-desktop-sharp/configure.in	2009-01-19 10:12:14.000000000 +0100
-@@ -188,7 +188,7 @@
- AC_SUBST(GNOME_PRINT_CFLAGS)
- AC_SUBST(GNOME_PRINT_LIBS)
- 
--GTKHTML_REQUIRED_VERSION=3.23.5
-+GTKHTML_REQUIRED_VERSION=3.18.0
- 
diff --git a/debian/patches/03_fix_pkg-config_paths.dpatch b/debian/patches/03_fix_pkg-config_paths
similarity index 100%
rename from debian/patches/03_fix_pkg-config_paths.dpatch
rename to debian/patches/03_fix_pkg-config_paths
diff --git a/debian/patches/04_gnome_desktop_2_soname.dpatch b/debian/patches/04_gnome_desktop_2_soname
similarity index 100%
rename from debian/patches/04_gnome_desktop_2_soname.dpatch
rename to debian/patches/04_gnome_desktop_2_soname
diff --git a/debian/patches/00list b/debian/patches/series
similarity index 100%
rename from debian/patches/00list
rename to debian/patches/series
diff --git a/debian/rules b/debian/rules
index 7edf2b8..06ec337 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
 
@@ -22,7 +20,7 @@ NEXT_UPVERSION = $(shell perl -e '$$_=pop; s/(\d+)$$/$$1+1/e; print' $(VERSION))
 
 
 autoreconf: autoreconf-stamp
-autoreconf-stamp: patch-stamp
+autoreconf-stamp:
 	autoreconf -f -i
 	patch -p3 < debian/ltmain-add-as-needed.patch
 	touch $@
@@ -48,7 +46,7 @@ build-arch-stamp: config-stamp
 	$(MAKE)
 	touch $@
 
-clean: clean-patched unpatch
+clean: clean-patched
 clean-patched:
 	dh_testdir
 	dh_testroot
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)

-- 
gnome-desktop-sharp2