[jabref] 309/459: Drop patch 01_free_javac.patch, not needed anymore. Make (build) dependency on libjgoodies-looks-java versioned.
gregor herrmann
gregoa at debian.org
Thu Sep 15 20:40:48 UTC 2016
This is an automated email from the git hooks/post-receive script.
gregoa pushed a commit to branch master
in repository jabref.
commit 0cb9729d6b90325b3c27f4c39eecbe7a9ebfb94f
Author: gregor herrmann <gregoa at debian.org>
Date: Fri Feb 10 21:33:34 2012 +0100
Drop patch 01_free_javac.patch, not needed anymore. Make (build) dependency
on libjgoodies-looks-java versioned.
---
debian/control | 4 ++--
debian/patches/01_free_javac.patch | 41 --------------------------------------
debian/patches/series | 1 -
3 files changed, 2 insertions(+), 44 deletions(-)
diff --git a/debian/control b/debian/control
index f314342..3eeedf7 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Build-Depends-Indep: ant,
libglazedlists-java,
libjempbox-java (>= 1:1.5.0),
libjgoodies-forms-java,
- libjgoodies-looks-java,
+ libjgoodies-looks-java (>= 2.4.0),
libjpf-java,
libjpfcodegen-java,
liblog4j1.2-java,
@@ -38,7 +38,7 @@ Depends: ${misc:Depends},
libjempbox-java (>= 1:1.5.0),
libjgoodies-common-java,
libjgoodies-forms-java,
- libjgoodies-looks-java,
+ libjgoodies-looks-java (>= 2.4.0),
libjpf-java,
libjpfcodegen-java,
libmicroba-java,
diff --git a/debian/patches/01_free_javac.patch b/debian/patches/01_free_javac.patch
deleted file mode 100644
index ec6473c..0000000
--- a/debian/patches/01_free_javac.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Author: gregor herrmann <gregoa at debian.org>
-Author: Philip Rinn <rinni at gmx.net>
-Description: Changes to be able to compile JabRef with free java compilers.
---- a/src/java/net/sf/jabref/JabRef.java
-+++ b/src/java/net/sf/jabref/JabRef.java
-@@ -29,7 +29,6 @@ import com.jgoodies.looks.FontPolicy;
- import com.jgoodies.looks.FontSet;
- import com.jgoodies.looks.FontSets;
- import com.jgoodies.looks.plastic.Plastic3DLookAndFeel;
--import com.jgoodies.looks.windows.WindowsLookAndFeel;
- import gnu.dtools.ritopt.BooleanOption;
- import gnu.dtools.ritopt.Options;
- import gnu.dtools.ritopt.StringOption;
-@@ -606,27 +605,6 @@ public class JabRef {
-
- //Plastic3DLookAndFeel plLnf = (Plastic3DLookAndFeel) lnf;
- }
-- else if ((lnf != null) && (lnf instanceof WindowsLookAndFeel)) {
--
-- // Set a "model" icon size, so menu items are evenly spaced even though
-- // only some items have icons. We load an arbitrary icon and look at
-- // its size to determine what size to use:
-- int defaultIconSize = GUIGlobals.getImage("open").getIconWidth();
-- com.jgoodies.looks.Options.setDefaultIconSize
-- (new Dimension(defaultIconSize, defaultIconSize));
--
-- if (overrideDefaultFonts) {
-- FontSet fontSet = FontSets.createDefaultFontSet(
-- new Font("Tahoma", Font.PLAIN, fontSizes), // control font
-- new Font("Tahoma", Font.PLAIN, fontSizes), // menu font
-- new Font("Tahoma", Font.BOLD, fontSizes) // title font
-- );
-- FontPolicy fixedPolicy = FontPolicies.createFixedPolicy(fontSet);
-- WindowsLookAndFeel.setFontPolicy(fixedPolicy);
-- }
--
-- //WindowsLookAndFeel plLnf = (WindowsLookAndFeel) lnf;
-- }
-
- if (lnf != null) {
- try {
diff --git a/debian/patches/series b/debian/patches/series
index 6e8547f..db9175d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-01_free_javac.patch
02_libs.patch
05_antlr32.patch
06_BibtexEntry.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