r46684 - in /desktop/unstable/gnome-control-center/debian: changelog patches/debian-uses-ssh-service.patch patches/series rules

[biebl at users.alioth.debian.org]

Author: biebl
Date: Wed Oct 14 19:50:26 2015
New Revision: 46684

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=46684
Log:
Drop debian/patches/debian-uses-ssh-service.patch and instead set
SSHD_SERVICE=ssh.service via CPPFLAGS in debian/rules.

Removed:
    desktop/unstable/gnome-control-center/debian/patches/debian-uses-ssh-service.patch
Modified:
    desktop/unstable/gnome-control-center/debian/changelog
    desktop/unstable/gnome-control-center/debian/patches/series
    desktop/unstable/gnome-control-center/debian/rules

Modified: desktop/unstable/gnome-control-center/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-control-center/debian/changelog?rev=46684&op=diff
==============================================================================
--- desktop/unstable/gnome-control-center/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gnome-control-center/debian/changelog	[utf-8] Wed Oct 14 19:50:26 2015
@@ -5,6 +5,8 @@
   * Update Build-Depends as per configure.ac:
     - Bump libgrilo-0.2-dev to (>= 0.2.12).
     - Bump libgnome-bluetooth-dev to (>= 3.18.0).
+  * Drop debian/patches/debian-uses-ssh-service.patch and instead set
+    SSHD_SERVICE=ssh.service via CPPFLAGS in debian/rules.
 
  -- Michael Biebl <biebl at debian.org>  Wed, 14 Oct 2015 19:15:54 +0200
 

Modified: desktop/unstable/gnome-control-center/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-control-center/debian/patches/series?rev=46684&op=diff
==============================================================================
--- desktop/unstable/gnome-control-center/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/gnome-control-center/debian/patches/series	[utf-8] Wed Oct 14 19:50:26 2015
@@ -1,4 +1,3 @@
-debian-uses-ssh-service.patch
 01_menu_category.patch
 06_handle_passwd_with_ldap.patch
 07_polkit_wheel_sudo_group.patch

Modified: desktop/unstable/gnome-control-center/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-control-center/debian/rules?rev=46684&op=diff
==============================================================================
--- desktop/unstable/gnome-control-center/debian/rules	[utf-8] (original)
+++ desktop/unstable/gnome-control-center/debian/rules	[utf-8] Wed Oct 14 19:50:26 2015
@@ -11,6 +11,8 @@
 export DEB_LDFLAGS_MAINT_APPEND = -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
 include /usr/share/dpkg/buildflags.mk
 
+CPPFLAGS += -DSSHD_SERVICE=\\\"ssh.service\\\"
+
 DEB_CONFIGURE_EXTRA_FLAGS += --disable-update-mimedb
 
 DEB_DH_MAKESHLIBS_ARGS_gnome-control-center = --no-act