aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog2
-rwxr-xr-xdebian/rules2
2 files changed, 3 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index e2bf42da2..3c1054f03 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ 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).
+ * debian/rules:
+ + No such option for dh_auto_build: --with quilt."
* nx-libs.spec:
+ Adapt installation of debian/VERSION as VERSION.x2goagent and
nxcomp/VERSION to latest changes introduced by
diff --git a/debian/rules b/debian/rules
index 1f02c900d..dbef1ef90 100755
--- a/debian/rules
+++ b/debian/rules
@@ -54,7 +54,7 @@ override_dh_auto_build:
rm -Rf nx-X11/lib/{expat,fontconfig,fontenc,font/FreeType,font/include/fontenc.h,freetype2,regex,zlib}
rm -Rf nx-X11/lib/{FS,ICE,SM,Xaw,Xft,Xt,Xmu,Xmuu}
- LD_LIBRARY_PATH=`pwd`/debian/libnx-x11/usr/lib/nx/X11:$$LD_LIBRARY_PATH dh_auto_build --with quilt --parallel
+ LD_LIBRARY_PATH=`pwd`/debian/libnx-x11/usr/lib/nx/X11:$$LD_LIBRARY_PATH dh_auto_build --parallel
override_dh_strip:
dh_strip --dbg-package=nx-x11-dbg