Remove ChangeLog.proto and move important info to PKGBUILD(5)

The change log prototype should be distribution determined.

Signed-off-by: Jason St. John <jstjohn@purdue.edu>
Signed-off-by: Allan McRae <allan@archlinux.org>

3 files changed, 2 insertions, 18 deletions

diff --git a/Makefile.am b/Makefile.am
index 9321d58b..4c6f6565 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,8 +21,7 @@ dist_pkgdata_DATA = \
 	proto/PKGBUILD.proto \
 	proto/PKGBUILD-split.proto \
 	proto/PKGBUILD-vcs.proto \
-	proto/proto.install \
-	proto/ChangeLog.proto
+	proto/proto.install
 
 $(top_srcdir)/test/pacman/tests/TESTS: $(wildcard test/pacman/tests/*.py*)
 	@printf "TESTS += %s\n" $^ | sed -e "s/\.py\.in/.py/" | LC_ALL=C sort -u > "$@"
diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt
index eeb56966..50d8347c 100644
--- a/doc/PKGBUILD.5.txt
+++ b/doc/PKGBUILD.5.txt
@@ -102,6 +102,7 @@ below).
 
 *changelog*::
 	Specifies a changelog file that is to be included in the package.
+	The changelog file should end in a single newline.
 	This file should reside in the same directory as the PKGBUILD and will
 	be copied into the package by makepkg. It does not need to be included
 	in the source array (e.g., `changelog=$pkgname.changelog`).
diff --git a/proto/ChangeLog.proto b/proto/ChangeLog.proto
deleted file mode 100644
index 87e86e72..00000000
--- a/proto/ChangeLog.proto
+++ /dev/null
@@ -1,16 +0,0 @@
-2007-12-01 Your Name <youremail@domain.com>
-
-	* pkgver-pkgrel :
-	new upstream release.
-	Reason we changed stuff.
-	Another reason we changed stuff.
-
-	* gcc-4.1.patch :
-	Removed, no longer needed.
-
-2007-11-01 Your Name <youremail@domain.com>
-
-	* 1.0-5 :
-	added ChangeLog.
-	the last line should end with just one newline.
-	you can cat the file to check it displays fine.