[DRE-commits] [redmine] 05/39: debian/copyright: updated wrt recent changes in the upstream tree

[Antonio Terceiro]

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

terceiro pushed a commit to branch master
in repository redmine.

commit ebd51f22478025aa8f47c55185eebc01ae4119cf
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Mon Sep 21 19:09:10 2015 -0300

    debian/copyright: updated wrt recent changes in the upstream tree
---
 debian/changelog |  1 +
 debian/copyright | 61 ++++----------------------------------------------------
 2 files changed, 5 insertions(+), 57 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 791f460..9d6eadb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ redmine (3.1.0-1) UNRELEASED; urgency=medium
     - 0002-Force-table-encoding-in-mysql.patch
     - 0003-Use-production-environment-by-default.patch
     - 0004-Add-multi-tenancy-support.patch
+  * debian/copyright: updated wrt recent changes in the upstream tree
 
  -- Antonio Terceiro <terceiro at debian.org>  Tue, 25 Aug 2015 17:33:17 -0300
 
diff --git a/debian/copyright b/debian/copyright
index c5b1350..9e6b41a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -88,75 +88,22 @@ Files:
 Copyright: 2012 Kaitseministeerium
 License: GPL-2+
 
-Files: vendor/plugins/acts_as_versioned/*
+Files: lib/plugins/acts_as_versioned/*
 Copyright: 2005 Rick Olson 
 License: Expat
 
-Files: vendor/plugins/acts_as_list/*
+Files: lib/plugins/acts_as_tree/*
 Copyright: 2007 David Heinemeier Hansson
 License: Expat
 
-Files: vendor/plugins/acts_as_tree/*
-Copyright: 2007 David Heinemeier Hansson
-License: Expat
-
-Files: vendor/plugins/awesome_nested_set/*
-Copyright: 2008 Collective Idea <info at collectiveidea.com>
-License: Expat
-
-Files: vendor/plugins/classic_pagination/*
-Copyright: 2004-2006 David Heinemeier Hansson
-License: Expat
-
-Files: vendor/plugins/engines/*
-Copyright: 2008 James Adam
-License: Expat
-
-Files: vendor/plugins/gravatar/*
+Files: lib/plugins/gravatar/*
 Copyright: 2007 West Arete Computing, Inc.
 License: Expat
 
-Files: vendor/plugins/open_id_authentication/*
+Files: lib/plugins/open_id_authentication/*
 Copyright: 2007 David Heinemeier Hansson
 License: Expat
 
-Files:
- vendor/plugins/rfpdf/lib/rfpdf.rb
- vendor/plugins/rfpdf/lib/rfpdf/*
- vendor/plugins/rfpdf/lib/fonts/ttf2ufm/makefontuni_ruby.php
-Copyright: 2006 4ssoM LLC <www.4ssoM.com>
-License: Expat
-
-Files:
- vendor/plugins/rfpdf/lib/tcpdf.rb
- vendor/plugins/rfpdf/lib/core/*
- vendor/plugins/rfpdf/lib/config/lang/eng.rb
-Copyright: 2002-2007 Nicola Asuni
-License: LGPL
-
-Files: vendor/plugins/rfpdf/lib/rfpdf/math.rb
-Copyright: 2003-2005 Austin Ziegler
-License: Expat
-
-Files:
- vendor/plugins/rfpdf/lib/rfpdf/fpdf.rb
- vendor/plugins/rfpdf/lib/fpdf/*
-Copyright: 2005 Brian Ollenberger <ollenberger at gmail.com>
-License:
- Permission is hereby granted, free of charge, to any person obtaining a copy
- of this software to use, copy, modify, distribute, sublicense, and/or sell
- copies of the software, and to permit persons to whom the software is furnished
- to do so.
- .
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED.
-Comment:
- Ruby FPDF is released under a permissive license,
- similar to that of FPDF. I only ask that you retain the copyright notice at the top
- of the source file. You may make modifications to FPDF, but if you redistribute
- those modifications, make it clear in a comment immediately before or after the
- copyright notice that you have modified it. I also wouldn't mind if you sent patches
- back to me, but you are not strictly required to do so.
-
 License: GPL-2
  On Debian systems, the complete text of the GNU General
  Public License version 2 can be found in '/usr/share/common-licenses/GPL-2'.

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