Merged r317 of mainline 1.6

in/other=WHEREAREMYFILES.in

@@ -1,13 +1,18 @@
 WHERE ARE MY FILES?!
 
-If you are reading this, you are probably wondering why your Wicd configuration
-files are not here.  What follows is a summary of the folders that Wicd uses.
+If you are reading this in %VARLIB%, then you may ignore (but please don't
+delete) this file.  The only reason it is here is that it is definitely
+constant between package updates.
+
+If you are reading this from your home directory, you are probably wondering
+why your Wicd configuration files are not in ~/.wicd.  What follows is a
+summary of the folders that Wicd uses.
 
 For a more detailed (and complete) description what is in each directory,
 consult the man pages for wicd(8) and wicd-curses(8).
 
 ~/.wicd
-    User-dependent configuration files, only used by wicd-curses
+    User-dependent configuration files
 
 %ETC%
     Global configuration files

in/scripts=wicd-client.in

@@ -7,8 +7,8 @@ if [ ! -d "$HOME/.wicd" ]; then
     mkdir -p "$HOME/.wicd"
 fi
 # Make sure the user knows WHEREAREMYFILES ;-)
-if [ -e "%DOCDIR%WHEREAREMYFILES" ] && [ ! -L "$HOME/.wicd/WHEREAREMYFILES" ]; then
-    ln -s "%DOCDIR%WHEREAREMYFILES" "$HOME/.wicd/WHEREAREMYFILES"
+if [ -e "%VARLIB%WHEREAREMYFILES" ] && [ ! -L "$HOME/.wicd/WHEREAREMYFILES" ]; then
+    ln -s "%VARLIB%WHEREAREMYFILES" "$HOME/.wicd/WHEREAREMYFILES"
 fi
 if [ "$DISPLAY" = "" ]; then
     if [ -x "%BIN%wicd-curses" ]; then

in/scripts=wicd-curses.in

@@ -1,2 +1,9 @@
 #!/bin/bash
+if [ ! -d "$HOME/.wicd" ]; then
+    mkdir -p "$HOME/.wicd"
+fi
+if [ -e "%VARLIB%WHEREAREMYFILES" ] && [ ! -L "$HOME/.wicd/WHEREAREMYFILES" ]; then
+    ln -s "%VARLIB%WHEREAREMYFILES" "$HOME/.wicd/WHEREAREMYFILES"
+fi
+
 exec python -O %LIB%wicd-curses.py $@

in/wicd=wpath.py.in

@@ -33,6 +33,7 @@ postconnectscripts = '%SCRIPTS%postconnect'
 images = '%IMAGES%'
 encryption = '%ENCRYPTION%'
 bin = '%BIN%'
+varlib = '%VARLIB%'
 networks = '%NETWORKS%'
 log = '%LOG%'
 resume = '%RESUME%'