rbook 0.4.3 → 0.5

data/Rakefile

@@ -3,9 +3,9 @@ require 'rake/clean'
 require 'rake/rdoctask'
 require 'rake/testtask'
 require "rake/gempackagetask"
-require "rubygems"
+require 'spec/rake/spectask'
 
-PKG_VERSION = "0.4.3"
+PKG_VERSION = "0.5"
 PKG_NAME = "rbook"
 PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
 RUBYFORGE_PROJECT = 'rbook'
@@ -13,196 +13,33 @@ RUBYFORGE_USER = 'yob'
 
 CLEAN.include "**/.*.sw*"
 
-desc "Default Task"
-task :default => [ :test ]
-
-# Run all tests
-desc "Run all test"
-task :test => [ :test_units ]
-
-# Run the unit tests
-desc "Run all unit tests"
-Rake::TestTask.new("test_units") { |t|
-  t.pattern = 'test/unit/**/*_test.rb'
-  t.verbose = true
-  t.warning = true
-}
-
-# Genereate the RDoc documentation
-desc "Create documentation"
-Rake::RDocTask.new("doc") do |rdoc|
-  rdoc.title = "RBook"
-  rdoc.rdoc_dir = 'doc/html'
-  rdoc.rdoc_files.include('README')
-  rdoc.rdoc_files.include('COPYING')
-  rdoc.rdoc_files.include('LICENSE')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-  rdoc.options << "--inline-source"
-end
-
 spec = Gem::Specification.new do |spec|
 	spec.name = PKG_NAME
 	spec.version = PKG_VERSION
 	spec.platform = Gem::Platform::RUBY
-	spec.summary = "A collection of classes and modules for working with bibliographic data"
-	spec.files =  Dir.glob("{examples,lib,test}/**/**/*") +
+	spec.summary = "A pseudo gem that depends on the various rbook gems"
+	spec.files =  Dir.glob("README") +
                       ["Rakefile"]
   
-  spec.require_path = "lib"
-  spec.bindir = "bin"
-  spec.test_files = Dir[ "test/test_*.rb" ]
-	spec.has_rdoc = true
-	spec.extra_rdoc_files = %w{README COPYING LICENSE}
-	spec.rdoc_options << '--title' << 'rbook Documentation' <<
-	                     '--main'  << 'README' << '-q'
-  spec.add_dependency('scrapi', '>= 1.2.0')
   spec.author = "James Healy"
 	spec.email = "jimmy@deefa.com"
+  spec.add_dependency('rbook-bisac', ">= 0.5")
+  spec.add_dependency('rbook-gbip', ">= 0.5")
+  spec.add_dependency('rbook-isbn', ">= 1.0")
+  spec.add_dependency('rbook-onix', ">= 0.5")
+  spec.add_dependency('rbook-pacstream', ">= 0.5")
+  spec.add_dependency('rbook-titlepage', ">= 0.9")
 	spec.rubyforge_project = "rbook"
 	spec.homepage = "http://rbook.rubyforge.org/"
 	spec.description = <<END_DESC
-  rbook is a collection of classes and modules for 
-  working with bibliographic data. It currently 
-  supports converting and validating isbns, and converting
-  to and from both ONIX and BISAC
+  The rbook series of gems provide libraries for working
+  with bibliographic data. This pseudo package depends on
+  each of the gems to make installing them easier.
 END_DESC
 end
 
 desc "Generate a gem for rbook"
 Rake::GemPackageTask.new(spec) do |pkg|
-	pkg.need_zip = true
 	pkg.need_tar = true
 end
 
-desc "Report code statistics (KLOCs, etc) from the application"
-task :stats do
-  require 'vendor/code_statistics'
-  #dirs = [["Library", "lib"],["Functional tests", "test/functional"],["Unit tests", "test/unit"]]
-  dirs = [["Library", "lib"],["Unit tests", "test/unit"]]
-  CodeStatistics.new(*dirs).to_s
-end
-
-
-# Release files to Rubyforge. 
-# The code for this task provided by Florian Gross.
-desc "Publish the release files to RubyForge." 
-
-task :publish => [:package] do
-
-  files = ['gem', 'tgz', 'zip'].map { |ext| "pkg/#{PKG_NAME}-#{PKG_VERSION}.#{ext}" }
-
-  if RUBYFORGE_PROJECT then
-    require 'net/http'
-    require 'open-uri'
-
-    changes = ''
-    if File.exist?('doc/RELEASES') then
-      changes_re = /^== \s+ Version \s+ #{Regexp.quote(Version)} \s*
-                    (.+?) (?:==|\Z)/mx
-      changes = File.read('doc/RELEASES')[changes_re, 1] || ''
-    end
-
-    project_uri = "http://rubyforge.org/projects/#{RUBYFORGE_PROJECT}/"
-    project_data = open(project_uri) { |data| data.read }
-    group_id = project_data[/[?&]group_id=(\d+)/, 1]
-    raise "Couldn't get group id" unless group_id
-
-    print "#{RUBYFORGE_USER}@rubyforge.org's password: "
-    password = STDIN.gets.chomp
-
-    login_response = Net::HTTP.start('rubyforge.org', 80) do |http|
-      data = [
-        "login=1",
-        "form_loginname=#{RUBYFORGE_USER}",
-        "form_pw=#{password}"
-      ].join("&")
-      http.post('/account/login.php', data)
-    end
-    puts login_response
-    cookie = login_response['set-cookie']
-    raise 'Login failed' unless cookie
-    headers = { 'Cookie' => cookie }
-
-    release_uri = "http://rubyforge.org/frs/admin/?group_id=#{group_id}"
-    release_data = open(release_uri, headers) { |data| data.read }
-    package_id = release_data[/[?&]package_id=(\d+)/, 1]
-    raise "Couldn't get package id" unless package_id
-
-    first_file = true
-    release_id = ""
-
-    files.each do |filename|
-      basename = File.basename(filename)
-      file_ext = File.extname(filename)
-      file_data = File.open(filename, "rb") { |file| file.read }
-
-      puts "Releasing #{basename}..."
-
-      release_response = Net::HTTP.start('rubyforge.org', 80) do |http|
-        release_date = Time.now.strftime('%Y-%m-%d %H:%M')
-        type_map = {
-          '.zip'    => '3000',
-          '.tgz'    => '3110',
-          '.gz'     => '3110',
-          '.gem'    => '1400',
-          '.md5sum' => '8100'
-        }; type_map.default = '9999'
-        type = type_map[file_ext]
-        boundary = 'rubyqMY6QN9bp6e4kS21H4y0zxcvoor'
-
-        query_hash = if first_file then
-          {
-            'group_id' => group_id,
-            'package_id' => package_id,
-            'release_name' => PKG_VERSION,
-            'release_date' => release_date,
-            'type_id' => type,
-            'processor_id' => '8000', # Any
-            'release_notes' => '',
-            'release_changes' => changes,
-            'preformatted' => '1',
-            'submit' => '1'
-          }
-        else
-          {
-            'group_id' => group_id,
-            'release_id' => release_id,
-            'package_id' => package_id,
-            'step2' => '1',
-            'type_id' => type,
-            'processor_id' => '8000', # Any
-            'submit' => 'Add This File'
-          }
-        end
-
-        query = '?' + query_hash.map do |(name, value)|
-          [name, URI.encode(value)].join('=')
-        end.join('&')
-
-        data = [
-          "--" + boundary,
-          "Content-Disposition: form-data; name=\"userfile\"; filename=\"#{basename}\"",
-          "Content-Type: application/octet-stream",
-          "Content-Transfer-Encoding: binary",
-          "", file_data, ""
-          ].join("\x0D\x0A")
-
-        release_headers = headers.merge(
-          'Content-Type' => "multipart/form-data; boundary=#{boundary}"
-        )
-
-        target = first_file ? '/frs/admin/qrs.php' : '/frs/admin/editrelease.php'
-        http.post(target + query, data, release_headers)
-      end
-
-      if first_file then
-        puts release_response.body
-        release_id = release_response.body[/release_id=(\d+)/, 1]
-        raise("Couldn't get release id") unless release_id
-      end
-
-      first_file = false
-    end
-  end
-
-end 

metadata

@@ -1,21 +1,21 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.1
+rubygems_version: 0.9.4
 specification_version: 1
 name: rbook
 version: !ruby/object:Gem::Version 
-  version: 0.4.3
-date: 2007-01-25 00:00:00 +11:00
-summary: A collection of classes and modules for working with bibliographic data
+  version: "0.5"
+date: 2007-07-03 00:00:00 +10:00
+summary: A pseudo gem that depends on the various rbook gems
 require_paths: 
 - lib
 email: jimmy@deefa.com
 homepage: http://rbook.rubyforge.org/
 rubyforge_project: rbook
-description: rbook is a collection of classes and modules for  working with bibliographic data. It currently  supports converting and validating isbns, and converting to and from both ONIX and BISAC
+description: The rbook series of gems provide libraries for working with bibliographic data. This pseudo package depends on each of the gems to make installing them easier.
 autorequire: 
 default_executable: 
 bindir: bin
-has_rdoc: true
+has_rdoc: false
 required_ruby_version: !ruby/object:Gem::Version::Requirement 
   requirements: 
   - - ">"
@@ -29,118 +29,13 @@ post_install_message:
 authors: 
 - James Healy
 files: 
-- examples/www
-- examples/onix
-- examples/titlepage.rb
-- examples/pacstream.rb
-- examples/gbip.rb
-- examples/titlepage_www.rb
-- examples/titlepage_with_proxy.rb
-- examples/www/find_cover_from_amazon.rb
-- examples/www/find_url_from_rainbow.rb
-- examples/www/find_all.rb
-- examples/www/list.rb
-- examples/onix/stream_reader.rb
-- lib/rbook
-- lib/rbook/bisac
-- lib/rbook/gbip
-- lib/rbook/www
-- lib/rbook/onix
-- lib/rbook/titlepage
-- lib/rbook/onix.rb
-- lib/rbook/titlepage.rb
-- lib/rbook/pacstream.rb
-- lib/rbook/bisac.rb
-- lib/rbook/gbip.rb
-- lib/rbook/www.rb
-- lib/rbook/isbn.rb
-- lib/rbook/errors.rb
-- lib/rbook/bisac/po.rb
-- lib/rbook/bisac/product.rb
-- lib/rbook/bisac/po_line_item.rb
-- lib/rbook/bisac/message.rb
-- lib/rbook/gbip/pos.rb
-- lib/rbook/gbip/title.rb
-- lib/rbook/gbip/warehouse.rb
-- lib/rbook/www/hha_scraper.rb
-- lib/rbook/www/ban_scraper.rb
-- lib/rbook/www/wiley_us_scraper.rb
-- lib/rbook/www/oup_scraper.rb
-- lib/rbook/www/random_au_scraper.rb
-- lib/rbook/www/penguin_scraper.rb
-- lib/rbook/www/harper_au_scraper.rb
-- lib/rbook/www/aau_scraper.rb
-- lib/rbook/www/orbis_scraper.rb
-- lib/rbook/www/paulist_scraper.rb
-- lib/rbook/www/amazon_uk_scraper.rb
-- lib/rbook/www/unireps_scraper.rb
-- lib/rbook/www/sas_scraper.rb
-- lib/rbook/www/random_us_scraper.rb
-- lib/rbook/www/harper_us_scraper.rb
-- lib/rbook/www/base.rb
-- lib/rbook/www/pearson_au_scraper.rb
-- lib/rbook/www/macmillan_scraper.rb
-- lib/rbook/onix/lists
-- lib/rbook/onix/stream_reader.rb
-- lib/rbook/onix/lists.rb
-- lib/rbook/onix/supply_detail.rb
-- lib/rbook/onix/product.rb
-- lib/rbook/onix/message.rb
-- lib/rbook/onix/xchar.rb
-- lib/rbook/onix/stream_writer.rb
-- lib/rbook/onix/contributor.rb
-- lib/rbook/onix/sales_restriction.rb
-- lib/rbook/onix/lists/product_form.rb
-- lib/rbook/onix/lists/contributor_role.rb
-- lib/rbook/titlepage/client.rb
-- lib/rbook/titlepage/titlepage_utils.rb
-- lib/rbook/titlepage/wwwclient.rb
-- lib/rbook/titlepage/titlepage_driver.rb
-- test/unit
-- test/data
-- test/mocks
-- test/unit/bisac
-- test/unit/onix
-- test/unit/titlepage_test.rb
-- test/unit/isbn_test.rb
-- test/unit/bisac/po_test.rb
-- test/unit/bisac/bisac_test.rb
-- test/unit/bisac/po_line_item_test.rb
-- test/unit/onix/supply_detail_test.rb
-- test/unit/onix/product_test.rb
-- test/unit/onix/message_test.rb
-- test/unit/onix/xchar_test.rb
-- test/unit/onix/stream_writer_test.rb
-- test/unit/onix/contributor_test.rb
-- test/unit/onix/sales_restriction_test.rb
-- test/unit/onix/stream_reader_test.rb
-- test/data/abingdon.xml
-- test/data/single_product.xml
-- test/data/invalid_no_product.xml
-- test/data/chalice.xml
-- test/data/not_xml.csv
-- test/data/xml_not_onix.xml
-- test/data/bisac_po.txt
-- test/data/eerdsman.xml
-- test/data/augsburg.xml
-- test/data/valid_bisac.txt
-- test/mocks/titlepage_driver.rb
 - Rakefile
-- README
-- COPYING
-- LICENSE
 test_files: []
 
-rdoc_options: 
-- --title
-- rbook Documentation
-- --main
-- README
-- -q
-extra_rdoc_files: 
-- README
-- COPYING
-- LICENSE
+rdoc_options: []
+
+extra_rdoc_files: []
+
 executables: []
 
 extensions: []
@@ -149,11 +44,56 @@ requirements: []
 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: scrapi
+  name: rbook-bisac
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Version::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0.5"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: rbook-gbip
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Version::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0.5"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: rbook-isbn
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Version::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "1.0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: rbook-onix
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Version::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0.5"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: rbook-pacstream
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Version::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0.5"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: rbook-titlepage
   version_requirement: 
   version_requirements: !ruby/object:Gem::Version::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.2.0
+        version: "0.9"
     version: 

data/COPYING

@@ -1,340 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    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 program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year  name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.