[med-svn] [htslib] 02/03: Wrap and sort
Matthias Klumpp
ximion-guest at moszumanska.debian.org
Fri Aug 4 03:08:23 UTC 2017
This is an automated email from the git hooks/post-receive script.
ximion-guest pushed a commit to branch debian/unstable
in repository htslib.
commit ff8e09b106b585a7bdc8053f05e2ee3c85979939
Author: Matthias Klumpp <matthias at tenstral.net>
Date: Thu Aug 3 22:53:54 2017 -0400
Wrap and sort
---
debian/control | 16 +++++++--------
debian/copyright | 49 +++++++++++++++++++++++-----------------------
debian/htslib-test.install | 8 ++++----
debian/tabix.install | 2 +-
debian/tabix.manpages | 2 +-
5 files changed, 38 insertions(+), 39 deletions(-)
diff --git a/debian/control b/debian/control
index 5c0da86..51db69d 100644
--- a/debian/control
+++ b/debian/control
@@ -6,11 +6,11 @@ Section: science
Priority: optional
Build-Depends: debhelper (>= 10),
dh-exec,
+ libbz2-dev,
libcurl4-gnutls-dev,
+ liblzma-dev,
libssl-dev,
- zlib1g-dev,
- libbz2-dev,
- liblzma-dev
+ zlib1g-dev
Standards-Version: 4.0.0
Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/htslib.git
Vcs-Git: https://anonscm.debian.org/git/debian-med/htslib.git -b debian/unstable
@@ -20,8 +20,8 @@ Package: libhts2
Architecture: any
Multi-Arch: same
Section: libs
-Depends: ${shlibs:Depends},
- ${misc:Depends}
+Depends: ${misc:Depends},
+ ${shlibs:Depends}
Pre-Depends: ${misc:Pre-Depends}
Description: C library for high-throughput sequencing data formats
HTSlib is an implementation of a unified C library for accessing common file
@@ -58,9 +58,9 @@ Description: Development files for the HTSlib
Package: htslib-test
Architecture: all
-Depends: ${misc:Depends},
- ${perl:Depends},
- libhts-dev
+Depends: libhts-dev,
+ ${misc:Depends},
+ ${perl:Depends}
Description: Test data for HTSlib
HTSlib is an implementation of a unified C library for accessing common file
formats, such as SAM (Sequence Alignment/Map), CRAM and VCF (Variant Call
diff --git a/debian/copyright b/debian/copyright
index a923ec3..21f0a4b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -17,23 +17,23 @@ License: Various_BSD-3-Clause
.
---------------------------------------------------------------------------
.
- Redistribution and use in source and binary forms, with or without
+ Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
.
- 1. Redistributions of source code must retain the above copyright notice,
+ 1. Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
.
- 2. Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
.
3. Neither the names Genome Research Ltd and Wellcome Trust Sanger
Institute nor the names of its contributors may be used to endorse or promote
products derived from this software without specific prior written permission.
.
- THIS SOFTWARE IS PROVIDED BY GENOME RESEARCH LTD AND CONTRIBUTORS "AS IS" AND
- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ THIS SOFTWARE IS PROVIDED BY GENOME RESEARCH LTD AND CONTRIBUTORS "AS IS" AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL GENOME RESEARCH LTD OR CONTRIBUTORS BE LIABLE
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
@@ -44,33 +44,33 @@ License: Various_BSD-3-Clause
.
---------------------------------------------------------------------------
.
- Redistribution and use in source and binary forms, with or without
+ Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
.
- 1 Redistributions of source code must retain the above copyright notice,
+ 1 Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
.
- 2 Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
+ 2 Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
.
- 3 Neither the name of the MEDICAL RESEARCH COUNCIL, THE LABORATORY OF
- MOLECULAR BIOLOGY nor the names of its contributors may be used to endorse or
- promote products derived from this software without specific prior written
+ 3 Neither the name of the MEDICAL RESEARCH COUNCIL, THE LABORATORY OF
+ MOLECULAR BIOLOGY nor the names of its contributors may be used to endorse or
+ promote products derived from this software without specific prior written
permission.
.
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-Files: md5.c
+Files: md5.c
Copyright: No copyright is claimed
License: solar-MD5
This is an OpenSSL-compatible implementation of the RSA Data Security, Inc.
@@ -114,4 +114,3 @@ License: MIT
ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
-
diff --git a/debian/htslib-test.install b/debian/htslib-test.install
index 9e34d5c..70a9e9b 100644
--- a/debian/htslib-test.install
+++ b/debian/htslib-test.install
@@ -1,6 +1,6 @@
-test/* /usr/share/htslib-test/test
-cram/*.c /usr/share/htslib-test/cram
-Makefile /usr/share/htslib-test
-*.mk /usr/share/htslib-test
*.c /usr/share/htslib-test
*.h /usr/share/htslib-test
+*.mk /usr/share/htslib-test
+Makefile /usr/share/htslib-test
+cram/*.c /usr/share/htslib-test/cram
+test/* /usr/share/htslib-test/test
diff --git a/debian/tabix.install b/debian/tabix.install
index 888d277..7ef89c7 100644
--- a/debian/tabix.install
+++ b/debian/tabix.install
@@ -1,3 +1,3 @@
-tabix usr/bin
bgzip usr/bin
htsfile usr/bin
+tabix usr/bin
diff --git a/debian/tabix.manpages b/debian/tabix.manpages
index 216f5ae..751e62f 100644
--- a/debian/tabix.manpages
+++ b/debian/tabix.manpages
@@ -1,2 +1,2 @@
+htsfile.1
tabix.1
-htsfile.1
\ No newline at end of file
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/htslib.git
More information about the debian-med-commit
mailing list