[DRE-commits] [ruby-sdoc] 08/08: final tidying up

Antonio Terceiro terceiro at moszumanska.debian.org
Sun Aug 3 02:13:05 UTC 2014 

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

terceiro pushed a commit to branch master
in repository ruby-sdoc.

commit 38130de900981b123165d2369502b75df2b40550
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Sat Aug 2 23:08:09 2014 -0300

    final tidying up
---
 debian/control                     |  2 +-
 debian/copyright                   | 87 +++++++++++++++++++++++++++-----------
 debian/ruby-sdoc.lintian-overrides |  3 +-
 spec/spec_helper.rb                |  3 --
 4 files changed, 65 insertions(+), 30 deletions(-)

diff --git a/debian/control b/debian/control
index 2ed90fb..fc55112 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Package: ruby-sdoc
 Architecture: all
 XB-Ruby-Versions: ${ruby:Versions}
 Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter, ruby-json
-Description: RDoc generator to build searchable HTML documentation for Ruby code.
+Description: RDoc generator to build searchable HTML documentation for Ruby code
  This package provides extra generators and templates for the RDoc
  documentation tool for Ruby. Generated HTML documentation has a javascript
  search index, so the documentation is searchable without any server-side
diff --git a/debian/copyright b/debian/copyright
index f60cbfe..209fdc2 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -120,6 +120,8 @@ Comment:
 Files: lib/rdoc/generator/template/sdoc/resources/css/github.css
  lib/rdoc/generator/template/rails/resources/css/github.css
 Copyright: (c) Vasily Polovnyov <vast at whiteants.net>
+License:
+ Unspecified; assumed to be the same as most of the files in the package.
 
 Files: lib/rdoc/generator/template/sdoc/resources/js/highlight.pack.js
  lib/rdoc/generator/template/rails/resources/js/highlight.pack.js
@@ -157,10 +159,12 @@ Files: lib/rdoc/generator/template/sdoc/resources/js/jquery-1.3.2.min.js
  lib/rdoc/generator/template/rails/resources/js/jquery-1.3.2.min.js
 Copyright:
  * Copyright (c) 2009 John Resig
+ * Copyright 2009, The Dojo Foundation
+License:
+ * Copyright (c) 2009 John Resig
  * Dual licensed under the MIT and GPL licenses.
  * Copyright 2009, The Dojo Foundation
  * Released under the MIT, BSD, and GPL Licenses.
-License: MIT or BSD or GPL
 Comment: the upstream package only includes a minified copy of this library.
  The original source (and its licensing terms) was obtained from
  https://jquery.com/ and distributed in the debian
@@ -176,34 +180,67 @@ Copyright:
  * Released under the MIT and GPL licenses.
  * Copyright 2008 George McGinley Smith
  * Copyright 2001 Robert Penner
-License: MIT or GPL
+License:
+ * Copyright (c) 2009 AUTHORS.txt (http://ui.jquery.com/about)
+ * Dual licensed under the MIT (MIT-LICENSE.txt)
+ * and GPL (GPL-LICENSE.txt) licenses.
+ * Copyright 2007 John Resig
+ * Released under the MIT and GPL licenses.
+ * Copyright 2008 George McGinley Smith
+ All rights reserved.
+ .
+ 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 the author nor the names of contributors may be used to
+ endorse or promote products derived from this software without specific prior
+ written permission.
+ .
+ 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.
+ * Copyright 2001 Robert Penner
  All rights reserved.
  .
- 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 the author nor the names of contributors may be used to endorse
- or promote products derived from this software without specific prior written permission.
- .
- 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.
+ 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 the author nor the names of contributors may be used to
+ endorse or promote products derived from this software without specific prior
+ written permission.
+ .
+ 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.
 
 Files: debian/*
 Copyright: 2014 Christian Hofstaedtler <zeha at debian.org>
  2014 Antonio Terceiro <terceiro at debian.org>
-License: same as the original package
-Comment:
+License:
  The Debian packaging is licensed under the same terms as the original package.
diff --git a/debian/ruby-sdoc.lintian-overrides b/debian/ruby-sdoc.lintian-overrides
index 6187086..02f6276 100644
--- a/debian/ruby-sdoc.lintian-overrides
+++ b/debian/ruby-sdoc.lintian-overrides
@@ -1 +1,2 @@
-ruby-sdoc binary: image-file-in-usr-lib
+ruby-sdoc: image-file-in-usr-lib
+ruby-sdoc: copyright-refers-to-versionless-license-file
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index e690163..7454582 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,6 +1,3 @@
-require 'rubygems'
-require 'bundler/setup'
-
 require 'sdoc'
 
 require 'rdoc/test_case'

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

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