The following commit has been merged in the master branch:
commit 535809c8fea56ccf6c8bab8d424e71a2d11c057d
Author: Stefano Zacchiroli <[email protected]>
Date: Thu Feb 19 10:59:34 2009 +0100
debian/*.in: avoid using @OCamlABI@ for dir path and explicit "stublibs/"
diff --git a/debian/changelog b/debian/changelog
index f3a797b..567f1dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ocamlnet (2.2.9-6) UNRELEASED; urgency=low
+
+ * debian/*.in: avoid using @OCamlABI@ for dir path and explicit
+ "stublibs/"
+
+ -- Stefano Zacchiroli <[email protected]> Thu, 19 Feb 2009 10:58:58 +0100
+
ocamlnet (2.2.9-5) experimental; urgency=low
[ Stefano Zacchiroli ]
diff --git a/debian/libnethttpd-ocaml-dev.install.in
b/debian/libnethttpd-ocaml-dev.install.in
index 98d750f..a342be1 100644
--- a/debian/libnethttpd-ocaml-dev.install.in
+++ b/debian/libnethttpd-ocaml-dev.install.in
@@ -1,3 +1,3 @@
-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/@OCamlStdlibDir@/nethttpd @OCamlStdlibDir@
+debian/tmp/@OCamlStdlibDir@/nethttpd-for-netcgi1 @OCamlStdlibDir@
+debian/tmp/@OCamlStdlibDir@/nethttpd-for-netcgi2 @OCamlStdlibDir@
diff --git a/debian/libocamlnet-gtk2-ocaml-dev.install.in
b/debian/libocamlnet-gtk2-ocaml-dev.install.in
index 956e150..5b2c989 100644
--- a/debian/libocamlnet-gtk2-ocaml-dev.install.in
+++ b/debian/libocamlnet-gtk2-ocaml-dev.install.in
@@ -1 +1 @@
-debian/tmp/usr/lib/ocaml/@OCamlABI@/equeue-gtk2
@OCamlStdlibDir@
+debian/tmp/@OCamlStdlibDir@/equeue-gtk2 @OCamlStdlibDir@
diff --git a/debian/libocamlnet-ocaml-dev.install.in
b/debian/libocamlnet-ocaml-dev.install.in
index 39e9433..3138eb2 100644
--- a/debian/libocamlnet-ocaml-dev.install.in
+++ b/debian/libocamlnet-ocaml-dev.install.in
@@ -1,19 +1,19 @@
-debian/tmp/usr/lib/ocaml/@OCamlABI@/cgi
@OCamlStdlibDir@
-debian/tmp/usr/lib/ocaml/@OCamlABI@/equeue @OCamlStdlibDir@
-debian/tmp/usr/lib/ocaml/@OCamlABI@/netcgi1 @OCamlStdlibDir@
-debian/tmp/usr/lib/ocaml/@OCamlABI@/netcgi2 @OCamlStdlibDir@
-debian/tmp/usr/lib/ocaml/@OCamlABI@/netcgi_apache @OCamlStdlibDir@
-debian/tmp/usr/lib/ocaml/@OCamlABI@/netcgi2-plex @OCamlStdlibDir@
-debian/tmp/usr/lib/ocaml/@OCamlABI@/netclient @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-auth-dh
@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
@OCamlStdlibDir@
-debian/tmp/usr/lib/ocaml/@OCamlABI@/shell @OCamlStdlibDir@
-debian/tmp/usr/lib/ocaml/@OCamlABI@/smtp @OCamlStdlibDir@
+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
diff --git a/debian/libocamlnet-ocaml.dirs.in b/debian/libocamlnet-ocaml.dirs.in
index f895e2a..a00aedc 100644
--- a/debian/libocamlnet-ocaml.dirs.in
+++ b/debian/libocamlnet-ocaml.dirs.in
@@ -1 +1 @@
-...@ocamlstdlibdir@/stublibs
+...@ocamldlldir@/stublibs
diff --git a/debian/libocamlnet-ocaml.install.in
b/debian/libocamlnet-ocaml.install.in
index 85e2de8..2cbf6f5 100644
--- a/debian/libocamlnet-ocaml.install.in
+++ b/debian/libocamlnet-ocaml.install.in
@@ -1,3 +1,3 @@
-debian/tmp/usr/lib/ocaml/@OCamlABI@/stublibs/*netaccel*
@OCamlStdlibDir@/stublibs
-debian/tmp/usr/lib/ocaml/@OCamlABI@/stublibs/*netsys*
@OCamlStdlibDir@/stublibs
-debian/tmp/usr/lib/ocaml/@OCamlABI@/stublibs/*rpc_auth_local*
@OCamlStdlibDir@/stublibs
+debian/tmp/@OCamlDllDir@/*netaccel* @OCamlDllDir@
+debian/tmp/@OCamlDllDir@/*netsys* @OCamlDllDir@
+debian/tmp/@OCamlDllDir@/*rpc_auth_local* @OCamlDllDir@
diff --git a/debian/libocamlnet-ssl-ocaml-dev.install.in
b/debian/libocamlnet-ssl-ocaml-dev.install.in
index 65e95ce..8f60c2c 100644
--- a/debian/libocamlnet-ssl-ocaml-dev.install.in
+++ b/debian/libocamlnet-ssl-ocaml-dev.install.in
@@ -1,2 +1,2 @@
-debian/tmp/usr/lib/ocaml/@OCamlABI@/equeue-ssl @OCamlStdlibDir@
-debian/tmp/usr/lib/ocaml/@OCamlABI@/rpc-ssl @OCamlStdlibDir@
+debian/tmp/@OCamlStdlibDir@/equeue-ssl @OCamlStdlibDir@
+debian/tmp/@OCamlStdlibDir@/rpc-ssl @OCamlStdlibDir@
diff --git a/debian/libocamlnet-ssl-ocaml.install.in
b/debian/libocamlnet-ssl-ocaml.install.in
index 21d55cb..4fe271b 100644
--- a/debian/libocamlnet-ssl-ocaml.install.in
+++ b/debian/libocamlnet-ssl-ocaml.install.in
@@ -1 +1 @@
-debian/tmp/usr/lib/ocaml/@OCamlABI@/stublibs/*equeue_ssl*
@OCamlStdlibDir@/stublibs
+debian/tmp/@OCamlDllDir@/*equeue_ssl* @OCamlDllDir@
--
ocamlnet packaging
_______________________________________________
Pkg-ocaml-maint-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits
