[Pkg-ocaml-maint-commits] [mingw32-ocaml] 02/02: Revert previous change, fix conflict with previous package.

[Romain Beauxis]

This is an automated email from the git hooks/post-receive script.

toots pushed a commit to branch master
in repository mingw32-ocaml.

commit 5c69071bd3c03e900752dc0b297eb93424cd1159
Author: Romain Beauxis <toots at rastageeks.org>
Date:   Wed May 15 07:50:38 2013 -0500

    Revert previous change, fix conflict with previous package.
---
 debian/changelog |    8 +++++---
 debian/control   |   10 ++++++----
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cf1ab8e..4bf44ba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,11 @@
 mingw-ocaml (4.00.1~20130426-3) unstable; urgency=low
 
-  * Enable on any arch.
-  Closes: #574717
+  * Add Breaks: mingw-ocaml (<< 4.00.1~20130426-1~)
+    to avoid conflicts with previous version of the 
+    package.
+  Closes: #709088  
 
- -- Romain Beauxis <toots at rastageeks.org>  Wed, 15 May 2013 07:18:54 -0500
+ -- Romain Beauxis <toots at rastageeks.org>  Wed, 15 May 2013 07:48:18 -0500
 
 mingw-ocaml (4.00.1~20130426-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 83050ea..c971cb6 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: ocaml
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders: Romain Beauxis <toots at rastageeks.org>
-Build-Depends: debhelper (>= 7.0.50~), quilt, mingw-w64, gcc-multilib, 
+Build-Depends: debhelper (>= 7.0.50~), quilt, mingw-w64, gcc-multilib [amd64 kfreebsd-amd64],
                ocaml-nox, camlp4, m4
 Standards-Version: 3.9.4
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/mingw32-ocaml.git
@@ -49,7 +49,8 @@ Description: OCaml cross-compiler based on mingw -- Meta-package
  windows targets.
 
 Package: flexdll
-Architecture: any
+Architecture: i386 amd64 kfreebsd-amd64 kfreebsd-i386
+Breaks: mingw-ocaml (<< 4.00.1~20130426-1~)
 Depends:
   ${shlibs:Depends},
   ${misc:Depends}
@@ -77,7 +78,8 @@ Description: OCaml cross-compiler based on mingw -- FlexDLL linker
  on windows.
 
 Package: ocaml-mingw-w64-i686
-Architecture: any
+Architecture: i386 amd64 kfreebsd-amd64 kfreebsd-i386
+Breaks: mingw-ocaml (<< 4.00.1~20130426-1~)
 Depends:
   ${shlibs:Depends},
   ${misc:Depends},
@@ -111,7 +113,7 @@ Description: OCaml cross-compiler based on mingw -- 32 bit compiler
  to be executed under 32 bit windows.
 
 Package: ocaml-mingw-w64-x86-64
-Architecture: any
+Architecture: amd64 kfreebsd-amd64
 Depends:
   ${shlibs:Depends},
   ${misc:Depends},

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/mingw32-ocaml.git