[osrm] 03/12: Use stand-alone license paragraph in copyright file.

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository osrm.

commit 26c4af8e1b056fbe44ff89044470692448c1f2e8
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Apr 4 18:34:28 2015 +0200

    Use stand-alone license paragraph in copyright file.
---
 debian/changelog |  1 +
 debian/copyright | 29 ++++-------------------------
 2 files changed, 5 insertions(+), 25 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 51011cf..a86ad1a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,5 +9,6 @@ osrm (4.5.0-1) UNRELEASED; urgency=medium
   [ Bas Couwenberg ]
   * Add gbp.conf to use pristine-tar by default.
   * Update Vcs-Browser URL to use cgit instead of gitweb.
+  * Use stand-alone license paragraph in copyright file.
 
  -- Christopher Baines <mail at cbaines.net>  Sat, 04 Apr 2015 13:07:57 +0100
diff --git a/debian/copyright b/debian/copyright
index 49f386f..438fabb 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,36 +3,14 @@ Upstream-Name: osrm
 Source: http://project-osrm.org/
 
 Files: *
-Copyright: Project OSRM, Dennis Luxen, others
+Copyright: 2013, Project OSRM, Dennis Luxen, others
 License: BSD-2-clause
- Copyright (c) 2013, Project OSRM, Dennis Luxen, others
- All rights reserved.
- .
- 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.
- .
- 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 HOLDER 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.
 
 Files: debian/*
 Copyright: 2015 Christopher Baines <mail at cbaines.net>
 License: BSD-2-clause
- All rights reserved.
- .
+
+License: BSD-2-clause
  Redistribution and use in source and binary forms, with or without modification,
  are permitted provided that the following conditions are met:
  .
@@ -52,3 +30,4 @@ License: BSD-2-clause
  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/pkg-grass/osrm.git