[Pkg-ocaml-maint-commits] [SCM] obus packaging branch, master, updated. debian/1.0.rc1-2-9-g1910a09
Nicolas Dandrimont
Nicolas.Dandrimont at crans.org
Sun Apr 24 18:17:36 UTC 2011
The following commit has been merged in the master branch:
commit 6f5823d46cd8579911ed58bcc6645c238caea878
Author: Nicolas Dandrimont <Nicolas.Dandrimont at crans.org>
Date: Sun Apr 24 19:59:21 2011 +0200
Drop patches (fixed upstream)
diff --git a/debian/changelog b/debian/changelog
index 86f2934..6f0c681 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,10 @@
obus (1.1.2-1) experimental; urgency=low
* New upstream release
+ - Drop patches (fixed upstream)
* Bump required OCaml version to 3.12.0, lwt to 2.2.0
- -- Nicolas Dandrimont <nicolas.dandrimont at crans.org> Tue, 19 Apr 2011 11:34:07 +0200
+ -- Nicolas Dandrimont <nicolas.dandrimont at crans.org> Sun, 24 Apr 2011 19:59:01 +0200
obus (1.0~rc1-2) experimental; urgency=low
diff --git a/debian/patches/0001-Fix-build-on-bytecode-architectures.patch b/debian/patches/0001-Fix-build-on-bytecode-architectures.patch
deleted file mode 100644
index b6dbc4c..0000000
--- a/debian/patches/0001-Fix-build-on-bytecode-architectures.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From: Stephane Glondu <steph at glondu.net>
-Date: Thu, 29 Apr 2010 08:22:11 +0200
-Subject: [PATCH] Fix build on bytecode architectures
-
-Signed-off-by: Stephane Glondu <steph at glondu.net>
----
- Makefile | 10 +++++-----
- 1 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 723621d..2d4b927 100644
---- a/Makefile
-+++ b/Makefile
-@@ -93,12 +93,12 @@ install: prefix
- bindings/*/*.mli \
- _build/src/*.cmi \
- _build/bindings/*/*.cmi \
-- _build/src/*.cmx \
-- _build/bindings/*/*.cmx \
-+ $(wildcard _build/src/*.cmx) \
-+ $(wildcard _build/bindings/*/*.cmx) \
- _build/*.cma \
-- _build/*.cmxa \
-- _build/*.cmxs \
-- _build/*.a
-+ $(wildcard _build/*.cmxa) \
-+ $(wildcard _build/*.cmxs) \
-+ $(wildcard _build/*.a)
- install -vm 755 _build/tools/obus_introspect.best $(PREFIX)/bin/obus-introspect
- install -vm 755 _build/tools/obus_binder.best $(PREFIX)/bin/obus-binder
- install -vm 755 _build/tools/obus_dump.best $(PREFIX)/bin/obus-dump
---
diff --git a/debian/patches/0002-Fix-build-with-lwt-2.1.0.patch b/debian/patches/0002-Fix-build-with-lwt-2.1.0.patch
deleted file mode 100644
index 649017b..0000000
--- a/debian/patches/0002-Fix-build-with-lwt-2.1.0.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From: Stephane Glondu <steph at glondu.net>
-Date: Thu, 29 Apr 2010 08:12:04 +0200
-Subject: [PATCH] Fix build with lwt 2.1.0
-
-Signed-off-by: Stephane Glondu <steph at glondu.net>
----
- _tags | 2 +-
- myocamlbuild.ml | 1 +
- 2 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git a/_tags b/_tags
-index b8bacb3..86d8080 100644
---- a/_tags
-+++ b/_tags
-@@ -27,7 +27,7 @@
- <syntax/pa_monad.ml>: pkg_camlp4.quotations.r
-
- # Common dependencies
--<{src,src/private,tools,test,examples}/*>: pkg_lwt.unix, pkg_xmlm, pkg_react
-+<{src,src/private,tools,test,examples}/*>: pkg_lwt.unix, pkg_xmlm, pkg_lwt.react
-
- # Examples
- <examples/*>: use_obus
-diff --git a/myocamlbuild.ml b/myocamlbuild.ml
-index d2d2640..1247e3a 100644
---- a/myocamlbuild.ml
-+++ b/myocamlbuild.ml
-@@ -88,6 +88,7 @@ let packages = [
- "camlp4.quotations.o";
- "camlp4.quotations.r";
- "lwt";
-+ "lwt.react";
- "lwt.unix";
- "lwt.syntax";
- "str";
---
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 01a9bbe..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-0001-Fix-build-on-bytecode-architectures.patch
-0002-Fix-build-with-lwt-2.1.0.patch
--
obus packaging
More information about the Pkg-ocaml-maint-commits
mailing list