[Pkg-ocaml-maint-commits] [SCM] perl4caml packaging branch, master, updated. debian/0.9.5-2-5-g55dd47d

Stephane Glondu steph at glondu.net
Fri Oct 9 12:21:19 UTC 2009


The following commit has been merged in the master branch:
commit a61e7262d4b55e9c57120ce0c49fb108270ad851
Author: Stephane Glondu <steph at glondu.net>
Date:   Fri Oct 9 12:02:39 2009 +0200

    Switch patches to quilt

diff --git a/debian/control b/debian/control
index 032f3d0..bb97185 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends:
  debhelper (>= 7),
  libperl-dev,
  ocaml-nox (>= 3.11),
- dpatch,
+ quilt,
  dh-ocaml
 Standards-Version: 3.8.3
 Homepage: http://merjis.com/developers/perl4caml
diff --git a/debian/patches/10_Makefile.dpatch b/debian/patches/0001-Fix-Makefile-to-detect-ocamlopt.patch
old mode 100755
new mode 100644
similarity index 88%
rename from debian/patches/10_Makefile.dpatch
rename to debian/patches/0001-Fix-Makefile-to-detect-ocamlopt.patch
index 6a7dfa6..00bf9f9
--- a/debian/patches/10_Makefile.dpatch
+++ b/debian/patches/0001-Fix-Makefile-to-detect-ocamlopt.patch
@@ -1,10 +1,13 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10_Makefile.dpatch by Mike Furr <mfurr at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+From: Mike Furr <mfurr at debian.org>
+Date: Wed, 4 May 2005 02:28:31 +0000
+Subject: [PATCH] Fix Makefile to detect ocamlopt
+
+Signed-off-by: Mike Furr <mfurr at debian.org>
+Signed-off-by: Stephane Glondu <steph at glondu.net>
+---
+ Makefile |   29 ++++++++++++++++++++++++++---
+ 1 files changed, 26 insertions(+), 3 deletions(-)
 
- at DPATCH@
 diff --git a/Makefile b/Makefile
 index 4827101..f79b054 100644
 --- a/Makefile
@@ -80,3 +83,4 @@ index 4827101..f79b054 100644
 -.PHONY: depend dist check-manifest html dpkg test run-tests
 \ No newline at end of file
 +.PHONY: depend dist check-manifest html dpkg test run-tests
+-- 
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 137bae7..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-10_Makefile
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..34cd41f
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Fix-Makefile-to-detect-ocamlopt.patch
diff --git a/debian/rules b/debian/rules
index 2cd3a4e..bf1161f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 include /usr/share/ocaml/ocamlinit.mk
-include /usr/share/dpatch/dpatch.make
+include /usr/share/quilt/quilt.make
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1

-- 
perl4caml packaging



More information about the Pkg-ocaml-maint-commits mailing list