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

[Ole Streicher]

The following commit has been merged in the debian branch:
commit 5fd195fd8b843897eafceb7a7a5b5c7c6faec04b
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Fri Jun 29 10:07:21 2012 +0200

    Split debian-changes

diff --git a/debian/patches/debian-changes-0.0.1-1 b/debian/patches/debian-changes-0.0.1-1
deleted file mode 100644
index d74a0c8..0000000
--- a/debian/patches/debian-changes-0.0.1-1
+++ /dev/null
@@ -1,69 +0,0 @@
-Description: Upstream changes introduced in version 0.0.1-1
- This patch has been created by dpkg-source during the package build.
- Here's the last changelog entry, hopefully it gives details on why
- those changes were made:
- .
- cpl-plugin-iiinstrument (0.0.1-1) unstable; urgency=low
- .
-   * New package. Closes: #00000
- .
- The person named in the Author field signed this changelog entry.
-Author: Ole Streicher <debian at liska.ath.cx>
-Bug-Debian: http://bugs.debian.org/00000
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: http://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
-
---- 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],
-     AC_MSG_CHECKING([for CPL])
- 
-     cpl_check_cpl_header="cpl_macros.h"
--    cpl_check_cpl_lib="libcplcore.la"
-+    cpl_check_cpl_lib="libcplcore.a"
- 
-     cpl_includes=""
-     cpl_libraries=""
---- 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
- LIBIIINSTRUMENT = $(top_builddir)/iiinstrument/libiiinstrument.la
- 
- INCLUDES = $(all_includes)
--LDADD = $(LIBIIINSTRUMENT)
-+LDADD = $(LIBIIINSTRUMENT) -lcplcore -lcplui
- 
- check_PROGRAMS = iiinstrument_dfs-test
- 
---- 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],
- [
- 
-     if test -z "$plugindir"; then
--        plugindir='${libdir}/esopipes-plugins/${PACKAGE}-${VERSION}'
-+        plugindir='${libdir}/plugins/${PACKAGE}-${VERSION}'
-     fi
- 
-     if test -z "$privatelibdir"; then
---- 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 
- 
- 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/libadd_cpl.patch b/debian/patches/libadd_cpl.patch
new file mode 100644
index 0000000..ea34e7d
--- /dev/null
+++ b/debian/patches/libadd_cpl.patch
@@ -0,0 +1,23 @@
+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
+ LIBIIINSTRUMENT = $(top_builddir)/iiinstrument/libiiinstrument.la
+ 
+ INCLUDES = $(all_includes)
+-LDADD = $(LIBIIINSTRUMENT)
++LDADD = $(LIBIIINSTRUMENT) -lcplcore -lcplui
+ 
+ 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 
+ 
+ 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/series b/debian/patches/series
index de18d3b..e2c2220 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,3 @@
-debian-changes-0.0.1-1
+libadd_cpl.patch
+set_plugindir.patch
+use-std-paths-for-cpl.patch
diff --git a/debian/patches/set_plugindir.patch b/debian/patches/set_plugindir.patch
new file mode 100644
index 0000000..9060a05
--- /dev/null
+++ b/debian/patches/set_plugindir.patch
@@ -0,0 +1,13 @@
+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],
+ [
+ 
+     if test -z "$plugindir"; then
+-        plugindir='${libdir}/esopipes-plugins/${PACKAGE}-${VERSION}'
++        plugindir='${libdir}/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
new file mode 100644
index 0000000..63f02a6
--- /dev/null
+++ b/debian/patches/use-std-paths-for-cpl.patch
@@ -0,0 +1,13 @@
+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],
+     AC_MSG_CHECKING([for CPL])
+ 
+     cpl_check_cpl_header="cpl_macros.h"
+-    cpl_check_cpl_lib="libcplcore.la"
++    cpl_check_cpl_lib="libcplcore.so"
+ 
+     cpl_includes=""
+     cpl_libraries=""

-- 
Sample data reduction pipeline