r39208 - in /desktop/experimental/glib2.0: ./ debian/changelog debian/control debian/control.in debian/rules
laney at users.alioth.debian.org
laney at users.alioth.debian.org
Wed Aug 21 08:43:29 UTC 2013
Author: laney
Date: Wed Aug 21 08:43:28 2013
New Revision: 39208
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=39208
Log:
Merge changes from unstable, mainly for build / testsuite fixes.
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/rules
Propchange: desktop/experimental/glib2.0/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 21 08:43:28 2013
@@ -1,2 +1,2 @@
/desktop/experimental/glib2.0:34881-37631
-/desktop/unstable/glib2.0:24636,27515-27547
+/desktop/unstable/glib2.0:24636,27515-27547,38796-39206
Modified: desktop/experimental/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/changelog?rev=39208&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/changelog [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/changelog [utf-8] Wed Aug 21 08:43:28 2013
@@ -2,6 +2,7 @@
* New upstream release 2.37.6
* Update symbols file
+ * Merge changes from unstable, mainly for build / testsuite fixes.
-- Iain Lane <laney at debian.org> Tue, 20 Aug 2013 14:44:10 +0000
@@ -52,6 +53,40 @@
the testsuite.
-- Iain Lane <laney at debian.org> Fri, 21 Jun 2013 15:28:46 +0100
+
+glib2.0 (2.36.4-1) unstable; urgency=low
+
+ * New upstream release.
+ * Remove 0001-Revert-g_file_set_contents-don-t-fsync-on-ext3-4.patch, merged
+ upstream.
+ * Make test suite linux only again. On kfreebsd the test suite keeps getting
+ stuck and the build is killed after a timeout.
+
+ -- Michael Biebl <biebl at debian.org> Sat, 10 Aug 2013 09:57:58 +0200
+
+glib2.0 (2.36.3-4) unstable; urgency=low
+
+ [ Josselin Mouette ]
+ * Still run the testsuite on !linux, even though non-fatal.
+
+ [ Michael Biebl ]
+ * Track stable releases.
+ * Use dh_python2 to properly generate the dependencies for gdbus-codegen,
+ which is shipped in libglib2.0-dev.
+
+ -- Michael Biebl <biebl at debian.org> Sun, 04 Aug 2013 16:39:05 +0200
+
+glib2.0 (2.36.3-3) unstable; urgency=low
+
+ [ Julien Cristau ]
+ * Use gcc-4.8 on sparc to fix misbuild causing test failure (closes: #709781).
+
+ [ Josselin Mouette ]
+ * Only make the testsuite fatal on linux. Although the other
+ architectures don’t pass, we have to keep a pair of reverse
+ dependencies working.
+
+ -- Josselin Mouette <joss at debian.org> Sat, 06 Jul 2013 15:51:11 +0200
glib2.0 (2.36.3-2) unstable; urgency=low
@@ -2989,4 +3024,3 @@
* Initial Release.
-- Akira TAGOH <tagoh at debian.org> Tue, 12 Mar 2002 02:32:11 +0900
-
Modified: desktop/experimental/glib2.0/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/control?rev=39208&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/control [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/control [utf-8] Wed Aug 21 08:43:28 2013
@@ -2,10 +2,11 @@
Section: libs
Priority: optional
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Emilio Pozuelo Monfort <pochu at debian.org>, Martin Pitt <mpitt at debian.org>
+Uploaders: Emilio Pozuelo Monfort <pochu at debian.org>, Josselin Mouette <joss at debian.org>, Martin Pitt <mpitt at debian.org>, Michael Biebl <biebl at debian.org>
Build-Depends: debhelper (>= 8.1.3),
cdbs (>= 0.4.93),
dh-autoreconf,
+ gcc-4.8 [sparc],
pkg-config (>= 0.16.0),
gettext,
autotools-dev,
@@ -23,7 +24,7 @@
dbus-x11,
shared-mime-info,
xterm,
- python (>= 2.5),
+ python (>= 2.6.6-3~),
python-dbus,
python-gi,
libxml2-utils,
@@ -109,12 +110,12 @@
Architecture: any
Depends: ${misc:Depends},
${shlibs:Depends},
+ ${python:Depends},
libglib2.0-0 (= ${binary:Version}),
libglib2.0-bin (= ${binary:Version}),
libpcre3-dev (>= 1:8.31),
pkg-config (>= 0.16.0),
zlib1g-dev
-Recommends: python
Suggests: libglib2.0-doc
Description: Development files for the GLib library
GLib is a library containing many useful C routines for things such
Modified: desktop/experimental/glib2.0/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/control.in?rev=39208&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/control.in [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/control.in [utf-8] Wed Aug 21 08:43:28 2013
@@ -1,4 +1,4 @@
-Source: glib at APIVER@
+ource: glib at APIVER@
Section: libs
Priority: optional
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
@@ -6,6 +6,7 @@
Build-Depends: debhelper (>= 8.1.3),
cdbs (>= 0.4.93),
dh-autoreconf,
+ gcc-4.8 [sparc],
pkg-config (>= 0.16.0),
gettext,
autotools-dev,
@@ -23,7 +24,7 @@
dbus-x11,
shared-mime-info,
xterm,
- python (>= 2.5),
+ python (>= 2.6.6-3~),
python-dbus,
python-gi,
libxml2-utils,
@@ -109,12 +110,12 @@
Architecture: any
Depends: ${misc:Depends},
${shlibs:Depends},
+ ${python:Depends},
@SHARED_PKG@ (= ${binary:Version}),
@BIN_PKG@ (= ${binary:Version}),
libpcre3-dev (>= 1:8.31),
pkg-config (>= 0.16.0),
zlib1g-dev
-Recommends: python
Suggests: @DOC_PKG@
Description: Development files for the GLib library
GLib is a library containing many useful C routines for things such
Modified: desktop/experimental/glib2.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/rules?rev=39208&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/rules [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/rules [utf-8] Wed Aug 21 08:43:28 2013
@@ -59,7 +59,9 @@
# where creating /home/buildd/.dbus-keyrings fails
export HOME=$(CURDIR)/debian/build
-DEB_MAKE_CHECK_TARGET = $(if $(filter deb, $(cdbs_make_curflavor)), -k check)
+ifeq ($(DEB_HOST_ARCH_OS), linux)
+ DEB_MAKE_CHECK_TARGET = $(if $(filter deb, $(cdbs_make_curflavor)), -k check)
+endif
# The tests assume this directory exists and is writable
export XDG_RUNTIME_DIR=$(CURDIR)/debian/tmp-xdg-runtime-dir
@@ -74,6 +76,9 @@
DEB_CONFIGURE_EXTRA_FLAGS += \
--disable-modular-tests \
--disable-gtk-doc
+endif
+ifeq ($(DEB_HOST_ARCH), sparc)
+ DEB_CONFIGURE_EXTRA_FLAGS += CC=gcc-4.8
endif
DEB_CONFIGURE_FLAGS_deb := \
@@ -101,6 +106,8 @@
> debian/$(cdbs_curpkg).$$script ; \
done
+binary-install/libglib2.0-dev::
+ dh_python2 -plibglib2.0-dev /usr/share/glib-2.0/codegen
common-install-arch::
set -e; for file in libgio-fam.install libglib2.0-0.install \
More information about the pkg-gnome-commits
mailing list