[Pkg-mongodb-maintainers] [pkg-mongodb] 147/394: sync SConstruct to provide new set of patches

[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 dc90fb9c5284fc9db8315937dacdc44e2ca4f184
Author: Antonin Kral <a.kral at bobek.cz>
Date:   Tue Apr 5 10:18:15 2011 +0200

    sync SConstruct to provide new set of patches
---
 SConstruct                                   |  2 +-
 debian/patches/2001_x64_install_to_lib.patch | 16 ----------------
 debian/patches/series                        |  1 -
 3 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/SConstruct b/SConstruct
index cb6019f..41383b1 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 = "lib"
+        nixLibPrefix = "lib64"
         env.Append( LIBPATH=["/usr/lib64" , "/lib64" ] )
         env.Append( LIBS=["pthread"] )
 
diff --git a/debian/patches/2001_x64_install_to_lib.patch b/debian/patches/2001_x64_install_to_lib.patch
deleted file mode 100644
index 61954b6..0000000
--- a/debian/patches/2001_x64_install_to_lib.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Install libs to /usr/lib, not /usr/lib64
- Closes: #588557
-Forwarded: not-needed
-Author: Antonin Kral <A.Kral at sh.cvut.cz>
-Last-Update: 2010-08-11
---- a/SConstruct
-+++ b/SConstruct
-@@ -553,7 +553,7 @@
- 
-     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/series b/debian/patches/series
deleted file mode 100644
index 49554c2..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-2001_x64_install_to_lib.patch

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