aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2010-09-21 09:14:51 -0500
committerTed Gould <ted@gould.cx>2010-09-21 09:14:51 -0500
commitc5216efc9f945cff9c2c1b53189f9faee7421809 (patch)
tree6e0e52973badb2b1a8ff3cf8c6971a738a77b939
parent2af39613b0efacd440e342de204e771b37dfcbd1 (diff)
parent4b5bf4f7648b5d68a6746edbd5d1af4a6194b528 (diff)
downloadlibayatana-indicator-c5216efc9f945cff9c2c1b53189f9faee7421809.tar.gz
libayatana-indicator-c5216efc9f945cff9c2c1b53189f9faee7421809.tar.bz2
libayatana-indicator-c5216efc9f945cff9c2c1b53189f9faee7421809.zip
Merge from Ubuntu Desktop
-rw-r--r--debian/changelog19
-rw-r--r--debian/control4
-rw-r--r--debian/source/format1
3 files changed, 21 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index 80b981b..77177cd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,22 @@
+libindicator (0.3.13-0ubuntu2~ppa1) UNRELEASED; urgency=low
+
+ * debian/source:
+ - don't use quilt format, it's making the daily build not working
+ * debian/control:
+ - put the Vcs-Bzr to point the right official branch
+ - rename to soname bump
+ * debian/libindicator1.install: rename to soname bump
+ * debian/rules: update MAKESHLIBS_ARGS
+
+ -- Didier Roche <didrocks@ubuntu.com> Tue, 21 Sep 2010 12:33:31 +0200
+
+libindicator (0.3.13-0ubuntu1) maverick; urgency=low
+
+ * New upstream release.
+ * Adding a menu_show signal
+
+ -- Ted Gould <ted@ubuntu.com> Wed, 15 Sep 2010 11:46:37 -0500
+
libindicator (0.3.13-0ubuntu1~ppa3) maverick; urgency=low
* debian/rules:
diff --git a/debian/control b/debian/control
index 0dfe822..9f16716 100644
--- a/debian/control
+++ b/debian/control
@@ -14,8 +14,8 @@ Build-Depends: debhelper (>= 5.0),
gtk-doc-tools
Standards-Version: 3.9.0
Homepage: https://launchpad.net/libindicator
-Vcs-Bzr: https://code.launchpad.net/~indicator-applet-developers/libindicator/ubuntu
-Vcs-Browser: http://bazaar.launchpad.net/~indicator-applet-developers/libindicator/ubuntu
+Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/libindicator/ubuntu
+Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-desktop/libindicator/ubuntu
Package: libindicator1
Section: libs
diff --git a/debian/source/format b/debian/source/format
deleted file mode 100644
index 163aaf8..0000000
--- a/debian/source/format
+++ /dev/null
@@ -1 +0,0 @@
-3.0 (quilt)