[Pkg-ocaml-maint-commits] [SCM] ocamlwc packaging branch, master, updated. debian/0.3-8-3-geb673e7

[Ralf Treinen]

The following commit has been merged in the master branch:
commit d11f39e78cfa1eadf79593fc5b20c3a6c8e5253a
Merge: 050241897eb32ad774fdcb8c1a7d64bd4cdc2b84 727f4be425607e5faf9a11de8df9b21cc6e06c8f
Author: Ralf Treinen <treinen at free.fr>
Date:   Wed Oct 20 08:44:43 2010 +0200

    Merge branch 'master' of git+ssh://git.debian.org//git/pkg-ocaml-maint/packages/ocamlwc
    
    Conflicts:
    	debian/changelog
    	debian/control

diff --combined debian/changelog
index d3a6fa6,3d9a801..189abe3
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,8 +1,15 @@@
 -ocamlwc (0.3-8) UNRELEASED; urgency=low
 -
 -  * debian/control: update my e-mail address, remove DMUA
 -
 - -- Stéphane Glondu <glondu at debian.org>  Mon, 08 Feb 2010 14:01:39 +0100
 +ocamlwc (0.3-8) unstable; urgency=low
 +
 +  * Move to source format 3.0 (quilt):
 +    - debian/patches quilt style
 +    - no more build-dependency on dpatch
 +    - no more patching in debian/rules
 +    - added file debian/source/format
 +  * Standards-Version 3.8.4 (no change)
-   * Removed DM-Upload-Allowed
 +  * Rebuild for ocaml 3.11.2
++  * Removed DM-Upload-Allowed
 +
-  -- Ralf Treinen <treinen at debian.org>  Mon, 08 Feb 2010 21:09:27 +0100
++ -- Ralf Treinen <treinen at debian.org> Mon, 08 Feb 2010 21:09:27 +0100
  
  ocamlwc (0.3-7) unstable; urgency=low
  

-- 
ocamlwc packaging