[Pkg-ocaml-maint-commits] [SCM] ocamlnet packaging branch, master, updated. debian/2.2.9-5-3-gf31cb97

[Stefano Zacchiroli]

The following commit has been merged in the master branch:
commit f31cb976d11c819cb7f31fd84ec9f5912bdfdefc
Author: Stefano Zacchiroli <zack at upsilon.cc>
Date:   Sat Feb 21 00:05:07 2009 +0100

    debian/*.install.in: avoid specifying debian/tmp/ (is default now)

diff --git a/debian/changelog b/debian/changelog
index 0de8e3d..b098088 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ ocamlnet (2.2.9-6) UNRELEASED; urgency=low
     "stublibs/"
   * debian/rules: use ocamldoc-apiref-config from /usr/share/ocaml/;
     accordingly: bump dependency on dh-ocaml to >= 0.2
+  * debian/*.install.in: avoid specifying debian/tmp/ (is default now)
 
  -- Stefano Zacchiroli <zack at debian.org>  Thu, 19 Feb 2009 10:58:58 +0100
 
diff --git a/debian/libapache2-mod-ocamlnet.install.in b/debian/libapache2-mod-ocamlnet.install.in
index 31c2e37..6245d3f 100644
--- a/debian/libapache2-mod-ocamlnet.install.in
+++ b/debian/libapache2-mod-ocamlnet.install.in
@@ -1,2 +1,2 @@
-src/netcgi2-apache/mod_netcgi_apache.so				usr/lib/apache2/modules
-debian/etc/netcgi_apache.*					etc/apache2/mods-available
+src/netcgi2-apache/mod_netcgi_apache.so		usr/lib/apache2/modules
+debian/etc/netcgi_apache.*			etc/apache2/mods-available
diff --git a/debian/libnethttpd-ocaml-dev.install.in b/debian/libnethttpd-ocaml-dev.install.in
index a342be1..e774f5d 100644
--- a/debian/libnethttpd-ocaml-dev.install.in
+++ b/debian/libnethttpd-ocaml-dev.install.in
@@ -1,3 +1,3 @@
-debian/tmp/@OCamlStdlibDir@/nethttpd			@OCamlStdlibDir@
-debian/tmp/@OCamlStdlibDir@/nethttpd-for-netcgi1	@OCamlStdlibDir@
-debian/tmp/@OCamlStdlibDir@/nethttpd-for-netcgi2	@OCamlStdlibDir@
+ at OCamlStdlibDir@/nethttpd		@OCamlStdlibDir@
+ at OCamlStdlibDir@/nethttpd-for-netcgi1	@OCamlStdlibDir@
+ at OCamlStdlibDir@/nethttpd-for-netcgi2	@OCamlStdlibDir@
diff --git a/debian/libocamlnet-gtk2-ocaml-dev.install.in b/debian/libocamlnet-gtk2-ocaml-dev.install.in
index 5b2c989..c39806a 100644
--- a/debian/libocamlnet-gtk2-ocaml-dev.install.in
+++ b/debian/libocamlnet-gtk2-ocaml-dev.install.in
@@ -1 +1 @@
-debian/tmp/@OCamlStdlibDir@/equeue-gtk2			@OCamlStdlibDir@
+ at OCamlStdlibDir@/equeue-gtk2			@OCamlStdlibDir@
diff --git a/debian/libocamlnet-ocaml-bin.install.in b/debian/libocamlnet-ocaml-bin.install.in
index b4c6203..cecbfeb 100644
--- a/debian/libocamlnet-ocaml-bin.install.in
+++ b/debian/libocamlnet-ocaml-bin.install.in
@@ -1 +1 @@
-debian/tmp/usr/bin/*						/usr/bin
+usr/bin/*			/usr/bin
diff --git a/debian/libocamlnet-ocaml-dev.install.in b/debian/libocamlnet-ocaml-dev.install.in
index 3138eb2..96a2f23 100644
--- a/debian/libocamlnet-ocaml-dev.install.in
+++ b/debian/libocamlnet-ocaml-dev.install.in
@@ -1,19 +1,19 @@
-debian/tmp/@OCamlStdlibDir@/cgi				@OCamlStdlibDir@
-debian/tmp/@OCamlStdlibDir@/equeue			@OCamlStdlibDir@
-debian/tmp/@OCamlStdlibDir@/netcgi1			@OCamlStdlibDir@
-debian/tmp/@OCamlStdlibDir@/netcgi2			@OCamlStdlibDir@
-debian/tmp/@OCamlStdlibDir@/netcgi_apache		@OCamlStdlibDir@
-debian/tmp/@OCamlStdlibDir@/netcgi2-plex		@OCamlStdlibDir@
-debian/tmp/@OCamlStdlibDir@/netclient			@OCamlStdlibDir@
-debian/tmp/@OCamlStdlibDir@/netplex			@OCamlStdlibDir@
-debian/tmp/@OCamlStdlibDir@/netshm			@OCamlStdlibDir@
-debian/tmp/@OCamlStdlibDir@/netstring			@OCamlStdlibDir@
-debian/tmp/@OCamlStdlibDir@/netsys			@OCamlStdlibDir@
-debian/tmp/@OCamlStdlibDir@/pop				@OCamlStdlibDir@
-debian/tmp/@OCamlStdlibDir@/rpc-auth-dh			@OCamlStdlibDir@
-debian/tmp/@OCamlStdlibDir@/rpc-auth-local		@OCamlStdlibDir@
-debian/tmp/@OCamlStdlibDir@/rpc-generator		@OCamlStdlibDir@
-debian/tmp/@OCamlStdlibDir@/rpc				@OCamlStdlibDir@
-debian/tmp/@OCamlStdlibDir@/shell			@OCamlStdlibDir@
-debian/tmp/@OCamlStdlibDir@/smtp			@OCamlStdlibDir@
-debian/tmp/usr/share/ocamlnet					/usr/share
+ at OCamlStdlibDir@/cgi			@OCamlStdlibDir@
+ at OCamlStdlibDir@/equeue			@OCamlStdlibDir@
+ at OCamlStdlibDir@/netcgi1		@OCamlStdlibDir@
+ at OCamlStdlibDir@/netcgi2		@OCamlStdlibDir@
+ at OCamlStdlibDir@/netcgi_apache		@OCamlStdlibDir@
+ at OCamlStdlibDir@/netcgi2-plex		@OCamlStdlibDir@
+ at OCamlStdlibDir@/netclient		@OCamlStdlibDir@
+ at OCamlStdlibDir@/netplex		@OCamlStdlibDir@
+ at OCamlStdlibDir@/netshm			@OCamlStdlibDir@
+ at OCamlStdlibDir@/netstring		@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
diff --git a/debian/libocamlnet-ocaml.install.in b/debian/libocamlnet-ocaml.install.in
index 2cbf6f5..03d1c95 100644
--- a/debian/libocamlnet-ocaml.install.in
+++ b/debian/libocamlnet-ocaml.install.in
@@ -1,3 +1,3 @@
-debian/tmp/@OCamlDllDir@/*netaccel*		@OCamlDllDir@
-debian/tmp/@OCamlDllDir@/*netsys*		@OCamlDllDir@
-debian/tmp/@OCamlDllDir@/*rpc_auth_local*	@OCamlDllDir@
+ at OCamlDllDir@/*netaccel*		@OCamlDllDir@
+ at OCamlDllDir@/*netsys*			@OCamlDllDir@
+ at OCamlDllDir@/*rpc_auth_local*		@OCamlDllDir@
diff --git a/debian/libocamlnet-ssl-ocaml-dev.install.in b/debian/libocamlnet-ssl-ocaml-dev.install.in
index 8f60c2c..4ee3334 100644
--- a/debian/libocamlnet-ssl-ocaml-dev.install.in
+++ b/debian/libocamlnet-ssl-ocaml-dev.install.in
@@ -1,2 +1,2 @@
-debian/tmp/@OCamlStdlibDir@/equeue-ssl			@OCamlStdlibDir@
-debian/tmp/@OCamlStdlibDir@/rpc-ssl			@OCamlStdlibDir@
+ at OCamlStdlibDir@/equeue-ssl		@OCamlStdlibDir@
+ at OCamlStdlibDir@/rpc-ssl		@OCamlStdlibDir@
diff --git a/debian/libocamlnet-ssl-ocaml.install.in b/debian/libocamlnet-ssl-ocaml.install.in
index 4fe271b..3b94abd 100644
--- a/debian/libocamlnet-ssl-ocaml.install.in
+++ b/debian/libocamlnet-ssl-ocaml.install.in
@@ -1 +1 @@
-debian/tmp/@OCamlDllDir@/*equeue_ssl*	@OCamlDllDir@
+ at OCamlDllDir@/*equeue_ssl*	@OCamlDllDir@

-- 
ocamlnet packaging