* Merging in ~ubuntu-desktop branch.

* debian/rules:
  - updated shlib version
* Upstream release 0.1.2 (LP: #423958)
* debian/control
  - Specify full urls for Vcs-Bzr
* Add bzr-builddep configuration for merge mode.
* debian/control: Fix Vcs-* links.

4 files changed, 30 insertions, 11 deletions

diff --git a/.bzr-builddeb/default.conf b/.bzr-builddeb/default.conf
new file mode 100644
index 0000000..3165e05
--- /dev/null
+++ b/.bzr-builddeb/default.conf
@@ -0,0 +1,2 @@
+[BUILDDEB]
+merge = True
diff --git a/debian/changelog b/debian/changelog
index 0e09cd1..ed14d63 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libdbusmenu (0.1.3-0ubuntu1~ppa2) UNRELEASED; urgency=low
+
+  * Merging in ~ubuntu-desktop branch.
+
+ -- Ted Gould <ted@ubuntu.com>  Thu, 10 Sep 2009 08:48:03 -0500
+
 libdbusmenu (0.1.3-0ubuntu1~ppa1) karmic; urgency=low
 
   * Upstream update 0.1.3
@@ -5,27 +11,34 @@ libdbusmenu (0.1.3-0ubuntu1~ppa1) karmic; urgency=low
 
  -- Ted Gould <ted@ubuntu.com>  Thu, 10 Sep 2009 08:43:47 -0500
 
-libdbusmenu (0.1.2-0ubuntu1~ppa1) karmic; urgency=low
+libdbusmenu (0.1.2-0ubuntu1) karmic; urgency=low
 
-  * Upstream release 0.1.2 for build failure on 64-bit
+  * debian/rules:
+    - updated shlib version
 
- -- Ted Gould <ted@ubuntu.com>  Thu, 03 Sep 2009 15:37:27 -0500
+  [ Ted Gould ]
+  * Upstream release 0.1.2 (LP: #423958)
 
-libdbusmenu (0.1.1-0ubuntu1~ppa1) karmic; urgency=low
+  [ Ken VanDine ]
+  * debian/control
+    - Specify full urls for Vcs-Bzr
 
-  * Upstream release 0.1.1
+ -- Sebastien Bacher <seb128@ubuntu.com>  Fri, 04 Sep 2009 11:12:38 +0200
 
- -- Ted Gould <ted@ubuntu.com>  Thu, 03 Sep 2009 14:28:11 -0500
-
-libdbusmenu (0.1.0-0ubuntu1) UNRELEASED; urgency=low
+libdbusmenu (0.1.0-0ubuntu1) karmic; urgency=low
 
+  [ Ted Gould ]
   * Upstream release 0.1.0
   * debian/watch: Added for tarball
   * debian/control: 
     - Specify both Vcs-Bzr and Vcs-Browser
     - Fixed the project name
 
- -- Ted Gould <ted@ubuntu.com>  Thu, 27 Aug 2009 09:59:48 -0500
+  [ Martin Pitt ]
+  * Add bzr-builddep configuration for merge mode.
+  * debian/control: Fix Vcs-* links.
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Thu, 27 Aug 2009 20:55:55 +0200
 
 libdbusmenu (0.1~bzr5-0ubuntu1) karmic; urgency=low
 
diff --git a/debian/control b/debian/control
index b90f93d..69d6adf 100644
--- a/debian/control
+++ b/debian/control
@@ -13,8 +13,8 @@ Build-Depends: debhelper (>= 5.0),
                libjson-glib-dev
 Standards-Version: 3.8.0
 Homepage: https://launchpad.net/libdbusmenu
-Vcs-Bzr: lp:~ubuntu-core-dev/dbusmenu/ubuntu
-Vcs-Browser: http://code.launchpad.net/~ubuntu-core-dev/dbusmenu/ubuntu
+Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/dbusmenu/ubuntu
+Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-desktop/dbusmenu/ubuntu
 
 Package: libdbusmenu-glib0
 Section: libs
diff --git a/debian/rules b/debian/rules
index d40913d..7f7f405 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,3 +5,7 @@ include /usr/share/cdbs/1/class/gnome.mk
 
 DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper
 LDFLAGS += -Wl,-z,defs -Wl,--as-needed
+
+DEB_DH_MAKESHLIBS_ARGS_libdbusmenu-gtk0 += -V 'libdbusmenu-gtk0 (>= 0.1.2)'
+
+