diff options
| author | Thomas Preud'homme <robotux@celest.fr> | 2018-02-23 23:49:42 +0000 |
|---|---|---|
| committer | Thomas Preud'homme <robotux@celest.fr> | 2018-02-23 23:49:42 +0000 |
| commit | b8c95cea1e9d07cd1062c037ab42a46bed292991 (patch) | |
| tree | 7d6245eecdbcbda09be776dbebbd83b4bf9c8540 | |
| parent | 6cc7be3e2ca1007ca25690e672b96fcf2db737b6 (diff) | |
| parent | 73de37793cc6f9268ad3334c5ff049b0b7bce5ed (diff) | |
merge patched into master
| -rw-r--r-- | debian/.git-dpm | 4 | ||||
| -rw-r--r-- | debian/patches/0001-Disable-ultimate-build.patch | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/debian/.git-dpm b/debian/.git-dpm index c253c35..a100f1d 100644 --- a/debian/.git-dpm +++ b/debian/.git-dpm @@ -1,6 +1,6 @@ # see git-dpm(1) from git-dpm package -a5d2d6e383311c3d63cdade00dbd06e348c01e8f -a5d2d6e383311c3d63cdade00dbd06e348c01e8f +73de37793cc6f9268ad3334c5ff049b0b7bce5ed +73de37793cc6f9268ad3334c5ff049b0b7bce5ed 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 38b31a5..1c5f298 100644 --- a/debian/patches/0001-Disable-ultimate-build.patch +++ b/debian/patches/0001-Disable-ultimate-build.patch @@ -1,4 +1,4 @@ -From a5d2d6e383311c3d63cdade00dbd06e348c01e8f Mon Sep 17 00:00:00 2001 +From 73de37793cc6f9268ad3334c5ff049b0b7bce5ed 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 @@ -9,8 +9,8 @@ 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-18 +Forwarded: mailed to ultracopier@first-world.info +Last-Update: 2018-02-19 --- Variable.h | 2 +- plugins/Themes/Oxygen/Variable.h | 2 +- |