[cpl-plugin-giraf] 16/34: Adjust for version 2.11

[Ole Streicher]

This is an automated email from the git hooks/post-receive script.

olebole-guest pushed a commit to branch debian
in repository cpl-plugin-giraf.

commit 7aed57540f5adcfd19c1f7f28b66ba77793e5310
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Tue May 7 11:13:43 2013 +0200

    Adjust for version 2.11
---
 debian/changelog                     |    2 +-
 debian/cpl-plugin-giraf.install      |    2 ++
 debian/patches/format_security.patch |   20 --------------------
 debian/patches/libadd_cpl.patch      |   23 +++++------------------
 debian/patches/series                |    1 -
 debian/patches/set_plugindir.patch   |    2 +-
 6 files changed, 9 insertions(+), 41 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 14f56c2..97c7c3a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-cpl-plugin-giraf (2.9.2-1) UNRELEASED; urgency=low
+cpl-plugin-giraf (2.11-1) UNRELEASED; urgency=low
 
   * Initial release. (Closes: #XXXXXX)
 
diff --git a/debian/cpl-plugin-giraf.install b/debian/cpl-plugin-giraf.install
new file mode 100644
index 0000000..fef075b
--- /dev/null
+++ b/debian/cpl-plugin-giraf.install
@@ -0,0 +1,2 @@
+calib/dic usr/share/cpl-plugins/giraf
+calib/gasgano usr/share/cpl-plugins/giraf
diff --git a/debian/patches/format_security.patch b/debian/patches/format_security.patch
deleted file mode 100644
index 81f4242..0000000
--- a/debian/patches/format_security.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/giraffe/gimatrix.c
-+++ b/giraffe/gimatrix.c
-@@ -878,7 +878,7 @@
-         cx_string_append(buffer, cx_string_get(tmp));
-     }
- 
--    cpl_msg_debug("", cx_string_get(buffer));
-+    cpl_msg_debug("", "%s", cx_string_get(buffer));
- 
-     /* print values */
-     for (k = 0, i = 0; i < nr; i++) {
-@@ -888,7 +888,7 @@
-             cx_string_append(buffer, cx_string_get(tmp));
-         }
- 
--        cpl_msg_debug("", cx_string_get(buffer));
-+        cpl_msg_debug("", "%s", cx_string_get(buffer));
-     }
- 
-     cx_string_delete(tmp);
diff --git a/debian/patches/libadd_cpl.patch b/debian/patches/libadd_cpl.patch
index d34b4c2..b0d5639 100644
--- a/debian/patches/libadd_cpl.patch
+++ b/debian/patches/libadd_cpl.patch
@@ -2,8 +2,8 @@ Author: Ole Streicher <debian at liska.ath.cx>
 Description: Add the cpl libraries to the recips.so and the test program
 --- a/recipes/Makefile.am
 +++ b/recipes/Makefile.am
-@@ -36,47 +36,47 @@
- 	giscience.la gistandard.la giwavecalibration.la
+@@ -35,36 +35,36 @@
+ 	gimasterflat.la giscience.la gistandard.la giwavecalibration.la
  
  gimasterflat_la_SOURCES = gimasterflat.c
 -gimasterflat_la_LIBADD = $(LIBGIRAFFE)
@@ -46,25 +46,12 @@ Description: Add the cpl libraries to the recips.so and the test program
 +giframestack_la_LIBADD = $(LIBGIRAFFE) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
  giframestack_la_LDFLAGS = -module -avoid-version
  giframestack_la_DEPENDENCIES = $(LIBGIRAFFE)
- 
- 
- giccdlin_la_SOURCES = giccdlin.c
--giccdlin_la_LIBADD = $(LIBGIRAFFE)
-+giccdlin_la_LIBADD = $(LIBGIRAFFE) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- giccdlin_la_LDFLAGS = -avoid-version -module
- giccdlin_la_DEPENDENCIES = $(LIBGIRAFFE)
- 
- giccdron_la_SOURCES = giccdron.c
--giccdron_la_LIBADD = $(LIBGIRAFFE)
-+giccdron_la_LIBADD = $(LIBGIRAFFE) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- giccdron_la_LDFLAGS = -avoid-version -module
- giccdron_la_DEPENDENCIES = $(LIBGIRAFFE)
 --- a/tests/Makefile.am
 +++ b/tests/Makefile.am
-@@ -32,7 +32,7 @@
- LIBGIRAFFE = $(top_builddir)/giraffe/libgiraffe.la
+@@ -33,7 +33,7 @@
+ 
+ AM_CPPFLAGS = -I$(top_builddir)/giraffe -I$(top_srcdir)/giraffe
  
- INCLUDES = -I$(top_builddir)/giraffe -I$(top_srcdir)/giraffe
 -LDADD = $(LIBGIRAFFE)
 +LDADD = $(LIBGIRAFFE) $(LIBCPLCORE) $(LIBCPLUI)
  
diff --git a/debian/patches/series b/debian/patches/series
index 3306368..e2c2220 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 libadd_cpl.patch
 set_plugindir.patch
 use-std-paths-for-cpl.patch
-format_security.patch
diff --git a/debian/patches/set_plugindir.patch b/debian/patches/set_plugindir.patch
index 7282953..036cd25 100644
--- a/debian/patches/set_plugindir.patch
+++ b/debian/patches/set_plugindir.patch
@@ -9,5 +9,5 @@ Description: Set the plugin directory so that esorex and python-cpl can find it.
 -        plugindir='${libdir}/esopipes-plugins/${PACKAGE}-${VERSION}'
 +        plugindir='${libdir}/cpl/plugins/${PACKAGE}-${VERSION}'
      fi
+     AC_SUBST(plugindir)
      
-     if test -z "$configdir"; then

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/cpl-plugin-giraf.git