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

[Gabor Kelemen]

[Martin Pitt (pitti)]

Thanks!

review: Approve

=== modified file 'debian/control'
--- debian/control	2011-09-16 05:45:05 +0000
+++ debian/control	2012-01-09 00:44:24 +0000
@@ -6,7 +6,7 @@
 Uploaders: Alan Baghumian <[e-mail]>, Otavio Salvador <[e-mail]>
 Build-Depends: debhelper (>= 7), libxml-parser-perl, uuid-dev,
  parted, pkg-config, gnome-doc-utils, rarian-compat, libgtkmm-2.4-dev,
- libparted0-dev (>= 2.2), intltool
+ libparted0-dev (>= 2.2), intltool, dh-translations
 Standards-Version: 3.9.1
 Homepage: http://gparted.sourceforge.net
 
 
=== modified file 'debian/patches/01_fix-desktop.patch'
--- debian/patches/01_fix-desktop.patch	2011-08-10 14:49:48 +0000
+++ debian/patches/01_fix-desktop.patch	2012-01-09 00:44:24 +0000
@@ -1,8 +1,8 @@
-Index: gparted-0.8.1/gparted.desktop.in.in
+Index: gparted/gparted.desktop.in.in
 ===================================================================
---- gparted-0.8.1.orig/gparted.desktop.in.in	2011-08-10 16:20:22.138993940 -0400
-+++ gparted-0.8.1/gparted.desktop.in.in	2011-08-10 16:20:44.438993933 -0400
-@@ -3,9 +3,10 @@
+--- gparted.orig/gparted.desktop.in.in	2012-01-07 00:14:26.721709000 +0100
++++ gparted/gparted.desktop.in.in	2012-01-07 01:05:40.747638636 +0100
+@@ -3,9 +3,9 @@
  _GenericName=Partition Editor
  _X-GNOME-FullName=GParted Partition Editor
  _Comment=Create, reorganize, and delete partitions
@@ -14,4 +14,3 @@
 -Categories=GNOME;System;Filesystem;
 +Categories=GNOME;System;Filesystem;Settings;
  StartupNotify=true
-+X-Ubuntu-Gettext-Domain=gparted
 
=== modified file 'debian/rules'
--- debian/rules	2011-08-17 09:30:48 +0000
+++ debian/rules	2012-01-09 00:44:24 +0000
@@ -53,6 +53,7 @@
 	dh_install
 	dh_link
 	cp debian/gparted.xpm debian/gparted/usr/share/pixmaps
+	dh_translations
 	dh_strip
 	dh_compress
 	dh_fixperms