Skip to content

Commit

Permalink
debian: Update copyright file
Browse files Browse the repository at this point in the history
  • Loading branch information
jodal committed Dec 1, 2013
1 parent d4d8485 commit ab16dbd
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 11 deletions.
8 changes: 8 additions & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
mopidy (0.17.0-1) unstable; urgency=low

* Include Apache 2.0 declaration in debian/copyright.
* Update license text for js/lib/bane-*.js to BSD 2-clause.
* Upload to unstable.

-- Stein Magnus Jodal <stein.magnus@jodal.no> Sun, 01 Dec 2013 21:25:55 +0100

mopidy (0.17.0-0mopidy2) unstable; urgency=low

* Add missing licenses to debian/copyright.
Expand Down
32 changes: 21 additions & 11 deletions debian/copyright
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,19 @@ Source: https://github.com/mopidy/mopidy
Files: *
Copyright: 2009-2013 Stein Magnus Jodal and contributors
License: Apache-2.0
On Debian systems the full text of the Apache License (Version 2) can be found
in the `/usr/share/common-licenses/Apache-2.0' file.

Files: js/lib/bane-*.js
Copyright: 2010-2012 Christian Johansen and August Lilleaas
Copyright: 2010-2013 Christian Johansen and Stein Magnus Jodal
License: BSD
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
.
* Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
* 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.
* Neither the name of Christian Johansen nor the names of his contributors
may be used to endorse or promote products derived from this software
without specific prior written permission.
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.
.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
Expand Down Expand Up @@ -60,5 +56,19 @@ License: Expat
Files: debian/*
Copyright: 2010-2013 Stein Magnus Jodal <stein.magnus@jodal.no>
License: Apache-2.0

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 full text of the Apache License (Version 2) can be found
in the `/usr/share/common-licenses/Apache-2.0' file.

0 comments on commit ab16dbd

Please sign in to comment.