[arch-commits] CVS update of extra/network/wicd (4 files)

[Varun Acharya]

    Date: Thursday, November 8, 2007 @ 02:08:19
  Author: varun
    Path: /home/cvs-extra/extra/network/wicd

   Added: wicd.desktop (1.1)
Modified: PKGBUILD (1.1 -> 1.2) wicd-daemon (1.1 -> 1.2)
          wicd.install (1.2 -> 1.3)

PKGBUILD cleanup,added .desktop


--------------+
 PKGBUILD     |   69 ++++++++++++++++++++++++++++++++++++++++++---------------
 wicd-daemon  |    2 -
 wicd.desktop |   11 +++++++++
 wicd.install |    4 +--
 4 files changed, 65 insertions(+), 21 deletions(-)


Index: extra/network/wicd/PKGBUILD
diff -u extra/network/wicd/PKGBUILD:1.1 extra/network/wicd/PKGBUILD:1.2
--- extra/network/wicd/PKGBUILD:1.1	Mon Nov  5 09:35:20 2007
+++ extra/network/wicd/PKGBUILD	Thu Nov  8 02:08:19 2007
@@ -3,7 +3,7 @@
 
 pkgname=wicd
 pkgver=1.3.1
-pkgrel=4
+pkgrel=5
 pkgdesc="New and alternative wireless/wired network management utility"
 arch=('i686' 'x86_64')
 url="http://wicd.sourceforge.net/"
@@ -12,33 +12,66 @@
 conflicts=()
 install=wicd.install
 source=(http://downloads.sourceforge.net/sourceforge/$pkgname/wicd_$pkgver-src.tar.bz2 \
-        wicd-daemon)
+        wicd-daemon wicd.desktop)
 options=(!emptydirs)
 md5sums=('7ec32f0a88fee1ed61da038244eb692c' \
-        '27dfe9ef6a5f9a0b4f7ad925fb6db1b8')
-
+         '8835ed1d4aba7effe3f157eeb0b66443' \
+         'a37f63a6c82491116d5b69540ae13d25')
+                       
+  
 build() {
    
-# wicd moved to /usr/share
-  sed -i -e 's_/opt_/usr/share_' ${startdir}/src/etc/acpi/resume.d/80-wicd-connect.sh
-  sed -i -e 's_/opt_/usr/share_' ${startdir}/src/etc/init.d/wicd || return 1
-  sed -i -e 's_/opt_/usr/share_' ${startdir}/src/opt/wicd/gui.py || return 1
- 
-  mv ${startdir}/src/opt/* ${startdir}/src/usr/share
-  cp -R ${startdir}/src/usr ${startdir}/pkg/
-  
-  #Fix permissions
-  
-  chmod -R 755 ${startdir}/pkg/usr/
+  # wicd moved to /usr/lib
+  sed -i -e 's_/opt_/usr/lib_' ${startdir}/src/etc/acpi/resume.d/80-wicd-connect.sh || return 1
+  sed -i -e 's_/opt_/usr/lib_' ${startdir}/src/etc/init.d/wicd || return 1
+  sed -i -e 's_/opt_/usr/lib_' ${startdir}/src/opt/wicd/gui.py || return 1
+  sed -i -e 's_images/_/usr/share/wicd/images/_' ${startdir}/src/opt/wicd/{edgy,dapper}.py
+
+  #Create Directories
+  mkdir -p ${startdir}/pkg/usr/lib
+  mkdir -p ${startdir}/pkg/usr/share/locale
+  mkdir -p ${startdir}/pkg/usr/share/wicd
   
-# Leave init.d pseudo-daemon and add custom rc.d script
+  #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
+
+  #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
+
+  # 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
+  # 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-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
+
+
+  #Fix permissions
+  chmod -R 755 ${startdir}/pkg/usr/lib/wicd
+  chmod 644 ${startdir}/pkg/usr/share/applications/wicd.desktop
+  chmod 644 ${startdir}/pkg/usr/share/locale/*.po*
+  chmod 644 ${startdir}/pkg/usr/share/locale/{en_US,es_ES,fi_FI,it_IT,nl_NL,pl_PL,sv_SE}/LC_MESSAGES/*.mo
+  chmod 644 ${startdir}/pkg/usr/share/wicd/images/*.png
+  chmod 644 ${startdir}/pkg/usr/share/pixmaps/wicd.png
+
 }
Index: extra/network/wicd/wicd-daemon
diff -u extra/network/wicd/wicd-daemon:1.1 extra/network/wicd/wicd-daemon:1.2
--- extra/network/wicd/wicd-daemon:1.1	Mon Nov  5 09:35:20 2007
+++ extra/network/wicd/wicd-daemon	Thu Nov  8 02:08:19 2007
@@ -7,7 +7,7 @@
   start)
     stat_busy "Starting wicd Daemon"
     killall daemon.py &> /dev/null
-    /usr/share/wicd/daemon.py &> /dev/null
+    /usr/lib/wicd/daemon.py &> /dev/null
     add_daemon wicd
     stat_done
     ;;
Index: extra/network/wicd/wicd.desktop
diff -u /dev/null extra/network/wicd/wicd.desktop:1.1
--- /dev/null	Thu Nov  8 02:08:19 2007
+++ extra/network/wicd/wicd.desktop	Thu Nov  8 02:08:19 2007
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Categories=Application;Network;Internet;
+Encoding=UTF-8
+Exec=/usr/lib/wicd/gui.py
+GenericName=Network Manager
+Icon=/usr/share/pixmaps/wicd.png
+Comment=Manage Wired/Wireless Networks
+Name=Wicd
+Terminal=false
+Type=Application
+Version=1.0
Index: extra/network/wicd/wicd.install
diff -u extra/network/wicd/wicd.install:1.2 extra/network/wicd/wicd.install:1.3
--- extra/network/wicd/wicd.install:1.2	Mon Nov  5 09:37:32 2007
+++ extra/network/wicd/wicd.install	Thu Nov  8 02:08:19 2007
@@ -15,11 +15,11 @@
   echo
   echo "Wireless Interface Connection Daemon"
   echo
-  echo "==> To run: /usr/share/wicd/gui.py"
+  echo "==> To run: /usr/lib/wicd/gui.py"
   sleep 1
   
   echo
-  echo "==> Tray: /usr/share/wicd/tray.py"
+  echo "==> Tray: /usr/lib/wicd/tray.py"
   echo "==> Add it to your autostart folder"
   echo "==> to have wicd tray applet appear at startup."
   sleep 1