[Pkg-ocaml-maint-commits] [SCM] postgresql-ocaml packaging branch, master, updated. debian/1.7.0-3-18-g17fd15e

[Stefano Zacchiroli]

The following commit has been merged in the master branch:
commit 4a330077dd2fbef5c01063f3ff51b979ba431601
Author: Stefano Zacchiroli <zack at upsilon.cc>
Date:   Sun Feb 22 18:36:59 2009 +0100

    debian/patches/*: clean up obsolete dpatch headers

diff --git a/debian/changelog b/debian/changelog
index 92e22f0..c5cffe1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ postgresql-ocaml (1.10.3-1) UNRELEASED; urgency=low
   * debian/rules: use ocaml.mk as a "rules" CDBS snippet
   * debian/*.in: use explicit substitution variables instead of
     making assumption on stdlib dir location
+  * debian/patches/*: clean up obsolete dpatch headers and use dpatch-run
   * bump debhelper compatibility level to 7
 
   [ Stephane Glondu ]
diff --git a/debian/patches/examples.dpatch.in b/debian/patches/examples.dpatch.in
index 72be773..62991ab 100644
--- a/debian/patches/examples.dpatch.in
+++ b/debian/patches/examples.dpatch.in
@@ -1,27 +1,9 @@
-#! /bin/sh -e
-## 03_examples.dpatch by  <zack at debian.org>
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 03_examples.dpatch by Stefano Zacchiroli <zack at debian.org>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
 ## DP: make examples easily buildable in Debian
 
-if [ $# -lt 1 ]; then
-    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
-    exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
-
-case "$1" in
-    -patch) patch -p1 ${patch_opts} < $0;;
-    -unpatch) patch -R -p1 ${patch_opts} < $0;;
-    *)
-        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
-        exit 1;;
-esac
-
-exit 0
-
 @DPATCH@
 diff -urNad /home/zack/dati/debian/packages/postgresql-ocaml/postgresql-ocaml-1.3.3/examples/dump/Makefile postgresql-ocaml-1.3.3/examples/dump/Makefile
 --- /home/zack/dati/debian/packages/postgresql-ocaml/postgresql-ocaml-1.3.3/examples/dump/Makefile	2004-01-28 18:14:59.000000000 +0100
diff --git a/debian/patches/install_destdir.dpatch b/debian/patches/install_destdir.dpatch
old mode 100644
new mode 100755
index df44532..95ce479
--- a/debian/patches/install_destdir.dpatch
+++ b/debian/patches/install_destdir.dpatch
@@ -1,27 +1,9 @@
-#! /bin/sh -e
-## 01_makefile.dpatch by  <zack at debian.org>
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_makefile.dpatch by Stefano Zacchiroli <zack at debian.org>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
 ## DP: enable passing target installation directory from debian/rules
 
-if [ $# -lt 1 ]; then
-    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
-    exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
-
-case "$1" in
-    -patch) patch -p1 ${patch_opts} < $0;;
-    -unpatch) patch -R -p1 ${patch_opts} < $0;;
-    *)
-        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
-        exit 1;;
-esac
-
-exit 0
-
 @DPATCH@
 diff -urNad trunk~/lib/Makefile trunk/lib/Makefile
 --- trunk~/lib/Makefile	2005-05-31 16:00:47.000000000 +0000

-- 
postgresql-ocaml packaging