projects
/
debian
/
gnuradio
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
eliminate conflict with grc since we're renaming our binary
[debian/gnuradio]
/
debian
/
control
diff --git
a/debian/control
b/debian/control
index a758d33dc72e2edff0a78782dbd157110f3b5212..2912109fc0eb9f1772034f8ec58c968647baa20f 100644
(file)
--- 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}