[SCM] Git repository for devscripts branch, master, updated. v2.11.7-37-gf15cfe1

[Benjamin Drung]

The following commit has been merged in the master branch:
commit f15cfe1da8fa9d4e19223ab5408d9d9c776db156
Author: Stefano Rivera <stefanor at debian.org>
Date:   Thu May 31 02:22:05 2012 +0200

    Incorporate Ubuntu's delta: Move debian-keyring, equivs, libcrypt-ssleay-perl, and libsoap-lite-perl to Suggests when building on Ubuntu.
    
    Signed-off-by: Benjamin Drung <bdrung at debian.org>

diff --git a/debian/changelog b/debian/changelog
index 900a7e0..29cf350 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -40,6 +40,9 @@ devscripts (2.11.8) UNRELEASED; urgency=low
   * devscripts.Logger Don't substitute arguments into logged strings unless
     they were provided. (LP: #968129)
   * debchange: Use distro-info to determine Ubuntu release names.
+  * Incorporate Ubuntu's delta:
+    Move debian-keyring, equivs, libcrypt-ssleay-perl, and libsoap-lite-perl
+    to Suggests when building on Ubuntu.
 
   [ Salvatore Bonaccorso ]
   * bts: When searching for usertags use tag= in the url (followed by
diff --git a/debian/control b/debian/control
index f34ef6e..b9b19d8 100644
--- a/debian/control
+++ b/debian/control
@@ -47,16 +47,12 @@ Depends: dpkg-dev (>= 1.15.4.1),
 Recommends: at,
             curl | wget,
             dctrl-tools,
-            debian-keyring,
             dput | dupload,
-            equivs,
             fakeroot,
             gnupg,
-            libcrypt-ssleay-perl,
             libdistro-info-perl,
             libjson-perl,
             libparse-debcontrol-perl,
-            libsoap-lite-perl,
             liburi-perl,
             libwww-perl,
             lintian,
@@ -69,7 +65,8 @@ Recommends: at,
             strace,
             unzip,
             wdiff,
-            xz-utils
+            xz-utils,
+            ${vendor:Recommends}
 Suggests: bsd-mailx | mailx,
           build-essential,
           cvs-buildpackage,
@@ -84,7 +81,8 @@ Suggests: bsd-mailx | mailx,
           mutt,
           ssh-client,
           svn-buildpackage,
-          w3m
+          w3m,
+          ${vendor:Suggests}
 Breaks: ubuntu-dev-tools (<< 0.124~)
 Replaces: ubuntu-dev-tools (<< 0.124~)
 Description: scripts to make the life of a Debian Package maintainer easier
diff --git a/debian/rules b/debian/rules
index 4647c9c..1491f02 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,4 +1,13 @@
 #!/usr/bin/make -f
 
+UBU_SUGGESTS=debian-keyring, equivs, libcrypt-ssleay-perl, libsoap-lite-perl
+
 %:
 	dh $@ --with python2
+
+override_dh_gencontrol:
+ifeq ($(shell dpkg-vendor --derives-from Ubuntu && echo ubuntu),ubuntu)
+	dh_gencontrol -- -V'vendor:Suggests=$(UBU_SUGGESTS)' -V'vendor:Recommends='
+else
+	dh_gencontrol -- -V'vendor:Suggests=' -V'vendor:Recommends=$(UBU_SUGGESTS)'
+endif

-- 
Git repository for devscripts