gregor herrmann pushed to branch master at Debian Java Maintainers / jabref
Commits: 9acd52cf by gregor herrmann at 2018-05-20T22:49:54+02:00 refresh patches with consistent quilt options Gbp-Dch: Ignore - - - - - 3 changed files: - debian/patches/030_xjc.patch - debian/patches/060_0664_perms.patch - debian/patches/070_jdk9_swing.patch Changes: ===================================== debian/patches/030_xjc.patch ===================================== --- a/debian/patches/030_xjc.patch +++ b/debian/patches/030_xjc.patch @@ -2,11 +2,9 @@ Description: xjc ant task needs jaxb-impl on the classpath Author: tony mancill <tmanc...@debian.org> Forwarded: not-needed -Index: jabref/xjc.gradle -=================================================================== ---- jabref.orig/xjc.gradle -+++ jabref/xjc.gradle -@@ -2,33 +2,8 @@ configurations { +--- a/xjc.gradle ++++ b/xjc.gradle +@@ -2,33 +2,8 @@ xjc } @@ -42,10 +40,8 @@ Index: jabref/xjc.gradle } tasks.compileJava.dependsOn xjc -Index: jabref/src/main/resources/xjc/mods/loc/mods/xml.xsd -=================================================================== --- /dev/null -+++ jabref/src/main/resources/xjc/mods/loc/mods/xml.xsd ++++ b/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"> @@ -193,10 +189,8 @@ Index: jabref/src/main/resources/xjc/mods/loc/mods/xml.xsd + </xs:attributeGroup> + +</xs:schema> -Index: jabref/src/main/resources/xjc/mods/loc/standards/xlink/xlink.xsd -=================================================================== --- /dev/null -+++ jabref/src/main/resources/xjc/mods/loc/standards/xlink/xlink.xsd ++++ b/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 --> @@ -273,10 +267,8 @@ Index: jabref/src/main/resources/xjc/mods/loc/standards/xlink/xlink.xsd + <attribute name="type" type="string" fixed="none" form="qualified" /> + </attributeGroup> +</schema> -Index: jabref/src/main/resources/xjc/mods/catalog.cat -=================================================================== --- /dev/null -+++ jabref/src/main/resources/xjc/mods/catalog.cat ++++ b/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"/> ===================================== debian/patches/060_0664_perms.patch ===================================== --- a/debian/patches/060_0664_perms.patch +++ b/debian/patches/060_0664_perms.patch @@ -4,10 +4,8 @@ Forwarded: not-needed Source: https://patch-diff.githubusercontent.com/raw/JabRef/jabref/pull/2637.patch Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=857351 -Index: jabref/src/main/java/net/sf/jabref/logic/exporter/FileSaveSession.java -=================================================================== ---- jabref.orig/src/main/java/net/sf/jabref/logic/exporter/FileSaveSession.java -+++ jabref/src/main/java/net/sf/jabref/logic/exporter/FileSaveSession.java +--- a/src/main/java/net/sf/jabref/logic/exporter/FileSaveSession.java ++++ b/src/main/java/net/sf/jabref/logic/exporter/FileSaveSession.java @@ -38,7 +38,6 @@ public class FileSaveSession extends Sav private static final String TEMP_SUFFIX = "save.bib"; private final Path temporaryFile; ===================================== debian/patches/070_jdk9_swing.patch ===================================== --- a/debian/patches/070_jdk9_swing.patch +++ b/debian/patches/070_jdk9_swing.patch @@ -1,7 +1,5 @@ -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 +--- a/src/main/java/net/sf/jabref/gui/FindUnlinkedFilesDialog.java ++++ b/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(); @@ -40,10 +38,8 @@ Index: jabref/src/main/java/net/sf/jabref/gui/FindUnlinkedFilesDialog.java 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 +--- a/src/main/java/net/sf/jabref/collab/EntryChange.java ++++ b/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; @@ -56,10 +52,8 @@ Index: jabref/src/main/java/net/sf/jabref/collab/EntryChange.java 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 +--- a/src/main/java/net/sf/jabref/collab/ChangeDisplayDialog.java ++++ b/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: View it on GitLab: https://salsa.debian.org/java-team/jabref/commit/9acd52cf0debdfd8e626357acb03f3acc3b8891d --- View it on GitLab: https://salsa.debian.org/java-team/jabref/commit/9acd52cf0debdfd8e626357acb03f3acc3b8891d You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ pkg-java-commits mailing list pkg-java-comm...@alioth-lists.debian.net https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits