[SCM] Simple and fast multimedia library for C++ branch, master, updated. upstream/1.4-108-g2e47a27

[Christoph Egger]

The following commit has been merged in the master branch:
commit c306f1f011356cb2b04faef7b0723234b2519b31
Author: Christoph Egger <Christoph.Egger at gmx.de>
Date:   Fri Dec 18 13:37:16 2009 +0100

    General QA for -3 upload

diff --git a/debian/changelog b/debian/changelog
index 405a76a..caa9ecf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+libsfml (1.5+repack1-3) unstable; urgency=low
+
+  * Making -dev only suggest -doc instead of recommend
+  * Update my EMail Address
+  * Reformat debian/control slightly
+  * Make -dbg installable with only some SFML libs available
+
+ -- Christoph Egger <christoph at debian.org>  Fri, 18 Dec 2009 13:36:46 +0100
+
 libsfml (1.5+repack1-2) unstable; urgency=low
 
   * Patch include/SFML/Config.hpp to correctly detect kFreeBSD kernels
diff --git a/debian/control b/debian/control
index 9ce6dc5..2e37b94 100644
--- a/debian/control
+++ b/debian/control
@@ -2,26 +2,36 @@ Source: libsfml
 Section: devel
 Priority: extra
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
-Uploaders: Christoph Egger <debian at christoph-egger.org>
+Uploaders: Christoph Egger <christoph at debian.org>
 Vcs-Git: git://git.debian.org/git/pkg-games/libsfml.git/
 Vcs-Browser: http://git.debian.org/?p=pkg-games/libsfml.git
-Build-Depends: debhelper (>= 7), libgl1-mesa-glx, mesa-common-dev, 
-  libglu1-mesa-dev, libxrandr-dev, libfreetype6-dev, libopenal-dev, 
-  libsndfile1-dev, libjpeg-dev, libpng-dev, libglew1.5-dev, quilt, 
-  libsoil-dev
+Build-Depends: debhelper (>= 7),
+ libgl1-mesa-glx,
+ mesa-common-dev,
+ libglu1-mesa-dev,
+ libxrandr-dev,
+ libfreetype6-dev,
+ libopenal-dev,
+ libsndfile1-dev,
+ libjpeg-dev,
+ libpng-dev,
+ libglew1.5-dev,
+ quilt,
+ libsoil-dev
 Standards-Version: 3.8.3
 Homepage: http://www.sfml-dev.org/
 
 Package: libsfml-dev
 Section: libdevel
 Architecture: any
-Depends: libsfml-audio1.5 (= ${binary:Version}), libsfml-graphics1.5 (= ${binary:Version}), 
-  libsfml-network1.5 (= ${binary:Version}), libsfml-system1.5 (= ${binary:Version}), 
-  libsfml-window1.5 (= ${binary:Version})
-Recommends: libsfml-doc
+Depends: libsfml-audio1.5 (= ${binary:Version}),
+ libsfml-graphics1.5 (= ${binary:Version}),
+ libsfml-network1.5 (= ${binary:Version}),
+ libsfml-system1.5 (= ${binary:Version}),
+ libsfml-window1.5 (= ${binary:Version})
 Conflicts: libsfml1.deb3-dev
 Replaces: libsfml1.deb3-dev
-Suggests: libsfml1.5-dbg
+Suggests: libsfml1.5-dbg, libsfml-doc
 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
@@ -96,9 +106,12 @@ Description: Simple and fast cross-platform multimedia library - Window part
 Package: libsfml1.5-dbg
 Section: debug
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libsfml-audio1.5 (= ${binary:Version}),
-  libsfml-graphics1.5 (= ${binary:Version}), libsfml-network1.5 (= ${binary:Version}),
-  libsfml-system1.5 (= ${binary:Version}), libsfml-window1.5 (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends},
+ libsfml-audio1.5 (= ${binary:Version}) |
+ libsfml-graphics1.5 (= ${binary:Version}) |
+ libsfml-network1.5 (= ${binary:Version}) |
+ libsfml-system1.5 (= ${binary:Version}) |
+ libsfml-window1.5 (= ${binary:Version})
 Description: Simple and fast cross-platform multimedia library - debug symbols
  SFML is an modern multimedia library offering a wide range of subsystems
  useful to produce an multimedia app. It offers OpenGL integration for

-- 
Simple and fast multimedia library for C++