summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorDmitry Shachnev <mitya57@gmail.com>2017-06-30 19:25:43 +0300
committerDmitry Shachnev <mitya57@gmail.com>2017-06-30 19:25:43 +0300
commit0110c71c75220b4bf3c2ad2fb54839f0bac7a2a8 (patch)
tree830eff0bb5da18677a6c897d066bb6e027bf81d7 /debian
parentdaaaf18be4d85e55b0423011e7fbe751aebaa8fe (diff)
downloadqtbase-0110c71c75220b4bf3c2ad2fb54839f0bac7a2a8.tar.gz
Bump version to 5.9.1, refresh patches.
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog4
-rw-r--r--debian/patches/armv4.diff4
-rw-r--r--debian/patches/link_fbclient.diff6
3 files changed, 8 insertions, 6 deletions
diff --git a/debian/changelog b/debian/changelog
index 46a9791..c31d905 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
-qtbase-opensource-src (5.9.0+dfsg-2) UNRELEASED; urgency=medium
+qtbase-opensource-src (5.9.1+dfsg-1) UNRELEASED; urgency=medium
[ Dmitry Shachnev ]
+ * New upstream release.
+ * Refresh and rebase patches for the new release.
* Remove unused gstreamer build-dependencies, thanks to Alexander Volkov.
See upstream commit 60e5a1c8effd4099.
* Drop libqt5gui5 recommendation on mesa-utils, thanks to Alexander Volkov.
diff --git a/debian/patches/armv4.diff b/debian/patches/armv4.diff
index 987ad42..0c26505 100644
--- a/debian/patches/armv4.diff
+++ b/debian/patches/armv4.diff
@@ -5,7 +5,7 @@ Last-Update: 2016-07-01
--- a/src/corelib/global/qprocessordetection.h
+++ b/src/corelib/global/qprocessordetection.h
-@@ -130,6 +130,8 @@
+@@ -131,6 +131,8 @@
# elif defined(__ARM_ARCH_5TEJ__) \
|| defined(__ARM_ARCH_5TE__)
# define Q_PROCESSOR_ARM 5
@@ -14,7 +14,7 @@ Last-Update: 2016-07-01
# else
# define Q_PROCESSOR_ARM 0
# endif
-@@ -144,6 +146,9 @@
+@@ -145,6 +147,9 @@
# endif
# if Q_PROCESSOR_ARM >= 5
# define Q_PROCESSOR_ARM_V5
diff --git a/debian/patches/link_fbclient.diff b/debian/patches/link_fbclient.diff
index d012f14..02cba5b 100644
--- a/debian/patches/link_fbclient.diff
+++ b/debian/patches/link_fbclient.diff
@@ -2,10 +2,10 @@ Description: build ibase sql plugin against firebird
Author: Fathi Boudra <fabo@debian.org>
Author: Dmitry Shachnev <mitya57@debian.org>
Forwarded: no
-Last-Update: 2016-01-24
+Last-Update: 2017-06-30
---- a/src/sql/configure.json
-+++ b/src/sql/configure.json
+--- a/src/plugins/sqldrivers/configure.json
++++ b/src/plugins/sqldrivers/configure.json
@@ -50,7 +50,7 @@
"test": "unix/ibase",
"sources": [