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

[Christoph Egger]

The following commit has been merged in the master branch:
commit 4f929d8f63d1f47c27a030f84ff95eeb275b8a68
Author: Christoph Egger <Christoph.Egger at gmx.de>
Date:   Thu Aug 27 01:14:57 2009 +0200

    New changelog + cleanup

diff --git a/debian/changelog b/debian/changelog
index b4db17f..2a13677 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+libsfml (1.5+repack1-2) unstable; urgency=low
+
+  * Patch include/SFML/Config.hpp to correctly detect kfreeBSD kernels
+    enables the build on these ports
+  * Bump standards version from 3.8.2 to .3 (no changes)
+  * Bump compat to 7, use debian/clean file
+  * Clean up watchfile
+  * Clean up rules as per NM-review
+  * Depend on unversioned lib{jpeg,png}-dev packages, no speical needs
+    here
+  * remove debian/*dirs files, they're unneeded
+
+ -- Christoph Egger <debian at christoph-egger.org>  Mon, 24 Aug 2009 15:20:58 +0200
+
 libsfml (1.5+repack1-1) unstable; urgency=low
 
   * [af202195] Imported Upstream version 1.5+repack1
diff --git a/debian/control b/debian/control
index b2273ec..18bf13d 100644
--- a/debian/control
+++ b/debian/control
@@ -7,9 +7,9 @@ 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, libjpeg62-dev, libpng12-dev, libglew1.5-dev, quilt, 
+  libsndfile1-dev, libjpeg-dev, libpng-dev, libglew1.5-dev, quilt, 
   libsoil-dev
-Standards-Version: 3.8.2
+Standards-Version: 3.8.3
 Homepage: http://www.sfml-dev.org/
 
 Package: libsfml-dev
diff --git a/debian/rules b/debian/rules
index 2540bc4..36145fa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,24 +5,23 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-
-version=1.5.0
+version=1.5
 major=1
 
 include /usr/share/quilt/quilt.make
 -include /usr/share/topgit/tg2quilt.mk
 
 get-orig-source:
-	cd .. ; rm -rf libsfml-1.5.orig ;  mkdir libsfml-1.5.orig ; cd libsfml-1.5.orig ; \
-		wget http://downloads.sourceforge.net/sfml/SFML-1.5-sdk-linux-32.tar.gz ; \
-		tar -xzf SFML-1.5-sdk-linux-32.tar.gz ; cd SFML-1.5 ; \
+	cd .. ; rm -rf libsfml-$(version).orig ;  mkdir libsfml-$(version).orig ; cd libsfml-$(version).orig ; \
+		wget http://downloads.sourceforge.net/sfml/SFML-$(version)-sdk-linux-32.tar.gz ; \
+		tar -xzf SFML-$(version)-sdk-linux-32.tar.gz ; cd SFML-$(version) ; \
 		find . \( -iname glew -o -iname glext -o -iname libjpeg \
 			-o -iname libpng -o -iname zlib -o -iname SOIL \) -print | xargs /bin/rm -rf ; \
 		find samples \( -name "*.jpg" -o -name "*.png" -o -name "*.[ch]pp" -o \
 			-name "*.sfx" \) -print | xargs /bin/chmod a-x  ; \
 		make mrproper ; \
-		cd .. ; rm SFML-1.5-sdk-linux-32.tar.gz; mv SFML-1.5/* . ; rm -r SFML-1.5
-	cd .. ; dpkg-source -b -i -su libsfml libsfml-1.5.orig
+		cd .. ; rm SFML-$(version)-sdk-linux-32.tar.gz; mv SFML-$(version)/* . ; rm -r SFML-$(version)
+	cd .. ; dpkg-source -b -i -su libsfml libsfml-$(version).orig
 
 build: build-stamp
 build-stamp: $(QUILT_STAMPFN)
@@ -43,7 +42,7 @@ clean: unpatch
 install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k 
+	dh_prep
 	dh_installdirs
 
 	$(MAKE) DESTDIR=$(CURDIR)/debian/tmp/usr install
diff --git a/debian/watch b/debian/watch
index 7a6a7e4..c1ed598 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,9 +1,9 @@
 # See uscan(1) for format
 version=3
 
-opts=dversionmangle=s/\+repack\d+$//g \
- http://www.sfml-dev.org/download.php http://downloads.sourceforge.net/sfml/SFML-([\d\.]*\d)-sdk-linux-32\.tar\.gz
-
 #opts=dversionmangle=s/\+repack\d+$//g \
-# http://sf.net/sfml/SFML-([\d\.]*\d)-sdk-linux\.tar\.gz
+# http://www.sfml-dev.org/download.php http://downloads.sourceforge.net/sfml/SFML-([\d\.]*\d)-sdk-linux-32\.tar\.gz
+
+opts=dversionmangle=s/\+repack\d+$//g \
+  http://sf.net/sfml/SFML-([\d\.]*\d)-sdk-linux\.tar\.gz
 

-- 
Simple and fast multimedia library for C++