[Pkg-ocaml-maint-commits] [SCM] mingw32-ocaml packaging branch, master, updated. debian/3.12.1+debian2-3-g3d3a56f

[Romain Beauxis]

The following commit has been merged in the master branch:
commit b0189450d8b5a6986cbdef0ef72a7b655588cebc
Author: Romain Beauxis <toots at rastageeks.org>
Date:   Sat Nov 3 18:14:34 2012 +0100

    Fixed upgrade path from squeeze to wheezy.
    
    Conflicts:
    	debian/changelog

diff --git a/debian/changelog b/debian/changelog
index c52ed01..7be58c1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mingw-ocaml (3.12.1+debian3) unstable; urgency=low
+
+  * Added Replaces: mingw32-ocaml to mingw-ocaml
+  Closes: #662746
+
+ -- Romain Beauxis <toots at rastageeks.org>  Sat, 03 Nov 2012 16:40:31 +0100
+
 mingw-ocaml (3.12.1+debian2) unstable; urgency=low
 
   * Fixed typo in dummy transitional package.. 
diff --git a/debian/control b/debian/control
index fe7ec68..209fc4d 100644
--- a/debian/control
+++ b/debian/control
@@ -17,6 +17,8 @@ Depends:
  ocaml-nox,
  ocaml-findlib,
  mingw-w64
+Replaces: mingw32-ocaml (<< 3.12.1~)
+Breaks: mingw32-ocaml (<< 3.12.1~)
 Description: OCaml cross-compiler based on mingw
  Objective Caml (OCaml) is an implementation of the ML language, based on
  the Caml Light dialect extended with a complete class-based object system

-- 
mingw32-ocaml packaging