Maj wicd#1.7.0-1

3 files changed, 64 insertions, 44 deletions

diff --git a/extra/wicd/.footprint b/extra/wicd/.footprint
index 2f1135727..aeebc638a 100644
--- a/extra/wicd/.footprint
+++ b/extra/wicd/.footprint
@@ -18,6 +18,7 @@ lrwxrwxrwx	root/root	etc/rc.d/rc5.d/S20wicd -> ../init.d/wicd
 drwxr-xr-x	root/root	etc/rc.d/rc6.d/
 lrwxrwxrwx	root/root	etc/rc.d/rc6.d/K80wicd -> ../init.d/wicd
 drwxr-xr-x	root/root	etc/wicd/
+-rw-r--r--	root/root	etc/wicd/dhclient.conf.template.default
 drwxr-xr-x	root/root	etc/wicd/encryption/
 drwxr-xr-x	root/root	etc/wicd/encryption/templates/
 -rw-r--r--	root/root	etc/wicd/encryption/templates/active
@@ -33,24 +34,31 @@ drwxr-xr-x	root/root	etc/wicd/encryption/templates/
 -rw-r--r--	root/root	etc/wicd/encryption/templates/wpa
 -rw-r--r--	root/root	etc/wicd/encryption/templates/wpa-psk
 drwxr-xr-x	root/root	etc/wicd/scripts/
+-rw-r--r--	root/root	etc/wicd/scripts/.empty_on_purpose
 drwxr-xr-x	root/root	etc/wicd/scripts/postconnect/
+-rw-r--r--	root/root	etc/wicd/scripts/postconnect/.empty_on_purpose
 drwxr-xr-x	root/root	etc/wicd/scripts/postdisconnect/
+-rw-r--r--	root/root	etc/wicd/scripts/postdisconnect/.empty_on_purpose
 drwxr-xr-x	root/root	etc/wicd/scripts/preconnect/
+-rw-r--r--	root/root	etc/wicd/scripts/preconnect/.empty_on_purpose
 drwxr-xr-x	root/root	etc/wicd/scripts/predisconnect/
+-rw-r--r--	root/root	etc/wicd/scripts/predisconnect/.empty_on_purpose
 drwxr-xr-x	root/root	etc/xdg/
 drwxr-xr-x	root/root	etc/xdg/autostart/
 -rw-r--r--	root/root	etc/xdg/autostart/wicd-tray.desktop
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
+-rwxr-xr-x	root/root	usr/bin/wicd-cli
 -rwxr-xr-x	root/root	usr/bin/wicd-client
 -rwxr-xr-x	root/root	usr/bin/wicd-curses
+-rwxr-xr-x	root/root	usr/bin/wicd-gtk
 drwxr-xr-x	root/root	usr/lib/
 drwxr-xr-x	root/root	usr/lib/pm-utils/
 drwxr-xr-x	root/root	usr/lib/pm-utils/sleep.d/
--rwxr-xr-x	root/root	usr/lib/pm-utils/sleep.d/55wicd
+-rwxr-xr-x	root/root	usr/lib/pm-utils/sleep.d/91wicd
 drwxr-xr-x	root/root	usr/lib/python2.6/
 drwxr-xr-x	root/root	usr/lib/python2.6/site-packages/
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/Wicd-1.6.2.2-py2.6.egg-info
+-rw-r--r--	root/root	usr/lib/python2.6/site-packages/Wicd-1.7.0-py2.6.egg-info
 drwxr-xr-x	root/root	usr/lib/python2.6/site-packages/wicd/
 -rw-r--r--	root/root	usr/lib/python2.6/site-packages/wicd/__init__.py (EMPTY)
 -rw-r--r--	root/root	usr/lib/python2.6/site-packages/wicd/__init__.pyc
@@ -60,20 +68,12 @@ drwxr-xr-x	root/root	usr/lib/python2.6/site-packages/wicd/
 -rw-r--r--	root/root	usr/lib/python2.6/site-packages/wicd/configmanager.pyc
 -rw-r--r--	root/root	usr/lib/python2.6/site-packages/wicd/dbusmanager.py
 -rw-r--r--	root/root	usr/lib/python2.6/site-packages/wicd/dbusmanager.pyc
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/wicd/gui.py
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/wicd/gui.pyc
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/wicd/guiutil.py
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/wicd/guiutil.pyc
 -rw-r--r--	root/root	usr/lib/python2.6/site-packages/wicd/logfile.py
 -rw-r--r--	root/root	usr/lib/python2.6/site-packages/wicd/logfile.pyc
 -rw-r--r--	root/root	usr/lib/python2.6/site-packages/wicd/misc.py
 -rw-r--r--	root/root	usr/lib/python2.6/site-packages/wicd/misc.pyc
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/wicd/netentry.py
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/wicd/netentry.pyc
 -rw-r--r--	root/root	usr/lib/python2.6/site-packages/wicd/networking.py
 -rw-r--r--	root/root	usr/lib/python2.6/site-packages/wicd/networking.pyc
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/wicd/prefs.py
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/wicd/prefs.pyc
 -rw-r--r--	root/root	usr/lib/python2.6/site-packages/wicd/translations.py
 -rw-r--r--	root/root	usr/lib/python2.6/site-packages/wicd/translations.pyc
 -rw-r--r--	root/root	usr/lib/python2.6/site-packages/wicd/wnettools.py
@@ -82,31 +82,13 @@ drwxr-xr-x	root/root	usr/lib/python2.6/site-packages/wicd/
 -rw-r--r--	root/root	usr/lib/python2.6/site-packages/wicd/wpath.pyc
 drwxr-xr-x	root/root	usr/lib/wicd/
 -rwxr-xr-x	root/root	usr/lib/wicd/__init__.py (EMPTY)
--rwxr-xr-x	root/root	usr/lib/wicd/autoconnect.py
 -rwxr-xr-x	root/root	usr/lib/wicd/backend.py
-drwxr-xr-x	root/root	usr/lib/wicd/backends/
--rw-r--r--	root/root	usr/lib/wicd/backends/be-external.py
--rw-r--r--	root/root	usr/lib/wicd/backends/be-ioctl.py
 -rwxr-xr-x	root/root	usr/lib/wicd/configmanager.py
--rwxr-xr-x	root/root	usr/lib/wicd/configscript.py
--rwxr-xr-x	root/root	usr/lib/wicd/configscript_curses.py
--rw-r--r--	root/root	usr/lib/wicd/curses_misc.py
 -rwxr-xr-x	root/root	usr/lib/wicd/dbusmanager.py
--rwxr-xr-x	root/root	usr/lib/wicd/gui.py
--rwxr-xr-x	root/root	usr/lib/wicd/guiutil.py
 -rwxr-xr-x	root/root	usr/lib/wicd/logfile.py
 -rwxr-xr-x	root/root	usr/lib/wicd/misc.py
--rwxr-xr-x	root/root	usr/lib/wicd/monitor.py
--rwxr-xr-x	root/root	usr/lib/wicd/netentry.py
--rw-r--r--	root/root	usr/lib/wicd/netentry_curses.py
 -rwxr-xr-x	root/root	usr/lib/wicd/networking.py
--rwxr-xr-x	root/root	usr/lib/wicd/prefs.py
--rw-r--r--	root/root	usr/lib/wicd/prefs_curses.py
--rwxr-xr-x	root/root	usr/lib/wicd/suspend.py
 -rwxr-xr-x	root/root	usr/lib/wicd/translations.py
--rwxr-xr-x	root/root	usr/lib/wicd/wicd-client.py
--rwxr-xr-x	root/root	usr/lib/wicd/wicd-curses.py
--rwxr-xr-x	root/root	usr/lib/wicd/wicd-daemon.py
 -rwxr-xr-x	root/root	usr/lib/wicd/wnettools.py
 -rwxr-xr-x	root/root	usr/lib/wicd/wpath.py
 drwxr-xr-x	root/root	usr/sbin/
@@ -121,44 +103,46 @@ drwxr-xr-x	root/root	usr/share/doc/wicd/
 -rw-r--r--	root/root	usr/share/doc/wicd/INSTALL
 -rw-r--r--	root/root	usr/share/doc/wicd/LICENSE
 -rw-r--r--	root/root	usr/share/doc/wicd/README
+-rw-r--r--	root/root	usr/share/doc/wicd/README.cli
+-rw-r--r--	root/root	usr/share/doc/wicd/README.curses
 drwxr-xr-x	root/root	usr/share/icons/
 drwxr-xr-x	root/root	usr/share/icons/hicolor/
 drwxr-xr-x	root/root	usr/share/icons/hicolor/128x128/
 drwxr-xr-x	root/root	usr/share/icons/hicolor/128x128/apps/
--rw-r--r--	root/root	usr/share/icons/hicolor/128x128/apps/wicd-client.png
+-rw-r--r--	root/root	usr/share/icons/hicolor/128x128/apps/wicd-gtk.png
 drwxr-xr-x	root/root	usr/share/icons/hicolor/16x16/
 drwxr-xr-x	root/root	usr/share/icons/hicolor/16x16/apps/
--rw-r--r--	root/root	usr/share/icons/hicolor/16x16/apps/wicd-client.png
+-rw-r--r--	root/root	usr/share/icons/hicolor/16x16/apps/wicd-gtk.png
 drwxr-xr-x	root/root	usr/share/icons/hicolor/192x192/
 drwxr-xr-x	root/root	usr/share/icons/hicolor/192x192/apps/
--rw-r--r--	root/root	usr/share/icons/hicolor/192x192/apps/wicd-client.png
+-rw-r--r--	root/root	usr/share/icons/hicolor/192x192/apps/wicd-gtk.png
 drwxr-xr-x	root/root	usr/share/icons/hicolor/22x22/
 drwxr-xr-x	root/root	usr/share/icons/hicolor/22x22/apps/
--rw-r--r--	root/root	usr/share/icons/hicolor/22x22/apps/wicd-client.png
+-rw-r--r--	root/root	usr/share/icons/hicolor/22x22/apps/wicd-gtk.png
 drwxr-xr-x	root/root	usr/share/icons/hicolor/24x24/
 drwxr-xr-x	root/root	usr/share/icons/hicolor/24x24/apps/
--rw-r--r--	root/root	usr/share/icons/hicolor/24x24/apps/wicd-client.png
+-rw-r--r--	root/root	usr/share/icons/hicolor/24x24/apps/wicd-gtk.png
 drwxr-xr-x	root/root	usr/share/icons/hicolor/32x32/
 drwxr-xr-x	root/root	usr/share/icons/hicolor/32x32/apps/
--rw-r--r--	root/root	usr/share/icons/hicolor/32x32/apps/wicd-client.png
+-rw-r--r--	root/root	usr/share/icons/hicolor/32x32/apps/wicd-gtk.png
 drwxr-xr-x	root/root	usr/share/icons/hicolor/36x36/
 drwxr-xr-x	root/root	usr/share/icons/hicolor/36x36/apps/
--rw-r--r--	root/root	usr/share/icons/hicolor/36x36/apps/wicd-client.png
+-rw-r--r--	root/root	usr/share/icons/hicolor/36x36/apps/wicd-gtk.png
 drwxr-xr-x	root/root	usr/share/icons/hicolor/48x48/
 drwxr-xr-x	root/root	usr/share/icons/hicolor/48x48/apps/
--rw-r--r--	root/root	usr/share/icons/hicolor/48x48/apps/wicd-client.png
+-rw-r--r--	root/root	usr/share/icons/hicolor/48x48/apps/wicd-gtk.png
 drwxr-xr-x	root/root	usr/share/icons/hicolor/64x64/
 drwxr-xr-x	root/root	usr/share/icons/hicolor/64x64/apps/
--rw-r--r--	root/root	usr/share/icons/hicolor/64x64/apps/wicd-client.png
+-rw-r--r--	root/root	usr/share/icons/hicolor/64x64/apps/wicd-gtk.png
 drwxr-xr-x	root/root	usr/share/icons/hicolor/72x72/
 drwxr-xr-x	root/root	usr/share/icons/hicolor/72x72/apps/
--rw-r--r--	root/root	usr/share/icons/hicolor/72x72/apps/wicd-client.png
+-rw-r--r--	root/root	usr/share/icons/hicolor/72x72/apps/wicd-gtk.png
 drwxr-xr-x	root/root	usr/share/icons/hicolor/96x96/
 drwxr-xr-x	root/root	usr/share/icons/hicolor/96x96/apps/
--rw-r--r--	root/root	usr/share/icons/hicolor/96x96/apps/wicd-client.png
+-rw-r--r--	root/root	usr/share/icons/hicolor/96x96/apps/wicd-gtk.png
 drwxr-xr-x	root/root	usr/share/icons/hicolor/scalable/
 drwxr-xr-x	root/root	usr/share/icons/hicolor/scalable/apps/
--rw-r--r--	root/root	usr/share/icons/hicolor/scalable/apps/wicd-client.svg
+-rw-r--r--	root/root	usr/share/icons/hicolor/scalable/apps/wicd-gtk.svg
 drwxr-xr-x	root/root	usr/share/locale/
 drwxr-xr-x	root/root	usr/share/locale/fr/
 drwxr-xr-x	root/root	usr/share/locale/fr/LC_MESSAGES/
@@ -171,9 +155,21 @@ drwxr-xr-x	root/root	usr/share/man/man5/
 -rw-r--r--	root/root	usr/share/man/man5/wicd-wired-settings.conf.5.gz
 -rw-r--r--	root/root	usr/share/man/man5/wicd-wireless-settings.conf.5.gz
 drwxr-xr-x	root/root	usr/share/man/man8/
+-rw-r--r--	root/root	usr/share/man/man8/wicd-cli.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/wicd-curses.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/wicd.8.gz
+drwxr-xr-x	root/root	usr/share/man/nl/
+drwxr-xr-x	root/root	usr/share/man/nl/man1/
+-rw-r--r--	root/root	usr/share/man/nl/man1/wicd-client.1.gz
+drwxr-xr-x	root/root	usr/share/man/nl/man5/
+-rw-r--r--	root/root	usr/share/man/nl/man5/wicd-manager-settings.conf.5.gz
+-rw-r--r--	root/root	usr/share/man/nl/man5/wicd-wired-settings.conf.5.gz
+-rw-r--r--	root/root	usr/share/man/nl/man5/wicd-wireless-settings.conf.5.gz
+drwxr-xr-x	root/root	usr/share/man/nl/man8/
+-rw-r--r--	root/root	usr/share/man/nl/man8/wicd-curses.8.gz
+-rw-r--r--	root/root	usr/share/man/nl/man8/wicd.8.gz
 drwxr-xr-x	root/root	usr/share/pixmaps/
+-rw-r--r--	root/root	usr/share/pixmaps/wicd-gtk.xpm
 drwxr-xr-x	root/root	usr/share/pixmaps/wicd/
 -rw-r--r--	root/root	usr/share/pixmaps/wicd/bad-signal-lock.png
 -rw-r--r--	root/root	usr/share/pixmaps/wicd/bad-signal.png
@@ -223,14 +219,39 @@ drwxr-xr-x	root/root	usr/share/pixmaps/wicd/
 -rw-r--r--	root/root	usr/share/pixmaps/wicd/wired-gui.svg
 -rw-r--r--	root/root	usr/share/pixmaps/wicd/wired.png
 drwxr-xr-x	root/root	usr/share/wicd/
+drwxr-xr-x	root/root	usr/share/wicd/backends/
+-rw-r--r--	root/root	usr/share/wicd/backends/be-external.py
+-rw-r--r--	root/root	usr/share/wicd/backends/be-ioctl.py
+drwxr-xr-x	root/root	usr/share/wicd/cli/
+-rw-r--r--	root/root	usr/share/wicd/cli/wicd-cli.py
+drwxr-xr-x	root/root	usr/share/wicd/curses/
+-rwxr-xr-x	root/root	usr/share/wicd/curses/configscript_curses.py
+-rw-r--r--	root/root	usr/share/wicd/curses/curses_misc.py
+-rw-r--r--	root/root	usr/share/wicd/curses/netentry_curses.py
+-rw-r--r--	root/root	usr/share/wicd/curses/prefs_curses.py
+-rwxr-xr-x	root/root	usr/share/wicd/curses/wicd-curses.py
+drwxr-xr-x	root/root	usr/share/wicd/daemon/
+-rwxr-xr-x	root/root	usr/share/wicd/daemon/autoconnect.py
+-rwxr-xr-x	root/root	usr/share/wicd/daemon/monitor.py
+-rwxr-xr-x	root/root	usr/share/wicd/daemon/suspend.py
+-rw-r--r--	root/root	usr/share/wicd/daemon/wicd-daemon.py
+drwxr-xr-x	root/root	usr/share/wicd/gtk/
+-rwxr-xr-x	root/root	usr/share/wicd/gtk/configscript.py
+-rw-r--r--	root/root	usr/share/wicd/gtk/gui.py
+-rw-r--r--	root/root	usr/share/wicd/gtk/guiutil.py
+-rw-r--r--	root/root	usr/share/wicd/gtk/netentry.py
+-rw-r--r--	root/root	usr/share/wicd/gtk/prefs.py
+-rw-r--r--	root/root	usr/share/wicd/gtk/wicd-client.py
+-rw-r--r--	root/root	usr/share/wicd/gtk/wicd.glade
 drwxr-xr-x	root/root	usr/share/wicd/scripts/
 -rwxr-xr-x	root/root	usr/share/wicd/scripts/50-wicd-suspend.sh
 -rwxr-xr-x	root/root	usr/share/wicd/scripts/80-wicd-connect.sh
--rw-r--r--	root/root	usr/share/wicd/wicd.glade
 drwxr-xr-x	root/root	var/
 drwxr-xr-x	root/root	var/lib/
 drwxr-xr-x	root/root	var/lib/wicd/
 -rw-r--r--	root/root	var/lib/wicd/WHEREAREMYFILES
 drwxr-xr-x	root/root	var/lib/wicd/configurations/
+-rw-r--r--	root/root	var/lib/wicd/configurations/.empty_on_purpose
 drwxr-xr-x	root/root	var/log/
 drwxr-xr-x	root/root	var/log/wicd/
+-rw-r--r--	root/root	var/log/wicd/.empty_on_purpose
diff --git a/extra/wicd/.md5sum b/extra/wicd/.md5sum
index bf2b67794..4df58aa29 100644
--- a/extra/wicd/.md5sum
+++ b/extra/wicd/.md5sum
@@ -1,5 +1,5 @@
 498472a13498e568216edea673b6c084  wicd
-acbbe695abf7ff83161c62317dfc7509  wicd-1.6.2.2.tar.gz
+003d2e67240989db55934553437ba32a  wicd-1.7.0.tar.gz
 b8edd56cf084347b0ae6dc0e02d1b747  wicd-locale.patch
 a37f63a6c82491116d5b69540ae13d25  wicd.desktop
 97736bc03057542e4184fe1bd33cbd20  wicd_in_usr.patch
diff --git a/extra/wicd/Pkgfile b/extra/wicd/Pkgfile
index 3b7850b0c..3d038c681 100644
--- a/extra/wicd/Pkgfile
+++ b/extra/wicd/Pkgfile
@@ -5,7 +5,7 @@
 # Depends on: pygtk, wpa_supplicant, ethtool, dbus-python, wireless_tools
 
 name=wicd
-version=1.6.2.2
+version=1.7.0
 release=1
 source=(http://downloads.sourceforge.net/$name/wicd-$version.tar.gz \
 	wicd wicd_in_usr.patch wicd-locale.patch wicd.desktop )
@@ -23,7 +23,6 @@ build() {
 	for i in *.py; do
 		install -D -m755 $i $PKG/usr/lib/wicd/$i
 	done
-	chmod 755 $PKG/usr/lib/wicd/wicd-daemon.py
 	rm -rf  $PKG/usr/share/autostart
 
 	#Install the daemon service