[Pkg-javascript-commits] [node-q] 12/20: Update copyright file.

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository node-q.

commit 80633ecf22c3ea25b3e491de463be8ee18fad72e
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Feb 28 23:30:15 2015 +0100

    Update copyright file.
    
    Changes:
    - Use author as Upstream-Contact instead of GitHub issues
    - Update copyright years
    - Document MIT with Apache-2.0 portions for q.js,
---
 debian/copyright | 51 +++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 49 insertions(+), 2 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index dea42fa..fc2b734 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,12 +1,42 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: q
-Upstream-Contact: http://github.com/kriskowal/q/issues
+Upstream-Contact: Kris Kowal <kris at cixar.com>
 Source: https://github.com/kriskowal/q
 
 Files: *
-Copyright: 2015, Kris Kowal <kris at cixar.com> (https://github.com/kriskowal)
+Copyright: 2009–2014, Kristopher Michael Kowal <kris at cixar.com>
 License: Expat
 
+Files: q.js
+Copyright: 2009-2012, Kris Kowal
+           2007-2009, Tyler Close
+                2011, Google Inc.
+Comment: From the file header:
+ .
+ Copyright 2009-2012 Kris Kowal under the terms of the MIT
+ license found at http://github.com/kriskowal/q/raw/master/LICENSE
+ .
+ With parts by Tyler Close
+ Copyright 2007-2009 Tyler Close under the terms of the MIT X license found
+ at http://www.opensource.org/licenses/mit-license.html
+ Forked at ref_send.js version: 2009-05-11
+ .
+ With parts by Mark Miller
+ Copyright (C) 2011 Google Inc.
+ .
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ .
+ http://www.apache.org/licenses/LICENSE-2.0
+ .
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+License: Expat and Apache-2.0
+
 Files: debian/*
 Copyright: 2015, Bas Couwenberg <sebastic at debian.org>
 License: Expat
@@ -32,3 +62,20 @@ License: Expat
  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  SOFTWARE.
 
+License: Apache-2.0
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ .
+ http://www.apache.org/licenses/LICENSE-2.0
+ .
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ .
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ .
+ On Debian systems, the complete text of the Apache License version 2
+ an be found in the `/usr/share/common-licenses/Apache-2.0' file.
+

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/node-q.git