[DRE-commits] [SCM] ruby-ronn.git branch, master, updated. 86f7b83e1089f5adbb101cbaebebf377662cc31a
Martin Ueding
dev at martin-ueding.de
Wed Oct 5 21:09:35 UTC 2011
The following commit has been merged in the master branch:
commit 86f7b83e1089f5adbb101cbaebebf377662cc31a
Author: Martin Ueding <dev at martin-ueding.de>
Date: Wed Oct 5 23:09:09 2011 +0200
Import my packaging
diff --git a/bin/ronn b/bin/ronn
index 5edb510..37ae36f 100755
--- a/bin/ronn
+++ b/bin/ronn
@@ -43,25 +43,9 @@ end
##
# Libraries and LOAD_PATH shenanigans
-begin
- require 'rdiscount'
- require 'hpricot'
- require 'ronn'
-rescue LoadError => boom
- if boom.to_s =~ /ronn/
- libdir = File.expand_path("../../lib", __FILE__).sub(%r|^#{Dir.pwd}/|, './')
- if File.directory?(libdir) && !$:.include?(libdir)
- warn "warn: #{boom}. adding #{libdir} to RUBYLIB ..."
- $:.unshift libdir
- retry
- end
- elsif !defined?(Gem)
- warn "warn: #{boom}. loading rubygems ..."
- require 'rubygems'
- retry
- end
- abort boom.to_s
-end
+require 'rdiscount'
+require 'hpricot'
+require 'ronn'
##
# Argument defaults
diff --git a/debian/changelog b/debian/changelog
index 7f93602..4d0e69f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
-ruby-ronn (0.7.3-1) UNRELEASED; urgency=low
+ruby-ronn (0.7.3-1) unstable; urgency=low
- * Initial release (Closes: #nnnn)
+ * Initial release (Closes: #643672)
- -- Martin Ueding <dev at martin-ueding.de> Wed, 05 Oct 2011 23:01:51 +0200
+ -- Martin Ueding <dev at martin-ueding.de> Sun, 25 Sep 2011 15:09:46 +0200
diff --git a/debian/control b/debian/control
index f2f908d..2606375 100644
--- a/debian/control
+++ b/debian/control
@@ -3,18 +3,20 @@ Section: ruby
Priority: optional
Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
Uploaders: Martin Ueding <dev at martin-ueding.de>
-DM-Upload-Allowed: yes
Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.10~)
Standards-Version: 3.9.2
-#Vcs-Git: git://git.debian.org/pkg-ruby-extras/ruby-ronn.git
-#Vcs-Browser: http://git.debian.org/?p=pkg-ruby-extras/ruby-ronn.git;a=summary
Homepage: http://rtomayko.github.com/ronn
XS-Ruby-Versions: all
Package: ruby-ronn
Architecture: all
XB-Ruby-Versions: ${ruby:Versions}
-Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter
-# hpricot (>= 0.8.2), rdiscount (>= 1.5.8), mustache (>= 0.7.0)
-Description: Builds manuals
- Builds manuals
+Depends: ${misc:Depends}, ruby | ruby-interpreter, ruby-hpricot (>= 0.8.2), ruby-rdiscount (>= 1.5.8), ruby-mustache (>= 0.7.0), ruby-contest, ruby-test-unit
+Description: Builds manuals from Markdown
+ Ronn builds manuals. It converts simple, human readable textfiles to roff for
+ terminal display, and also to HTML for the web.
+ .
+ The source format includes all of Markdown but has a more rigid structure and
+ syntax extensions for features commonly found in manpages (definition lists,
+ link notation, etc.). The ronn-format(7) manual page defines the format in
+ detail.
diff --git a/debian/copyright b/debian/copyright
index b6fb646..d752a4f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,33 +1,47 @@
-Format: http://dep.debian.net/deps/dep5
+Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=174
Upstream-Name: ronn
-Source: FIXME <http://example.com/>
+Source: https://github.com/rtomayko/ronn
Files: *
-Copyright: <years> <put author's name and email here>
- <years> <likewise for another author>
-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.
+Copyright: 2009 Ryan Tomayko
+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.
Files: debian/*
Copyright: 2011 Martin Ueding <dev at martin-ueding.de>
-License:
- [LICENSE TEXT]
+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:
+ .
+ The above copyright notice and this permission notice shall be included
+ in all copies or substantial portions of the Software.
+ .
+ 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/not-require-rubygems b/debian/patches/not-require-rubygems
new file mode 100644
index 0000000..f8da33b
--- /dev/null
+++ b/debian/patches/not-require-rubygems
@@ -0,0 +1,48 @@
+Description: Do not require rubygems
+ Since this is not deployed as a ruby gem any more, requiring rubygems does not
+ make sense.
+ .
+ ruby-ronn (0.7.3-1) unstable; urgency=low
+ .
+ * Initial release (Closes: #643672)
+Author: Martin Ueding <dev at martin-ueding.de>
+Bug-Debian: http://bugs.debian.org/643672
+
+---
+
+Origin: vendor
+Forwarded: no
+Reviewed-By: Cédric Boutillier <cedric.boutillier at gmail.com>
+Last-Update: 2011-10-04
+
+--- ruby-ronn-0.7.3.orig/bin/ronn
++++ ruby-ronn-0.7.3/bin/ronn
+@@ -43,25 +43,9 @@ end
+ ##
+ # Libraries and LOAD_PATH shenanigans
+
+-begin
+- require 'rdiscount'
+- require 'hpricot'
+- require 'ronn'
+-rescue LoadError => boom
+- if boom.to_s =~ /ronn/
+- libdir = File.expand_path("../../lib", __FILE__).sub(%r|^#{Dir.pwd}/|, './')
+- if File.directory?(libdir) && !$:.include?(libdir)
+- warn "warn: #{boom}. adding #{libdir} to RUBYLIB ..."
+- $:.unshift libdir
+- retry
+- end
+- elsif !defined?(Gem)
+- warn "warn: #{boom}. loading rubygems ..."
+- require 'rubygems'
+- retry
+- end
+- abort boom.to_s
+-end
++require 'rdiscount'
++require 'hpricot'
++require 'ronn'
+
+ ##
+ # Argument defaults
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..8d836c7
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+not-require-rubygems
diff --git a/debian/ruby-ronn.docs b/debian/ruby-ronn.docs
index 07b3c9e..b43bf86 100644
--- a/debian/ruby-ronn.docs
+++ b/debian/ruby-ronn.docs
@@ -1,2 +1 @@
-# FIXME: READMEs found
-# README.md
+README.md
diff --git a/debian/ruby-ronn.manpages b/debian/ruby-ronn.manpages
index 229433a..edf218b 100644
--- a/debian/ruby-ronn.manpages
+++ b/debian/ruby-ronn.manpages
@@ -1,3 +1,2 @@
-# FIXME: man/ dir found in source. Consider installing manpages
-# man/ronn-format.7
-# man/ronn.1
+man/ronn-format.7
+man/ronn.1
diff --git a/debian/ruby-tests.rb b/debian/ruby-tests.rb
index eac5ce6..1c68a58 100644
--- a/debian/ruby-tests.rb
+++ b/debian/ruby-tests.rb
@@ -1,13 +1,2 @@
-# FIXME
-# there's a spec/ or a test/ directory in the upstream source, but
-# no test suite was defined in the Gem specification. It would be
-# a good idea to define it here so the package gets tested at build time.
-# Examples:
-# $: << 'lib' << '.'
-# Dir['{spec,test}/**/*.rb'].each { |f| require f }
-#
-# require 'test/ts_foo.rb'
-#
-# require 'rbconfig'
-# ruby = File.join(RbConfig::CONFIG['bindir'], RbConfig::CONFIG['ruby_install_name'])
-# exec("#{ruby} -I. test/runtests.rb")
+# TODO reenable once ruby-contest is packaged.
+# Dir["test/*.rb"].each {|f| require f}
--
ruby-ronn.git
More information about the Pkg-ruby-extras-commits
mailing list