Bug#680647: unblock: binutils-mingw-w64/2

[Stephen Kitt <steve@sk2.org>]

Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please unblock package binutils-mingw-w64: it drops a erroneous
Conflicts relationship with mingw32-binutils, which is required to
allow mingw32-ocaml upgrades from squeeze using apt-get (see #662746
for details).

The diff is as follows:

diff --git a/debian/changelog b/debian/changelog
index e6866ff..056d74d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+binutils-mingw-w64 (2) unstable; urgency=low
+
+  * binutils-mingw-w64 doesn't conflict with mingw32-binutils so remove
+    the relationship (helps with #662746).
+
+ -- Stephen Kitt <steve@sk2.org>  Wed, 04 Jul 2012 22:54:01 +0200
+
 binutils-mingw-w64 (1) unstable; urgency=low
 
   [ Stephen Kitt ]
diff --git a/debian/control b/debian/control
index 9ec7885..39dcbab 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,6 @@ Package: binutils-mingw-w64
 Architecture: all
 Depends: ${misc:Depends}, binutils-mingw-w64-i686, binutils-mingw-w64-x86-64
 Built-Using: binutils (= ${binutils:Version})
-Conflicts: mingw32-binutils
 Description: Cross-binutils for Win32 and Win64 using MinGW-w64
  MinGW-w64 provides a development and runtime environment for 32- and
  64-bit (x86 and x64) Windows applications using the Windows API and
@@ -25,7 +24,6 @@ Package: binutils-mingw-w64-i686
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, binutils (>= ${local:Version})
 Built-Using: binutils (= ${binutils:Version})
-Conflicts: mingw32-binutils
 Breaks: binutils-mingw-w64 (<< 2.22-1+1)
 Replaces: binutils-mingw-w64 (<< 2.22-1+1)
 Description: Cross-binutils for Win32 (x86) using MinGW-w64
@@ -39,7 +37,6 @@ Package: binutils-mingw-w64-x86-64
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, binutils (>= ${local:Version})
 Built-Using: binutils (= ${binutils:Version})
-Conflicts: mingw32-binutils
 Breaks: binutils-mingw-w64 (<< 2.22-1+1)
 Replaces: binutils-mingw-w64 (<< 2.22-1+1)
 Description: Cross-binutils for Win64 (x64) using MinGW-w64



unblock binutils-mingw-w64/2

Regards,

Stephen


-- System Information:
Debian Release: wheezy/sid
  APT prefers testing
  APT policy: (500, 'testing'), (500, 'stable'), (200, 'unstable'), (1, 'experimental')
Architecture: i386 (i686)

Kernel: Linux 3.2.0-2-686-pae (SMP w/2 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash