Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/clementine/PKGBUILD
	community/google-gadgets/PKGBUILD
	community/redis/PKGBUILD
	community/uzbl/PKGBUILD
	extra/anjuta/PKGBUILD
	extra/atkmm/PKGBUILD
	extra/ekiga/PKGBUILD
	extra/epiphany/PKGBUILD
	extra/evolution-data-server/PKGBUILD
	extra/gdl/PKGBUILD
	extra/glade/PKGBUILD
	extra/glibmm/PKGBUILD
	extra/gnome-control-center/PKGBUILD
	extra/gnome-desktop/PKGBUILD
	extra/gnome-menus/PKGBUILD
	extra/gnome-nettool/PKGBUILD
	extra/gnome-panel/PKGBUILD
	extra/gnome-sharp/PKGBUILD
	extra/gtk2/PKGBUILD
	extra/gtkmm/PKGBUILD
	extra/libchamplain/PKGBUILD
	extra/libgda/PKGBUILD
	extra/libotr/PKGBUILD
	extra/libvncserver/PKGBUILD
	extra/libwebkit/PKGBUILD
	extra/notification-daemon/PKGBUILD
	extra/pangomm/PKGBUILD
	extra/pidgin/PKGBUILD
	extra/pygobject/PKGBUILD
	extra/rasqal/PKGBUILD
	extra/redland/PKGBUILD
	extra/vte/PKGBUILD
	extra/xarchiver/PKGBUILD
	extra/yelp/PKGBUILD
	testing/gnome-control-center/PKGBUILD
	testing/mesa/PKGBUILD
	testing/rasqal/PKGBUILD
	testing/redland/PKGBUILD

3 files changed, 10 insertions, 20 deletions

diff --git a/community/systemd/PKGBUILD b/community/systemd/PKGBUILD
index 9cf223be6..2eab37e96 100644
--- a/community/systemd/PKGBUILD
+++ b/community/systemd/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 45374 2011-04-21 02:36:08Z dreisner $
+# $Id: PKGBUILD 45855 2011-04-30 03:24:21Z dreisner $
 # Maintainer: Dave Reisner <d@falconindy.com>
 
 pkgname=systemd
-pkgver=25
+pkgver=26
 pkgrel=1
 pkgdesc="Session and Startup manager"
 arch=('i686' 'x86_64' 'mips64el')
@@ -25,8 +25,8 @@ backup=(etc/systemd/system.conf
 install=systemd.install
 source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.bz2"
         "os-release")
-md5sums=('11c64b4af8ba863d650b6a7339610fc2'
-         'f9922299150b4adda7b89e10bca33033')
+md5sums=('b7c468aa400c64d02d533eba6359e283'
+         '752636def0db3c03f121f8b4f44a63cd')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -48,8 +48,8 @@ package() {
   make DESTDIR="$pkgdir" install
 
   install -Dm644 "$srcdir/os-release" "$pkgdir/etc/os-release"
-  install -dm755 "$pkgdir/etc/modules-load.d" "$pkgdir/run"
-  printf "d /var/run/console 755 root root\n" > "$pkgdir/etc/tmpfiles.d/console.conf"
+  install -dm755 "$pkgdir/etc/modules-load.d"
+  printf "d /run/console 755 root root\n" > "$pkgdir/etc/tmpfiles.d/console.conf"
 
   # fix systemd-analyze for python2
   sed -i '1s/python$/python2/' "$pkgdir/usr/bin/systemd-analyze"
diff --git a/community/systemd/os-release b/community/systemd/os-release
index 0b45d5265..5e24a6031 100644
--- a/community/systemd/os-release
+++ b/community/systemd/os-release
@@ -1,4 +1,5 @@
-NAME=Arch Linux
+NAME="Arch Linux"
 ID=arch
-PRETTY_NAME=Arch Linux
-ANSI_COLOR=1;36
\ No newline at end of file
+PRETTY_NAME="Arch Linux"
+ANSI_COLOR="1;36"
+
diff --git a/community/systemd/systemd.install b/community/systemd/systemd.install
index 0c75c4b27..33d597bf1 100644
--- a/community/systemd/systemd.install
+++ b/community/systemd/systemd.install
@@ -9,17 +9,6 @@ post_install() {
 
   [ -f /etc/machine-id ] || /bin/systemd-machine-id-setup
 
-  # Try to read default runlevel from the old inittab if it exists
-  runlevel=$(/bin/awk -F':' '$3 == "initdefault" && $1 !~ "^#" { print $2 }' /etc/inittab 2> /dev/null)
-  if [ -z "$runlevel" ]; then
-    target="/lib/systemd/system/graphical.target"
-  else
-    target="/lib/systemd/system/runlevel$runlevel.target"
-  fi
-
-  # And symlink what we found to the new-style default.target
-  /bin/ln -sf "$target" /etc/systemd/system/default.target
-
   echo "systemd has been installed to /bin/systemd. Please ensure you append"
   echo "init=/bin/systemd to your kernel command line in your bootloader."
 }