[arch-commits] Commit in wicd/repos (5 files)

[Giovanni Scafora]

    Date: Wednesday, September 3, 2008 @ 16:16:36
  Author: giovanni
Revision: 11816

Merged revisions 11814-11815 via svnmerge from 
svn+ssh://archlinux.org/home/svn-packages/wicd/trunk

........
  r11815 | giovanni | 2008-09-03 22:15:44 +0200 (mer, 03 set 2008) | 2 lines
  
  upgpkg: wicd 1.5.1-3
      Small fix and improvements
........

Modified:
  wicd/repos/extra-i686/	(properties)
  wicd/repos/extra-i686/PKGBUILD
  wicd/repos/extra-i686/wicd-daemon
  wicd/repos/extra-i686/wicd.desktop
  wicd/repos/extra-i686/wicd.install

--------------+
 PKGBUILD     |    7 ++++---
 wicd-daemon  |    7 +++----
 wicd.desktop |    2 +-
 wicd.install |   17 ++++++++++-------
 4 files changed, 18 insertions(+), 15 deletions(-)


Property changes on: wicd/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /wicd/trunk:1-11813
   + /wicd/trunk:1-11815

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-09-03 20:15:44 UTC (rev 11815)
+++ extra-i686/PKGBUILD	2008-09-03 20:16:36 UTC (rev 11816)
@@ -4,7 +4,7 @@
 
 pkgname=wicd
 pkgver=1.5.1
-pkgrel=2
+pkgrel=3
 pkgdesc="New and alternative wireless/wired network management utility"
 arch=('i686' 'x86_64')
 url="http://wicd.sourceforge.net/"
@@ -14,8 +14,8 @@
 install=wicd.install
 source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz wicd-daemon wicd.desktop)
 options=(emptydirs)
-md5sums=('dda372b0778de24552850d3d877d1b65' '8835ed1d4aba7effe3f157eeb0b66443' \
-         'c1f3e9a18470568893a5a8f7c27d4e46')
+md5sums=('dda372b0778de24552850d3d877d1b65' 'f40e5f59998d0829707a7c9976afa8f8' \
+         'eee9b10d9c860e1c7d195f115dc603f9')
   
 build() {
   cd $startdir/src/$pkgname-$pkgver
@@ -30,5 +30,6 @@
   for i in *.py; do
     install -Dm 755 $i $startdir/pkg/usr/lib/wicd/$i
   done
+  
   rm -rf  ${startdir}/pkg/usr/share/autostart
 }

Modified: extra-i686/wicd-daemon
===================================================================
--- extra-i686/wicd-daemon	2008-09-03 20:15:44 UTC (rev 11815)
+++ extra-i686/wicd-daemon	2008-09-03 20:16:36 UTC (rev 11816)
@@ -2,18 +2,17 @@
 
 . /etc/rc.conf
 . /etc/rc.d/functions
-
 case "$1" in
   start)
     stat_busy "Starting wicd Daemon"
-    killall daemon.py &> /dev/null
-    /usr/lib/wicd/daemon.py &> /dev/null
+    pkill -f wicd-daemon.py &> /dev/null
+    /usr/sbin/wicd &> /dev/null
     add_daemon wicd
     stat_done
     ;;
   stop)
     stat_busy "Stopping wicd Daemon"
-    killall daemon.py &> /dev/null
+    pkill -f wicd-daemon.py &> /dev/null
     rm_daemon wicd
     stat_done
     ;;

Modified: extra-i686/wicd.desktop
===================================================================
--- extra-i686/wicd.desktop	2008-09-03 20:15:44 UTC (rev 11815)
+++ extra-i686/wicd.desktop	2008-09-03 20:16:36 UTC (rev 11816)
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Categories=Application;Network;Internet;
 Encoding=UTF-8
-Exec=/usr/lib/wicd/wicd-client.py
+Exec=/usr/bin/wicd-client
 GenericName=Network Manager
 Icon=/usr/share/pixmaps/wicd/wicd-client.png
 Comment=Manage Wired/Wireless Networks

Modified: extra-i686/wicd.install
===================================================================
--- extra-i686/wicd.install	2008-09-03 20:15:44 UTC (rev 11815)
+++ extra-i686/wicd.install	2008-09-03 20:16:36 UTC (rev 11816)
@@ -7,21 +7,24 @@
   echo "==> DAEMONS array"
 }
 
+pre_upgrade() {
+  [ -f /var/run/daemons/wicd ] && cp /var/run/daemons/wicd /var/run/daemons/wicd.pid && /etc/rc.d/wicd stop
+  pre_install $*
+}
+
 post_install() {
   echo
   echo "Wireless Interface Connection Daemon"
   echo
-  echo "==> To run: /usr/lib/wicd/gui.py"
+  echo "==> To run: wicd-client"
   sleep 1
-  
-  echo
-  echo "==> Tray: /usr/lib/wicd/wicd-client.py"
-  echo "==> Add it to your autostart folder"
-  echo "==> to have the wicd tray applet appear at startup."
-  sleep 1
     
 }
 
+post_upgrade() {
+  [ -f /var/run/daemons/wicd.pid ] && rm /var/run/daemons/wicd.pid && /etc/rc.d/wicd start
+  post_install $*
+}
 
 op=$1
 shift