[Pkg-ocaml-maint-commits] [SCM] lablgtk2 packaging branch, master, updated. debian/2.12.0-2-7-gcf5d82f

[Stephane Glondu]

The following commit has been merged in the master branch:
commit b6e42b4e92ce35c1a5bd0c7a7f1178a26bdf3891
Author: Stephane Glondu <steph at glondu.net>
Date:   Sun Jun 7 17:03:14 2009 +0200

    Use quilt instead of dpatch

diff --git a/debian/control b/debian/control
index 6869ea6..ee4824a 100644
--- a/debian/control
+++ b/debian/control
@@ -25,7 +25,7 @@ Build-Depends:
  libgnomeui-dev,
  libpanel-applet2-dev,
  libgtksourceview-dev,
- dpatch
+ quilt
 Standards-Version: 3.8.0
 Homepage: http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/lablgtk.html
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/lablgtk2.git
diff --git a/debian/patches/0001-Disable-svgz.patch b/debian/patches/0001-Disable-svgz.patch
new file mode 100644
index 0000000..7c3f491
--- /dev/null
+++ b/debian/patches/0001-Disable-svgz.patch
@@ -0,0 +1,25 @@
+From: Julien Cristau <julien.cristau at ens-lyon.org>
+Date: Sun, 7 Jun 2009 16:55:39 +0200
+Subject: [PATCH] Disable svgz
+
+librsvg doesn't have a rsvg-gz.h header anymore, and
+rsvg_handle_new_gz isn't necessary (svgz files are detected
+automatically). So don't build a binding for this function.
+---
+ config.make.in |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/config.make.in b/config.make.in
+index 9ccad03..49adbaa 100644
+--- a/config.make.in
++++ b/config.make.in
+@@ -19,7 +19,7 @@ EXE=@EXE@
+ USE_GL=@USE_GTKGL@
+ USE_GLADE=@USE_GLADE@
+ USE_RSVG=@USE_RSVG@
+-HAVE_SVGZ=@HAVE_SVGZ@
++HAVE_SVGZ=
+ USE_GNOMECANVAS=@USE_GNOMECANVAS@
+ USE_GNOMEUI=@USE_GNOMEUI@
+ USE_PANEL=@USE_PANEL@
+-- 
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 632d716..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-no_rsvg_gz
diff --git a/debian/patches/no_rsvg_gz.dpatch b/debian/patches/no_rsvg_gz.dpatch
deleted file mode 100755
index 9711fbc..0000000
--- a/debian/patches/no_rsvg_gz.dpatch
+++ /dev/null
@@ -1,21 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## no_rsvg_gz.dpatch by Julien Cristau <julien.cristau at ens-lyon.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: librsvg doesn't have a rsvg-gz.h header anymore, and
-## DP: rsvg_handle_new_gz isn't necessary (svgz files are detected
-## DP: automatically). So don't build a binding for this function.
-
- at DPATCH@
-diff -urNad lablgtk2-2.6.0~/config.make.in lablgtk2-2.6.0/config.make.in
---- lablgtk2-2.6.0~/config.make.in	2005-06-02 02:20:18.000000000 +0200
-+++ lablgtk2-2.6.0/config.make.in	2006-02-09 19:09:26.000000000 +0100
-@@ -18,7 +18,7 @@
- USE_GL=@USE_GTKGL@
- USE_GLADE=@USE_GLADE@
- USE_RSVG=@USE_RSVG@
--HAVE_SVGZ=@HAVE_SVGZ@
-+HAVE_SVGZ=
- USE_GNOMECANVAS=@USE_GNOMECANVAS@
- USE_GNOMEUI=@USE_GNOMEUI@
- USE_PANEL=@USE_PANEL@
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..08b30ba
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Disable-svgz.patch
diff --git a/debian/rules b/debian/rules
index 473c99e..785d9cd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,8 +10,8 @@ include /usr/share/ocaml/ocamlinit.mk
 
 DESTDIR = $(CURDIR)/debian/tmp
 
-# We want to use dpatch.
-include /usr/share/dpatch/dpatch.make
+# We want to use quilt.
+include /usr/share/quilt/quilt.make
 PACKAGE = lablgtk
 
 ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
@@ -32,7 +32,7 @@ configure-stamp: ocamlinit
 
 
 build: build-stamp
-build-stamp: patch-stamp configure-stamp
+build-stamp: $(QUILT_STAMPFN) configure-stamp
 	dh_testdir
 
 	$(MAKE) depend

-- 
lablgtk2 packaging