[Debian-ha-commits] [pcs] 02/03: Add more details to debian/copyright

Christoph Berg myon at debian.org
Thu Jan 28 10:43:37 UTC 2016


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

myon pushed a commit to branch master
in repository pcs.

commit 288d8183cb8139e142c742fef496363dea9cf9ec
Author: Christoph Berg <christoph.berg at credativ.de>
Date:   Thu Jan 28 11:07:21 2016 +0100

    Add more details to debian/copyright
---
 debian/changelog |  2 +-
 debian/copyright | 66 ++++++++++++++++++++++++++++++--------------------------
 2 files changed, 37 insertions(+), 31 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 45fe258..1e1d589 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,4 +2,4 @@ pcs (0.9.148-1) unstable; urgency=medium
 
   * Initial release.
 
- -- Richard B Winters <rik at mmogp.com>  Fri, 01 May 2015 08:29:07 -0400
+ -- Richard B Winters <rik at mmogp.com>  Thu, 28 Jan 2016 10:12:39 +0100
diff --git a/debian/copyright b/debian/copyright
index c35985c..1a51beb 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,14 +6,43 @@ Files: *
 Copyright: (c) 2012-2015 Chris Feist
 License: GPL-2+
 
-Files: debian/missing-sources/handlebars-v1.2.1.js
+Files: pcsd/public/js/ember-1.4.0.js
+Copyright: 2011-2014 Tilde Inc. and contributors
+           Portions Copyright 2006-2011 Strobe Inc.
+           Portions Copyright 2008-2011 Apple Inc. All rights reserved.
+           (c) 2016 Yehuda Katz, Tom Dale and Ember.js contributors
+License: MIT
+
+Files: pcsd/public/js/handlebars-v1.2.1.js
 Copyright: 2011-2016 Yehuda Katz
-License: Expat
+License: MIT
 
-Files: debian/missing-sources/jquery-1.91.js
+Files: pcsd/public/js/jquery-1.9.1.min.js
+       pcsd/public/js/jquery-ui-1.10.1.custom.min.js
+       pcsd/public/css/jquery-ui-1.10.1.custom.css
+       debian/missing-sources/jquery-1.91.js
        debian/missing-sources/jquery-ui-1.10.1.custom.js
-Copyright: jQuery Foundation and other contributors
-License: Expat
+Copyright: 2005, 2012, 2013 jQuery Foundation, Inc. and other contributors
+License: MIT
+
+License: MIT
+ 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.
 
 Files: debian/*
 Copyright: 2015-2016 Debian-HA Maintainers
@@ -32,28 +61,5 @@ License: GPL-2+
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  GNU General Public License for more details.
  .
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>
- .
- On Debian systems, the complete text of the GNU General
- Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
- 
-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.
\ No newline at end of file
+ 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/debian-ha/pcs.git



More information about the Debian-HA-Commits mailing list