[DRE-commits] [ruby-mixlib-archive] 02/02: A bit of work
Hleb Valoshka
tsfgnu-guest at moszumanska.debian.org
Fri Aug 5 12:51:09 UTC 2016
This is an automated email from the git hooks/post-receive script.
tsfgnu-guest pushed a commit to branch master
in repository ruby-mixlib-archive.
commit 7d294a08452d915b6f3e0e29c421cb061ac704bf
Author: Hleb Valoshka <375gnu at gmail.com>
Date: Fri Aug 5 15:50:55 2016 +0300
A bit of work
---
debian/changelog | 6 ++--
debian/control | 12 ++++---
debian/copyright | 37 +++++++++-------------
...1-Require-tmpdir-in-specs-clean-load_path.patch | 16 ++++++++++
debian/patches/series | 1 +
debian/ruby-tests.rake | 5 +++
debian/watch | 4 ++-
7 files changed, 51 insertions(+), 30 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 203a947..29a1816 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
-ruby-mixlib-archive (0.2.0-1) UNRELEASED; urgency=medium
+ruby-mixlib-archive (0.2.0-1) unstable; urgency=medium
- * Initial release (Closes: #nnnn)
+ * Initial release.
- -- Hleb Valoshka <375gnu at gmail.com> Fri, 05 Aug 2016 14:01:41 +0300
+ -- Hleb Valoshka <375gnu at gmail.com> Fri, 05 Aug 2016 15:50:28 +0300
diff --git a/debian/control b/debian/control
index 412fc30..38ae273 100644
--- a/debian/control
+++ b/debian/control
@@ -5,8 +5,10 @@ Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.al
Uploaders: Hleb Valoshka <375gnu at gmail.com>
Build-Depends: debhelper (>= 9~),
gem2deb,
- ruby-mixlib-log
-Standards-Version: 3.9.7
+ ruby-mixlib-log,
+ ruby-rspec,
+ rake
+Standards-Version: 3.9.8
Vcs-Git: https://anonscm.debian.org/git/pkg-ruby-extras/ruby-mixlib-archive.git
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-ruby-extras/ruby-mixlib-archive.git
Homepage: https://chef.io
@@ -20,5 +22,7 @@ Depends: ruby | ruby-interpreter,
ruby-mixlib-log,
${misc:Depends},
${shlibs:Depends}
-Description: A simple interface to various archive formats
- A simple interface to various archive formats
+Description: simple interface to various archive formats
+ This package provides a simple interface to various archive formats.
+ .
+ Currently only uncompressed and gzipped TAR files are supported.
diff --git a/debian/copyright b/debian/copyright
index c4fbdf2..dfd363f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,33 +3,26 @@ Upstream-Name: mixlib-archive
Source: https://chef.io
Files: *
-Copyright: <years> <put author's name and email here>
- <years> <likewise for another author>
-License: GPL-2+ (FIXME)
+Copyright: 2016 Chef Software, 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/patches/0001-Require-tmpdir-in-specs-clean-load_path.patch b/debian/patches/0001-Require-tmpdir-in-specs-clean-load_path.patch
new file mode 100644
index 0000000..8d5eb55
--- /dev/null
+++ b/debian/patches/0001-Require-tmpdir-in-specs-clean-load_path.patch
@@ -0,0 +1,16 @@
+From: Hleb Valoshka <375gnu at gmail.com>
+Date: Fri, 5 Aug 2016 14:27:42 +0300
+Subject: Require tmpdir in specs, clean load_path
+
+---
+ spec/spec_helper.rb | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
+index e98e7c8..d8134c5 100644
+--- a/spec/spec_helper.rb
++++ b/spec/spec_helper.rb
+@@ -1,2 +1,2 @@
+-$LOAD_PATH.unshift File.expand_path("../../lib", __FILE__)
+ require "mixlib/archive"
++require "tmpdir"
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..7d36bb6
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Require-tmpdir-in-specs-clean-load_path.patch
diff --git a/debian/ruby-tests.rake b/debian/ruby-tests.rake
new file mode 100644
index 0000000..cf1591e
--- /dev/null
+++ b/debian/ruby-tests.rake
@@ -0,0 +1,5 @@
+require 'gem2deb/rake/spectask'
+
+Gem2Deb::Rake::RSpecTask.new do |spec|
+ spec.pattern = './spec/**/*_spec.rb'
+end
diff --git a/debian/watch b/debian/watch
index bfa2971..345d63a 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,4 @@
version=3
-http://pkg-ruby-extras.alioth.debian.org/cgi-bin/gemwatch/mixlib-archive .*/mixlib-archive-(.*).tar.gz
+opts=uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha)\.\d*)$/$1~$2/,\
+filenamemangle=s/.+\/v?(\d\S*)\.tar\.gz/mixlib-archive-$1\.tar\.gz/ \
+https://github.com/chef/mixlib-archive/tags .*/v?(\d\S*)\.tar\.gz
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-mixlib-archive.git
More information about the Pkg-ruby-extras-commits
mailing list