debian/: Use `dh_python2' for packaging.

diff --git a/debian/control b/debian/control
index 17a7451a1aa3194c8ce5073e546c9c5b5279a1cb..4c55f88ae482335510d2e83ba6ef8bf7ca880315 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,12 +3,12 @@ Section: net
 Priority: extra
 Maintainer: Mark Wooding <mdw@distorted.org.uk>
 XS-Python-Version: >= 2.4
 Priority: extra
 Maintainer: Mark Wooding <mdw@distorted.org.uk>
 XS-Python-Version: >= 2.4

-Build-Depends: debhelper (>= 9), pkg-config, curl, rsync, python-central,
+Build-Depends: debhelper (>= 9), pkg-config, curl, rsync,

        tshark, wireshark-dev (>= 1.12.1),
        tshark, wireshark-dev (>= 1.12.1),

+       python (>= 2.6.6-3~),

        mlib-dev (>= 2.2.2),
        catacomb-dev (>= 2.4.0), catacomb-bin (>= 2.1.4)
        mlib-dev (>= 2.2.2),
        catacomb-dev (>= 2.4.0), catacomb-bin (>= 2.1.4)

-Build-Depends-Indep: python,
-       python-cdb, python-gtk2,
+Build-Depends-Indep: python-cdb, python-gtk2,

        python-mlib (>= 1.0.2), python-catacomb (>= 1.2.0)
 Standards-Version: 3.1.1
 
        python-mlib (>= 1.0.2), python-catacomb (>= 1.2.0)
 Standards-Version: 3.1.1
 

diff --git a/debian/rules b/debian/rules
index c1eb564d259819a063644ad3ae1245195e511ac7..0822dce1082e2cc4ff4120c01a1ab805663c96f5 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -48,9 +48,9 @@ dh-clean-hook::
 ### Other things.
 
 ## Python stuff.
 ### Other things.
 
 ## Python stuff.

-DH_OPTIONS             += --with=python-central
-OVERRIDES              += pycentral
-dh_pycentral_OPTS      += -ppython-tripe
+DH_OPTIONS             += --with=python2
+OVERRIDES              += python2
+dh_python2_OPTS                += -ppython-tripe

 
 ## The peer database.
 OVERRIDES              += install
 
 ## The peer database.
 OVERRIDES              += install