Merging in Ubuntu Desktop

4 files changed, 27 insertions, 8 deletions

diff --git a/debian/changelog b/debian/changelog
index 3f1bea1..d42ed44 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,26 @@
-libdbusmenu (0.2.1-0ubuntu1~ppa1) karmic; urgency=low
+libdbusmenu (0.2.1-0ubuntu1) lucid; urgency=low
 
   * Upstream release 0.2.1
-    * Not deleting images that we're still using.
-    * Adding padding between the icon and the label.
-    * Setting direction based on parent widget text direction.
+    - Fix to not destroy the image if we're still using it.
+    - Adding code to support icon names that have an implied direction in them.
+    - Fix to put a small amount of padding between the icon and the label.
 
- -- Ted Gould <ted@ubuntu.com>  Tue, 12 Jan 2010 08:46:10 -0600
+ -- Ken VanDine <ken.vandine@canonical.com>  Tue, 12 Jan 2010 11:03:39 -0500
+
+libdbusmenu (0.2.0-0ubuntu3) lucid; urgency=low
+
+  * debian/rules:
+    - updated shlibs version (lp: #505258)
+
+ -- Sebastien Bacher <seb128@ubuntu.com>  Mon, 11 Jan 2010 16:04:11 +0100
+
+libdbusmenu (0.2.0-0ubuntu2) lucid; urgency=low
+
+  * Added debian/libdbusmenu-tools.install
+  * debian/control
+    - improved description for libdbusmenu-tools
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Sat, 09 Jan 2010 09:05:47 -0500
 
 libdbusmenu (0.2.0-0ubuntu1) lucid; urgency=low
 
diff --git a/debian/control b/debian/control
index c392b34..80f22f6 100644
--- a/debian/control
+++ b/debian/control
@@ -67,4 +67,7 @@ Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          libdbusmenu-glib0 (= ${binary:Version})
-Description: Need a better description.
+Description: Tools useful during development with libdbusmenu
+ .
+ This package contains tools that are useful when building applications.
+
diff --git a/debian/libdbusmenu-tools.install b/debian/libdbusmenu-tools.install
new file mode 100644
index 0000000..9f680c7
--- /dev/null
+++ b/debian/libdbusmenu-tools.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/libdbusmenu/dbusmenu-dumper 
diff --git a/debian/rules b/debian/rules
index 7f7f405..0611a62 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,6 +6,6 @@ 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)'
-
+DEB_DH_MAKESHLIBS_ARGS_libdbusmenu-gtk0 += -V 'libdbusmenu-gtk0 (>= 0.2)'
+DEB_DH_MAKESHLIBS_ARGS_libdbusmenu-glib0 += -V 'libdbusmenu-glib0 (>= 0.2)'