The following commit has been merged in the master branch: commit 126848f312d02524c9a19e40296a05b6b0d6cc3e Author: Stephane Glondu <st...@glondu.net> Date: Tue Jun 4 17:30:19 2013 +0200
Rename stuff to follow Apache naming conventions diff --git a/debian/control b/debian/control index 3e35e38..906d2d5 100644 --- a/debian/control +++ b/debian/control @@ -272,7 +272,7 @@ Description: OCaml application-level Internet libraries - HTTP daemon developmen This package contains the development stuff you need to use the nethttpd library in your programs. -Package: libapache2-mod-ocamlnet +Package: libapache2-mod-netcgi-apache Architecture: any Section: httpd Depends: @@ -280,6 +280,9 @@ Depends: ${ocaml:Depends}, ${shlibs:Depends}, ${misc:Depends} +Breaks: libapache2-mod-ocamlnet (<< 3.6) +Replaces: libapache2-mod-ocamlnet (<< 3.6) +Provides: libapache2-mod-ocamlnet # This package contains only an Apache module, dh_ocaml doesn't work on it! Description: OCaml application-level Internet libraries - netcgi2 Apache2 connector Ocamlnet is a collection of OCaml libraries focusing focus on diff --git a/debian/libapache2-mod-ocamlnet.README.Debian b/debian/libapache2-mod-netcgi-apache.README.Debian similarity index 100% rename from debian/libapache2-mod-ocamlnet.README.Debian rename to debian/libapache2-mod-netcgi-apache.README.Debian diff --git a/debian/libapache2-mod-ocamlnet.apache2.in b/debian/libapache2-mod-netcgi-apache.apache2.in similarity index 63% rename from debian/libapache2-mod-ocamlnet.apache2.in rename to debian/libapache2-mod-netcgi-apache.apache2.in index e21057b..6a873cb 100644 --- a/debian/libapache2-mod-ocamlnet.apache2.in +++ b/debian/libapache2-mod-netcgi-apache.apache2.in @@ -1,3 +1,3 @@ -conf debian/netcgi_apache.conf +conf debian/libapache2-mod-netcgi-apache.conf mod debian/tmp/@OCamlDllDir@/mod_netcgi_apache.so mod debian/netcgi_apache.load diff --git a/debian/netcgi_apache.conf b/debian/libapache2-mod-netcgi-apache.conf similarity index 100% rename from debian/netcgi_apache.conf rename to debian/libapache2-mod-netcgi-apache.conf diff --git a/debian/libapache2-mod-netcgi-apache.lintian-overrides b/debian/libapache2-mod-netcgi-apache.lintian-overrides new file mode 100644 index 0000000..45fbaa9 --- /dev/null +++ b/debian/libapache2-mod-netcgi-apache.lintian-overrides @@ -0,0 +1,2 @@ +# Uses libcamlrun_shared.so +libapache2-mod-netcgi-apache: binary-or-shlib-defines-rpath usr/lib/apache2/modules/mod_netcgi_apache.so /usr/lib/ocaml diff --git a/debian/libapache2-mod-ocamlnet.lintian-overrides b/debian/libapache2-mod-ocamlnet.lintian-overrides deleted file mode 100644 index 634f986..0000000 --- a/debian/libapache2-mod-ocamlnet.lintian-overrides +++ /dev/null @@ -1,2 +0,0 @@ -# Uses libcamlrun_shared.so -libapache2-mod-ocamlnet: binary-or-shlib-defines-rpath usr/lib/apache2/modules/mod_netcgi_apache.so /usr/lib/ocaml -- ocamlnet packaging _______________________________________________ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits