diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-02-14 15:14:23 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-02-14 16:14:30 +0100 |
| commit | ce531230f148a8c586a6e29c340e2db03d7bd3bb (patch) | |
| tree | fa42beb1d1addeb4797435e93cb1032e1ea97c85 /debian | |
| parent | ea8ca04a7cb478c6c379e64e5db655fff9c0e15a (diff) | |
| download | nx-libs-ce531230f148a8c586a6e29c340e2db03d7bd3bb.tar.gz nx-libs-ce531230f148a8c586a6e29c340e2db03d7bd3bb.tar.bz2 nx-libs-ce531230f148a8c586a6e29c340e2db03d7bd3bb.zip | |
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
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/VERSION | 1 | ||||
| -rwxr-xr-x | debian/roll-tarballs.sh | 2 | ||||
| -rwxr-xr-x | debian/rules | 6 |
3 files changed, 1 insertions, 8 deletions
diff --git a/debian/VERSION b/debian/VERSION deleted file mode 100644 index 9af1780f9..000000000 --- a/debian/VERSION +++ /dev/null @@ -1 +0,0 @@ -3.5.99.0 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 |