[jabref] 01/03: number patches, drop old patches
Tony Mancill
tmancill at moszumanska.debian.org
Sun Dec 4 19:58:23 UTC 2016
This is an automated email from the git hooks/post-receive script.
tmancill pushed a commit to branch dev
in repository jabref.
commit 49402d619265061551e499fd0667e4721396a98b
Author: tony mancill <tmancill at debian.org>
Date: Sun Dec 4 11:26:34 2016 -0800
number patches, drop old patches
---
.../{gradle_build.patch => 010_gradle_build.patch} | 0
...h => 020_disable_automatic_upgrade_check.patch} | 0
debian/patches/{xjc.patch => 030_xjc.patch} | 0
...cadapter.patch => 040_disable_macadapter.patch} | 0
.../{unirest_json.patch => 050_unirest_json.patch} | 0
debian/patches/fix-headless-bibtex-output.diff | 27 --
debian/patches/generated_JabRefPlugin.java.patch | 369 ---------------------
debian/patches/series | 12 +-
8 files changed, 5 insertions(+), 403 deletions(-)
diff --git a/debian/patches/gradle_build.patch b/debian/patches/010_gradle_build.patch
similarity index 100%
rename from debian/patches/gradle_build.patch
rename to debian/patches/010_gradle_build.patch
diff --git a/debian/patches/disable_automatic_upgrade_check.patch b/debian/patches/020_disable_automatic_upgrade_check.patch
similarity index 100%
rename from debian/patches/disable_automatic_upgrade_check.patch
rename to debian/patches/020_disable_automatic_upgrade_check.patch
diff --git a/debian/patches/xjc.patch b/debian/patches/030_xjc.patch
similarity index 100%
rename from debian/patches/xjc.patch
rename to debian/patches/030_xjc.patch
diff --git a/debian/patches/disable_macadapter.patch b/debian/patches/040_disable_macadapter.patch
similarity index 100%
rename from debian/patches/disable_macadapter.patch
rename to debian/patches/040_disable_macadapter.patch
diff --git a/debian/patches/unirest_json.patch b/debian/patches/050_unirest_json.patch
similarity index 100%
rename from debian/patches/unirest_json.patch
rename to debian/patches/050_unirest_json.patch
diff --git a/debian/patches/fix-headless-bibtex-output.diff b/debian/patches/fix-headless-bibtex-output.diff
deleted file mode 100644
index d123af4..0000000
--- a/debian/patches/fix-headless-bibtex-output.diff
+++ /dev/null
@@ -1,27 +0,0 @@
-Description: fix headless BibTeX output
-Origin: vendor
-Bug: https://sourceforge.net/p/jabref/bugs/1228/
-Bug-Debian: https://bugs.debian.org/723100
-Forwarded: https://sourceforge.net/p/jabref/bugs/1228/
-Author: Vincent Fourmond <fourmond at debian.org>
-Reviewed-by: gregor herrmann <gregoa at debian.org>
-Last-Update: 2014-05-07
-
---- a/src/java/net/sf/jabref/BibtexEntry.java
-+++ b/src/java/net/sf/jabref/BibtexEntry.java
-@@ -105,13 +105,13 @@
- }
-
- String suffix = "";
-- if (JabRef.jrf.prefs.getBoolean(JabRefPreferences.WRITEFIELD_ADDSPACES)) {
-+ if (JabRefPreferences.getInstance().getBoolean(JabRefPreferences.WRITEFIELD_ADDSPACES)) {
- for (int i = maxFieldLength - field.length(); i > 0; i--)
- suffix += " ";
- }
-
- String res;
-- if (JabRef.jrf.prefs.getBoolean(JabRefPreferences.WRITEFIELD_CAMELCASENAME)) {
-+ if (JabRefPreferences.getInstance().getBoolean(JabRefPreferences.WRITEFIELD_CAMELCASENAME)) {
- if (tagDisplayNameMap.containsKey(field.toLowerCase())) {
- res = tagDisplayNameMap.get(field.toLowerCase()) + suffix;
- } else {
diff --git a/debian/patches/generated_JabRefPlugin.java.patch b/debian/patches/generated_JabRefPlugin.java.patch
deleted file mode 100644
index a246437..0000000
--- a/debian/patches/generated_JabRefPlugin.java.patch
+++ /dev/null
@@ -1,369 +0,0 @@
-Description: file was removed in 2.9.1 but doesn't get generated either ...
-Origin: vendor
-Forwarded: info via mail
-Author: gregor herrmann <gregoa at debian.org>
-Last-Update: 2013-01-01
-
---- /dev/null
-+++ b/src/java/net/sf/jabref/plugin/core/generated/_JabRefPlugin.java
-@@ -0,0 +1,360 @@
-+package net.sf.jabref.plugin.core.generated;
-+
-+import java.net.URL;
-+import java.util.ArrayList;
-+import java.util.List;
-+import net.sf.jabref.plugin.util.RuntimeExtension;
-+import org.java.plugin.Plugin;
-+import org.java.plugin.PluginLifecycleException;
-+import org.java.plugin.registry.Extension;
-+import org.java.plugin.registry.ExtensionPoint;
-+
-+import org.apache.commons.logging.Log;
-+import org.apache.commons.logging.LogFactory;
-+
-+/**
-+ * Do not modify this file, as it was auto generated and will be overwritten!
-+ * User modifications should go in net.sf.jabref.plugin.core.JabRefPlugin.
-+ */
-+public abstract class _JabRefPlugin extends Plugin {
-+
-+ public static String getId(){
-+ return "net.sf.jabref.core";
-+ }
-+
-+ static Log log = LogFactory.getLog(_JabRefPlugin.class);
-+
-+ public List<ExportFormatTemplateExtension> getExportFormatTemplateExtensions(){
-+ ExtensionPoint extPoint = getManager().getRegistry().getExtensionPoint(getId(), "ExportFormatTemplate");
-+ List<ExportFormatTemplateExtension> result = new ArrayList<ExportFormatTemplateExtension>();
-+ for (Extension ext : extPoint.getConnectedExtensions()) {
-+ try {
-+ result.add(new ExportFormatTemplateExtension(getManager().getPlugin(
-+ ext.getDeclaringPluginDescriptor().getId()), ext));
-+ } catch (PluginLifecycleException e) {
-+ log.error("Failed to activate plug-in " + ext.getDeclaringPluginDescriptor().getId(), e);
-+ }
-+ }
-+ return result;
-+ }
-+
-+ public static class ExportFormatTemplateExtension extends RuntimeExtension {
-+ public ExportFormatTemplateExtension(Plugin declaringPlugin, Extension wrapped){
-+ super(declaringPlugin, wrapped);
-+ }
-+
-+
-+ public String getDisplayName(){
-+ return getStringParameter("displayName");
-+ }
-+
-+
-+ public String getConsoleName(){
-+ return getStringParameter("consoleName");
-+ }
-+
-+
-+ public String getLayoutFilename(){
-+ return getStringParameter("layoutFilename");
-+ }
-+
-+
-+ public URL getDirAsUrl(){
-+ return getResourceParameter("dir");
-+ }
-+
-+ public URL getDirAsUrl(String relativePath){
-+ return getResourceParameter("dir", relativePath);
-+ }
-+
-+
-+ public String getExtension(){
-+ return getStringParameter("extension");
-+ }
-+
-+
-+ public String getEncoding(){
-+ return getStringParameter("encoding");
-+ }
-+
-+ }
-+
-+ public List<ExportFormatExtension> getExportFormatExtensions(){
-+ ExtensionPoint extPoint = getManager().getRegistry().getExtensionPoint(getId(), "ExportFormat");
-+ List<ExportFormatExtension> result = new ArrayList<ExportFormatExtension>();
-+ for (Extension ext : extPoint.getConnectedExtensions()) {
-+ try {
-+ result.add(new ExportFormatExtension(getManager().getPlugin(
-+ ext.getDeclaringPluginDescriptor().getId()), ext));
-+ } catch (PluginLifecycleException e) {
-+ log.error("Failed to activate plug-in " + ext.getDeclaringPluginDescriptor().getId(), e);
-+ }
-+ }
-+ return result;
-+ }
-+
-+ public static class ExportFormatExtension extends RuntimeExtension {
-+ public ExportFormatExtension(Plugin declaringPlugin, Extension wrapped){
-+ super(declaringPlugin, wrapped);
-+ }
-+
-+
-+ /**
-+ * @return A singleton instance of the class parameter or null if the class could not be found!
-+ */
-+ public net.sf.jabref.export.IExportFormat getExportFormat(){
-+ return (net.sf.jabref.export.IExportFormat)getClassParameter("exportFormat");
-+ }
-+
-+
-+ public String getDisplayName(){
-+ return getStringParameter("displayName");
-+ }
-+
-+
-+ public String getConsoleName(){
-+ return getStringParameter("consoleName");
-+ }
-+
-+
-+ public String getExtension(){
-+ return getStringParameter("extension");
-+ }
-+
-+ }
-+
-+ public List<SidePanePluginExtension> getSidePanePluginExtensions(){
-+ ExtensionPoint extPoint = getManager().getRegistry().getExtensionPoint(getId(), "SidePanePlugin");
-+ List<SidePanePluginExtension> result = new ArrayList<SidePanePluginExtension>();
-+ for (Extension ext : extPoint.getConnectedExtensions()) {
-+ try {
-+ result.add(new SidePanePluginExtension(getManager().getPlugin(
-+ ext.getDeclaringPluginDescriptor().getId()), ext));
-+ } catch (PluginLifecycleException e) {
-+ log.error("Failed to activate plug-in " + ext.getDeclaringPluginDescriptor().getId(), e);
-+ }
-+ }
-+ return result;
-+ }
-+
-+ public static class SidePanePluginExtension extends RuntimeExtension {
-+ public SidePanePluginExtension(Plugin declaringPlugin, Extension wrapped){
-+ super(declaringPlugin, wrapped);
-+ }
-+
-+
-+ /**
-+ * @return A singleton instance of the class parameter or null if the class could not be found!
-+ */
-+ public net.sf.jabref.plugin.SidePanePlugin getSidePanePlugin(){
-+ return (net.sf.jabref.plugin.SidePanePlugin)getClassParameter("sidePanePlugin");
-+ }
-+
-+
-+ public String getName(){
-+ return getStringParameter("name");
-+ }
-+
-+
-+ public String getDescription(){
-+ return getStringParameter("description");
-+ }
-+
-+ }
-+
-+ public List<EntryFetcherExtension> getEntryFetcherExtensions(){
-+ ExtensionPoint extPoint = getManager().getRegistry().getExtensionPoint(getId(), "EntryFetcher");
-+ List<EntryFetcherExtension> result = new ArrayList<EntryFetcherExtension>();
-+ for (Extension ext : extPoint.getConnectedExtensions()) {
-+ try {
-+ result.add(new EntryFetcherExtension(getManager().getPlugin(
-+ ext.getDeclaringPluginDescriptor().getId()), ext));
-+ } catch (PluginLifecycleException e) {
-+ log.error("Failed to activate plug-in " + ext.getDeclaringPluginDescriptor().getId(), e);
-+ }
-+ }
-+ return result;
-+ }
-+
-+ public static class EntryFetcherExtension extends RuntimeExtension {
-+ public EntryFetcherExtension(Plugin declaringPlugin, Extension wrapped){
-+ super(declaringPlugin, wrapped);
-+ }
-+
-+
-+ /**
-+ * @return A singleton instance of the class parameter or null if the class could not be found!
-+ */
-+ public net.sf.jabref.imports.EntryFetcher getEntryFetcher(){
-+ return (net.sf.jabref.imports.EntryFetcher)getClassParameter("entryFetcher");
-+ }
-+
-+
-+ public String getName(){
-+ return getStringParameter("name");
-+ }
-+
-+
-+ public String getDescription(){
-+ return getStringParameter("description");
-+ }
-+
-+ }
-+
-+ public List<ExportFormatProviderExtension> getExportFormatProviderExtensions(){
-+ ExtensionPoint extPoint = getManager().getRegistry().getExtensionPoint(getId(), "ExportFormatProvider");
-+ List<ExportFormatProviderExtension> result = new ArrayList<ExportFormatProviderExtension>();
-+ for (Extension ext : extPoint.getConnectedExtensions()) {
-+ try {
-+ result.add(new ExportFormatProviderExtension(getManager().getPlugin(
-+ ext.getDeclaringPluginDescriptor().getId()), ext));
-+ } catch (PluginLifecycleException e) {
-+ log.error("Failed to activate plug-in " + ext.getDeclaringPluginDescriptor().getId(), e);
-+ }
-+ }
-+ return result;
-+ }
-+
-+ public static class ExportFormatProviderExtension extends RuntimeExtension {
-+ public ExportFormatProviderExtension(Plugin declaringPlugin, Extension wrapped){
-+ super(declaringPlugin, wrapped);
-+ }
-+
-+
-+ /**
-+ * @return A singleton instance of the class parameter or null if the class could not be found!
-+ */
-+ public net.sf.jabref.export.IExportFormatProvider getFormatProvider(){
-+ return (net.sf.jabref.export.IExportFormatProvider)getClassParameter("formatProvider");
-+ }
-+
-+
-+ public String getName(){
-+ return getStringParameter("name");
-+ }
-+
-+
-+ public String getDescription(){
-+ return getStringParameter("description");
-+ }
-+
-+ }
-+
-+ public List<PushToApplicationExtension> getPushToApplicationExtensions(){
-+ ExtensionPoint extPoint = getManager().getRegistry().getExtensionPoint(getId(), "PushToApplication");
-+ List<PushToApplicationExtension> result = new ArrayList<PushToApplicationExtension>();
-+ for (Extension ext : extPoint.getConnectedExtensions()) {
-+ try {
-+ result.add(new PushToApplicationExtension(getManager().getPlugin(
-+ ext.getDeclaringPluginDescriptor().getId()), ext));
-+ } catch (PluginLifecycleException e) {
-+ log.error("Failed to activate plug-in " + ext.getDeclaringPluginDescriptor().getId(), e);
-+ }
-+ }
-+ return result;
-+ }
-+
-+ public static class PushToApplicationExtension extends RuntimeExtension {
-+ public PushToApplicationExtension(Plugin declaringPlugin, Extension wrapped){
-+ super(declaringPlugin, wrapped);
-+ }
-+
-+
-+ /**
-+ * @return A singleton instance of the class parameter or null if the class could not be found!
-+ */
-+ public net.sf.jabref.external.PushToApplication getPushToApp(){
-+ return (net.sf.jabref.external.PushToApplication)getClassParameter("pushToApp");
-+ }
-+
-+
-+ public String getName(){
-+ return getStringParameter("name");
-+ }
-+
-+
-+ public String getDescription(){
-+ return getStringParameter("description");
-+ }
-+
-+ }
-+
-+ public List<LayoutFormatterExtension> getLayoutFormatterExtensions(){
-+ ExtensionPoint extPoint = getManager().getRegistry().getExtensionPoint(getId(), "LayoutFormatter");
-+ List<LayoutFormatterExtension> result = new ArrayList<LayoutFormatterExtension>();
-+ for (Extension ext : extPoint.getConnectedExtensions()) {
-+ try {
-+ result.add(new LayoutFormatterExtension(getManager().getPlugin(
-+ ext.getDeclaringPluginDescriptor().getId()), ext));
-+ } catch (PluginLifecycleException e) {
-+ log.error("Failed to activate plug-in " + ext.getDeclaringPluginDescriptor().getId(), e);
-+ }
-+ }
-+ return result;
-+ }
-+
-+ public static class LayoutFormatterExtension extends RuntimeExtension {
-+ public LayoutFormatterExtension(Plugin declaringPlugin, Extension wrapped){
-+ super(declaringPlugin, wrapped);
-+ }
-+
-+
-+ /**
-+ * @return A singleton instance of the class parameter or null if the class could not be found!
-+ */
-+ public net.sf.jabref.export.layout.LayoutFormatter getLayoutFormatter(){
-+ return (net.sf.jabref.export.layout.LayoutFormatter)getClassParameter("layoutFormatter");
-+ }
-+
-+
-+ public String getDescription(){
-+ return getStringParameter("description");
-+ }
-+
-+
-+ public String getName(){
-+ return getStringParameter("name");
-+ }
-+
-+ }
-+
-+ public List<ImportFormatExtension> getImportFormatExtensions(){
-+ ExtensionPoint extPoint = getManager().getRegistry().getExtensionPoint(getId(), "ImportFormat");
-+ List<ImportFormatExtension> result = new ArrayList<ImportFormatExtension>();
-+ for (Extension ext : extPoint.getConnectedExtensions()) {
-+ try {
-+ result.add(new ImportFormatExtension(getManager().getPlugin(
-+ ext.getDeclaringPluginDescriptor().getId()), ext));
-+ } catch (PluginLifecycleException e) {
-+ log.error("Failed to activate plug-in " + ext.getDeclaringPluginDescriptor().getId(), e);
-+ }
-+ }
-+ return result;
-+ }
-+
-+ public static class ImportFormatExtension extends RuntimeExtension {
-+ public ImportFormatExtension(Plugin declaringPlugin, Extension wrapped){
-+ super(declaringPlugin, wrapped);
-+ }
-+
-+
-+ /**
-+ * @return A singleton instance of the class parameter or null if the class could not be found!
-+ */
-+ public net.sf.jabref.imports.ImportFormat getImportFormat(){
-+ return (net.sf.jabref.imports.ImportFormat)getClassParameter("importFormat");
-+ }
-+
-+
-+ public String getName(){
-+ return getStringParameter("name");
-+ }
-+
-+
-+ public String getDescription(){
-+ return getStringParameter("description");
-+ }
-+
-+ }
-+
-+}
diff --git a/debian/patches/series b/debian/patches/series
index 45b07c5..88f64bf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,5 @@
-#generated_JabRefPlugin.java.patch
-#fix-headless-bibtex-output.diff
-gradle_build.patch
-disable_automatic_upgrade_check.patch
-xjc.patch
-disable_macadapter.patch
-unirest_json.patch
+010_gradle_build.patch
+020_disable_automatic_upgrade_check.patch
+030_xjc.patch
+040_disable_macadapter.patch
+050_unirest_json.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jabref.git
More information about the pkg-java-commits
mailing list