[DRE-commits] [SCM] ruby-tidy.git branch, master, updated. upstream/1.1.2-3-g8d35b97

Dmitry Borodaenko angdraug at debian.org
Sat Oct 8 16:09:27 UTC 2011


The following commit has been merged in the master branch:
commit e0ba2df40e5315816951f28eac9d22c231f1ff54
Author: Dmitry Borodaenko <angdraug at debian.org>
Date:   Sat Oct 8 18:13:34 2011 +0300

    First repackaged build
    
    * Merge in earlier packaging information (control, changelog, watch)
    * Update copyright to DEP5
    * Add Conflicts/Breaks/Replaces and transitional packages for the rename
    * Use ruby-tests.rb to run the tests
    * Set XS-Ruby-Versions to ruby1.8 (segfaults with ruby1.9.1)

diff --git a/debian/changelog b/debian/changelog
index f87cf49..380d482 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,36 @@
-ruby-tidy (1.1.2-1) UNRELEASED; urgency=low
+ruby-tidy (1.1.2+gem2deb-1) unstable; urgency=low
 
-  * Initial release (Closes: #nnnn)
+  * Switch to gem2deb-based packaging:
+    - source and binary packages renamed to ruby-tidy
+    - transitional packages added
+    - source format changed to 3.0 (quilt).
 
  -- Dmitry Borodaenko <angdraug at debian.org>  Sat, 08 Oct 2011 16:40:26 +0300
+
+libtidy-ruby (1.1.2-3) unstable; urgency=low
+
+  * Included patches from RubyForge:
+    - #4095: replace hard-coded line separator with $/ magic variable
+    - #10007 (Ben Walding): fix segfault caused by changes to TidyBuffer
+      struct in upstream CVS (closes: #462325).
+  * Versioned depends on libtidy-0.99-0 (>= 20080116cvs) due to the
+    incompatible TidyBuffer changes (see above).
+  * Moved debhelper from Build-Depends-Indep to Build-Depends.
+  * Bumped Standards-Version to 3.7.3.
+
+ -- Dmitry Borodaenko <angdraug at debian.org>  Mon, 04 Feb 2008 15:37:24 +0200
+
+libtidy-ruby (1.1.2-2) unstable; urgency=low
+
+  * Depend on new libtidy-0.99-0.
+
+ -- Dmitry Borodaenko <angdraug at debian.org>  Tue, 20 Dec 2005 13:01:30 +0200
+
+libtidy-ruby (1.1.2-1) unstable; urgency=low
+
+  * Initial release. Closes: #311270 (ITP).
+  * Modified orig.tar.gz to put all files in one directory and to use Unix
+    newlines.
+  * Patched tidy.rb to load libtidy.so from libtidy0 package.
+
+ -- Dmitry Borodaenko <angdraug at debian.org>  Fri, 19 Aug 2005 14:55:08 +0300
diff --git a/debian/control b/debian/control
index 28806ef..be9dc5c 100644
--- a/debian/control
+++ b/debian/control
@@ -4,16 +4,35 @@ 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.10~)
+Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.10~), libtidy-0.99-0
 Standards-Version: 3.9.2
-#Vcs-Git: git://git.debian.org/pkg-ruby-extras/ruby-tidy.git
-#Vcs-Browser: http://git.debian.org/?p=pkg-ruby-extras/ruby-tidy.git;a=summary
-Homepage: tidy.rubyforge.org
-XS-Ruby-Versions: all
+Vcs-Cvs: :pserver:anonymous at rubyforge.org:/var/cvs/tidy
+Homepage: http://tidy.rubyforge.org/
+XS-Ruby-Versions: ruby1.8
 
 Package: ruby-tidy
 Architecture: all
 XB-Ruby-Versions: ${ruby:Versions}
-Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter
-Description: Ruby interface to HTML Tidy Library Project
- <insert long description, indented with spaces>
+Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter, libtidy-0.99-0
+Replaces: libtidy-ruby (<< 1.1.2+gem2deb-1~), libtidy-ruby1.8 (<< 1.1.2+gem2deb-1~)
+Breaks: libtidy-ruby (<< 1.1.2+gem2deb-1~), libtidy-ruby1.8 (<< 1.1.2+gem2deb-1~)
+Provides: libtidy-ruby, libtidy-ruby1.8
+Description: Ruby interface to HTML Tidy Library
+ HTML Tidy corrects markup in a way compliant with the latest standards,
+ and optimal for the popular browsers.
+
+Package: libtidy-ruby
+Section: oldlibs
+Architecture: all
+Depends: ${misc:Depends}, ruby-tidy
+Description: Transitional package for ruby-tidy
+ This is a transitional package to ease upgrades to the ruby-tidy
+ package. It can safely be removed.
+
+Package: libtidy-ruby1.8
+Section: oldlibs
+Architecture: all
+Depends: ${misc:Depends}, ruby-tidy
+Description: Transitional package for ruby-tidy
+ This is a transitional package to ease upgrades to the ruby-tidy
+ package. It can safely be removed.
diff --git a/debian/copyright b/debian/copyright
index d2d539e..7bb0c1a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,33 +1,90 @@
 Format: http://dep.debian.net/deps/dep5
 Upstream-Name: tidy
-Source: FIXME <http://example.com/>
+Source: http://tidy.rubyforge.org/
 
 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.
- .
- 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.
- .
- 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'.
+Copyright: Copyright (C) 2004-2005 Kevin Howe <kh at newclear.ca>
+License: Ruby or GPL-2
 
 Files: debian/*
-Copyright: 2011 Dmitry Borodaenko <angdraug at debian.org>
-License:
- [LICENSE TEXT]
+Copyright: 2005-2011 Dmitry Borodaenko <angdraug at debian.org>
+License: GPL-2+
+
+License: Ruby
+ Ruby is copyrighted free software by Yukihiro Matsumoto <matz at netlab.jp>.
+ You can redistribute it and/or modify it under either the terms of the GPL
+ (see the file GPL), or the conditions below:
+ .
+   1. You may make and give away verbatim copies of the source form of the
+      software without restriction, provided that you duplicate all of the
+      original copyright notices and associated disclaimers.
+ .
+   2. You may modify your copy of the software in any way, provided that
+      you do at least ONE of the following:
+ .
+        a) place your modifications in the Public Domain or otherwise
+           make them Freely Available, such as by posting said
+           modifications to Usenet or an equivalent medium, or by allowing
+           the author to include your modifications in the software.
+ . 
+        b) use the modified software only within your corporation or
+           organization.
+ .
+        c) give non-standard binaries non-standard names, with
+           instructions on where to get the original software distribution.
+ .
+        d) make other distribution arrangements with the author.
+ .
+   3. You may distribute the software in object code or binary form,
+      provided that you do at least ONE of the following:
+ .
+        a) distribute the binaries and library files of the software,
+           together with instructions (in the manual page or equivalent)
+           on where to get the original distribution.
+ .
+        b) accompany the distribution with the machine-readable source of
+           the software.
+ .
+        c) give non-standard binaries non-standard names, with
+           instructions on where to get the original software distribution.
+ .
+        d) make other distribution arrangements with the author.
+ .
+   4. You may modify and include the part of the software into any other
+      software (possibly commercial).  But some files in the distribution
+      are not written by the author, so that they are not under these terms.
+ .
+      For the list of those files and their copying conditions, see the
+      file LEGAL.
+ .
+   5. The scripts and library files supplied as input to or produced as 
+      output from the software do not automatically fall under the
+      copyright of the software, but belong to whomever generated them, 
+      and may be sold commercially, and may be aggregated with this
+      software.
+ .
+   6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
+      IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+      WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+      PURPOSE.
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL-2'.
+
+License: GPL-2
+ The files hereby included are free software; you can distribute them
+ under the terms of the GNU General Public License as published by the
+ Free Software Foundation; under version 2 of the License as published
+ in June 1991.
+ .
+ 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'.
+
+License: GPL-2+
+ The files hereby included are 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.
+ .
+ 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'.
diff --git a/debian/ruby-tests.rb b/debian/ruby-tests.rb
index eac5ce6..4c67401 100644
--- a/debian/ruby-tests.rb
+++ b/debian/ruby-tests.rb
@@ -1,13 +1,3 @@
-# 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")
+require 'rbconfig'
+ruby = File.join(RbConfig::CONFIG['bindir'], RbConfig::CONFIG['ruby_install_name'])
+exec("#{ruby} -I. test/usage.rb")
diff --git a/debian/ruby-tidy.docs b/debian/ruby-tidy.docs
index ae6847c..71a2544 100644
--- a/debian/ruby-tidy.docs
+++ b/debian/ruby-tidy.docs
@@ -1,2 +1 @@
-# FIXME: READMEs found
-# README.txt.en
+README.txt.en
diff --git a/debian/ruby-tidy.examples b/debian/ruby-tidy.examples
new file mode 100644
index 0000000..cbee83e
--- /dev/null
+++ b/debian/ruby-tidy.examples
@@ -0,0 +1 @@
+test/usage.rb
diff --git a/debian/watch b/debian/watch
index c5fc49a..bd9500f 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
 version=3
-http://pkg-ruby-extras.alioth.debian.org/cgi-bin/gemwatch/tidy .*/tidy-(.*).tar.gz
+http://rubyforge.org/frs/?group_id=435 .*/tidy-([\d\.]*).tar.gz

-- 
ruby-tidy.git



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