Author: zack Date: Wed Jan 3 16:18:37 2007 New Revision: 3448 URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=3448 Log: snapshot, almost ready for an upload to experimental
Added: trunk/packages/ocamlnet/trunk/debian/NEWS trunk/packages/ocamlnet/trunk/debian/README.Debian trunk/packages/ocamlnet/trunk/debian/libocamlnet-ocaml-dev.docs trunk/packages/ocamlnet/trunk/debian/libocamlnet-ocaml-doc.dirs trunk/packages/ocamlnet/trunk/debian/libocamlnet-ocaml-doc.links trunk/packages/ocamlnet/trunk/debian/patches/missing_shebangs.dpatch (with props) trunk/packages/ocamlnet/trunk/debian/patches/mkdir_destdir.dpatch (with props) Modified: trunk/packages/ocamlnet/trunk/debian/TODO trunk/packages/ocamlnet/trunk/debian/changelog trunk/packages/ocamlnet/trunk/debian/control trunk/packages/ocamlnet/trunk/debian/libocamlnet-ocaml-dev.install.in trunk/packages/ocamlnet/trunk/debian/libocamlnet-ocaml-doc.doc-base trunk/packages/ocamlnet/trunk/debian/libocamlnet-ocaml-doc.docs trunk/packages/ocamlnet/trunk/debian/patches/00list trunk/packages/ocamlnet/trunk/debian/rules Added: trunk/packages/ocamlnet/trunk/debian/NEWS URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlnet/trunk/debian/NEWS?rev=3448&op=file ============================================================================== --- trunk/packages/ocamlnet/trunk/debian/NEWS (added) +++ trunk/packages/ocamlnet/trunk/debian/NEWS Wed Jan 3 16:18:37 2007 @@ -1,0 +1,13 @@ +ocamlnet (2.2.3-1) experimental; urgency=low + + * Ocamlnet 2.2 includes several OCaml libraries which were formerly packaged + as several different (source) Debian packages. As such packages like + libequeue-ocaml-dev and libnetclient-ocaml-dev are no longer available in + Debian and have been subsumed by Ocamlnet + * Being now a large package, Ocamlnet starting from version 2.2 has been + split in several (binary) Debian packages. In particular libraries related + to GTK, SSL, and the HTTP daemon have been split in new packages; see + /usr/share/doc/libocamlnet-ocaml-dev/README.Debian for details about where + to find the library you are looking for + + -- Stefano Zacchiroli <[EMAIL PROTECTED]> Wed, 3 Jan 2007 16:17:34 +0100 Added: trunk/packages/ocamlnet/trunk/debian/README.Debian URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlnet/trunk/debian/README.Debian?rev=3448&op=file ============================================================================== --- trunk/packages/ocamlnet/trunk/debian/README.Debian (added) +++ trunk/packages/ocamlnet/trunk/debian/README.Debian Wed Jan 3 16:18:37 2007 @@ -1,0 +1,63 @@ + +Where is the doc? +================= + +The Ocamlnet reference manual and several programming examples are now +shipped by the libocamlnet-ocaml-doc packages. If the package is +installed you can access them from: +- /usr/share/doc/libocamlnet-ocaml-dev/html (reference manual) +- /usr/share/doc/libocamlnet-ocaml-dev/examples (programming examples) + + -- Stefano Zacchiroli <[EMAIL PROTECTED]> Wed, 3 Jan 2007 16:17:34 +0100 + +Ocamlnet packages organization +============================== + +Ocamlnet 2.2 in Debian has been split in several packages in order to +diminish package size and dependencies. The split follows upstream's +distribution guidelines: +- libocamlnet-ocaml{,-dev} (core libraries) +- libocamlnet-gtk2-ocaml-dev (GTK2-related libraries) +- libocamlnet-ssl-ocaml{,-dev} (SSL-relater libraries) +- libnethttpd-ocaml-dev (nethttpd library) + +Ocamlnet libraries related to GTK1 and Tcl are currently not shipped in +the Debian packages of Ocamlnet. In case you desperately need them +please let me know. + +An overview of all the libraries available in Ocamlnet is given in +/usr/share/doc/libocamlnet-ocaml-dev/INSTALL.gz, the following table +describes in which Debian package a given Ocamlnet library can be found: + + Library Debian package name + -------------------------------------------------- + cgi libocamlnet-ocaml{,-dev} + equeue libocamlnet-ocaml{,-dev} + equeue-gtk1 n/a + equeue-gtk2 libocamlnet-gtk-ocaml-dev + equeue-ssl libocamlnet-ssl-ocaml{,-dev} + equeue-tcl n/a + netcgi1 libocamlnet-ocaml{,-dev} + netcgi2 libocamlnet-ocaml{,-dev} + netcgi2-plex libocamlnet-ocaml{,-dev} + netclient libocamlnet-ocaml{,-dev} + nethttpd libnethttpd-ocaml-dev + nethttpd-for-netcgi1 libnethttpd-ocaml-dev + nethttpd-for-netcgi2 libnethttpd-ocaml-dev + netplex libocamlnet-ocaml{,-dev} + netshm libocamlnet-ocaml{,-dev} + netstring libocamlnet-ocaml{,-dev} + netsys libocamlnet-ocaml{,-dev} + pop libocamlnet-ocaml{,-dev} + rpc libocamlnet-ocaml{,-dev} + rpc-auth-dh libocamlnet-ocaml{,-dev} + rpc-auth-local libocamlnet-ocaml{,-dev} + rpc-generator libocamlnet-ocaml{,-dev} + rpc-ssl libocamlnet-ssl-ocaml{,-dev} + rpc-xti n/a + shell libocamlnet-ocaml{,-dev} + smtp libocamlnet-ocaml{,-dev} + -------------------------------------------------- + + -- Stefano Zacchiroli <[EMAIL PROTECTED]> Wed, 3 Jan 2007 16:17:34 +0100 + Modified: trunk/packages/ocamlnet/trunk/debian/TODO URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlnet/trunk/debian/TODO?rev=3448&op=diff ============================================================================== --- trunk/packages/ocamlnet/trunk/debian/TODO (original) +++ trunk/packages/ocamlnet/trunk/debian/TODO Wed Jan 3 16:18:37 2007 @@ -1,11 +1,7 @@ -Snapshot packaging of Ocamlnet 2.2. Package bascially working, but a lot more TODO: -- package is to big, split it in several packages, strategies: - * factor out a -doc package with HTML docs and examples - * have a look at the factorization proposed by Gerd in README - * follow the structure of the packages who used to contain the various - Ocamlnet components in Debian -- added conflicts/replaces/... in debian/control +- building without invoking "clean" doesn't work + (to test: "fakeroot debian/rules binary" fails---as probably "debuild binary" + will--- while debuild works) --- Tue, 02 Jan 2007 17:52:06 +0100 zack +-- Wed, 03 Jan 2007 16:17:01 +0100 zack Modified: trunk/packages/ocamlnet/trunk/debian/changelog URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlnet/trunk/debian/changelog?rev=3448&op=diff ============================================================================== --- trunk/packages/ocamlnet/trunk/debian/changelog (original) +++ trunk/packages/ocamlnet/trunk/debian/changelog Wed Jan 3 16:18:37 2007 @@ -1,31 +1,35 @@ -ocamlnet (2.2.3-1) UNRELEASED; urgency=low - - * XXX Zack token: I'm working on packaging ocamlnet 2.2, this temp changelog - entry is just to let others know that I'm working on it. Please get in - touch with me if you're going to work on this. Please note that with this - commit the package is still *NOT WORKING*. Cheers. +ocamlnet (2.2.3-1) experimental; urgency=low + * New upstream release - now includes the former equeue, netclient, and rpc libraries. That maps to the Debian packages: libequeue-ocaml{,-dev}, libnetclient-ocaml-dev, librpc-ocaml-dev - * debian/compat - - bumped to compatibility level 5 - * debian/control + * debian/control + - reshaped package organization, now generated multiple binaries following + upstream suggestion on package split: libocamlnet-ocaml{,-dev} for core + libraries, libocamlnet-gtk2-ocaml-dev for GTK-related libs, + libocamlnet-ssl-ocaml{,-dev} for SSL-related libs, libnethttpd-ocaml-dev + for nethttpd, libocamlnet-ocaml-doc for the HTML manual and examples - build-deps: removed equeue (now integrated), bumped debhelper to >= 5, added lablgtk2 (equeue's build-dep), ocaml-ssl (new build-dep), labltk (new build dep), cryptgps (new build dep) - - deps: removed deps on equeue (now integrated) + - deps: removed deps on equeue (now integrated), added transitional + conflicts/replaces/provides relationships * debian/patches - removed patch 01_build (no longer needed, this upstream is very nice with us packagers) - - added patch no_debugging_info (avoid compiling with -g) + - added patches: no_debugging_info (avoid compiling with -g), + missing_shebangs (for example shell scripts wo shebang lines), + mkdir_destdir (for creating destdir before invoking install target) - updated to cope with new sources structure (and renamed removing useless sequence number) patch dont_install_gpl * debian/*doc-base - updated doc-base info to point to the (now comprehensive) ocamlnet 2 reference manual - - -- Stefano Zacchiroli <[EMAIL PROTECTED]> Tue, 2 Jan 2007 12:09:25 +0100 + * debian/compat + - bumped to compatibility level 5 + + -- Stefano Zacchiroli <[EMAIL PROTECTED]> Wed, 3 Jan 2007 16:17:34 +0100 ocamlnet (1.1-14) UNRELEASED; urgency=low Modified: trunk/packages/ocamlnet/trunk/debian/control URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlnet/trunk/debian/control?rev=3448&op=diff ============================================================================== --- trunk/packages/ocamlnet/trunk/debian/control (original) +++ trunk/packages/ocamlnet/trunk/debian/control Wed Jan 3 16:18:37 2007 @@ -10,7 +10,10 @@ Architecture: any Section: libdevel Depends: ocaml-nox-${F:OCamlABI}, ocaml-findlib, libocamlnet-ocaml (= ${Source-Version}), libpcre-ocaml-dev (>= 5.11.1), ${misc:Depends} -Description: OCaml application-level Internet protocols and conventions library +Conflicts: libequeue-ocaml-dev, libnetclient-ocaml-dev, librpc-ocaml-dev +Replaces: libequeue-ocaml-dev, libnetclient-ocaml-dev +Provides: libequeue-ocaml-dev, libnetclient-ocaml-dev +Description: OCaml application-level Internet libraries - core development libraries Ocamlnet is a collection of OCaml libraries focusing focus on application-level Internet protocols and conventions. . @@ -44,7 +47,10 @@ Architecture: any Section: libs Depends: ocaml-base-nox-${F:OCamlABI}, libpcre-ocaml, ${shlibs:Depends}, ${misc:Depends} -Description: OCaml application-level Internet protocols and conventions library +Conflicts: libequeue-ocaml +Replaces: libequeue-ocaml +Provides: libequeue-ocaml +Description: OCaml application-level Internet libraries - core runtime libraries Ocamlnet is a collection of OCaml libraries focusing focus on application-level Internet protocols and conventions. . @@ -76,7 +82,10 @@ Architecture: any Section: libdevel Depends: ocaml-nox-${F:OCamlABI}, ocaml-findlib, libocamlnet-ocaml-dev (= ${Source-Version}), ${misc:Depends} -Description: OCaml application-level Internet protocols and conventions library +Conflicts: libequeue-gtk2-ocaml-dev +Replaces: libequeue-gtk2-ocaml-dev +Provides: libequeue-gtk2-ocaml-dev +Description: OCaml application-level Internet libraries - GTK2 development libraries Ocamlnet is a collection of OCaml libraries focusing focus on application-level Internet protocols and conventions. . @@ -107,7 +116,7 @@ Architecture: any Section: libdevel Depends: ocaml-nox-${F:OCamlABI}, ocaml-findlib, libocamlnet-ssl-ocaml (= ${Source-Version}), libocamlnet-ocaml-dev (= ${Source-Version}), libssl-ocaml-dev, ${misc:Depends} -Description: OCaml application-level Internet protocols and conventions library +Description: OCaml application-level Internet libraries - SSL development libraries Ocamlnet is a collection of OCaml libraries focusing focus on application-level Internet protocols and conventions. . @@ -138,7 +147,7 @@ Architecture: any Section: libs Depends: ocaml-base-nox-${F:OCamlABI}, libocamlnet-ocaml (= ${Source-Version}), libssl-ocaml, ${shlibs:Depends}, ${misc:Depends} -Description: OCaml application-level Internet protocols and conventions library +Description: OCaml application-level Internet libraries - SSL runtime libraries Ocamlnet is a collection of OCaml libraries focusing focus on application-level Internet protocols and conventions. . @@ -169,7 +178,7 @@ Architecture: any Section: libdevel Depends: ocaml-nox-${F:OCamlABI}, ocaml-findlib, libocamlnet-ocaml-dev (= ${Source-Version}), ${misc:Depends} -Description: OCaml application-level Internet protocols and conventions library +Description: OCaml application-level Internet libraries - HTTP daemon development libraries Ocamlnet is a collection of OCaml libraries focusing focus on application-level Internet protocols and conventions. . @@ -200,8 +209,9 @@ Architecture: all Section: doc Depends: ${misc:Depends} +Conflicts: libocamlnet-ocaml-dev (<< 2.2) Suggests: libocamlnet-ocaml-dev -Description: OCaml application-level Internet protocols and conventions library +Description: OCaml application-level Internet libraries - documentation and examples Ocamlnet is a collection of OCaml libraries focusing focus on application-level Internet protocols and conventions. . Added: trunk/packages/ocamlnet/trunk/debian/libocamlnet-ocaml-dev.docs URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlnet/trunk/debian/libocamlnet-ocaml-dev.docs?rev=3448&op=file ============================================================================== --- trunk/packages/ocamlnet/trunk/debian/libocamlnet-ocaml-dev.docs (added) +++ trunk/packages/ocamlnet/trunk/debian/libocamlnet-ocaml-dev.docs Wed Jan 3 16:18:37 2007 @@ -1,0 +1,2 @@ +INSTALL +RELNOTES Modified: trunk/packages/ocamlnet/trunk/debian/libocamlnet-ocaml-dev.install.in URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlnet/trunk/debian/libocamlnet-ocaml-dev.install.in?rev=3448&op=diff ============================================================================== --- trunk/packages/ocamlnet/trunk/debian/libocamlnet-ocaml-dev.install.in (original) +++ trunk/packages/ocamlnet/trunk/debian/libocamlnet-ocaml-dev.install.in Wed Jan 3 16:18:37 2007 @@ -1,4 +1,4 @@ -debian/tmp/usr/bin /usr/bin +debian/tmp/usr/bin/* /usr/bin debian/tmp/usr/lib/ocaml/@OCamlABI@/cgi @OCamlStdlibDir@ debian/tmp/usr/lib/ocaml/@OCamlABI@/equeue @OCamlStdlibDir@ debian/tmp/usr/lib/ocaml/@OCamlABI@/netcgi1 @OCamlStdlibDir@ Added: trunk/packages/ocamlnet/trunk/debian/libocamlnet-ocaml-doc.dirs URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlnet/trunk/debian/libocamlnet-ocaml-doc.dirs?rev=3448&op=file ============================================================================== --- trunk/packages/ocamlnet/trunk/debian/libocamlnet-ocaml-doc.dirs (added) +++ trunk/packages/ocamlnet/trunk/debian/libocamlnet-ocaml-doc.dirs Wed Jan 3 16:18:37 2007 @@ -1,0 +1,1 @@ +usr/share/doc/libocamlnet-ocaml-dev Modified: trunk/packages/ocamlnet/trunk/debian/libocamlnet-ocaml-doc.doc-base URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlnet/trunk/debian/libocamlnet-ocaml-doc.doc-base?rev=3448&op=diff ============================================================================== --- trunk/packages/ocamlnet/trunk/debian/libocamlnet-ocaml-doc.doc-base (original) +++ trunk/packages/ocamlnet/trunk/debian/libocamlnet-ocaml-doc.doc-base Wed Jan 3 16:18:37 2007 @@ -5,5 +5,5 @@ Section: Apps/Programming Format: HTML -Index: /usr/share/doc/libocamlnet-ocaml-dev/html-main/index.html -Files: /usr/share/doc/libocamlnet-ocaml-dev/html-main/* +Index: /usr/share/doc/libocamlnet-ocaml-doc/html-main/index.html +Files: /usr/share/doc/libocamlnet-ocaml-doc/html-main/* Modified: trunk/packages/ocamlnet/trunk/debian/libocamlnet-ocaml-doc.docs URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlnet/trunk/debian/libocamlnet-ocaml-doc.docs?rev=3448&op=diff ============================================================================== --- trunk/packages/ocamlnet/trunk/debian/libocamlnet-ocaml-doc.docs (original) +++ trunk/packages/ocamlnet/trunk/debian/libocamlnet-ocaml-doc.docs Wed Jan 3 16:18:37 2007 @@ -1,2 +1,1 @@ -RELNOTES doc/* Added: trunk/packages/ocamlnet/trunk/debian/libocamlnet-ocaml-doc.links URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlnet/trunk/debian/libocamlnet-ocaml-doc.links?rev=3448&op=file ============================================================================== --- trunk/packages/ocamlnet/trunk/debian/libocamlnet-ocaml-doc.links (added) +++ trunk/packages/ocamlnet/trunk/debian/libocamlnet-ocaml-doc.links Wed Jan 3 16:18:37 2007 @@ -1,0 +1,2 @@ +usr/share/doc/libocamlnet-ocaml-doc/html-main usr/share/doc/libocamlnet-ocaml-dev/html +usr/share/doc/libocamlnet-ocaml-doc/examples usr/share/doc/libocamlnet-ocaml-dev/examples Modified: trunk/packages/ocamlnet/trunk/debian/patches/00list URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlnet/trunk/debian/patches/00list?rev=3448&op=diff ============================================================================== --- trunk/packages/ocamlnet/trunk/debian/patches/00list (original) +++ trunk/packages/ocamlnet/trunk/debian/patches/00list Wed Jan 3 16:18:37 2007 @@ -1,2 +1,4 @@ no_debugging_info dont_install_gpl +mkdir_destdir +missing_shebangs Added: trunk/packages/ocamlnet/trunk/debian/patches/missing_shebangs.dpatch URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlnet/trunk/debian/patches/missing_shebangs.dpatch?rev=3448&op=file ============================================================================== --- trunk/packages/ocamlnet/trunk/debian/patches/missing_shebangs.dpatch (added) +++ trunk/packages/ocamlnet/trunk/debian/patches/missing_shebangs.dpatch Wed Jan 3 16:18:37 2007 @@ -1,0 +1,21 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## missing_shebangs.dpatch by Stefano Zacchiroli <[EMAIL PROTECTED]> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: added missing shebang lines in example shell scripts + [EMAIL PROTECTED]@ +diff -urNad trunk~/examples/cgi/netcgi2-plex/compile.sh trunk/examples/cgi/netcgi2-plex/compile.sh +--- trunk~/examples/cgi/netcgi2-plex/compile.sh 2007-01-02 17:13:51.000000000 +0100 ++++ trunk/examples/cgi/netcgi2-plex/compile.sh 2007-01-03 13:42:04.000000000 +0100 +@@ -1,2 +1,3 @@ ++#!/bin/sh + export OCAMLPATH=../../../src + make +diff -urNad trunk~/examples/cgi/netcgi2-plex/run.sh trunk/examples/cgi/netcgi2-plex/run.sh +--- trunk~/examples/cgi/netcgi2-plex/run.sh 2007-01-02 17:13:51.000000000 +0100 ++++ trunk/examples/cgi/netcgi2-plex/run.sh 2007-01-03 13:42:05.000000000 +0100 +@@ -1,2 +1,3 @@ ++#!/bin/sh + export LD_LIBRARY_PATH=../../../src/netsys:../../../src/netstring + exec ./netplex -conf netplex.cfg "$@" Propchange: trunk/packages/ocamlnet/trunk/debian/patches/missing_shebangs.dpatch ------------------------------------------------------------------------------ svn:executable = * Added: trunk/packages/ocamlnet/trunk/debian/patches/mkdir_destdir.dpatch URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlnet/trunk/debian/patches/mkdir_destdir.dpatch?rev=3448&op=file ============================================================================== --- trunk/packages/ocamlnet/trunk/debian/patches/mkdir_destdir.dpatch (added) +++ trunk/packages/ocamlnet/trunk/debian/patches/mkdir_destdir.dpatch Wed Jan 3 16:18:37 2007 @@ -1,0 +1,18 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## mkdir_destdir.dpatch by Stefano Zacchiroli <[EMAIL PROTECTED]> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: create installation destination directories, since ocamlfind doesn't + [EMAIL PROTECTED]@ +diff -urNad trunk~/Makefile trunk/Makefile +--- trunk~/Makefile 2007-01-02 17:13:47.000000000 +0100 ++++ trunk/Makefile 2007-01-03 13:27:36.000000000 +0100 +@@ -46,6 +46,7 @@ + # The following PHONY rule is important for Cygwin: + .PHONY: install + install: ++ mkdir -p $(DESTDIR) $(OCAMLFIND_DESTDIR) $(OCAMLFIND_DESTDIR)/stublibs + for pkg in $(PKGLIST); do \ + ( cd src/$$pkg && $(MAKE) -f Makefile.pre install ) || exit; \ + done Propchange: trunk/packages/ocamlnet/trunk/debian/patches/mkdir_destdir.dpatch ------------------------------------------------------------------------------ svn:executable = * Modified: trunk/packages/ocamlnet/trunk/debian/rules URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlnet/trunk/debian/rules?rev=3448&op=diff ============================================================================== --- trunk/packages/ocamlnet/trunk/debian/rules (original) +++ trunk/packages/ocamlnet/trunk/debian/rules Wed Jan 3 16:18:37 2007 @@ -12,10 +12,12 @@ DEB_MAKE_BUILD_TARGET = all ifeq ($(OCAML_HAVE_OCAMLOPT),yes) -DEB_MAKE_BUILD_TARGET += opt +#DEB_MAKE_BUILD_TARGET += opt endif DEB_DH_COMPRESS_ARGS = -X.ml +DEB_STRIP_EXCLUDE += usr/bin/netplex-admin # OCaml custom bytecode binaries can't be striped +DEB_STRIP_EXCLUDE += usr/bin/ocamlrpcgen configure/$(PKGNAME):: configure-stamp configure-stamp: @@ -26,6 +28,3 @@ clean:: rm -f debian/configure-stamp -build/$(PKGNAME):: - mkdir -p $(OCAMLFIND_DESTDIR) $(OCAMLFIND_DESTDIR)/stublibs - _______________________________________________ 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