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

[Giovanni Scafora]

    Date: Sunday, November 30, 2008 @ 06:55:57
  Author: giovanni
Revision: 19775

Merged revisions 19770 via svnmerge from 
svn+ssh://archlinux.org/srv/svn-packages/wicd/trunk

........
  r19770 | giovanni | 2008-11-30 03:45:52 -0800 (dom, 30 nov 2008) | 2 lines
  
  upgpkg: wicd 1.5.4-4
      Fixed FS12266
........

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

--------------+
 PKGBUILD     |    2 +-
 wicd.install |   36 +++++++++---------------------------
 2 files changed, 10 insertions(+), 28 deletions(-)


Property changes on: wicd/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /wicd/trunk:1-19501
   + /wicd/trunk:1-19774

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-11-30 11:51:38 UTC (rev 19774)
+++ extra-i686/PKGBUILD	2008-11-30 11:55:57 UTC (rev 19775)
@@ -4,7 +4,7 @@
 
 pkgname=wicd
 pkgver=1.5.4
-pkgrel=3
+pkgrel=4
 pkgdesc="New and alternative wireless/wired network management utility"
 arch=('i686' 'x86_64')
 url="http://wicd.sourceforge.net/"

Modified: extra-i686/wicd.install
===================================================================
--- extra-i686/wicd.install	2008-11-30 11:51:38 UTC (rev 19774)
+++ extra-i686/wicd.install	2008-11-30 11:55:57 UTC (rev 19775)
@@ -1,31 +1,13 @@
-pre_install() {
-  echo 
-  echo "==> Disable networkmanager,dhcdbd or other networking" 
-  echo "==> utility and add 'wicd' to DAEMONS"
+post_install() {
+  echo
+  echo "==> You need to restart the dbus service after "
+  echo "==> upgrading wicd."
+  echo "==> Disable networkmanager,dhcdbd or other networking " 
+  echo "==> utility and add 'wicd' to DAEMONS "
   echo "==> in /etc/rc.conf"
   echo "==> 'dbus' HAS to be before 'wicd' in rc.conf in the "
-  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 "==> DAEMONS array."
+  echo "==> Wireless Interface Connection Daemon"
   echo
-  echo "Wireless Interface Connection Daemon"
-  echo
-  echo "==> To run: wicd-client"
-  sleep 1
-    
+  echo "==> To run: wicd-client"    
 }
-
-post_upgrade() {
-  [ -f /var/run/daemons/wicd.pid ] && rm /var/run/daemons/wicd.pid && /etc/rc.d/wicd start
-  post_install $*
-}
-
-op=$1
-shift
-$op $*