[DRE-commits] [ruby-gollum-lib] 02/02: make lintian happy
Praveen Arimbrathodiyil
praveen at moszumanska.debian.org
Mon Dec 7 15:38:07 UTC 2015
This is an automated email from the git hooks/post-receive script.
praveen pushed a commit to branch master
in repository ruby-gollum-lib.
commit 9d1ce34333f0a265b4db597add0018461dfa81b8
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date: Mon Dec 7 21:02:08 2015 +0530
make lintian happy
---
debian/changelog | 6 +++---
debian/control | 18 ++++++++++-------
debian/copyright | 45 ++++++++++++++++++-----------------------
debian/patches/series | 1 +
debian/patches/use-rugged.patch | 27 +++++++++++++++++++++++++
debian/rules | 14 ++++++++++++-
6 files changed, 75 insertions(+), 36 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 54d0d53..91a775c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
-ruby-gollum-lib (4.1.0-1) UNRELEASED; urgency=medium
+ruby-gollum-lib (4.1.0-1) unstable; urgency=medium
- * Initial release (Closes: #nnnn)
+ * Initial release (Closes: #807334)
- -- Pirate Praveen <praveen at debian.org> Mon, 07 Dec 2015 21:00:30 +0530
+ -- Pirate Praveen <praveen at debian.org> Mon, 07 Dec 2015 21:01:58 +0530
diff --git a/debian/control b/debian/control
index e5ef0d8..9087b1d 100644
--- a/debian/control
+++ b/debian/control
@@ -5,10 +5,10 @@ Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.al
Uploaders: Pirate Praveen <praveen at debian.org>
Build-Depends: debhelper (>= 9~),
gem2deb,
- ruby-github-markup (>= 1.3.3),
- ruby-gollum-grit-adapter (>= 1.0),
+ ruby-github-markup (>= 1.3.1),
+ ruby-gollum-rugged-adapter (>= 0.4.1),
ruby-nokogiri (>= 1.6.4),
- ruby-rouge (>= 1.9),
+ ruby-rouge (>= 1.7.4),
ruby-sanitize (>= 2.1.0),
ruby-stringex (>= 2.5.1)
Standards-Version: 3.9.6
@@ -22,13 +22,17 @@ Package: ruby-gollum-lib
Architecture: all
XB-Ruby-Versions: ${ruby:Versions}
Depends: ruby | ruby-interpreter,
- ruby-github-markup (>= 1.3.3),
- ruby-gollum-grit-adapter (>= 1.0),
+ ruby-github-markup (>= 1.3.1),
+ ruby-gollum-rugged-adapter (>= 0.4.1),
ruby-nokogiri (>= 1.6.4),
- ruby-rouge (>= 1.9),
+ ruby-rouge (>= 1.7.4),
ruby-sanitize (>= 2.1.0),
ruby-stringex (>= 2.5.1),
${misc:Depends},
${shlibs:Depends}
-Description: A simple, Git-powered wiki.
+Description: simple, Git-powered wiki
A simple, Git-powered wiki with a sweet API and local frontend.
+ .
+ Gollum-lib is the Ruby API that allows you to retrieve raw or formatted wiki
+ content from a Git repository, write new content to the repository, and
+ collect various meta data about the wiki as a whole.
diff --git a/debian/copyright b/debian/copyright
index f5bb859..36e04a3 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,35 +1,30 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: gollum-lib
-Source: http://github.com/gollum/gollum-lib
+Source: https://rubygems.org/gems/gollum-lib
Files: *
-Copyright: <years> <put author's name and email here>
- <years> <likewise for another author>
-License: GPL-2+ (FIXME)
+Copyright: Tom Preston-Werner, Rick Olson
+License: Expat
Files: debian/*
Copyright: 2015 Pirate Praveen <praveen at debian.org>
-License: GPL-2+ (FIXME)
-Comment: the Debian packaging is licensed under the same terms as the original package.
+License: Expat
-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/series b/debian/patches/series
new file mode 100644
index 0000000..a10fb80
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+use-rugged.patch
diff --git a/debian/patches/use-rugged.patch b/debian/patches/use-rugged.patch
new file mode 100644
index 0000000..66eeb72
--- /dev/null
+++ b/debian/patches/use-rugged.patch
@@ -0,0 +1,27 @@
+https://lists.debian.org/debian-ruby/2015/12/msg00015.html
+
+Index: ruby-gollum-lib-4.1.0/gollum-lib.gemspec
+===================================================================
+--- ruby-gollum-lib-4.1.0.orig/gollum-lib.gemspec
++++ ruby-gollum-lib-4.1.0/gollum-lib.gemspec
+@@ -1,4 +1,4 @@
+ require File.join(File.dirname(__FILE__), 'gemspec.rb')
+ require File.join(File.dirname(__FILE__), 'lib', 'gollum-lib', 'version.rb')
+-default_adapter = ['gollum-grit_adapter', '~> 1.0']
+-Gem::Specification.new &specification(Gollum::Lib::VERSION, default_adapter)
+\ No newline at end of file
++default_adapter = ['gollum-rugged_adapter', '~> 1.0']
++Gem::Specification.new &specification(Gollum::Lib::VERSION, default_adapter)
+Index: ruby-gollum-lib-4.1.0/metadata.yml
+===================================================================
+--- ruby-gollum-lib-4.1.0.orig/metadata.yml
++++ ruby-gollum-lib-4.1.0/metadata.yml
+@@ -12,7 +12,7 @@ cert_chain: []
+ date: 2015-08-09 00:00:00.000000000 Z
+ dependencies:
+ - !ruby/object:Gem::Dependency
+- name: gollum-grit_adapter
++ name: gollum-rugged_adapter
+ requirement: !ruby/object:Gem::Requirement
+ requirements:
+ - - ~>
diff --git a/debian/rules b/debian/rules
index 3454d59..b5052b9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,17 @@
#!/usr/bin/make -f
-
+#export DH_VERBOSE=1
+#
+# Uncomment to ignore all test failures (but the tests will run anyway)
+#export DH_RUBY_IGNORE_TESTS=all
+#
+# Uncomment to ignore some test failures (but the tests will run anyway).
+# Valid values:
+#export DH_RUBY_IGNORE_TESTS=ruby2.1 ruby2.2
+#
+# If you need to specify the .gemspec (eg there is more than one)
+#export DH_RUBY_GEMSPEC=gem.gemspec
+#
+# Uncomment to check dependencies during build:
export GEM2DEB_TEST_RUNNER = --check-dependencies
%:
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-gollum-lib.git
More information about the Pkg-ruby-extras-commits
mailing list