[Pkg-bazaar-commits] ./bzr-dbus/unstable r51: New upstream snapshot.

[Jelmer Vernooij]

------------------------------------------------------------
revno: 51
committer: Jelmer Vernooij <jelmer at debian.org>
branch nick: debian
timestamp: Tue 2009-03-10 15:02:59 +0100
message:
  New upstream snapshot.
modified:
  __init__.py
  debian/changelog
  debian/control
  hook.py
    ------------------------------------------------------------
    revno: 33.3.3
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: trunk
    timestamp: Sat 2008-12-13 05:00:02 +1100
    message:
      Silently eat failures to connect to DBus as DBus is not present on servers and other normal situations.
    modified:
      hook.py
    ------------------------------------------------------------
    revno: 33.3.4
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: trunk
    timestamp: Mon 2009-01-05 10:50:50 +1100
    message:
      Add a version marker to __init__.py
    modified:
      __init__.py
-------------- next part --------------
=== modified file '__init__.py'
--- a/__init__.py	2008-03-24 13:19:57 +0000
+++ b/__init__.py	2009-03-10 14:02:59 +0000
@@ -56,6 +56,8 @@
    --port=192.168.1.2:4155``.
 """
 
+version_info = (0, 1, 0, 'dev', 0)
+
 from bzrlib import commands
 
 from activity import Activity, LanGateway

=== modified file 'debian/changelog'
--- a/debian/changelog	2008-11-07 17:31:44 +0000
+++ b/debian/changelog	2009-03-10 14:02:59 +0000
@@ -1,3 +1,9 @@
+bzr-dbus (0.1~bzr39-1) unstable; urgency=low
+
+  * New upstream snapshot.
+
+ -- Jelmer Vernooij <jelmer at debian.org>  Tue, 10 Mar 2009 15:01:50 +0100
+
 bzr-dbus (0.1~bzr36-3) unstable; urgency=low
 
   * Add patch to prevent immediate failure if dbus can't be contacted.

=== modified file 'debian/control'
--- a/debian/control	2008-08-04 20:26:42 +0000
+++ b/debian/control	2009-03-10 14:02:59 +0000
@@ -2,7 +2,7 @@
 Section: devel
 Priority: optional
 Maintainer: Debian Bazaar Maintainers <pkg-bazaar-maint at lists.alioth.debian.org>
-Uploaders: Jelmer Vernooij <jelmer at samba.org>
+Uploaders: Jelmer Vernooij <jelmer at debian.org>
 Homepage: https://launchpad.net/bzr-dbus
 Build-Depends-Indep: bzr (>= 1.0)
 Build-Depends: python-central (>= 0.5), cdbs (>= 0.4.43), debhelper (>= 5.0.37.2), python-dbus, python-gobject, python-dev
@@ -13,7 +13,7 @@
 
 Package: bzr-dbus
 Architecture: all
-Depends: bzr (>= 1.0), ${python:Depends}, python-dbus
+Depends: bzr (>= 1.0), ${python:Depends}, python-dbus, ${misc:Depends}
 Enhances: bzr, bzr-gtk
 XB-Python-Version: ${python:Versions}
 Description: D-Bus announcements plugin for Bazaar

=== modified file 'hook.py'
--- a/hook.py	2008-10-06 13:43:33 +0000
+++ b/hook.py	2009-03-10 14:02:59 +0000
@@ -21,7 +21,6 @@
 
 from bzrlib.branch import Branch
 from bzrlib.smart.server import SmartTCPServer
-from bzrlib.trace import warning
 
 import activity
 from server_mainloop import (
@@ -47,7 +46,6 @@
     try:
         return activity.Activity()
     except dbus.DBusException, e:
-        warning("Unable to contact DBus session: " + str(e))
         return None