aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-01-28 15:10:54 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-01-28 16:35:07 +0100
commitf18608de2146cece6afa9f9e3feac1cd9bca601c (patch)
tree68fba8fc6c09c0b3309e229d093221898b69b32e
parent5565184a6de302ac6edbf5f52f237c0ff2b00283 (diff)
downloadnx-libs-f18608de2146cece6afa9f9e3feac1cd9bca601c.tar.gz
nx-libs-f18608de2146cece6afa9f9e3feac1cd9bca601c.tar.bz2
nx-libs-f18608de2146cece6afa9f9e3feac1cd9bca601c.zip
rebase with unify
-rw-r--r--debian/CODE-REDUCTION_CLEANUP-BACKUPFILES12
-rw-r--r--debian/CODE-REDUCTION_CLEANUP-UNUSED1
-rw-r--r--debian/CODE-REDUCTION_PRESERVE-NEEDED3
3 files changed, 0 insertions, 16 deletions
diff --git a/debian/CODE-REDUCTION_CLEANUP-BACKUPFILES b/debian/CODE-REDUCTION_CLEANUP-BACKUPFILES
index ebd8113ab..5235942e5 100644
--- a/debian/CODE-REDUCTION_CLEANUP-BACKUPFILES
+++ b/debian/CODE-REDUCTION_CLEANUP-BACKUPFILES
@@ -6,8 +6,6 @@ nx-X11/include/Xpoll.h.in.NX.original
nx-X11/include/Xpoll.h.in.X.original
nx-X11/lib/font/fontfile/encparse.c.NX.original
nx-X11/lib/font/fontfile/encparse.c.X.original
-nx-X11/lib/SM/sm_client.c.NX.original
-nx-X11/lib/SM/sm_client.c.SM.original
nx-X11/lib/X11/ChkIfEv.c.NX.original
nx-X11/lib/X11/ChkIfEv.c.X.original
nx-X11/lib/X11/cmsProp.c.X.original
@@ -195,10 +193,6 @@ nx-X11/programs/Xserver/randr/rrscreen.c.X.original
nx-X11/programs/Xserver/randr/rrxinerama.c.NX.original
nx-X11/programs/Xserver/randr/rrxinerama.c.X.original
nx-X11/programs/Xserver/randr.X.original
-nx-X11/programs/Xserver/randr.X.original/Imakefile
-nx-X11/programs/Xserver/randr.X.original/mirandr.c
-nx-X11/programs/Xserver/randr.X.original/randr.c
-nx-X11/programs/Xserver/randr.X.original/randrstr.h
nx-X11/programs/Xserver/render/renderedge.c.NX.original
nx-X11/programs/Xserver/render/renderedge.c.X.original
nx-X11/programs/Xserver/Xext/Imakefile.NX.original
@@ -217,10 +211,4 @@ nx-X11/programs/Xserver/xkb/Imakefile.NX.original
nx-X11/programs/Xserver/xkb/Imakefile.X.original
nx-X11/programs/Xserver/xkb/xkbDflts.h.NX.original
nx-X11/programs/Xserver/xkb/xkbDflts.h.X.original
-nx-X11/programs/xterm/charproc.c.NX.original
-nx-X11/programs/xterm/charproc.c.X.original
-nx-X11/programs/xterm/Imakefile.NX.original
-nx-X11/programs/xterm/Imakefile.X.original
-nx-X11/programs/xterm/main.c.NX.original
-nx-X11/programs/xterm/main.c.X.original
nx-X11/WSDrawBuffer.h.X.original
diff --git a/debian/CODE-REDUCTION_CLEANUP-UNUSED b/debian/CODE-REDUCTION_CLEANUP-UNUSED
index a72ed11d7..2272174a0 100644
--- a/debian/CODE-REDUCTION_CLEANUP-UNUSED
+++ b/debian/CODE-REDUCTION_CLEANUP-UNUSED
@@ -40,7 +40,6 @@ nx-X11/programs/Xserver/hw/sun/
nx-X11/programs/Xserver/hw/sunLynx/
nx-X11/programs/Xserver/hw/vfb/
nx-X11/programs/Xserver/hw/xfree86/
-nx-X11/programs/Xserver/hw/xfree86/
nx-X11/programs/Xserver/hw/xnest/
nx-X11/programs/Xserver/hw/xwin/
nx-X11/programs/Xserver/ilbm/
diff --git a/debian/CODE-REDUCTION_PRESERVE-NEEDED b/debian/CODE-REDUCTION_PRESERVE-NEEDED
index 159468f28..7f1eee8e4 100644
--- a/debian/CODE-REDUCTION_PRESERVE-NEEDED
+++ b/debian/CODE-REDUCTION_PRESERVE-NEEDED
@@ -1,4 +1,3 @@
-nx-X11/config/cf/date.def
nx-X11/config/cf/host.def
nx-X11/config/cf/Imake.cf
nx-X11/config/cf/Imakefile
@@ -8,14 +7,12 @@ nx-X11/config/cf/Library.tmpl
nx-X11/config/cf/linux.cf
nx-X11/config/cf/lnxLib.rules
nx-X11/config/cf/lnxLib.tmpl
-nx-X11/config/cf/Makefile
nx-X11/config/cf/noop.rules
nx-X11/config/cf/README
nx-X11/config/cf/ServerLib.tmpl
nx-X11/config/cf/Server.tmpl
nx-X11/config/cf/site.def
nx-X11/config/cf/Threads.tmpl
-nx-X11/config/cf/version.def
nx-X11/config/cf/X11.rules
nx-X11/config/cf/X11.tmpl
nx-X11/config/cf/xf86.rules