aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2010-10-15 14:48:14 -0500
committerTed Gould <ted@gould.cx>2010-10-15 14:48:14 -0500
commit879ce4300fc0f749a8998bbf14c2fba925c64a5c (patch)
tree5978df8ee74279bb80f9d02f911cc34d337c1adb /debian
parentac662a1a1a94644d85c4052042a270023fec4f7f (diff)
parent948cb8ef96ab75f7f468d535450ce065af3e2c26 (diff)
downloadlibayatana-indicator-879ce4300fc0f749a8998bbf14c2fba925c64a5c.tar.gz
libayatana-indicator-879ce4300fc0f749a8998bbf14c2fba925c64a5c.tar.bz2
libayatana-indicator-879ce4300fc0f749a8998bbf14c2fba925c64a5c.zip
Merging in Ubuntu desktop
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog19
-rw-r--r--debian/control1
-rwxr-xr-xdebian/rules2
3 files changed, 11 insertions, 11 deletions
diff --git a/debian/changelog b/debian/changelog
index 3b7ca79..ef85b25 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,21 +1,22 @@
-libindicator (0.3.14-0ubuntu1~ppa1) maverick; urgency=low
+libindicator (0.3.14-0ubuntu1) maverick; urgency=low
* New upstream release.
- * Adding a function to signal a menu is shown
+ * Adding a function to signal a menu is shown (LP: #637692)
* Changing indicator directory to '4'
-
- -- Ted Gould <ted@ubuntu.com> Tue, 21 Sep 2010 15:55:56 -0500
-
-libindicator (0.3.13-0ubuntu2~ppa1) UNRELEASED; urgency=low
-
* debian/source:
- don't use quilt format, it's making the daily build not working
* debian/control:
- rename to soname bump
+ - put the Vcs-Bzr to point the right official branch
* debian/libindicator1.install: rename to soname bump
- * debian/rules: update MAKESHLIBS_ARGS
+ * debian/rules:
+ - update MAKESHLIBS_ARGS
+
+ [Ted Gould]
+ * debian/rules:
+ - removing simple-patchsys
- -- Didier Roche <didrocks@ubuntu.com> Tue, 21 Sep 2010 12:33:31 +0200
+ -- Didier Roche <didrocks@ubuntu.com> Wed, 22 Sep 2010 18:09:44 +0200
libindicator (0.3.13-0ubuntu1) maverick; urgency=low
diff --git a/debian/control b/debian/control
index 0dfe822..d701099 100644
--- a/debian/control
+++ b/debian/control
@@ -22,7 +22,6 @@ 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.
diff --git a/debian/rules b/debian/rules
index 9099854..7ad558a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,5 +6,5 @@ include /usr/share/cdbs/1/class/gnome.mk
LDFLAGS += -Wl,-z,defs -Wl,--as-needed
-DEB_DH_MAKESHLIBS_ARGS_libindicator0 += -V 'libindicator1 (>= 0.3.13)'
+DEB_DH_MAKESHLIBS_ARGS_libindicator0 += -V 'libindicator1 (>= 0.3.14)'