r13153 - packages/trunk/netpanzer/debian/patches

[Alexander Reichle-Schmehl]

Author: tolimar
Date: 2012-01-20 09:56:27 +0000 (Fri, 20 Jan 2012)
New Revision: 13153

Modified:
   packages/trunk/netpanzer/debian/patches/use-system-libs.patch
Log:
Reformat patch so that it is applied by quilt



Modified: packages/trunk/netpanzer/debian/patches/use-system-libs.patch
===================================================================
--- packages/trunk/netpanzer/debian/patches/use-system-libs.patch	2012-01-20 09:46:41 UTC (rev 13152)
+++ packages/trunk/netpanzer/debian/patches/use-system-libs.patch	2012-01-20 09:56:27 UTC (rev 13153)
@@ -1,8 +1,6 @@
-Index: SConstruct
-===================================================================
---- SConstruct	(revision 1339)
-+++ SConstruct	(working copy)
-@@ -154,16 +154,10 @@
+--- a/SConstruct
++++ b/SConstruct
+@@ -154,16 +154,10 @@ env.BuildDir(env['FINALBUILDDIR'],'.',du
  crossmingwenv.BuildDir(crossmingwenv['FINALBUILDDIR'],'.',duplicate=0)
  crosslinuxenv.BuildDir(crosslinuxenv['FINALBUILDDIR'],'.',duplicate=0)
  
@@ -19,7 +17,7 @@
  crosslinuxnetworkenv = crosslinuxenv.Clone()
  
  ################################################################
-@@ -205,9 +199,9 @@
+@@ -205,9 +199,9 @@ print 'Building version ' + NPVERSION +
  # Configure Environments
  ################################################################
  
@@ -32,7 +30,7 @@
  
  # for this platform
  if thisplatform == 'darwin':
-@@ -216,14 +210,10 @@
+@@ -216,14 +210,10 @@ if thisplatform == 'darwin':
   
      if env['universal'] != 'false':
  		env.Append( CCFLAGS = [ '-arch', 'ppc', '-arch', 'i386' ] )
@@ -47,7 +45,7 @@
          networkenv.Append( CCFLAGS = [ '-arch', 'i386' ] )
          env.Append( LINKFLAGS = [ '-arch', 'i386' ] )
  	
-@@ -265,36 +255,12 @@
+@@ -265,36 +255,12 @@ MakeStaticLib(          networkenv, 'npn
  MakeStaticLib(crossmingwnetworkenv, 'npnetwork', 'Network', '*.cpp')
  MakeStaticLib(crosslinuxnetworkenv, 'npnetwork', 'Network', '*.cpp')
  
@@ -84,7 +82,7 @@
  MakeStaticLib(crosslinuxenv, 'np2d', '2D 2D/libpng', '*.c*')
  
  # BUILDS REST OF LIBRARIES
-@@ -323,9 +289,9 @@
+@@ -323,9 +289,9 @@ if crossmingwenv.has_key('WINICON'):
      
  crosslinuxenv.Append( NPSOURCES = globSources(crosslinuxenv, 'src/NetPanzer', npdirs, "*.cpp") )