[Pkg-ocaml-maint-commits] [SCM] cryptokit packaging branch, master, updated. debian/1.3-11-1-gb0a711f

Stephane Glondu steph at glondu.net
Wed Apr 15 23:25:11 UTC 2009


The following commit has been merged in the master branch:
commit b0a711f0273b1fbcdb715b4e6b1f04f7473c0e66
Author: Mehdi Dogguy <Mehdi.Dogguy at pps.jussieu.fr>
Date:   Wed Apr 15 23:09:25 2009 +0200

    Replace ifdef with ifneq, Fixes FTBTS, Bug:#524247

diff --git a/debian/changelog b/debian/changelog
index 4800374..8934a5b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+cryptokit (1.3-12) unstable; urgency=low
+
+  * Used ifeq instead of ifdef in debian/rules: a variable can be defined
+    and empty. Fixes FTBFS on non-native archs, Closes: #524247.
+  * Add myself to Uploaders.
+
+ -- Mehdi Dogguy <dogguy at pps.jussieu.fr>  Wed, 15 Apr 2009 22:31:51 +0200
+
 cryptokit (1.3-11) unstable; urgency=low
 
   * Add myself to Uploaders and DMUA
diff --git a/debian/control b/debian/control
index aff06cf..22fa1c5 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,8 @@ Uploaders:
  Stefano Zacchiroli <zack at debian.org>,
  Sven Luther <luther at debian.org>,
  Sylvain Le Gall <gildor at debian.org>,
- Stephane Glondu <steph at glondu.net>
+ Stephane Glondu <steph at glondu.net>,
+ Mehdi Dogguy <dogguy at pps.jussieu.fr>
 DM-Upload-Allowed: yes
 Build-Depends: cdbs (>= 0.4.23-1.1), ocaml-nox (>= 3.11), debhelper (>= 7), zlib1g-dev, dpkg-dev (>= 1.13.19), dh-ocaml
 Standards-Version: 3.8.1
diff --git a/debian/rules b/debian/rules
index a16266d..1d4c5a4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -46,7 +46,7 @@ OCAML_OCAMLDOC_PACKAGES := libcryptokit-ocaml-dev
 CFLAGS += -DHAVE_ZLIB
 
 build/libcryptokit-ocaml::
-ifdef OCAML_OPT_ARCH
+ifneq ($(OCAML_OPT_ARCH),)
 	ocamlopt -I . -shared -linkall -o cryptokit.cmxs cryptokit.cmxa
 endif
 

-- 
cryptokit packaging



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