[SCM] showq/master: Update copyright file.

mira-guest at users.alioth.debian.org mira-guest at users.alioth.debian.org
Thu Dec 15 22:25:37 UTC 2016


The following commit has been merged in the master branch:
commit faaca16bb4e273b1f18d02828ee34275e0766441
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Thu Dec 15 23:18:17 2016 +0100

    Update copyright file.

diff --git a/debian/copyright b/debian/copyright
index 040e6dc..e0af3a9 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=173
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Show Q
 Upstream-Contact: Errol van-de-l'Isle <errolv at users.berlios.de>
 Source: https://github.com/evandelisle/showq
@@ -19,9 +19,13 @@ Copyright:
  2000-2007 Paul Davis 
 License: GPL-2+
 
+Files: waf
+Copyright: 2005-2011 Thomas Nagy
+License: BSD-3-clause
+
 Files: debian/*
 Copyright:
- 2011 Jaromír Mikeš <mira.mikes at seznam.cz>
+ 2011-2016 Jaromír Mikeš <mira.mikes at seznam.cz>
 License: GPL-2+
 
 License: GPL-2+
@@ -42,3 +46,30 @@ Comment: On Debian systems, the complete text of the GNU General
  .
  You should have received a copy of the GNU General Public License 
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+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:
+ .
+ 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 and/or other materials provided with the distribution.
+ .
+ 3. The name of the author may not be used to endorse or promote products
+    derived from this software without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR "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 AUTHOR 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.

-- 
showq packaging



More information about the pkg-multimedia-commits mailing list