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

[Ole Streicher]

The following commit has been merged in the debian branch:
commit e0e84244d1f7e87f776b529c3ccd724a965f177f
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Wed Apr 3 14:33:34 2013 +0200

    update for new upstream version

diff --git a/debian/changelog b/debian/changelog
index 3e5ab93..aea0832 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
-cpl-plugin-iiinstrument (0.0.2-1) unstable; urgency=low
+cpl-plugin-iiinstrument (0.0.3-1) unstable; urgency=low
 
   * New package. Closes: #00000
 
- -- Ole Streicher <debian at liska.ath.cx>  Thu, 28 Feb 2012 13:40:00 +0100
+ -- Ole Streicher <debian at liska.ath.cx>  Wed, 03 Apr 2013 14:10:00 +0200
diff --git a/debian/control b/debian/control
index 04e2343..c1c64cd 100644
--- a/debian/control
+++ b/debian/control
@@ -4,11 +4,10 @@ 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 (>= 9), dh-autoreconf, libcpl-dev (>= 5.3.1)
-DM-Upload-Allowed: yes
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
 Homepage: http://www.eso.org/sci/software/pipelines/iiinstrument
-Vcs-Git: git://git.debian.org/git/debian-science/packages/cpl-plugin-iiinstrument.git
-Vcs-Browser: http://git.debian.org/?p=debian-science/packages/cpl-plugin-iiinstrument.git
+Vcs-Git: git://anonscm.debian.org/debian-science/packages/cpl-plugin-iiinstrument.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/cpl-plugin-iiinstrument.git
 
 Package: cpl-plugin-iiinstrument
 Architecture: any
diff --git a/debian/patches/add_test_recipe.patch b/debian/patches/add_test_recipe.patch
index 27a08fb..6a4c7c4 100644
--- a/debian/patches/add_test_recipe.patch
+++ b/debian/patches/add_test_recipe.patch
@@ -429,11 +429,11 @@ Description: This patch adds another recipe that is mainly used for the
 --- a/recipes/Makefile.am
 +++ b/recipes/Makefile.am
 @@ -44,3 +44,8 @@
- rrrecipe_calib_la_LIBADD = $(LIBIIINSTRUMENT)
- rrrecipe_calib_la_LDFLAGS = -module -avoid-version
+ rrrecipe_calib_la_LIBADD = $(LIBIIINSTRUMENT) $(LIBCPLUI) $(LIBCPLDFS) $(LIBCPLCORE)
+ rrrecipe_calib_la_LDFLAGS = -module -avoid-version -no-undefined
  rrrecipe_calib_la_DEPENDENCIES = $(LIBIIINSTRUMENT)
 +
 +rtest_la_SOURCES = rtest.c
-+rtest_la_LIBADD = $(LIBIIINSTRUMENT) -lcplcore -lcpldfs -lcplui
++rtest_la_LIBADD = $(LIBIIINSTRUMENT) $(LIBCPLUI) $(LIBCPLDFS) $(LIBCPLCORE)
 +rtest_la_LDFLAGS = -module -avoid-version
 +rtest_la_DEPENDENCIES = $(LIBIIINSTRUMENT)
diff --git a/debian/patches/libadd_cpl.patch b/debian/patches/libadd_cpl.patch
index 4a797a0..702ec2f 100644
--- a/debian/patches/libadd_cpl.patch
+++ b/debian/patches/libadd_cpl.patch
@@ -1,24 +1,18 @@
 Author: Ole Streicher <debian at liska.ath.cx>
 Description: Add the cpl libraries to the recips.so and the test program
---- a/iiinstrument/tests/Makefile.am
-+++ b/iiinstrument/tests/Makefile.am
-@@ -32,7 +32,7 @@
- LIBIIINSTRUMENT = $(top_builddir)/iiinstrument/libiiinstrument.la
- 
- INCLUDES = $(all_includes)
--LDADD = $(LIBIIINSTRUMENT)
-+LDADD = $(LIBIIINSTRUMENT) -lcplcore -lcplui
- 
- check_PROGRAMS = iiinstrument_dfs-test
- 
 --- a/recipes/Makefile.am
 +++ b/recipes/Makefile.am
-@@ -36,7 +36,7 @@
+@@ -36,11 +36,11 @@
  plugin_LTLIBRARIES = rrrecipe.la rrrecipe_calib.la 
  
  rrrecipe_la_SOURCES = rrrecipe.c 
 -rrrecipe_la_LIBADD = $(LIBIIINSTRUMENT)
-+rrrecipe_la_LIBADD = $(LIBIIINSTRUMENT) -lcplcore -lcpldfs -lcplui
- rrrecipe_la_LDFLAGS = -module -avoid-version
++rrrecipe_la_LIBADD = $(LIBIIINSTRUMENT) $(LIBCPLUI) $(LIBCPLDFS) $(LIBCPLCORE)
+ rrrecipe_la_LDFLAGS = -module -avoid-version -no-undefined
  rrrecipe_la_DEPENDENCIES = $(LIBIIINSTRUMENT)
  
+ rrrecipe_calib_la_SOURCES = rrrecipe_calib.c 
+-rrrecipe_calib_la_LIBADD = $(LIBIIINSTRUMENT)
++rrrecipe_calib_la_LIBADD = $(LIBIIINSTRUMENT) $(LIBCPLUI) $(LIBCPLDFS) $(LIBCPLCORE)
+ rrrecipe_calib_la_LDFLAGS = -module -avoid-version -no-undefined
+ rrrecipe_calib_la_DEPENDENCIES = $(LIBIIINSTRUMENT)
diff --git a/debian/patches/use-std-paths-for-cpl.patch b/debian/patches/use-std-paths-for-cpl.patch
index ae95068..645f95a 100644
--- a/debian/patches/use-std-paths-for-cpl.patch
+++ b/debian/patches/use-std-paths-for-cpl.patch
@@ -2,20 +2,20 @@ Author: Ole Streicher <debian at liska.ath.cx>
 Description: Use standard path and name for cpl
 --- a/m4macros/cpl.m4
 +++ b/m4macros/cpl.m4
-@@ -41,7 +41,7 @@
+@@ -1250,7 +1250,7 @@
      AC_MSG_CHECKING([for CPL])
  
-     cpl_check_cpl_header="cpl_macros.h"
--    cpl_check_cpl_lib="libcplcore.la"
+     cpl_check_cpl_header="cpl.h"
+-    cpl_check_cpl_lib="libcplcore.a"
 +    cpl_check_cpl_lib="libcplcore.so"
  
-     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"
+     cpl_incdirs=""
+     cpl_libdirs=""
+@@ -1325,6 +1325,7 @@
+                 cpl_libdirs="$cpl_libdirs /usr/local/lib"
+                 cpl_libdirs="$cpl_libdirs /usr/local/lib32"
+                 cpl_libdirs="$cpl_libdirs /usr/lib64"
++		cpl_libdirs="$cpl_libdirs /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)"
+                 cpl_libdirs="$cpl_libdirs /usr/lib"
+                 cpl_libdirs="$cpl_libdirs /usr/lib32"
  
-             test -n "$CPLDIR" && cpl_libdirs="$CPLDIR/lib $cpl_libdirs"

-- 
Sample data reduction pipeline