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

[Ole Streicher]

The following commit has been merged in the debian branch:
commit 8b3f59daa041212fb2b5e1074c340f421f2b1318
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Thu Jan 3 11:01:40 2013 +0100

    update for new upstream version

diff --git a/debian/patches/add_test_recipe.patch b/debian/patches/add_test_recipe.patch
index 98a66ed..27a08fb 100644
--- a/debian/patches/add_test_recipe.patch
+++ b/debian/patches/add_test_recipe.patch
@@ -428,17 +428,10 @@ Description: This patch adds another recipe that is mainly used for the
 +}
 --- a/recipes/Makefile.am
 +++ b/recipes/Makefile.am
-@@ -33,9 +33,14 @@
- 
- noinst_HEADERS = 
- 
--plugin_LTLIBRARIES = rrrecipe.la 
-+plugin_LTLIBRARIES = rrrecipe.la rtest.la
- 
- rrrecipe_la_SOURCES = rrrecipe.c 
- rrrecipe_la_LIBADD = $(LIBIIINSTRUMENT) -lcplcore -lcpldfs -lcplui
- rrrecipe_la_LDFLAGS = -module -avoid-version
- rrrecipe_la_DEPENDENCIES = $(LIBIIINSTRUMENT)
+@@ -44,3 +44,8 @@
+ rrrecipe_calib_la_LIBADD = $(LIBIIINSTRUMENT)
+ rrrecipe_calib_la_LDFLAGS = -module -avoid-version
+ rrrecipe_calib_la_DEPENDENCIES = $(LIBIIINSTRUMENT)
 +
 +rtest_la_SOURCES = rtest.c
 +rtest_la_LIBADD = $(LIBIIINSTRUMENT) -lcplcore -lcpldfs -lcplui
diff --git a/debian/patches/libadd_cpl.patch b/debian/patches/libadd_cpl.patch
index ea34e7d..4a797a0 100644
--- a/debian/patches/libadd_cpl.patch
+++ b/debian/patches/libadd_cpl.patch
@@ -1,8 +1,8 @@
 Author: Ole Streicher <debian at liska.ath.cx>
 Description: Add the cpl libraries to the recips.so and the test program
---- cpl-plugin-iiinstrument-0.0.1.orig/iiinstrument/tests/Makefile.am
-+++ cpl-plugin-iiinstrument-0.0.1/iiinstrument/tests/Makefile.am
-@@ -32,7 +32,7 @@ endif
+--- a/iiinstrument/tests/Makefile.am
++++ b/iiinstrument/tests/Makefile.am
+@@ -32,7 +32,7 @@
  LIBIIINSTRUMENT = $(top_builddir)/iiinstrument/libiiinstrument.la
  
  INCLUDES = $(all_includes)
@@ -11,13 +11,14 @@ Description: Add the cpl libraries to the recips.so and the test program
  
  check_PROGRAMS = iiinstrument_dfs-test
  
---- cpl-plugin-iiinstrument-0.0.1.orig/recipes/Makefile.am
-+++ cpl-plugin-iiinstrument-0.0.1/recipes/Makefile.am
-@@ -36,6 +36,6 @@ noinst_HEADERS =
- plugin_LTLIBRARIES = rrrecipe.la 
+--- a/recipes/Makefile.am
++++ b/recipes/Makefile.am
+@@ -36,7 +36,7 @@
+ 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_DEPENDENCIES = $(LIBIIINSTRUMENT)
+ 
diff --git a/debian/patches/set_plugindir.patch b/debian/patches/set_plugindir.patch
index 7e6bc2c..9c9230a 100644
--- a/debian/patches/set_plugindir.patch
+++ b/debian/patches/set_plugindir.patch
@@ -1,8 +1,8 @@
 Author: Ole Streicher <debian at liska.ath.cx>
 Description: Set the plugin directory so that esorex and python-cpl can find it.
---- cpl-plugin-iiinstrument-0.0.1.orig/acinclude.m4
-+++ cpl-plugin-iiinstrument-0.0.1/acinclude.m4
-@@ -86,7 +86,7 @@ AC_DEFUN([IIINSTRUMENT_SET_PATHS],
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -86,7 +86,7 @@
  [
  
      if test -z "$plugindir"; then

-- 
Sample data reduction pipeline