[Pkg-ocaml-maint-commits] [SCM] cmigrep packaging branch, master, updated. debian/1.5-4-5-g0503cca

Fri Nov 13 19:20:35 UTC 2009

The following commit has been merged in the master branch:
commit 7d7baa9ecebe6418929890a98db216f878e3a3f9
Author: Ralf Treinen <treinen at free.fr>
Date:   Fri Nov 13 20:11:13 2009 +0100

    convert from dpacth to quilt

diff --git a/debian/README.source b/debian/README.source
index 7adf597..372edd0 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -4,7 +4,7 @@ cmigrep Debian source package
 Patching upstream sources
 -------------------------
 
-This package uses dpatch to manage all modifications to the upstream
+This package uses quilt to manage all modifications to the upstream
 source. Changes are stored in the source package as diffs in
 debian/patches and applied during the build.
 
@@ -14,7 +14,7 @@ to the root level of the source package and run:
     debian/rules patch
 
 Removing a patch is as simple as removing its entry from the
-debian/patches/00list file, and please also remove the patch file
+debian/patches/series file, and please also remove the patch file
 itself.
 
- -- Mehdi Dogguy <dogguy at pps.jussieu.fr>, Tue, 7 Jul 2009 13:05:54 +0200
+ -- Ralf Treinen <treinen at debian.org>, Fri, 13 Nov 2009 20:10:16 +0100
diff --git a/debian/changelog b/debian/changelog
index c11286b..35b3749 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,15 +4,22 @@ cmigrep (1.5-4) unstable; urgency=low
   * Switch packaging to git
 
   [ Mehdi Dogguy ]
-  * Bump Standards-Version to 3.8.2
-    o Add a README.source
+  * Added a README.source
   * Add myself to uploaders
   * Remove usage of old OCaml's standard library location (It was harmless
     but there is no reason to keep it)
   * Tighten build depends to ease OCaml 3.11.1 transition.
-  * Add DM-Upload-Allowed (with team consent)
 
- -- Mehdi Dogguy <dogguy at pps.jussieu.fr>  Tue, 07 Jul 2009 13:50:53 +0200
+  [ Ralf Treinen ]
+  * Bump Standards-Version to 3.8.3 (no change)
+  * Convert from dpatch to quilt:
+    - build-depends on quilt, not dpatch
+    - use quilt cdbs rules
+    - add debian/patches/series, remove 00list
+    - simplify names of patches, use headers similar to DEP-5 format
+    - updated debian/README.source accordingly.
+
+ -- Ralf Treinen <treinen at debian.org>  Fri, 13 Nov 2009 20:10:40 +0100
 
 cmigrep (1.5-3) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 9a37126..756d100 100644
--- a/debian/control
+++ b/debian/control
@@ -7,13 +7,12 @@ Uploaders: Ralf Treinen <treinen at debian.org>,
  Samuel Mimram <smimram at debian.org>,
  Mehdi Dogguy <dogguy at pps.jussieu.fr>,
  Stefano Zacchiroli <zack at debian.org>
-Build-Depends: debhelper (>= 5.0), dpatch, cdbs, dh-ocaml
+Build-Depends: debhelper (>= 5.0), quilt, cdbs, dh-ocaml
 Build-Depends-Indep: ocaml-nox (>= 3.11.1),
  libpcre-ocaml-dev (>= 6.0.1-1),
  ocaml-findlib (>= 1.2.4-2),
  ocaml-compiler-libs
-DM-Upload-Allowed: yes
-Standards-Version: 3.8.2
+Standards-Version: 3.8.3
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/cmigrep.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/cmigrep.git
 Homepage: http://homepage.mac.com/letaris/
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index e62fc40..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,2 +0,0 @@
-01make-without-godi
-02no-private-flag
diff --git a/debian/patches/01make-without-godi.dpatch b/debian/patches/01make-without-godi.dpatch
deleted file mode 100755
index 1e954ef..0000000
--- a/debian/patches/01make-without-godi.dpatch
+++ /dev/null
@@ -1,32 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01make-without-godi.dpatch by Ralf Treinen <treinen at debian.org>
-##
-## DP: Compile without godi. Provide directly the include directories for
-## DP: the compiler-libs.
-
- at DPATCH@
-diff -urNad trunk~/Makefile trunk/Makefile
---- trunk~/Makefile	2007-04-01 16:43:39.000000000 +0200
-+++ trunk/Makefile	2007-07-07 10:18:23.000000000 +0200
-@@ -16,17 +16,15 @@
- includecore.cmo includemod.cmo parmatch.cmo typetexp.cmo stypes.cmo	\
- typecore.cmo typedecl.cmo typeclass.cmo typemod.cmo cmigrep.ml
- 
--
--GODI_CONF=$(shell godi_confdir)
--GODI_BASE=$(shell cat $(GODI_CONF)/godi.conf | grep ^LOCALBASE | sed -e 's/LOCALBASE *= *//')
--GODI_LIB=$(GODI_BASE)/lib/ocaml/compiler-lib
-+COMPILERLIBFLAGS=-I +compiler-libs/parsing -I +compiler-libs/typing     \
-+-I +compiler-libs/utils
- 
- all:
--	ocamlfind ocamlopt -o cmigrep -I $(GODI_LIB) \
-+	ocamlfind ocamlopt -o cmigrep $(COMPILERLIBFLAGS) \
- 	-package pcre,findlib,unix -linkpkg $(SOURCES)
- 
- byte:
--	ocamlfind ocamlc -o cmigrep -I $(GODI_LIB) \
-+	ocamlfind ocamlc -o cmigrep $(COMPILERLIBFLAGS) \
- 	-package pcre,findlib,unix -linkpkg $(BYTESOURCES)
- 
- install:
diff --git a/debian/patches/02no-private-flag.dpatch b/debian/patches/02no-private-flag.dpatch
deleted file mode 100755
index e4f7d6b..0000000
--- a/debian/patches/02no-private-flag.dpatch
+++ /dev/null
@@ -1,29 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## no-private-flag.dpatch by Ralf Treinen <treinen at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: The fields Type_variant and Type_record have lost the "private"
-## DP: field in the passage from ocaml 3.10 to 3.11. [treinen at debian.org]
-
- at DPATCH@
-diff -urNad trunk~/cmigrep.ml trunk/cmigrep.ml
---- trunk~/cmigrep.ml	2008-04-02 02:37:07.000000000 +0200
-+++ trunk/cmigrep.ml	2009-03-02 21:01:16.000000000 +0100
-@@ -304,7 +304,7 @@
-     (function
-        | Tsig_type (id, type_decl, _rec_status) ->
-            begin match type_decl.type_kind with
--           | Type_variant (constructors, _private) ->
-+           | Type_variant (constructors) ->
-                List.iter
-                  (fun (name, type_exprs) ->
-                     if Pcre.pmatch ~rex:exp name then begin
-@@ -382,7 +382,7 @@
-     (function
-        | Tsig_type (id, type_decl, _rec_status) ->
-            begin match type_decl.type_kind with
--           | Type_record (labels, _, _) ->
-+           | Type_record (labels, _) ->
-                List.iter
-                  (fun (name, mutable_flag, type_expr) ->
-                     if Pcre.pmatch ~rex:exp name then begin

-- 
cmigrep packaging

