[med-svn] [picard-tools] 04/06: Merge

[Andreas Tille]

This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository picard-tools.

commit 4234434d9281423b2edf4bec6ffb361ebe298f52
Author: Andreas Tille <tille at debian.org>
Date:   Sun Feb 21 19:49:39 2016 +0100

    Merge
---
 debian/changelog |  5 +++++
 debian/control   | 19 +++++++++++--------
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5ba7ceb..f473775 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,10 +3,15 @@ picard-tools (2.1.0+dfsg-1) UNRELEASED; urgency=medium
   * New upstream version
   * Adapt debian/watch to use xz compression
   * Remove Shaun Jackman and add myself as Uploader
+<<<<<<< 77fac7dfaf1ddc33dc96096e7f0747b3523a49f0
  
   [ Steffen Moeller and Jon Ison ]
   * Added EDAM annotation to debian/upstream/edam
 
+=======
+  * cme fix dpkg-control
+  
+>>>>>>> cme fix dpkg-control
  -- Andreas Tille <tille at debian.org>  Sun, 21 Feb 2016 19:04:03 +0100
 
 picard-tools (1.138+dfsg.1-1) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index de0b84a..c56c7be 100644
--- a/debian/control
+++ b/debian/control
@@ -21,10 +21,10 @@ Build-Depends: ant,
 # required for links and dependencies in documentation:
                default-jdk-doc,
                libhtsjdk-java-doc,
-               libguava-java-doc,
-Standards-Version: 3.9.6
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-med/picard-tools.git
-Vcs-Git: git://anonscm.debian.org/debian-med/picard-tools.git
+               libguava-java-doc
+Standards-Version: 3.9.7
+Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/picard-tools.git
+Vcs-Git: https://anonscm.debian.org/git/debian-med/picard-tools.git
 Homepage: http://broadinstitute.github.io/picard/
 
 Package: picard-tools
@@ -79,11 +79,13 @@ Description: Command line tools to manipulate SAM and BAM files
 Package: libpicard-java
 Architecture: all
 Section: java
-Depends: ${misc:Depends}, ${java:Depends}
-Recommends: ${java:Recommends}, r-base-core
+Depends: ${misc:Depends},
+         ${java:Depends}
+Recommends: ${java:Recommends},
+            r-base-core
 Suggests: picard-tools
-Replaces: picard-tools (<< 1.114)
 Breaks: picard-tools (<< 1.114)
+Replaces: picard-tools (<< 1.114)
 Description: Java library to manipulate SAM and BAM files
  SAM (Sequence Alignment/Map) format is a generic format for storing
  large nucleotide sequence alignments. This library provides classes to
@@ -95,7 +97,8 @@ Description: Java library to manipulate SAM and BAM files
 Package: libpicard-java-doc
 Architecture: all
 Section: doc
-Depends: ${misc:Depends}, ${java:Depends}
+Depends: ${misc:Depends},
+         ${java:Depends}
 Recommends: ${java:Recommends}
 Description: Documentation for the java picard library
  SAM (Sequence Alignment/Map) format is a generic format for storing

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/picard-tools.git