[Forensics-changes] [SCM] debian-forensics/libphash branch, debian, updated. debian/0.9.0-2-9-gdf4f113

[Christophe Monniez]

The following commit has been merged in the debian branch:
commit e9ce2a86615df2470506f6374cba71bd268346b9
Author: Christophe Monniez <christophe.monniez at fccu.be>
Date:   Thu Dec 23 11:12:43 2010 +0100

    Removing obsolete patch.

diff --git a/debian/control b/debian/control
index 83e7ee8..16cc0bd 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, libsndfile1-dev, libsamplerate0-dev, libmpg123-dev, dpatch
+Build-Depends: debhelper (>= 7), libavformat-dev, libavcodec-dev, libswscale-dev, libfftw3-dev, libjpeg-dev, libpng-dev, cimg-dev, libsndfile1-dev, libsamplerate0-dev, libmpg123-dev
 Standards-Version: 3.9.1
 Homepage: http://phash.org
 Vcs-Browser: http://git.debian.org/?p=forensics/libphash.git
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 707604e..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-01_build_on_kfreebsd
diff --git a/debian/patches/01_build_on_kfreebsd.dpatch b/debian/patches/01_build_on_kfreebsd.dpatch
deleted file mode 100755
index 2d38981..0000000
--- a/debian/patches/01_build_on_kfreebsd.dpatch
+++ /dev/null
@@ -1,28 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_build_on_kfreebsd.dpatch by Tiago Bortoletto Vaz <tiago at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix for building in other systems but linux
-
- at DPATCH@
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' libphash~/src/pHash.cpp libphash/src/pHash.cpp
---- libphash~/src/pHash.cpp	2010-03-28 18:23:01.000000000 +0000
-+++ libphash/src/pHash.cpp	2010-05-15 03:06:57.000000000 +0000
-@@ -34,7 +34,7 @@
- int ph_num_threads()
- {
- 	int numCPU = 1;
--	#ifdef linux
-+	#ifdef __GLIBC__
- 		numCPU = sysconf( _SC_NPROCESSORS_ONLN );
- 	#else
- 		nt mib[4];
-@@ -1098,7 +1098,7 @@
- 	m->branchfactor = 2;
-     	m->pathlength = 5;
-     	m->leafcapacity = 23;
--    	#ifdef linux
-+	#ifdef __GLIBC__
- 		m->pgsize = sysconf(_SC_PAGE_SIZE);
- 	#else
- 		m->pgsize = getpagesize();

-- 
debian-forensics/libphash