[Pkg-ocaml-maint-commits] [SCM] janest-core packaging branch, master, updated. debian/0.5.0-2-1-g371fca1

[Stefano Zacchiroli]

The following commit has been merged in the master branch:
commit 371fca13c954e0a3b3bdcd21f9ad627a21cd4d6f
Author: Stefano Zacchiroli <zack at upsilon.cc>
Date:   Fri May 9 14:06:08 2008 +0200

    upload to unstable / disable arch-specific patch machinery
    
    * uploading to unstable
    * disabling the arch-specific patch machinery to give a try to bin-proc
      Arch:any. In that package it has been documented what works properly on
      all archs and what does not.

diff --git a/debian/README.source b/debian/README.source
index efe01b7..ebdf044 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -23,3 +23,8 @@ changes. In order to refresh the patch after changes you can use the
   fakeroot debian/rules no-bin-prot-patch
 
  -- Stefano Zacchiroli <zack at debian.org>  Sun, 04 May 2008 21:25:34 +0200
+
+UPDATE: the patch machinery has been disabled, we now try to build legacy
+        bin-prot everywhere
+
+ -- Stefano Zacchiroli <zack at debian.org>  Fri, 09 May 2008 14:04:05 +0200
diff --git a/debian/changelog b/debian/changelog
index 7a55d4c..8dbbe09 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+janest-core (0.5.0-3) unstable; urgency=low
+
+  * uploading to unstable
+  * disabling the arch-specific patch machinery to give a try to bin-proc
+    Arch:any. In that package it has been documented what works properly on
+    all archs and what does not.
+
+ -- Stefano Zacchiroli <zack at debian.org>  Fri, 09 May 2008 14:04:57 +0200
+
 janest-core (0.5.0-2) experimental; urgency=low
 
   * make the package Architecture: any
diff --git a/debian/rules b/debian/rules
index 7894653..00afb0a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,18 +9,22 @@ DEV_PKG_NAME = lib$(LIB_NAME)-ocaml-dev
 DEST_DIR = $(CURDIR)/debian/$(DEV_PKG_NAME)$(OCAML_STDLIB_DIR)
 DEST_DLL_DIR = $(CURDIR)/debian/$(DLL_PKG_NAME)$(OCAML_DLL_DIR)
 
-# If bin_prot is available we compile legacy library and depend on it, if it is
-# not we patch the code to avoid requiring bin_prot. The list of archs below
-# must match the archs on which libbin-prot-camlp4-dev package is available.
-# When changing this list please remember to change README.Debian accordingly.
-BIN_PROT_ARCHS = i386 amd64
-
-ifeq (,$(findstring $(DEB_HOST_ARCH),$(BIN_PROT_ARCHS)))
-# bin_prot is not available, we need to patch the code ...
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-else # bin_prot is available, add its dependency to control
+# XXX currently disabled, we will give a try at compiling bin-prot everywhere,
+# XXX mentioning what doesn't work in its README.Debian
+## If bin_prot is available we compile legacy library and depend on it, if it is
+## not we patch the code to avoid requiring bin_prot. The list of archs below
+## must match the archs on which libbin-prot-camlp4-dev package is available.
+## When changing this list please remember to change README.Debian accordingly.
+#BIN_PROT_ARCHS = i386 amd64
+
+#ifeq (,$(findstring $(DEB_HOST_ARCH),$(BIN_PROT_ARCHS)))
+## bin_prot is not available, we need to patch the code ...
+#include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+#else # bin_prot is available, add its dependency to control
+#DEB_DH_GENCONTROL_ARGS += -VF:OCamlArchDeps="libbin-prot-camlp4-dev"
+#endif
+
 DEB_DH_GENCONTROL_ARGS += -VF:OCamlArchDeps="libbin-prot-camlp4-dev"
-endif
 
 ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
 DEB_MAKE_BUILD_TARGET = all

-- 
janest-core packaging