remove ChangeLog generation

Nowadays, RDoc 4.x expects GNU-style ChangeLog files and cannot seem
to parse them verbatim anymore.  Since I've long been against
GNU-style ChangeLogs, we'll leave them out and tell folks to read
"git log" instead.

8 files changed, 6 insertions, 39 deletions

diff --git a/.gitignore b/.gitignore
index cce615b..2a6e67a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,4 @@
 /GIT-VERSION-FILE
-ChangeLog
 olddoc_1
 olddoc_5
 LATEST
diff --git a/Documentation/olddoc.1.txt b/Documentation/olddoc.1.txt
index e7b31d8..c294cdb 100644
--- a/Documentation/olddoc.1.txt
+++ b/Documentation/olddoc.1.txt
@@ -14,7 +14,7 @@ olddoc - old-fashioned RDoc HTML generator
 
 olddoc features oldweb, and old-fashioned RDoc HTML generator.
 You can also use "olddoc prepare" to generate NEWS files from
-git tags and ChangeLog entries from "git log".
+git tags.
 
 # SEE ALSO
 
diff --git a/GNUmakefile b/GNUmakefile
index b6007d8..1087882 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -16,7 +16,7 @@ fix-perms:
 gem-man:
         $(MAKE) -C Documentation/ gem-man
 
-pkg_extra := NEWS ChangeLog
+pkg_extra := NEWS
 
 .manifest: fix-perms
         $(RUBY) -I lib bin/olddoc prepare
@@ -55,5 +55,5 @@ $(pkggem): fix-perms .gem-manifest
 
 package: $(pkggem)
 
-.PHONY: all .FORCE-GIT-VERSION-FILE NEWS ChangeLog
+.PHONY: all .FORCE-GIT-VERSION-FILE NEWS
 .PHONY: check-warnings fix-perms doc
diff --git a/README b/README
index 3faff28..ef0503c 100644
--- a/README
+++ b/README
@@ -40,8 +40,8 @@ missing out!
         cd $ANY_RDOC_USING_RUBY_PROJECT
         rdoc -f oldweb
 
-You can also use olddoc to generate NEWS and ChangeLog entries
-assuming you have a README file and .olddoc.yml
+You can also use olddoc to generate NEWS entries
+assuming you have git tags, a README file and .olddoc.yml
 
         olddoc prepare
 
diff --git a/Rakefile b/Rakefile
index ad483bd..5ca0c29 100644
--- a/Rakefile
+++ b/Rakefile
@@ -23,7 +23,7 @@ task :rsync_docs do
 
   files = `git ls-files Documentation/*.txt`.split(/\n/)
   files.concat(top)
-  files.concat(%w(NEWS NEWS.atom.xml ChangeLog))
+  files.concat(%w(NEWS NEWS.atom.xml))
   gzfiles = files.map { |txt| do_gzip.call(txt) }
   files.concat(gzfiles)
   sh("rsync --chmod=Fugo=r -av #{files.join(' ')} #{dest}")
diff --git a/lib/olddoc.rb b/lib/olddoc.rb
index f230cbf..7b8affa 100644
--- a/lib/olddoc.rb
+++ b/lib/olddoc.rb
@@ -3,7 +3,6 @@
 module Olddoc
   VERSION = '1.0.0'
 
-  autoload :Changelog, 'olddoc/changelog'
   autoload :Gemspec, 'olddoc/gemspec'
   autoload :History, 'olddoc/history'
   autoload :Merge, 'olddoc/merge'
diff --git a/lib/olddoc/changelog.rb b/lib/olddoc/changelog.rb
deleted file mode 100644
index 7a7fe96..0000000
--- a/lib/olddoc/changelog.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-# helper method for generating the ChangeLog in RDoc format atomically
-require 'tempfile'
-
-module Olddoc::Changelog
-  include Olddoc::History
-
-  def changelog
-    fp = Tempfile.new('ChangeLog', '.')
-    fp.write "ChangeLog from #@cgit_uri"
-    cmd = %w(git log)
-    if @changelog_start && tags[0]
-      range = "#@changelog_start..#{tags[0][:tag]}"
-      fp.write(" (#{range})")
-      cmd << range
-    end
-    fp.write("\n\n")
-    prefix = "   "
-    IO.popen(cmd.join(' ')) do |io|
-      io.each { |line|
-        fp.write prefix
-        fp.write line
-      }
-    end
-    fp.chmod(0666 & ~File.umask)
-    File.rename(fp.path, 'ChangeLog')
-    fp.close!
-  end
-end
diff --git a/lib/olddoc/prepare.rb b/lib/olddoc/prepare.rb
index f760bd3..1ed66a0 100644
--- a/lib/olddoc/prepare.rb
+++ b/lib/olddoc/prepare.rb
@@ -5,7 +5,6 @@ require 'uri'
 class Olddoc::Prepare
   include Olddoc::NewsRdoc
   include Olddoc::NewsAtom
-  include Olddoc::Changelog
   include Olddoc::Readme
 
   def initialize(opts)
@@ -15,13 +14,11 @@ class Olddoc::Prepare
       abort "rdoc_url and cgit_url required in .olddoc.yml for `prepare'"
     @rdoc_uri = URI.parse(rdoc_url)
     @cgit_uri = URI.parse(cgit_url)
-    @changelog_start = opts['changelog_start']
     @name, @short_desc = readme_metadata
   end
 
   def run
     news_rdoc
-    changelog
     news_atom
   end
 end