diff -u classpath-0.97.2/debian/control classpath-0.97.2/debian/control --- classpath-0.97.2/debian/control +++ classpath-0.97.2/debian/control @@ -1,9 +1,10 @@ Source: classpath Section: libs Priority: optional -Maintainer: Debian Java Maintainers +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Debian Java Maintainers Uploaders: Michael Koch , Arnaud Vandyck , John Leuner -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 (>= 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], libmagic-dev, libxul-dev Build-Depends-Indep: gjdoc (>= 0.7.9) Standards-Version: 3.7.3 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/classpath @@ -134,10 +135,10 @@ #Architecture: any #Section: net #Depends: ${shlibs:Depends}, cacao | jamvm +#Recommends: firefox | abrowser | www-browser #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 +#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 #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. diff -u classpath-0.97.2/debian/changelog classpath-0.97.2/debian/changelog --- classpath-0.97.2/debian/changelog +++ classpath-0.97.2/debian/changelog @@ -1,3 +1,18 @@ +classpath (2:0.97.2-1.1ubuntu1) jaunty; urgency=low + + * Merge from debian unstable (LP: #309549)(LP: #237668), remaining changes: + * debian/control: + - Recommend firefox instead of mozilla-firefox. + * Fix FTBFS caused by -Werror where return value of 'chdir' was ignored + - add debian/patches/20_fix_ftbfs_warn_unused_result.dpatch + - update debian/patches/00list + * fix LP: #272772: packages that Depend/Recommend/Suggest firefox + (meta-package) must alternatively Depend/Recommend/Suggest abrowser + * Fix FTBFS due to missing mozilla-plugin build dependency + - changed to build-depends on libxul-dev instead of iceape-dev + + -- Manny Vindiola Thu, 18 Dec 2008 21:24:48 -0500 + classpath (2:0.97.2-1.1) unstable; urgency=high * Non-maintainer upload. @@ -59,6 +74,33 @@ -- Michael Koch Wed, 27 Feb 2008 23:26:22 +0100 +classpath (2:0.96.1-1ubuntu3) intrepid; urgency=low + + * Fix FTBFS caused by -Werror where return value of 'chdir' was ignored + - add debian/patches/20_fix_ftbfs_warn_unused_result.dpatch + - update debian/patches/00list + + -- Fabien Tassin Sun, 21 Sep 2008 23:09:31 +0200 + +classpath (2:0.96.1-1ubuntu2) intrepid; urgency=low + + * fix LP: #272772: packages that Depend/Recommend/Suggest firefox + (meta-package) must alternatively Depend/Recommend/Suggest abrowser + - update debian/control + + -- Fabien Tassin Sun, 21 Sep 2008 22:19:51 +0200 + +classpath (2:0.96.1-1ubuntu1) hardy; urgency=low + + * Merge from Debian unstable (LP: #164854), remaining changes: + - debian/control: + + Add XB-Npp-xxx tags + + Update Maintainer field + * debian/control: + + Recommend firefox instead of mozilla-firefox. + + -- Michael Bienia Sat, 12 Jan 2008 18:55:51 +0100 + classpath (2:0.96.1-1) unstable; urgency=low * New upstream release. @@ -105,6 +147,25 @@ -- Michael Koch Sat, 17 Feb 2007 08:56:00 +0100 +classpath (2:0.92-4ubuntu2) gutsy; urgency=low + + * Add /usr/include/xulrunner to CLASSPATH_INCLUDES in configure + * And MOZILLA_CFLAGS + + -- Barry deFreese Fri, 28 Sep 2007 16:09:59 -0400 + +classpath (2:0.92-4ubuntu1) gutsy; urgency=low + + Remaining ubuntu changes: + * debian/control: added Xb-Npp-xxx tags accordingly to "firefox distro + add-on suport" spec, + (https://blueprints.launchpad.net/ubuntu/+spec/firefox-distro-addon-support) + * debian/control: use Maintainer: Ubuntu MOTU Developers + and XSBC-Original-Maintainer: Debian Java + Maintainers . + + -- Hilario Montoliu Sat, 18 Aug 2007 18:07:46 +0000 + classpath (2:0.92-4) unstable; urgency=low * Include /usr/lib/classpath/libgconfpeer.so.0.0.0 (Closes: #387318). diff -u classpath-0.97.2/debian/patches/00list classpath-0.97.2/debian/patches/00list --- classpath-0.97.2/debian/patches/00list +++ classpath-0.97.2/debian/patches/00list @@ -2,0 +3 @@ +90_fix_ftbfs_warn_unused_result.dpatch only in patch2: unchanged: --- classpath-0.97.2.orig/debian/patches/90_fix_ftbfs_warn_unused_result.dpatch +++ classpath-0.97.2/debian/patches/90_fix_ftbfs_warn_unused_result.dpatch @@ -0,0 +1,29 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 20_fix_ftbfs_warn_unused_result.dpatch by Fabien Tassin +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Adds runtime selection of the runtime to the appletviewer tool + +@DPATCH@ +--- classpath/native/jni/native-lib/cpproc.c.orig ++++ classpath/native/jni/native-lib/cpproc.c +@@ -81,17 +81,18 @@ + dup2(local_fds[3], 1); + if (pipe_count == 3) + dup2(local_fds[5], 2); + else + dup2(1, 2); + + close_all_fds(local_fds, pipe_count * 2); + +- chdir(wd); ++ if (chdir(wd) != 0) ++ return errno; + if (newEnviron == NULL) + execvp(commandLine[0], commandLine); + else + execve(commandLine[0], commandLine, newEnviron); + + abort(); + + break;