update branches/2.5 from beta1 to the 2.5 release
[debian/jabref.git] / debian / patches / 01_free_javac.dpatch
index e24e7852665b03d4494e55016426dc59b06a33cd..6097c389d1559489bb780126f2b57f034cf69328 100755 (executable)
@@ -6,18 +6,18 @@
 ##     Thanks to Matthias Klose, cf. #383006
 
 @DPATCH@
-diff -urNad jabref-2.2~b2~/src/java/net/sf/jabref/JabRef.java jabref-2.2~b2/src/java/net/sf/jabref/JabRef.java
---- jabref-2.2~b2~/src/java/net/sf/jabref/JabRef.java  2006-11-26 21:10:32.000000000 +0100
-+++ jabref-2.2~b2/src/java/net/sf/jabref/JabRef.java   2006-11-26 21:17:14.000000000 +0100
-@@ -46,7 +46,6 @@
- import com.jgoodies.looks.plastic.Plastic3DLookAndFeel;
- import com.jgoodies.looks.plastic.PlasticLookAndFeel;
--import com.jgoodies.looks.windows.WindowsLookAndFeel;
+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 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;
-@@ -578,27 +577,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;
                  }
@@ -45,14 +45,3 @@ diff -urNad jabref-2.2~b2~/src/java/net/sf/jabref/JabRef.java jabref-2.2~b2/src/
  
                  if (lnf != null) {
                      try {
-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
---- jabref-2.2~b2~/src/java/net/sf/jabref/export/VerifyingWriter.java  2006-11-26 21:10:32.000000000 +0100
-+++ jabref-2.2~b2/src/java/net/sf/jabref/export/VerifyingWriter.java   2006-11-26 21:14:29.000000000 +0100
-@@ -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;