[SCM] FreeHEP XML Library branch, patch/pom.xml, updated. upstream/2.1.2-11-ga464846

[Giovanni Mascellani]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FreeHEP XML Library".

The branch, patch/pom.xml has been updated
       via  a464846046e7fdb21145fba1f803e23a6023c541 (commit)
       via  fff0600d8e52227274ebb4df7973a17ac4386145 (commit)
       via  fcc342378249c2ffe7420d6647010cb5fa8a1330 (commit)
       via  3c03598771e19f4683aedf1521788d128f5199a8 (commit)
      from  07040e525b7600a20c0157ba8e35a78b7bab0955 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit a464846046e7fdb21145fba1f803e23a6023c541
Merge: 07040e525b7600a20c0157ba8e35a78b7bab0955 fff0600d8e52227274ebb4df7973a17ac4386145
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date:   Fri Feb 12 14:52:22 2010 +0100

    Merge commit 'refs/top-bases/patch/pom.xml' into patch/pom.xml

-----------------------------------------------------------------------

Summary of changes:
 debian/control   |    5 ++---
 debian/copyright |   44 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+), 3 deletions(-)

diff --git a/debian/control b/debian/control
index 7dde3b9..a617fd6 100644
--- a/debian/control
+++ b/debian/control
@@ -6,9 +6,8 @@ Uploaders: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>,
  Gabriele Giacone <1o5g4r8o at gmail.com>
 Build-Depends: debhelper (>= 7), cdbs, maven-debian-helper, quilt
 Build-Depends-Indep: default-jdk, libfreehep-io-java, libfreehep-util-java,
- libfreehep-swing-java, libfreehep-graphicsio-java, junit, libjdom1-java,
- libmaven-exec-plugin-java
-Standards-Version: 3.8.3
+ libfreehep-swing-java, junit, libjdom1-java, libmaven-exec-plugin-java
+Standards-Version: 3.8.4
 Vcs-Git: git://git.debian.org/git/pkg-java/freehep/freehep-xml.git
 Vcs-Browser: http://git.debian.org/?p=pkg-java/freehep/freehep-xml.git
 Homepage: http://java.freehep.org/
diff --git a/debian/copyright b/debian/copyright
index 220376b..ccfb068 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -15,6 +15,50 @@ License: LGPL-2.1+
   <http://java.freehep.org/svn/repos/freehep/show/freehep/trunk/vectorgraphics/LICENSE.txt>
   and adopted license at <http://java.freehep.org/license.html>
 
+Files: src/main/java/org/freehep/xml/util/XMLCharacterProperties.java
+Copyright: 1999, The Apache Software Foundation
+License: Apache Software License Version 1.1
+  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.apache.org/)."
+     Alternately, this acknowledgment may appear in the software itself,
+     if and wherever such third-party acknowledgments normally appear.
+  4. The names "Xerces" and "Apache Software Foundation" must
+     not be used to endorse or promote products derived from this
+     software without prior written permission. For written
+     permission, please contact apache at apache.org.
+  5. Products derived from this software may not be called "Apache",
+     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.
+  This software consists of voluntary contributions made by many
+  individuals on behalf of the Apache Software Foundation and was
+  originally based on software copyright (c) 1999, International
+  Business Machines, Inc., http://www.apache.org.  For more
+  information on the Apache Software Foundation, please see
+  <http://www.apache.org/>.
+
 Files: debian/*
 Copyright: 2010, Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
 	   2010, Gabriele Giacone <1o5g4r8o at gmail.com>


hooks/post-receive
-- 
FreeHEP XML Library