[arch-commits] Commit in wicd/trunk (PKGBUILD wicd.install)

[daniel at nymeria.archlinux.org]

    Date: Tuesday, January 22, 2013 @ 19:43:20
  Author: daniel
Revision: 175848

upgpkg: wicd 1.7.2.4-6

Fixed FS#33378 and FS#33317

Modified:
  wicd/trunk/PKGBUILD
  wicd/trunk/wicd.install

--------------+
 PKGBUILD     |   15 ++++++++++++---
 wicd.install |    6 +-----
 2 files changed, 13 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-01-22 18:30:51 UTC (rev 175847)
+++ PKGBUILD	2013-01-22 18:43:20 UTC (rev 175848)
@@ -5,7 +5,7 @@
 pkgbase=wicd
 pkgname=('wicd' 'wicd-gtk')
 pkgver=1.7.2.4
-pkgrel=5
+pkgrel=6
 arch=(any)
 url="http://wicd.sourceforge.net/"
 license=('GPL2')
@@ -13,13 +13,17 @@
 install=wicd.install
 source=(http://launchpad.net/wicd/1.7/$pkgver/+download/wicd-$pkgver.tar.gz             wicd-daemon
         wicd.desktop
-        dbus_string_fix.patch)
+        dbus_string_fix.patch
+	http://bazaar.launchpad.net/~wicd-devel/wicd/experimental/diff/831
+	http://bazaar.launchpad.net/~wicd-devel/wicd/experimental/diff/835)
 makedepends=('python2' 'python2-babel' 'python2-distribute' 'gettext')
 options=('emptydirs')
 md5sums=('c2435ddfdef0b9898852d72a85a45f0f'
          'f40e5f59998d0829707a7c9976afa8f8'
          '326df163a5732d38741371baa4fce9e5'
-         '744b3c12fe901ed435351e884dc8cb1d')
+         '744b3c12fe901ed435351e884dc8cb1d'
+         '0d2355bc2eb7234a537f42f1773edfe0'
+         '1630d7fe8f09911302d33b26286ff9b8')
 
 build() {
   cd "$srcdir/$pkgbase-$pkgver"
@@ -29,6 +33,11 @@
   
   patch -p0 < "$srcdir/dbus_string_fix.patch"
   
+  # Fix problem with new urwid FS#33378 LP#1075399
+  patch -Np0 -i "$srcdir/831"
+  patch -Np0 -i "$srcdir/835"
+
+
   python2 setup.py configure --no-install-init \
 	                     --resume=/usr/share/wicd/scripts/ \
                              --suspend=/usr/share/wicd/scripts/ \

Modified: wicd.install
===================================================================
--- wicd.install	2013-01-22 18:30:51 UTC (rev 175847)
+++ wicd.install	2013-01-22 18:43:20 UTC (rev 175848)
@@ -13,11 +13,7 @@
   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."
-  echo "==> Wireless Interface Connection Daemon"
+  echo "==> utility and add 'wicd' to your systemd configuration."
   echo
   echo "==> To run: wicd-cli or wicd-curses"    
 }