[eso-midas] 06/06: Fix small copyright issues
Ole Streicher
olebole-guest at moszumanska.debian.org
Wed Apr 23 09:28:34 UTC 2014
This is an automated email from the git hooks/post-receive script.
olebole-guest pushed a commit to branch debian
in repository eso-midas.
commit c8ca4a1e6d88a69fe0a3978a1f09fe01651fcb59
Author: Ole Streicher <debian at liska.ath.cx>
Date: Wed Apr 23 11:19:28 2014 +0200
Fix small copyright issues
---
debian/copyright | 19 ++++++-------------
1 file changed, 6 insertions(+), 13 deletions(-)
diff --git a/debian/copyright b/debian/copyright
index 7a0356b..73451d1 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,10 +1,9 @@
-Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=202
-Upstream-Name:
-Upstream-Author: Ralf Palsa <rpalsa at eso.org>,
- Lars Lundin <llundin at eso.org>
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name:ESO-MIDAS
+Upstream-Author: Ralf Palsa <rpalsa at eso.org>, Lars Lundin <llundin at eso.org>
Source: http://www.eso.org/sci/software/esomidas/midas-distrib.html
-Files: *
+Files: * debian/*
Copyright:
1985-2011 European Southern Observatory,
1990 David E. Smyth,
@@ -19,7 +18,8 @@ Copyright:
1995 Mark Calabretta,
1987-1992 Free Software Foundation, Inc,
1992 European Southern Observatory and Warsaw Observatory,
- 1990 Andrew T. Young
+ 1990 Andrew T. Young,
+ 2014 Ole Streicher <debian at liska.ath.cx> (Debian packaging)
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
@@ -37,10 +37,3 @@ License: GPL-2+
Notice: The web page claims that ESO-MIDAS
<http://www.eso.org/sci/software/esomidas/> is a registered trademark.
However, this is outdated, as the trademark ist cancelled since 1998.
-
-Files: debian/*
-Copyright: 2011 Ole Streicher <debian at liska.ath.cx>
-License: GPL-2
- On Debian systems, the full text of the GNU General Public
- License version 2 can be found in the file
- `/usr/share/common-licenses/GPL-2'.
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/eso-midas.git
More information about the debian-science-commits
mailing list