diff options
| -rwxr-xr-x | debian/roll-tarballs.sh | 12 | ||||
| -rwxr-xr-x | debian/rules | 7 | ||||
| -rw-r--r-- | etc/keystrokes.cfg (renamed from debian/keystrokes.cfg) | 0 | ||||
| -rw-r--r-- | etc/nxagent.keyboard (renamed from debian/nxagent.keyboard) | 0 | ||||
| -rw-r--r-- | etc/rgb (renamed from debian/rgb) | 0 | ||||
| -rw-r--r-- | etc/x2goagent.keyboard (renamed from debian/x2goagent.keyboard) | 0 | ||||
| -rw-r--r-- | nx-libs.spec | 8 |
7 files changed, 0 insertions, 27 deletions
diff --git a/debian/roll-tarballs.sh b/debian/roll-tarballs.sh index 384bc57e8..fcb83679c 100755 --- a/debian/roll-tarballs.sh +++ b/debian/roll-tarballs.sh @@ -86,10 +86,6 @@ if [ "x$MODE" = "xfull" ]; then cp -v debian/patches/$file doc/applied-patches echo ${file##*/} >> doc/applied-patches/series done - mkdir -p ./etc/ - cp -v debian/rgb ./etc/ - cp -v debian/nxagent.keyboard ./etc/ - cp -v debian/x2goagent.keyboard ./etc/ else rm -Rf "nxcompshad"* rm -Rf "nxcompext"* @@ -101,8 +97,6 @@ else done fi cp -v debian/COPYING.full+lite COPYING -cp -v debian/nxagent.keyboard nxagent.keyboard -cp -v debian/x2goagent.keyboard x2goagent.keyboard # apply all patches shipped in debian/patches and create a copy of them that we ship with the tarball if [ -s "doc/applied-patches/series" ]; then @@ -116,12 +110,6 @@ for f in $(ls README* 2>/dev/null); do mv -v $f doc/; 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 -fi - # remove folders that we do not want to roll into the tarball rm -Rf ".pc/" rm -Rf "debian/" diff --git a/debian/rules b/debian/rules index 7b60a46a4..2375b46ac 100755 --- a/debian/rules +++ b/debian/rules @@ -20,7 +20,6 @@ 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 etc/rgb etc/keystrokes.cfg etc/nxagent.keyboard etc/x2goagent.keyboard rm -f debian/libnx-xinerama1.postinst rm -fR .preserve/ dh_clean @@ -78,12 +77,6 @@ override_dh_auto_install: override_dh_auto_build: - mkdir -p etc/ - ln -s ../debian/keystrokes.cfg etc/keystrokes.cfg - ln -s ../debian/rgb etc/rgb - ln -s ../debian/nxagent.keyboard etc/nxagent.keyboard - ln -s ../debian/x2goagent.keyboard etc/x2goagent.keyboard - # let's prep the libnx-xinerama1.postinst script with the value of the build systems's DEB_BUILD_MULTIARCH variable sed debian/libnx-xinerama1.postinst.in -e 's/#DEB_BUILD_MULTIARCH#/$(DEB_BUILD_MULTIARCH)/' > debian/libnx-xinerama1.postinst diff --git a/debian/keystrokes.cfg b/etc/keystrokes.cfg index a5e521071..a5e521071 100644 --- a/debian/keystrokes.cfg +++ b/etc/keystrokes.cfg diff --git a/debian/nxagent.keyboard b/etc/nxagent.keyboard index afe283260..afe283260 100644 --- a/debian/nxagent.keyboard +++ b/etc/nxagent.keyboard diff --git a/debian/x2goagent.keyboard b/etc/x2goagent.keyboard index afe283260..afe283260 100644 --- a/debian/x2goagent.keyboard +++ b/etc/x2goagent.keyboard diff --git a/nx-libs.spec b/nx-libs.spec index ccbf6f9da..5c1064f33 100644 --- a/nx-libs.spec +++ b/nx-libs.spec @@ -659,14 +659,6 @@ information on NX. %prep %setup -q -# copy files from the debian/ folder to designated places in the source tree, -# taken from roll-tarball.sh: -mkdir etc/ -cp -v debian/keystrokes.cfg etc/keystrokes.cfg -cp -v debian/rgb etc/rgb -cp -v debian/nxagent.keyboard etc/nxagent.keyboard -cp -v debian/x2goagent.keyboard etc/x2goagent.keyboard - # remove build cruft that is in Git (also taken from roll-tarball.sh) rm -Rf nx*/configure nx*/autom4te.cache* # Install into /usr |