[SCM] Simple and fast multimedia library for C++ branch, master, updated. 5a84c9f26d93dffa9a6965d88ddd6fa0d62ae616

[Christoph Egger]

The following commit has been merged in the master branch:
commit b8b2f3f9ebf8613b7483acb8af10e48944581a16
Author: Christoph Egger <Christoph.Egger at gmx.de>
Date:   Sat May 24 12:03:06 2008 +0200

     * Doing the patch the quilt way - hopefully it works now

diff --git a/debian/patches/change_source_code_reference_to_removed_stuff.diff b/debian/patches/patching_files_as_needed_by_repackaging.patch
similarity index 51%
rename from debian/patches/change_source_code_reference_to_removed_stuff.diff
rename to debian/patches/patching_files_as_needed_by_repackaging.patch
index d3b0bfe..51fccb2 100644
--- a/debian/patches/change_source_code_reference_to_removed_stuff.diff
+++ b/debian/patches/patching_files_as_needed_by_repackaging.patch
@@ -1,33 +1,33 @@
-diff --git a/src/SFML/Graphics/ImageLoader.cpp b/src/SFML/Graphics/ImageLoader.cpp
-index 9e4d4e9..55d91ce 100755
---- a/src/SFML/Graphics/ImageLoader.cpp
-+++ b/src/SFML/Graphics/ImageLoader.cpp
+Index: libsfml/src/SFML/Graphics/ImageLoader.cpp
+===================================================================
+--- libsfml.orig/src/SFML/Graphics/ImageLoader.cpp	2008-05-24 11:59:44.000000000 +0200
++++ libsfml/src/SFML/Graphics/ImageLoader.cpp	2008-05-24 12:00:11.000000000 +0200
 @@ -28,10 +28,10 @@
- #include <SFML/Graphics/ImageLoader.hpp>
- extern "C"
- {
--    #include <SFML/Graphics/libjpeg/jpeglib.h>
--    #include <SFML/Graphics/libjpeg/jerror.h>
-+    #include <jpeglib.h>
-+    #include <jerror.h>
- }
--#include <SFML/Graphics/libpng/png.h>
-+#include <libpng/png.h>
- #include <SFML/Graphics/SOIL/SOIL.h>
- #include <iostream>
- 
-diff --git a/src/SFML/Window/Linux/WindowImplX11.cpp b/src/SFML/Window/Linux/WindowImplX11.cpp
-index 4d8c93f..4e3c063 100755
---- a/src/SFML/Window/Linux/WindowImplX11.cpp
-+++ b/src/SFML/Window/Linux/WindowImplX11.cpp
+ #include <SFML/Graphics/ImageLoader.hpp>
+ extern "C"
+ {
+-    #include <SFML/Graphics/libjpeg/jpeglib.h>
+-    #include <SFML/Graphics/libjpeg/jerror.h>
++    #include <jpeglib.h>
++    #include <jerror.h>
+ }
+-#include <SFML/Graphics/libpng/png.h>
++#include <libpng/png.h>
+ #include <SFML/Graphics/SOIL/SOIL.h>
+ #include <iostream>
+ 
+Index: libsfml/src/SFML/Window/Linux/WindowImplX11.cpp
+===================================================================
+--- libsfml.orig/src/SFML/Window/Linux/WindowImplX11.cpp	2008-05-24 12:00:43.000000000 +0200
++++ libsfml/src/SFML/Window/Linux/WindowImplX11.cpp	2008-05-24 12:01:03.000000000 +0200
 @@ -27,8 +27,8 @@
- ////////////////////////////////////////////////////////////
- #include <SFML/Window/Linux/WindowImplX11.hpp>
- #include <SFML/Window/WindowStyle.hpp>
--#include <SFML/Window/glext/glxext.h>
--#include <SFML/Window/glext/glext.h>
-+#include <GL/glxext.h>
-+#include <GL/glext.h>
- #include <X11/keysym.h>
- #include <X11/XKBlib.h>
- #include <X11/extensions/Xrandr.h>
\ No newline at end of file
+ ////////////////////////////////////////////////////////////
+ #include <SFML/Window/Linux/WindowImplX11.hpp>
+ #include <SFML/Window/WindowStyle.hpp>
+-#include <SFML/Window/glext/glxext.h>
+-#include <SFML/Window/glext/glext.h>
++#include <GL/glxext.h>
++#include <GL/glext.h>
+ #include <X11/keysym.h>
+ #include <X11/XKBlib.h>
+ #include <X11/extensions/Xrandr.h>
diff --git a/debian/patches/series b/debian/patches/series
index c25f8e0..e63e005 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-change_source_code_reference_to_removed_stuff.diff
+patching_files_as_needed_by_repackaging.patch

-- 
Simple and fast multimedia library for C++