Merge lp:~bobbo/gwibber/karmic-packaging into lp:~gwibber-team/gwibber/packaging

[David Futcher]

[David Futcher (bobbo)]

Ubuntu packaging update I propose for merging into the packaging trunk and uploading into Ubuntu Karmic.

Changelog:

gwibber (0.9.2~bzr263-0ubuntu1) karmic; urgency=low

  [ Fabien Tassin ]
  * New upstream snapshot
  * Add python-xdg to Depends

  [ Alexander Sack ]
  * Fix typo s/DATA__BASE_DIRS/DATA_BASE_DIRS/ causing startup issues

  [ David Futcher ]
  * debian/control: Improve long description
  * Install gwibber manpage (LP: #364813)
    - debian/copyright: Update to include manpage license terms
    - debian/gwibber.manpages: Add manpage

 -- David Futcher <email address hidden> Tue, 28 Apr 2009 16:59:01 +0100

=== modified file 'debian/changelog'
--- debian/changelog	2009-04-24 12:54:40 +0000
+++ debian/changelog	2009-04-29 14:56:24 +0000
@@ -1,4 +1,4 @@
-gwibber (0.9.2~bzr263-0ubuntu1) UNRELEASED; urgency=low
+gwibber (0.9.2~bzr263-0ubuntu1) karmic; urgency=low
 
   [ Fabien Tassin ]
   * New upstream snapshot
@@ -6,8 +6,14 @@
 
   [ Alexander Sack ]
   * Fix typo s/DATA__BASE_DIRS/DATA_BASE_DIRS/ causing startup issues
+  
+  [ David Futcher ]
+  * debian/control: Improve long description
+  * Install gwibber manpage (LP: #364813)
+    - debian/copyright: Update to include manpage license terms
+    - debian/gwibber.manpages: Add manpage
 
- -- Dominic Evans <[e-mail]>  Fri, 24 Apr 2009 10:26:48 +0100
+ -- David Futcher <[e-mail]>  Tue, 28 Apr 2009 16:59:01 +0100
 
 gwibber (0.8-0ubuntu3) jaunty; urgency=low
 
 
=== modified file 'debian/control'
--- debian/control	2009-04-24 12:54:40 +0000
+++ debian/control	2009-04-29 14:56:24 +0000
@@ -14,4 +14,5 @@
 Depends: python-dbus, python-gtk2, python-gconf, python-notify, python-egenix-mxdatetime, python-simplejson, python-cairo, libwebkit-1.0-1, python-webkitgtk, librsvg2-2, librsvg2-common, python-feedparser, python-imaging, python-gnome2-desktop, python-xdg, ${python:Depends}, ${misc:Depends}
 Recommends: python-indicate
 Description: Open source microblogging client for GNOME
- It supports Twitter, Jaiku, Identi.ca, Facebook, and Digg.
+ Gwibber is a microblogging client for GNOME. It supports Twitter, 
+ Jaiku, Identi.ca, Facebook, Flickr, Digg and RSS.
 
=== modified file 'debian/copyright'
--- debian/copyright	2009-02-23 15:26:46 +0000
+++ debian/copyright	2009-04-29 14:56:24 +0000
@@ -29,6 +29,12 @@
 
 The following files are distributed under their own terms:
 
+gwibber.1: 
+
+  Copyright (c) 2009, Greg Grossmeier <[e-mail]>
+  Licensed under a Creative Commons Attribution-ShareAlike License (cc by-sa)
+  <http://creativecommons.org/licenses/by-sa/3.0/>
+
 gwibber/gwp.py, gwibber/swp.py: MIT
 
   __license__ = "MIT <http://www.opensource.org/licenses/mit-license.php>"
 
=== added file 'debian/gwibber.manpages'
--- debian/gwibber.manpages	1970-01-01 00:00:00 +0000
+++ debian/gwibber.manpages	2009-04-29 14:56:24 +0000
@@ -0,0 +1,1 @@
+gwibber.1