From: Bdale Garbee <bdale@gag.com>
Date: Fri, 21 May 2010 15:04:32 +0000 (-0600)
Subject: remove conflicts on python-wxgtk2.6
X-Git-Url: https://git.gag.com/?p=debian%2Fgnuradio;a=commitdiff_plain;h=7bc8e5a055cf2f7b1b13093cd62b03c18bddecdc

remove conflicts on python-wxgtk2.6
---

diff --git a/debian/changelog b/debian/changelog
index 96f35f96..c930917e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ gnuradio (3.2.2.dfsg-2) UNRELEASED; urgency=low
   * accept patches that remove moc files and make libusrp packages depend 
     on adduser, closes: #566564, #566565, #574209, #574231, #574209
   * stop delivering custom prefs.py, closes: #559640
+  * lose the conflicts on python-wxgtk2.6, closes: #582486
 
  -- Bdale Garbee <bdale@gag.com>  Thu, 22 Apr 2010 22:45:26 -0600
 
diff --git a/debian/control b/debian/control
index 8240d467..a758d33d 100644
--- a/debian/control
+++ b/debian/control
@@ -302,7 +302,6 @@ Description: Python bindings for GNU Radio core library
 Package: python-gnuradio-wxgui
 Architecture: any
 Depends: ${python:Depends}, python-gnuradio-core (= ${binary:Version}), python-wxgtk2.8, python-opengl, python-numpy
-Conflicts: python-wxgtk2.6
 Provides: ${python:Provides}
 Section: python
 XB-Python-Version: ${python:Versions}