r42179 - in /desktop/experimental/glib2.0: ./ debian/ debian/patches/ debian/source/ debian/tests/

laney at users.alioth.debian.org laney at users.alioth.debian.org
Thu Aug 14 09:58:40 UTC 2014 

Author: laney
Date: Thu Aug 14 09:58:40 2014
New Revision: 42179

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=42179
Log:
Merge changes from unstable


Added:
    desktop/experimental/glib2.0/debian/patches/regex-if-PCRE-is-8.34-or-later-disable-auto-possessi.patch
      - copied unchanged from r42178, desktop/unstable/glib2.0/debian/patches/regex-if-PCRE-is-8.34-or-later-disable-auto-possessi.patch
    desktop/experimental/glib2.0/debian/patches/regex-test-do-not-assert-that-system-PCRE-allows-P-1.patch
      - copied unchanged from r42178, desktop/unstable/glib2.0/debian/patches/regex-test-do-not-assert-that-system-PCRE-allows-P-1.patch
    desktop/experimental/glib2.0/debian/patches/regex-test-do-not-assert-that-system-PCRE-still-has-.patch
      - copied unchanged from r42178, desktop/unstable/glib2.0/debian/patches/regex-test-do-not-assert-that-system-PCRE-still-has-.patch
    desktop/experimental/glib2.0/debian/source/lintian-overrides
      - copied unchanged from r42178, desktop/unstable/glib2.0/debian/source/lintian-overrides
Removed:
    desktop/experimental/glib2.0/debian/patches/05_run-gio-tests-with-a-dbus-session.patch
Modified:
    desktop/experimental/glib2.0/   (props changed)
    desktop/experimental/glib2.0/debian/changelog
    desktop/experimental/glib2.0/debian/control
    desktop/experimental/glib2.0/debian/control.in
    desktop/experimental/glib2.0/debian/patches/series
    desktop/experimental/glib2.0/debian/rules
    desktop/experimental/glib2.0/debian/tests/control
    desktop/experimental/glib2.0/debian/tests/installed-tests

Propchange: desktop/experimental/glib2.0/
------------------------------------------------------------------------------
--- svn:mergeinfo	(original)
+++ svn:mergeinfo	Thu Aug 14 09:58:40 2014
@@ -1,2 +1,2 @@
 /desktop/experimental/glib2.0:34881-37631
-/desktop/unstable/glib2.0:24636,27515-27547,38796-39206
+/desktop/unstable/glib2.0:24636,27515-27547,38796-39206,41794-42178

Modified: desktop/experimental/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/changelog?rev=42179&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/changelog	[utf-8] (original)
+++ desktop/experimental/glib2.0/debian/changelog	[utf-8] Thu Aug 14 09:58:40 2014
@@ -73,6 +73,41 @@
   * Update symbols file with new symbols for this release.
 
  -- Iain Lane <laney at debian.org>  Tue, 27 May 2014 15:41:46 +0100
+
+glib2.0 (2.40.0-4) unstable; urgency=medium
+
+  * Team upload
+
+  [ Emilio Pozuelo Monfort ]
+  * Use the default compiler on sparc, since it's already >> 4.7.
+    Closes: #751313.
+
+  [ Iain Lane ]
+  * Fix Vcs-* for the unstable branches
+
+  [ Simon McVittie ]
+  * Adapt for system pcre3/1:8.35 (Closes: #755439):
+    - a PCRE 8.31 bug in case-insensitivity has been fixed, so do not assert
+      bug-for-bug compatibility with 8.31
+    - named match groups' names cannot start with a digit any more, so
+      (?P<1>.) is no longer allowed; do not assert that it is
+    - turn off a new optimization that would reduce the result set when called
+      from g_match_all(_full), to preserve existing functionality
+  * Build-depend on pcre3/1:8.35 so that the new optimization is
+    known to be turned off in the built binaries
+  * Add patch from upstream to fix mis-optimization in gvariant test
+    with gcc 4.9 (Closes: #756272)
+  * Avoid using dbus-launch for regression tests (Closes: #737488):
+    - run installed-tests under dbus-run-session from dbus (>= 1.8)
+    - do not run build-time tests under dbus-launch: those that use D-Bus
+      all create their own session bus instances now
+      (i.e. remove 05_run-gio-tests-with-a-dbus-session.patch)
+    - set a deliberately invalid DBUS_SESSION_BUS_ADDRESS to make sure
+      nothing in the build is still inheriting it from the environment
+  * Override Lintian false positive #733733: we build-depend on python:any
+    but Lintian doesn't yet understand :any syntax
+
+ -- Simon McVittie <smcv at debian.org>  Sun, 10 Aug 2014 22:58:33 +0100
 
 glib2.0 (2.40.0-3) unstable; urgency=medium
 

Modified: desktop/experimental/glib2.0/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/control?rev=42179&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/control	[utf-8] (original)
+++ desktop/experimental/glib2.0/debian/control	[utf-8] Thu Aug 14 09:58:40 2014
@@ -12,7 +12,7 @@
                gnome-pkg-tools (>= 0.11),
                dpkg-dev (>= 1.16.0),
                libelfg0-dev (>= 0.8.12),
-               libpcre3-dev (>= 1:8.31),
+               libpcre3-dev (>= 1:8.35),
                desktop-file-utils,
                gtk-doc-tools (>= 1.20),
                libselinux1-dev [linux-any],

Modified: desktop/experimental/glib2.0/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/control.in?rev=42179&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/control.in	[utf-8] (original)
+++ desktop/experimental/glib2.0/debian/control.in	[utf-8] Thu Aug 14 09:58:40 2014
@@ -12,7 +12,7 @@
                gnome-pkg-tools (>= 0.11),
                dpkg-dev (>= 1.16.0),
                libelfg0-dev (>= 0.8.12),
-               libpcre3-dev (>= 1:8.31),
+               libpcre3-dev (>= 1:8.35),
                desktop-file-utils,
                gtk-doc-tools (>= 1.20),
                libselinux1-dev [linux-any],

Modified: desktop/experimental/glib2.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/series?rev=42179&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/series	[utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/series	[utf-8] Thu Aug 14 09:58:40 2014
@@ -2,7 +2,6 @@
 02_gettext-desktopfiles-ubuntu.patch
 03_disble_glib_compile_schemas_warning.patch
 04_homedir_env.patch
-05_run-gio-tests-with-a-dbus-session.patch
 06_thread_test_ignore_prctl_fail.patch
 07_disable_tests_on_slow_archs.patch
 10_kfreebsd_issetugid_prototype.patch
@@ -18,3 +17,6 @@
 81-skip-monitor-test-on-non-linux.patch
 0001-timer-test-use-volatile-for-locals.patch
 skip-broken-timer-test.patch
+regex-if-PCRE-is-8.34-or-later-disable-auto-possessi.patch
+regex-test-do-not-assert-that-system-PCRE-allows-P-1.patch
+regex-test-do-not-assert-that-system-PCRE-still-has-.patch

Modified: desktop/experimental/glib2.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/rules?rev=42179&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/rules	[utf-8] (original)
+++ desktop/experimental/glib2.0/debian/rules	[utf-8] Thu Aug 14 09:58:40 2014
@@ -63,6 +63,10 @@
 # Do not clutter $HOME with ~/.dbus-keyrings and avoid failure on the buildds
 # where creating /home/buildd/.dbus-keyrings fails
 export HOME=$(CURDIR)/debian/build
+
+# Make sure that everything that uses D-Bus is creating its own temporary
+# session rather than polluting the developer's (or failing, on buildds)
+export DBUS_SESSION_BUS_ADDRESS=this-should-not-be-used-and-will-fail:
 
 ifeq ($(DEB_HOST_ARCH_OS), linux)
   DEB_MAKE_CHECK_TARGET = $(if $(filter deb, $(cdbs_make_curflavor)), -k check -j1)

Modified: desktop/experimental/glib2.0/debian/tests/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/tests/control?rev=42179&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/tests/control	[utf-8] (original)
+++ desktop/experimental/glib2.0/debian/tests/control	[utf-8] Thu Aug 14 09:58:40 2014
@@ -2,4 +2,4 @@
 Depends: libglib2.0-dev, build-essential
 
 Tests: installed-tests
-Depends: libglib2.0-tests, dbus-x11, xauth, xvfb, gnome-desktop-testing
+Depends: libglib2.0-tests, dbus-x11, dbus (>= 1.8), xauth, xvfb, gnome-desktop-testing

Modified: desktop/experimental/glib2.0/debian/tests/installed-tests
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/tests/installed-tests?rev=42179&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/tests/installed-tests	[utf-8] (original)
+++ desktop/experimental/glib2.0/debian/tests/installed-tests	[utf-8] Thu Aug 14 09:58:40 2014
@@ -7,4 +7,4 @@
 
 export XDG_RUNTIME_DIR=$ADTTMP
 
-dbus-launch xvfb-run -a gnome-desktop-testing-runner glib
+dbus-run-session -- xvfb-run -a gnome-desktop-testing-runner glib

More information about the pkg-gnome-commits mailing list