[Pkg-utopia-commits] r381 - in packages/experimental/dbus/debian: . patches

Sjoerd Simons sjoerd at costa.debian.org
Sun Dec 4 12:16:44 UTC 2005


Author: sjoerd
Date: 2005-12-04 12:16:43 +0000 (Sun, 04 Dec 2005)
New Revision: 381

Added:
   packages/experimental/dbus/debian/libdbus-1-2.install
   packages/experimental/dbus/debian/libdbus-glib-1-2.install
   packages/experimental/dbus/debian/libdbus-qt-1-2.install
Removed:
   packages/experimental/dbus/debian/libdbus-1-1.install
   packages/experimental/dbus/debian/libdbus-glib-1-1.install
   packages/experimental/dbus/debian/libdbus-qt-1-1c2.install
   packages/experimental/dbus/debian/patches/dbus-reloadconfig-reply.patch
Modified:
   packages/experimental/dbus/debian/changelog
   packages/experimental/dbus/debian/control
Log:
New upstream release preperation

Modified: packages/experimental/dbus/debian/changelog
===================================================================
--- packages/experimental/dbus/debian/changelog	2005-11-30 15:06:52 UTC (rev 380)
+++ packages/experimental/dbus/debian/changelog	2005-12-04 12:16:43 UTC (rev 381)
@@ -1,3 +1,12 @@
+dbus (0.60-1) experimental; urgency=low
+
+  * New upstream release 
+  * Sonames of libdbus-1, libdbus-glib-1 and libdbus-qt-1 was bumped to 2
+  * debian/patches/dbus-reloadconfig-reply.patch
+    + Removed. Merged upstream
+
+ -- Sjoerd Simons <sjoerd at debian.org>  Sun,  4 Dec 2005 13:05:17 +0100
+
 dbus (0.50-3) experimental; urgency=low
 
   * Also move dbus-launch and dbus-send manpages to the dbus package

Modified: packages/experimental/dbus/debian/control
===================================================================
--- packages/experimental/dbus/debian/control	2005-11-30 15:06:52 UTC (rev 380)
+++ packages/experimental/dbus/debian/control	2005-12-04 12:16:43 UTC (rev 381)
@@ -27,14 +27,12 @@
  description of dbus-glib-1 for more information about those.
  .
  This package contains the D-BUS daemon; the client-side library can
- be found in the libdbus-1-1 package, as it is no longer contained in
+ be found in the libdbus-1-2 package, as it is no longer contained in
  this package.
 
-Package: libdbus-1-1
+Package: libdbus-1-2
 Architecture: any
 Depends: ${shlibs:Depends}
-Conflicts: libdbus0, dbus-1
-Replaces: libdbus0, dbus-1
 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
@@ -48,7 +46,7 @@
  .
  D-BUS is still under heavy development, but is expected to be widely
  used.  It comes with several interfaces, including GLib.  See the
- description of dbus-glib-1 for more information about those.
+ description of libdbus-glib-1-2 for more information about those.
  .
  The daemon can be found in the dbus package.
 
@@ -56,7 +54,6 @@
 Architecture: any
 Section: utils
 Depends: ${shlibs:Depends}, dbus
-Replaces: dbus-1 (<< 0.20-4)
 Description: simple interprocess messaging system (utilities)
  D-BUS is a message bus, used for sending messages between
  applications.  Conceptually, it fits somewhere in between raw sockets
@@ -86,7 +83,7 @@
 Package: libdbus-1-dev
 Section: libdevel
 Architecture: any
-Depends: libdbus-1-1 (= ${Source-Version}), pkg-config
+Depends: libdbus-1-2 (= ${Source-Version}), pkg-config
 Conflicts: dbus-1-dev
 Replaces: libdbus0-dev, dbus-1-dev 
 Description: simple interprocess messaging system (development headers)
@@ -99,7 +96,7 @@
 Package: libdbus-glib-1-dev
 Section: libdevel
 Architecture: any
-Depends: libdbus-glib-1-1 (= ${Source-Version}), libdbus-1-dev (= ${Source-Version}), libglib2.0-dev
+Depends: libdbus-glib-1-2 (= ${Source-Version}), libdbus-1-dev (= ${Source-Version}), libglib2.0-dev
 Conflicts: libdbus-glib-dev, dbus-glib-1-dev, dbus-1-utils (<< 0.50-2)
 Replaces: libdbus-glib0-dev, dbus-glib-1-dev
 Description: simple interprocess messaging system (GLib interface)
@@ -111,7 +108,7 @@
  .
  See the dbus description for more information about D-BUS in general.
 
-Package: libdbus-glib-1-1
+Package: libdbus-glib-1-2
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
@@ -128,7 +125,7 @@
 Package: libdbus-qt-1-dev
 Section: libdevel
 Architecture: any
-Depends: libdbus-qt-1-1c2 (= ${Source-Version}), libdbus-1-dev (= ${Source-Version}), libqt3-mt-dev 
+Depends: libdbus-qt-1-2 (= ${Source-Version}), libdbus-1-dev (= ${Source-Version}), libqt3-mt-dev 
 Conflicts: dbus-qt-1-dev
 Replaces: dbus-qt-1-dev
 Description: simple interprocess messaging system (Qt interface)
@@ -140,12 +137,10 @@
  .
  See the dbus description for more information about D-BUS in general.
 
-Package: libdbus-qt-1-1c2
+Package: libdbus-qt-1-2
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
-Conflicts: dbus-qt-1, dbus-qt-1c2, libdbus-qt-1-1
-Replaces: dbus-qt-1, dbus-qt-1c2, libdbus-qt-1-1
 Description: simple interprocess messaging system (Qt-based shared library)
  D-BUS is a message bus, used for sending messages between applications.
  Conceptually, it fits somewhere in between raw sockets and CORBA in
@@ -174,7 +169,7 @@
 Conflicts: libdbus-cil
 Replaces: libdbus-cil
 Architecture: i386 powerpc amd64
-Depends: ${cli:Depends}, libdbus-glib-1-1
+Depends: ${cli:Depends}, libdbus-glib-1-2
 Description: CLI binding for D-BUS 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

Deleted: packages/experimental/dbus/debian/libdbus-1-1.install
===================================================================
--- packages/experimental/dbus/debian/libdbus-1-1.install	2005-11-30 15:06:52 UTC (rev 380)
+++ packages/experimental/dbus/debian/libdbus-1-1.install	2005-12-04 12:16:43 UTC (rev 381)
@@ -1 +0,0 @@
-debian/tmp/usr/lib/libdbus-1*.so.*

Copied: packages/experimental/dbus/debian/libdbus-1-2.install (from rev 380, packages/experimental/dbus/debian/libdbus-1-1.install)

Deleted: packages/experimental/dbus/debian/libdbus-glib-1-1.install
===================================================================
--- packages/experimental/dbus/debian/libdbus-glib-1-1.install	2005-11-30 15:06:52 UTC (rev 380)
+++ packages/experimental/dbus/debian/libdbus-glib-1-1.install	2005-12-04 12:16:43 UTC (rev 381)
@@ -1 +0,0 @@
-debian/tmp/usr/lib/libdbus-glib*.so.*

Copied: packages/experimental/dbus/debian/libdbus-glib-1-2.install (from rev 380, packages/experimental/dbus/debian/libdbus-glib-1-1.install)

Deleted: packages/experimental/dbus/debian/libdbus-qt-1-1c2.install
===================================================================
--- packages/experimental/dbus/debian/libdbus-qt-1-1c2.install	2005-11-30 15:06:52 UTC (rev 380)
+++ packages/experimental/dbus/debian/libdbus-qt-1-1c2.install	2005-12-04 12:16:43 UTC (rev 381)
@@ -1 +0,0 @@
-debian/tmp/usr/lib/libdbus-qt*.so.*

Copied: packages/experimental/dbus/debian/libdbus-qt-1-2.install (from rev 380, packages/experimental/dbus/debian/libdbus-qt-1-1c2.install)

Deleted: packages/experimental/dbus/debian/patches/dbus-reloadconfig-reply.patch
===================================================================
--- packages/experimental/dbus/debian/patches/dbus-reloadconfig-reply.patch	2005-11-30 15:06:52 UTC (rev 380)
+++ packages/experimental/dbus/debian/patches/dbus-reloadconfig-reply.patch	2005-12-04 12:16:43 UTC (rev 381)
@@ -1,54 +0,0 @@
-Index: bus/driver.c
-===================================================================
-RCS file: /cvs/dbus/dbus/bus/driver.c,v
-retrieving revision 1.73
-retrieving revision 1.74
-diff -u -r1.73 -r1.74
---- bus/driver.c	3 Oct 2005 19:55:56 -0000	1.73
-+++ bus/driver.c	7 Nov 2005 21:57:13 -0000	1.74
-@@ -1094,23 +1094,34 @@
- 				 DBusError      *error)
- {
-   BusContext *context;
--  dbus_bool_t retval;
-+  DBusMessage *reply;
- 
-   _DBUS_ASSERT_ERROR_IS_CLEAR (error);
- 
--  retval = FALSE;
--
-+  reply = NULL;
-+  
-   context = bus_connection_get_context (connection);
-   if (!bus_context_reload_config (context, error))
--    {
--      _DBUS_ASSERT_ERROR_IS_SET (error);
--      goto out;
--    }
-+    goto failed;
- 
--  retval = TRUE;
--  
-- out:
--  return retval;
-+  reply = dbus_message_new_method_return (message);
-+  if (reply == NULL)
-+    goto oom;
-+
-+  if (! bus_transaction_send_from_driver (transaction, connection, reply))
-+    goto oom;
-+
-+  dbus_message_unref (reply);
-+  return TRUE;
-+
-+ oom:
-+  BUS_SET_OOM (error);
-+
-+ failed:
-+  _DBUS_ASSERT_ERROR_IS_SET (error);
-+  if (reply)
-+    dbus_message_unref (reply);
-+  return FALSE;
- }
- 
- /* For speed it might be useful to sort this in order of




More information about the Pkg-utopia-commits mailing list