Merge lp:~kiwinote/software-properties/bug1042180 into lp:software-properties

Proposed by Kiwinote
Status: Merged
Merged at revision: 793
Proposed branch: lp:~kiwinote/software-properties/bug1042180
Merge into: lp:software-properties
Diff against target: 26 lines (+8/-0)
2 files modified
debian/changelog (+7/-0)
softwareproperties/gtk/SoftwarePropertiesGtk.py (+1/-0)
To merge this branch: bzr merge lp:~kiwinote/software-properties/bug1042180
Reviewer Review Type Date Requested Status
Michael Vogt Pending
Review via email: mp+121611@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Michael Vogt (mvo) wrote :

On Tue, Aug 28, 2012 at 01:33:19PM -0000, Kiwinote wrote:
> Kiwinote has proposed merging lp:~kiwinote/software-properties/bug1042180 into lp:software-properties.
>
> Requested reviews:
> Michael Vogt (mvo)
>
> For more details, see:
> https://code.launchpad.net/~kiwinote/software-properties/bug1042180/+merge/121611
> --
> https://code.launchpad.net/~kiwinote/software-properties/bug1042180/+merge/121611
> You are requested to review the proposed merge of lp:~kiwinote/software-properties/bug1042180 into lp:software-properties.

Perfect, many thanks!

> === modified file 'debian/changelog'
> --- debian/changelog 2012-08-27 08:13:24 +0000
> +++ debian/changelog 2012-08-28 13:32:19 +0000
> @@ -1,3 +1,10 @@
> +software-properties (0.92.1) UNRELEASED; urgency=low
> +
> + * softwareproperties/gtk/SoftwarePropertiesGtk.py:
> + - add missing import to unblock startup (LP: #1042180)
> +
> + -- Kiwinote <email address hidden> Tue, 28 Aug 2012 15:22:59 +0200
> +
> software-properties (0.92) quantal; urgency=low
>
> [ Robert Roth ]
>
> === modified file 'softwareproperties/gtk/SoftwarePropertiesGtk.py'
> --- softwareproperties/gtk/SoftwarePropertiesGtk.py 2012-08-27 07:42:37 +0000
> +++ softwareproperties/gtk/SoftwarePropertiesGtk.py 2012-08-28 13:32:19 +0000
> @@ -28,6 +28,7 @@
> import apt_pkg
> import dbus
> from gettext import gettext as _
> +import gettext
> import os
> import subprocess
> from aptdaemon import client
>

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 2012-08-27 08:13:24 +0000
3+++ debian/changelog 2012-08-28 13:32:19 +0000
4@@ -1,3 +1,10 @@
5+software-properties (0.92.1) UNRELEASED; urgency=low
6+
7+ * softwareproperties/gtk/SoftwarePropertiesGtk.py:
8+ - add missing import to unblock startup (LP: #1042180)
9+
10+ -- Kiwinote <kiwinote@gmail.com> Tue, 28 Aug 2012 15:22:59 +0200
11+
12 software-properties (0.92) quantal; urgency=low
13
14 [ Robert Roth ]
15
16=== modified file 'softwareproperties/gtk/SoftwarePropertiesGtk.py'
17--- softwareproperties/gtk/SoftwarePropertiesGtk.py 2012-08-27 07:42:37 +0000
18+++ softwareproperties/gtk/SoftwarePropertiesGtk.py 2012-08-28 13:32:19 +0000
19@@ -28,6 +28,7 @@
20 import apt_pkg
21 import dbus
22 from gettext import gettext as _
23+import gettext
24 import os
25 import subprocess
26 from aptdaemon import client

Subscribers

People subscribed via source and target branches

to status/vote changes: