[Debian-med-packaging] [SCM] The European Molecular Biology Open Software Suite. branch, master, updated. upstream/6.1.0-8-gfb63ce7

[Charles Plessy]

The following commit has been merged in the master branch:
commit fb63ce74e12566e1a496c6fde49acf1688578ea6
Author: Charles Plessy <plessy at debian.org>
Date:   Mon Nov 9 20:19:03 2009 +0900

    Two patches correcting ‘vectorstrip’ and ‘tfm’.
    
      - tfm-html.patch: New patch to let ‘tfm’ find the HTML documentation.
      - transient-vectorstrip.patch: applied in upstream CVS, so applied here as well.

diff --git a/debian/patches/series b/debian/patches/series
index b215134..0a4d87d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
-using-pager-in-tfm.patch
 official-upstream-patch.patch
 transient-vectorstrip.patch
+using-pager-in-tfm.patch
+tfm-html.patch
diff --git a/debian/patches/tfm-html.patch b/debian/patches/tfm-html.patch
new file mode 100644
index 0000000..c0595eb
--- /dev/null
+++ b/debian/patches/tfm-html.patch
@@ -0,0 +1,14 @@
+Author: Charles Plessy
+Forwarded: https://sourceforge.net/tracker/?func=detail&aid=2877960&group_id=93650&atid=605031
+Description: Corrects the name of the directory where tfm looks for HTML documentation.
+--- emboss.orig/emboss/tfm.c
++++ emboss/emboss/tfm.c
+@@ -216,7 +216,7 @@
+ 	**  if that didn't work then try the doc directory from the
+ 	**  distribution tarball
+ 	*/
+-	ajStrAssignS(docroot, ajNamValueBasedir());
++	ajStrAssignS(docroot, ajNamValueRootdir());
+ 	ajDirnameFix(docroot);
+ 
+ 	if(ajStrGetLen(embassy))
diff --git a/debian/patches/transient-vectorstrip.patch b/debian/patches/transient-vectorstrip.patch
index 8dfdb8a..c4d8fd1 100644
--- a/debian/patches/transient-vectorstrip.patch
+++ b/debian/patches/transient-vectorstrip.patch
@@ -1,6 +1,6 @@
-Description: keeps quality scores.
- This is a transient patch for my personal use, but that I would like to share with others.
- I will discuss with Upstream about the possibiltiy to have it in the next official patch release.
+Description: Makes vectorsctrip retain quality scores.
+ This patch or an equivalent solution has been applied Upstream.
+ https://sourceforge.net/tracker/index.php?func=detail&aid=2886368&group_id=93650&atid=605034
 Origin: http://lists.open-bio.org/pipermail/emboss/2009-September/003735.html
 --- emboss-6.1.0.orig/ajax/ajseq.c
 +++ emboss-6.1.0/ajax/ajseq.c

-- 
The European Molecular Biology Open Software Suite.