[DRE-commits] [gem2deb] 01/01: Merge branch 'master' into extconf-options
Cédric Boutillier
boutil at moszumanska.debian.org
Mon May 11 21:19:50 UTC 2015
This is an automated email from the git hooks/post-receive script.
boutil pushed a commit to branch extconf-options
in repository gem2deb.
commit 6c1d6faf06e51c6e94db22f10c73e6f57bc24d32
Merge: ebb45cc 170ff74
Author: Cédric Boutillier <boutil at debian.org>
Date: Fri Apr 3 14:42:21 2015 +0200
Merge branch 'master' into extconf-options
Rakefile | 16 +--
bin/dh-make-ruby | 3 +
bin/dh_ruby | 39 +++++++
bin/gem2deb | 3 +
bin/gem2tgz | 3 +
debian/changelog | 56 +++++++++-
debian/control | 4 +-
debian/gem2deb-test-runner.install | 1 +
debian/rules | 2 +-
lib/gem2deb.rb | 14 ++-
lib/gem2deb/dh_make_ruby.rb | 122 ++++++++++++++-------
lib/gem2deb/dh_make_ruby/template/debian/control | 15 +--
.../dh_make_ruby/template/debian/tests/control | 9 --
.../dh_make_ruby/template/debian/tests/control.ex | 13 +++
lib/gem2deb/dh_ruby.rb | 43 +++++---
lib/gem2deb/extension_builder.rb | 2 +-
lib/gem2deb/installer.rb | 12 +-
lib/gem2deb/make.rb | 49 +++++++++
lib/gem2deb/setup_rb_installer.rb | 37 +++++--
lib/gem2deb/version.rb | 2 +-
test/integration/dh_make_ruby_integration_test.rb | 2 +-
test/integration/dh_ruby_fixdepends_test.rb | 2 +-
test/integration/gem2deb_test.rb | 2 +-
test/sample/simplegem/Rakefile | 6 +
test/sample/simplegem/pkg/simplegem-0.0.1.gem | Bin 4096 -> 4608 bytes
test/test_helper.rb | 9 +-
test/unit/dh_make_ruby_test.rb | 25 ++++-
test/unit/dh_ruby_test.rb | 19 +++-
test/unit/extension_builder_test.rb | 2 +-
test/unit/gem2tgz_test.rb | 2 +-
test/unit/installer_test.rb | 20 +---
test/unit/metadata_test.rb | 2 +-
test/unit/secure_code_test.rb | 2 +-
test/unit/setup_rb_installer_test.rb | 6 +-
test/unit/test_runner_test.rb | 2 +-
35 files changed, 405 insertions(+), 141 deletions(-)
diff --cc debian/changelog
index 4263559,c5f9b9e..a02515c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,56 +1,61 @@@
- gem2deb (0.9.3) UNRELEASED; urgency=medium
+ gem2deb (0.13) UNRELEASED; urgency=medium
+ [ Antonio Terceiro ]
- * gem2deb-test-runner: add '.' to $LOAD_PATH with --autopkgtest
- * Gem2Deb::TestRunner: remove innocuous constructor
+ * dh-make-ruby: bump Standards-Version in template to 3.9.6
+ * dh-make-ruby: add gem runtime dependencies to Build-Depends: as well
+ [ Cédric Boutillier ]
+ * Allow additional parameters for extconf.rb (Closes: #756129)
+
- -- Cédric Boutillier <boutil at debian.org> Mon, 08 Sep 2014 17:12:54 +0200
+ -- Antonio Terceiro <terceiro at debian.org> Sat, 28 Feb 2015 13:27:25 -0300
+
+ gem2deb (0.12) experimental; urgency=medium
+
+ * dh_ruby: if debian/dh_ruby.{mk,rake} exists, call {make,rake} on it during
+ the build. See docs in dh_ruby(1)
+ * dh-make-ruby: use a cache based on the output of apt-file to map gem names
+ to Debian package names when generating dependencies.
+ - add apt-file to Recommends:
+
+ -- Antonio Terceiro <terceiro at debian.org> Sat, 21 Feb 2015 20:34:04 -0200
+
+ gem2deb (0.11) experimental; urgency=medium
+
+ * dh-make-ruby: generate 'Testsuite: autopkgtest-pkg-ruby' to not conflict
+ with DEP-8 spec (i.e., if the 'Testsuite' field contains 'autopkgtest',
+ then debian/tests/control *must* exist).
+ - autopkgtest-pkg-ruby will be handled by autopkgtest and the implicit
+ test control data that uses gem2deb-test-runner will be used.
+ * improved "usage: " banner in several of the provided programs
+ * SetupRbInstaller: always use the system copy of setup.rb
+ * Gem2Deb#run: always print command lines being executed. This makes build
+ logs much more detailed, what is a good thing.
+ * dh-make-ruby: look for test files recursively in generated
+ debian/ruby-tests.rake for both test/unit and rspec style tests.
+ * dh-make-ruby: gem dependencies will now be included in debian/control
+ uncommented and transformed to Debian package names, i.e. foo → ruby-foo,
+ except for known exceptions (such as rake and rails initially).
+
+ -- Antonio Terceiro <terceiro at debian.org> Fri, 06 Feb 2015 15:37:58 -0200
+
+ gem2deb (0.10) unstable; urgency=medium
+
+ * gem2deb-test-runner: add '.' to $LOAD_PATH with --autopkgtest
+ * dh-make-ruby won't create debian/tests/control anymore since autopkgtest
+ will now auto-detect Ruby packages and assume an implicit tests
+ definition. debian/tests/control.ex will be created instead, with comments
+ explaining to either modify it and rename to control, or delete it.
+ * dh-make-ruby: when test/ or spec/ exists, create debian/ruby-tests.rake
+ with the appropriate rake invocation to run the tests, instead of being
+ insecure and creating files all commented out.
+ * install 'gem2deb/rake/testtask.rb' to gem2deb-test-runner instead of
+ gem2deb
+ * dh-make-ruby: generate uncommented Vcs-* headers in debian/control
+ * dh-make-ruby: remove version qualifier from build-dependency on gem2deb to
+ remove friction when backporting.
+
+ -- Antonio Terceiro <terceiro at debian.org> Mon, 08 Sep 2014 14:07:02 -0300
++>>>>>>> master
gem2deb (0.9.1) unstable; urgency=medium
diff --cc lib/gem2deb/dh_ruby.rb
index 039da54,4a20107..b62598a
--- a/lib/gem2deb/dh_ruby.rb
+++ b/lib/gem2deb/dh_ruby.rb
@@@ -77,10 -78,8 +81,10 @@@ module Gem2De
end
end
+ @build_args = ARGV.join(" ")
+
installers.each do |installer|
- installer.dh_auto_install_destdir = argv.first
+ installer.destdir_base = destdir_for(installer.binary_package, dh_auto_install_destdir)
installer.install_files_and_build_extensions
installer.update_shebangs
end
diff --cc lib/gem2deb/installer.rb
index 842fef9,ecf18d8..9bc45a4
--- a/lib/gem2deb/installer.rb
+++ b/lib/gem2deb/installer.rb
@@@ -16,11 -16,9 +16,11 @@@ module Gem2De
attr_reader :ruby_versions
attr_accessor :verbose
- attr_accessor :dh_auto_install_destdir
+ attr_accessor :destdir_base
- def initialize(binary_package, root, ruby_versions = SUPPORTED_RUBY_VERSIONS.keys)
+ attr_accessor :build_args
+
+ def initialize(binary_package, root, ruby_versions = SUPPORTED_RUBY_VERSIONS.keys, build_args = "")
@binary_package = binary_package
@root = File.expand_path(root)
@ruby_versions = ruby_versions
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/gem2deb.git
More information about the Pkg-ruby-extras-commits
mailing list