[DRE-commits] [SCM] ruby-redcloth.git branch, master, updated. upstream/4.2.8-2-g914712b

Dmitry Borodaenko angdraug at debian.org
Tue Sep 6 16:34:41 UTC 2011


The following commit has been merged in the master branch:
commit 914712b4e01e6f6cdd36071394415a5f0b12785f
Author: Dmitry Borodaenko <angdraug at debian.org>
Date:   Tue Sep 6 04:42:53 2011 +0300

    First repackaged build
    
    * Merge in earlier packaging information (control, changelog)
    * Point watch file at GitHub
    * Update copyright to DEP5
    * Add Conflicts/Breaks/Replaces and transitional packages for the rename
    * Override dh_installdocs and dh_clean to handle rdoc
    * Use ruby-tests.rb to run the tests
    * Add redcloth(1) manpage

diff --git a/debian/changelog b/debian/changelog
index dd46d77..ac6f058 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,124 @@
-ruby-redcloth (4.2.8-1) UNRELEASED; urgency=low
+ruby-redcloth (4.2.8-1) unstable; urgency=low
 
-  * Initial release (Closes: #nnnn)
+  * New upstream version.
+  * Switch to gem2deb-based packaging:
+    - source and binary packages renamed to ruby-redcloth
+    - transitional packages added
+    - source format changed to 3.0 (quilt).
+  * Redirect watch file to GitHub.
+  * Add redcloth(1) manpage.
 
- -- Dmitry Borodaenko <angdraug at debian.org>  Tue, 06 Sep 2011 01:52:59 +0300
+ -- Dmitry Borodaenko <angdraug at debian.org>  Tue, 06 Sep 2011 19:27:19 +0300
+
+redcloth (4.2.2-1) unstable; urgency=low
+
+  * New upstream version.
+  * Replaced autogenerated ext/redcloth_scan/*.c with Ragel source files
+    pulled from upstream git.
+  * Vcs-Browser and Vcs-Git fields added to debian/control.
+  * Debhelper compat level upgraded to 5.
+  * Standards-Version upgraded to 3.8.3:
+    - section changed to ruby.
+
+ -- Dmitry Borodaenko <angdraug at debian.org>  Sat, 22 Aug 2009 13:04:38 +0300
+
+redcloth (4.1.9-2) unstable; urgency=low
+
+  * Rearranged target dependencies in debian/rules to conform to Debian
+    Policy: binary-* should depend on build, this was missing for
+    binary-arch (Closes: #518496).
+
+ -- Dmitry Borodaenko <angdraug at debian.org>  Sat, 07 Mar 2009 17:07:34 +0200
+
+redcloth (4.1.9-1) unstable; urgency=low
+
+  * New upstream version:
+    - Ruby 1.9 compatibility fixes.
+  * Revert from Rakefile back to setup.rb.
+  * Removed rake and rubgems from Build-Depends.
+  * Upload to unstable.
+
+ -- Dmitry Borodaenko <angdraug at debian.org>  Wed, 04 Mar 2009 17:32:04 +0200
+
+redcloth (4.0.4-2) experimental; urgency=low
+
+  * Added ruby1.8-dev and ruby1.9-dev to Build-Depends (Closes: #504273).
+
+ -- Dmitry Borodaenko <angdraug at debian.org>  Sun, 02 Nov 2008 15:11:50 +0200
+
+redcloth (4.0.4-1) experimental; urgency=low
+
+  * New upstream version:
+    - total rewrite with new maintainer and new copyright
+    - pure Ruby implementation replaced with binary library compiled from C
+      code generated by Ragel
+    - license changed from BSD to MIT.
+  * Upstream source tarball repackaged to exclude binary and auto-generated
+    files (*.bundle, ._*, *.c), size reduced from 400k to 70k.
+  * Updated to Standards-Version 3.8.0:
+    - Homepage: field added to control file.
+  * Watch file updated (upstream switched from tar.gz to tgz).
+  * Build a library for Ruby 1.9 in libredcloth-ruby1.9.
+
+ -- Dmitry Borodaenko <angdraug at debian.org>  Tue, 28 Oct 2008 18:19:30 +0200
+
+redcloth (3.0.99.0.svn.20060519-1) unstable; urgency=low
+
+  * Subversion snapshot of RedCloth 3.1.
+    - includes main part of notextile fix by Paul van Tilburg
+      (Closes: #392012)
+    - forward-ported Paul van Tilburg's fix for (*) and (**) from 3.0.4-2
+    - removed fix for (_), as it breaks more important test cases
+  * notextile modifier regexp cleanup by Paul van Tilburg.
+  * 'x' between numerics fixed (Closes: #389370).
+  * Improved and included infinite loop fix by Fabien Penso on
+    redcloth-upwards ML.
+
+ -- Dmitry Borodaenko <angdraug at debian.org>  Sun, 15 Oct 2006 16:28:51 +0100
+
+redcloth (3.0.4-2) unstable; urgency=low
+
+  * Generate more documentation:
+    - generate RDoc documentation (Closes: #357631)
+    - generate HTML versions of README and REFERENCE
+  * Include patch by Paul van Tilburg:
+    - fix for strong (*) and bold (**) greediness (Closes: #368442)
+    - remove non-multiline limit for emphasis (_) (Closes: #367670)
+  * Bumped Standards-Version to 3.7.2.
+
+ -- Dmitry Borodaenko <angdraug at debian.org>  Sat, 09 Sep 2006 18:58:33 +0100
+
+redcloth (3.0.4-1) unstable; urgency=low
+
+  * New upstream version.
+  * Updated project home page link in debian/copyright file.
+  * Bumped Standards-Version to 3.6.2.
+
+ -- Dmitry Borodaenko <angdraug at debian.org>  Thu, 06 Oct 2005 20:06:11 +0300
+
+redcloth (3.0.3-2) unstable; urgency=low
+
+  * New version from upstream CVS (2005-02-18):
+    - fixes unwanted <p> in lite_mode (Closes: #303095)
+    - fixes list handling
+
+ -- Dmitry Borodaenko <angdraug at debian.org>  Wed,  6 Apr 2005 13:09:38 +0300
+
+redcloth (3.0.3-1) unstable; urgency=low
+
+  * New upstream version.
+  * Added debian/watch file.
+
+ -- Dmitry Borodaenko <angdraug at debian.org>  Fri, 11 Feb 2005 12:46:15 +0200
+
+redcloth (2.0.10-2) unstable; urgency=low
+
+  * Fixed long description to be more descriptive.
+
+ -- Dmitry Borodaenko <angdraug at debian.org>  Thu,  1 Jul 2004 18:13:08 +0300
+
+redcloth (2.0.10-1) unstable; urgency=low
+
+  * Initial release. Closes: #256663 (ITP).
+
+ -- Dmitry Borodaenko <angdraug at debian.org>  Mon, 28 Jun 2004 18:26:31 +0300
diff --git a/debian/control b/debian/control
index fc86294..dd7b87c 100644
--- a/debian/control
+++ b/debian/control
@@ -4,17 +4,54 @@ Priority: optional
 Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
 Uploaders: Dmitry Borodaenko <angdraug at debian.org>
 DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.7~)
+Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.7~), rake (>= 0.8.7~), ruby-rspec (>= 2.4~)
 Standards-Version: 3.9.2
-#Vcs-Git: git://git.debian.org/pkg-ruby-extras/ruby-redcloth.git
-#Vcs-Browser: http://git.debian.org/?p=pkg-ruby-extras/ruby-redcloth.git;a=summary
-Homepage: http://redcloth.org
+Vcs-Git: git://github.com/jgarber/redcloth.git
+Vcs-Browser: https://github.com/jgarber/redcloth
+Homepage: https://github.com/jgarber/redcloth
 XS-Ruby-Versions: all
 
 Package: ruby-redcloth
 Architecture: any
 XB-Ruby-Versions: ${ruby:Versions}
 Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter
-# bundler (~> 1.0.10, development), rake (~> 0.8.7, development), rspec (~> 2.4, development), diff-lcs (~> 1.1.2, development), rvm (~> 1.2.6, development), rake-compiler (~> 0.7.1, development)
-Description: RedCloth-4.2.8
- Textile parser for Ruby.
+Replaces: libredcloth-ruby (<< 4.2.8-1~), libredcloth-ruby-doc (<< 4.2.8-1~), libredcloth-ruby1.8 (<< 4.2.8-1~), libredcloth-ruby1.9.1 (<< 4.2.8-1~)
+Breaks: libredcloth-ruby (<< 4.2.8-1~), libredcloth-ruby-doc (<< 4.2.8-1~), libredcloth-ruby1.8 (<< 4.2.8-1~), libredcloth-ruby1.9.1 (<< 4.2.8-1~)
+Provides: libredcloth-ruby, libredcloth-ruby-doc, libredcloth-ruby1.8, libredcloth-ruby1.9.1
+Description: Textile module for Ruby
+ Textile is a very simple text format, intended for making readable text
+ that can be converted to HTML, and used in docs, blogs, and Wiki pages.
+ .
+ RedCloth is a Ruby module for converting Textile to HTML.
+
+Package: libredcloth-ruby
+Section: oldlibs
+Architecture: all
+Depends: ${misc:Depends}, ruby-redcloth
+Description: Transitional package for ruby-redcloth
+ This is a transitional package to ease upgrades to the ruby-redcloth
+ package. It can safely be removed.
+
+Package: libredcloth-ruby-doc
+Section: oldlibs
+Architecture: all
+Depends: ${misc:Depends}, ruby-redcloth
+Description: Transitional package for ruby-redcloth
+ This is a transitional package to ease upgrades to the ruby-redcloth
+ package. It can safely be removed.
+
+Package: libredcloth-ruby1.8
+Section: oldlibs
+Architecture: all
+Depends: ${misc:Depends}, ruby-redcloth
+Description: Transitional package for ruby-redcloth
+ This is a transitional package to ease upgrades to the ruby-redcloth
+ package. It can safely be removed.
+
+Package: libredcloth-ruby1.9.1
+Section: oldlibs
+Architecture: all
+Depends: ${misc:Depends}, ruby-redcloth
+Description: Transitional package for ruby-redcloth
+ This is a transitional package to ease upgrades to the ruby-redcloth
+ package. It can safely be removed.
diff --git a/debian/copyright b/debian/copyright
index 8d2b8d9..c24e803 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,10 +1,29 @@
-FIXME. fill-in with DEP5 copyright file. http://dep.debian.net/deps/dep5/
-Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=173
-Upstream-Name: redcloth
-Source: FIXME (URL where source can be downloaded)
+Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=173
+Upstream-Name: RedCloth
+Source: https://github.com/jgarber/redcloth
 
 Files: *
-Copyright: Copyright 1998 John Doe <jdoe at example.com>
+Copyright: Copyright (c) 2011 Jason Garber
+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 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: Copyright 2004-2008 Dmitry Borodaenko <angdraug at debian.org>
 License: GPL-2+
  This program is free software; you can redistribute it
  and/or modify it under the terms of the GNU General Public
@@ -26,8 +45,3 @@ License: GPL-2+
  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'.
-
-Files: debian/*
-Copyright: Copyright 1998 Jane Smith <jsmith at example.net>
-License:
- [LICENSE TEXT]
diff --git a/debian/redcloth.1 b/debian/redcloth.1
new file mode 100644
index 0000000..3b77782
--- /dev/null
+++ b/debian/redcloth.1
@@ -0,0 +1,23 @@
+.TH REDCLOTH 1 September 2011
+.SH NAME
+redcloth \- Ruby Textile formatter
+.SH SYNOPSIS
+redcloth [options] [redcloth_formatted.txt]
+.SH DESCRIPTION
+Format a Textile document into HTML or other type of output supported by
+RedCloth. If no file specified, STDIN will be used. If you are typing
+input, you can send an EOF by pressing ^D.
+.SH OPTIONS
+.TP
+\fB-o\fR, \fB--output\fR \fBSTYLE\fR
+Output format (defaults to html).
+.SH AUTHOR
+Dmitry Borodaenko <angdraug at debian.org>
+.SH NOTES
+This manual page was written by Dmitry Borodaenko <angdraug at debian.org>
+for the Debian project.
+
+This is free documentation; 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.
diff --git a/debian/ruby-redcloth.docs b/debian/ruby-redcloth.docs
index 3f94eb1..f836607 100644
--- a/debian/ruby-redcloth.docs
+++ b/debian/ruby-redcloth.docs
@@ -1,6 +1,3 @@
-# FIXME: doc/ dir found in source. Consider installing the docs.
-# Examples:
-# doc/manual.html
-# doc/site/*
-# FIXME: READMEs found
-# README.rdoc
+README.rdoc
+doc/textile_reference.html
+rdoc
diff --git a/debian/ruby-redcloth.manpages b/debian/ruby-redcloth.manpages
new file mode 100644
index 0000000..fb0671a
--- /dev/null
+++ b/debian/ruby-redcloth.manpages
@@ -0,0 +1 @@
+debian/redcloth.1
diff --git a/debian/ruby-test-files.yaml b/debian/ruby-test-files.yaml
deleted file mode 100644
index dd234ca..0000000
--- a/debian/ruby-test-files.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
---- 
-- spec/benchmark_spec.rb
-- spec/custom_tags_spec.rb
-- spec/erb_spec.rb
-- spec/extension_spec.rb
-- spec/fixtures/basic.yml
-- spec/fixtures/code.yml
-- spec/fixtures/definitions.yml
-- spec/fixtures/extra_whitespace.yml
-- spec/fixtures/filter_html.yml
-- spec/fixtures/filter_pba.yml
-- spec/fixtures/html.yml
-- spec/fixtures/images.yml
-- spec/fixtures/instiki.yml
-- spec/fixtures/links.yml
-- spec/fixtures/lists.yml
-- spec/fixtures/poignant.yml
-- spec/fixtures/sanitize_html.yml
-- spec/fixtures/table.yml
-- spec/fixtures/textism.yml
-- spec/fixtures/threshold.yml
-- spec/formatters/class_filtered_html_spec.rb
-- spec/formatters/filtered_html_spec.rb
-- spec/formatters/html_no_breaks_spec.rb
-- spec/formatters/html_spec.rb
-- spec/formatters/id_filtered_html_spec.rb
-- spec/formatters/latex_spec.rb
-- spec/formatters/lite_mode_html_spec.rb
-- spec/formatters/no_span_caps_html_spec.rb
-- spec/formatters/sanitized_html_spec.rb
-- spec/formatters/style_filtered_html_spec.rb
-- spec/parser_spec.rb
-- spec/spec_helper.rb
diff --git a/debian/ruby-tests.rb b/debian/ruby-tests.rb
new file mode 100644
index 0000000..3bc13b4
--- /dev/null
+++ b/debian/ruby-tests.rb
@@ -0,0 +1,3 @@
+$: << 'spec'
+require 'rspec/core'
+Dir['spec/**/*_spec.rb'].each { |f| require f }
diff --git a/debian/rules b/debian/rules
index a5e7dc8..a117bf0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,3 +13,13 @@
 
 %:
 	dh $@ --buildsystem=ruby --with ruby
+
+override_dh_installdocs:
+	rdoc1.8 --inline-source --line-numbers \
+		--op rdoc --main README.rdoc --title "RedCloth" \
+		lib README.rdoc
+	dh_installdocs
+
+override_dh_clean:
+	rm -rf rdoc
+	dh_clean

-- 
ruby-redcloth.git



More information about the Pkg-ruby-extras-commits mailing list