Merge lp:~yolanda.robla/ubuntu/saucy/openldap/server_banner into lp:ubuntu/saucy/openldap

[Yolanda Robla]

Updated code to display Ubuntu distribution in slapd -V

=== modified file 'debian/changelog'
--- debian/changelog	2013-05-30 13:03:25 +0000
+++ debian/changelog	2013-07-08 16:29:26 +0000
@@ -1,3 +1,10 @@
+openldap (2.4.31-1+nmu2ubuntu2) saucy; urgency=low
+
+  * debian/control: added lsb-release
+  * debian/patches/fix-ldap-distribution.patch: show distribution in version
+
+ -- Yolanda Robla <[e-mail]>  Mon, 08 Jul 2013 16:53:09 +0200
+
 openldap (2.4.31-1+nmu2ubuntu1) saucy; urgency=low
 
   * Merge from Debian unstable. Remaining changes:

=== modified file 'debian/control'
--- debian/control	2012-07-18 13:29:46 +0000
+++ debian/control	2013-07-08 16:29:26 +0000
@@ -16,7 +16,7 @@
  libsasl2-dev, libslp-dev, libltdl-dev | libltdl3-dev (>= 1.4.3),
  libwrap0-dev, perl, debconf-utils, po-debconf, quilt (>= 0.46-7),
  groff-base, time, heimdal-dev, hardening-wrapper,
- dh-autoreconf, dh-apparmor
+ dh-autoreconf, dh-apparmor, lsb-release
 Build-Conflicts: libbind-dev, bind-dev, libicu-dev, autoconf2.13
 Standards-Version: 3.9.1
 Homepage: http://www.openldap.org/

=== added file 'debian/patches/fix-ldap-distribution.patch'
--- debian/patches/fix-ldap-distribution.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/fix-ldap-distribution.patch	2013-07-08 16:29:26 +0000
@@ -0,0 +1,24 @@
+--- a/build/mkversion	2013-06-27 10:25:47.851083000 +0000
++++ b/build/mkversion	2013-07-08 14:16:15.772912999 +0000
+@@ -52,6 +52,12 @@
+ APPLICATION=$1
+ WHOWHERE="$USER@`uname -n`:`pwd`"
+ 
++if test -x /usr/bin/lsb_release; then
++    OPENLDAP_DISTRIBUTION=" ($(lsb_release -si))"
++else
++    OPENLDAP_DISTRIBUTION=""
++fi
++
+ cat << __EOF__
+ /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+  *
+@@ -72,7 +78,7 @@
+ "COPYING RESTRICTIONS APPLY\n";
+ 
+ $static $const char $SYMBOL[] =
+-"@(#) \$$PACKAGE: $APPLICATION $VERSION (" __DATE__ " " __TIME__ ") \$\n"
++"@(#) \$$PACKAGE: $APPLICATION $VERSION$OPENLDAP_DISTRIBUTION (" __DATE__ " " __TIME__ ") \$\n"
+ "\t$WHOWHERE\n";
+ 
+ __EOF__

=== modified file 'debian/patches/series'
--- debian/patches/series	2013-05-30 13:03:25 +0000
+++ debian/patches/series	2013-07-08 16:29:26 +0000
@@ -22,3 +22,4 @@
 no-bdb-ABI-second-guessing
 heimdal-fix
 bdb-deadlock.patch
+fix-ldap-distribution.patch