[Pkg-ocaml-maint-commits] [SCM] ocaml-bitmatch packaging branch, master, updated. debian/1.9.7-2-5-g00df673

[Sylvain Le Gall]

The following commit has been merged in the master branch:
commit 00df673a0be8683895b4365ab24ea73179ec399b
Author: Sylvain Le Gall <gildor at debian.org>
Date:   Fri Jun 26 22:47:39 2009 +0200

    New upstream release (2.0.0)

diff --git a/debian/changelog b/debian/changelog
index 0c8849c..f3d5179 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
-ocaml-bitstring (1.9.7-3) UNRELEASED; urgency=low
+ocaml-bitstring (2.0.0-1) UNRELEASED; urgency=low
 
   * Add debian/gbp.conf to force using pristine-tar
+  * New Upstream Version
+    * Updated debian/patches/*
 
- -- Sylvain Le Gall <gildor at debian.org>  Sat, 07 Mar 2009 16:05:36 +0100
+ -- Sylvain Le Gall <gildor at debian.org>  Fri, 26 Jun 2009 22:18:38 +0200
 
 ocaml-bitstring (1.9.7-2) unstable; urgency=low
 
diff --git a/debian/patches/01-byte-compilation.dpatch b/debian/patches/01-byte-compilation.dpatch
index 5183e24..bc53749 100644
--- a/debian/patches/01-byte-compilation.dpatch
+++ b/debian/patches/01-byte-compilation.dpatch
@@ -5,23 +5,23 @@
 ## DP: Allow byte only compilation.
 
 @DPATCH@
-Index: ocaml-bitmatch/Makefile.in
+Index: ocaml-bitstring/Makefile.in
 ===================================================================
---- ocaml-bitmatch.orig/Makefile.in	2009-02-28 04:33:44.000000000 +0100
-+++ ocaml-bitmatch/Makefile.in	2009-02-28 04:40:02.000000000 +0100
-@@ -25,6 +25,8 @@
- OCAMLDOC	= @OCAMLDOC@
- INSTALL		= @INSTALL@
+--- ocaml-bitstring.orig/Makefile.in	2009-06-26 22:18:38.000000000 +0200
++++ ocaml-bitstring/Makefile.in	2009-06-26 22:39:14.000000000 +0200
+@@ -33,6 +33,8 @@
+ OCAMLLIB	= @OCAMLLIB@
+ top_srcdir	= @top_srcdir@
  
 +OCAMLBEST       = @OCAMLBEST@
 +
  pkg_cil		= @pkg_cil@
  pkg_extlib	= @pkg_extlib@
  
-@@ -47,11 +49,14 @@
- TESTS		= $(patsubst %.ml,%,$(wildcard tests/*.ml))
+@@ -77,11 +79,15 @@
  
- all:	bitstring.cma bitstring_persistent.cma \
+ all:	$(BYTESWAP_H) \
+ 	bitstring.cma bitstring_persistent.cma \
 -	bitstring.cmxa bitstring_persistent.cmxa \
  	pa_bitstring.cmo \
  	bitstring-objinfo
@@ -31,15 +31,16 @@ Index: ocaml-bitmatch/Makefile.in
 +all:    bitstring.cmxa bitstring_persistent.cmxa 
 +endif 
 +
- bitstring.cma: bitstring_types.cmo bitstring_config.cmo bitstring.cmo \
- 	  bitmatch.cmo
- 	$(OCAMLFIND) ocamlc -a -o $@ $^
-@@ -171,7 +176,7 @@
++
+ bitstring.cma: bitstring_types.cmo bitstring_config.cmo \
+ 	  bitstring_c.o bitstring.cmo bitmatch.cmo
+ 	$(OCAMLMKLIB) -o bitstring $^
+@@ -268,7 +274,7 @@
  # Install.
  
  install:
--	ocamlfind install bitstring META *.mli *.cmx *.cma *.cmxa *.a \
-+	ocamlfind install bitstring META $(wildcard *.mli *.cmx *.cma *.cmxa *.a) \
+-	ocamlfind install bitstring META *.mli *.cmx *.cma *.cmxa *.a *.so \
++	ocamlfind install bitstring META $(wildcard *.mli *.cmx *.cma *.cmxa *.a *.so) \
  		bitstring.cmi \
  		bitstring_persistent.cmi \
  		pa_bitstring.cmo
diff --git a/debian/patches/add_dynlink.patch b/debian/patches/add_dynlink.patch
index 5fb7764..8dda6af 100644
--- a/debian/patches/add_dynlink.patch
+++ b/debian/patches/add_dynlink.patch
@@ -1,7 +1,7 @@
-Index: ocaml-bitmatch/META.in
+Index: ocaml-bitstring/META.in
 ===================================================================
---- ocaml-bitmatch.orig/META.in	2009-02-28 04:42:10.000000000 +0100
-+++ ocaml-bitmatch/META.in	2009-02-28 04:42:16.000000000 +0100
+--- ocaml-bitstring.orig/META.in	2008-10-06 10:40:57.000000000 +0200
++++ ocaml-bitstring/META.in	2009-06-26 22:40:44.000000000 +0200
 @@ -1,7 +1,7 @@
  name = "bitstring"
  version = "@PACKAGE_VERSION@"
@@ -11,16 +11,16 @@ Index: ocaml-bitmatch/META.in
  archive(byte) = "bitstring.cma"
  archive(native) = "bitstring.cmxa"
  
-Index: ocaml-bitmatch/Makefile.in
+Index: ocaml-bitstring/Makefile.in
 ===================================================================
---- ocaml-bitmatch.orig/Makefile.in	2009-02-28 04:42:19.000000000 +0100
-+++ ocaml-bitmatch/Makefile.in	2009-02-28 04:42:43.000000000 +0100
-@@ -84,7 +84,7 @@
- 
+--- ocaml-bitstring.orig/Makefile.in	2009-06-26 22:39:52.000000000 +0200
++++ ocaml-bitstring/Makefile.in	2009-06-26 22:42:38.000000000 +0200
+@@ -115,7 +115,7 @@
  bitstring-objinfo: bitstring_objinfo.cmo bitstring.cma bitstring_persistent.cma
  	$(OCAMLFIND) ocamlc -I +camlp4 unix.cma camlp4lib.cma \
+ 	  $(OCAMLCLIBS) \
 -	  bitstring.cma bitstring_persistent.cma \
 +	  bitstring.cma bitstring_persistent.cma -linkpkg -package dynlink \
  	  $< -o $@
  
- # Tests and examples.
+ # Create byteswap.h if the system doesn't have this file.
diff --git a/debian/rules b/debian/rules
index a8aaf9c..0ab615e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,7 +27,7 @@ DESTDIR_DEV=$(CURDIR)/debian/libbitstring-ocaml-dev
 DEB_MAKE_CLEAN_TARGET    := distclean
 DEB_MAKE_BUILD_TARGET    := all 
 DEB_MAKE_INSTALL_TARGET  := install 
-DEB_MAKE_INSTALL_TARGET  += OCAMLFIND_DESTDIR="$(DESTDIR_DEV)/$(OCAML_STDLIB_DIR)"
+DEB_MAKE_INSTALL_TARGET  += OCAMLFIND_DESTDIR="$(DESTDIR_DEV)/$(OCAML_STDLIB_DIR)" OCAMLFIND_LDCONF=ignore
 
 OCAML_OCAMLDOC_PACKAGES = libbitstring-ocaml-dev
 

-- 
ocaml-bitmatch packaging