[jabref] 42/459: * Apply patch from Matthias Klose to enable building with a free java compiler - thanks! (Closes: #383006) * Change build dependencies accordingly.
gregor herrmann
gregoa at debian.org
Thu Sep 15 20:39:37 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 95028f15fe0ddcf9cd3f0870d6de7ffb68b191e3
Author: gregor herrmann <gregoa at debian.org>
Date: Sun Sep 24 13:53:11 2006 +0000
* Apply patch from Matthias Klose to enable building with a free java compiler -
thanks! (Closes: #383006)
* Change build dependencies accordingly.
---
debian/changelog | 8 +++++
debian/control | 4 +--
debian/patches/00list | 1 +
debian/patches/01_free_javac.dpatch | 58 +++++++++++++++++++++++++++++++++++++
debian/rules | 12 ++++----
5 files changed, 75 insertions(+), 8 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index daa2d34..a2d9583 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+jabref (2.1-4) unstable; urgency=low
+
+ * Apply patch from Matthias Klose to enable building with a free java compiler -
+ thanks! (Closes: #383006)
+ * Change build dependencies accordingly.
+
+ -- gregor herrmann <gregor+debian at comodo.priv.at> Sun, 24 Sep 2006 15:09:38 +0200
+
jabref (2.1-3) unstable; urgency=low
* Change menu section to "Apps/Databases" and remove lintian override.
diff --git a/debian/control b/debian/control
index 832de98..3c46bb3 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: contrib/tex
Priority: optional
Maintainer: gregor herrmann <gregor+debian at comodo.priv.at>
Uploaders: tony mancill <tmancill at debian.org>
-Build-Depends: debhelper (>= 5.0.0)
-Build-Depends-Indep: sun-java5-jdk | j2sdk1.4 | j2sdk1.5 | sun-j2sdk1.5, ant, imagemagick
+Build-Depends: debhelper (>= 5.0.0), dpatch
+Build-Depends-Indep: java-gcj-compat-dev, ant, imagemagick
Standards-Version: 3.7.2
Package: jabref
diff --git a/debian/patches/00list b/debian/patches/00list
new file mode 100644
index 0000000..2a20555
--- /dev/null
+++ b/debian/patches/00list
@@ -0,0 +1 @@
+01_free_javac
diff --git a/debian/patches/01_free_javac.dpatch b/debian/patches/01_free_javac.dpatch
new file mode 100755
index 0000000..f5cb953
--- /dev/null
+++ b/debian/patches/01_free_javac.dpatch
@@ -0,0 +1,58 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_free_javac.dpatch by <gregor+debian at 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
+
+ at 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;
+ import com.jgoodies.looks.FontSet;
+ import com.jgoodies.looks.FontSets;
+ import com.jgoodies.looks.FontPolicy;
+@@ -624,27 +623,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);
+- }
+-
+- //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;
diff --git a/debian/rules b/debian/rules
index caceddf..b0d93d1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,23 +9,23 @@
# 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
-
-build-stamp: configure-stamp
- dh_testdir
+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.png build/jabref16.xpm
+build-stamp: configure-stamp
+ dh_testdir
touch build-stamp
-clean:
+clean: unpatch
dh_testdir
dh_testroot
rm -f build-stamp configure-stamp
--
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