aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-02-14 14:23:10 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-02-14 16:14:30 +0100
commite54e896a6e2dcfc2c80a4d77db819b802dfd1fc1 (patch)
tree296171ad3f1f23c02f56619d93b3705d58895ded
parentdb3c6a6d2ce6e5ca7528b918327104df0c846b53 (diff)
downloadnx-libs-e54e896a6e2dcfc2c80a4d77db819b802dfd1fc1.tar.gz
nx-libs-e54e896a6e2dcfc2c80a4d77db819b802dfd1fc1.tar.bz2
nx-libs-e54e896a6e2dcfc2c80a4d77db819b802dfd1fc1.zip
Use proper quoting on build flag vars (they may contain spaces).
-rw-r--r--debian/changelog1
-rwxr-xr-xdebian/rules2
2 files changed, 2 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index a8c2480f6..6ce69dbc5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -85,6 +85,7 @@ nx-libs (2:3.5.0.29-0x2go2) UNRELEASED; urgency=medium
+ Add to B-D: expat.
+ Install upstream ChangeLogs into bin:packages.
+ Remove upstream nx-libs ChangeLog during override_dh_clean.
+ + Use proper quoting on build flag vars (they may contain spaces).
* nx-libs.spec:
+ The gpg-offline bin:package is not available in our SLE repo. We can do
diff --git a/debian/rules b/debian/rules
index 396f9b937..b38d8a0b6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -114,7 +114,7 @@ override_dh_auto_build:
# 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
- LOCAL_LDFLAGS=$(LDFLAGS) SHLIBGLOBALSFLAGS=$(LDFLAGS) SHLIBDIR=$(LIBDIR) PREFIX=/usr dh_auto_build --parallel
+ LOCAL_LDFLAGS="$(LDFLAGS)" SHLIBGLOBALSFLAGS="$(LDFLAGS)" SHLIBDIR="$(LIBDIR)" PREFIX=/usr dh_auto_build --parallel
override_dh_strip:
dh_strip -plibnx-x11-6 --dbg-package=libnx-x11-6-dbg