[Pkg-ocaml-maint-commits] [SCM] ocamlnet packaging branch, master, updated. debian/3.5.1-1-15-g9138f62

Stephane Glondu steph at glondu.net
Wed May 8 10:07:01 UTC 2013


The following commit has been merged in the master branch:
commit 9138f62ea3da64bab48a9ef0e796744803a59df3
Author: Stephane Glondu <steph at glondu.net>
Date:   Wed May 8 11:32:47 2013 +0200

    Enable netmech-scram and netzip

diff --git a/debian/README.Debian b/debian/README.Debian
index c333e51..eb5ea25 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -33,35 +33,37 @@ 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
-	--------------------------------------------------
-	equeue		      libocamlnet-ocaml{,-dev}
-	equeue-gtk1	      n/a
-	equeue-gtk2	      libocamlnet-gtk-ocaml-dev
-	equeue-ssl	      libocamlnet-ssl-ocaml{,-dev}
-	equeue-tcl	      n/a
-	netcgi2		      libocamlnet-ocaml{,-dev}
-	netcgi2-plex	      libocamlnet-ocaml{,-dev}
-	netclient	      libocamlnet-ocaml{,-dev}
-	nethttpd	      libnethttpd-ocaml-dev
-	nethttpd-for-netcgi2  libnethttpd-ocaml-dev
-	netplex		      libocamlnet-ocaml{,-dev}
-	netshm		      libocamlnet-ocaml{,-dev}
-	netstring	      libocamlnet-ocaml{,-dev}
-	netstring-pcre	      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}
-	--------------------------------------------------
+        Library               Debian package name
+        --------------------------------------------------
+        equeue                libocamlnet-ocaml{,-dev}
+        equeue-gtk1           n/a
+        equeue-gtk2           libocamlnet-gtk-ocaml-dev
+        equeue-ssl            libocamlnet-ssl-ocaml{,-dev}
+        equeue-tcl            n/a
+        netcgi2               libocamlnet-ocaml{,-dev}
+        netcgi2-plex          libocamlnet-ocaml{,-dev}
+        netclient             libocamlnet-ocaml{,-dev}
+        nethttpd              libnethttpd-ocaml-dev
+        nethttpd-for-netcgi2  libnethttpd-ocaml-dev
+        netmech-scram         libocamlnet-ocaml{,-dev}
+        netplex               libocamlnet-ocaml{,-dev}
+        netshm                libocamlnet-ocaml{,-dev}
+        netstring             libocamlnet-ocaml{,-dev}
+        netstring-pcre        libocamlnet-ocaml{,-dev}
+        netsys                libocamlnet-ocaml{,-dev}
+        netzip                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}
+        --------------------------------------------------
 
- -- Stéphane Glondu <glondu at debian.org>  Tue, 07 May 2013 13:57:52 +0200
+ -- Stéphane Glondu <glondu at debian.org>, Wed,  8 May 2013 12:04:38 +0200
 
 Debian GNU/kFreeBSD and GNU/Hurd ports
 ======================================
diff --git a/debian/control b/debian/control
index 2439a19..2933b7b 100644
--- a/debian/control
+++ b/debian/control
@@ -15,6 +15,8 @@ Build-Depends:
  liblablgtk2-ocaml-dev (>= 2.12.0-4~),
  libcryptgps-ocaml-dev (>= 0.2.1-7~),
  libssl-ocaml-dev (>= 0.4.3-3~),
+ libzip-ocaml-dev,
+ libcryptokit-ocaml-dev,
  apache2-prefork-dev
 Standards-Version: 3.9.4
 Homepage: http://projects.camlcity.org/projects/ocamlnet.html
diff --git a/debian/libocamlnet-ocaml-dev.install.in b/debian/libocamlnet-ocaml-dev.install.in
index 946dc92..0bb3432 100644
--- a/debian/libocamlnet-ocaml-dev.install.in
+++ b/debian/libocamlnet-ocaml-dev.install.in
@@ -1,21 +1,23 @@
- at OCamlStdlibDir@/equeue			@OCamlStdlibDir@
- at OCamlStdlibDir@/netcamlbox		@OCamlStdlibDir@
- at OCamlStdlibDir@/netcgi2		@OCamlStdlibDir@
- at OCamlStdlibDir@/netcgi_apache		@OCamlStdlibDir@
- at OCamlStdlibDir@/netcgi2-plex		@OCamlStdlibDir@
- at OCamlStdlibDir@/netclient		@OCamlStdlibDir@
- at OCamlStdlibDir@/netgssapi		@OCamlStdlibDir@
- at OCamlStdlibDir@/netmulticore		@OCamlStdlibDir@
- at OCamlStdlibDir@/netplex		@OCamlStdlibDir@
- at OCamlStdlibDir@/netshm			@OCamlStdlibDir@
- at OCamlStdlibDir@/netstring		@OCamlStdlibDir@
- at OCamlStdlibDir@/netstring-pcre		@OCamlStdlibDir@
- at OCamlStdlibDir@/netsys			@OCamlStdlibDir@
- at OCamlStdlibDir@/pop			@OCamlStdlibDir@
- at OCamlStdlibDir@/rpc-auth-dh		@OCamlStdlibDir@
- at OCamlStdlibDir@/rpc-auth-local		@OCamlStdlibDir@
- at OCamlStdlibDir@/rpc-generator		@OCamlStdlibDir@
- at OCamlStdlibDir@/rpc			@OCamlStdlibDir@
- at OCamlStdlibDir@/shell			@OCamlStdlibDir@
- at OCamlStdlibDir@/smtp			@OCamlStdlibDir@
-usr/share/ocamlnet			/usr/share
+ at OCamlStdlibDir@/equeue                 @OCamlStdlibDir@
+ at OCamlStdlibDir@/netcamlbox             @OCamlStdlibDir@
+ at OCamlStdlibDir@/netcgi2                @OCamlStdlibDir@
+ at OCamlStdlibDir@/netcgi_apache          @OCamlStdlibDir@
+ at OCamlStdlibDir@/netcgi2-plex           @OCamlStdlibDir@
+ at OCamlStdlibDir@/netclient              @OCamlStdlibDir@
+ at OCamlStdlibDir@/netgssapi              @OCamlStdlibDir@
+ at OCamlStdlibDir@/netmech-scram          @OCamlStdlibDir@
+ at OCamlStdlibDir@/netmulticore           @OCamlStdlibDir@
+ at OCamlStdlibDir@/netplex                @OCamlStdlibDir@
+ at OCamlStdlibDir@/netshm                 @OCamlStdlibDir@
+ at OCamlStdlibDir@/netstring              @OCamlStdlibDir@
+ at OCamlStdlibDir@/netstring-pcre         @OCamlStdlibDir@
+ at OCamlStdlibDir@/netsys                 @OCamlStdlibDir@
+ at OCamlStdlibDir@/netzip                 @OCamlStdlibDir@
+ at OCamlStdlibDir@/pop                    @OCamlStdlibDir@
+ at OCamlStdlibDir@/rpc-auth-dh            @OCamlStdlibDir@
+ at OCamlStdlibDir@/rpc-auth-local         @OCamlStdlibDir@
+ at OCamlStdlibDir@/rpc-generator          @OCamlStdlibDir@
+ at OCamlStdlibDir@/rpc                    @OCamlStdlibDir@
+ at OCamlStdlibDir@/shell                  @OCamlStdlibDir@
+ at OCamlStdlibDir@/smtp                   @OCamlStdlibDir@
+usr/share/ocamlnet                      /usr/share
diff --git a/debian/rules b/debian/rules
index e4e3911..ceaed21 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,7 +19,7 @@ CFGFLAGS += -enable-gtk2 -enable-ssl
 CFGFLAGS += -with-nethttpd -prefer-netcgi2 -with-rpc-auth-dh
 CFGFLAGS += -bindir /usr/bin -datadir /usr/share/ocamlnet
 CFGFLAGS += -enable-apache -apache /usr/sbin/apache2 -apxs /usr/bin/apxs2
-CFGFLAGS += -enable-pcre
+CFGFLAGS += -enable-pcre -enable-zip -enable-crypto
 
 %:
 	dh $@ --with ocaml

-- 
ocamlnet packaging



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