[Pkg-ocaml-maint-commits] [SCM] perl4caml packaging branch, master, updated. debian/0.9.5-1-1-gdd0855c

[Stephane Glondu]

The following commit has been merged in the master branch:
commit dd0855c71fc997ac39c5146a8c6030246ec7f196
Author: Stephane Glondu <steph at glondu.net>
Date:   Tue Feb 24 08:33:29 2009 +0100

    Fix 10_Makefile.dpatch to handle tests on bytecode-only architectures

diff --git a/debian/changelog b/debian/changelog
index 0b07170..65a954e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+perl4caml (0.9.5-2) UNRELEASED; urgency=low
+
+  * Fix 10_Makefile.dpatch to handle tests on bytecode-only architectures
+    (fixes FTBFS)
+
+ -- Stephane Glondu <steph at glondu.net>  Tue, 24 Feb 2009 08:46:29 +0100
+
 perl4caml (0.9.5-1) unstable; urgency=low
 
   * Acknowledge NMU
diff --git a/debian/patches/10_Makefile.dpatch b/debian/patches/10_Makefile.dpatch
index 239c670..6a7dfa6 100755
--- a/debian/patches/10_Makefile.dpatch
+++ b/debian/patches/10_Makefile.dpatch
@@ -5,10 +5,11 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad perl4caml-0.9.3/Makefile /tmp/dpep.RbqfpB/perl4caml-0.9.3/Makefile
---- perl4caml-0.9.3/Makefile	2005-05-03 22:05:05.246071082 -0400
-+++ /tmp/dpep.RbqfpB/perl4caml-0.9.3/Makefile	2005-05-03 22:10:11.837276478 -0400
-@@ -4,6 +4,10 @@
+diff --git a/Makefile b/Makefile
+index 4827101..f79b054 100644
+--- a/Makefile
++++ b/Makefile
+@@ -20,6 +20,10 @@
  
  include Makefile.config
  
@@ -19,7 +20,7 @@ diff -urNad perl4caml-0.9.3/Makefile /tmp/dpep.RbqfpB/perl4caml-0.9.3/Makefile
  OCAMLC := ocamlc
  OCAMLOPT := ocamlopt
  OCAMLMKLIB := ocamlmklib
-@@ -52,7 +56,11 @@
+@@ -71,7 +75,11 @@ WRAPPERS := \
  	wrappers/pl_Template.cmo \
  	wrappers/pl_WWW_Mechanize.cmo
  
@@ -31,7 +32,7 @@ diff -urNad perl4caml-0.9.3/Makefile /tmp/dpep.RbqfpB/perl4caml-0.9.3/Makefile
  
  perl4caml.cma: perl.cmo perl_c.o $(WRAPPERS)
  	$(OCAMLMKLIB) -o perl4caml $(LIBPERL) $^
-@@ -60,9 +68,14 @@
+@@ -79,12 +87,20 @@ perl4caml.cma: perl.cmo perl_c.o $(WRAPPERS)
  perl4caml.cmxa: perl.cmx perl_c.o $(WRAPPERS:.cmo=.cmx)
  	$(OCAMLMKLIB) -o perl4caml $(LIBPERL) $^
  
@@ -44,9 +45,17 @@ diff -urNad perl4caml-0.9.3/Makefile /tmp/dpep.RbqfpB/perl4caml-0.9.3/Makefile
 +	examples/parsedate.bc
 +endif
  
- TEST_PROGRAMS := $(patsubst %.ml,%.bc,$(wildcard test/*.ml)) \
- 	$(patsubst %.ml,%.opt,$(wildcard test/*.ml))
-@@ -142,10 +155,17 @@
+-TEST_PROGRAMS := $(patsubst %.ml,%.bc,$(wildcard test/*.ml)) \
+-	$(patsubst %.ml,%.opt,$(wildcard test/*.ml))
++TEST_PROGRAMS := $(patsubst %.ml,%.bc,$(wildcard test/*.ml))
++
++ifdef HASOCAMLOPT
++TEST_PROGRAMS += $(patsubst %.ml,%.opt,$(wildcard test/*.ml))
++endif
+ 
+ test: $(TEST_PROGRAMS) run-tests
+ 
+@@ -161,10 +177,17 @@ install:
  	rm -rf $(DESTDIR)$(OCAMLLIBDIR)/perl
  	install -c -m 0755 -d $(DESTDIR)$(OCAMLLIBDIR)/perl
  	install -c -m 0755 -d $(DESTDIR)$(OCAMLLIBDIR)/stublibs
@@ -64,3 +73,10 @@ diff -urNad perl4caml-0.9.3/Makefile /tmp/dpep.RbqfpB/perl4caml-0.9.3/Makefile
  	install -c -m 0644 dllperl4caml.so $(DESTDIR)$(OCAMLLIBDIR)/stublibs
  
  # Distribution.
+@@ -220,4 +243,4 @@ html/index.html: $(wildcard *.ml) $(wildcard *.mli) $(wildcard wrappers/*.ml)
+ 	mkdir html
+ 	-$(OCAMLDOC) $(OCAMLDOCFLAGS) -d html $^
+ 
+-.PHONY: depend dist check-manifest html dpkg test run-tests
+\ No newline at end of file
++.PHONY: depend dist check-manifest html dpkg test run-tests

-- 
perl4caml packaging