[freehep-xml] 02/04: Refresh patches.
Giovanni Mascellani
gio at moszumanska.debian.org
Sat Jun 11 13:14:10 UTC 2016
This is an automated email from the git hooks/post-receive script.
gio pushed a commit to branch master
in repository freehep-xml.
commit a99ff814e37ebbfc34ed5ae4ac572591a14c5ef2
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date: Sat Jun 11 15:00:57 2016 +0200
Refresh patches.
---
.../{patch => }/XMLCharacterProperties.java.diff | 27 ++++++++--------------
debian/patches/series | 2 +-
2 files changed, 10 insertions(+), 19 deletions(-)
diff --git a/debian/patches/patch/XMLCharacterProperties.java.diff b/debian/patches/XMLCharacterProperties.java.diff
similarity index 74%
rename from debian/patches/patch/XMLCharacterProperties.java.diff
rename to debian/patches/XMLCharacterProperties.java.diff
index 9d81d1c..7c2690c 100644
--- a/debian/patches/patch/XMLCharacterProperties.java.diff
+++ b/debian/patches/XMLCharacterProperties.java.diff
@@ -1,24 +1,17 @@
-From: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
-Subject: [PATCH] patch/XMLCharacterProperties.java
+From: Giovanni Mascellani <gio at debian.org>
+Subject: Substitute for 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
+The original file is not compatible with LGPL. This file was rewritten
+from scratch looking just the docstrings of the original file.
+Index: freehep-xml/src/main/java/org/freehep/xml/util/XMLCharacterProperties.java
+===================================================================
--- /dev/null
-+++ b/src/main/java/org/freehep/xml/util/XMLCharacterProperties.java
++++ freehep-xml/src/main/java/org/freehep/xml/util/XMLCharacterProperties.java
@@ -0,0 +1,80 @@
+/*
-+ * Copyright 2010 by Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
++ * Copyright 2010 by Giovanni Mascellani <gio at debian.org>
+ *
-+ * This class is meant as a substitute for the original XMLCharacterProperties
++ * This class is 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.
@@ -95,5 +88,3 @@ index 0000000..25295cd
+
+}
+
---
-tg: (6d7665d..) patch/XMLCharacterProperties.java (depends on: master)
diff --git a/debian/patches/series b/debian/patches/series
index 4792648..3a315d4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-patch/XMLCharacterProperties.java.diff -p1
+XMLCharacterProperties.java.diff
--
Alioth's hooks/post-receive on /srv/git.debian.org/git/pkg-java/freehep/freehep-xml.git
More information about the pkg-java-commits
mailing list