[Pkg-ocaml-maint-commits] [SCM] ocamlwc packaging branch, master, updated. debian/0.3-8-3-geb673e7

Ralf Treinen treinen at free.fr
Wed Oct 20 06:48:13 UTC 2010


The following commit has been merged in the master branch:
commit e2bf7a0e10a2b165a488daa328bb4b4e541f5ed9
Author: Ralf Treinen <treinen at free.fr>
Date:   Mon Feb 8 21:13:57 2010 +0100

    ready for ocaml 3.11.2

diff --git a/debian/changelog b/debian/changelog
index d040bbe..d3a6fa6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+ocamlwc (0.3-8) unstable; urgency=low
+
+  * Move to source format 3.0 (quilt):
+    - debian/patches quilt style
+    - no more build-dependency on dpatch
+    - no more patching in debian/rules
+    - added file debian/source/format
+  * Standards-Version 3.8.4 (no change)
+  * Removed DM-Upload-Allowed
+  * Rebuild for ocaml 3.11.2
+
+ -- Ralf Treinen <treinen at debian.org>  Mon, 08 Feb 2010 21:09:27 +0100
+
 ocamlwc (0.3-7) unstable; urgency=low
 
   * Changed section to ocaml
diff --git a/debian/control b/debian/control
index e3a0610..3ce6f1f 100644
--- a/debian/control
+++ b/debian/control
@@ -6,9 +6,9 @@ Uploaders: Georg Neis <gn at oglaroon.de>,
  Ralf Treinen <treinen at debian.org>,
  Stephane Glondu <steph at glondu.net>
 DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 7.0.52), dpatch, dh-ocaml
+Build-Depends: debhelper (>= 7.0.52), dh-ocaml
 Build-Depends-Indep: ocaml-nox
-Standards-Version: 3.8.2
+Standards-Version: 3.8.4
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocamlwc.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocamlwc.git
 Homepage: http://www.lri.fr/~filliatr/software.en.html
diff --git a/debian/patches/makefile.dpatch b/debian/patches/makefile
similarity index 59%
rename from debian/patches/makefile.dpatch
rename to debian/patches/makefile
index b136f7e..1de30e2 100755
--- a/debian/patches/makefile.dpatch
+++ b/debian/patches/makefile
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## makefile.dpatch by Georg Neis <gn at oglaroon.de>
-##
-## DP: Use the bytecode compiler.
+Author: Georg Neis <gn at oglaroon.de>
+Description: Use the bytecode compiler.
 
- at DPATCH@
-diff -urNad ocamlwc-0.3~/Makefile.in ocamlwc-0.3/Makefile.in
 --- ocamlwc-0.3~/Makefile.in	2003-09-05 13:57:38.000000000 +0200
 +++ ocamlwc-0.3/Makefile.in	2006-12-31 12:51:54.000000000 +0100
 @@ -6,7 +6,7 @@
diff --git a/debian/patches/00list b/debian/patches/series
similarity index 100%
rename from debian/patches/00list
rename to debian/patches/series
diff --git a/debian/rules b/debian/rules
index f1c6ba1..d95e337 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,6 @@
 
 #export DH_VERBOSE=1
 
-include /usr/share/dpatch/dpatch.make
 include /usr/share/ocaml/ocamlvars.mk
 
 override_dh_auto_configure: patch-stamp
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)

-- 
ocamlwc packaging



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