[Debian-med-packaging] [SCM] The European Molecular Biology Open Software Suite. branch, master, updated. upstream/6.2.0-15-gaaadeea

[Charles Plessy]

The following commit has been merged in the master branch:
commit aaadeea0f55a71d1a9a88df0627d8ad838603351
Author: Charles Plessy <plessy at debian.org>
Date:   Sun Feb 21 17:32:14 2010 +0900

    6.2.0 release, in which frestdist.txt is removed (conflict with embassy-phylip).

diff --git a/debian/changelog b/debian/changelog
index fc36323..95a1fdd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,11 @@
-emboss (6.1.0-6) UNRELEASED; urgency=low
+emboss (6.2.0-1) UNRELEASED; urgency=low
 
-  * New upstream patch (patch-1-3) with too many corrections to be listed in
-    this changelog.
-    See ‘ftp://emboss.open-bio.org/pub/EMBOSS/fixes/README.fixes’.
+  * New upstream release.
   * Specified ‘Format: 1.5’ in debian/control (according to Policy 3.8.3
     §5.6.16 and dpkg-source(1) 1.14.25), since the upstream patches can not be
     easily handled by the formats 3.0.
 
- -- Charles Plessy <plessy at debian.org>  Mon, 14 Dec 2009 08:48:26 +0900
+ -- Charles Plessy <plessy at debian.org>  Sun, 21 Feb 2010 16:54:43 +0900
 
 emboss (6.1.0-5) unstable; urgency=low
 
diff --git a/debian/copyright.introduction b/debian/copyright.introduction
index 196d960..1cb934c 100644
--- a/debian/copyright.introduction
+++ b/debian/copyright.introduction
@@ -5,6 +5,8 @@ was prepared by the "pkg-emboss" project in 2006, using the work of Matt Hope
 as a starting point. The packaging work of the pkg-emboss project is in the
 public domain unless stated otherwise.
 
+Source: ftp://emboss.open-bio.org/pub/EMBOSS/EMBOSS-6.2.0.tar.gz
+
 ------------------------------------------------------------------------
 EMBOSS License (http://emboss.sourceforge.net/licence/)
 
diff --git a/debian/rules b/debian/rules
index d04865c..e610e04 100755
--- a/debian/rules
+++ b/debian/rules
@@ -108,9 +108,6 @@ install-stamp:
 	antiword $(CURDIR)/debian/emboss-doc/usr/share/EMBOSS/doc/manuals/domainatrix.doc > $(CURDIR)/debian/emboss-doc/usr/share/EMBOSS/doc/manuals/domainatrix.txt
 	# Remove this file when the relicenced file becomes part of the upstream tarball.
 	uudecode -o $(CURDIR)/debian/emboss-doc/usr/share/EMBOSS/doc/manuals/EMBOSS_qg.pdf $(CURDIR)/debian/EMBOSS_qg_new.pdf.uu
-	# Remove this file, that belongs to the PHYLIPNEW EMBASSY package (embassy-phylip in Debian).
-	# See EMBOSS bug ‘https://sourceforge.net/support/tracker.php?aid=2831977’.
-	rm $(CURDIR)/debian/emboss-doc/usr/share/EMBOSS/doc/programs/text/frestdist.txt
 
 	$(MAKE) -C jemboss install DESTDIR=$(CURDIR)/debian/jemboss bindir=/usr/bin
 	# dangling LICEN[CS]E FILE

-- 
The European Molecular Biology Open Software Suite.