diff options
| author | Ted Gould <ted@gould.cx> | 2011-09-19 21:42:40 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2011-09-19 21:42:40 -0500 |
| commit | 8ec147c04f22eca3d25c4618d8ff2f7b7f9d286f (patch) | |
| tree | 056cbdd7335d86c70ef4b057b2c1b5e7b6acd2cb | |
| parent | 5600252dee9cd71ef58e51e3195f9bbce6c4b43e (diff) | |
| parent | 130ebff768cb4fe0a1584bdbd9f7d3db7acde250 (diff) | |
| download | libayatana-indicator-8ec147c04f22eca3d25c4618d8ff2f7b7f9d286f.tar.gz libayatana-indicator-8ec147c04f22eca3d25c4618d8ff2f7b7f9d286f.tar.bz2 libayatana-indicator-8ec147c04f22eca3d25c4618d8ff2f7b7f9d286f.zip | |
Merging in U. Desktop
| -rw-r--r-- | debian/changelog | 22 | ||||
| -rw-r--r-- | debian/control | 5 | ||||
| -rwxr-xr-x | debian/rules | 2 |
3 files changed, 19 insertions, 10 deletions
diff --git a/debian/changelog b/debian/changelog index e6d553c..0fa3e90 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,23 @@ -libindicator (0.3.93-0ubuntu1~ppa1) oneiric; urgency=low +libindicator (0.3.93-0ubuntu2) oneiric; urgency=low - * New upstream release. - * Rescan icon theme if icon can't be loaded + * Drop the Breaks: against old versions of libindicator and libindicator3; + there are no file conflicts between the libraries, so this doesn't + accurately reflect the package relationships but does make it harder to + calculate upgrades from natty. LP: #839098. + + -- Steve Langasek <steve.langasek@ubuntu.com> Thu, 01 Sep 2011 14:22:12 -0700 + +libindicator (0.3.93-0ubuntu1) oneiric; urgency=low + + * debian/rules: + - update the translations template + + [ Ted Gould ] + * New upstream release - -- Ted Gould <ted@ubuntu.com> Thu, 11 Aug 2011 09:44:35 -0500 + -- Sebastien Bacher <seb128@ubuntu.com> Thu, 11 Aug 2011 21:16:12 +0200 -libindicator (0.3.92-0ubuntu1~ppa1) oneiric; urgency=low +libindicator (0.3.92-0ubuntu1) oneiric; urgency=low * New upstream release. * Adding support for a secondary activate signal diff --git a/debian/control b/debian/control index d9fbd97..06ee081 100644 --- a/debian/control +++ b/debian/control @@ -23,9 +23,6 @@ Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Breaks: libindicator1 (<= ${binary:Version}), - libindicator2 (<= ${binary:Version}), - libindicator3 (<= ${binary:Version}) Description: panel indicator applet - shared library This library contains information to build indicators to go into the indicator applet. @@ -61,8 +58,6 @@ Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Breaks: libindicator3-2 (<= ${binary:Version}), - libindicator3-3 (<= ${binary:Version}) 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 17ed4cf..66b1948 100755 --- a/debian/rules +++ b/debian/rules @@ -22,3 +22,5 @@ debian/stamp-autotools/gtk3: cdbs_configure_flags += $(DEB_CONFIGURE_FLAGS_gtk3) common-install-arch:: find debian/tmp -name \*.la -delete + cd po; intltool-update --pot --verbose + |