r27788 - in /desktop/unstable/glib-networking/debian: changelog control patches/ patches/Only-set-GTLS-errors-when-errors-have-occurred.patch patches/series patches/work-around-intltool-issue.patch

Tue Apr 26 18:06:08 UTC 2011

Author: sjoerd
Date: Tue Apr 26 18:05:52 2011
New Revision: 27788

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=27788
Log:
* New upstream release
* debian/patches/Only-set-GTLS-errors-when-errors-have-occurred.patch
  - Added. Only reports errors when sending if errors occurred
* debian/patches/work-around-intltool-issue.patch
  - Added. Work around intltool discovering translations in applied patched
    (Debian bug #560704)

Added:
    desktop/unstable/glib-networking/debian/patches/
    desktop/unstable/glib-networking/debian/patches/Only-set-GTLS-errors-when-errors-have-occurred.patch
    desktop/unstable/glib-networking/debian/patches/series
    desktop/unstable/glib-networking/debian/patches/work-around-intltool-issue.patch
Modified:
    desktop/unstable/glib-networking/debian/changelog
    desktop/unstable/glib-networking/debian/control

Modified: desktop/unstable/glib-networking/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib-networking/debian/changelog?rev=27788&op=diff
==============================================================================

--- desktop/unstable/glib-networking/debian/changelog [utf-8] (original)
+++ desktop/unstable/glib-networking/debian/changelog [utf-8] Tue Apr 26 18:05:52 2011
@@ -1,3 +1,14 @@
+glib-networking (2.28.6-1) UNRELEASED; urgency=low
+
+  * New upstream release
+  * debian/patches/Only-set-GTLS-errors-when-errors-have-occurred.patch
+    - Added. Only reports errors when sending if errors occurred
+  * debian/patches/work-around-intltool-issue.patch
+    - Added. Work around intltool discovering translations in applied patched
+      (Debian bug #560704)
+
+ -- Sjoerd Simons <sjoerd at debian.org>  Tue, 26 Apr 2011 19:03:54 +0100
+
 glib-networking (2.28.4-2) unstable; urgency=low
 
   [ Rodrigo Moya ]

Modified: desktop/unstable/glib-networking/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib-networking/debian/control?rev=27788&op=diff
==============================================================================
--- desktop/unstable/glib-networking/debian/control [utf-8] (original)
+++ desktop/unstable/glib-networking/debian/control [utf-8] Tue Apr 26 18:05:52 2011
@@ -7,7 +7,7 @@
 Section: libs
 Priority: optional
 Maintainer: Emilio Pozuelo Monfort <pochu at debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Sebastian Dröge <slomo at debian.org>, Sjoerd Simons <sjoerd at debian.org>
 Build-Depends: debhelper (>= 8),
                cdbs,
                gnome-pkg-tools,

Added: desktop/unstable/glib-networking/debian/patches/Only-set-GTLS-errors-when-errors-have-occurred.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib-networking/debian/patches/Only-set-GTLS-errors-when-errors-have-occurred.patch?rev=27788&op=file
==============================================================================
--- desktop/unstable/glib-networking/debian/patches/Only-set-GTLS-errors-when-errors-have-occurred.patch (added)
+++ desktop/unstable/glib-networking/debian/patches/Only-set-GTLS-errors-when-errors-have-occurred.patch [utf-8] Tue Apr 26 18:05:52 2011
@@ -1,0 +1,25 @@
+From b957ebff9cfc75db8762692c7912d380f86104cb Mon Sep 17 00:00:00 2001
+From: Sjoerd Simons <sjoerd.simons at collabora.co.uk>
+Date: Tue, 26 Apr 2011 18:30:11 +0100
+Subject: [PATCH] Only set GTLS errors when errors have occurred
+
+---
+ tls/gnutls/gtlsconnection-gnutls.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/tls/gnutls/gtlsconnection-gnutls.c b/tls/gnutls/gtlsconnection-gnutls.c
+index d9ba322..5b15910 100644
+--- a/tls/gnutls/gtlsconnection-gnutls.c
++++ b/tls/gnutls/gtlsconnection-gnutls.c
+@@ -527,7 +527,7 @@ end_gnutls_io (GTlsConnectionGnutls  *gnutls,
+             ret == GNUTLS_E_WARNING_ALERT_RECEIVED) &&	\
+            !gnutls->priv->error);			\
+   ret = end_gnutls_io (gnutls, ret, error);		\
+-  if (ret && error && !*error)				\
++  if (ret < 0 && error && !*error)			\
+     {							\
+       g_set_error (error, G_TLS_ERROR, G_TLS_ERROR_MISC,\
+                    errmsg, gnutls_strerror (ret));	\
+-- 
+1.7.4.4
+

Added: desktop/unstable/glib-networking/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib-networking/debian/patches/series?rev=27788&op=file
==============================================================================
--- desktop/unstable/glib-networking/debian/patches/series (added)
+++ desktop/unstable/glib-networking/debian/patches/series [utf-8] Tue Apr 26 18:05:52 2011
@@ -1,0 +1,2 @@
+Only-set-GTLS-errors-when-errors-have-occurred.patch
+work-around-intltool-issue.patch

Added: desktop/unstable/glib-networking/debian/patches/work-around-intltool-issue.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib-networking/debian/patches/work-around-intltool-issue.patch?rev=27788&op=file
==============================================================================
--- desktop/unstable/glib-networking/debian/patches/work-around-intltool-issue.patch (added)
+++ desktop/unstable/glib-networking/debian/patches/work-around-intltool-issue.patch [utf-8] Tue Apr 26 18:05:52 2011
@@ -1,0 +1,20 @@
+From 7d165689c85d96f2cabe9a93e49f08be657e021c Mon Sep 17 00:00:00 2001
+From: Sjoerd Simons <sjoerd.simons at collabora.co.uk>
+Date: Tue, 26 Apr 2011 18:58:00 +0100
+Subject: [PATCH] work around intltool issue
+
+---
+ po/POTFILES.skip |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+ create mode 100644 po/POTFILES.skip
+
+diff --git a/po/POTFILES.skip b/po/POTFILES.skip
+new file mode 100644
+index 0000000..845ca06
+--- /dev/null
++++ b/po/POTFILES.skip
+@@ -0,0 +1 @@
++.pc
+-- 
+1.7.4.4
+


