Merge lp:~yolanda.robla/ubuntu/saucy/dovecot/update_dovecot_name into lp:ubuntu/saucy/dovecot

[Yolanda Robla]

Updated dovecot name

[lp:~yolanda.robla/ubuntu/saucy/dovecot/update_dovecot_name]

99. By Yolanda Robla on 2013-06-18

updated description

[Martin Pitt (pitti)]

dovecot_autoreconf.patch is going to be really hard to maintain. May I suggest dropping this and using dh_autoreconf instead?

++AC_DEFINE_UNQUOTED(DOVECOT_NAME, "$PACKAGE_NAME$DOVECOT_DISTRIBUTION", Dovecot name)

Shouldn't there be a space between the package name and the distro name?

review: Needs Fixing

[lp:~yolanda.robla/ubuntu/saucy/dovecot/update_dovecot_name]

100. By Yolanda Robla on 2013-06-25

debian/rules: added autoconf in config-stamp

101. By Yolanda Robla on 2013-06-25

updated dependencies

[Yolanda Robla (yolanda.robla)]

Removed dovecot_autoreconf.patch, and calling autoconf in debian/rules
Space not needed between $PACKAGE_NAME and $DOVECOT_DISTRIBUTION, because that space is added when setting the $DOVECOT-DISTRIBUTION var. By this way, no extra space is added if $DOVECOT_DISTRIBUTION is empty.

[Martin Pitt (pitti)]

Looks much better, thanks!

review: Approve

[Martin Pitt (pitti)]

As you didn't bzr add the changed source and quilt files, and I always mess this up as well, I just uploaded this and let the package importer sort it out. Closing MP manually. Thanks!

=== modified file 'debian/changelog'
--- debian/changelog	2013-02-11 12:41:24 +0000
+++ debian/changelog	2013-06-25 14:16:35 +0000
@@ -1,3 +1,12 @@
+dovecot (1:2.1.7-7ubuntu2) UNRELEASED; urgency=low
+
+  * debian/patches/dovecot_name.patch: updated Dovecot name to reflect 
+    distribution in login greeting
+  * debian/control: added lsb-release as build-dependency
+  * debian/rules: added autoconf in config-stamp
+
+ -- Yolanda Robla <[e-mail]>  Mon, 17 Jun 2013 15:38:22 +0200
+
 dovecot (1:2.1.7-7ubuntu1) raring; urgency=low
 
   [ James Page ]

=== modified file 'debian/control'
--- debian/control	2013-02-11 12:41:24 +0000
+++ debian/control	2013-06-25 14:16:35 +0000
@@ -4,7 +4,9 @@
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Dovecot Maintainers <[e-mail]>
 Uploaders: Jaldhar H. Vyas <[e-mail]>, Fabio Tranchitella <[e-mail]>, Joel Johnson <[e-mail]>, Marco Nenciarini <[e-mail]>
-Build-Depends: debhelper (>= 7.2.3~), dpkg-dev (>= 1.16.1), pkg-config, libssl-dev, libpam0g-dev, libldap2-dev, libpq-dev, libmysqlclient-dev, libsqlite3-dev, libsasl2-dev, zlib1g-dev, libkrb5-dev, drac-dev (>= 1.12-5), libbz2-dev, libdb-dev, libcurl4-gnutls-dev, libexpat-dev, hardening-wrapper
+Build-Depends: debhelper (>= 7.2.3~), dpkg-dev (>= 1.16.1), pkg-config, libssl-dev, libpam0g-dev, libldap2-dev, libpq-dev,
+ libmysqlclient-dev, libsqlite3-dev, libsasl2-dev, zlib1g-dev, libkrb5-dev, drac-dev (>= 1.12-5), libbz2-dev, libdb-dev,
+ libcurl4-gnutls-dev, libexpat-dev, hardening-wrapper, lsb-release, dh-autoreconf
 Standards-Version: 3.9.3
 Homepage: http://dovecot.org/
 Vcs-Git: git://git.debian.org/git/collab-maint/dovecot.git

=== added file 'debian/patches/dovecot_name.patch'
--- debian/patches/dovecot_name.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/dovecot_name.patch	2013-06-25 14:16:35 +0000
@@ -0,0 +1,73 @@
+Description: Update Dovecot name to include Distribution in
+ login greeting message
+Origin: https://blueprints.launchpad.net/ubuntu/+spec/servercloud-s-server-app-banner-updates
+Author: Yolanda Robla <[e-mail]>
+Last-Update: 2013-06-18
+
+diff --git a/configure.in b/configure.in
+index 35f7e07..47c7cef 100644
+--- a/configure.in
++++ b/configure.in
+@@ -283,7 +283,12 @@ AC_C_INLINE
+ AC_PROG_LIBTOOL
+ AM_ICONV
+ 
+-AC_DEFINE_UNQUOTED(DOVECOT_NAME, "$PACKAGE_NAME", Dovecot name)
++if test -x /usr/bin/lsb_release && lsb_release -si; then
++    DOVECOT_DISTRIBUTION=" ($(lsb_release -si))"
++else
++    DOVECOT_DISTRIBUTION=""
++fi
++AC_DEFINE_UNQUOTED(DOVECOT_NAME, "$PACKAGE_NAME$DOVECOT_DISTRIBUTION", Dovecot name)
+ AC_DEFINE_UNQUOTED(DOVECOT_STRING, "$PACKAGE_STRING", Dovecot string)
+ AC_DEFINE_UNQUOTED(DOVECOT_VERSION, "$PACKAGE_VERSION", Dovecot version)
+
+diff --git a/src/config/all-settings.c b/src/config/all-settings.c
+index ca6df6e..34abf2d 100644
+--- a/src/config/all-settings.c
++++ b/src/config/all-settings.c
+@@ -2539,7 +2539,7 @@ static const struct setting_define login_setting_defines[] = {
+ };
+ static const struct login_settings login_default_settings = {
+ 	.login_trusted_networks = "",
+-	.login_greeting = PACKAGE_NAME" ready.",
++	.login_greeting = DOVECOT_NAME" ready.",
+ 	.login_log_format_elements = "user=<%u> method=%m rip=%r lip=%l mpid=%e %c session=<%{session}>",
+ 	.login_log_format = "%$: %s",
+ 	.login_access_sockets = "",
+@@ -2671,7 +2671,7 @@ static const struct setting_define lmtp_setting_defines[] = {
+ static const struct lmtp_settings lmtp_default_settings = {
+ 	.lmtp_proxy = FALSE,
+ 	.lmtp_save_to_detail_mailbox = FALSE,
+-	.login_greeting = PACKAGE_NAME" ready."
++	.login_greeting = DOVECOT_NAME" ready."
+ };
+ static const struct setting_parser_info *lmtp_setting_dependencies[] = {
+ 	&lda_setting_parser_info,
+diff --git a/src/lmtp/lmtp-settings.c b/src/lmtp/lmtp-settings.c
+index aa803a2..8baedbb 100644
+--- a/src/lmtp/lmtp-settings.c
++++ b/src/lmtp/lmtp-settings.c
+@@ -67,7 +67,7 @@ static const struct setting_define lmtp_setting_defines[] = {
+ static const struct lmtp_settings lmtp_default_settings = {
+ 	.lmtp_proxy = FALSE,
+ 	.lmtp_save_to_detail_mailbox = FALSE,
+-	.login_greeting = PACKAGE_NAME" ready."
++	.login_greeting = DOVECOT_NAME" ready."
+ };
+ 
+ static const struct setting_parser_info *lmtp_setting_dependencies[] = {
+        &lda_setting_parser_info,
+diff --git a/src/login-common/login-settings.c b/src/login-common/login-settings.c
+index df34108..d00e20d 100644
+--- a/src/login-common/login-settings.c
++++ b/src/login-common/login-settings.c
+@@ -55,7 +55,7 @@ static const struct setting_define login_setting_defines[] = {
+ 
+ static const struct login_settings login_default_settings = {
+ 	.login_trusted_networks = "",
+-	.login_greeting = PACKAGE_NAME" ready.",
++	.login_greeting = DOVECOT_NAME" ready.",
+ 	.login_log_format_elements = "user=<%u> method=%m rip=%r lip=%l mpid=%e %c session=<%{session}>",
+ 	.login_log_format = "%$: %s",
+ 	.login_access_sockets = "",

=== modified file 'debian/patches/series'
--- debian/patches/series	2013-02-11 12:41:24 +0000
+++ debian/patches/series	2013-06-25 14:16:35 +0000
@@ -11,3 +11,4 @@
 default-mail_location.patch
 chgrp-error.patch
 exampledir.patch
+dovecot_name.patch

=== modified file 'debian/rules'
--- debian/rules	2013-02-11 12:41:24 +0000
+++ debian/rules	2013-06-25 14:16:35 +0000
@@ -25,6 +25,7 @@
 
 config-stamp: configure
 	dh_testdir
+	autoconf
 	# Dovecot
 	$(shell $(dpkg_buildflags) --export=configure) sh configure \
 	            --with-ldap=plugin \