This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository scala-2.10.
commit fb86763da8033a4723f0517a2338b7137887b6f4 Author: Frank S. Thomas <[email protected]> Date: Sat Feb 25 21:53:13 2012 +0100 Updated debian/copyright to version 1.0. --- debian/changelog | 7 +++++ debian/copyright | 86 +++++++++++++++++++++++++++++++++++--------------------- 2 files changed, 61 insertions(+), 32 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4053425..44a71de 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +scala (2.9.1.dfsg-4) UNRELEASED; urgency=low + + [ Frank S. Thomas ] + * Updated debian/copyright to version 1.0 of the copyright format. + + -- Frank S. Thomas <[email protected]> Sat, 25 Feb 2012 21:45:25 +0100 + scala (2.9.1.dfsg-3) unstable; urgency=low * Do not link to scala-library.jar in scala package (Closes: #654549). diff --git a/debian/copyright b/debian/copyright index 2e5f9d3..04d0d0e 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,4 +1,4 @@ -Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?view=markup&pathrev=174 +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: Scala Source: http://www.scala-lang.org/ @@ -12,39 +12,12 @@ License: BSD-3-clause . This software was developed by the Programming Methods Laboratory of the Swiss Federal Institute of Technology (EPFL), Lausanne, Switzerland. - . - Permission to use, copy, modify, and distribute this software in source - or binary form for any purpose with or without fee is hereby granted, - 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. Neither the name of the EPFL 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. Files: src/actors/scala/actors/Linked*.java Copyright: released into the public domain by Doug Lea License: public-domain - Originally written by Doug Lea and released into the public domain. - This may be used for any purposes whatsoever without acknowledgment. + Originally written by Doug Lea and released into the public domain. + This may be used for any purposes whatsoever without acknowledgment. Files: src/actors/scala/actors/threadpool/* Copyright: released into the public domain by Dawid Kurzyniec et al. @@ -74,8 +47,6 @@ License: public-domain Files: src/compiler/scala/tools/nsc/doc/html/resource/lib/jquery-ui.js Copyright: © 2010 AUTHORS.txt (http://jqueryui.com/about) License: Expat or GPL - On Debian systems, the complete text of the GNU General - Public License can be found in `/usr/share/common-licenses/GPL'. Files: src/compiler/scala/tools/nsc/doc/html/resource/lib/jquery.js Copyright: © 2010 John Resig @@ -132,3 +103,54 @@ Copyright: © 2009-2011 Mehdi Dogguy © 2008-2009 Min Huang © 2007-2009 Lex Spoon License: BSD-3-clause + +License: BSD-3-clause + Permission to use, copy, modify, and distribute this software in source + or binary form for any purpose with or without fee is hereby granted, + 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. Neither the name of the EPFL 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. + +License: Expat + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + . + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + +License: GPL + On Debian systems, the complete text of the GNU General + Public License can be found in `/usr/share/common-licenses/GPL'. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/scala-2.10.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
