r37110 - in /desktop/experimental/glib2.0/debian: changelog patches/15_gio_desktop_app_info_test_bin_true_path.patch patches/series

[pochu at users.alioth.debian.org]

Author: pochu
Date: Thu Mar 21 14:44:49 2013
New Revision: 37110

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=37110
Log:
* debian/patches/15_gio_desktop_app_info_test_bin_true_path.patch:
  + Change path for 'true' to /bin/true as that's where it is in
    Debian. This fixes a testcase that was failing on every arch
    and was causing the build to fail on ia64 and powerpc as test
    failures are fatal on those arches.

Added:
    desktop/experimental/glib2.0/debian/patches/15_gio_desktop_app_info_test_bin_true_path.patch
Modified:
    desktop/experimental/glib2.0/debian/changelog
    desktop/experimental/glib2.0/debian/patches/series

Modified: desktop/experimental/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/changelog?rev=37110&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/changelog [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/changelog [utf-8] Thu Mar 21 14:44:49 2013
@@ -12,6 +12,11 @@
       the prototype is missing. Thanks to Julien Cristau for the
       patch. This works-around #703559 and can be removed when that
       bug is fixed.
+  * debian/patches/15_gio_desktop_app_info_test_bin_true_path.patch:
+    + Change path for 'true' to /bin/true as that's where it is in
+      Debian. This fixes a testcase that was failing on every arch
+      and was causing the build to fail on ia64 and powerpc as test
+      failures are fatal on those arches.
 
  -- Emilio Pozuelo Monfort <pochu at debian.org>  Wed, 20 Mar 2013 20:05:37 +0100
 

Added: desktop/experimental/glib2.0/debian/patches/15_gio_desktop_app_info_test_bin_true_path.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/15_gio_desktop_app_info_test_bin_true_path.patch?rev=37110&op=file
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/15_gio_desktop_app_info_test_bin_true_path.patch (added)
+++ desktop/experimental/glib2.0/debian/patches/15_gio_desktop_app_info_test_bin_true_path.patch [utf-8] Thu Mar 21 14:44:49 2013
@@ -1,0 +1,15 @@
+Description: Fix path for /bin/true in Debian
+Author: Emilio Pozuelo Monfort <pochu at debian.org>
+Origin: vendor
+
+--- a/gio/tests/desktop-app-info.c
++++ b/gio/tests/desktop-app-info.c
+@@ -34,7 +34,7 @@
+   GAppInfo *info;
+ 
+   error = NULL;
+-  info = g_app_info_create_from_commandline ("/usr/bin/true blah",
++  info = g_app_info_create_from_commandline ("/bin/true blah",
+                                              name,
+                                              G_APP_INFO_CREATE_NONE,
+                                              &error);

Modified: desktop/experimental/glib2.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/series?rev=37110&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/series [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/series [utf-8] Thu Mar 21 14:44:49 2013
@@ -8,5 +8,6 @@
 10_kfreebsd_issetugid_prototype.patch
 11_kfreebsd_pthread_condattr_setclock_prototype.patch
 13_sparc_prlimit_prototype.patch
+15_gio_desktop_app_info_test_bin_true_path.patch
 61_glib-compile-binaries-path.patch
 90_gio-modules-multiarch-compat.patch