[plexus-i18n] 06/31: New upstream svn snapshot to supply missing license grants

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Wed Aug 30 08:16:49 UTC 2017


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

ebourg-guest pushed a commit to branch master
in repository plexus-i18n.

commit 7dd1aa5d4c1e6ed8fbd1fd1e9222cd1a304e8e7c
Author: Paul Cager <paul-debian at home.paulcager.org>
Date:   Fri Jul 20 23:30:20 2007 +0000

    New upstream svn snapshot to supply missing license grants
---
 debian/changelog |  8 ++++++
 debian/copyright | 81 ++++++++++++++++++++++++++++++++++++++++++--------------
 debian/rules     |  4 ++-
 3 files changed, 72 insertions(+), 21 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b3517d1..9275681 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+plexus-i18n (1.0-beta-7+svn6675-1) unstable; urgency=low
+
+  * New upstream release, to correct license problems (resulting in
+    rejection from ftp-master).
+      (Closes: #428575)
+
+ -- Paul Cager <paul-debian at home.paulcager.org>  Sat, 21 Jul 2007 00:09:27 +0100
+
 plexus-i18n (1.0-beta-6-1) unstable; urgency=low
 
   * Initial release. (Closes: #428575)
diff --git a/debian/copyright b/debian/copyright
index b635b32..5dcb065 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -8,7 +8,7 @@ of the GNU General Public License version 2 can be found in
 
 
 plexus-i18n was downloaded from
-    http://svn.codehaus.org/plexus/tags/plexus-i18n-$(VERSION)
+    http://svn.codehaus.org/plexus/plexus-components/trunk/plexus-i18n
 
 Upstream Authors:  
     The Apache Software Foundation
@@ -17,24 +17,65 @@ Upstream Authors:
     Jason van Zyl <jason at zenplex.com>
 
 Copyright:
-
-    Copyright (c) 2007, Codehaus.org
+    Copyright (c) 2001-2007, Codehaus.org
 
 License:
-    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.
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+Source files DefaultI18NTest.java and I18NTokenizerTest.java are
+licensed under version 1.1 of the license:
+    The Apache Software License, Version 1.1
+
+    Copyright (c) 2001 The Apache Software Foundation.  All rights
+    reserved.
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions
+    are met:
+
+    1. Redistributions of source code must retain the above copyright
+       notice, this list of conditions and the following disclaimer.
+
+    2. 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.
+
+    3. The end-user documentation included with the redistribution,
+       if any, must include the following acknowledgment:
+          "This product includes software developed by the
+           Apache Software Foundation (http://www.codehaus.org/)."
+       Alternately, this acknowledgment may appear in the software itself,
+       if and wherever such third-party acknowledgments normally appear.
+    
+    4. The names "Apache" and "Apache Software Foundation" and
+       "Apache Turbine" must not be used to endorse or promote products
+       derived from this software without prior written permission. For
+       written permission, please contact codehaus at codehaus.org.
+    
+    5. Products derived from this software may not be called "Apache",
+       "Apache Turbine", nor may "Apache" appear in their name, without
+       prior written permission of the Apache Software Foundation.
+    
+    THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 APACHE SOFTWARE FOUNDATION OR
+    ITS 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.
diff --git a/debian/rules b/debian/rules
index 570fee4..1210591 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,7 +17,9 @@ DEB_ANT_BUILD_TARGET := package javadoc
 DEB_ANT_BUILDFILE    := ./debian/build.xml
 DEB_ANT_ARGS         := -DartfiactId=$(PACKAGE) -Dpackage=$(PACKAGE) -Dversion=$(VERSION)
 API_DOCS             := build/api
-SVN                  := http://svn.codehaus.org/plexus/tags/plexus-i18n-$(VERSION)
+#SVN                  := http://svn.codehaus.org/plexus/tags/plexus-i18n-$(VERSION)
+SVN_REV              := $(shell dpkg-parsechangelog | egrep '^Version:' | sed 's/.*+svn//' | sed 's/-.*//')
+SVN                  := http://svn.codehaus.org/plexus/plexus-components/trunk/$(PACKAGE) -r $(SVN_REV)
 
 get-orig-source:
 	echo "Getting version $(VERSION) from $(SVN)"

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



More information about the pkg-java-commits mailing list