prepare for an upload from amd64, where it actually builds

diff --git a/debian/changelog b/debian/changelog
index 23bae0cf571e662ce4f2319e6687a10050ed66b4..41b27fe27c9983efccfcf44224e834d088110777 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-gnuradio (3.2.2.dfsg-2) UNRELEASED; urgency=low
+gnuradio (3.2.2.dfsg-2) unstable; urgency=low
 
   * fix typos in short package descriptions, closes: #556572
   * resolve gnuradio-companion conflict with grc by renaming our binary,

diff --git a/debian/control b/debian/control
index 2912109fc0eb9f1772034f8ec58c968647baa20f..237c647a2afed4a1088de7311b3659fbceac5386 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Priority: optional
 Maintainer: Bdale Garbee <bdale@gag.com>
 Build-Conflicts: automake1.8, automake1.9
 Build-Depends: automake, debhelper (>= 5), doxygen, ghostscript, guile-1.8, libasound2-dev, libaudio-dev, libblas-dev, libboost-dev, libboost-program-options-dev, libboost-thread-dev, libcppunit-dev, libfftw3-dev, libfontconfig1-dev, libfreetype6-dev, libglib2.0-dev, libgsl0-dev, libjack-dev, libpng12-dev, libqt4-dev, libqt4-opengl-dev, libqwt5-qt4-dev, libqwtplot3d-qt4-dev, libsdl1.2-dev, libtool, libusb-dev, libwxgtk2.8-dev, libxext-dev, libxrender-dev, libxt-dev, pkg-config, portaudio19-dev, python-central, python-cheetah, python-dev, python-gtk2, python-lxml, python-numpy, python-qt4, python-qt4-dev, python-wxgtk2.8, sdcc, swig, texlive-latex-base, xdg-utils, xmlto
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
 XS-Python-Version: >=2.5
 
 ################################################################################
@@ -146,7 +146,7 @@ Description: Client side library for the USRP(1) hardware
 Package: libusrp2-0
 Section: comm
 Architecture: any
-Depends: libgruel0 (= ${binary:Version}), libgromnithread0 (= ${binary:Version}), ${shlibs:Depends}, adduser
+Depends: libgruel0 (= ${binary:Version}), libgromnithread0 (= ${binary:Version}), ${shlibs:Depends}, adduser, ${misc:Depends}
 Description: Client side library for the USRP2 hardware
  The Universal Software Radio Peripheral 2 (USRP2) is a GbE-connected,
  low-cost and open board. It features two high-speed analog-to-digital
@@ -161,7 +161,7 @@ Description: Client side library for the USRP2 hardware
 Package: libusrp2-dev
 Section: libdevel
 Architecture: any
-Depends: libusrp2-0 (= ${binary:Version}), libboost-thread-dev, libgromnithread-dev (= ${binary:Version}), libgruel-dev (= ${binary:Version})
+Depends: libusrp2-0 (= ${binary:Version}), libboost-thread-dev, libgromnithread-dev (= ${binary:Version}), libgruel-dev (= ${binary:Version}), ${misc:Depends}
 Description: Client side library for the USRP2 hardware
  The Universal Software Radio Peripheral 2 (USRP2) is a GbE-connected,
  low-cost and open board. It features two high-speed analog-to-digital
@@ -182,7 +182,7 @@ Description: Client side library for the USRP2 hardware
 Package: libgnuradio-core0
 Section: libs
 Architecture: any
-Depends: libgruel0 (= ${binary:Version}), libgromnithread0 (= ${binary:Version}), ${shlibs:Depends}
+Depends: libgruel0 (= ${binary:Version}), libgromnithread0 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Conflicts:  libgnuradio-core0c2, libgnuradio-core0c2a
 Replaces:  libgnuradio-core0c2, libgnuradio-core0c2a
 Suggests: gnuradio-doc
@@ -194,7 +194,7 @@ Section: libdevel
 Architecture: any 
 Replaces: libgnuradio-core0-dev
 Conflicts: libgnuradio-core0-dev
-Depends: libgnuradio-core0 (= ${binary:Version}), libgruel-dev (= ${binary:Version}), libgromnithread-dev (= ${binary:Version}), libboost-thread-dev, libboost-date-time-dev, libgsl0-dev, libatlas-base-dev, libfftw3-dev, swig
+Depends: libgnuradio-core0 (= ${binary:Version}), libgruel-dev (= ${binary:Version}), libgromnithread-dev (= ${binary:Version}), libboost-thread-dev, libboost-date-time-dev, libgsl0-dev, libatlas-base-dev, libfftw3-dev, swig, ${misc:Depends}
 Description: The GNU Software Radio Core Library
  This package contains the core GNU Radio libraries.
  .
@@ -203,14 +203,14 @@ Description: The GNU Software Radio Core Library
 Package: libgnuradio-audio-alsa0
 Section: libs
 Architecture: any
-Depends: libgnuradio-core0 (= ${binary:Version}), ${shlibs:Depends}
+Depends: libgnuradio-core0 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Description: GNU Radio C++ block for ALSA sound system
  This package contains the ALSA sound system driver for GNU Radio.
 
 Package: libgnuradio-audio-alsa-dev
 Section: libdevel
 Architecture: any
-Depends: libgnuradio-audio-alsa0 (= ${binary:Version}), libgnuradio-core-dev (= ${binary:Version}), libasound2-dev
+Depends: libgnuradio-audio-alsa0 (= ${binary:Version}), libgnuradio-core-dev (= ${binary:Version}), libasound2-dev, ${misc:Depends}
 Description: GNU Radio C++ block for ALSA sound system
  This package contains the ALSA sound system driver for GNU Radio.
  .
@@ -219,7 +219,7 @@ Description: GNU Radio C++ block for ALSA sound system
 Package: libgnuradio-qtgui0
 Section: libs
 Architecture: any
-Depends: libgnuradio-core0 (= ${binary:Version}), ${shlibs:Depends}
+Depends: libgnuradio-core0 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Description: GNU Radio C++ blocks for QT-based GUI applications
  This package contains the C++ library for using GNU Radio inside
  QT-based GUI applications.
@@ -227,7 +227,7 @@ Description: GNU Radio C++ blocks for QT-based GUI applications
 Package: libgnuradio-qtgui-dev
 Section: libdevel
 Architecture: any
-Depends: libgnuradio-qtgui0 (= ${binary:Version}), libgnuradio-core-dev (= ${binary:Version}), libqt4-dev, libqwtplot3d-qt4-dev
+Depends: libgnuradio-qtgui0 (= ${binary:Version}), libgnuradio-core-dev (= ${binary:Version}), libqt4-dev, libqwtplot3d-qt4-dev, ${misc:Depends}
 Description: GNU Radio C++ blocks for QT-based GUI applications
  This package contains the C++ library for using GNU Radio inside
  QT-based GUI applications.
@@ -237,7 +237,7 @@ Description: GNU Radio C++ blocks for QT-based GUI applications
 Package: libgnuradio-usrp0
 Section: libs
 Architecture: any
-Depends: libgnuradio-core0 (= ${binary:Version}), libusrp0 (= ${binary:Version}), ${shlibs:Depends}
+Depends: libgnuradio-core0 (= ${binary:Version}), libusrp0 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Description: GNU Radio C++ blocks for USRP(1) hardware
  This package contains the C++ API blocks for the Universal Software Radio
  Peripheral.
@@ -245,7 +245,7 @@ Description: GNU Radio C++ blocks for USRP(1) hardware
 Package: libgnuradio-usrp-dev
 Section: libdevel
 Architecture: any
-Depends: libgnuradio-usrp0 (= ${binary:Version}), libgnuradio-core-dev (= ${binary:Version}), libusrp-dev (= ${binary:Version})
+Depends: libgnuradio-usrp0 (= ${binary:Version}), libgnuradio-core-dev (= ${binary:Version}), libusrp-dev (= ${binary:Version}), ${misc:Depends}
 Description: GNU Radio C++ blocks for USRP(1) hardware
  This package contains the C++ API blocks for the Universal Software Radio
  Peripheral.
@@ -255,7 +255,7 @@ Description: GNU Radio C++ blocks for USRP(1) hardware
 Package: libgnuradio-usrp2-0
 Section: libs
 Architecture: any
-Depends: libgnuradio-core0 (= ${binary:Version}), libusrp2-0 (= ${binary:Version}), ${shlibs:Depends}
+Depends: libgnuradio-core0 (= ${binary:Version}), libusrp2-0 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Description: GNU Radio C++ blocks for USRP2 hardware
  This package contains the C++ API blocks for the Universal Software Radio
  Peripheral 2.
@@ -263,7 +263,7 @@ Description: GNU Radio C++ blocks for USRP2 hardware
 Package: libgnuradio-usrp2-dev
 Section: libdevel
 Architecture: any
-Depends: libgnuradio-usrp2-0 (= ${binary:Version}), libgnuradio-core-dev (= ${binary:Version}), libusrp2-dev (= ${binary:Version})
+Depends: libgnuradio-usrp2-0 (= ${binary:Version}), libgnuradio-core-dev (= ${binary:Version}), libusrp2-dev (= ${binary:Version}), ${misc:Depends}
 Description: GNU Radio C++ blocks for USRP2 hardware
  This package contains the C++ API blocks for the Universal Software Radio
  Peripheral 2.
@@ -276,7 +276,7 @@ Description: GNU Radio C++ blocks for USRP2 hardware
 
 Package: python-usrp
 Architecture: any
-Depends: ${python:Depends}, libusrp0 (= ${binary:Version}), ${shlibs:Depends}
+Depends: ${python:Depends}, libusrp0 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Provides: ${python:Provides}
 Section: python
 XB-Python-Version: ${python:Versions}
@@ -290,8 +290,8 @@ Description: Python bindings for the USRP library
 
 Package: python-gnuradio-core
 Architecture: any
-Depends: ${python:Depends}, ${shlibs:Depends}, python-numpy
-Conflicts: python-gnuradio (< 3.2)
+Depends: ${python:Depends}, ${shlibs:Depends}, python-numpy, ${misc:Depends}
+Conflicts: python-gnuradio (<< 3.2)
 Provides: ${python:Provides}
 Section: python
 XB-Python-Version: ${python:Versions}
@@ -301,7 +301,7 @@ 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
+Depends: ${python:Depends}, python-gnuradio-core (= ${binary:Version}), python-wxgtk2.8, python-opengl, python-numpy, ${misc:Depends}
 Provides: ${python:Provides}
 Section: python
 XB-Python-Version: ${python:Versions}
@@ -311,7 +311,7 @@ Description: GNU Radio Graphical Interface Routines based on wxPython
 
 Package: python-gnuradio-usrp
 Architecture: any
-Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-core, python-usrp
+Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-core, python-usrp, ${misc:Depends}
 Provides: ${python:Provides}
 Section: python
 XB-Python-Version: ${python:Versions}
@@ -321,7 +321,7 @@ Description: Python bindings for GNU Radio USRP driver
 
 Package: python-gnuradio-usrp2
 Architecture: any
-Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-core
+Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-core, ${misc:Depends}
 Provides: ${python:Provides}
 Section: python
 XB-Python-Version: ${python:Versions}
@@ -331,7 +331,7 @@ Description: Python bindings for GNU Radio USRP driver
 
 Package: python-gnuradio-audio-alsa
 Architecture: any
-Depends: ${python:Depends}, ${shlibs:Depends}, libgnuradio-audio-alsa0 (= ${binary:Version}), python-gnuradio-core
+Depends: ${python:Depends}, ${shlibs:Depends}, libgnuradio-audio-alsa0 (= ${binary:Version}), python-gnuradio-core, ${misc:Depends}
 Section: python
 Provides: ${python:Provides}, python-gnuradio-audio
 XB-Python-Version: ${python:Versions}
@@ -341,7 +341,7 @@ Description: Python bindings for GNU Radio ALSA audio driver
 
 Package: python-gnuradio-audio-portaudio
 Architecture: any
-Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-core
+Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-core, ${misc:Depends}
 Provides: ${python:Provides}, python-gnuradio-audio
 Section: python
 XB-Python-Version: ${python:Versions}
@@ -351,7 +351,7 @@ Description: GNU Radio Python PortAudio Driver
 
 Package: python-gnuradio-audio-jack
 Architecture: any
-Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-core
+Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-core, ${misc:Depends}
 Section: python
 Provides: ${python:Provides}, python-gnuradio-audio
 XB-Python-Version: ${python:Versions}
@@ -361,7 +361,7 @@ Description: GNU Radio Python JACK Audio Driver
 
 Package: python-gnuradio-audio-oss
 Architecture: any
-Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-core
+Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-core, ${misc:Depends}
 Section: python
 Provides: ${python:Provides}, python-gnuradio-audio
 XB-Python-Version: ${python:Versions}
@@ -371,7 +371,7 @@ Description: GNU Radio Python OSS Audio Driver
 
 Package: python-gnuradio-cvsd-vocoder
 Architecture: any
-Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-core
+Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-core, ${misc:Depends}
 Provides: ${python:Provides}
 Section: python
 XB-Python-Version: ${python:Versions}
@@ -381,7 +381,7 @@ Description: GNU Radio CVSD Vocoder
 
 Package: python-gnuradio-gsm-fr-vocoder
 Architecture: any
-Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-core
+Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-core, ${misc:Depends}
 Provides: ${python:Provides}
 Section: python
 XB-Python-Version: ${python:Versions}
@@ -391,7 +391,7 @@ Description: GNU Radio GSM Full-Rate Vocoder
 
 Package: python-gnuradio-qtgui
 Architecture: any
-Depends: ${python:Depends}, ${shlibs:Depends}, libgnuradio-qtgui0 (= ${binary:Version}), python-gnuradio-core
+Depends: ${python:Depends}, ${shlibs:Depends}, libgnuradio-qtgui0 (= ${binary:Version}), python-gnuradio-core, ${misc:Depends}
 Section: python
 Provides: ${python:Provides}
 XB-Python-Version: ${python:Versions}
@@ -401,7 +401,7 @@ Description: Python bindings for GNU Radio ALSA audio driver
 
 Package: python-gnuradio-trellis
 Architecture: any
-Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-core
+Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-core, ${misc:Depends}
 Provides: ${python:Provides}
 Section: python
 XB-Python-Version: ${python:Versions}
@@ -411,7 +411,7 @@ Description: GNU Radio Trellis-Coded Modulation library
 
 Package: python-gnuradio-video-sdl
 Architecture: any
-Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-core
+Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-core, ${misc:Depends}
 Provides: ${python:Provides}
 Section: python
 XB-Python-Version: ${python:Versions}
@@ -425,7 +425,7 @@ Description: GNU Radio SDL Interface Library
 
 Package: gnuradio-utils
 Architecture: any
-Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-usrp, python-gnuradio-usrp2, python-gnuradio-wxgui, python-matplotlib, python-tk, python-scipy
+Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-usrp, python-gnuradio-usrp2, python-gnuradio-wxgui, python-matplotlib, python-tk, python-scipy, ${misc:Depends}
 Provides: ${python:Provides}
 Section: comm
 XB-Python-Version: ${python:Versions}
@@ -434,7 +434,7 @@ Description: GNU Radio Utilities
 
 Package: gnuradio-examples
 Architecture: any
-Depends: ${python:Depends}, python-gnuradio-core
+Depends: ${python:Depends}, python-gnuradio-core, ${misc:Depends}
 Provides: ${python:Provides}
 Recommends: python-gnuradio-wxgui, python-gnuradio
 Section: comm
@@ -444,7 +444,7 @@ Description: GNU Radio Example Programs
 
 Package: gnuradio-pager
 Architecture: any
-Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-usrp
+Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-usrp, ${misc:Depends}
 Provides: ${python:Provides}
 Section: comm
 XB-Python-Version: ${python:Versions}
@@ -455,7 +455,7 @@ Package: gnuradio-sounder
 Architecture: any
 Replaces: gnuradio-sounder-firmware
 Conflicts: gnuradio-sounder-firmware
-Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-usrp
+Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-usrp, ${misc:Depends}
 Provides: ${python:Provides}
 Section: comm
 XB-Python-Version: ${python:Versions}
@@ -466,7 +466,7 @@ Package: gnuradio-gpio
 Architecture: any
 Replaces: gnuradio-gpio-firmware
 Conflicts: gnuradio-gpio-firmware
-Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-usrp
+Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-usrp, ${misc:Depends}
 Provides: ${python:Provides}
 Section: comm
 XB-Python-Version: ${python:Versions}
@@ -477,7 +477,7 @@ Package: gnuradio-radar-mono
 Architecture: any
 Replaces: gnuradio-radar-mono-firmware
 Conflicts: gnuradio-radar-mono-firmware
-Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-usrp
+Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-usrp, ${misc:Depends}
 Provides: ${python:Provides}
 Section: comm
 XB-Python-Version: ${python:Versions}
@@ -486,7 +486,7 @@ Description: GNU Radio Monostatic Radar Application
 
 Package: gnuradio-radio-astronomy
 Architecture: any
-Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-usrp, python-gnuradio-wxgui
+Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-usrp, python-gnuradio-wxgui, ${misc:Depends}
 Provides: ${python:Provides}
 Section: comm
 XB-Python-Version: ${python:Versions}
@@ -495,7 +495,7 @@ 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
+Depends: ${python:Depends}, gnuradio, gnuradio-doc, usrp-doc, python-lxml, python-cheetah, python-gtk2, ${misc:Depends}
 Provides: ${python:Provides}
 Section: comm
 XB-Python-Version: ${python:Versions}
@@ -527,7 +527,7 @@ Description: Software Defined Radio
 Package: libgnuradio
 Section: libs
 Architecture: all
-Depends: libgnuradio-core0
+Depends: libgnuradio-core0, ${misc:Depends}
 Recommends: libgnuradio-audio-alsa0, libgnuradio-qtqui, libgnuradio-usrp0, libgnuradio-usrp2-0
 Description: GNU Radio C++ API libraries
  This is a virtual package that depends, recommends, or suggests all of the
@@ -537,7 +537,7 @@ Description: GNU Radio C++ API libraries
 Package: libgnuradio-dev
 Section: libdevel
 Architecture: all
-Depends: libgnuradio (= ${binary:Version}), libgnuradio-core-dev
+Depends: libgnuradio (= ${binary:Version}), libgnuradio-core-dev, ${misc:Depends}
 Recommends: libgnuradio-audio-alsa-dev, libgnuradio-qtgui-dev, libgnuradio-usrp-dev, libgnuradio-usrp2-dev,
 Suggests: gnuradio-doc, usrp-doc
 Replaces: gnuradio-dev
@@ -549,7 +549,7 @@ Description: Development headers for GNU Radio C++ development
 Package: python-gnuradio
 Section: python
 Architecture: all
-Depends: python-gnuradio-core
+Depends: python-gnuradio-core, ${misc:Depends}
 Recommends: python-gnuradio-wxgui, python-gnuradio-audio-alsa | python-gnuradio-audio, python-gnuradio-cvsd-vocoder, python-gnuradio-gsm-fr-vocoder, python-gnuradio-qtgui, python-gnuradio-trellis, python-gnuradio-video-sdl, python-gnuradio-usrp, python-gnuradio-usrp2
 Provides: ${python:Provides}
 XB-Python-Version: ${python:Versions}