[Pkg-ocaml-maint-commits] r2257 - in trunk/packages/mod-caml/trunk/debian: . patches

Tue Dec 6 22:30:10 UTC 2005

Author: zack
Date: 2005-12-06 22:30:10 +0000 (Tue, 06 Dec 2005)
New Revision: 2257

Added:
   trunk/packages/mod-caml/trunk/debian/TODO
   trunk/packages/mod-caml/trunk/debian/patches/
   trunk/packages/mod-caml/trunk/debian/patches/00list
   trunk/packages/mod-caml/trunk/debian/patches/17_install_dest.dpatch
Modified:
   trunk/packages/mod-caml/trunk/debian/README.Debian
   trunk/packages/mod-caml/trunk/debian/changelog
   trunk/packages/mod-caml/trunk/debian/control
   trunk/packages/mod-caml/trunk/debian/rules
Log:
more debian-like package, still a lot todo, have a look at debian/TODO


Modified: trunk/packages/mod-caml/trunk/debian/README.Debian
===================================================================

--- trunk/packages/mod-caml/trunk/debian/README.Debian	2005-12-06 21:55:45 UTC (rev 2256)
+++ trunk/packages/mod-caml/trunk/debian/README.Debian	2005-12-06 22:30:10 UTC (rev 2257)
@@ -46,10 +46,12 @@
 his live servers:
 
 CamlLoad /usr/share/mod_caml/registry.cmo
-CamlLoad /usr/lib/ocaml/3.08/extlib/extLib.cma
-CamlLoad /usr/lib/ocaml/3.08/postgres/postgres.cma
-CamlLoad /usr/lib/ocaml/3.08/dbi/dbi.cma
-CamlLoad /usr/lib/ocaml/3.08/dbi/dbi_postgres.cmo
+CamlLoad /usr/lib/ocaml/3.09.0/extlib/extLib.cma
+CamlLoad /usr/lib/ocaml/3.09.0/postgresql/postgresql.cma
+CamlLoad /usr/lib/ocaml/3.09.0/nums.cma
+CamlLoad /usr/lib/ocaml/3.09.0/dbi/dbi.cma
+CamlLoad /usr/lib/ocaml/3.09.0/dbi/dbi_postgresql.cmo
+CamlLoad /usr/lib/ocaml/3.09.0/calendar/calendar.cma
 CamlLoad /usr/share/cocanwiki/html/_bin/cocanwiki.cma
 
 (plus at least 10 other proprietary modules).

Added: trunk/packages/mod-caml/trunk/debian/TODO
===================================================================
--- trunk/packages/mod-caml/trunk/debian/TODO	2005-12-06 21:55:45 UTC (rev 2256)
+++ trunk/packages/mod-caml/trunk/debian/TODO	2005-12-06 22:30:10 UTC (rev 2257)
@@ -0,0 +1,6 @@
+- create /etc/apache/conf.d/mod_caml.conf and move there apache's LoadModule
+  (check if there exists an apache policy or something similar)
+- provide a META for the "template" library. Does it deserve a directory in
+  `ocamlc -where` as well?
+- provide a META for mod_caml (there is one, but IIRC it is fubar)
+- provide doc-base for HTML version of the API reference

Modified: trunk/packages/mod-caml/trunk/debian/changelog
===================================================================
--- trunk/packages/mod-caml/trunk/debian/changelog	2005-12-06 21:55:45 UTC (rev 2256)
+++ trunk/packages/mod-caml/trunk/debian/changelog	2005-12-06 22:30:10 UTC (rev 2257)
@@ -3,6 +3,7 @@
   * new upstream release
   * rebuilt with ocaml 3.09, bumped deps accordingly
   * made svn structure svn-buildpackage friendly
+  * use dpatch
   * debian/control
     - bumped standards version
     - removed useless dep on libpgsql-ocaml-dev

Modified: trunk/packages/mod-caml/trunk/debian/control
===================================================================
--- trunk/packages/mod-caml/trunk/debian/control	2005-12-06 21:55:45 UTC (rev 2256)
+++ trunk/packages/mod-caml/trunk/debian/control	2005-12-06 22:30:10 UTC (rev 2257)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Richard W.M. Jones <rich at annexia.org>
 Uploaders: Sven Luther <luther at debian.org>, Stefano Zacchiroli <zack at debian.org>
-Build-Depends: debhelper (>= 4.0.0), libdbi-ocaml-dev (>= 0.9.13), libpcre-ocaml-dev (>= 5.10.1), ocaml-findlib (>= 1.1), ocaml-nox (>= 3.09.0), apache-dev
+Build-Depends: debhelper (>= 4.0.0), libdbi-ocaml-dev (>= 0.9.13), libpcre-ocaml-dev (>= 5.10.1), ocaml-findlib (>= 1.1), ocaml-nox (>= 3.09.0), apache-dev, dpatch
 Standards-Version: 3.6.2
 
 Package: libapache-mod-caml

Added: trunk/packages/mod-caml/trunk/debian/patches/00list
===================================================================
--- trunk/packages/mod-caml/trunk/debian/patches/00list	2005-12-06 21:55:45 UTC (rev 2256)
+++ trunk/packages/mod-caml/trunk/debian/patches/00list	2005-12-06 22:30:10 UTC (rev 2257)
@@ -0,0 +1 @@
+17_install_dest.dpatch

Added: trunk/packages/mod-caml/trunk/debian/patches/17_install_dest.dpatch
===================================================================
--- trunk/packages/mod-caml/trunk/debian/patches/17_install_dest.dpatch	2005-12-06 21:55:45 UTC (rev 2256)
+++ trunk/packages/mod-caml/trunk/debian/patches/17_install_dest.dpatch	2005-12-06 22:30:10 UTC (rev 2257)
@@ -0,0 +1,44 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 17_install_dest.dpatch by Stefano Zacchiroli <zack at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad trunk~/Makefile trunk/Makefile
+--- trunk~/Makefile	2005-11-15 18:38:42.000000000 +0100
++++ trunk/Makefile	2005-12-06 23:25:07.000000000 +0100
+@@ -225,17 +225,18 @@
+ install-doc:
+ 	$(INSTALL)    -m 0755 -d $(DESTDIR)$(DOCDIR)
+ 	$(INSTALL) -c -m 0644 AUTHORS FAQ README TODO $(DESTDIR)$(DOCDIR)
++	$(INSTALL)    -m 0755 -d $(DESTDIR)$(DOCDIR)/examples
+ 	$(INSTALL) -c -m 0644 \
+ 	  examples/simple-scripts/*.ml \
+-	  $(DESTDIR)$(DOCDIR)
++	  $(DESTDIR)$(DOCDIR)/examples
+ 
+ install-html:
+ 	$(INSTALL)    -m 0755 -d $(DESTDIR)$(DOCDIR)/html
+ 	$(INSTALL) -c -m 0644 html/*.html $(DESTDIR)$(DOCDIR)/html
+ 
+ install-conf:
+-	$(INSTALL)    -m 0755 -d $(DESTDIR)$(APACHECONFDIR)
+-	$(INSTALL) -c -m 0644 modcaml-example.conf $(DESTDIR)$(APACHECONFDIR)
++	$(INSTALL)    -m 0755 -d $(DESTDIR)$(DOCDIR)/examples
++	$(INSTALL) -c -m 0644 modcaml-example.conf $(DESTDIR)$(DOCDIR)/examples
+ 
+ dist:
+ 	$(MAKE) check-manifest
+diff -urNad trunk~/Makefile.config trunk/Makefile.config
+--- trunk~/Makefile.config	2005-11-21 17:15:05.000000000 +0100
++++ trunk/Makefile.config	2005-12-06 23:22:52.000000000 +0100
+@@ -139,7 +139,7 @@
+ # DOCDIR
+ # This is where we will install the documentation.
+ 
+-DOCDIR = /usr/share/doc/$(PACKAGE)-$(VERSION)
++DOCDIR = /usr/share/doc/libapache-mod-caml
+ 
+ # HAVE_POSTGRES
+ # Tests whether you have (the OCaml module) Postgres installed.  If so, then


Property changes on: trunk/packages/mod-caml/trunk/debian/patches/17_install_dest.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: trunk/packages/mod-caml/trunk/debian/rules
===================================================================
--- trunk/packages/mod-caml/trunk/debian/rules	2005-12-06 21:55:45 UTC (rev 2256)
+++ trunk/packages/mod-caml/trunk/debian/rules	2005-12-06 22:30:10 UTC (rev 2257)
@@ -6,13 +6,15 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+include /usr/share/dpatch/dpatch.make
+
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
 	touch configure-stamp
 
 build: build-stamp
-build-stamp: configure-stamp 
+build-stamp: patch-stamp configure-stamp 
 	dh_testdir
 
 	if [ -x /usr/bin/ocamlopt ]; then \
@@ -26,7 +28,8 @@
 		BUILD_OPT=$$BUILD_OPT
 	touch build-stamp
 
-clean:
+clean: clean1 unpatch
+clean1:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp


