aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2011-01-14 11:06:08 -0600
committerTed Gould <ted@gould.cx>2011-01-14 11:06:08 -0600
commit5400cb97bb9bd305dc75dd0b6e57e4ea44f2777d (patch)
treeb543df3cf1f3d5a3eb7c4bea746de75597716100
parentb5161b9e6e3226053aa21929afad36c09822e689 (diff)
parent3814e3d2d075044d7a77d0e0ccd0989f32f15010 (diff)
downloadlibayatana-indicator-5400cb97bb9bd305dc75dd0b6e57e4ea44f2777d.tar.gz
libayatana-indicator-5400cb97bb9bd305dc75dd0b6e57e4ea44f2777d.tar.bz2
libayatana-indicator-5400cb97bb9bd305dc75dd0b6e57e4ea44f2777d.zip
Sync to Ubuntu Desktop
-rw-r--r--debian/changelog6
-rw-r--r--debian/control1
2 files changed, 6 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index e58d984..461d173 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,7 +5,7 @@ libindicator (0.3.17-0ubuntu1~ppa1) UNRELEASED; urgency=low
-- Ted Gould <ted@ubuntu.com> Fri, 14 Jan 2011 11:03:58 -0600
-libindicator (0.3.16-0ubuntu1~ppa1) natty; urgency=low
+libindicator (0.3.16-0ubuntu1) natty; urgency=low
* New upstream release.
* GDBus Port
@@ -15,6 +15,10 @@ libindicator (0.3.16-0ubuntu1~ppa1) natty; urgency=low
* debian/libindicator3-dev: Adding in the include files for this
version of the library.
+ [ Ken VanDine ]
+ * debian/control:
+ - libindicator2 Breaks libindicator1
+
-- Ted Gould <ted@ubuntu.com> Thu, 13 Jan 2011 12:49:25 -0600
libindicator (0.3.15-0ubuntu2) natty; urgency=low
diff --git a/debian/control b/debian/control
index 17855cf..4d0932f 100644
--- a/debian/control
+++ b/debian/control
@@ -23,6 +23,7 @@ Section: libs
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
+Breaks: libindicator1
Description: panel indicator applet - shared library
This library contains information to build indicators to go into
the indicator applet.