aboutsummaryrefslogtreecommitdiff
path: root/debian/patches
diff options
context:
space:
mode:
authorMihai Moldovan <ionic@ionic.de>2017-02-27 04:08:51 +0100
committerMihai Moldovan <ionic@ionic.de>2017-02-27 04:08:51 +0100
commit0a5d26d121a8420feb25bd68c8f1623edf50e0a8 (patch)
tree104d1f0ff7e856a3c2e54433046e52346e80d356 /debian/patches
parente1f2902bb1ad29f852f97dc08a3e3e29ad88c384 (diff)
parentfff875549f70b5f16f9e15cb8fdb4022939bf806 (diff)
downloadnx-libs-0a5d26d121a8420feb25bd68c8f1623edf50e0a8.tar.gz
nx-libs-0a5d26d121a8420feb25bd68c8f1623edf50e0a8.tar.bz2
nx-libs-0a5d26d121a8420feb25bd68c8f1623edf50e0a8.zip
Merge branch 'sunweaver-pr/hard-code-rgb-colors' into 3.6.x
Attributes GH PR #319: https://github.com/ArcticaProject/nx-libs/pull/319
Diffstat (limited to 'debian/patches')
-rw-r--r--debian/patches/016_nx-X11_install-location.debian.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/debian/patches/016_nx-X11_install-location.debian.patch b/debian/patches/016_nx-X11_install-location.debian.patch
index c758a3cfe..c8458311d 100644
--- a/debian/patches/016_nx-X11_install-location.debian.patch
+++ b/debian/patches/016_nx-X11_install-location.debian.patch
@@ -14,7 +14,7 @@ Last-Update: 2017-02-08
--- a/nx-X11/config/cf/Imake.tmpl
+++ b/nx-X11/config/cf/Imake.tmpl
-@@ -730,7 +730,7 @@
+@@ -725,7 +725,7 @@
#define AlternateUsrLibDir YES
#endif
#else
@@ -23,7 +23,7 @@ Last-Update: 2017-02-08
#ifndef AlternateUsrLibDir
#define AlternateUsrLibDir NO
#endif
-@@ -748,7 +748,7 @@
+@@ -743,7 +743,7 @@
#define AlternateUsrDataDir YES
#endif
#else