[Debian-med-packaging] [SCM] picard-tools branch, master, updated. upstream/1.26-26-g8b68625

[Charles Plessy]

The following commit has been merged in the master branch:
commit 8b6862592858fb0e9bc165c4d0a69bd81341a4ec
Author: Charles Plessy <plessy at debian.org>
Date:   Tue Aug 3 19:17:47 2010 +0900

    * New upstream release.
    
     - Refreshed patch.
     - Documented a new file in debian/copyright.
     - Checked conformance with latest Policy.

diff --git a/debian/changelog b/debian/changelog
index 6611cef..3991ec6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-picard-tools (1.26-1) UNRELEASED; urgency=low
+picard-tools (1.27-1) UNRELEASED; urgency=low
 
   * New upstream release.
-  * Removed the fourth number in Standards-Version (debian/control,
-    see Policy §5.6.11).
+  * Incremented Standards-Version to reflect conformance with Policy 3.9.1
+    (debian/changelog, no changes needed).
 
  -- Charles Plessy <plessy at debian.org>  Wed, 07 Jul 2010 14:05:52 +0900
 
diff --git a/debian/control b/debian/control
index 6b83e4a..7548a44 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Uploaders: Shaun Jackman <sjackman at debian.org>,
  Charles Plessy <plessy at debian.org>
 Build-Depends: ant, openjdk-6-jdk|java-compiler, testng,
  debhelper (>= 7.0.50~)
-Standards-Version: 3.9.0
+Standards-Version: 3.9.1
 Homepage: http://picard.sourceforge.net/
 Vcs-Git: git://git.debian.org/git/debian-med/picard-tools.git
 Vcs-Browser: http://git.debian.org/?p=debian-med/picard-tools.git
diff --git a/debian/copyright b/debian/copyright
index f3b9967..b564444 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -92,6 +92,23 @@ License: GPL-2
 Comment: On Debian systems, the complete text of the GNU General Public License
  version 2 is available in the file ‘/usr/share/common-licenses/GPL-2’.
 
+Files: etc/test/junit-noframes.xsl
+Copyright: 2001-2004 The Apache Software Foundation
+License: Apache-2.0
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ .
+     http://www.apache.org/licenses/LICENSE-2.0
+ .
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+Comment: On Debian systems, the complete text of the Apache License version 2.0
+ is available in the file ‘/usr/share/common-licenses/Apache-2.0’.
+
 Files: debian/*
 Copyright: 2010 Shaun Jackman <sjackman at debian.org>
 License: ISC
diff --git a/debian/patches/01-build.xml b/debian/patches/01-build.xml
index 6215e2a..03b6716 100644
--- a/debian/patches/01-build.xml
+++ b/debian/patches/01-build.xml
@@ -42,7 +42,7 @@ Forwarded: no
                 compiler="javac1.5" fork="true"> <!-- Force SAM-JDK to be built with 1.5 -->
              <!--<compilerarg value="-Xlint:unchecked"/>-->
              <src path="${src.test}"/>
-@@ -214,9 +215,12 @@
+@@ -221,9 +222,12 @@
          <mkdir dir="${dist}"/>
          <jar destfile="${dist}/picard-${picard-version}.jar" compress="no">
              <fileset dir="${classes}" includes ="net/sf/picard/**/*.*"/>

-- 
manipulate SAM and BAM files