[DRE-commits] [ruby-mixlib-install] 03/05: A bit of work

[Hleb Valoshka]

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

tsfgnu-guest pushed a commit to branch master
in repository ruby-mixlib-install.

commit f2b3a0358150a51521c5d841dcd905865438f9a9
Author: Hleb Valoshka <375gnu at gmail.com>
Date:   Sat Mar 5 19:37:06 2016 +0300

    A bit of work
---
 debian/control   |  8 +++++---
 debian/copyright | 37 +++++++++++++++----------------------
 debian/rules     |  2 +-
 3 files changed, 21 insertions(+), 26 deletions(-)

diff --git a/debian/control b/debian/control
index efaf488..6bf9e8c 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.al
 Uploaders: Hleb Valoshka <375gnu at gmail.com>
 Build-Depends: debhelper (>= 9~),
                gem2deb
-Standards-Version: 3.9.6
+Standards-Version: 3.9.7
 Vcs-Git: git://anonscm.debian.org/pkg-ruby-extras/ruby-mixlib-install.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-ruby-extras/ruby-mixlib-install.git
 Homepage: https://chef.io
@@ -18,5 +18,7 @@ XB-Ruby-Versions: ${ruby:Versions}
 Depends: ruby | ruby-interpreter,
          ${misc:Depends},
          ${shlibs:Depends}
-Description: A mixin to help with omnitruck installs
- <insert long description, indented with spaces>
+Description: Mixin to help with omnitruck installs
+ Ruby library providing mixin to help with omnitruck installs.
+ .
+ Used by Chef related tools.
diff --git a/debian/copyright b/debian/copyright
index f43a9cc..c6acdbe 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,33 +3,26 @@ Upstream-Name: mixlib-install
 Source: https://chef.io
 
 Files: *
-Copyright: <years> <put author's name and email here>
-           <years> <likewise for another author>
-License: GPL-2+ (FIXME)
+Copyright: 2015 Chef, Inc
+License: Apache-2.0
 
 Files: debian/*
 Copyright: 2016 Hleb Valoshka <375gnu at gmail.com>
-License: GPL-2+ (FIXME)
+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
+ 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
  .
- 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.
+ http://www.apache.org/licenses/LICENSE-2.0
  .
- 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
+ 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.
  .
- 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'.
+ On Debian systems, the full text of the Apache License, Version 2.0
+ can be found in the file `/usr/share/common-licenses/Apache-2.0'.
diff --git a/debian/rules b/debian/rules
index 57b4299..98ebf73 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,7 +12,7 @@
 #export DH_RUBY_GEMSPEC=gem.gemspec
 #
 # Uncomment to check dependencies during build:
-# export GEM2DEB_TEST_RUNNER = --check-dependencies
+export GEM2DEB_TEST_RUNNER = --check-dependencies
 
 %:
 	dh $@ --buildsystem=ruby --with ruby

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