Move Makefile (and auxiliary file replace.sh) into base folder. Adapt packaging these scripts:

    debian/roll-tarballs.sh
    debian/rules
    nx-libs.spec

5 files changed, 1 insertions, 11 deletions

diff --git a/debian/Makefile.nx-libs b/Makefile
index 3aeda739b..3aeda739b 100644
--- a/debian/Makefile.nx-libs
+++ b/Makefile
diff --git a/debian/roll-tarballs.sh b/debian/roll-tarballs.sh
index 3ff7667f7..02a25dff5 100755
--- a/debian/roll-tarballs.sh
+++ b/debian/roll-tarballs.sh
@@ -34,7 +34,6 @@ PROJECT="nx-libs"
 NULL=""
 
 test -d .git || usage
-test -f debian/Makefile.nx-libs || usage
 RELEASE="$1"
 test -n "${RELEASE}" || usage
 CHECKOUT="$2"
@@ -135,10 +134,6 @@ fi
 
 mv -v debian/changelog doc/changelog
 
-# copy the top-level makefile if no quilt patch created it before
-test -f Makefile || test -f debian/Makefile.nx-libs && cp -v debian/Makefile.nx-libs Makefile
-test -f replace.sh || test -f debian/Makefile.replace.sh && cp -v debian/Makefile.replace.sh replace.sh
-
 # 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 b38d8a0b6..ad9ddded6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,9 +23,8 @@ override_dh_clean:
 	rm -f doc/changelog
 	rm -f nx-X11/programs/Xserver/hw/nxagent/changelog
 	rm -f nx-X11/programs/nxauth/changelog
-	if [ ! -f replace.sh ] && [ ! -h replace.sh ]; then ln -s debian/Makefile.replace.sh replace.sh; fi
 	. ./replace.sh; set -x; ls debian/*.install.in | while read file; do rm -f $$(string_rep $$file .install.in .install); done
-	rm -fR replace.sh Makefile bin etc/rgb VERSION.x2goagent etc/keystrokes.cfg etc/nxagent.keyboard etc/x2goagent.keyboard
+	rm -fR bin etc/rgb VERSION.x2goagent etc/keystrokes.cfg etc/nxagent.keyboard etc/x2goagent.keyboard
 	rm -f debian/libnx-xinerama1.postinst
 	rm -fR .preserve/
 	if [ -f nxcomp/.VERSION.NoMachine ]; then mv nxcomp/.VERSION.NoMachine nxcomp/VERSION; fi
@@ -98,8 +97,6 @@ override_dh_auto_build:
 	cp -a nx-X11/programs/Xserver/hw/nxagent/CHANGELOG nx-X11/programs/Xserver/hw/nxagent/changelog
 	cp -a nx-X11/programs/nxauth/CHANGELOG nx-X11/programs/nxauth/changelog
 	cp -a nxproxy/CHANGELOG nxproxy/changelog
-	ln -s debian/Makefile.nx-libs Makefile
-	ln -s debian/Makefile.replace.sh replace.sh
 	ln -s debian/wrappers bin
 	mkdir -p etc/
 	ln -s ../debian/keystrokes.cfg etc/keystrokes.cfg
diff --git a/nx-libs.spec b/nx-libs.spec
index 31887239f..b5ac8d92f 100644
--- a/nx-libs.spec
+++ b/nx-libs.spec
@@ -665,8 +665,6 @@ mkdir bin/
 cp -v debian/wrappers/* bin/
 mkdir etc/
 cp -v debian/keystrokes.cfg etc/keystrokes.cfg
-cp -v debian/Makefile.nx-libs Makefile
-cp -v debian/Makefile.replace.sh replace.sh
 cp -v debian/rgb etc/rgb
 cp -v debian/nxagent.keyboard etc/nxagent.keyboard
 cp -v debian/x2goagent.keyboard etc/x2goagent.keyboard
diff --git a/debian/Makefile.replace.sh b/replace.sh
index 83d6b5b3e..83d6b5b3e 100644
--- a/debian/Makefile.replace.sh
+++ b/replace.sh