[X2Go-Commits] [nx-libs] 08/52: VERSION file: master VERSION file is in base folder, symlinked from nx*/VERSION and hw/nxagent/VERSION.
git-admin at x2go.org
git-admin at x2go.org
Sat Feb 14 17:47:03 CET 2015
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch 3.6.x
in repository nx-libs.
commit ce531230f148a8c586a6e29c340e2db03d7bd3bb
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Sat Feb 14 15:14:23 2015 +0100
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
---
debian/VERSION => VERSION | 0
VERSION.x2goagent | 1 +
debian/roll-tarballs.sh | 2 --
debian/rules | 6 +-----
nx-X11/programs/Xserver/hw/nxagent/VERSION | 1 +
nx-libs.spec | 2 --
nxcomp/VERSION | 2 +-
nxcompext/VERSION | 2 +-
nxcompshad/VERSION | 2 +-
nxproxy/VERSION | 2 +-
10 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/debian/VERSION b/VERSION
similarity index 100%
rename from debian/VERSION
rename to VERSION
diff --git a/VERSION.x2goagent b/VERSION.x2goagent
new file mode 120000
index 0000000..974cf28
--- /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 02a25df..03ab677 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 ad9ddde..e0b4166 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 0000000..9ca2cfb
--- /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 b5ac8d9..c037a26 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
deleted file mode 100644
index 1545d96..0000000
--- a/nxcomp/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-3.5.0
diff --git a/nxcomp/VERSION b/nxcomp/VERSION
new file mode 120000
index 0000000..6ff19de
--- /dev/null
+++ b/nxcomp/VERSION
@@ -0,0 +1 @@
+../VERSION
\ No newline at end of file
diff --git a/nxcompext/VERSION b/nxcompext/VERSION
deleted file mode 100644
index 1545d96..0000000
--- a/nxcompext/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-3.5.0
diff --git a/nxcompext/VERSION b/nxcompext/VERSION
new file mode 120000
index 0000000..6ff19de
--- /dev/null
+++ b/nxcompext/VERSION
@@ -0,0 +1 @@
+../VERSION
\ No newline at end of file
diff --git a/nxcompshad/VERSION b/nxcompshad/VERSION
deleted file mode 100644
index 1545d96..0000000
--- a/nxcompshad/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-3.5.0
diff --git a/nxcompshad/VERSION b/nxcompshad/VERSION
new file mode 120000
index 0000000..6ff19de
--- /dev/null
+++ b/nxcompshad/VERSION
@@ -0,0 +1 @@
+../VERSION
\ No newline at end of file
diff --git a/nxproxy/VERSION b/nxproxy/VERSION
deleted file mode 100644
index 1545d96..0000000
--- a/nxproxy/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-3.5.0
diff --git a/nxproxy/VERSION b/nxproxy/VERSION
new file mode 120000
index 0000000..6ff19de
--- /dev/null
+++ b/nxproxy/VERSION
@@ -0,0 +1 @@
+../VERSION
\ No newline at end of file
--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
More information about the x2go-commits
mailing list