Move ofp-switch-config into new package openflow-switch-config.

This reduces the openflow-switch package's number of dependencies, making
it easier to install.

diff --git a/debian/.gitignore b/debian/.gitignore
index 7768acf..e322b36 100644 (file)
--- a/debian/.gitignore
+++ b/debian/.gitignore
@@ -12,6 +12,7 @@
 /openflow-pki
 /openflow-pki-server
 /openflow-switch
+/openflow-switch-config
 /openflow-switch.copyright
 /openflow-switchmon
 /openflow-switchmon.copyright
@@ -19,3 +20,4 @@
 /openflow-switchmon.dirs
 /openflow-switchmon.init
 /openflow-switchmon.install
+/rules.ext

diff --git a/debian/control.in b/debian/control.in
index b7aa8b5..f80099c 100644 (file)
--- a/debian/control.in
+++ b/debian/control.in
@@ -29,11 +29,19 @@ Description: OpenFlow common components
 Package: openflow-switch
 Architecture: any
 Suggests: openflow-datapath-module
-Depends: ${shlibs:Depends}, ${misc:Depends}, openflow-common, libwww-perl, libdigest-sha1-perl, dhcp3-client
+Depends: ${shlibs:Depends}, ${misc:Depends}, openflow-common, dhcp3-client
 Description: OpenFlow switch implementations
  openflow-switch provides the userspace components and utilities for
- the OpenFlow kernel-based switch.  It also includes a userspace-only
- implementation of an OpenFlow switch.
+ the OpenFlow kernel-based switch.  
+ .
+ OpenFlow is a protocol for flow-based control over network switching.
+
+Package: openflow-switch-config
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, openflow-switch, libwww-perl, libdigest-sha1-perl
+Description: OpenFlow switch implementations
+ openflow-switch-config provides a utility for interactively configuring
+ the OpenFlow switch provided in the openflow-switch package.
  .
  OpenFlow is a protocol for flow-based control over network switching.
 

diff --git a/debian/openflow-switch-config.dirs b/debian/openflow-switch-config.dirs
new file mode 100644 (file)
index 0000000..881ded8
--- /dev/null
+++ b/debian/openflow-switch-config.dirs
@@ -0,0 +1 @@
+/usr/share/lintian/overrides

diff --git a/debian/openflow-switch-config.install b/debian/openflow-switch-config.install
new file mode 100644 (file)
index 0000000..75c5008
--- /dev/null
+++ b/debian/openflow-switch-config.install
@@ -0,0 +1 @@
+debian/ofp-switch-setup usr/sbin

diff --git a/debian/openflow-switch-config.manpages b/debian/openflow-switch-config.manpages
new file mode 100644 (file)
index 0000000..e176dad
--- /dev/null
+++ b/debian/openflow-switch-config.manpages
@@ -0,0 +1 @@
+debian/ofp-switch-setup.8

diff --git a/debian/openflow-switch.overrides b/debian/openflow-switch-config.overrides
similarity index 100%
rename from debian/openflow-switch.overrides
rename to debian/openflow-switch-config.overrides

diff --git a/debian/openflow-switch.templates b/debian/openflow-switch-config.templates
similarity index 100%
rename from debian/openflow-switch.templates
rename to debian/openflow-switch-config.templates

diff --git a/debian/openflow-switch.README.Debian b/debian/openflow-switch.README.Debian
index 73be13a..d4b1cb3 100644 (file)
--- a/debian/openflow-switch.README.Debian
+++ b/debian/openflow-switch.README.Debian
@@ -2,9 +2,10 @@ README.Debian for openflow-switch
 ---------------------------------
 
 * The switch must be configured before it can be used.  To configure
-  it interactively, run the ofp-switch-setup program.  Alternatively,
-  edit /etc/default/openflow-switch by hand, then start the switch
-  manually with "/etc/init.d/openflow-switch start".
+  it interactively, install the openflow-switch-config package and run
+  the ofp-switch-setup program.  Alternatively, edit
+  /etc/default/openflow-switch by hand, then start the switch manually
+  with "/etc/init.d/openflow-switch start".
 
 * To use the Linux kernel-based switch implementation, you will need
   to build and install the OpenFlow kernel module.  To do so, install

diff --git a/debian/openflow-switch.default b/debian/openflow-switch.default
index 5112332..6a86e2f 100644 (file)
--- a/debian/openflow-switch.default
+++ b/debian/openflow-switch.default
@@ -4,8 +4,8 @@
 # uncomment them.  Afterward, the secure channel will come up
 # automatically at boot time.  It can be started immediately with
 #       /etc/init.d/openflow-switch start
-# Alternatively, use the ofp-switch-setup program to do everything
-# automatically.
+# Alternatively, use the ofp-switch-setup program (from the
+# openflow-switch-config package) to do everything automatically.
 
 # NETDEVS: Which network devices should the OpenFlow switch include?
 #

diff --git a/debian/openflow-switch.dirs b/debian/openflow-switch.dirs
index 836e4e5..6cf04b5 100644 (file)
--- a/debian/openflow-switch.dirs
+++ b/debian/openflow-switch.dirs
@@ -1,2 +1 @@
 /etc/openflow-switch
-/usr/share/lintian/overrides

diff --git a/debian/openflow-switch.init b/debian/openflow-switch.init
index e6acfa4..3dbfb9d 100755 (executable)
--- a/debian/openflow-switch.init
+++ b/debian/openflow-switch.init
@@ -142,7 +142,7 @@ configure_ssl() {
         if test ! -e "$CACERT" && test "$CACERT_MODE" != bootstrap; then
             echo "$CACERT: CA certificate missing (and CA certificate bootstrapping not enabled)" >&2
         fi
-        echo "Run ofp-switch-setup or edit /etc/default/openflow-switch to configure" >&2
+        echo "Run ofp-switch-setup (in the openflow-switch-config package) or edit /etc/default/openflow-switch to configure" >&2
         if test "$MODE" = discovery; then
             echo "You may also delete or rename $PRIVKEY to disable SSL requirement" >&2
         fi
@@ -161,7 +161,7 @@ case "$1" in
     start)
         if test -z "$NETDEVS"; then
             echo "$default: No network devices configured, switch disabled" >&2
-            echo "Run ofp-switch-setup or edit /etc/default/openflow-switch to configure" >&2
+            echo "Run ofp-switch-setup (in the openflow-switch-config package) or edit /etc/default/openflow-switch to configure" >&2
             exit 0
         fi
         if test "$MODE" = discovery; then
@@ -169,12 +169,12 @@ case "$1" in
         elif test "$MODE" = in-band || test "$MODE" = out-of-band; then
             if test -z "$CONTROLLER"; then
                 echo "$default: No controller configured and not configured for discovery, switch disabled" >&2
-                echo "Run ofp-switch-setup or edit /etc/default/openflow-switch to configure" >&2
+                echo "Run ofp-switch-setup (in the openflow-switch-config package) or edit /etc/default/openflow-switch to configure" >&2
                 exit 0
             fi
         else
             echo "$default: MODE must set to 'discovery', 'in-band', or 'out-of-band'" >&2
-            echo "Run ofp-switch-setup or edit /etc/default/openflow-switch to configure" >&2
+            echo "Run ofp-switch-setup (in the openflow-switch-config package) or edit /etc/default/openflow-switch to configure" >&2
             exit 1
         fi
         : ${PRIVKEY:=/etc/openflow-switch/of0-privkey.pem}
@@ -194,7 +194,7 @@ case "$1" in
                 ;;
             *)
                 echo "$default: CONTROLLER must be in the form 'ssl:HOST[:PORT]' or 'tcp:HOST[:PORT]' when not in discovery mode" >&2
-                echo "Run ofp-switch-setup or edit /etc/default/openflow-switch to configure" >&2
+                echo "Run ofp-switch-setup (in the openflow-switch-config package) or edit /etc/default/openflow-switch to configure" >&2
                 exit 1
         esac
 

diff --git a/debian/openflow-switch.links b/debian/openflow-switch.links
deleted file mode 100644 (file)
index 629db1d..0000000
--- a/debian/openflow-switch.links
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/modass/packages/default.sh /usr/share/modass/packages/openflow-datapath-source

diff --git a/debian/po/POTFILES.in b/debian/po/POTFILES.in
index be39266..e3ea07e 100644 (file)
--- a/debian/po/POTFILES.in
+++ b/debian/po/POTFILES.in
@@ -1 +1 @@
-[type: gettext/rfc822deb] openflow-switch.templates
+[type: gettext/rfc822deb] openflow-switch-config.templates

diff --git a/debian/po/templates.pot b/debian/po/templates.pot
index 96f7f02..443a1ce 100644 (file)
--- a/debian/po/templates.pot
+++ b/debian/po/templates.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: openflow-dev@lists.stanford.edu\n"
-"POT-Creation-Date: 2008-07-23 14:55-0700\n"
+"POT-Creation-Date: 2008-10-31 10:13-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,19 +18,19 @@ msgstr ""
 
 #. Type: multiselect
 #. Choices
-#: ../openflow-switch.templates:1001
+#: ../openflow-switch-config.templates:1001
 msgid "${choices}"
 msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../openflow-switch.templates:1002
+#: ../openflow-switch-config.templates:1002
 msgid "OpenFlow switch network devices:"
 msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../openflow-switch.templates:1002
+#: ../openflow-switch-config.templates:1002
 msgid ""
 "Choose the network devices that should become part of the OpenFlow switch.  "
 "At least two devices must be selected for this machine to be a useful "
@@ -40,7 +40,7 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../openflow-switch.templates:1002
+#: ../openflow-switch-config.templates:1002
 msgid ""
 "The network devices that you select should not be configured with IP or IPv6 "
 "addresses, even if the switch contacts the controller over one of the "
@@ -51,13 +51,13 @@ msgstr ""
 
 #. Type: error
 #. Description
-#: ../openflow-switch.templates:2001
+#: ../openflow-switch-config.templates:2001
 msgid "No network devices were selected."
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../openflow-switch.templates:2001
+#: ../openflow-switch-config.templates:2001
 msgid ""
 "No network devices were selected for inclusion in the OpenFlow switch. The "
 "switch will be disabled."
@@ -65,13 +65,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../openflow-switch.templates:3001
+#: ../openflow-switch-config.templates:3001
 msgid "Some Network Devices Have IP or IPv6 Addresses"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../openflow-switch.templates:3001
+#: ../openflow-switch-config.templates:3001
 msgid ""
 "The following network devices selected to be part of the OpenFlow switch "
 "have IP or IPv6 addresses configured:"
@@ -79,13 +79,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../openflow-switch.templates:3001
+#: ../openflow-switch-config.templates:3001
 msgid "${configured-netdevs}"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../openflow-switch.templates:3001
+#: ../openflow-switch-config.templates:3001
 msgid ""
 "This is usually a mistake, even if the switch contacts the controller over "
 "one of the selected network devices.  This is because a running OpenFlow "
@@ -95,7 +95,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../openflow-switch.templates:3001
+#: ../openflow-switch-config.templates:3001
 msgid ""
 "If this is an unintentional mistake, move back and fix the selection, or de-"
 "configure the IP or IPv6 from these network devices."
@@ -103,19 +103,19 @@ msgstr ""
 
 #. Type: select
 #. Choices
-#: ../openflow-switch.templates:4001
+#: ../openflow-switch-config.templates:4001
 msgid "discovery, in-band, out-of-band"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../openflow-switch.templates:4002
+#: ../openflow-switch-config.templates:4002
 msgid "Switch-to-controller access method:"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../openflow-switch.templates:4002
+#: ../openflow-switch-config.templates:4002
 msgid ""
 "The OpenFlow switch must be able to contact the OpenFlow controller over the "
 "network.  It can do so in one of three ways:"
@@ -123,7 +123,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../openflow-switch.templates:4002
+#: ../openflow-switch-config.templates:4002
 msgid ""
 "discovery: A single network is used for OpenFlow traffic and other data "
 "traffic; that is, the switch contacts the controller over one of the network "
@@ -135,14 +135,14 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../openflow-switch.templates:4002
+#: ../openflow-switch-config.templates:4002
 msgid ""
 "in-band: As above, but the location of the controller is manually configured."
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../openflow-switch.templates:4002
+#: ../openflow-switch-config.templates:4002
 msgid ""
 "out-of-band: OpenFlow traffic uses a network separate from the data traffic "
 "that it controls.  If this is the case, the control network must already be "
@@ -152,13 +152,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../openflow-switch.templates:5001
+#: ../openflow-switch-config.templates:5001
 msgid "Preparing to discover controller."
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../openflow-switch.templates:5001
+#: ../openflow-switch-config.templates:5001
 msgid ""
 "The setup program will now attempt to discover the OpenFlow controller. "
 "Controller discovery may take up to 30 seconds.  Please be patient."
@@ -166,7 +166,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../openflow-switch.templates:5001
+#: ../openflow-switch-config.templates:5001
 msgid ""
 "See secchan(8) for instructions on how to configure a DHCP server for "
 "controller discovery."
@@ -174,19 +174,19 @@ msgstr ""
 
 #. Type: error
 #. Description
-#: ../openflow-switch.templates:6001
+#: ../openflow-switch-config.templates:6001
 msgid "Controller discovery failed."
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../openflow-switch.templates:6001
+#: ../openflow-switch-config.templates:6001
 msgid "The controller's location could not be determined automatically."
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../openflow-switch.templates:6001
+#: ../openflow-switch-config.templates:6001
 msgid ""
 "Ensure that the OpenFlow DHCP server is properly configured.  See secchan(8) "
 "for instructions on how to configure a DHCP server for controller discovery."
@@ -194,43 +194,43 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openflow-switch.templates:7001
+#: ../openflow-switch-config.templates:7001
 msgid "Use discovered settings?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openflow-switch.templates:7001
+#: ../openflow-switch-config.templates:7001
 msgid "Controller discovery obtained the following settings:"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openflow-switch.templates:7001
+#: ../openflow-switch-config.templates:7001
 msgid "Controller location: ${controller-vconn}"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openflow-switch.templates:7001
+#: ../openflow-switch-config.templates:7001
 msgid "PKI URL: ${pki-uri}"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../openflow-switch.templates:7001
+#: ../openflow-switch-config.templates:7001
 msgid "Please verify that these settings are correct."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../openflow-switch.templates:8001
+#: ../openflow-switch-config.templates:8001
 msgid "Switch IP address:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../openflow-switch.templates:8001
+#: ../openflow-switch-config.templates:8001
 msgid ""
 "For in-band communication with the controller, the OpenFlow switch must be "
 "able to determine its own IP address.  Its IP address may be configured "
@@ -239,13 +239,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../openflow-switch.templates:8001
+#: ../openflow-switch-config.templates:8001
 msgid "For static configuration, specify the switch's IP address as a string."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../openflow-switch.templates:8001
+#: ../openflow-switch-config.templates:8001
 msgid ""
 "For dynamic configuration with DHCP (the most common case), specify \"dhcp"
 "\". Configuration with DHCP will only work reliably if the network topology "
@@ -255,13 +255,13 @@ msgstr ""
 
 #. Type: error
 #. Description
-#: ../openflow-switch.templates:9001
+#: ../openflow-switch-config.templates:9001
 msgid "The switch IP address is invalid."
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../openflow-switch.templates:9001
+#: ../openflow-switch-config.templates:9001
 msgid ""
 "The switch IP address must specified as \"dhcp\" or a valid IP address in "
 "dotted-octet form (e.g. \"1.2.3.4\")."
@@ -269,13 +269,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../openflow-switch.templates:10001
+#: ../openflow-switch-config.templates:10001
 msgid "Controller location:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../openflow-switch.templates:10001
+#: ../openflow-switch-config.templates:10001
 msgid ""
 "Specify how the OpenFlow switch should connect to the OpenFlow controller. "
 "The value should be in form \"ssl:HOST[:PORT]\" to connect to the controller "
@@ -285,13 +285,13 @@ msgstr ""
 
 #. Type: error
 #. Description
-#: ../openflow-switch.templates:11001
+#: ../openflow-switch-config.templates:11001
 msgid "The controller location is invalid."
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../openflow-switch.templates:11001
+#: ../openflow-switch-config.templates:11001
 msgid ""
 "The controller location must be specifed as \"ssl:HOST[:PORT]\" to connect "
 "to the controller over SSL (recommended for security) or \"tcp:HOST[:PORT]\" "
@@ -300,13 +300,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../openflow-switch.templates:12001
+#: ../openflow-switch-config.templates:12001
 msgid "OpenFlow PKI server host name or URL:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../openflow-switch.templates:12001
+#: ../openflow-switch-config.templates:12001
 msgid ""
 "Specify a URL to the OpenFlow public key infrastructure (PKI).  If a host "
 "name or IP address is specified in place of a URL, then http://<host>/"
@@ -316,14 +316,14 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../openflow-switch.templates:12001
+#: ../openflow-switch-config.templates:12001
 msgid ""
 "The OpenFlow PKI is usually on the same machine as the OpenFlow controller."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../openflow-switch.templates:12001
+#: ../openflow-switch-config.templates:12001
 msgid ""
 "The setup process will connect to the OpenFlow PKI server over HTTP, using "
 "the system's configured default HTTP proxy (if any)."
@@ -331,19 +331,19 @@ msgstr ""
 
 #. Type: error
 #. Description
-#: ../openflow-switch.templates:13001
+#: ../openflow-switch-config.templates:13001
 msgid "The switch CA certificate could not be retrieved."
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../openflow-switch.templates:13001
+#: ../openflow-switch-config.templates:13001
 msgid "Retrieval of ${url} failed, with the following status: \"${error}\"."
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../openflow-switch.templates:13001
+#: ../openflow-switch-config.templates:13001
 msgid ""
 "Ensure that the OpenFlow PKI server is correctly configured and available at "
 "${pki-uri}.  If the system is configured to use an HTTP proxy, also make "
@@ -357,20 +357,21 @@ msgstr ""
 #. Choices
 #. Type: select
 #. Choices
-#: ../openflow-switch.templates:14001 ../openflow-switch.templates:15001
-#: ../openflow-switch.templates:17001
+#: ../openflow-switch-config.templates:14001
+#: ../openflow-switch-config.templates:15001
+#: ../openflow-switch-config.templates:17001
 msgid "yes, no"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../openflow-switch.templates:14002
+#: ../openflow-switch-config.templates:14002
 msgid "Is ${fingerprint} the controller CA's fingerprint?"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../openflow-switch.templates:14002
+#: ../openflow-switch-config.templates:14002
 msgid ""
 "If a man-in-the-middle attack is possible in your network environment, check "
 "that the controller CA's fingerprint is really ${fingerprint}.  Answer \"yes"
@@ -379,7 +380,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../openflow-switch.templates:14002
+#: ../openflow-switch-config.templates:14002
 msgid ""
 "If a man-in-the-middle attack is not a concern, there is no need to verify "
 "the fingerprint.  Simply answer \"yes\"."
@@ -387,13 +388,13 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../openflow-switch.templates:15002
+#: ../openflow-switch-config.templates:15002
 msgid "Send certificate request to switch CA?"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../openflow-switch.templates:15002
+#: ../openflow-switch-config.templates:15002
 msgid ""
 "Before it can connect to the controller over SSL, the OpenFlow switch's key "
 "must be signed by the switch certificate authority (CA) located on the "
@@ -403,7 +404,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../openflow-switch.templates:15002
+#: ../openflow-switch-config.templates:15002
 msgid ""
 "Answer \"yes\" to send a signing request to the switch CA now.  This is "
 "ordinarily the correct choice.  There is no harm in sending a given signing "
@@ -412,7 +413,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../openflow-switch.templates:15002
+#: ../openflow-switch-config.templates:15002
 msgid ""
 "Answer \"no\" to skip sending a signing request to the switch CA. Unless the "
 "request has already been sent to the switch CA, manual sending of the "
@@ -421,19 +422,19 @@ msgstr ""
 
 #. Type: error
 #. Description
-#: ../openflow-switch.templates:16001
+#: ../openflow-switch-config.templates:16001
 msgid "The certificate request could not be sent."
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../openflow-switch.templates:16001
+#: ../openflow-switch-config.templates:16001
 msgid "Posting to ${url} failed, with the following status: \"${error}\"."
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../openflow-switch.templates:16001
+#: ../openflow-switch-config.templates:16001
 msgid ""
 "Ensure that the OpenFlow PKI server is correctly configured and available at "
 "${pki-uri}."
@@ -441,13 +442,13 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../openflow-switch.templates:17002
+#: ../openflow-switch-config.templates:17002
 msgid "Fetch signed switch certificate from PKI server?"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../openflow-switch.templates:17002
+#: ../openflow-switch-config.templates:17002
 msgid ""
 "Before it can connect to the controller over SSL, the OpenFlow switch's key "
 "must be signed by the switch certificate authority (CA) located on the "
@@ -457,7 +458,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../openflow-switch.templates:17002
+#: ../openflow-switch-config.templates:17002
 msgid ""
 "At this point, a signing request has been sent to the switch CA (or sending "
 "a request has been manually skipped), but the signed certificate has not yet "
@@ -467,7 +468,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../openflow-switch.templates:17002
+#: ../openflow-switch-config.templates:17002
 msgid ""
 "Answer \"yes\" to attempt to retrieve the signed switch certificate from the "
 "switch CA.  If the switch certificate request has been signed at the PKI "
@@ -476,7 +477,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../openflow-switch.templates:17002
+#: ../openflow-switch-config.templates:17002
 msgid ""
 "Answer \"no\" to postpone switch configuration.  The configuration process "
 "must be restarted later, when the switch certificate request has been signed."
@@ -484,13 +485,13 @@ msgstr ""
 
 #. Type: error
 #. Description
-#: ../openflow-switch.templates:18001
+#: ../openflow-switch-config.templates:18001
 msgid "Signed switch certificate could not be retrieved."
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../openflow-switch.templates:18001
+#: ../openflow-switch-config.templates:18001
 msgid ""
 "The signed switch certificate could not be retrieved from the switch CA: "
 "retrieval of ${url} failed, with the following status: \"${error}\"."
@@ -498,7 +499,7 @@ msgstr ""
 
 #. Type: error
 #. Description
-#: ../openflow-switch.templates:18001
+#: ../openflow-switch-config.templates:18001
 msgid ""
 "This probably indicates that the switch's certificate request has not yet "
 "been signed.  If this is the problem, it may be fixed by signing the "
@@ -508,13 +509,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../openflow-switch.templates:19001
+#: ../openflow-switch-config.templates:19001
 msgid "OpenFlow Switch Setup Finished"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../openflow-switch.templates:19001
+#: ../openflow-switch-config.templates:19001
 msgid ""
 "Setup of this OpenFlow switch is finished.  Complete the setup procedure to "
 "enable the switch."

diff --git a/debian/rules b/debian/rules
index a03ff50..e720210 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -110,7 +110,7 @@ install-arch: build-arch
        dh_clean -k -s 
        dh_installdirs -s
        $(MAKE) -C _debian DESTDIR=$(CURDIR)/debian/openflow install
-       cp debian/openflow-switch.overrides debian/openflow-switch/usr/share/lintian/overrides/openflow-switch
+       cp debian/openflow-switch-config.overrides debian/openflow-switch-config/usr/share/lintian/overrides/openflow-switch-config
        dh_install -s
 
 # Must not depend on anything. This is to be called by