more copyright simplification

2 files changed, 8 insertions, 41 deletions

diff --git a/src/util.c b/src/util.c
index f33c1b4..df3126d 100644
--- a/src/util.c
+++ b/src/util.c
@@ -1,26 +1,9 @@
-/* 
- * "$Id: util.c,v 1.1 2005/02/28 17:56:51 hofmann Exp $"
+/*
+ * Copyright 2006 Johannes Hofmann <Johannes.Hofmann@gmx.de>
  *
- * flpsed program.
- *
- * Copyright 2005 by Johannes Hofmann
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *  
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA.
+ * This software may be used and distributed according to the terms
+ * of the GNU General Public License, incorporated herein by reference.
  */
-
 #include <stdlib.h>
 #include <stdio.h>
 #include <unistd.h>
diff --git a/src/util.h b/src/util.h
index d5a71e1..ad0e423 100644
--- a/src/util.h
+++ b/src/util.h
@@ -1,24 +1,8 @@
-/* 
- * "$Id: util.h,v 1.2 2005/03/17 18:46:20 hofmann Exp $"
+/*
+ * Copyright 2006 Johannes Hofmann <Johannes.Hofmann@gmx.de>
  *
- * flpsed program.
- *
- * Copyright 2005 by Johannes Hofmann
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *  
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA.
+ * This software may be used and distributed according to the terms
+ * of the GNU General Public License, incorporated herein by reference.
  */
 #ifndef _UTIL_H_
 #define _UTIL_H_