[SCM] C Bindings for the SFML Library branch, master, updated. upstream/1.5-52-g061fec4

[Christoph Egger]

The following commit has been merged in the master branch:
commit 061fec4a97c548148211c42c91ce531d45b78d7c
Author: Christoph Egger <Christoph.Egger at gmx.de>
Date:   Tue Dec 22 00:30:10 2009 +0100

    -2 Upload

diff --git a/debian/changelog b/debian/changelog
index 509e2ec..3a95c45 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+libcsfml (1.5-2) unstable; urgency=low
+
+  * Change dh_chlean -k to dh_prep and therefor bump debhelper to 7
+  * Get rid of strange Make error on systems where topgit is not
+    installed (e.g. buildds, chroots)
+  * Line Break Depends/Build-Depends
+  * Update my Email Address
+  * Fix Build on kFreeBSD and GNU/Hurd
+
+ -- Christoph Egger <christoph at debian.org>  Fri, 18 Dec 2009 13:31:53 +0100
+
 libcsfml (1.5-1) unstable; urgency=low
 
   * New upstream 1.5 release
diff --git a/debian/compat b/debian/compat
index 1e8b314..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-6
+7
diff --git a/debian/control b/debian/control
index 308152a..603d3d8 100644
--- a/debian/control
+++ b/debian/control
@@ -1,8 +1,10 @@
 Source: libcsfml
 Priority: extra
 Maintainer: Debian Games team <pkg-games-devel at lists.alioth.debian.org>
-Uploaders: Christoph Egger <debian at christoph-egger.org>
-Build-Depends: debhelper (>= 6), quilt, libsfml-dev (>= 1.5)
+Uploaders: Christoph Egger <christoph at debian.org>
+Build-Depends: debhelper (>= 7),
+  quilt,
+  libsfml-dev (>= 1.5)
 Standards-Version: 3.8.3
 Section: libs
 Homepage: http://www.sfml-dev.org
@@ -12,8 +14,10 @@ Vcs-Browser: http://git.debian.org/?p=pkg-games/libcsfml.git
 Package: libcsfml-dev
 Section: libdevel
 Architecture: any
-Depends: libcsfml-audio1.5 (= ${binary:Version}), libcsfml-graphics1.5 (= ${binary:Version}),
- libcsfml-network1.5 (= ${binary:Version}), libcsfml-system1.5 (= ${binary:Version}),
+Depends: libcsfml-audio1.5 (= ${binary:Version}),
+ libcsfml-graphics1.5 (= ${binary:Version}),
+ libcsfml-network1.5 (= ${binary:Version}),
+ libcsfml-system1.5 (= ${binary:Version}),
  libcsfml-window1.5 (= ${binary:Version})
 Conflicts: libcsfml1.deb3-dev
 Replaces: libcsfml1.deb3-dev
@@ -28,9 +32,13 @@ Description: Developmentfiles for the C binding of SFML
 Package: libcsfml1.5-dbg
 Section: debug
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libcsfml-audio1.5 (= ${binary:Version}) 
-  | libcsfml-graphics1.5 (= ${binary:Version}) | libcsfml-network1.5 (= ${binary:Version})
-  | libcsfml-system1.5 (= ${binary:Version}) | libcsfml-window1.5 (= ${binary:Version})
+Depends: ${shlibs:Depends},
+  ${misc:Depends},
+  libcsfml-audio1.5 (= ${binary:Version}) |
+  libcsfml-graphics1.5 (= ${binary:Version}) |
+  libcsfml-network1.5 (= ${binary:Version}) |
+  libcsfml-system1.5 (= ${binary:Version}) |
+  libcsfml-window1.5 (= ${binary:Version})
 Description: Libraries for the C Binding of SFML - Debug Files
  SFML is an simple but fast library for providing access
  to multimedia libraries. It can be used to develop OpenGL
@@ -96,4 +104,3 @@ Description: Libraries for the C Binding of SFML - Window Part
  Development
  .
  The Window library provides basic utilities for creating and managing Windows
-
diff --git a/debian/rules b/debian/rules
index 857f78f..475b85e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,15 +9,15 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-include /usr/share/quilt/quilt.make 
--include /usr/share/topgit/tg2quilt.mk
+include /usr/share/quilt/quilt.make
+include  $(wildcard /usr/share/topgit/tg2quilt.mk)
 
 # shared library versions, option 1
 version=1.5.0
 major=1
 
 build: build-stamp
-build-stamp: $(QUILT_STAMPFN)  
+build-stamp: $(QUILT_STAMPFN)
 	dh_testdir
 
 #	Add here commands to compile the package.
@@ -32,14 +32,14 @@ clean: unpatch
 #	Add here commands to clean up after the build process.
 	$(MAKE) -C CSFML mrproper
 
-	rm -Rf .pc 
+	rm -Rf .pc
 
 	dh_clean build-stamp configure-stamp
 
 install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k 
+	dh_prep
 	dh_installdirs
 
 #	Add here commands to install the package into debian/tmp
@@ -54,7 +54,7 @@ binary-indep: build install
 binary-arch: build install
 	dh_testdir
 	dh_testroot
-	dh_installchangelogs 
+	dh_installchangelogs
 	dh_installdocs
 	dh_installexamples
 	dh_install --fail-missing --sourcedir=debian/tmp

-- 
C Bindings for the SFML Library