[DRE-commits] [ruby-fog-libvirt] 06/16: Merge remote-tracking branch 'alioth/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 85ca07ebd5ce043afa552717285104cea88b71a9
Merge: b51e466 eff2f78
Author: intrigeri <intrigeri at boum.org>
Date:   Wed Feb 17 14:49:03 2016 +0000

    Merge remote-tracking branch 'alioth/master'

 debian/control   |  5 +++--
 debian/copyright |  3 ++-
 debian/rules     | 14 +-------------
 3 files changed, 6 insertions(+), 16 deletions(-)

diff --cc debian/control
index 70511a6,310e90c..38ca4c0
--- a/debian/control
+++ b/debian/control
@@@ -2,15 -2,15 +2,16 @@@ Source: ruby-fog-libvir
  Section: ruby
  Priority: optional
  Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
- Uploaders: intrigeri <intrigeri at debian.org>
 -Uploaders: Antonio Terceiro <terceiro at debian.org>
++Uploaders: Antonio Terceiro <terceiro at debian.org>,
++           intrigeri <intrigeri at debian.org>
  Build-Depends: debhelper (>= 7.0.50~),
                 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-shindo (>= 0.3.4)
++               ruby-shindo (>= 0.3.4)
  Standards-Version: 3.9.6
  Vcs-Git: git://anonscm.debian.org/pkg-ruby-extras/ruby-fog-libvirt.git
  Vcs-Browser: https://anonscm.debian.org/cgit/pkg-ruby-extras/ruby-fog-libvirt.git
diff --cc debian/copyright
index 4be56ee,e83c00b..e3b74e0
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,32 -1,35 +1,33 @@@
  Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
  Upstream-Name: fog-libvirt
 -Source: FIXME <http://example.com/>
 +Source: http://github.com/fog/fog-libvirt
  
  Files: *
 -Copyright: <years> <put author's name and email here>
 -           <years> <likewise for another author>
 -License: GPL-2+ (FIXME)
 +Copyright: Copyright (c) 2009-2014 CONTRIBUTORS.md
 +License: Expat
  
  Files: debian/*
- Copyright: 2015 intrigeri <intrigeri at debian.org>
 -Copyright: 2015 Antonio Terceiro <terceiro at debian.org>
 -License: GPL-2+ (FIXME)
++Copyright: 2015-2016 intrigeri <intrigeri at debian.org>,
++           2015 Antonio Terceiro <terceiro at debian.org>
 +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 OR COPYRIGHT HOLDERS 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.

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