From 0e01d019537c9c6d34a6411458c0e1fa36da0aad Mon Sep 17 00:00:00 2001
From: Bill Cox <waywardgeek@gmail.com>
Date: Mon, 18 Apr 2011 10:55:43 -0400
Subject: [PATCH] Create ChangeLog from git

---
 ChangeLog        |  2 --
 Makefile         |  2 +-
 README           |  4 +++-
 debian/changelog | 12 ++++++++++++
 debian/copyright |  4 ++++
 mkorig           |  1 +
 6 files changed, 21 insertions(+), 4 deletions(-)
 delete mode 100644 ChangeLog

diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644
index 9498596..0000000
--- a/ChangeLog
+++ /dev/null
@@ -1,2 +0,0 @@
-This file is now only here as a place-holder for autotools.  Log history is
-maintained in git.
diff --git a/Makefile b/Makefile
index a1745ac..ee7955c 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 
 #CFLAGS=-Wall -g -ansi -fPIC -pthread
 CFLAGS=-Wall -O2 -ansi -fPIC -pthread
-LIB_TAG=0.1.15
+LIB_TAG=0.1.16
 CC=gcc
 PREFIX=/usr
 
diff --git a/README b/README
index 8382ff5..0cc1e29 100644
--- a/README
+++ b/README
@@ -9,7 +9,9 @@ Sonic can also be used by the sighted.  For example, Sonic can improve the
 experience of listening to an audio book on an Android phone.
 
 Sonic is Copyright 2010, Bill Cox, all rights reserved.  It is released as open
-source under the Lesser Gnu Public License version 2.1.
+source under the Lesser Gnu Public License version 2.1.  All files except main.c
+and all the sound samples are LGPL.  main.c and the sound samples in the samples
+directory are in the public domain.
 
 Author: Bill Cox
 email: waywardgeek@gmail.com
diff --git a/debian/changelog b/debian/changelog
index c4473a5..d66a404 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+sonic (0.1.16-1ubuntu1) maverick; urgency=low
+
+  * Added git log in ChangeLog.
+
+ -- Bill Cox <waywardgeek@gmail.com>  Mon, 18 Apr 2011 10:54:13 -0400
+
+sonic (0.1.16-1) unstable; urgency=low
+
+  * Added a bit more explanation about copyrights of various files.
+
+ -- Bill Cox <waywardgeek@gmail.com>  Sat, 16 Apr 2011 16:49:33 -0400
+
 sonic (0.1.15-1) unstable; urgency=low
 
   * Updates to improve Debian packaging.
diff --git a/debian/copyright b/debian/copyright
index 25e0308..06bace4 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -31,6 +31,10 @@ Copyright:
    Boston, MA 02110-1335
    USA
 
+   There are some files in this distribution which are in the public domain.
+   They are main.c, and all sound samples in the samples directory.  All other
+   files are LGPL 2.1.
+
 The Debian packaging is:
 
     Copyright (C) 2010 Bill Cox <waywardgeek@gmail.com>
diff --git a/mkorig b/mkorig
index 2f9984d..6535635 100755
--- a/mkorig
+++ b/mkorig
@@ -13,6 +13,7 @@ fi
 make clean
 make -f debian/rules clean
 echo "sonic_${version} (git: `git log -1 --oneline | sed 's/ .*//'`)" > version
+git2cl > ChangeLog
 cd ..
 if ! tar -cvzf sonic_$version.orig.tar.gz --exclude-vcs --exclude=debian sonic-$version; then 
     echo "Could not create sonic_$version.orig.tar.gz"