r37634 - in /desktop/unstable/glib-networking: ./ debian/changelog debian/control debian/control.in

[mpitt at users.alioth.debian.org]

Author: mpitt
Date: Wed May  8 04:33:55 2013
New Revision: 37634

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=37634
Log:
merge experimental branch

Modified:
    desktop/unstable/glib-networking/   (props changed)
    desktop/unstable/glib-networking/debian/changelog
    desktop/unstable/glib-networking/debian/control
    desktop/unstable/glib-networking/debian/control.in

Propchange: desktop/unstable/glib-networking/
------------------------------------------------------------------------------
    svn:mergeinfo = /desktop/experimental/glib-networking:35691-37633

Modified: desktop/unstable/glib-networking/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib-networking/debian/changelog?rev=37634&op=diff
==============================================================================
--- desktop/unstable/glib-networking/debian/changelog [utf-8] (original)
+++ desktop/unstable/glib-networking/debian/changelog [utf-8] Wed May  8 04:33:55 2013
@@ -1,3 +1,62 @@
+glib-networking (2.36.1-2) UNRELEASED; urgency=low
+
+  * Merge experimental branch, upload to unstable.
+
+ -- Martin Pitt <mpitt at debian.org>  Wed, 08 May 2013 06:32:23 +0200
+
+glib-networking (2.36.1-1) experimental; urgency=low
+
+  * New upstream release.
+
+ -- Iain Lane <laney at debian.org>  Tue, 23 Apr 2013 11:28:54 +0100
+
+glib-networking (2.36.0-1) experimental; urgency=low
+
+  * New upstream release.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org>  Mon, 25 Mar 2013 16:04:44 +0100
+
+glib-networking (2.35.9-1) experimental; urgency=low
+
+  * New upstream release.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org>  Tue, 05 Mar 2013 18:39:07 +0100
+
+glib-networking (2.35.8-1) experimental; urgency=low
+
+  * New upstream release.
+    + debian/control.in:
+      - Update build dependencies.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org>  Sat, 23 Feb 2013 19:31:23 +0100
+
+glib-networking (2.34.0-1) experimental; urgency=low
+
+  * New upstream release.
+    + debian/control.in:
+      - Update build dependencies.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org>  Tue, 23 Oct 2012 16:50:01 +0200
+
+glib-networking (2.33.14-1) experimental; urgency=low
+
+  * New upstream release.
+  * Bump Build-Depends on libglib2.0-dev to (>= 2.33.14) so we don't pick up
+    the version from unstable. This will also generate a tight enough
+    dependency.
+
+ -- Michael Biebl <biebl at debian.org>  Thu, 20 Sep 2012 21:12:58 +0200
+
+glib-networking (2.33.12-1) experimental; urgency=low
+
+  * New upstream version, matching glib 2.33.12.
+  * debian/control.in: Bump glib build dependency to >= 2.33.12.
+  * debian/control.in: Switch Vcs-* to experimental branch.
+  * debian/watch: Watch for unstable versions while we are tracking the 2.34
+    development versions.
+
+ -- Martin Pitt <mpitt at debian.org>  Thu, 06 Sep 2012 05:55:23 +0200
+
 glib-networking (2.32.3-1) unstable; urgency=low
 
   * New upstream release.

Modified: desktop/unstable/glib-networking/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib-networking/debian/control?rev=37634&op=diff
==============================================================================
--- desktop/unstable/glib-networking/debian/control [utf-8] (original)
+++ desktop/unstable/glib-networking/debian/control [utf-8] Wed May  8 04:33:55 2013
@@ -2,16 +2,15 @@
 # 
 # Modifications should be made to debian/control.in instead.
 # This file is regenerated automatically in the clean target.
-
 Source: glib-networking
 Section: libs
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Josselin Mouette <joss at debian.org>, Martin Pitt <mpitt at debian.org>, Michael Biebl <biebl at debian.org>
+Uploaders: Emilio Pozuelo Monfort <pochu 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),
                gnome-pkg-tools,
-               libglib2.0-dev (>= 2.31.6),
+               libglib2.0-dev (>= 2.35.8),
                libgnutls-dev (>= 2.12.8),
                libp11-kit-dev (>= 0.8),
                libproxy-dev (>= 0.3.1),

Modified: desktop/unstable/glib-networking/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib-networking/debian/control.in?rev=37634&op=diff
==============================================================================
--- desktop/unstable/glib-networking/debian/control.in [utf-8] (original)
+++ desktop/unstable/glib-networking/debian/control.in [utf-8] Wed May  8 04:33:55 2013
@@ -6,7 +6,7 @@
 Build-Depends: debhelper (>= 8.1.3),
                cdbs (>= 0.4.93),
                gnome-pkg-tools,
-               libglib2.0-dev (>= 2.31.6),
+               libglib2.0-dev (>= 2.35.8),
                libgnutls-dev (>= 2.12.8),
                libp11-kit-dev (>= 0.8),
                libproxy-dev (>= 0.3.1),