Imported Debian patch 0.1.1-5

diff --git a/debian/changelog b/debian/changelog
index e2eb11a153e4027a6202c7ad08734f6669bf4032..cd80e9d18fe435984f46c07e508fe80efbd17c5b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+roundcube (0.1.1-5) unstable; urgency=low
+
+  * Fix ordering of message-id in message headers, thanks to Reinhard
+    Tartler (Closes: #486493)
+  * Update Standards-Version to 3.8.0
+
+ -- Vincent Bernat <bernat@debian.org>  Tue, 17 Jun 2008 00:33:40 +0200
+
 roundcube (0.1.1-4) unstable; urgency=low
 
   * Add Slovak debconf translation, thanks to Ivan Masár (Closes: #481376)

diff --git a/debian/control b/debian/control
index 954b66e5ee1203d172c338207e3fbdee2e0d7450..845f7c3cd30f36deb57f6f6b12e64eb67c20baa3 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Roundcube Maintainers <pkg-roundcube-maintainers@lists.alioth
 Uploaders: Vincent Bernat <bernat@debian.org>, Romain Beauxis <toots@rastageeks.org>
 Build-Depends: debhelper (>= 5), quilt, patchutils (>= 0.2.25), cdbs (>= 0.4.27), po-debconf
 Homepage: http://www.roundcube.net/
-Standards-Version: 3.7.3
+Standards-Version: 3.8.0
 Vcs-Svn: svn://svn.debian.org/svn/pkg-roundcube/roundcube
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-roundcube/roundcube
 

diff --git a/debian/control.in b/debian/control.in
index 39a92cb70a2bd51efe18cc835e006bedf55337a0..af9fe6e74365352fc181ab4896d78e0ae6598083 100644 (file)
--- a/debian/control.in
+++ b/debian/control.in
@@ -5,7 +5,7 @@ Maintainer: Debian Roundcube Maintainers <pkg-roundcube-maintainers@lists.alioth
 Uploaders: Vincent Bernat <bernat@debian.org>, Romain Beauxis <toots@rastageeks.org>
 Build-Depends: @cdbs@, po-debconf
 Homepage: http://www.roundcube.net/
-Standards-Version: 3.7.3
+Standards-Version: 3.8.0
 Vcs-Svn: svn://svn.debian.org/svn/pkg-roundcube/roundcube
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-roundcube/roundcube
 

diff --git a/debian/patches/messageid-headers-ordering.patch b/debian/patches/messageid-headers-ordering.patch
new file mode 100644 (file)
index 0000000..109d2af
--- /dev/null
+++ b/debian/patches/messageid-headers-ordering.patch
@@ -0,0 +1,18 @@
+--- roundcubemail/program/steps/mail/sendmail.inc (revision 1232)\r
++++ roundcubemail/program/steps/mail/sendmail.inc (revision 1261)\r
+@@ -211,7 +211,4 @@\r
+ \r
+ // additional headers\r
+-$headers['Message-ID'] = $message_id;\r
+-$headers['X-Sender'] = $from;\r
+-\r
+ if ($CONFIG['http_received_header'])\r
+ {\r
+@@ -224,4 +221,7 @@\r
+ }\r
+ \r
++$headers['Message-ID'] = $message_id;\r
++$headers['X-Sender'] = $from;\r
++\r
+ if (!empty($CONFIG['useragent']))\r
+   $headers['User-Agent'] = $CONFIG['useragent'];\r

diff --git a/debian/patches/series b/debian/patches/series
index 2bb76e7d0930686eb035062b011b811d873f5a28..44004ec55df75026589f3b1ee8cc9f0975a4623a 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ use-db-backend.patch
 correct-magic-path.patch
 disable-tinymce-spellchecker.patch
 mysql-update-fix.patch
+messageid-headers-ordering.patch