[Pkg-ocaml-maint-commits] r5324 - in /trunk/packages/ocsigen: trunk/debian/ upstream/

glondu-guest at users.alioth.debian.org glondu-guest at users.alioth.debian.org
Sat Mar 15 05:46:30 UTC 2008 

Author: glondu-guest
Date: Sat Mar 15 05:46:30 2008
New Revision: 5324

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=5324
Log:
New upstream release.

Added:
    trunk/packages/ocsigen/trunk/debian/liblwt-ocaml-dev.install.in
    trunk/packages/ocsigen/trunk/debian/ocsigen-dev.install.in
    trunk/packages/ocsigen/trunk/debian/ocsigen.dirs
      - copied, changed from r5323, trunk/packages/ocsigen/trunk/debian/ocsigen.dirs.in
    trunk/packages/ocsigen/trunk/debian/ocsigen.install
    trunk/packages/ocsigen/upstream/ocsigen_1.0.0~rc1.orig.tar.gz   (with props)
Removed:
    trunk/packages/ocsigen/trunk/debian/ocsigen.dirs.in
Modified:
    trunk/packages/ocsigen/trunk/debian/changelog
    trunk/packages/ocsigen/trunk/debian/control
    trunk/packages/ocsigen/trunk/debian/ocsigen-dev.dirs.in
    trunk/packages/ocsigen/trunk/debian/ocsigen.postinst
    trunk/packages/ocsigen/trunk/debian/rules

Modified: trunk/packages/ocsigen/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocsigen/trunk/debian/changelog?rev=5324&op=diff
==============================================================================
--- trunk/packages/ocsigen/trunk/debian/changelog (original)
+++ trunk/packages/ocsigen/trunk/debian/changelog Sat Mar 15 05:46:30 2008
@@ -1,8 +1,18 @@
-ocsigen (0.99.5-3) UNRELEASED; urgency=low
+ocsigen (1.0.0~rc1-1) UNRELEASED; urgency=low
 
-  * NOT RELEASED YET
+  * New upstream release.
+  * Add dependency on ocaml-findlib to ocsigen binary package.
+  * Add dependency on psmisc to ocsigen binary package (for fuser).
+  * Add versioned dependency on ocsigen to ocsigen-dev.
+  * Change dependency on libzip-ocaml-dev from Suggests to Depends.
+  * Upstream Makefile now installs native version of Lwt if available
+    and provides a `distclean' target; cleaning debian/rules
+    accordingly.
+  * Remove files generated by debian/rules during cleanup.
+  * Use *.install files to dispatch files between binary packages.
+  * Install missing /var/lib/ocsigen.
 
- -- Stefano Zacchiroli <zack at debian.org>  Tue, 04 Mar 2008 17:14:23 +0100
+ -- Stephane Glondu <steph at glondu.net>  Sat, 15 Mar 2008 03:14:28 +0100
 
 ocsigen (0.99.5-2) unstable; urgency=medium
 

Modified: trunk/packages/ocsigen/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocsigen/trunk/debian/control?rev=5324&op=diff
==============================================================================
--- trunk/packages/ocsigen/trunk/debian/control (original)
+++ trunk/packages/ocsigen/trunk/debian/control Sat Mar 15 05:46:30 2008
@@ -11,8 +11,7 @@
 
 Package: ocsigen
 Architecture: any
-Depends: adduser, ${shlibs:Depends}, ocaml-nox-${F:OCamlABI}, libsqlite3-ocaml-dev, libcryptokit-ocaml-dev
-Recommends: libzip-ocaml-dev
+Depends: adduser, psmisc, ${shlibs:Depends}, ocaml-nox-${F:OCamlABI}, ocaml-findlib, libsqlite3-ocaml-dev, libcryptokit-ocaml-dev, libzip-ocaml-dev
 Suggests: ocsigen-doc
 Description: Web server and programming framework in OCaml
  Ocsigen is a Web server and a programming framework providing a new
@@ -65,7 +64,7 @@
 Section: devel
 Priority: extra
 Architecture: any
-Depends: ocaml-nox-${F:OCamlABI}, ocaml-findlib, ocsigen, liblwt-ocaml-dev, camlp4, camlp4-extra, libocamlnet-ocaml-dev (>= 2.0), libgdbm-dev, libsqlite3-ocaml-dev, libzip-ocaml-dev, libcryptokit-ocaml-dev
+Depends: ocaml-nox-${F:OCamlABI}, ocaml-findlib, ocsigen (= ${binary:Version}), liblwt-ocaml-dev, camlp4, camlp4-extra, libocamlnet-ocaml-dev (>= 2.0), libgdbm-dev, libsqlite3-ocaml-dev, libzip-ocaml-dev, libcryptokit-ocaml-dev
 Recommends: ocsigen-doc
 Description: Development files for Ocsigen
  Ocsigen is a Web server and a programming framework providing a new

Added: trunk/packages/ocsigen/trunk/debian/liblwt-ocaml-dev.install.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocsigen/trunk/debian/liblwt-ocaml-dev.install.in?rev=5324&op=file
==============================================================================
--- trunk/packages/ocsigen/trunk/debian/liblwt-ocaml-dev.install.in (added)
+++ trunk/packages/ocsigen/trunk/debian/liblwt-ocaml-dev.install.in Sat Mar 15 05:46:30 2008
@@ -1,0 +1,1 @@
+usr/lib/ocaml/@OCamlABI@/lwt

Modified: trunk/packages/ocsigen/trunk/debian/ocsigen-dev.dirs.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocsigen/trunk/debian/ocsigen-dev.dirs.in?rev=5324&op=diff
==============================================================================
--- trunk/packages/ocsigen/trunk/debian/ocsigen-dev.dirs.in (original)
+++ trunk/packages/ocsigen/trunk/debian/ocsigen-dev.dirs.in Sat Mar 15 05:46:30 2008
@@ -1,2 +1,1 @@
 usr/lib/ocaml/@OCamlABI@/ocsigen
-usr/lib/ocsigen

Added: trunk/packages/ocsigen/trunk/debian/ocsigen-dev.install.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocsigen/trunk/debian/ocsigen-dev.install.in?rev=5324&op=file
==============================================================================
--- trunk/packages/ocsigen/trunk/debian/ocsigen-dev.install.in (added)
+++ trunk/packages/ocsigen/trunk/debian/ocsigen-dev.install.in Sat Mar 15 05:46:30 2008
@@ -1,0 +1,1 @@
+usr/lib/ocaml/@OCamlABI@/ocsigen

Copied: trunk/packages/ocsigen/trunk/debian/ocsigen.dirs (from r5323, trunk/packages/ocsigen/trunk/debian/ocsigen.dirs.in)
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocsigen/trunk/debian/ocsigen.dirs?rev=5324&op=diff
==============================================================================
--- trunk/packages/ocsigen/trunk/debian/ocsigen.dirs.in (original)
+++ trunk/packages/ocsigen/trunk/debian/ocsigen.dirs Sat Mar 15 05:46:30 2008
@@ -1,7 +1,7 @@
 etc/ocsigen
 etc/logrotate.d
-usr/lib/ocaml/@OCamlABI@/ocsigen
 usr/lib/ocsigen
 usr/share/doc/ocsigen
+var/lib/ocsigen
 var/log/ocsigen
 var/www/ocsigen

Added: trunk/packages/ocsigen/trunk/debian/ocsigen.install
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocsigen/trunk/debian/ocsigen.install?rev=5324&op=file
==============================================================================
--- trunk/packages/ocsigen/trunk/debian/ocsigen.install (added)
+++ trunk/packages/ocsigen/trunk/debian/ocsigen.install Sat Mar 15 05:46:30 2008
@@ -1,0 +1,8 @@
+etc/ocsigen
+etc/logrotate.d
+usr/bin
+usr/lib/ocsigen
+usr/share/man
+var/lib/ocsigen
+var/log/ocsigen
+var/www/ocsigen

Modified: trunk/packages/ocsigen/trunk/debian/ocsigen.postinst
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocsigen/trunk/debian/ocsigen.postinst?rev=5324&op=diff
==============================================================================
--- trunk/packages/ocsigen/trunk/debian/ocsigen.postinst (original)
+++ trunk/packages/ocsigen/trunk/debian/ocsigen.postinst Sat Mar 15 05:46:30 2008
@@ -54,6 +54,8 @@
 
 ###
 # 4. Change ownership of directory.
+$CHOWN -R $OCSIGEN:$OCSIGEN /var/lib/ocsigen/
+$CHMOD 750 /var/lib/ocsigen/
 $CHOWN -R $OCSIGEN:$OCSIGEN /var/log/ocsigen/
 $CHOWN -R $OCSIGEN:$OCSIGEN /var/www/ocsigen/
 

Modified: trunk/packages/ocsigen/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocsigen/trunk/debian/rules?rev=5324&op=diff
==============================================================================
--- trunk/packages/ocsigen/trunk/debian/rules (original)
+++ trunk/packages/ocsigen/trunk/debian/rules Sat Mar 15 05:46:30 2008
@@ -15,9 +15,8 @@
 NATIVECODE := $(shell [ -x /usr/bin/ocamlopt ] && echo yes)
 OFILES := $(patsubst %.in,%,$(wildcard debian/*.in))
 
-DESTDIR := $(CURDIR)/debian/ocsigen
+DESTDIR := $(CURDIR)/debian/tmp
 LWT_XTARGET := $(if $(NATIVECODE),lwt.opt)
-LWT_XARCHIVES := $(if $(NATIVECODE),lwt/lwt.a lwt/lwt.cmxa)
 
 ocamlinit:
 	for f in $(OFILES); do sed -e 's/@OCamlABI@/$(OCAMLABI)/g' $$f.in > $$f; done
@@ -33,7 +32,7 @@
 	    --bindir /usr/bin \
 	    --libdir /usr/lib \
 	    --mandir /usr/share/man/man1 \
-	    --docdir /usr/share/doc/ocsigen \
+	    --docdir /usr/share/doc \
 	    --ocsigen-user ocsigen \
 	    --ocsigen-group ocsigen \
 	    --disable-ocamlduce
@@ -46,7 +45,6 @@
 
 	$(MAKE) depend
 	$(MAKE) all $(LWT_XTARGET)
-#	$(MAKE) doc
 
 	touch $@
 
@@ -54,10 +52,8 @@
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp
-
-	[ ! -f Makefile.config ] || $(MAKE) clean
-	-find -name "*depend" -delete
-
+	-rm -f $(OFILES)
+	[ ! -f Makefile.config ] || $(MAKE) distclean
 	dh_clean
 
 install: build
@@ -68,14 +64,8 @@
 
 	$(MAKE) install MODULEINSTALLDIR=$(shell ocamlc -where) CHOWN=true
 	$(MAKE) logrotate
+	mv $(DESTDIR)/usr/share/doc/ocsigen debian/ocsigen-doc/usr/share/doc/ocsigen-doc/html
 	rm -f $(DESTDIR)/var/run/ocsigen_command
-	-install -t $(DESTDIR)/usr/lib/ocaml/$(OCAMLABI)/lwt -m 0644 $(LWT_XARCHIVES)
-	mv $(DESTDIR)/usr/share/doc/ocsigen/ocsigen debian/ocsigen-doc/usr/share/doc/ocsigen-doc/html
-	mv $(DESTDIR)/usr/lib/ocaml/$(OCAMLABI)/lwt debian/liblwt-ocaml-dev/usr/lib/ocaml/$(OCAMLABI)
-	mv $(DESTDIR)/usr/lib/ocsigen/*.cmi debian/ocsigen-dev/usr/lib/ocsigen
-	mv $(DESTDIR)/usr/lib/ocaml/$(OCAMLABI)/ocsigen/*.cmi debian/ocsigen-dev/usr/lib/ocaml/$(OCAMLABI)/ocsigen
-	mv $(DESTDIR)/usr/lib/ocaml/$(OCAMLABI)/ocsigen/META debian/ocsigen-dev/usr/lib/ocaml/$(OCAMLABI)/ocsigen
-	mv $(DESTDIR)/usr/lib/ocaml/$(OCAMLABI)/ocsigen/xhtmlsyntax.cma debian/ocsigen-dev/usr/lib/ocaml/$(OCAMLABI)/ocsigen
 	rm -f $(DESTDIR)/var/www/ocsigen/ocsigenstuff/LICENSE
 
 binary-common:
@@ -84,7 +74,7 @@
 	dh_installchangelogs
 	dh_installdocs
 	dh_installexamples
-	dh_install
+	dh_install --sourcedir=debian/tmp
 	dh_installlogrotate
 	dh_installinit
 	dh_installman

Added: trunk/packages/ocsigen/upstream/ocsigen_1.0.0~rc1.orig.tar.gz
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocsigen/upstream/ocsigen_1.0.0%7Erc1.orig.tar.gz?rev=5324&op=file
==============================================================================
Binary file - no diff available.

Propchange: trunk/packages/ocsigen/upstream/ocsigen_1.0.0~rc1.orig.tar.gz
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

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