[SCM] Debian packaging for uimaj branch, master, updated. debian/2.4.0-1-1-g3b8e269
Damien Raude-Morvan
drazzib at debian.org
Thu Jun 28 00:25:28 UTC 2012
The following commit has been merged in the master branch:
commit 3b8e26934d8973ee19634ef2b8f07ae9f76bf814
Author: Damien Raude-Morvan <drazzib at debian.org>
Date: Wed Jun 27 00:37:28 2012 +0200
Fix FTBFS with Java7.
diff --git a/.gitignore b/.gitignore
index 845ca06..993ba30 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,5 @@
.pc
+.project
+.classpath
+.settings
+target
diff --git a/debian/changelog b/debian/changelog
index 4c0c240..6e34b09 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+uimaj (2.4.0-2) unstable; urgency=low
+
+ * d/patches/java7-compat.diff: Fix FTBFS with Java7.
+ * d/control: Bump Standards-Version to 3.9.3: no changes needed.
+ * d/copyright: Update to copyright format 1.0.
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Wed, 27 Jun 2012 00:26:11 +0200
+
uimaj (2.4.0-1) unstable; urgency=low
* New upstream release.
diff --git a/debian/control b/debian/control
index c578a85..b7c7b84 100644
--- a/debian/control
+++ b/debian/control
@@ -32,7 +32,7 @@ Build-Depends-Indep: ant,
libxerces2-java,
libxml-commons-resolver1.1-java,
xsltproc
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
Vcs-Git: git://git.debian.org/pkg-java/uimaj.git
Vcs-Browser: http://git.debian.org/?p=pkg-java/uimaj.git
Homepage: http://uima.apache.org/
diff --git a/debian/copyright b/debian/copyright
index 19ce1c3..5339e8a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format: http://dep.debian.net/deps/dep5/
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: Apache UIMA Java SDK
Upstream-Contact: The Apache Software Foundation <http://incubator.apache.org/uima/>
Source: http://www.apache.org/dist/incubator/uima/source/
@@ -8,8 +8,9 @@ Copyright: Copyright 2006, 2010 The Apache Software Foundation
License: Apache-2.0
Files: debian/*
-Copyright: 2008, Fabien Poulard <fabien.poulard at univ-nantes.fr>
-Copyright: 2010, Damien Raude-Morvan <drazzib at debian.org>
+Copyright:
+ Copyright 2008, Fabien Poulard <fabien.poulard at univ-nantes.fr>
+ Copyright 2010, Damien Raude-Morvan <drazzib at debian.org>
License: Apache-2.0
License: Apache-2.0
diff --git a/debian/patches/java7-compat.diff b/debian/patches/java7-compat.diff
new file mode 100644
index 0000000..534acd1
--- /dev/null
+++ b/debian/patches/java7-compat.diff
@@ -0,0 +1,111 @@
+Description: Fix compat with Java 7:
+ Force usage of org.apache.uima.cas.Type instead of new
+ Type inner class in java.awt.Window.
+Author: Damien Raude-Morvan <drazzib at debian.org>
+--- a/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/AnnotationDisplayCustomizationFrame.java
++++ b/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/AnnotationDisplayCustomizationFrame.java
+@@ -336,17 +336,17 @@
+ private TreeModel createTreeModel(TypeSystem ts) {
+ String typeName = CAS.TYPE_NAME_ANNOTATION;
+ DefaultMutableTreeNode node = new DefaultMutableTreeNode(typeName);
+- Type type = ts.getType(typeName);
++ org.apache.uima.cas.Type type = ts.getType(typeName);
+ addChildren(node, type, ts);
+ DefaultTreeModel treeModel = new DefaultTreeModel(node);
+ return treeModel;
+ }
+
+ @SuppressWarnings("unchecked")
+- private static void addChildren(DefaultMutableTreeNode node, Type type, TypeSystem ts) {
+- List<Type> dtrs = ts.getDirectSubtypes(type);
++ private static void addChildren(DefaultMutableTreeNode node, org.apache.uima.cas.Type type, TypeSystem ts) {
++ List<org.apache.uima.cas.Type> dtrs = ts.getDirectSubtypes(type);
+ DefaultMutableTreeNode dtrNode;
+- Type dtrType;
++ org.apache.uima.cas.Type dtrType;
+ for (int i = 0; i < dtrs.size(); i++) {
+ dtrType = dtrs.get(i);
+ dtrNode = new DefaultMutableTreeNode(dtrType.getName());
+--- a/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/MainFrame.java
++++ b/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/MainFrame.java
+@@ -1654,12 +1654,12 @@
+ }
+
+ @SuppressWarnings("unchecked")
+- private DefaultMutableTreeNode createTypeTree(Type type, TypeSystem ts, String label,
++ private DefaultMutableTreeNode createTypeTree(org.apache.uima.cas.Type type, TypeSystem ts, String label,
+ FSIndexRepository ir) {
+ int size = ir.getIndex(label, type).size();
+ TypeTreeNode typeNode = new TypeTreeNode(type, label, size);
+ DefaultMutableTreeNode node = new DefaultMutableTreeNode(typeNode);
+- List<Type> types = ts.getDirectSubtypes(type);
++ List<org.apache.uima.cas.Type> types = ts.getDirectSubtypes(type);
+ final int max = types.size();
+ for (int i = 0; i < max; i++) {
+ if (ir.getIndex(label, types.get(i)) == null) {
+--- a/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/tsview/MainFrame.java
++++ b/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/tsview/MainFrame.java
+@@ -69,7 +69,7 @@
+ if (node == null) {
+ return;
+ }
+- Type t = (Type) node.getUserObject();
++ org.apache.uima.cas.Type t = (org.apache.uima.cas.Type) node.getUserObject();
+ if (t != null) {
+ MainFrame.this.selectedType = t;
+ updateFeatureTable();
+@@ -79,7 +79,7 @@
+
+ TypeSystem ts = null;
+
+- private Type selectedType;
++ private org.apache.uima.cas.Type selectedType;
+
+ private JTable featureTable = null;
+
+@@ -181,12 +181,12 @@
+ ((FeatureTableModel) this.featureTable.getModel()).setType(this.selectedType);
+ }
+
+- private DefaultMutableTreeNode createTypeTree(Type type) {
++ private DefaultMutableTreeNode createTypeTree(org.apache.uima.cas.Type type) {
+ DefaultMutableTreeNode node = new DefaultMutableTreeNode(type);
+ List<?> types = this.ts.getDirectSubtypes(type);
+ final int max = types.size();
+ for (int i = 0; i < max; i++) {
+- DefaultMutableTreeNode child = createTypeTree((Type) types.get(i));
++ DefaultMutableTreeNode child = createTypeTree((org.apache.uima.cas.Type) types.get(i));
+ node.add(child);
+ }
+ return node;
+@@ -198,11 +198,11 @@
+ }
+ DefaultMutableTreeNode rootNode = (DefaultMutableTreeNode) this.typeTree.getModel().getRoot();
+ rootNode.removeAllChildren();
+- Type top = this.ts.getTopType();
++ org.apache.uima.cas.Type top = this.ts.getTopType();
+ rootNode.setUserObject(top);
+ List<?> types = this.ts.getDirectSubtypes(top);
+ for (int i = 0; i < types.size(); i++) {
+- rootNode.add(createTypeTree((Type) types.get(i)));
++ rootNode.add(createTypeTree((org.apache.uima.cas.Type) types.get(i)));
+ }
+ DefaultTreeModel model = (DefaultTreeModel) this.typeTree.getModel();
+ // 1.3 compatability hack.
+--- a/uimaj-tools/src/main/java/org/apache/uima/tools/docanalyzer/DocumentAnalyzer.java
++++ b/uimaj-tools/src/main/java/org/apache/uima/tools/docanalyzer/DocumentAnalyzer.java
+@@ -1192,12 +1192,12 @@
+ if (outputs[j].isType()) {
+ outputTypeList.add(outputs[j].getName());
+ // also add subsumed types
+- Type t = currentTypeSystem.getType(outputs[j].getName());
++ org.apache.uima.cas.Type t = currentTypeSystem.getType(outputs[j].getName());
+ if (t != null) {
+ List subsumedTypes = currentTypeSystem.getProperlySubsumedTypes(t);
+ Iterator it = subsumedTypes.iterator();
+ while (it.hasNext()) {
+- outputTypeList.add(((Type) it.next()).getName());
++ outputTypeList.add(((org.apache.uima.cas.Type) it.next()).getName());
+ }
+ }
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 80119be..3dfbf03 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ disable_ecore.diff
#docbook_tool.diff
build-helper-version.diff
disable_internal_javadoc.diff
+java7-compat.diff
--
Debian packaging for uimaj
More information about the pkg-java-commits
mailing list