aboutsummaryrefslogtreecommitdiff
path: root/debian
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 14:53:10 +0100
commit8c98a401b49506f969dc9263d9bd566e5b31a572 (patch)
treefefb1dce17fea2701ac4cee76eb7f1d5b6c7a26a /debian
parent863119ed643f6b43441570161659e9c9d5ae5da5 (diff)
downloadnx-libs-8c98a401b49506f969dc9263d9bd566e5b31a572.tar.gz
nx-libs-8c98a401b49506f969dc9263d9bd566e5b31a572.tar.bz2
nx-libs-8c98a401b49506f969dc9263d9bd566e5b31a572.zip
Use proper quoting on build flag vars (they may contain spaces).
Conflicts (resolved by Mike Gabriel after cherry-pick from 3.6.x branch): debian/rules
Diffstat (limited to 'debian')
-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 bdb9e647a..6a82c674d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -140,7 +140,7 @@ override_dh_auto_build:
cp -av .preserve/* .
rm -Rf .preserve/
- 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