r26847 - in /desktop/unstable/glib2.0/debian: changelog control control.in patches/0001-Run-gio-tests-with-a-dbus-session.patch patches/series rules
pochu at users.alioth.debian.org
pochu at users.alioth.debian.org
Sat Mar 12 22:57:03 UTC 2011
Author: pochu
Date: Sat Mar 12 22:57:02 2011
New Revision: 26847
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=26847
Log:
+ Build depend on dbus, dbus-x11, shared-mime-info, python-gobject
and python-dbus, needed by the test suite.
* d/p/0001-Run-gio-tests-with-a-dbus-session.patch:
+ New patch. Run gio tests through dbus-launch, since some of them
need a running dbus session.
* debian/control.in,
debian/rules:
+ Add autoreconf magic, needed by the above patch.
Added:
desktop/unstable/glib2.0/debian/patches/0001-Run-gio-tests-with-a-dbus-session.patch
Modified:
desktop/unstable/glib2.0/debian/changelog
desktop/unstable/glib2.0/debian/control
desktop/unstable/glib2.0/debian/control.in
desktop/unstable/glib2.0/debian/patches/series
desktop/unstable/glib2.0/debian/rules
Modified: desktop/unstable/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/changelog?rev=26847&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/changelog [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/changelog [utf-8] Sat Mar 12 22:57:02 2011
@@ -1,14 +1,20 @@
glib2.0 (2.28.2-2) UNRELEASED; urgency=low
* debian/control.in:
- + Build depend on dbus, shared-mime-info, python-gobject and
- python-dbus, needed by the test suite.
+ + Build depend on dbus, dbus-x11, shared-mime-info, python-gobject
+ and python-dbus, needed by the test suite.
+ libglib2.0-data doesn't need to depend on libglib2.0-0, since
it only ships translations. This will avoid making glib
uninstallable on the buildds when it is uploaded until the new
version has been built.
* d/p/0001-Document-g_timeout_add_seconds-first-call-latency.patch:
+ New patch. Fix a test case that was failing randomly.
+ * d/p/0001-Run-gio-tests-with-a-dbus-session.patch:
+ + New patch. Run gio tests through dbus-launch, since some of them
+ need a running dbus session.
+ * debian/control.in,
+ debian/rules:
+ + Add autoreconf magic, needed by the above patch.
-- Emilio Pozuelo Monfort <pochu at debian.org> Fri, 11 Mar 2011 23:19:30 +0000
Modified: desktop/unstable/glib2.0/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/control?rev=26847&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/control [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/control [utf-8] Sat Mar 12 22:57:02 2011
@@ -5,6 +5,7 @@
Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Josselin Mouette <joss at debian.org>, Sjoerd Simons <sjoerd at debian.org>
Build-Depends: debhelper (>> 5.0.22),
cdbs (>= 0.4.90),
+ dh-autoreconf,
pkg-config (>= 0.16.0),
gettext,
autotools-dev,
@@ -18,6 +19,7 @@
libgamin-dev [!linux-any] | libfam-dev [!linux-any],
zlib1g-dev,
dbus,
+ dbus-x11,
shared-mime-info,
python-gobject,
python-dbus
Modified: desktop/unstable/glib2.0/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/control.in?rev=26847&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/control.in [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/control.in [utf-8] Sat Mar 12 22:57:02 2011
@@ -5,6 +5,7 @@
Uploaders: @GNOME_TEAM@
Build-Depends: debhelper (>> 5.0.22),
cdbs (>= 0.4.90),
+ dh-autoreconf,
pkg-config (>= 0.16.0),
gettext,
autotools-dev,
@@ -18,6 +19,7 @@
libgamin-dev [!linux-any] | libfam-dev [!linux-any],
zlib1g-dev,
dbus,
+ dbus-x11,
shared-mime-info,
python-gobject,
python-dbus
Added: desktop/unstable/glib2.0/debian/patches/0001-Run-gio-tests-with-a-dbus-session.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/patches/0001-Run-gio-tests-with-a-dbus-session.patch?rev=26847&op=file
==============================================================================
--- desktop/unstable/glib2.0/debian/patches/0001-Run-gio-tests-with-a-dbus-session.patch (added)
+++ desktop/unstable/glib2.0/debian/patches/0001-Run-gio-tests-with-a-dbus-session.patch [utf-8] Sat Mar 12 22:57:02 2011
@@ -1,0 +1,43 @@
+From 0f2f4616f2810ac6821ac8f85952874f422007c8 Mon Sep 17 00:00:00 2001
+From: Emilio Pozuelo Monfort <pochu27 at gmail.com>
+Date: Sat, 12 Mar 2011 22:09:11 +0000
+Subject: [PATCH] Run gio tests with a dbus session
+
+Some gio tests (e.g. gapplication) need a running dbus session
+to work, so we run them with dbus-launch, which prepares the
+dbus session.
+---
+ Makefile.decl | 2 +-
+ gio/tests/Makefile.am | 3 +++
+ 2 files changed, 4 insertions(+), 1 deletions(-)
+
+diff --git a/Makefile.decl b/Makefile.decl
+index 163fd8b..6bf9281 100644
+--- a/Makefile.decl
++++ b/Makefile.decl
+@@ -1,7 +1,7 @@
+ # GLIB - Library of useful C routines
+
+ #GTESTER = gtester # for non-GLIB packages
+-GTESTER = $(top_builddir)/glib/gtester # for the GLIB package
++GTESTER = $(GTESTER_ENV) $(top_builddir)/glib/gtester # for the GLIB package
+ GTESTER_REPORT = $(top_builddir)/glib/gtester-report # for the GLIB package
+
+ # initialize variables for unconditional += appending
+diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am
+index 46b0efa..e775180 100644
+--- a/gio/tests/Makefile.am
++++ b/gio/tests/Makefile.am
+@@ -2,6 +2,9 @@ NULL =
+
+ include $(top_srcdir)/Makefile.decl
+
++# Some tests need a dbus session
++GTESTER_ENV = dbus-launch
++
+ INCLUDES = \
+ -g \
+ $(gio_INCLUDES) \
+--
+1.7.4.1
+
Modified: desktop/unstable/glib2.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/patches/series?rev=26847&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/patches/series [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/patches/series [utf-8] Sat Mar 12 22:57:02 2011
@@ -1,4 +1,5 @@
0001-Document-g_timeout_add_seconds-first-call-latency.patch
+0001-Run-gio-tests-with-a-dbus-session.patch
01_gettext-desktopfiles.patch
02_gettext-desktopfiles-ubuntu.patch
03_blacklist-directories.patch
Modified: desktop/unstable/glib2.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/rules?rev=26847&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/rules [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/rules [utf-8] Sat Mar 12 22:57:02 2011
@@ -4,6 +4,7 @@
DEB_MAKE_FLAVORS = deb udeb refdbg
DISABLE_UPDATE_UPLOADERS := 1
+include /usr/share/cdbs/1/rules/autoreconf.mk
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/utils.mk
include /usr/share/cdbs/1/class/gnome.mk
More information about the pkg-gnome-commits
mailing list