[med-svn] [Git][med-team/ska][master] 4 commits: finallize copyright and exclude binaries
Andreas Tille (@tille)
gitlab at salsa.debian.org
Tue Sep 20 10:02:52 BST 2022
Andreas Tille pushed to branch master at Debian Med / ska
Commits:
c2d2f8a0 by Andreas Tille at 2022-09-20T10:51:32+02:00
finallize copyright and exclude binaries
- - - - -
9f9aaeae by Andreas Tille at 2022-09-20T10:51:56+02:00
New upstream version 1.0+dfsg
- - - - -
ea26d44c by Andreas Tille at 2022-09-20T10:51:56+02:00
Update upstream source from tag 'upstream/1.0+dfsg'
Update to upstream version '1.0+dfsg'
with Debian dir 6d50f925ecf48e010dcc017974875c40e999f22f
- - - - -
12c1f080 by Andreas Tille at 2022-09-20T11:02:09+02:00
Attempt to build with googletest test suite - unfortunately this ends up in errors
- - - - -
12 changed files:
- debian/control
- debian/copyright
- debian/rules
- − tests/DNA_unittest
- − tests/DNA_unittest.dSYM/Contents/Info.plist
- − tests/DNA_unittest.dSYM/Contents/Resources/DWARF/DNA_unittest
- − tests/general_unittest
- − tests/general_unittest.dSYM/Contents/Info.plist
- − tests/general_unittest.dSYM/Contents/Resources/DWARF/general_unittest
- − tests/kmers_unittest
- − tests/kmers_unittest.dSYM/Contents/Info.plist
- − tests/kmers_unittest.dSYM/Contents/Resources/DWARF/kmers_unittest
Changes:
=====================================
debian/control
=====================================
@@ -3,7 +3,8 @@ Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.
Uploaders: Andreas Tille <tille at debian.org>
Section: science
Priority: optional
-Build-Depends: debhelper-compat (= 13)
+Build-Depends: debhelper-compat (= 13),
+ googletest <!nocheck>
Standards-Version: 4.6.1
Vcs-Browser: https://salsa.debian.org/med-team/ska
Vcs-Git: https://salsa.debian.org/med-team/ska.git
=====================================
debian/copyright
=====================================
@@ -4,11 +4,78 @@ Source: https://github.com/simonrharris/SKA/tags
Files-Excluded: tests/DNA_unittest
tests/general_unittest
tests/kmers_unittest
+ tests/*_unittest.dSYM
Files: *
-Copyright: 20xx-20yy <upstream>
-License: <license>
+Copyright: 2018-2022 Simon Harris (Wellcome Sanger Institute)
+License: GPL-3+
+
+Files: src/kseq.h
+Copyright: 2008, 2009, 2011 Attractive Chaos <attractor at live.co.uk>
+License: MIT
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+ .
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ 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.
+
+Files: tests/*_unittest.cpp
+Copyright: 2005, Google Inc.
+License: BSD-3-clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+ .
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * 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.
+ * Neither the name of Google Inc. 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 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Files: debian/*
Copyright: 2022 Andreas Tille <tille at debian.org>
-License: <license>
+License: GPL-3+
+
+License: GPL-3+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ On Debian systems you can find the full text of the GNU General Public
+ License version 3 at /usr/share/common-licenses/GPL-3.
=====================================
debian/rules
=====================================
@@ -3,19 +3,13 @@
# DH_VERBOSE := 1
export LC_ALL=C.UTF-8
-
%:
dh $@
override_dh_auto_install:
# do not use broken Makefile which forces /usr/local/bin
-### When overriding auto_test make sure DEB_BUILD_OPTIONS will be respected
-#override_dh_auto_test:
-#ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
-# do_stuff_for_testing
-#endif
-
-### If you **really** can not use uscan (even not with mode=git) use a debian/get-orig-script
-#get-orig-source:
-# . debian/get-orig-source
+override_dh_auto_test:
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+ cd tests && ln -s /usr/src/googletest/googletest && make
+endif
=====================================
tests/DNA_unittest deleted
=====================================
Binary files a/tests/DNA_unittest and /dev/null differ
=====================================
tests/DNA_unittest.dSYM/Contents/Info.plist deleted
=====================================
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
- <dict>
- <key>CFBundleDevelopmentRegion</key>
- <string>English</string>
- <key>CFBundleIdentifier</key>
- <string>com.apple.xcode.dsym.DNA_unittest</string>
- <key>CFBundleInfoDictionaryVersion</key>
- <string>6.0</string>
- <key>CFBundlePackageType</key>
- <string>dSYM</string>
- <key>CFBundleSignature</key>
- <string>????</string>
- <key>CFBundleShortVersionString</key>
- <string>1.0</string>
- <key>CFBundleVersion</key>
- <string>1</string>
- </dict>
-</plist>
=====================================
tests/DNA_unittest.dSYM/Contents/Resources/DWARF/DNA_unittest deleted
=====================================
Binary files a/tests/DNA_unittest.dSYM/Contents/Resources/DWARF/DNA_unittest and /dev/null differ
=====================================
tests/general_unittest deleted
=====================================
Binary files a/tests/general_unittest and /dev/null differ
=====================================
tests/general_unittest.dSYM/Contents/Info.plist deleted
=====================================
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
- <dict>
- <key>CFBundleDevelopmentRegion</key>
- <string>English</string>
- <key>CFBundleIdentifier</key>
- <string>com.apple.xcode.dsym.general_unittest</string>
- <key>CFBundleInfoDictionaryVersion</key>
- <string>6.0</string>
- <key>CFBundlePackageType</key>
- <string>dSYM</string>
- <key>CFBundleSignature</key>
- <string>????</string>
- <key>CFBundleShortVersionString</key>
- <string>1.0</string>
- <key>CFBundleVersion</key>
- <string>1</string>
- </dict>
-</plist>
=====================================
tests/general_unittest.dSYM/Contents/Resources/DWARF/general_unittest deleted
=====================================
Binary files a/tests/general_unittest.dSYM/Contents/Resources/DWARF/general_unittest and /dev/null differ
=====================================
tests/kmers_unittest deleted
=====================================
Binary files a/tests/kmers_unittest and /dev/null differ
=====================================
tests/kmers_unittest.dSYM/Contents/Info.plist deleted
=====================================
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
- <dict>
- <key>CFBundleDevelopmentRegion</key>
- <string>English</string>
- <key>CFBundleIdentifier</key>
- <string>com.apple.xcode.dsym.kmers_unittest</string>
- <key>CFBundleInfoDictionaryVersion</key>
- <string>6.0</string>
- <key>CFBundlePackageType</key>
- <string>dSYM</string>
- <key>CFBundleSignature</key>
- <string>????</string>
- <key>CFBundleShortVersionString</key>
- <string>1.0</string>
- <key>CFBundleVersion</key>
- <string>1</string>
- </dict>
-</plist>
=====================================
tests/kmers_unittest.dSYM/Contents/Resources/DWARF/kmers_unittest deleted
=====================================
Binary files a/tests/kmers_unittest.dSYM/Contents/Resources/DWARF/kmers_unittest and /dev/null differ
View it on GitLab: https://salsa.debian.org/med-team/ska/-/compare/469ac6303add2d4aa9b8be2f21e413e14386a200...12c1f080ac1a193e68dd77b3366ce7dabbc84210
--
View it on GitLab: https://salsa.debian.org/med-team/ska/-/compare/469ac6303add2d4aa9b8be2f21e413e14386a200...12c1f080ac1a193e68dd77b3366ce7dabbc84210
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20220920/aeecf9af/attachment-0001.htm>
More information about the debian-med-commit
mailing list