aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog1
-rw-r--r--debian/patches/000_add-NX-redistribution-README.full+lite.patch3
-rw-r--r--debian/patches/009_nxagent_add-man-page.full.patch3
-rw-r--r--debian/patches/009_nxproxy_add-man-page.full+lite.patch3
-rw-r--r--debian/patches/010_nxauth_fix-binary-name-in-man-page.full.patch1
-rw-r--r--debian/patches/024_fix-make-clean.full+lite.patch3
-rw-r--r--debian/patches/029_nxcomp_ppc64.full+lite.patch3
-rw-r--r--debian/patches/052_nxcomp_macos10-nxauth-location.full+lite.patch3
-rw-r--r--debian/patches/053_nx-X11_no-xcomp1-install-target.full.patch3
-rw-r--r--debian/patches/203_nxagent_disable-rootless-exit.full.patch3
-rw-r--r--debian/patches/206_nxagent_clipboard-as-nxoption.full.patch3
-rw-r--r--debian/patches/209_x2goagent_add-man-page.full.patch3
-rw-r--r--debian/patches/321_nxagent_x2go-specific-keystroke-config.full.patch3
-rw-r--r--debian/patches/991_fix-hr-typos.full+lite.patch3
-rw-r--r--debian/patches/991_fix-hr-typos.full.patch3
15 files changed, 40 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 76742e129..6c7e02690 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,7 @@ nx-libs (2:3.5.0.29-0x2go2) UNRELEASED; urgency=medium
* Add 991_fix-hr-typos.full+lite.patch and 991_fix-hr-typos.full.patch.
Fix several typos in upstream code detected by lintian.
* Makefile.nx-libs: Don't allow symlinks to point into buildroot.
+ * Add Description: and Author: fields to various patch headers.
* NX code reduction efforts (from 93Mb to 41Mb):
- Drop more unused code in nx-X11/programs/Xserver/hw/. Do this in
diff --git a/debian/patches/000_add-NX-redistribution-README.full+lite.patch b/debian/patches/000_add-NX-redistribution-README.full+lite.patch
index 47490c7ad..3e1f2e878 100644
--- a/debian/patches/000_add-NX-redistribution-README.full+lite.patch
+++ b/debian/patches/000_add-NX-redistribution-README.full+lite.patch
@@ -1,3 +1,6 @@
+Description: Add README.NX-redistributed
+Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+
--- /dev/null
+++ b/README.NX-redistributed
@@ -0,0 +1,42 @@
diff --git a/debian/patches/009_nxagent_add-man-page.full.patch b/debian/patches/009_nxagent_add-man-page.full.patch
index 8befcf70d..cec8c7527 100644
--- a/debian/patches/009_nxagent_add-man-page.full.patch
+++ b/debian/patches/009_nxagent_add-man-page.full.patch
@@ -1,3 +1,6 @@
+Description: man page for nxagent
+Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+
--- /dev/null
+++ b/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1
@@ -0,0 +1,37 @@
diff --git a/debian/patches/009_nxproxy_add-man-page.full+lite.patch b/debian/patches/009_nxproxy_add-man-page.full+lite.patch
index 7dccb357b..b60e218ee 100644
--- a/debian/patches/009_nxproxy_add-man-page.full+lite.patch
+++ b/debian/patches/009_nxproxy_add-man-page.full+lite.patch
@@ -1,3 +1,6 @@
+Description: man page for nxproxy
+Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+
--- /dev/null
+++ b/nxproxy/man/nxproxy.1
@@ -0,0 +1,27 @@
diff --git a/debian/patches/010_nxauth_fix-binary-name-in-man-page.full.patch b/debian/patches/010_nxauth_fix-binary-name-in-man-page.full.patch
index a3de56597..c8f76b51a 100644
--- a/debian/patches/010_nxauth_fix-binary-name-in-man-page.full.patch
+++ b/debian/patches/010_nxauth_fix-binary-name-in-man-page.full.patch
@@ -1,7 +1,6 @@
Description: Fix binary name in man page for nxauth.
The NX auth man page in upstream still uses xauth as
binary name.
-Forwarded: pending...
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Last-Update: 2012-12-31
--- a/nx-X11/programs/nxauth/nxauth.man
diff --git a/debian/patches/024_fix-make-clean.full+lite.patch b/debian/patches/024_fix-make-clean.full+lite.patch
index 74d52d785..7f0b327cf 100644
--- a/debian/patches/024_fix-make-clean.full+lite.patch
+++ b/debian/patches/024_fix-make-clean.full+lite.patch
@@ -1,3 +1,6 @@
+Description: fix clean rule in nxcomp's Makefile.in
+Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+
--- a/nxcomp/Makefile.in
+++ b/nxcomp/Makefile.in
@@ -313,4 +313,4 @@
diff --git a/debian/patches/029_nxcomp_ppc64.full+lite.patch b/debian/patches/029_nxcomp_ppc64.full+lite.patch
index f9fd749ee..9d454d5db 100644
--- a/debian/patches/029_nxcomp_ppc64.full+lite.patch
+++ b/debian/patches/029_nxcomp_ppc64.full+lite.patch
@@ -1,3 +1,6 @@
+Description: Fix BIGENDIAN issue in nxcomp (relevant on PPC64 arch)
+Author: Mihai Moldovan <ionic@ionic.de>
+
--- a/nxcomp/Loop.cpp
+++ b/nxcomp/Loop.cpp
@@ -6832,9 +6832,9 @@
diff --git a/debian/patches/052_nxcomp_macos10-nxauth-location.full+lite.patch b/debian/patches/052_nxcomp_macos10-nxauth-location.full+lite.patch
index 4960c9d9e..813363e69 100644
--- a/debian/patches/052_nxcomp_macos10-nxauth-location.full+lite.patch
+++ b/debian/patches/052_nxcomp_macos10-nxauth-location.full+lite.patch
@@ -1,3 +1,6 @@
+Description: Fix nxauth location on Mac OS X 10
+Author: Mihai Moldovan <ionic@ionic.de>
+
--- a/nxcomp/Auth.cpp
+++ b/nxcomp/Auth.cpp
@@ -217,22 +217,31 @@
diff --git a/debian/patches/053_nx-X11_no-xcomp1-install-target.full.patch b/debian/patches/053_nx-X11_no-xcomp1-install-target.full.patch
index eca4200d9..acf9374e5 100644
--- a/debian/patches/053_nx-X11_no-xcomp1-install-target.full.patch
+++ b/debian/patches/053_nx-X11_no-xcomp1-install-target.full.patch
@@ -1,3 +1,6 @@
+Description: Avoid building libXcomp.so.1 (which is identical to libXcomp.so.3)
+Author: Orion Poplawski <orion@cora.nwra.com>
+
--- a/nx-X11/lib/X11/Imakefile 2013-01-04 05:25:49.000000000 -0700
+++ b/nx-X11/lib/X11/Imakefile 2013-01-15 15:26:07.969167259 -0700
@@ -63,7 +63,6 @@ NX_XCOMPLIBDIR = $(XTOP)/../nxcomp
diff --git a/debian/patches/203_nxagent_disable-rootless-exit.full.patch b/debian/patches/203_nxagent_disable-rootless-exit.full.patch
index fcdecc010..74579f4d8 100644
--- a/debian/patches/203_nxagent_disable-rootless-exit.full.patch
+++ b/debian/patches/203_nxagent_disable-rootless-exit.full.patch
@@ -1,3 +1,6 @@
+Description: Add -norootlessexit cmdline option to nxagent
+Author: Oleksandr Shneyder <o.schneyder@phoca-gmbh.de>
+
--- a/nx-X11/programs/Xserver/hw/nxagent/Args.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Args.c
@@ -672,6 +672,12 @@
diff --git a/debian/patches/206_nxagent_clipboard-as-nxoption.full.patch b/debian/patches/206_nxagent_clipboard-as-nxoption.full.patch
index f173b25ca..12b51dc0e 100644
--- a/debian/patches/206_nxagent_clipboard-as-nxoption.full.patch
+++ b/debian/patches/206_nxagent_clipboard-as-nxoption.full.patch
@@ -1,3 +1,6 @@
+Descripion: Add -clipboard cmdline option to nxagent
+Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+
--- a/nx-X11/programs/Xserver/hw/nxagent/Args.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Args.c
@@ -984,7 +984,7 @@
diff --git a/debian/patches/209_x2goagent_add-man-page.full.patch b/debian/patches/209_x2goagent_add-man-page.full.patch
index 00ade43f8..310fa87d6 100644
--- a/debian/patches/209_x2goagent_add-man-page.full.patch
+++ b/debian/patches/209_x2goagent_add-man-page.full.patch
@@ -1,3 +1,6 @@
+Description: Add x2goagent man page
+Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+
--- /dev/null
+++ b/nx-X11/programs/Xserver/hw/nxagent/man/x2goagent.1
@@ -0,0 +1,35 @@
diff --git a/debian/patches/321_nxagent_x2go-specific-keystroke-config.full.patch b/debian/patches/321_nxagent_x2go-specific-keystroke-config.full.patch
index 8ab4f939f..795f10b76 100644
--- a/debian/patches/321_nxagent_x2go-specific-keystroke-config.full.patch
+++ b/debian/patches/321_nxagent_x2go-specific-keystroke-config.full.patch
@@ -1,3 +1,6 @@
+Description: Adapt paths of keystrokes.cfg if nxagent runs as x2goagent
+Author: Horst Schirmeier <horst@schirmeier.com>
+
--- a/nx-X11/programs/Xserver/hw/nxagent/Keystroke.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Keystroke.c
@@ -27,6 +27,7 @@
diff --git a/debian/patches/991_fix-hr-typos.full+lite.patch b/debian/patches/991_fix-hr-typos.full+lite.patch
index 4ac12a5ff..4ff18462e 100644
--- a/debian/patches/991_fix-hr-typos.full+lite.patch
+++ b/debian/patches/991_fix-hr-typos.full+lite.patch
@@ -1,3 +1,6 @@
+Description: Fix several typos in nxcomp
+Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+
--- a/nxcomp/CHANGELOG
+++ b/nxcomp/CHANGELOG
@@ -668,7 +668,7 @@
diff --git a/debian/patches/991_fix-hr-typos.full.patch b/debian/patches/991_fix-hr-typos.full.patch
index d06ea3f53..cc862a8b4 100644
--- a/debian/patches/991_fix-hr-typos.full.patch
+++ b/debian/patches/991_fix-hr-typos.full.patch
@@ -1,3 +1,6 @@
+Description: Fix several typos in nx-X11
+Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+
--- a/nx-X11/extras/Mesa/src/mesa/drivers/dri/common/xmlconfig.c
+++ b/nx-X11/extras/Mesa/src/mesa/drivers/dri/common/xmlconfig.c
@@ -729,7 +729,7 @@