[Pkg-ocaml-maint-commits] [SCM] ocaml-zarith packaging branch, master, updated. debian/1.0-3-2-ge2ed6db

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit 243ed797f159a06eb9325d6299a1de883088d665
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Wed Oct 19 17:47:25 2011 +0200

    Remove 0002-Fix-install-target.patch and adapt debian/rules instead.

diff --git a/debian/changelog b/debian/changelog
index 0ab75c3..a0f01c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ocaml-zarith (1.0-4) UNRELEASED; urgency=low
+
+  * Remove 0002-Fix-install-target.patch and adapt debian/rules instead.
+
+ -- Mehdi Dogguy <mehdi at debian.org>  Wed, 19 Oct 2011 17:40:05 +0200
+
 ocaml-zarith (1.0-3) experimental; urgency=low
 
   * Do not try to build zarith.a on bytecode only architectures.
diff --git a/debian/patches/0002-Fix-install-target.patch b/debian/patches/0002-Fix-install-target.patch
deleted file mode 100644
index e16b741..0000000
--- a/debian/patches/0002-Fix-install-target.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: Mehdi Dogguy <mehdi at debian.org>
-Date: Thu, 29 Sep 2011 09:05:18 +0200
-Subject: [PATCH] Fix install target
-
----
- project.mak |    5 ++++-
- 1 files changed, 4 insertions(+), 1 deletions(-)
-
-diff --git a/project.mak b/project.mak
-index 470c8a1..2e3e9f7 100644
---- a/project.mak
-+++ b/project.mak
-@@ -80,10 +80,13 @@ endif
- 
- ifeq ($(INSTMETH),findlib)
- install:
--	$(OCAMLFIND) install -destdir $(INSTALLDIR) zarith META $(TOINSTALL) dllzarith.so
-+	mkdir -p $(INSTALLDIR)/stublibs/
-+	$(OCAMLFIND) install -destdir $(INSTALLDIR) zarith META $(TOINSTALL)
-+	cp dllzarith.so $(INSTALLDIR)/stublibs/
- 
- uninstall:
- 	$(OCAMLFIND) remove -destdir $(INSTALLDIR) zarith
-+	rm -f $(INSTALLDIR)/stublibs/dllzarith.so
- endif
- 
- 
--- 
diff --git a/debian/patches/0003-Make-it-byte-arch-aware.patch b/debian/patches/0002-Make-it-byte-arch-aware.patch
similarity index 97%
rename from debian/patches/0003-Make-it-byte-arch-aware.patch
rename to debian/patches/0002-Make-it-byte-arch-aware.patch
index f6ebd84..3c05848 100644
--- a/debian/patches/0003-Make-it-byte-arch-aware.patch
+++ b/debian/patches/0002-Make-it-byte-arch-aware.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] Make it byte-arch aware
  1 files changed, 13 insertions(+), 3 deletions(-)
 
 diff --git a/project.mak b/project.mak
-index 2e3e9f7..5ad2847 100644
+index 470c8a1..22b6c0b 100644
 --- a/project.mak
 +++ b/project.mak
 @@ -22,13 +22,23 @@ MLISRC = z.mli q.mli big_int_Z.mli
diff --git a/debian/patches/0004-Disable-charset-when-calling-ocamldoc.patch b/debian/patches/0003-Disable-charset-when-calling-ocamldoc.patch
similarity index 95%
rename from debian/patches/0004-Disable-charset-when-calling-ocamldoc.patch
rename to debian/patches/0003-Disable-charset-when-calling-ocamldoc.patch
index c1c14ce..8dbf05f 100644
--- a/debian/patches/0004-Disable-charset-when-calling-ocamldoc.patch
+++ b/debian/patches/0003-Disable-charset-when-calling-ocamldoc.patch
@@ -9,7 +9,7 @@ Debian yet. We should drop this patch as soon as it enters in.
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/project.mak b/project.mak
-index 5ad2847..d416c06 100644
+index 22b6c0b..2ef2e9e 100644
 --- a/project.mak
 +++ b/project.mak
 @@ -66,7 +66,7 @@ bitest: zarith.cmxa  bitest.cmx
diff --git a/debian/patches/0005-ocamlopt-is-not-really-required.patch b/debian/patches/0004-ocamlopt-is-not-really-required.patch
similarity index 100%
rename from debian/patches/0005-ocamlopt-is-not-really-required.patch
rename to debian/patches/0004-ocamlopt-is-not-really-required.patch
diff --git a/debian/patches/0006-Detect-more-arch-triplets.patch b/debian/patches/0005-Detect-more-arch-triplets.patch
similarity index 100%
rename from debian/patches/0006-Detect-more-arch-triplets.patch
rename to debian/patches/0005-Detect-more-arch-triplets.patch
diff --git a/debian/patches/series b/debian/patches/series
index d31a133..7fac211 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
 0001-added-failsafe-flag-to-ocamkmklib-seems-to-make-buil.patch
-0002-Fix-install-target.patch
-0003-Make-it-byte-arch-aware.patch
-0004-Disable-charset-when-calling-ocamldoc.patch
-0005-ocamlopt-is-not-really-required.patch
-0006-Detect-more-arch-triplets.patch
+0002-Make-it-byte-arch-aware.patch
+0003-Disable-charset-when-calling-ocamldoc.patch
+0004-ocamlopt-is-not-really-required.patch
+0005-Detect-more-arch-triplets.patch
diff --git a/debian/rules b/debian/rules
index 0e82de8..56c6125 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,6 +8,7 @@ override_dh_auto_install:
 ifneq (,$(findstring libzarith-ocaml-doc,$(shell dh_listpackages)))
 	$(MAKE) doc
 endif
+	mkdir -p $(CURDIR)/debian/tmp/$(OCAML_STDLIB_DIR)/stublibs
 	$(MAKE) install
 
 override_dh_auto_test:

-- 
ocaml-zarith packaging