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

Eric Bélanger eric at nymeria.archlinux.org
Fri May 31 01:28:20 EDT 2013


    Date: Friday, May 31, 2013 @ 07:28:19
  Author: eric
Revision: 186768

archrelease: copy trunk to staging-any

Added:
  wicd/repos/staging-any/
  wicd/repos/staging-any/PKGBUILD
    (from rev 186767, wicd/trunk/PKGBUILD)
  wicd/repos/staging-any/dbus_string_fix.patch
    (from rev 186767, wicd/trunk/dbus_string_fix.patch)
  wicd/repos/staging-any/wicd-gtk.install
    (from rev 186767, wicd/trunk/wicd-gtk.install)
  wicd/repos/staging-any/wicd.desktop
    (from rev 186767, wicd/trunk/wicd.desktop)
  wicd/repos/staging-any/wicd.install
    (from rev 186767, wicd/trunk/wicd.install)

-----------------------+
 PKGBUILD              |  114 ++++++++++++++++++++++++++++++++++++++++++++++++
 dbus_string_fix.patch |   16 ++++++
 wicd-gtk.install      |   11 ++++
 wicd.desktop          |   11 ++++
 wicd.install          |   19 ++++++++
 5 files changed, 171 insertions(+)

Copied: wicd/repos/staging-any/PKGBUILD (from rev 186767, wicd/trunk/PKGBUILD)
===================================================================
--- staging-any/PKGBUILD	                        (rev 0)
+++ staging-any/PKGBUILD	2013-05-31 05:28:19 UTC (rev 186768)
@@ -0,0 +1,114 @@
+# $Id$
+# Maintainer: Daniel Isenmann <daniel at archlinux.org>
+# Contributor: Rashif "Don Ray" Rahman <rayrashif at gmail.com>
+
+pkgbase=wicd
+pkgname=('wicd' 'wicd-gtk')
+pkgver=1.7.2.4
+pkgrel=7
+arch=(any)
+url="http://wicd.sourceforge.net/"
+license=('GPL2')
+conflicts=('wicd-svn')
+install=wicd.install
+source=(http://launchpad.net/wicd/1.7/$pkgver/+download/wicd-$pkgver.tar.gz
+        wicd.desktop
+        dbus_string_fix.patch
+	http://bazaar.launchpad.net/~wicd-devel/wicd/experimental/diff/831
+	http://bazaar.launchpad.net/~wicd-devel/wicd/experimental/diff/835)
+md5sums=('c2435ddfdef0b9898852d72a85a45f0f'
+         '326df163a5732d38741371baa4fce9e5'
+         '744b3c12fe901ed435351e884dc8cb1d'
+         '0d2355bc2eb7234a537f42f1773edfe0'
+         '1630d7fe8f09911302d33b26286ff9b8')
+makedepends=('python2' 'python2-babel' 'python2-distribute' 'gettext' 'dbus-glib' 'dhcpcd' 
+             'ethtool' 'inetutils' 'net-tools' 'pygtk' 'python2-dbus' 'python2-gobject2' 
+             'python2-urwid' 'rfkill' 'shared-mime-info' 'wireless_tools' 'wpa_supplicant'
+             'hicolor-icon-theme')
+options=('emptydirs')
+
+prepare() {
+  cd $pkgbase-$pkgver
+
+  find . -type f -exec sed -i 's@#!/usr.*python@#!/usr/bin/python2@' {} \;
+  export PYTHON=python2
+  
+  sed -i 's|/usr/sbin/|/usr/bin/|' other/wicd.service
+
+  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"
+}
+
+build() {
+  cd $pkgbase-$pkgver
+
+  python2 setup.py configure --no-install-init \
+	                     --resume=/usr/share/wicd/scripts/ \
+                             --suspend=/usr/share/wicd/scripts/ \
+                             --verbose \
+                             --python=/usr/bin/python2 \
+			     --lib=/usr/lib \
+			     --sbin=/usr/bin \
+			     --systemd=/usr/lib/systemd/system
+  
+  #HACK for https://bugs.launchpad.net/wicd/+bug/928589
+  mkdir -p translations/ast/LC_MESSAGES
+  msgfmt po/ast.po -o translations/ast/LC_MESSAGES/wicd.mo
+}
+
+package_wicd() {
+  pkgdesc="Wired and wireless network manager for Linux"
+  depends=('python2' 'python2-dbus' 'dhcpcd' 'wpa_supplicant' 'wireless_tools'
+           'inetutils' 'net-tools' 'ethtool' 'shared-mime-info' 'python2-urwid' 'python2-gobject2' 'dbus-glib' 'rfkill')
+  optdepends=('wicd-gtk: needed if you want the GTK interface')
+  backup=('etc/wicd/encryption/templates/active')
+  install=wicd.install  
+
+  cd $pkgbase-$pkgver
+  python2 setup.py install --optimize=1 --root="$pkgdir"
+
+  cd build/lib/wicd
+  for i in *.py; do
+    install -Dm 755 $i "$pkgdir/usr/lib/wicd/$i"
+  done
+  
+  rm -rf "$pkgdir"/usr/share/autostart
+
+  #deleting the GTK stuff
+  rm -rf "$pkgdir"/etc/xdg
+  rm -f "$pkgdir"/usr/bin/{wicd-client,wicd-gtk}
+  rm -rf "$pkgdir"/usr/share/{applications,icons,pixmaps}
+  rm -rf "$pkgdir"/usr/share/wicd/gtk  
+}
+
+package_wicd-gtk() {
+  pkgdesc="Wired and wireless network manager for Linux - GTK client"
+  depends=('wicd' 'pygtk' 'hicolor-icon-theme')
+  optdepends=('gksu: needed to access some preferences in gtk interface'
+              'notification-daemon: needed if you want notifications'
+              'python2-notify:	needed if you want notifications')
+  install=wicd-gtk.install 
+
+  cd $pkgbase-$pkgver
+  python2 setup.py install --optimize=1 --root="$pkgdir"
+
+  install -Dm644 "$srcdir/wicd.desktop" "$pkgdir/usr/share/applications/wicd.desktop"
+
+  cd build/lib/wicd
+  for i in *.py; do
+    install -Dm 755 $i "$pkgdir"/usr/lib/wicd/$i
+  done
+  
+  #deleting the core dirs which exists in wicd
+  rm -rf "$pkgdir"/etc/{wicd,dbus-1,rc.d,logrotate.d}
+  rm -rf "$pkgdir"/usr/lib
+  rm -rf "$pkgdir"/usr/share/{man,doc,locale,wicd/curses,wicd/daemon,wicd/backends,wicd/scripts,wicd/cli}
+  rm -rf "$pkgdir"/var
+  rm -f "$pkgdir"/usr/bin/{wicd,wicd-curses,wicd-cli}
+
+  rm -rf "$pkgdir"/usr/share/autostart
+  rm -rf "$pkgdir"/usr/share/dbus-1
+}

Copied: wicd/repos/staging-any/dbus_string_fix.patch (from rev 186767, wicd/trunk/dbus_string_fix.patch)
===================================================================
--- staging-any/dbus_string_fix.patch	                        (rev 0)
+++ staging-any/dbus_string_fix.patch	2013-05-31 05:28:19 UTC (rev 186768)
@@ -0,0 +1,16 @@
+=== modified file 'wicd/misc.py'
+--- wicd/misc.py	2012-04-30 19:20:47 +0000
++++ wicd/misc.py	2012-05-03 16:01:49 +0000
+@@ -430,7 +430,10 @@
+     """ Sanitize property names to be used in config-files. """
+     allowed = string.ascii_letters + '_' + string.digits
+     table = string.maketrans(allowed, ' ' * len(allowed))
+-    return s.translate(None, table)
++
++    # s is a dbus.String -- since we don't allow unicode property keys,
++    # make it simple.
++    return str(s).translate(None, table)
+ 
+ def sanitize_escaped(s):
+     """ Sanitize double-escaped unicode strings. """
+

Copied: wicd/repos/staging-any/wicd-gtk.install (from rev 186767, wicd/trunk/wicd-gtk.install)
===================================================================
--- staging-any/wicd-gtk.install	                        (rev 0)
+++ staging-any/wicd-gtk.install	2013-05-31 05:28:19 UTC (rev 186768)
@@ -0,0 +1,11 @@
+post_install() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_upgrade
+}
+
+post_remove() {
+    post_upgrade
+}

Copied: wicd/repos/staging-any/wicd.desktop (from rev 186767, wicd/trunk/wicd.desktop)
===================================================================
--- staging-any/wicd.desktop	                        (rev 0)
+++ staging-any/wicd.desktop	2013-05-31 05:28:19 UTC (rev 186768)
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Categories=Network;
+Encoding=UTF-8
+Exec=/usr/bin/wicd-client
+GenericName=Network Manager
+Icon=wicd-gtk
+Comment=Manage Wired/Wireless Networks
+Name=Wicd
+Terminal=false
+Type=Application
+Version=1.0

Copied: wicd/repos/staging-any/wicd.install (from rev 186767, wicd/trunk/wicd.install)
===================================================================
--- staging-any/wicd.install	                        (rev 0)
+++ staging-any/wicd.install	2013-05-31 05:28:19 UTC (rev 186768)
@@ -0,0 +1,19 @@
+PKGNAME=wicd
+
+pre_remove () {
+    for pyo in $(pacman -Qql $PKGNAME  | grep \.py$ | sed 's|.py$|.pyo|g'); do
+        if [ -f "$pyo" ]; then
+            rm "$pyo"
+        fi
+    done
+}
+
+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 your systemd configuration."
+  echo
+  echo "==> To run: wicd-cli or wicd-curses"    
+}



More information about the arch-commits mailing list