VERSION file: master VERSION file is in base folder, symlinked from nx*/VERSION and hw/nxagent/VERSION.

  This commit removes the debian/VERSION file at makes it now unnecessary to
  copy/symlink the VERSION file at build time. These build scripts got adapted:

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

  Furthermore, all NX component now use the main VERSION file as reference.

    typechange: nxcomp/VERSION
    typechange: nxcompext/VERSION
    typechange: nxcompshad/VERSION
    typechange: nxproxy/VERSION

10 files changed, 7 insertions, 13 deletions

diff --git a/debian/VERSION b/VERSION
index 9af1780f9..9af1780f9 100644
--- a/debian/VERSION
+++ b/VERSION
diff --git a/VERSION.x2goagent b/VERSION.x2goagent
new file mode 120000
index 000000000..974cf28e0
--- /dev/null
+++ b/VERSION.x2goagent
@@ -0,0 +1 @@
+VERSION
\ No newline at end of file
diff --git a/debian/roll-tarballs.sh b/debian/roll-tarballs.sh
index 02a25dff5..03ab6778b 100755
--- a/debian/roll-tarballs.sh
+++ b/debian/roll-tarballs.sh
@@ -90,7 +90,6 @@ if [ "x$MODE" = "xfull" ]; then
     cp -v debian/rgb ./etc/
     cp -v debian/nxagent.keyboard ./etc/
     cp -v debian/x2goagent.keyboard ./etc/
-    cp -v debian/VERSION ./VERSION.x2goagent
 else
     rm -Rf "nxcompshad"*
     rm -Rf "nxcompext"*
@@ -101,7 +100,6 @@ else
         echo ${file##*/} >> doc/applied-patches/series
     done
 fi
-cp -v debian/VERSION ./nxcomp/VERSION
 cp -v debian/COPYING.full+lite COPYING
 cp -v debian/nxagent.keyboard nxagent.keyboard
 cp -v debian/x2goagent.keyboard x2goagent.keyboard
diff --git a/debian/rules b/debian/rules
index ad9ddded6..e0b4166f5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,10 +24,9 @@ override_dh_clean:
 	rm -f nx-X11/programs/Xserver/hw/nxagent/changelog
 	rm -f nx-X11/programs/nxauth/changelog
 	. ./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 VERSION.x2goagent etc/keystrokes.cfg etc/nxagent.keyboard etc/x2goagent.keyboard
+	rm -fR bin etc/rgb 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
 	dh_clean
 
 override_dh_installchangelog:
@@ -91,7 +90,6 @@ override_dh_auto_build:
 	# create copies of upstream changelogs so that names apply to Debian policy...
 	cp -a nx-X11/CHANGELOG nx-X11/changelog
 	cp -a nxcomp/CHANGELOG nxcomp/changelog
-	if [ -f nxcomp/VERSION ]; then cp nxcomp/VERSION nxcomp/.VERSION.NoMachine; fi
 	cp -a nxcompext/CHANGELOG nxcompext/changelog
 	cp -a nxcompshad/CHANGELOG nxcompshad/changelog
 	cp -a nx-X11/programs/Xserver/hw/nxagent/CHANGELOG nx-X11/programs/Xserver/hw/nxagent/changelog
@@ -105,8 +103,6 @@ override_dh_auto_build:
 	ln -s ../debian/x2goagent.keyboard etc/x2goagent.keyboard
 	mkdir -p doc/
 	ln -s ../debian/changelog doc/changelog
-	ln -sf debian/VERSION VERSION.x2goagent
-	ln -sf ../debian/VERSION nxcomp/VERSION
 
 	# 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/nx-X11/programs/Xserver/hw/nxagent/VERSION b/nx-X11/programs/Xserver/hw/nxagent/VERSION
new file mode 120000
index 000000000..9ca2cfb9d
--- /dev/null
+++ b/nx-X11/programs/Xserver/hw/nxagent/VERSION
@@ -0,0 +1 @@
+../../../../../VERSION
\ No newline at end of file
diff --git a/nx-libs.spec b/nx-libs.spec
index b5ac8d92f..c037a2662 100644
--- a/nx-libs.spec
+++ b/nx-libs.spec
@@ -668,8 +668,6 @@ 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
-cp -v debian/VERSION VERSION.x2goagent
-cp -v debian/VERSION nxcomp/VERSION
 
 # remove build cruft that is in Git (also taken from roll-tarball.sh)
 rm -Rf nx*/configure nx*/autom4te.cache*
diff --git a/nxcomp/VERSION b/nxcomp/VERSION
index 1545d9665..6ff19de4b 100644..120000
--- a/nxcomp/VERSION
+++ b/nxcomp/VERSION
@@ -1 +1 @@
-3.5.0
+../VERSION
\ No newline at end of file
diff --git a/nxcompext/VERSION b/nxcompext/VERSION
index 1545d9665..6ff19de4b 100644..120000
--- a/nxcompext/VERSION
+++ b/nxcompext/VERSION
@@ -1 +1 @@
-3.5.0
+../VERSION
\ No newline at end of file
diff --git a/nxcompshad/VERSION b/nxcompshad/VERSION
index 1545d9665..6ff19de4b 100644..120000
--- a/nxcompshad/VERSION
+++ b/nxcompshad/VERSION
@@ -1 +1 @@
-3.5.0
+../VERSION
\ No newline at end of file
diff --git a/nxproxy/VERSION b/nxproxy/VERSION
index 1545d9665..6ff19de4b 100644..120000
--- a/nxproxy/VERSION
+++ b/nxproxy/VERSION
@@ -1 +1 @@
-3.5.0
+../VERSION
\ No newline at end of file