[Forensics-changes] [SCM] debian-forensics/libphash branch, debian, updated. debian/0.9.4-1-13-g0867a3d

[Julien Valroff]

The following commit has been merged in the debian branch:
commit e60be0935984337b73ebb88da53d7683f944722b
Author: Julien Valroff <julien at kirya.net>
Date:   Fri Aug 19 15:35:40 2011 +0200

    Add multiarch support

diff --git a/debian/changelog b/debian/changelog
index 2961b3c..7e12e88 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,8 +10,9 @@ libphash (0.9.4-2) unstable; urgency=low
   * Drop ${shlibs:Depends} substvar from -dev package 
   * Bump standards version to 3.9.2 (no changes needed) 
   * Don't use dh override to fix CXXFLAGS 
+  * Add multiarch support 
 
- -- Julien Valroff <julien at debian.org>  Thu, 18 Aug 2011 19:20:25 +0200
+ -- Julien Valroff <julien at debian.org>  Fri, 19 Aug 2011 15:35:23 +0200
 
 libphash (0.9.4-1.1) unstable; urgency=low
 
diff --git a/debian/compat b/debian/compat
index 45a4fb7..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/control b/debian/control
index 9938ceb..93cadf7 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 (>= 8.0.0), libavformat-dev, libavcodec-dev, libswscale-dev, libfftw3-dev, libjpeg-dev, libpng-dev, cimg-dev, libsndfile1-dev, libsamplerate0-dev, libmpg123-dev
+Build-Depends: debhelper (>= 8.1.3~), libavformat-dev, libavcodec-dev, libswscale-dev, libfftw3-dev, libjpeg-dev, libpng-dev, cimg-dev, libsndfile1-dev, libsamplerate0-dev, libmpg123-dev
 Standards-Version: 3.9.2
 Homepage: http://phash.org
 Vcs-Browser: http://git.debian.org/?p=forensics/libphash.git
@@ -11,7 +11,9 @@ Vcs-Git: git://git.debian.org/forensics/libphash.git
 
 Package: libphash0
 Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
+Multi-Arch: same
 Description: Perceptual hashing library
  Unlike cryptographic hash functions which rely on an avalanche effect of
  changes in input leading to drastic changes in the output, perceptual
diff --git a/debian/libphash0-dev.install b/debian/libphash0-dev.install
index 7b82d23..aa9492b 100644
--- a/debian/libphash0-dev.install
+++ b/debian/libphash0-dev.install
@@ -1,4 +1,4 @@
-debian/tmp/usr/lib/*.so usr/lib
-debian/tmp/usr/lib/*.a usr/lib
-debian/tmp/usr/include/* usr/include
-debian/tmp/usr/lib/pkgconfig/* usr/lib/pkgconfig
+usr/lib/*/*.so
+usr/lib/*/*.a
+usr/include/*
+usr/lib/pkgconfig/*
diff --git a/debian/libphash0.install b/debian/libphash0.install
index 1dd7c70..9503874 100644
--- a/debian/libphash0.install
+++ b/debian/libphash0.install
@@ -1 +1 @@
-debian/tmp/usr/lib/*.so.* usr/lib
+debian/tmp/usr/lib/*/*.so.*

-- 
debian-forensics/libphash