The following commit has been merged in the experimental/master branch:
commit acf38fbfc022b7c39ca87e4f723d447691a9cdce
Merge: 4221ef9e6d0d8a692fab34eef61e4665971f622b 
895a96c8a4d617d9cdd496caef7e098ce3593f4f
Author: Stephane Glondu <st...@glondu.net>
Date:   Sun Jul 3 22:14:00 2011 +0200

    Merge branch 'master' into experimental/master
    
    Conflicts:
        debian/changelog

diff --combined debian/changelog
index b1cdae3,65c418f..357c1e5
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,21 +1,22 @@@
 -ocamlnet (2.2.9-9) UNRELEASED; urgency=low
 +ocamlnet (3.0~0test2-1) UNRELEASED; urgency=low
  
 +  * New upstream pre-release
-   * Move libapache2-mod-ocamlnet to section httpd
+   * Remove misleading debian/README.source
  
-  -- Stéphane Glondu <glo...@debian.org>  Tue, 20 Oct 2009 14:17:42 +0200
+  -- Stéphane Glondu <glo...@debian.org>  Mon, 03 May 2010 21:56:45 +0200
+ 
+ ocamlnet (2.2.9-8) unstable; urgency=low
+ 
+   * debian/control:
+     - move libapache2-mod-ocamlnet to section httpd
+     - remove Stefano from Uploaders
+     - bump Standards-Version to 3.8.4 (no changes)
+   * Add 0012-Use-OCaml-version-to-guess-str-stubs-link-options.patch
+     (Closes: #580093)
+   * Reformat debian/NEWS to please Lintian
+   * Switch source package format to 3.0 (quilt)
+ 
+  -- Stéphane Glondu <glo...@debian.org>  Mon, 03 May 2010 20:47:39 +0200
  
  ocamlnet (2.2.9-7) unstable; urgency=low
  

-- 
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

Reply via email to