dbus-0.6x: unify patches

diff --git a/packages/dbus/dbus-0.61/.mtn2git_empty b/packages/dbus/dbus-0.61/.mtn2git_empty
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/packages/dbus/dbus-0.61/dbus-1.init b/packages/dbus/dbus-0.61/dbus-1.init
deleted file mode 100644 (file)
index 60440b7..0000000
--- a/packages/dbus/dbus-0.61/dbus-1.init
+++ /dev/null
@@ -1,86 +0,0 @@
-#! /bin/sh
-# -*- coding: utf-8 -*-
-# Debian init.d script for D-BUS
-# Copyright © 2003 Colin Walters <walters@debian.org>
-
-set -e
-
-DAEMON=/usr/bin/dbus-daemon
-NAME=dbus-1
-DAEMONUSER=messagebus
-PIDDIR=/var/run/dbus
-PIDFILE=$PIDDIR/pid
-DESC="system message bus"
-EVENTDIR=/etc/dbus-1/event.d
-
-test -x $DAEMON || exit 0
-
-# Source defaults file; edit that file to configure this script.
-ENABLED=1
-PARAMS=""
-if [ -e /etc/default/dbus-1 ]; then
-  . /etc/default/dbus-1
-fi
-
-test "$ENABLED" != "0" || exit 0
-
-start_it_up()
-{
-  if [ ! -d $PIDDIR ]; then
-    mkdir -p $PIDDIR
-    chown $DAEMONUSER $PIDDIR
-    chgrp $DAEMONUSER $PIDDIR
-  fi
-  if [ -e $PIDFILE ]; then
-    PIDDIR=/proc/$(cat $PIDFILE)
-    if [ -d ${PIDDIR} -a  "$(readlink -f ${PIDDIR}/exe)" = "${DAEMON}" ]; then 
-      echo "$DESC already started; not starting."
-    else
-      echo "Removing stale PID file $PIDFILE."
-      rm -f $PIDFILE
-    fi
-  fi
-  echo -n "Starting $DESC: "
-  start-stop-daemon --start --quiet --pidfile $PIDFILE \
-    --user $DAEMONUSER --exec $DAEMON -- --system $PARAMS
-  echo "$NAME."
-  if [ -d $EVENTDIR ]; then
-      run-parts --arg=start $EVENTDIR
-  fi
-}
-
-shut_it_down()
-{
-  if [ -d $EVENTDIR ]; then
-      run-parts --reverse --arg=stop $EVENTDIR
-  fi
-  echo -n "Stopping $DESC: "
-  start-stop-daemon --stop  --quiet --pidfile $PIDFILE \
-    --user $DAEMONUSER
-  # We no longer include these arguments so that start-stop-daemon
-  # can do its job even given that we may have been upgraded.
-  # We rely on the pidfile being sanely managed
-  # --exec $DAEMON -- --system $PARAMS
-  echo "$NAME."
-  rm -f $PIDFILE
-}
-
-case "$1" in
-  start)
-    start_it_up
-  ;;
-  stop)
-    shut_it_down
-  ;;
-  restart|force-reload)
-    shut_it_down
-    sleep 1
-    start_it_up
-  ;;
-  *)
-    echo "Usage: /etc/init.d/$NAME {start|stop|restart|force-reload}" >&2
-    exit 1
-  ;;
-esac
-
-exit 0

diff --git a/packages/dbus/dbus-0.61/no-bindings.patch b/packages/dbus/dbus-0.61/no-bindings.patch
deleted file mode 100644 (file)
index ccfc3f8..0000000
--- a/packages/dbus/dbus-0.61/no-bindings.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- dbus-0.50/tools/Makefile.am.orig   2005-09-07 10:05:38 +0200
-+++ dbus-0.50/tools/Makefile.am        2005-09-07 10:06:30 +0200
-@@ -6,9 +6,6 @@
- nodist_libdbus_glib_HEADERS = dbus-glib-bindings.h
- libdbus_glibdir = $(includedir)/dbus-1.0/dbus
- 
--dbus-glib-bindings.h: dbus-bus-introspect.xml $(top_builddir)/glib/dbus-binding-tool$(EXEEXT)
--      $(top_builddir)/glib/dbus-binding-tool --mode=glib-client --output=dbus-glib-bindings.h dbus-bus-introspect.xml
--
- BUILT_SOURCES = dbus-glib-bindings.h dbus-bus-introspect.xml
- 
- else

diff --git a/packages/dbus/dbus-0.61/no-introspect.patch b/packages/dbus/dbus-0.61/no-introspect.patch
deleted file mode 100644 (file)
index 1e43dd1..0000000
--- a/packages/dbus/dbus-0.61/no-introspect.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- dbus-0.50/tools/Makefile.am.orig   2005-09-07 10:03:49 +0200
-+++ dbus-0.50/tools/Makefile.am        2005-09-07 10:04:28 +0200
-@@ -21,11 +21,6 @@
- GTK_TOOLS=
- endif
- 
--if HAVE_GLIB
--dbus-bus-introspect.xml: $(top_builddir)/bus/dbus-daemon$(EXEEXT) dbus-launch$(EXEEXT) dbus-send$(EXEEXT) $(top_builddir)/bus/dbus-daemon$(EXEEXT) Makefile
--      DBUS_TOP_BUILDDIR=$(top_builddir) $(srcdir)/run-with-tmp-session-bus.sh ./dbus-send --print-reply=literal --dest=org.freedesktop.DBus /org/freedesktop/DBus org.freedesktop.DBus.Introspectable.Introspect > dbus-bus-introspect.xml.tmp && mv dbus-bus-introspect.xml.tmp dbus-bus-introspect.xml
--endif
--
- bin_PROGRAMS=dbus-send $(GLIB_TOOLS) dbus-launch dbus-cleanup-sockets $(GTK_TOOLS)
- 
- dbus_send_SOURCES=                            \

diff --git a/packages/dbus/dbus-0.60/.mtn2git_empty b/packages/dbus/dbus-0.6x/.mtn2git_empty
similarity index 100%
rename from packages/dbus/dbus-0.60/.mtn2git_empty
rename to packages/dbus/dbus-0.6x/.mtn2git_empty

diff --git a/packages/dbus/dbus-0.60/dbus-1.init b/packages/dbus/dbus-0.6x/dbus-1.init
similarity index 100%
rename from packages/dbus/dbus-0.60/dbus-1.init
rename to packages/dbus/dbus-0.6x/dbus-1.init

diff --git a/packages/dbus/dbus-0.60/no-bindings.patch b/packages/dbus/dbus-0.6x/no-bindings.patch
similarity index 100%
rename from packages/dbus/dbus-0.60/no-bindings.patch
rename to packages/dbus/dbus-0.6x/no-bindings.patch

diff --git a/packages/dbus/dbus-0.60/no-introspect.patch b/packages/dbus/dbus-0.6x/no-introspect.patch
similarity index 100%
rename from packages/dbus/dbus-0.60/no-introspect.patch
rename to packages/dbus/dbus-0.6x/no-introspect.patch

diff --git a/packages/dbus/dbus_0.60.bb b/packages/dbus/dbus_0.60.bb
index e827457..f8e1681 100644 (file)
--- a/packages/dbus/dbus_0.60.bb
+++ b/packages/dbus/dbus_0.60.bb
@@ -1,6 +1,6 @@
 include dbus_${PV}.inc
 
-
+FILESPATH = "${FILE_DIRNAME}/dbus-0.6x:${FILE_DIRNAME}/dbus"
 DEPENDS = "expat glib-2.0 virtual/libintl dbus-native"
 SRC_URI_EXTRA = "file://no-introspect.patch;patch=1 file://no-bindings.patch;patch=1"
 

diff --git a/packages/dbus/dbus_0.61.bb b/packages/dbus/dbus_0.61.bb
index e827457..f8e1681 100644 (file)
--- a/packages/dbus/dbus_0.61.bb
+++ b/packages/dbus/dbus_0.61.bb
@@ -1,6 +1,6 @@
 include dbus_${PV}.inc
 
-
+FILESPATH = "${FILE_DIRNAME}/dbus-0.6x:${FILE_DIRNAME}/dbus"
 DEPENDS = "expat glib-2.0 virtual/libintl dbus-native"
 SRC_URI_EXTRA = "file://no-introspect.patch;patch=1 file://no-bindings.patch;patch=1"