[DRE-commits] [rhc] 01/07: Update packaging with a new dh-make-ruby run
Antonio Terceiro
terceiro at moszumanska.debian.org
Tue Jun 30 12:36:48 UTC 2015
This is an automated email from the git hooks/post-receive script.
terceiro pushed a commit to branch master
in repository rhc.
commit 5e26c065d2165dbbd669acc596a5f683d382de04
Author: Antonio Terceiro <terceiro at debian.org>
Date: Tue Jun 30 09:11:22 2015 -0300
Update packaging with a new dh-make-ruby run
---
debian/changelog | 6 +++++
debian/control | 38 +++++++++++++++++-----------
debian/ruby-test-files.yaml.disabled | 49 ------------------------------------
debian/ruby-tests.rake | 7 ++++++
debian/rules | 13 ++--------
5 files changed, 39 insertions(+), 74 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index ce17d75..23704a6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+rhc (1.35.4-3) UNRELEASED; urgency=medium
+
+ * Update packaging with a new dh-make-ruby run
+
+ -- Antonio Terceiro <terceiro at debian.org> Tue, 30 Jun 2015 09:07:27 -0300
+
rhc (1.35.4-2) unstable; urgency=medium
* Team upload.
diff --git a/debian/control b/debian/control
index 17badc9..052d69f 100644
--- a/debian/control
+++ b/debian/control
@@ -3,32 +3,42 @@ Section: ruby
Priority: optional
Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
Uploaders: Chow Loong Jin <hyperair at debian.org>
-Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.6.1~)
+Build-Depends: debhelper (>= 7.0.50~),
+ gem2deb,
+ rake,
+ ruby-archive-tar-minitar,
+ ruby-commander (<< 4.3.0),
+ ruby-commander (>= 4.0),
+ ruby-highline (>= 1.6.11),
+ ruby-httpclient (>= 2.4.0),
+ ruby-net-scp (>= 1.1.2),
+ ruby-net-ssh (<< 2.9.3),
+ ruby-net-ssh (>= 2.0.11),
+ ruby-net-ssh-multi (>= 1.2.0),
+ ruby-open4,
+ ruby-rspec
Standards-Version: 3.9.6
Vcs-Git: git://anonscm.debian.org/pkg-ruby-extras/rhc.git
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-ruby-extras/rhc.git;a=summary
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-ruby-extras/rhc.git
Homepage: https://github.com/openshift/rhc
+Testsuite: autopkgtest-pkg-ruby
XS-Ruby-Versions: all
Package: rhc
Architecture: all
XB-Ruby-Versions: ${ruby:Versions}
-Depends: ${misc:Depends},
- ruby | ruby-interpreter,
- ruby-net-ssh (>= 2.0.11),
- ruby-net-scp (>= 1.1.1),
- ruby-net-ssh-multi (>= 1.2.0),
+Depends: ruby | ruby-interpreter,
ruby-archive-tar-minitar,
+ ruby-commander (<< 4.3.0),
ruby-commander (>= 4.0),
ruby-highline (>= 1.6.11),
- ruby-highline (<< 1.7),
- ruby-httpclient (>= 2.2),
+ ruby-httpclient (>= 2.4.0),
+ ruby-net-scp (>= 1.1.2),
+ ruby-net-ssh (>= 2.0.11),
+ ruby-net-ssh-multi (>= 1.2.0),
ruby-open4,
- rake (>= 0.8.7),
- ruby-fakefs (>= 0.4),
- ruby-thor,
- cucumber,
- ruby-activesupport (>= 3.0)
+ ${misc:Depends},
+ ${shlibs:Depends}
Description: OpenShift command-line client tools
OpenShift is a cloud computing platform as a service (PaaS) product from Red
Hat.
diff --git a/debian/ruby-test-files.yaml.disabled b/debian/ruby-test-files.yaml.disabled
deleted file mode 100644
index fbc1cbe..0000000
--- a/debian/ruby-test-files.yaml.disabled
+++ /dev/null
@@ -1,49 +0,0 @@
----
-- spec/rest_spec_helper.rb
-- spec/spec_helper.rb
-- spec/direct_execution_helper.rb
-- spec/coverage_helper.rb
-- spec/wizard_spec_helper.rb
-- spec/rhc/highline_extensions_spec.rb
-- spec/rhc/cli_spec.rb
-- spec/rhc/rest_spec.rb
-- spec/rhc/targz_spec.rb
-- spec/rhc/wizard_spec.rb
-- spec/rhc/servers_spec.rb
-- spec/rhc/rest_client_spec.rb
-- spec/rhc/commands/sshkey_spec.rb
-- spec/rhc/commands/apps_spec.rb
-- spec/rhc/commands/account_spec.rb
-- spec/rhc/commands/domain_spec.rb
-- spec/rhc/commands/team_spec.rb
-- spec/rhc/commands/cartridge_spec.rb
-- spec/rhc/commands/app_spec.rb
-- spec/rhc/commands/snapshot_spec.rb
-- spec/rhc/commands/ssh_spec.rb
-- spec/rhc/commands/region_spec.rb
-- spec/rhc/commands/tail_spec.rb
-- spec/rhc/commands/setup_spec.rb
-- spec/rhc/commands/alias_spec.rb
-- spec/rhc/commands/scp_spec.rb
-- spec/rhc/commands/env_spec.rb
-- spec/rhc/commands/port_forward_spec.rb
-- spec/rhc/commands/git_clone_spec.rb
-- spec/rhc/commands/authorization_spec.rb
-- spec/rhc/commands/member_spec.rb
-- spec/rhc/commands/threaddump_spec.rb
-- spec/rhc/commands/server_spec.rb
-- spec/rhc/commands/deployment_spec.rb
-- spec/rhc/commands/logout_spec.rb
-- spec/rhc/json_spec.rb
-- spec/rhc/auth_spec.rb
-- spec/rhc/config_spec.rb
-- spec/rhc/helpers_spec.rb
-- spec/rhc/rest_application_spec.rb
-- spec/rhc/command_spec.rb
-- features/server_feature.rb
-- features/members_feature.rb
-- features/deployments_feature.rb
-- features/app_feature.rb
-- features/core_feature.rb
-- features/keys_feature.rb
-- features/domains_feature.rb
diff --git a/debian/ruby-tests.rake b/debian/ruby-tests.rake
new file mode 100644
index 0000000..dcc1601
--- /dev/null
+++ b/debian/ruby-tests.rake
@@ -0,0 +1,7 @@
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec) do |spec|
+ spec.pattern = './spec/**/*_spec.rb'
+end
+
+task :default => :spec
diff --git a/debian/rules b/debian/rules
index 82ddc0c..3454d59 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,15 +1,6 @@
#!/usr/bin/make -f
-#export DH_VERBOSE=1
-#
-# Uncomment to ignore all test failures (but the tests will run anyway)
-#export DH_RUBY_IGNORE_TESTS=all
-#
-# Uncomment to ignore some test failures (but the tests will run anyway).
-# Valid values:
-#export DH_RUBY_IGNORE_TESTS=ruby1.9.1 ruby2.0 require-rubygems
-#
-# If you need to specify the .gemspec (eg there is more than one)
-#export DH_RUBY_GEMSPEC=gem.gemspec
+
+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/rhc.git
More information about the Pkg-ruby-extras-commits
mailing list