Debian: Use ${source:Version} for versioned dependencies as appropriate

${source:Version} should be used for versioned dependencies
of arch:any packages on arch:all packages.

${source:Version} may be used for versioned dependencies
of arch:all packages on arch:any packages.

See: http://lintian.debian.org/tags/not-binnmuable-any-depends-all.html
     http://lintian.debian.org/tags/not-binnmuable-all-depends-any.html

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

diff --git a/debian/control b/debian/control
index f107ebcbabb49f0ce582a1d18c0b71467485125d..d38590f51fe54fca99af04c92a860aa325f80d92 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -65,7 +65,9 @@ Description: Monitoring utility for OpenFlow switches
 
 Package: openvswitch-pki
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, openvswitch-common (= ${binary:Version})
+Depends:
+ ${shlibs:Depends}, ${misc:Depends}, openvswitch-common (>= ${source:Version}),
+ openvswitch-common (<< ${source:Version}.1~)
 Description: A dependency package for the Open vSwitch public key infrastructure
  openvswitch-pki provides PKI (public key infrastructure) support for
  Open vSwitch switches and controllers, reducing the risk of
@@ -87,7 +89,9 @@ Description: Open vSwitch public key infrastructure (HTTP server support)
 
 Package: openvswitch-controller
 Architecture: any
-Depends: ${shlibs:Depends}, openvswitch-common (= ${binary:Version}), openvswitch-pki (= ${binary:Version}), ${misc:Depends}
+Depends:
+ ${shlibs:Depends}, openvswitch-common (= ${binary:Version}),
+ openvswitch-pki (= ${source:Version}), ${misc:Depends}
 Description: Open vSwitch controller implementation
  The Open vSwitch controller enables OpenFlow switches that connect to it
  to act as MAC-learning Ethernet switches.
@@ -130,10 +134,14 @@ Description: Watchdog utility for Open vSwitch switches
 Package: nicira-switch
 Architecture: all
 Depends: 
- openvswitch-common (= ${binary:Version}), 
- openvswitch-switch (= ${binary:Version}), 
- openvswitch-switchui (= ${binary:Version}), 
- openvswitch-datapath-module (= ${binary:Version}),
+ openvswitch-common (>= ${source:Version}),
+ openvswitch-common (<< ${source:Version}.1~),
+ openvswitch-switch (>= ${source:Version}),
+ openvswitch-switch (<< ${source:Version}.1~),
+ openvswitch-switchui (>= ${source:Version}),
+ openvswitch-switchui (<< ${source:Version}.1~),
+ openvswitch-datapath-module (>= ${source:Version}),
+ openvswitch-datapath-module (<< ${source:Version}.1~),
  corekeeper, openvswitch-monitor, openvswitch-wdt, ${misc:Depends}
 Description: A meta-package for installing a Nicira Open vSwitch switch
  Installing this package will install everything needed for a Nicira