[med-svn] [SCM] emboss branch, master, updated. debian/6.4.0-2-3-g6f8da22

[Andreas Tille]

The following commit has been merged in the master branch:
commit 6f8da2216a95c2c48a019c44b5d030d4e8ece37b
Author: Andreas Tille <tille at debian.org>
Date:   Thu Aug 9 16:32:51 2012 +0200

    Enable building including PostgreSQL support

diff --git a/debian/changelog b/debian/changelog
index b24310d..3247da3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ emboss (6.4.0-3) UNRELEASED; urgency=low
     with the --as-needed issue when linking against database clients
     (thanks to Felix)
     Closes: #650237
+  * Fix typo to build emboss including PostgreSQL support (Thanks to
+    Felix Geyer <fgeyer at debian.org> for the patch)
+    Closes: #683190
 
  -- Andreas Tille <tille at debian.org>  Thu, 09 Aug 2012 16:01:07 +0200
 
diff --git a/debian/patches/emboss_psql_fix_typo.patch b/debian/patches/emboss_psql_fix_typo.patch
new file mode 100644
index 0000000..fd9138d
--- /dev/null
+++ b/debian/patches/emboss_psql_fix_typo.patch
@@ -0,0 +1,16 @@
+Description: Fix typo to build emboss with PostgreSQL support
+Author: Felix Geyer <fgeyer at debian.org>
+Date: Sun, 29 Jul 2012 17:51:04 UTC
+Bugs-Debian: http://bugs.debian.org/683190
+
+--- emboss-6.4.0.orig/m4/postgresql.m4
++++ emboss-6.4.0/m4/postgresql.m4
+@@ -98,7 +98,7 @@
+             EMBCPPFLAGS=$CPPFLAGS
+ 	    EMBLDFLAGS=$LDFLAGS
+             
+-            CPPFLAGS="$POSTGRESSQL_CPPFLAGS $EMBCPPFLAGS"
++            CPPFLAGS="$POSTGRESQL_CPPFLAGS $EMBCPPFLAGS"
+ 	    LDFLAGS="$POSTGRESQL_LDFLAGS $EMBLDFLAGS"
+ 
+             AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>
diff --git a/debian/patches/fix-mysql-macro.patch b/debian/patches/fix-mysql-macro.patch
index 1e33c01..eb65d74 100644
--- a/debian/patches/fix-mysql-macro.patch
+++ b/debian/patches/fix-mysql-macro.patch
@@ -3,9 +3,9 @@ Author: Felix Geyer <fgeyer at debian.org>
 Date: Sun, 29 Jul 2012 22:07:33 +0200
 Bugs-Debian: http://bugs.debian.org/650237
 
---- emboss-6.4.0.orig/m4/mysql.m4
-+++ emboss-6.4.0/m4/mysql.m4
-@@ -100,10 +100,10 @@
+--- a/m4/mysql.m4
++++ b/m4/mysql.m4
+@@ -100,10 +100,10 @@ dnl provides it in the mysql RPM even th
  dnl not be installed
  
              EMBCPPFLAGS=$CPPFLAGS
@@ -18,7 +18,7 @@ Bugs-Debian: http://bugs.debian.org/650237
  
              AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>
                                                #include "mysql.h"]],
-@@ -112,7 +112,7 @@
+@@ -112,7 +112,7 @@ dnl not be installed
  			   [havemysql=no])
  
  	    CPPFLAGS=$EMBCPPFLAGS
diff --git a/debian/patches/fix-postgresql-macro.patch b/debian/patches/fix-postgresql-macro.patch
index 64af046..4010b2b 100644
--- a/debian/patches/fix-postgresql-macro.patch
+++ b/debian/patches/fix-postgresql-macro.patch
@@ -3,9 +3,9 @@ Author: Felix Geyer <fgeyer at debian.org>
 Date: Sun, 29 Jul 2012 22:07:33 +0200
 Bugs-Debian: http://bugs.debian.org/650237
 
---- emboss-6.4.0.orig/m4/postgresql.m4
-+++ emboss-6.4.0/m4/postgresql.m4
-@@ -96,10 +96,10 @@
+--- a/m4/postgresql.m4
++++ b/m4/postgresql.m4
+@@ -96,10 +96,10 @@ dnl provides it in the postgresql RPM ev
  dnl not be installed
  
              EMBCPPFLAGS=$CPPFLAGS
@@ -18,7 +18,7 @@ Bugs-Debian: http://bugs.debian.org/650237
  
              AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>
                                                #include "libpq-fe.h"]],
-@@ -108,7 +108,7 @@
+@@ -108,7 +108,7 @@ dnl not be installed
  			   [havepostgresql=no])
  
  	    CPPFLAGS=$EMBCPPFLAGS
diff --git a/debian/patches/series b/debian/patches/series
index 402af6a..fab8c5d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ using-pager-in-tfm.patch
 tfm-html.patch
 fix-postgresql-macro.patch
 fix-mysql-macro.patch
+emboss_psql_fix_typo.patch

-- 
The European Molecular Biology Open Software Suite.