Merging in changes from Martin with fixes to the control and copyright files.

3 files changed, 32 insertions, 110 deletions

diff --git a/debian/changelog b/debian/changelog
index b04eb72..0ea0f02 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,107 +1,9 @@
-indicator-messages (0.1~ppa16) intrepid; urgency=low
+indicator-messages (0.1-0ubuntu1) jaunty; urgency=low
 
-  * Updating to upstream release tagged 0.1 
+  * Initial release, based on DX team's PPA packaging branch.
+    (lp:~indicator-applet-developers/indicator-applet/messages-packaging)
+  * debian/control: Add Homepage:, Vcs-Bzr:, and fix package
+    description.
+  * debian/copyright: Properly describe license.
 
- -- Ted Gould <ted@ubuntu.com>  Mon, 16 Feb 2009 12:56:43 -0600
-
-indicator-messages (0.1~ppa15) intrepid; urgency=low
-
-  * Making the menu hide if there is no one around to be
-    in the menu.
-
- -- Ted Gould <ted@ubuntu.com>  Sun, 15 Feb 2009 23:01:14 -0600
-
-indicator-messages (0.1~ppa14) intrepid; urgency=low
-
-  * Adding in application menu items.  They now parse the
-    desktop file of the application provided as a property.
-  * Making the IM menu items have icons and times and
-    clean them up a bit so that they work better.  Also
-    handling property updates.
-  * Legal stuff.  On all headers and in copyright.
-
- -- Ted Gould <ted@ubuntu.com>  Fri, 13 Feb 2009 16:40:39 -0600
-
-indicator-messages (0.1~ppa13) intrepid; urgency=low
-
-  * Display the icon instead of "messages"
-
- -- Ted Gould <ted@ubuntu.com>  Wed, 04 Feb 2009 19:11:54 +0100
-
-indicator-messages (0.1~ppa12) intrepid; urgency=low
-
-  * Fixed icon directories and names
-
- -- Ted Gould <ted@ubuntu.com>  Wed, 04 Feb 2009 18:14:41 +0100
-
-indicator-messages (0.1~ppa11) intrepid; urgency=low
-
-  * Start using our own icons.
-
- -- Ted Gould <ted@ubuntu.com>  Wed, 04 Feb 2009 18:00:22 +0100
-
-indicator-messages (0.1~ppa10) intrepid; urgency=low
-
-  * Adding in dummy icons
-
- -- Ted Gould <ted@ubuntu.com>  Wed, 04 Feb 2009 17:15:51 +0100
-
-indicator-messages (0.1~ppa9) intrepid; urgency=low
-
-  * Changed libindicate name to libindicate0, so need to have
-    another build in the PPA.
-
- -- Ted Gould <ted@ubuntu.com>  Tue, 03 Feb 2009 11:59:36 +0100
-
-indicator-messages (0.1~ppa8) intrepid; urgency=low
-
-  * Bumping for PPA
-
- -- Ted Gould <ted@ubuntu.com>  Mon, 02 Feb 2009 09:19:45 +0100
-
-indicator-messages (0.1~ppa7) intrepid; urgency=low
-
-  * Adding in activate callback when the menu item is
-    clicked on.
-
- -- Ted Gould <ted@ubuntu.com>  Fri, 30 Jan 2009 15:08:40 -0600
-
-indicator-messages (0.1~ppa6) intrepid; urgency=low
-
-  * Making things better, now menu items are created and
-    destroyed as they are, well, indicators are created
-    and destroyed.  Also minor cleanups.
-
- -- Ted Gould <ted@ubuntu.com>  Thu, 29 Jan 2009 14:53:11 -0600
-
-indicator-messages (0.1~ppa5) intrepid; urgency=low
-
-  * Basically now indicators show up if someone puts an IM message
-    on the Bus.  Way cool.  No delete or anything fancy, but good
-    progress.
-
- -- Ted Gould <ted@ubuntu.com>  Wed, 21 Jan 2009 19:39:50 -0600
-
-indicator-messages (0.1~ppa4) intrepid; urgency=low
-
-  * Make menu items for IM indicators
-
- -- Ted Gould <ted@ubuntu.com>  Wed, 21 Jan 2009 14:35:33 -0600
-
-indicator-messages (0.1~ppa3) intrepid; urgency=low
-
-  * Adding a build dependency on libindicate-dev
-
- -- Ted Gould <ted@ubuntu.com>  Mon, 19 Jan 2009 12:02:08 -0600
-
-indicator-messages (0.1~ppa2) intrepid; urgency=low
-
-  * Moving the directory
-
- -- Ted Gould <ted@ubuntu.com>  Thu, 04 Dec 2008 23:10:23 -0800
-
-indicator-messages (0.1~ppa1) intrepid; urgency=low
-
-  * Initial release
-
- -- Ted Gould <ted@ubuntu.com>  Thu, 04 Dec 2008 20:32:25 -0800
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Tue, 17 Feb 2009 11:35:38 +0100
diff --git a/debian/control b/debian/control
index 3b4bdf4..3635452 100644
--- a/debian/control
+++ b/debian/control
@@ -11,9 +11,15 @@ Build-Depends: debhelper (>= 5.0),
                intltool,
                libindicate-dev
 Standards-Version: 3.8.0
+Homepage: https://launchpad.net/indicator-applet
+Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/indicator-applet/messages-ubuntu
 
 Package: indicator-messages
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, indicator-applet
-Description: Applet for the GNOME panel providing various indicators for
- display to users.
+Description: GNOME panel indicator applet for messages
+ indicator-applet is an applet to display information from
+ various applications consistently in the GNOME panel.
+ .
+ This package provides support for messaging applications.
+
diff --git a/debian/copyright b/debian/copyright
index 04a54b5..aa4fb6f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,17 +3,31 @@ Wed, 11 Feb 2009 15:41:06 -0600.
 
 It was downloaded from <http://launchpad.net/indicate-applet/>
 
-Upstream Author(s):
+Upstream Author:
 
     Ted Gould <ted@canonical.com>
 
 Copyright:
 
-    <Copyright (C) 2009 Canonical Ltd.>
+    Copyright (C) 2009 Canonical Ltd.
 
 License:
 
-    Licensed under the GPL v3
+  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
+
+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'.