Merge lp:~timo-jyrinki/kubuntu-packaging/qtdeclarative-opensource-src_fix_rfc2822_again into lp:~kubuntu-packagers/kubuntu-packaging/qtdeclarative-opensource-src

[Timo Jyrinki]

* debian/patches/Support-RFC2822Date-date-format-similar-to-V8.patch
  - Support RFC 2822 format (LP: #1298978)

[Timo Jyrinki (timo-jyrinki)]

Cleaned up headers from lp:~bzoltan/kubuntu-packaging/Revert_the_Support-RFC2822Date-date-format-similar-to-V8 + Zoltan's PPA upload, otherwise the same.

In CI Train.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:162
http://jenkins.qa.ubuntu.com/job/kubuntu-packagers-kubuntu-packaging-qtdeclarative-opensource-src-ci/28/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/kubuntu-packagers-kubuntu-packaging-qtdeclarative-opensource-src-utopic-amd64-ci/5
    SUCCESS: http://jenkins.qa.ubuntu.com/job/kubuntu-packagers-kubuntu-packaging-qtdeclarative-opensource-src-utopic-armhf-ci/5

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/kubuntu-packagers-kubuntu-packaging-qtdeclarative-opensource-src-ci/28/rebuild

review: Approve (continuous-integration)

=== modified file 'debian/changelog'
--- debian/changelog	2014-07-01 13:58:25 +0000
+++ debian/changelog	2014-07-07 08:53:22 +0000
@@ -1,3 +1,10 @@
+qtdeclarative-opensource-src (5.3.0-3ubuntu7) utopic; urgency=medium
+
+  * debian/patches/Support-RFC2822Date-date-format-similar-to-V8.patch
+    - Support RFC 2822 format (LP: #1298978) 
+
+ -- Zoltán Balogh <[e-mail]>  Thu, 03 Jul 2014 15:52:17 +0300
+
 qtdeclarative-opensource-src (5.3.0-3ubuntu6) utopic; urgency=medium
 
   * QQMLObjectCreator: Pass down parent to subCreator

=== added file 'debian/patches/Support-RFC2822Date-date-format-similar-to-V8.patch'
--- debian/patches/Support-RFC2822Date-date-format-similar-to-V8.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/Support-RFC2822Date-date-format-similar-to-V8.patch	2014-07-07 08:53:22 +0000
@@ -0,0 +1,28 @@
+Description: Support RFC 2822 datetime format
+ Currently a date like "Wed, 18 Sep 2013 07:00:51 -0700" cannot be parsed.
+ However, this used to work in Qt 5.0.2. This commit adds a check for
+ Qt::RFC2822Date format after the ISODate check but before the manually
+ defined QStringLiteral formats.
+ . 
+ Note: upstream believed this bug is fixed in Qt 5.3, but it has been now 
+ tested not to be the case with both Debian's Qt 5.3.1 and Ubuntu's Qt 5.3.0
+Author: Zoltán Balogh <[e-mail]>
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1298978
+Subject: [PATCH] Support RFC2822Date date format similar to V8.
+Origin: upstream
+Bug: https://bugreports.qt-project.org/browse/QTBUG-38011
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1298978
+Forwarded: https://bugreports.qt-project.org/browse/QTBUG-38011
+Last-Update: 2014-07-07
+
+--- qtdeclarative-opensource-src-5.3.0.orig/src/qml/jsruntime/qv4dateobject.cpp
++++ qtdeclarative-opensource-src-5.3.0/src/qml/jsruntime/qv4dateobject.cpp
+@@ -488,6 +488,8 @@ static inline double ParseString(const Q
+     QDateTime dt = QDateTime::fromString(s, Qt::TextDate);
+     if (!dt.isValid())
+         dt = QDateTime::fromString(s, Qt::ISODate);
++    if (!dt.isValid())
++        dt = QDateTime::fromString(s, Qt::RFC2822Date);
+     if (!dt.isValid()) {
+         QStringList formats;
+         formats << QStringLiteral("M/d/yyyy")

=== modified file 'debian/patches/series'
--- debian/patches/series	2014-07-01 13:58:25 +0000
+++ debian/patches/series	2014-07-07 08:53:22 +0000
@@ -7,3 +7,4 @@
 fix_qqmlobjectcreator.patch
 Implement-proper-support-for-layoutChange-in-QQmlDel.patch
 parenttosubcreator_qqmlobjectcreator.patch
+Support-RFC2822Date-date-format-similar-to-V8.patch