From 0277e0857c774b28b2baa9d03edb2a38cf944b5f Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Thu, 2 Oct 2014 12:34:22 +0200 Subject: nx-libs.spec: Adapt installation of debian/VERSION as VERSION.x2goagent and nxcomp/VERSION to latest changes introduced by 400_nxcomp-version.full+lite.patch. --- debian/changelog | 4 ++++ nx-libs.spec | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 9d4fcfd89..e2bf42da2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,10 @@ nx-libs (2:3.5.0.28-0x2go1) UNRELEASED; urgency=medium + Don't use dpkg-architecture (bin:package dpkg-dev) in postinst script. Instead prep a libnx-x11.postinst script at build time. (Fixes: #621). + * nx-libs.spec: + + Adapt installation of debian/VERSION as VERSION.x2goagent and + nxcomp/VERSION to latest changes introduced by + 400_nxcomp-version.full+lite.patch. [ Nito Martinez ] * Add 400_nxcomp-version.full+lite.patch. Allow 4-digit version comparison diff --git a/nx-libs.spec b/nx-libs.spec index be1717e8a..01bc76ea9 100644 --- a/nx-libs.spec +++ b/nx-libs.spec @@ -495,7 +495,8 @@ 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 rgb -cp -v debian/VERSION.x2goagent VERSION.x2goagent +cp -v debian/VERSION VERSION.x2goagent +cp -v debian/VERSION nxcomp/VERSION # remove bundled libraries (also taken from roll-tarball.sh) rm -Rf nx-X11/extras/{drm,expat,fontconfig,freetype2,fonts,ogl-sample,regex,rman,ttf2pt1,x86emu,zlib} rm -Rf nx-X11/lib/{expat,fontconfig,fontenc,font/FreeType,font/include/fontenc.h,freetype2,regex,zlib} -- cgit v1.2.3