From 8d4dbdee2d218ab8908cf97aa022562c313a0ad3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Tue, 29 Nov 2016 13:18:46 +0100 Subject: [PATCH] ipaddress: finalize packaging --- ipaddress/debian/changelog | 4 +-- ipaddress/debian/control | 5 ++-- ipaddress/debian/copyright | 48 +++++++++++++++++------------------ ipaddress/debian/ruby-ipaddress.docs | 3 +-- ipaddress/debian/ruby-test-files.yaml | 7 ----- ipaddress/debian/ruby-tests.rb | 2 ++ 6 files changed, 31 insertions(+), 38 deletions(-) delete mode 100644 ipaddress/debian/ruby-test-files.yaml create mode 100644 ipaddress/debian/ruby-tests.rb diff --git a/ipaddress/debian/changelog b/ipaddress/debian/changelog index 9dea00a..e641ac5 100644 --- a/ipaddress/debian/changelog +++ b/ipaddress/debian/changelog @@ -1,5 +1,5 @@ -ruby-ipaddress (0.8.3-1) UNRELEASED; urgency=medium +ruby-ipaddress (0.8.3-1) trusty; urgency=low - * Initial release (Closes: #nnnn) + * Initial release -- František Dvořák Tue, 29 Nov 2016 13:00:07 +0100 diff --git a/ipaddress/debian/control b/ipaddress/debian/control index e45413f..ec4be50 100644 --- a/ipaddress/debian/control +++ b/ipaddress/debian/control @@ -3,10 +3,11 @@ Section: ruby Priority: optional Maintainer: Debian Ruby Extras Maintainers Uploaders: František Dvořák -Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.6.1~) -Standards-Version: 3.9.4 +Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.6.1~), ruby-minitest +Standards-Version: 3.9.5 #Vcs-Git: git://anonscm.debian.org/pkg-ruby-extras/ruby-ipaddress.git #Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-ruby-extras/ruby-ipaddress.git;a=summary +Vcs-Browser: http://scientific.zcu.cz/git/?p=packaging-rpm-NOW.git;a=summary Homepage: https://github.com/bluemonk/ipaddress XS-Ruby-Versions: all diff --git a/ipaddress/debian/copyright b/ipaddress/debian/copyright index f129585..ebec657 100644 --- a/ipaddress/debian/copyright +++ b/ipaddress/debian/copyright @@ -1,35 +1,33 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: ipaddress -Source: FIXME +Source: https://github.com/ipaddress-gem/ipaddress Files: * -Copyright: - -License: GPL-2+ (FIXME) +Copyright: 2009-2015 Marco Ceresa + 2009-2015 Marco Ceresa and Mike Mackintos +License: MIT Files: debian/* -Copyright: 2016 František Dvořák -License: GPL-2+ (FIXME) +Copyright: 2016 CESNET - INDIGO-DataCloud +License: MIT 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: MIT + 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. diff --git a/ipaddress/debian/ruby-ipaddress.docs b/ipaddress/debian/ruby-ipaddress.docs index 0d5eab8..e475c53 100644 --- a/ipaddress/debian/ruby-ipaddress.docs +++ b/ipaddress/debian/ruby-ipaddress.docs @@ -1,2 +1 @@ -# FIXME: READMEs found -# README.rdoc +README.rdoc diff --git a/ipaddress/debian/ruby-test-files.yaml b/ipaddress/debian/ruby-test-files.yaml deleted file mode 100644 index b7c452f..0000000 --- a/ipaddress/debian/ruby-test-files.yaml +++ /dev/null @@ -1,7 +0,0 @@ ---- -- test/ipaddress/ipv4_test.rb -- test/ipaddress/ipv6_test.rb -- test/ipaddress/mongoid_test.rb -- test/ipaddress/prefix_test.rb -- test/ipaddress_test.rb -- test/test_helper.rb diff --git a/ipaddress/debian/ruby-tests.rb b/ipaddress/debian/ruby-tests.rb new file mode 100644 index 0000000..4d1ef62 --- /dev/null +++ b/ipaddress/debian/ruby-tests.rb @@ -0,0 +1,2 @@ +$: << 'test' << '.' +Dir['{spec,test}/**/*.rb'].each { |f| require f } -- 1.8.2.3