[Pkg-ocaml-maint-commits] r1241 - in trunk/packages/demexp: . debian debian/patches
Thomas Petazzoni
tpetazzo-guest@costa.debian.org
Sun, 10 Apr 2005 18:15:17 +0000
Author: tpetazzo-guest
Date: 2005-04-10 18:15:17 +0000 (Sun, 10 Apr 2005)
New Revision: 1241
Added:
trunk/packages/demexp/trunk/
Modified:
trunk/packages/demexp/debian/README.Debian
trunk/packages/demexp/debian/changelog
trunk/packages/demexp/debian/control
trunk/packages/demexp/debian/patches/makefile.dpatch
Log:
CDuce 0.3 needed, new Makefile style, using ocamlfind ocamlopt (thanks Samuel)
Modified: trunk/packages/demexp/debian/README.Debian
===================================================================
--- trunk/packages/demexp/debian/README.Debian 2005-04-10 18:13:26 UTC (rev 1240)
+++ trunk/packages/demexp/debian/README.Debian 2005-04-10 18:15:17 UTC (rev 1241)
@@ -1,4 +1,7 @@
demexp for Debian
-----------------
--- Thomas Petazzoni <thomas.petazzoni@enix.org>, Sat, 29 Jan 2005 15:15:11 +0100
+This package contains the software written for the Democratic
+Experience project, http://www.demexp.org.
+
+ -- Thomas Petazzoni <thomas.petazzoni@enix.org>, Sun Apr 10 16:13:28 2005
Modified: trunk/packages/demexp/debian/changelog
===================================================================
--- trunk/packages/demexp/debian/changelog 2005-04-10 18:13:26 UTC (rev 1240)
+++ trunk/packages/demexp/debian/changelog 2005-04-10 18:15:17 UTC (rev 1241)
@@ -1,3 +1,16 @@
+demexp (0.4-2) unstable; urgency=low
+
+ * Migration to CDuce 0.3.2. A dpatch new-cduce-version has been written
+ and sent upstream.
+ * Global cleanup of the Makefile. Instead of using «ocamlfind query», we
+ directly use «ocamlfind ocamlopt». This allows a smarter depency
+ handling. For example, while CDuce depends on Curl, there is no need
+ for the DemExp Makefile to specify a dependency against
+ Curl. Ocamlfind ocamlopt with the --package option will handle it
+ cleanly. Many thanks to Samuel Mimram for his help.
+
+ -- Thomas Petazzoni <thomas.petazzoni@enix.org> Sun, 10 Apr 2005 16:12:16 +0200
+
demexp (0.4-1) unstable; urgency=low
* New upstream release 0.4
Modified: trunk/packages/demexp/debian/control
===================================================================
--- trunk/packages/demexp/debian/control 2005-04-10 18:13:26 UTC (rev 1240)
+++ trunk/packages/demexp/debian/control 2005-04-10 18:15:17 UTC (rev 1241)
@@ -2,7 +2,7 @@
Section: net
Priority: optional
Maintainer: Thomas Petazzoni <thomas.petazzoni@enix.org>
-Build-Depends: debhelper (>= 4.0.0), ocaml-nox-3.08.3, liblablgtk2-ocaml-dev, nowebm, latex, tetex-extra, ocaml-findlib, libpxp-ocaml-dev, libequeue-ocaml-dev, librpc-ocaml-dev, libnetclient-ocaml-dev, ocaml-ulex, ocaml-native-compilers, dpatch (>= 1.19), cduce
+Build-Depends: debhelper (>= 4.0.0), ocaml-nox-3.08.3, liblablgtk2-ocaml-dev, nowebm, latex, tetex-extra, ocaml-findlib, libpxp-ocaml-dev, libequeue-ocaml-dev, librpc-ocaml-dev, libnetclient-ocaml-dev, ocaml-ulex, ocaml-native-compilers, dpatch (>= 1.19), cduce (>= 0.3)
Standards-Version: 3.6.1
Package: demexp-client-gtk2
Modified: trunk/packages/demexp/debian/patches/makefile.dpatch
===================================================================
--- trunk/packages/demexp/debian/patches/makefile.dpatch 2005-04-10 18:13:26 UTC (rev 1240)
+++ trunk/packages/demexp/debian/patches/makefile.dpatch 2005-04-10 18:15:17 UTC (rev 1241)
@@ -5,9 +5,9 @@
## DP: No description.
@DPATCH@
-diff -urNad demexp-0.4/Makefile /tmp/dpep.KyIi3R/demexp-0.4/Makefile
+diff -urNad demexp-0.4/Makefile /tmp/dpep.CU4bNK/demexp-0.4/Makefile
--- demexp-0.4/Makefile 2005-03-15 18:50:27.000000000 +0100
-+++ /tmp/dpep.KyIi3R/demexp-0.4/Makefile 2005-04-09 20:22:10.155278901 +0200
++++ /tmp/dpep.CU4bNK/demexp-0.4/Makefile 2005-04-10 16:00:39.468121337 +0200
@@ -7,6 +7,8 @@
.PHONY: all
all: bin bin.bc static test test.bc xml doc pdf
@@ -17,36 +17,101 @@
# commands
## for LaTeX
-@@ -69,22 +71,28 @@
- CLNT_OCAMLINC:=-I net -I lib -I $(EQUEUEDIR) -I $(RPCDIR) \
- -I lablgtk2-clnt
+@@ -20,10 +22,6 @@
+ ## for Bitv library
+ BITVDIR:=bitv-0.5
+-## for ocamlrpcgen
+-EQUEUEDIR:=$(shell ocamlfind query equeue)
+-RPCDIR:=$(shell ocamlfind query rpc)
+-
+ OCAMLRPCGEN:=ocamlrpcgen
+ OCAMLRPCGENFLAGS:=-cpp none -int unboxed
+
+@@ -37,66 +35,34 @@
+ ## for CDuce
+ CDUCE:=cduce
+
+-CDUCEDIR:=$(shell ocamlfind query cduce)
+-PXPENGINEDIR:=$(shell ocamlfind query pxp-engine)
+-PXPLEXUTF8DIR:=$(shell ocamlfind query pxp-lex-utf8)
+-PCREDIR:=$(shell ocamlfind query pcre)
+-NETSTRINGDIR:=$(shell ocamlfind query netstring)
+-NETCLIENTDIR:=$(shell ocamlfind query netclient)
+-ULEXDIR:=$(shell ocamlfind query ulex)
+-
+-# fix above dirs if no path is found with a dummy directory (.)
+-CDUCEDIR:=$(if $(CDUCEDIR),$(CDUCEDIR),.)
+-PXPENGINEDIR:=$(if $(PXPENGINEDIR),$(PXPENGINEDIR),.)
+-PXPLEXUTF8DIR:=$(if $(PXPLEXUTF8DIR),$(PXPLEXUTF8DIR),.)
+-PCREDIR:=$(if $(PCREDIR),$(PCREDIR),.)
+-NETSTRINGDIR:=$(if $(NETSTRINGDIR),$(NETSTRINGDIR),.)
+-NETCLIENTDIR:=$(if $(NETCLIENTDIR),$(NETCLIENTDIR),.)
+-ULEXDIR:=$(if $(ULEXDIR),$(ULEXDIR),.)
+-
+-
+ ## for O'Caml
+-COMMON_OCAMLINC:=-I srv -I net -I lib \
+- -I $(EQUEUEDIR) -I $(RPCDIR) \
+- -I $(BITVDIR)
+-
+-SRV_OCAMLINC:=-I srv -I net -I lib -I $(BITVDIR) \
+- -I $(EQUEUEDIR) -I $(RPCDIR) \
+- -I $(CDUCEDIR) -I $(PXPENGINEDIR) -I $(PXPLEXUTF8DIR) \
+- -I $(PCREDIR) -I $(NETSTRINGDIR) \
+- -I $(NETCLIENTDIR) -I $(ULEXDIR)
+-
+-CLNT_OCAMLINC:=-I net -I lib -I $(EQUEUEDIR) -I $(RPCDIR) \
+- -I lablgtk2-clnt
+-
-SRV_CMXALIBS:=str.cmxa unix.cmxa equeue.cmxa rpc.cmxa threads.cmxa \
-+OLD_SRV_CMXALIBS:=str.cmxa unix.cmxa equeue.cmxa rpc.cmxa threads.cmxa \
- gramlib.cmxa pcre.cmxa netstring.cmxa ulexing.cmxa netclient.cmxa \
- pxp_engine.cmxa pxp_lex_utf8.cmxa pxp_lex_link_utf8.cmx \
- nums.cmxa cduce_lib.cmxa
+- gramlib.cmxa pcre.cmxa netstring.cmxa ulexing.cmxa netclient.cmxa \
+- pxp_engine.cmxa pxp_lex_utf8.cmxa pxp_lex_link_utf8.cmx \
+- nums.cmxa cduce_lib.cmxa
++COMMON_OCAMLINC:=-I srv -I net -I lib -I $(BITVDIR)
-+SRV_CMXALIBS:=threads.cmxa \
-+ gramlib.cmxa \
-+ nums.cmxa
-+
-+
- SRV_CMALIBS:=$(patsubst %.cmx,%.cmo,$(SRV_CMXALIBS:%.cmxa=%.cma))
+-SRV_CMALIBS:=$(patsubst %.cmx,%.cmo,$(SRV_CMXALIBS:%.cmxa=%.cma))
++SRV_OCAMLINC:=-I srv -I net -I lib -I $(BITVDIR)
++CLNT_OCAMLINC:=-I net -I lib -I lablgtk2-clnt
-CLNT_CMXALIBS:= unix.cmxa equeue.cmxa rpc.cmxa str.cmxa \
- lablgtk.cmxa lablglade.cmxa
-+CLNT_CMXALIBS:=lablgtk.cmxa lablglade.cmxa
++COMMON_PACKAGES:=rpc str
- CLNT_CMALIBS:=$(patsubst %.cmx,%.cmo,$(CLNT_CMXALIBS:%.cmxa=%.cma))
+-CLNT_CMALIBS:=$(patsubst %.cmx,%.cmo,$(CLNT_CMXALIBS:%.cmxa=%.cma))
++SRV_PACKAGES:=cduce pxp-engine pxp-lex-utf8 pcre \
++ netstring netclient ulex equeue threads num
++CLNT_PACKAGES:=lablgtk2 lablgtk2.glade
-+PACKAGES:=cduce pxp-engine pxp-lex-utf8 pcre netstring netclient ulex rpc equeue str
-+
OCAMLC:=ocamlc.opt
-OCAMLOPT:=ocamlopt.opt
-+OCAMLOPT:=ocamlfind ocamlopt -linkpkg -package "$(PACKAGES)"
++OCAMLOPT:=ocamlfind ocamlopt -linkpkg
OCAMLDEP:=ocamldep
OCAMLLEX:=ocamllex
OCAMLYACC:=ocamlyacc
+
+ COMMON_OCAMLCFLAGS:=$(COMMON_OCAMLINC) -thread -g
+-COMMON_OCAMLOPTFLAGS:=$(COMMON_OCAMLINC) -thread
++COMMON_OCAMLOPTFLAGS:=-package "$(COMMON_PACKAGES)" $(COMMON_OCAMLINC) -thread
+
+ SRV_OCAMLCFLAGS:=$(SRV_OCAMLINC) -I +camlp4 -thread -g
+-SRV_OCAMLOPTFLAGS:=$(SRV_OCAMLINC) -I +camlp4 -thread
++SRV_OCAMLOPTFLAGS:=-package "$(COMMON_PACKAGES)" -package "$(SRV_PACKAGES)" $(SRV_OCAMLINC) -I +camlp4 -thread
+
+ CLNT_OCAMLCFLAGS:=$(CLNT_OCAMLINC) -I +lablgtk2 -g
+-CLNT_OCAMLOPTFLAGS:=$(CLNT_OCAMLINC) -I +lablgtk2
++CLNT_OCAMLOPTFLAGS:=-package "$(COMMON_PACKAGES)" -package "$(CLNT_PACKAGES)" $(CLNT_OCAMLINC) -I +lablgtk2
+
+ LABLGLADECC:=lablgladecc2
+
+@@ -419,7 +385,7 @@
+ $(OCAMLC) -c $(SRV_OCAMLINC) -pp "cdo2ml -static" -impl $<
+
+ %.cmx: %.cdo
+- $(OCAMLOPT) -c $(SRV_OCAMLINC) -pp "cdo2ml -static" -impl $<
++ $(OCAMLOPT) -c $(SRV_OCAMLOPTFLAGS) $(SRV_OCAMLINC) -pp "cdo2ml -static" -impl $<
+
+ ### O'Caml sources dependencies
+