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

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 1b165cbb63d1b0cddc40ce083fd378df6c8c61be
Author: Stephane Glondu <steph at glondu.net>
Date:   Tue Oct 6 15:16:24 2009 +0200

    Various updates
    
     * this version closes #549849
     * add README.source
     * add myself to Uploaders
     * add debian/gbp.conf
     * add Lintian override for RPATH in mod_netcgi_apache.so
     * remove empty directories in binary packages
     * don't install INSTALL, as complained by Lintian

diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..ad6d920
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,10 @@
+Debian source package for ocamlnet
+==================================
+
+Patching upstream sources
+-------------------------
+
+This package uses dpatch for patching the source. Please consider
+reading dpatch manpage to patch the source.
+
+ -- Stéphane Glondu <glondu at debian.org>, Tue,  6 Oct 2009 14:59:40 +0200
diff --git a/debian/changelog b/debian/changelog
index 3d968a8..2f2464b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,12 +4,15 @@ ocamlnet (2.2.9-7) UNRELEASED; urgency=low
   * debian/copyright: point to GPL-2 under /usr/share/common-licenses/
 
   [ Stephane Glondu ]
+  * Switch packaging to dh-ocaml 0.9 (Closes: #549849)
+  * Add README.source
   * debian/control:
+    - add myself to Uploaders
     - move to section ocaml
-    - update Standards-Version to 3.8.2
-    - adapt to new dh-ocaml
+    - update Standards-Version to 3.8.3
+  * Add Lintian override for RPATH in mod_netcgi_apache.so
 
- -- Stefano Zacchiroli <zack at debian.org>  Sat, 28 Feb 2009 11:57:46 +0100
+ -- Stéphane Glondu <glondu at debian.org>  Tue, 06 Oct 2009 15:04:43 +0200
 
 ocamlnet (2.2.9-6) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index c981661..42fc902 100644
--- a/debian/control
+++ b/debian/control
@@ -2,21 +2,23 @@ Source: ocamlnet
 Section: ocaml
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
-Uploaders: Stefano Zacchiroli <zack at debian.org>
+Uploaders:
+ Stefano Zacchiroli <zack at debian.org>,
+ Stéphane Glondu <glondu at debian.org>
 Build-Depends:
  debhelper (>> 7),
  dpatch,
  cdbs,
  dh-ocaml (>= 0.9),
- ocaml-nox (>= 3.11),
- camlp4 (>= 3.11),
- ocaml-findlib (>= 1.2.4),
- libpcre-ocaml-dev (>= 5.15.1),
- liblablgtk2-ocaml-dev (>= 2.12),
- libcryptgps-ocaml-dev (>= 0.2.1-6),
- libssl-ocaml-dev (>= 0.4.3-2),
+ ocaml-nox (>= 3.11.1-3~),
+ camlp4 (>= 3.11.1-3~),
+ ocaml-findlib (>= 1.2.5),
+ libpcre-ocaml-dev (>= 6.0.1-2~),
+ liblablgtk2-ocaml-dev (>= 2.12.0-4~),
+ libcryptgps-ocaml-dev (>= 0.2.1-7~),
+ libssl-ocaml-dev (>= 0.4.3-3~),
  apache2-prefork-dev
-Standards-Version: 3.8.2
+Standards-Version: 3.8.3
 Homepage: http://projects.camlcity.org/projects/ocamlnet.html
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocamlnet.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocamlnet.git
diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 0000000..cec628c
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,2 @@
+[DEFAULT]
+pristine-tar = True
diff --git a/debian/libapache2-mod-ocamlnet.lintian-overrides b/debian/libapache2-mod-ocamlnet.lintian-overrides
new file mode 100644
index 0000000..ce3962b
--- /dev/null
+++ b/debian/libapache2-mod-ocamlnet.lintian-overrides
@@ -0,0 +1,2 @@
+# Uses libcamlrun_shared.so
+libapache2-mod-ocamlnet: binary-or-shlib-defines-rpath ./usr/lib/apache2/modules/mod_netcgi_apache.so /usr/lib/ocaml
diff --git a/debian/libocamlnet-ocaml-dev.dirs.in b/debian/libocamlnet-ocaml-dev.dirs.in
deleted file mode 100644
index 951d6ee..0000000
--- a/debian/libocamlnet-ocaml-dev.dirs.in
+++ /dev/null
@@ -1,2 +0,0 @@
- at OCamlStdlibDir@
-usr/share/doc/libocamlnet-ocaml-dev/html
diff --git a/debian/libocamlnet-ocaml-dev.docs b/debian/libocamlnet-ocaml-dev.docs
index a790ddf..c8c89ba 100644
--- a/debian/libocamlnet-ocaml-dev.docs
+++ b/debian/libocamlnet-ocaml-dev.docs
@@ -1,2 +1 @@
-INSTALL
 RELNOTES
diff --git a/debian/libocamlnet-ocaml.dirs.in b/debian/libocamlnet-ocaml.dirs.in
deleted file mode 100644
index a00aedc..0000000
--- a/debian/libocamlnet-ocaml.dirs.in
+++ /dev/null
@@ -1 +0,0 @@
- at OCamlDllDir@/stublibs

-- 
ocamlnet packaging