[SCM] Simple and fast multimedia library for C++ branch, master, updated. fa1310b87b2e5fec93cf656a864ea005b3e4cd37
Christoph Egger
Christoph.Egger at gmx.de
Sat May 24 13:34:10 UTC 2008
The following commit has been merged in the master branch:
commit fa1310b87b2e5fec93cf656a864ea005b3e4cd37
Author: Christoph Egger <Christoph.Egger at gmx.de>
Date: Sat May 24 15:33:55 2008 +0200
* Making the patch apply
diff --git a/debian/patches/add_script_header_to_example_makefiles.patch b/debian/patches/add_script_header_to_example_makefiles.patch
index a34438e..a7a3db8 100644
--- a/debian/patches/add_script_header_to_example_makefiles.patch
+++ b/debian/patches/add_script_header_to_example_makefiles.patch
@@ -1,17 +1,17 @@
Index: libsfml/samples/Makefile
===================================================================
---- libsfml.orig/samples/Makefile 2008-05-24 15:04:33.000000000 +0200
-+++ libsfml/samples/Makefile 2008-05-24 15:04:40.000000000 +0200
+--- libsfml.orig/samples/Makefile 2008-05-24 15:07:03.000000000 +0200
++++ libsfml/samples/Makefile 2008-05-24 15:28:28.000000000 +0200
@@ -1,3 +1,5 @@
-+#!/usr/bin/make -f
-+
- export CC = g++
- export CFLAGS = -W -Wall -ansi -I../../include -DNDEBUG -O2
- export LDFLAGS =
++#!/usr/bin/make -f
++
+ export CC = g++
+ export CFLAGS = -W -Wall -ansi -I../../include -DNDEBUG -O2
+ export LDFLAGS =
Index: libsfml/samples/X11/Makefile
===================================================================
---- libsfml.orig/samples/X11/Makefile 2008-05-24 15:06:23.000000000 +0200
-+++ libsfml/samples/X11/Makefile 2008-05-24 15:06:32.000000000 +0200
+--- libsfml.orig/samples/X11/Makefile 2008-05-24 15:07:02.000000000 +0200
++++ libsfml/samples/X11/Makefile 2008-05-24 15:27:58.000000000 +0200
@@ -1,3 +1,5 @@
+#!/usr/bin/make -f
+
@@ -20,8 +20,8 @@ Index: libsfml/samples/X11/Makefile
Index: libsfml/samples/opengl/Makefile
===================================================================
---- libsfml.orig/samples/opengl/Makefile 2008-05-24 15:06:38.000000000 +0200
-+++ libsfml/samples/opengl/Makefile 2008-05-24 15:06:46.000000000 +0200
+--- libsfml.orig/samples/opengl/Makefile 2008-05-24 15:07:03.000000000 +0200
++++ libsfml/samples/opengl/Makefile 2008-05-24 15:27:58.000000000 +0200
@@ -1,3 +1,5 @@
+#!/usr/bin/make -f
+
@@ -30,18 +30,18 @@ Index: libsfml/samples/opengl/Makefile
Index: libsfml/samples/pong/Makefile
===================================================================
---- libsfml.orig/samples/pong/Makefile 2008-05-24 15:05:51.000000000 +0200
-+++ libsfml/samples/pong/Makefile 2008-05-24 15:06:00.000000000 +0200
+--- libsfml.orig/samples/pong/Makefile 2008-05-24 15:07:03.000000000 +0200
++++ libsfml/samples/pong/Makefile 2008-05-24 15:29:01.000000000 +0200
@@ -1,3 +1,5 @@
-+#!/usr/bin/make -f
-+
- EXEC = pong
- OBJ = Pong.o
-
++#!/usr/bin/make -f
++
+ EXEC = pong
+ OBJ = Pong.o
+
Index: libsfml/samples/post-fx/Makefile
===================================================================
---- libsfml.orig/samples/post-fx/Makefile 2008-05-24 15:03:55.000000000 +0200
-+++ libsfml/samples/post-fx/Makefile 2008-05-24 15:04:08.000000000 +0200
+--- libsfml.orig/samples/post-fx/Makefile 2008-05-24 15:07:03.000000000 +0200
++++ libsfml/samples/post-fx/Makefile 2008-05-24 15:27:58.000000000 +0200
@@ -1,3 +1,5 @@
+#!/usr7bin/make -f
+
@@ -50,8 +50,8 @@ Index: libsfml/samples/post-fx/Makefile
Index: libsfml/samples/qt/Makefile
===================================================================
---- libsfml.orig/samples/qt/Makefile 2008-05-24 15:05:34.000000000 +0200
-+++ libsfml/samples/qt/Makefile 2008-05-24 15:05:42.000000000 +0200
+--- libsfml.orig/samples/qt/Makefile 2008-05-24 15:07:02.000000000 +0200
++++ libsfml/samples/qt/Makefile 2008-05-24 15:27:58.000000000 +0200
@@ -1,3 +1,5 @@
+#!/usr/bin/make -f
+
@@ -60,8 +60,8 @@ Index: libsfml/samples/qt/Makefile
Index: libsfml/samples/sockets/Makefile
===================================================================
---- libsfml.orig/samples/sockets/Makefile 2008-05-24 15:04:46.000000000 +0200
-+++ libsfml/samples/sockets/Makefile 2008-05-24 15:04:54.000000000 +0200
+--- libsfml.orig/samples/sockets/Makefile 2008-05-24 15:07:02.000000000 +0200
++++ libsfml/samples/sockets/Makefile 2008-05-24 15:27:58.000000000 +0200
@@ -1,3 +1,5 @@
+#!/usr/bin/make -f
+
@@ -70,8 +70,8 @@ Index: libsfml/samples/sockets/Makefile
Index: libsfml/samples/sound/Makefile
===================================================================
---- libsfml.orig/samples/sound/Makefile 2008-05-24 15:06:09.000000000 +0200
-+++ libsfml/samples/sound/Makefile 2008-05-24 15:06:17.000000000 +0200
+--- libsfml.orig/samples/sound/Makefile 2008-05-24 15:07:03.000000000 +0200
++++ libsfml/samples/sound/Makefile 2008-05-24 15:27:58.000000000 +0200
@@ -1,3 +1,5 @@
+#!/usr/bin/make -f
+
@@ -80,8 +80,8 @@ Index: libsfml/samples/sound/Makefile
Index: libsfml/samples/sound_capture/Makefile
===================================================================
---- libsfml.orig/samples/sound_capture/Makefile 2008-05-24 15:02:32.000000000 +0200
-+++ libsfml/samples/sound_capture/Makefile 2008-05-24 15:03:02.000000000 +0200
+--- libsfml.orig/samples/sound_capture/Makefile 2008-05-24 15:07:03.000000000 +0200
++++ libsfml/samples/sound_capture/Makefile 2008-05-24 15:27:58.000000000 +0200
@@ -1,3 +1,5 @@
+#!/usr/bin/make -f
+
@@ -90,8 +90,8 @@ Index: libsfml/samples/sound_capture/Makefile
Index: libsfml/samples/voip/Makefile
===================================================================
---- libsfml.orig/samples/voip/Makefile 2008-05-24 15:05:02.000000000 +0200
-+++ libsfml/samples/voip/Makefile 2008-05-24 15:05:11.000000000 +0200
+--- libsfml.orig/samples/voip/Makefile 2008-05-24 15:07:02.000000000 +0200
++++ libsfml/samples/voip/Makefile 2008-05-24 15:27:58.000000000 +0200
@@ -1,3 +1,5 @@
+#!/usr/bin/make -f
+
@@ -100,8 +100,8 @@ Index: libsfml/samples/voip/Makefile
Index: libsfml/samples/window/Makefile
===================================================================
---- libsfml.orig/samples/window/Makefile 2008-05-24 15:05:20.000000000 +0200
-+++ libsfml/samples/window/Makefile 2008-05-24 15:05:27.000000000 +0200
+--- libsfml.orig/samples/window/Makefile 2008-05-24 15:07:02.000000000 +0200
++++ libsfml/samples/window/Makefile 2008-05-24 15:27:58.000000000 +0200
@@ -1,3 +1,5 @@
+#!/usr/bin/make -f
+
@@ -110,8 +110,8 @@ Index: libsfml/samples/window/Makefile
Index: libsfml/samples/wxwidgets/Makefile
===================================================================
---- libsfml.orig/samples/wxwidgets/Makefile 2008-05-24 15:04:18.000000000 +0200
-+++ libsfml/samples/wxwidgets/Makefile 2008-05-24 15:04:27.000000000 +0200
+--- libsfml.orig/samples/wxwidgets/Makefile 2008-05-24 15:07:02.000000000 +0200
++++ libsfml/samples/wxwidgets/Makefile 2008-05-24 15:27:58.000000000 +0200
@@ -1,3 +1,5 @@
+#!/usr/bin/make -f
+
--
Simple and fast multimedia library for C++
More information about the Pkg-games-commits
mailing list