[pkg-java] r6255 - in trunk/classpath/debian: . patches
mkoch at alioth.debian.org
mkoch at alioth.debian.org
Fri Apr 25 13:33:05 UTC 2008
Author: mkoch
Date: 2008-04-25 13:33:03 +0000 (Fri, 25 Apr 2008)
New Revision: 6255
Added:
trunk/classpath/debian/patches/20_abstractbuttonicon.dpatch
Modified:
trunk/classpath/debian/
trunk/classpath/debian/changelog
trunk/classpath/debian/control
trunk/classpath/debian/patches/00list
Log:
classpath (2:0.97.1-1) unstable; urgency=low
* New upstream release
- Disable javadoc generation for jsr166 code. This breaks with current
gjdoc.
* Re-add conditional for Alsa dependencies. Closes: #468851.
* Added patch from Petter Reinholdtsen to fix Swing buttons.
-- Michael Koch <konqueror at gmx.de> Wed, 16 Apr 2008 07:46:14 +0200
Property changes on: trunk/classpath/debian
___________________________________________________________________
Name: svn:ignore
- classpath
classpath-doc
classpath-gtkpeer
classpath-qtpeer
gcjwebplugin
jikes-classpath
tmp
files
classpath-common-unzipped
classpath-common
classpath.substvars
classpath-gtkpeer.substvars
classpath-qtpeer.substvars
gcjwebplugin.substvars
patched
+ classpath
classpath-doc
classpath-gtkpeer
classpath-qtpeer
gcjwebplugin
jikes-classpath
tmp
files
classpath-common-unzipped
classpath-common
patched
*.debhelper.log
*.substvars
Modified: trunk/classpath/debian/changelog
===================================================================
--- trunk/classpath/debian/changelog 2008-04-25 12:25:08 UTC (rev 6254)
+++ trunk/classpath/debian/changelog 2008-04-25 13:33:03 UTC (rev 6255)
@@ -1,9 +1,12 @@
-classpath (2:0.97.1-1) UNRELEASED; urgency=low
+classpath (2:0.97.1-1) unstable; urgency=low
* New upstream release
+ - Disable javadoc generation for jsr166 code. This breaks with current
+ gjdoc.
* Re-add conditional for Alsa dependencies. Closes: #468851.
+ * Added patch from Petter Reinholdtsen to fix Swing buttons.
- -- Michael Koch <konqueror at gmx.de> Sat, 12 Apr 2008 21:02:15 +0200
+ -- Michael Koch <konqueror at gmx.de> Wed, 16 Apr 2008 07:46:14 +0200
classpath (2:0.97-1) unstable; urgency=low
Modified: trunk/classpath/debian/control
===================================================================
--- trunk/classpath/debian/control 2008-04-25 12:25:08 UTC (rev 6254)
+++ trunk/classpath/debian/control 2008-04-25 13:33:03 UTC (rev 6255)
@@ -4,7 +4,7 @@
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Michael Koch <konqueror at gmx.de>, Arnaud Vandyck <avdyk at debian.org>, John Leuner <jewel at debian.org>
Build-Depends: debhelper (>= 4.0.0), ecj, zip, libgtk2.0-dev, libgconf2-dev, libart-2.0-dev, libx11-dev, libice-dev, libxt-dev, libxtst-dev, libasound2-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], libcairo2-dev, dpatch, libqt4-dev (>= 4.1.0), dssi-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], ladspa-sdk, libjack0.100.0-dev, libxul-dev, libmagic-dev, gcj
-Build-Depends-Indep: gjdoc (>= 0.7.5-4)
+Build-Depends-Indep: gjdoc (>= 0.7.9)
Standards-Version: 3.7.3
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/classpath
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/classpath
Modified: trunk/classpath/debian/patches/00list
===================================================================
--- trunk/classpath/debian/patches/00list 2008-04-25 12:25:08 UTC (rev 6254)
+++ trunk/classpath/debian/patches/00list 2008-04-25 13:33:03 UTC (rev 6255)
@@ -1 +1,2 @@
10_appletviewer.dpatch
+20_abstractbuttonicon.dpatch
Added: trunk/classpath/debian/patches/20_abstractbuttonicon.dpatch
===================================================================
--- trunk/classpath/debian/patches/20_abstractbuttonicon.dpatch (rev 0)
+++ trunk/classpath/debian/patches/20_abstractbuttonicon.dpatch 2008-04-25 13:33:03 UTC (rev 6255)
@@ -0,0 +1,59 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 20_abstractbuttonicon by Petter Reinholdtsen
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Only show icon when both icon and text is available for an
+## DP: abstractbutton, to match the behaviour of SUN Java.
+
+ at DPATCH@
+Index: classpath/javax/swing/AbstractButton.java
+===================================================================
+RCS file: /sources/classpath/classpath/javax/swing/AbstractButton.java,v
+retrieving revision 1.69
+diff -u -3 -p -u -r1.69 AbstractButton.java
+--- classpath/javax/swing/AbstractButton.java 16 Oct 2006 12:23:33 -0000 1.69
++++ classpath/javax/swing/AbstractButton.java 20 Apr 2008 15:09:01 -0000
+@@ -2033,6 +2033,9 @@ public abstract class AbstractButton ext
+ * the "enabled" property is set to <code>true</code>; the mnemonic and
+ * actionCommand properties are unchanged.</p>
+ *
++ * <p>If the icon is set, it is displayed instead of the NAME
++ * test.</p>
++ *
+ * @param a An Action to configure the button from
+ */
+ protected void configurePropertiesFromAction(Action a)
+@@ -2046,8 +2049,11 @@ public abstract class AbstractButton ext
+ }
+ else
+ {
+- setText((String) (a.getValue(Action.NAME)));
+- setIcon((Icon) (a.getValue(Action.SMALL_ICON)));
++ Icon icon = (Icon) a.getValue(Action.SMALL_ICON);
++ if (null != icon)
++ setIcon(icon);
++ else
++ setText((String) (a.getValue(Action.NAME)));
+ setEnabled(a.isEnabled());
+ setToolTipText((String) (a.getValue(Action.SHORT_DESCRIPTION)));
+ if (a.getValue(Action.MNEMONIC_KEY) != null)
+Index: classpath/javax/swing/JMenuItem.java
+===================================================================
+RCS file: /sources/classpath/classpath/javax/swing/JMenuItem.java,v
+retrieving revision 1.35
+diff -u -3 -p -u -r1.35 JMenuItem.java
+--- classpath/javax/swing/JMenuItem.java 13 Oct 2006 08:51:30 -0000 1.35
++++ classpath/javax/swing/JMenuItem.java 20 Apr 2008 15:09:01 -0000
+@@ -292,6 +292,12 @@ public class JMenuItem extends AbstractB
+
+ if (! (this instanceof JMenu) && action != null)
+ {
++ /**
++ * Make sure menus always have the label, while
++ * AbstractButtons only have a label when no icon is set
++ */
++ setText((String) (action.getValue(Action.NAME)));
++
+ setAccelerator((KeyStroke) (action.getValue(Action.ACCELERATOR_KEY)));
+ if (accelerator != null)
+ super.registerKeyboardAction(action, accelerator,
More information about the pkg-java-commits
mailing list