[DRE-commits] [ruby-nori] 02/03: A bit of work on package
Hleb Valoshka
tsfgnu-guest at moszumanska.debian.org
Wed Jul 22 18:31:14 UTC 2015
This is an automated email from the git hooks/post-receive script.
tsfgnu-guest pushed a commit to branch master
in repository ruby-nori.
commit 447669fc1467ec8e9f6e36c7a0b71d128d3e3e53
Author: Hleb Valoshka <375gnu at gmail.com>
Date: Tue Jul 14 18:21:17 2015 +0300
A bit of work on package
---
debian/control | 11 +++++--
debian/copyright | 45 ++++++++++++++---------------
debian/patches/0001-Remove-bundler.patch | 16 ++++++++++
debian/patches/0002-Update-for-RSpec3.patch | 28 ++++++++++++++++++
debian/patches/series | 2 ++
debian/tests/control.ex | 13 ---------
6 files changed, 76 insertions(+), 39 deletions(-)
diff --git a/debian/control b/debian/control
index 12300cf..ff399a9 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,8 @@ Uploaders: Hleb Valoshka <375gnu at gmail.com>
Build-Depends: debhelper (>= 7.0.50~),
gem2deb,
rake,
- ruby-rspec
+ ruby-rspec,
+ ruby-nokogiri
Standards-Version: 3.9.6
Vcs-Git: git://anonscm.debian.org/pkg-ruby-extras/ruby-nori.git
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-ruby-extras/ruby-nori.git
@@ -18,7 +19,13 @@ Package: ruby-nori
Architecture: all
XB-Ruby-Versions: ${ruby:Versions}
Depends: ruby | ruby-interpreter,
+ ruby-nokogiri,
${misc:Depends},
${shlibs:Depends}
Description: XML to Hash translator
- XML to Hash translator
+ Really simple XML parser ripped from Crack which ripped it from Merb.
+ Nori was created to bypass the stale development of Crack, improve its XML
+ parser and fix certain issues.
+ .
+ Nori supports pluggable parsers and ships with both REXML and Nokogiri
+ implementations. It defaults to Nokogiri, but you can change it to use REXML.
diff --git a/debian/copyright b/debian/copyright
index c718c58..b914261 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,35 +1,32 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: nori
-Source: FIXME <http://example.com/>
+Source: https://github.com/savonrb/nori
Files: *
-Copyright: <years> <put author's name and email here>
- <years> <likewise for another author>
-License: GPL-2+ (FIXME)
+Copyright: 2011-2015 Daniel Harrington <me at rubiii.com>
+License: Expat
Files: debian/*
Copyright: 2015 Hleb Valoshka <375gnu at gmail.com>
-License: GPL-2+ (FIXME)
+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.
diff --git a/debian/patches/0001-Remove-bundler.patch b/debian/patches/0001-Remove-bundler.patch
new file mode 100644
index 0000000..2df2426
--- /dev/null
+++ b/debian/patches/0001-Remove-bundler.patch
@@ -0,0 +1,16 @@
+From: Hleb Valoshka <375gnu at gmail.com>
+Date: Tue, 14 Jul 2015 18:21:03 +0300
+Subject: Remove bundler
+
+---
+ spec/spec_helper.rb | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
+index dadf6cb..4114ca7 100644
+--- a/spec/spec_helper.rb
++++ b/spec/spec_helper.rb
+@@ -1,2 +1 @@
+-require "bundler"
+-Bundler.require :default, :development
++require 'nori'
diff --git a/debian/patches/0002-Update-for-RSpec3.patch b/debian/patches/0002-Update-for-RSpec3.patch
new file mode 100644
index 0000000..a55950c
--- /dev/null
+++ b/debian/patches/0002-Update-for-RSpec3.patch
@@ -0,0 +1,28 @@
+From: Hleb Valoshka <375gnu at gmail.com>
+Date: Tue, 14 Jul 2015 18:41:17 +0300
+Subject: Update for RSpec3
+
+---
+ spec/nori/core_ext/object_spec.rb | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/spec/nori/core_ext/object_spec.rb b/spec/nori/core_ext/object_spec.rb
+index 73e50ec..ba8ae45 100644
+--- a/spec/nori/core_ext/object_spec.rb
++++ b/spec/nori/core_ext/object_spec.rb
+@@ -5,13 +5,13 @@ describe Object do
+ describe "#blank?" do
+ [nil, false, [], {}].each do |object|
+ it "should return true for: #{object.inspect}" do
+- expect(object.blank?).to be_true
++ expect(object.blank?).to be_truthy
+ end
+ end
+
+ [true, [nil], 1, "string", { :key => "value" }].each do |object|
+ it "should return false for: #{object.inspect}" do
+- expect(object.blank?).to be_false
++ expect(object.blank?).to be_falsey
+ end
+ end
+ end
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..830efa5
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+0001-Remove-bundler.patch
+0002-Update-for-RSpec3.patch
diff --git a/debian/tests/control.ex b/debian/tests/control.ex
deleted file mode 100644
index d604201..0000000
--- a/debian/tests/control.ex
+++ /dev/null
@@ -1,13 +0,0 @@
-# AUTOGENERATED FILE
-#
-# As of autopkgtest 3.5, Ruby packages that use gem2deb are automatically
-# detected, and if debian/tests/control does not exist the contents below will
-# be assumed (with the exception of gem2deb being filtered out from
-# @builddeps@):
-
-Test-Command: gem2deb-test-runner --autopkgtest --check-dependencies 2>&1
-Depends: @, @builddeps@, gem2deb-test-runner
-
-# if you would need to change something to the above, to that and rename this
-# file to `control`. Otherwise, you should probably delete this file
-# (recommended).
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-nori.git
More information about the Pkg-ruby-extras-commits
mailing list