[Pkg-ocaml-maint-commits] r3956 - in /trunk/packages/mod-caml/trunk/debian: changelog control patches/18_apache2.dpatch rules

munga-guest at users.alioth.debian.org munga-guest at users.alioth.debian.org
Tue Jul 10 14:20:39 UTC 2007 

Author: munga-guest
Date: Tue Jul 10 14:20:39 2007
New Revision: 3956

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=3956
Log:
experimental libapache2-mod-caml package (2)

Modified:
    trunk/packages/mod-caml/trunk/debian/changelog
    trunk/packages/mod-caml/trunk/debian/control
    trunk/packages/mod-caml/trunk/debian/patches/18_apache2.dpatch
    trunk/packages/mod-caml/trunk/debian/rules

Modified: trunk/packages/mod-caml/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/mod-caml/trunk/debian/changelog?rev=3956&op=diff
==============================================================================
--- trunk/packages/mod-caml/trunk/debian/changelog (original)
+++ trunk/packages/mod-caml/trunk/debian/changelog Tue Jul 10 14:20:39 2007
@@ -1,11 +1,18 @@
 mod-caml (1.3.8-2) unstable; urgency=low
 
+  [ Pietro Abate ]
   * new configure script
   * split the package in libapache-mod-caml and libapache2-mod-caml
   * fixed various problems to compile against apache2
   * added dep to apache2.2-common
 
- -- Pietro Abate <pietro.abate at pps.jussieu.fr>  Thu, 28 Jun 2007 13:18:51 +0000
+  [ Pietro Abate ]
+  * Dropped apache 1.3 support
+
+  [ Pietro Abate ]
+  * added bytecode library and fixed the META file
+
+ -- Pietro Abate <pietro.abate at pps.jussieu.fr>  Tue, 10 Jul 2007 12:03:03 +0000
 
 mod-caml (1.3.8-1) unstable; urgency=low
 

Modified: trunk/packages/mod-caml/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/mod-caml/trunk/debian/control?rev=3956&op=diff
==============================================================================
--- trunk/packages/mod-caml/trunk/debian/control (original)
+++ trunk/packages/mod-caml/trunk/debian/control Tue Jul 10 14:20:39 2007
@@ -8,28 +8,12 @@
 XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/mod-caml
 XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/mod-caml/trunk/
 
-Package: libapache-mod-caml
-Section: web
-Architecture: any
-Depends: libpcre-ocaml (>= 5.10.1), ocaml-nox (>= 3.09.0), apache
-Recommends: libtemplate-ocaml-dev (= ${Source-Version})
-Replaces: libapache-ocaml, libapache-ocaml-dev
-Description: Objective CAML (OCaml) bindings for the Apache API
- mod_caml is a set of Objective CAML (OCaml) bindings for the Apache
- API. It allows you to run "CGI scripts" written in OCaml directly inside
- the Apache webserver. However, it is much much more than just that:
- .
-  * Bind to any part of the Apache request cycle.
-  * Read and modify internal Apache structures.
-  * Share modules of code between handlers and scripts.
-  * CGI library and templating system (allows separation of code and
-    presentation).
-
 Package: libapache2-mod-caml
 Section: web
 Architecture: any
 Depends: libpcre-ocaml (>= 5.10.1), ocaml-nox (>= 3.09.0), apache2.2-common
-Recommends: libtemplate-ocaml-dev (= ${Source-Version})
+Suggests: libcgi-ocaml-dev (= ${Source-Version}), libcgi-ocaml-examples (= ${Source-Version})
+Recommends: libcgi-ocaml (= ${Source-Version})
 Replaces: libapache-ocaml, libapache-ocaml-dev
 Description: Objective CAML (OCaml) bindings for the Apache API
  mod_caml is a set of Objective CAML (OCaml) bindings for the Apache2
@@ -39,14 +23,14 @@
   * Bind to any part of the Apache request cycle.
   * Read and modify internal Apache structures.
   * Share modules of code between handlers and scripts.
-  * CGI library and templating system (allows separation of code and
-    presentation).
 
-Package: libtemplate-ocaml-dev
+Package: libcgi-ocaml-dev
 Section: libdevel
 Architecture: any
-Depends: libpcre-ocaml-dev (>= 5.10.1), ocaml-nox (>= 3.09.0), libdbi-ocaml-dev (>= 0.9.13), libpcre-ocaml-dev (>= 5.10.1), ocaml-findlib (>= 1.1)
+Depends: libpcre-ocaml-dev (>= 5.10.1), ocaml-nox (>= 3.09.0), libdbi-ocaml-dev (>= 0.9.13), ocaml-findlib (>= 1.1)
 Description: Simple templating system for Objective CAML (OCaml)
- This is a simple web page templating system for Objective CAML
- (OCaml) intended to be used in conjunction with mod_caml (the Debian
- package libapache-mod-caml).
+ This package contains a cgi module and a simple web page templating system
+ intended to be used in conjunction with mod_caml. 
+ .
+ This package contains all the development libraries you need to use
+ compile a cgi program with ocaml.

Modified: trunk/packages/mod-caml/trunk/debian/patches/18_apache2.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/mod-caml/trunk/debian/patches/18_apache2.dpatch?rev=3956&op=diff
==============================================================================
--- trunk/packages/mod-caml/trunk/debian/patches/18_apache2.dpatch (original)
+++ trunk/packages/mod-caml/trunk/debian/patches/18_apache2.dpatch Tue Jul 10 14:20:39 2007
@@ -5,9 +5,18 @@
 ## DP: No description.
 
 @DPATCH@
+diff -urNad mod-caml-1.3.8~/META.in mod-caml-1.3.8/META.in
+--- mod-caml-1.3.8~/META.in	2005-10-28 10:02:48.000000000 +0000
++++ mod-caml-1.3.8/META.in	2007-07-10 11:59:59.000000000 +0000
+@@ -1,3 +1,5 @@
+ name="@PACKAGE@"
+ version="@VERSION@"
+ description="Apache API Module"
++requires=""
++archive(byte) = "apache.cma"
 diff -urNad mod-caml-1.3.8~/Makefile mod-caml-1.3.8/Makefile
---- mod-caml-1.3.8~/Makefile	2007-06-28 13:35:46.000000000 +0000
-+++ mod-caml-1.3.8/Makefile	2007-06-28 13:35:46.000000000 +0000
+--- mod-caml-1.3.8~/Makefile	2007-07-10 11:59:59.000000000 +0000
++++ mod-caml-1.3.8/Makefile	2007-07-10 12:02:33.000000000 +0000
 @@ -17,7 +17,8 @@
  #
  # $Id: Makefile,v 1.68 2005/08/24 12:47:11 ChriS Exp $
@@ -18,7 +27,34 @@
  
  TMPDIR ?= /tmp
  export TMPDIR
-@@ -225,18 +226,23 @@
+@@ -36,7 +37,7 @@
+ OCAMLDOCFLAGS := -html -stars -sort $(OCAMLCINCS)
+ 
+ all:	META config.h mod_caml_config.ml 500mod_caml.info mod_caml.so \
+-	$(ALL_CMXS) \
++	$(ALL_CMXS) apache.cma \
+ 	example-handlers example-scripts example-maillist example-comments \
+ 	html
+ 
+@@ -74,6 +75,9 @@
+ 	$(OCAMLC) -linkall -custom $(OCAMLCFLAGS) $(ALL_CMAS) $^ -o $@ \
+ 	  -cclib "$(CFLAGS) $(LDFLAGS_SHLIB) $(OCAMLLIBS)"
+ 
++apache.cma: $(ALL_CMOS)
++	$(OCAMLC) -a -o apache.cma $(ALL_CMOS)
++
+ example-handlers: registry.cmo examples/simple-handlers/print_trans.cmo \
+ 	examples/simple-handlers/auth_simple.cmo
+ 
+@@ -182,6 +186,7 @@
+ 	template.mli template.cmi $(DESTDIR)$(OCAMLAPACHEDIR)
+ 	$(INSTALL) -c -m 0644 registry.mli registry.cmi \
+ 	$(DESTDIR)$(OCAMLAPACHEDIR)
++	$(INSTALL) -c -m 0644 apache.cma $(DESTDIR)$(OCAMLAPACHEDIR)
+ 	$(INSTALL) -c -m 0644 META $(DESTDIR)$(OCAMLAPACHEDIR)
+ 	$(INSTALL) -c -m 0644 registry.cmo $(DESTDIR)$(MODCAMLLIBDIR)
+ 
+@@ -225,18 +230,23 @@
  install-doc:
  	$(INSTALL)    -m 0755 -d $(DESTDIR)$(DOCDIR)
  	$(INSTALL) -c -m 0644 AUTHORS FAQ README TODO $(DESTDIR)$(DOCDIR)
@@ -46,9 +82,20 @@
  
  dist:
  	$(MAKE) check-manifest
+diff -urNad mod-caml-1.3.8~/Makefile.conf mod-caml-1.3.8/Makefile.conf
+--- mod-caml-1.3.8~/Makefile.conf	1970-01-01 00:00:00.000000000 +0000
++++ mod-caml-1.3.8/Makefile.conf	2007-07-10 11:59:59.000000000 +0000
+@@ -0,0 +1,7 @@
++# This file has been generated by the configure script
++BINDIR=/usr/local/bin
++MANDIR=/usr/local/man
++DOCDIR=/usr/local/share/doc/mod_caml
++MODCAMLLIBDIR=/usr/local/share/mod_caml
++APACHE_MAJOR=2
++APXS=/usr/bin/apxs2
 diff -urNad mod-caml-1.3.8~/Makefile.distrib mod-caml-1.3.8/Makefile.distrib
 --- mod-caml-1.3.8~/Makefile.distrib	1970-01-01 00:00:00.000000000 +0000
-+++ mod-caml-1.3.8/Makefile.distrib	2007-06-28 13:35:46.000000000 +0000
++++ mod-caml-1.3.8/Makefile.distrib	2007-07-10 11:59:59.000000000 +0000
 @@ -0,0 +1,26 @@
 +OCAMLC := ocamlc
 +OCAMLOPT := ocamlopt
@@ -78,7 +125,7 @@
 +MAILER_ARGS := -t -i
 diff -urNad mod-caml-1.3.8~/apache_c.c mod-caml-1.3.8/apache_c.c
 --- mod-caml-1.3.8~/apache_c.c	2005-11-15 16:34:30.000000000 +0000
-+++ mod-caml-1.3.8/apache_c.c	2007-06-28 13:35:46.000000000 +0000
++++ mod-caml-1.3.8/apache_c.c	2007-07-10 11:59:59.000000000 +0000
 @@ -45,7 +45,7 @@
  #if APACHE2
  #define ap_pstrdup apr_pstrdup
@@ -114,14 +161,14 @@
  
 diff -urNad mod-caml-1.3.8~/configure.log mod-caml-1.3.8/configure.log
 --- mod-caml-1.3.8~/configure.log	1970-01-01 00:00:00.000000000 +0000
-+++ mod-caml-1.3.8/configure.log	2007-06-28 13:35:46.000000000 +0000
++++ mod-caml-1.3.8/configure.log	2007-07-10 11:59:59.000000000 +0000
 @@ -0,0 +1,3 @@
 +Linux compile 2.6.18-4-xen-vserver-686 #1 SMP Thu May 10 04:02:17 UTC 2007 i686 GNU/Linux
 +==> ocamlfind ocamlopt
 +==> ocamlfind ocamlopt -package pcre -linkpkg -o configure.try && rm -f configure.try
 diff -urNad mod-caml-1.3.8~/configure.ml mod-caml-1.3.8/configure.ml
 --- mod-caml-1.3.8~/configure.ml	1970-01-01 00:00:00.000000000 +0000
-+++ mod-caml-1.3.8/configure.ml	2007-06-28 13:35:46.000000000 +0000
++++ mod-caml-1.3.8/configure.ml	2007-07-10 11:59:59.000000000 +0000
 @@ -0,0 +1,162 @@
 +open Printf
 +
@@ -309,7 +356,7 @@
 -</Location>
 diff -urNad mod-caml-1.3.8~/modcaml.conf mod-caml-1.3.8/modcaml.conf
 --- mod-caml-1.3.8~/modcaml.conf	1970-01-01 00:00:00.000000000 +0000
-+++ mod-caml-1.3.8/modcaml.conf	2007-06-28 13:35:46.000000000 +0000
++++ mod-caml-1.3.8/modcaml.conf	2007-07-10 11:59:59.000000000 +0000
 @@ -0,0 +1,12 @@
 +
 +CamlLoad /usr/share/mod_caml/registry.cmo
@@ -325,7 +372,7 @@
 +</Location>
 diff -urNad mod-caml-1.3.8~/modcaml.load mod-caml-1.3.8/modcaml.load
 --- mod-caml-1.3.8~/modcaml.load	1970-01-01 00:00:00.000000000 +0000
-+++ mod-caml-1.3.8/modcaml.load	2007-06-28 13:35:46.000000000 +0000
++++ mod-caml-1.3.8/modcaml.load	2007-07-10 11:59:59.000000000 +0000
 @@ -0,0 +1,2 @@
 +
 +LoadModule caml_module  /usr/lib/apache2/modules/mod_caml.so

Modified: trunk/packages/mod-caml/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/mod-caml/trunk/debian/rules?rev=3956&op=diff
==============================================================================
--- trunk/packages/mod-caml/trunk/debian/rules (original)
+++ trunk/packages/mod-caml/trunk/debian/rules Tue Jul 10 14:20:39 2007
@@ -6,8 +6,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-DEB_DESTDIR_APACHE2 = $(CURDIR)/debian/libapache2-mod-caml
-DEB_DESTDIR_APACHE1 = $(CURDIR)/debian/libapache-mod-caml
+DEB_DESTDIR = $(CURDIR)/debian/libapache2-mod-caml
 
 include /usr/share/dpatch/dpatch.make
 
@@ -16,43 +15,15 @@
 	dh_testdir
 	touch configure-stamp
 
-build: build-stamp-apache1 build-stamp-apache2
-build-stamp-apache1: patch-stamp configure-stamp 
+build: build-stamp
+build-stamp: patch-stamp configure-stamp 
 	dh_testdir
-
-	rm -rf build-apache1
-	mkdir build-apache1
 
 	if [ -x /usr/bin/ocamlopt ]; then \
 		BUILD_OPT=1; \
 	else \
 		BUILD_OPT=0; \
 	fi; \
-	cd build-apache1; \
-	cp -a ../ . ;\
-	ocaml ./configure.ml \
-		--apxs=/usr/bin/apxs \
-		--prefix=/usr \
-		--docdir=/usr/share/doc/libapache-mod-caml ; \
-	$(MAKE) \
-		HAVE_OCAMLODBC=0 \
-		HAVE_CAMLTEMPLATE=0 \
-		BUILD_OPT=$$BUILD_OPT
-	touch build-stamp-apache1
-
-build-stamp-apache2: patch-stamp configure-stamp 
-	dh_testdir
-
-	rm -rf build-apache2
-	mkdir build-apache2
-
-	if [ -x /usr/bin/ocamlopt ]; then \
-		BUILD_OPT=1; \
-	else \
-		BUILD_OPT=0; \
-	fi; \
-	cd build-apache2; \
-	cp -a ../ . ;\
 	ocaml ./configure.ml \
 		--apxs=/usr/bin/apxs2 \
 		--prefix=/usr \
@@ -61,7 +32,7 @@
 		HAVE_OCAMLODBC=0 \
 		HAVE_CAMLTEMPLATE=0 \
 		BUILD_OPT=$$BUILD_OPT
-	touch build-stamp-apache2
+	touch build-stamp
 
 clean: clean1 unpatch
 clean1:
@@ -78,7 +49,6 @@
 	dh_clean -k 
 	dh_installdirs
 
-	cd build-apache1; \
 	if [ -x /usr/bin/ocamlopt ]; then \
 		BUILD_OPT=1; \
 	else \
@@ -88,26 +58,33 @@
 		HAVE_MYSQL=0 HAVE_PERL4CAML=0 HAVE_OCAMLODBC=0 \
 		HAVE_CAMLTEMPLATE=0 \
 		BUILD_OPT=$$BUILD_OPT \
-		DESTDIR=$(DEB_DESTDIR_APACHE1)
-
-	cd build-apache2; \
-	if [ -x /usr/bin/ocamlopt ]; then \
-		BUILD_OPT=1; \
-	else \
-		BUILD_OPT=0; \
-	fi; \
-	$(MAKE) install \
-		HAVE_MYSQL=0 HAVE_PERL4CAML=0 HAVE_OCAMLODBC=0 \
-		HAVE_CAMLTEMPLATE=0 \
-		BUILD_OPT=$$BUILD_OPT \
-		DESTDIR=$(DEB_DESTDIR_APACHE2)
+		DESTDIR=$(DEB_DESTDIR)
 
 	# Move the Template-related files across.
-	dh_movefiles -plibtemplate-ocaml-dev \
-	  --sourcedir=debian/libapache-mod-caml \
-	  usr/share/mod_caml/caml-bin \
-	  usr/share/mod_caml/caml-icons \
-	  usr/share/mod_caml/templates
+
+	mkdir -p debian/libcgi-ocaml-dev/usr/share/doc/libcgi-ocaml-dev/caml-icons ;\
+	mv debian/libapache2-mod-caml/usr/share/mod_caml/caml-icons \
+	debian/libcgi-ocaml-dev/usr/share/doc/libcgi-ocaml-dev/
+
+	mkdir -p debian/libcgi-ocaml-dev/usr/share/doc/libcgi-ocaml-dev/templates ;\
+	mv debian/libapache2-mod-caml/usr/share/mod_caml/templates \
+	debian/libcgi-ocaml-dev/usr/share/doc/libcgi-ocaml-dev/
+
+	mkdir -p debian/libcgi-ocaml-dev/usr/lib/ocaml/3.09.2/apache ;\
+	mv debian/libapache2-mod-caml/usr/lib/ocaml/3.09.2/apache \
+	debian/libcgi-ocaml-dev/`ocamlc -where`/
+
+	mkdir -p debian/libcgi-ocaml-dev/usr/share/doc/libcgi-ocaml-dev/html ;\
+	mv debian/libapache2-mod-caml/usr/share/doc/libapache2-mod-caml/html \
+	debian/libcgi-ocaml-dev/usr/share/doc/libcgi-ocaml-dev/
+
+	mkdir -p debian/libcgi-ocaml-dev/usr/share/doc/libcgi-ocaml-dev/ ;\
+	mv debian/libapache2-mod-caml/usr/share/doc/libapache2-mod-caml/*.ml \
+	debian/libcgi-ocaml-dev/usr/share/doc/libcgi-ocaml-dev/
+	
+	rm -Rf debian/libapache2-mod-caml/usr/share/mod_caml/caml-bin
+
+	rm -Rf debian/libapache2-mod-caml/usr/lib/ocaml/3.09.2
 
 # Build architecture-independent files here.
 binary-indep: build install
@@ -140,9 +117,8 @@
 #	dh_makeshlibs
 	dh_installdeb
 	dh_shlibdeps
-	dh_gencontrol -plibtemplate-ocaml-dev
+	dh_gencontrol -plibcgi-ocaml-dev
 	dh_gencontrol -plibapache2-mod-caml
-	dh_gencontrol -plibapache-mod-caml
 	dh_md5sums
 	dh_builddeb

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