r36580 - in /desktop/experimental/glib2.0/debian: changelog patches/92_revert_appinfo_command_line.patch

[mpitt at users.alioth.debian.org]

Author: mpitt
Date: Tue Jan 15 09:12:38 2013
New Revision: 36580

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=36580
Log:
92_revert_appinfo_command_line.patch: Update test that assumes that the
desktop file has a Terminal line, as the patch removes that.

Modified:
    desktop/experimental/glib2.0/debian/changelog
    desktop/experimental/glib2.0/debian/patches/92_revert_appinfo_command_line.patch

Modified: desktop/experimental/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/changelog?rev=36580&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/changelog [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/changelog [utf-8] Tue Jan 15 09:12:38 2013
@@ -22,6 +22,8 @@
   [ Martin Pitt ]
   * New upstream release 2.35.4 
   * Drop 08_disable_gapplication_basic_test.patch, test is now more robust.
+  * 92_revert_appinfo_command_line.patch: Update test that assumes that the
+    desktop file has a Terminal line, as the patch removes that.
 
  -- Iain Lane <laney at debian.org>  Thu, 10 Jan 2013 13:00:54 +0000
 

Modified: desktop/experimental/glib2.0/debian/patches/92_revert_appinfo_command_line.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/92_revert_appinfo_command_line.patch?rev=36580&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/92_revert_appinfo_command_line.patch [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/92_revert_appinfo_command_line.patch [utf-8] Tue Jan 15 09:12:38 2013
@@ -1,5 +1,7 @@
---- glib2.0-2.33.10/gio/tests/appinfo-test.desktop.gnome	2012-08-21 15:17:22.205059142 +0200
-+++ glib2.0-2.33.10/gio/tests/appinfo-test.desktop	2012-08-21 15:17:28.621059452 +0200
+Index: glib2.0-2.35.4/gio/tests/appinfo-test.desktop
+===================================================================
+--- glib2.0-2.35.4.orig/gio/tests/appinfo-test.desktop	2012-08-19 04:19:25.000000000 +0200
++++ glib2.0-2.35.4/gio/tests/appinfo-test.desktop	2013-01-15 09:54:26.000000000 +0100
 @@ -9,7 +9,6 @@
  Comment[de]=GAppInfo Beispiel
  Exec=./appinfo-test --option %U %i --name %c --filename %k %m %%
@@ -8,3 +10,16 @@
  StartupNotify=true
  StartupWMClass=appinfo-class
  MimeType=image/png;image/jpeg;
+Index: glib2.0-2.35.4/gio/tests/desktop-app-info.c
+===================================================================
+--- glib2.0-2.35.4.orig/gio/tests/desktop-app-info.c	2012-11-22 03:13:00.000000000 +0100
++++ glib2.0-2.35.4/gio/tests/desktop-app-info.c	2013-01-15 09:55:24.315133072 +0100
+@@ -360,7 +360,7 @@
+   appinfo = g_desktop_app_info_new_from_filename (SRCDIR "/appinfo-test.desktop");
+   g_assert (appinfo != NULL);
+ 
+-  g_assert (g_desktop_app_info_has_key (appinfo, "Terminal"));
++  g_assert (g_desktop_app_info_has_key (appinfo, "StartupNotify"));
+   g_assert (!g_desktop_app_info_has_key (appinfo, "Bratwurst"));
+ 
+   s = g_desktop_app_info_get_string (appinfo, "StartupWMClass");