[Forensics-changes] [SCM] debian-forensics/libphash branch, debian, updated. debian/0.9.0-1-5-ga5e5573

[Tiago Bortoletto Vaz]

The following commit has been merged in the debian branch:
commit 18c1578271745b388816a89cbe0df345dc8babc2
Author: Tiago Bortoletto Vaz <tiago at debian-ba.org>
Date:   Sat May 15 03:10:50 2010 +0000

    Added patch 01_build_on_kfreebsd.dpatch: testing libc variant rather than kernel in order to build for kfreebsd. Thanks to Petr Salinger and Cyril Brulebois. (Closes: #576895)

diff --git a/debian/changelog b/debian/changelog
index a2b93d1..44b76e9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libphash (0.9.0-2) unstable; urgency=low
+
+  * Added patch 01_build_on_kfreebsd.dpatch: testing libc variant rather than
+    kernel in order to build for kfreebsd. Thanks to Petr Salinger and Cyril
+    Brulebois. (Closes: #576895)
+
+ -- Tiago Bortoletto Vaz <tiago at debian.org>  Sat, 15 May 2010 03:07:53 +0000
+
 libphash (0.9.0-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 9058790..9cf6ad8 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: libs
 Priority: optional
 Maintainer: Debian Forensics <forensics-devel at lists.alioth.debian.org>
 Uploaders: Tiago Bortoletto Vaz <tiago at debian.org>
-Build-Depends: debhelper (>= 7), libavformat-dev, libavcodec-dev, libswscale-dev, libfftw3-dev, libjpeg-dev, libpng-dev, cimg-dev
+Build-Depends: debhelper (>= 7), libavformat-dev, libavcodec-dev, libswscale-dev, libfftw3-dev, libjpeg-dev, libpng-dev, cimg-dev, dpatch
 Standards-Version: 3.8.4
 Homepage: http://phash.org
 Vcs-Browser: http://git.debian.org/?p=forensics/libphash.git
diff --git a/debian/rules b/debian/rules
index 2a40804..828b316 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,12 +2,24 @@
 
 #export DH_VERBOSE=1
 
-clean:
-	dh $@
+clean: clean-patched unpatch
+
+clean-patched:
+	dh_clean
 	rm -f build-stamp
 
+patch: patch-stamp
+
+patch-stamp:
+	dpatch apply-all
+	dpatch cat-all >patch-stamp
+
+unpatch:
+	dpatch deapply-all
+	rm -rf patch-stamp debian/patched
+
 build: build-stamp
-build-stamp:
+build-stamp: patch
 	dh_testdir
 	dh_auto_configure
 	touch $@

-- 
debian-forensics/libphash