aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2010-09-19 13:28:14 -0500
committerTed Gould <ted@gould.cx>2010-09-19 13:28:14 -0500
commit49b70435e5ad752302913719fe227569b51aed40 (patch)
treeb8cdf29d385ce2253aa7765ed40dbb63767c556a /debian
parent0bcacdcdc45b229e955d9e9d748580f4c3fb3fd1 (diff)
parentbf38aa8b5b4331ac13503d53b123e6bbf19f7432 (diff)
downloadlibayatana-indicator-49b70435e5ad752302913719fe227569b51aed40.tar.gz
libayatana-indicator-49b70435e5ad752302913719fe227569b51aed40.tar.bz2
libayatana-indicator-49b70435e5ad752302913719fe227569b51aed40.zip
* Upstream Merge
* Adding a function to signal a menu is shown * Changing indicator directory to '4' * debian/control: Switching from libindicator0 to libindicator1 as we've broken ABI. Conflicting with libindicator0 to make upgrade simpler as it doesn't make sense to have both installed. * Autogen update
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog12
-rw-r--r--debian/control7
-rw-r--r--debian/libindicator1.install (renamed from debian/libindicator0.install)0
3 files changed, 16 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index f41decf..f0be2f8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+libindicator (0.3.13-0ubuntu1~ppa2) UNRELEASED; urgency=low
+
+ * Upstream Merge
+ * Adding a function to signal a menu is shown
+ * Changing indicator directory to '4'
+ * debian/control: Switching from libindicator0 to libindicator1
+ as we've broken ABI. Conflicting with libindicator0 to make
+ upgrade simpler as it doesn't make sense to have both installed.
+ * Autogen update
+
+ -- Ted Gould <ted@ubuntu.com> Sun, 19 Sep 2010 13:26:45 -0500
+
libindicator (0.3.13-0ubuntu1~ppa1) maverick; urgency=low
* New upstream release.
diff --git a/debian/control b/debian/control
index 6530e9b..0dfe822 100644
--- a/debian/control
+++ b/debian/control
@@ -17,11 +17,12 @@ 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
-Package: libindicator0
+Package: libindicator1
Section: libs
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
+Conflicts: libindicator0
Description: panel indicator applet - shared library
This library contains information to build indicators to go into
the indicator applet.
@@ -34,7 +35,7 @@ Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends},
libgtk2.0-dev (>= 2.12.0),
- libindicator0 (= ${binary:Version})
+ libindicator1 (= ${binary:Version})
Description: panel indicator applet - library development files
This library contains information to build indicators to go into
the indicator applet.
@@ -46,7 +47,7 @@ Section: devel
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends},
- libindicator0 (= ${binary:Version})
+ libindicator1 (= ${binary:Version})
Description: Tools for libindicator
Tools useful for developers of applications using indicators.
.
diff --git a/debian/libindicator0.install b/debian/libindicator1.install
index 85dbd3e..85dbd3e 100644
--- a/debian/libindicator0.install
+++ b/debian/libindicator1.install