Move to autogenerated ChangeLog.

Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>

diff --git a/.gitignore b/.gitignore
index 3f8cb5538e478c9675a0f3d6693eb77065ad0b88..5d43ffd455da4ccba0dfa7d1e9774966fcc16ead 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /genkernel.8
 /genkernel-*.tar.bz2
+/ChangeLog

diff --git a/ChangeLog b/ChangeLog.old
similarity index 99%
rename from ChangeLog
rename to ChangeLog.old
index 7902101f65eb47fdc5ed4b116ee234aa23686e1b..912856504ea14e1b9ced4afaae04386b4fbac35c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog.old
@@ -1,9 +1,11 @@
+# After 2012/11/01, the changelog is now auto-generated.
+# This file is for historical purposes only.
 # ChangeLog for genkernel
 # Copyright: 
 # - 2003-2008 Gentoo Foundation
 # - 2008-2012 Various authors (see AUTHORS)
 # Distributed under the GPL v2
-# $Id$
+# $Id: 7902101f65eb47fdc5ed4b116ee234aa23686e1b $
 
   19 Oct 2012; Robin H. Johnson <robbat2@gentoo.org> gen_bootloader.sh:
   Missing then keyword.

diff --git a/HACKING b/HACKING
index 479f1aa8380ae3c8621ece40b143e17cc7fcf888..7ac0a60ddf44655fd2360c805afd6e889d70a388 100644 (file)
--- a/HACKING
+++ b/HACKING
@@ -17,10 +17,9 @@ Testing things:
 
 Rolling a release:
 - Bump the version in the main genkernel file.
-- echangelog "Bump version to ${PV}"
-- git commit -a -m "Bump version to ${PV}"
+- git commit -s -a -m "Bump version to ${PV}"
 - make dist
-- git tag -a -m "Tag release v${PV}" v${PV}
+- git tag -s -a -m "Tag release v${PV}" v${PV}
 - git push ${REMOTE} master --tags
 - upload genkernel-${PV}.tar.bz2 to the hosting:
     scp genkernel-${PV}.tar.bz2 ${USER}@dev.gentoo.org:/space/distfiles-local/

diff --git a/Makefile b/Makefile
index 751bb4625ac42a4094fc1b66a3b5e069ad4cade4..8e31a066277073fb94dd64b44b7b990d782b3f32 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,20 +2,23 @@ PACKAGE_VERSION = `/bin/fgrep GK_V= genkernel | sed "s/.*GK_V='\([^']\+\)'/\1/"`
 distdir = genkernel-$(PACKAGE_VERSION)
 
 # Add off-Git/generated files here that need to be shipped with releases
-EXTRA_DIST = genkernel.8
+EXTRA_DIST = genkernel.8 ChangeLog
 
 genkernel.8: doc/genkernel.8.txt doc/asciidoc.conf Makefile genkernel
        a2x --conf-file=doc/asciidoc.conf --attribute="genkernelversion=$(PACKAGE_VERSION)" \
                 --format=manpage -D . "$<"
 
+ChangeLog:
+       git log >$@
+
 clean:
-       rm -f genkernel.8
+       rm -f $(EXTRA_DIST)
 
 check-git-repository:
        git diff --quiet || { echo 'STOP, you have uncommitted changes in the working directory' ; false ; }
        git diff --cached --quiet || { echo 'STOP, you have uncommitted changes in the index' ; false ; }
 
-dist: check-git-repository genkernel.8
+dist: check-git-repository $(EXTRA_DIST)
        rm -Rf "$(distdir)" "$(distdir)".tar "$(distdir)".tar.bz2
        mkdir "$(distdir)"
        git ls-files -z | xargs -0 cp --no-dereference --parents --target-directory="$(distdir)" \