[DRE-commits] [ruby-pygments.rb] 02/02: refreshed control and copyright with cme

dod at debian.org dod at debian.org
Fri Mar 21 12:58:56 UTC 2014


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

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

commit 0bf129189ba35e5f857e8a59fd9d210fe2a8b5a5
Author: Dominique Dumont <dod at debian.org>
Date:   Fri Mar 21 13:58:49 2014 +0100

    refreshed control and copyright with cme
---
 debian/compat    |  2 +-
 debian/control   | 43 +++++++++++++------------
 debian/copyright | 95 +++++++++++++++++++++++++++++---------------------------
 3 files changed, 72 insertions(+), 68 deletions(-)

diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index f19744d..f0e024d 100644
--- a/debian/control
+++ b/debian/control
@@ -1,34 +1,32 @@
 Source: ruby-pygments.rb
+Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
+Uploaders: Per Andersson <avtobiff at gmail.com>,
+           Dominique Dumont <dod at debian.org>
 Section: ruby
 Priority: optional
-Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
-Uploaders: Per Andersson <avtobiff at gmail.com>
-Build-Depends:
- debhelper (>= 7.0.50~),
- gem2deb (>= 0.3.0~),
- bundler,
- python-pygments,
- rake-compiler,
- ruby-posix-spawn,
- ruby-yajl
-Standards-Version: 3.9.4
-Vcs-Git: git://anonscm.debian.org/pkg-ruby-extras/ruby-pygments.rb.git
-Vcs-Browser: http://anonscm.debian.org/gitweb?p=pkg-ruby-extras/ruby-pygments.rb.git;a=summary
+Build-Depends: debhelper (>= 9),
+               gem2deb (>= 0.3.0~),
+               bundler,
+               python-pygments,
+               rake-compiler,
+               ruby-posix-spawn,
+               ruby-yajl
+Standards-Version: 3.9.5
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-ruby-extras/packages/ruby-pygments.rb.git
+Vcs-Git: git://anonscm.debian.org/pkg-ruby-extras/packages/ruby-pygments.rb.git
 Homepage: http://github.com/tmm1/pygments.rb
 XS-Ruby-Versions: all
 
 Package: ruby-pygments.rb
 Architecture: all
-XB-Ruby-Versions: ${ruby:Versions}
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+         python,
+         python-pygments,
+         ruby | ruby-interpreter,
+         ruby-posix-spawn,
+         ruby-yajl
 Provides: ruby-pygments
-Depends:
- ${misc:Depends},
- ${shlibs:Depends},
- python,
- python-pygments,
- ruby | ruby-interpreter,
- ruby-posix-spawn,
- ruby-yajl
 Description: pygments wrapper for Ruby
  A Ruby wrapper for the Python pygments syntax highlighter.
  .
@@ -39,3 +37,4 @@ Description: pygments wrapper for Ruby
  Each Ruby process that runs has its own 'personal Python'; for example, 4
  Unicorn workers will have one Python process each.  If a Python process dies,
  a new one will be spawned on the next pygments.rb request.
+XB-Ruby-Versions: ${ruby:Versions}
diff --git a/debian/copyright b/debian/copyright
index 242a49f..d4f4a38 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,8 @@
 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
 Copyright: 2012-2013 Aman Gupta <aman at tmm1.net>
            2012-2013 Ted Nyman <ted at ted.io>
 License: MIT
@@ -10,12 +12,13 @@ Copyright: 2012 Github, Inc
 License: BSD
 
 Files: vendor/pygments-main/*
-Copyright: 2006-2013 The pygments team
+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: MIT
+License: Expat
 
 Files: test/test_data.c
 Copyright: 2009-2010 Salvatore Sanfilippo <antirez at gmail.com>
@@ -24,30 +27,41 @@ License: BSD-3-clause
 Files: test/test_data.py
 Copyright: 2009-2013 Benoît Chesneau <benoitc at e-engura.org>
            2009-2013 Paul J. Davis <paul.joseph.davis at gmail.com>
-License: MIT
+License: Expat
 
 Files: debian/*
 Copyright: 2013 Per Andersson <avtobiff at gmail.com>
-License: MIT
+ 2014 Axel Wagner <mero at merovius.de>
+ 2014 Dominique Dumont <dod at debian.org>
+License: Expat
 
-License: MIT
- 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:
+License: BSD
+ Copyright (c) The Regents of the University of California.
+ All rights reserved.
  .
- The above copyright notice and this permission notice shall be included in all
- copies or substantial portions of the Software.
+ 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.
  .
- 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.
+ 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
@@ -98,30 +112,21 @@ License: BSD-3-clause
  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  POSSIBILITY OF SUCH DAMAGE.
 
-License: BSD
- Copyright (c) The Regents of the University of California.
- All rights reserved.
+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:
  .
- 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.
+ The above copyright notice and this permission notice shall be included in all
+ copies or substantial portions of the Software.
  .
- 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.
+ 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.

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



More information about the Pkg-ruby-extras-commits mailing list