debian/patches/01_free_javac.dpatch

   1 #! /bin/sh /usr/share/dpatch/dpatch-run
   2 ## 01_free_javac.dpatch by  <gregor+debian@comodo.priv.at>
   3 ##
   4 ## All lines beginning with `## DP:' are a description of the patch.
   5 ## DP: Changes to be able to compile JabRef with free java compilers.
   6 ##     Thanks to Matthias Klose, cf. #383006
   7
   8 @DPATCH@
   9 diff -urNad jabref-2.2~b2~/src/java/net/sf/jabref/JabRef.java jabref-2.2~b2/src/java/net/sf/jabref/JabRef.java
  10 --- jabref-2.2~b2~/src/java/net/sf/jabref/JabRef.java   2006-11-26 21:10:32.000000000 +0100
  11 +++ jabref-2.2~b2/src/java/net/sf/jabref/JabRef.java    2006-11-26 21:17:14.000000000 +0100
  12 @@ -46,7 +46,6 @@
  13
  14  import com.jgoodies.looks.plastic.Plastic3DLookAndFeel;
  15  import com.jgoodies.looks.plastic.PlasticLookAndFeel;
  16 -import com.jgoodies.looks.windows.WindowsLookAndFeel;
  17  import com.jgoodies.looks.FontSet;
  18  import com.jgoodies.looks.FontSets;
  19  import com.jgoodies.looks.FontPolicy;
  20 @@ -578,27 +577,6 @@
  21
  22                      //Plastic3DLookAndFeel plLnf = (Plastic3DLookAndFeel) lnf;
  23                  }
  24 -                else if ((lnf != null) && (lnf instanceof WindowsLookAndFeel)) {
  25 -
  26 -                    // Set a "model" icon size, so menu items are evenly spaced even though
  27 -                    // only some items have icons. We load an arbitrary icon and look at
  28 -                    // its size to determine what size to use:
  29 -                    int defaultIconSize = GUIGlobals.getImage("open").getIconWidth();
  30 -                    com.jgoodies.looks.Options.setDefaultIconSize
  31 -                        (new Dimension(defaultIconSize, defaultIconSize));
  32 -
  33 -                    if (overrideDefaultFonts) {
  34 -                        FontSet fontSet = FontSets.createDefaultFontSet(
  35 -                            new Font("Tahoma", Font.PLAIN, fontSizes),    // control font
  36 -                            new Font("Tahoma", Font.PLAIN, fontSizes),    // menu font
  37 -                            new Font("Tahoma", Font.BOLD, fontSizes)     // title font
  38 -                            );
  39 -                        FontPolicy fixedPolicy = FontPolicies.createFixedPolicy(fontSet);
  40 -                        WindowsLookAndFeel.setFontPolicy(fixedPolicy);
  41 -                    }
  42 -
  43 -                    //WindowsLookAndFeel plLnf = (WindowsLookAndFeel) lnf;
  44 -                }
  45
  46                  if (lnf != null) {
  47                      try {
  48 diff -urNad jabref-2.2~b2~/src/java/net/sf/jabref/export/VerifyingWriter.java jabref-2.2~b2/src/java/net/sf/jabref/export/VerifyingWriter.java
  49 --- jabref-2.2~b2~/src/java/net/sf/jabref/export/VerifyingWriter.java   2006-11-26 21:10:32.000000000 +0100
  50 +++ jabref-2.2~b2/src/java/net/sf/jabref/export/VerifyingWriter.java    2006-11-26 21:14:29.000000000 +0100
  51 @@ -1,7 +1,5 @@
  52  package net.sf.jabref.export;
  53
  54 -import sun.misc.CharacterEncoder;
  55 -
  56  import java.io.*;
  57  import java.nio.charset.Charset;
  58  import java.nio.charset.CharsetEncoder;