recreated patches for 2.0.2

5 files changed, 44 insertions, 6 deletions

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
index 5fed695..3145433 100644
--- 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
@@ -7,10 +7,10 @@ Subject: install libs to /usr/lib not /usr/lib64 (Closes: #588557)
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/SConstruct b/SConstruct
-index 4e46052..f98eb27 100644
+index 4f2aa3f..29565d7 100644
 --- a/SConstruct
 +++ b/SConstruct
-@@ -495,7 +495,7 @@ elif "linux2" == os.sys.platform or "linux3" == os.sys.platform:
+@@ -513,7 +513,7 @@ elif "linux2" == os.sys.platform or "linux3" == os.sys.platform:
  
      if os.uname()[4] == "x86_64" and not force32:
          linux64 = True
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
index be0629b..eadeafa 100644
--- 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
@@ -7,10 +7,10 @@ Subject: return empty TERM if not set (Closes: #620910)
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/SConstruct b/SConstruct
-index f98eb27..7417daa 100644
+index 29565d7..b36d82f 100644
 --- a/SConstruct
 +++ b/SConstruct
-@@ -684,7 +684,7 @@ if nix:
+@@ -702,7 +702,7 @@ if nix:
  
      #make scons colorgcc friendly
      env['ENV']['HOME'] = os.environ['HOME']
diff --git a/debian/patches/0003-Ignore-unused-but-set-variables-and-params-Closes-62.patch b/debian/patches/0003-Ignore-unused-but-set-variables-and-params-Closes-62.patch
index f597cbb..a8514b3 100644
--- a/debian/patches/0003-Ignore-unused-but-set-variables-and-params-Closes-62.patch
+++ b/debian/patches/0003-Ignore-unused-but-set-variables-and-params-Closes-62.patch
@@ -7,10 +7,10 @@ Subject: Ignore unused but set variables and params (Closes: #625401)
  1 files changed, 2 insertions(+), 1 deletions(-)
 
 diff --git a/SConstruct b/SConstruct
-index 7417daa..05d0dfe 100644
+index b36d82f..fcd9c70 100644
 --- a/SConstruct
 +++ b/SConstruct
-@@ -674,7 +674,8 @@ if nix:
+@@ -692,7 +692,8 @@ if nix:
      # env.Append( " -Wconversion" ) TODO: this doesn't really work yet
      if linux:
          env.Append( CPPFLAGS=" -Werror " )
diff --git a/debian/patches/0004-use-system-wide-pcre.patch b/debian/patches/0004-use-system-wide-pcre.patch
new file mode 100644
index 0000000..a5047ca
--- /dev/null
+++ b/debian/patches/0004-use-system-wide-pcre.patch
@@ -0,0 +1,37 @@
+From: Antonin Kral <a.kral@bobek.cz>
+Date: Thu, 15 Dec 2011 11:22:43 +0100
+Subject: use system-wide pcre
+
+---
+ SConstruct |   10 +++++++++-
+ 1 files changed, 9 insertions(+), 1 deletions(-)
+
+diff --git a/SConstruct b/SConstruct
+index fcd9c70..937bf72 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -37,7 +37,11 @@ def getThirdPartyShortNames():
+     for x in os.listdir( "third_party" ):
+         if not x.endswith( ".py" ) or x.find( "#" ) >= 0:
+             continue
+-         
++
++        #use system-wide pcre
++        if x.find('pcre') >= 0:
++            continue
++
+         lst.append( x.rpartition( "." )[0] )
+     return lst
+ 
+@@ -511,6 +515,10 @@ elif "linux2" == os.sys.platform or "linux3" == os.sys.platform:
+     linux = True
+     platform = "linux"
+ 
++    # use system-wide pcre
++    env.Append( CPPPATH=["/usr/include"] )
++    env.Append( LIBS=["pcrecpp", "pcre"] )
++
+     if os.uname()[4] == "x86_64" and not force32:
+         linux64 = True
+         nixLibPrefix = "lib"
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index 4acc1e0..a018508 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 0001-install-libs-to-usr-lib-not-usr-lib64-Closes-588557.patch
 0002-return-empty-TERM-if-not-set-Closes-620910.patch
 0003-Ignore-unused-but-set-variables-and-params-Closes-62.patch
+0004-use-system-wide-pcre.patch