[SCM] FreeHEP XML Library branch, build, updated. upstream/2.1.2+dfsg1-24-g6fad95c

[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, build has been updated
       via  6fad95cece87cdd1eb96b725197e74707e2b0b6f (commit)
       via  c52046432cff56246186124dac1f64da838571dc (commit)
       via  35430be0fada4d36c2f949251af49e0c6279cc5d (commit)
      from  4fe78c950e7a72a75cbc99647f198bd443dcf51e (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 6fad95cece87cdd1eb96b725197e74707e2b0b6f
Merge: 4fe78c950e7a72a75cbc99647f198bd443dcf51e c52046432cff56246186124dac1f64da838571dc
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date:   Fri Feb 26 17:35:26 2010 +0100

    Merge branch 'master' into build

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

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

diff --git a/debian/control b/debian/control
index a617fd6..a985341 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,9 @@ Architecture: all
 Depends: ${misc:Depends}, ${maven:Depends}, openjdk-6-jre | java2-runtime
 Recommends: ${maven:OptionalDepends}
 Description: FreeHEP XML Library
- This library provides readers and writers for the XML format as well as
- a Menu System for building GUI menus from XML.
+ This library provides tools to read and write XML and XHTML files. You can
+ write XML and XHTML files using a Writer-like interface, with additional
+ methods to add tags and attributes, or save and restore on object
+ configuration with XML.
  .
  FreeHEP is a collection of Java libraries used in High Energy Physics.
diff --git a/debian/copyright b/debian/copyright
index ccfb068..220376b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -15,50 +15,6 @@ 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