[Pkg-ocaml-maint-commits] [SCM] camlp5 packaging branch, master, updated. debian/5.13-1-4-gd4ed117

Stephane Glondu steph at glondu.net
Sun May 2 10:03:14 UTC 2010


The following commit has been merged in the master branch:
commit 3e72adb3451676478f5a20827584489bee33e1ad
Author: Stephane Glondu <steph at glondu.net>
Date:   Sun May 2 11:40:06 2010 +0200

    New upstream release

diff --git a/debian/changelog b/debian/changelog
index 0ff9bf5..892acdf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+camlp5 (5.14-1) UNRELEASED; urgency=low
+
+  * New upstream release
+    - remove all patches (applied upstream)
+
+ -- Stéphane Glondu <glondu at debian.org>  Sun, 02 May 2010 11:39:02 +0200
+
 camlp5 (5.13-1) unstable; urgency=low
 
   * New upstream release:
diff --git a/debian/patches/0001-Fix-typos-in-manpage.patch b/debian/patches/0001-Fix-typos-in-manpage.patch
deleted file mode 100644
index d410cc7..0000000
--- a/debian/patches/0001-Fix-typos-in-manpage.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From: Stephane Glondu <steph at glondu.net>
-Date: Tue, 5 Jan 2010 17:27:36 +0100
-Subject: [PATCH] Fix typos in manpage
-
----
- man/camlp5.1.tpl |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/man/camlp5.1.tpl b/man/camlp5.1.tpl
-index 9fdf2ab..a10d718 100644
---- a/man/camlp5.1.tpl
-+++ b/man/camlp5.1.tpl
-@@ -107,7 +107,7 @@ object files (ending with .cmo or .cma). Several usage of these options
- are authorized. They must precede the other options.
- 
- .LP
--An optionnal
-+An optional
- .B \-\-
- may end the load options.
- 
-@@ -300,7 +300,7 @@ the command line as ".cmi" files. For example, how to add the the
- OCaml module "str":
- .nf
- .ta 1c
--	mkcamlp5 -custom str.cmi str.cma -cclib -lstr -o camlp5str
-+	mkcamlp5 \-custom str.cmi str.cma \-cclib \-lstr \-o camlp5str
- .fi
- .LP
- 
--- 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 65871ce..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-Fix-typos-in-manpage.patch

-- 
camlp5 packaging



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