Skip to content
Commits on Source (7)
Show whitespace changes
Inline Side-by-side
debian/changelog
View file @ 4edc0bf9
jabref (3.8.2+ds-4) UNRELEASED; urgency=medium
jabref (3.8.2+ds-4) unstable; urgency=medium
* Apply upstream patch for file perms (Closes: #857351)
-- tony mancill <tmancill@debian.org> Sun, 08 Apr 2018 16:26:39 -0700
* Build with default-jdk
- This resolves the build-time part of #893138
- openjdk-8 is still required at runtime
* Convert TR9401 catalog file to XML format for xjc/saxb 2.3
* Add build-dep on libscram-java (needed by postgresql)
* Add JDK9 swing patch
* Update Vcs fields for migration from Alioth -> Salsa
-- tony mancill <tmancill@debian.org> Sun, 20 May 2018 10:59:57 -0700
jabref (3.8.2+ds-3) unstable; urgency=medium
......
debian/control
View file @ 4edc0bf9
......@@ -32,14 +32,15 @@ Build-Depends-Indep: ant,
libpdfbox-java (<< 1:2),
libpostgresql-jdbc-java (>= 9.4.1212),
libreoffice-java-common,
libscram-java,
libspin-java,
libswingx-java (<< 1:1.6.4),
libunirest-java-java,
openjdk-8-jdk,
default-jdk,
ure (>= 5.0~)
Standards-Version: 4.1.4
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/jabref.git
Vcs-Git: https://anonscm.debian.org/git/pkg-java/jabref.git
Vcs-Browser: https://salsa.debian.org/java-team/jabref
Vcs-Git: https://salsa.debian.org/java-team/jabref.git
Homepage: https://www.jabref.org/
Package: jabref
......
debian/patches/030_xjc.patch
View file @ 4edc0bf9
......@@ -2,9 +2,11 @@ Description: xjc ant task needs jaxb-impl on the classpath
Author: tony mancill <tmancill@debian.org>
Forwarded: not-needed
--- a/xjc.gradle
+++ b/xjc.gradle
@@ -2,33 +2,8 @@
Index: jabref/xjc.gradle
===================================================================
--- jabref.orig/xjc.gradle
+++ jabref/xjc.gradle
@@ -2,33 +2,8 @@ configurations {
xjc
}
......@@ -40,8 +42,10 @@ Forwarded: not-needed
}
tasks.compileJava.dependsOn xjc
Index: jabref/src/main/resources/xjc/mods/loc/mods/xml.xsd
===================================================================
--- /dev/null
+++ b/src/main/resources/xjc/mods/loc/mods/xml.xsd
+++ jabref/src/main/resources/xjc/mods/loc/mods/xml.xsd
@@ -0,0 +1,146 @@
+<?xml version="1.0"?>
+<xs:schema targetNamespace="http://www.w3.org/XML/1998/namespace" xmlns:xs="http://www.w3.org/2001/XMLSchema" xml:lang="en">
......@@ -189,8 +193,10 @@ Forwarded: not-needed
+ </xs:attributeGroup>
+
+</xs:schema>
Index: jabref/src/main/resources/xjc/mods/loc/standards/xlink/xlink.xsd
===================================================================
--- /dev/null
+++ b/src/main/resources/xjc/mods/loc/standards/xlink/xlink.xsd
+++ jabref/src/main/resources/xjc/mods/loc/standards/xlink/xlink.xsd
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- METS XLink Schema, v. 2, Nov. 15, 2004 -->
......@@ -267,8 +273,11 @@ Forwarded: not-needed
+ <attribute name="type" type="string" fixed="none" form="qualified" />
+ </attributeGroup>
+</schema>
Index: jabref/src/main/resources/xjc/mods/catalog.cat
===================================================================
--- /dev/null
+++ b/src/main/resources/xjc/mods/catalog.cat
@@ -0,0 +1,2 @@
+-- local resources for Library Of Congress MODS --
+REWRITE_SYSTEM "http://www.loc.gov" "loc"
+++ jabref/src/main/resources/xjc/mods/catalog.cat
@@ -0,0 +1,3 @@
+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
+ <rewriteSystem systemIdStartString="http://www.loc.gov" rewritePrefix="loc"/>
+</catalog>
debian/patches/070_jdk9_swing.patch 0 → 100644
View file @ 4edc0bf9
Index: jabref/src/main/java/net/sf/jabref/gui/FindUnlinkedFilesDialog.java
===================================================================
--- jabref.orig/src/main/java/net/sf/jabref/gui/FindUnlinkedFilesDialog.java
+++ jabref/src/main/java/net/sf/jabref/gui/FindUnlinkedFilesDialog.java
@@ -398,8 +398,10 @@ public class FindUnlinkedFilesDialog ext
private void expandTree(JTree currentTree, TreePath parent, boolean expand) {
TreeNode node = (TreeNode) parent.getLastPathComponent();
if (node.getChildCount() >= 0) {
- for (Enumeration<TreeNode> e = node.children(); e.hasMoreElements();) {
- TreePath path = parent.pathByAddingChild(e.nextElement());
+ final Enumeration e = node.children();
+ while (e.hasMoreElements()) {
+ final TreeNode tNode = (TreeNode) e.nextElement();
+ TreePath path = parent.pathByAddingChild(tNode);
expandTree(currentTree, path, expand);
}
}
@@ -637,9 +639,10 @@ public class FindUnlinkedFilesDialog ext
*/
private List<File> getFileListFromNode(CheckableTreeNode node) {
List<File> filesList = new ArrayList<>();
- Enumeration<CheckableTreeNode> children = node.depthFirstEnumeration();
+ final Enumeration children = node.depthFirstEnumeration();
List<CheckableTreeNode> nodesToRemove = new ArrayList<>();
- for (CheckableTreeNode child : Collections.list(children)) {
+ while (children.hasMoreElements()) {
+ final CheckableTreeNode child = (CheckableTreeNode) children.nextElement();
if (child.isLeaf() && child.isSelected()) {
File nodeFile = ((FileNodeWrapper) child.getUserObject()).file;
if ((nodeFile != null) && nodeFile.isFile()) {
@@ -1081,8 +1084,9 @@ public class FindUnlinkedFilesDialog ext
public void setSelected(boolean bSelected) {
isSelected = bSelected;
- Enumeration<CheckableTreeNode> tmpChildren = this.children();
- for (CheckableTreeNode child : Collections.list(tmpChildren)) {
+ final Enumeration tmpChildren = this.children();
+ while (tmpChildren.hasMoreElements()) {
+ CheckableTreeNode child = (CheckableTreeNode) tmpChildren.nextElement();
child.setSelected(bSelected);
}
Index: jabref/src/main/java/net/sf/jabref/collab/EntryChange.java
===================================================================
--- jabref.orig/src/main/java/net/sf/jabref/collab/EntryChange.java
+++ jabref/src/main/java/net/sf/jabref/collab/EntryChange.java
@@ -74,8 +74,9 @@ class EntryChange extends Change {
public boolean makeChange(BasePanel panel, BibDatabase secondary, NamedCompound undoEdit) {
boolean allAccepted = true;
- Enumeration<Change> e = children();
- for (Change c : Collections.list(e)) {
+ Enumeration e = children();
+ while (e.hasMoreElements()) {
+ final Change c = (Change) e.nextElement();
if (c.isAcceptable() && c.isAccepted()) {
c.makeChange(panel, secondary, undoEdit);
} else {
Index: jabref/src/main/java/net/sf/jabref/collab/ChangeDisplayDialog.java
===================================================================
--- jabref.orig/src/main/java/net/sf/jabref/collab/ChangeDisplayDialog.java
+++ jabref/src/main/java/net/sf/jabref/collab/ChangeDisplayDialog.java
@@ -86,9 +86,10 @@ class ChangeDisplayDialog extends JDialo
// Perform all accepted changes:
// Store all edits in an Undoable object:
NamedCompound ce = new NamedCompound(Localization.lang("Merged external changes"));
- Enumeration<Change> enumer = root.children();
+ Enumeration enumer = root.children();
boolean anyDisabled = false;
- for (Change c : Collections.list(enumer)) {
+ while (enumer.hasMoreElements()) {
+ final Change c = (Change) enumer.nextElement();
boolean allAccepted = false;
if (c.isAcceptable() && c.isAccepted()) {
allAccepted = c.makeChange(panel, localSecondary, ce);
debian/patches/series
View file @ 4edc0bf9
......@@ -4,3 +4,4 @@
030_xjc.patch
050_unirest_json.patch
060_0664_perms.patch
070_jdk9_swing.patch
debian/rules
View file @ 4edc0bf9
......@@ -2,10 +2,6 @@
export DH_VERBOSE=1
# force build with openjdk-8, even if -9 is installed
include /usr/share/dpkg/architecture.mk
export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-$(DEB_HOST_ARCH)
%:
dh $@ --buildsystem=gradle
......