r44286 - in /desktop/unstable/glib2.0/debian: changelog patches/regex-test-do-not-assert-that-system-PCRE-allows-P-1.patch

[smcv at users.alioth.debian.org]

Author: smcv
Date: Mon May  4 11:11:58 2015
New Revision: 44286

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=44286
Log:
d/p/regex-test-do-not-assert-that-system-PCRE-allows-P-1.patch:
update to the version that went upstream in 2.45.1. No functional change.

Modified:
    desktop/unstable/glib2.0/debian/changelog
    desktop/unstable/glib2.0/debian/patches/regex-test-do-not-assert-that-system-PCRE-allows-P-1.patch

Modified: desktop/unstable/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/changelog?rev=44286&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/changelog	[utf-8] (original)
+++ desktop/unstable/glib2.0/debian/changelog	[utf-8] Mon May  4 11:11:58 2015
@@ -1,3 +1,10 @@
+glib2.0 (2.44.0-3) UNRELEASED; urgency=medium
+
+  * d/p/regex-test-do-not-assert-that-system-PCRE-allows-P-1.patch:
+    update to the version that went upstream in 2.45.1. No functional change.
+
+ -- Simon McVittie <smcv at debian.org>  Mon, 04 May 2015 09:53:53 +0100
+
 glib2.0 (2.44.0-2) unstable; urgency=medium
 
   * Upload to unstable.

Modified: desktop/unstable/glib2.0/debian/patches/regex-test-do-not-assert-that-system-PCRE-allows-P-1.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/patches/regex-test-do-not-assert-that-system-PCRE-allows-P-1.patch?rev=44286&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/patches/regex-test-do-not-assert-that-system-PCRE-allows-P-1.patch	[utf-8] (original)
+++ desktop/unstable/glib2.0/debian/patches/regex-test-do-not-assert-that-system-PCRE-allows-P-1.patch	[utf-8] Mon May  4 11:11:58 2015
@@ -1,19 +1,22 @@
-From 070c9e965ac43f851bebc1ed653e9b468ec73cc8 Mon Sep 17 00:00:00 2001
+From 4e29e9a079a8e7a80ee78d9dc55b9ceb90f3421c Mon Sep 17 00:00:00 2001
 From: Simon McVittie <simon.mcvittie at collabora.co.uk>
 Date: Sun, 20 Jul 2014 19:34:54 +0100
-Subject: [PATCH 3/4] regex test: do not assert that system PCRE allows
- "(?P<1>)"
+Subject: [PATCH] regex test: do not assert that system PCRE allows "(?P<1>)"
 
 Perl >= 5.18, and PCRE >= 8.34, disallow this.
 
 Bug: https://bugzilla.gnome.org/show_bug.cgi?id=733325
+Reviewed-by: Christian Persch <chpe at gnome.org>
+Applied-upstream: 2.45.1, commit:4e29e9a0
 ---
  glib/tests/regex.c | 3 +++
  1 file changed, 3 insertions(+)
 
+diff --git a/glib/tests/regex.c b/glib/tests/regex.c
+index 833e585..b886b06 100644
 --- a/glib/tests/regex.c
 +++ b/glib/tests/regex.c
-@@ -2569,8 +2569,11 @@
+@@ -2628,8 +2628,11 @@ main (int argc, char *argv[])
    TEST_EXPAND("a", "a", "\\0130", FALSE, "X");
    TEST_EXPAND("a", "a", "\\\\\\0", FALSE, "\\a");
    TEST_EXPAND("a(?P<G>.)c", "xabcy", "X\\g<G>X", FALSE, "XbX");
@@ -25,3 +28,6 @@
    TEST_EXPAND(".", EURO, "\\0", FALSE, EURO);
    TEST_EXPAND("(.)", EURO, "\\1", FALSE, EURO);
    TEST_EXPAND("(?P<G>.)", EURO, "\\g<G>", FALSE, EURO);
+-- 
+2.1.4
+