[Pkg-ocaml-maint-commits] [SCM] cudf packaging branch, master, updated. debian/0.5.99-2-3-g7587734

[Stefano Zacchiroli]

The following commit has been merged in the master branch:
commit 75877349911b694648a69f4d38a2197b31a1ac1b
Author: Stefano Zacchiroli <zack at upsilon.cc>
Date:   Wed Jun 1 09:58:47 2011 +0200

    new upstream release, drop integrated patches

diff --git a/debian/changelog b/debian/changelog
index 44618d5..9b2cfa4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+cudf (0.6-1) unstable; urgency=low
+
+  * New upstream release; highlights:
+    - speed improvements in the pretty printing engine and in cudf-check
+    - fixes in the pretty printing engine
+  * debian/patches/
+    - drop link-caml_hash_variant-with-ldl.patch (integrated upstream)
+
+ -- Stefano Zacchiroli <zack at debian.org>  Wed, 01 Jun 2011 09:55:06 +0200
+
 cudf (0.5.99-2) unstable; urgency=low
 
   [ Ralf Treinen ]
diff --git a/debian/patches/link-caml_hash_variant-with-ldl.patch b/debian/patches/link-caml_hash_variant-with-ldl.patch
deleted file mode 100644
index 1f36176..0000000
--- a/debian/patches/link-caml_hash_variant-with-ldl.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Description: link caml_hash_variant with -ldl
- without that, one can run into the following issues, on non-Linux systems:
-   cc -Wall -DG_LOG_DOMAIN=\"libCUDF\" -o caml_hash_variant caml_hash_variant.o dummy.o -L/usr/lib/ocaml -lcamlrun -lm -lcurses
-   /usr/lib/ocaml/libcamlrun.a(unix.o): In function `caml_dlerror':
-   (.text+0x16c): undefined reference to `dlerror'
-   /usr/lib/ocaml/libcamlrun.a(unix.o): In function `caml_dlsym':
-   (.text+0x17a): undefined reference to `dlsym'
-   /usr/lib/ocaml/libcamlrun.a(unix.o): In function `caml_dlclose':
-   (.text+0x19e): undefined reference to `dlclose'
-   /usr/lib/ocaml/libcamlrun.a(unix.o): In function `caml_dlopen':
-   (.text+0x1bb): undefined reference to `dlopen'
-   collect2: ld returned 1 exit status
-Author: Cyril Brulebois <kibi at debian.org>
-Last-Update: 2010-11-05
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=602489
----
- c-lib/Makefile.variants |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/c-lib/Makefile.variants b/c-lib/Makefile.variants
-index 19af0ea..fdf2655 100644
---- a/c-lib/Makefile.variants
-+++ b/c-lib/Makefile.variants
-@@ -65,7 +65,7 @@ cudf-variants.h: caml_hash_variant Makefile.variants
- caml_hash_variant: caml_hash_variant.o
- 	> dummy.ml
- 	ocamlc -o dummy.o -output-obj dummy.ml
--	$(CC) $(CFLAGS) -o $@ $< dummy.o -L$(OCAML_LIBDIR) -lcamlrun -lm -lcurses
-+	$(CC) $(CFLAGS) -o $@ $< dummy.o -L$(OCAML_LIBDIR) -lcamlrun -lm -lcurses -ldl
- 	@rm -f dummy.*
- 
- clean: clean-variants
--- 
diff --git a/debian/patches/series b/debian/patches/series
index 8e6c57d..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-link-caml_hash_variant-with-ldl.patch

-- 
cudf packaging