r36218 - in /desktop/experimental/glib2.0/debian: changelog patches/91_kfreebsd_credentials.patch

[smcv at users.alioth.debian.org]

Author: smcv
Date: Fri Nov  2 14:14:29 2012
New Revision: 36218

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=36218
Log:
Mark 91_kfreebsd_credentials.patch as having gone upstream

Modified:
    desktop/experimental/glib2.0/debian/changelog
    desktop/experimental/glib2.0/debian/patches/91_kfreebsd_credentials.patch

Modified: desktop/experimental/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/changelog?rev=36218&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/changelog [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/changelog [utf-8] Fri Nov  2 14:14:29 2012
@@ -1,3 +1,9 @@
+glib2.0 (2.34.1-3) UNRELEASED; urgency=low
+
+  * Mark 91_kfreebsd_credentials.patch as having gone upstream
+
+ -- Simon McVittie <smcv at debian.org>  Fri, 02 Nov 2012 14:12:24 +0000
+
 glib2.0 (2.34.1-2) experimental; urgency=low
 
   * Team upload

Modified: desktop/experimental/glib2.0/debian/patches/91_kfreebsd_credentials.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/91_kfreebsd_credentials.patch?rev=36218&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/91_kfreebsd_credentials.patch [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/91_kfreebsd_credentials.patch [utf-8] Fri Nov  2 14:14:29 2012
@@ -1,4 +1,4 @@
-From 54df0c1f0246a700a36d865347d2ab3ec3e9d371 Mon Sep 17 00:00:00 2001
+From 1afaea333b2f2775d4e5fc6f4de8f9f83f994fd7 Mon Sep 17 00:00:00 2001
 From: Simon McVittie <simon.mcvittie at collabora.co.uk>
 Date: Sun, 21 Oct 2012 23:38:31 +0100
 Subject: [PATCH] Use the FreeBSD credentials-passing code on Debian
@@ -14,6 +14,8 @@
 Bug: https://bugzilla.gnome.org/show_bug.cgi?id=649302
 Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=581750
 Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=631968
+Reviewed-by: Dan Winship <danw at gnome.org>
+Applied-upstream: 2.35.2, commit:1afaea3; 2.34.2, commit:11f26aa; 2.32.5, commit:7a3f70e
 ---
  gio/gcredentials.c            |   18 +++++++++---------
  gio/gunixcredentialsmessage.c |   12 ++++++------