[Pkg-ocaml-maint-commits] [SCM] otags packaging branch, master, updated. debian/3.09.3-4-14-g2ab003d
Stephane Glondu
steph at glondu.net
Fri Mar 18 12:54:34 UTC 2011
The following commit has been merged in the master branch:
commit f3e776a76bc89aaad4c491d6dcbf7eab15c29ff3
Author: Stephane Glondu <steph at glondu.net>
Date: Fri Mar 18 13:47:02 2011 +0100
Fix patch name and add reference to #618757
diff --git a/debian/changelog b/debian/changelog
index 1a0cfe1..7c9cbe0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
otags (3.09.3.3-1~11) UNRELEASED; urgency=low
* New upstream release
- * Add 0004-Compatibility-with-Camlp5-6.02.2.patch, and bump versioned
- dependency to camlp5
+ * Add 0004-Compatibility-with-Camlp5-6.02.1.patch, and bump versioned
+ dependency to camlp5 (Closes: #618757)
* Update debian/watch
* Bump Standards-Version to 3.9.1 (no changes)
diff --git a/debian/patches/0004-Compatibility-with-Camlp5-6.02.2.patch b/debian/patches/0004-Compatibility-with-Camlp5-6.02.1.patch
similarity index 94%
rename from debian/patches/0004-Compatibility-with-Camlp5-6.02.2.patch
rename to debian/patches/0004-Compatibility-with-Camlp5-6.02.1.patch
index 503b69e..737a841 100644
--- a/debian/patches/0004-Compatibility-with-Camlp5-6.02.2.patch
+++ b/debian/patches/0004-Compatibility-with-Camlp5-6.02.1.patch
@@ -1,7 +1,8 @@
From: Stephane Glondu <steph at glondu.net>
Date: Tue, 16 Nov 2010 23:04:20 +0100
-Subject: [PATCH] Compatibility with Camlp5 6.02.2
+Subject: [PATCH] Compatibility with Camlp5 6.02.1
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=618757
---
pr.ml | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/debian/patches/series b/debian/patches/series
index 2f70220..e6cc530 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,4 @@
0001-Change-install-directory.patch
0002-Use-camlp5-instead-of-camlp4.patch
0003-Do-not-set-an-upper-bound-on-supported-OCaml-version.patch
-0004-Compatibility-with-Camlp5-6.02.2.patch
+0004-Compatibility-with-Camlp5-6.02.1.patch
--
otags packaging
More information about the Pkg-ocaml-maint-commits
mailing list