Merged r233 from mainline

wicd/wicd-client.py

@@ -632,14 +632,14 @@ class TrayIcon(object):
 def usage():
     """ Print usage information. """
     print """
-wicd 1.50
+wicd %s 
 wireless (and wired) connection daemon front-end.
 
 Arguments:
 \t-n\t--no-tray\tRun wicd without the tray icon.
 \t-h\t--help\t\tPrint this help information.
 \t-a\t--no-animate\tRun the tray without network traffic tray animations.
-"""
+""" % wpath.version
 
 def setup_dbus(force=True):
     global bus, daemon, wireless, wired, DBUS_AVAIL

wicd/wicd-daemon.py

@@ -132,8 +132,7 @@ class WicdDaemon(dbus.service.Object):
         anything >= 0. This number is effective starting wicd v1.2.0.
         
         """
-        version = '1.6.0'
-        return version
+        return wpath.version
 
     @dbus.service.method('org.wicd.daemon')
     def SetWiredInterface(self, interface):
@@ -1447,7 +1446,7 @@ class WiredDaemon(dbus.service.Object):
 
 def usage():
     print """
-wicd 1.6.0
+wicd %s 
 wireless (and wired) connection daemon.
 
 Arguments:
@@ -1457,7 +1456,7 @@ Arguments:
 \t-n\t--no-poll\tDon't monitor network status.
 \t-o\t--no-stdout\tDon't redirect stdout.
 \t-h\t--help\t\tPrint this help.
-"""
+""" % (wpath.version + ' (bzr-r%s)' % wpath.revision)
 
 def daemonize():
     """ Disconnect from the controlling terminal.

wicd/wpath.py

@@ -1,72 +0,0 @@
-""" Path configuration and functions for the wicd daemon and gui clients.
-
-chdir() -- Change directory to the location of the current file.
-
-"""
-
-import os
-
-# The path containing the wpath.py file.
-current = os.path.dirname(os.path.realpath(__file__)) + '/'
-
-# These paths can easily be modified to handle system wide installs, or
-# they can be left as is if all files remain with the source directory
-# layout.
-
-# These paths are replaced when setup.py configure is run
-
-# All directory paths *MUST* end in a /
-
-# DIRECTORIES
-
-lib = '/usr/lib/wicd/'
-share = '/usr/share/wicd/'
-etc = '/etc/wicd/'
-images = '/usr/share/pixmaps/wicd/'
-encryption = '/etc/wicd/encryption/templates/'
-bin = '/usr/bin/'
-networks = '/var/lib/wicd/configurations/'
-log = '/var/log/wicd/'
-resume = '/etc/acpi/resume.d/'
-suspend = '/etc/acpi/suspend.d/'
-sbin = '/usr/sbin/'
-pmutils = '/usr/lib/pm-utils/sleep.d/'
-dbus = '/etc/dbus-1/system.d/'
-desktop = '/usr/share/applications/'
-backends= '/usr/lib/wicd/backends/'
-translations = '/usr/share/locale/'
-icons = '/usr/share/icons/hicolor/'
-autostart = '/etc/xdg/autostart/'
-init = '/etc/init.d/'
-docdir = '/usr/share/doc/wicd/'
-mandir = '/usr/share/man/'
-kdedir = '/usr/share/autostart/'
-
-# FILES
-
-# python begins the file section
-python = '/usr/bin/python'
-pidfile = '/var/run/wicd/wicd.pid'
-# stores something like other/wicd
-# really only used in the install
-initfile = 'init/debian/wicd'
-# stores only the file name, i.e. wicd
-initfilename = 'wicd'
-
-# BOOLEANS
-no_install_pmutils = False
-no_install_init = False
-no_install_man = False
-no_install_kde = False
-no_install_acpi = False
-no_install_docs = False
-
-def chdir(file):
-    """Change directory to the location of the specified file.
-
-    Keyword arguments:
-    file -- the file to switch to (usually __file__)
-
-    """
-    os.chdir(os.path.dirname(os.path.realpath(file)))
-