aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2010-09-17 16:41:30 -0500
committerTed Gould <ted@gould.cx>2010-09-17 16:41:30 -0500
commitdaaf146585e8bad6912bd926ded7c177a0fe6d0d (patch)
treea29e1a301946c20b7d8992e9acf06e2439c8e6fa /debian
parent8d7fd1329103fbd67f01e9dd1b4661c171ae76e6 (diff)
downloadlibayatana-indicator-daaf146585e8bad6912bd926ded7c177a0fe6d0d.tar.gz
libayatana-indicator-daaf146585e8bad6912bd926ded7c177a0fe6d0d.tar.bz2
libayatana-indicator-daaf146585e8bad6912bd926ded7c177a0fe6d0d.zip
debian/control: Replaces really needs to be conflicts. You don't
want both of these.
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog7
-rw-r--r--debian/control2
2 files changed, 8 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 542a812..8e8a1a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libindicator (0.3.13-0ubuntu1~ppa2~ats4) UNRELEASED; urgency=low
+
+ * debian/control: Replaces really needs to be conflicts. You don't
+ want both of these.
+
+ -- Ted Gould <ted@ubuntu.com> Fri, 17 Sep 2010 16:41:00 -0500
+
libindicator (0.3.13-0ubuntu1~ppa2~ats3) maverick; urgency=low
* Autogen update
diff --git a/debian/control b/debian/control
index eabc1f9..0dfe822 100644
--- a/debian/control
+++ b/debian/control
@@ -22,7 +22,7 @@ Section: libs
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
-Replaces: libindicator0
+Conflicts: libindicator0
Description: panel indicator applet - shared library
This library contains information to build indicators to go into
the indicator applet.