r45544 - in /desktop/experimental/glib2.0/debian: ./ patches/

[laney at users.alioth.debian.org]

Author: laney
Date: Tue Jul 21 16:49:51 2015
New Revision: 45544

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=45544
Log:
* New upstream release 2.45.4
* d/p/0001-gio-tests-appmonitor-Delete-file-before-checking-for.patch,
  d/p/0001-glocalfilemonitor-Send-DELETED-event-when-there-is-n.patch: Drop,
  applied upstream.
* d/p/07_disable_tests_on_slow_archs.patch: Refresh to apply cleanly.

Removed:
    desktop/experimental/glib2.0/debian/patches/0001-gio-tests-appmonitor-Delete-file-before-checking-for.patch
    desktop/experimental/glib2.0/debian/patches/0001-glocalfilemonitor-Send-DELETED-event-when-there-is-n.patch
Modified:
    desktop/experimental/glib2.0/debian/changelog
    desktop/experimental/glib2.0/debian/patches/07_disable_tests_on_slow_archs.patch
    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=45544&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/changelog	[utf-8] (original)
+++ desktop/experimental/glib2.0/debian/changelog	[utf-8] Tue Jul 21 16:49:51 2015
@@ -1,3 +1,13 @@
+glib2.0 (2.45.4-1) UNRELEASED; urgency=medium
+
+  * New upstream release 2.45.4
+  * d/p/0001-gio-tests-appmonitor-Delete-file-before-checking-for.patch,
+    d/p/0001-glocalfilemonitor-Send-DELETED-event-when-there-is-n.patch: Drop,
+    applied upstream.
+  * d/p/07_disable_tests_on_slow_archs.patch: Refresh to apply cleanly.
+
+ -- Iain Lane <laney at debian.org>  Tue, 21 Jul 2015 15:36:15 +0100
+
 glib2.0 (2.45.3-1) experimental; urgency=medium
 
   [ Simon McVittie ]

Modified: desktop/experimental/glib2.0/debian/patches/07_disable_tests_on_slow_archs.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/07_disable_tests_on_slow_archs.patch?rev=45544&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/07_disable_tests_on_slow_archs.patch	[utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/07_disable_tests_on_slow_archs.patch	[utf-8] Tue Jul 21 16:49:51 2015
@@ -6,14 +6,14 @@
 ===================================================================
 --- a/gio/tests/socket.c
 +++ b/gio/tests/socket.c
-@@ -1447,7 +1447,9 @@
+@@ -1452,7 +1452,9 @@
    g_test_add_func ("/socket/ipv6_v4mapped", test_ipv6_v4mapped);
  #endif
    g_test_add_func ("/socket/close_graceful", test_close_graceful);
 +#if !defined(__arm__)
    g_test_add_func ("/socket/timed_wait", test_timed_wait);
 +#endif
-   g_test_add_func ("/socket/fd_roundtrip", test_fd_roundtrip);
+   g_test_add_func ("/socket/fd_reuse", test_fd_reuse);
    g_test_add_func ("/socket/address", test_sockaddr);
  #ifdef G_OS_UNIX
 Index: b/glib/tests/mainloop.c

Modified: desktop/experimental/glib2.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/series?rev=45544&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/series	[utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/series	[utf-8] Tue Jul 21 16:49:51 2015
@@ -12,5 +12,3 @@
 0001-timer-test-use-volatile-for-locals.patch
 skip-broken-timer-test.patch
 0001-Fix-trashing-on-overlayfs.patch
-0001-glocalfilemonitor-Send-DELETED-event-when-there-is-n.patch
-0001-gio-tests-appmonitor-Delete-file-before-checking-for.patch