debian: wrap-and-sort

Wrap long lines and sort items in the Debian packaging files.

Signed-off-by: James Page <james.page@ubuntu.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>

diff --git a/debian/control b/debian/control
index 66cb361..b1ba732 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,17 +3,25 @@ Section: net
 Priority: extra
 Maintainer: Open vSwitch developers <dev@openvswitch.org>
 Uploaders: Ben Pfaff <pfaffben@debian.org>, Simon Horman <horms@debian.org>
-Build-Depends:
- debhelper (>= 8), autoconf (>= 2.64), automake (>= 1.10) | automake1.10, 
- libssl-dev, bzip2, openssl, graphviz,
- python-all (>= 2.7), procps, python-qt4,
- python-zopeinterface, python-twisted-conch, libtool
+Build-Depends: autoconf (>= 2.64),
+               automake (>= 1.10) | automake1.10,
+               bzip2,
+               debhelper (>= 8),
+               graphviz,
+               libssl-dev,
+               libtool,
+               openssl,
+               procps,
+               python-all (>= 2.7),
+               python-qt4,
+               python-twisted-conch,
+               python-zopeinterface
 Standards-Version: 3.9.3
 Homepage: http://openvswitch.org/
 
 Package: openvswitch-datapath-source
 Architecture: all
-Depends: module-assistant, bzip2, debhelper (>= 5.0.37), ${misc:Depends}
+Depends: bzip2, debhelper (>= 5.0.37), module-assistant, ${misc:Depends}
 Suggests: openvswitch-switch
 Description: Open vSwitch datapath module source - module-assistant version
  Open vSwitch is a production quality, multilayer, software-based,
@@ -31,7 +39,7 @@ Description: Open vSwitch datapath module source - module-assistant version
 
 Package: openvswitch-datapath-dkms
 Architecture: all
-Depends: dkms (>= 1.95), make, libc6-dev, ${misc:Depends}, ${python:Depends}
+Depends: dkms (>= 1.95), libc6-dev, make, ${misc:Depends}, ${python:Depends}
 Description: Open vSwitch datapath module source - DKMS version
  Open vSwitch is a production quality, multilayer, software-based,
  Ethernet virtual switch. It is designed to enable massive network
@@ -47,9 +55,11 @@ Description: Open vSwitch datapath module source - DKMS version
 
 Package: openvswitch-common
 Architecture: linux-any
-Depends:
- ${shlibs:Depends}, openssl, ${misc:Depends}, python,
- python (>= 2.7) | python-argparse
+Depends: openssl,
+         python,
+         python (>= 2.7) | python-argparse,
+         ${misc:Depends},
+         ${shlibs:Depends}
 Suggests: ethtool
 Description: Open vSwitch common components
  Open vSwitch is a production quality, multilayer, software-based,
@@ -66,7 +76,15 @@ Description: Open vSwitch common components
 Package: openvswitch-switch
 Architecture: linux-any
 Suggests: openvswitch-datapath-module
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, openvswitch-common (= ${binary:Version}), kmod | module-init-tools, procps, uuid-runtime, netbase, python-argparse
+Depends: kmod | module-init-tools,
+         netbase,
+         openvswitch-common (= ${binary:Version}),
+         procps,
+         python-argparse,
+         uuid-runtime,
+         ${misc:Depends},
+         ${python:Depends},
+         ${shlibs:Depends}
 Description: Open vSwitch switch implementations
  Open vSwitch is a production quality, multilayer, software-based,
  Ethernet virtual switch. It is designed to enable massive network
@@ -81,13 +99,14 @@ Description: Open vSwitch switch implementations
 
 Package: openvswitch-ipsec
 Architecture: linux-any
-Depends:
- ${shlibs:Depends}, ${misc:Depends}, python,
- ipsec-tools (>=0.8~alpha20101208),
- racoon (>=0.8~alpha20101208),
- openvswitch-common (= ${binary:Version}),
- openvswitch-switch (= ${binary:Version}),
- python-openvswitch (= ${source:Version})
+Depends: ipsec-tools (>=0.8~alpha20101208),
+         openvswitch-common (= ${binary:Version}),
+         openvswitch-switch (= ${binary:Version}),
+         python,
+         python-openvswitch (= ${source:Version}),
+         racoon (>=0.8~alpha20101208),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Description: Open vSwitch GRE-over-IPsec support
  Open vSwitch is a production quality, multilayer, software-based,
  Ethernet virtual switch. It is designed to enable massive network
@@ -102,9 +121,9 @@ Description: Open vSwitch GRE-over-IPsec support
 
 Package: openvswitch-pki
 Architecture: all
-Depends:
- ${misc:Depends}, openvswitch-common (>= ${source:Version}),
- openvswitch-common (<< ${source:Version}.1~)
+Depends: openvswitch-common (<< ${source:Version}.1~),
+         openvswitch-common (>= ${source:Version}),
+         ${misc:Depends}
 Description: Open vSwitch public key infrastructure dependency package
  Open vSwitch is a production quality, multilayer, software-based,
  Ethernet virtual switch. It is designed to enable massive network
@@ -120,9 +139,10 @@ Description: Open vSwitch public key infrastructure dependency package
 
 Package: openvswitch-testcontroller
 Architecture: linux-any
-Depends:
- ${shlibs:Depends}, openvswitch-common (= ${binary:Version}),
- openvswitch-pki (= ${source:Version}), ${misc:Depends}
+Depends: openvswitch-common (= ${binary:Version}),
+         openvswitch-pki (= ${source:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Description: Simple controller for testing OpenFlow setups
  This controller enables OpenFlow switches that connect to it to act
  as MAC-learning Ethernet switches.  It can be used for initial
@@ -132,13 +152,12 @@ Description: Simple controller for testing OpenFlow setups
 Package: openvswitch-dbg
 Section: debug
 Architecture: linux-any
-Depends:
- ${shlibs:Depends}, ${misc:Depends},
- openvswitch-common (= ${binary:Version}),
- openvswitch-switch (= ${binary:Version})
-Conflicts:
- openvswitch-testcontroller (<< ${binary:Version}),
- openvswitch-testcontroller (>> ${binary:Version})
+Depends: openvswitch-common (= ${binary:Version}),
+         openvswitch-switch (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
+Conflicts: openvswitch-testcontroller (<< ${binary:Version}),
+           openvswitch-testcontroller (>> ${binary:Version})
 Description: Debug symbols for Open vSwitch packages
  Open vSwitch is a production quality, multilayer, software-based,
  Ethernet virtual switch. It is designed to enable massive network
@@ -169,7 +188,10 @@ Description: Python bindings for Open vSwitch
 
 Package: openvswitch-test
 Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}, python-twisted-web, python (>= 2.7) | python-argparse
+Depends: python (>= 2.7) | python-argparse,
+         python-twisted-web,
+         ${misc:Depends},
+         ${python:Depends}
 Description: Open vSwitch test package
  Open vSwitch is a production quality, multilayer, software-based,
  Ethernet virtual switch. It is designed to enable massive network
@@ -184,10 +206,12 @@ Description: Open vSwitch test package
 
 Package: openvswitch-vtep
 Architecture: linux-any
-Depends:
- ${shlibs:Depends}, ${misc:Depends}, openvswitch-common (>= ${binary:Version}),
- openvswitch-switch (>= ${binary:Version}), python,
- python-openvswitch (>= ${source:Version})
+Depends: openvswitch-common (>= ${binary:Version}),
+         openvswitch-switch (>= ${binary:Version}),
+         python,
+         python-openvswitch (>= ${source:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Description: Open vSwitch VTEP utilities
  Open vSwitch is a production quality, multilayer, software-based, Ethernet
  virtual switch. It is designed to enable massive network automation through

diff --git a/debian/copyright.in b/debian/copyright.in
index c91d1a6..bfac3c6 100644 (file)
--- a/debian/copyright.in
+++ b/debian/copyright.in
@@ -656,4 +656,3 @@ InMon Corp.
 Phone: (415) 283-3260
 URL:   www.inmon.com
 Email: info@inmon.com
-

diff --git a/debian/openvswitch-common.manpages b/debian/openvswitch-common.manpages
index a219722..5799d92 100644 (file)
--- a/debian/openvswitch-common.manpages
+++ b/debian/openvswitch-common.manpages
@@ -1,8 +1,8 @@
 _debian/ovsdb/ovsdb-client.1
 _debian/ovsdb/ovsdb-tool.1
+_debian/utilities/bugtool/ovs-bugtool.8
 _debian/utilities/ovs-appctl.8
 _debian/utilities/ovs-benchmark.1
 _debian/utilities/ovs-ofctl.8
 _debian/utilities/ovs-pki.8
-_debian/utilities/bugtool/ovs-bugtool.8
 utilities/ovs-parse-backtrace.8

diff --git a/debian/openvswitch-datapath-source.install b/debian/openvswitch-datapath-source.install
index 943245c..4b98acb 100644 (file)
--- a/debian/openvswitch-datapath-source.install
+++ b/debian/openvswitch-datapath-source.install
@@ -1,5 +1,5 @@
+_debian/openvswitch.tar.gz usr/src/modules/openvswitch-datapath
+debian/*.modules.in usr/src/modules/openvswitch-datapath/debian
 debian/changelog usr/src/modules/openvswitch-datapath/debian
-debian/control usr/src/modules/openvswitch-datapath/debian
 debian/compat usr/src/modules/openvswitch-datapath/debian
-debian/*.modules.in usr/src/modules/openvswitch-datapath/debian
-_debian/openvswitch.tar.gz usr/src/modules/openvswitch-datapath
+debian/control usr/src/modules/openvswitch-datapath/debian

diff --git a/debian/openvswitch-switch.install b/debian/openvswitch-switch.install
index b5d0063..a512971 100644 (file)
--- a/debian/openvswitch-switch.install
+++ b/debian/openvswitch-switch.install
@@ -1,3 +1,4 @@
+debian/ifupdown.sh usr/share/openvswitch/scripts
 etc/bash_completion.d/ovs-vsctl-bashcomp.bash
 usr/bin/ovs-dpctl
 usr/bin/ovs-dpctl-top
@@ -13,4 +14,3 @@ usr/share/openvswitch/scripts/ovs-ctl
 usr/share/openvswitch/scripts/ovs-lib
 usr/share/openvswitch/scripts/ovs-save
 usr/share/openvswitch/vswitch.ovsschema
-debian/ifupdown.sh usr/share/openvswitch/scripts

diff --git a/debian/openvswitch-switch.links b/debian/openvswitch-switch.links
index 0d6d1e0..cf58073 100644 (file)
--- a/debian/openvswitch-switch.links
+++ b/debian/openvswitch-switch.links
@@ -1,2 +1,2 @@
-usr/share/openvswitch/scripts/ifupdown.sh etc/network/if-pre-up.d/openvswitch
 usr/share/openvswitch/scripts/ifupdown.sh etc/network/if-post-down.d/openvswitch
+usr/share/openvswitch/scripts/ifupdown.sh etc/network/if-pre-up.d/openvswitch

diff --git a/debian/openvswitch-switch.manpages b/debian/openvswitch-switch.manpages
index 9e175dd..e2d9d8a 100644 (file)
--- a/debian/openvswitch-switch.manpages
+++ b/debian/openvswitch-switch.manpages
@@ -1,6 +1,6 @@
 _debian/ovsdb/ovsdb-server.1
-_debian/utilities/ovs-dpctl.8
 _debian/utilities/ovs-dpctl-top.8
+_debian/utilities/ovs-dpctl.8
 _debian/utilities/ovs-pcap.1
 _debian/utilities/ovs-tcpundump.1
 _debian/utilities/ovs-vlan-test.8

diff --git a/debian/openvswitch-test.install b/debian/openvswitch-test.install
index b295ead..8a01a51 100644 (file)
--- a/debian/openvswitch-test.install
+++ b/debian/openvswitch-test.install
@@ -1,3 +1,3 @@
-usr/share/openvswitch/python/ovstest usr/lib/python2.7/dist-packages/
-usr/bin/ovs-test
 usr/bin/ovs-l3ping
+usr/bin/ovs-test
+usr/share/openvswitch/python/ovstest usr/lib/python2.7/dist-packages/

diff --git a/debian/openvswitch-test.manpages b/debian/openvswitch-test.manpages
index 1a7f6d4..0c0008b 100644 (file)
--- a/debian/openvswitch-test.manpages
+++ b/debian/openvswitch-test.manpages
@@ -1,2 +1,2 @@
-_debian/utilities/ovs-test.8
 _debian/utilities/ovs-l3ping.8
+_debian/utilities/ovs-test.8

diff --git a/debian/openvswitch-vtep.install b/debian/openvswitch-vtep.install
index db91209..6ef518f 100644 (file)
--- a/debian/openvswitch-vtep.install
+++ b/debian/openvswitch-vtep.install
@@ -1,3 +1,3 @@
 _debian/vtep/vtep-ctl usr/bin
-usr/share/openvswitch/vtep.ovsschema
 usr/share/openvswitch/scripts/ovs-vtep
+usr/share/openvswitch/vtep.ovsschema