[Pkg-ocaml-maint-commits] [SCM] extlib packaging branch, master, updated. debian/1.5.1-5-12-g4a99eb3

[Stephane Glondu]

The following commit has been merged in the master branch:
commit cb7ef8eba61fdee7ca2355edfebe3fbece2a217a
Author: Stephane Glondu <steph at glondu.net>
Date:   Mon Aug 15 20:43:12 2011 +0200

    Switch source package format to 3.0 (quilt)

diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 825e83f..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,5 +0,0 @@
-This package use dpatch for patching the source.
-
-Please consider reading dpatch manpage to patch the source.
-
- -- Stéphane Glondu <glondu at debian.org>, Mon, 31 Aug 2009 15:10:05 +0200
diff --git a/debian/control b/debian/control
index a001ba7..0757b19 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,6 @@ Build-Depends:
  ocaml-nox (>= 3.11.1-3~),
  ocaml-findlib (>= 1.2.5),
  debhelper (>> 7),
- dpatch,
  cdbs,
  dh-ocaml (>= 0.9)
 Standards-Version: 3.8.3
diff --git a/debian/patches/build_with_debug_info.dpatch b/debian/patches/0001-Compile-ocaml-objects-with-debugging-information.patch
old mode 100755
new mode 100644
similarity index 50%
rename from debian/patches/build_with_debug_info.dpatch
rename to debian/patches/0001-Compile-ocaml-objects-with-debugging-information.patch
index 4ff9ba0..ed999d7
--- a/debian/patches/build_with_debug_info.dpatch
+++ b/debian/patches/0001-Compile-ocaml-objects-with-debugging-information.patch
@@ -1,14 +1,16 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## build_with_debug_info.dpatch by Stefano Zacchiroli <zack at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: compile ocaml objects with debugging information
+From: Stefano Zacchiroli <zack at debian.org>
+Date: Mon, 15 Aug 2011 20:42:10 +0200
+Subject: Compile ocaml objects with debugging information
 
- at DPATCH@
-diff -urNad trunk~/install.ml trunk/install.ml
---- trunk~/install.ml	2007-12-28 01:47:08.000000000 +0100
-+++ trunk/install.ml	2008-01-07 22:04:36.000000000 +0100
-@@ -160,7 +160,7 @@
+---
+ install.ml |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/install.ml b/install.ml
+index 193f683..39cb166 100644
+--- a/install.ml
++++ b/install.ml
+@@ -160,7 +160,7 @@ let install() =
  	if !autodoc && not (Sys.file_exists doc_dir) then run (sprintf "mkdir %s" doc_dir);
  	run (sprintf "ocamlc -c %s" (m_list ".mli"));
  	if !autobyte then begin
@@ -17,3 +19,4 @@ diff -urNad trunk~/install.ml trunk/install.ml
  		run (sprintf "ocamlc -a -o extLib.cma %s extLib.ml" (m_list ".cmo"));
  		List.iter (fun m -> remove (m ^ ".cmo")) modules;
  		remove "extLib.cmo";
+-- 
diff --git a/debian/patches/00dpatch.conf b/debian/patches/00dpatch.conf
deleted file mode 100644
index 685acc6..0000000
--- a/debian/patches/00dpatch.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-conf_debianonly=1
-conf_origtargzpath=../tarballs
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 922d784..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-build_with_debug_info.dpatch
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..ccb12d7
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Compile-ocaml-objects-with-debugging-information.patch
diff --git a/debian/rules b/debian/rules
index cc69210..e7219fb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,4 @@
 #!/usr/bin/make -f
-include /usr/share/cdbs/1/rules/dpatch.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/ocaml.mk
 
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/source/local-options b/debian/source/local-options
new file mode 100644
index 0000000..c4cf480
--- /dev/null
+++ b/debian/source/local-options
@@ -0,0 +1,2 @@
+abort-on-upstream-changes
+unapply-patches

-- 
extlib packaging