[SCM] Sample data reduction pipeline branch, debian, updated. 18bd2af5aae85b7f488b472309c7ed8d6546e7d6

[Ole Streicher]

The following commit has been merged in the debian branch:
commit 3aac218f421e3b43adc3841d309d09f331454764
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Fri Jun 29 14:32:52 2012 +0200

    Add multi-arch support

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 cab96cc..69c5a8f 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: science
 Priority: optional
 Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: Ole Streicher <debian at liska.ath.cx>
-Build-Depends: debhelper (>= 8), dh-autoreconf, libcpl-dev (>= 5.3.1)
+Build-Depends: debhelper (>= 9), dh-autoreconf, libcpl-dev (>= 5.3.1)
 Standards-Version: 3.9.3
 Homepage: http://www.eso.org/sci/software/pipelines/iiinstrument
 Vcs-Git: git://git.debian.org/git/debian-science/packages/cpl-plugin-iiinstrument.git
@@ -12,11 +12,13 @@ Vcs-Browser: http://git.debian.org/?p=debian-science/packages/cpl-plugin-iiinstr
 Package: cpl-plugin-iiinstrument
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}, cpl-plugin-iiinstrument-calib
+Multi-Arch: same
 Description: Sample data reduction pipeline
  This is just an example data reduction pipeline.
 
 Package: cpl-plugin-iiinstrument-calib
 Architecture: all
+Multi-Arch: foreign
 Depends: ${misc:Depends}
 Description: Sample data reduction pipeline calibration data 
  This is just the calibration data of an example data reduction pipeline.
diff --git a/debian/cpl-plugin-iiinstrument.install b/debian/cpl-plugin-iiinstrument.install
index cdda5da..f1d0181 100644
--- a/debian/cpl-plugin-iiinstrument.install
+++ b/debian/cpl-plugin-iiinstrument.install
@@ -1,2 +1 @@
 usr/lib/*
-
diff --git a/debian/patches/set_plugindir.patch b/debian/patches/set_plugindir.patch
index 9060a05..7e6bc2c 100644
--- a/debian/patches/set_plugindir.patch
+++ b/debian/patches/set_plugindir.patch
@@ -7,7 +7,7 @@ Description: Set the plugin directory so that esorex and python-cpl can find it.
  
      if test -z "$plugindir"; then
 -        plugindir='${libdir}/esopipes-plugins/${PACKAGE}-${VERSION}'
-+        plugindir='${libdir}/plugins/${PACKAGE}-${VERSION}'
++        plugindir='${libdir}/cpl/plugins/${PACKAGE}-${VERSION}'
      fi
  
      if test -z "$privatelibdir"; then
diff --git a/debian/patches/use-std-paths-for-cpl.patch b/debian/patches/use-std-paths-for-cpl.patch
index 63f02a6..ae95068 100644
--- a/debian/patches/use-std-paths-for-cpl.patch
+++ b/debian/patches/use-std-paths-for-cpl.patch
@@ -1,8 +1,8 @@
 Author: Ole Streicher <debian at liska.ath.cx>
 Description: Use standard path and name for cpl
---- cpl-plugin-iiinstrument-0.0.1.orig/m4macros/cpl.m4
-+++ cpl-plugin-iiinstrument-0.0.1/m4macros/cpl.m4
-@@ -41,7 +41,7 @@ AC_DEFUN([CPL_CHECK_LIBS],
+--- a/m4macros/cpl.m4
++++ b/m4macros/cpl.m4
+@@ -41,7 +41,7 @@
      AC_MSG_CHECKING([for CPL])
  
      cpl_check_cpl_header="cpl_macros.h"
@@ -11,3 +11,11 @@ Description: Use standard path and name for cpl
  
      cpl_includes=""
      cpl_libraries=""
+@@ -97,6 +97,7 @@
+             cpl_libdirs="/opt/cpl/lib \
+                          /usr/local/lib \
+                          /usr/local/cpl/lib \
++			 /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)
+                          /usr/lib"
+ 
+             test -n "$CPLDIR" && cpl_libdirs="$CPLDIR/lib $cpl_libdirs"
diff --git a/debian/rules b/debian/rules
index 3f40a9a..dee4f0e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,7 @@
 	dh  $@ --with autoreconf
 
 override_dh_auto_configure:
-	dh_auto_configure -- --prefix=/usr/ --lib-dir=/usr/lib/cpl --with-cpl=/usr 
+	dh_auto_configure -- --prefix=/usr/
 
 override_dh_makeshlibs:
 	sed -i "/dependency_libs/ s/'.*'/''/" `find . -name '*.la'`

-- 
Sample data reduction pipeline