[Pkg-ocaml-maint-commits] [SCM] ocurl packaging branch, master, updated. debian/0.5.1-2-8-g7e3137e
Mehdi Dogguy
mehdi at debian.org
Wed Jul 21 08:56:01 UTC 2010
The following commit has been merged in the master branch:
commit 81073c609dcf7e1ad6af171d5fa96edd851ff805
Author: Mehdi Dogguy <mehdi at debian.org>
Date: Wed Apr 7 22:34:32 2010 +0200
Use quilt instead of dpatch
diff --git a/debian/changelog b/debian/changelog
index 68a3c2c..6074a86 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
ocurl (0.5.3-1) unstable; urgency=low
* New upstream release (Closes: #576824)
+ * Use quilt (convert patches to quilt format)
- -- Mehdi Dogguy <mehdi at debian.org> Wed, 07 Apr 2010 22:26:04 +0200
+ -- Mehdi Dogguy <mehdi at debian.org> Wed, 07 Apr 2010 22:34:47 +0200
ocurl (0.5.1-2) unstable; urgency=low
diff --git a/debian/control b/debian/control
index c0f9e70..d15bb31 100644
--- a/debian/control
+++ b/debian/control
@@ -7,10 +7,10 @@ Uploaders:
Mehdi Dogguy <mehdi at debian.org>,
Pietro Abate <Pietro.Abate at pps.jussieu.fr>
Build-Depends:
- debhelper (>= 7.0.0),
+ debhelper (>= 7.0.50~),
libcurl4-gnutls-dev (>= 7.15.0-2),
ocaml-nox (>= 3.10.1),
- dpatch,
+ quilt (>= 0.47),
ocaml-findlib (>= 1.2.5),
libkrb5-dev,
cdbs,
diff --git a/debian/patches/01_makefile.in.dpatch b/debian/patches/0001-fixes-makefile-to-use-ocamlfind-and-support-both-byt.patch
old mode 100755
new mode 100644
similarity index 61%
rename from debian/patches/01_makefile.in.dpatch
rename to debian/patches/0001-fixes-makefile-to-use-ocamlfind-and-support-both-byt.patch
index 1a6ce3b..d43ab6f
--- a/debian/patches/01_makefile.in.dpatch
+++ b/debian/patches/0001-fixes-makefile-to-use-ocamlfind-and-support-both-byt.patch
@@ -1,14 +1,16 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_makefile.in.dpatch by <tassi at garfield>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: fixes makefile to use ocamlfind and support both byte and opt compilation
+From: Enrico Tassi <gareuselesinge at debian.org>
+Date: Wed, 7 Apr 2010 22:42:24 +0200
+Subject: [PATCH] fixes makefile to use ocamlfind and support both byte and opt compilation
- at DPATCH@
-diff -urNad trunk~/Makefile.in trunk/Makefile.in
---- trunk~/Makefile.in 2004-07-20 23:32:44.000000000 +0200
-+++ trunk/Makefile.in 2007-09-16 22:03:39.000000000 +0200
-@@ -10,7 +10,7 @@
+---
+ Makefile.in | 30 ++++++++++++++++--------------
+ 1 files changed, 16 insertions(+), 14 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 5eff392..13df227 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -10,7 +10,7 @@ INSTALLDIR = @INSTALLDIR@
INSTALL = @INSTALL@
INSTALLDATA = @INSTALL_DATA@
@@ -17,7 +19,7 @@ diff -urNad trunk~/Makefile.in trunk/Makefile.in
OCBYTE = @OCAMLC@
OCOPT = @OCAMLOPT@
-@@ -31,9 +31,9 @@
+@@ -31,9 +31,9 @@ CURLFLAGS = -ccopt @CURLFLAGS@
CURLCLIBS = -cclib -lcurl-helper -cclib "@CURLLIBS@"
ifeq (@OCAMLBEST@,opt)
@@ -29,36 +31,35 @@ diff -urNad trunk~/Makefile.in trunk/Makefile.in
endif
all:
-@@ -45,11 +45,11 @@
+@@ -45,11 +45,11 @@ targets: $(TARGETS) examples
examples:
(cd examples; $(MAKE))
-curl.cma: $(CURLBCOBJS) libcurl-helper.a
- $(OCBYTE) -custom -a $(FLAGS) $(CURLFLAGS) -o $@ $(CURLBCOBJS) $(CURLCLIBS)
-+curl.cma: $(CURLBCOBJS) dllcurl-helper.so
++curl.cma: $(CURLBCOBJS) libcurl-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
++curl.cmxa: $(CURLOBJS) libcurl-helper.so
+ ocamlmklib -o curl $(CURLOBJS) -oc curl-helper @CURLLIBS@
.ml.cmx:
$(OCOPT) -c $(FLAGS) $< -o $@
-@@ -60,17 +60,19 @@
+@@ -60,17 +60,18 @@ curl.cmxa: $(CURLOBJS) libcurl-helper.a
.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@
++libcurl-helper.a libcurl-helper.so: $(CURLHELPEROBJS)
++ ocamlmklib -oc curl-helper $(CURLHELPEROBJS) @CURLLIBS@
.c.o:
-- $(CC) -c $(CFLAGS) $(CAMLINCDIR) $< -o $@
-+ $(OC) -c -ccopt "$(CFLAGS)" $<
+- $(CC) -c -Wall $(CFLAGS) $(CAMLINCDIR) $< -o $@
++ $(OC) -c -ccopt "$(CFLAGS)" $<
install:
ifeq ($(FINDLIB),ocamlfind)
@@ -66,12 +67,12 @@ diff -urNad trunk~/Makefile.in trunk/Makefile.in
- $(wildcard *.a) $(wildcard *.cma) $(wildcard *.cmxa)
+ ocamlfind install -destdir $(DESTDIR) -ldconf ignore \
+ curl META $(wildcard *.cmi) \
-+ $(wildcard *.a) $(wildcard *.cma) \
-+ $(wildcard *.cmxa) $(wildcard *.so) $(wildcard *.mli)
++ $(wildcard *.a) $(wildcard *.cma) \
++ $(wildcard *.cmxa) $(wildcard *.so) $(wildcard *.mli)
else
mkdir -p $(INSTALLDIR)
$(INSTALLDATA) curl.cma $(INSTALLDIR)
-@@ -83,7 +85,8 @@
+@@ -83,7 +84,8 @@ endif
clean:
@@ -81,3 +82,4 @@ diff -urNad trunk~/Makefile.in trunk/Makefile.in
@(cd examples; $(MAKE) clean)
depend:
+--
diff --git a/debian/patches/0002-fix-compilation-flags.patch b/debian/patches/0002-fix-compilation-flags.patch
new file mode 100644
index 0000000..55185b5
--- /dev/null
+++ b/debian/patches/0002-fix-compilation-flags.patch
@@ -0,0 +1,24 @@
+From: Enrico Tassi <gareuselesinge at debian.org>
+Date: Wed, 7 Apr 2010 22:44:32 +0200
+Subject: [PATCH] fix compilation flags
+
+---
+ configure | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure b/configure
+index 84a7df9..55d45bf 100755
+--- a/configure
++++ b/configure
+@@ -1655,8 +1655,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+ 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
+
+--
diff --git a/debian/patches/00dpatch.conf b/debian/patches/00dpatch.conf
deleted file mode 100644
index 41c2b41..0000000
--- a/debian/patches/00dpatch.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-conf_origtargzpath=../upstream/
-conf_debianonly=1
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index cf9b5a9..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,2 +0,0 @@
-01_makefile.in.dpatch
-02_configure.dpatch
diff --git a/debian/patches/02_configure.dpatch b/debian/patches/02_configure.dpatch
deleted file mode 100755
index 7903fb0..0000000
--- a/debian/patches/02_configure.dpatch
+++ /dev/null
@@ -1,21 +0,0 @@
-#! /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: fix compilation flags
-
- 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
-
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..714a6f4
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+0001-fixes-makefile-to-use-ocamlfind-and-support-both-byt.patch
+0002-fix-compilation-flags.patch
diff --git a/debian/rules b/debian/rules
index 56f387b..6529df6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,6 @@
#!/usr/bin/make -f
-include /usr/share/cdbs/1/rules/dpatch.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/autotools.mk
include /usr/share/cdbs/1/rules/ocaml.mk
--
ocurl packaging
More information about the Pkg-ocaml-maint-commits
mailing list