[Pkg-ocaml-maint-commits] [SCM] camlbz2 packaging branch, build, updated. baa027e2f9683062a3e3afbda2f6b2f8c632da80

[Stefano Zacchiroli]

The following commit has been merged in the build branch:
commit baa027e2f9683062a3e3afbda2f6b2f8c632da80
Author: Stefano Zacchiroli <zack at upsilon.cc>
Date:   Sun Nov 9 00:37:35 2008 +0100

    patches for 0.6.0

diff --git a/debian/patches/fixes/make.diff b/debian/patches/fixes/make.diff
new file mode 100644
index 0000000..aae5e09
--- /dev/null
+++ b/debian/patches/fixes/make.diff
@@ -0,0 +1,55 @@
+From: Stefano Zacchiroli <zack at upsilon.cc>
+Subject: [PATCH] fixes/debian-build
+
+Various build-process fixes to for Debian packaging
+
+- proper distclean vs maintainer-clean target distinction
+- install without failing when ocamlopt is not available
+
+Signed-off-by: Stefano Zacchiroli <zack at upsilon.cc>
+
+---
+ Makefile.in |   13 ++++++++-----
+ 1 files changed, 8 insertions(+), 5 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 4df223d..125f476 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -19,8 +19,8 @@ NAME := camlbz2
+ SHORTNAME := bz2
+ VERSION := 0.6.0
+ 
+-INSTALLFILES := $(SHORTNAME).cmi $(SHORTNAME).cmx $(SHORTNAME).mli \
+-	$(SHORTNAME).a $(SHORTNAME).cma $(SHORTNAME).cmxa \
++INSTALLFILES := \
++	$(SHORTNAME).cmi $(SHORTNAME).mli $(SHORTNAME).cma \
+ 	dll$(NAME).so lib$(NAME).a
+ 
+ DISTSRC := $(SHORTNAME).ml $(SHORTNAME).mli \
+@@ -35,6 +35,7 @@ DESTDIR =
+ ifndef OCAMLOPT
+ all : stub lib
+ else
++INSTALLFILES += $(SHORTNAME).cmx $(SHORTNAME).cmxa $(SHORTNAME).a
+ all : stub lib libopt
+ endif
+ 
+@@ -86,10 +87,12 @@ findlib-install: all
+ 		$(SHORTNAME) META $(INSTALLFILES)
+ 
+ clean:
+-	rm -f *.cm* *.a *.so *.o *.opt test test.opt
++	rm -f *.cm* *.a *.so *.o *.opt test test.opt .depend
+ distclean: clean
+-	rm -rf .depend Makefile aclocal.m4 autom4te.cache/ doc/
+-	rm -f config.log config.status configure
++	rm -f config.log config.status Makefile
++maintainer-clean: distclean
++	rm -rf aclocal.m4 doc/
++	rm -f aclocal.m4 configure
+ 
+ ifdef OCAMLDOC
+ doc : doc/index.html
+-- 
+tg: (b462450..) fixes/make (depends on: upstream)
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..f668ba3
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+fixes/make.diff -p1

-- 
camlbz2 packaging