[Pkg-wmaker-commits] [wmfsm] 30/83: wmfsm: Combine ChangeLog and ChangeLog.old.

[Doug Torrance]

This is an automated email from the git hooks/post-receive script.

dtorrance-guest pushed a commit to branch master
in repository wmfsm.

commit 56a0ca541a2ee88d6898d182435249d6edf08c5e
Author: Doug Torrance <dtorrance at monmouthcollege.edu>
Date:   Thu Jan 22 00:22:16 2015 -0600

    wmfsm: Combine ChangeLog and ChangeLog.old.
    
    As ChangeLog is no longer automatically generated by arch, there is no need
    to keep these files separate.
---
 ChangeLog     | 38 ++++++++++++++++++++++++++++++++++----
 ChangeLog.old | 34 ----------------------------------
 2 files changed, 34 insertions(+), 38 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index de04f61..afd47a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,3 @@
-# do not edit -- automatically generated by arch changelog
-# tag: automatic-ChangeLog--cgray4 at po-box.mcgill.ca--archive/wmfsm--dev--0.3
-#
-
 2002-07-13 03:17:14 GMT	Chris Gray <cgray4 at po-box.mcgill.ca>	patch-4
 
     Summary:
@@ -100,3 +96,37 @@
      ./wmgeneral/wmgeneral.c ./wmgeneral/wmgeneral.h
 
 
+2001-01-19  Chris Gray  <cgray at tribsoft.com>
+
+	* configure.in: Did a lot of work so that maintenance should be
+	easier in the future.  Things are totally done with
+	automake/autoconf now.  The goal is to remove all of the OS
+	dependent ifdefs and change them to depend on the actual feature
+	of the OS that we are testing for.
+
+2001-01-13  Chris Gray  <cgray at tribsoft.com>
+
+	* debian/wmfsm.1: Changed the man page to reflect the new
+	options.  I should probably distribute this man page in such a way
+	that non-Debian users can install it easily.
+
+	* wmfsm/wmfsm.c: Added getopt support, and a new option, --delay.
+	The delay should be 10 * number in microseconds which seems a bit
+	unintuitive to me.  I'll probably change that.
+
+2001-01-09  Chris Gray  <cgray at tribsoft.com>
+
+	* wmfsm/wmfsm.c: Added FreeBSD patches from Steven Enderle
+	<panic at subphase.de>.  Also, it looks like I am taking this project
+	over.  Hopefully I can do some good!
+
+0.30    24/08/1999  OpenBSD support, it hopefully works...
+                    Blinking on a filesystem that is 95 percent full
+0.30    04/06/1999  use fstat() instead of system("df")
+                    Exclusion of directories via ~/.wmfsmrc
+                    uses less colors (54), other colorschemes are included
+0.27    26/03/1999  mouse toggable fire/normal mode
+                    bug fixes
+                    Solaris 2.6/7 support
+0.26    06/03/1999  added fire mode for bars
+0.25	05/03/1999	first release
diff --git a/ChangeLog.old b/ChangeLog.old
deleted file mode 100644
index e53ff61..0000000
--- a/ChangeLog.old
+++ /dev/null
@@ -1,34 +0,0 @@
-2001-01-19  Chris Gray  <cgray at tribsoft.com>
-
-	* configure.in: Did a lot of work so that maintenance should be
-	easier in the future.  Things are totally done with
-	automake/autoconf now.  The goal is to remove all of the OS
-	dependent ifdefs and change them to depend on the actual feature
-	of the OS that we are testing for.
-
-2001-01-13  Chris Gray  <cgray at tribsoft.com>
-
-	* debian/wmfsm.1: Changed the man page to reflect the new
-	options.  I should probably distribute this man page in such a way
-	that non-Debian users can install it easily.
-
-	* wmfsm/wmfsm.c: Added getopt support, and a new option, --delay.
-	The delay should be 10 * number in microseconds which seems a bit
-	unintuitive to me.  I'll probably change that.
-
-2001-01-09  Chris Gray  <cgray at tribsoft.com>
-
-	* wmfsm/wmfsm.c: Added FreeBSD patches from Steven Enderle
-	<panic at subphase.de>.  Also, it looks like I am taking this project
-	over.  Hopefully I can do some good!
-
-0.30    24/08/1999  OpenBSD support, it hopefully works...
-                    Blinking on a filesystem that is 95 percent full
-0.30    04/06/1999  use fstat() instead of system("df")
-                    Exclusion of directories via ~/.wmfsmrc
-                    uses less colors (54), other colorschemes are included
-0.27    26/03/1999  mouse toggable fire/normal mode
-                    bug fixes
-                    Solaris 2.6/7 support
-0.26    06/03/1999  added fire mode for bars
-0.25	05/03/1999	first release

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmfsm.git