Update copyright information

1 files changed, 35 insertions, 27 deletions

diff --git a/debian/copyright b/debian/copyright
index 11c5c94..1f631e0 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,39 +1,32 @@
-Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
-Name: rapid-photo-downloader
-Maintainer: Damon Lynch <damonlynch@gmail.com>
+Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=153
+Upstream-Name: Rapid Photo Downloader
+Upstream-Contact: Damon Lynch <damonlynch@gmail.com>
 Source: https://launchpad.net/rapid
 
 Files: *
 Copyright: 2007-2010 Damon Lynch <damonlynch@gmail.com>
 License: GPL-2+
- On Debian systems the full text of the GNU Lesser General Public
- License can be found in the `/usr/share/common-licenses/GPL'
- file.
 
 Files: rapid/ValidatedEntry.py
 Copyright: 2006 Daniel J. Popowich <dpopowich@astro.umass.edu>
-License: other
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation files
- (the "Software"), to deal in the Software without restriction,
- including without limitation the rights to use, copy, modify, merge,
- publish, distribute, sublicense, and/or sell copies of the Software,
- and to permit persons to whom the Software is furnished to do so,
- subject to the following conditions:
- . 
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
+License:
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of this software and associated documentation files (the "Software"),
+ to deal in the Software without restriction, including without limitation
+ the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ and/or sell copies of the Software, and to permit persons to whom the
+ Software is furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included
+ in all copies or substantial portions of the Software.
 
-Files: rapid/gnomeglade.py, rapid/misc.py, rapid/prefs.py, rapid/paths.py
+Files: rapid/gnomeglade.py rapid/misc.py rapid/prefs.py rapid/paths.py
 Copyright: 2002-2006 Stephen Kennedy <stevek@gnome.org>
 License: GPL-2+
- On Debian systems the full text of the GNU Lesser General Public
- License can be found in the `/usr/share/common-licenses/GPL'
- file.
-            
+
 Files: rapid/idletube.py
 Copyright: 2005 Antoon Pardon    
-License: other
+License:
  Permission is hereby granted, free of charge, to any person obtaining a
  copy of this software and associated documentation files (the "Software"),
  to deal in the Software without restriction, including without limitation
@@ -46,8 +39,23 @@ License: other
 
 Files: debian/*
 Copyright: 2009 Damon Lynch <damonlynch@gmail.com>
-           2009-2010 Julien Valroff <julien@kirya.net>
+           2009-2011 Julien Valroff <julien@debian.org>
 License: GPL-2+.
- On Debian systems the full text of the GNU Lesser General Public
- License can be found in the `/usr/share/common-licenses/GPL'
- file.
+
+License: GPL-2+
+ 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 St, Fifth Floor, Boston, MA 02110-1301, USA.
+ .
+ On Debian systems, the complete text of the GNU General Public
+ License can be found in the file `/usr/share/common-licenses/GPL'.