[pkg-java] r9429 - in trunk/classpath/debian: . patches

Sat Aug 1 19:40:06 UTC 2009

Author: mkoch
Date: 2009-08-01 19:40:05 +0000 (Sat, 01 Aug 2009)
New Revision: 9429

Modified:
   trunk/classpath/debian/changelog
   trunk/classpath/debian/classpath-common.install
   trunk/classpath/debian/compat
   trunk/classpath/debian/control
   trunk/classpath/debian/patches/10_appletviewer.dpatch
   trunk/classpath/debian/patches/20_abstractbuttonicon.dpatch
   trunk/classpath/debian/rules
Log:
0.98-1 upload

Modified: trunk/classpath/debian/changelog
===================================================================

--- trunk/classpath/debian/changelog	2009-08-01 18:57:59 UTC (rev 9428)
+++ trunk/classpath/debian/changelog	2009-08-01 19:40:05 UTC (rev 9429)
@@ -1,3 +1,26 @@
+classpath (2:0.98-1) unstable; urgency=low
+
+  * New upstream release.
+    - fixes predictibility in PRNG.java (Closes: #512532).
+  * debian/classpath-common.install: Don't install gappletviewer.1.gz.
+    (Closes: #537290)
+  * debian/control:
+    - Build-Depend on debhelper (>= 5).
+    - Updated Standards-Version to 3.8.2.
+  * debian/rules:
+    - Enable examples.
+
+ -- Michael Koch <konqueror at gmx.de>  Tue, 28 Jul 2009 23:13:05 +0200
+
+classpath (2:0.97.2-1.1) unstable; urgency=high
+
+  * Non-maintainer upload.
+  * Redisable gcjwebplugin for all architectures, since the security
+    issues are not considered to be adequately resolved for lenny and the
+    icedtea-gcjwebplugin is now available (closes: #267040).
+
+ -- Sean Finney <seanius at debian.org>  Sun, 26 Oct 2008 21:45:32 +0100
+
 classpath (2:0.97.2-1) unstable; urgency=low
 
   * New upstream release.

Modified: trunk/classpath/debian/classpath-common.install
===================================================================
--- trunk/classpath/debian/classpath-common.install	2009-08-01 18:57:59 UTC (rev 9428)
+++ trunk/classpath/debian/classpath-common.install	2009-08-01 19:40:05 UTC (rev 9429)
@@ -16,7 +16,5 @@
 
 usr/lib/classpath/gappletviewer usr/lib/classpath
 
-usr/share/man/man1/gappletviewer.1
-
 usr/share/info/cp-tools.info
 usr/share/info/cp-vmintegration.info

Modified: trunk/classpath/debian/compat
===================================================================
--- trunk/classpath/debian/compat	2009-08-01 18:57:59 UTC (rev 9428)
+++ trunk/classpath/debian/compat	2009-08-01 19:40:05 UTC (rev 9429)
@@ -1 +1 @@
-4
+5

Modified: trunk/classpath/debian/control
===================================================================
--- trunk/classpath/debian/control	2009-08-01 18:57:59 UTC (rev 9428)
+++ trunk/classpath/debian/control	2009-08-01 19:40:05 UTC (rev 9429)
@@ -3,9 +3,9 @@
 Priority: optional
 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 [!alpha !arm !hppa !hurd-i386], gcj [!alpha !arm !hppa !hurd-i386], 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], iceape-dev (>=  1.1.9-5), libmagic-dev
+Build-Depends: debhelper (>= 5), ecj [!alpha !arm !hppa !hurd-i386], gcj [!alpha !arm !hppa !hurd-i386], 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], iceape-dev (>=  1.1.9-5), libmagic-dev
 Build-Depends-Indep: gjdoc (>= 0.7.9)
-Standards-Version: 3.7.3
+Standards-Version: 3.8.2
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/classpath
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/classpath
 Homepage: http://www.classpath.org/
@@ -130,14 +130,14 @@
  include GNU Java's classes from the classpath package in jikes' 
  bootclasspath.
 
-Package: gcjwebplugin
-Architecture: any
-Section: net
-Depends: ${shlibs:Depends}, cacao | jamvm
-XB-Npp-Applications: ec8030f7-c20a-464f-9b0e-13a3a9e97384, 92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a 
-XB-Npp-Name: GCJ Web Browser Plugin 
-XB-Npp-MimeType: application/x-java-vm, application/x-java-applet, application/x-java-applet;version=1.1, application/x-java-applet;version=1.1.1, application/x-java-applet;version=1.1.2, application/x-java-applet;version=1.1.3, application/x-java-applet;version=1.2, application/x-java-applet;version=1.2.1, application/x-java-applet;version=1.2.2, application/x-java-applet;version=1.3, application/x-java-applet;version=1.3.1, application/x-java-applet;version=1.4, application/x-java-applet;version=1.4.1, application/x-java-applet;version=1.4.2, application/x-java-applet;jpi-version=1.4.2_01, application/x-java-bean, application/x-java-bean;version=1.1, application/x-java-bean;version=1.1.1, application/x-java-bean;version=1.1.2, application/x-java-bean;version=1.1.3, application/x-java-bean;version=1.2, application/x-java-bean;version=1.2.1, application/x-java-bean;version=1.2.2, application/x-java-bean;version=1.3, application/x-java-bean;version=1.3.1, application/x-java-bean;version=1.4, application/x-java-bean;version=1.4.1, application/x-java-bean;version=1.4.2, application/x-java-bean;jpi-version=1.4.2_01
-Recommends: iceweasel | www-browser
-Description: web browser plugin to execute Java (tm) applets
- gcjwebplugin is a little web browser plugin to execute Java applets.
- It is targeted for Mozilla and compatible browsers that support the NPAPI.
+#Package: gcjwebplugin
+#Architecture: any
+#Section: net
+#Depends: ${shlibs:Depends}, cacao | jamvm
+#XB-Npp-Applications: ec8030f7-c20a-464f-9b0e-13a3a9e97384, 92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a 
+#XB-Npp-Name: GCJ Web Browser Plugin 
+#XB-Npp-MimeType: application/x-java-vm, application/x-java-applet, application/x-java-applet;version=1.1, application/x-java-applet;version=1.1.1, application/x-java-applet;version=1.1.2, application/x-java-applet;version=1.1.3, application/x-java-applet;version=1.2, application/x-java-applet;version=1.2.1, application/x-java-applet;version=1.2.2, application/x-java-applet;version=1.3, application/x-java-applet;version=1.3.1, application/x-java-applet;version=1.4, application/x-java-applet;version=1.4.1, application/x-java-applet;version=1.4.2, application/x-java-applet;jpi-version=1.4.2_01, application/x-java-bean, application/x-java-bean;version=1.1, application/x-java-bean;version=1.1.1, application/x-java-bean;version=1.1.2, application/x-java-bean;version=1.1.3, application/x-java-bean;version=1.2, application/x-java-bean;version=1.2.1, application/x-java-bean;version=1.2.2, application/x-java-bean;version=1.3, application/x-java-bean;version=1.3.1, application/x-java-bean;version=1.4, application/x-java-bean;version=1.4.1, application/x-java-bean;version=1.4.2, application/x-java-bean;jpi-version=1.4.2_01
+#Recommends: iceweasel | www-browser
+#Description: web browser plugin to execute Java (tm) applets
+# gcjwebplugin is a little web browser plugin to execute Java applets.
+# It is targeted for Mozilla and compatible browsers that support the NPAPI.

Modified: trunk/classpath/debian/patches/10_appletviewer.dpatch
===================================================================
--- trunk/classpath/debian/patches/10_appletviewer.dpatch	2009-08-01 18:57:59 UTC (rev 9428)
+++ trunk/classpath/debian/patches/10_appletviewer.dpatch	2009-08-01 19:40:05 UTC (rev 9429)
@@ -7,15 +7,15 @@
 @DPATCH@
 --- classpath/tools/gappletviewer.in.orig	2006-06-17 11:20:28.000000000 +0000
 +++ classpath/tools/gappletviewer.in	2006-06-11 14:46:00.000000000 +0000
-@@ -43,4 +43,10 @@
+@@ -44,4 +44,10 @@
  tools_dir=@datadir@/@PACKAGE@
  tools_cp=${tools_dir}/tools.zip
  
--exec @VM_BINARY@ -Xbootclasspath/p:"${tools_cp}" gnu.classpath.tools.appletviewer.Main "$@"
+-exec @JAVA@ -classpath "${tools_cp}" gnu.classpath.tools.appletviewer.Main "$@"
 +if [ -x /usr/bin/cacao ]; then
 +  JAVACMD=/usr/bin/cacao
 +else
 +  JAVACMD=/usr/bin/jamvm
 +fi
 +
-+exec $JAVACMD -Xbootclasspath/p:"${tools_cp}" gnu.classpath.tools.appletviewer.Main "$@"
++exec $JAVACMD -classpath "${tools_cp}" gnu.classpath.tools.appletviewer.Main "$@"

Modified: trunk/classpath/debian/patches/20_abstractbuttonicon.dpatch
===================================================================
--- trunk/classpath/debian/patches/20_abstractbuttonicon.dpatch	2009-08-01 18:57:59 UTC (rev 9428)
+++ trunk/classpath/debian/patches/20_abstractbuttonicon.dpatch	2009-08-01 19:40:05 UTC (rev 9429)
@@ -13,7 +13,7 @@
 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
+@@ -2035,6 +2035,9 @@ public abstract class AbstractButton ext
     * the "enabled" property is set to <code>true</code>; the mnemonic and
     * actionCommand properties are unchanged.</p>
     *
@@ -23,7 +23,7 @@
     * @param a An Action to configure the button from
     */
    protected void configurePropertiesFromAction(Action a)
-@@ -2046,8 +2049,11 @@ public abstract class AbstractButton ext
+@@ -2048,8 +2051,11 @@ public abstract class AbstractButton ext
        }
      else
        {

Modified: trunk/classpath/debian/rules
===================================================================
--- trunk/classpath/debian/rules	2009-08-01 18:57:59 UTC (rev 9428)
+++ trunk/classpath/debian/rules	2009-08-01 19:40:05 UTC (rev 9429)
@@ -34,7 +34,7 @@
 		--infodir=\$${prefix}/share/info \
 		--disable-dependency-tracking \
 		--with-glibj=both \
-		--disable-examples \
+		--enable-examples \
 		--with-gjdoc \
 		--enable-plugin \
 		--enable-qt-peer \
@@ -121,7 +121,7 @@
 	
 	# Move examples
 	mkdir -p $(CURDIR)/debian/tmp/usr/share/doc/classpath-doc
-#	mv $(CURDIR)/debian/tmp/usr/share/classpath/examples $(CURDIR)/debian/tmp/usr/share/doc/classpath-doc/examples
+	mv $(CURDIR)/debian/tmp/usr/share/classpath/examples $(CURDIR)/debian/tmp/usr/share/doc/classpath-doc/examples
 	
 	# Install javadocs
 	cp -r $(CURDIR)/doc/api/html $(CURDIR)/debian/tmp/usr/share/doc/classpath-doc/api


