r3161 - in /trunk/packages: ocaml-expat/trunk/debian/ ocaml-expat/trunk/debian/patches/ ocurl/trunk/debian/ ocurl/trunk/debian/patches/
Author: gareuselesinge
Date: Sun Sep 17 13:15:35 2006
New Revision: 3161
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=3161
Log:
moved to the new ocaml CDBS class
Added:
trunk/packages/ocaml-expat/trunk/debian/patches/00dpatch.conf
trunk/packages/ocurl/trunk/debian/patches/00dpatch.conf
Modified:
trunk/packages/ocaml-expat/trunk/debian/patches/Makefile.dpatch
trunk/packages/ocaml-expat/trunk/debian/rules
trunk/packages/ocurl/trunk/debian/patches/01_makefile.in.dpatch
trunk/packages/ocurl/trunk/debian/rules
Added: trunk/packages/ocaml-expat/trunk/debian/patches/00dpatch.conf
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-expat/trunk/debian/patches/00dpatch.conf?rev=3161&op=file
==============================================================================
--- trunk/packages/ocaml-expat/trunk/debian/patches/00dpatch.conf (added)
+++ trunk/packages/ocaml-expat/trunk/debian/patches/00dpatch.conf Sun Sep 17 13:15:35 2006
@@ -1,0 +1,2 @@
+conf_origtargzpath=../upstream/
+conf_debianonlyconf_debianonly=1
Modified: trunk/packages/ocaml-expat/trunk/debian/patches/Makefile.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-expat/trunk/debian/patches/Makefile.dpatch?rev=3161&op=diff
==============================================================================
--- trunk/packages/ocaml-expat/trunk/debian/patches/Makefile.dpatch (original)
+++ trunk/packages/ocaml-expat/trunk/debian/patches/Makefile.dpatch Sun Sep 17 13:15:35 2006
@@ -5,15 +5,18 @@
## DP: No description.
@DPATCH@
-diff -urNad ocaml-expat-0.9.0/Makefile /tmp/dpep.1bs8CC/ocaml-expat-0.9.0/Makefile
---- ocaml-expat-0.9.0/Makefile 2005-01-23 17:16:48.000000000 +0100
-+++ /tmp/dpep.1bs8CC/ocaml-expat-0.9.0/Makefile 2005-01-23 17:17:49.000000000 +0100
-@@ -51,8 +51,11 @@
+diff -urNad trunk~/Makefile trunk/Makefile
+--- trunk~/Makefile 2005-03-13 15:00:29.000000000 +0100
++++ trunk/Makefile 2006-09-17 15:11:20.000000000 +0200
+@@ -49,9 +49,13 @@
+ ## Installation
.PHONY: install
install: all
- { test ! -f $(XARCHIVE) || extra="$(XARCHIVE) $(NAME).a"; }; \
+- { test ! -f $(XARCHIVE) || extra="$(XARCHIVE) $(NAME).a"; }; \
- $(OCAMLFIND) install $(NAME) META $(NAME).cmi $(NAME).mli $(ARCHIVE) \
- dll$(CARCHIVE_NAME).so lib$(CARCHIVE_NAME).a $$extra
++ mkdir -p $(DESTDIR)
++ { test ! -f $(XARCHIVE) || extra="$(XARCHIVE) $(NAME).a $(NAME).cmx"; }; \
+ $(OCAMLFIND) install \
+ -destdir $(DESTDIR) \
+ -ldconf ignore \
Modified: trunk/packages/ocaml-expat/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-expat/trunk/debian/rules?rev=3161&op=diff
==============================================================================
--- trunk/packages/ocaml-expat/trunk/debian/rules (original)
+++ trunk/packages/ocaml-expat/trunk/debian/rules Sun Sep 17 13:15:35 2006
@@ -2,39 +2,13 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/makefile.mk
include /usr/share/cdbs/1/rules/dpatch.mk
+include /usr/share/cdbs/1/class/ocaml.mk
-PKGNAME = libexpat-ocaml-dev
-
-OCAMLABI := $(shell ocamlc -version)
-OCAMLLIBDIR := $(shell ocamlc -where)
-OFILES := $(patsubst %.in,%,$(shell ls debian/*.in))
-HAVE_OCAMLOPT := $(shell test -x /usr/bin/ocamlopt && echo "yes")
-DESTDIR := $(CURDIR)/debian/tmp$(OCAMLLIBDIR)
-DEB_DH_GENCONTROL_ARGS = -- -VF:OCamlABI="$(OCAMLABI)"
+DESTDIR := $(CURDIR)/debian/tmp$(OCAML_STDLIB_DIR)
DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(DESTDIR)
-ifeq ($(HAVE_OCAMLOPT),yes)
+ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
DEB_MAKE_BUILD_TARGET = allopt doc NO_CUSTOM=y
else
DEB_MAKE_BUILD_TARGET = all doc NO_CUSTOM=y
endif
-
-# expand @OCamlABI@ insinde *.in (all but control.in)
-ocamlinit:
- for f in $(OFILES); do \
- if test $$f != debian/control; then \
- sed -e 's/@OCamlABI@/$(OCAMLABI)/g' $$f.in > $$f; \
- fi \
- done
-
-# use this when a new to move to a new ocaml release the control file
-bump-abi:
- sed -e 's/@OCamlABI@/$(OCAMLABI)/g' debian/control.in > debian/control
-
-update-config:: ocamlinit
-
-build/$(PKGNAME)::
- mkdir -p $(DESTDIR)
-
-# work around cdbs' bug
-unpatch: deapply-dpatches
Added: 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=3161&op=file
==============================================================================
--- trunk/packages/ocurl/trunk/debian/patches/00dpatch.conf (added)
+++ trunk/packages/ocurl/trunk/debian/patches/00dpatch.conf Sun Sep 17 13:15:35 2006
@@ -1,0 +1,2 @@
+conf_origtargzpath=../upstream/
+conf_debianonlyconf_debianonly=1
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=3161&op=diff
==============================================================================
--- trunk/packages/ocurl/trunk/debian/patches/01_makefile.in.dpatch (original)
+++ trunk/packages/ocurl/trunk/debian/patches/01_makefile.in.dpatch Sun Sep 17 13:15:35 2006
@@ -5,9 +5,9 @@
## DP: No description.
@DPATCH@
-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
+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
@@ -10,7 +10,7 @@
INSTALL = @INSTALL@
INSTALLDATA = @INSTALL_DATA@
@@ -17,67 +17,13 @@
OCBYTE = @OCAMLC@
OCOPT = @OCAMLOPT@
-@@ -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)" $<
+@@ -69,7 +69,8 @@
install:
ifeq ($(FINDLIB),ocamlfind)
- ocamlfind install curl META $(wildcard *.cmi) \
-- $(wildcard *.a) $(wildcard *.cma) $(wildcard *.cmxa)
-+ ocamlfind install -destdir $(DESTDIR) -ldconf ignore \
++ ocamlfind install -destdir $(DESTDIR) \
+ curl META $(wildcard *.cmi) \
-+ $(wildcard *.a) $(wildcard *.cma) \
-+ $(wildcard *.cmxa) $(wildcard *.so) $(wildcard *.mli)
+ $(wildcard *.a) $(wildcard *.cma) $(wildcard *.cmxa)
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:
Modified: trunk/packages/ocurl/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocurl/trunk/debian/rules?rev=3161&op=diff
==============================================================================
--- trunk/packages/ocurl/trunk/debian/rules (original)
+++ trunk/packages/ocurl/trunk/debian/rules Sun Sep 17 13:15:35 2006
@@ -1,37 +1,14 @@
#!/usr/bin/make -f
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/makefile.mk
include /usr/share/cdbs/1/rules/dpatch.mk
include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/class/ocaml.mk
PKGNAME = libcurl-ocaml-dev
-OCAMLABI := $(shell ocamlc -version)
-OCAMLLIBDIR := $(shell ocamlc -where)
-OFILES := $(patsubst %.in,%,$(shell ls debian/*.in))
-HAVE_OCAMLOPT := $(shell test -x /usr/bin/ocamlopt && echo "yes")
-DESTDIR := $(CURDIR)/debian/tmp$(OCAMLLIBDIR)
-DEB_DH_GENCONTROL_ARGS = -- -VF:OCamlABI="$(OCAMLABI)"
+DESTDIR := $(CURDIR)/debian/tmp$(OCAML_STDLIB_DIR)
DEB_MAKE_BUILD_TARGET = all NO_CUSTOM=y
DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(DESTDIR)
-DEB_CONFIGURE_EXTRA_FLAGS =
-# expand @OCamlABI@ insinde *.in (all but control.in)
-ocamlinit:
- for f in $(OFILES); do \
- if test $$f != debian/control; then \
- sed -e 's/@OCamlABI@/$(OCAMLABI)/g' $$f.in > $$f; \
- fi \
- done
-
-# use this when a new to move to a new ocaml release the control file
-bump-abi:
- sed -e 's/@OCamlABI@/$(OCAMLABI)/g' debian/control.in > debian/control
-
-update-config:: ocamlinit
-
build/$(PKGNAME)::
mkdir -p $(DESTDIR)
-
-# work around cdbs' bug
-unpatch: deapply-dpatches
Reply to: