aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2010-07-15 12:17:31 -0500
committerTed Gould <ted@gould.cx>2010-07-15 12:17:31 -0500
commit13ebc6ddcc71a2594f06f00f36e4ed5ab7414a3b (patch)
tree05fbc0e8a11e55e419e726d1096f2cbf9ca59e03
parente5080c72570bccf9e74f66ef91d7a5c75c5355da (diff)
parent8b7fa3f649123d88bc1a036795fd9a85d6565ab4 (diff)
downloadlibayatana-indicator-13ebc6ddcc71a2594f06f00f36e4ed5ab7414a3b.tar.gz
libayatana-indicator-13ebc6ddcc71a2594f06f00f36e4ed5ab7414a3b.tar.bz2
libayatana-indicator-13ebc6ddcc71a2594f06f00f36e4ed5ab7414a3b.zip
Merge from Debian
-rw-r--r--debian/changelog10
-rw-r--r--debian/source/format1
2 files changed, 10 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index b08ff75..48b4f9e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,14 @@ libindicator (0.3.10-0ubuntu1) maverick; urgency=low
-- Ted Gould <ted@ubuntu.com> Thu, 15 Jul 2010 10:02:56 -0500
+libindicator (0.3.9-1) unstable; urgency=low
+
+ * Merging new upstream release and some changes from Ubuntu.
+ * Don't drop debian/source/*
+ * Standards-Version: 3.9.0
+
+ -- Evgeni Golov <evgeni@debian.org> Wed, 14 Jul 2010 10:07:36 +0200
+
libindicator (0.3.9-0ubuntu2) maverick; urgency=low
* Merged in fix for (LP: #603489)
@@ -24,7 +32,7 @@ libindicator (0.3.9-0ubuntu1) maverick; urgency=low
-- Ted Gould <ted@ubuntu.com> Thu, 08 Jul 2010 15:19:08 -0500
-libindicator (0.3.8-2) unstable; urgency=low
+libindicator (0.3.8-2) UNRELEASED; urgency=low
* Revert cdbs drop, as requested by the Ubuntu maintainers.
* Update Maintainer and Vcs-* fields for pkg-ayatana.
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)