[eso-midas] 02/05: Revert removal of files since now midas is completely dfsg-free

Ole Streicher olebole-guest at moszumanska.debian.org
Tue Jul 8 18:48:21 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 d3cc23a7c66099e0155fdffff79094a1d299057a
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Tue Jul 8 19:43:54 2014 +0200

    Revert removal of files since now midas is completely dfsg-free
---
 debian/copyright | 34 +++-------------------------------
 1 file changed, 3 insertions(+), 31 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 49bb696..28af81b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,14 +2,6 @@ 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-Excluded:
- gui/GraphLib/libsrc/uimxR5/include/msg.h
- gui/GraphLib/libsrc/.Wcl
- gui/GraphLib/libsrc/.Xukc
- gui/GraphLib/libsrc/old_uimxR4
- libsrc/readline
- install/unix/systems/Cygwin
- install/unix/systems/Linux_alpha
 
 Files: * debian/*
 Copyright:
@@ -57,30 +49,9 @@ License: MIT
  the software without specific, written prior permission. The year
  included in the notice is the year of the creation of the work.
 
-Files: debian/patches/dfsg-free-msg_h.patch
-Copyright: 1999, 2007 The NetBSD Foundation, Inc.
- 1993 Daniel Boulet and RTMX Inc.
+Files: gui/GraphLib/libsrc/uimxR5/include/msg.h
+Copyright: 1993 Daniel Boulet and RTMX Inc.
 License: BSD
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
- 1. Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
- THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- POSSIBILITY OF SUCH DAMAGE.
- .
  This system call was implemented by Daniel Boulet under contract from RTMX.
  .
  Redistribution and use in source forms, with and without modification,
@@ -89,4 +60,5 @@ License: BSD
  Redistribution in binary form may occur without any restrictions.
  Obviously, it would be nice if you gave credit where credit is due
  but requiring it would be too onerous.
+ .
  This software is provided ``AS IS'' without any warranties of any kind.

-- 
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