Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community-testing/cegui/PKGBUILD
	community-testing/darktable/PKGBUILD
	community-testing/freewrl/PKGBUILD
	community-testing/gambas3/PKGBUILD
	community-testing/gource/PKGBUILD
	community-testing/luminancehdr/PKGBUILD
	community-testing/luxrays/PKGBUILD
	community-testing/luxrender/PKGBUILD
	community-testing/megaglest/PKGBUILD
	community-testing/openimageio/PKGBUILD
	community-testing/performous/PKGBUILD
	community-testing/projectm/PKGBUILD
	community-testing/rss-glx/PKGBUILD
	community-testing/sfml/PKGBUILD
	community-testing/spring/PKGBUILD
	community-testing/supertux/PKGBUILD
	community-testing/widelands/PKGBUILD
	community-testing/xbmc/PKGBUILD
	community-testing/xbmc/xbmc.install
	community/plan9port/PKGBUILD
	community/v8/PKGBUILD
	multilib/dev86/PKGBUILD
	testing/binutils/PKGBUILD
	testing/bzflag/PKGBUILD
	testing/calligra/PKGBUILD
	testing/cinepaint/PKGBUILD
	testing/coreutils/PKGBUILD
	testing/enblend-enfuse/PKGBUILD
	testing/gcc/PKGBUILD
	testing/gegl/PKGBUILD
	testing/glew/PKGBUILD
	testing/glibc/PKGBUILD
	testing/glibc/glibc.install
	testing/glibc/nscd.service
	testing/gnome-documents/PKGBUILD
	testing/hugin/PKGBUILD
	testing/inkscape/PKGBUILD
	testing/opencv/PKGBUILD
	testing/systemd/PKGBUILD
	testing/systemd/systemd.install
	testing/tracker/PKGBUILD
	testing/transcode/PKGBUILD
	testing/transcode/ffmpeg-0.11.patch
	testing/xf86-video-nouveau/PKGBUILD
	testing/xine-lib/PKGBUILD

1 files changed, 0 insertions, 44 deletions

diff --git a/community-testing/connman/connmand-daemon b/community-testing/connman/connmand-daemon
deleted file mode 100755
index aff1ddeb2..000000000
--- a/community-testing/connman/connmand-daemon
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-DESC="Connection Manager"
-NAME="connmand"
-ARGS=""
-DAEMON="/usr/sbin/$NAME"
-
-PID=`pidof -o %PPID ${DAEMON}`
-case "$1" in
-  start)
-    stat_busy "Starting ${DESC}"
-    if [ -z "$PID" ]; then
-       ${DAEMON} ${ARGS}
-    fi
-    if [ ! -z "$PID" -o $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon ${NAME}
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping ${DESC}"
-    [ ! -z "$PID" ]  && killall ${DAEMON} &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon ${NAME}
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-        echo "usage: $0 {start|stop|restart}"
-	;;
-esac
-exit 0