[DRE-commits] [ruby-rails-admin] 04/05: fix copyright

[Praveen Arimbrathodiyil]

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

praveen pushed a commit to branch master
in repository ruby-rails-admin.

commit c0f66810b417b3b289fd73fce188afba899b9f2b
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Sat Aug 29 09:22:18 2015 +0530

    fix copyright
---
 debian/changelog |  1 +
 debian/copyright | 20 --------------------
 2 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 42e90bc..d53802a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 ruby-rails-admin (0.6.8~dfsg-1) UNRELEASED; urgency=medium
 
   * New upstream release
+  * Remove extra license in copyright file
 
  -- Pirate Praveen <praveen at debian.org>  Sat, 29 Aug 2015 09:19:44 +0530
 
diff --git a/debian/copyright b/debian/copyright
index 475fc34..e9b277a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -62,26 +62,6 @@ License: Apache-2.0
  On Debian systems, the full text of the Apache License version 2.0 can be
  found in the file `/usr/share/common-licenses/Apache-2.0'.
 
-License: Expat
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files (the
- "Software"), to deal in the Software without restriction, including
- without limitation the rights to use, copy, modify, merge, publish,
- distribute, sublicense, and/or sell copies of the Software, and to
- permit persons to whom the Software is furnished to do so, subject to
- the following conditions:
- .
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
- .
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
 License: GPL-2
  This program is free software; you can redistribute it
  and/or modify it under the terms of the GNU General Public

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-rails-admin.git