[Pkg-ocaml-maint-commits] r3438 - in
/trunk/packages/ocamlnet/trunk/debian: ./ patches/
zack at users.alioth.debian.org
zack at users.alioth.debian.org
Tue Jan 2 17:54:15 CET 2007
Author: zack
Date: Tue Jan 2 17:54:15 2007
New Revision: 3438
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=3438
Log:
ocamlnet 2.2 packaging snapshot
TODO: factorize ocamlnet in several packages
TODO: add conflicts/replaces/... to ease transition
see debian/TODO for more details
Added:
trunk/packages/ocamlnet/trunk/debian/libocamlnet-ocaml-dev.dirs.in
trunk/packages/ocamlnet/trunk/debian/libocamlnet-ocaml.dirs.in
trunk/packages/ocamlnet/trunk/debian/libocamlnet-ocaml.install.in
trunk/packages/ocamlnet/trunk/debian/patches/dont_install_gpl.dpatch (with props)
trunk/packages/ocamlnet/trunk/debian/patches/no_debugging_info.dpatch (with props)
Removed:
trunk/packages/ocamlnet/trunk/debian/libocamlnet-ocaml-dev.doc-base.intro
trunk/packages/ocamlnet/trunk/debian/patches/02_dont_install_gpl.dpatch
Modified:
trunk/packages/ocamlnet/trunk/debian/TODO
trunk/packages/ocamlnet/trunk/debian/changelog
trunk/packages/ocamlnet/trunk/debian/compat
trunk/packages/ocamlnet/trunk/debian/control
trunk/packages/ocamlnet/trunk/debian/docs
trunk/packages/ocamlnet/trunk/debian/libocamlnet-ocaml-dev.doc-base.refman
trunk/packages/ocamlnet/trunk/debian/libocamlnet-ocaml-dev.install.in
trunk/packages/ocamlnet/trunk/debian/patches/00list
trunk/packages/ocamlnet/trunk/debian/rules
Modified: trunk/packages/ocamlnet/trunk/debian/TODO
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlnet/trunk/debian/TODO?rev=3438&op=diff
==============================================================================
--- trunk/packages/ocamlnet/trunk/debian/TODO (original)
+++ trunk/packages/ocamlnet/trunk/debian/TODO Tue Jan 2 17:54:15 2007
@@ -1,6 +1,11 @@
-Split a libocamlnet-ocaml-doc package containing html documentation and
-examples.
+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
--- Mon, 15 Aug 2005 14:55:58 +0200 zack
+-- Tue, 02 Jan 2007 17:52:06 +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=3438&op=diff
==============================================================================
--- trunk/packages/ocamlnet/trunk/debian/changelog (original)
+++ trunk/packages/ocamlnet/trunk/debian/changelog Tue Jan 2 17:54:15 2007
@@ -8,6 +8,22 @@
- 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
+ - 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)
+ * 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)
+ - 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 <zack at debian.org> Tue, 2 Jan 2007 12:09:25 +0100
Modified: trunk/packages/ocamlnet/trunk/debian/compat
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlnet/trunk/debian/compat?rev=3438&op=diff
==============================================================================
--- trunk/packages/ocamlnet/trunk/debian/compat (original)
+++ trunk/packages/ocamlnet/trunk/debian/compat Tue Jan 2 17:54:15 2007
@@ -1,1 +1,1 @@
-4
+5
Modified: trunk/packages/ocamlnet/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlnet/trunk/debian/control?rev=3438&op=diff
==============================================================================
--- trunk/packages/ocamlnet/trunk/debian/control (original)
+++ trunk/packages/ocamlnet/trunk/debian/control Tue Jan 2 17:54:15 2007
@@ -2,14 +2,14 @@
Section: devel
Priority: optional
Maintainer: Stefano Zacchiroli <zack at debian.org>
-Build-Depends: debhelper (>> 4.0.0), ocaml-nox (>= 3.09.2-7), libpcre-ocaml-dev (>= 5.11.1), libequeue-ocaml-dev (>= 2.1.3-4), ocaml-findlib (>= 1.1), dpatch, cdbs
+Build-Depends: debhelper (>> 5.0.0), dpatch, cdbs, ocaml-nox (>= 3.09.2-7), ocaml-findlib (>= 1.1), libpcre-ocaml-dev (>= 5.11.1), liblablgtk2-ocaml-dev, libcryptgps-ocaml-dev
Standards-Version: 3.7.2
XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/ocamlnet
Package: libocamlnet-ocaml-dev
Architecture: any
Section: libdevel
-Depends: ocaml-nox-${F:OCamlABI}, libocamlnet-ocaml (= ${Source-Version}), libpcre-ocaml-dev (>= 5.11.1), libequeue-ocaml-dev (>= 2.1.3-4), ocaml-findlib (>= 1.1), ${misc:Depends}
+Depends: ocaml-nox-${F:OCamlABI}, libocamlnet-ocaml (= ${Source-Version}), libpcre-ocaml-dev (>= 5.11.1), ocaml-findlib (>= 1.1), ${misc:Depends}
Description: OCaml application-level Internet protocols and conventions library
Collection of modules for the Objective Caml language which
focus on application-level Internet protocols and conventions.
@@ -38,7 +38,7 @@
Package: libocamlnet-ocaml
Architecture: any
Section: libs
-Depends: ocaml-base-nox-${F:OCamlABI}, libpcre-ocaml, libequeue-ocaml, ${shlibs:Depends}, ${misc:Depends}
+Depends: ocaml-base-nox-${F:OCamlABI}, libpcre-ocaml, ${shlibs:Depends}, ${misc:Depends}
Description: OCaml application-level Internet protocols and conventions library
Collection of modules for the Objective Caml language which
focus on application-level Internet protocols and conventions.
Modified: trunk/packages/ocamlnet/trunk/debian/docs
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlnet/trunk/debian/docs?rev=3438&op=diff
==============================================================================
--- trunk/packages/ocamlnet/trunk/debian/docs (original)
+++ trunk/packages/ocamlnet/trunk/debian/docs Tue Jan 2 17:54:15 2007
@@ -1,2 +1,2 @@
-README
+RELNOTES
doc/*
Added: trunk/packages/ocamlnet/trunk/debian/libocamlnet-ocaml-dev.dirs.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlnet/trunk/debian/libocamlnet-ocaml-dev.dirs.in?rev=3438&op=file
==============================================================================
--- trunk/packages/ocamlnet/trunk/debian/libocamlnet-ocaml-dev.dirs.in (added)
+++ trunk/packages/ocamlnet/trunk/debian/libocamlnet-ocaml-dev.dirs.in Tue Jan 2 17:54:15 2007
@@ -1,0 +1,1 @@
+ at OCamlStdlibDir@
Modified: trunk/packages/ocamlnet/trunk/debian/libocamlnet-ocaml-dev.doc-base.refman
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlnet/trunk/debian/libocamlnet-ocaml-dev.doc-base.refman?rev=3438&op=diff
==============================================================================
--- trunk/packages/ocamlnet/trunk/debian/libocamlnet-ocaml-dev.doc-base.refman (original)
+++ trunk/packages/ocamlnet/trunk/debian/libocamlnet-ocaml-dev.doc-base.refman Tue Jan 2 17:54:15 2007
@@ -1,9 +1,9 @@
Document: ocamlnet-refman
-Title: OcamlNet Reference Manual
+Title: Ocamlnet 2 Reference Manual
Author: Gerd Stolpmann
-Abstract: Reference manual for the OcamlNet library
+Abstract: Reference manual for the Ocamlnet library
Section: Apps/Programming
Format: HTML
-Index: /usr/share/doc/libocamlnet-ocaml-dev/html/refman/index.html
-Files: /usr/share/doc/libocamlnet-ocaml-dev/html/refman/*
+Index: /usr/share/doc/libocamlnet-ocaml-dev/html-main/index.html
+Files: /usr/share/doc/libocamlnet-ocaml-dev/html-main/*
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=3438&op=diff
==============================================================================
--- trunk/packages/ocamlnet/trunk/debian/libocamlnet-ocaml-dev.install.in (original)
+++ trunk/packages/ocamlnet/trunk/debian/libocamlnet-ocaml-dev.install.in Tue Jan 2 17:54:15 2007
@@ -1,5 +1,23 @@
-debian/tmp/cgi/ usr/lib/ocaml/@OCamlABI@/
-debian/tmp/nethttpd/ usr/lib/ocaml/@OCamlABI@/
-debian/tmp/netstring/ usr/lib/ocaml/@OCamlABI@/
-debian/tmp/pop/ usr/lib/ocaml/@OCamlABI@/
-debian/tmp/smtp/ usr/lib/ocaml/@OCamlABI@/
+debian/tmp/usr/lib/ocaml/@OCamlABI@/cgi @OCamlStdlibDir@
+debian/tmp/usr/lib/ocaml/@OCamlABI@/equeue @OCamlStdlibDir@
+debian/tmp/usr/lib/ocaml/@OCamlABI@/equeue-gtk2 @OCamlStdlibDir@
+debian/tmp/usr/lib/ocaml/@OCamlABI@/equeue-ssl @OCamlStdlibDir@
+debian/tmp/usr/lib/ocaml/@OCamlABI@/netcgi1 @OCamlStdlibDir@
+debian/tmp/usr/lib/ocaml/@OCamlABI@/netcgi2 @OCamlStdlibDir@
+debian/tmp/usr/lib/ocaml/@OCamlABI@/netcgi2-plex @OCamlStdlibDir@
+debian/tmp/usr/lib/ocaml/@OCamlABI@/netclient @OCamlStdlibDir@
+debian/tmp/usr/lib/ocaml/@OCamlABI@/nethttpd @OCamlStdlibDir@
+debian/tmp/usr/lib/ocaml/@OCamlABI@/nethttpd-for-netcgi1 @OCamlStdlibDir@
+debian/tmp/usr/lib/ocaml/@OCamlABI@/nethttpd-for-netcgi2 @OCamlStdlibDir@
+debian/tmp/usr/lib/ocaml/@OCamlABI@/netplex @OCamlStdlibDir@
+debian/tmp/usr/lib/ocaml/@OCamlABI@/netshm @OCamlStdlibDir@
+debian/tmp/usr/lib/ocaml/@OCamlABI@/netstring @OCamlStdlibDir@
+debian/tmp/usr/lib/ocaml/@OCamlABI@/netsys @OCamlStdlibDir@
+debian/tmp/usr/lib/ocaml/@OCamlABI@/pop @OCamlStdlibDir@
+debian/tmp/usr/lib/ocaml/@OCamlABI@/rpc @OCamlStdlibDir@
+debian/tmp/usr/lib/ocaml/@OCamlABI@/rpc-auth-local @OCamlStdlibDir@
+debian/tmp/usr/lib/ocaml/@OCamlABI@/rpc-generator @OCamlStdlibDir@
+debian/tmp/usr/lib/ocaml/@OCamlABI@/rpc-ssl @OCamlStdlibDir@
+debian/tmp/usr/lib/ocaml/@OCamlABI@/shell @OCamlStdlibDir@
+debian/tmp/usr/lib/ocaml/@OCamlABI@/smtp @OCamlStdlibDir@
+debian/tmp/usr/share/ocamlnet /usr/share
Added: trunk/packages/ocamlnet/trunk/debian/libocamlnet-ocaml.dirs.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlnet/trunk/debian/libocamlnet-ocaml.dirs.in?rev=3438&op=file
==============================================================================
--- trunk/packages/ocamlnet/trunk/debian/libocamlnet-ocaml.dirs.in (added)
+++ trunk/packages/ocamlnet/trunk/debian/libocamlnet-ocaml.dirs.in Tue Jan 2 17:54:15 2007
@@ -1,0 +1,1 @@
+ at OCamlStdlibDir@/stublibs
Added: trunk/packages/ocamlnet/trunk/debian/libocamlnet-ocaml.install.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlnet/trunk/debian/libocamlnet-ocaml.install.in?rev=3438&op=file
==============================================================================
--- trunk/packages/ocamlnet/trunk/debian/libocamlnet-ocaml.install.in (added)
+++ trunk/packages/ocamlnet/trunk/debian/libocamlnet-ocaml.install.in Tue Jan 2 17:54:15 2007
@@ -1,0 +1,1 @@
+debian/tmp/usr/lib/ocaml/@OCamlABI@/stublibs/* @OCamlStdlibDir@/stublibs
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=3438&op=diff
==============================================================================
--- trunk/packages/ocamlnet/trunk/debian/patches/00list (original)
+++ trunk/packages/ocamlnet/trunk/debian/patches/00list Tue Jan 2 17:54:15 2007
@@ -1,2 +1,2 @@
-01_build
-02_dont_install_gpl
+no_debugging_info
+dont_install_gpl
Added: trunk/packages/ocamlnet/trunk/debian/patches/dont_install_gpl.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlnet/trunk/debian/patches/dont_install_gpl.dpatch?rev=3438&op=file
==============================================================================
--- trunk/packages/ocamlnet/trunk/debian/patches/dont_install_gpl.dpatch (added)
+++ trunk/packages/ocamlnet/trunk/debian/patches/dont_install_gpl.dpatch Tue Jan 2 17:54:15 2007
@@ -1,0 +1,31 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## dont_install_gpl.dpatch by Stefano Zacchiroli <zack at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: avoid shipping GPL license text, we have it in Debian!
+
+ at DPATCH@
+diff -urNad trunk~/src/nethttpd-for-netcgi1/Makefile.pre trunk/src/nethttpd-for-netcgi1/Makefile.pre
+--- trunk~/src/nethttpd-for-netcgi1/Makefile.pre 2006-12-28 20:05:28.000000000 +0100
++++ trunk/src/nethttpd-for-netcgi1/Makefile.pre 2007-01-02 15:12:11.000000000 +0100
+@@ -4,7 +4,7 @@
+ PKGNAME = nethttpd-for-netcgi1
+ GENERATE = META
+
+-INSTALL_EXTRA += LICENSE
++INSTALL_EXTRA +=
+
+ PP_OPTIONS = -package "camlp4, camlp4.macro" -syntax "camlp4o"
+
+diff -urNad trunk~/src/nethttpd-for-netcgi2/Makefile.pre trunk/src/nethttpd-for-netcgi2/Makefile.pre
+--- trunk~/src/nethttpd-for-netcgi2/Makefile.pre 2006-12-28 20:05:28.000000000 +0100
++++ trunk/src/nethttpd-for-netcgi2/Makefile.pre 2007-01-02 15:12:16.000000000 +0100
+@@ -13,7 +13,7 @@
+ PKGNAME = nethttpd-for-netcgi2
+ GENERATE = META $(COPY_OVER)
+
+-INSTALL_EXTRA += LICENSE
++INSTALL_EXTRA +=
+
+ PP_OPTIONS = -package "camlp4, camlp4.macro" -syntax "camlp4o"
+
Propchange: trunk/packages/ocamlnet/trunk/debian/patches/dont_install_gpl.dpatch
------------------------------------------------------------------------------
svn:executable = *
Added: trunk/packages/ocamlnet/trunk/debian/patches/no_debugging_info.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlnet/trunk/debian/patches/no_debugging_info.dpatch?rev=3438&op=file
==============================================================================
--- trunk/packages/ocamlnet/trunk/debian/patches/no_debugging_info.dpatch (added)
+++ trunk/packages/ocamlnet/trunk/debian/patches/no_debugging_info.dpatch Tue Jan 2 17:54:15 2007
@@ -1,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## no_debugging_info.dpatch by Stefano Zacchiroli <zack at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: avoid compiling with debugging information enabled (-g)
+
+ at DPATCH@
+diff -urNad trunk~/Makefile.rules trunk/Makefile.rules
+--- trunk~/Makefile.rules 2006-12-28 20:05:24.000000000 +0100
++++ trunk/Makefile.rules 2007-01-02 15:08:21.000000000 +0100
+@@ -7,7 +7,7 @@
+ # How to invoke compilers and tools:
+ # (May be moved to Makefile.conf if necessary)
+
+-OCAMLC = $(OCAMLFIND) ocamlc -g $(OCAMLC_OPTIONS) $(INCLUDES) -package "$(REQUIRES)" $(PP_OPTIONS)
++OCAMLC = $(OCAMLFIND) ocamlc $(OCAMLC_OPTIONS) $(INCLUDES) -package "$(REQUIRES)" $(PP_OPTIONS)
+ OCAMLOPT = $(OCAMLFIND) ocamlopt -inline 10 $(OCAMLOPT_OPTIONS) $(INCLUDES) -package "$(REQUIRES)" $(PP_OPTIONS)
+ OCAMLDEP = $(OCAMLFIND) ocamldep $(OCAMLDEP_OPTIONS) $(PP_OPTIONS)
+ OCAMLFIND = ocamlfind
Propchange: trunk/packages/ocamlnet/trunk/debian/patches/no_debugging_info.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=3438&op=diff
==============================================================================
--- trunk/packages/ocamlnet/trunk/debian/rules (original)
+++ trunk/packages/ocamlnet/trunk/debian/rules Tue Jan 2 17:54:15 2007
@@ -6,23 +6,38 @@
PKGNAME = libocamlnet-ocaml-dev
-NETDBDESTDIR = $(OCAML_STDLIB_DIR)/netstring
-DEB_SRCDIR = $(CURDIR)/src
-DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(CURDIR)/debian/tmp NETDBDESTDIR=$(CURDIR)/debian/tmp/netstring
+DESTDIR = $(CURDIR)/debian/tmp
+OCAMLFIND_DESTDIR = $(DESTDIR)$(OCAML_STDLIB_DIR)
+DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(DESTDIR) OCAMLFIND_DESTDIR=$(OCAMLFIND_DESTDIR)
-configure/$(PKGNAME)::
- cd src/ && ./configure -enable-compatcgi -datadir $(NETDBDESTDIR)
- find src -name depend -exec rm -f {} \;
+DEB_MAKE_BUILD_TARGET = all
-ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
+# XXX temporarily commented out, to speed up building while testing
+#ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
+#DEB_MAKE_BUILD_TARGET += opt
+#endif
+
+DEB_DH_COMPRESS_ARGS = -X.ml
+
+configure/$(PKGNAME):: configure-stamp
+configure-stamp:
+ # XXX TODO: add back the following configure parameter, right now the
+ # compilation with it fails due to a missing file
+ # -with-rpc-auth-dh
+ ./configure \
+ -enable-gtk2 -enable-ssl -enable-modcaml -with-nethttpd -prefer-netcgi2 \
+ -bindir /usr/bin -datadir /usr/share/ocamlnet
+ touch debian/configure-stamp
+clean::
+ rm -rf debian/configure-stamp
+# find src -name depend -exec rm -f {} \;
+
build/$(PKGNAME)::
- $(MAKE) -C $(DEB_SRCDIR) opt
-endif
-build/$(PKGNAME)::
- mkdir -p debian/tmp
-common-install-impl::
- mkdir -p debian/libocamlnet-ocaml$(OCAML_STDLIB_DIR)/stublibs
- mv debian/tmp/netstring/*.so debian/libocamlnet-ocaml$(OCAML_STDLIB_DIR)/stublibs
-clean::
- rm -f /src/netstring/tools/unimap_to_ocaml/unimap_to_ocaml.cm*
- rm -f /src/tmp/t.cm*
+ mkdir -p $(OCAMLFIND_DESTDIR) $(OCAMLFIND_DESTDIR)/stublibs
+#common-install-impl::
+# mkdir -p debian/libocamlnet-ocaml$(OCAML_STDLIB_DIR)/stublibs
+# mv debian/tmp/netstring/*.so debian/libocamlnet-ocaml$(OCAML_STDLIB_DIR)/stublibs
+#clean::
+# rm -f /src/netstring/tools/unimap_to_ocaml/unimap_to_ocaml.cm*
+# rm -f /src/tmp/t.cm*
+
More information about the Pkg-ocaml-maint-commits
mailing list