From 72bf4ad3ea06ef327d162798ac97a5ec13bb2b21 Mon Sep 17 00:00:00 2001
From: Alexander Kojevnikov <alexander@kojevnikov.com>
Date: Sat, 16 Jul 2011 15:42:30 +0800
Subject: [PATCH] Merge NEWS and README

---
 README            |  6 ------
 NEWS => README.md | 10 ++++++++++
 dist/README       |  2 +-
 3 files changed, 11 insertions(+), 7 deletions(-)
 delete mode 100644 README
 rename NEWS => README.md (82%)

diff --git a/README b/README
deleted file mode 100644
index aae0f13..0000000
--- a/README
+++ /dev/null
@@ -1,6 +0,0 @@
-Spek is an acoustic spectrum analyser written in C and Vala. It uses the GNOME
-platform: GLib, GTK+, Cairo and Pango as well as the FFmpeg libraries.
-
-Spek is available on *BSD, GNU/Linux, Windows and Mac OS X.
-
-Find out more about Spek on its website: http://www.spek-project.org/
diff --git a/NEWS b/README.md
similarity index 82%
rename from NEWS
rename to README.md
index 887563c..db65c98 100644
--- a/NEWS
+++ b/README.md
@@ -1,3 +1,13 @@
+Spek
+==============================================================================
+
+Spek is an acoustic spectrum analyser written in C and Vala. It uses the GNOME
+platform: GLib, GTK+, Cairo and Pango as well as the FFmpeg libraries.
+
+Spek is available on *BSD, GNU/Linux, Windows and Mac OS X.
+
+Find out more about Spek on its website: <http://www.spek-project.org/>
+
 Spek 0.7 - Released 2011-04-24
 ==============================================================================
 
diff --git a/dist/README b/dist/README
index f8336ad..0987b6d 100644
--- a/dist/README
+++ b/dist/README
@@ -14,7 +14,7 @@ Spek release checklist
    * dist/osx/bundle.sh
  * Update AUTHORS using `git log X.Y.. --pretty=format:"%an <%ae>" | sort -u`.
  * Sync AUTHORS with the About dialogue.
- * Update NEWS.
+ * Update news in README.md.
  * Update the website and debian/control's description with the new features.
  * Update the manpage if necessary.
  * Update sshots if there are user-visible changes.