[SCM] qtsystems packaging branch, master, updated. 52551a42142890804946b2d26f0cb52f12941a01
Timo Jyrinki
timo at alioth.debian.org
Fri Jun 14 08:46:45 UTC 2013
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtsystems.git;a=commitdiff;h=c86b6ee
The following commit has been merged in the master branch:
commit c86b6ee018246aa332992271a4620a6519e8236c
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date: Fri Jun 14 10:59:19 2013 +0300
debian/patches/revert_module_version.patch:
* debian/patches/revert_module_version.patch:
- Revert to non-zero version number
---
debian/changelog | 2 ++
debian/patches/revert_module_version.patch | 14 ++++++++++++++
debian/patches/series | 1 +
3 files changed, 17 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 756e7e6..b15f188 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
qtsystems-opensource-src (5.0~git20130614-1) UNRELEASED; urgency=low
* Initial release
+ * debian/patches/revert_module_version.patch:
+ - Revert to non-zero version number
-- Timo Jyrinki <timo-jyrinki at ubuntu.com> Wed, 30 Jan 2013 14:15:42 +0200
diff --git a/debian/patches/revert_module_version.patch b/debian/patches/revert_module_version.patch
new file mode 100644
index 0000000..1e49550
--- /dev/null
+++ b/debian/patches/revert_module_version.patch
@@ -0,0 +1,14 @@
+Description: Revert module version zeroing
+ Trying to revert the zeroing since a crash seems to happen without
+ non-zero version number. (https://bugs.launchpad.net/bugs/1178620)
+
+diff --git a/.qmake.conf b/.qmake.conf
+index 8840bd9..3c4fa5e 100644
+--- a/.qmake.conf
++++ b/.qmake.conf
+@@ -1,3 +1,3 @@
+ load(qt_build_config)
+
+-MODULE_VERSION = 0.0.0
++MODULE_VERSION = 5.0.0
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..462fa7f
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+revert_module_version.patch
--
qtsystems packaging
More information about the pkg-kde-commits
mailing list