[maemo-commits] [maemo-commits] r17249 - projects/haf/trunk/dbus/debian

[From: subversion at stage.maemo.org]

Author: guillem
Date: 2009-01-21 16:39:30 +0200 (Wed, 21 Jan 2009)
New Revision: 17249

Modified:
   projects/haf/trunk/dbus/debian/changelog
   projects/haf/trunk/dbus/debian/control
   projects/haf/trunk/dbus/debian/dbus.init
   projects/haf/trunk/dbus/debian/rules
Log:
Sync with Debian packaging 1.2.1-5

Reenable X support for dbus-x11.
Add back dbus-x11 as a Recommends in dbus.
Upgrade lsb-base versioned dependency to 3.2-14.
Add status support to the init script.


Modified: projects/haf/trunk/dbus/debian/changelog
===================================================================
--- projects/haf/trunk/dbus/debian/changelog	2009-01-21 14:34:12 UTC (rev 17248)
+++ projects/haf/trunk/dbus/debian/changelog	2009-01-21 14:39:30 UTC (rev 17249)
@@ -2,6 +2,11 @@
 
   * New upstream release.
     - debian/patches/01-add-initgroups-call.patch: Refresh.
+  * Sync with Debian packaging 1.2.1-5.
+    - Reenable X support for dbus-x11.
+    - Add back dbus-x11 as a Recommends in dbus.
+    - Upgrade lsb-base versioned dependency to 3.2-14.
+    - Add status support to the init script.
   * Update copyright years in scripts, and use UTF-8 symbol.
   * Use log_warning_msg instead of echo in init script.
   * Use binary:Version substvar instead of obsolete Source-Version.

Modified: projects/haf/trunk/dbus/debian/control
===================================================================
--- projects/haf/trunk/dbus/debian/control	2009-01-21 14:34:12 UTC (rev 17248)
+++ projects/haf/trunk/dbus/debian/control	2009-01-21 14:39:30 UTC (rev 17249)
@@ -7,7 +7,8 @@
                quilt,
                autotools-dev,
                libexpat1-dev,
-               doxygen
+               doxygen,
+               libx11-dev
 Standards-Version: 3.7.3
 Homepage: http://dbus.freedesktop.org/
 
@@ -15,8 +16,8 @@
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         passwd,
-         lsb-base (>= 3.1)
+         passwd
+         lsb-base (>= 3.2-14)
 Conflicts: libdbus0,
            dbus-1,
            dbus-1-utils (<< 1.0.2-5),
@@ -25,6 +26,7 @@
           dbus-1,
           dbus-1-utils (<< 1.0.2-5)
 Provides: dbus-1-utils
+Recommends: dbus-x11
 Description: simple interprocess messaging system
  D-Bus is a message bus, used for sending messages between applications.
  Conceptually, it fits somewhere in between raw sockets and CORBA in

Modified: projects/haf/trunk/dbus/debian/dbus.init
===================================================================
--- projects/haf/trunk/dbus/debian/dbus.init	2009-01-21 14:34:12 UTC (rev 17248)
+++ projects/haf/trunk/dbus/debian/dbus.init	2009-01-21 14:39:30 UTC (rev 17249)
@@ -201,8 +201,11 @@
     sleep 1 # XXX why?
     start_it_up
   ;;
+  status)
+    status_of_proc -p $PIDFILE $DAEMON $NAME && exit 0 || exit $?
+    ;;
   *)
-    echo "Usage: /etc/init.d/$NAME {start|stop|reload|restart|force-reload}" >&2
+    echo "Usage: /etc/init.d/$NAME {start|stop|reload|restart|force-reload|status}" >&2
     exit 2
   ;;
 esac

Modified: projects/haf/trunk/dbus/debian/rules
===================================================================
--- projects/haf/trunk/dbus/debian/rules	2009-01-21 14:34:12 UTC (rev 17248)
+++ projects/haf/trunk/dbus/debian/rules	2009-01-21 14:39:30 UTC (rev 17249)
@@ -19,7 +19,6 @@
 DEB_CONFIGURE_LIBEXECDIR := "\$${prefix}/lib/dbus-1.0"
 
 DEB_CONFIGURE_EXTRA_FLAGS += \
-	--without-x \
 	--disable-xml-docs \
 	--enable-doxygen-docs