[Pkg-ocaml-maint-commits] [SCM] ocaml-curses packaging branch, master, updated. debian/1.0.3-1-7-gd3345c2

Mehdi Dogguy mehdi at debian.org
Thu Jan 5 01:47:07 UTC 2012


The following commit has been merged in the master branch:
commit c773971e102488290234c85571dffd4c5accc029
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Thu Jan 5 02:30:06 2012 +0100

    Convert to 3.0 (quilt) source format

diff --git a/debian/changelog b/debian/changelog
index ef96fbb..a8e5807 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,11 @@ ocaml-curses (1.0.3-2) unstable; urgency=low
   * Team upload.
   * Enable wide character support (Closes: #600897).
     - Use libncursesw5-dev instead of libncurses5-dev in Build-Depends.
+  * Convert to 3.0 (quilt) source format
+    - Use quilt instead of dpatch
+    - Fix build-depends-on-obsolete-package dpatch
 
- -- Mehdi Dogguy <mehdi at debian.org>  Thu, 05 Jan 2012 02:23:41 +0100
+ -- Mehdi Dogguy <mehdi at debian.org>  Thu, 05 Jan 2012 02:28:15 +0100
 
 ocaml-curses (1.0.3-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index fa9e6e1..cc1673c 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: ocaml
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders: Samuel Mimram <smimram at debian.org>, Sylvain Le Gall <gildor at debian.org>
-Build-Depends: debhelper (>= 7), dpkg-dev (>= 1.13.19), libncursesw5-dev, ocaml-nox (>= 3.11), dh-ocaml (>= 0.9.1), ocaml-findlib (>= 1.2.4), dpatch
+Build-Depends: debhelper (>= 7), dpkg-dev (>= 1.13.19), libncursesw5-dev, ocaml-nox (>= 3.11), dh-ocaml (>= 0.9.1), ocaml-findlib (>= 1.2.4)
 Standards-Version: 3.8.3
 Homepage: http://www.nongnu.org/ocaml-tmk/
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocaml-curses.git
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 39d0a3d..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-run_autoconf
diff --git a/debian/patches/run_autoconf.dpatch b/debian/patches/run_autoconf.diff
similarity index 99%
rename from debian/patches/run_autoconf.dpatch
rename to debian/patches/run_autoconf.diff
index 69a1ecc..665f508 100755
--- a/debian/patches/run_autoconf.dpatch
+++ b/debian/patches/run_autoconf.diff
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## run_autoconf.dpatch by Sylvain Le Gall <gildor at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+Author: Sylvain Le Gall <gildor at debian.org>
+Description: run autoconf
 
- at DPATCH@
 diff -urNad ocaml-curses~/config.h.in ocaml-curses/config.h.in
 --- ocaml-curses~/config.h.in	1970-01-01 00:00:00.000000000 +0000
 +++ ocaml-curses/config.h.in	2009-12-16 23:40:18.253476530 +0000
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..708e1c9
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+run_autoconf.diff
diff --git a/debian/rules b/debian/rules
index 0cf6053..5abe2d7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,6 @@
 
 include /usr/share/ocaml/ocamlvars.mk
 include /usr/share/ocaml/ocamlinit.mk
-include /usr/share/dpatch/dpatch.make
 
 DESTDIR = $(CURDIR)/debian/tmp/$(OCAML_STDLIB_DIR)
 
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)

-- 
ocaml-curses packaging



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