[resteasy] 01/01: fix copyright a bit

Timo Aaltonen tjaalton-guest at moszumanska.debian.org
Wed Jun 25 16:36:17 UTC 2014


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

tjaalton-guest pushed a commit to branch master
in repository resteasy.

commit a4aba352e2e0ca44d2c5076fe36d638f46b5f6d4
Author: Timo Aaltonen <tjaalton at ubuntu.com>
Date:   Wed Jun 25 19:36:13 2014 +0300

    fix copyright a bit
---
 debian/copyright | 37 ++++++++++++++++++++++++++++---------
 1 file changed, 28 insertions(+), 9 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 8e7d030..298d25e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -17,9 +17,36 @@ Files: jaxrs/jaxrs-api/*
 Copyright: 2010-2013, Oracle
 License: CDDL-1.1 or GPL-2 with classpath exception
 
-Files: jaxrs/tjws/*
+Files: jaxrs/tjws/src/main/java/Acme/Serve/ThrottleItem.java
+       jaxrs/tjws/src/main/java/Acme/Serve/ThrottledOutputStream.java
+       jaxrs/tjws/src/main/java/Acme/Serve/CgiServlet.java
+       jaxrs/tjws/src/main/java/Acme/WildcardDictionary.java
 Copyright: 1996-1998, Jef Poskanzer <jef at acme.com>
 License: BSD-2-clause
+
+Files: jaxrs/tjws/src/main/java/Acme/Serve/Serve.java
+       jaxrs/tjws/src/main/java/Acme/Serve/FileServlet.java
+       jaxrs/tjws/src/main/java/Acme/Utils.java
+Copyright: 1996-1998, Jef Poskanzer <jef at acme.com>
+           1998-2010, Dmitriy Rogatkin
+License: BSD-2-clause
+
+Files: jaxrs/tjws/src/main/java/Acme/Serve/SimpleAcceptor.java
+       jaxrs/tjws/src/main/java/Acme/Serve/WarDeployer.java
+       jaxrs/tjws/src/main/java/Acme/Serve/SSLAcceptor.java
+       jaxrs/tjws/src/main/java/Acme/Serve/SelectorAcceptor.java
+Copyright: 1998-2010, Dmitriy Rogatkin
+License: BSD-2-clause
+
+Files: debian/*
+Copyright: 2013, Ade Lee <alee at redhat.com>
+License: Apache-2.0
+
+License: Apache-2.0
+ On Debian systems, the full text of the Apache-2.0 license
+ can be found in the file '/usr/share/common-licenses/Apache-2.0'
+
+License: BSD-2-clause
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
  are met:
@@ -41,14 +68,6 @@ License: BSD-2-clause
  OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  SUCH DAMAGE.
 
-Files: debian/*
-Copyright: 2013, Ade Lee <alee at redhat.com>
-License: Apache-2.0
-
-License: Apache-2.0
- On Debian systems, the full text of the Apache-2.0 license
- can be found in the file '/usr/share/common-licenses/Apache-2.0'
-
 License: LGPL-2.1+
  On Debian systems, the full text of the LGPL-2.1 license
  can be found in the file '/usr/share/common-licenses/LGPL-2.1'

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



More information about the pkg-java-commits mailing list