r45903 - in /desktop/experimental/gnome-control-center/debian: changelog control control.in patches/debian-uses-ssh-service.patch

[ah at users.alioth.debian.org]

Author: ah
Date: Wed Sep 16 15:27:58 2015
New Revision: 45903

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=45903
Log:
* New upstream release candidate.
* Update build-dependencies according to configure.ac changes:
  - bump gnome-bluetooth >= 3.17.90
  - bump gnome-desktop >= 3.17.4
* Update debian/patches/debian-uses-ssh-service.patch

Modified:
    desktop/experimental/gnome-control-center/debian/changelog
    desktop/experimental/gnome-control-center/debian/control
    desktop/experimental/gnome-control-center/debian/control.in
    desktop/experimental/gnome-control-center/debian/patches/debian-uses-ssh-service.patch

Modified: desktop/experimental/gnome-control-center/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-control-center/debian/changelog?rev=45903&op=diff
==============================================================================
--- desktop/experimental/gnome-control-center/debian/changelog	[utf-8] (original)
+++ desktop/experimental/gnome-control-center/debian/changelog	[utf-8] Wed Sep 16 15:27:58 2015
@@ -1,8 +1,16 @@
-gnome-control-center (1:3.16.3-2) UNRELEASED; urgency=medium
-
+gnome-control-center (1:3.17.92-1) experimental; urgency=medium
+
+  [ Josselin Mouette ]
   * Remove Debian menu entry.
 
- -- Josselin Mouette <joss at debian.org>  Fri, 04 Sep 2015 09:28:23 +0200
+  [ Andreas Henriksson ]
+  * New upstream release candidate.
+  * Update build-dependencies according to configure.ac changes:
+    - bump gnome-bluetooth >= 3.17.90
+    - bump gnome-desktop >= 3.17.4
+  * Update debian/patches/debian-uses-ssh-service.patch
+
+ -- Andreas Henriksson <andreas at fatal.se>  Wed, 16 Sep 2015 17:22:36 +0200
 
 gnome-control-center (1:3.16.3-1) unstable; urgency=medium
 

Modified: desktop/experimental/gnome-control-center/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-control-center/debian/control?rev=45903&op=diff
==============================================================================
--- desktop/experimental/gnome-control-center/debian/control	[utf-8] (original)
+++ desktop/experimental/gnome-control-center/debian/control	[utf-8] Wed Sep 16 15:27:58 2015
@@ -31,9 +31,9 @@
                libgdk-pixbuf2.0-dev (>= 2.23.0),
                libgirepository1.0-dev,
                libglib2.0-dev (>= 2.37.7),
-               libgnome-desktop-3-dev (>= 3.11.3),
+               libgnome-desktop-3-dev (>= 3.17.4),
                libgnomekbd-dev (>= 2.91.91),
-               libgnome-bluetooth-dev (>= 3.11.1) [linux-any],
+               libgnome-bluetooth-dev (>= 3.17.90) [linux-any],
                libibus-1.0-dev (>= 1.5.2),
                libgoa-1.0-dev (>= 3.15.1),
                libgrilo-0.2-dev (>= 0.2.6),

Modified: desktop/experimental/gnome-control-center/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-control-center/debian/control.in?rev=45903&op=diff
==============================================================================
--- desktop/experimental/gnome-control-center/debian/control.in	[utf-8] (original)
+++ desktop/experimental/gnome-control-center/debian/control.in	[utf-8] Wed Sep 16 15:27:58 2015
@@ -27,9 +27,9 @@
                libgdk-pixbuf2.0-dev (>= 2.23.0),
                libgirepository1.0-dev,
                libglib2.0-dev (>= 2.37.7),
-               libgnome-desktop-3-dev (>= 3.11.3),
+               libgnome-desktop-3-dev (>= 3.17.4),
                libgnomekbd-dev (>= 2.91.91),
-               libgnome-bluetooth-dev (>= 3.11.1) [linux-any],
+               libgnome-bluetooth-dev (>= 3.17.90) [linux-any],
                libibus-1.0-dev (>= 1.5.2),
                libgoa-1.0-dev (>= 3.15.1),
                libgrilo-0.2-dev (>= 0.2.6),

Modified: desktop/experimental/gnome-control-center/debian/patches/debian-uses-ssh-service.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-control-center/debian/patches/debian-uses-ssh-service.patch?rev=45903&op=diff
==============================================================================
--- desktop/experimental/gnome-control-center/debian/patches/debian-uses-ssh-service.patch	[utf-8] (original)
+++ desktop/experimental/gnome-control-center/debian/patches/debian-uses-ssh-service.patch	[utf-8] Wed Sep 16 15:27:58 2015
@@ -13,22 +13,22 @@
 --- a/panels/sharing/cc-remote-login-helper.c
 +++ b/panels/sharing/cc-remote-login-helper.c
 @@ -20,7 +20,7 @@
-  */
- 
  #include <gio/gio.h>
+
+ #ifndef SSHD_SERVICE
 -#define SSHD_SERVICE "sshd.service"
 +#define SSHD_SERVICE "ssh.service"
+ #endif
  
  static const gchar *service_list[] = { SSHD_SERVICE, NULL };
- 
 --- a/panels/sharing/cc-remote-login.c
 +++ b/panels/sharing/cc-remote-login.c
 @@ -21,7 +21,7 @@
- #include "cc-remote-login.h"
  #include <gio/gio.h>
  
+ #ifndef SSHD_SERVICE
 -#define SSHD_SERVICE "sshd.service"
 +#define SSHD_SERVICE "ssh.service"
+ #endif
  
  typedef struct
- {