aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@canonical.com>2009-09-04 13:27:18 -0500
committerTed Gould <ted@canonical.com>2009-09-04 13:27:18 -0500
commit7f656a9416eae80a6cd68754b97cd2b104f2e711 (patch)
tree696f68142ef1a7fec564c4eec6049d311a11cb09
parent638dce7a7e56ee478b18c3e3a5fe486d81eaca81 (diff)
parent866bdf8a658e660e613f6943e2b23cea318843b5 (diff)
downloadayatana-indicator-session-7f656a9416eae80a6cd68754b97cd2b104f2e711.tar.gz
ayatana-indicator-session-7f656a9416eae80a6cd68754b97cd2b104f2e711.tar.bz2
ayatana-indicator-session-7f656a9416eae80a6cd68754b97cd2b104f2e711.zip
Updating with ubuntu-desktop
-rw-r--r--.bzr-builddeb/default.conf2
-rw-r--r--debian/changelog11
-rw-r--r--debian/control4
3 files changed, 11 insertions, 6 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 86ac861..1369e64 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,12 @@
-indicator-session (0.1.1-0ubuntu1~ppa1) karmic; urgency=low
+indicator-session (0.1.1-0ubuntu1) karmic; urgency=low
- * Upstream update 0.1.1 for dbusmenu 0.1.1
- * debian/control: Increasing dbusmenu dep to 0.1.1
+ * set bzr-builddeb merge mode to true for easy tarball build
- -- Ted Gould <ted@ubuntu.com> Thu, 03 Sep 2009 15:18:34 -0500
+ [ Ted Gould ]
+ * Upstream update 0.1.1 for dbusmenu 0.1.2 (LP: #423975)
+ * debian/control: Increasing dbusmenu dep to 0.1.2
+
+ -- Sebastien Bacher <seb128@ubuntu.com> Fri, 04 Sep 2009 11:46:25 +0200
indicator-session (0.1-0ubuntu1) karmic; urgency=low
diff --git a/debian/control b/debian/control
index c2b6f8d..43f2150 100644
--- a/debian/control
+++ b/debian/control
@@ -9,8 +9,8 @@ Build-Depends: debhelper (>= 5.0),
gnome-doc-utils,
scrollkeeper,
libindicator-dev,
- libdbusmenu-glib-dev (>= 0.1.1),
- libdbusmenu-gtk-dev (>= 0.1.1),
+ libdbusmenu-glib-dev (>= 0.1.2),
+ libdbusmenu-gtk-dev (>= 0.1.2),
libpolkit-gnome-dev,
intltool
Standards-Version: 3.8.2