[DRE-commits] [ruby-pygments.rb] 07/07: Update debian/copyright after repackaging upstream tarball

[Per Andersson]

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

avtobiff-guest pushed a commit to branch master
in repository ruby-pygments.rb.

commit 5eb88f34acfc443ba96fea816a33f2f620dbd3cc
Author: Per Andersson <avtobiff at gmail.com>
Date:   Fri Apr 4 04:04:20 2014 +0200

    Update debian/copyright after repackaging upstream tarball
---
 debian/copyright | 75 ++++----------------------------------------------------
 1 file changed, 5 insertions(+), 70 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index cb6eaec..0bca228 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,25 +1,12 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: pygments.rb
 Source: http://github.com/tmm1/pygments.rb
-Comment: vendors/pygments-main and vendors/simplejson are not used, they are disabled by patch 0002-Don-t-set-
- PYGMENTS_PATH-and-remove-sys.path-appends
+
+Files: *
 Copyright: 2012-2013 Aman Gupta <aman at tmm1.net>
            2012-2013 Ted Nyman <ted at ted.io>
 License: Expat
 
-Files: vendor/custom_lexers/github.py
-Copyright: 2012 Github, Inc
-License: BSD
-
-Files: vendor/pygments-main/*
-Copyright: 2006-2013 Georg Brandl <georg at python.org>, Tim Hatch <tim at timhatch.com>, Armin Ronacher <armin.ronacher at active-4.com>.
-License: BSD-2-clause
-Comment: See vendor/pygments-main/AUTHORS for complete list of contributors
-
-Files: vendor/simplejson/*
-Copyright: 2006 Bob Ippolito <bob at redivi.com>
-License: Expat
-
 Files: test/test_data.c
 Copyright: 2009-2010 Salvatore Sanfilippo <antirez at gmail.com>
 License: BSD-3-clause
@@ -30,63 +17,11 @@ Copyright: 2009-2013 Benoît Chesneau <benoitc at e-engura.org>
 License: Expat
 
 Files: debian/*
-Copyright: 2013 Per Andersson <avtobiff at gmail.com>
- 2014 Axel Wagner <mero at merovius.de>
- 2014 Dominique Dumont <dod at debian.org>
+Copyright: 2013-2014 Per Andersson <avtobiff at gmail.com>
+           2014 Axel Wagner <mero at merovius.de>
+           2014 Dominique Dumont <dod at debian.org>
 License: Expat
 
-License: BSD
- Copyright (c) The Regents of the University of California.
- All rights reserved.
- .
- Redistribution and use in source and binary forms, with or without
- modification, are permitted 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 University 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: 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.
-
 License: BSD-3-clause
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions are met:

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