Debian: Depend on python (>= 2.7) | python-argparse

Depend on python (>= 2.7) | python-argparse instead of
python-argparse to avoid pulling in python2.6

See: http://bugs.debian.org/653645

Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: Ben Pfaff <blp@nicira.com>

diff --git a/debian/changelog b/debian/changelog
index e0acd8d..823a610 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,6 +24,9 @@ openvswitch (1.4.0-1) unstable; urgency=low
         and connectivity issues. This tool currently is not included in RH or
         Xen packages.
     - RHEL packaging now supports integration with Red Hat network scripts.
+    - Debian: Depend on python (>= 2.7) | python-argparse instead of
+              python-argparse to avoid pulling in python2.6
+              (closes: #653645)
 
  -- Open vSwitch team <dev@openvswitch.org>  Mon, xx xxx xxxx 23:36:00 +0000
 

diff --git a/debian/control b/debian/control
index c350fac..5861447 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -33,7 +33,9 @@ Description: Open vSwitch datapath module source - DKMS version
 
 Package: openvswitch-common
 Architecture: linux-any
-Depends: ${shlibs:Depends}, openssl, ${misc:Depends}, python, python-argparse
+Depends:
+ ${shlibs:Depends}, openssl, ${misc:Depends}, python,
+ python (>= 2.7) | python-argparse
 Suggests: ethtool
 Description: Open vSwitch common components
  openvswitch-common provides components required by both openvswitch-switch
@@ -141,7 +143,7 @@ Description: Open vSwitch graphical monitoring tool
 
 Package: openvswitch-test
 Architecture: all
-Depends: python-twisted-web, python-argparse
+Depends: python-twisted-web, python (>= 2.7) | python-argparse
 Description: Open vSwitch test package
  This package contains utilities that are useful to diagnose
  performance and connectivity issues in Open vSwitch setup.