[DRE-commits] [ruby-cabin] 05/06: Fix various lintian warnings and errors

[Tim Potter]

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

tpot-guest pushed a commit to branch master
in repository ruby-cabin.

commit 421c8690cfc26790191ee14e7f8a618d5c54bb3b
Author: Tim Potter <tpot at hp.com>
Date:   Tue Aug 5 11:09:12 2014 +1000

    Fix various lintian warnings and errors
---
 debian/changelog |  2 +-
 debian/control   |  3 ++-
 debian/copyright | 40 ++++++++++++++++------------------------
 3 files changed, 19 insertions(+), 26 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 163a2cb..7ed5bb4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
 ruby-cabin (0.6.1-1) unstable; urgency=medium
 
-  * Initial release (Closes: #nnnn)
+  * Initial release (Closes: #757066)
 
  -- Tim Potter <tpot at hp.com>  Fri, 25 Jul 2014 15:24:19 +1000
diff --git a/debian/control b/debian/control
index 03a2205..3088680 100644
--- a/debian/control
+++ b/debian/control
@@ -15,4 +15,5 @@ Architecture: all
 XB-Ruby-Versions: ${ruby:Versions}
 Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter
 Description: Experiments in structured and contextual logging
- This is an experiment to try and make logging more flexible and more consumable. Plain text logs are bullshit, let's emit structured and contextual logs. Metrics, too!
+ This is an experiment to try and make logging more flexible and more consumable. Plain text 
+ logs are bullshit, let's emit structured and contextual logs. Metrics, too!
diff --git a/debian/copyright b/debian/copyright
index fc7b4b1..8f16f4e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,35 +1,27 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: cabin
-Source: FIXME <http://example.com/>
+Source: https://github.com/jordansissel/ruby-cabin
 
 Files: *
-Copyright: <years> <put author's name and email here>
-           <years> <likewise for another author>
-License: GPL-2+ (FIXME)
+Copyright: 2011 Jordan Sissel
+License: Apache 2.0
 
 Files: debian/*
-Copyright: 2014  <tpot at hp.com>
-License: GPL-2+ (FIXME)
+Copyright: 2014 Tim Potter <tpot at hp.com>
+License: Apache 2.0
 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: Apache 2.0
+ Copyright 2011 Jordan Sissel
  .
- 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.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
  .
- 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
+ http://www.apache.org/licenses/LICENSE-2.0
  .
- 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'.
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.

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