Merge branch 'libstdcxx11-transition'

13 files changed, 125 insertions, 111 deletions

diff --git a/debian/changelog b/debian/changelog
index e0d8001..dc9cab7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libsfml (2.3.1+dfsg-2~exp1) experimental; urgency=medium
+
+  * Rename packages to libsfml-*2.3v5 for libstdcxx ABI transition.
+  * Update symbol files for GCC 5 (Closes: #791747).
+  * Build-Depend on g++ >= 5.2.
+
+ -- James Cowgill <james410@cowgill.org.uk>  Wed, 05 Aug 2015 11:41:14 +0100
+
 libsfml (2.3.1+dfsg-1) unstable; urgency=medium
 
   * New upstream version.
diff --git a/debian/control b/debian/control
index 986db95..08810b8 100644
--- a/debian/control
+++ b/debian/control
@@ -9,6 +9,7 @@ Vcs-Browser: https://anonscm.debian.org/cgit/pkg-games/libsfml.git
 Build-Depends: debhelper (>= 9),
  cmake (>= 2.8.9),
  doxygen,
+ g++ (>= 4:5.2),
  libflac-dev,
  libfreetype6-dev,
  libgl1-mesa-dev,
@@ -32,11 +33,11 @@ Architecture: any
 Multi-Arch: same
 Depends: ${misc:Depends},
  libgl1-mesa-dev | libgl-dev,
- libsfml-audio2.3 (= ${binary:Version}),
- libsfml-graphics2.3 (= ${binary:Version}),
- libsfml-network2.3 (= ${binary:Version}),
- libsfml-system2.3 (= ${binary:Version}),
- libsfml-window2.3 (= ${binary:Version})
+ libsfml-audio2.3v5 (= ${binary:Version}),
+ libsfml-graphics2.3v5 (= ${binary:Version}),
+ libsfml-network2.3v5 (= ${binary:Version}),
+ libsfml-system2.3v5 (= ${binary:Version}),
+ libsfml-window2.3v5 (= ${binary:Version})
 Suggests: libsfml2.3-dbg, libsfml-doc
 Description: Simple and Fast Multimedia Library - Development Files
  SFML is a modern multimedia library offering a wide range of subsystems
@@ -46,11 +47,13 @@ Description: Simple and Fast Multimedia Library - Development Files
  .
  This package includes header files for all SFML libraries.
 
-Package: libsfml-audio2.3
+Package: libsfml-audio2.3v5
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Breaks: libsfml-audio2.3
+Replaces: libsfml-audio2.3
 Description: Simple and Fast Multimedia Library - Audio part
  SFML is a modern multimedia library offering a wide range of subsystems
  useful to produce a multimedia app. It offers OpenGL integration for
@@ -60,11 +63,13 @@ Description: Simple and Fast Multimedia Library - Audio part
  The Audio library is used to play sound and music in games. It is able to
  load OGG/Vorbis files.
 
-Package: libsfml-graphics2.3
+Package: libsfml-graphics2.3v5
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Breaks: libsfml-graphics2.3
+Replaces: libsfml-graphics2.3
 Description: Simple and Fast Multimedia Library - Graphics part
  SFML is a modern multimedia library offering a wide range of subsystems
  useful to produce a multimedia app. It offers OpenGL integration for
@@ -74,11 +79,13 @@ Description: Simple and Fast Multimedia Library - Graphics part
  The Graphics library contains all the OpenGL and drawing code. It needs the
  Window library for Window creation.
 
-Package: libsfml-network2.3
+Package: libsfml-network2.3v5
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Breaks: libsfml-network2.3
+Replaces: libsfml-network2.3
 Description: Simple and Fast Multimedia Library - Network part
  SFML is a modern multimedia library offering a wide range of subsystems
  useful to produce a multimedia app. It offers OpenGL integration for
@@ -87,11 +94,13 @@ Description: Simple and Fast Multimedia Library - Network part
  .
  The Network Library brings basic networking support as needed by games.
 
-Package: libsfml-system2.3
+Package: libsfml-system2.3v5
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Breaks: libsfml-system2.3
+Replaces: libsfml-system2.3
 Description: Simple and Fast Multimedia Library - System part
  SFML is a modern multimedia library offering a wide range of subsystems
  useful to produce a multimedia app. It offers OpenGL integration for
@@ -101,11 +110,13 @@ Description: Simple and Fast Multimedia Library - System part
  The system library brings useful system utilities like multithreading and
  UNICODE handling.
 
-Package: libsfml-window2.3
+Package: libsfml-window2.3v5
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Breaks: libsfml-window2.3
+Replaces: libsfml-window2.3
 Description: Simple and Fast Multimedia Library - Window part
  SFML is a modern multimedia library offering a wide range of subsystems
  useful to produce a multimedia app. It offers OpenGL integration for
@@ -120,11 +131,11 @@ Priority: extra
 Architecture: any
 Multi-Arch: same
 Depends: ${misc:Depends},
- libsfml-audio2.3 (= ${binary:Version}) |
- libsfml-graphics2.3 (= ${binary:Version}) |
- libsfml-network2.3 (= ${binary:Version}) |
- libsfml-system2.3 (= ${binary:Version}) |
- libsfml-window2.3 (= ${binary:Version})
+ libsfml-audio2.3v5 (= ${binary:Version}) |
+ libsfml-graphics2.3v5 (= ${binary:Version}) |
+ libsfml-network2.3v5 (= ${binary:Version}) |
+ libsfml-system2.3v5 (= ${binary:Version}) |
+ libsfml-window2.3v5 (= ${binary:Version})
 Description: Simple and Fast Multimedia Library - Debug Symbols
  SFML is a modern multimedia library offering a wide range of subsystems
  useful to produce a multimedia app. It offers OpenGL integration for
diff --git a/debian/libsfml-audio2.3.install b/debian/libsfml-audio2.3v5.install
index 8a7b276..8a7b276 100644
--- a/debian/libsfml-audio2.3.install
+++ b/debian/libsfml-audio2.3v5.install
diff --git a/debian/libsfml-audio2.3.symbols b/debian/libsfml-audio2.3v5.symbols
index ad694c1..7cd146b 100644
--- a/debian/libsfml-audio2.3.symbols
+++ b/debian/libsfml-audio2.3v5.symbols
@@ -1,4 +1,4 @@
-libsfml-audio.so.2.3 libsfml-audio2.3 #MINVER#
+libsfml-audio.so.2.3 libsfml-audio2.3v5 #MINVER#
 * Build-Depends-Package: libsfml-dev
 # Ignore std:: template instantiations
  (regex|optional)"^_ZN?K?S" 2.3
@@ -7,7 +7,7 @@ libsfml-audio.so.2.3 libsfml-audio2.3 #MINVER#
  _ZN2sf10AlResourceD1Ev@Base 2.3
  _ZN2sf10AlResourceD2Ev@Base 2.3
  _ZN2sf11SoundBuffer10initializeERNS_14InputSoundFileE@Base 2.3
- _ZN2sf11SoundBuffer12loadFromFileERKSs@Base 2.3
+ _ZN2sf11SoundBuffer12loadFromFileERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.3
  (subst)_ZN2sf11SoundBuffer14loadFromMemoryEPKv{size_t}@Base 2.3
  _ZN2sf11SoundBuffer14loadFromStreamERNS_11InputStreamE@Base 2.3
  _ZN2sf11SoundBuffer15loadFromSamplesEPKsyjj@Base 2.3
@@ -49,8 +49,8 @@ libsfml-audio.so.2.3 libsfml-audio2.3 #MINVER#
  _ZN2sf11SoundStreamD1Ev@Base 2.3
  _ZN2sf11SoundStreamD2Ev@Base 2.3
  _ZN2sf13SoundRecorder11isAvailableEv@Base 2.3
- _ZN2sf13SoundRecorder16getDefaultDeviceEv@Base 2.3
- _ZN2sf13SoundRecorder19getAvailableDevicesEv@Base 2.3
+ _ZN2sf13SoundRecorder16getDefaultDeviceB5cxx11Ev@Base 2.3
+ _ZN2sf13SoundRecorder19getAvailableDevicesB5cxx11Ev@Base 2.3
  _ZN2sf13SoundRecorder21setProcessingIntervalENS_4TimeE@Base 2.3
  _ZN2sf13SoundRecorder22processCapturedSamplesEv@Base 2.3
  _ZN2sf13SoundRecorder4stopEv@Base 2.3
@@ -59,13 +59,13 @@ libsfml-audio.so.2.3 libsfml-audio2.3 #MINVER#
  _ZN2sf13SoundRecorder6recordEv@Base 2.3
  _ZN2sf13SoundRecorder7cleanupEv@Base 2.3
  _ZN2sf13SoundRecorder7onStartEv@Base 2.3
- _ZN2sf13SoundRecorder9setDeviceERKSs@Base 2.3
+ _ZN2sf13SoundRecorder9setDeviceERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.3
  _ZN2sf13SoundRecorderC1Ev@Base 2.3
  _ZN2sf13SoundRecorderC2Ev@Base 2.3
  _ZN2sf13SoundRecorderD0Ev@Base 2.3
  _ZN2sf13SoundRecorderD1Ev@Base 2.3
  _ZN2sf13SoundRecorderD2Ev@Base 2.3
- _ZN2sf14InputSoundFile12openFromFileERKSs@Base 2.3
+ _ZN2sf14InputSoundFile12openFromFileERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.3
  (subst)_ZN2sf14InputSoundFile14openFromMemoryEPKv{size_t}@Base 2.3
  _ZN2sf14InputSoundFile14openFromStreamERNS_11InputStreamE@Base 2.3
  _ZN2sf14InputSoundFile4readEPsy@Base 2.3
@@ -76,7 +76,7 @@ libsfml-audio.so.2.3 libsfml-audio2.3 #MINVER#
  _ZN2sf14InputSoundFileC2Ev@Base 2.3
  _ZN2sf14InputSoundFileD1Ev@Base 2.3
  _ZN2sf14InputSoundFileD2Ev@Base 2.3
- _ZN2sf15OutputSoundFile12openFromFileERKSsjj@Base 2.3
+ _ZN2sf15OutputSoundFile12openFromFileERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEjj@Base 2.3
  _ZN2sf15OutputSoundFile5closeEv@Base 2.3
  _ZN2sf15OutputSoundFile5writeEPKsy@Base 2.3
  _ZN2sf15OutputSoundFileC1Ev@Base 2.3
@@ -85,8 +85,8 @@ libsfml-audio.so.2.3 libsfml-audio2.3 #MINVER#
  _ZN2sf15OutputSoundFileD2Ev@Base 2.3
  (subst)_ZN2sf16SoundFileFactory22createReaderFromMemoryEPKv{size_t}@Base 2.3
  _ZN2sf16SoundFileFactory22createReaderFromStreamERNS_11InputStreamE@Base 2.3
- _ZN2sf16SoundFileFactory24createReaderFromFilenameERKSs@Base 2.3
- _ZN2sf16SoundFileFactory24createWriterFromFilenameERKSs@Base 2.3
+ _ZN2sf16SoundFileFactory24createReaderFromFilenameERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.3
+ _ZN2sf16SoundFileFactory24createWriterFromFilenameERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.3
  _ZN2sf16SoundFileFactory9s_readersE@Base 2.3
  _ZN2sf16SoundFileFactory9s_writersE@Base 2.3
  (subst)_ZN2sf19SoundBufferRecorder16onProcessSamplesEPKs{size_t}@Base 2.3
@@ -96,7 +96,7 @@ libsfml-audio.so.2.3 libsfml-audio2.3 #MINVER#
  (optional=weak)_ZN2sf19SoundBufferRecorderD1Ev@Base 2.3
  (optional=weak)_ZN2sf19SoundBufferRecorderD2Ev@Base 2.3
  _ZN2sf5Music10initializeEv@Base 2.3
- _ZN2sf5Music12openFromFileERKSs@Base 2.3
+ _ZN2sf5Music12openFromFileERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.3
  (subst)_ZN2sf5Music14openFromMemoryEPKv{size_t}@Base 2.3
  _ZN2sf5Music14openFromStreamERNS_11InputStreamE@Base 2.3
  _ZN2sf5Music6onSeekENS_4TimeE@Base 2.3
@@ -135,7 +135,7 @@ libsfml-audio.so.2.3 libsfml-audio2.3 #MINVER#
  _ZN2sf8Listener15getGlobalVolumeEv@Base 2.3
  _ZN2sf8Listener15setGlobalVolumeEf@Base 2.3
  _ZNK2sf11SoundBuffer10getSamplesEv@Base 2.3
- _ZNK2sf11SoundBuffer10saveToFileERKSs@Base 2.3
+ _ZNK2sf11SoundBuffer10saveToFileERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.3
  _ZNK2sf11SoundBuffer11attachSoundEPNS_5SoundE@Base 2.3
  _ZNK2sf11SoundBuffer11detachSoundEPNS_5SoundE@Base 2.3
  _ZNK2sf11SoundBuffer11getDurationEv@Base 2.3
@@ -155,7 +155,7 @@ libsfml-audio.so.2.3 libsfml-audio2.3 #MINVER#
  _ZNK2sf11SoundStream7getLoopEv@Base 2.3
  _ZNK2sf11SoundStream9getStatusEv@Base 2.3
  _ZNK2sf13SoundRecorder13getSampleRateEv@Base 2.3
- _ZNK2sf13SoundRecorder9getDeviceEv@Base 2.3
+ _ZNK2sf13SoundRecorder9getDeviceB5cxx11Ev@Base 2.3
  _ZNK2sf14InputSoundFile11getDurationEv@Base 2.3
  _ZNK2sf14InputSoundFile13getSampleRateEv@Base 2.3
  _ZNK2sf14InputSoundFile14getSampleCountEv@Base 2.3
@@ -187,8 +187,6 @@ libsfml-audio.so.2.3 libsfml-audio2.3 #MINVER#
  _ZTVN2sf11SoundSourceE@Base 2.3
  _ZTVN2sf11SoundStreamE@Base 2.3
  _ZTVN2sf13SoundRecorderE@Base 2.3
- _ZTVN2sf15SoundFileReaderE@Base 2.3
- _ZTVN2sf15SoundFileWriterE@Base 2.3
  _ZTVN2sf19SoundBufferRecorderE@Base 2.3
  _ZTVN2sf5MusicE@Base 2.3
  _ZTVN2sf5SoundE@Base 2.3
diff --git a/debian/libsfml-graphics2.3.install b/debian/libsfml-graphics2.3v5.install
index 1853f3b..1853f3b 100644
--- a/debian/libsfml-graphics2.3.install
+++ b/debian/libsfml-graphics2.3v5.install
diff --git a/debian/libsfml-graphics2.3.symbols b/debian/libsfml-graphics2.3v5.symbols
index e217afb..48cf87b 100644
--- a/debian/libsfml-graphics2.3.symbols
+++ b/debian/libsfml-graphics2.3v5.symbols
@@ -1,4 +1,4 @@
-libsfml-graphics.so.2.3 libsfml-graphics2.3 #MINVER#
+libsfml-graphics.so.2.3 libsfml-graphics2.3v5 #MINVER#
 * Build-Depends-Package: libsfml-dev
 # Ignore std:: template instantiations
  (regex|optional)"^_ZN?K?S" 2.3
@@ -107,7 +107,7 @@ libsfml-graphics.so.2.3 libsfml-graphics2.3 #MINVER#
  (optional=weak)_ZN2sf14RectangleShapeD0Ev@Base 2.3
  (optional=weak)_ZN2sf14RectangleShapeD1Ev@Base 2.3
  (optional=weak)_ZN2sf14RectangleShapeD2Ev@Base 2.3
- _ZN2sf4Font12loadFromFileERKSs@Base 2.3
+ _ZN2sf4Font12loadFromFileERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.3
  (subst)_ZN2sf4Font14loadFromMemoryEPKv{size_t}@Base 2.3
  _ZN2sf4Font14loadFromStreamERNS_11InputStreamE@Base 2.3
  _ZN2sf4Font4PageC1Ev@Base 2.3
@@ -166,7 +166,7 @@ libsfml-graphics.so.2.3 libsfml-graphics2.3 #MINVER#
  _ZN2sf5ColorC2Ehhhh@Base 2.3
  _ZN2sf5ColorC2Ej@Base 2.3
  _ZN2sf5ColorC2Ev@Base 2.3
- _ZN2sf5Image12loadFromFileERKSs@Base 2.3
+ _ZN2sf5Image12loadFromFileERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.3
  _ZN2sf5Image14flipVerticallyEv@Base 2.3
  (subst)_ZN2sf5Image14loadFromMemoryEPKv{size_t}@Base 2.3
  _ZN2sf5Image14loadFromStreamERNS_11InputStreamE@Base 2.3
@@ -196,24 +196,24 @@ libsfml-graphics.so.2.3 libsfml-graphics2.3 #MINVER#
  _ZN2sf5ShapeD1Ev@Base 2.3
  _ZN2sf5ShapeD2Ev@Base 2.3
  _ZN2sf6Shader11isAvailableEv@Base 2.3
- _ZN2sf6Shader12loadFromFileERKSsNS0_4TypeE@Base 2.3
- _ZN2sf6Shader12loadFromFileERKSsS2_@Base 2.3
- _ZN2sf6Shader12setParameterERKSsNS0_18CurrentTextureTypeE@Base 2.3
- _ZN2sf6Shader12setParameterERKSsRKNS_5ColorE@Base 2.3
- _ZN2sf6Shader12setParameterERKSsRKNS_7TextureE@Base 2.3
- _ZN2sf6Shader12setParameterERKSsRKNS_7Vector2IfEE@Base 2.3
- _ZN2sf6Shader12setParameterERKSsRKNS_7Vector3IfEE@Base 2.3
- _ZN2sf6Shader12setParameterERKSsRKNS_9TransformE@Base 2.3
- _ZN2sf6Shader12setParameterERKSsf@Base 2.3
- _ZN2sf6Shader12setParameterERKSsff@Base 2.3
- _ZN2sf6Shader12setParameterERKSsfff@Base 2.3
- _ZN2sf6Shader12setParameterERKSsffff@Base 2.3
+ _ZN2sf6Shader12loadFromFileERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEENS0_4TypeE@Base 2.3
+ _ZN2sf6Shader12loadFromFileERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES8_@Base 2.3
+ _ZN2sf6Shader12setParameterERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEENS0_18CurrentTextureTypeE@Base 2.3
+ _ZN2sf6Shader12setParameterERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKNS_5ColorE@Base 2.3
+ _ZN2sf6Shader12setParameterERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKNS_7TextureE@Base 2.3
+ _ZN2sf6Shader12setParameterERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKNS_7Vector2IfEE@Base 2.3
+ _ZN2sf6Shader12setParameterERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKNS_7Vector3IfEE@Base 2.3
+ _ZN2sf6Shader12setParameterERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKNS_9TransformE@Base 2.3
+ _ZN2sf6Shader12setParameterERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEf@Base 2.3
+ _ZN2sf6Shader12setParameterERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEff@Base 2.3
+ _ZN2sf6Shader12setParameterERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEfff@Base 2.3
+ _ZN2sf6Shader12setParameterERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEffff@Base 2.3
  _ZN2sf6Shader14CurrentTextureE@Base 2.3
- _ZN2sf6Shader14loadFromMemoryERKSsNS0_4TypeE@Base 2.3
- _ZN2sf6Shader14loadFromMemoryERKSsS2_@Base 2.3
+ _ZN2sf6Shader14loadFromMemoryERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEENS0_4TypeE@Base 2.3
+ _ZN2sf6Shader14loadFromMemoryERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES8_@Base 2.3
  _ZN2sf6Shader14loadFromStreamERNS_11InputStreamENS0_4TypeE@Base 2.3
  _ZN2sf6Shader14loadFromStreamERNS_11InputStreamES2_@Base 2.3
- _ZN2sf6Shader16getParamLocationERKSs@Base 2.3
+ _ZN2sf6Shader16getParamLocationERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.3
  _ZN2sf6Shader4bindEPKS0_@Base 2.3
  _ZN2sf6Shader7compileEPKcS2_@Base 2.3
  _ZN2sf6ShaderC1Ev@Base 2.3
@@ -246,7 +246,7 @@ libsfml-graphics.so.2.3 libsfml-graphics2.3 #MINVER#
  _ZN2sf6VertexC2Ev@Base 2.3
  _ZN2sf7Texture11setRepeatedEb@Base 2.3
  _ZN2sf7Texture12getValidSizeEj@Base 2.3
- _ZN2sf7Texture12loadFromFileERKSsRKNS_4RectIiEE@Base 2.3
+ _ZN2sf7Texture12loadFromFileERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKNS_4RectIiEE@Base 2.3
  _ZN2sf7Texture13loadFromImageERKNS_5ImageERKNS_4RectIiEE@Base 2.3
  _ZN2sf7Texture14getMaximumSizeEv@Base 2.3
  (subst)_ZN2sf7Texture14loadFromMemoryEPKv{size_t}RKNS_4RectIiEE@Base 2.3
@@ -362,7 +362,7 @@ libsfml-graphics.so.2.3 libsfml-graphics2.3 #MINVER#
  _ZNK2sf4View7getSizeEv@Base 2.3
  _ZNK2sf4View9getCenterEv@Base 2.3
  _ZNK2sf5Color9toIntegerEv@Base 2.3
- _ZNK2sf5Image10saveToFileERKSs@Base 2.3
+ _ZNK2sf5Image10saveToFileERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.3
  _ZNK2sf5Image12getPixelsPtrEv@Base 2.3
  _ZNK2sf5Image7getSizeEv@Base 2.3
  _ZNK2sf5Image8getPixelEjj@Base 2.3
diff --git a/debian/libsfml-network2.3.install b/debian/libsfml-network2.3v5.install
index b769faf..b769faf 100644
--- a/debian/libsfml-network2.3.install
+++ b/debian/libsfml-network2.3v5.install
diff --git a/debian/libsfml-network2.3.symbols b/debian/libsfml-network2.3v5.symbols
index a884b00..28689f5 100644
--- a/debian/libsfml-network2.3.symbols
+++ b/debian/libsfml-network2.3v5.symbols
@@ -1,4 +1,4 @@
-libsfml-network.so.2.3 libsfml-network2.3 #MINVER#
+libsfml-network.so.2.3 libsfml-network2.3v5 #MINVER#
 * Build-Depends-Package: libsfml-dev
 # Ignore std:: template instantiations
  (regex|optional)"^_ZN?K?S" 2.3
@@ -21,54 +21,52 @@ libsfml-network.so.2.3 libsfml-network2.3 #MINVER#
  _ZN2sf14SocketSelectorD1Ev@Base 2.3
  _ZN2sf14SocketSelectorD2Ev@Base 2.3
  _ZN2sf14SocketSelectoraSERKS0_@Base 2.3
- _ZN2sf3Ftp10deleteFileERKSs@Base 2.3
+ _ZN2sf3Ftp10deleteFileERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.3
  _ZN2sf3Ftp10disconnectEv@Base 2.3
- _ZN2sf3Ftp10renameFileERKSsS2_@Base 2.3
+ _ZN2sf3Ftp10renameFileERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES8_@Base 2.3
  _ZN2sf3Ftp11DataChannel4openENS0_12TransferModeE@Base 2.3
  _ZN2sf3Ftp11DataChannel4sendERSi@Base 2.3
  _ZN2sf3Ftp11DataChannel7receiveERSo@Base 2.3
  _ZN2sf3Ftp11DataChannelC1ERS0_@Base 2.3
  _ZN2sf3Ftp11DataChannelC2ERS0_@Base 2.3
  _ZN2sf3Ftp11getResponseEv@Base 2.3
- _ZN2sf3Ftp11sendCommandERKSsS2_@Base 2.3
- _ZN2sf3Ftp15ListingResponseC1ERKNS0_8ResponseERKSs@Base 2.3
- _ZN2sf3Ftp15ListingResponseC2ERKNS0_8ResponseERKSs@Base 2.3
- _ZN2sf3Ftp15changeDirectoryERKSs@Base 2.3
- _ZN2sf3Ftp15createDirectoryERKSs@Base 2.3
- _ZN2sf3Ftp15deleteDirectoryERKSs@Base 2.3
+ _ZN2sf3Ftp11sendCommandERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES8_@Base 2.3
+ _ZN2sf3Ftp15ListingResponseC1ERKNS0_8ResponseERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.3
+ _ZN2sf3Ftp15ListingResponseC2ERKNS0_8ResponseERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.3
+ _ZN2sf3Ftp15changeDirectoryERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.3
+ _ZN2sf3Ftp15createDirectoryERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.3
+ _ZN2sf3Ftp15deleteDirectoryERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.3
  _ZN2sf3Ftp15parentDirectoryEv@Base 2.3
  _ZN2sf3Ftp17DirectoryResponseC1ERKNS0_8ResponseE@Base 2.3
  _ZN2sf3Ftp17DirectoryResponseC2ERKNS0_8ResponseE@Base 2.3
- _ZN2sf3Ftp19getDirectoryListingERKSs@Base 2.3
+ _ZN2sf3Ftp19getDirectoryListingERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.3
  _ZN2sf3Ftp19getWorkingDirectoryEv@Base 2.3
- _ZN2sf3Ftp5loginERKSsS2_@Base 2.3
+ _ZN2sf3Ftp5loginERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES8_@Base 2.3
  _ZN2sf3Ftp5loginEv@Base 2.3
- _ZN2sf3Ftp6uploadERKSsS2_NS0_12TransferModeE@Base 2.3
+ _ZN2sf3Ftp6uploadERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES8_NS0_12TransferModeE@Base 2.3
  _ZN2sf3Ftp7connectERKNS_9IpAddressEtNS_4TimeE@Base 2.3
- _ZN2sf3Ftp8ResponseC1ENS1_6StatusERKSs@Base 2.3
- _ZN2sf3Ftp8ResponseC2ENS1_6StatusERKSs@Base 2.3
- _ZN2sf3Ftp8downloadERKSsS2_NS0_12TransferModeE@Base 2.3
+ _ZN2sf3Ftp8ResponseC1ENS1_6StatusERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.3
+ _ZN2sf3Ftp8ResponseC2ENS1_6StatusERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.3
+ _ZN2sf3Ftp8downloadERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES8_NS0_12TransferModeE@Base 2.3
  _ZN2sf3Ftp9keepAliveEv@Base 2.3
  _ZN2sf3FtpD1Ev@Base 2.3
  _ZN2sf3FtpD2Ev@Base 2.3
  _ZN2sf4Http11sendRequestERKNS0_7RequestENS_4TimeE@Base 2.3
  _ZN2sf4Http7Request14setHttpVersionEjj@Base 2.3
- _ZN2sf4Http7Request6setUriERKSs@Base 2.3
- _ZN2sf4Http7Request7setBodyERKSs@Base 2.3
- _ZN2sf4Http7Request8setFieldERKSsS3_@Base 2.3
+ _ZN2sf4Http7Request6setUriERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.3
+ _ZN2sf4Http7Request7setBodyERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.3
+ _ZN2sf4Http7Request8setFieldERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES9_@Base 2.3
  _ZN2sf4Http7Request9setMethodENS1_6MethodE@Base 2.3
- _ZN2sf4Http7RequestC1ERKSsNS1_6MethodES3_@Base 2.3
- _ZN2sf4Http7RequestC2ERKSsNS1_6MethodES3_@Base 2.3
- (optional=weak)_ZN2sf4Http7RequestD1Ev@Base 2.3
- (optional=weak)_ZN2sf4Http7RequestD2Ev@Base 2.3
- _ZN2sf4Http7setHostERKSst@Base 2.3
+ _ZN2sf4Http7RequestC1ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEENS1_6MethodES9_@Base 2.3
+ _ZN2sf4Http7RequestC2ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEENS1_6MethodES9_@Base 2.3
+ _ZN2sf4Http7setHostERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEt@Base 2.3
  _ZN2sf4Http8Response11parseFieldsERSi@Base 2.3
- _ZN2sf4Http8Response5parseERKSs@Base 2.3
+ _ZN2sf4Http8Response5parseERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.3
  _ZN2sf4Http8ResponseC1Ev@Base 2.3
  _ZN2sf4Http8ResponseC2Ev@Base 2.3
- _ZN2sf4HttpC1ERKSst@Base 2.3
+ _ZN2sf4HttpC1ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEt@Base 2.3
  _ZN2sf4HttpC1Ev@Base 2.3
- _ZN2sf4HttpC2ERKSst@Base 2.3
+ _ZN2sf4HttpC2ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEt@Base 2.3
  _ZN2sf4HttpC2Ev@Base 2.3
  _ZN2sf6Packet5clearEv@Base 2.3
  (subst)_ZN2sf6Packet6appendEPKv{size_t}@Base 2.3
@@ -83,8 +81,8 @@ libsfml-network.so.2.3 libsfml-network2.3 #MINVER#
  _ZN2sf6PacketlsEPKc@Base 2.3
  _ZN2sf6PacketlsEPKw@Base 2.3
  _ZN2sf6PacketlsERKNS_6StringE@Base 2.3
- _ZN2sf6PacketlsERKSbIwSt11char_traitsIwESaIwEE@Base 2.3
- _ZN2sf6PacketlsERKSs@Base 2.3
+ _ZN2sf6PacketlsERKNSt7__cxx1112basic_stringIwSt11char_traitsIwESaIwEEE@Base 2.3
+ _ZN2sf6PacketlsERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.3
  _ZN2sf6PacketlsEa@Base 2.3
  _ZN2sf6PacketlsEb@Base 2.3
  _ZN2sf6PacketlsEd@Base 2.3
@@ -99,8 +97,8 @@ libsfml-network.so.2.3 libsfml-network2.3 #MINVER#
  _ZN2sf6PacketrsEPc@Base 2.3
  _ZN2sf6PacketrsEPw@Base 2.3
  _ZN2sf6PacketrsERNS_6StringE@Base 2.3
- _ZN2sf6PacketrsERSbIwSt11char_traitsIwESaIwEE@Base 2.3
- _ZN2sf6PacketrsERSs@Base 2.3
+ _ZN2sf6PacketrsERNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.3
+ _ZN2sf6PacketrsERNSt7__cxx1112basic_stringIwSt11char_traitsIwESaIwEEE@Base 2.3
  _ZN2sf6PacketrsERa@Base 2.3
  _ZN2sf6PacketrsERb@Base 2.3
  _ZN2sf6PacketrsERd@Base 2.3
@@ -127,12 +125,12 @@ libsfml-network.so.2.3 libsfml-network2.3 #MINVER#
  _ZN2sf9IpAddress9BroadcastE@Base 2.3
  _ZN2sf9IpAddress9LocalHostE@Base 2.3
  _ZN2sf9IpAddressC1EPKc@Base 2.3
- _ZN2sf9IpAddressC1ERKSs@Base 2.3
+ _ZN2sf9IpAddressC1ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.3
  _ZN2sf9IpAddressC1Ehhhh@Base 2.3
  _ZN2sf9IpAddressC1Ej@Base 2.3
  _ZN2sf9IpAddressC1Ev@Base 2.3
  _ZN2sf9IpAddressC2EPKc@Base 2.3
- _ZN2sf9IpAddressC2ERKSs@Base 2.3
+ _ZN2sf9IpAddressC2ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.3
  _ZN2sf9IpAddressC2Ehhhh@Base 2.3
  _ZN2sf9IpAddressC2Ej@Base 2.3
  _ZN2sf9IpAddressC2Ev@Base 2.3
@@ -171,17 +169,17 @@ libsfml-network.so.2.3 libsfml-network2.3 #MINVER#
  _ZN2sfrsERSiRNS_9IpAddressE@Base 2.3
  _ZNK2sf11TcpListener12getLocalPortEv@Base 2.3
  _ZNK2sf14SocketSelector7isReadyERNS_6SocketE@Base 2.3
- _ZNK2sf3Ftp15ListingResponse10getListingEv@Base 2.3
- _ZNK2sf3Ftp17DirectoryResponse12getDirectoryEv@Base 2.3
- _ZNK2sf3Ftp8Response10getMessageEv@Base 2.3
+ _ZNK2sf3Ftp15ListingResponse10getListingB5cxx11Ev@Base 2.3
+ _ZNK2sf3Ftp17DirectoryResponse12getDirectoryB5cxx11Ev@Base 2.3
+ _ZNK2sf3Ftp8Response10getMessageB5cxx11Ev@Base 2.3
  _ZNK2sf3Ftp8Response4isOkEv@Base 2.3
  _ZNK2sf3Ftp8Response9getStatusEv@Base 2.3
- _ZNK2sf4Http7Request7prepareEv@Base 2.3
- _ZNK2sf4Http7Request8hasFieldERKSs@Base 2.3
+ _ZNK2sf4Http7Request7prepareB5cxx11Ev@Base 2.3
+ _ZNK2sf4Http7Request8hasFieldERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.3
  _ZNK2sf4Http8Response19getMajorHttpVersionEv@Base 2.3
  _ZNK2sf4Http8Response19getMinorHttpVersionEv@Base 2.3
- _ZNK2sf4Http8Response7getBodyEv@Base 2.3
- _ZNK2sf4Http8Response8getFieldERKSs@Base 2.3
+ _ZNK2sf4Http8Response7getBodyB5cxx11Ev@Base 2.3
+ _ZNK2sf4Http8Response8getFieldERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.3
  _ZNK2sf4Http8Response9getStatusEv@Base 2.3
  _ZNK2sf6Packet11endOfPacketEv@Base 2.3
  _ZNK2sf6Packet11getDataSizeEv@Base 2.3
@@ -189,7 +187,7 @@ libsfml-network.so.2.3 libsfml-network2.3 #MINVER#
  (subst)_ZNK2sf6PacketcvMS0_Fb{size_t}EEv@Base 2.3
  _ZNK2sf6Socket10isBlockingEv@Base 2.3
  _ZNK2sf6Socket9getHandleEv@Base 2.3
- _ZNK2sf9IpAddress8toStringEv@Base 2.3
+ _ZNK2sf9IpAddress8toStringB5cxx11Ev@Base 2.3
  _ZNK2sf9IpAddress9toIntegerEv@Base 2.3
  _ZNK2sf9TcpSocket12getLocalPortEv@Base 2.3
  _ZNK2sf9TcpSocket13getRemotePortEv@Base 2.3
diff --git a/debian/libsfml-system2.3.install b/debian/libsfml-system2.3v5.install
index 19b0317..19b0317 100644
--- a/debian/libsfml-system2.3.install
+++ b/debian/libsfml-system2.3v5.install
diff --git a/debian/libsfml-system2.3.lintian-overrides b/debian/libsfml-system2.3v5.lintian-overrides
index 03dc33c..e27e22c 100644
--- a/debian/libsfml-system2.3.lintian-overrides
+++ b/debian/libsfml-system2.3v5.lintian-overrides
@@ -1,3 +1,3 @@
 # The libsfml-system package doesn't use any functions which can be
 #  fortified, even though all the correct flags are passed.
-libsfml-system2.3 binary: hardening-no-fortify-functions
+libsfml-system2.3v5 binary: hardening-no-fortify-functions
diff --git a/debian/libsfml-system2.3.symbols b/debian/libsfml-system2.3v5.symbols
index a022919..2d22ae4 100644
--- a/debian/libsfml-system2.3.symbols
+++ b/debian/libsfml-system2.3v5.symbols
@@ -1,4 +1,4 @@
-libsfml-system.so.2.3 libsfml-system2.3 #MINVER#
+libsfml-system.so.2.3 libsfml-system2.3v5 #MINVER#
 * Build-Depends-Package: libsfml-dev
 # Ignore std:: template instantiations
  (regex|optional)"^_ZN?K?S" 2.3
@@ -9,7 +9,7 @@ libsfml-system.so.2.3 libsfml-system2.3 #MINVER#
  _ZN2sf11ThreadLocalD2Ev@Base 2.3
  _ZN2sf12microsecondsEx@Base 2.3
  _ZN2sf12millisecondsEi@Base 2.3
- _ZN2sf15FileInputStream4openERKSs@Base 2.3
+ _ZN2sf15FileInputStream4openERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.3
  _ZN2sf15FileInputStream4readEPvx@Base 2.3
  _ZN2sf15FileInputStream4seekEx@Base 2.3
  _ZN2sf15FileInputStream4tellEv@Base 2.3
@@ -50,8 +50,8 @@ libsfml-system.so.2.3 libsfml-system2.3 #MINVER#
  _ZN2sf5MutexD2Ev@Base 2.3
  _ZN2sf5sleepENS_4TimeE@Base 2.3
  _ZN2sf6String10InvalidPosE@Base 2.3
- _ZN2sf6String3endEv@Base 2.3
- _ZN2sf6String5beginEv@Base 2.3
+ _ZN2sf6String3endB5cxx11Ev@Base 2.3
+ _ZN2sf6String5beginB5cxx11Ev@Base 2.3
  _ZN2sf6String5clearEv@Base 2.3
  (subst)_ZN2sf6String5eraseE{size_t}{size_t}@Base 2.3
  (subst)_ZN2sf6String6insertE{size_t}RKS0_@Base 2.3
@@ -61,9 +61,9 @@ libsfml-system.so.2.3 libsfml-system2.3 #MINVER#
  _ZN2sf6StringC1EPKj@Base 2.3
  _ZN2sf6StringC1EPKw@Base 2.3
  _ZN2sf6StringC1ERKS0_@Base 2.3
- _ZN2sf6StringC1ERKSbIjSt11char_traitsIjESaIjEE@Base 2.3
- _ZN2sf6StringC1ERKSbIwSt11char_traitsIwESaIwEE@Base 2.3
- _ZN2sf6StringC1ERKSsRKSt6locale@Base 2.3
+ _ZN2sf6StringC1ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKSt6locale@Base 2.3
+ _ZN2sf6StringC1ERKNSt7__cxx1112basic_stringIjSt11char_traitsIjESaIjEEE@Base 2.3
+ _ZN2sf6StringC1ERKNSt7__cxx1112basic_stringIwSt11char_traitsIwESaIwEEE@Base 2.3
  _ZN2sf6StringC1EcRKSt6locale@Base 2.3
  _ZN2sf6StringC1Ej@Base 2.3
  _ZN2sf6StringC1Ev@Base 2.3
@@ -72,9 +72,9 @@ libsfml-system.so.2.3 libsfml-system2.3 #MINVER#
  _ZN2sf6StringC2EPKj@Base 2.3
  _ZN2sf6StringC2EPKw@Base 2.3
  _ZN2sf6StringC2ERKS0_@Base 2.3
- _ZN2sf6StringC2ERKSbIjSt11char_traitsIjESaIjEE@Base 2.3
- _ZN2sf6StringC2ERKSbIwSt11char_traitsIwESaIwEE@Base 2.3
- _ZN2sf6StringC2ERKSsRKSt6locale@Base 2.3
+ _ZN2sf6StringC2ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKSt6locale@Base 2.3
+ _ZN2sf6StringC2ERKNSt7__cxx1112basic_stringIjSt11char_traitsIjESaIjEEE@Base 2.3
+ _ZN2sf6StringC2ERKNSt7__cxx1112basic_stringIwSt11char_traitsIwESaIwEEE@Base 2.3
  _ZN2sf6StringC2EcRKSt6locale@Base 2.3
  _ZN2sf6StringC2Ej@Base 2.3
  _ZN2sf6StringC2Ev@Base 2.3
@@ -125,20 +125,20 @@ libsfml-system.so.2.3 libsfml-system2.3 #MINVER#
  _ZNK2sf4Time14asMillisecondsEv@Base 2.3
  _ZNK2sf4Time9asSecondsEv@Base 2.3
  _ZNK2sf5Clock14getElapsedTimeEv@Base 2.3
- _ZNK2sf6String12toAnsiStringERKSt6locale@Base 2.3
- _ZNK2sf6String12toWideStringEv@Base 2.3
- _ZNK2sf6String3endEv@Base 2.3
+ _ZNK2sf6String12toAnsiStringB5cxx11ERKSt6locale@Base 2.3
+ _ZNK2sf6String12toWideStringB5cxx11Ev@Base 2.3
+ _ZNK2sf6String3endB5cxx11Ev@Base 2.3
  (subst)_ZNK2sf6String4findERKS0_{size_t}@Base 2.3
- _ZNK2sf6String5beginEv@Base 2.3
- _ZNK2sf6String6toUtf8Ev@Base 2.3
+ _ZNK2sf6String5beginB5cxx11Ev@Base 2.3
+ _ZNK2sf6String6toUtf8B5cxx11Ev@Base 2.3
  _ZNK2sf6String7getDataEv@Base 2.3
  _ZNK2sf6String7getSizeEv@Base 2.3
  _ZNK2sf6String7isEmptyEv@Base 2.3
- _ZNK2sf6String7toUtf16Ev@Base 2.3
- _ZNK2sf6String7toUtf32Ev@Base 2.3
+ _ZNK2sf6String7toUtf16B5cxx11Ev@Base 2.3
+ _ZNK2sf6String7toUtf32B5cxx11Ev@Base 2.3
  (subst)_ZNK2sf6String9substringE{size_t}{size_t}@Base 2.3
- _ZNK2sf6StringcvSbIwSt11char_traitsIwESaIwEEEv@Base 2.3
- _ZNK2sf6StringcvSsEv@Base 2.3
+ _ZNK2sf6StringcvNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEB5cxx11Ev@Base 2.3
+ _ZNK2sf6StringcvNSt7__cxx1112basic_stringIwSt11char_traitsIwESaIwEEEB5cxx11Ev@Base 2.3
  (subst)_ZNK2sf6StringixE{size_t}@Base 2.3
  _ZTIN2sf11InputStreamE@Base 2.3
  _ZTIN2sf11NonCopyableE@Base 2.3
@@ -148,6 +148,5 @@ libsfml-system.so.2.3 libsfml-system2.3 #MINVER#
  _ZTSN2sf11NonCopyableE@Base 2.3
  _ZTSN2sf15FileInputStreamE@Base 2.3
  _ZTSN2sf17MemoryInputStreamE@Base 2.3
- _ZTVN2sf11InputStreamE@Base 2.3
  _ZTVN2sf15FileInputStreamE@Base 2.3
  _ZTVN2sf17MemoryInputStreamE@Base 2.3
diff --git a/debian/libsfml-window2.3.install b/debian/libsfml-window2.3v5.install
index bf25e6e..bf25e6e 100644
--- a/debian/libsfml-window2.3.install
+++ b/debian/libsfml-window2.3v5.install
diff --git a/debian/libsfml-window2.3.symbols b/debian/libsfml-window2.3v5.symbols
index 391666b..4984170 100644
--- a/debian/libsfml-window2.3.symbols
+++ b/debian/libsfml-window2.3v5.symbols
@@ -1,4 +1,4 @@
-libsfml-window.so.2.3 libsfml-window2.3 #MINVER#
+libsfml-window.so.2.3 libsfml-window2.3v5 #MINVER#
 * Build-Depends-Package: libsfml-dev
 # Ignore std:: template instantiations
  (regex|optional)"^_ZN?K?S" 2.3