--- wicd-1.6.2.2.orig/debian/postrm +++ wicd-1.6.2.2/debian/postrm @@ -0,0 +1,59 @@ +#!/bin/sh +# postrm script for wicd + +set -e + +# early load debconf +. /usr/share/debconf/confmodule + +# summary of how this script can be called: +# * `remove' +# * `purge' +# * `upgrade' +# * `failed-upgrade' +# * `abort-install' +# * `abort-install' +# * `abort-upgrade' +# * `disappear' +# +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + + +case "$1" in + remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + ;; + + purge) + rm -rf /etc/wicd + rm -rf /var/lib/wicd + rm -rf /var/log/wicd + rm -rf /var/run/wicd + if [ -x "/etc/init.d/dbus" ]; then + # Check if DBus has started, otherwise this fails on + # certain environments (chroots, for example). See + # #514778 . + if [ -n "$DBUS_SESSION_BUS_ADDRESS" ]; then + if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then + invoke-rc.d dbus force-reload || exit $? + else + /etc/init.d/dbus force-reload || exit $? + fi + fi + fi + ;; + + *) + echo "postrm called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 + + --- wicd-1.6.2.2.orig/debian/default +++ wicd-1.6.2.2/debian/default @@ -0,0 +1,3 @@ +# Don't start the daemon by default, let the user set it. +# Use "yes" (without quotes) to make /etc/init.d/wicd start the WICD daemon. +START_DAEMON=yes --- wicd-1.6.2.2.orig/debian/compat +++ wicd-1.6.2.2/debian/compat @@ -0,0 +1 @@ +7 --- wicd-1.6.2.2.orig/debian/README.Debian +++ wicd-1.6.2.2/debian/README.Debian @@ -0,0 +1,65 @@ +wicd for Debian +--------------- + +1. Installation problems +------------------------ + +If Wicd fails to connect after you install it, make sure that the only +entry in your /etc/network/interfaces file is + + auto lo + iface lo inet loopback + +You can change the contents of this file by using various editors, but +remember: you have to be root! + +From version 1.5.9-1 onwards, the wicd-client GUI will be available +only to users of the `netdev' group, so as to avoid users not +enabled by root to change network configuration. +This means that, if you do *not* belong to that group, wicd-client +will refuse to start with a permission denied error by DBus, as soon +as installation succeeds. + +To add yourself to the netdev group, ask your administrator to do, or +do as root yourself: + + # usermod --append --groups netdev + +or: + + # adduser netdev + +(obviously replace "" with the user you want to grant +access to wicd-client to). This could also be done with graphical +user management programs. + +After you did this, you have to reload DBus by: + + # /etc/init.d/dbus reload + + +2. Boot-time problems +--------------------- + +If you happen to have boot-time problems, specifically the need to +restart DBus at each boot, please make sure that DBus is started +*before* wicd during boot. That should be ensured by the LSB headers +in the init script, but not everyone has a dependency-based boot +order. +If your boot-time problems are of some other nature, please reportbug(1) +them. + + +3. Delays when verifying AP association +--------------------------------------- + +WICD uses ping(8) to verify it correctly associated to the AP. Until 1.6.1-3, +it only spent at most 3 seconds to check this. This was done by passing "-w 3" +to ping(8), but this parameter is not supported by inetutils-ping. So be +warned that if you use inetutils-ping, there's no way to specify a maximum +wait time: if your AP association failed, you must wait for the ping to +timeout (roughly, ~10 seconds). A solution is using iputils-ping or, if you +can't, bug inetutils-ping maintainers to add that feature. + + + -- David Paleino Mon, 07 Sep 2009 12:10:32 +0200 --- wicd-1.6.2.2.orig/debian/control +++ wicd-1.6.2.2/debian/control @@ -0,0 +1,45 @@ +Source: wicd +Section: net +Priority: optional +Maintainer: David Paleino +DM-Upload-Allowed: yes +Build-Depends: debhelper (>= 7), python, quilt +Build-Depends-Indep: python-support, po-debconf +Standards-Version: 3.8.3 +Homepage: http://wicd.sourceforge.net/ +Vcs-Browser: http://git.debian.org/?p=collab-maint/wicd.git +Vcs-Git: git://git.debian.org/collab-maint/wicd.git + +Package: wicd +Architecture: all +Depends: ${misc:Depends}, ${python:Depends}, + python-gtk2, + python-urwid, + python-dbus, + dbus, + wpasupplicant, + python-glade2, + wireless-tools, + dhcpcd | dhcp3-client | pump | udhcpc, + net-tools | ethtool, + net-tools | iproute, + adduser, + lsb-base (>= 3.2-13), + psmisc, + iputils-ping | inetutils-ping +Recommends: gksu | kdesu | ktsuss | sudo, + python-notify +Suggests: pm-utils +Description: wired and wireless network manager + Wicd is a general-purpose network configuration server which aims + to provide a simple but flexible interface for connecting to networks. + Its features include: + wide variety of settings. + * ability to connect to (and maintain profiles for) both wired and + wireless networks; + * support for many encryption schemes, including WEP, WPA, WPA2 and + custom schemes; + * wireless-tools compatibility; + * tray icon showing network activity and signal strength; + * lack of GNOME dependencies (although it does require GTK+), making it + easy to use in Xfce, Fluxbox, Openbox, Enlightenment, etc. --- wicd-1.6.2.2.orig/debian/copyright +++ wicd-1.6.2.2/debian/copyright @@ -0,0 +1,68 @@ +Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat +Upstream-Name: Wicd +Upstream-Maintainer: Adam Blackburn + Dan O'Reilly +Upstream-Source: https://sourceforge.net/project/showfiles.php?group_id=194573 +Packaged-By: David Paleino +Packaged-Date: Thu, 11 Sep 2008 19:35:30 +0200 + +Files: debian/* +Copyright: © 2008, David Paleino +License: GPL-2+ + +Files: in/init=gentoo=wicd.in + init/gentoo/wicd +Copyright: © 1996-2006, Gentoo Foundation +License: GPL-2 + +Files: in/man=wicd.8.in + in/man=wicd-manager-settings.conf.5.in + in/man=wicd-wired-settings.conf.5.in + in/man=wicd-wireless-settings.conf.5.in +Copyright: © 2008, Robby Workman +License: GPL-2+ + +Files: wicd/networking.py + wicd/wicd-daemon.py + wicd/wnettools.py +Copyright: © 2007-2008, Adam Blackburn +Copyright: © 2007-2008, Dan O'Reilly +Copyright: © 2007-2008, Byron Hillis +License: GPL-2+ + +Files: uninstall.sh +Copyright: © 2008, Robby Workman +Copyright: © 2008, Alan Hicks +License: BSD-1 + +Files: * +Copyright: © 2007-2008, Adam Blackburn +Copyright: © 2007-2008, Dan O'Reilly +License: GPL-2+ + +License: GPL-2+ +License: GPL-2 + On Debian systems the full text of the GNU General Public License can + be found in the `/usr/share/common-licenses/GPL-2' file. + +License: BSD-1 + # Copyright 2008 Robby Workman , Northport, AL, USA + # Copyright 2008 Alan Hicks , Lizella, GA, USA + # All rights reserved. + # + # Redistribution and use of this script, with or without modification, is + # permitted provided that the following conditions are met: + # + # 1. Redistributions of this script must retain the above copyright + # notice, this list of conditions and the following disclaimer. + # + # THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED + # WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + # MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO + # EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + # SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + # PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; + # OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + # WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR + # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. --- wicd-1.6.2.2.orig/debian/NEWS.Debian +++ wicd-1.6.2.2/debian/NEWS.Debian @@ -0,0 +1,24 @@ +wicd (1.5.9-1) unstable; urgency=low + + From this version onwards, the wicd-client GUI will be available + only to users of the `netdev' group, so as to avoid users not + enabled by root to change network configuration. + This means that, if you do *not* belong to that group, wicd-client + will refuse to start with a permission denied error by DBus, as soon + as installation of 1.5.9-1 succeeds. + + To add yourself to the netdev group, ask your administrator to + do, or do as root yourself: + + # usermod --append --groups netdev + + (obviously replace "" with the user you want to grant + access to wicd-client to). This could also be done with graphical + user management programs. + + Also, be sure to reload the D-Bus daemon with: + + # /etc/init.d/dbus reload + + -- David Paleino Sun, 08 Feb 2009 13:43:54 +0100 + --- wicd-1.6.2.2.orig/debian/README.source +++ wicd-1.6.2.2/debian/README.source @@ -0,0 +1,12 @@ +wicd for Debian +--------------- + +This package uses quilt to manage all modifications to the upstream +source. Changes are stored in the source package as diffs in +debian/patches and applied during the build. + +Please read how to use quilt in the provided documentation: + + /usr/share/doc/quilt/README.source + + -- David Paleino Wed, 24 Dec 2008 10:40:45 +0100 --- wicd-1.6.2.2.orig/debian/wicd-client.xpm +++ wicd-1.6.2.2/debian/wicd-client.xpm @@ -0,0 +1,156 @@ +/* XPM */ +static char *wicd_client[] = { +/* columns rows colors chars-per-pixel */ +"32 32 118 2", +" c black", +". c #000100", +"X c #000200", +"o c #000300", +"O c #000301", +"+ c #000401", +"@ c #000501", +"# c #000601", +"$ c #000801", +"% c #000901", +"& c #000902", +"* c #000B02", +"= c #000F02", +"- c #001303", +"; c #001403", +": c #001804", +"> c #001B04", +", c #001E05", +"< c #001F05", +"1 c #002105", +"2 c #002205", +"3 c #002406", +"4 c #002706", +"5 c #002907", +"6 c #002D07", +"7 c #003008", +"8 c #003108", +"9 c #003408", +"0 c #003509", +"q c #003709", +"w c #003809", +"e c #003909", +"r c #003A09", +"t c #003C0A", +"y c #003F0A", +"u c #00400A", +"i c #00420B", +"p c #00440B", +"a c #00450B", +"s c #00460B", +"d c #004A0C", +"f c #004C0C", +"g c #004E0D", +"h c #004F0D", +"j c #00520D", +"k c #00530D", +"l c #00570E", +"z c #00590E", +"x c #005D0F", +"c c #006110", +"v c #006410", +"b c #006510", +"n c #006811", +"m c #006A11", +"M c #006D11", +"N c #006E12", +"B c #007012", +"V c #007312", +"C c #007613", +"Z c #007913", +"A c #008115", +"S c #008215", +"D c #008315", +"F c #008616", +"G c #008716", +"H c #008A16", +"J c #008B16", +"K c #008C16", +"L c #008E17", +"P c #008F17", +"I c #009017", +"U c #009117", +"Y c #009518", +"T c #009D19", +"R c #00A01A", +"E c #00A61B", +"W c #00A71B", +"Q c #00A81B", +"! c #00A91B", +"~ c #00AF1C", +"^ c #00B01C", +"/ c #00B11D", +"( c #00B21D", +") c #00B31D", +"_ c #00B91E", +"` c #00BA1E", +"' c #00BB1E", +"] c #00BC1E", +"[ c #00BF1F", +"{ c #00C11F", +"} c #00C820", +"| c #00CA20", +" . c #00CE21", +".. c #00D222", +"X. c #00D322", +"o. c #00D422", +"O. c #00D723", +"+. c #00DB23", +"@. c #00DC23", +"#. c #00DD24", +"$. c #00E024", +"%. c #00E124", +"&. c #00E725", +"*. c #00ED26", +"=. c #00EF26", +"-. c #00EF27", +";. c #00F127", +":. c #00F227", +">. c #00F427", +",. c #00F527", +"<. c #00F828", +"1. c #00F928", +"2. c #00FB28", +"3. c #00FC29", +"4. c #00FD29", +"5. c #00FE29", +"6. c #00FF29", +"7. c None", +/* pixels */ +"7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.", +"7.7.7.7.7.7. ; 7.7.7.7.7.7.7.7.7.7.7.7.7.7. - 7.7.7.7.7.7.", +"7.7.7.7.7.5 Q < 7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.> Q 6 7.7.7.7.7.", +"7.7.7.7.a :.h 7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.s >.f 7.7.7.7.", +"7.7.7.0 ,.' 7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7. ( <.t 7.7.7.", +"7.7.* +.6.i 7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.e 6.%.= 7.7.", +"7.7.Z 6.#.. 7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7. o.6.S 7.7.", +"7.@ &.6.P 7.7.7.7.7.v l 7.7.7.7.7.7.7.7.j m 7.7.7.7.7.F 6.*.% 7.", +"7.a 6.6.k 7.7.7.7.j { 7.7.7.7.7.7.7.7.7.7.` z 7.7.7.7.d 6.6.g 7.", +"7.G 6.6.4 7.7.7.7.| C 7.7.7.7.7.7.7.7.7.7.B ..7.7.7.7., 6.6.I 7.", +" ) 6.6.& 7.7.7.y 6.u 7.7.7. 7.7.7.9 6.d 7.7.7.o 3.6.] ", +" | 6.1. 7.7.7.M 6.7.7.7. 7.7.7.2.V 7.7.7. -.6.X. ", +" .6.<. 7.7.7.V 6.7.7.7. 7.7.7.<.Z 7.7.7. =.6.O. ", +" [ 6.6.$ 7.7.7.x 6.7 7.7.7. 7.7.7.1 6.b 7.7.7.X 2.6.} ", +"7.T 6.6.3 7.7.7.7.;.n 7.7.7. 7.7.7.c ,.7.7.7.7.> 6.6.E ", +"7.b 6.6.h 7.7.7.7.L W 7.7.7. 7.7.7.R Y 7.7.7.7.s 6.6.N 7.", +"7.> 3.6.J 7.7.7.7.7.' s 7.7. 7.7.y [ 7.7.7.7.7.A 6.5.2 7.", +"7. ~ 6.O. 7.7.7.7.7.z O 7. 7.X l 7.7.7.7.7. .6._ 7.", +"7.7.7 2.6.r 7.7.7.7.7.7.7.7. 7.7.7.7.7.7.7.7.8 6.4.q 7.7.", +"7.7. D 6./ 7.7.7.7.7.7.7. 7.7.7.7.7.7.7. Q 6.K 7.7.", +"7.7.7.O ! 6.p 7.7.7.7.7.7.7. 7.7.7.7.7.7.7.t 5.^ @ 7.7.7.", +"7.7.7.7.+ H $.: 7.7.7.7.7.7. 7.7.7.7.7.7.; @.U # 7.7.7.7.", +"7.7.7.7.7.7.9 V $ 7.7.7.7.7. 7.7.7.7.7.# B w 7.7.7.7.7.", +"7.7.7.7.7.7.7.7. 7.7.7.7. 7.7.7.7. 7.7.7.7.7.7.7.7.", +"7.7.7.7.7.7.7.7.7.7.7.7.7.7. 7.7.7.7.7.7.7.7.7.7.7.7.7.7.", +"7.7.7.7.7.7.7.7.7.7.7.7.7.7. 7.7.7.7.7.7.7.7.7.7.7.7.7.7.", +"7.7.7.7.7.7.7.7.7.7.7.7.7.7. 7.7.7.7.7.7.7.7.7.7.7.7.7.7.", +"7.7.7.7.7.7.7.7.7.7.7.7.7.7. 7.7.7.7.7.7.7.7.7.7.7.7.7.7.", +"7.7.7.7.7.7.7.7.7.7. 7.7.7.7.7.7.7.7.7.7.", +"7.7.7.7.7.7.7.7.7.7. 7.7.7.7.7.7.7.7.7.7.", +"7.7.7.7.7.7.7.7.7.7. 7.7.7.7.7.7.7.7.7.7.", +"7.7.7.7.7.7.7.7.7.7. 7.7.7.7.7.7.7.7.7.7." +}; --- wicd-1.6.2.2.orig/debian/rules +++ wicd-1.6.2.2/debian/rules @@ -0,0 +1,58 @@ +#!/usr/bin/make -f +# -*- makefile -*- + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +include /usr/share/quilt/quilt.make + +build: build-stamp +build-stamp: $(QUILT_STAMPFN) + dh build --before dh_auto_configure + python setup.py configure \ + --no-install-acpi \ + --no-install-docs \ + --lib=/usr/share/wicd \ + --share=/usr/share/wicd \ + --wicdgroup=netdev \ + --loggroup=adm \ + --logperms=0640 + python setup.py build + dh build --after dh_auto_build + touch $@ + +clean: unpatch + dh clean --before dh_auto_clean + python setup.py clean + dh clean --after dh_auto_clean + + @find . \( -name "*.pyc" -o -name "*.pyo" \) -delete + #@find init/ \( -name "wicd" -o -name "rc.wicd" \) -delete + -rm -rf build/ + + dh_clean wpath.py install.log os wicd/wpath.py \ + man/*.8 man/*.5 scripts/* other/*.sh \ + other/postinst other/55wicd debian/wicd-po/*.mo + +install: build + dh install --before dh_auto_install + python setup.py install --root=$(CURDIR)/debian/wicd --install-lib=/usr/share/wicd + install -m644 debian/wicd-client.xpm \ + $(CURDIR)/debian/wicd/usr/share/pixmaps/wicd.xpm + + find $(CURDIR)/debian/wicd -name "*.png" -exec chmod 644 {} \; + find $(CURDIR)/debian/wicd/etc/wicd/ -type f -exec chmod 644 {} \; + find $(CURDIR)/debian/wicd \( -name "*.glade" -o -name "*.conf" -o -name "*.desktop" \) -exec chmod 644 {} \; + -rm -rf $(CURDIR)/debian/wicd/var/run + + dh install --after dh_auto_install --before dh_installinit + dh_pysupport -i + dh_installinit -i + dh install --after dh_installinit + +binary-arch: +binary-indep: build install + dh binary-indep + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install --- wicd-1.6.2.2.orig/debian/watch +++ wicd-1.6.2.2/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://sf.net/wicd/wicd-([^a-zA-Z]*)\.tar\.gz --- wicd-1.6.2.2.orig/debian/init +++ wicd-1.6.2.2/debian/init @@ -0,0 +1,173 @@ +#! /bin/sh +### BEGIN INIT INFO +# Provides: wicd +# Required-Start: dbus +# Required-Stop: +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: Starts and stops Wicd +# Description: Starts and stops Wicd, a network manager +### END INIT INFO + +# Author: Adam Blackburn +# + +# Do NOT "set -e" + +# PATH should only include /usr/* if it runs after the mountnfs.sh script +PATH=/usr/sbin:/usr/bin:/sbin:/bin +DESC="Network connection manager" +NAME=wicd +RUNDIR=/var/run/$NAME +DAEMON=/usr/sbin/$NAME +DAEMON_ARGS="" +PIDFILE=$RUNDIR/wicd.pid +SCRIPTNAME=/etc/init.d/wicd + +# Exit if the package is not installed +[ -x "$DAEMON" ] || exit 0 + +# Create RUNDIR if it doesn't exist +[ -d "$RUNDIR" ] || mkdir -p "$RUNDIR" + +# Read configuration variable file if it is present +[ -r /etc/default/$NAME ] && . /etc/default/$NAME + +# Load the VERBOSE setting and other rcS variables +[ -f /etc/default/rcS ] && . /etc/default/rcS + +# Define LSB log_* functions. +# Depend on lsb-base (>= 3.0-6) to ensure that this file is present. +. /lib/lsb/init-functions + +# Perhaps not the best idea +# but a confirmation is nice +# when starting/stopping the daemon +VERBOSE=yes + +# +# Function that starts the daemon/service +# +do_start() +{ + # Return + # 0 if daemon has been started + # 1 if daemon was already running + # 2 if daemon could not be started + # vvvv -- don't do this -- vvvv + # [ -e $PIDFILE ] && return 1 + start-stop-daemon --start --quiet --pidfile $PIDFILE --startas $DAEMON --test > /dev/null \ + || return 1 + start-stop-daemon --start --quiet --pidfile $PIDFILE --startas $DAEMON -- \ + $DAEMON_ARGS > /dev/null 2> /dev/null\ + || return 2 + # Add code here, if necessary, that waits for the process to be ready + # to handle requests from services started subsequently which depend + # on this one. As a last resort, sleep for some time. +} + +# +# Function that stops the daemon/service +# +do_stop() +{ + # Return + # 0 if daemon has been stopped + # 1 if daemon was already stopped + # 2 if daemon could not be stopped + # other if a failure occurred + start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME + RETVAL="$?" + [ "$RETVAL" = 2 ] && return 2 + # Wait for children to finish too if this is a daemon that forks + # and if the daemon is only ever run from this initscript. + # If the above conditions are not satisfied then add some other code + # that waits for the process to drop all resources that could be + # needed by services started subsequently. A last resort is to + # sleep for some time. + start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec $DAEMON + [ "$?" = 2 ] && return 2 + # Many daemons don't delete their pidfiles when they exit. + rm -f $PIDFILE + return "$RETVAL" +} + +# +# Function that sends a SIGHUP to the daemon/service +# +do_reload() { + # + # If the daemon can reload its configuration without + # restarting (for example, when it is sent a SIGHUP), + # then implement that here. + # + start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --name $NAME + return 0 +} + +case "$1" in + start) + if [ "$START_DAEMON" != no ]; then + [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME" + do_start + case "$?" in + 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; + 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; + esac + else + log_warning_msg "Not starting wicd daemon. Please edit /etc/default/wicd first." + fi + ;; + stop) + [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME" + do_stop + case "$?" in + 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; + 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; + esac + ;; + #reload|force-reload) + # + # If do_reload() is not implemented then leave this commented out + # and leave 'force-reload' as an alias for 'restart'. + # + #log_daemon_msg "Reloading $DESC" "$NAME" + #do_reload + #log_end_msg $? + #;; + restart|force-reload) + # + # If the "reload" option is implemented then remove the + # 'force-reload' alias + # + log_daemon_msg "Restarting $DESC" "$NAME" + do_stop + case "$?" in + 0|1) + if [ "$START_DAEMON" != no ]; then + do_start + case "$?" in + 0) log_end_msg 0 ;; + 1) log_end_msg 1 ;; # Old process is still running + *) log_end_msg 1 ;; # Failed to start + esac + else + log_warning_msg "Not starting wicd daemon. Please edit /etc/default/wicd first." + fi + ;; + *) + # Failed to stop + log_end_msg 1 + ;; + esac + ;; + status) + status_of_proc -p $PIDFILE $DAEMON $NAME + ;; + *) + echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload|status}" >&2 + exit 3 + ;; +esac + +: --- wicd-1.6.2.2.orig/debian/docs +++ wicd-1.6.2.2/debian/docs @@ -0,0 +1 @@ +debian/NEWS.Debian --- wicd-1.6.2.2.orig/debian/menu +++ wicd-1.6.2.2/debian/menu @@ -0,0 +1,5 @@ +?package(wicd):\ + needs="X11" \ + section="Applications/Network/Monitoring" \ + title="WICD" command="/usr/bin/wicd-client" \ + icon="/usr/share/pixmaps/wicd.xpm" --- wicd-1.6.2.2.orig/debian/changelog +++ wicd-1.6.2.2/debian/changelog @@ -0,0 +1,305 @@ +wicd (1.6.2.2-3) unstable; urgency=low + + * debian/po/ja.po updated (Closes: #554838) + * debian/patches/06-dont_bomb_out_on_configparser_error.patch added + (Closes: #554949) + + -- David Paleino Sat, 07 Nov 2009 16:59:06 +0100 + +wicd (1.6.2.2-2) unstable; urgency=low + + * debian/po/ja.po added, thanks to Hideki Yamane (Closes: #546231) + * debian/control: + - remove Conflict on network-manager, since both can be used at + the same time, provided they don't try to control the same + interface (Closes: #548978) + - added dependency on dbus (Closes: #540331, #551605) + * debian/patches/05-use_binsh.patch added (Closes: #549443) + + -- David Paleino Mon, 26 Oct 2009 10:38:22 +0100 + +wicd (1.6.2.2-1) unstable; urgency=low + + * New upstream version + - fixed connection templates (Closes: #536219) + - fixed Ad-Hoc Network creation (Closes: #534718, #534215) + - fixed Ad-Hoc Network dialog unresponsiveness (Closes: #537462) + - according to upstream, fixed random crashes with DBus handling + in wicd-curses (Closes: #539025) + - fixes hidden network connection bug (Closes: #545141) + * debian/control: + - added missing dependency on ping (iputils- or inetutils-) + - added python-notify to Recommends (Closes: #534271) + - Standards-Version bumped to 3.8.3, no changes needed + * debian/patches/: + - 01-remove_unused_icons.patch added (Closes: #538009) + - 02-detect_ping_flavour.patch added (Closes: #543656) + - 05-fix_typo.patch removed, fixed upstream + * debian/rules: + - stylistic changes + - don't install acpi-support integration anymore, let's + just use pm-utils (LP: #366119) + * debian/po/: + - es.po added, thanks to Francisco Javier Cuadrado (Closes: #534661) + - fr.po added, thanks to Steve Petruzzello (Closes: #537213) + * debian/postrm: + - removing /var/run/wicd on purge (Closes: #536444) + - early load Debconf (Closes: #534648) + * debian/README.Debian updated: explain the differences between + iputils-ping and inetutils-ping, related to 02-detect_ping_flavour.patch. + (Closes: #545458) + + -- David Paleino Mon, 07 Sep 2009 19:31:22 +0200 + +wicd (1.6.1-3) unstable; urgency=low + + * debian/config, debian/templates updated: + - only show users to add to netdev, skip those who are already + members (Closes: #534138) + - gracefully handle upgrades from previous broken versions, where + debconf set a value of ${default} for wicd/users + (Closes: #532112) + + -- David Paleino Mon, 22 Jun 2009 17:59:27 +0200 + +wicd (1.6.1-2) unstable; urgency=low + + * debian/control: + - Vcs-* fields updated (oops.) + * debian/patches/05-fix_typo.patch added, fixes missing rename of + global var + + -- David Paleino Sun, 21 Jun 2009 20:59:17 +0200 + +wicd (1.6.1-1) unstable; urgency=low + + * New upstream version: + - Add Pre/Post-Disconnection scripts (Closes: #517383) + * debian/templates: + - merged the note into the multiselect screen + - updated multiselect text, removed note + * debian/control: + - long description wording improved, thanks to Justin B Rye + from the debian-l10n-english mailing list + - Recommend graphical su programs to handle scripts (and sudo for + wicd-curses) (Closes: #519915) + - PAPT removed from Uploaders + - Standards-Version bumped to 3.8.2, no changes needed + * debian/patches/: + - 01-fix_desktop_file.patch, 02-fix_logfile_perms.patch, + 03-fix_lintian_manpage_warning.patch, 10-add_udhcpc_support.patch + removed, merged upstream + * debian/init updated, status_of_proc() works now! + * debian/po/: + - cs.po added, thanks to Martin Šín (Closes: #532210) + - de.po added, thanks to Helge Kreutzmann (Closes: #533446) + - eu.po added, thanks to Piarres Beobide (Closes: #533615) + - fi.po added, thanks to Esko Arajärvi (Closes: #533226) + - pt.po added, thanks to Américo Monteiro (Closes: #533244) + - ru.po added, thanks to Yuri Kozlov (Closes: #533213) + - sv.po added, thanks to Martin Bagge (Closes: #532160) + - zh_CN.po added, thanks to Deng Xiyue (Closes: #533392) + * debian/rules: + - pass --loggroup and --logperms to setup.py + + -- David Paleino Sun, 21 Jun 2009 11:32:22 +0200 + +wicd (1.6.0-2~pre1) experimental; urgency=low + + * debian/config: + - use getent group instead of grepping /etc/group + - remove ${default} substitution + - fixed typo in db_subst of ${users} + * debian/templates: + - remove Default field in wicd/users (Closes: #532112) + * debian/po/* updated + * debian/patches/01-fix_desktop_file.patch added + + -- David Paleino Sat, 06 Jun 2009 22:35:22 +0200 + +wicd (1.6.0-1) experimental; urgency=low + + * New upstream version + - DBus at_console policy fixed (Closes: #530505, #525622) + - wireless channel shown in overview (Closes: #525542) + - added "Search domain" option in preferences tab (Closes: #516466) + * debian/patches/: + - 01-fix_desktop_file.patch, 07-add_resolvconf_support.patch + removed, fixed upstream + - 02-fix_logfile_perms.patch, 03-fix_lintian_manpage_warning.patch, + 04-fix-scripts.patch refreshed + - 05-fix_DBus_policy.patch removed, permissions given to the + `netdev' group via a configuration option + - 06-add_LC_MESSAGES_parsing.patch removed, fixed upstream (in + wicd/translations.py) + - 09-fix_wire_plugging_detection.patch fixed (Closes: #522057) + - 10-add_udhcpc_support.patch added, thanks to "madmo" from the + Wicd forums for making it, and to Luca Capello for fixing and + porting it to 1.5.9, now ported to 1.6.0 (Closes: #520014) + * original debian/po removed, substituted by debconf's translations + * debian/config, debian/templates added, initial debconf support + (Closes: #524060) + * debian/control: + - Build-Dependency on po-debconf added + - added missing dependency on lsb-base + - added missing dependency on python-urwid, needed by wicd-curses + - added missing dependency on psmisc (Closes: #520925) + - added alternative dependency on udhcpc + * debian/postinst: + - enable debconf questions + * debian/README.Debian updated: specify that DBus should be boot-started + before wicd (Closes: #526408) + * debian/init: added support for "status" command, thanks to Peter + Eisentraut (Closes: #528928) + * debian/rules updated + * debian/watch fixed not to catch alpha/beta releases + + -- David Paleino Sat, 06 Jun 2009 01:03:58 +0200 + +wicd (1.5.9-5) unstable; urgency=low + + * debian/patches/: + - 08-fix_GetIP.patch added, thanks to Giuseppe Martino + (Closes: #519433) + - 09-fix_wire_plugging_detection.patch, added, thanks to Giuseppe + Martino (Closes: #503738) + * debian/control: + - Standards-Version bumped to 3.8.1: + + debian/init fixed, /var/run/wicd created on init.d script + start, since /var/run may be mounted as a temporary filesystem + (§9.3.2) + + -- David Paleino Mon, 16 Mar 2009 00:51:43 +0100 + +wicd (1.5.9-4) unstable; urgency=low + + * debian/control: + - fixing typo in Depends field: dhcpd <> dhcpcd (Closes: #518459) + + -- David Paleino Fri, 06 Mar 2009 11:52:15 +0100 + +wicd (1.5.9-3) unstable; urgency=low + + * The brown-paper-bag bug release + * debian/postinst: + - only force-reload DBus if it's already started (Closes: #517395), + I had already fixed this in debian/postrm before (see -2). + * debian/patches/: + - 06-add_LC_MESSAGES_parsing.patch updated: workaround "bug" in + python's locale.getdefaultlocale(), putting LC_CTYPE at a higher + priority than LC_MESSAGES (well, not considering it at all) + (really closes: #514553) + + -- David Paleino Fri, 27 Feb 2009 22:10:05 +0100 + +wicd (1.5.9-2) unstable; urgency=low + + * debian/patches/: + - 06-add_LC_MESSAGES_parsing.patch added (Closes: #514553) + - 07-add_resolvconf_support.patch added (Closes: #514597) + * debian/README.Debian updated: + - add information on how to add users to netdev. + - add information on how to reload DBus + * debian/NEWS.Debian updated: + - add information on how to reload DBus + * debian/control: + - swapped Maintainer/Uploaders fields + * debian/postrm: + - only force-reload DBus if it's already started (Closes: #514778) + * debian/postinst: add a netdev *group*, not *user* (Closes: #516317) + * debian/po/fr.po added, debian/rules updated: + - workaround to fix broken translation in broken i18n system + (Closes: #516459) + + -- David Paleino Sun, 22 Feb 2009 21:30:47 +0100 + +wicd (1.5.9-1) unstable; urgency=low + + * New upstream release: + - Fixed security hole in DBus configuration file + - Fixed the TTLS template + * debian/patches/: + - 05-fix_DBus_policy.patch added, allow only members of the netdev + group to configure wicd (Closes: #512160) + * debian/postinst: add group "netdev", which will be the only one able + to configure wicd + * debian/control: added dependency on adduser + * debian/NEWS.Debian and debian/docs added, explain the new permissions + policy + + -- David Paleino Sun, 08 Feb 2009 14:57:56 +0100 + +wicd (1.5.8-1) unstable; urgency=low + + * New upstream release + * debian/control: + - DM-Upload-Allowed set (ACKed by Bernd Zeimetz) + + -- David Paleino Fri, 09 Jan 2009 19:17:27 +0100 + +wicd (1.5.7-2) unstable; urgency=high + + [ David Paleino ] + * debian/rules: + - passing --lib to configure, moving files in /usr/share/wicd + (Closes: #510461) + - also removing other/55wicd in clean target + - binary-arch target emptied, not using it + * debian/prerm removed: + * debian/postinst updated: + * debian/postrm updated: + - fix double-{starting,stopping} of wicd + - forcibly reload dbus upon installation or removal + * debian/default added. + * debian/init updated: + - allow to disable the daemon in /etc/default/wicd. + + [ Bernd Zeimetz ] + * debian/rules: + - run dh_pysupport before dh_installinit, so Python modules will be + compiled before the daemon starts (Closes: #510457) + - call setup.py configure and install with appropriate options, so the + modules are installed in the private module directory properly + (Closes: #510462). + * debian/patches/04-fix-scripts.patch: + - set PYTHONPATH while executing script so Python will find them + in the private directory (Closes: #510308) + + -- David Paleino Fri, 02 Jan 2009 18:20:29 +0100 + +wicd (1.5.7-1) unstable; urgency=low + + * New upstream release (Closes: #503737) + * debian/control: + - added some runtime dependencies (not really, but used by most + users) to wicd (Closes: #503739) + - added Conflicts: network-manager (Closes: #509051) + - added Suggests on pm-utils, since we now also have those + functionalities + - update Vcs-* and Maintainer fields to reflect injection into + PAPT + * debian/postrm added: + - removes runtime-generated files (Closes: #503747) + * debian/patches: + - 02-fix_logfile_perms.patch added, sets permissions of + /var/log/wicd/wicd.log to root:adm (Closes: #503749) + - 03-fix_lintian_manpage_warning.patch added, gives a more + meaningful whatis entry + * debian/rules: + - get-orig-source target to ease upstream tarball fetch + - ensure right permissions are set in install target + - using dh7-style rules + * debian/README.source added + * debian/docs removed + * debian/copyright fixed: + - added copyright year to in/man* + - removed useless escaping of '=' in filenames + - fixed pointer to GPL-2 + + -- David Paleino Wed, 24 Dec 2008 17:37:13 +0100 + +wicd (1.5.2-1) unstable; urgency=low + + * Initial release (Closes: #465870) + + -- David Paleino Sun, 14 Sep 2008 11:43:47 +0200 --- wicd-1.6.2.2.orig/debian/postinst +++ wicd-1.6.2.2/debian/postinst @@ -0,0 +1,55 @@ +#!/bin/sh +# postinst script for wicd +# +# see: dh_installdeb(1) + +set -e + +. /usr/share/debconf/confmodule + +# summary of how this script can be called: +# * `configure' +# * `abort-upgrade' +# * `abort-remove' `in-favour' +# +# * `abort-remove' +# * `abort-deconfigure' `in-favour' +# `removing' +# +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + + +case "$1" in + configure) + if [ ! $(getent group netdev) ]; then + addgroup --quiet --system netdev + fi + if [ -x "/etc/init.d/dbus" ]; then + # Check if DBus has started, otherwise this fails on + # certain environments (chroots, for example). See + # #514778 #517395 + if [ -n "$DBUS_SESSION_BUS_ADDRESS" ]; then + if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then + invoke-rc.d dbus force-reload || exit $? + else + /etc/init.d/dbus force-reload || exit $? + fi + fi + fi + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# + +db_stop; + +exit 0 --- wicd-1.6.2.2.orig/debian/templates +++ wicd-1.6.2.2/debian/templates @@ -0,0 +1,6 @@ +Template: wicd/users +Type: multiselect +Choices: ${users} +_Description: Users to add to the netdev group: + Users who should be able to run wicd clients need to be added to the + group "netdev". --- wicd-1.6.2.2.orig/debian/config +++ wicd-1.6.2.2/debian/config @@ -0,0 +1,35 @@ +#!/bin/bash + +set -e + +# Source debconf library. +. /usr/share/debconf/confmodule + +# Fix upgrades from broken experimental version +db_get wicd/users +if [ -n "$( echo $RET | grep \${ )" ]; then + db_set wicd/users "" + db_fset wicd/users seen false +fi + +db_metaget wicd/users users +users="$(getent passwd | awk -F: '{if ($3 >= 1000 && $3 < 60000) print $1}' | sort | tr '\n' ',' | sed 's@,@, @g;s@, $@@g')" +netdev=$(getent group netdev | cut -d: -f4 | sed -e 's@,@ @g') + +# Don't show users already in netdev +for u in $netdev; do + users=$(echo $users | sed "s@$u, @@g;s@, $u\$@@g"); +done + +db_subst wicd/users users "$users" + +db_input high wicd/users || true +db_go + +db_get wicd/users +users=$(echo $RET | sed -e 's@,@@g') + +# Add selected users +for u in $users; do + adduser $u netdev +done --- wicd-1.6.2.2.orig/debian/links +++ wicd-1.6.2.2/debian/links @@ -0,0 +1 @@ +usr/share/man/man8/wicd.8 usr/share/man/man8/wicd-client.8 --- wicd-1.6.2.2.orig/debian/po/fi.po +++ wicd-1.6.2.2/debian/po/fi.po @@ -0,0 +1,34 @@ +# Debconf translations for wicd. +# Copyright © 2009, David Paleino +# This file is distributed under the same license as the wicd package. +# +# Esko Arajärvi , 2009. +msgid "" +msgstr "" +"Project-Id-Version: wicd\n" +"Report-Msgid-Bugs-To: wicd@packages.debian.org\n" +"POT-Creation-Date: 2009-06-13 17:38+0200\n" +"PO-Revision-Date: 2009-06-15 21:25+0300\n" +"Last-Translator: Esko Arajärvi \n" +"Language-Team: Finnish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Lokalize 0.3\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. Type: multiselect +#. Description +#: ../templates:1001 +msgid "Users to add to the netdev group:" +msgstr "Ryhmään ”netdev” lisättävät käyttäjät:" + +#. Type: multiselect +#. Description +#: ../templates:1001 +msgid "" +"Users who should be able to run wicd clients need to be added to the group " +"\"netdev\"." +msgstr "" +"Käyttäjien tulee kuulua ryhmään ”netdev” voidakseen ajaa wicd-asiakkaita." + --- wicd-1.6.2.2.orig/debian/po/ja.po +++ wicd-1.6.2.2/debian/po/ja.po @@ -0,0 +1,33 @@ +# Debconf translations for wicd. +# Copyright © 2009, David Paleino +# This file is distributed under the same license as the wicd package. +# Hideki Yamane (Debian-JP) , 2009. +# +msgid "" +msgstr "" +"Project-Id-Version: wicd 1.6.2.2-1\n" +"Report-Msgid-Bugs-To: wicd@packages.debian.org\n" +"POT-Creation-Date: 2009-06-13 17:38+0200\n" +"PO-Revision-Date: 2009-09-12 02:27+0900\n" +"Last-Translator: Hideki Yamane (Debian-JP) \n" +"Language-Team: Debian JP Project \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: multiselect +#. Description +#: ../templates:1001 +msgid "Users to add to the netdev group:" +msgstr "netdev グループに追加するユーザ:" + +#. Type: multiselect +#. Description +#: ../templates:1001 +msgid "" +"Users who should be able to run wicd clients need to be added to the group " +"\"netdev\"." +msgstr "" +"wicd クライアントを動作可能なユーザは「netdev」グループに追加されている" +"必要があります。" + --- wicd-1.6.2.2.orig/debian/po/templates.pot +++ wicd-1.6.2.2/debian/po/templates.pot @@ -0,0 +1,31 @@ +# Debconf translations for wicd. +# Copyright © 2009, David Paleino +# This file is distributed under the same license as the wicd package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: wicd@packages.debian.org\n" +"POT-Creation-Date: 2009-06-13 17:38+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: multiselect +#. Description +#: ../templates:1001 +msgid "Users to add to the netdev group:" +msgstr "" + +#. Type: multiselect +#. Description +#: ../templates:1001 +msgid "" +"Users who should be able to run wicd clients need to be added to the group " +"\"netdev\"." +msgstr "" --- wicd-1.6.2.2.orig/debian/po/de.po +++ wicd-1.6.2.2/debian/po/de.po @@ -0,0 +1,32 @@ +# Debconf translations for wicd. +# Copyright © 2009, David Paleino +# This file is distributed under the same license as the wicd package. +# Copyright (C) Helge Kreutzmann , 2009. +# +msgid "" +msgstr "" +"Project-Id-Version: wicd 1.6.0-2~pre1\n" +"Report-Msgid-Bugs-To: wicd@packages.debian.org\n" +"POT-Creation-Date: 2009-06-13 17:38+0200\n" +"PO-Revision-Date: 2009-06-15 22:41+0200\n" +"Last-Translator: Helge Kreutzmann \n" +"Language-Team: de \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: multiselect +#. Description +#: ../templates:1001 +msgid "Users to add to the netdev group:" +msgstr "Benutzer, die zur Gruppe »netdev« hinzugefügt werden sollen:" + +#. Type: multiselect +#. Description +#: ../templates:1001 +msgid "" +"Users who should be able to run wicd clients need to be added to the group " +"\"netdev\"." +msgstr "" +"Benutzer, die die Clients von Wicd ausführen sollen, müssen zu der Gruppe " +"»netdev« hinzugefügt werden." --- wicd-1.6.2.2.orig/debian/po/es.po +++ wicd-1.6.2.2/debian/po/es.po @@ -0,0 +1,50 @@ +# wicd po-debconf translation to Spanish +# Copyright (C) 2009 Software in the Public Interest +# This file is distributed under the same license as the wicd package. +# +# Changes: +# - Initial translation +# Francisco Javier Cuadrado , 2009 +# +# Traductores, si no conocen el formato PO, merece la pena leer la +# documentación de gettext, especialmente las secciones dedicadas a este +# formato, por ejemplo ejecutando: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Equipo de traducción al español, por favor, lean antes de traducir +# los siguientes documentos: +# +# - El proyecto de traducción de Debian al español +# http://www.debian.org/intl/spanish/ +# especialmente las notas de traducción en +# http://www.debian.org/intl/spanish/notas +# +# - La guía de traducción de po's de debconf: +# /usr/share/doc/po-debconf/README-trans +# o http://www.debian.org/intl/l10n/po-debconf/README-trans +# +msgid "" +msgstr "" +"Project-Id-Version: wicd 1.6.0-2~pre1\n" +"Report-Msgid-Bugs-To: wicd@packages.debian.org\n" +"POT-Creation-Date: 2009-06-13 17:38+0200\n" +"PO-Revision-Date: 2009-06-16 11:32+0100\n" +"Last-Translator: Francisco Javier Cuadrado \n" +"Language-Team: Debian l10n Spanish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: multiselect +#. Description +#: ../templates:1001 +msgid "Users to add to the netdev group:" +msgstr "Usuarios a añadir al grupo netdev:" + +#. Type: multiselect +#. Description +#: ../templates:1001 +msgid "Users who should be able to run wicd clients need to be added to the group \"netdev\"." +msgstr "Los usuarios que deberían poder ejecutar los clientes de wicd se deben añadir al grupo «netdev»." + --- wicd-1.6.2.2.orig/debian/po/pt.po +++ wicd-1.6.2.2/debian/po/pt.po @@ -0,0 +1,35 @@ +# translation of wicd debconf to Portuguese +# Debconf translations for wicd. +# Copyright © 2009, David Paleino +# This file is distributed under the same license as the wicd package. +# +# Américo Monteiro , 2009. +msgid "" +msgstr "" +"Project-Id-Version: wicd 1.6.0-2~pre1\n" +"Report-Msgid-Bugs-To: wicd@packages.debian.org\n" +"POT-Creation-Date: 2009-06-13 17:38+0200\n" +"PO-Revision-Date: 2009-06-15 19:15+0100\n" +"Last-Translator: Américo Monteiro \n" +"Language-Team: Portuguese \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" + +#. Type: multiselect +#. Description +#: ../templates:1001 +msgid "Users to add to the netdev group:" +msgstr "Utilizadores a adicionar ao grupo netdev:" + +#. Type: multiselect +#. Description +#: ../templates:1001 +msgid "" +"Users who should be able to run wicd clients need to be added to the group " +"\"netdev\"." +msgstr "" +"Os utilizadores com permissão de usar os clientes do wicd necessitam de ser " +"adicionados ao grupo \"netdev\"." + --- wicd-1.6.2.2.orig/debian/po/ru.po +++ wicd-1.6.2.2/debian/po/ru.po @@ -0,0 +1,35 @@ +# Debconf translations for wicd. +# Copyright © 2009, David Paleino +# This file is distributed under the same license as the wicd package. +# +# Yuri Kozlov , 2009. +msgid "" +msgstr "" +"Project-Id-Version: wicd 1.6.0-2~pre1\n" +"Report-Msgid-Bugs-To: wicd@packages.debian.org\n" +"POT-Creation-Date: 2009-06-13 17:38+0200\n" +"PO-Revision-Date: 2009-06-15 21:32+0400\n" +"Last-Translator: Yuri Kozlov \n" +"Language-Team: Russian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" + +#. Type: multiselect +#. Description +#: ../templates:1001 +msgid "Users to add to the netdev group:" +msgstr "Пользователи, добавляемые в группу netdev:" + +#. Type: multiselect +#. Description +#: ../templates:1001 +msgid "" +"Users who should be able to run wicd clients need to be added to the group " +"\"netdev\"." +msgstr "" +"Пользователи, которым разрешено запускать клиентов wicd, должны быть " +"добавлены в группу \"netdev\"." + --- wicd-1.6.2.2.orig/debian/po/it.po +++ wicd-1.6.2.2/debian/po/it.po @@ -0,0 +1,33 @@ +# Debconf translations for wicd. +# Copyright © 2009, David Paleino +# This file is distributed under the same license as the wicd package. +# David Paleino , 2009. +# +msgid "" +msgstr "" +"Project-Id-Version: 1.0\n" +"Report-Msgid-Bugs-To: wicd@packages.debian.org\n" +"POT-Creation-Date: 2009-06-13 17:38+0200\n" +"PO-Revision-Date: 2009-04-20 20:33+0200\n" +"Last-Translator: David Paleino \n" +"Language-Team: Italian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. Type: multiselect +#. Description +#: ../templates:1001 +msgid "Users to add to the netdev group:" +msgstr "Utenti da aggiungere al gruppo netdev:" + +#. Type: multiselect +#. Description +#: ../templates:1001 +msgid "" +"Users who should be able to run wicd clients need to be added to the group " +"\"netdev\"." +msgstr "" +"Gli utenti che dovrebbero essere abilitati all'esecuzione dei client wicd " +"devono essere aggiunti al gruppo \"netdev\"." --- wicd-1.6.2.2.orig/debian/po/fr.po +++ wicd-1.6.2.2/debian/po/fr.po @@ -0,0 +1,32 @@ +# Translation of wicd debconf templates to French +# This file is distributed under the same license as the wicd package. +# Copyright © 2006-2009 Debian French l10n team +# Translator: +# Steve Petruzzello , 2009 +msgid "" +msgstr "" +"Project-Id-Version: wicd_1.6.1-3\n" +"Report-Msgid-Bugs-To: wicd@packages.debian.org\n" +"POT-Creation-Date: 2009-06-13 17:38+0200\n" +"PO-Revision-Date: 2009-06-30 12:00+0200\n" +"Last-Translator: Steve Petruzzello \n" +"Language-Team: French \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: multiselect +#. Description +#: ../templates:1001 +msgid "Users to add to the netdev group:" +msgstr "Utilisateurs à ajouter au groupe netdev :" + +#. Type: multiselect +#. Description +#: ../templates:1001 +msgid "" +"Users who should be able to run wicd clients need to be added to the group " +"\"netdev\"." +msgstr "" +"Les utilisateurs désirant utiliser wicd doivent être ajoutés au groupe " +"« netdev »." --- wicd-1.6.2.2.orig/debian/po/sv.po +++ wicd-1.6.2.2/debian/po/sv.po @@ -0,0 +1,32 @@ +# Debconf translations for wicd. +# Copyright © 2009, David Paleino +# This file is distributed under the same license as the wicd package. +# Martin Bagge, , 2009. +# +msgid "" +msgstr "" +"Project-Id-Version: wicd 1.6.0-2~pre1\n" +"Report-Msgid-Bugs-To: wicd@packages.debian.org\n" +"POT-Creation-Date: 2009-06-13 17:38+0200\n" +"PO-Revision-Date: 2009-06-16 22:44+0100\n" +"Last-Translator: Martin Bagge \n" +"Language-Team: Swedish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Poedit-Language: Swedish\n" +"X-Poedit-Country: Sweden\n" +"X-Poedit-SourceCharset: utf-8\n" + +#. Type: multiselect +#. Description +#: ../templates:1001 +msgid "Users to add to the netdev group:" +msgstr "Användare att lägga till i gruppen netdev:" + +#. Type: multiselect +#. Description +#: ../templates:1001 +msgid "Users who should be able to run wicd clients need to be added to the group \"netdev\"." +msgstr "Användare som ska kunna köra wicd-klienter måste läggas till i gruppen \"netdev\"." + --- wicd-1.6.2.2.orig/debian/po/POTFILES.in +++ wicd-1.6.2.2/debian/po/POTFILES.in @@ -0,0 +1 @@ +[type: gettext/rfc822deb] templates --- wicd-1.6.2.2.orig/debian/po/cs.po +++ wicd-1.6.2.2/debian/po/cs.po @@ -0,0 +1,32 @@ +# Debconf translations for wicd. +# Copyright B) 2009, David Paleino +# This file is distributed under the same license as the wicd package. +# Martin Sin , 2009. +# +msgid "" +msgstr "" +"Project-Id-Version: wicd 1.6.0-2~pre1\n" +"Report-Msgid-Bugs-To: wicd@packages.debian.org\n" +"POT-Creation-Date: 2009-06-13 17:38+0200\n" +"PO-Revision-Date: 2009-06-14 11:32+0200\n" +"Last-Translator: Martin Sin \n" +"Language-Team: Czech \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: multiselect +#. Description +#: ../templates:1001 +msgid "Users to add to the netdev group:" +msgstr "Uživatelé přidaní do skupiny netdev:" + +#. Type: multiselect +#. Description +#: ../templates:1001 +msgid "" +"Users who should be able to run wicd clients need to be added to the group " +"\"netdev\"." +msgstr "" +"Uživatele, kteří budou spouštět klienty wicd, je třeba přidat do skupiny " +"\"netdev\"." --- wicd-1.6.2.2.orig/debian/po/zh_CN.po +++ wicd-1.6.2.2/debian/po/zh_CN.po @@ -0,0 +1,30 @@ +# Debconf translations for wicd. +# Copyright © 2009, David Paleino +# This file is distributed under the same license as the wicd package. +# Deng Xiyue , 2009. +# +msgid "" +msgstr "" +"Project-Id-Version: wicd\n" +"Report-Msgid-Bugs-To: wicd@packages.debian.org\n" +"POT-Creation-Date: 2009-06-13 17:38+0200\n" +"PO-Revision-Date: 2009-06-17 14:14+0800\n" +"Last-Translator: Deng Xiyue \n" +"Language-Team: Debian Chinese GB \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: multiselect +#. Description +#: ../templates:1001 +msgid "Users to add to the netdev group:" +msgstr "要加入 netdev 组中的用户：" + +#. Type: multiselect +#. Description +#: ../templates:1001 +msgid "" +"Users who should be able to run wicd clients need to be added to the group " +"\"netdev\"." +msgstr "要运行 wicd 客户端的用户需要加入到“netdev”组中。" --- wicd-1.6.2.2.orig/debian/po/eu.po +++ wicd-1.6.2.2/debian/po/eu.po @@ -0,0 +1,36 @@ +# translation of templates.po to Euskara +# Debconf translations for wicd. +# Copyright © 2009, David Paleino +# This file is distributed under the same license as the wicd package. +# +# Piarres Beobide EGaña , 2009. +msgid "" +msgstr "" +"Project-Id-Version: templates\n" +"Report-Msgid-Bugs-To: wicd@packages.debian.org\n" +"POT-Creation-Date: 2009-06-13 17:38+0200\n" +"PO-Revision-Date: 2009-06-19 12:28+0200\n" +"Last-Translator: Piarres Beobide EGaña \n" +"Language-Team: Euskara \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. Type: multiselect +#. Description +#: ../templates:1001 +msgid "Users to add to the netdev group:" +msgstr "netdev taldera gehitzeko erabiltzaileak:" + +#. Type: multiselect +#. Description +#: ../templates:1001 +msgid "" +"Users who should be able to run wicd clients need to be added to the group " +"\"netdev\"." +msgstr "" +"Wicd bezeroak exekutatzeko gai diren erabiltzaileak \"netdev\" taldean " +"gehitu behar dira." + --- wicd-1.6.2.2.orig/debian/patches/06-dont_bomb_out_on_configparser_error.patch +++ wicd-1.6.2.2/debian/patches/06-dont_bomb_out_on_configparser_error.patch @@ -0,0 +1,46 @@ +From: David Paleino +Subject: gracefully handle (and try to fix) configuration parsing errors + From time to time, it happens that an empty section "[]" is added to + wired-settings.conf. (Un)fortunately, RawConfigParser doesn't seem to + remove it with self.remove_section(""), but it automagically disappears + if the configfile is re-written again. Exceptions on errors are caught + if that was not the error. +Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=553197 + http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=554949 +Forwarded: no + +--- + wicd/configmanager.py | 15 ++++++++++++--- + 1 file changed, 12 insertions(+), 3 deletions(-) + +--- wicd.orig/wicd/configmanager.py ++++ wicd/wicd/configmanager.py +@@ -24,7 +24,7 @@ reusable for other purposes as well. + # along with this program. If not, see . + # + +-from ConfigParser import RawConfigParser ++from ConfigParser import RawConfigParser, ParsingError + + from wicd.misc import Noneify, to_unicode + +@@ -37,8 +37,17 @@ class ConfigManager(RawConfigParser): + self.config_file = path + self.debug = debug + self.mrk_ws = mark_whitespace +- self.read(path) +- ++ try: ++ self.read(path) ++ except ParsingError, e: ++ self.write() ++ try: ++ self.read(path) ++ except ParsingError, p: ++ import sys ++ print "Could not start wicd: %s" % p.message ++ sys.exit(1) ++ + def __repr__(self): + return self.config_file + --- wicd-1.6.2.2.orig/debian/patches/05-use_binsh.patch +++ wicd-1.6.2.2/debian/patches/05-use_binsh.patch @@ -0,0 +1,35 @@ +From: David Paleino +Subject: don't force users to use bash +Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=549443 +Forwarded: no + +--- + in/scripts=wicd-client.in | 2 +- + in/scripts=wicd-curses.in | 2 +- + in/scripts=wicd.in | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +--- wicd.orig/in/scripts=wicd-client.in ++++ wicd/in/scripts=wicd-client.in +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/bin/sh + BOLD=$(tput bold) + BLUE=$(tput setaf 4) + NC=$(tput sgr0) +--- wicd.orig/in/scripts=wicd-curses.in ++++ wicd/in/scripts=wicd-curses.in +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/bin/sh + if [ ! -d "$HOME/.wicd" ]; then + mkdir -p "$HOME/.wicd" + fi +--- wicd.orig/in/scripts=wicd.in ++++ wicd/in/scripts=wicd.in +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/bin/sh + + PYTHONPATH=%LIB% + export PYTHONPATH --- wicd-1.6.2.2.orig/debian/patches/02-detect_ping_flavour.patch +++ wicd-1.6.2.2/debian/patches/02-detect_ping_flavour.patch @@ -0,0 +1,30 @@ +Description: detect which flavour of ping(1) is installed + This is needed because inetutils-ping does not support + "-w deadline", but just waits timeout. +Origin: vendor: +Bug-Debian: http://bugs.debian.org/543656 +Author: David Paleino +--- + wicd/wnettools.py | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) + +--- wicd.orig/wicd/wnettools.py ++++ wicd/wicd/wnettools.py +@@ -679,7 +679,16 @@ class BaseInterface(object): + trying to ping it. + + """ +- cmd = "ping -q -w 3 -c 1 %s" % gateway ++ if "iputils" in misc.Run(["ping", "-V"]): ++ cmd = "ping -q -w 3 -c 1 %s" % gateway ++ else: ++ # ping is from inetutils-ping (which doesn't support -w) ++ # or from some other package ++ # ++ # If there's no AP association, this will wait for ++ # timeout, while the above will wait (-w) 3 seconds at ++ # most. ++ cmd = "ping -q -c 1 %s" % gateway + if self.verbose: print cmd + return misc.LaunchAndWait(cmd) + --- wicd-1.6.2.2.orig/debian/patches/08-fix_GetIP.patch +++ wicd-1.6.2.2/debian/patches/08-fix_GetIP.patch @@ -0,0 +1,17 @@ +Fixes bug in GetIP(), see #519433 for full description. +Patch by Giuseppe Martino , thank you! +--- + wicd/wnettools.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- wicd-1.5.9.orig/wicd/wnettools.py ++++ wicd-1.5.9/wicd/wnettools.py +@@ -563,7 +563,7 @@ class Interface(object): + The IP address of the interface in dotted quad form. + + """ +- if not self.iface: return False ++ if not self.iface: return None + cmd = 'ifconfig ' + self.iface + if self.verbose: print cmd + output = misc.Run(cmd) --- wicd-1.6.2.2.orig/debian/patches/04-fix-scripts.patch +++ wicd-1.6.2.2/debian/patches/04-fix-scripts.patch @@ -0,0 +1,29 @@ +Make the scripts find their libraries +--- + in/scripts=wicd-client.in | 4 ++++ + in/scripts=wicd.in | 5 ++++- + 2 files changed, 8 insertions(+), 1 deletion(-) + +--- wicd.orig/in/scripts=wicd.in ++++ wicd/in/scripts=wicd.in +@@ -1,3 +1,6 @@ + #!/bin/bash + +-exec python -O %LIB%wicd-daemon.py $@ ++PYTHONPATH=%LIB% ++export PYTHONPATH ++ ++exec python %LIB%wicd-daemon.py $@ +--- wicd.orig/in/scripts=wicd-client.in ++++ wicd/in/scripts=wicd-client.in +@@ -2,6 +2,10 @@ + BOLD=$(tput bold) + BLUE=$(tput setaf 4) + NC=$(tput sgr0) ++ ++PYTHONPATH=%LIB% ++export PYTHONPATH ++ + # check_firstrun() + if [ ! -d "$HOME/.wicd" ]; then + mkdir -p "$HOME/.wicd" --- wicd-1.6.2.2.orig/debian/patches/01-remove_unused_icons.patch +++ wicd-1.6.2.2/debian/patches/01-remove_unused_icons.patch @@ -0,0 +1,23 @@ +Don't install rarely-used icons, save disk space +--- + setup.py | 4 ---- + 1 file changed, 4 deletions(-) + +--- wicd.orig/setup.py ++++ wicd/setup.py +@@ -467,15 +467,11 @@ try: + (wpath.log, []), + (wpath.etc, []), + (wpath.icons + 'scalable/apps/', ['icons/scalable/wicd-client.svg']), +- (wpath.icons + '192x192/apps/', ['icons/192px/wicd-client.png']), + (wpath.icons + '128x128/apps/', ['icons/128px/wicd-client.png']), + (wpath.icons + '96x96/apps/', ['icons/96px/wicd-client.png']), +- (wpath.icons + '72x72/apps/', ['icons/72px/wicd-client.png']), + (wpath.icons + '64x64/apps/', ['icons/64px/wicd-client.png']), + (wpath.icons + '48x48/apps/', ['icons/48px/wicd-client.png']), +- (wpath.icons + '36x36/apps/', ['icons/36px/wicd-client.png']), + (wpath.icons + '32x32/apps/', ['icons/32px/wicd-client.png']), +- (wpath.icons + '24x24/apps/', ['icons/24px/wicd-client.png']), + (wpath.icons + '22x22/apps/', ['icons/22px/wicd-client.png']), + (wpath.icons + '16x16/apps/', ['icons/16px/wicd-client.png']), + (wpath.images, [('images/' + b) for b in os.listdir('images') if not b.startswith('.')]), --- wicd-1.6.2.2.orig/debian/patches/series +++ wicd-1.6.2.2/debian/patches/series @@ -0,0 +1,7 @@ +01-remove_unused_icons.patch +02-detect_ping_flavour.patch +04-fix-scripts.patch +#08-fix_GetIP.patch +#09-fix_wire_plugging_detection.patch +05-use_binsh.patch +06-dont_bomb_out_on_configparser_error.patch --- wicd-1.6.2.2.orig/debian/patches/09-fix_wire_plugging_detection.patch +++ wicd-1.6.2.2/debian/patches/09-fix_wire_plugging_detection.patch @@ -0,0 +1,54 @@ +Fix detection of wire plugging/unplugging. +Patch provided by Giuseppe Martino , thank you! +--- + wicd/monitor.py | 10 ++++++++++ + wicd/wicd-daemon.py | 12 ++++++++++++ + 2 files changed, 22 insertions(+) + +--- wicd-1.5.9.orig/wicd/monitor.py ++++ wicd-1.5.9/wicd/monitor.py +@@ -64,6 +64,7 @@ class ConnectionStatus(object): + self.last_reconnect_time = time.time() + self.signal_changed = False + self.iwconfig = "" ++ self.plugged = False + + def check_for_wired_connection(self, wired_ip): + """ Checks for an active wired connection. +@@ -160,6 +161,15 @@ class ConnectionStatus(object): + + # Check for wired. + wired_ip = wired.GetWiredIP() ++ ++ if not self.plugged and wired.CheckPluggedIn(): ++ daemon.SendWirePluggedSignal() ++ self.plugged = True ++ ++ if self.plugged and not wired.CheckPluggedIn(): ++ daemon.SendWireUnpluggedSignal() ++ self.plugged = False ++ + wired_found = self.check_for_wired_connection(wired_ip) + if wired_found: + self.update_state(misc.WIRED, wired_ip=wired_ip) +--- wicd-1.5.9.orig/wicd/wicd-daemon.py ++++ wicd-1.5.9/wicd/wicd-daemon.py +@@ -669,6 +669,18 @@ class ConnectionWizard(dbus.service.Obje + + @dbus.service.method('org.wicd.daemon') + @dbus.service.signal(dbus_interface='org.wicd.daemon', signature='') ++ def SendWirePluggedSignal(self): ++ """ Emits a signal announcing wire is plugged. """ ++ pass ++ ++ @dbus.service.method('org.wicd.daemon') ++ @dbus.service.signal(dbus_interface='org.wicd.daemon', signature='') ++ def SendWireUnpluggedSignal(self): ++ """ Emits a signal announcing wire is unplugged. """ ++ pass ++ ++ @dbus.service.method('org.wicd.daemon') ++ @dbus.service.signal(dbus_interface='org.wicd.daemon', signature='') + def SendStartScanSignal(self): + """ Emits a signal announcing a scan has started. """ + pass