[Pkg-ocaml-maint-commits] r1514 - in
trunk/packages/ocamlnet/trunk/debian: . patches
Stefano Zacchiroli
zack at costa.debian.org
Fri Jul 29 19:42:07 UTC 2005
Author: zack
Date: 2005-07-29 19:42:07 +0000 (Fri, 29 Jul 2005)
New Revision: 1514
Added:
trunk/packages/ocamlnet/trunk/debian/patches/02_dont_install_gpl.dpatch
Modified:
trunk/packages/ocamlnet/trunk/debian/changelog
trunk/packages/ocamlnet/trunk/debian/control
trunk/packages/ocamlnet/trunk/debian/copyright
trunk/packages/ocamlnet/trunk/debian/patches/00list
trunk/packages/ocamlnet/trunk/debian/patches/01_build.dpatch
trunk/packages/ocamlnet/trunk/debian/rules
Log:
new upstream version 1.1
Modified: trunk/packages/ocamlnet/trunk/debian/changelog
===================================================================
--- trunk/packages/ocamlnet/trunk/debian/changelog 2005-07-29 19:41:50 UTC (rev 1513)
+++ trunk/packages/ocamlnet/trunk/debian/changelog 2005-07-29 19:42:07 UTC (rev 1514)
@@ -1,3 +1,19 @@
+ocamlnet (1.1-1) unstable; urgency=low
+
+ * New upstream release
+ - added Nethttpd, HTTP 1.1 daemon functionality library
+ - added Smtp, SMTP client library
+ * debian/control
+ - "ported" description to latest features
+ - bumped standards-version
+ - bumped pcre dependencies to 5.10
+ * debian/copyright
+ - added copyright info for Nethttpd (GPL license)
+ * debian/patches/02_dont_install_gpl
+ - avoid installing gpl license in <ocaml_lib_dir>/nethtppd/
+
+ -- Stefano Zacchiroli <zack at debian.org> Fri, 29 Jul 2005 13:57:47 +0200
+
ocamlnet (1.0-3) unstable; urgency=low
* fixed bug in preinst which inhibit clean up of old diversions
Modified: trunk/packages/ocamlnet/trunk/debian/control
===================================================================
--- trunk/packages/ocamlnet/trunk/debian/control 2005-07-29 19:41:50 UTC (rev 1513)
+++ trunk/packages/ocamlnet/trunk/debian/control 2005-07-29 19:42:07 UTC (rev 1514)
@@ -2,54 +2,63 @@
Section: devel
Priority: optional
Maintainer: Stefano Zacchiroli <zack at debian.org>
-Build-Depends: debhelper (>> 4.0.0), ocaml-nox-3.08.3, libpcre-ocaml-dev (>= 5.08), ocaml-findlib, dpatch
-Standards-Version: 3.6.1.1
+Build-Depends: debhelper (>> 4.0.0), ocaml-nox-3.08.3, libpcre-ocaml-dev (>= 5.10), ocaml-findlib, dpatch
+Standards-Version: 3.6.2
Package: libocamlnet-ocaml-dev
Architecture: any
Section: libdevel
-Depends: ocaml-nox-3.08.3, libocamlnet-ocaml (= ${Source-Version}), libpcre-ocaml-dev (>= 5.08), ocaml-findlib, ${misc:Depends}
+Depends: ocaml-nox-3.08.3, libocamlnet-ocaml (= ${Source-Version}), libpcre-ocaml-dev (>= 5.10), ocaml-findlib, ${misc:Depends}
Description: OCaml application-level Internet protocols and conventions library
- The Ocamlnet library will provide a collection of modules for
- the Objective Caml language which focus on application-level
- Internet protocols and conventions.
+ Collection of modules for the Objective Caml language which
+ focus on application-level Internet protocols and conventions.
.
The current distribution contains:
- * a mature implementation of the CGI protocol
- * an implementation of the JSERV protocol, can be used to
- connect application servers written in OCaml with web servers
- * an experimental POP3 client
- * a library of string processing functions related to Internet
- protocols (formerly known as "netstring" and distributed
- separately): MIME encoding/decoding, Date/time parsing,
- Character encoding conversion, HTML parsing and printing, URL
- parsing and printing, OO-representation of channels, and a
- lot more
+ * a mature implementation of the CGI protocol
+ * an implementation of the JSERV protocol (AJP-1.2), can be used
+ with mod_jserv (Apache JServ) and mod_jk (Jakarta connector)
+ to connect application servers written in O'Caml with web
+ servers
+ * an implementation of the FastCGI protocol, for the same
+ purpose
+ * an HTTP daemon, for substituting the web server completely
+ * a POP3 client
+ * an SMTP client
+ * a library of string processing functions related to Internet
+ protocols (formerly known as "netstring" and distributed
+ separately): MIME encoding/decoding, Date/time parsing,
+ Character encoding conversion, HTML parsing and printing, URL
+ parsing and printing, OO-representation of channels, and a lot
+ more.
.
This package contains all the development stuff you need to use
Ocamlnet in your programs.
-
Package: libocamlnet-ocaml
Architecture: any
Section: libs
Depends: ocaml-base-nox-3.08.3, ${shlibs:Depends}, ${misc:Depends}
Description: OCaml application-level Internet protocols and conventions library
- The Ocamlnet library will provide a collection of modules for
- the Objective Caml language which focus on application-level
- Internet protocols and conventions.
+ Collection of modules for the Objective Caml language which
+ focus on application-level Internet protocols and conventions.
.
The current distribution contains:
- * a mature implementation of the CGI protocol
- * an implementation of the JSERV protocol, can be used to
- connect application servers written in OCaml with web servers
- * an experimental POP3 client
- * a library of string processing functions related to Internet
- protocols (formerly known as "netstring" and distributed
- separately): MIME encoding/decoding, Date/time parsing,
- Character encoding conversion, HTML parsing and printing, URL
- parsing and printing, OO-representation of channels, and a
- lot more
+ * a mature implementation of the CGI protocol
+ * an implementation of the JSERV protocol (AJP-1.2), can be used
+ with mod_jserv (Apache JServ) and mod_jk (Jakarta connector)
+ to connect application servers written in O'Caml with web
+ servers
+ * an implementation of the FastCGI protocol, for the same
+ purpose
+ * an HTTP daemon, for substituting the web server completely
+ * a POP3 client
+ * an SMTP client
+ * a library of string processing functions related to Internet
+ protocols (formerly known as "netstring" and distributed
+ separately): MIME encoding/decoding, Date/time parsing,
+ Character encoding conversion, HTML parsing and printing, URL
+ parsing and printing, OO-representation of channels, and a lot
+ more.
.
This package contains only the shared runtime stub libraries.
Modified: trunk/packages/ocamlnet/trunk/debian/copyright
===================================================================
--- trunk/packages/ocamlnet/trunk/debian/copyright 2005-07-29 19:41:50 UTC (rev 1513)
+++ trunk/packages/ocamlnet/trunk/debian/copyright 2005-07-29 19:42:07 UTC (rev 1514)
@@ -7,7 +7,8 @@
Gerd Stolpmann <gerd at gerd-stolpmann.de>
Patrick Doane <patrick at watson.org>
-Copyright:
+Copyright (for every part of the library except Nethttpd, see below for
+Nethttp Copyright):
Copyright (c) 2001 Patrick Doane and Gerd Stolpmann
@@ -30,3 +31,9 @@
3. This notice may not be removed or altered from any source
distribution.
+Copyright (for Nethttpd):
+
+ Nethttp is distributed under the terms of the GNU General Public
+ License (GPL). On Debian GNU/Linux systems a copy of the license is
+ available in /usr/share/common-licenses/GPL .
+
Modified: trunk/packages/ocamlnet/trunk/debian/patches/00list
===================================================================
--- trunk/packages/ocamlnet/trunk/debian/patches/00list 2005-07-29 19:41:50 UTC (rev 1513)
+++ trunk/packages/ocamlnet/trunk/debian/patches/00list 2005-07-29 19:42:07 UTC (rev 1514)
@@ -1 +1,2 @@
01_build
+02_dont_install_gpl
Modified: trunk/packages/ocamlnet/trunk/debian/patches/01_build.dpatch
===================================================================
--- trunk/packages/ocamlnet/trunk/debian/patches/01_build.dpatch 2005-07-29 19:41:50 UTC (rev 1513)
+++ trunk/packages/ocamlnet/trunk/debian/patches/01_build.dpatch 2005-07-29 19:42:07 UTC (rev 1514)
@@ -1,41 +1,33 @@
-#! /bin/sh -e
-## 01_build.dpatch by <zack at debian.org>
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 99-unnamed.dpatch by <zack at muletto.takhisis.invalid>
##
## All lines beginning with `## DP:' are a description of the patch.
-## DP: Makefiles changes in order to install under DESTDIR/
+## DP: No description.
-if [ $# -lt 1 ]; then
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
-
-case "$1" in
- -patch) patch -p1 ${patch_opts} < $0;;
- -unpatch) patch -R -p1 ${patch_opts} < $0;;
- *)
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1;;
-esac
-
-exit 0
-
@DPATCH@
-diff -urNad /home/zack/dati/debian/packages/ocamlnet/ocamlnet-0.98/src/Makefile.rules ocamlnet-0.98/src/Makefile.rules
---- /home/zack/dati/debian/packages/ocamlnet/ocamlnet-0.98/src/Makefile.rules 2004-09-09 13:48:53.321100320 +0200
-+++ ocamlnet-0.98/src/Makefile.rules 2004-09-09 13:49:24.778318096 +0200
+diff -urNad --exclude=CVS --exclude=.svn ./src/Makefile.rules /tmp/dpep-work.Ndl9sd/trunk/src/Makefile.rules
+--- ./src/Makefile.rules 2005-07-29 15:22:14.000000000 +0200
++++ /tmp/dpep-work.Ndl9sd/trunk/src/Makefile.rules 2005-07-29 15:22:15.000000000 +0200
@@ -7,7 +7,7 @@
# How to invoke compilers and tools:
# (May be moved to Makefile.conf if necessary)
--OCAMLC = $(USE_OCAMLFIND) ocamlc -g $(OCAMLC_OPTIONS) $(INCLUDES)
-+OCAMLC = $(USE_OCAMLFIND) ocamlc $(OCAMLC_OPTIONS) $(INCLUDES)
- OCAMLOPT = $(USE_OCAMLFIND) ocamlopt -inline 10 $(OCAMLOPT_OPTIONS) $(INCLUDES)
- OCAMLDEP = ocamldep $(OCAMLDEP_OPTIONS)
+-OCAMLC = $(USE_OCAMLFIND) ocamlc -g $(OCAMLC_OPTIONS) $(INCLUDES) $(PP_OPTIONS)
++OCAMLC = $(USE_OCAMLFIND) ocamlc $(OCAMLC_OPTIONS) $(INCLUDES) $(PP_OPTIONS)
+ OCAMLOPT = $(USE_OCAMLFIND) ocamlopt -inline 10 $(OCAMLOPT_OPTIONS) $(INCLUDES) $(PP_OPTIONS)
+ OCAMLDEP = $(USE_OCAMLFIND) ocamldep $(OCAMLDEP_OPTIONS) $(PP_OPTIONS)
OCAMLFIND = ocamlfind
-@@ -78,7 +78,7 @@
+@@ -19,6 +19,9 @@
+ TOOLS_DIR = $(TOP_DIR)/tools
+ COLLECT_FILES = $(TOOLS_DIR)/collect_files
+
++DESTDIR =
++NETDBDESTDIR =
++
+ # Note: In Makefile.conf, we have either
+ # PP_OPTIONS=$(PP_OPTIONS_FINDLIB) or
+ # PP_OPTIONS=$(PP_OPTIONS_NON_FINDLIB).
+@@ -93,7 +96,7 @@
.PHONY: install-findlib
install-findlib:
files=`$(COLLECT_FILES) *.mli *.cmi *.cma *.cmxa *.a META $(INSTALL_EXTRA)` && \
@@ -44,17 +36,15 @@
.PHONY: uninstall-findlib
uninstall-findlib:
-diff -urNad /home/zack/dati/debian/packages/ocamlnet/ocamlnet-0.98/src/netstring/Makefile ocamlnet-0.98/src/netstring/Makefile
---- /home/zack/dati/debian/packages/ocamlnet/ocamlnet-0.98/src/netstring/Makefile 2004-09-09 13:48:53.322100168 +0200
-+++ ocamlnet-0.98/src/netstring/Makefile 2004-09-09 13:50:01.090797760 +0200
-@@ -168,9 +168,9 @@
-
+diff -urNad --exclude=CVS --exclude=.svn ./src/netstring/Makefile /tmp/dpep-work.Ndl9sd/trunk/src/netstring/Makefile
+--- ./src/netstring/Makefile 2005-07-29 15:22:14.000000000 +0200
++++ /tmp/dpep-work.Ndl9sd/trunk/src/netstring/Makefile 2005-07-29 15:22:15.000000000 +0200
+@@ -173,8 +173,8 @@
.PHONY: install-netdb
install-netdb:
-- mkdir -p $(NET_DB_DIR)
+ mkdir -p $(NET_DB_DIR)
- cp netdb/*.netdb $(NET_DB_DIR)
- @echo "Installed .netdb files into $(NET_DB_DIR)"
-+ mkdir -p $(NETDBDESTDIR)
+ cp netdb/*.netdb $(NETDBDESTDIR)
+ @echo "Installed .netdb files into $(NETDBDESTDIR)"
if [ "$(INSTMETHOD)" != "findlib" ]; then \
Added: trunk/packages/ocamlnet/trunk/debian/patches/02_dont_install_gpl.dpatch
===================================================================
--- trunk/packages/ocamlnet/trunk/debian/patches/02_dont_install_gpl.dpatch 2005-07-29 19:41:50 UTC (rev 1513)
+++ trunk/packages/ocamlnet/trunk/debian/patches/02_dont_install_gpl.dpatch 2005-07-29 19:42:07 UTC (rev 1514)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_dont_install_gpl.dpatch by <zack at muletto.takhisis.invalid>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad --exclude=CVS --exclude=.svn ./src/nethttpd/Makefile /tmp/dpep-work.oRHbJe/trunk/src/nethttpd/Makefile
+--- ./src/nethttpd/Makefile 2005-07-26 00:43:35.000000000 +0200
++++ /tmp/dpep-work.oRHbJe/trunk/src/nethttpd/Makefile 2005-07-29 15:22:52.000000000 +0200
+@@ -19,7 +19,7 @@
+ #PP_OPTIONS_FINDLIB += -ppopt "-DTesting"
+ # do this to enable test coverage calculations
+
+-INSTALL_EXTRA += LICENSE
++#INSTALL_EXTRA += LICENSE
+
+ ocamldoc.dump:
+ ocamldoc `ocamlfind query -i-format equeue pcre` -I ../netstring -I ../cgi -v -stars -dump ocamldoc.dump $(OCAMLDOC)
Property changes on: trunk/packages/ocamlnet/trunk/debian/patches/02_dont_install_gpl.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Modified: trunk/packages/ocamlnet/trunk/debian/rules
===================================================================
--- trunk/packages/ocamlnet/trunk/debian/rules 2005-07-29 19:41:50 UTC (rev 1513)
+++ trunk/packages/ocamlnet/trunk/debian/rules 2005-07-29 19:42:07 UTC (rev 1514)
@@ -13,13 +13,9 @@
configure-stamp: patch-stamp
dh_testdir
- cd src/; ./configure \
- -enable-findlib \
- -with-netstring \
- -with-cgi \
- -with-pop \
- -enable-compatcgi \
- -datadir $(NETDBDESTDIR)
+ cd src/; ./configure \
+ -enable-compatcgi \
+ -datadir $(NETDBDESTDIR)
touch configure-stamp
More information about the Pkg-ocaml-maint-commits
mailing list