[DRE-commits] [ruby-fog-libvirt] 13/16: Merge remote-tracking branch 'intrigeri/master'

[Antonio Terceiro]

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

terceiro pushed a commit to branch master
in repository ruby-fog-libvirt.

commit d78bdba8354b01506beb9deb45c16741e931d5dd
Merge: ce2cb0b c4c2b84
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Sun Apr 17 13:49:14 2016 -0300

    Merge remote-tracking branch 'intrigeri/master'

 debian/changelog                                   | 11 ++++-
 debian/control                                     |  6 ++-
 debian/copyright                                   | 48 +++++++++----------
 ...pendency-on-ruby-libvirt-at-the-Gem-level.patch | 54 ++++++++++++++++++++++
 debian/patches/Add-missing-require-s.patch         | 19 ++++++++
 debian/patches/series                              |  2 +
 debian/ruby-test-files.yaml                        |  6 +++
 fog-libvirt.gemspec                                |  2 +-
 lib/fog/libvirt/models/compute/server.rb           |  7 ++-
 lib/fog/libvirt/version.rb                         |  2 +-
 metadata.yml                                       | 16 +++++--
 11 files changed, 136 insertions(+), 37 deletions(-)

diff --cc debian/control
index 5a23ce0,ebf2070..7739bf2
--- a/debian/control
+++ b/debian/control
@@@ -3,16 -3,17 +3,17 @@@ Section: rub
  Priority: optional
  Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
  Uploaders: Antonio Terceiro <terceiro at debian.org>
 -Build-Depends: debhelper (>= 7.0.50~),
 +Build-Depends: debhelper (>= 9~),
                 gem2deb,
-                ruby-fog-core (>= 1.27),
                 ruby-fog-core (>= 1.27.4),
                 ruby-fog-json,
                 ruby-fog-xml (>= 0.1.1),
                 ruby-json,
-                ruby-libvirt (>= 0.5.0)
+                ruby-libvirt (>= 0.5.0),
+                ruby-libvirt (<< 0.7.0),
+                ruby-shindo (>= 0.3.4)
 -Standards-Version: 3.9.6
 -Vcs-Git: git://anonscm.debian.org/pkg-ruby-extras/ruby-fog-libvirt.git
 +Standards-Version: 3.9.7
 +Vcs-Git: https://anonscm.debian.org/git/pkg-ruby-extras/ruby-fog-libvirt.git
  Vcs-Browser: https://anonscm.debian.org/cgit/pkg-ruby-extras/ruby-fog-libvirt.git
  Homepage: http://github.com/fog/fog-libvirt
  Testsuite: autopkgtest-pkg-ruby

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