[Pkg-virtualbox-commits] [SCM] virtualbox Debian packaging branch, master, updated. debian/4.1.16-dfsg-2

[Felix Geyer]

The following commit has been merged in the master branch:
commit 8544f35356691869f5a32a04e2d13b7d963b897b
Author: Felix Geyer <debfx-pkg at fobos.de>
Date:   Sun Jun 10 21:28:28 2012 +0200

    Switch from python-central to dh_python2.
    
    Closes: #617143

diff --git a/debian/changelog b/debian/changelog
index f7ef957..cd11cae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ virtualbox (4.1.16-dfsg-2) UNRELEASED; urgency=low
 
   * Fix unregistering vboxnet devices. (LP: #1009156)
     - Add 37-fix-unregister-netdevice.patch, backported from upstream.
+  * Switch from python-central to dh_python2. (Closes: #617143)
 
  -- Felix Geyer <debfx-pkg at fobos.de>  Sun, 10 Jun 2012 19:59:09 +0200
 
diff --git a/debian/control b/debian/control
index 8f72251..1d87845 100644
--- a/debian/control
+++ b/debian/control
@@ -49,8 +49,7 @@ Build-Depends: bcc,
                lsb-release,
                lynx-cur,
                makeself,
-               python-central (>= 0.6.7~),
-               python-dev (>= 2.4),
+               python-dev (>= 2.6.6-3~),
                texlive-fonts-extra,
                texlive-fonts-recommended,
                texlive-latex-extra,
@@ -62,7 +61,7 @@ Build-Depends: bcc,
                xsltproc,
                yasm (>= 0.7.0),
                zlib1g-dev
-XS-Python-Version: >= 2.5
+X-Python-Version: >= 2.5
 Standards-Version: 3.9.3
 Homepage: http://www.virtualbox.org/
 Vcs-Git: git://git.debian.org/git/pkg-virtualbox/virtualbox.git
@@ -99,7 +98,6 @@ Suggests: virtualbox-guest-additions-iso,
 Conflicts: virtualbox-2.0, virtualbox-2.1, virtualbox-2.2, virtualbox-3.0
 Breaks: virtualbox-ose (<< 4.0.6-dfsg-1~)
 Replaces: virtualbox-ose (<< 4.0.6-dfsg-1~)
-XB-Python-Version: ${python:Versions}
 Description: x86 virtualization solution - base binaries
  VirtualBox is a free x86 virtualization solution allowing a wide range
  of x86 operating systems such as Windows, DOS, BSD or Linux to run on a
diff --git a/debian/rules b/debian/rules
index 1e5e8ab..413ba65 100755
--- a/debian/rules
+++ b/debian/rules
@@ -80,7 +80,7 @@ endif
 
 
 %:
-	dh $@ --with python_central,dkms
+	dh $@ --with python2,dkms
 
 override_dh_auto_configure:
 	@echo Building for $(DIST_RELEASE)
@@ -231,9 +231,6 @@ override_dh_shlibdeps:
 override_dh_compress:
 	dh_compress -X.pdf
 
-override_dh_pycentral:
-	dh_pycentral -p$(sname)
-
 override_dh_auto_clean:
 	dh_auto_clean
 

-- 
virtualbox Debian packaging