[cpl-plugin-sinfo] 18/42: Adjust debian files for new release

[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-sinfo.

commit 9f1142c0364ebbccb33ab62c10d1812fd7416e24
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Tue May 7 16:37:49 2013 +0200

    Adjust debian files for new release
---
 debian/changelog                     |    8 +-------
 debian/patches/format_security.patch |    2 +-
 debian/patches/libadd_cpl.patch      |   23 +++++++++++++++--------
 3 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5ea5cd0..c192c2d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,4 @@
-cpl-plugin-sinfo (2.3.2-1~test4) quantal; urgency=low
-
-  * Fix implicite fucntion declaration
-
- -- Ole Streicher <debian at liska.ath.cx>  Thu, 10 Jan 2013 09:45:00 +0100
-
-cpl-plugin-sinfo (2.3.2-1) quantal; urgency=low
+cpl-plugin-sinfo (2.3.3-1) UNRELEASED; urgency=low
 
   * Initial release. (Closes: #XXXXXX)
 
diff --git a/debian/patches/format_security.patch b/debian/patches/format_security.patch
index bc06783..26aba2b 100644
--- a/debian/patches/format_security.patch
+++ b/debian/patches/format_security.patch
@@ -42,7 +42,7 @@ Description: Fix format security errors
     }
 --- a/sinfoni/sinfo_dfs.c
 +++ b/sinfoni/sinfo_dfs.c
-@@ -1734,8 +1734,8 @@
+@@ -1733,8 +1733,8 @@
  int sinfo_check_rec_status(const int val) {
     if(cpl_error_get_code() != CPL_ERROR_NONE) {
        sinfo_msg_error("error before %d",val);
diff --git a/debian/patches/libadd_cpl.patch b/debian/patches/libadd_cpl.patch
index 3dc067d..4988a8b 100644
--- a/debian/patches/libadd_cpl.patch
+++ b/debian/patches/libadd_cpl.patch
@@ -2,7 +2,7 @@ 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
-@@ -74,199 +74,199 @@
+@@ -75,205 +75,205 @@
  #New recipes
  
  #sinfo_utl_table_test_la_SOURCES = sinfo_utl_table_test.c
@@ -62,13 +62,13 @@ Description: Add the cpl libraries to the recips.so and the test program
  
  #sinfo_rec_psf_la_SOURCES = sinfo_rec_psf.c 
 -#sinfo_rec_psf_la_LIBADD = $(LIBSINFONI) 
-+#sinfo_rec_psf_la_LIBADD = $(LIBSINFONI)  $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
++#sinfo_rec_psf_la_LIBADD = $(LIBSINFONI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
  #sinfo_rec_psf_la_LDFLAGS = -module -avoid-version
  #sinfo_rec_psf_la_DEPENDENCIES = $(LIBSINFONI)
  
  sinfo_rec_pupil_la_SOURCES = sinfo_rec_pupil.c 
 -sinfo_rec_pupil_la_LIBADD = $(LIBSINFONI) 
-+sinfo_rec_pupil_la_LIBADD = $(LIBSINFONI)  $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
++sinfo_rec_pupil_la_LIBADD = $(LIBSINFONI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
  sinfo_rec_pupil_la_LDFLAGS = -module -avoid-version
  sinfo_rec_pupil_la_DEPENDENCIES = $(LIBSINFONI)
  
@@ -135,11 +135,11 @@ Description: Add the cpl libraries to the recips.so and the test program
  #sinfo_utl_ima_cube_ks_test_la_LDFLAGS = -module -avoid-version
  #sinfo_utl_ima_cube_ks_test_la_DEPENDENCIES = $(LIBSINFONI)
  
- sinfo_utl_eff_la_SOURCES = sinfo_utl_eff.c
--sinfo_utl_eff_la_LIBADD = $(LIBSINFONI)
-+sinfo_utl_eff_la_LIBADD = $(LIBSINFONI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- sinfo_utl_eff_la_LDFLAGS = -module -avoid-version
- sinfo_utl_eff_la_DEPENDENCIES = $(LIBSINFONI)
+ #sinfo_utl_eff_la_SOURCES = sinfo_utl_eff.c
+-#sinfo_utl_eff_la_LIBADD = $(LIBSINFONI)
++#sinfo_utl_eff_la_LIBADD = $(LIBSINFONI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ #sinfo_utl_eff_la_LDFLAGS = -module -avoid-version
+ #sinfo_utl_eff_la_DEPENDENCIES = $(LIBSINFONI)
  
  sinfo_utl_cube2spectrum_la_SOURCES = sinfo_utl_cube2spectrum.c
 -sinfo_utl_cube2spectrum_la_LIBADD = $(LIBSINFONI)
@@ -240,3 +240,10 @@ Description: Add the cpl libraries to the recips.so and the test program
  #sinfo_utl_seds_la_LDFLAGS = -module -avoid-version
  #sinfo_utl_seds_la_DEPENDENCIES = $(LIBSINFONI)
  
+ 
+ sinfo_utl_line_oh_select_la_SOURCES = sinfo_utl_line_oh_select.c
+-sinfo_utl_line_oh_select_la_LIBADD = $(LIBSINFONI)
++sinfo_utl_line_oh_select_la_LIBADD = $(LIBSINFONI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ sinfo_utl_line_oh_select_la_LDFLAGS = -module -avoid-version
+ sinfo_utl_line_oh_select_la_DEPENDENCIES = $(LIBSINFONI)
+ 

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