diff options
| -rw-r--r-- | bin/nxagent (renamed from debian/wrappers/nxagent) | 0 | ||||
| -rw-r--r-- | bin/nxauth (renamed from debian/wrappers/nxauth) | 0 | ||||
| -rw-r--r-- | bin/nxproxy (renamed from debian/wrappers/nxproxy) | 0 | ||||
| -rw-r--r-- | bin/x2goagent (renamed from debian/wrappers/x2goagent) | 0 | ||||
| -rw-r--r-- | debian/libnx-x11-6.docs | 1 | ||||
| -rw-r--r-- | debian/libnx-xau6.docs | 1 | ||||
| -rw-r--r-- | debian/libnx-xcomposite1.docs | 1 | ||||
| -rw-r--r-- | debian/libnx-xdamage1.docs | 1 | ||||
| -rw-r--r-- | debian/libnx-xdmcp6.docs | 1 | ||||
| -rw-r--r-- | debian/libnx-xext6.docs | 1 | ||||
| -rw-r--r-- | debian/libnx-xfixes3.docs | 1 | ||||
| -rw-r--r-- | debian/libnx-xinerama1.docs | 1 | ||||
| -rw-r--r-- | debian/libnx-xpm4.docs | 1 | ||||
| -rw-r--r-- | debian/libnx-xrandr2.docs | 1 | ||||
| -rw-r--r-- | debian/libnx-xrender1.docs | 1 | ||||
| -rw-r--r-- | debian/libnx-xtst6.docs | 1 | ||||
| -rw-r--r-- | debian/libxcomp3.docs | 1 | ||||
| -rw-r--r-- | debian/libxcompext3.docs | 1 | ||||
| -rw-r--r-- | debian/libxcompshad3.docs | 1 | ||||
| -rw-r--r-- | debian/nxagent.docs | 1 | ||||
| -rw-r--r-- | debian/nxauth.docs | 1 | ||||
| -rw-r--r-- | debian/nxproxy.docs | 1 | ||||
| -rwxr-xr-x | debian/roll-tarballs.sh | 10 | ||||
| -rwxr-xr-x | debian/rules | 3 | ||||
| -rw-r--r-- | nx-libs.spec | 2 |
25 files changed, 2 insertions, 31 deletions
diff --git a/debian/wrappers/nxagent b/bin/nxagent index 6306ed069..6306ed069 100644 --- a/debian/wrappers/nxagent +++ b/bin/nxagent diff --git a/debian/wrappers/nxauth b/bin/nxauth index c8dbb83f3..c8dbb83f3 100644 --- a/debian/wrappers/nxauth +++ b/bin/nxauth diff --git a/debian/wrappers/nxproxy b/bin/nxproxy index 23e7109e3..23e7109e3 100644 --- a/debian/wrappers/nxproxy +++ b/bin/nxproxy diff --git a/debian/wrappers/x2goagent b/bin/x2goagent index 09011efbe..09011efbe 100644 --- a/debian/wrappers/x2goagent +++ b/bin/x2goagent diff --git a/debian/libnx-x11-6.docs b/debian/libnx-x11-6.docs deleted file mode 100644 index 5a57a3fdc..000000000 --- a/debian/libnx-x11-6.docs +++ /dev/null @@ -1 +0,0 @@ -nx-X11/changelog
\ No newline at end of file diff --git a/debian/libnx-xau6.docs b/debian/libnx-xau6.docs deleted file mode 100644 index 5a57a3fdc..000000000 --- a/debian/libnx-xau6.docs +++ /dev/null @@ -1 +0,0 @@ -nx-X11/changelog
\ No newline at end of file diff --git a/debian/libnx-xcomposite1.docs b/debian/libnx-xcomposite1.docs deleted file mode 100644 index 5a57a3fdc..000000000 --- a/debian/libnx-xcomposite1.docs +++ /dev/null @@ -1 +0,0 @@ -nx-X11/changelog
\ No newline at end of file diff --git a/debian/libnx-xdamage1.docs b/debian/libnx-xdamage1.docs deleted file mode 100644 index 5a57a3fdc..000000000 --- a/debian/libnx-xdamage1.docs +++ /dev/null @@ -1 +0,0 @@ -nx-X11/changelog
\ No newline at end of file diff --git a/debian/libnx-xdmcp6.docs b/debian/libnx-xdmcp6.docs deleted file mode 100644 index 5a57a3fdc..000000000 --- a/debian/libnx-xdmcp6.docs +++ /dev/null @@ -1 +0,0 @@ -nx-X11/changelog
\ No newline at end of file diff --git a/debian/libnx-xext6.docs b/debian/libnx-xext6.docs deleted file mode 100644 index 5a57a3fdc..000000000 --- a/debian/libnx-xext6.docs +++ /dev/null @@ -1 +0,0 @@ -nx-X11/changelog
\ No newline at end of file diff --git a/debian/libnx-xfixes3.docs b/debian/libnx-xfixes3.docs deleted file mode 100644 index 5a57a3fdc..000000000 --- a/debian/libnx-xfixes3.docs +++ /dev/null @@ -1 +0,0 @@ -nx-X11/changelog
\ No newline at end of file diff --git a/debian/libnx-xinerama1.docs b/debian/libnx-xinerama1.docs deleted file mode 100644 index 5a57a3fdc..000000000 --- a/debian/libnx-xinerama1.docs +++ /dev/null @@ -1 +0,0 @@ -nx-X11/changelog
\ No newline at end of file diff --git a/debian/libnx-xpm4.docs b/debian/libnx-xpm4.docs deleted file mode 100644 index 5a57a3fdc..000000000 --- a/debian/libnx-xpm4.docs +++ /dev/null @@ -1 +0,0 @@ -nx-X11/changelog
\ No newline at end of file diff --git a/debian/libnx-xrandr2.docs b/debian/libnx-xrandr2.docs deleted file mode 100644 index 5a57a3fdc..000000000 --- a/debian/libnx-xrandr2.docs +++ /dev/null @@ -1 +0,0 @@ -nx-X11/changelog
\ No newline at end of file diff --git a/debian/libnx-xrender1.docs b/debian/libnx-xrender1.docs deleted file mode 100644 index 5a57a3fdc..000000000 --- a/debian/libnx-xrender1.docs +++ /dev/null @@ -1 +0,0 @@ -nx-X11/changelog
\ No newline at end of file diff --git a/debian/libnx-xtst6.docs b/debian/libnx-xtst6.docs deleted file mode 100644 index 5a57a3fdc..000000000 --- a/debian/libnx-xtst6.docs +++ /dev/null @@ -1 +0,0 @@ -nx-X11/changelog
\ No newline at end of file diff --git a/debian/libxcomp3.docs b/debian/libxcomp3.docs deleted file mode 100644 index 97efc9f41..000000000 --- a/debian/libxcomp3.docs +++ /dev/null @@ -1 +0,0 @@ -nxcomp/changelog diff --git a/debian/libxcompext3.docs b/debian/libxcompext3.docs deleted file mode 100644 index 8323a3471..000000000 --- a/debian/libxcompext3.docs +++ /dev/null @@ -1 +0,0 @@ -nxcompext/changelog diff --git a/debian/libxcompshad3.docs b/debian/libxcompshad3.docs deleted file mode 100644 index 33632b9a6..000000000 --- a/debian/libxcompshad3.docs +++ /dev/null @@ -1 +0,0 @@ -nxcompshad/changelog diff --git a/debian/nxagent.docs b/debian/nxagent.docs index 6d791c6da..5d7d87aed 100644 --- a/debian/nxagent.docs +++ b/debian/nxagent.docs @@ -1,2 +1 @@ -nx-X11/programs/Xserver/hw/nxagent/changelog README.keystrokes
\ No newline at end of file diff --git a/debian/nxauth.docs b/debian/nxauth.docs deleted file mode 100644 index aaa115f2c..000000000 --- a/debian/nxauth.docs +++ /dev/null @@ -1 +0,0 @@ -nx-X11/programs/nxauth/changelog
\ No newline at end of file diff --git a/debian/nxproxy.docs b/debian/nxproxy.docs index 4b3d18d8c..2243d21ac 100644 --- a/debian/nxproxy.docs +++ b/debian/nxproxy.docs @@ -1,4 +1,3 @@ -nxproxy/changelog nxproxy/README nxproxy/README-IPAQ nxproxy/README-VALGRIND diff --git a/debian/roll-tarballs.sh b/debian/roll-tarballs.sh index 37c897a66..384bc57e8 100755 --- a/debian/roll-tarballs.sh +++ b/debian/roll-tarballs.sh @@ -116,15 +116,7 @@ for f in $(ls README* 2>/dev/null); do mv -v $f doc/; done -mkdir -p bin/ -if [ "$MODE" = "lite" ]; then - # copy wrapper script nxproxy only into tarball - cp -v debian/wrappers/nxproxy bin/ -else - # copy wrapper scripts into tarball - for w in $(ls debian/wrappers/* 2>/dev/null); do - cp -v $w bin/ - done +if [ "$MODE" = "full" ]; then # provide a default keystrokes.cfg file mkdir -p etc test -f etc/keystrokes.cfg || test -f debian/keystrokes.cfg && cp -v debian/keystrokes.cfg etc/keystrokes.cfg diff --git a/debian/rules b/debian/rules index b17828231..7b60a46a4 100755 --- a/debian/rules +++ b/debian/rules @@ -20,7 +20,7 @@ override_dh_auto_clean: override_dh_clean: rm -f nx*/configure . ./replace.sh; set -x; ls debian/*.install.in | while read file; do rm -f $$(string_rep $$file .install.in .install); done - rm -fR bin etc/rgb etc/keystrokes.cfg etc/nxagent.keyboard etc/x2goagent.keyboard + rm -fR etc/rgb etc/keystrokes.cfg etc/nxagent.keyboard etc/x2goagent.keyboard rm -f debian/libnx-xinerama1.postinst rm -fR .preserve/ dh_clean @@ -78,7 +78,6 @@ override_dh_auto_install: override_dh_auto_build: - ln -s debian/wrappers bin mkdir -p etc/ ln -s ../debian/keystrokes.cfg etc/keystrokes.cfg ln -s ../debian/rgb etc/rgb diff --git a/nx-libs.spec b/nx-libs.spec index 897c1d29d..ccbf6f9da 100644 --- a/nx-libs.spec +++ b/nx-libs.spec @@ -661,8 +661,6 @@ information on NX. %setup -q # copy files from the debian/ folder to designated places in the source tree, # taken from roll-tarball.sh: -mkdir bin/ -cp -v debian/wrappers/* bin/ mkdir etc/ cp -v debian/keystrokes.cfg etc/keystrokes.cfg cp -v debian/rgb etc/rgb |