* 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, 13 insertions, 29 deletions

diff --git a/debian/copyright b/debian/copyright
index ca1ebdd..f47fefc 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,33 +1,17 @@
-This package was debianized by Ted Gould <ted@canonical.com> on
-Wed, 11 Feb 2009 15:41:06 -0600.
+Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
+Name: libindicator
+Maintainer: Ted Gould <ted@canonical.com>
+Source: https://launchpad.net/libindicator
 
-It was downloaded from <http://launchpad.net/indicator-applet/>
+Files: *
+Copyright: 2009-2010 Ted Gould <ted@canonical.com>, Canonical Ltd.
+License: GPL-3
 
-Upstream Author:
-
-    Ted Gould <ted@canonical.com>
-
-Copyright:
-
-    Copyright (C) 2009 Canonical Ltd.
-
-License:
-
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, version 3 of the License.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+Files: debian/*
+Copyright: 2009-2010 Evgeni Golov <evgeni@debian.org>
+Copyright: 2009-2010 Ted Gould <ted@canonical.com>, Canonical Ltd.
+License: GPL-3
 
+License: GPL-3
 On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL-3'.
-
-The Debian packaging is (C) 2009, Canonical Ltd. and
-is licensed under the GPLv3, see `/usr/share/common-licenses/GPL-3'.
+ Public License version 3 can be found in `/usr/share/common-licenses/GPL-3'.