Ubuntu

Merge lp:~neonofneophyte/ubuntu/oneiric/notification-daemon/fix-for-557887 into lp:ubuntu/oneiric/notification-daemon

Proposed by Ben Tucker on 2011-06-23
Status: Merged
Merge reported by: Chris Halse Rogers
Merged at revision: not available
Proposed branch: lp:~neonofneophyte/ubuntu/oneiric/notification-daemon/fix-for-557887
Merge into: lp:ubuntu/oneiric/notification-daemon
Diff against target: 43 lines (+17/-3) 2 files modified
To merge this branch: bzr merge lp:~neonofneophyte/ubuntu/oneiric/notification-daemon/fix-for-557887
Reviewer Review Type Date Requested Status
Robert Roth (community) Needs Fixing on 2011-06-24
Ubuntu branches 2011-06-23 Pending
Review via email: mp+65720@code.launchpad.net

Description of the Change

Fixed LP bug #557887 by moving the homepage URL, which was in the description, into the more appropriate Homepage tag.

To post a comment you must log in.
Robert Roth (evfool) wrote :

The fix looks fine, but there's a nonsense sentence left at the end of the description, although this was not reported in the bug ("as per the Desktop Notifications spec"). I guess it would also worth removing that at the same time, and the whole change should be forwarded to Debian (they should accept it without objections), to avoid having distro patches.

review: Needs Fixing
Ben Tucker (neonofneophyte) wrote :

> The fix looks fine, but there's a nonsense sentence left at the end of the
> description, although this was not reported in the bug ("as per the Desktop
> Notifications spec"). I guess it would also worth removing that at the same
> time, and the whole change should be forwarded to Debian (they should accept
> it without objections), to avoid having distro patches.

I will go ahead and remove that last sentence, then. Also, how do I go about forwarding the patch to Debian?

51. By Ben Tucker on 2011-06-24

debian/control.in: Removed the very last sentence of the description,
which was nonsense.
(https://code.launchpad.net/~neonofneophyte/ubuntu/oneiric/notification-daemon/fix-for-557887/+merge/65720)

Robert Roth (evfool) wrote :

Thanks, now it's OK. Regarding forwarding to debian, see the https://wiki.ubuntu.com/Debian/Bugs page or ask for help on IRC on the #ubuntu-devel channel.

Ben Tucker (neonofneophyte) wrote :

I have submitted the patch to Debian, and it is now pending review (sorry
for the delay, I was having some trouble with the tools)

On Fri, Jun 24, 2011 at 2:07 PM, Robert Roth <email address hidden> wrote:

> Thanks, now it's OK. Regarding forwarding to debian, see the
> https://wiki.ubuntu.com/Debian/Bugs page or ask for help on IRC on the
> #ubuntu-devel channel.
> --
>
> https://code.launchpad.net/~neonofneophyte/ubuntu/oneiric/notification-daemon/fix-for-557887/+merge/65720
> You are the owner of
> lp:~neonofneophyte/ubuntu/oneiric/notification-daemon/fix-for-557887.
>

Robert Roth (evfool) wrote :

Thanks for submitting it to debian. The tooling setup takes indeed a long time at first, but once you have it setup, you are ready for development :) So keep up the good work.

Chris Halse Rogers (raof) wrote :

Since the patch has been sitting in the Debian BTS for a month now I've gone ahead and cleaned this up and uploaded.

I merged the top two changelog entries into one - 0.7.1-2ubuntu1 was never in the archive, so there's no need to make a 0.7.1-2ubuntu2 changelog entry - and fixed the Launchpad bug closing line - you need (LP: #number), not (LP #number).

Thanks for your work!

Preview Diff

1=== modified file 'debian/changelog'
2--- debian/changelog 2011-06-08 09:14:07 +0000
3+++ debian/changelog 2011-06-24 20:36:00 +0000
4@@ -1,3 +1,18 @@
5+notification-daemon (0.7.1-2ubuntu2) oneiric; urgency=low
6+
7+ * debian/control.in: Removed the very last sentence of the description,
8+ which was nonsense.
9+ (https://code.launchpad.net/~neonofneophyte/ubuntu/oneiric/notification-daemon/fix-for-557887/+merge/65720)
10+
11+ -- Ben Tucker <neonofneophyte@gmail.com> Fri, 24 Jun 2011 13:24:37 -0700
12+
13+notification-daemon (0.7.1-2ubuntu1) oneiric; urgency=low
14+
15+ * debian/control.in: Made the URL at the bottom of the description a
16+ homepage instead. (LP #557887)
17+
18+ -- Ben Tucker <neonofneophyte@gmail.com> Thu, 23 Jun 2011 12:47:47 -0700
19+
20 notification-daemon (0.7.1-2) experimental; urgency=low
21
22 * debian/control.in: Add back libdbus-glib-1-dev build dependency. configure
23
24=== modified file 'debian/control.in'
25--- debian/control.in 2011-06-08 09:14:07 +0000
26+++ debian/control.in 2011-06-24 20:36:00 +0000
27@@ -21,6 +21,7 @@
28 ${misc:Depends}
29 Conflicts: notify-daemon
30 Replaces: notify-daemon
31+Homepage: http://www.galago-project.org/specs/notification/index.php
32 Description: daemon to displays passive pop-up notifications
33 notification-daemon displays passive pop-up notifications, as per
34 the Desktop Notifications Specification.
35@@ -29,7 +30,5 @@
36 doing passive pop-up notifications on the Linux desktop. These are
37 designed to notify the user of something without interrupting their
38 work with a dialog box that they must close. Passive popups can
39- automatically disappear after a short period of time. as per the
40- Desktop Notifications spec
41+ automatically disappear after a short period of time.
42 .
43- http://www.galago-project.org/specs/notification/index.php

Subscribers

People subscribed via source and target branches

to all changes: