[Pkg-ocaml-maint-commits] [SCM] ocaml-bitstring packaging branch, master, updated. debian/2.0.0-5-10-g4474bc3

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit 7caa91f608bc738d06073dc3ebc3c2265b8d8f2d
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Sat Jan 9 11:35:14 2010 +0100

    Remove add_dynlink.patch: fixed upstream.

diff --git a/debian/changelog b/debian/changelog
index 8dc2c26..951cf3f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ ocaml-bitstring (2.0.2-1) UNRELEASED; urgency=low
 
   * New upstream release (Closes: #564222)
     + Remove fix_ARCH_ALIGN_INT64.dpatch: integrated upstream.
+    + Remove add_dynlink.patch: fixed upstream.
   * Add myself to uploaders.
   * Remove DMUA flag, not needed anymore.
 
diff --git a/debian/patches/add_dynlink.patch b/debian/patches/add_dynlink.patch
deleted file mode 100644
index 8dda6af..0000000
--- a/debian/patches/add_dynlink.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: ocaml-bitstring/META.in
-===================================================================
---- 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@"
- description = "Bitstrings and bitstring matching"
--requires = "unix"
-+requires = "dynlink unix"
- archive(byte) = "bitstring.cma"
- archive(native) = "bitstring.cmxa"
- 
-Index: ocaml-bitstring/Makefile.in
-===================================================================
---- 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 $@
- 
- # Create byteswap.h if the system doesn't have this file.
diff --git a/debian/patches/series b/debian/patches/series
index 73aa2f5..22452b2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,3 @@
 no-camlp4of-opt.patch
-add_dynlink.patch
 01-byte-compilation.dpatch
 update-configure.patch
-fix_ARCH_ALIGN_INT64.dpatch

-- 
ocaml-bitstring packaging