Author: smimram Date: Wed Jan 2 13:01:41 2008 New Revision: 5018 URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=5018 Log: Import Stéphane Glondu's patch.
Added: trunk/packages/ocsigen/trunk/debian/liblwt-ocaml-dev.dirs.in trunk/packages/ocsigen/trunk/debian/ocsigen-dev.dirs.in Modified: trunk/packages/ocsigen/trunk/debian/changelog trunk/packages/ocsigen/trunk/debian/control 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=5018&op=diff ============================================================================== --- trunk/packages/ocsigen/trunk/debian/changelog (original) +++ trunk/packages/ocsigen/trunk/debian/changelog Wed Jan 2 13:01:41 2008 @@ -1,8 +1,13 @@ ocsigen (0.99.4-2) UNRELEASED; urgency=low + [ Stefano Zacchiroli ] * fix vcs-svn field to point just above the debian/ dir - -- Stefano Zacchiroli <[EMAIL PROTECTED]> Mon, 31 Dec 2007 16:50:15 +0100 + [ Stéphane Glondu ] + * Split out the Lwt modules into liblwt-ocaml-dev, closes: #452908. + * Added package ocsigen-dev. + + -- Samuel Mimram <[EMAIL PROTECTED]> Wed, 02 Jan 2008 12:45:19 +0000 ocsigen (0.99.4-1) unstable; urgency=low Modified: trunk/packages/ocsigen/trunk/debian/control URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocsigen/trunk/debian/control?rev=5018&op=diff ============================================================================== --- trunk/packages/ocsigen/trunk/debian/control (original) +++ trunk/packages/ocsigen/trunk/debian/control Wed Jan 2 13:01:41 2008 @@ -1,9 +1,9 @@ Source: ocsigen -Section: devel +Section: web Priority: optional Maintainer: Samuel Mimram <[EMAIL PROTECTED]> Build-Depends: debhelper (>= 5), dpatch, ocaml-nox (>= 3.10), camlp4, camlp4-extra, ocaml-findlib, libocamlnet-ocaml-dev (>= 2.0), libssl-ocaml-dev (>= 0.4.0-1), libgdbm-dev, libsqlite3-ocaml-dev, libzip-ocaml-dev, libcryptokit-ocaml-dev -Standards-Version: 3.7.2 +Standards-Version: 3.7.3 Homepage: http://www.ocsigen.org/ Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/ocsigen/trunk Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocsigen/trunk/ @@ -12,19 +12,65 @@ Architecture: any Depends: adduser, ${shlibs:Depends}, ocaml-nox-${F:OCamlABI} Suggests: ocsigen-doc -Description: web programming framework in OCaml - Ocsigen is a programming framework providing a new way to create - dynamic web sites. With Ocsigen, you program in a concise and modular - way, with a strong type system which helps you to produce always valid - xhtml. The server handles sessions and page parameters automatically. +Description: Web server and programming framework in OCaml + Ocsigen is a Web server and a programming framework providing a new + way to create dynamic Web sites. Its goal is to offer an alternative + to Apache/PHP, based on cutting-edge technologies coming from + research in programming languages. It has most of the features you + expect from a Web server (static pages, CGI scripts, etc.) and also + an innovative module, called Eliom, for generating dynamic Web + pages. With Eliom, you program in a concise and modular way, with a + strong type system which helps you to produce valid xhtml. The server + handles sessions, URLs, and page parameters automatically. Package: ocsigen-doc +Section: doc Architecture: all -Depends: adduser, ${shlibs:Depends}, ocaml-nox-${F:OCamlABI} -Description: documentation of ocsigen web programming framework in OCaml - Ocsigen is a programming framework providing a new way to create - dynamic web sites. With Ocsigen, you program in a concise and modular - way, with a strong type system which helps you to produce always valid - xhtml. The server handles sessions and page parameters automatically. +Depends: ${shlibs:Depends}, ocaml-nox-${F:OCamlABI} +Description: Documentation for Ocsigen + Ocsigen is a Web server and a programming framework providing a new + way to create dynamic Web sites. Its goal is to offer an alternative + to Apache/PHP, based on cutting-edge technologies coming from + research in programming languages. It has most of the features you + expect from a Web server (static pages, CGI scripts, etc.) and also + an innovative module, called Eliom, for generating dynamic Web + pages. With Eliom, you program in a concise and modular way, with a + strong type system which helps you to produce valid xhtml. The server + handles sessions, URLs, and page parameters automatically. . - This package contains the documentation of the ocsigen modules. + This package contains the documentation of all Ocsigen's modules + (including Lwt). + +Package: liblwt-ocaml-dev +Section: libdevel +Architecture: any +Depends: ocaml-nox-${F:OCamlABI}, libssl-ocaml-dev (>= 0.4.0-1) +Recommends: ocaml-findlib +Suggests: ocsigen-doc +Description: Cooperative light-weight thread library for OCaml + Lwt is a library of cooperative threads implemented in monadic style. + With respect to preemptive threads, cooperative threads are not using a + scheduler to distribute processor time between threads. Instead of this, + each thread must tell the others that he wants to let them work. + . + This package contains all the development stuff you need to use the lwt + OCaml library in your programs. + +Package: ocsigen-dev +Section: devel +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 +Recommends: ocsigen-doc +Description: Development files for Ocsigen + Ocsigen is a Web server and a programming framework providing a new + way to create dynamic Web sites. Its goal is to offer an alternative + to Apache/PHP, based on cutting-edge technologies coming from + research in programming languages. It has most of the features you + expect from a Web server (static pages, CGI scripts, etc.) and also + an innovative module, called Eliom, for generating dynamic Web + pages. With Eliom, you program in a concise and modular way, with a + strong type system which helps you to produce valid xhtml. The server + handles sessions, URLs, and page parameters automatically. + . + This package contains all you need to develop your own extensions and + Eliom modules. Added: trunk/packages/ocsigen/trunk/debian/liblwt-ocaml-dev.dirs.in URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocsigen/trunk/debian/liblwt-ocaml-dev.dirs.in?rev=5018&op=file ============================================================================== --- trunk/packages/ocsigen/trunk/debian/liblwt-ocaml-dev.dirs.in (added) +++ trunk/packages/ocsigen/trunk/debian/liblwt-ocaml-dev.dirs.in Wed Jan 2 13:01:41 2008 @@ -1,0 +1,1 @@ +usr/lib/ocaml/@OCamlABI@/lwt Added: 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=5018&op=file ============================================================================== --- trunk/packages/ocsigen/trunk/debian/ocsigen-dev.dirs.in (added) +++ trunk/packages/ocsigen/trunk/debian/ocsigen-dev.dirs.in Wed Jan 2 13:01:41 2008 @@ -1,0 +1,2 @@ +usr/lib/ocaml/@OCamlABI@/ocsigen +usr/lib/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=5018&op=diff ============================================================================== --- trunk/packages/ocsigen/trunk/debian/ocsigen.postinst (original) +++ trunk/packages/ocsigen/trunk/debian/ocsigen.postinst Wed Jan 2 13:01:41 2008 @@ -41,11 +41,11 @@ # Issue a warning if it fails. if $GROUPMOD $OCSIGEN > /dev/null 2>&1; then # group already exists, use --ingroup - if ! $ADDUSER --system --disabled-password --disabled-login --home /usr/share/ocsigen --no-create-home --ingroup $OCSIGEN $OCSIGEN; then + if ! $ADDUSER --system --disabled-password --disabled-login --home /var/www/ocsigen --no-create-home --ingroup $OCSIGEN $OCSIGEN; then echo "The adduser command failed." fi else - if ! $ADDUSER --system --disabled-password --disabled-login --home /usr/share/ocsigen --no-create-home --group $OCSIGEN; then + if ! $ADDUSER --system --disabled-password --disabled-login --home /var/www/ocsigen --no-create-home --group $OCSIGEN; then echo "The adduser command failed." fi fi Modified: trunk/packages/ocsigen/trunk/debian/rules URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocsigen/trunk/debian/rules?rev=5018&op=diff ============================================================================== --- trunk/packages/ocsigen/trunk/debian/rules (original) +++ trunk/packages/ocsigen/trunk/debian/rules Wed Jan 2 13:01:41 2008 @@ -14,7 +14,7 @@ OCAMLABI := $(shell ocamlc -version) OFILES := $(patsubst %.in,%,$(wildcard debian/*.in)) -DESTDIR := $(CURDIR)/debian/ocsigen/ +DESTDIR := $(CURDIR)/debian/ocsigen ocamlinit: @@ -31,7 +31,7 @@ --bindir /usr/bin \ --libdir /usr/lib \ --mandir /usr/share/man/man1 \ - --docdir /usr/share/doc/ocsigen-doc \ + --docdir /usr/share/doc/ocsigen \ --ocsigen-user ocsigen \ --ocsigen-group ocsigen \ --disable-ocamlduce @@ -66,8 +66,10 @@ $(MAKE) install MODULEINSTALLDIR=$(shell ocamlc -where) CHOWN=true $(MAKE) logrotate rm -f $(DESTDIR)/var/run/ocsigen_command - mv $(DESTDIR)/usr/share/doc/ocsigen-doc/ocsigen debian/ocsigen-doc/usr/share/doc/ocsigen-doc/html -# cp -r doc debian/ocsigen-doc/usr/share/doc/ocsigen-doc/html + 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,META,xhtmlsyntax.cma} debian/ocsigen-dev/usr/lib/ocaml/$(OCAMLABI)/ocsigen rm -f $(DESTDIR)/var/www/ocsigen/ocsigenstuff/LICENSE binary-common: _______________________________________________ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits