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

Eric Belanger eric at archlinux.org
Thu Sep 4 02:01:22 UTC 2008 

    Date: Wednesday, September 3, 2008 @ 22:01:22
  Author: eric
Revision: 11821

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

................
  r356 | aaron | 2008-04-18 18:56:27 -0400 (Fri, 18 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
................
  r11809 | giovanni | 2008-09-03 12:44:49 -0400 (Wed, 03 Sep 2008) | 9 lines
  
  Merged revisions 2-11808 via svnmerge from 
  svn+ssh://archlinux.org/home/svn-packages/wicd/trunk
  
  ........
    r356 | aaron | 2008-04-19 00:56:27 +0200 (sab, 19 apr 2008) | 1 line
    
    Added svn:keywords to all PKGBUILDs
  ........
................
  r11813 | giovanni | 2008-09-03 14:28:29 -0400 (Wed, 03 Sep 2008) | 2 lines
  
  upgpkg: wicd 1.5.1-2
      No autostart
................
  r11815 | giovanni | 2008-09-03 16:15:44 -0400 (Wed, 03 Sep 2008) | 2 lines
  
  upgpkg: wicd 1.5.1-3
      Small fix and improvements
................

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

--------------+
 ChangeLog    |    7 ++---
 PKGBUILD     |   78 +++++++++++++--------------------------------------------
 wicd-daemon  |    7 ++---
 wicd.desktop |    4 +-
 wicd.install |   17 +++++++-----
 5 files changed, 37 insertions(+), 76 deletions(-)


Property changes on: wicd/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /wicd/trunk:1
   + /wicd/trunk:1-11820

Modified: extra-x86_64/ChangeLog
===================================================================
--- extra-x86_64/ChangeLog	2008-09-04 01:58:11 UTC (rev 11820)
+++ extra-x86_64/ChangeLog	2008-09-04 02:01:22 UTC (rev 11821)
@@ -1,3 +1,7 @@
+2008-09-03 Giovanni Scafora <giovanni at archlinux.org>
+
+	* wicd-1.5.1
+
 2008-01-11 Varun Acharya <varun at archlinux.org>
 
 	* wicd-1.4.1-4 moved to extra
@@ -6,7 +10,6 @@
 	* dhclient,wpa_supplicant are now deps
 	* wicd.install cleaned up
 
-
 2008-01-09 Varun Acharya <varun at archlinux.org>
 
 	* wicd-1.4.1-3 now in testing
@@ -31,5 +34,3 @@
 
 	* Cleaned up PKGBUILD, defaults to /usr/share
 	* Adopted from AUR and moved to testing/extra
-
-

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-09-04 01:58:11 UTC (rev 11820)
+++ extra-x86_64/PKGBUILD	2008-09-04 02:01:22 UTC (rev 11821)
@@ -1,3 +1,4 @@
+# $Id$
 # Maintainer: Varun Acharya <varun at archlinux.org>
 # Contributor: Rashif "Don Ray" Rahman <rayrashif at gmail.com>
 
@@ -2,4 +3,4 @@
 pkgname=wicd
-pkgver=1.4.1
-pkgrel=4
+pkgver=1.5.1
+pkgrel=3
 pkgdesc="New and alternative wireless/wired network management utility"
@@ -11,67 +12,24 @@
 depends=('dbus-python' 'pygtk' 'dhclient' 'wpa_supplicant' 'ethtool')
 conflicts=('wicd-svn')
 install=wicd.install
-source=(http://downloads.sourceforge.net/sourceforge/$pkgname/wicd_$pkgver-src.tar.bz2 \
-        wicd-daemon wicd.desktop wicd_in_usr.patch wicd-locale.patch)
+source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz wicd-daemon wicd.desktop)
 options=(emptydirs)
-md5sums=('c5dccf8df6d3995ad0aae0324af2302d' \
-         '8835ed1d4aba7effe3f157eeb0b66443' \
-         'a37f63a6c82491116d5b69540ae13d25' \
-         '97736bc03057542e4184fe1bd33cbd20' \
-         'b8edd56cf084347b0ae6dc0e02d1b747')         
-                       
+md5sums=('dda372b0778de24552850d3d877d1b65' 'f40e5f59998d0829707a7c9976afa8f8' \
+         'eee9b10d9c860e1c7d195f115dc603f9')
   
 build() {
-   
-  #Change default location to /usr/lib
-   patch -Np1 -i ${startdir}/wicd_in_usr.patch
-   patch -Np1 -i ${startdir}/wicd-locale.patch
-  
-  #Create Directories
-  mkdir -p ${startdir}/pkg/usr/lib
-  mkdir -p ${startdir}/pkg/usr/share/locale
-  mkdir -p ${startdir}/pkg/usr/share/wicd
-  
-  #Copying 
-  cp -R ${startdir}/src/opt/wicd ${startdir}/pkg/usr/lib
-  cp -R ${startdir}/src/usr/share/* ${startdir}/pkg/usr/share/
- 
-  #Moving stuff around to the right locations
-  mv ${startdir}/pkg/usr/lib/wicd/translations/* ${startdir}/pkg/usr/share/locale/
-  mv ${startdir}/pkg/usr/lib/wicd/images/ ${startdir}/pkg/usr/share/wicd
-  rm -rf ${startdir}/pkg/usr/lib/wicd/translations
-  ln -sf /usr/share/wicd/images/no-signal.png ${startdir}/pkg/usr/share/wicd/images/idle-signal.png
-  
-  
-  #Remove unwanted .desktop file/broken symlinks
-  rm ${startdir}/pkg/usr/share/applications/hammer-00186ddbac.desktop || return 1
-  rm ${startdir}/pkg/usr/share/wicd/images/wicd.png
-  rm ${startdir}/pkg/usr/share/pixmaps/wicd.png 
-  rm ${startdir}/pkg/usr/lib/wicd/data/wicd.png
+  cd $startdir/src/$pkgname-$pkgver
+  python setup.py configure --no-install-init --resume=/usr/share/wicd/scripts/ --suspend=/usr/share/wicd/scripts/ --verbose
+  python setup.py install --root=$startdir/pkg
 
-  # Leave init.d pseudo-daemon and add custom rc.d script
-  cd ${startdir}
-  install -D -m755 wicd-daemon pkg/etc/rc.d/wicd
-    
-  # Copy other system files
-  cd $startdir/src/etc
-  install -D -m644 dbus-1/system.d/wicd.conf \
-  ${startdir}/pkg/etc/dbus-1/system.d/wicd.conf
-  install -D -m755 acpi/resume.d/80-wicd-connect.sh \
-  ${startdir}/pkg/etc/acpi/resume.d/80-wicd-connexct.sh
-  install -D -m644 ${startdir}/src/opt/wicd/images/wicd-purple.png \
-  ${startdir}/pkg/usr/share/pixmaps/wicd.png
-  install -D -m644 ${startdir}/src/opt/wicd/images/wicd-purple.png \
-  ${startdir}/pkg/usr/share/wicd/images/wicd.png
-  install -D -m644 ${startdir}/src/opt/wicd/images/wicd-purple.png \
-  ${startdir}/pkg/usr/lib/wicd/data/wicd.png
-  install -D -m644 ${startdir}/wicd.desktop \
-  ${startdir}/pkg/usr/share/applications/wicd.desktop
+  # Add custom rc.d script
+  install -Dm755 ../wicd-daemon $startdir/pkg/etc/rc.d/wicd
+  install -Dm644 ../wicd.desktop ${startdir}/pkg/usr/share/applications/wicd.desktop
 
-
-  #Fix permissions
-  chmod -R 755 ${startdir}/pkg/usr/lib/wicd
-  find ${startdir}/pkg/usr/share -type d -exec chmod 755 {} \;
-  find ${startdir}/pkg/usr/share -type f -exec chmod 644 {} \;
-
+  cd build/lib/wicd
+  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-x86_64/wicd-daemon
===================================================================
--- extra-x86_64/wicd-daemon	2008-09-04 01:58:11 UTC (rev 11820)
+++ extra-x86_64/wicd-daemon	2008-09-04 02:01:22 UTC (rev 11821)
@@ -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-x86_64/wicd.desktop
===================================================================
--- extra-x86_64/wicd.desktop	2008-09-04 01:58:11 UTC (rev 11820)
+++ extra-x86_64/wicd.desktop	2008-09-04 02:01:22 UTC (rev 11821)
@@ -1,9 +1,9 @@
 [Desktop Entry]
 Categories=Application;Network;Internet;
 Encoding=UTF-8
-Exec=/usr/lib/wicd/gui.py
+Exec=/usr/bin/wicd-client
 GenericName=Network Manager
-Icon=/usr/share/pixmaps/wicd.png
+Icon=/usr/share/pixmaps/wicd/wicd-client.png
 Comment=Manage Wired/Wireless Networks
 Name=Wicd
 Terminal=false

Modified: extra-x86_64/wicd.install
===================================================================
--- extra-x86_64/wicd.install	2008-09-04 01:58:11 UTC (rev 11820)
+++ extra-x86_64/wicd.install	2008-09-04 02:01:22 UTC (rev 11821)
@@ -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/tray.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

More information about the arch-commits mailing list