[med-svn] r9797 - trunk/packages/freemedforms/trunk/debian

[Andreas Tille]

Author: tille
Date: 2012-02-26 11:18:27 +0000 (Sun, 26 Feb 2012)
New Revision: 9797

Modified:
   trunk/packages/freemedforms/trunk/debian/changelog
   trunk/packages/freemedforms/trunk/debian/copyright
Log:
Fixed several DEP5 related issues in debian/copyright


Modified: trunk/packages/freemedforms/trunk/debian/changelog
===================================================================
--- trunk/packages/freemedforms/trunk/debian/changelog	2012-02-26 08:04:51 UTC (rev 9796)
+++ trunk/packages/freemedforms/trunk/debian/changelog	2012-02-26 11:18:27 UTC (rev 9797)
@@ -9,8 +9,15 @@
   * creating doc packages
   * changing license terms of debian/* files to BSD revised
 
- -- Andreas Tille <tille at debian.org>  Fri, 11 Nov 2011 14:32:14 +0100
+  [ Andreas Tille ]
+  * debian/copyright
+    - DEP5 now accepted so use
+      http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+    - Used config-edit to fix License fields
+    - Fixed UTF-8 issues
 
+ -- Andreas Tille <tille at debian.org>  Sun, 26 Feb 2012 12:01:12 +0100
+
 freemedforms (0.6.0-1) UNRELEASED; urgency=low
 
   * Initial release

Modified: trunk/packages/freemedforms/trunk/debian/copyright
===================================================================
--- trunk/packages/freemedforms/trunk/debian/copyright	2012-02-26 08:04:51 UTC (rev 9796)
+++ trunk/packages/freemedforms/trunk/debian/copyright	2012-02-26 11:18:27 UTC (rev 9797)
@@ -1,12 +1,10 @@
-Format: http://dep.debian.net/deps/dep5/
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: FreeMedForms
 Upstream-Contact: Eric Maeker <eric.maeker at gmail.com>
 Source: http://code.google.com/p/freemedforms/downloads/list
-X-Debianized-By: Eric Maeker <eric.maeker at gmail.com>, Andreas Tille <tille at debian.org>
-X-Debianized-Date: Sat, 05 Sep 2009 16:22:53 +0200
 
 Files: *
-Copyright: © 2008-2012 by Eric Maeker, MD
+Copyright: 2008-2012 by Eric Maeker, MD
 License: GPL-3+
  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
@@ -21,11 +19,11 @@
  You should have received a copy of the GNU General Public License
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 Comment: On Debian systems, the complete text of the GNU General Public
- License version 3 can be found in ‘/usr/share/common-licenses/GPL-3’.
+ License version 3 can be found in ‚`/usr/share/common-licenses/GPL-3'.
 
 Files: contrib/quazip/*
-Copyright: © 2005-2007 Sergey A. Tachenov
-License: Dual licensed as GPL2+ and LGPL
+Copyright: 2005-2007 Sergey A. Tachenov
+License: GPL2+ or LGPL
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public
  License as published by the Free Software Foundation; either
@@ -40,7 +38,7 @@
  License along with this library; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 Comment: On Debian systems, the complete text of the GNU Lesser General
- Public License version 2.1 can be found in ‘/usr/share/common-licenses/LGPL-2.1’.
+ Public License version 2.1 can be found in '/usr/share/common-licenses/LGPL-2.1'.
 Remark: Here we are using LGPL to be able to link against a BSD licensed
  program
 Comment: On Debian systems, the complete text of the GNU Lesser General
@@ -56,7 +54,7 @@
        tests/basicsortfiltermodel
        tests/formmodel/[mt]*
 Copyright: 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
-License: : LGPL-2.1+
+License: LGPL-2.1+
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public
  License as published by the Free Software Foundation; either
@@ -71,11 +69,11 @@
  License along with this library; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 Comment: On Debian systems, the complete text of the GNU Lesser General
- Public License version 2.1 can be found in ‘/usr/share/common-licenses/LGPL-2.1’.
+ Public License version 2.1 can be found in '/usr/share/common-licenses/LGPL-2.1'.
 
 Files: contrib/quazip/quazip/{crypt.h ioapi.c unzip.[ch] z*}
 Copyright: 1998-2005 Gilles Vollant, Jean-loup Gailly and Mark Adler
-License: Info-ZIP license
+License: Info-ZIP
  Permission is granted to anyone to use this software for any purpose,
  including commercial applications, and to alter it and redistribute it
  freely, subject to the above disclaimer and the following restrictions:
@@ -117,7 +115,7 @@
                                     Printer.svg
                                     unadvised.svg}
 Copyright: 2006-2008 Lapo Calamandrei, Jakub Steiner, Andreas Nilsson
-License: Creative Commons 2.0 by SA
+License: CC-BY-SA-2.0
    Attribution-ShareAlike 2.0 License
  .
    THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS
@@ -364,20 +362,20 @@
        global_resources/pixmaps/48x48
        global_resources/pixmaps/64x64
 Copyright: Tango Desktop Project, Eric Maeker
-License: Public Domain
+License: PD
  These icons are in Public Domain
 
 Files: global_resources/datapacks/appinstalled/drugs/master.db
 Copyright: Eric Maeker, MD
-License: The file is created by upstream using the following database licenses
+License: PD
  This file is constructed using the following raw source files:
   - FDA drugs database: http://www.fda.gov/downloads/Drugs/InformationOnDrugs/ucm054599.zip
-    License: public domain © FDA
+    License: public domain; Copyright: FDA
 
 Files: debian/*
-Copyright: © 2009-2012, Eric Maeker <eric.maeker at gmail.com>
+Copyright: 2009-2012, Eric Maeker <eric.maeker at gmail.com>
                         Andreas Tille <tille at debian.org>
-License: BSD revised
+License: BSD-revised
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
  are met: