[DRE-commits] [SCM] ruby-nokogiri.git branch, master, updated. upstream/1.5.0-2-g8a1dccf

Lucas Nussbaum lucas at lucas-nussbaum.net
Fri Jul 29 17:25:11 UTC 2011 

The following commit has been merged in the master branch:
commit 8a1dccfb3ed2bd6615feea9f676836e33d084641
Author: Lucas Nussbaum <lucas at lucas-nussbaum.net>
Date:   Fri Jul 29 19:14:33 2011 +0200

    continue packaging

diff --git a/debian/changelog b/debian/changelog
index b6d0a3a..0b2e423 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,81 @@
-ruby-nokogiri (1.5.0-1) UNRELEASED; urgency=low
+ruby-nokogiri (1.5.0-1) unstable; urgency=low
 
-  * Initial release (Closes: #nnnn)
+  * Switch to gem2deb. Rename source and binary packages.
+  * New upstream version. Closes: #604623.
 
  -- Lucas Nussbaum <lucas at debian.org>  Fri, 29 Jul 2011 18:50:38 +0200
+
+libnokogiri-ruby (1.4.0-4) unstable; urgency=low
+
+  * fix failing tests (and resulting FTBFS) with libxml 2.7.8, thanks to
+    Mike Dalessio (Closes: #606296)
+
+ -- Ryan Niebur <ryan at debian.org>  Mon, 13 Dec 2010 20:28:41 -0800
+
+libnokogiri-ruby (1.4.0-3.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * debian/patches
+    - add fix-test_element_description.rb.patch from upstream git to fix
+     FTBFS (Closes: #577355)
+
+ -- Hideki Yamane <henrich at debian.org>  Fri, 23 Jul 2010 01:32:30 +0900
+
+libnokogiri-ruby (1.4.0-3) unstable; urgency=low
+
+  * Fix test to also work in UTC. Closes: #566055.
+
+ -- Lucas Nussbaum <lucas at lucas-nussbaum.net>  Thu, 21 Jan 2010 10:58:36 +1300
+
+libnokogiri-ruby (1.4.0-2) unstable; urgency=low
+
+  * Drop 1.9 package, add 1.9.1 package. Closes: #565825.
+  * Enable the test suite.
+    + Make ruby1.9.1 test suite failures non-fatal.
+
+ -- Lucas Nussbaum <lucas at lucas-nussbaum.net>  Wed, 20 Jan 2010 21:22:44 +1300
+
+libnokogiri-ruby (1.4.0-1) unstable; urgency=low
+
+  * New upstream release
+  * update email address
+  * close a launchpad bug too
+
+ -- Ryan Niebur <ryan at debian.org>  Thu, 05 Nov 2009 07:32:08 -0800
+
+libnokogiri-ruby (1.3.3-2) unstable; urgency=low
+
+  * add quilt patching
+  * get rid of the annoying libxml warning messages (Closes: 546843)
+    (LP: 475250)
+
+ -- Ryan Niebur <ryanryan52 at gmail.com>  Tue, 15 Sep 2009 21:49:02 -0700
+
+libnokogiri-ruby (1.3.3-1) unstable; urgency=low
+
+  * New upstream release
+  * Debian Policy 3.8.3
+
+ -- Ryan Niebur <ryanryan52 at gmail.com>  Wed, 02 Sep 2009 17:36:50 -0700
+
+libnokogiri-ruby (1.3.2-1) unstable; urgency=low
+
+  * new upstream version
+  * Debian Policy 3.8.2
+  * install the upstream changelog
+
+ -- Ryan Niebur <ryanryan52 at gmail.com>  Sat, 27 Jun 2009 23:28:37 -0700
+
+libnokogiri-ruby (1.3.1-1) unstable; urgency=low
+
+  * New upstream release
+  * improve debian/rules a bit
+  * add DMUA field
+
+ -- Ryan Niebur <ryanryan52 at gmail.com>  Mon, 01 Jun 2009 17:26:41 -0700
+
+libnokogiri-ruby (1.2.3-1) unstable; urgency=low
+
+  * Initial release (Closes: 520583)
+
+ -- Ryan Niebur <ryanryan52 at gmail.com>  Sun, 22 Mar 2009 12:13:48 -0700
diff --git a/debian/control b/debian/control
index 112a766..1661982 100644
--- a/debian/control
+++ b/debian/control
@@ -4,10 +4,10 @@ Priority: optional
 Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
 Uploaders: Lucas Nussbaum <lucas at debian.org>
 DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.6~), libxml2-dev, libxslt-dev
+Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.6~), libxml2-dev, libxslt-dev, ruby-minitest
 Standards-Version: 3.9.2
-#Vcs-Git: git://git.debian.org/pkg-ruby-extras/ruby-nokogiri.git
-#Vcs-Browser: http://git.debian.org/?p=pkg-ruby-extras/ruby-nokogiri.git;a=summary
+Vcs-Git: git://git.debian.org/pkg-ruby-extras/ruby-nokogiri.git
+Vcs-Browser: http://git.debian.org/?p=pkg-ruby-extras/ruby-nokogiri.git;a=summary
 Homepage: http://nokogiri.org
 XS-Ruby-Versions: all
 
@@ -15,10 +15,44 @@ Package: ruby-nokogiri
 Architecture: any
 XB-Ruby-Versions: ${ruby:Versions}
 Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter
-# racc (>= 1.4.6, development), rexical (>= 1.0.5, development), rake-compiler (>= 0.7.9, development), minitest (~> 2.2.2, development), mini_portile (>= 0.2.2, development), hoe-debugging (>= 0, development), hoe-git (>= 0, development), hoe-gemspec (>= 0, development), hoe-bundler (>= 0, development), hoe (>= 2.9.4, development)
-Description: Nokogiri (鋸) is an HTML, XML, SAX, and Reader parser
- Nokogiri (鋸) is an HTML, XML, SAX, and Reader parser.  Among Nokogiri's
- many features is the ability to search documents via XPath or CSS3 selectors.
- .
- XML is like violence - if it doesn’t solve your problems, you are not using
- enough of it.
+Replaces: libnokogiri-ruby (<< 1.5.0-1~), libnokogiri-ruby1.8 (<< 1.5.0-1~), libnokogiri-ruby1.9.1 (<< 1.5.0-1~), libnokogiri-ruby1.9 (<< 1.5.0-1~)
+Breaks: libnokogiri-ruby (<< 1.5.0-1~), libnokogiri-ruby1.8 (<< 1.5.0-1~), libnokogiri-ruby1.9.1 (<< 1.5.0-1~), libnokogiri-ruby1.9 (<< 1.5.0-1~)
+Provides: libnokogiri-ruby, libnokogiri-ruby1.8, libnokogiri-ruby1.9.1, libnokogiri-ruby1.9
+Description: HTML, XML, SAX, and Reader parser for Ruby
+ Nokogiri (鋸) is an HTML, XML, SAX, and Reader parser.  It is able to
+ search documents via XPath or CSS3 selectors, and is a drop-in replacement
+ for Hpricot (though not bug for bug).
+
+# Transitional packages
+Package: libnokogiri-ruby
+Section: oldlibs
+Architecture: all
+Depends: ${misc:Depends}, ruby-nokogiri
+Description: Transitional package for ruby-nokogiri
+ This is a transitional package to ease upgrades to the ruby-nokogiri
+ package. It can safely be removed.
+
+Package: libnokogiri-ruby1.8
+Section: oldlibs
+Architecture: all
+Depends: ${misc:Depends}, ruby-nokogiri
+Description: Transitional package for ruby-nokogiri
+ This is a transitional package to ease upgrades to the ruby-nokogiri
+ package. It can safely be removed.
+
+Package: libnokogiri-ruby1.9.1
+Section: oldlibs
+Architecture: all
+Depends: ${misc:Depends}, ruby-nokogiri
+Description: Transitional package for ruby-nokogiri
+ This is a transitional package to ease upgrades to the ruby-nokogiri
+ package. It can safely be removed.
+
+Package: libnokogiri-ruby1.9
+Section: oldlibs
+Architecture: all
+Depends: ${misc:Depends}, ruby-nokogiri
+Description: Transitional package for ruby-nokogiri
+ This is a transitional package to ease upgrades to the ruby-nokogiri
+ package. It can safely be removed.
+
diff --git a/debian/copyright b/debian/copyright
index b0d2f61..b457eae 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,33 +1,30 @@
-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: nokogiri
-Source: FIXME (URL where source can be downloaded)
-
-Files: *
-Copyright: Copyright 1998 John Doe <jdoe at example.com>
-License: GPL-2+
- 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'.
-
-Files: debian/*
-Copyright: Copyright 1998 Jane Smith <jsmith at example.net>
+This package was debianized by Ryan Niebur <ryanryan52 at gmail.com> on
+Sat, 21 Mar 2009 00:16:04 -0700.
+
+It was downloaded from <http://rubyforge.org/frs/?group_id=7062&release_id=32227>
+
+Upstream Authors:
+
+    Aaron Patterson
+    Mike Dalessio
+
+Copyright:
+
+    Copyright 2008-2009 Aaron Patterson
+    Copyright 2008-2009 Mike Dalessio
+
 License:
- [LICENSE TEXT]
+
+    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 Debian packaging is copyright 2009, Ryan Niebur <ryanryan52 at gmail.com> and
+is licensed under the same license as nokogiri itself.
diff --git a/debian/patches/no-require-rubygems.dpatch b/debian/patches/no-require-rubygems.dpatch
new file mode 100644
index 0000000..d9d6aad
--- /dev/null
+++ b/debian/patches/no-require-rubygems.dpatch
@@ -0,0 +1,10 @@
+--- a/bin/nokogiri
++++ b/bin/nokogiri
+@@ -3,7 +3,6 @@ require 'optparse'
+ require 'open-uri'
+ require 'irb'
+ require 'uri'
+-require 'rubygems'
+ require 'nokogiri'
+ 
+ parse_class = Nokogiri
diff --git a/debian/patches/remove-annoying-warning.patch b/debian/patches/remove-annoying-warning.patch
new file mode 100644
index 0000000..282b4fe
--- /dev/null
+++ b/debian/patches/remove-annoying-warning.patch
@@ -0,0 +1,17 @@
+http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=546843
+
+--- a/lib/nokogiri/version.rb
++++ b/lib/nokogiri/version.rb
+@@ -28,11 +28,7 @@ module Nokogiri
+     def warnings
+       return [] unless libxml2?
+ 
+-      if compiled_parser_version != loaded_parser_version
+-        ["Nokogiri was built against LibXML version #{compiled_parser_version}, but has dynamically loaded #{loaded_parser_version}"]
+-      else
+-        []
+-      end
++      []
+     end
+ 
+     def to_hash
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..f362509
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+remove-annoying-warning.patch
+no-require-rubygems.dpatch
diff --git a/debian/ruby-nokogiri.docs b/debian/ruby-nokogiri.docs
index a0cfc0f..6bb382d 100644
--- a/debian/ruby-nokogiri.docs
+++ b/debian/ruby-nokogiri.docs
@@ -1,3 +1,2 @@
-# FIXME: READMEs found
-# README.rdoc
-# README.ja.rdoc
+README.rdoc
+README.ja.rdoc
diff --git a/debian/ruby-tests.rb b/debian/ruby-tests.rb
index ef02d67..8b7e3ab 100644
--- a/debian/ruby-tests.rb
+++ b/debian/ruby-tests.rb
@@ -1,3 +1,4 @@
 $: << 'lib' << 'test' << '.'
+Encoding.default_external = "UTF-8" if RUBY_VERSION >= '1.9.1'
 Dir['test/**/test_*.rb'].each { |f| require f }
 

-- 
ruby-nokogiri.git

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