[SCM] JAS(2) Plotter branch, master, updated. debian/2.2.6+dfsg1-1-8-gc7a3d50
Torsten Werner
twerner at alioth.debian.org
Tue Aug 30 22:34:38 UTC 2011
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 "JAS(2) Plotter".
The branch, master has been updated
via c7a3d507a3927a3071b4e766137ac450df8a4b6b (commit)
via 294b4f5f3b6c63562eb55c2bd97e805b5790267a (commit)
via 46dc4b7c542ea01c4d97d9587ff82071ecad9626 (commit)
via 619abe03273ff092f5bb81b2b9ee450970cec450 (commit)
via d7db3fb3cfe70d817079bbc8049930d82922d71f (commit)
via e706d1a72b077cfb3a30c0ff5d2c1c78cf5d97b8 (commit)
via 67d2137835fe96b12ef28bf3825d410b6023fe33 (commit)
via dad9cfaf7b2d002d4723c6238b2aaf64adebc737 (commit)
via a5d1f18fbffbea70c79bf31aaa4425763460e940 (commit)
via cf73d733564650fc83ae0bfb725b3d95b4203d29 (commit)
via bb1499d28e725b188dbdcafe49b969049b15794c (commit)
via bec0afc49981ac39644c3f8992aef08a12dcb7b3 (commit)
via decc5daf7e3ed7db54ba47cb228b7ba2bdf1a181 (commit)
via 97dd17ec133edabf1cf61a852f1551e43fa72d35 (commit)
via 059eb9eaf42dcaf19bc28b25b552c5522416a206 (commit)
via fc94ae9c225ef1749acf7a2660082e3fd103ba98 (commit)
via 4e9a85b8c07b42deceae3278599e93b8f3d79d3c (commit)
via 3e8149db8b33e85a4338690a63c7ce0ebe043209 (commit)
via 3512edb07d2fd92dbc6a4f5242214170754cc0e3 (commit)
via 97962b9ac6e023c7fe7e84362d5fa004a86a3a38 (commit)
via dcc4380b2afd60264ed5020b79508e3a85739fa2 (commit)
via d20f8cf81e7e0dc9c40ce986a3f54dd449f4d8ad (commit)
via e1af1f14ea69ffdf903e01be94ebfd95e90053d0 (commit)
via ebff4fd014c323edcca9a450c60349e13b33d295 (commit)
via 1426e4155e1bb5befcd584a0b47d43031765c80d (commit)
via 29687b9b4084fc9a66909f95d844f02632fae19d (commit)
via 8f7fa3d9bc042301e9205ec9c00df6af08801bb5 (commit)
via 40988afe076809739048c461a6f87b966486b1ed (commit)
from 2494ea937450b1a732887ece2d5ef64ba82e6125 (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 c7a3d507a3927a3071b4e766137ac450df8a4b6b
Author: Torsten Werner <twerner at debian.org>
Date: Wed Aug 31 00:31:58 2011 +0200
Update Standards-Version: 3.9.1.
commit 294b4f5f3b6c63562eb55c2bd97e805b5790267a
Author: Torsten Werner <twerner at debian.org>
Date: Wed Aug 31 00:31:27 2011 +0200
Remove Java runtime from Depends.
commit 46dc4b7c542ea01c4d97d9587ff82071ecad9626
Author: Torsten Werner <twerner at debian.org>
Date: Wed Aug 31 00:30:03 2011 +0200
Switch to source format 3.0.
commit 619abe03273ff092f5bb81b2b9ee450970cec450
Merge: 2494ea9 d7db3fb
Author: Torsten Werner <twerner at debian.org>
Date: Wed Aug 31 00:26:01 2011 +0200
Merge branch 'build'
commit d7db3fb3cfe70d817079bbc8049930d82922d71f
Merge: e706d1a 4612261
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date: Mon Jan 25 10:11:46 2010 +0100
Merge branch 'master' into build
commit e706d1a72b077cfb3a30c0ff5d2c1c78cf5d97b8
Merge: 67d2137 f7c88b4
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date: Sun Jan 24 23:54:16 2010 +0100
Merge branch 'master' into build
commit 67d2137835fe96b12ef28bf3825d410b6023fe33
Merge: dad9cfa c9d4656
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date: Sun Jan 24 17:53:43 2010 +0100
Merge branch 'master' into build
commit dad9cfaf7b2d002d4723c6238b2aaf64adebc737
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date: Sun Jan 24 17:47:04 2010 +0100
Patches updated
commit a5d1f18fbffbea70c79bf31aaa4425763460e940
Merge: cf73d73 2e38280
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date: Sun Jan 24 17:46:15 2010 +0100
Merge branch 'master' into build
commit cf73d733564650fc83ae0bfb725b3d95b4203d29
Merge: bb1499d 28b140e
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date: Sat Jan 23 20:40:26 2010 +0100
Merge branch 'master' into build
commit bb1499d28e725b188dbdcafe49b969049b15794c
Merge: bec0afc 5bd5bdb
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date: Sat Jan 23 20:36:30 2010 +0100
Merge branch 'master' into build
commit bec0afc49981ac39644c3f8992aef08a12dcb7b3
Merge: decc5da 902864b
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date: Thu Jan 21 14:57:24 2010 +0100
Merge branch 'master' into build
commit decc5daf7e3ed7db54ba47cb228b7ba2bdf1a181
Merge: 97dd17e 147db8a
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date: Wed Jan 20 10:52:01 2010 +0100
Merge branch 'master' into build
commit 97dd17ec133edabf1cf61a852f1551e43fa72d35
Merge: 059eb9e 1206850
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date: Tue Jan 19 16:44:31 2010 +0100
Merge branch 'master' into build
commit 059eb9eaf42dcaf19bc28b25b552c5522416a206
Merge: fc94ae9 d875caf
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date: Tue Jan 19 16:18:09 2010 +0100
Merge branch 'master' into build
commit fc94ae9c225ef1749acf7a2660082e3fd103ba98
Merge: 4e9a85b d48fe0b
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date: Tue Jan 19 16:07:59 2010 +0100
Merge branch 'master' into build
commit 4e9a85b8c07b42deceae3278599e93b8f3d79d3c
Merge: 3e8149d 220529a
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date: Tue Jan 19 15:51:16 2010 +0100
Merge branch 'master' into build
commit 3e8149db8b33e85a4338690a63c7ce0ebe043209
Merge: 3512edb 7a2d06d
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date: Tue Jan 19 15:40:38 2010 +0100
Merge branch 'master' into build
commit 3512edb07d2fd92dbc6a4f5242214170754cc0e3
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date: Tue Jan 19 15:34:48 2010 +0100
Patches updated
commit 97962b9ac6e023c7fe7e84362d5fa004a86a3a38
Merge: dcc4380 13f164d
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date: Sun Jan 17 17:48:55 2010 +0100
Merge branch 'master' into build
commit dcc4380b2afd60264ed5020b79508e3a85739fa2
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date: Sun Jan 17 17:45:39 2010 +0100
Updated patches
commit d20f8cf81e7e0dc9c40ce986a3f54dd449f4d8ad
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date: Sun Jan 17 14:54:47 2010 +0100
Updated patches
commit e1af1f14ea69ffdf903e01be94ebfd95e90053d0
Merge: ebff4fd e0fee32
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date: Tue Jan 12 01:35:13 2010 +0100
Merge branch 'master' into build
commit ebff4fd014c323edcca9a450c60349e13b33d295
Merge: 1426e41 4cf4a7d
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date: Fri Jan 8 12:03:56 2010 +0100
Merge branch 'master' into build
commit 1426e4155e1bb5befcd584a0b47d43031765c80d
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date: Fri Jan 8 12:03:37 2010 +0100
Quilt patches regenerated
commit 29687b9b4084fc9a66909f95d844f02632fae19d
Merge: 8f7fa3d 5ce374a
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date: Sat Dec 12 18:09:22 2009 +0100
Merge branch 'master' into build
commit 8f7fa3d9bc042301e9205ec9c00df6af08801bb5
Merge: 40988af 5595965
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date: Sat Dec 12 18:02:47 2009 +0100
Merge branch 'master' into build
commit 40988afe076809739048c461a6f87b966486b1ed
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date: Sat Dec 12 13:49:14 2009 +0100
Patches generated by topgit
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 13 ++-
debian/control | 7 +-
.../patches/patch/XMLCharacterProperties.java.diff | 99 ++++++++++++++++++++
debian/patches/patch/pom.xml.diff | 46 +++++++++
debian/patches/patch/tablelayout.diff | 27 ++++++
debian/patches/series | 3 +
debian/rules | 1 -
debian/source/format | 1 +
8 files changed, 189 insertions(+), 8 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 8c1dd85..377e71b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,17 @@
-jas-plotter (2.2.6+dfsg1-2) UNRELEASED; urgency=low
+jas-plotter (2.2.6+dfsg1-2) unstable; urgency=low
- * Standards version bumped to 3.8.4.
+ * Team upload
+
+ [ Giovanni Mascellani ]
* Added real watch file
* Fixed my email address.
- -- Giovanni Mascellani <gio at debian.org> Sat, 29 Jan 2011 16:16:51 +0100
+ [ Torsten Werner ]
+ * Switch to source format 3.0.
+ * Remove Java runtime from Depends.
+ * Update Standards-Version: 3.9.1.
+
+ -- Torsten Werner <twerner at debian.org> Wed, 31 Aug 2011 00:31:39 +0200
jas-plotter (2.2.6+dfsg1-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 5dfeeef..870966f 100644
--- a/debian/control
+++ b/debian/control
@@ -4,18 +4,17 @@ Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Giovanni Mascellani <gio at debian.org>,
Gabriele Giacone <1o5g4r8o at gmail.com>
-Build-Depends: debhelper (>= 7), cdbs, default-jdk, maven-debian-helper, quilt
+Build-Depends: debhelper (>= 7), cdbs, default-jdk, maven-debian-helper
Build-Depends-Indep: libsurefire-java (>= 2.4.3), javahelp2 (>= 2.0.05.ds1-3), junit,
libxerces2-java, libtablelayout-java (>= 20090826)
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
Vcs-Git: git://git.debian.org/git/pkg-java/freehep/jas-plotter.git
Vcs-Browser: http://git.debian.org/?p=pkg-java/freehep/jas-plotter.git;a=summary
Homepage: http://java.freehep.org/jas-plotter/
Package: libjas-plotter-java
Architecture: all
-Depends: ${misc:Depends}, ${maven:Depends}, libtablelayout-java,
- openjdk-6-jre | java2-runtime
+Depends: ${misc:Depends}, ${maven:Depends}, libtablelayout-java
Recommends: ${maven:OptionalDepends}
Description: JAS(2) Plotter graphic library
This library, part of the Java Analysis Studio distribution, is able to
diff --git a/debian/patches/patch/XMLCharacterProperties.java.diff b/debian/patches/patch/XMLCharacterProperties.java.diff
new file mode 100644
index 0000000..180c4ce
--- /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>
+
+---
+ .../java/jas/util/xml/XMLCharacterProperties.java | 80 ++++++++++++++++++++
+ 1 files changed, 80 insertions(+), 0 deletions(-)
+
+diff --git a/src/main/java/jas/util/xml/XMLCharacterProperties.java b/src/main/java/jas/util/xml/XMLCharacterProperties.java
+new file mode 100644
+index 0000000..394acd7
+--- /dev/null
++++ b/src/main/java/jas/util/xml/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 JAS Plotter, 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 jas.util.xml;
++
++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: (2e38280..) 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..55c6cd7
--- /dev/null
+++ b/debian/patches/patch/pom.xml.diff
@@ -0,0 +1,46 @@
+From: Gabriele Giacone <1o5g4r8o at gmail.com>
+Subject: [PATCH] patch/pom.xml
+
+ - Removed dependence on freehep-export (cyclic dependency)
+ - Added dependence on Debian libtablelayout
+
+Signed-off-by: Gabriele Giacone <1o5g4r8o at gmail.com>
+
+---
+ pom.xml | 14 +++++++-------
+ 1 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/pom.xml b/pom.xml
+index ed34af3..ade5308 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -29,12 +29,6 @@
+ </build>
+ <dependencies>
+ <dependency>
+- <groupId>org.freehep</groupId>
+- <artifactId>freehep-export</artifactId>
+- <version>2.1.1</version>
+- <scope>test</scope>
+- </dependency>
+- <dependency>
+ <groupId>javax.help</groupId>
+ <artifactId>javahelp</artifactId>
+ <version>2.0.02</version>
+@@ -48,7 +42,13 @@
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+- </dependency>
++ </dependency>
++ <dependency>
++ <groupId>org.debian</groupId>
++ <artifactId>tablelayout</artifactId>
++ <scope>system</scope>
++ <systemPath>/usr/share/java/tablelayout.jar</systemPath>
++ </dependency>
+ </dependencies>
+
+ <scm>
+--
+tg: (220529a..) patch/pom.xml (depends on: master)
diff --git a/debian/patches/patch/tablelayout.diff b/debian/patches/patch/tablelayout.diff
new file mode 100644
index 0000000..52ec53d
--- /dev/null
+++ b/debian/patches/patch/tablelayout.diff
@@ -0,0 +1,27 @@
+From: Gabriele Giacone <1o5g4r8o at gmail.com>
+Subject: [PATCH] patch/tablelayout
+
+To compile against Debian libtablelayout-java under
+/usr/share/java/tablelayout.jar
+
+Signed-off-by: Gabriele Giacone <1o5g4r8o at gmail.com>
+
+---
+ src/main/java/jas/hist/JASHistPropertyDialog.java | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/main/java/jas/hist/JASHistPropertyDialog.java b/src/main/java/jas/hist/JASHistPropertyDialog.java
+index 2d05d8a..9a9f250 100644
+--- a/src/main/java/jas/hist/JASHistPropertyDialog.java
++++ b/src/main/java/jas/hist/JASHistPropertyDialog.java
+@@ -46,7 +46,7 @@ import javax.swing.event.ChangeEvent;
+ import javax.swing.event.ChangeListener;
+ import javax.swing.event.ListSelectionEvent;
+ import javax.swing.event.ListSelectionListener;
+-import tablelayout.TableLayout;
++import org.debian.tablelayout.TableLayout;
+
+
+ public final class JASHistPropertyDialog extends PropertyDialog
+--
+tg: (220529a..) patch/tablelayout (depends on: master)
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..5051613
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+patch/XMLCharacterProperties.java.diff -p1
+patch/pom.xml.diff -p1
+patch/tablelayout.diff -p1
diff --git a/debian/rules b/debian/rules
index 90ab7ed..9873a98 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,6 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/maven.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-include /usr/share/topgit/tg2quilt.mk
JAVA_HOME := /usr/lib/jvm/default-java
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
hooks/post-receive
--
JAS(2) Plotter
More information about the pkg-java-commits
mailing list