[netpanzer] 56/118: Reformat patch so that it is applied by quilt
Markus Koschany
apo at moszumanska.debian.org
Sun Jun 5 10:19:24 UTC 2016
This is an automated email from the git hooks/post-receive script.
apo pushed a commit to branch master
in repository netpanzer.
commit 13e6faa2934a3bc566cb63be475b2a59648a3afc
Author: Alexander Reichle-Schmehl <tolimar at debian.org>
Date: Fri Jan 20 09:56:27 2012 +0000
Reformat patch so that it is applied by quilt
---
debian/patches/use-system-libs.patch | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/debian/patches/use-system-libs.patch b/debian/patches/use-system-libs.patch
index 9fb7cdc..9690f27 100644
--- a/debian/patches/use-system-libs.patch
+++ b/debian/patches/use-system-libs.patch
@@ -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 @@ Index: SConstruct
crosslinuxnetworkenv = crosslinuxenv.Clone()
################################################################
-@@ -205,9 +199,9 @@
+@@ -205,9 +199,9 @@ print 'Building version ' + NPVERSION +
# Configure Environments
################################################################
@@ -32,7 +30,7 @@ Index: SConstruct
# 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 @@ Index: SConstruct
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 @@ Index: SConstruct
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") )
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/netpanzer.git
More information about the Pkg-games-commits
mailing list