[med-svn] r5868 - trunk/packages/vienna-rna/trunk/debian/patches

[Alexandre Mestiashvili]

Author: malex-guest
Date: 2011-02-03 09:22:28 +0000 (Thu, 03 Feb 2011)
New Revision: 5868

Added:
   trunk/packages/vienna-rna/trunk/debian/patches/01_RNAforester_missing_header.patch
   trunk/packages/vienna-rna/trunk/debian/patches/02_RNAforester_missing_libs.patch
Modified:
   trunk/packages/vienna-rna/trunk/debian/patches/do_not_configure_g2-0.70.patch
   trunk/packages/vienna-rna/trunk/debian/patches/series
Log:
RNAforester has another upstream maintainer , also merged libg2 patches.


Added: trunk/packages/vienna-rna/trunk/debian/patches/01_RNAforester_missing_header.patch
===================================================================
--- trunk/packages/vienna-rna/trunk/debian/patches/01_RNAforester_missing_header.patch	                        (rev 0)
+++ trunk/packages/vienna-rna/trunk/debian/patches/01_RNAforester_missing_header.patch	2011-02-03 09:22:28 UTC (rev 5868)
@@ -0,0 +1,12 @@
+Index: vienna-rna-1.8.4/RNAforester/src/rnafuncs.cpp
+===================================================================
+--- vienna-rna-1.8.4.orig/RNAforester/src/rnafuncs.cpp	2011-01-30 15:36:42.000000000 +0000
++++ vienna-rna-1.8.4/RNAforester/src/rnafuncs.cpp	2011-01-30 15:37:08.000000000 +0000
+@@ -6,6 +6,7 @@
+ #include <iostream>
+ #include <string>
+ #include <sstream>
++#include <cstdio>
+ 
+ #ifndef WIN32
+ #include "config.h"

Added: trunk/packages/vienna-rna/trunk/debian/patches/02_RNAforester_missing_libs.patch
===================================================================
--- trunk/packages/vienna-rna/trunk/debian/patches/02_RNAforester_missing_libs.patch	                        (rev 0)
+++ trunk/packages/vienna-rna/trunk/debian/patches/02_RNAforester_missing_libs.patch	2011-02-03 09:22:28 UTC (rev 5868)
@@ -0,0 +1,13 @@
+Index: vienna-rna-1.8.4/RNAforester/src/Makefile.in
+===================================================================
+--- vienna-rna-1.8.4.orig/RNAforester/src/Makefile.in	2011-01-30 16:32:29.000000000 +0000
++++ vienna-rna-1.8.4/RNAforester/src/Makefile.in	2011-01-30 16:33:25.000000000 +0000
+@@ -102,7 +102,7 @@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+-LIBS = @LIBS@
++LIBS = @LIBS@ -lm -lX11 -lgd
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@

Modified: trunk/packages/vienna-rna/trunk/debian/patches/do_not_configure_g2-0.70.patch
===================================================================
--- trunk/packages/vienna-rna/trunk/debian/patches/do_not_configure_g2-0.70.patch	2011-02-03 08:14:39 UTC (rev 5867)
+++ trunk/packages/vienna-rna/trunk/debian/patches/do_not_configure_g2-0.70.patch	2011-02-03 09:22:28 UTC (rev 5868)
@@ -43,3 +43,17 @@
  
  ac_config_files="$ac_config_files Makefile src/Makefile man/Makefile"
  
+
+Index: ViennaRNA-1.8.4/RNAforester/Makefile.in
+===================================================================
+--- ViennaRNA-1.8.4.orig/RNAforester/Makefile.in	2011-01-28 23:39:23.740182140 +0100
++++ ViennaRNA-1.8.4/RNAforester/Makefile.in	2011-01-28 23:39:44.556182444 +0100
+@@ -189,7 +189,7 @@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-SUBDIRS = g2-0.70 src man
++SUBDIRS =  src man
+ all: config.h
+ 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
+ 

Modified: trunk/packages/vienna-rna/trunk/debian/patches/series
===================================================================
--- trunk/packages/vienna-rna/trunk/debian/patches/series	2011-02-03 08:14:39 UTC (rev 5867)
+++ trunk/packages/vienna-rna/trunk/debian/patches/series	2011-02-03 09:22:28 UTC (rev 5868)
@@ -1,10 +1,9 @@
 fix_cluster_manpages.patch
 lintian_messages01.patch
-fix_install_relative_path.patch
 readseq_exclude.patch
 fix_manual_pages.patch
 fix_perl_modules_path.patch
-missing_x11.patch
-fix_missing_header.patch
+02_RNAforester_missing_libs.patch
+01_RNAforester_missing_header.patch
 do_not_configure_g2-0.70.patch
 fix_RNAlib_info.patch