[jajuk] 01/01: add BSD-4-clause license, fix copyright, update changelog, use standards-version 3.9.8

Felix Natter fnatter-guest at moszumanska.debian.org
Sat Apr 9 16:06:33 UTC 2016


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

fnatter-guest pushed a commit to branch master
in repository jajuk.

commit 00de3d6248c5dbc1acc991e774f62d30f9d8fdf0
Author: Felix Natter <fnatter at gmx.net>
Date:   Sat Apr 9 17:38:54 2016 +0200

    add BSD-4-clause license, fix copyright, update changelog, use standards-version 3.9.8
---
 debian/changelog |  4 +++-
 debian/control   |  2 +-
 debian/copyright | 46 +++++++++++++++++++++++++++++++++++++++++++++-
 3 files changed, 49 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9228c57..05640df 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-jajuk (1:1.10.9+dfsg2-1) UNRELEASED; urgency=medium
+jajuk (1:1.10.9+dfsg2-1) unstable; urgency=medium
 
   [ tony mancill ]
   * Moved the package to Git
@@ -17,6 +17,8 @@ jajuk (1:1.10.9+dfsg2-1) UNRELEASED; urgency=medium
   * Add myself to Uploaders.
   * Install 64x64 icon in /usr/share/pixmaps.
   * Update copyright.
+  * Remove files with unclear license, apply upstream patch from
+    upcoming 1.11 to replace this (06_scrolling_stuff.patch).
 
  -- Felix Natter <fnatter at gmx.net>  Sat, 09 Apr 2016 14:08:19 +0200
 
diff --git a/debian/control b/debian/control
index a2f9f89..4232f06 100644
--- a/debian/control
+++ b/debian/control
@@ -42,7 +42,7 @@ Build-Depends-Indep: ant,
                      mplayer,
                      substance (>= 7.3),
                      libqdwizard-java
-Standards-Version: 3.9.7
+Standards-Version: 3.9.8
 Vcs-Git: https://anonscm.debian.org/git/pkg-java/jajuk.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/jajuk.git
 Homepage: http://jajuk.info
diff --git a/debian/copyright b/debian/copyright
index b96d129..a4caa78 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -57,7 +57,6 @@ License: LGPL-2.1+
 Files: src/main/java/ext/services/lastfm/*
  src/main/java/ext/services/network/NetworkUtils.java
  src/main/java/ext/services/network/Proxy.java
- src/main/java/ext/JScrollingText.java
  src/main/java/ext/services/xml/XMLBuilder.java
  src/main/java/ext/services/xml/XMLUtils.java
 Copyright: Copyright (C) 2006-2009 Alex Aranda, Sylvain Gaudard, Thomas Beckers and contributors
@@ -95,3 +94,48 @@ License: LGPL-2.1+
  On Debian systems, the complete text of LGPL 2.1 license can be found
  in `/usr/share/common-licenses/LGPL-2.1'.
 
+License: BSD-4-clause
+ Copyright (c) 1993 The Regents of the University of California. All
+ rights reserved.
+ .
+ This software was developed by the Computer Systems Engineering group
+ at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
+ contributed to Berkeley.
+ .
+ All advertising materials mentioning features or use of this software
+ must display the following acknowledgement: This product includes
+ software developed by the University of California, Lawrence Berkeley
+ Laboratory.
+ .
+ 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. All advertising materials mentioning features or use of this
+    software must display the following acknowledgement: This product
+    includes software developed by the University of California,
+    Berkeley and its contributors.
+ .
+    4. Neither the name of the University 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 REGENTS 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 REGENTS 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.

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



More information about the pkg-java-commits mailing list