aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog7
-rw-r--r--debian/control2
2 files changed, 7 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index d3d483f..9437510 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libindicator (0.4.90-0ubuntu2) precise; urgency=low
+
+ * debian/control
+ - dropped the Conflicts with libindicator6 and libindicator3-6
+
+ -- Ken VanDine <ken.vandine@canonical.com> Tue, 24 Jan 2012 21:44:30 -0500
+
libindicator (0.4.90-0ubuntu1) precise; urgency=low
[ Ted Gould ]
diff --git a/debian/control b/debian/control
index 218cfe1..90e1367 100644
--- a/debian/control
+++ b/debian/control
@@ -23,7 +23,6 @@ Section: libs
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
-Conflicts: libindicator6
Description: panel indicator applet - shared library
This library contains information to build indicators to go into
the indicator applet.
@@ -59,7 +58,6 @@ Section: libs
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
-Conflicts: libindicator3-6
Description: panel indicator applet - shared library
This library contains information to build indicators to go into
the indicator applet.