More slight changes for the packaging

Makefile.am

@@ -1,20 +1,22 @@
 
-# Copyright (C) 2006-2010 Julien Ridoux <julien@synclab.org>
+# Copyright (C) 2006-2011 Julien Ridoux <julien@synclab.org>
 #
 # This file is part of the radclock program.
 # 
-# 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 3 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 program. If not, see <http://www.gnu.org/licenses/>.
+# 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 program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
 
 SUBDIRS = libradclock radclock examples man
 
@@ -63,6 +65,8 @@ dist-hook:
 	@echo "Pushing version number in packaging scripts" 
 	sed -i -e 's/_RADCLOCK_VERSION_/$(PACKAGE_VERSION)/' $(distdir)/debian/changelog
 	sed -i -e 's/_RADCLOCK_VERSION_/$(PACKAGE_VERSION)/' $(distdir)/redhat/radclock.spec
+	@echo "Move debian copyright file in $(distdir) for Debian packaging"
+	mv $(distdir)/debian/copyright $(distdir)/
 	@echo ""
 	@echo "------------------------------------------------------"
 	@echo "*         You made a release distribution"

configure.in

@@ -1,21 +1,22 @@
 
-# Copyright (C) 2006-2010 Julien Ridoux <julien@synclab.org>
+# Copyright (C) 2006-2011 Julien Ridoux <julien@synclab.org>
 #
 # This file is part of the radclock program.
 # 
-# 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 3 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.
+# 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 program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
-# You should have received a copy of the GNU General Public License along with
-# this program. If not, see <http://www.gnu.org/licenses/>.
-
 # Process this file with autoconf to produce a configure script.
 # Requires autoconf >=2.57
 # Requires automake >=1.8

debian/copyright

@@ -5,8 +5,8 @@ It was downloaded from http://www.synclab.org/radclock/
 Upstream Authors: see the AUTHORS file 
 
 Copyright:
- 2006-2010 Julien Ridoux <julien@synclab.org>
- 2004-2010 Darryl Veitch <dveitch@unimelb.edu.au> 
+ 2006-2011 Julien Ridoux <julien@synclab.org>
+ 2004-2011 Darryl Veitch <dveitch@unimelb.edu.au> 
 
 License: GPL-2+