[DRE-commits] [ruby-gssapi] 02/03: A bit of work on package
Hleb Valoshka
tsfgnu-guest at moszumanska.debian.org
Wed Jul 22 18:26:29 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-gssapi.
commit 0935ff51002e243dacd3be6da9385bac4c848876
Author: Hleb Valoshka <375gnu at gmail.com>
Date: Tue Jul 14 14:34:28 2015 +0300
A bit of work on package
---
debian/control | 12 ++++--
debian/copyright | 43 ++++++++++------------
debian/patches/0001-Update-for-RSpec3.patch | 40 ++++++++++++++++++++
.../0002-Disable-tests-for-GSSAPI-Simple.patch | 19 ++++++++++
debian/patches/series | 2 +
debian/ruby-tests.rake | 9 +++--
debian/tests/control.ex | 13 -------
7 files changed, 93 insertions(+), 45 deletions(-)
diff --git a/debian/control b/debian/control
index b958fc3..5656bd7 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,10 @@ Uploaders: Hleb Valoshka <375gnu at gmail.com>
Build-Depends: debhelper (>= 7.0.50~),
gem2deb,
rake,
- ruby-ffi (>= 1.0.1)
+ ruby-rspec,
+ ruby-rspec-expectations,
+ ruby-ffi (>= 1.0.1),
+ libgssapi-krb5-2
Standards-Version: 3.9.6
Vcs-Git: git://anonscm.debian.org/pkg-ruby-extras/ruby-gssapi.git
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-ruby-extras/ruby-gssapi.git
@@ -19,11 +22,12 @@ Architecture: all
XB-Ruby-Versions: ${ruby:Versions}
Depends: ruby | ruby-interpreter,
ruby-ffi (>= 1.0.1),
+ libgssapi-krb5-2,
${misc:Depends},
${shlibs:Depends}
-Description: A FFI wrapper around the system GSSAPI library.
+Description: FFI wrapper around the system GSSAPI library
A FFI wrapper around the system GSSAPI library. Please make sure and read the
Yard docs or standard GSSAPI documentation if you have any questions.
.
- There is also a class called GSSAPI::Simple that wraps many of the common features
- used for GSSAPI.
+ There is also a class called GSSAPI::Simple that wraps many of the common
+ features used for GSSAPI.
diff --git a/debian/copyright b/debian/copyright
index b1cf0ae..5cdcc84 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,35 +1,30 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: gssapi
-Source: FIXME <http://example.com/>
+Source: http://github.com/zenchild/gssapi
Files: *
-Copyright: <years> <put author's name and email here>
- <years> <likewise for another author>
-License: GPL-2+ (FIXME)
+Copyright: 2010-2014 Dan Wanek <dan.wanek at gmail.com>
+License: Expat
Files: debian/*
Copyright: 2015 Hleb Valoshka <375gnu at gmail.com>
-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 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.
diff --git a/debian/patches/0001-Update-for-RSpec3.patch b/debian/patches/0001-Update-for-RSpec3.patch
new file mode 100644
index 0000000..362a1fa
--- /dev/null
+++ b/debian/patches/0001-Update-for-RSpec3.patch
@@ -0,0 +1,40 @@
+From: Hleb Valoshka <375gnu at gmail.com>
+Date: Tue, 14 Jul 2015 15:34:15 +0300
+Subject: Update for RSpec3
+
+---
+ test/spec/gssapi_simple_spec.rb | 4 ++--
+ test/spec/test_buffer_spec.rb | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/test/spec/gssapi_simple_spec.rb b/test/spec/gssapi_simple_spec.rb
+index f07b551..182da36 100644
+--- a/test/spec/gssapi_simple_spec.rb
++++ b/test/spec/gssapi_simple_spec.rb
+@@ -13,12 +13,12 @@ describe GSSAPI::Simple, 'Test the Simple GSSAPI interface' do
+ it 'should get the initial context for a client' do
+ gsscli = GSSAPI::Simple.new(@conf[:c_host], @conf[:c_service])
+ token = gsscli.init_context
+- token.should_not be_empty
++ expect(token).not_to be_empty
+ end
+
+ it 'should acquire credentials for a server service' do
+ gsscli = GSSAPI::Simple.new(@conf[:s_host], @conf[:s_service], @conf[:keytab])
+- gsscli.acquire_credentials.should be_true
++ expect(gsscli.acquire_credentials).to be_truthy
+ end
+
+ end
+diff --git a/test/spec/test_buffer_spec.rb b/test/spec/test_buffer_spec.rb
+index c2714fa..2f1951b 100644
+--- a/test/spec/test_buffer_spec.rb
++++ b/test/spec/test_buffer_spec.rb
+@@ -10,6 +10,6 @@ describe GSSAPI::LibGSSAPI::UnManagedGssBufferDesc, 'Unmanaged Buffer Test' do
+ end
+
+ # If we get here without any errors we should be golden
+- true.should be_true
++ expect(true).to be_truthy
+ end
+ end
diff --git a/debian/patches/0002-Disable-tests-for-GSSAPI-Simple.patch b/debian/patches/0002-Disable-tests-for-GSSAPI-Simple.patch
new file mode 100644
index 0000000..a5a0a82
--- /dev/null
+++ b/debian/patches/0002-Disable-tests-for-GSSAPI-Simple.patch
@@ -0,0 +1,19 @@
+From: Hleb Valoshka <375gnu at gmail.com>
+Date: Tue, 14 Jul 2015 15:35:17 +0300
+Subject: Disable tests for GSSAPI::Simple
+
+They need remote services and absent files
+---
+ test/spec/gssapi_simple_spec.rb | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/spec/gssapi_simple_spec.rb b/test/spec/gssapi_simple_spec.rb
+index 182da36..5015c4c 100644
+--- a/test/spec/gssapi_simple_spec.rb
++++ b/test/spec/gssapi_simple_spec.rb
+@@ -21,4 +21,4 @@ describe GSSAPI::Simple, 'Test the Simple GSSAPI interface' do
+ expect(gsscli.acquire_credentials).to be_truthy
+ end
+
+-end
++end if false
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..d2d1e41
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+0001-Update-for-RSpec3.patch
+0002-Disable-tests-for-GSSAPI-Simple.patch
diff --git a/debian/ruby-tests.rake b/debian/ruby-tests.rake
index 63f3fd6..479771f 100644
--- a/debian/ruby-tests.rake
+++ b/debian/ruby-tests.rake
@@ -1,6 +1,7 @@
-require 'gem2deb/rake/testtask'
+require 'rspec/core/rake_task'
-Gem2Deb::Rake::TestTask.new do |t|
- t.libs = ['test']
- t.test_files = FileList['test/**/*_test.rb'] + FileList['test/**/test_*.rb']
+RSpec::Core::RakeTask.new(:spec) do |spec|
+ spec.pattern = './test/spec/**/*_spec.rb'
end
+
+task :default => :spec
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-gssapi.git
More information about the Pkg-ruby-extras-commits
mailing list