diff options
author | Mihai Moldovan <ionic@ionic.de> | 2017-08-03 09:41:21 +0200 |
---|---|---|
committer | Mihai Moldovan <ionic@ionic.de> | 2017-08-03 09:41:21 +0200 |
commit | 6ae091cc27f90bd431e4d9564c760fa209f8efb8 (patch) | |
tree | 253588fb5860a00d39e957085a08a0dfcd736927 /debian/patches/0016_nx-X11_install-location.full.patch | |
parent | a4fb30f8d0dc188821ac61d64d113a6ae6156b95 (diff) | |
download | nx-libs-6ae091cc27f90bd431e4d9564c760fa209f8efb8.tar.gz nx-libs-6ae091cc27f90bd431e4d9564c760fa209f8efb8.tar.bz2 nx-libs-6ae091cc27f90bd431e4d9564c760fa209f8efb8.zip |
debian/patches: refresh all patches.
Removes some fuzziness and adds the -p diff option to show the C
function name in hunk headers.
Diffstat (limited to 'debian/patches/0016_nx-X11_install-location.full.patch')
-rw-r--r-- | debian/patches/0016_nx-X11_install-location.full.patch | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/debian/patches/0016_nx-X11_install-location.full.patch b/debian/patches/0016_nx-X11_install-location.full.patch index 6571aea9e..370fd7bdd 100644 --- a/debian/patches/0016_nx-X11_install-location.full.patch +++ b/debian/patches/0016_nx-X11_install-location.full.patch @@ -6,7 +6,7 @@ Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Last-Update: 2012-12-31 --- a/nx-X11/config/cf/Imake.tmpl +++ b/nx-X11/config/cf/Imake.tmpl -@@ -820,12 +820,12 @@ +@@ -820,12 +820,12 @@ TCLIBDIR = TclLibDir #ifndef UsrLibDir #ifdef ProjectRoot @@ -21,7 +21,7 @@ Last-Update: 2012-12-31 #ifndef AlternateUsrLibDir #define AlternateUsrLibDir NO #endif -@@ -863,7 +863,7 @@ +@@ -863,7 +863,7 @@ TCLIBDIR = TclLibDir #endif #ifndef IncRoot #ifdef ProjectRoot @@ -32,7 +32,7 @@ Last-Update: 2012-12-31 #endif --- a/nx-X11/config/cf/X11.rules +++ b/nx-X11/config/cf/X11.rules -@@ -36,17 +36,17 @@ +@@ -36,17 +36,17 @@ XCOMM $XFree86: xc/config/cf/X11.rules,v #endif #if defined(X11ProjectRoot) @@ -54,7 +54,7 @@ Last-Update: 2012-12-31 #endif #ifdef UsrLibDirPath # undef UsrLibDirPath -@@ -60,7 +60,7 @@ +@@ -60,7 +60,7 @@ XCOMM $XFree86: xc/config/cf/X11.rules,v #if ImportX11 # define XLdPreLibs -L$(LIBSRC) #elif defined(UseInstalledX11) && defined(X11ProjectRoot) @@ -63,7 +63,7 @@ Last-Update: 2012-12-31 #else # define XLdPreLibs /**/ #endif -@@ -70,7 +70,7 @@ +@@ -70,7 +70,7 @@ XCOMM $XFree86: xc/config/cf/X11.rules,v #define LdPreLibs LdPreLib XLdPreLibs #ifdef X11ProjectRoot @@ -72,7 +72,7 @@ Last-Update: 2012-12-31 #else # define XLdPostLibs /**/ #endif -@@ -86,7 +86,7 @@ +@@ -86,7 +86,7 @@ XCOMM $XFree86: xc/config/cf/X11.rules,v # define TopXInclude -I$(TOP)/exports/include #else # ifdef X11ProjectRoot @@ -81,7 +81,7 @@ Last-Update: 2012-12-31 # else # define TopXInclude /**/ # endif -@@ -98,7 +98,7 @@ +@@ -98,7 +98,7 @@ XCOMM $XFree86: xc/config/cf/X11.rules,v #define TopIncludes TopInclude $(TOP_X_INCLUDES) #if UseInstalledX11 && defined(X11ProjectRoot) @@ -92,7 +92,7 @@ Last-Update: 2012-12-31 #elif ImportX11 --- a/nx-X11/config/cf/X11.tmpl +++ b/nx-X11/config/cf/X11.tmpl -@@ -1401,7 +1401,7 @@ +@@ -1401,7 +1401,7 @@ FCHOWN_DEFINES = -DHAS_FCHOWN #ifndef BinDir #ifdef ProjectRoot @@ -101,7 +101,7 @@ Last-Update: 2012-12-31 #else #define BinDir /usr/bin/X11 #endif -@@ -1461,7 +1461,7 @@ +@@ -1461,7 +1461,7 @@ FCHOWN_DEFINES = -DHAS_FCHOWN #endif #ifndef LibDir # ifdef ProjectRoot @@ -112,7 +112,7 @@ Last-Update: 2012-12-31 # endif --- a/nx-X11/config/cf/linux.cf +++ b/nx-X11/config/cf/linux.cf -@@ -1054,7 +1054,7 @@ +@@ -1054,7 +1054,7 @@ InstallNamedTargetNoClobber(install,file #if HaveLib64 # ifndef LibDirName @@ -123,7 +123,7 @@ Last-Update: 2012-12-31 # define SystemUsrLibDir /usr/lib64 --- a/nx-X11/config/cf/site.def +++ b/nx-X11/config/cf/site.def -@@ -72,7 +72,7 @@ +@@ -72,7 +72,7 @@ XCOMM site: $XFree86: xc/config/cf/site #ifdef AfterVendorCF #ifndef ProjectRoot @@ -132,7 +132,7 @@ Last-Update: 2012-12-31 #endif /* -@@ -87,7 +87,7 @@ +@@ -87,7 +87,7 @@ XCOMM site: $XFree86: xc/config/cf/site * ProjectRoot rather than in /etc/X11. See also HasVarDirectory, * UseEtcX11 and UseSeparateConfDir. * @@ -143,7 +143,7 @@ Last-Update: 2012-12-31 --- a/nxproxy/Makefile.in +++ b/nxproxy/Makefile.in -@@ -33,7 +33,7 @@ +@@ -33,7 +33,7 @@ LIBS = @LIBS@ srcdir = @srcdir@ prefix = @prefix@ |