aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@canonical.com>2009-10-08 10:14:24 -0400
committerTed Gould <ted@canonical.com>2009-10-08 10:14:24 -0400
commit6d8cd640eb0b86d9c002c5cb2134ca4f267bf5d6 (patch)
tree6b57e8c2e5eb43fbac62c3157016ed3e3ab2664b
parent7f83810945a0bee57ff9f0b17b9816bbfd6c3a0b (diff)
parent90bed2928ef6a8c2c471e867f95bda4d4c9c904b (diff)
downloadlibayatana-indicator-6d8cd640eb0b86d9c002c5cb2134ca4f267bf5d6.tar.gz
libayatana-indicator-6d8cd640eb0b86d9c002c5cb2134ca4f267bf5d6.tar.bz2
libayatana-indicator-6d8cd640eb0b86d9c002c5cb2134ca4f267bf5d6.zip
Merging in ubuntu-desktop branch
-rw-r--r--debian/changelog212
-rw-r--r--debian/control3
2 files changed, 14 insertions, 201 deletions
diff --git a/debian/changelog b/debian/changelog
index 5d6212d..b4a3dd7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,12 @@
-libindicator (0.2.0-0ubuntu1~ppa1) karmic; urgency=low
+libindicator (0.2.0-0ubuntu1) karmic; urgency=low
- * Upstream release 0.2.0
+ * Upstream release 0.2.0 (LP: #427443):
+ - Use silent automake mode.
+ - Tag for final release.
- -- Ted Gould <ted@ubuntu.com> Thu, 10 Sep 2009 11:04:54 -0500
+ -- Ted Gould <ted@ubuntu.com> Thu, 10 Sep 2009 20:22:45 +0200
-libindicator (0.2.0~bzr325-0ubuntu1) UNRELEASED; urgency=low
+libindicator (0.2.0~bzr325-0ubuntu1) karmic; urgency=low
[ Ted Gould ]
* New version (LP: #417039)
@@ -25,202 +27,12 @@ libindicator (0.2.0~bzr325-0ubuntu1) UNRELEASED; urgency=low
* debian/indicator-applet-sus.install: List files that are now
used by the new binary package.
- -- Ken VanDine <ken.vandine@canonical.com> Mon, 24 Aug 2009 08:59:06 -0400
-
-indicator-applet (0.2.0~bzr319-0ubuntu4) karmic; urgency=low
-
- * Add build-dep on gtk-doc-tools
-
- -- Jonathan Riddell <jriddell@ubuntu.com> Wed, 05 Aug 2009 11:28:57 +0100
-
-indicator-applet (0.2.0~bzr319-0ubuntu3) karmic; urgency=low
-
- * debian/rules
- - added --enable-gtk-doc to build the docs
-
- -- Ken VanDine <ken.vandine@canonical.com> Wed, 05 Aug 2009 09:50:17 +0100
-
-indicator-applet (0.2.0~bzr319-0ubuntu2) karmic; urgency=low
-
- * Run ./autogen.sh before upload
-
- -- Jonathan Riddell <jriddell@ubuntu.com> Wed, 05 Aug 2009 00:40:52 +0100
-
-indicator-applet (0.2.0~bzr319-0ubuntu1) karmic; urgency=low
-
- [ Ted Gould ]
- * Merging in upstream code to split out libindicate-gtk
- * debian/control:
- * Changing the version number of libindcate to 2 to match
- the .so numbering.
- * Creating packages for libindicate-gtk
- * Added libindicate-gtk-dev.install and libindicate-gtk0.install
- for the new library.
- * Renamed libindicate1.install to libindicate2.install to match
- the package name change.
- * Modified libindicate-dev to be more specific about the header
- files that it grabs.
-
- -- Jonathan Riddell <jriddell@ubuntu.com> Wed, 05 Aug 2009 00:22:54 +0100
-
-indicator-applet (0.2.0~bzr309-0ubuntu3) karmic; urgency=low
-
- * Now moving on to Karmic
-
- -- Ted Gould <ted@ubuntu.com> Fri, 17 Jul 2009 21:24:41 -0500
-
-indicator-applet (0.2.0~bzr309-0ubuntu2) jaunty; urgency=low
-
- * debian/control, debian/libindicate-doc.install: Merging in Ken
- Vandine's work on making a -doc package for libindicate.
-
- -- Ted Gould <ted@ubuntu.com> Fri, 17 Jul 2009 21:23:41 -0500
-
-indicator-applet (0.2.0~bzr309-0ubuntu1) jaunty; urgency=low
-
- * Merge from upstream, includes documentation.
-
- -- Ted Gould <ted@ubuntu.com> Tue, 05 May 2009 16:44:29 +0100
-
-indicator-applet (0.2.0~bzr307-0ubuntu2) jaunty; urgency=low
-
- * Increment for PPA. Forgot to autogen.sh
-
- -- Ted Gould <ted@ubuntu.com> Mon, 27 Apr 2009 11:06:45 -0500
-
-indicator-applet (0.2.0~bzr307-0ubuntu1) jaunty; urgency=low
-
- * Upstream Snapshot: Adding in a test suite.
- * debian/control: Adding a build-dep on dbus-test-runner
-
- -- Ted Gould <ted@ubuntu.com> Mon, 27 Apr 2009 10:52:28 -0500
-
-indicator-applet (0.2.0~bzr305-0ubuntu1) jaunty; urgency=low
-
- * Upstream snapshot
+ [ Ken VanDine ]
* debian/control:
- * Add in package libindicator-dev
- * Add build depends on libxml2-dev for upstream dep
- * debian/libindicate-dev.install: Add greater specificity on what
- gets installed to not get confused with files from libindicator
- * debian/libindicator-dev.install: Specify which files should be
- put into the development package.
-
- -- Ted Gould <ted@ubuntu.com> Wed, 22 Apr 2009 23:46:28 -0500
-
-indicator-applet (0.1.6-0ubuntu1) jaunty; urgency=low
-
- * New upstream version
- * Applied the same fixes as Cody Russell's patch to indicator-messages
- to the finalize functions here. Should fix LP: #359018 completely.
- * Minor warnings fixes in search of solution to above.
-
- -- Ted Gould <ted@ubuntu.com> Tue, 14 Apr 2009 11:36:12 +0200
-
-indicator-applet (0.1.5-0ubuntu1) jaunty; urgency=low
-
- * debian/control: Switching libindicate0 to libindicate1 to express
- the fact that the binary compatibility is broken.
- * debian/libindicate0.install changed to debian/libindicate1.install
- * New upstream version:
- * Adds new API for detecting interests of various listeners. Implemented
- on both client and server side. (LP: #353112)
- * Makes it so that all objects down to the menu now use the gtkstyle
- naming from FUSA to ensure that they all pick up the theme hacks that
- are set for FUSA. (LP: #334490)
- * Explicitly sets the about window's window icon. (LP: #356437)
-
- -- Ted Gould <ted@ubuntu.com> Fri, 03 Apr 2009 15:09:33 -0500
-
-indicator-applet (0.1.4-0ubuntu1) jaunty; urgency=low
-
- * New upstream version
- * Changing the text in the license box to make sense. (LP: #346215)
- * Call GNOME Program Init to initialize all of the ATK and gettext
- stuff that needs to be initialized for it all to work. Patch from
- Eitan Isaacson. (LP: #349031)
- * Give the indicator applet an ATK name so it can be found by the
- accessibility frameworks. Patch from Eitan Isaacson. (LP: #349031)
- * Making it so the 'No Indicators' situation uses a label instead of a
- desensitized menu item to allow right click through. (LP: #346359)
- * Remove the making of 'Indicator Applet Factory' translatable.
- (LP: #349540)
- * Make sure translations get loaded and make the 'No Indicators' error
- and the license translatable. Patch from Gabor Kelemen. (LP: #349998)
- * debian/control: Adding libgnomeui-dev as a dependency as it was added
- upstream.
-
- -- Ted Gould <ted@ubuntu.com> Mon, 30 Mar 2009 09:31:44 +0200
-
-indicator-applet (0.1.3-0ubuntu2) jaunty; urgency=low
-
- * debian/control: Add dependency to indicator-messages; the applet is
- currently fairly useless without it. (LP: #346359)
-
- -- Martin Pitt <martin.pitt@ubuntu.com> Wed, 25 Mar 2009 11:25:29 +0100
-
-indicator-applet (0.1.3-0ubuntu1) jaunty; urgency=low
-
- * New upstream version 0.1.3, makes the GObject introspection
- an optional build item.
- * debian/control: Removing GObject introspection
- * debian/*.install, remove all of GIR references
-
- -- Ted Gould <ted@ubuntu.com> Wed, 18 Mar 2009 00:12:30 -0500
-
-indicator-applet (0.1.2-0ubuntu2) UNRELEASED; urgency=low
-
- * Add debian/watch.
- * Add bzr-builddeb configuration (merge mode). Fortunately this doesn't
- insist on having *only* debian/ in bzr. This gives us the best of both
- worlds, bzd-bd auto-downloading orig.tar.gz and merging in the
- pre-generated autoconf stuff, and retaining the possibility of merging
- directly from trunk, since we keep the full upstream source in this branch.
- * debian/copyright: Fix download location.
-
- -- Martin Pitt <martin.pitt@ubuntu.com> Tue, 17 Mar 2009 10:51:46 +0100
-
-indicator-applet (0.1.2-0ubuntu1) jaunty; urgency=low
-
- * New upstream version
- * Removes duplicate prototypes (LP: #338885)
- * Fixes background color to match them on dark themes when
- the panel color is not set (LP: #334490)
- * Removing the handle and replacing it with the ability to
- right click on the applet to get a panel menu (LP: #339818)
- * Various build fixes
-
- -- Ted Gould <ted@ubuntu.com> Sun, 15 Mar 2009 08:58:20 -0500
-
-indicator-applet (0.1.1-0ubuntu2) jaunty; urgency=low
-
- * src/applet-main.c, applet_fill_cb(): Do not show anything if we
- are running under a stracciatella GNOME session (i. e. without
- Ubuntu components). See UbuntuSpec:stracciatella-session.
-
- -- Martin Pitt <martin.pitt@ubuntu.com> Thu, 19 Feb 2009 17:24:04 +0100
-
-indicator-applet (0.1.1-0ubuntu1) jaunty; urgency=low
-
- * New upstream release with some icon changes.
- * debian/control: Fix Vcs-Bzr.
- * debian/control: Update package descriptions; the messaging part is
- provided by indicator-messages.
- * debian/copyright: Fix leftover word "either" from the license
- description.
-
- -- Martin Pitt <martin.pitt@ubuntu.com> Thu, 19 Feb 2009 16:12:01 +0100
-
-indicator-applet (0.1-0ubuntu1) jaunty; urgency=low
+ - Set both Vcs-Bzr and Vcs-Bzr-Browser, with ~ubuntu-desktop
- * Initial release, based on DX team's PPA packaging branch.
- (lp:~indicator-applet-developers/indicator-applet/applet-packaging)
- * Repack orig.tar.gz with a copy of the LGPL 3, libindicate/* is
- under that license.
- * debian/control: Add Homepage:, Vcs-Bzr:, and proper package
- descriptions.
- * debian/copyright: Properly describe licenses.
- * configure.ac: Add missing gio-2.0 pkgconfig check (from DX team
- PPA packaging branch), and autoreconf to pick up the change.
+ [ Martin Pitt ]
+ * Flush changelog.
+ * debian/control: Fix Vcs-* links.
- -- Martin Pitt <martin.pitt@ubuntu.com> Tue, 17 Feb 2009 10:28:14 +0100
+ -- Ken VanDine <ken.vandine@canonical.com> Tue, 25 Aug 2009 08:35:00 +0200
diff --git a/debian/control b/debian/control
index 1c91055..9f0f009 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,8 @@ Build-Depends: debhelper (>= 5.0),
libtool
Standards-Version: 3.8.0
Homepage: https://launchpad.net/libindicator
-Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/libindicator/ubuntu
+Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/libindicator/ubuntu
+Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-desktop/libindicator/ubuntu
Package: libindicator-dev
Section: libdevel