[DRE-commits] [ruby-adsf] 02/15: update copyright and control files

[Cédric Boutillier]

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

boutil pushed a commit to branch master
in repository ruby-adsf.

commit 451f51fb3f681f47428defdb5d035f42a864a1d3
Author: Cédric Boutillier <boutil at debian.org>
Date:   Fri Jun 3 22:00:13 2016 +0200

    update copyright and control files
---
 debian/control   | 10 +++++++---
 debian/copyright | 42 +++++++++++++++++++-----------------------
 2 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/debian/control b/debian/control
index afb602a..f4a883b 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Cédric Boutillier <boutil at debian.org>
 Build-Depends: debhelper (>= 9~),
                gem2deb,
                ruby-rack (>= 1.0.0)
-Standards-Version: 3.9.7
+Standards-Version: 3.9.8
 Vcs-Git: https://anonscm.debian.org/git/pkg-ruby-extras/ruby-adsf.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-ruby-extras/ruby-adsf.git
 Homepage: http://github.com/ddfreyne/adsf/
@@ -20,5 +20,9 @@ Depends: ruby | ruby-interpreter,
          ruby-rack (>= 1.0.0),
          ${misc:Depends},
          ${shlibs:Depends}
-Description: a tiny static file server
- A web server that can be spawned in any directory
+Description: tiny static file server
+ adsf (A Dead Simple Fileserver) is a tiny web server that can be spawned in any
+ directory to serve static files. It can be used programmatically in Rack and
+ other Ruby applications.
+ .
+ For example, the nanoc static website generator uses it its "view" command.
diff --git a/debian/copyright b/debian/copyright
index 4cb13e3..81d8a9a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,33 +3,29 @@ Upstream-Name: adsf
 Source: http://github.com/ddfreyne/adsf/
 
 Files: *
-Copyright: <years> <put author's name and email here>
-           <years> <likewise for another author>
-License: GPL-2+ (FIXME)
+Copyright: 2009-2016 Denis Defreyne <denis.defreyne at stoneship.org>
+License: Expat
 
 Files: debian/*
 Copyright: 2016 Cédric Boutillier <boutil at debian.org>
-License: GPL-2+ (FIXME)
+License: Expat
 Comment: the Debian packaging is licensed under the same terms as the original package.
 
-License: GPL-2+ (FIXME)
- This program is free software; you can redistribute it
- and/or modify it under the terms of the GNU General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later
- version.
+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:
  .
- This program is distributed in the hope that it will be
- useful, but WITHOUT ANY WARRANTY; without even the implied
- warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE.  See the GNU General Public License for more
- details.
+ The above copyright notice and this permission notice shall be included in all
+ copies or substantial portions of the Software.
  .
- You should have received a copy of the GNU General Public
- License along with this package; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- Boston, MA  02110-1301 USA
- .
- On Debian systems, the full text of the GNU General Public
- License version 2 can be found in the file
- `/usr/share/common-licenses/GPL-2'.
+ 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-adsf.git