[Pkg-mongodb-maintainers] [pkg-mongodb] 148/394: return empty TERM if not set (Closes: #620910)

[Apollon Oikonomopoulos]

This is an automated email from the git hooks/post-receive script.

apoikos pushed a commit to branch master
in repository pkg-mongodb.

commit 4c744c57a43222a726a34b3253fce6108a140e46
Author: Antonin Kral <a.kral at bobek.cz>
Date:   Tue Apr 5 10:21:46 2011 +0200

    return empty TERM if not set (Closes: #620910)
---
 debian/changelog                                   |  6 ++++++
 ...bs-to-usr-lib-not-usr-lib64-Closes-588557.patch | 22 ++++++++++++++++++++++
 ...eturn-empty-TERM-if-not-set-Closes-620910.patch | 22 ++++++++++++++++++++++
 debian/patches/series                              |  2 ++
 4 files changed, 52 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 7d71430..e5d0f60 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mongodb (1:1.8.0-2) unstable; urgency=low
+
+  * return empty TERM if not set (Closes: #620910)
+
+ -- Antonin Kral <A.Kral at sh.cvut.cz>  Tue, 05 Apr 2011 10:21:26 +0200
+
 mongodb (1:1.8.0-1) unstable; urgency=low
 
   * Upstream 1.8.0
diff --git a/debian/patches/0001-install-libs-to-usr-lib-not-usr-lib64-Closes-588557.patch b/debian/patches/0001-install-libs-to-usr-lib-not-usr-lib64-Closes-588557.patch
new file mode 100644
index 0000000..3e140a5
--- /dev/null
+++ b/debian/patches/0001-install-libs-to-usr-lib-not-usr-lib64-Closes-588557.patch
@@ -0,0 +1,22 @@
+From: Antonin Kral <a.kral at bobek.cz>
+Date: Tue, 5 Apr 2011 10:19:25 +0200
+Subject: install libs to /usr/lib not /usr/lib64 (Closes: #588557)
+
+---
+ SConstruct |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/SConstruct b/SConstruct
+index 41383b1..cb6019f 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -469,7 +469,7 @@ elif "linux2" == os.sys.platform:
+ 
+     if os.uname()[4] == "x86_64" and not force32:
+         linux64 = True
+-        nixLibPrefix = "lib64"
++        nixLibPrefix = "lib"
+         env.Append( LIBPATH=["/usr/lib64" , "/lib64" ] )
+         env.Append( LIBS=["pthread"] )
+ 
+-- 
diff --git a/debian/patches/0002-return-empty-TERM-if-not-set-Closes-620910.patch b/debian/patches/0002-return-empty-TERM-if-not-set-Closes-620910.patch
new file mode 100644
index 0000000..b8cd144
--- /dev/null
+++ b/debian/patches/0002-return-empty-TERM-if-not-set-Closes-620910.patch
@@ -0,0 +1,22 @@
+From: Antonin Kral <a.kral at bobek.cz>
+Date: Tue, 5 Apr 2011 10:19:55 +0200
+Subject: return empty TERM if not set (Closes: #620910)
+
+---
+ SConstruct |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/SConstruct b/SConstruct
+index cb6019f..0293366 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -679,7 +679,7 @@ if nix:
+ 
+     #make scons colorgcc friendly
+     env['ENV']['HOME'] = os.environ['HOME']
+-    env['ENV']['TERM'] = os.environ['TERM']
++    env['ENV']['TERM'] = os.environ.get('TERM', '')
+ 
+     if linux and has_option( "sharedclient" ):
+         env.Append( LINKFLAGS=" -Wl,--as-needed -Wl,-zdefs " )
+-- 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..9e0d57f
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+0001-install-libs-to-usr-lib-not-usr-lib64-Closes-588557.patch
+0002-return-empty-TERM-if-not-set-Closes-620910.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mongodb/pkg-mongodb.git