2 files changed, 35 insertions, 27 deletions
diff --git a/debian/control b/debian/control
index 17f1733259..eda5ba9a7a 100644
--- a/debian/control
+++ b/debian/control
@@ -7,9 +7,9 @@ Section: comm
 Priority: optional
 Maintainer: Johnathan Corgan <jcorgan@corganenterprises.com>
 Build-Conflicts: automake1.8, automake1.9
-Build-Depends: debhelper (>= 5.0.37.2), build-essential, automake, libtool, pkg-config, python-dev, swig, fftw3-dev | libfftw3-dev, libcppunit-dev, libboost1.37-dev, libgsl0-dev, guile-1.8, libasound2-dev, python-wxgtk2.8, python-numpy, doxygen, xmlto, sdcc-nf, libusb-dev, libjack-dev, portaudio19-dev, libsdl1.2-dev, python-cheetah, python-lxml, python-gtk2, libqt4-dev, libqwt5-qt4-dev, libqwtplot3d-qt4-dev
+Build-Depends: debhelper (>= 5.0.38), build-essential, python-central (>=0.5.6), automake, libtool, pkg-config, python-dev (>=2.6), python-dev (<2.7), swig, fftw3-dev | libfftw3-dev, libcppunit-dev, libboost1.37-dev | libboost1.35-dev, libgsl0-dev, guile-1.8, libasound2-dev, python-wxgtk2.8, python-numpy, doxygen, xmlto, sdcc-nf, libusb-dev, libjack-dev, portaudio19-dev, libsdl1.2-dev, python-cheetah, python-lxml, python-gtk2, libqt4-dev, libqwt5-qt4-dev, libqwtplot3d-qt4-dev
 Standards-Version: 3.7.2
-XS-Python-Version: = 2.6
+XS-Python-Version: =2.6
 
 ################################################################################
 # C++ auxiliary libraries                                                      #
@@ -280,7 +280,7 @@ Architecture: any
 Depends: ${python:Depends}, libusrp (= ${binary:Version}), ${shlibs:Depends}
 Provides: ${python:Provides}
 Section: python
-XB-Python-Version: 2.6
+XB-Python-Version: ${python:Versions}
 Description: Python bindings for the USRP library
  This package provides auxiliary routines in Python for manipulating the USRP
  hardware.
@@ -295,7 +295,7 @@ Depends: ${python:Depends}, ${shlibs:Depends}, python-numpy
 Conflicts: python-gnuradio (< 3.2)
 Provides: ${python:Provides}
 Section: python
-XB-Python-Version: 2.6
+XB-Python-Version: ${python:Versions}
 Description: Python bindings for GNU Radio core library
  This package provides the modules that enable one to use gnuradio 
  from Python scripts.
@@ -306,7 +306,7 @@ Depends: ${python:Depends}, python-gnuradio-core (= ${binary:Version}), python-w
 Conflicts: python-wxgtk2.6
 Provides: ${python:Provides}
 Section: python
-XB-Python-Version: 2.6
+XB-Python-Version: ${python:Versions}
 Description: GNU Radio Graphical Interface Routines based on wxPython
  This package provides high level GUI construction classes based
  upon the wxPython bindings for wxWidgets.
@@ -316,7 +316,7 @@ Architecture: any
 Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-core, python-usrp
 Provides: ${python:Provides}
 Section: python
-XB-Python-Version: 2.6
+XB-Python-Version: ${python:Versions}
 Description: Python bindings for GNU Radio USRP driver
  This package provides the Python interface to the GNU Radio USRP
  driver and daughterboard drivers.
@@ -326,7 +326,7 @@ Architecture: any
 Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-core
 Provides: ${python:Provides}
 Section: python
-XB-Python-Version: 2.6
+XB-Python-Version: ${python:Versions}
 Description: Python bindings for GNU Radio USRP driver
  This package provides the Python interface to the GNU Radio USRP
  driver and daughterboard drivers.
@@ -336,7 +336,7 @@ Architecture: any
 Depends: ${python:Depends}, ${shlibs:Depends}, libgnuradio-audio-alsa (= ${binary:Version}), python-gnuradio-core
 Section: python
 Provides: ${python:Provides}, python-gnuradio-audio
-XB-Python-Version: 2.6
+XB-Python-Version: ${python:Versions}
 Description: Python bindings for GNU Radio ALSA audio driver
  This package provides the Python wrappers around the GNU Radio ALSA
  audio driver.
@@ -346,7 +346,7 @@ Architecture: any
 Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-core
 Provides: ${python:Provides}, python-gnuradio-audio
 Section: python
-XB-Python-Version: 2.6
+XB-Python-Version: ${python:Versions}
 Description: GNU Radio Python PortAudio Driver
  This package provides the Python interface to the GNU Radio driver
  for the PortAudio audio system.
@@ -356,7 +356,7 @@ Architecture: any
 Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-core
 Section: python
 Provides: ${python:Provides}, python-gnuradio-audio
-XB-Python-Version: 2.6
+XB-Python-Version: ${python:Versions}
 Description: GNU Radio Python JACK Audio Driver
  This package provides the Python interface to the GNU Radio driver
  for the JACK audio system.
@@ -366,7 +366,7 @@ Architecture: any
 Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-core
 Section: python
 Provides: ${python:Provides}, python-gnuradio-audio
-XB-Python-Version: 2.6
+XB-Python-Version: ${python:Versions}
 Description: GNU Radio Python OSS Audio Driver
  This package provides the Python interface to the GNU Radio driver
  for the OSS audio system.
@@ -376,7 +376,7 @@ Architecture: any
 Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-core
 Provides: ${python:Provides}
 Section: python
-XB-Python-Version: 2.6
+XB-Python-Version: ${python:Versions}
 Description: GNU Radio CVSD Vocoder
  This package provides an implementation of a CVSD vocoder for
  GNU Radio.
@@ -386,7 +386,7 @@ Architecture: any
 Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-core
 Provides: ${python:Provides}
 Section: python
-XB-Python-Version: 2.6
+XB-Python-Version: ${python:Versions}
 Description: GNU Radio GSM Full-Rate Vocoder
  This package provides an implementation of a full-rate GSM vocoder 
  for GNU Radio.
@@ -396,7 +396,7 @@ Architecture: any
 Depends: ${python:Depends}, ${shlibs:Depends}, libgnuradio-qtgui (= ${binary:Version}), python-gnuradio-core
 Section: python
 Provides: ${python:Provides}
-XB-Python-Version: 2.6
+XB-Python-Version: ${python:Versions}
 Description: Python bindings for GNU Radio ALSA audio driver
  This package provides the Python wrappers around the GNU Radio QT
  GUI C++ blocks.
@@ -406,7 +406,7 @@ Architecture: any
 Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-core
 Provides: ${python:Provides}
 Section: python
-XB-Python-Version: 2.6
+XB-Python-Version: ${python:Versions}
 Description: GNU Radio Trellis-Coded Modulation library
  This package provides an implementation of trellis-coded modulation
  for GNU Radio.
@@ -416,7 +416,7 @@ Architecture: any
 Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-core
 Provides: ${python:Provides}
 Section: python
-XB-Python-Version: 2.6
+XB-Python-Version: ${python:Versions}
 Description: GNU Radio SDL Interface Library
  This package provides an interface to the SDL rendering library
  for GNU Radio.
@@ -430,24 +430,26 @@ Architecture: any
 Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-usrp, python-gnuradio-usrp2, python-gnuradio-wxgui, python-matplotlib, python-tk, python-scipy
 Provides: ${python:Provides}
 Section: comm
-XB-Python-Version: 2.6
+XB-Python-Version: ${python:Versions}
 Description: GNU Radio Utilities
  This package provides commonly used utilities for GNU Radio
 
 Package: gnuradio-examples
 Architecture: any
 Depends: ${python:Depends}, python-gnuradio-core
+Provides: ${python:Provides}
 Recommends: python-gnuradio-wxgui, python-gnuradio
 Section: comm
-XB-Python-Version: 2.6
+XB-Python-Version: ${python:Versions}
 Description: GNU Radio Example Programs
  This package provides examples of GNU Radio usage using Python.
 
 Package: gnuradio-pager
 Architecture: any
 Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-usrp
+Provides: ${python:Provides}
 Section: comm
-XB-Python-Version: 2.6
+XB-Python-Version: ${python:Versions}
 Description: GNU Radio FLEX Pager Decoder
  This package provides a decoder for the FLEX paging protocol for GNU Radio
 
@@ -456,8 +458,9 @@ Architecture: any
 Replaces: gnuradio-sounder-firmware
 Conflicts: gnuradio-sounder-firmware
 Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-usrp
+Provides: ${python:Provides}
 Section: comm
-XB-Python-Version: 2.6
+XB-Python-Version: ${python:Versions}
 Description: GNU Radio Channel Sounder Application
  This package provides an RF channel sounder application for GNU Radio
 
@@ -466,8 +469,9 @@ Architecture: any
 Replaces: gnuradio-gpio-firmware
 Conflicts: gnuradio-gpio-firmware
 Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-usrp
+Provides: ${python:Provides}
 Section: comm
-XB-Python-Version: 2.6
+XB-Python-Version: ${python:Versions}
 Description: GNU Radio Streaming Digital Application
  This package provides streaming digital GPIO capabilities for GNU Radio
 
@@ -476,24 +480,27 @@ Architecture: any
 Replaces: gnuradio-radar-mono-firmware
 Conflicts: gnuradio-radar-mono-firmware
 Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-usrp
+Provides: ${python:Provides}
 Section: comm
-XB-Python-Version: 2.6
+XB-Python-Version: ${python:Versions}
 Description: GNU Radio Monostatic Radar Application
  This package provides a monostatic radar application for GNU Radio
 
 Package: gnuradio-radio-astronomy
 Architecture: any
 Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-usrp, python-gnuradio-wxgui
+Provides: ${python:Provides}
 Section: comm
-XB-Python-Version: 2.6
+XB-Python-Version: ${python:Versions}
 Description: GNU Radio Radio Astronomy Applications
  This package provides radio astronomy applications for GNU Radio
 
 Package: grc
 Architecture: any
-Depends: python (>= 2.6), 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
+Provides: ${python:Provides}
 Section: comm
-XB-Python-Version: 2.6
+XB-Python-Version: ${python:Versions}
 Description: The GNU Radio Companion
  GRC is a graphical flowgraph editor for the GNU Software Radio
 
@@ -547,7 +554,7 @@ Architecture: all
 Depends: python-gnuradio-core
 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: 2.6
+XB-Python-Version: ${python:Versions}
 Description: Python Libraries for GNU Radio Components
  This is a virtual package that depends or recommends all of the packages that
  make up the GNU Radio Python API.
diff --git a/debian/rules b/debian/rules
index fe17823551..6a6e5c7f8c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,6 +6,8 @@ export DH_VERBOSE=1
 # This has to be exported to make some magic below work.
 export DH_OPTIONS
 
+export DH_PYCENTRAL=nomove
+
 clean:
 	dh_testdir
 	dh_testroot
@@ -41,7 +43,6 @@ configure-stamp:
 		--enable-shared \
 		--sysconfdir=/etc \
 		--enable-all-components \
-		--enable-doxygen \
 		--disable-gr-audio-osx \
 		--disable-gr-audio-windows \
 		--disable-gcell --disable-gr-gcell \