[Pkg-ocaml-maint-commits] [SCM] obus packaging branch, master, updated. debian/1.0.rc1-1-5-ga5188df

[Stephane Glondu]

The following commit has been merged in the master branch:
commit acf710ea9afef29594480a56ac9dfaa325cce7d3
Author: Stephane Glondu <steph at glondu.net>
Date:   Thu Apr 29 08:25:15 2010 +0200

    Switch source package format to 3.0 (quilt)
    
    Convert direct changes to upstream sources to
    0001-Fix-build-on-bytecode-architectures.patch.

diff --git a/Makefile b/Makefile
index 2d4b927..723621d 100644
--- a/Makefile
+++ b/Makefile
@@ -93,12 +93,12 @@ install: prefix
 	 bindings/*/*.mli \
 	 _build/src/*.cmi \
 	 _build/bindings/*/*.cmi \
-	 $(wildcard _build/src/*.cmx) \
-	 $(wildcard _build/bindings/*/*.cmx) \
+	 _build/src/*.cmx \
+	 _build/bindings/*/*.cmx \
 	 _build/*.cma \
-	 $(wildcard _build/*.cmxa) \
-	 $(wildcard _build/*.cmxs) \
-	 $(wildcard _build/*.a)
+	 _build/*.cmxa \
+	 _build/*.cmxs \
+	 _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/0001-Fix-build-on-bytecode-architectures.patch b/debian/patches/0001-Fix-build-on-bytecode-architectures.patch
new file mode 100644
index 0000000..b6dbc4c
--- /dev/null
+++ b/debian/patches/0001-Fix-build-on-bytecode-architectures.patch
@@ -0,0 +1,32 @@
+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/series b/debian/patches/series
new file mode 100644
index 0000000..c6c94b1
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Fix-build-on-bytecode-architectures.patch
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)

-- 
obus packaging