[DRE-commits] [ruby-kitchen-vagrant] 03/06: A bit of packaging work

Thu Jul 9 16:36:06 UTC 2015

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

tsfgnu-guest pushed a commit to branch master
in repository ruby-kitchen-vagrant.

commit 6d3248a9b8a128e6de3b344c4632517937401a8f
Author: Hleb Valoshka <375gnu at gmail.com>
Date:   Wed Jul 8 18:06:49 2015 +0300

    A bit of packaging work
---
 debian/control                   | 12 +++++++++---
 debian/copyright                 | 39 ++++++++++++++++-----------------------
 debian/ruby-kitchen-vagrant.docs |  3 +--
 debian/rules                     |  5 +++++
 debian/tests/control.ex          | 13 -------------
 5 files changed, 31 insertions(+), 41 deletions(-)

diff --git a/debian/control b/debian/control
index 3a9f961..21ee91d 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 7.0.50~),
                gem2deb,
                rake,
                ruby-rspec,
-               ruby-test-kitchen (>= 1.4)
+               test-kitchen (>= 1.4)
 Standards-Version: 3.9.6
 Vcs-Git: git://anonscm.debian.org/pkg-ruby-extras/ruby-kitchen-vagrant.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-ruby-extras/ruby-kitchen-vagrant.git
@@ -19,8 +19,14 @@ Package: ruby-kitchen-vagrant
 Architecture: all
 XB-Ruby-Versions: ${ruby:Versions}
 Depends: ruby | ruby-interpreter,
-         ruby-test-kitchen (>= 1.4),
+         test-kitchen (>= 1.4),
+         vagrant (>= 1.6),
          ${misc:Depends},
          ${shlibs:Depends}
-Description: Kitchen::Driver::Vagrant - A Vagrant Driver for Test Kitchen.
+Description: vagrant driver for test kitchen
  Kitchen::Driver::Vagrant - A Vagrant Driver for Test Kitchen.
+ .
+ This driver works by generating a single Vagrantfile for each instance in a
+ sandboxed directory. Since the Vagrantfile is written out on disk, Vagrant
+ needs absolutely no knowledge of Test Kitchen. So no Vagrant plugins are
+ required.
diff --git a/debian/copyright b/debian/copyright
index 9ccb2ec..6295b58 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,35 +1,28 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: kitchen-vagrant
-Source: FIXME <http://example.com/>
+Source: https://github.com/test-kitchen/kitchen-vagrant/
 
 Files: *
-Copyright: <years> <put author's name and email here>
-           <years> <likewise for another author>
-License: GPL-2+ (FIXME)
+Copyright: 2012-2015 Fletcher Nichol <fnichol at nichol.ca>
+License: Apache-2.0
 
 Files: debian/*
 Copyright: 2015 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/ruby-kitchen-vagrant.docs b/debian/ruby-kitchen-vagrant.docs
index 07b3c9e..b43bf86 100644
--- a/debian/ruby-kitchen-vagrant.docs
+++ b/debian/ruby-kitchen-vagrant.docs
@@ -1,2 +1 @@
-# FIXME: READMEs found
-# README.md
+README.md
diff --git a/debian/rules b/debian/rules
index 57b4299..c1c9247 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,3 +16,8 @@
 
 %:
 	dh $@ --buildsystem=ruby --with ruby
+
+override_dh_auto_install:
+	mkdir -p $(CURDIR)/debian/ruby-kitchen-vagrant/usr/share/ruby-kitchen-vagrant
+	cp -rf $(CURDIR)/templates/ $(CURDIR)/debian/ruby-kitchen-vagrant/usr/share/ruby-kitchen-vagrant
+	dh_auto_install
diff --git a/debian/tests/control.ex b/debian/tests/control.ex
deleted file mode 100644
index d604201..0000000
--- a/debian/tests/control.ex
+++ /dev/null
@@ -1,13 +0,0 @@
-# AUTOGENERATED FILE
-#
-# As of autopkgtest 3.5, Ruby packages that use gem2deb are automatically
-# detected, and if debian/tests/control does not exist the contents below will
-# be assumed (with the exception of gem2deb being filtered out from
-# @builddeps@):
-
-Test-Command: gem2deb-test-runner --autopkgtest --check-dependencies 2>&1
-Depends: @, @builddeps@, gem2deb-test-runner
-
-# if you would need to change something to the above, to that and rename this
-# file to `control`. Otherwise, you should probably delete this file
-# (recommended).

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

