* New upstream release:
authorgregor herrmann <gregoa@debian.org>
Sun, 26 Nov 2006 20:58:28 +0000 (20:58 -0000)
committergregor herrmann <gregoa@debian.org>
Sun, 26 Nov 2006 20:58:28 +0000 (20:58 -0000)
  - remove j2re1.4 from Depends, JabRef now needs Java 1.5;
  - undistributable fonts no longer included (closes: #393676);
  - includes the patch to make Enter work in dialogs, therefore remove
    patch 02_button;
  - update patch 01_free_javac;
  - update debian/copyright (new contributors);
  - update debian/rules (icon file name changed).

1  2 
debian/changelog
debian/control
debian/copyright
debian/patches/00list
debian/patches/01_free_javac.dpatch
debian/patches/02_libs.dpatch
debian/rules

diff --combined debian/changelog
index 766d77c,0000000..a410c7f
mode 100644,000000..100644
--- /dev/null
@@@ -1,180 -1,0 +1,185 @@@
- jabref (2.1-5) unstable; urgency=low
++jabref (2.2~b2-1) UNRELEASED; urgency=low
 +
 +  * Fix typo in long description.
-   * Remove j2re1.4 from Depends, JabRef now needs Java 1.5.
-   * Build against Debian packages of libraries instead of pre-built jar files
-     (closes: #389068).
-  -- gregor herrmann <gregor+debian@comodo.priv.at>  Fri, 29 Sep 2006 23:29:17 +0200
++  * New upstream release:
++    - remove j2re1.4 from Depends, JabRef now needs Java 1.5;
++    - undistributable fonts no longer included (closes: #393676);
++    - includes the patch to make Enter work in dialogs, therefore remove
++      patch 02_button;
++    - update patch 01_free_javac;
++    - update debian/copyright (new contributors);
++    - update debian/rules (icon file name changed).
++
++ -- gregor herrmann <gregor+debian@comodo.priv.at>  Sun, 26 Nov 2006 21:50:54 +0100
 +
 +jabref (2.1-4) unstable; urgency=low
 +
 +  * Apply patch from Matthias Klose to enable building with a free java compiler -
 +    thanks! (Cf. #383006)
 +  * Change build dependencies accordingly.
 +  * Apply patch from Morten Omholt Alver (upstream author) to enable 'enter' in
 +    dialogs - thanks! (Closes: #387235)
 +
 + -- gregor herrmann <gregor+debian@comodo.priv.at>  Mon, 25 Sep 2006 00:32:40 +0200
 +
 +jabref (2.1-3) unstable; urgency=low
 +
 +  * Change menu section to "Apps/Databases" and remove lintian override.
 +    "Apps/Data Management" was premature, thanks to Frank Küster and 
 +    Bill Allombert for pointing this out (cf. #386320).
 +
 + -- gregor herrmann <gregor+debian@comodo.priv.at>  Mon, 11 Sep 2006 21:12:37 +0200
 +
 +jabref (2.1-2) unstable; urgency=low
 +
 +  * Change menu section to "Apps/Data Management", thanks to Frank Küster
 +    (closes: #386320).
 +  * Add lintian override for this new section.
 +  * Convert changelog to UTF-8.
 +
 + -- gregor herrmann <gregor+debian@comodo.priv.at>  Thu,  7 Sep 2006 16:42:27 +0200
 +
 +jabref (2.1-1) unstable; urgency=low
 +
 +  * New upstream release (closes: #382310, #379704).
 +  * Change back wrapper script, as the behaviour of "-v" changed in the
 +    new release (cf. #378189 for details).
 +  * Menu icons now created from PNGs in upstream tarball, therefore add build
 +    dependency on imagemagick.
 +  * Clean up README.Debian.
 +  * Update debian/copright to reflect the changes as shown in the About Box.
 +
 + -- gregor herrmann <gregor+debian@comodo.priv.at>  Fri, 11 Aug 2006 12:09:45 +0200
 +
 +jabref (2.0.1+2.1b2-6) unstable; urgency=low
 +
 +  * Update menu icons, the new ones are kindly provided by Morten Omholt Alver
 +    (upstream author) - thanks!
 +
 + -- gregor herrmann <gregor+debian@comodo.priv.at>  Tue,  1 Aug 2006 22:31:16 +0200
 +
 +jabref (2.0.1+2.1b2-5) unstable; urgency=low
 +
 +  * Now really change debian/copyright.
 +
 + -- gregor herrmann <gregor+debian@comodo.priv.at>  Mon, 31 Jul 2006 21:40:47 +0200
 +
 +jabref (2.0.1+2.1b2-4) unstable; urgency=low
 +
 +  * Add icon to menu entry, thanks to LI Daobing for the idea
 +    (closes: #380604).
 +  * Remove references to the libraries Commons Logging and Commons HTTP Client
 +    from debian/copyright, as they are not included in the upstream tarball 
 +    any more.
 +
 + -- gregor herrmann <gregor+debian@comodo.priv.at>  Mon, 31 Jul 2006 16:37:47 +0200
 +
 +jabref (2.0.1+2.1b2-3) unstable; urgency=low
 +
 +  * Convert debian/copyright to UTF-8.
 +  * Mention startup options in manpage, thanks to LI Daobing (closes: #378190).
 +  * Change wrapper script to always pass "-n" if called with "-v" in order
 +    to make jabref only print the version number and quit afterwards with
 +    "-v". Thanks to LI Daobing (closes: #378189).
 +
 + -- gregor herrmann <gregor+debian@comodo.priv.at>  Fri, 14 Jul 2006 13:23:58 +0200
 +
 +jabref (2.0.1+2.1b2-2) unstable; urgency=low
 +
 +  * Pass command line parameters to /usr/bin/jabref and add hint about Sun
 +    Java and update-alternatives to README.Debian (closes: #377316).
 +
 + -- gregor herrmann <gregor+debian@comodo.priv.at>  Sat,  8 Jul 2006 12:51:40 +0200
 +
 +jabref (2.0.1+2.1b2-1) unstable; urgency=low
 +
 +  * New upstream release.
 +
 + -- gregor herrmann <gregor+debian@comodo.priv.at>  Tue,  4 Jul 2006 16:42:35 +0200
 +
 +jabref (2.0.1+2.1b-3) unstable; urgency=low
 +
 +  * Changed order of Build-Depend-Indep.
 +  * Cleaned up debian/rules.
 +  * Moved dh_ calls in debian/rules to binary-indep target.
 +  * Add lintian override (upstream tarball has .cvsignore stuff).
 +  * Added Tony Mancill to Uploaders (thanks for sponsoring!).
 +  * Clarified debian/copyright and fixed typo (thanks to Tony Mancill).
 +  * Updated debhelper compatibility level to 5.
 +  * Cleaned up debian/watch.
 +  * Added menu entry.
 +  * Intial upload to the Debian archive (closes: #205392).
 +
 + -- gregor herrmann <gregor+debian@comodo.priv.at>  Wed, 14 Jun 2006 17:51:38 +0200
 +
 +jabref (2.0.1+2.1b-2) unstable; urgency=low
 +
 +  * Change dependencies to include several versions of the Sun JRE/JDK.
 +
 + -- gregor herrmann <gregor+debian@comodo.priv.at>  Tue, 30 May 2006 17:12:05 +0200
 +
 +jabref (2.0.1+2.1b-1) unstable; urgency=low
 +
 +  * New upstream release.
 +
 + -- gregor herrmann <gregor+debian@comodo.priv.at>  Sat, 20 May 2006 17:06:49 +0200
 +
 +jabref (2.0.1-3) unstable; urgency=low
 +
 +  * Update to Standards-Version: 3.7.2 (no changes required).
 +  * Change dependencies to new sun-java5-jre/jdk.
 +
 + -- gregor herrmann <gregor+debian@comodo.priv.at>  Wed, 17 May 2006 17:48:52 +0200
 +
 +jabref (2.0.1-2) unstable; urgency=low
 +
 +  * Update to Standards-Version: 3.7.0 (no changes required).
 +  * Moved debhelper from Build-Depends-Indep to Build-Depends 
 +    in debian/control.
 +
 + -- gregor herrmann <gregor+debian@comodo.priv.at>  Mon,  1 May 2006 14:44:02 +0200
 +
 +jabref (2.0.1-1) unstable; urgency=low
 +
 +  * New upstream release
 +  * Set debhelper compatibility level to 5.
 +
 + -- gregor herrmann <gregor+debian@comodo.priv.at>  Fri,  3 Feb 2006 21:18:29 +0100
 +
 +jabref (1.8.1-2) unstable; urgency=low
 +
 +  * Added homepage to debian/control.
 +
 + -- gregor herrmann <gregor+debian@comodo.priv.at>  Sun, 25 Dec 2005 14:30:28 +0100
 +
 +jabref (1.8.1-1) unstable; urgency=low
 +
 +  * New upstream release
 +
 + -- gregor herrmann <gregor+debian@comodo.priv.at>  Fri,  7 Oct 2005 22:30:10 +0200
 +
 +jabref (1.8-4) unstable; urgency=low
 +
 +  * Fixed error in /usr/bin/jabref.
 +
 + -- gregor herrmann <gregor+debian@comodo.priv.at>  Tue, 13 Sep 2005 18:44:57 +0200
 +
 +jabref (1.8-3) unstable; urgency=low
 +
 +  * Trimmed Depends: to j2re1.4.
 +  * Added j2sdk1 to Build-Depends-Indep.
 +
 + -- gregor herrmann <gregor+debian@comodo.priv.at>  Sun, 11 Sep 2005 01:24:05 +0200
 +
 +jabref (1.8-2) unstable; urgency=low
 +
 +  * Moved jabref.jar from /usr/share/java/jabref to ../
 +
 + -- gregor herrmann <gregor+debian@comodo.priv.at>  Sat,  3 Sep 2005 02:45:23 +0200
 +
 +jabref (1.8-1) unstable; urgency=low
 +
 +  * Initial release Closes: #205392
 +
 + -- gregor herrmann <gregor+debian@comodo.priv.at>  Thu,  1 Sep 2005 23:18:00 +0200
 +
diff --combined debian/control
index 653f8a3,0000000..59a31d4
mode 100644,000000..100644
--- /dev/null
@@@ -1,20 -1,0 +1,20 @@@
- Build-Depends-Indep: java-gcj-compat-dev, ant, imagemagick, libjgoodies-forms-java, libjgoodies-looks-java, libmicroba-java, libglazedlists-java, libspin-java
 +Source: jabref
 +Section: contrib/tex
 +Priority: optional
 +Maintainer: gregor herrmann <gregor+debian@comodo.priv.at>
 +Uploaders: tony mancill <tmancill@debian.org>
 +Build-Depends: debhelper (>= 5.0.0), dpatch
++Build-Depends-Indep: java-gcj-compat-dev, ant, imagemagick
 +Standards-Version: 3.7.2
 +XS-Vcs-Svn: http://svn.toastfreeware.priv.at/debian/jabref/trunk/
 +
 +Package: jabref
 +Architecture: all
 +Depends: sun-java5-jre | j2re1.5 | sun-j2sdk1.5
 +Description: graphical frontend to manage BibTeX databases
 + JabRef is a GUI to manage BibTeX databases, the standard LaTeX bibliography
 + reference format. JabRef is built to be platform independent (requires Java
 + 1.5). It merges and extends the functionalities of BibKeeper (Morten O.
 + Alver) and JBibtexManager (Nizar Batada).
 + .
 +  Homepage: http://jabref.sourceforge.net/
diff --combined debian/copyright
index 82da132,0000000..0c80300
mode 100644,000000..100644
--- /dev/null
@@@ -1,138 -1,0 +1,141 @@@
- Krzysztof A. Kociuszkiewicz
 +This package was debianized by gregor herrmann <gregor+debian@comodo.priv.at> on
 +Thu,  1 Sep 2005 23:18:00 +0200.
 +
 +It was downloaded from http://jabref.sourceforge.net/
 +
 +Copyright:
 +
 +(c) 2006
 +Morten Alver <mortenalver@users.sourceforge.net>
 +Nizar Batada <nbatada@users.sourceforge.net>
 +
 +License:
 +
 +JabRef is free open source software, distributed under the GNU General
 +Public Licence. See the enclosed text file 'gpl.txt', or the About
 +dialog, for details about the GPL.
 +
 +      On Debian GNU/Linux systems, the complete text of the GNU General
 +      Public License can be found in `/usr/share/common-licenses/GPL'.
 +
 +JabRef also uses libraries distributed by other parties; see the About
 +box for details.
 +
 +
 +From the About box:
 +
 +(c) 2006
 +JabRef is freely distributable under the terms of the GNU Public License, version 2.
 +
 +Developers:
 +Morten O. Alver 
 +Nizar N. Batada 
 +Michel Baylac 
 +Guillaume Gardey 
 +Cyrille d'Haese 
 +Raik Nagel 
++Christopher Oezbek
 +Ellen Reitmayr 
++Gert Renckens
 +Andreas Rudert 
 +Michael Spiegel 
 +Ulrik Stervbo 
 +Dominik Waßenhoven 
 +Joerg K. Wegner 
 +Michael Wrighton 
 +Egon Willighagen
 +Jörg Zieren
 +
 +Contributions from:
 +Kolja Brix 
 +Frédéric Darboux 
 +Fabrice Dessaint 
 +Nathan Dunn 
 +Brian Van Essen
 +Alexis Gallagher 
 +Sascha Hunold 
 +Bernd Kalbfuss 
 +Martin Kähmer 
 +Ervin Kolenovic
- Christopher Oezbek
++Krzysztof A. Kosciuszkiewicz
++Christian Kopf
 +Jeffrey Kuhn
 +Alex Montgomery
- UIFSplitPane) by Karsten Lentzsch, which are distributed under these terms.
- [0]
 +John Relph
 +Moritz Ringler
 +Andreas Rudert
++Mark Schenk
 +Rudolf Seemann
 +Toralf Senger
 +Mike Smoot
++Ulrich Stärk
 +Martin Stolle
 +David Weitzman
 +Seb Wills
 +John Zedlewski
 +
 +Thanks to:
 +Samin Muhammad Ridwanul Karim 
 +Stefan Robert 
 +
 +Third-party software used:
 +
 +JabRef uses JGoodies Looks 2.04 and JGoodies Forms 1.0.5, distributed by
 +JGoodies (http://www.jgoodies.com) under the terms of the BSD License (see
 +http://www.opensource.org/licenses/bsd-license.html for details).
 +
 +Also included are two additional classes (SimpleInternalFrame and
++UIFSplitPane) by Karsten Lentzsch, which are distributed under these terms. [0]
 +
 +Command line options are parsed using RitOpt
 +(http://ritopt.sourceforge.net). RitOpt is distributed under the terms of
 +the GNU Public License, version 2.
 +
 +JabRef uses the ANTLR parser generator for interpreting search strings.
 +ANTLR is public domain software - see http://www.antlr.org/license.html for
 +the licensing terms.
 +
 +For table presentation and filtering, JabRef uses the Glazed Lists library
 +(http://publicobject.com/glazedlists), which is distributed under the Lesser
 +GNU Public License.
 +
 +JabRef also uses the threading library Spin 1.3.1, which is distributed
 +under the terms of the Lesser GNU Public License.
 +
 +Some GUI components from the Microba library are used, it is licensed under
 +a BSD style license. See http://sourceforge.net/projects/microba/ for more
 +informations.
 +
 +The majority of icons are from the Crystal Clear icon set by Everaldo
 +(http://www.everaldo.com), which is distributed under the terms of the
 +Lesser General Public License.
 +
 +
 +
 +[0]
 +
 +Copyright (c) 2003 JGoodies Karsten Lentzsch. All Rights Reserved.
 +
 +Redistribution and use in source and binary forms, with or without
 +modification, are permitted provided that the following conditions are met:
 +
 +* Redistributions of source code must retain the above copyright notice,
 +  this list of conditions and the following disclaimer.
 +* Redistributions in binary form must reproduce the above copyright notice,
 +  this list of conditions and the following disclaimer in the documentation
 +  and/or other materials provided with the distribution.
 +* Neither the name of JGoodies Karsten Lentzsch nor the names of its
 +  contributors may be used to endorse or promote products derived from this
 +  software without specific prior written permission.
 +
 +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
 +LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
 +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 +ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 +POSSIBILITY OF SUCH DAMAGE.
diff --combined debian/patches/00list
index 4a17e3a,0000000..2a20555
mode 100644,000000..100644
--- /dev/null
@@@ -1,3 -1,0 +1,1 @@@
- 02_button
- 03_libs
 +01_free_javac
index f5cb953,0000000..e24e785
mode 100755,000000..100755
--- /dev/null
@@@ -1,58 -1,0 +1,58 @@@
- 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 @@
 +#! /bin/sh /usr/share/dpatch/dpatch-run
 +## 01_free_javac.dpatch by  <gregor+debian@comodo.priv.at>
 +##
 +## All lines beginning with `## DP:' are a description of the patch.
 +## DP: Changes to be able to compile JabRef with free java compilers.
 +##     Thanks to Matthias Klose, cf. #383006
 +
 +@DPATCH@
- @@ -624,27 +623,6 @@
++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;
 + import com.jgoodies.looks.FontSet;
 + import com.jgoodies.looks.FontSets;
 + import com.jgoodies.looks.FontPolicy;
- -                    
++@@ -578,27 +577,6 @@
 + 
 +                     //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);
 +-                    }
- 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
++-
 +-                    //WindowsLookAndFeel plLnf = (WindowsLookAndFeel) lnf;
 +-                }
 + 
 +                 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;
index 0000000,0000000..f9c6cd2
new file mode 100755 (executable)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,192 @@@
++#! /bin/sh /usr/share/dpatch/dpatch-run
++## 03_libs.dpatch by  <gregor+debian@comodo.priv.at>
++##
++## All lines beginning with `## DP:' are a description of the patch.
++## DP: Replace pre-compiled libs by Debian packages
++
++@DPATCH@
++diff -urNad jabref~/build.xml jabref/build.xml
++--- jabref~/build.xml 2006-09-30 11:57:24.000000000 +0200
+++++ jabref/build.xml  2006-10-15 18:19:19.000000000 +0200
++@@ -86,6 +86,7 @@
++ 
++         <!-- Set the properties for library directories -->
++         <property name="library.directory" value="lib" />
+++        <property name="library.directory.debian" value="/usr/share/java" />
++ 
++ 
++     <taskdef name="jarbundler"
++@@ -101,6 +102,9 @@
++                 <fileset dir="${library.directory}">
++                         <include name="*.jar" />
++                 </fileset>
+++                <fileset dir="${library.directory.debian}">
+++                        <include name="*.jar" />
+++                </fileset>
++         </path>
++ 
++     <!-- Runs project (e.g. in NetBeans 4) -->
++@@ -110,12 +114,12 @@
++             <pathelement location="${build.lib}/jabref.jar"/>
++             <!--<pathelement location="${library.directory}/commons-httpclient-2.0.jar" />
++             <pathelement location="${library.directory}/commons-logging.jar" />-->
++-            <pathelement location="${library.directory}/antlr.jar" />
++-            <pathelement location="${library.directory}/looks-2.0.4.jar" />
++-            <pathelement location="${library.directory}/forms-1.0.4.jar" />
++-            <pathelement location="${library.directory}/spin-1.4.jar" />
++-            <pathelement location="${library.directory}/glazedlists-1.5.0_java14.jar" />
++-            <pathelement location="${library.directory}/microba.jar" />
+++            <pathelement location="${library.directory.debian}/antlr.jar" />
+++            <pathelement location="${library.directory.debian}/looks.jar" />
+++            <pathelement location="${library.directory.debian}/forms.jar" />
+++            <pathelement location="${library.directory.debian}/spin.jar" />
+++            <pathelement location="${library.directory.debian}/glazedlists.jar" />
+++            <pathelement location="${library.directory.debian}/microba.jar" />
++         </classpath>
++          </java>
++     </target>
++@@ -139,11 +143,11 @@
++       <nbprofiledirect>
++           <classpath>
++             <pathelement location="${build.lib}/jabref.jar"/>
++-            <pathelement location="${library.directory}/antlr.jar" />
++-            <pathelement location="${library.directory}/looks-2.0.4.jar" />
++-            <pathelement location="${library.directory}/forms-1.0.4.jar" />
++-            <pathelement location="${library.directory}/spin-1.4.jar" />
++-            <pathelement location="${library.directory}/glazedlists-1.5.0_java14.jar" />
+++            <pathelement location="${library.directory.debian}/antlr.jar" />
+++            <pathelement location="${library.directory.debian}/looks.jar" />
+++            <pathelement location="${library.directory.debian}/forms.jar" />
+++            <pathelement location="${library.directory.debian}/spin.jar" />
+++            <pathelement location="${library.directory.debian}/glazedlists.jar" />
++         </classpath>
++       </nbprofiledirect>
++ 
++@@ -155,11 +159,11 @@
++           <env key="LD_LIBRARY_PATH" path="${profiler.info.agentpath}:${env.LD_LIBRARY_PATH}"/>
++           <classpath>
++             <pathelement location="${build.lib}/jabref.jar"/>
++-            <pathelement location="${library.directory}/antlr.jar" />
++-            <pathelement location="${library.directory}/looks-2.0.4.jar" />
++-            <pathelement location="${library.directory}/forms-1.0.4.jar" />
++-            <pathelement location="${library.directory}/spin-1.4.jar" />
++-            <pathelement location="${library.directory}/glazedlists-1.5.0_java14.jar" />
+++            <pathelement location="${library.directory.debian}/antlr.jar" />
+++            <pathelement location="${library.directory.debian}/looks.jar" />
+++            <pathelement location="${library.directory.debian}/forms.jar" />
+++            <pathelement location="${library.directory.debian}/spin.jar" />
+++            <pathelement location="${library.directory.debian}/glazedlists.jar" />
++ 
++         </classpath>
++       </java>
++@@ -175,12 +179,12 @@
++                                 <pathelement path="${build.classes}" />
++                                 <!--<pathelement location="${library.directory}/commons-httpclient-2.0.jar" />
++                                 <pathelement location="${library.directory}/commons-logging.jar" />-->
++-                                <pathelement location="${library.directory}/antlr.jar" />
++-                                <pathelement location="${library.directory}/looks-2.0.4.jar" />
++-                                <pathelement location="${library.directory}/forms-1.0.4.jar" />
++-                                <pathelement location="${library.directory}/spin-1.4.jar" />
++-                                <pathelement location="${library.directory}/glazedlists-1.5.0_java14.jar" />
++-                                <pathelement location="${library.directory}/microba.jar" />
+++                                <pathelement location="${library.directory.debian}/antlr.jar" />
+++                                <pathelement location="${library.directory.debian}/looks.jar" />
+++                                <pathelement location="${library.directory.debian}/forms.jar" />
+++                                <pathelement location="${library.directory.debian}/spin.jar" />
+++                                <pathelement location="${library.directory.debian}/glazedlists.jar" />
+++                                <pathelement location="${library.directory.debian}/microba.jar" />
++                         </classpath>
++                 </javac>
++         </target>
++@@ -194,9 +198,9 @@
++                                 <pathelement path="${build.classes}" />
++                                 <!--<pathelement location="${library.directory}/commons-httpclient-2.0.jar" />
++                                 <pathelement location="${library.directory}/commons-logging.jar" />-->
++-                                <pathelement location="${library.directory}/antlr.jar" />
++-                                <pathelement location="${library.directory}/looks-2.0.4.jar" />
++-                                <pathelement location="${library.directory}/spin-1.4.jar" />
+++                                <pathelement location="${library.directory.debian}/antlr.jar" />
+++                                <pathelement location="${library.directory.debian}/looks.jar" />
+++                                <pathelement location="${library.directory.debian}/spin.jar" />
++                         </classpath>
++                 </javac>
++ 
++@@ -409,16 +413,16 @@
++                 <mkdir dir="${build.tmp}"/>
++                 <!--<unjar src="${library.directory}/commons-httpclient-2.0.jar" dest="${build.tmp}" />
++                 <unjar src="${library.directory}/commons-logging.jar" dest="${build.tmp}" />-->
++-                <unjar src="${library.directory}/antlr.jar" dest="${build.tmp}" />
+++                <unjar src="${library.directory.debian}/antlr.jar" dest="${build.tmp}" />
++                 <!--                <unjar src="${library.directory}/plastic-1.2.1.jar" dest="${build.classes}" />-->
++-                <unjar src="${library.directory}/looks-2.0.4.jar" dest="${build.tmp}" />
++-                <unjar src="${library.directory}/forms-1.0.4.jar" dest="${build.tmp}" />
++-                <unjar src="${library.directory}/spin-1.4.jar" dest="${build.tmp}" />
++-                <unjar src="${library.directory}/glazedlists-1.5.0_java14.jar" dest="${build.tmp}" />
++-                <unjar src="${library.directory}/microba.jar" dest="${build.tmp}" />
+++                <unjar src="${library.directory.debian}/looks.jar" dest="${build.tmp}" />
+++                <unjar src="${library.directory.debian}/forms.jar" dest="${build.tmp}" />
+++                <unjar src="${library.directory.debian}/spin.jar" dest="${build.tmp}" />
+++                <unjar src="${library.directory.debian}/glazedlists.jar" dest="${build.tmp}" />
+++                <unjar src="${library.directory.debian}/microba.jar" dest="${build.tmp}" />
++             <delete dir="${build.tmp}/META-INF"/>
++          <!-- rename the microba license file -->
++-         <move file="${build.tmp}/license.txt" tofile="${build.tmp}/microba-license.txt"/>
+++         <!-- <move file="${build.tmp}/license.txt" tofile="${build.tmp}/microba-license.txt"/> -->
++         </target>
++ 
++ 
++@@ -447,6 +451,9 @@
++                                 <fileset dir="${library.directory}">
++                                         <include name="*.jar" />
++                                 </fileset>
+++                                <fileset dir="${library.directory.debian}">
+++                                        <include name="*.jar" />
+++                                </fileset>
++                         </classpath>
++                 </taskdef>
++                 <!-- allowed Pretty Much Done rulsets -->
++@@ -483,6 +490,9 @@
++                                 <fileset dir="${library.directory}">
++                                         <include name="*.jar" />
++                                 </fileset>
+++                                <fileset dir="${library.directory.debian}">
+++                                        <include name="*.jar" />
+++                                </fileset>
++                         </classpath>
++                 </taskdef>
++                 <cpd format="text" minimumTokenCount="100" outputFile="${build.dir}/duplicated_code_report.txt">
++@@ -500,6 +510,9 @@
++                                 <fileset dir="${library.directory}">
++                                         <include name="*.jar" />
++                                 </fileset>
+++                                <fileset dir="${library.directory.debian}">
+++                                        <include name="*.jar" />
+++                                </fileset>
++                         </classpath>
++                 </taskdef>
++                 <echo>Cyclomatic
++@@ -523,6 +536,9 @@
++                                 <fileset dir="${library.directory}">
++                                         <include name="*.jar" />
++                                 </fileset>
+++                                <fileset dir="${library.directory.debian}">
+++                                        <include name="*.jar" />
+++                                </fileset>
++                         </classpath>
++                 </taskdef>
++                 <jalopy fileformat="unix" convention="${src.dir}/java/jalopy.format.convention.xml" history="file" historymethod="adler32" loglevel="error" threads="2" classpathref="classpath" backup="bak">
++@@ -545,10 +561,10 @@
++                                 <pathelement location="${build.lib}/jabref.jar" />
++                                 <!--<pathelement location="${library.directory}/commons-httpclient-2.0.jar" />
++                                 <pathelement location="${library.directory}/commons-logging.jar" />-->
++-                                <pathelement location="${library.directory}/antlr.jar" />
++-                                <pathelement location="${library.directory}/looks-2.0.4.jar" />
++-                                <pathelement location="${library.directory}/looks-2.0.4.jar" />
++-                                <pathelement location="${library.directory}/spin-1.4.jar" />
+++                                <pathelement location="${library.directory.debian}/antlr.jar" />
+++                                <pathelement location="${library.directory.debian}/looks.jar" />
+++                                <pathelement location="${library.directory.debian}/forms.jar" />
+++                                <pathelement location="${library.directory.debian}/spin.jar" />
++                         </classpath>
++ 
++                         <!--<test name="tests.net.sf.jabref.export.layout.format.AuthorLastFirstAbbreviatorTester"/>-->
diff --combined debian/rules
index b0d93d1,0000000..864618b
mode 100755,000000..100755
--- /dev/null
@@@ -1,77 -1,0 +1,77 @@@
-       convert -geometry 16x16 src/images/JabRef-icon.png build/jabref16.xpm
 +#!/usr/bin/make -f
 +# -*- makefile -*-
 +# Sample debian/rules that uses debhelper.
 +# This file was originally written by Joey Hess and Craig Small.
 +# As a special exception, when this file is copied by dh-make into a
 +# dh-make output file, you may use that output file without restriction.
 +# This special exception was added by Craig Small in version 0.37 of dh-make.
 +
 +# Uncomment this to turn on verbose mode.
 +#export DH_VERBOSE=1
 +
 +include /usr/share/dpatch/dpatch.make
 +
 +configure: configure-stamp
 +configure-stamp:
 +      dh_testdir
 +      touch configure-stamp
 +
 +build: build-stamp patch
 +      ant compile unjarlib jars
 +      convert -geometry 32x32 src/images/JabRef-icon-48.png build/jabref32.xpm
++      convert -geometry 16x16 src/images/JabRef-icon-48.png build/jabref16.xpm
 +
 +build-stamp: configure-stamp 
 +      dh_testdir
 +      touch build-stamp
 +
 +clean: unpatch
 +      dh_testdir
 +      dh_testroot
 +      rm -f build-stamp configure-stamp
 +      if [ -d build ] ; then rm -r build; fi
 +      dh_clean 
 +
 +install: build
 +      dh_testdir
 +      dh_testroot
 +      dh_clean -k 
 +      dh_installdirs
 +                                                        
 +# Build architecture-independent files here.
 +binary-indep: build install
 +      dh_testdir
 +      dh_testroot
 +      dh_installchangelogs 
 +      dh_installdocs
 +#     dh_installexamples
 +      dh_install
 +      dh_installmenu
 +#     dh_installdebconf       
 +#     dh_installlogrotate
 +#     dh_installemacsen
 +#     dh_installpam
 +#     dh_installmime
 +#     dh_installinit
 +#     dh_installcron
 +#     dh_installinfo
 +      dh_installman
 +#     dh_link
 +#     dh_strip
 +      dh_compress
 +      dh_fixperms
 +#     dh_perl
 +#     dh_python
 +#     dh_makeshlibs
 +      dh_installdeb
 +#     dh_shlibdeps
 +      dh_gencontrol
 +      dh_md5sums
 +      dh_builddeb
 +
 +# Build architecture-dependent files here.
 +binary-arch: build install
 +# We have nothing to do.
 +
 +binary: binary-indep binary-arch
 +.PHONY: build clean binary-indep binary-arch binary install configure