update branches/2.5 from beta1 to the 2.5 release
[debian/jabref.git] / debian / patches / 01_free_javac.dpatch
index f5cb95322b41178df17af9855f0752cbbf3ed592..6097c389d1559489bb780126f2b57f034cf69328 100755 (executable)
@@ -7,17 +7,17 @@
 
 @DPATCH@
 diff -urNad jabref~/src/java/net/sf/jabref/JabRef.java jabref/src/java/net/sf/jabref/JabRef.java
---- jabref~/src/java/net/sf/jabref/JabRef.java 2006-08-10 21:38:43.000000000 +0200
-+++ jabref/src/java/net/sf/jabref/JabRef.java  2006-09-24 01:22:03.000000000 +0200
-@@ -43,7 +43,6 @@
- import com.jgoodies.looks.plastic.Plastic3DLookAndFeel;
- import com.jgoodies.looks.plastic.PlasticLookAndFeel;
--import com.jgoodies.looks.windows.WindowsLookAndFeel;
+--- jabref~/src/java/net/sf/jabref/JabRef.java 2008-03-16 16:09:28.000000000 +0100
++++ jabref/src/java/net/sf/jabref/JabRef.java  2008-03-16 16:11:42.000000000 +0100
+@@ -70,7 +70,6 @@
  import com.jgoodies.looks.FontSet;
  import com.jgoodies.looks.FontSets;
- import com.jgoodies.looks.FontPolicy;
-@@ -624,27 +623,6 @@
+ import com.jgoodies.looks.plastic.Plastic3DLookAndFeel;
+-import com.jgoodies.looks.windows.WindowsLookAndFeel;
+ /**
+  * JabRef Main Class - The application gets started here.
+@@ -609,27 +608,6 @@
  
                      //Plastic3DLookAndFeel plLnf = (Plastic3DLookAndFeel) lnf;
                  }
@@ -39,20 +39,9 @@ diff -urNad jabref~/src/java/net/sf/jabref/JabRef.java jabref/src/java/net/sf/ja
 -                        FontPolicy fixedPolicy = FontPolicies.createFixedPolicy(fontSet);
 -                        WindowsLookAndFeel.setFontPolicy(fixedPolicy);
 -                    }
--                    
+-
 -                    //WindowsLookAndFeel plLnf = (WindowsLookAndFeel) lnf;
 -                }
  
                  if (lnf != null) {
                      try {
-diff -urNad jabref~/src/java/net/sf/jabref/export/VerifyingWriter.java jabref/src/java/net/sf/jabref/export/VerifyingWriter.java
---- jabref~/src/java/net/sf/jabref/export/VerifyingWriter.java 2006-02-25 18:58:27.000000000 +0100
-+++ jabref/src/java/net/sf/jabref/export/VerifyingWriter.java  2006-09-24 01:22:03.000000000 +0200
-@@ -1,7 +1,5 @@
- package net.sf.jabref.export;
--import sun.misc.CharacterEncoder;
--
- import java.io.*;
- import java.nio.charset.Charset;
- import java.nio.charset.CharsetEncoder;