[SCM] Simple and fast multimedia library for C++ branch, master, updated. upstream/1.2-8-g5fb5c03

[Christoph Egger]

The following commit has been merged in the master branch:
commit 5fb5c039ac8398ad9f1a3bc66daf57659b0314da
Author: Christoph Egger <Christoph.Egger at gmx.de>
Date:   Thu May 22 22:58:51 2008 +0200

     * Adding simplepatch infrastructure
     * Patch for includes as changed by repackaging

diff --git a/debian/control b/debian/control
index 9c54347..aa28596 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Christoph Egger <Christoph.Egger at gmx.de>
 Vcs-Git: git://git.debian.org/git/pkg-games/libsfml/
 Vcs-Browser: http://git.debian.org/?p=pkg-games/libsfml.git;a=log
-Build-Depends: cdbs, debhelper (>= 5), libgl1-mesa-glx, mesa-common-dev, libglu1-mesa-dev, libxrandr-dev, libfreetype6-dev, libopenal-dev, libsndfile1-dev
+Build-Depends: cdbs, debhelper (>= 5), libgl1-mesa-glx, mesa-common-dev, libglu1-mesa-dev, libxrandr-dev, libfreetype6-dev, libopenal-dev, libsndfile1-dev, zlib1g-dev, libjpeg62-dev, libpng12-dev, libglew1.5-dev, patchutils
 Standards-Version: 3.7.3
 
 Package: libsfml1-dev
diff --git a/debian/patches/10-change-link-to-removed-headers.diff b/debian/patches/10-change-link-to-removed-headers.diff
new file mode 100644
index 0000000..69d6d55
--- /dev/null
+++ b/debian/patches/10-change-link-to-removed-headers.diff
@@ -0,0 +1,29 @@
+--- a/src/SFML/Graphics/ImageLoader.cpp	2008-05-22 22:21:28.000000000 +0200
++++ s/src/SFML/Graphics/ImageLoader.cpp	2008-05-22 21:41:39.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>
+
+--- a/src/SFML/Window/Linux/WindowImplX11.cpp	2007-12-30 08:59:18.000000000 +0100
++++ s/src/SFML/Window/Linux/WindowImplX11.cpp	2008-05-22 21:39: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>
diff --git a/debian/rules b/debian/rules
index 0e454ba..e304987 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,6 +2,7 @@
   
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/makefile.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
 # Add here any variable or target overrides you need.
 

-- 
Simple and fast multimedia library for C++