Merging lp:~ubuntu-desktop/libindicator/ubuntu

* Merged in fix for (LP: #603489)
* New upstream release.
  * Removing checking for style properties that aren't used.
  * Make it so that a watcher dying is the same as unregistering.
* Merge debian changes
	* Drop debian/source/*
* debian/control: Switch VCS for this branch to be the indicator
  applet developers branch.
* Revert cdbs drop, as requested by the Ubuntu maintainers.
* Update Maintainer and Vcs-* fields for pkg-ayatana.
* Merge Ubuntu package into Debian.
  Closes: #549999
* debian/copyright:
  + Update to machine readable format.
* debian/control:
  + Drop cdbs Build-Dep, bump debhelper to >=7.
  + Standards-Version 3.8.4.
  + Update Vcs-* fields.
  + Drop GNOME from Description, the package is not GNOME specific.
  + Slightly update Description, thanks lintian.
* debian/rules:
  + Use minimal debhelper 7 rules without cdbs.
  + Disable tests for now, they fail (launchpad 587811)
* debian/source/format:
  + Add file, make package 3.0 (quilt).

1 files changed, 8 insertions, 6 deletions

diff --git a/debian/control b/debian/control
index 686f637..af01ed9 100644
--- a/debian/control
+++ b/debian/control
@@ -2,6 +2,8 @@ Source: libindicator
 Section: libs
 Priority: optional
 Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: The Ayatana Packagers <pkg-ayatana-devel@lists.alioth.debian.org>
+Uploaders: Evgeni Golov <evgeni@debian.org>, Kartik Mistry <kartik@debian.org>
 Build-Depends: debhelper (>= 5.0),
                cdbs (>= 0.4.41),
                libglib2.0-dev (>= 2.22),
@@ -10,21 +12,21 @@ Build-Depends: debhelper (>= 5.0),
                libtool,
                intltool,
                gtk-doc-tools
-Standards-Version: 3.8.0
+Standards-Version: 3.8.4
 Homepage: https://launchpad.net/libindicator
-Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/libindicator/ubuntu
-Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-desktop/libindicator/ubuntu
+Vcs-Bzr: https://code.launchpad.net/~indicator-applet-developers/libindicator/ubuntu
+Vcs-Browser: http://bazaar.launchpad.net/~indicator-applet-developers/libindicator/ubuntu
 
 Package: libindicator0
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends}
-Description: GNOME panel indicator applet - shared library
+Description: panel indicator applet - shared library
  This library contains information to build indicators to go into
  the indicator applet.
  .
- This package contains files that are needed to build applications.
+ This package contains the library itself.
 
 Package: libindicator-dev
 Section: libdevel
@@ -33,7 +35,7 @@ Depends: ${shlibs:Depends},
          ${misc:Depends},
          libgtk2.0-dev (>= 2.12.0),
          libindicator0 (= ${binary:Version})
-Description: GNOME panel indicator applet - shared library
+Description: panel indicator applet - library development files
  This library contains information to build indicators to go into
  the indicator applet.
  .