[SCM] Execution Tool for European Southern Observatory pipelines branch, master, updated. upstream/3.9.0-8-g9c769ee

[Ole Streicher]

The following commit has been merged in the master branch:
commit 6dfdb4b3bc73dcbc40a5c1b6faf30bc7aef5b3f0
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Wed Mar 21 12:57:04 2012 +0100

    Change patches to comply with upstream version 3.9.4.

diff --git a/debian/changelog b/debian/changelog
index 80e2dbf..d773728 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+esorex (3.9.4-1) unstable; urgency=low
+
+  * New upstream version
+
+ -- Ole Streicher <debian at liska.ath.cx>  Wed, 21 Mar 2012 12:10:00 +0100
+
 esorex (3.9.0-1) unstable; urgency=low
 
   * New package. Closes: #641634
diff --git a/debian/patches/add-cplcore-link.patch b/debian/patches/add-cplcore-link.patch
deleted file mode 100644
index 24a30e6..0000000
--- a/debian/patches/add-cplcore-link.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Author: Ole Streicher <debian at liska.ath.cx>
-Description: Explicitely link cplcore to avoid build errors in unstable
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -49,6 +49,6 @@
- 
- esorex_LDFLAGS = $(CPL_LDFLAGS) $(CFITSIO_LDFLAGS) $(LIBLTDL)
--esorex_LDADD = @GETOPT@ $(LIBCPLUI) $(LIBCPLDFS) $(LIBLTDL)
-+esorex_LDADD = @GETOPT@ $(LIBCPLUI) $(LIBCPLDFS) $(LIBCPLCORE) $(LIBCEXT) $(LIBLTDL)
- esorex_DEPENDENCIES = @GETOPT@ $(LIBLTDL)
- 
- if PURIFY
diff --git a/debian/patches/check-for-cpl-so.patch b/debian/patches/check-for-cpl-so.patch
deleted file mode 100644
index bd4e70c..0000000
--- a/debian/patches/check-for-cpl-so.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Author: Ole Streicher <debian at liska.ath.cx>
-Description: Since the Debian version of CPL does not provide .la files, we 
- check for the existence of the .so files. These are also used for the 
- build process.
---- a/m4macros/cpl.m4
-+++ b/m4macros/cpl.m4
-@@ -186,7 +186,7 @@
-     AC_MSG_CHECKING([for libcext])
- 
-     cpl_cext_check_header="cxmacros.h"
--    cpl_cext_check_lib="libcext.la"
-+    cpl_cext_check_lib="libcext.so"
- 
-     cpl_cext_includes=""
-     cpl_cext_libraries=""
-@@ -335,7 +335,7 @@
-     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=""
diff --git a/debian/patches/fix-autotools.patch b/debian/patches/fix-autotools.patch
index 57bebda..cf7478e 100644
--- a/debian/patches/fix-autotools.patch
+++ b/debian/patches/fix-autotools.patch
@@ -14,7 +14,7 @@ Subject: Fix autotools files to allow the current version.
  
  AC_CONFIG_SRCDIR([Makefile.am])
  AC_CONFIG_AUX_DIR([admin])
-+AC_CONFIG_MACRO_DIR([m4macros])
++AC_CONFIG_MACRO_DIR([m4])
  
  AC_CANONICAL_HOST
  AC_CANONICAL_TARGET
diff --git a/debian/patches/remove-empty-configdir.patch b/debian/patches/remove-empty-configdir.patch
index 9e70176..fb5662a 100644
--- a/debian/patches/remove-empty-configdir.patch
+++ b/debian/patches/remove-empty-configdir.patch
@@ -8,6 +8,6 @@ Description: Avoid creation of an empty directory "/usr/share/esorex/config"
  
 -config_DATA =
 -
- esorex_LDFLAGS = $(CPL_LDFLAGS) $(CFITSIO_LDFLAGS) $(LIBLTDL)
- esorex_LDADD = @GETOPT@ $(LIBCPLUI) $(LIBCPLDFS) $(LIBLTDL)
+ esorex_LDFLAGS = $(CPL_LDFLAGS) $(LIBLTDL)
+ esorex_LDADD = @GETOPT@ $(LIBCPLDFS) $(LIBCPLUI) $(LIBCPLCORE) $(LIBCEXT) $(LIBLTDL)
  esorex_DEPENDENCIES = @GETOPT@ $(LIBLTDL)
diff --git a/debian/patches/remove-private-ltdl.patch b/debian/patches/remove-private-ltdl.patch
index 4ce7df1..40b54ce 100644
--- a/debian/patches/remove-private-ltdl.patch
+++ b/debian/patches/remove-private-ltdl.patch
@@ -25,7 +25,7 @@ Subject: Remove private library libltdl and use the installed one.
  
 --- a/configure.ac
 +++ b/configure.ac
-@@ -32,7 +32,9 @@
+@@ -32,7 +32,9 @@ ESO_PROG_CC_FLAG([fno-builtin], [CFLAGS="$CFLAGS -fno-builtin"])
  
  ESO_CHECK_DOCTOOLS
  
@@ -36,7 +36,7 @@ Subject: Remove private library libltdl and use the installed one.
  AC_SUBST(INCLTDL)
  AC_SUBST(LIBLTDL)
  
-@@ -79,9 +81,6 @@
+@@ -77,9 +79,6 @@ ESOREX_SET_PATHS
  # Determine the shared library suffix on this platform
  AC_LTDL_SHLIBEXT
  
diff --git a/debian/patches/series b/debian/patches/series
index c3a0beb..0e45b54 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,8 +2,6 @@ remove-private-ltdl.patch
 fix-autotools.patch
 generate-manpage.patch
 fix-spelling.patch
-check-for-cpl-so.patch
 move-rcfile-to-etc.patch
 remove-empty-configdir.patch
-add-cplcore-link.patch
 set-default-plugin-path.patch

-- 
Execution Tool for European Southern Observatory pipelines