[SCM] ORSA packaging branch, master, updated. debian/0.7.0-12-6-ge4ba595

[Frank S. Thomas]

The following commit has been merged in the master branch:
commit e4ba59525d2e9f205f22aa273195711c72fbea64
Author: Frank S. Thomas <fst at debian.org>
Date:   Thu Mar 12 14:02:28 2009 +0100

    debian/copyright: Use the machine-interpretable format.
    
    debian/copyright: Rewrote it in the machine-interpretable format which is
    specified in http://wiki.debian.org/Proposals/CopyrightFormat.

diff --git a/debian/changelog b/debian/changelog
index 79a55d9..ffbcdd1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ orsa (0.7.0-13) UNRELEASED; urgency=low
   * debian/rules: Added -DHAVE_INLINE to CPPFLAGS so that compiling ORSA does
     not fail with "gsl_vector_long_double.h:171: error: expected constructor,
     destructor, or type conversion before ‘long’".
+  * debian/copyright: Rewrote it in the machine-interpretable format which is
+    specified in http://wiki.debian.org/Proposals/CopyrightFormat.
 
  -- Frank S. Thomas <fst at debian.org>  Mon, 28 Apr 2008 22:21:36 +0200
 
diff --git a/debian/copyright b/debian/copyright
index 6c95fcf..07fbbe5 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,37 +1,34 @@
 This package was debianized by Frank S. Thomas <frank at thomas-alfeld.de> on
 Thu, 21 Apr 2005 02:50:20 +0200.
 
-It was downloaded from http://orsa.sourceforge.net
-
-Upstream Author: Pasquale Tricarico <tricaric at wsu.edu>
-
-Copyright © 2002-2004 Pasquale Tricarico
-
-License:
-
-   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.
-
-   As a special exception, Pasquale Tricarico gives permission to
-   link this program with Qt commercial edition, and distribute the
-   resulting executable, without including the source code for the Qt
-   commercial edition in the source distribution.
-
-   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 `/usr/share/common-licenses/GPL'.
-
-
-The Debian packaging is © 2005-2008 Frank S. Thomas <fst at debian.org>
-and is licensed under the GPL, see above.
+It was downloaded from http://orsa.sourceforge.net/
+
+Files: *
+Copyright: © 2002-2004 Pasquale Tricarico <tricaric at wsu.edu>
+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.
+ .
+ As a special exception, Pasquale Tricarico gives permission to
+ link this program with Qt commercial edition, and distribute the
+ resulting executable, without including the source code for the Qt
+ commercial edition in the source distribution.
+ .
+ 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 `/usr/share/common-licenses/GPL-2'.
+
+Files: debian/*
+Copyright: © 2005-2009 Frank S. Thomas <fst at debian.org>
+License: GPL-2+

-- 
ORSA packaging