Skip to content

N
nx-libs
Commit ce531230 authored by Mike Gabriel's avatar Mike Gabriel
Browse files
Options

VERSION file: master VERSION file is in base folder, symlinked from nx*/VERSION…

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
parent ea8ca04a
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 13 deletions
VERSION.x2goagent 0 → 120000
View file @ ce531230
VERSION
\ No newline at end of file
debian/roll-tarballs.sh
View file @ ce531230
......@@ -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
......
debian/rules
View file @ ce531230
......@@ -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
......
nx-X11/programs/Xserver/hw/nxagent/VERSION 0 → 120000
View file @ ce531230
../../../../../VERSION
\ No newline at end of file
nx-libs.spec
View file @ ce531230
......@@ -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*
......
nxcomp/VERSION 0 → 120000
View file @ ce531230
../VERSION
\ No newline at end of file
nxcompext/VERSION 0 → 120000
View file @ ce531230
../VERSION
\ No newline at end of file
nxcompshad/VERSION 0 → 120000
View file @ ce531230
../VERSION
\ No newline at end of file
nxproxy/VERSION 0 → 120000
View file @ ce531230
../VERSION
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment