From 4530d6b8495e4b72161d8ac5559655c71e78907c Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Tue, 8 Jun 2010 20:05:19 -0600 Subject: [PATCH] eliminate conflict with grc since we're renaming our binary --- debian/changelog | 6 +++--- debian/control | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index c930917e..23bae0cf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,14 +1,14 @@ gnuradio (3.2.2.dfsg-2) UNRELEASED; urgency=low * fix typos in short package descriptions, closes: #556572 - * make gnuradio-companion conflict with grc to resolve conflict over the - file named /usr/bin/grc, closes: #557050 + * resolve gnuradio-companion conflict with grc by renaming our binary, + closes: #557050 * 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 Thu, 22 Apr 2010 22:45:26 -0600 + -- Bdale Garbee Tue, 08 Jun 2010 20:05:02 -0600 gnuradio (3.2.2.dfsg-1) unstable; urgency=low diff --git a/debian/control b/debian/control index a758d33d..2912109f 100644 --- a/debian/control +++ b/debian/control @@ -496,7 +496,6 @@ Description: GNU Radio Radio Astronomy Applications Package: gnuradio-companion Architecture: any Depends: ${python:Depends}, gnuradio, gnuradio-doc, usrp-doc, python-lxml, python-cheetah, python-gtk2 -Conflicts: grc Provides: ${python:Provides} Section: comm XB-Python-Version: ${python:Versions} -- 2.30.2