[SCM] libepsilon branch, master, updated. upstream/0.8.1-33-g8ed8ab9

[Bas Couwenberg]

The following commit has been merged in the master branch:
commit 74e13bea9f8f30f7fc3ad520c22daf167f003b42
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Jan 15 21:19:14 2014 +0100

    Support Multi-Arch.

diff --git a/debian/changelog b/debian/changelog
index c7c85c0..a1e360c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ libepsilon (0.9.2-1) UNRELEASED; urgency=low
   * Change priority to optional.
   * Update copyright file format from dep5 to copyright-format 1.0.
   * Bump Debhelper compatibility to 9.
+  * Support Multi-Arch.
 
  -- Bas Couwenberg <sebastic at xs4all.nl>  Wed, 15 Jan 2014 20:58:42 +0100
 
diff --git a/debian/control b/debian/control
index 93be114..adc93bc 100644
--- a/debian/control
+++ b/debian/control
@@ -14,6 +14,7 @@ Homepage: http://sourceforge.net/projects/epsilon-project
 
 Package: libepsilon-dev
 Architecture: any
+Multi-Arch: same
 Section: libdevel
 Depends: libepsilon0 (= ${binary:Version}),
          ${misc:Depends}
@@ -30,7 +31,9 @@ Description: A library for wavelet image compression - development files
 
 Package: libepsilon0
 Architecture: any
+Multi-Arch: same
 Section: libs
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
          ${misc:Depends}
 Description: A library for wavelet image compression
diff --git a/debian/libepsilon-dev.install b/debian/libepsilon-dev.install
index d1bffed..a3c8f6c 100644
--- a/debian/libepsilon-dev.install
+++ b/debian/libepsilon-dev.install
@@ -1,3 +1,3 @@
 usr/include/*
-usr/lib/lib*.a
-usr/lib/lib*.so
+usr/lib/*/lib*.a
+usr/lib/*/lib*.so
diff --git a/debian/libepsilon0.install b/debian/libepsilon0.install
index d0dbfd1..3ddde58 100644
--- a/debian/libepsilon0.install
+++ b/debian/libepsilon0.install
@@ -1 +1 @@
-usr/lib/lib*.so.*
+usr/lib/*/lib*.so.*

-- 
A library for wavelet image compression