[Pkg-ocaml-maint-commits] r3748 - in /trunk/packages/ocurl/trunk/debian: changelog control patches/00dpatch.conf patches/00list patches/01_makefile.in.dpatch patches/02_configure.dpatch

gareuselesinge at users.alioth.debian.org gareuselesinge at users.alioth.debian.org
Tue May 15 09:24:16 UTC 2007 

Author: gareuselesinge
Date: Tue May 15 09:24:16 2007
New Revision: 3748

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=3748
Log:
a bunch of fixes for the new curl abi

Added:
    trunk/packages/ocurl/trunk/debian/patches/02_configure.dpatch   (with props)
Modified:
    trunk/packages/ocurl/trunk/debian/changelog
    trunk/packages/ocurl/trunk/debian/control
    trunk/packages/ocurl/trunk/debian/patches/00dpatch.conf
    trunk/packages/ocurl/trunk/debian/patches/00list
    trunk/packages/ocurl/trunk/debian/patches/01_makefile.in.dpatch

Modified: trunk/packages/ocurl/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocurl/trunk/debian/changelog?rev=3748&op=diff
==============================================================================
--- trunk/packages/ocurl/trunk/debian/changelog (original)
+++ trunk/packages/ocurl/trunk/debian/changelog Tue May 15 09:24:16 2007
@@ -1,9 +1,9 @@
 ocurl (0.2.1-8) unstable; urgency=low
 
   * moved to ocaml CBDS class
-  * rebuilt against 3.09.3
+  * rebuilt against curl abi 4 (Closes: #423816)
 
- -- Enrico Tassi <gareuselesinge at debian.org>  Mon, 18 Sep 2006 16:23:33 +0200
+ -- Enrico Tassi <gareuselesinge at debian.org>  Mon, 14 May 2007 17:30:13 +0200
 
 ocurl (0.2.1-7) unstable; urgency=low
 

Modified: trunk/packages/ocurl/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocurl/trunk/debian/control?rev=3748&op=diff
==============================================================================
--- trunk/packages/ocurl/trunk/debian/control (original)
+++ trunk/packages/ocurl/trunk/debian/control Tue May 15 09:24:16 2007
@@ -2,7 +2,7 @@
 Section: libdevel
 Priority: optional
 Maintainer: Enrico Tassi <gareuselesinge at debian.org>
-Build-Depends: debhelper (>= 4.0.0), libcurl3-gnutls-dev (>= 7.15.0-2), ocaml-nox (>= 3.09.3), dpatch, ocaml-findlib (>= 1.1), libkrb5-dev, cdbs
+Build-Depends: debhelper (>= 4.0.0), libcurl4-gnutls-dev (>= 7.15.0-2), ocaml-nox (>= 3.09.2), dpatch, ocaml-findlib (>= 1.1), libkrb5-dev, cdbs
 Standards-Version: 3.7.2
 XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/ocurl
 XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocurl/trunk/
@@ -10,7 +10,7 @@
 Package: libcurl-ocaml-dev
 Architecture: any
 Section: libdevel
-Depends: libcurl-ocaml (= ${binary:Version}), libcurl3-gnutls-dev (>= 7.15.0-2), ocaml-nox-${F:OCamlABI}, ocaml-findlib (>= 1.1)
+Depends: libcurl-ocaml (= ${binary:Version}), libcurl4-gnutls-dev (>= 7.15.0-2), ocaml-nox-${F:OCamlABI}, ocaml-findlib (>= 1.1)
 Description: ocaml libcurl bindings
  This Objective Caml library provides multi-protocol file transfer
  facilities based on the curl library.

Modified: trunk/packages/ocurl/trunk/debian/patches/00dpatch.conf
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocurl/trunk/debian/patches/00dpatch.conf?rev=3748&op=diff
==============================================================================
--- trunk/packages/ocurl/trunk/debian/patches/00dpatch.conf (original)
+++ trunk/packages/ocurl/trunk/debian/patches/00dpatch.conf Tue May 15 09:24:16 2007
@@ -1,2 +1,2 @@
 conf_origtargzpath=../upstream/
-conf_debianonlyconf_debianonly=1
+conf_debianonly=1

Modified: trunk/packages/ocurl/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocurl/trunk/debian/patches/00list?rev=3748&op=diff
==============================================================================
--- trunk/packages/ocurl/trunk/debian/patches/00list (original)
+++ trunk/packages/ocurl/trunk/debian/patches/00list Tue May 15 09:24:16 2007
@@ -1,1 +1,2 @@
 01_makefile.in.dpatch
+02_configure.dpatch

Modified: trunk/packages/ocurl/trunk/debian/patches/01_makefile.in.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocurl/trunk/debian/patches/01_makefile.in.dpatch?rev=3748&op=diff
==============================================================================
--- trunk/packages/ocurl/trunk/debian/patches/01_makefile.in.dpatch (original)
+++ trunk/packages/ocurl/trunk/debian/patches/01_makefile.in.dpatch Tue May 15 09:24:16 2007
@@ -5,9 +5,9 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad trunk~/Makefile.in trunk/Makefile.in
---- trunk~/Makefile.in	2004-07-20 23:32:44.000000000 +0200
-+++ trunk/Makefile.in	2006-09-17 14:52:18.000000000 +0200
+diff -urNad ocurl-0.2.0/Makefile.in /tmp/dpep.aNDt9h/ocurl-0.2.0/Makefile.in
+--- ocurl-0.2.0/Makefile.in	2005-04-02 17:02:15.382924240 +0000
++++ /tmp/dpep.aNDt9h/ocurl-0.2.0/Makefile.in	2005-04-02 17:03:45.555215968 +0000
 @@ -10,7 +10,7 @@
  INSTALL		= @INSTALL@
  INSTALLDATA	= @INSTALL_DATA@
@@ -17,13 +17,67 @@
  OCBYTE		= @OCAMLC@
  OCOPT		= @OCAMLOPT@
  
-@@ -69,7 +69,8 @@
+@@ -31,9 +31,9 @@
+ CURLCLIBS	= -cclib -lcurl-helper -cclib "@CURLLIBS@"
+ 
+ ifeq (@OCAMLBEST@,opt)
+-TARGETS		= curl.cma curl.cmxa libcurl-helper.a
++TARGETS		= curl.cma curl.cmxa libcurl-helper.a dllcurl-helper.so
+ else
+-TARGETS		= curl.cma libcurl-helper.a
++TARGETS		= curl.cma libcurl-helper.a dllcurl-helper.so
+ endif
+ 
+ all:
+@@ -45,11 +45,11 @@
+ examples:
+ 		(cd examples; $(MAKE))
+ 
+-curl.cma:	$(CURLBCOBJS) libcurl-helper.a
+-		$(OCBYTE) -custom -a $(FLAGS) $(CURLFLAGS) -o $@ $(CURLBCOBJS) $(CURLCLIBS)
++curl.cma:	$(CURLBCOBJS) dllcurl-helper.so
++		ocamlmklib  -o curl $(CURLBCOBJS) -oc curl-helper @CURLLIBS@
+ 
+-curl.cmxa:	$(CURLOBJS) libcurl-helper.a
+-		$(OCOPT) -a $(FLAGS) $(CURLFLAGS) $(LIBS) $(CURLOBJS) -o $@ $(CURLCLIBS)
++curl.cmxa:	$(CURLOBJS) dllcurl-helper.so
++		ocamlmklib  -o curl $(CURLOBJS) -oc curl-helper @CURLLIBS@
+ 
+ .ml.cmx:
+ 		$(OCOPT) -c $(FLAGS) $< -o $@
+@@ -60,17 +60,19 @@
+ .ml.cmo:
+ 		$(OCBYTE) -c $(FLAGS) $< -o $@
+ 
+-libcurl-helper.a:	$(CURLHELPEROBJS)
+-		ar crus libcurl-helper.a $(CURLHELPEROBJS)
+-		ranlib libcurl-helper.a
++libcurl-helper.a dllcurl-helper.so:	$(CURLHELPEROBJS)
++		ocamlmklib  -oc curl-helper $(CURLHELPEROBJS) \
++			@CURLLIBS@
+ 
+ .c.o:
+-		$(CC) -c $(CFLAGS) $(CAMLINCDIR) $< -o $@
++	        $(OC) -c -ccopt "$(CFLAGS)" $<
  
  install:
  ifeq ($(FINDLIB),ocamlfind)
 -		ocamlfind install curl META $(wildcard *.cmi) \
-+		ocamlfind install -destdir $(DESTDIR) \
+-			 $(wildcard *.a) $(wildcard *.cma) $(wildcard *.cmxa)
++		ocamlfind install -destdir $(DESTDIR) -ldconf ignore \
 +			curl META $(wildcard *.cmi) \
- 			 $(wildcard *.a) $(wildcard *.cma) $(wildcard *.cmxa)
++			 $(wildcard *.a) $(wildcard *.cma) \
++			 $(wildcard *.cmxa) $(wildcard *.so) $(wildcard *.mli)
  else
  		mkdir -p $(INSTALLDIR)
+ 		$(INSTALLDATA) curl.cma $(INSTALLDIR)
+@@ -83,7 +85,8 @@
+ 
+ 
+ clean:
+-		@rm -f $(TARGETS) *~ *.cm* *.o *.a .depend core
++		@rm -f $(TARGETS) *~ *.cm* *.o *.a *.so .depend core
++		@rm -f foo.ld.conf
+ 		@(cd examples; $(MAKE) clean)
+ 
+ depend:

Added: trunk/packages/ocurl/trunk/debian/patches/02_configure.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocurl/trunk/debian/patches/02_configure.dpatch?rev=3748&op=file
==============================================================================
--- trunk/packages/ocurl/trunk/debian/patches/02_configure.dpatch (added)
+++ trunk/packages/ocurl/trunk/debian/patches/02_configure.dpatch Tue May 15 09:24:16 2007
@@ -1,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_configure.dpatch by Enrico Tassi <gareuselesinge at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad trunk~/configure trunk/configure
+--- trunk~/configure	2004-07-20 23:32:44.000000000 +0200
++++ trunk/configure	2007-05-15 11:13:58.000000000 +0200
+@@ -1216,8 +1216,8 @@
+ 
+ 
+ CURLDIR=`curl-config --cflags`
+-CURLFLAGS=`curl-config --libs | cut -d ' ' -f 1`
+-CURLLIBS=`curl-config --libs | cut -d ' ' -f 2-`
++CURLFLAGS='-L .'
++CURLLIBS=`curl-config --libs`
+ 
+ CFLAGS=$CURLDIR
+ 

Propchange: trunk/packages/ocurl/trunk/debian/patches/02_configure.dpatch
------------------------------------------------------------------------------
    svn:executable = *

More information about the Pkg-ocaml-maint-commits mailing list