[DRE-commits] [gem2deb] 07/08: Merge remote-tracking branch 'origin/master'

[Antonio Terceiro]

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

terceiro pushed a commit to branch master
in repository gem2deb.

commit 0906e466b9d28f4db98cbdd91c20423ba8a6d927
Merge: f1c3176 3d2acea
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Mon Aug 11 22:40:41 2014 -0300

    Merge remote-tracking branch 'origin/master'
    
    Conflicts:
    	debian/changelog
    	lib/gem2deb/version.rb

 debian/changelog                                      |   7 ++++++-
 test/integration/dh_make_ruby_integration_test.rb     |   4 ++--
 test/integration/gem2deb_test.rb                      |   2 +-
 test/sample/Fancy_Package/Rakefile                    |   9 ++++++---
 test/sample/Fancy_Package/pkg/Fancy_Package-0.0.1.gem | Bin 3584 -> 4608 bytes
 test/sample/simpleextension/Rakefile                  |   9 ++++++---
 .../simpleextension/pkg/simpleextension-1.2.3.gem     | Bin 3584 -> 5120 bytes
 .../simpleextension_dh_auto_install_destdir/Rakefile  |   9 ++++++---
 test/sample/simpleextension_in_root/Rakefile          |   9 ++++++---
 .../pkg/simpleextension_in_root-1.2.3.gem             | Bin 3584 -> 4608 bytes
 test/sample/simpleextension_with_name_clash/Rakefile  |   9 ++++++---
 .../pkg/simpleextension-with-name-clash-1.2.3.gem     | Bin 4096 -> 5120 bytes
 test/sample/simplegem/Rakefile                        |   9 ++++++---
 test/sample/simplegem/pkg/simplegem-0.0.1.gem         | Bin 3072 -> 4096 bytes
 test/sample/simplemixed/Rakefile                      |   9 ++++++---
 test/sample/simplemixed/pkg/simplemixed-1.2.3.gem     | Bin 3584 -> 4608 bytes
 test/sample/simpleprogram-no-shebang/Rakefile         |   9 ++++++---
 .../pkg/simpleprogram-no-shebang-1.2.3.gem            | Bin 3072 -> 4608 bytes
 test/sample/simpleprogram/Rakefile                    |   9 ++++++---
 test/sample/simpleprogram/pkg/simpleprogram-1.2.3.gem | Bin 3072 -> 4096 bytes
 test/sample/simpletgz/Rakefile                        |  13 ++++++++-----
 test/sample/simpletgz/pkg/simpletgz-0.0.1.tgz         | Bin 520 -> 179 bytes
 22 files changed, 71 insertions(+), 36 deletions(-)

diff --cc debian/changelog
index ebef305,43c5e69..9b81709
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,9 +1,18 @@@
 -gem2deb (0.7.7) UNRELEASED; urgency=medium
 +gem2deb (0.8.0) unstable; urgency=medium
  
++  [Antonio Terceiro]
 +  * dh_ruby_fixdepends: inject minimum Ruby dependency provided by
 +    ruby-all-dev in the shared library dependencies. For that, bump dependency
 +    on ruby-all-dev to (>= 1:2.1.0.3~)
 +  * test/test_helper.rb: add test/bin to $PATH during tests
 +  * test/bin/wnpp-check: mock the actual wnpp-check during tests to avoid
 +    hitting the network
 +
-  -- Antonio Terceiro <terceiro at debian.org>  Sun, 10 Aug 2014 18:47:30 -0300
++  [Cédric Boutillier]
+   * Add no-wnpp-check option to gem2deb and dh_make_ruby in integration tests
+   * Update sample gems with non obsolete rake rules
+ 
+  -- Cédric Boutillier <boutil at debian.org>  Mon, 11 Aug 2014 14:22:55 +0200
  
  gem2deb (0.7.6) unstable; urgency=medium
  

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