[esorex] 03/04: Adjust for new upstream version

[Ole Streicher]

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

olebole-guest pushed a commit to branch debian
in repository esorex.

commit f00589437a9d2437bf9eb1704c6c6cfb8b4e908f
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Sat Apr 12 13:17:04 2014 +0200

    Adjust for new upstream version
---
 debian/changelog                         |  6 ++++++
 debian/patches/cpl60_compat.patch        | 12 ++++++------
 debian/patches/fix-autotools.patch       | 12 ------------
 debian/patches/remove-private-ltdl.patch |  4 ++--
 debian/patches/series                    |  1 -
 5 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a84e761..f19fcc9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+esorex (3.10.2-1) unstable; urgency=low
+
+  * New upstream version
+
+ -- Ole Streicher <debian at liska.ath.cx>  Sat, 12 Apr 2014 13:16:28 +0200
+
 esorex (3.10-1) unstable; urgency=low
 
   * Change distribution to unstable
diff --git a/debian/patches/cpl60_compat.patch b/debian/patches/cpl60_compat.patch
index 1203f78..eaed4ce 100644
--- a/debian/patches/cpl60_compat.patch
+++ b/debian/patches/cpl60_compat.patch
@@ -3,11 +3,11 @@ Subject: Remove function that is only in cpl >= 6.3 to establish compability
  with older (stable) versions and allow backporting.
 --- a/src/er_main.c
 +++ b/src/er_main.c
-@@ -641,7 +641,6 @@
+@@ -895,7 +895,6 @@
  
- cpl_msg_set_domain (PACKAGE);
- cpl_msg_set_time_off ();
--cpl_msg_set_threadid_off ();
- cpl_msg_set_domain_on ();
- cpl_msg_set_component_off ();
+     cpl_msg_set_domain (PACKAGE);
+     cpl_msg_set_time_off ();
+-    cpl_msg_set_threadid_off ();
+     cpl_msg_set_domain_on ();
+     cpl_msg_set_component_off ();
  
diff --git a/debian/patches/fix-autotools.patch b/debian/patches/fix-autotools.patch
deleted file mode 100644
index 44919f5..0000000
--- a/debian/patches/fix-autotools.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Author: Ole Streicher <debian at liska.ath.cx>
-Subject: Fix autotools files to allow the current version.
---- a/configure.ac
-+++ b/configure.ac
-@@ -5,6 +5,7 @@
- 
- AC_CONFIG_SRCDIR([Makefile.am])
- AC_CONFIG_AUX_DIR([admin])
-+AC_CONFIG_MACRO_DIR([m4])
- AC_CONFIG_HEADERS([config.h])
- 
- AC_CANONICAL_HOST
diff --git a/debian/patches/remove-private-ltdl.patch b/debian/patches/remove-private-ltdl.patch
index e675cdb..aea61c4 100644
--- a/debian/patches/remove-private-ltdl.patch
+++ b/debian/patches/remove-private-ltdl.patch
@@ -16,7 +16,7 @@ Subject: Remove private library libltdl and use the installed one.
  
 --- a/configure.ac
 +++ b/configure.ac
-@@ -30,7 +30,9 @@
+@@ -31,7 +31,9 @@
  
  ESO_CHECK_DOCTOOLS
  
@@ -27,7 +27,7 @@ Subject: Remove private library libltdl and use the installed one.
  AC_SUBST(INCLTDL)
  AC_SUBST(LIBLTDL)
  
-@@ -76,9 +78,6 @@
+@@ -77,9 +79,6 @@
  # Determine the shared library suffix on this platform
  AC_LTDL_SHLIBEXT
  
diff --git a/debian/patches/series b/debian/patches/series
index c205af4..a696f09 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 remove-private-ltdl.patch
-fix-autotools.patch
 generate-manpage.patch
 remove-empty-configdir.patch
 set-default-plugin-path.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/esorex.git