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

[Charles Plessy]

The following commit has been merged in the master branch:
commit 8e8b522cbc392234b711a82f70094ed1d3be027e
Author: Charles Plessy <plessy at debian.org>
Date:   Tue May 25 21:40:05 2010 +0900

    Incremented Standards-Version, corrected typos, found a convenience copy of the zlib.
    
    Thanks to Lintian.

diff --git a/debian/README.debian b/debian/README.debian
index e1dba32..8e0c497 100644
--- a/debian/README.debian
+++ b/debian/README.debian
@@ -22,14 +22,14 @@ tfm uses Debian's pager by default
 
 The `tfm' program will use /usr/bin/pager instead of /usr/bin/more by default.
 /usr/bin/pager is managed via the `update-alternatives' utility and can point
-to other pagers such as `less' and `most'. This can be overriden by using the
+to other pagers such as `less' and `most'. This can be overridden by using the
 PAGER environment variable, just as in default EMBOSS installations.
 
 
 EMBOSS Quick Guide relicenced
 -----------------------------
 
-This packages contains a relicenced version of the EMBOSS Quick Guide. Its
+This package contains a relicenced version of the EMBOSS Quick Guide. Its
 uuencoded sources (in MS Word format) are included in the Debian source package
 'emboss'.
 
diff --git a/debian/changelog b/debian/changelog
index 1aabf4d..681b096 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ emboss (6.2.0-1) UNRELEASED; urgency=low
     §5.6.16 and dpkg-source(1) 1.14.25), since the upstream patches can not be
     easily handled by the formats 3.0.
   * Dropped useless dependency on csh | c-shell for emboss (LP: 525662).
+  * Incremented Standards-Version in debian/control to reflect conformance
+    with Policy 3.8.4 (no changes needed).
 
  -- Charles Plessy <plessy at debian.org>  Sun, 21 Feb 2010 16:54:43 +0900
 
diff --git a/debian/control b/debian/control
index 8732b41..9a9c1ed 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 7), quilt, libx11-dev, x11proto-core-dev, libgdchar
 Build-Depends-Indep: openjdk-6-jdk
 Vcs-Browser: http://git.debian.org/?p=debian-med/emboss.git
 Vcs-Git: git://git.debian.org/git/debian-med/emboss.git
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
 Homepage: http://emboss.sourceforge.net
 
 Package: emboss
diff --git a/debian/copyright.introduction b/debian/copyright.introduction
index 1cb934c..c789c3b 100644
--- a/debian/copyright.introduction
+++ b/debian/copyright.introduction
@@ -111,6 +111,31 @@ The PLplot package may be distributed under the following terms:
     Foundation, Inc. 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 
+ZLIB LICENSE
+------------
+
+  Copyright (C) 1995-2005 Jean-loup Gailly and Mark Adler
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  Jean-loup Gailly        Mark Adler
+  jloup at gzip.org          madler at alumni.caltech.edu
+
+
 AUTHORS OF EMBOSS
 -----------------
 

-- 
The European Molecular Biology Open Software Suite.