diff options
| -rw-r--r-- | debian/.git-dpm | 4 | ||||
| -rw-r--r-- | debian/patches/0001-Disable-ultimate-build.patch | 30 | ||||
| -rw-r--r-- | debian/patches/0001-Recognize-Hurd-platform.patch (renamed from debian/patches/0002-Recognize-Hurd-platform.patch) | 7 | ||||
| -rw-r--r-- | debian/patches/series | 3 | ||||
| -rw-r--r-- | plugins/Themes/Oxygen/Variable.h | 2 |
5 files changed, 8 insertions, 38 deletions
diff --git a/debian/.git-dpm b/debian/.git-dpm index ff915c1..b5e3af7 100644 --- a/debian/.git-dpm +++ b/debian/.git-dpm @@ -1,6 +1,6 @@ # see git-dpm(1) from git-dpm package -b00b0c864574c3842effe1705b66066fa228f950 -b00b0c864574c3842effe1705b66066fa228f950 +d0bc70fd146728fe281b656931da657283603ea9 +d0bc70fd146728fe281b656931da657283603ea9 bd56579c7d9de94c17287adefa118290e6b7ba33 bd56579c7d9de94c17287adefa118290e6b7ba33 ultracopier_1.4.0.3.orig.tar.xz diff --git a/debian/patches/0001-Disable-ultimate-build.patch b/debian/patches/0001-Disable-ultimate-build.patch deleted file mode 100644 index 7fec183..0000000 --- a/debian/patches/0001-Disable-ultimate-build.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 59774a195bc6b530ccbd9c174e20602451ac1084 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 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: mailed to ultracopier@first-world.info -Last-Update: 2018-02-19 ---- - plugins/Themes/Oxygen/Variable.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/plugins/Themes/Oxygen/Variable.h b/plugins/Themes/Oxygen/Variable.h -index 8b6119b..660346f 100644 ---- a/plugins/Themes/Oxygen/Variable.h -+++ b/plugins/Themes/Oxygen/Variable.h -@@ -10,7 +10,7 @@ - //Un-comment this next line to put ultracopier plugin in debug mode
- #define ULTRACOPIER_PLUGIN_DEBUG
-
--#define ULTRACOPIER_VERSION_ULTIMATE
-+//#define ULTRACOPIER_VERSION_ULTIMATE
-
- #endif // VARIABLE_H
-
diff --git a/debian/patches/0002-Recognize-Hurd-platform.patch b/debian/patches/0001-Recognize-Hurd-platform.patch index c19213d..e26aa66 100644 --- a/debian/patches/0002-Recognize-Hurd-platform.patch +++ b/debian/patches/0001-Recognize-Hurd-platform.patch @@ -1,4 +1,4 @@ -From b00b0c864574c3842effe1705b66066fa228f950 Mon Sep 17 00:00:00 2001 +From d0bc70fd146728fe281b656931da657283603ea9 Mon Sep 17 00:00:00 2001 From: Thomas Preud'homme <robotux@celest.fr> Date: Fri, 16 Feb 2018 23:09:42 +0000 Subject: Recognize Hurd platform @@ -10,8 +10,9 @@ should work as well. This patch thus changes the guard for that code to also support Hurd. Author: Thomas Preud'homme <robotux@debian.org> -Forwarded: no -Last-Update: 2018-02-24 +Forwarded: https://github.com/alphaonex86/Ultracopier/commit/af299782b9a0feb63a8097834a46400890d8f184 +Applied-Upstream: commit:af299782b9a0feb63a8097834a46400890d8f184 +Last-Update: 2018-02-25 --- PluginsManager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/patches/series b/debian/patches/series index e14b4f0..162c632 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ -0001-Disable-ultimate-build.patch -0002-Recognize-Hurd-platform.patch +0001-Recognize-Hurd-platform.patch diff --git a/plugins/Themes/Oxygen/Variable.h b/plugins/Themes/Oxygen/Variable.h index 660346f..8b6119b 100644 --- a/plugins/Themes/Oxygen/Variable.h +++ b/plugins/Themes/Oxygen/Variable.h @@ -10,7 +10,7 @@ //Un-comment this next line to put ultracopier plugin in debug mode
#define ULTRACOPIER_PLUGIN_DEBUG
-//#define ULTRACOPIER_VERSION_ULTIMATE
+#define ULTRACOPIER_VERSION_ULTIMATE
#endif // VARIABLE_H
|