Gwibber

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

  1. karmic-packaging
  2. Merge into packaging
Proposed by David Futcher
Status: Merged
Merged at revision: not available
Proposed branch: lp://staging/~bobbo/gwibber/karmic-packaging
Merge into: lp://staging/~gwibber-team/gwibber/packaging
Diff against target: None lines
To merge this branch: bzr merge lp://staging/~bobbo/gwibber/karmic-packaging
Reviewer Review Type Date Requested Status
Gwibber Team Pending
Review via email: mp+6021@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
David Futcher (bobbo) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2009-04-24 12:54:40 +0000
3+++ debian/changelog 2009-04-29 14:56:24 +0000
4@@ -1,4 +1,4 @@
5-gwibber (0.9.2~bzr263-0ubuntu1) UNRELEASED; urgency=low
6+gwibber (0.9.2~bzr263-0ubuntu1) karmic; urgency=low
7
8 [ Fabien Tassin ]
9 * New upstream snapshot
10@@ -6,8 +6,14 @@
11
12 [ Alexander Sack ]
13 * Fix typo s/DATA__BASE_DIRS/DATA_BASE_DIRS/ causing startup issues
14+
15+ [ David Futcher ]
16+ * debian/control: Improve long description
17+ * Install gwibber manpage (LP: #364813)
18+ - debian/copyright: Update to include manpage license terms
19+ - debian/gwibber.manpages: Add manpage
20
21- -- Dominic Evans <oldmanuk@gmail.com> Fri, 24 Apr 2009 10:26:48 +0100
22+ -- David Futcher <bobbo@ubuntu.com> Tue, 28 Apr 2009 16:59:01 +0100
23
24 gwibber (0.8-0ubuntu3) jaunty; urgency=low
25
26
27=== modified file 'debian/control'
28--- debian/control 2009-04-24 12:54:40 +0000
29+++ debian/control 2009-04-29 14:56:24 +0000
30@@ -14,4 +14,5 @@
31 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}
32 Recommends: python-indicate
33 Description: Open source microblogging client for GNOME
34- It supports Twitter, Jaiku, Identi.ca, Facebook, and Digg.
35+ Gwibber is a microblogging client for GNOME. It supports Twitter,
36+ Jaiku, Identi.ca, Facebook, Flickr, Digg and RSS.
37
38=== modified file 'debian/copyright'
39--- debian/copyright 2009-02-23 15:26:46 +0000
40+++ debian/copyright 2009-04-29 14:56:24 +0000
41@@ -29,6 +29,12 @@
42
43 The following files are distributed under their own terms:
44
45+gwibber.1:
46+
47+ Copyright (c) 2009, Greg Grossmeier <greg@grossmeier.net>
48+ Licensed under a Creative Commons Attribution-ShareAlike License (cc by-sa)
49+ <http://creativecommons.org/licenses/by-sa/3.0/>
50+
51 gwibber/gwp.py, gwibber/swp.py: MIT
52
53 __license__ = "MIT <http://www.opensource.org/licenses/mit-license.php>"
54
55=== added file 'debian/gwibber.manpages'
56--- debian/gwibber.manpages 1970-01-01 00:00:00 +0000
57+++ debian/gwibber.manpages 2009-04-29 14:56:24 +0000
58@@ -0,0 +1,1 @@
59+gwibber.1

Subscribers

People subscribed via source and target branches