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

Christoph Egger Christoph.Egger at gmx.de
Sun Jun 22 16:16:11 UTC 2008 

The following commit has been merged in the master branch:
commit 317aa6bc24a39f6c66f368ed785f9e2d0ebca8b7
Author: Christoph Egger <Christoph.Egger at gmx.de>
Date:   Sun Jun 22 18:15:51 2008 +0200

     * Preparing debian packages for new upstream release

diff --git a/debian/changelog b/debian/changelog
index b911ae3..9d35b63 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libsfml (1.3-1) unstable; urgency=low
+
+  * New upstream release 
+
+ -- Christoph Egger <Christoph.Egger at gmx.de>  Sun, 22 Jun 2008 13:33:03 +0200
+
 libsfml (1.2-3) unstable; urgency=low
 
   * clean rules improvement (thanks to gnoéri)
@@ -6,7 +12,7 @@ libsfml (1.2-3) unstable; urgency=low
   * Renaming make target for orig tarball to reflect
     common way to do so
   * Allowing build on unknown arches and non-linux
-    debian kernels (Closes #486851)
+    debian kernels (Closes: #486851)
   * Linking libraries correctly (fixing upstream makefile) 
   * Not installing binary sample programms
 
diff --git a/debian/control b/debian/control
index c7a2264..9ee183b 100644
--- a/debian/control
+++ b/debian/control
@@ -8,17 +8,19 @@ Vcs-Browser: http://git.debian.org/?p=pkg-games/libsfml.git
 Build-Depends: debhelper (>= 5), libgl1-mesa-glx, mesa-common-dev, libglu1-mesa-dev, libxrandr-dev, libfreetype6-dev, libopenal-dev, libsndfile1-dev, libjpeg62-dev, libpng12-dev, libglew1.5-dev, quilt
 Standards-Version: 3.8.0
 
-Package: libsfml1-dev
+Package: libsfml1.deb3-dev
+Provides: libsfml-dev
+Conflicts: libsfml-dev
 Section: libdevel
 Architecture: any
-Depends: libsfml-audio1 (= ${binary:Version}), libsfml-graphics1 (= ${binary:Version}), libsfml-network1 (= ${binary:Version}), libsfml-system1 (= ${binary:Version}), libsfml-window1 (= ${binary:Version}), 
+Depends: libsfml-audio1.deb3 (= ${binary:Version}), libsfml-graphics1.deb3 (= ${binary:Version}), libsfml-network1.deb3 (= ${binary:Version}), libsfml-system1.deb3 (= ${binary:Version}), libsfml-window1.deb3 (= ${binary:Version}), 
 Description: Simple and fast cross-platform multimedia library - Development Files
  SFML is an modern multimedia library offering a wide range of subsystems
  useful to produce an multimedia app. It offers OpenGL integration for
  Hardware accelerated Graphics, Windowing and Input support, Audio and
  Network facilities and supports GNU/Linux MS Windows and Mac OS X.
 
-Package: libsfml-audio1
+Package: libsfml-audio1.deb3
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -28,7 +30,7 @@ Description: Simple and fast cross-platform multimedia library - Audio part
  Hardware accelerated Graphics, Windowing and Input support, Audio and
  Network facilities and supports GNU/Linux MS Windows and Mac OS X.
 
-Package: libsfml-graphics1
+Package: libsfml-graphics1.deb3
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -38,7 +40,7 @@ Description: Simple and fast cross-platform multimedia library - Graphics part
  Hardware accelerated Graphics, Windowing and Input support, Audio and
  Network facilities and supports GNU/Linux MS Windows and Mac OS X.
 
-Package: libsfml-network1
+Package: libsfml-network1.deb3
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -48,7 +50,7 @@ Description: Simple and fast cross-platform multimedia library - Network part
  Hardware accelerated Graphics, Windowing and Input support, Audio and
  Network facilities and supports GNU/Linux MS Windows and Mac OS X.
 
-Package: libsfml-system1
+Package: libsfml-system1.deb3
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -58,7 +60,7 @@ Description: Simple and fast cross-platform multimedia library - System part
  Hardware accelerated Graphics, Windowing and Input support, Audio and
  Network facilities and supports GNU/Linux MS Windows and Mac OS X.
 
-Package: libsfml-window1
+Package: libsfml-window1.deb3
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
diff --git a/debian/libsfml-audio1.dirs b/debian/libsfml-audio1.deb3.dirs
similarity index 100%
rename from debian/libsfml-audio1.dirs
rename to debian/libsfml-audio1.deb3.dirs
diff --git a/debian/libsfml-audio1.install b/debian/libsfml-audio1.deb3.install
similarity index 100%
rename from debian/libsfml-audio1.install
rename to debian/libsfml-audio1.deb3.install
diff --git a/debian/libsfml-graphics1.dirs b/debian/libsfml-graphics1.deb3.dirs
similarity index 100%
rename from debian/libsfml-graphics1.dirs
rename to debian/libsfml-graphics1.deb3.dirs
diff --git a/debian/libsfml-graphics1.install b/debian/libsfml-graphics1.deb3.install
similarity index 100%
rename from debian/libsfml-graphics1.install
rename to debian/libsfml-graphics1.deb3.install
diff --git a/debian/libsfml-network1.dirs b/debian/libsfml-network1.deb3.dirs
similarity index 100%
rename from debian/libsfml-network1.dirs
rename to debian/libsfml-network1.deb3.dirs
diff --git a/debian/libsfml-network1.install b/debian/libsfml-network1.deb3.install
similarity index 100%
rename from debian/libsfml-network1.install
rename to debian/libsfml-network1.deb3.install
diff --git a/debian/libsfml-system1.dirs b/debian/libsfml-system1.deb3.dirs
similarity index 100%
rename from debian/libsfml-system1.dirs
rename to debian/libsfml-system1.deb3.dirs
diff --git a/debian/libsfml-system1.install b/debian/libsfml-system1.deb3.install
similarity index 100%
rename from debian/libsfml-system1.install
rename to debian/libsfml-system1.deb3.install
diff --git a/debian/libsfml-window1.dirs b/debian/libsfml-window1.deb3.dirs
similarity index 100%
rename from debian/libsfml-window1.dirs
rename to debian/libsfml-window1.deb3.dirs
diff --git a/debian/libsfml-window1.install b/debian/libsfml-window1.deb3.install
similarity index 100%
rename from debian/libsfml-window1.install
rename to debian/libsfml-window1.deb3.install
diff --git a/debian/libsfml1-dev.dirs b/debian/libsfml1.deb3-dev.dirs
similarity index 100%
rename from debian/libsfml1-dev.dirs
rename to debian/libsfml1.deb3-dev.dirs
diff --git a/debian/libsfml1-dev.docs b/debian/libsfml1.deb3-dev.docs
similarity index 100%
rename from debian/libsfml1-dev.docs
rename to debian/libsfml1.deb3-dev.docs
diff --git a/debian/libsfml1-dev.install b/debian/libsfml1.deb3-dev.install
similarity index 100%
rename from debian/libsfml1-dev.install
rename to debian/libsfml1.deb3-dev.install
diff --git a/debian/patches/add_destdir_to_makefiles.patch b/debian/patches/add_destdir_to_makefiles.patch
index 2e72b68..423291b 100644
--- a/debian/patches/add_destdir_to_makefiles.patch
+++ b/debian/patches/add_destdir_to_makefiles.patch
@@ -1,8 +1,8 @@
 Index: libsfml/src/SFML/Makefile
 ===================================================================
---- libsfml.orig/src/SFML/Makefile	2008-05-22 23:10:31.000000000 +0200
-+++ libsfml/src/SFML/Makefile	2008-05-24 19:53:38.000000000 +0200
-@@ -35,4 +35,5 @@
+--- libsfml.orig/src/SFML/Makefile	2008-06-22 12:00:51.000000000 +0200
++++ libsfml/src/SFML/Makefile	2008-06-22 12:09:15.000000000 +0200
+@@ -43,4 +43,5 @@
  	@(cd ./System && $(MAKE) $@	&& cd ../Window && $(MAKE) $@ && cd ../Network && $(MAKE) $@ && cd ../Graphics && $(MAKE) $@ && cd ../Audio && $(MAKE) $@)
  
  install:
@@ -11,60 +11,101 @@ Index: libsfml/src/SFML/Makefile
 +
 Index: libsfml/src/SFML/Window/Makefile
 ===================================================================
---- libsfml.orig/src/SFML/Window/Makefile	2008-05-22 23:10:31.000000000 +0200
-+++ libsfml/src/SFML/Window/Makefile	2008-05-24 19:53:38.000000000 +0200
-@@ -24,4 +24,5 @@
- 	@rm -rf $(LIBPATH)/$(LIB)
+--- libsfml.orig/src/SFML/Window/Makefile	2008-06-22 12:00:51.000000000 +0200
++++ libsfml/src/SFML/Window/Makefile	2008-06-22 12:11:12.000000000 +0200
+@@ -9,7 +9,7 @@
+ else
+     LIB     = libsfml-window.so
+     LIBNAME = $(LIBPATH)/$(LIB).$(VERSION)
+-    INSTALL = && $(LN) $(LNFLAGS) /usr/lib/$(LIB).$(VERSION) /usr/lib/$(LIB)
++    INSTALL = && $(LN) $(LNFLAGS) /usr/lib/$(LIB).$(VERSION) $(DESTDIR)/usr/lib/$(LIB)
+ endif
+ 
+ all: $(LIB)
+@@ -32,4 +32,5 @@
+ 	@rm -rf $(LIBNAME)
  
  install:
--	@($(CP) $(LIBPATH)/$(LIB).$(VERSION) /usr/lib && $(LN) $(LNFLAGS) /usr/lib/$(LIB).$(VERSION) /usr/lib/$(LIB))
-+	@($(CP) $(LIBPATH)/$(LIB).$(VERSION) $(DESTDIR)/usr/lib && $(LN) $(LNFLAGS) /usr/lib/$(LIB).$(VERSION) $(DESTDIR)/usr/lib/$(LIB))
+-	@($(CP) $(LIBNAME) /usr/lib $(INSTALL))
++	@($(CP) $(LIBNAME) $(DESTDIR)/usr/lib $(INSTALL))
 +
 Index: libsfml/src/SFML/Audio/Makefile
 ===================================================================
---- libsfml.orig/src/SFML/Audio/Makefile	2008-05-22 23:10:31.000000000 +0200
-+++ libsfml/src/SFML/Audio/Makefile	2008-05-24 19:54:28.000000000 +0200
-@@ -24,4 +24,5 @@
- 	@rm -rf $(LIBPATH)/$(LIB)
+--- libsfml.orig/src/SFML/Audio/Makefile	2008-06-22 12:00:51.000000000 +0200
++++ libsfml/src/SFML/Audio/Makefile	2008-06-22 12:11:45.000000000 +0200
+@@ -10,7 +10,7 @@
+ else
+     LIB     = libsfml-audio.so
+     LIBNAME = $(LIBPATH)/$(LIB).$(VERSION)
+-    INSTALL = && $(LN) $(LNFLAGS) /usr/lib/$(LIB).$(VERSION) /usr/lib/$(LIB)
++    INSTALL = && $(LN) $(LNFLAGS) /usr/lib/$(LIB).$(VERSION) $(DESTDIR)/usr/lib/$(LIB)
+ endif
+ 
+ all: $(LIB)
+@@ -36,4 +36,5 @@
+ 	@rm -rf $(LIBNAME)
  
  install:
--	@($(CP) $(LIBPATH)/$(LIB).$(VERSION) /usr/lib && $(LN) $(LNFLAGS) /usr/lib/$(LIB).$(VERSION) /usr/lib/$(LIB))
-\ No newline at end of file
-+	@($(CP) $(LIBPATH)/$(LIB).$(VERSION) $(DESTDIR)/usr/lib && $(LN) $(LNFLAGS) /usr/lib/$(LIB).$(VERSION) $(DESTDIR)/usr/lib/$(LIB))
+-	@($(CP) $(LIBNAME) /usr/lib $(INSTALL))
++	@($(CP) $(LIBNAME) $(DESTDIR)/usr/lib $(INSTALL))
 +
 Index: libsfml/src/SFML/System/Makefile
 ===================================================================
---- libsfml.orig/src/SFML/System/Makefile	2008-05-22 23:10:31.000000000 +0200
-+++ libsfml/src/SFML/System/Makefile	2008-05-24 19:54:56.000000000 +0200
-@@ -19,4 +19,5 @@
- 	@rm -rf $(LIBPATH)/$(LIB)
+--- libsfml.orig/src/SFML/System/Makefile	2008-06-22 12:00:51.000000000 +0200
++++ libsfml/src/SFML/System/Makefile	2008-06-22 12:12:13.000000000 +0200
+@@ -8,7 +8,7 @@
+ else
+     LIB     = libsfml-system.so
+     LIBNAME = $(LIBPATH)/$(LIB).$(VERSION)
+-    INSTALL = && $(LN) $(LNFLAGS) /usr/lib/$(LIB).$(VERSION) /usr/lib/$(LIB)
++    INSTALL = && $(LN) $(LNFLAGS) /usr/lib/$(LIB).$(VERSION) $(DESTDIR)/usr/lib/$(LIB)
+ endif
+ 
+ all: $(LIB)
+@@ -31,4 +31,5 @@
+ 	@rm -rf $(LIBNAME)
  
  install:
--	@($(CP) $(LIBPATH)/$(LIB).$(VERSION) /usr/lib && $(LN) $(LNFLAGS) /usr/lib/$(LIB).$(VERSION) /usr/lib/$(LIB))
-\ No newline at end of file
-+	@($(CP) $(LIBPATH)/$(LIB).$(VERSION) $(DESTDIR)/usr/lib && $(LN) $(LNFLAGS) /usr/lib/$(LIB).$(VERSION) $(DESTDIR)/usr/lib/$(LIB))
+-	@($(CP) $(LIBNAME) /usr/lib $(INSTALL))
++	@($(CP) $(LIBNAME) $(DESTDIR)/usr/lib $(INSTALL))
 +
 Index: libsfml/src/SFML/Graphics/Makefile
 ===================================================================
---- libsfml.orig/src/SFML/Graphics/Makefile	2008-05-22 23:10:31.000000000 +0200
-+++ libsfml/src/SFML/Graphics/Makefile	2008-05-24 19:55:38.000000000 +0200
-@@ -30,4 +30,5 @@
- 	@rm -rf $(LIBPATH)/$(LIB)
+--- libsfml.orig/src/SFML/Graphics/Makefile	2008-06-22 12:00:51.000000000 +0200
++++ libsfml/src/SFML/Graphics/Makefile	2008-06-22 12:12:58.000000000 +0200
+@@ -18,7 +18,7 @@
+ else
+     LIB     = libsfml-graphics.so
+     LIBNAME = $(LIBPATH)/$(LIB).$(VERSION)
+-    INSTALL = && $(LN) $(LNFLAGS) /usr/lib/$(LIB).$(VERSION) /usr/lib/$(LIB)
++    INSTALL = && $(LN) $(LNFLAGS) /usr/lib/$(LIB).$(VERSION) $(DESTDIR)/usr/lib/$(LIB)
+ endif
+ 
+ all: $(LIB)
+@@ -44,4 +44,5 @@
+ 	@rm -rf $(LIBNAME)
  
  install:
--	@($(CP) $(LIBPATH)/$(LIB).$(VERSION) /usr/lib && $(LN) $(LNFLAGS) /usr/lib/$(LIB).$(VERSION) /usr/lib/$(LIB))
-\ No newline at end of file
-+	@($(CP) $(LIBPATH)/$(LIB).$(VERSION) $(DESTDIR)/usr/lib && $(LN) $(LNFLAGS) /usr/lib/$(LIB).$(VERSION) $(DESTDIR)/usr/lib/$(LIB))
+-	@($(CP) $(LIBNAME) /usr/lib $(INSTALL))
++	@($(CP) $(LIBNAME) $(DESTDIR)/usr/lib $(INSTALL))
 +
 Index: libsfml/src/SFML/Network/Makefile
 ===================================================================
---- libsfml.orig/src/SFML/Network/Makefile	2008-05-22 23:10:31.000000000 +0200
-+++ libsfml/src/SFML/Network/Makefile	2008-05-24 19:56:15.000000000 +0200
-@@ -19,4 +19,5 @@
- 	@rm -rf $(LIBPATH)/$(LIB)
+--- libsfml.orig/src/SFML/Network/Makefile	2008-06-22 12:00:51.000000000 +0200
++++ libsfml/src/SFML/Network/Makefile	2008-06-22 12:13:28.000000000 +0200
+@@ -8,7 +8,7 @@
+ else
+     LIB     = libsfml-network.so
+     LIBNAME = $(LIBPATH)/$(LIB).$(VERSION)
+-    INSTALL = && $(LN) $(LNFLAGS) /usr/lib/$(LIB).$(VERSION) /usr/lib/$(LIB)
++    INSTALL = && $(LN) $(LNFLAGS) /usr/lib/$(LIB).$(VERSION) $(DESTDIR)/usr/lib/$(LIB)
+ endif
+ 
+ all: $(LIB)
+@@ -31,4 +31,5 @@
+ 	@rm -rf $(LIBNAME)
  
  install:
--	@($(CP) $(LIBPATH)/$(LIB).$(VERSION) /usr/lib && $(LN) $(LNFLAGS) /usr/lib/$(LIB).$(VERSION) /usr/lib/$(LIB))
-\ No newline at end of file
-+	@($(CP) $(LIBPATH)/$(LIB).$(VERSION) $(DESTDIR)/usr/lib && $(LN) $(LNFLAGS) /usr/lib/$(LIB).$(VERSION) $(DESTDIR)/usr/lib/$(LIB))
+-	@($(CP) $(LIBNAME) /usr/lib $(INSTALL))
++	@($(CP) $(LIBNAME) $(DESTDIR)/usr/lib $(INSTALL))
 +
diff --git a/debian/patches/bump_soname.patch b/debian/patches/bump_soname.patch
new file mode 100644
index 0000000..fe448ce
--- /dev/null
+++ b/debian/patches/bump_soname.patch
@@ -0,0 +1,13 @@
+Index: libsfml/src/SFML/Makefile
+===================================================================
+--- libsfml.orig/src/SFML/Makefile	2008-06-22 14:08:20.000000000 +0200
++++ libsfml/src/SFML/Makefile	2008-06-22 14:09:32.000000000 +0200
+@@ -4,7 +4,7 @@
+ export CFLAGSEXT = -I../../../include -I../.. -DNDEBUG -O2 -fPIC
+ export LDFLAGS   = -shared
+ export LIBPATH   = ../../../lib
+-export VERSION   = 1
++export VERSION   = 1.deb3
+ export CP        = cp
+ export LN        = ln
+ export LNFLAGS   = -s -f
diff --git a/debian/patches/cstring_ftbfs.patch b/debian/patches/cstring_ftbfs.patch
index f94650f..3be2845 100644
--- a/debian/patches/cstring_ftbfs.patch
+++ b/debian/patches/cstring_ftbfs.patch
@@ -1,7 +1,7 @@
 Index: libsfml/src/SFML/Network/IPAddress.cpp
 ===================================================================
---- libsfml.orig/src/SFML/Network/IPAddress.cpp	2008-06-10 18:43:37.000000000 +0200
-+++ libsfml/src/SFML/Network/IPAddress.cpp	2008-06-10 18:46:25.000000000 +0200
+--- libsfml.orig/src/SFML/Network/IPAddress.cpp	2008-06-22 12:00:51.000000000 +0200
++++ libsfml/src/SFML/Network/IPAddress.cpp	2008-06-22 12:30:16.000000000 +0200
 @@ -28,6 +28,8 @@
  #include <SFML/Network/IPAddress.hpp>
  #include <SFML/Network/SocketHelper.hpp>
@@ -13,8 +13,8 @@ Index: libsfml/src/SFML/Network/IPAddress.cpp
  {
 Index: libsfml/src/SFML/Network/Packet.cpp
 ===================================================================
---- libsfml.orig/src/SFML/Network/Packet.cpp	2008-06-10 18:43:37.000000000 +0200
-+++ libsfml/src/SFML/Network/Packet.cpp	2008-06-10 18:46:25.000000000 +0200
+--- libsfml.orig/src/SFML/Network/Packet.cpp	2008-06-22 12:00:51.000000000 +0200
++++ libsfml/src/SFML/Network/Packet.cpp	2008-06-22 12:30:16.000000000 +0200
 @@ -28,6 +28,9 @@
  #include <SFML/Network/Packet.hpp>
  #include <SFML/Network/SocketHelper.hpp>
@@ -27,10 +27,10 @@ Index: libsfml/src/SFML/Network/Packet.cpp
  {
 Index: libsfml/src/SFML/Network/SocketTCP.cpp
 ===================================================================
---- libsfml.orig/src/SFML/Network/SocketTCP.cpp	2008-06-10 18:43:37.000000000 +0200
-+++ libsfml/src/SFML/Network/SocketTCP.cpp	2008-06-10 18:46:25.000000000 +0200
-@@ -30,6 +30,8 @@
- #include <SFML/Network/Packet.hpp>
+--- libsfml.orig/src/SFML/Network/SocketTCP.cpp	2008-06-22 12:00:51.000000000 +0200
++++ libsfml/src/SFML/Network/SocketTCP.cpp	2008-06-22 12:30:16.000000000 +0200
+@@ -31,6 +31,8 @@
+ #include <algorithm>
  #include <iostream>
  
 +#include <cstring>
@@ -40,10 +40,10 @@ Index: libsfml/src/SFML/Network/SocketTCP.cpp
  {
 Index: libsfml/src/SFML/Network/SocketUDP.cpp
 ===================================================================
---- libsfml.orig/src/SFML/Network/SocketUDP.cpp	2008-06-10 18:46:34.000000000 +0200
-+++ libsfml/src/SFML/Network/SocketUDP.cpp	2008-06-10 18:46:53.000000000 +0200
-@@ -30,6 +30,8 @@
- #include <SFML/Network/Packet.hpp>
+--- libsfml.orig/src/SFML/Network/SocketUDP.cpp	2008-06-22 12:00:51.000000000 +0200
++++ libsfml/src/SFML/Network/SocketUDP.cpp	2008-06-22 12:30:16.000000000 +0200
+@@ -31,6 +31,8 @@
+ #include <algorithm>
  #include <iostream>
  
 +#include <cstring>
@@ -53,8 +53,8 @@ Index: libsfml/src/SFML/Network/SocketUDP.cpp
  {
 Index: libsfml/src/SFML/Audio/SoundFileDefault.cpp
 ===================================================================
---- libsfml.orig/src/SFML/Audio/SoundFileDefault.cpp	2008-06-10 18:49:11.000000000 +0200
-+++ libsfml/src/SFML/Audio/SoundFileDefault.cpp	2008-06-10 18:49:35.000000000 +0200
+--- libsfml.orig/src/SFML/Audio/SoundFileDefault.cpp	2008-06-22 12:00:51.000000000 +0200
++++ libsfml/src/SFML/Audio/SoundFileDefault.cpp	2008-06-22 12:30:16.000000000 +0200
 @@ -28,6 +28,8 @@
  #include <SFML/Audio/SoundFileDefault.hpp>
  #include <iostream>
diff --git a/debian/patches/linking_against_all_needed_libs.patch b/debian/patches/linking_against_all_needed_libs.patch
index 6e40c75..798091e 100644
--- a/debian/patches/linking_against_all_needed_libs.patch
+++ b/debian/patches/linking_against_all_needed_libs.patch
@@ -1,34 +1,42 @@
 Index: libsfml/src/SFML/Graphics/Makefile
 ===================================================================
---- libsfml.orig/src/SFML/Graphics/Makefile	2008-06-17 19:21:43.000000000 +0200
-+++ libsfml/src/SFML/Graphics/Makefile	2008-06-17 19:21:43.000000000 +0200
-@@ -7,7 +7,7 @@
+--- libsfml.orig/src/SFML/Graphics/Makefile	2008-06-22 12:43:13.000000000 +0200
++++ libsfml/src/SFML/Graphics/Makefile	2008-06-22 12:44:18.000000000 +0200
+@@ -16,10 +16,10 @@
  all: $(LIB)
  
+ libsfml-graphics-s.a: $(OBJ) $(OBJSOIL)
+-	$(AR) $(ARFLAGS) $(LIBNAME) $(OBJ) $(OBJSOIL) -lpng -ljpeg -lz -lfreetype -lGLEW
++	$(AR) $(ARFLAGS) $(LIBNAME) $(OBJ) $(OBJSOIL) -lpng -ljpeg -lz -lfreetype -lGLEW $(LIBPATH)/libsfml-window-s.a -lGL
+ 
  libsfml-graphics.so: $(OBJ) $(OBJSOIL)
--	$(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBPATH)/$@.$(VERSION) $(OBJ) -lpng -ljpeg $(OBJSOIL) -lfreetype
-+	$(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBPATH)/$@.$(VERSION) $(OBJ) -lpng -ljpeg $(OBJSOIL) -lfreetype -lGL -lGLEW $(LIBPATH)/libsfml-window.so.$(VERSION)
+-	$(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) $(OBJSOIL) -lpng -ljpeg -lGLEW -lz -lfreetype
++	$(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) $(OBJSOIL) -lpng -ljpeg -lGLEW -lfreetype $(LIBPATH)/libsfml-window.so.$(VERSION) -lGL
  
  $(OBJ): %.o: %.cpp
  	$(CPP) -o $@ -c $< $(CFLAGS) -I/usr/include/freetype2
 Index: libsfml/src/SFML/Audio/Makefile
 ===================================================================
---- libsfml.orig/src/SFML/Audio/Makefile	2008-06-17 19:21:42.000000000 +0200
-+++ libsfml/src/SFML/Audio/Makefile	2008-06-17 19:21:43.000000000 +0200
-@@ -7,7 +7,7 @@
+--- libsfml.orig/src/SFML/Audio/Makefile	2008-06-22 12:43:13.000000000 +0200
++++ libsfml/src/SFML/Audio/Makefile	2008-06-22 12:43:13.000000000 +0200
+@@ -16,10 +16,10 @@
  all: $(LIB)
  
+ libsfml-audio-s.a: $(OBJ) $(OBJVORBIS)
+-	$(AR) $(ARFLAGS) $(LIBNAME) $(OBJ) $(OBJVORBIS)
++	$(AR) $(ARFLAGS) $(LIBNAME) $(OBJ) $(OBJVORBIS) $(LIBPATH/libsfml-system-s.a
+ 
  libsfml-audio.so: $(OBJ) $(OBJVORBIS)
--	$(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBPATH)/$@.$(VERSION) $(OBJ) $(OBJVORBIS) -lsndfile -lopenal
-+	$(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBPATH)/$@.$(VERSION) $(OBJ) $(OBJVORBIS) -lsndfile -lopenal $(LIBPATH)/libsfml-system.so.$(VERSION)
+-	$(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) $(OBJVORBIS) -lsndfile -lopenal
++	$(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) $(OBJVORBIS) -lsndfile -lopenal $(LIBPATH)/libsfml-system.so.$(VERSION)
  
  $(OBJ): %.o: %.cpp
  	$(CPP) -o $@ -c $< $(CFLAGS)
 Index: libsfml/src/SFML/Makefile
 ===================================================================
---- libsfml.orig/src/SFML/Makefile	2008-06-17 19:21:42.000000000 +0200
-+++ libsfml/src/SFML/Makefile	2008-06-17 19:22:14.000000000 +0200
-@@ -14,16 +14,16 @@
+--- libsfml.orig/src/SFML/Makefile	2008-06-22 12:43:13.000000000 +0200
++++ libsfml/src/SFML/Makefile	2008-06-22 12:43:13.000000000 +0200
+@@ -22,16 +22,16 @@
  sfml-system:
  	@(cd ./System && $(MAKE))
  
@@ -50,14 +58,18 @@ Index: libsfml/src/SFML/Makefile
  .PHONY: clean mrproper
 Index: libsfml/src/SFML/Window/Makefile
 ===================================================================
---- libsfml.orig/src/SFML/Window/Makefile	2008-06-17 19:22:20.000000000 +0200
-+++ libsfml/src/SFML/Window/Makefile	2008-06-17 19:23:01.000000000 +0200
-@@ -5,7 +5,7 @@
+--- libsfml.orig/src/SFML/Window/Makefile	2008-06-22 12:43:13.000000000 +0200
++++ libsfml/src/SFML/Window/Makefile	2008-06-22 12:44:44.000000000 +0200
+@@ -14,10 +14,10 @@
  all: $(LIB)
  
- libsfml-window.so: $(OBJ) $(OBJGLEW)
--	$(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBPATH)/$@.$(VERSION) $(OBJ) -lGLEW -lX11 -lXrandr -lGL
-+	$(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBPATH)/$@.$(VERSION) $(OBJ) -lGLEW -lX11 -lXrandr -lGL $(LIBPATH)/libsfml-system.so.$(VERSION)
+ libsfml-window-s.a: $(OBJ)
+-	$(AR) $(ARFLAGS) $(LIBNAME) $(OBJ)
++	$(AR) $(ARFLAGS) $(LIBNAME) $(OBJ) $(LIBPATH)/libsfml-syste-s.a
+ 
+ libsfml-window.so: $(OBJ)
+-	$(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) -lGLEW -lX11 -lXrandr -lGL
++	$(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) -lX11 -lXrandr -lGL $(LIBPATH)/libsfml-system.so.$(VERSION)
  
  $(OBJ): %.o: %.cpp
  	$(CPP) -o $@ -c $< $(CFLAGS)
diff --git a/debian/patches/patching_files_as_needed_by_repackaging.patch b/debian/patches/patching_files_as_needed_by_repackaging.patch
index 6112ae1..47d0a64 100644
--- a/debian/patches/patching_files_as_needed_by_repackaging.patch
+++ b/debian/patches/patching_files_as_needed_by_repackaging.patch
@@ -1,7 +1,7 @@
 Index: libsfml/src/SFML/Graphics/ImageLoader.cpp
 ===================================================================
---- libsfml.orig/src/SFML/Graphics/ImageLoader.cpp	2008-05-25 12:32:02.000000000 +0200
-+++ libsfml/src/SFML/Graphics/ImageLoader.cpp	2008-05-25 12:35:54.000000000 +0200
+--- libsfml.orig/src/SFML/Graphics/ImageLoader.cpp	2008-06-22 12:00:51.000000000 +0200
++++ libsfml/src/SFML/Graphics/ImageLoader.cpp	2008-06-22 12:21:33.000000000 +0200
 @@ -28,10 +28,10 @@
  #include <SFML/Graphics/ImageLoader.hpp>
  extern "C"
@@ -18,12 +18,12 @@ Index: libsfml/src/SFML/Graphics/ImageLoader.cpp
  
 Index: libsfml/src/SFML/Window/Linux/WindowImplX11.cpp
 ===================================================================
---- libsfml.orig/src/SFML/Window/Linux/WindowImplX11.cpp	2008-05-25 12:32:02.000000000 +0200
-+++ libsfml/src/SFML/Window/Linux/WindowImplX11.cpp	2008-05-25 12:35:54.000000000 +0200
+--- libsfml.orig/src/SFML/Window/Linux/WindowImplX11.cpp	2008-06-22 12:00:51.000000000 +0200
++++ libsfml/src/SFML/Window/Linux/WindowImplX11.cpp	2008-06-22 12:28:17.000000000 +0200
 @@ -27,8 +27,8 @@
  ////////////////////////////////////////////////////////////
+ #include <SFML/Window/WindowStyle.hpp> // important to be included first (conflict with None)
  #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>
@@ -31,42 +31,16 @@ Index: libsfml/src/SFML/Window/Linux/WindowImplX11.cpp
  #include <X11/keysym.h>
  #include <X11/XKBlib.h>
  #include <X11/extensions/Xrandr.h>
-Index: libsfml/src/SFML/Window/OpenGLCaps.cpp
+Index: libsfml/src/SFML/Graphics/Renderer.hpp
 ===================================================================
---- libsfml.orig/src/SFML/Window/OpenGLCaps.cpp	2008-05-25 12:32:02.000000000 +0200
-+++ libsfml/src/SFML/Window/OpenGLCaps.cpp	2008-05-25 12:35:54.000000000 +0200
-@@ -26,7 +26,7 @@
- // Headers
- ////////////////////////////////////////////////////////////
- #include <SFML/Window/OpenGLCaps.hpp>
--#include <SFML/Window/glew/glew.h>
-+#include <GL/glew.h>
- 
- 
- namespace sf
-Index: libsfml/include/SFML/Window.hpp
-===================================================================
---- libsfml.orig/include/SFML/Window.hpp	2008-05-25 12:38:11.000000000 +0200
-+++ libsfml/include/SFML/Window.hpp	2008-05-25 12:38:22.000000000 +0200
-@@ -37,7 +37,7 @@
- #include <SFML/Window/Window.hpp>
- #include <SFML/Window/WindowListener.hpp>
- #include <SFML/Window/WindowStyle.hpp>
--#include <SFML/Window/glew/glew.h>
-+#include <GL/glew.h>
- 
- 
- #endif // SFML_SFML_WINDOW_HPP
-Index: libsfml/src/SFML/Graphics/OpenGL.hpp
-===================================================================
---- libsfml.orig/src/SFML/Graphics/OpenGL.hpp	2008-05-25 12:36:33.000000000 +0200
-+++ libsfml/src/SFML/Graphics/OpenGL.hpp	2008-05-25 12:36:47.000000000 +0200
+--- libsfml.orig/src/SFML/Graphics/Renderer.hpp	2008-06-22 12:24:13.000000000 +0200
++++ libsfml/src/SFML/Graphics/Renderer.hpp	2008-06-22 12:24:37.000000000 +0200
 @@ -29,7 +29,7 @@
  // Headers
  ////////////////////////////////////////////////////////////
  #include <SFML/Config.hpp>
--#include <SFML/Window/glew/glew.h>
+-#include <SFML/Graphics/GLEW/glew.h>
 +#include <GL/glew.h>
  #include <iostream>
+ #include <set>
  #include <string>
- 
diff --git a/debian/patches/removing_removed_sources_from_makefiles.patch b/debian/patches/removing_removed_sources_from_makefiles.patch
index aff8470..5f9f878 100644
--- a/debian/patches/removing_removed_sources_from_makefiles.patch
+++ b/debian/patches/removing_removed_sources_from_makefiles.patch
@@ -1,45 +1,56 @@
 Index: libsfml/src/SFML/Graphics/Makefile
 ===================================================================
---- libsfml.orig/src/SFML/Graphics/Makefile	2008-05-24 20:02:50.000000000 +0200
-+++ libsfml/src/SFML/Graphics/Makefile	2008-05-24 20:03:41.000000000 +0200
-@@ -1,19 +1,13 @@
- LIB     = libsfml-graphics.so
+--- libsfml.orig/src/SFML/Graphics/Makefile	2008-06-22 12:12:58.000000000 +0200
++++ libsfml/src/SFML/Graphics/Makefile	2008-06-22 12:18:29.000000000 +0200
+@@ -1,15 +1,7 @@
  SRC     = $(wildcard *.cpp)
+-SRCGLEW = $(wildcard ./GLEW/*.c)
 -SRCJPEG = $(wildcard ./libjpeg/*.c)
 -SRCPNG  = $(wildcard ./libpng/*.c)
  SRCSOIL = $(wildcard ./SOIL/*.c)
 -SRCZLIB = $(wildcard ./zlib/*.c)
  OBJ     = $(SRC:.cpp=.o)
+-OBJGLEW = $(SRCGLEW:.c=.o)
 -OBJJPEG = $(SRCJPEG:.c=.o)
 -OBJPNG  = $(SRCPNG:.c=.o)
  OBJSOIL = $(SRCSOIL:.c=.o)
 -OBJZLIB = $(SRCZLIB:.c=.o)
  
+ ifeq ($(static), yes)
+     LIB     = libsfml-graphics-s.a
+@@ -23,11 +15,11 @@
+ 
  all: $(LIB)
  
--libsfml-graphics.so: $(OBJ) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB)
--	$(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBPATH)/$@.$(VERSION) $(OBJ) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB) -lfreetype
+-libsfml-graphics-s.a: $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB)
+-	$(AR) $(ARFLAGS) $(LIBNAME) $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB)
++libsfml-graphics-s.a: $(OBJ) $(OBJSOIL)
++	$(AR) $(ARFLAGS) $(LIBNAME) $(OBJ) $(OBJSOIL) -lpng -ljpeg -lz -lfreetype -lGLEW
+ 
+-libsfml-graphics.so: $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB)
+-	$(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB) -lfreetype
 +libsfml-graphics.so: $(OBJ) $(OBJSOIL)
-+	$(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBPATH)/$@.$(VERSION) $(OBJ) -lpng -ljpeg $(OBJSOIL) -lfreetype
++	$(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) $(OBJSOIL) -lpng -ljpeg -lGLEW -lz -lfreetype
  
  $(OBJ): %.o: %.cpp
  	$(CPP) -o $@ -c $< $(CFLAGS) -I/usr/include/freetype2
 Index: libsfml/src/SFML/Window/Makefile
 ===================================================================
---- libsfml.orig/src/SFML/Window/Makefile	2008-05-24 20:03:50.000000000 +0200
-+++ libsfml/src/SFML/Window/Makefile	2008-05-24 20:04:08.000000000 +0200
-@@ -1,13 +1,11 @@
- LIB = libsfml-window.so
+--- libsfml.orig/src/SFML/Window/Makefile	2008-06-22 12:11:12.000000000 +0200
++++ libsfml/src/SFML/Window/Makefile	2008-06-22 12:19:48.000000000 +0200
+@@ -1,6 +1,5 @@
  SRC     = $(wildcard *.cpp ./Linux/*.cpp)
--SRCGLEW = $(wildcard ./glew/*.c)
  OBJ     = $(SRC:.cpp=.o)
 -OBJGLEW = $(SRCGLEW:.c=.o)
  
- all: $(LIB)
+ ifeq ($(static), yes)
+     LIB     = libsfml-window-s.a
+@@ -18,7 +17,7 @@
+ 	$(AR) $(ARFLAGS) $(LIBNAME) $(OBJ)
  
- libsfml-window.so: $(OBJ) $(OBJGLEW)
--	$(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBPATH)/$@.$(VERSION) $(OBJ) $(OBJGLEW) -lX11 -lXrandr -lGL
-+	$(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBPATH)/$@.$(VERSION) $(OBJ) -lGLEW -lX11 -lXrandr -lGL
+ libsfml-window.so: $(OBJ)
+-	$(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) $(OBJGLEW) -lX11 -lXrandr -lGL
++	$(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) -lGLEW -lX11 -lXrandr -lGL
  
  $(OBJ): %.o: %.cpp
  	$(CPP) -o $@ -c $< $(CFLAGS)
diff --git a/debian/patches/series b/debian/patches/series
index 0e9e84c..d88a1f1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ patching_files_as_needed_by_repackaging.patch
 cstring_ftbfs.patch
 building_on_all_arches.patch
 linking_against_all_needed_libs.patch
+bump_soname.patch
diff --git a/debian/rules b/debian/rules
index e6c0693..501745c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -70,7 +70,7 @@ binary-arch: build install
 	dh_testroot
 	dh_installchangelogs 
 	dh_installdocs
-	dh_installexamples ; find debian/libsfml1-dev/usr/share/doc/libsfml1-dev/examples/bin -maxdepth 1 ! -type d -exec rm {} \;
+	dh_installexamples ; find debian/libsfml1.deb3-dev/usr/share/doc/libsfml1.deb3-dev/examples/bin -maxdepth 1 ! -type d -exec rm {} \;
 	dh_install --fail-missing --sourcedir=debian/tmp
 	dh_installman
 	dh_link

-- 
Simple and fast multimedia library for C++

More information about the Pkg-games-commits mailing list