Merge lp:~kelemeng/gparted/bug913591 into lp:ubuntu/precise/gparted

Proposed by Gabor Kelemen
Status: Merged
Merged at revision: 46
Proposed branch: lp:~kelemeng/gparted/bug913591
Merge into: lp:ubuntu/precise/gparted
Diff against target: 46 lines (+6/-6)
3 files modified
debian/control (+1/-1)
debian/patches/01_fix-desktop.patch (+4/-5)
debian/rules (+1/-0)
To merge this branch: bzr merge lp:~kelemeng/gparted/bug913591
Reviewer Review Type Date Requested Status
Martin Pitt Approve
Review via email: mp+87885@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Martin Pitt (pitti) wrote :

Thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2011-09-16 05:45:05 +0000
3+++ debian/control 2012-01-09 00:44:24 +0000
4@@ -6,7 +6,7 @@
5 Uploaders: Alan Baghumian <alan@technotux.org>, Otavio Salvador <otavio@debian.org>
6 Build-Depends: debhelper (>= 7), libxml-parser-perl, uuid-dev,
7 parted, pkg-config, gnome-doc-utils, rarian-compat, libgtkmm-2.4-dev,
8- libparted0-dev (>= 2.2), intltool
9+ libparted0-dev (>= 2.2), intltool, dh-translations
10 Standards-Version: 3.9.1
11 Homepage: http://gparted.sourceforge.net
12
13
14=== modified file 'debian/patches/01_fix-desktop.patch'
15--- debian/patches/01_fix-desktop.patch 2011-08-10 14:49:48 +0000
16+++ debian/patches/01_fix-desktop.patch 2012-01-09 00:44:24 +0000
17@@ -1,8 +1,8 @@
18-Index: gparted-0.8.1/gparted.desktop.in.in
19+Index: gparted/gparted.desktop.in.in
20 ===================================================================
21---- gparted-0.8.1.orig/gparted.desktop.in.in 2011-08-10 16:20:22.138993940 -0400
22-+++ gparted-0.8.1/gparted.desktop.in.in 2011-08-10 16:20:44.438993933 -0400
23-@@ -3,9 +3,10 @@
24+--- gparted.orig/gparted.desktop.in.in 2012-01-07 00:14:26.721709000 +0100
25++++ gparted/gparted.desktop.in.in 2012-01-07 01:05:40.747638636 +0100
26+@@ -3,9 +3,9 @@
27 _GenericName=Partition Editor
28 _X-GNOME-FullName=GParted Partition Editor
29 _Comment=Create, reorganize, and delete partitions
30@@ -14,4 +14,3 @@
31 -Categories=GNOME;System;Filesystem;
32 +Categories=GNOME;System;Filesystem;Settings;
33 StartupNotify=true
34-+X-Ubuntu-Gettext-Domain=gparted
35
36=== modified file 'debian/rules'
37--- debian/rules 2011-08-17 09:30:48 +0000
38+++ debian/rules 2012-01-09 00:44:24 +0000
39@@ -53,6 +53,7 @@
40 dh_install
41 dh_link
42 cp debian/gparted.xpm debian/gparted/usr/share/pixmaps
43+ dh_translations
44 dh_strip
45 dh_compress
46 dh_fixperms

Subscribers

People subscribed via source and target branches

to all changes: