diff-lcs 1.1.3 → 1.2.0

data/.autotest

@@ -0,0 +1,3 @@
+require 'rubygems'
+
+# vim: syntax=ruby

data/.rspec

@@ -0,0 +1,2 @@
+--colour
+--format documentation

data/.travis.yml

@@ -0,0 +1,21 @@
+---
+after_script:
+- rake travis:after -t
+before_script:
+- gem install hoe-travis --no-rdoc --no-ri
+- rake travis:before -t
+language: ruby
+notifications:
+  email: false
+rvm:
+  - 1.9.3
+  - 1.9.2
+  - ruby-head
+  - 1.8.7
+  - jruby-19mode
+  - jruby-head
+  - jruby-18mode
+  - rbx-19mode
+  - rbx-18mode
+  - ree
+script: rake travis

data/Contributing.rdoc

@@ -0,0 +1,63 @@
+== Contributing
+
+I value any contribution to Diff::LCS you can provide: a bug report, a feature
+request, or code contributions.
+
+Code contributions to Diff::LCS are especially <del>welcome</del>encouraged.
+Because Diff::LCS is a complex codebase, there are a few guidelines:
+
+* Changes <strong>will not</strong> be accepted without tests.
+* The test suite is written with RSpec.‡
+* Match my coding style.
+* Use a thoughtfully-named topic branch that contains your change. Rebase your
+  commits into logical chunks as necessary.
+* Use {quality commit messages}[http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html].
+* Do not change the version number; when your patch is accepted and a release
+  is made, the version will be updated at that point.
+* Submit a GitHub pull request with your changes.
+* New features require new documentation.
+
+=== Test Dependencies
+
+To run the test suite, you will need to install the development dependencies
+for Diff::LCS. If you have Bundler, you can accomplish this easily:
+
+    $ bundle install
+
+Diff::LCS uses Ryan Davis’s excellent {Hoe}[https://github.com/seattlerb/hoe]
+to manage the release process, and it adds a number of rake tasks. You will
+mostly be interested in:
+
+    $ rake
+
+which runs the tests the same way that:
+
+    $ rake spec
+    $ rake test
+    $ rake travis
+
+will do.
+
+=== Workflow
+
+Here's the most direct way to get your work merged into the project:
+
+* Fork the project.
+* Clone down your fork (+git clone git://github.com/<username>/diff-lcs.git+).
+* Create a topic branch to contain your change (+git checkout -b my\_awesome\_feature+).
+* Hack away, add tests. Not necessarily in that order.
+* Make sure everything still passes by running `rake`.
+* If necessary, rebase your commits into logical chunks, without errors.
+* Push the branch up (+git push origin my\_awesome\_feature+).
+* Create a pull request against halostatue/diff-lcs and describe what your
+  change does and the why you think it should be merged.
+
+=== Contributors
+
+* Austin Ziegler created Diff::LCS.
+
+Thanks to everyone else who has contributed to Diff::LCS:
+
+* Kenichi Kamiya
+* Michael Granger
+* Vít Ondruch

data/Gemfile

@@ -0,0 +1,20 @@
+# -*- ruby -*-
+
+# DO NOT EDIT THIS FILE. Instead, edit Rakefile, and run `rake bundler:gemfile`.
+
+source "https://rubygems.org/"
+
+
+gem "rubyforge", ">=2.0.4", :group => [:development, :test]
+gem "rdoc", "~>3.10", :group => [:development, :test]
+gem "rspec", "~>2.0", :group => [:development, :test]
+gem "rake", "~>10.0", :group => [:development, :test]
+gem "hoe-bundler", "~>1.2.0", :group => [:development, :test]
+gem "hoe-doofus", "~>1.0.0", :group => [:development, :test]
+gem "hoe-gemspec", "~>1.0.0", :group => [:development, :test]
+gem "hoe-git", "~>1.5.0", :group => [:development, :test]
+gem "hoe-rubygems", "~>1.0.0", :group => [:development, :test]
+gem "hoe-travis", "~>1.2", :group => [:development, :test]
+gem "hoe", "~>3.4", :group => [:development, :test]
+
+# vim: syntax=ruby

data/History.rdoc

@@ -1,3 +1,39 @@
+== 1.2.0 / 2013-01-21
+* Minor Enhancements:
+  * Added special case handling for Diff::LCS.patch so that it handles patches
+    that are empty or contain no changes.
+  * Added two new methods (#patch\_me and #unpatch\_me) to the includable
+    module.
+* Bugs Fixed:
+  * Fixed issue #1 patch direction detection.
+    https://github.com/halostatue/diff-lcs/issues/1
+  * Resolved issue #2 by handling string[string.size, 1] properly (it returns
+    "" not nil). https://github.com/halostatue/diff-lcs/issues/2
+  * Michael Granger (ged) fixed an implementation error in Diff::LCS::Change
+    and added specs in pull request #8. Thanks!
+    https://github.com/halostatue/diff-lcs/issues/8
+  * Made the code auto-testable.
+  * Vít Ondruch (voxik) provided the latest version of the GPL2 license file in
+    pull request #10. Thanks! https://github.com/halostatue/diff-lcs/issues/10
+  * Fixed a documentation issue with the includable versions of #patch! and
+    #unpatch! where they implied that they would replace the original value.
+    Given that Diff::LCS.patch always returns a copy, the documentation was
+    incorrect and has been corrected. To provide the behaviour that was
+    originally documented, two new methods were added to provide this
+    behaviour. Found by scooter-dangle in issue #12. Thanks!
+    https://github.com/halostatue/diff-lcs/issues/12
+* Code Style Changes:
+  * Removed trailing spaces.
+  * Calling class methods using '.' instead of '::'.
+  * Vít Ondruch (voxik) removed unnecessary shebangs in pull request #9.
+    Thanks! https://github.com/halostatue/diff-lcs/issues/9
+  * Kenichi Kamiya (kachick) removed some warnings of an unused variable in
+    lucky pull request #13. https://github.com/halostatue/diff-lcs/issues/13
+    Thanks!
+  * Embarked on a major refactoring to make the files a little more manageable
+    and understand the code on a deeper level.
+  * Adding to http://travis-ci.org.
+
 == 1.1.3 / 2011-08-27
 * Converted to 'hoe' for release.
 * Converted tests to RSpec 2.
@@ -36,7 +72,7 @@
   exist already. Removed the existing batch files as they didn't work.
 
 == 1.0.3 / -
-* Fixed a problem with #traverse_sequences where the first difference from the
+* Fixed a problem with #traverse\_sequences where the first difference from the
   left sequence might not be appropriately captured.
 
 == 1.0.2 / -

data/Manifest.txt

@@ -1,13 +1,19 @@
+.autotest
+.rspec
+.travis.yml
+Contributing.rdoc
+Gemfile
 History.rdoc
 License.rdoc
 Manifest.txt
 README.rdoc
 Rakefile
+autotest/discover.rb
 bin/htmldiff
 bin/ldiff
 diff-lcs.gemspec
 docs/COPYING.txt
-docs/artistic.html
+docs/artistic.txt
 lib/diff-lcs.rb
 lib/diff/lcs.rb
 lib/diff/lcs/array.rb
@@ -16,9 +22,12 @@ lib/diff/lcs/callbacks.rb
 lib/diff/lcs/change.rb
 lib/diff/lcs/htmldiff.rb
 lib/diff/lcs/hunk.rb
+lib/diff/lcs/internals.rb
 lib/diff/lcs/ldiff.rb
 lib/diff/lcs/string.rb
+spec/change_spec.rb
 spec/diff_spec.rb
+spec/issues_spec.rb
 spec/lcs_spec.rb
 spec/patch_spec.rb
 spec/sdiff_spec.rb

data/README.rdoc

@@ -1,29 +1,18 @@
-= diff-lcs
+= Diff::LCS
 
-== Description
-Diff::LCS is a port of Perl's Algorithm::Diff that uses the McIlroy-Hunt
-longest common subsequence (LCS) algorithm to compute intelligent differences
-between two sequenced enumerable containers. The implementation is based on
-Mario I. Wolczko's {Smalltalk version 1.2}[ftp://st.cs.uiuc.edu/pub/Smalltalk/MANCHESTER/manchester/4.0/diff.st]
-(1993) and Ned Konz's Perl version
-{Algorithm::Diff 1.15}[http://search.cpan.org/~nedkonz/Algorithm-Diff-1.15/].
-
-This is release 1.1.3, fixing several small bugs found over the years. Version
-1.1.0 added new features, including the ability to #patch and #unpatch changes
-as well as a new contextual diff callback, Diff::LCS::ContextDiffCallbacks,
-that should improve the context sensitivity of patching.
+home  :: http://diff-lcs.rubyforge.org/
+code  :: https://github.com/halostatue/diff-lcs
+bugs  :: https://github.com/halostatue/diff-lcs/issues
+rdoc  :: http://rubydoc.info/github/halostatue/diff-lcs
 
-This library is called Diff::LCS because of an early version of Algorithm::Diff
-which was restrictively licensed. This version has seen a minor license change:
-instead of being under Ruby's license as an option, the third optional license
-is the MIT license.
-
-== Where
+== Description
 
-* {GitHub}[https://github.com/halostatue/diff-lcs]
+Diff::LCS computes the difference between two Enumerable sequences using the
+McIlroy-Hunt longest common subsequence (LCS) algorithm. It includes utilities
+to create a simple HTML diff output format and a standard diff-like tool.
 
-This is the new home of Diff::LCS (diff-lcs). The Ruwiki page still refers to
-it, but development is not happening there any longer.
+This is release 1.2. Everyone is strongly encouraged to upgrade to this version
+as it fixes all known outstanding issues.
 
 == Synopsis
 
@@ -64,9 +53,45 @@ extended for use this way.
 
 Note that Diff::LCS requires a sequenced enumerable container, which means that
 the order of enumeration is both predictable and consistent for the same set of
-data. While it is theoretically possible to generate a diff for unordereded
+data. While it is theoretically possible to generate a diff for an unordered
 hash, it will only be meaningful if the enumeration of the hashes is
 consistent. In general, this will mean that containers that behave like String
 or Array will perform best.
 
+== History
+
+Diff::LCS is a port of Perl's Algorithm::Diff that uses the McIlroy-Hunt
+longest common subsequence (LCS) algorithm to compute intelligent differences
+between two sequenced enumerable containers. The implementation is based on
+Mario I. Wolczko's {Smalltalk version 1.2}[ftp://st.cs.uiuc.edu/pub/Smalltalk/MANCHESTER/manchester/4.0/diff.st]
+(1993) and Ned Konz's Perl version
+{Algorithm::Diff 1.15}[http://search.cpan.org/~nedkonz/Algorithm-Diff-1.15/].
+
+This library is called Diff::LCS because of an early version of Algorithm::Diff
+which was restrictively licensed.
+
+== Continuous Integration Status
+
+{<img src="https://travis-ci.org/halostatue/diff-lcs.png" />}[https://travis-ci.org/halostatue/diff-lcs]
+
+== Contributing
+
+If you'd like to hack on Diff::LCS, start by forking the repo on GitHub:
+
+https://github.com/halostatue/diff-lcs
+
+The best way to get your changes merged back into core is as follows:
+
+1. Clone down your fork.
+2. Create a thoughtfully named topic branch to contain your change.
+3. Hack away.
+4. Add tests and make sure everything still passes by running rake.
+5. If you are adding new functionality, document it in the README.
+6. Do not change the version number, we will do that on our end.
+7. If necessary, rebase your commits into logical chunks, without errors.
+8. Push the branch up to GitHub.
+9. Send a pull request for your branch
+
+:include: Contributing.rdoc
+
 :include: License.rdoc

data/Rakefile

@@ -4,16 +4,18 @@ require 'rubygems'
 require 'rspec'
 require 'hoe'
 
+Hoe.plugin :bundler
 Hoe.plugin :doofus
 Hoe.plugin :gemspec
 Hoe.plugin :git
+Hoe.plugin :rubyforge
+Hoe.plugin :email
+Hoe.plugin :travis
 
 Hoe.spec 'diff-lcs' do
-  self.rubyforge_name = 'ruwiki'
-
   developer('Austin Ziegler', 'austin@rubyforge.org')
 
-  self.remote_rdoc_dir = 'diff-lcs/rdoc'
+  self.remote_rdoc_dir = '.'
   self.rsync_args << ' --exclude=statsvn/'
 
   self.history_file = 'History.rdoc'
@@ -21,6 +23,18 @@ Hoe.spec 'diff-lcs' do
   self.extra_rdoc_files = FileList["*.rdoc"].to_a
 
   self.extra_dev_deps << ['rspec', '~> 2.0']
+  self.extra_dev_deps << ['rake', '~> 10.0']
+  self.extra_dev_deps << ['hoe-bundler', '~> 1.2.0']
+  self.extra_dev_deps << ['hoe-doofus', '~> 1.0.0']
+  self.extra_dev_deps << ['hoe-gemspec', '~> 1.0.0']
+  self.extra_dev_deps << ['hoe-git', '~> 1.5.0']
+  self.extra_dev_deps << ['hoe-rubygems', '~> 1.0.0']
+# self.extra_dev_deps << ['hoe-seattlerb', '~> 1.2.9, 1.2.8']
+  self.extra_dev_deps << ['hoe-travis', '~> 1.2']
+end
+
+unless Rake::Task.task_defined? :test
+  task :test => :spec
 end
 
 # vim: syntax=ruby

data/autotest/discover.rb

@@ -0,0 +1 @@
+Autotest.add_discovery { "rspec2" }

data/diff-lcs.gemspec

@@ -1,51 +1,63 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{diff-lcs}
-  s.version = "1.1.3"
+  s.name = "diff-lcs"
+  s.version = "1.2.0'
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Austin Ziegler"]
-  s.date = %q{2011-08-27}
-  s.description = %q{Diff::LCS is a port of Perl's Algorithm::Diff that uses the McIlroy-Hunt
-longest common subsequence (LCS) algorithm to compute intelligent differences
-between two sequenced enumerable containers. The implementation is based on
-Mario I. Wolczko's {Smalltalk version 1.2}[ftp://st.cs.uiuc.edu/pub/Smalltalk/MANCHESTER/manchester/4.0/diff.st]
-(1993) and Ned Konz's Perl version
-{Algorithm::Diff 1.15}[http://search.cpan.org/~nedkonz/Algorithm-Diff-1.15/].
-
-This is release 1.1.3, fixing several small bugs found over the years. Version
-1.1.0 added new features, including the ability to #patch and #unpatch changes
-as well as a new contextual diff callback, Diff::LCS::ContextDiffCallbacks,
-that should improve the context sensitivity of patching.
-
-This library is called Diff::LCS because of an early version of Algorithm::Diff
-which was restrictively licensed. This version has seen a minor license change:
-instead of being under Ruby's license as an option, the third optional license
-is the MIT license.}
+  s.date = "2013-01-21"
+  s.description = "Diff::LCS computes the difference between two Enumerable sequences using the\nMcIlroy-Hunt longest common subsequence (LCS) algorithm. It includes utilities\nto create a simple HTML diff output format and a standard diff-like tool.\n\nThis is release 1.2. Everyone is strongly encouraged to upgrade to this version\nas it fixes all known outstanding issues."
   s.email = ["austin@rubyforge.org"]
   s.executables = ["htmldiff", "ldiff"]
-  s.extra_rdoc_files = ["Manifest.txt", "docs/COPYING.txt", "History.rdoc", "License.rdoc", "README.rdoc"]
-  s.files = ["History.rdoc", "License.rdoc", "Manifest.txt", "README.rdoc", "Rakefile", "bin/htmldiff", "bin/ldiff", "diff-lcs.gemspec", "docs/COPYING.txt", "docs/artistic.html", "lib/diff-lcs.rb", "lib/diff/lcs.rb", "lib/diff/lcs/array.rb", "lib/diff/lcs/block.rb", "lib/diff/lcs/callbacks.rb", "lib/diff/lcs/change.rb", "lib/diff/lcs/htmldiff.rb", "lib/diff/lcs/hunk.rb", "lib/diff/lcs/ldiff.rb", "lib/diff/lcs/string.rb", "spec/diff_spec.rb", "spec/lcs_spec.rb", "spec/patch_spec.rb", "spec/sdiff_spec.rb", "spec/spec_helper.rb", "spec/traverse_balanced_spec.rb", "spec/traverse_sequences_spec.rb", ".gemtest"]
+  s.extra_rdoc_files = ["Contributing.rdoc", "History.rdoc", "License.rdoc", "Manifest.txt", "README.rdoc", "docs/COPYING.txt", "docs/artistic.txt", "Contributing.rdoc", "History.rdoc", "License.rdoc", "README.rdoc"]
+  s.files = [".autotest", ".rspec", ".travis.yml", "Contributing.rdoc", "Gemfile", "History.rdoc", "License.rdoc", "Manifest.txt", "README.rdoc", "Rakefile", "autotest/discover.rb", "bin/htmldiff", "bin/ldiff", "diff-lcs.gemspec", "docs/COPYING.txt", "docs/artistic.txt", "lib/diff-lcs.rb", "lib/diff/lcs.rb", "lib/diff/lcs/array.rb", "lib/diff/lcs/block.rb", "lib/diff/lcs/callbacks.rb", "lib/diff/lcs/change.rb", "lib/diff/lcs/htmldiff.rb", "lib/diff/lcs/hunk.rb", "lib/diff/lcs/internals.rb", "lib/diff/lcs/ldiff.rb", "lib/diff/lcs/string.rb", "spec/change_spec.rb", "spec/diff_spec.rb", "spec/issues_spec.rb", "spec/lcs_spec.rb", "spec/patch_spec.rb", "spec/sdiff_spec.rb", "spec/spec_helper.rb", "spec/traverse_balanced_spec.rb", "spec/traverse_sequences_spec.rb", ".gemtest"]
+  s.homepage = "http://diff-lcs.rubyforge.org/"
   s.rdoc_options = ["--main", "README.rdoc"]
   s.require_paths = ["lib"]
-  s.rubyforge_project = %q{ruwiki}
-  s.rubygems_version = %q{1.3.6}
-  s.summary = %q{Diff::LCS is a port of Perl's Algorithm::Diff that uses the McIlroy-Hunt longest common subsequence (LCS) algorithm to compute intelligent differences between two sequenced enumerable containers}
+  s.rubyforge_project = "diff-lcs"
+  s.rubygems_version = "1.8.24"
+  s.summary = "Diff::LCS computes the difference between two Enumerable sequences using the McIlroy-Hunt longest common subsequence (LCS) algorithm"
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<rubyforge>, [">= 2.0.4"])
+      s.add_development_dependency(%q<rdoc>, ["~> 3.10"])
       s.add_development_dependency(%q<rspec>, ["~> 2.0"])
-      s.add_development_dependency(%q<hoe>, ["~> 2.10"])
+      s.add_development_dependency(%q<rake>, ["~> 10.0"])
+      s.add_development_dependency(%q<hoe-bundler>, ["~> 1.2.0"])
+      s.add_development_dependency(%q<hoe-doofus>, ["~> 1.0.0"])
+      s.add_development_dependency(%q<hoe-gemspec>, ["~> 1.0.0"])
+      s.add_development_dependency(%q<hoe-git>, ["~> 1.5.0"])
+      s.add_development_dependency(%q<hoe-rubygems>, ["~> 1.0.0"])
+      s.add_development_dependency(%q<hoe-travis>, ["~> 1.2"])
+      s.add_development_dependency(%q<hoe>, ["~> 3.4"])
     else
+      s.add_dependency(%q<rubyforge>, [">= 2.0.4"])
+      s.add_dependency(%q<rdoc>, ["~> 3.10"])
       s.add_dependency(%q<rspec>, ["~> 2.0"])
-      s.add_dependency(%q<hoe>, ["~> 2.10"])
+      s.add_dependency(%q<rake>, ["~> 10.0"])
+      s.add_dependency(%q<hoe-bundler>, ["~> 1.2.0"])
+      s.add_dependency(%q<hoe-doofus>, ["~> 1.0.0"])
+      s.add_dependency(%q<hoe-gemspec>, ["~> 1.0.0"])
+      s.add_dependency(%q<hoe-git>, ["~> 1.5.0"])
+      s.add_dependency(%q<hoe-rubygems>, ["~> 1.0.0"])
+      s.add_dependency(%q<hoe-travis>, ["~> 1.2"])
+      s.add_dependency(%q<hoe>, ["~> 3.4"])
     end
   else
+    s.add_dependency(%q<rubyforge>, [">= 2.0.4"])
+    s.add_dependency(%q<rdoc>, ["~> 3.10"])
     s.add_dependency(%q<rspec>, ["~> 2.0"])
-    s.add_dependency(%q<hoe>, ["~> 2.10"])
+    s.add_dependency(%q<rake>, ["~> 10.0"])
+    s.add_dependency(%q<hoe-bundler>, ["~> 1.2.0"])
+    s.add_dependency(%q<hoe-doofus>, ["~> 1.0.0"])
+    s.add_dependency(%q<hoe-gemspec>, ["~> 1.0.0"])
+    s.add_dependency(%q<hoe-git>, ["~> 1.5.0"])
+    s.add_dependency(%q<hoe-rubygems>, ["~> 1.0.0"])
+    s.add_dependency(%q<hoe-travis>, ["~> 1.2"])
+    s.add_dependency(%q<hoe>, ["~> 3.4"])
   end
 end

data/docs/COPYING.txt

@@ -1,12 +1,12 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
+                    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
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
-			    Preamble
+                            Preamble
 
   The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
@@ -15,7 +15,7 @@ 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
+the GNU Lesser General Public License instead.)  You can apply it to
 your programs, too.
 
   When we speak of free software, we are referring to freedom, not
@@ -55,8 +55,8 @@ 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
+
+                    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
   0. This License applies to any program or other work which contains
@@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions:
     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
@@ -168,7 +168,7 @@ 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
@@ -225,7 +225,7 @@ 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
@@ -255,7 +255,7 @@ 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
+                            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
@@ -277,9 +277,9 @@ 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
+                     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
@@ -291,7 +291,7 @@ 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) 19yy  <name of author>
+    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
@@ -303,17 +303,16 @@ the "copyright" line and a pointer to where the full notice is found.
     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
-
+    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.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 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) 19yy name of author
+    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.
@@ -336,5 +335,5 @@ necessary.  Here is a sample; alter the names:
 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
+library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.