[Pkg-running-devel] [openambit] 01/04: * Properly specify BSD-3-clause license for openambit-0.2/wireshark_dissector/* * Properly specidy alternative BSD-3-clause or HIDAPI licenses for openambit-0.2/src/libambit/hid*

[Christian Perrier]

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

bubulle pushed a commit to branch master
in repository openambit.

commit da9af24e81aa90bad82366d5068b898bbde751d9
Author: Christian Perrier <bubulle at debian.org>
Date:   Tue Jul 8 07:58:06 2014 +0200

    * Properly specify BSD-3-clause license for
      openambit-0.2/wireshark_dissector/*
    * Properly specidy alternative BSD-3-clause or HIDAPI licenses
      for openambit-0.2/src/libambit/hid*
---
 debian/changelog |  9 ++++++++
 debian/copyright | 68 ++++++++++++++++++++++++++++++--------------------------
 2 files changed, 45 insertions(+), 32 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 807931b..64ed5dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+openambit (0.2-2) UNRELEASED; urgency=low
+
+  * Properly specify BSD-3-clause license for
+    openambit-0.2/wireshark_dissector/*
+  * Properly specidy alternative BSD-3-clause or HIDAPI licenses
+    for openambit-0.2/src/libambit/hid*
+
+ -- Christian Perrier <bubulle at debian.org>  Tue, 08 Jul 2014 07:55:51 +0200
+
 openambit (0.2-1) unstable; urgency=low
 
   * Initial release . Closes: #746652
diff --git a/debian/copyright b/debian/copyright
index 86b24d7..e54e1d6 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,26 +4,21 @@ Source: http://openambit.org
 
 Files: src/libambit/hid.c src/libambit/hid-libusb.c
 Copyright: 2009 Alan Ott
-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.
- .
- You should have received a copy of the GNU General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
- .
- On Debian systems, the complete text of the GNU General
- Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
+License: GPL-3 or BSD-3-Clause or HIDAPI
+
+Files: wireshark_dissector/*
+Copyright: 2013 Emil Ljungdahl <emil at kratern.se>
+License: BSD-3-clause
 
 Files: *
 Copyright: 2013,2014 Emil Ljungdahl <emil at kratern.se>
 License: GPL-3
+
+Files: debian/*
+Copyright: 2014 Christian Perrier <bubulle at debian.org>
+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
@@ -40,22 +35,31 @@ License: GPL-3
  On Debian systems, the complete text of the GNU General
  Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
 
-Files: debian/*
-Copyright: 2014 Christian Perrier <bubulle at debian.org>
-License: GPL-3
- This package 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 2 of the License, or
- (at your option) any later version.
- .
- This package 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.
+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:
  .
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>
+ 1. Redistributions of source code must retain the copyright
+    notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the 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.
  .
- On Debian systems, the complete text of the GNU General
- Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
+ 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.
 
+License: HIDAPI
+ This software may be used by anyone for any reason so
+ long as the copyright notice in the source files
+ remains intact.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-running/openambit.git