[med-svn] [jellyfish] 02/02: Adapted to file locations in new upstream version

[Andreas Tille]

This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository jellyfish.

commit afc76b61ce4ba1a0fc1f82d6297dcc32fcd01ceb
Author: Andreas Tille <tille at debian.org>
Date:   Mon Oct 6 14:47:03 2014 +0200

    Adapted to file locations in new upstream version
---
 debian/changelog |  1 +
 debian/copyright | 30 +-----------------------------
 2 files changed, 2 insertions(+), 29 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5623b9f..ddc9fe9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ jellyfish (2.1.4-1) UNRELEASED; urgency=medium
   * new upstream version needs autoreconf
   * New Build-Depends: yaggo
   * debian/rules: Make sure package builds twice in a row
+  * d/copyright: Adapted to file locations in new upstream version
 
  -- Andreas Tille <tille at debian.org>  Sat, 04 Oct 2014 19:06:43 +0200
 
diff --git a/debian/copyright b/debian/copyright
index 118bd53..7da9ef5 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -8,36 +8,8 @@ Copyright: Copyright 2011 Guillaume Marçais1, Carl Kingsford
 License: GPL-3+
  See `/usr/share/common-licenses/GPL'.
 
-Files: randomc.h
+Files: jellyfish/randomc.h
 Copyright: Copyright 2008 Agner Fog
 License: GPL
  See `/usr/share/common-licenses/GPL'.
 
-Files: half.h
-Copyright: Copyright 2002, Industrial Light & Magic
-License: other
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
- * Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
- * 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.
- * Neither the name of Industrial Light & Magic nor the names of
-   its contributors may be used to endorse or promote products derived
-   from this software without specific prior written permission.
- .
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT
- OWNER 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.
-

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/jellyfish.git