[Pkg-ocaml-maint-commits] [SCM] calendar packaging branch, master, updated. debian/2.01.1-1-1-gf205675

[Stefano Zacchiroli]

The following commit has been merged in the master branch:
commit f205675d531c6ca13eea3ac7012393a8569d7084
Author: Stefano Zacchiroli <zack at upsilon.cc>
Date:   Mon Mar 2 23:11:00 2009 +0100

    expand *.cmxa only if *.cmxa are actually there

diff --git a/debian/changelog b/debian/changelog
index 27e10ef..36bafa9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+calendar (2.01.1-2) unstable; urgency=low
+
+  * debian/patches/*
+    - install_destdir.dpatch: use $(wilcard...) to expand *.cmxa only if
+      they are actually there. Fix FTBFS on byte archs. (Closes: #517702)
+
+ -- Stefano Zacchiroli <zack at debian.org>  Mon, 02 Mar 2009 23:08:38 +0100
+
 calendar (2.01.1-1) unstable; urgency=low
 
   * New Upstream Version
diff --git a/debian/patches/install_destdir.dpatch b/debian/patches/install_destdir.dpatch
index 99ed6c2..a1dd210 100755
--- a/debian/patches/install_destdir.dpatch
+++ b/debian/patches/install_destdir.dpatch
@@ -6,8 +6,8 @@
 
 @DPATCH@
 diff -urNad calendar~/Makefile.in calendar/Makefile.in
---- calendar~/Makefile.in	2009-02-18 18:36:21.000000000 +0100
-+++ calendar/Makefile.in	2009-02-18 18:38:17.944672051 +0100
+--- calendar~/Makefile.in	2009-02-28 22:05:15.000000000 +0100
++++ calendar/Makefile.in	2009-03-02 23:08:26.479547401 +0100
 @@ -191,10 +191,12 @@
  # Install
  #########
@@ -18,7 +18,7 @@ diff -urNad calendar~/Makefile.in calendar/Makefile.in
  	  (if test -d `ocamlfind install -help | grep destdir | sed -e "s/.*default: \(.*\))/\1/"`/$(NAME); then $(MAKE) uninstall; fi;\
 -	  $(CAMLFIND) install $(NAME) target/*.cm[iox] target/*.cma target/*.cmxa $(MLI) $(CMI) $(CLIBS) META\
 +	  mkdir -p $(OCAML_LIB_DIR);\
-+	  $(CAMLFIND) install -destdir $(OCAML_LIB_DIR) $(NAME) target/*.cm[iox] target/*.cma target/*.cmxa $(MLI) $(CMI) $(CLIBS) META\
++	  $(CAMLFIND) install -destdir $(OCAML_LIB_DIR) $(NAME) target/*.cm[iox] target/*.cma $(wildcard target/*.cmxa) $(MLI) $(CMI) $(CLIBS) META\
  	)else \
  	  (echo; echo "Not the good version. Please, do :"; \
  	   echo "  make clean && make"; \

-- 
calendar packaging