[SCM] FreeHEP XML Library branch, master, updated. upstream/2.1.2+dfsg1-26-gfe8f77f
Gabriele Giacone
gg0-guest at alioth.debian.org
Sat Feb 27 11:38:18 UTC 2010
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, master has been updated
via fe8f77f697a62a469e0111bf4842d3f81fc19fe6 (commit)
via 6fad95cece87cdd1eb96b725197e74707e2b0b6f (commit)
via 4fe78c950e7a72a75cbc99647f198bd443dcf51e (commit)
via ca4b1dffac38f22c89c4bb420fb7479efe9ae1c0 (commit)
via 7a92e98d060059ea830c7a867733a3512cc0082b (commit)
via 0985291df440661b4b3def4a1c9cc89a3ebe481a (commit)
via ac182e6ab49af3a91af3306c3a23b12c00c019c5 (commit)
via 3e9787d1c43d6f339ec69466ca6099dbb16f1cdd (commit)
from 5363a35206631c04aad685f01f48065d468d6034 (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 fe8f77f697a62a469e0111bf4842d3f81fc19fe6
Merge: 5363a35206631c04aad685f01f48065d468d6034 6fad95cece87cdd1eb96b725197e74707e2b0b6f
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date: Sat Feb 27 12:36:33 2010 +0100
Merge branch 'build' of git+ssh://git.debian.org/git/pkg-java/freehep/freehep-xml
-----------------------------------------------------------------------
Summary of changes:
.../patches/patch/XMLCharacterProperties.java.diff | 99 ++++++++++++++++++++
debian/patches/patch/pom.xml.diff | 29 ++++++
debian/patches/series | 2 +
3 files changed, 130 insertions(+), 0 deletions(-)
diff --git a/debian/patches/patch/XMLCharacterProperties.java.diff b/debian/patches/patch/XMLCharacterProperties.java.diff
new file mode 100644
index 0000000..9d81d1c
--- /dev/null
+++ b/debian/patches/patch/XMLCharacterProperties.java.diff
@@ -0,0 +1,99 @@
+From: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
+Subject: [PATCH] patch/XMLCharacterProperties.java
+
+Substitute for XMLCharacterProperties.java, which is not compatible with LGPL.
+
+Signed-off-by: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
+
+---
+ .../freehep/xml/util/XMLCharacterProperties.java | 80 ++++++++++++++++++++
+ 1 files changed, 80 insertions(+), 0 deletions(-)
+
+diff --git a/src/main/java/org/freehep/xml/util/XMLCharacterProperties.java b/src/main/java/org/freehep/xml/util/XMLCharacterProperties.java
+new file mode 100644
+index 0000000..25295cd
+--- /dev/null
++++ b/src/main/java/org/freehep/xml/util/XMLCharacterProperties.java
+@@ -0,0 +1,80 @@
++/*
++ * Copyright 2010 by Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
++ *
++ * This class is meant as a substitute for the original XMLCharacterProperties
++ * in FreeHEP-XML, which is picked out from Xerces, but it licensed
++ * under Apache 1.1 license (GPL-incompatible). IT IS NOT A COMPLETE
++ * REPLACEMENT: it just implements the three methods needed by JAS Plotter.
++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License as published by the Free Software Foundation; either
++ * version 2.1 of the License, or (at your option) any later version.
++ *
++ * This library is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public
++ * License along with this library; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
++ *
++ */
++
++package org.freehep.xml.util;
++
++public class XMLCharacterProperties {
++
++ public static boolean isLetter(char c) {
++ return ((c >= 'a') && (c <= 'z')) || ((c >= 'A') && (c <= 'Z'));
++ }
++
++ public static boolean isDigit(char c) {
++ return (c >= '0') && (c <= '9');
++ }
++
++ /*
++ * [26] VersionNum ::= ([a-zA-Z0-9_.:] | '-')+
++ */
++ public static boolean validVersionNum(String name) {
++ int len = name.length();
++ if (len == 0) return false;
++ for (int i = 0; i < len; i++) {
++ char c = name.charAt(i);
++ if (!(isLetter(c) || isDigit(c) || c == '_' || c == '.' || c == ':' || c == '-')) return false;
++ }
++ return true;
++ }
++
++ /*
++ * [81] EncName ::= [A-Za-z] ([A-Za-z0-9._] | '-')*
++ */
++ public static boolean validEncName(String name) {
++ int len = name.length();
++ if (len == 0) return false;
++ if (!isLetter(name.charAt(0))) return false;
++ for (int i = 1; i < len; i++) {
++ char c = name.charAt(i);
++ if (!(isLetter(c) || isDigit(c) || c == '.' || c == '_' || c == '-')) return false;
++ }
++ return true;
++ }
++
++ /*
++ * [5] Name ::= (Letter | '_' | ':') (NameChar)*
++ */
++ public static boolean validName(String name) {
++ int len = name.length();
++ if (len == 0) return false;
++ char c = name.charAt(0);
++ if (!(isLetter(c) || c == '_' || c == ':')) return false;
++ for (int i = 1; i < len; i++) {
++ c = name.charAt(i);
++ if (!(isLetter(c) || isDigit(c) || c == '_' || c == '.' || c == ':' || c == '-')) return false;
++ }
++ return true;
++ }
++
++}
++
+--
+tg: (6d7665d..) patch/XMLCharacterProperties.java (depends on: master)
diff --git a/debian/patches/patch/pom.xml.diff b/debian/patches/patch/pom.xml.diff
new file mode 100644
index 0000000..f62aee9
--- /dev/null
+++ b/debian/patches/patch/pom.xml.diff
@@ -0,0 +1,29 @@
+From: Gabriele Giacone <1o5g4r8o at gmail.com>
+Subject: [PATCH] patch/pom.xml
+
+jdom doesn't support maven. "system" scope needed.
+
+Signed-off-by: Gabriele Giacone <1o5g4r8o at gmail.com>
+
+---
+ pom.xml | 4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
+
+diff --git a/pom.xml b/pom.xml
+index f5427ed..3d4040c 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -70,8 +70,10 @@
+ <version>2.0.3</version>
+ </dependency>
+ <dependency>
+- <groupId>jdom</groupId>
++ <groupId>org</groupId>
+ <artifactId>jdom</artifactId>
++ <scope>system</scope>
++ <systemPath>/usr/share/java/jdom1.jar</systemPath>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+--
+tg: (fff0600..) patch/pom.xml (depends on: master)
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..992ffcc
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+patch/XMLCharacterProperties.java.diff -p1
+patch/pom.xml.diff -p1
hooks/post-receive
--
FreeHEP XML Library
More information about the pkg-java-commits
mailing list