[DRE-commits] [ruby-rouge] 01/01: Update debian/copyright

Fri Jul 25 06:19:22 UTC 2014

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

uwabami-guest pushed a commit to branch master
in repository ruby-rouge.

commit 969e632240a80fb458f77229ddeb660c98d2a4f1
Author: Youhei SASAKI <uwabami at gfd-dennou.org>
Date:   Fri Jul 25 15:19:12 2014 +0900

    Update debian/copyright
    
    Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
---
 debian/copyright                    | 171 +-----------------------------------
 debian/ruby-rouge.lintian-overrides |   1 -
 2 files changed, 2 insertions(+), 170 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 0788347..9674a40 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,8 +4,7 @@ Source: http://github.com/jayferd/rouge
 
 Files: *
 Copyright: 2012 Jay Adkisson
-License: Expat with upstream NOTE
-Comment: Upstream note that many of the lexers in this project are adaptations of those in Pygments. In Debian, pygments provided by "python-pygments". The license for Pygments is as BSD-2-Clause.
+License: Expat
 
 Files: debian/*
 Copyright: 2014 Youhei SASAKI <uwabami at gfd-dennou.org>
@@ -29,170 +28,4 @@ License: Expat
  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: Expat with upstream NOTE
- 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.
- .
- Many of the lexers in this project are adaptations of those in Pygments
- (pygments.org).  The license for Pygments is as follows(BSD-2-Clause):
- .
- 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.
- .
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT
- OWNER 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.
- .
- AUTHORS:
-   Pygments is written and maintained by Georg Brandl <georg at python.org>.
- .
-   Major developers are Tim Hatch <tim at timhatch.com> and Armin Ronacher
-   <armin.ronacher at active-4.com>.
- .
-  * Sam Aaron -- Ioke lexer
-  * Kumar Appaiah -- Debian control lexer
-  * Ali Afshar -- image formatter
-  * Andreas Amann -- AppleScript lexer
-  * Jeffrey Arnold -- R/S lexer, BUGS lexers
-  * Jeremy Ashkenas -- CoffeeScript lexer
-  * Stefan Matthias Aust -- Smalltalk lexer
-  * Ben Bangert -- Mako lexers
-  * Max Battcher -- Darcs patch lexer
-  * Paul Baumgart, 280 North, Inc. -- Objective-J lexer
-  * Michael Bayer -- Myghty lexers
-  * John Benediktsson -- Factor lexer
-  * Christopher Bertels -- Fancy lexer
-  * Jarrett Billingsley -- MiniD lexer
-  * Adam Blinkinsop -- Haskell, Redcode lexers
-  * Frits van Bommel -- assembler lexers
-  * Pierre Bourdon -- bugfixes
-  * Hiram Chirino -- Scaml and Jade lexers
-  * Leaf Corcoran -- MoonScript lexer
-  * Christopher Creutzig -- MuPAD lexer
-  * Pete Curry -- bugfixes
-  * Owen Durni -- haXe lexer
-  * Nick Efford -- Python 3 lexer
-  * Sven Efftinge -- Xtend lexer
-  * Artem Egorkine -- terminal256 formatter
-  * James H. Fisher -- PostScript lexer
-  * Carlos Galdino -- Elixir and Elixir Console lexers
-  * Naveen Garg -- Autohotkey lexer
-  * Laurent Gautier -- R/S lexer
-  * Alex Gaynor -- PyPy log lexer
-  * Bertrand Goetzmann -- Groovy lexer
-  * Krzysiek Goj -- Scala lexer
-  * Matt Good -- Genshi, Cheetah lexers
-  * Patrick Gotthardt -- PHP namespaces support
-  * Olivier Guibe -- Asymptote lexer
-  * Martin Harriman -- SNOBOL lexer
-  * Matthew Harrison -- SVG formatter
-  * Steven Hazel -- Tcl lexer
-  * Aslak HellesÃ¸y -- Gherkin lexer
-  * Greg Hendershott -- Racket lexer
-  * Jordi GutiÃ©rrez Hermoso -- Octave lexer
-  * David Hess, Fish Software, Inc. -- Objective-J lexer
-  * Varun Hiremath -- Debian control lexer
-  * Doug Hogan -- Mscgen lexer
-  * Ben Hollis -- Mason lexer
-  * Tim Howard -- BlitzMax lexer
-  * Ivan Inozemtsev -- Fantom lexer
-  * Brian R. Jackson -- Tea lexer
-  * Dennis Kaarsemaker -- sources.list lexer
-  * Igor Kalnitsky -- vhdl lexer
-  * Eric Knibbe -- Lasso lexer
-  * Adam Koprowski -- Opa lexer
-  * Benjamin Kowarsch -- Modula-2 lexer
-  * Alexander Kriegisch -- Kconfig and AspectJ lexers
-  * Marek Kubica -- Scheme lexer
-  * Jochen Kupperschmidt -- Markdown processor
-  * Gerd Kurzbach -- Modelica lexer
-  * Olov Lassus -- Dart lexer
-  * Sylvestre Ledru -- Scilab lexer
-  * Mark Lee -- Vala lexer
-  * Ben Mabey -- Gherkin lexer
-  * Simone Margaritelli -- Hybris lexer
-  * Kirk McDonald -- D lexer
-  * Gordon McGregor -- SystemVerilog lexer
-  * Stephen McKamey -- Duel/JBST lexer
-  * Brian McKenna -- F# lexer
-  * Lukas Meuser -- BBCode formatter, Lua lexer
-  * Paul Miller -- LiveScript lexer
-  * Hong Minhee -- HTTP lexer
-  * Michael Mior -- Awk lexer
-  * Jon Morton -- Rust lexer
-  * Paulo Moura -- Logtalk lexer
-  * Mher Movsisyan -- DTD lexer
-  * Ana Nelson -- Ragel, ANTLR, R console lexers
-  * Nam T. Nguyen -- Monokai style
-  * Jesper Noehr -- HTML formatter "anchorlinenos"
-  * Mike Nolta -- Julia lexer
-  * Jonas Obrist -- BBCode lexer
-  * David Oliva -- Rebol lexer
-  * Jon Parise -- Protocol buffers lexer
-  * Ronny Pfannschmidt -- BBCode lexer
-  * Benjamin Peterson -- Test suite refactoring
-  * Dominik Picheta -- Nimrod lexer
-  * ClÃ©ment PrÃ©vost -- UrbiScript lexer
-  * Kashif Rasul -- CUDA lexer
-  * Justin Reidy -- MXML lexer
-  * Norman Richards -- JSON lexer
-  * Lubomir Rintel -- GoodData MAQL and CL lexers
-  * Andre Roberge -- Tango style
-  * Konrad Rudolph -- LaTeX formatter enhancements
-  * Mario Ruggier -- Evoque lexers
-  * Stou Sandalski -- NumPy, FORTRAN, tcsh and XSLT lexers
-  * Matteo Sasso -- Common Lisp lexer
-  * Joe Schafer -- Ada lexer
-  * Ken Schutte -- Matlab lexers
-  * Tassilo Schweyer -- Io, MOOCode lexers
-  * Joerg Sieker -- ABAP lexer
-  * Robert Simmons -- Standard ML lexer
-  * Kirill Simonov -- YAML lexer
-  * Steve Spigarelli -- XQuery lexer
-  * Jerome St-Louis -- eC lexer
-  * James Strachan -- Kotlin lexer
-  * Tiberius Teng -- default style overhaul
-  * Jeremy Thurgood -- Erlang, Squid config lexers
-  * Erick Tryzelaar -- Felix lexer
-  * Daniele Varrazzo -- PostgreSQL lexers
-  * Abe Voelker -- OpenEdge ABL lexer
-  * Whitney Young -- ObjectiveC lexer
-  * Matthias Vallentin -- Bro lexer
-  * Nathan Weizenbaum -- Haml and Sass lexers
-  * Dietmar Winkler -- Modelica lexer
-  * Nils Winter -- Smalltalk lexer
-  * Davy Wybiral -- Clojure lexer
-  * Diego Zamboni -- CFengine3 lexer
-  * Alex Zimin -- Nemerle lexer
+ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file
diff --git a/debian/ruby-rouge.lintian-overrides b/debian/ruby-rouge.lintian-overrides
index e4ec0d1..a6ec9b7 100644
--- a/debian/ruby-rouge.lintian-overrides
+++ b/debian/ruby-rouge.lintian-overrides
@@ -1,2 +1 @@
-ruby-rouge: spelling-error-in-copyright Nam Name
 ruby-rouge: script-not-executable usr/lib/ruby/vendor_ruby/rouge/demos/perl

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-rouge.git

