[Pkg-ocaml-maint-commits] [SCM] ocamlnet packaging branch, master, updated. debian/2.2.9-4-19-ga1a35f1

[Stefano Zacchiroli]

The following commit has been merged in the master branch:
commit a1a35f1a7cc5cba13b0130de454ab0f1cdaeb7ff
Merge: 6b9d81de2cabdf3559cd5e9fb5d2443d905839b6 6c18de768f9a664ea3139573306016780c059a89
Author: Stefano Zacchiroli <zack at upsilon.cc>
Date:   Tue Feb 3 14:56:38 2009 +0100

    Merge branch 'fixes/apache-rpath'
    
    Conflicts:
    
    	debian/changelog

diff --combined debian/TODO
index 056e8f5,4eaabfb..f9f4da9
--- a/debian/TODO
+++ b/debian/TODO
@@@ -11,9 -11,5 +11,7 @@@
    Update: ocamlrpcgen has a manpage written by Thomas Petazzoni and available
    in the old librpc-ocaml-dev package, reuse it!
  
 --- Wed, 03 Jan 2007 16:46:29 +0100 zack
 +- switch packaging workflow to GIT + TopGit
 +
- - merge into master the branch fixes/apache-rpath
- 
 +-- Wed, 29 Oct 2008 00:15:03 +0100 zack
  
diff --combined debian/changelog
index 9719c89,ea99c89..a884667
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,17 -1,15 +1,28 @@@
- ocamlnet (2.2.9-4) UNRELEASED; urgency=low
 -ocamlnet (2.2.9-3+lenny1) testing-proposed-updates; urgency=low
++ocamlnet (2.2.9-5) UNRELEASED; urgency=low
 +
 +  [ Stephane Glondu ]
 +  * Do not build rpc-auth-local on hurd-i386 (fixes FTBFS)
-   * Switching packaging to git
 +
 +  [ Stefano Zacchiroli ]
 +  * relax build-dep on apache2-prefork-dev by forcing the apache major number
 +    to 2 instead of letting ./configure query it invoking /usr/sbin/apache2
 +  * remove debian/patches/00dpatch.conf, we no longer have a debian-only
 +    layout
 +
 + -- Stephane Glondu <steph at glondu.net>  Mon, 08 Sep 2008 22:29:53 +0200
 +
++ocamlnet (2.2.9-4) unstable; urgency=low
+ 
+   * add rpath pointing at `ocamlc -where` to the Apache module shipped by
+     libapache2-mod-ocamlnet, so that libcamlrun_shared.so can be found
+     (Closes: #503616)
+   * fix wrong path in /etc/apache2/mods-available/netcgi_apache.load, which
+     inhibited proper loading of netcgi .cma library
+     (also needed to fix #503616)
+   * switch Vcs-* fields to the current GIT repository
+ 
 - -- Stefano Zacchiroli <zack at debian.org>  Thu, 30 Oct 2008 09:19:17 +0100
++ -- Stefano Zacchiroli <zack at debian.org>  Wed, 29 Oct 2008 00:09:07 +0100
+ 
  ocamlnet (2.2.9-3) unstable; urgency=medium
  
    [ Stephane Glondu ]

-- 
ocamlnet packaging