r46865 - in /desktop/unstable/glib2.0/debian: ./ patches/

[laney at users.alioth.debian.org]

Author: laney
Date: Mon Nov  9 12:58:51 2015
New Revision: 46865

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=46865
Log:
* New upstream stable release 2.46.2.
  + Fixes cross compilation (Closes: #800610)
* Drop changes from 2.46.1-2, which are all in this upstream releaee.
* Drop debian/patches/0001-GDateTime-test-fix-occasional-failures.patch,
  applied upstream.

Removed:
    desktop/unstable/glib2.0/debian/gdbus-example-objectmanager-server.c
    desktop/unstable/glib2.0/debian/patches/0001-GDateTime-test-fix-occasional-failures.patch
    desktop/unstable/glib2.0/debian/patches/Build-gdbus-example-objectmanager-server-again.patch
    desktop/unstable/glib2.0/debian/patches/Doc-copy-included-example-files.patch
Modified:
    desktop/unstable/glib2.0/debian/changelog
    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=46865&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/changelog	[utf-8] (original)
+++ desktop/unstable/glib2.0/debian/changelog	[utf-8] Mon Nov  9 12:58:51 2015
@@ -1,6 +1,11 @@
-glib2.0 (2.46.1-3) UNRELEASED; urgency=medium
+glib2.0 (2.46.2-1) UNRELEASED; urgency=medium
 
   * Fix Vcs-* to point to unstable.
+  * New upstream stable release 2.46.2.
+    + Fixes cross compilation (Closes: #800610)
+  * Drop changes from 2.46.1-2, which are all in this upstream releaee.
+  * Drop debian/patches/0001-GDateTime-test-fix-occasional-failures.patch,
+    applied upstream.
 
  -- Iain Lane <laney at debian.org>  Wed, 04 Nov 2015 15:01:22 +0000
 

Modified: desktop/unstable/glib2.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/patches/series?rev=46865&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/glib2.0/debian/patches/series	[utf-8] Mon Nov  9 12:58:51 2015
@@ -12,7 +12,3 @@
 0001-timer-test-use-volatile-for-locals.patch
 skip-broken-timer-test.patch
 0001-Fix-trashing-on-overlayfs.patch
-0001-GDateTime-test-fix-occasional-failures.patch
-Doc-copy-included-example-files.patch
-Doc-Fix-missing-glibconfig.h-when-builddir-srcdir.patch
-Build-gdbus-example-objectmanager-server-again.patch

Modified: desktop/unstable/glib2.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/rules?rev=46865&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/rules	[utf-8] (original)
+++ desktop/unstable/glib2.0/debian/rules	[utf-8] Mon Nov  9 12:58:51 2015
@@ -108,9 +108,6 @@
 pre-build::
 	mkdir -p debian/stamp-makefile-check \
 		 debian/tmp-xdg-runtime-dir
-	# this file was missed out of tarballs upstream
-	test -e gio/tests/gdbus-example-objectmanager-server.c || \
-		cp debian/gdbus-example-objectmanager-server.c gio/tests/
 
 binary-install/libglib2.0-0::
 	set -e; for script in postinst postrm; do \