[saxonhe] 01/01: Add dfsg+1 version mangle and w3c license

Tue Mar 14 13:03:14 UTC 2017

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

eugene pushed a commit to branch master
in repository saxonhe.

commit e9ae45c1a44c3cbe04e60f5c912b7a649e07e518
Author: Eugene Zhukov <eugene at debian.org>
Date:   Tue Mar 14 14:27:08 2017 +0200

    Add dfsg+1 version mangle and w3c license
---
 debian/changelog   |  7 +++++++
 debian/copyright   | 46 +++++++++++++++++++++++++++++++++++++++++++++-
 debian/orig-tar.sh |  2 +-
 debian/watch       |  2 +-
 4 files changed, 54 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7ea7bb8..8405964 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+saxonhe (9.7.0.10+dfsg+1-1) UNRELEASED; urgency=medium
+
+  * Include upstream resources (dfsg+1)
+  * Add w3c license to d/copyright
+
+ -- Eugene Zhukov <eugene at debian.org>  Tue, 14 Mar 2017 14:31:27 +0200
+
 saxonhe (9.7.0.10+dfsg-1) experimental; urgency=medium
 
   * New upstream release.
diff --git a/debian/copyright b/debian/copyright
index 86f50f6..c5d7e7e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,7 +6,7 @@ Files: *
 Copyright: 1999-2014, Saxonica
 License: MPL-2.0
 
-Files: sf/saxon/expr/sort/GenericSorter.java
+Files: net/sf/saxon/expr/sort/GenericSorter.java
 Copyright: 1999 CERN - European Organization for Nuclear Research.
 License: CERN
  Permission to use, copy, moNumbererdify, distribute and sell this software
@@ -20,6 +20,10 @@ Files: debian/*
 Copyright: 2013, Eugene Zhukov <eugene at debian.org>
 License: MPL-2.0
 
+Files: data/analyze-string.xsd data/json.xsd data/xpath-functions.xsd
+Copyright: 1994-2002 World Wide Web Consortium
+License: W3C SOFTWARE NOTICE AND LICENSE
+
 License: MPL-2.0
  The contents of this file are subject to the Mozilla Public License
  Version 2.0 (the "License"); you may not use this file except in
@@ -34,3 +38,43 @@ License: MPL-2.0
  The Original Code is Saxon-HE - The XSLT and XQuery Processor.
  .
  The Initial Developer of the Original Code is Michael H. Kay.
+
+License: W3C SOFTWARE NOTICE AND LICENSE
+ This W3C work (including software, documents, or other related items) is
+ being provided by the copyright holders under the following license. By
+ obtaining, using and/or copying this work, you (the licensee) agree that you
+ have read, understood, and will comply with the following terms and conditions:
+ .
+ Permission to use, copy, modify, and distribute this software and its
+ documentation, with or without modification,  for any purpose and without fee
+ or royalty is hereby granted, provided that you include the following on ALL
+ copies of the software and documentation or portions thereof, including
+ modifications, that you make:
+ .
+   - The full text of this NOTICE in a location viewable to users of the
+     redistributed or derivative work.
+   - Any pre-existing intellectual property disclaimers, notices, or terms
+     and conditions. If none exist, a short notice of the following form
+     (hypertext is preferred, text is permitted) should be used within the
+     body of any redistributed or derivative code:
+     "Copyright © [$date-of-software] World Wide Web Consortium,
+     (Massachusetts Institute of Technology, Institut National de Recherche
+     en Informatique et en Automatique, Keio University). All Rights Reserved.
+     http://www.w3.org/Consortium/Legal/"
+   - Notice of any changes or modifications to the W3C files, including the
+     date changes were made. (We recommend you provide URIs to the location
+     from which the code is derived.)
+ .
+ THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS
+ MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT
+ LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR
+ PURPOSE OR THAT THE USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE
+ ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
+ .
+ COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
+ CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENTATION.
+ .
+ The name and trademarks of copyright holders may NOT be used in advertising
+ or publicity pertaining to the software without specific, written prior
+ permission. Title to copyright in this software and any associated
+ documentation will at all times remain with copyright holders.
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
index b484d50..5482cd3 100755
--- a/debian/orig-tar.sh
+++ b/debian/orig-tar.sh
@@ -1,7 +1,7 @@
 #!/bin/sh -e
 
 VERSION=$2
-TAR=../saxonhe_$VERSION+dfsg.orig.tar.xz
+TAR=../saxonhe_$VERSION+dfsg+1.orig.tar.xz
 DIR=saxonhe-$VERSION
 TAG="$VERSION"
 
diff --git a/debian/watch b/debian/watch
index 733477b..e2daf7d 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,4 @@
 version=3
-opts=dversionmangle=s/\+dfsg// \
+opts=dversionmangle=s/\+dfsg\+1// \
 https://dev.saxonica.com/repos/archive/opensource/tags/ (\d.*)/ \
     debian debian/orig-tar.sh

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/saxonhe.git

