dbus: make Marcin happy:

* create a dbus.inc
* remove outdated dbi
* remove DEFAULT_PREFERENCE from 1.0.1
* dbus-glib still has both versions since 0.72 doesn't build for me

3 files changed, 0 insertions, 97 deletions

diff --git a/packages/dbus/dbus-0.91/.mtn2git_empty b/packages/dbus/dbus-0.91/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/dbus/dbus-0.91/.mtn2git_empty
+++ /dev/null
diff --git a/packages/dbus/dbus-0.91/dbus-1.init b/packages/dbus/dbus-0.91/dbus-1.init
deleted file mode 100644
index 60440b7223..0000000000
--- a/packages/dbus/dbus-0.91/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.91/fix-segfault.patch b/packages/dbus/dbus-0.91/fix-segfault.patch
deleted file mode 100644
index de5bcff774..0000000000
--- a/packages/dbus/dbus-0.91/fix-segfault.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- /tmp/dbus-marshal-recursive.c	2006-07-28 14:58:08.000000000 +0200
-+++ dbus-0.90/dbus/dbus-marshal-recursive.c	2006-07-28 14:58:18.724411000 +0200
-@@ -1294,7 +1294,7 @@
-                                                _dbus_string_get_length (&block->replacement) - block->padding,
-                                                &fixups))
-     goto oom;
--
-+printf("%s(%d)""got here", __FILE__, __LINE__);
- #if RECURSIVE_MARSHAL_WRITE_TRACE
-   _dbus_verbose ("REPLACEMENT at padding %d len %d\n", block->padding,
-                  _dbus_string_get_length (&block->replacement) - block->padding);