diff options
| author | Thomas Preud'homme <robotux@celest.fr> | 2018-02-18 21:47:19 +0000 |
|---|---|---|
| committer | Thomas Preud'homme <robotux@celest.fr> | 2018-02-18 21:47:20 +0000 |
| commit | acc19845b82e5590b5de2fdd7df4c20d73d8fb05 (patch) | |
| tree | 42493c402b1f42b403fa96fd3daa7759edce4f6e | |
| parent | d74f67c89836052c6ce674673e266917f2f9befb (diff) | |
| parent | a5d2d6e383311c3d63cdade00dbd06e348c01e8f (diff) | |
merge patched into master
| -rw-r--r-- | debian/.git-dpm | 4 | ||||
| -rw-r--r-- | debian/patches/0001-Disable-ultimate-build.patch | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/debian/.git-dpm b/debian/.git-dpm index 3040074..c253c35 100644 --- a/debian/.git-dpm +++ b/debian/.git-dpm @@ -1,6 +1,6 @@ # see git-dpm(1) from git-dpm package -5fbd7c3fb2c0910a38593d62493a08de0395402c -5fbd7c3fb2c0910a38593d62493a08de0395402c +a5d2d6e383311c3d63cdade00dbd06e348c01e8f +a5d2d6e383311c3d63cdade00dbd06e348c01e8f b3c8bdcc0d1e4b2ab298847a7902b6d60410a5bc b3c8bdcc0d1e4b2ab298847a7902b6d60410a5bc ultracopier_1.2.3.6.orig.tar.xz diff --git a/debian/patches/0001-Disable-ultimate-build.patch b/debian/patches/0001-Disable-ultimate-build.patch index f0aa5c7..38b31a5 100644 --- a/debian/patches/0001-Disable-ultimate-build.patch +++ b/debian/patches/0001-Disable-ultimate-build.patch @@ -1,16 +1,16 @@ -From 5fbd7c3fb2c0910a38593d62493a08de0395402c Mon Sep 17 00:00:00 2001 +From a5d2d6e383311c3d63cdade00dbd06e348c01e8f Mon Sep 17 00:00:00 2001 From: Thomas Preud'homme <robotux@celest.fr> Date: Fri, 16 Feb 2018 23:09:42 +0000 Subject: Disable ultimate build Due to the definition of the ULTRACOPIER_VERSION_ULTIMATE macro in various header files, the build produce an ultracopier ultimate and this cannot -be overriden in the build system. This patch comments out the macro, -which can then be set from the qmake invokation. +be overridden in the build system. This patch comments out the macro, +which can then be set from the qmake invocation. Author: Thomas Preud'homme <robotux@debian.org> Forwarded: no -Last-Update: 2018-02-16 +Last-Update: 2018-02-18 --- Variable.h | 2 +- plugins/Themes/Oxygen/Variable.h | 2 +- |