r41576 - in /desktop/unstable/file-roller/debian: changelog control patches/series patches/use-new-desktop-filename.patch

[ah at users.alioth.debian.org]

Author: ah
Date: Wed Apr 30 16:26:45 2014
New Revision: 41576

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=41576
Log:
* Add debian/patches/use-new-desktop-filename.patch (Closes: #746366)
  - from upstream git, fix for problem introduced in 3.12.1

Added:
    desktop/unstable/file-roller/debian/patches/use-new-desktop-filename.patch
Modified:
    desktop/unstable/file-roller/debian/changelog
    desktop/unstable/file-roller/debian/control
    desktop/unstable/file-roller/debian/patches/series

Modified: desktop/unstable/file-roller/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/file-roller/debian/changelog?rev=41576&op=diff
==============================================================================
--- desktop/unstable/file-roller/debian/changelog	[utf-8] (original)
+++ desktop/unstable/file-roller/debian/changelog	[utf-8] Wed Apr 30 16:26:45 2014
@@ -1,3 +1,10 @@
+file-roller (3.12.1-2) unstable; urgency=medium
+
+  * Add debian/patches/use-new-desktop-filename.patch (Closes: #746366)
+    - from upstream git, fix for problem introduced in 3.12.1
+
+ -- Andreas Henriksson <andreas at fatal.se>  Wed, 30 Apr 2014 18:16:42 +0200
+
 file-roller (3.12.1-1) unstable; urgency=medium
 
   * Add a recommends on gnome-icon-theme-symbolic (Closes: #745594)

Modified: desktop/unstable/file-roller/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/file-roller/debian/control?rev=41576&op=diff
==============================================================================
--- desktop/unstable/file-roller/debian/control	[utf-8] (original)
+++ desktop/unstable/file-roller/debian/control	[utf-8] Wed Apr 30 16:26:45 2014
@@ -7,9 +7,10 @@
 Section: gnome
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Andreas Henriksson <andreas at fatal.se>, Jordi Mallach <jordi at debian.org>, Michael Biebl <biebl at debian.org>
+Uploaders: Andreas Henriksson <andreas at fatal.se>, Michael Biebl <biebl at debian.org>
 Build-Depends: cdbs (>= 0.4.41),
                debhelper (>= 8),
+               desktop-file-utils,
                gettext,
                gnome-pkg-tools (>= 0.12),
                intltool (>= 0.40.0),
@@ -35,6 +36,7 @@
          ${shlibs:Depends}
 Replaces: gnome-icon-theme (<< 2.14)
 Recommends: gnome-icon-theme (>= 2.18),
+            gnome-icon-theme-symbolic,
             gvfs,
             unar,
             yelp

Modified: desktop/unstable/file-roller/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/file-roller/debian/patches/series?rev=41576&op=diff
==============================================================================
--- desktop/unstable/file-roller/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/file-roller/debian/patches/series	[utf-8] Wed Apr 30 16:26:45 2014
@@ -1,2 +1,3 @@
 01_package_names.patch
 99_ltmain_as-needed.patch
+use-new-desktop-filename.patch

Added: desktop/unstable/file-roller/debian/patches/use-new-desktop-filename.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/file-roller/debian/patches/use-new-desktop-filename.patch?rev=41576&op=file
==============================================================================
--- desktop/unstable/file-roller/debian/patches/use-new-desktop-filename.patch	(added)
+++ desktop/unstable/file-roller/debian/patches/use-new-desktop-filename.patch	[utf-8] Wed Apr 30 16:26:45 2014
@@ -0,0 +1,22 @@
+From 5de90dedbeb70546ce1ede86cbbc6626214f8d40 Mon Sep 17 00:00:00 2001
+From: Paolo Bacchilega <paobac at src.gnome.org>
+Date: Wed, 30 Apr 2014 11:37:18 +0200
+Subject: use the new .desktop filename
+
+
+diff --git a/src/fr-application.c b/src/fr-application.c
+index e2d4a9c..75704db 100644
+--- a/src/fr-application.c
++++ b/src/fr-application.c
+@@ -841,7 +841,7 @@ static void
+ fr_application_init (FrApplication *self)
+ {
+ #ifdef GDK_WINDOWING_X11
+-	egg_set_desktop_file (APPLICATIONS_DIR "/file-roller.desktop");
++	egg_set_desktop_file (APPLICATIONS_DIR "/org.gnome.FileRoller.desktop");
+ #else
+ 	/* manually set name and icon */
+ 	g_set_application_name (_("File Roller"));
+-- 
+cgit v0.10.1
+