diff -u gcj-4.2-4.2.3/debian/control gcj-4.2-4.2.3/debian/control --- gcj-4.2-4.2.3/debian/control +++ gcj-4.2-4.2.3/debian/control @@ -5,7 +5,7 @@ XSBC-Original-Maintainer: Debian GCC Maintainers Uploaders: Matthias Klose Standards-Version: 3.7.2 -Build-Depends: dpkg-dev (>= 1.14.15), debhelper (>= 5.0.62), gcc-multilib [amd64 i386 powerpc ppc64 s390 sparc kfreebsd-amd64], libc6.1-dev (>= 2.5) [alpha ia64] | libc0.3-dev (>= 2.5) [hurd-i386] | libc0.1-dev (>= 2.5) [kfreebsd-i386 kfreebsd-amd64 knetbsd-gnu] | libc12-dev (>= 2.5) [netbsd-elf-gnu] | libc6-dev (>= 2.5), libc6-dev-amd64 [i386], libc6-dev-sparc64 [sparc], libc6-dev-s390x [s390], libc6-dev-i386 [amd64], libc6-dev-powerpc [ppc64], libc6-dev-ppc64 [powerpc], libc0.1-dev-i386 [kfreebsd-amd64], lib32gcc1 [amd64 ppc64 kfreebsd-amd64], lib64gcc1 [i386 powerpc sparc s390], libunwind7-dev (>= 0.98.5-6) [ia64], libatomic-ops-dev [ia64], m4, autoconf, autoconf2.13, automake1.9, libtool, autogen, gawk, dejagnu [!none !hurd-i386], lzma, binutils (>= 2.17cvs20070426) | binutils-multiarch (>= 2.17cvs20070426), binutils-hppa64 (>= 2.17cvs20070426) [hppa], gperf (>= 3.0.1), bison (>= 1:2.3), flex, gettext, texinfo (>= 4.3), locales [!hurd-i386 !knetbsd-i386 !netbsd-i386 !m68k], procps [!hurd-i386], sharutils, libz-dev, fastjar [!knetbsd-i386 !netbsd-i386], libmagic-dev [!knetbsd-i386 !netbsd-i386], libecj-java (>= 3.3.0-2) [!knetbsd-i386 !netbsd-i386], zip [!knetbsd-i386 !netbsd-i386], gcj-4.2 [amd64 i386 powerpc], ecj (>= 3.3.0-2) [!knetbsd-i386 !netbsd-i386], libasound2-dev [!knetbsd-i386 !netbsd-i386 !hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], libxtst-dev [!knetbsd-i386 !netbsd-i386], libxt-dev [!knetbsd-i386 !netbsd-i386], libgtk2.0-dev (>= 2.4.4-2) [!knetbsd-i386 !netbsd-i386], libart-2.0-dev [!knetbsd-i386 !netbsd-i386], libcairo2-dev [!knetbsd-i386 !netbsd-i386], libgconf2-dev [!knetbsd-i386 !netbsd-i386], firefox-dev [!armel !arm !m68k !mips !mipsel !knetbsd-i386 !netbsd-i386 !hurd-i386], g++-4.2 [armel], gcc-4.2-source (>= 4.2.3), gcc-4.2-source (<< 4.2.4), realpath (>= 1.9.12), chrpath, lsb-release, make (>= 3.81) +Build-Depends: dpkg-dev (>= 1.14.15), debhelper (>= 5.0.62), gcc-multilib [amd64 i386 powerpc ppc64 s390 sparc kfreebsd-amd64], libc6.1-dev (>= 2.5) [alpha ia64] | libc0.3-dev (>= 2.5) [hurd-i386] | libc0.1-dev (>= 2.5) [kfreebsd-i386 kfreebsd-amd64 knetbsd-gnu] | libc12-dev (>= 2.5) [netbsd-elf-gnu] | libc6-dev (>= 2.5), libc6-dev-amd64 [i386], libc6-dev-sparc64 [sparc], libc6-dev-s390x [s390], libc6-dev-i386 [amd64], libc6-dev-powerpc [ppc64], libc6-dev-ppc64 [powerpc], libc0.1-dev-i386 [kfreebsd-amd64], lib32gcc1 [amd64 ppc64 kfreebsd-amd64], lib64gcc1 [i386 powerpc sparc s390], libunwind7-dev (>= 0.98.5-6) [ia64], libatomic-ops-dev [ia64], m4, autoconf, autoconf2.13, automake1.9, libtool, autogen, gawk, dejagnu [!none !hurd-i386], lzma, binutils (>= 2.17cvs20070426) | binutils-multiarch (>= 2.17cvs20070426), binutils-hppa64 (>= 2.17cvs20070426) [hppa], gperf (>= 3.0.1), bison (>= 1:2.3), flex, gettext, texinfo (>= 4.3), locales [!hurd-i386 !knetbsd-i386 !netbsd-i386 !m68k], procps [!hurd-i386], sharutils, libz-dev, fastjar [!knetbsd-i386 !netbsd-i386], libmagic-dev [!knetbsd-i386 !netbsd-i386], libecj-java (>= 3.3.0-2) [!knetbsd-i386 !netbsd-i386], zip [!knetbsd-i386 !netbsd-i386], gcj-4.2 [amd64 i386 powerpc], ecj (>= 3.3.0-2) [!knetbsd-i386 !netbsd-i386], libasound2-dev [!knetbsd-i386 !netbsd-i386 !hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], libxtst-dev [!knetbsd-i386 !netbsd-i386], libxt-dev [!knetbsd-i386 !netbsd-i386], libgtk2.0-dev (>= 2.4.4-2) [!knetbsd-i386 !netbsd-i386], libart-2.0-dev [!knetbsd-i386 !netbsd-i386], libcairo2-dev [!knetbsd-i386 !netbsd-i386], libgconf2-dev [!knetbsd-i386 !netbsd-i386], xulrunner-1.9-dev [!armel !arm !m68k !mips !mipsel !knetbsd-i386 !netbsd-i386 !hurd-i386], g++-4.2 [armel], gcc-4.2-source (>= 4.2.3), gcc-4.2-source (<< 4.2.4), realpath (>= 1.9.12), chrpath, lsb-release, make (>= 3.81) Build-Depends-Indep: gjdoc Package: gcj-4.2-base @@ -95,7 +95,7 @@ Section: web Architecture: any Priority: optional -Depends: gcj-4.2-base (= ${gcj:Version}), gappletviewer-4.2 (= ${gcj:Version}), ${shlibs:Depends}, firefox | mozilla-browser | epiphany-browser | galeon | konqueror +Depends: gcj-4.2-base (= ${gcj:Version}), gappletviewer-4.2 (= ${gcj:Version}), ${shlibs:Depends}, xulrunner-1.9 Description: Web browser plugin to execute Java (tm) applets gcjwebplugin is a little web browser plugin to execute Java (tm) applets. It is targeted for Mozilla and compatible browsers that support the NPAPI. diff -u gcj-4.2-4.2.3/debian/rules.patch gcj-4.2-4.2.3/debian/rules.patch --- gcj-4.2-4.2.3/debian/rules.patch +++ gcj-4.2-4.2.3/debian/rules.patch @@ -42,6 +42,7 @@ libstdc++-doxygen \ libjava-stacktrace \ libjava-subdir \ + libjava-classpath-xul1.9 \ libjava-jnipath \ libjava-sjlj \ libjava-rpath \ diff -u gcj-4.2-4.2.3/debian/changelog gcj-4.2-4.2.3/debian/changelog --- gcj-4.2-4.2.3/debian/changelog +++ gcj-4.2-4.2.3/debian/changelog @@ -1,3 +1,14 @@ +gcj-4.2 (4.2.3-1ubuntu3~asac1) hardy; urgency=low + + * add xulrunner-1.9 patch + - add debian/patches/libjava-classpath-xul1.9.dpatch + - update debian/rules + * use proper xulrunner-1.9 dependencies + - update debian/control (switch build-depends and depends) + - update debian/rules (switch install directory to xulrunner-addons only) + + -- Alexander Sack Mon, 11 Feb 2008 13:52:49 +0000 + gcj-4.2 (4.2.3-1ubuntu2) hardy; urgency=low * Upload as gcj-4.3, based on gcc-4.2_4.2.3-1ubuntu2. diff -u gcj-4.2-4.2.3/debian/README.Debian gcj-4.2-4.2.3/debian/README.Debian --- gcj-4.2-4.2.3/debian/README.Debian +++ gcj-4.2-4.2.3/debian/README.Debian @@ -35,12 +35,26 @@ Patches that Ubuntu applied in this version: svn-updates: - updates from the 4.2 branch upto 20080114. + updates from the 4.2 branch upto 20080208. + +svn-doc-updates: + updates from the 4.2 branch upto 20080207 (documentation). rename-info-files: Allow transformations on info file names. Reference the transformed info file names in the texinfo files. +gcc-directives-only-doc: + Backport from trunk: -fdirectives-only (when preprocessing, + handle directives, but do not expand macros). + documentation changes + +sparc-niagara2-doc: + Add niagara2 optimization support + +i386-biarch-doc: + biarch patches for i386/x86_64 + gcc-version: Add package identification to the gcc version string @@ -71,6 +85,10 @@ - Set the libjava sublibdir to /usr/lib/gcj-4.2 - Set the default libgcj database dir to /var/lib/gcj-4.2 +libjava-classpath-xul1.9: + - Set the libjava sublibdir to /usr/lib/gcj-4.2 + - Set the default libgcj database dir to /var/lib/gcj-4.2 + libjava-jnipath: - Add /usr/lib/jni to java.library.path. - When running the i386 binaries on amd64, look in @@ -222,6 +240,9 @@ mips-libspec: mips*-linux: Always imply -lpthread for -pthread +pr34688: + Fix PR middle-end/34688 + gcc-d-lang: Add D options and specs for the gcc driver. @@ -268,4 +289,6 @@ -amd64-biarch: - Set MULTILIB_OSDIRNAMES to the correct multilib path names for amd64. - - +i386-biarch: + biarch patches for i386/x86_64 + +disable-configure-run-check: + don't bogusly check if the 64bit binaries also work, + which does break on 32bit kernels. diff -u gcj-4.2-4.2.3/debian/rules.conf gcj-4.2-4.2.3/debian/rules.conf --- gcj-4.2-4.2.3/debian/rules.conf +++ gcj-4.2-4.2.3/debian/rules.conf @@ -149,7 +149,7 @@ ifeq ($(distribution),Debian) JAVA_BUILD_DEP += libxul-dev [java_plugin_no_archs], else - JAVA_BUILD_DEP += firefox-dev [java_plugin_no_archs], + JAVA_BUILD_DEP += xulrunner-1.9-dev [java_plugin_no_archs], endif JAVA_BUILD_DEP += g++-4.2 [armel], endif diff -u gcj-4.2-4.2.3/debian/rules.parameters gcj-4.2-4.2.3/debian/rules.parameters --- gcj-4.2-4.2.3/debian/rules.parameters +++ gcj-4.2-4.2.3/debian/rules.parameters @@ -2,9 +2,9 @@ GCC_VERSION := 4.2.3 NEXT_GCC_VERSION := 4.2.4 BASE_VERSION := 4.2 -SOURCE_VERSION := 4.2.3-1ubuntu2 -DEB_VERSION := 4.2.3-1ubuntu2 -DEB_EVERSION := 1:4.2.3-1ubuntu2 +SOURCE_VERSION := 4.2.3-1ubuntu3 +DEB_VERSION := 4.2.3-1ubuntu3 +DEB_EVERSION := 1:4.2.3-1ubuntu3 GPC_BASE_VERSION := GDC_BASE_VERSION := DEB_GPC_VERSION := @@ -12,7 +12,7 @@ DEB_SOVERSION := 4.2.1 DEB_SOEVERSION := 1:4.2.1 DEB_LIBGCC_SOVERSION := 1:4.2.1 -DEB_LIBGCC_VERSION := 1:4.2.3-1ubuntu2 +DEB_LIBGCC_VERSION := 1:4.2.3-1ubuntu3 DEB_STDCXX_SOVERSION := 4.2.1 DEB_GCJ_SOVERSION := 4.2.1 PKG_GCJ_EXT := 8 diff -u gcj-4.2-4.2.3/debian/rules.defs gcj-4.2-4.2.3/debian/rules.defs --- gcj-4.2-4.2.3/debian/rules.defs +++ gcj-4.2-4.2.3/debian/rules.defs @@ -346,7 +346,7 @@ with_java_maintainer_mode := yes with_java_maintainer_mode := no -browser_plugin_dirs = firefox iceape iceweasel mozilla midbrowser xulrunner firefox-plugins +browser_plugin_dirs = xulrunner-addons # used as well in debian/rules.conf to determine the build deps java_awt_peers = gtk # qt # xlib only in patch2: unchanged: --- gcj-4.2-4.2.3.orig/debian/patches/libjava-classpath-xul1.9.dpatch +++ gcj-4.2-4.2.3/debian/patches/libjava-classpath-xul1.9.dpatch @@ -0,0 +1,40 @@ +#! /bin/sh -e + +# DP: - Set the libjava sublibdir to /usr/lib/gcj-4.2 +# DP: - Set the default libgcj database dir to /var/lib/gcj-4.2 + +dir= +if [ $# -eq 3 -a "$2" = '-d' ]; then + pdir="-d $3" + dir="$3/" +elif [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) + patch $pdir -f --no-backup-if-mismatch -p0 < $0 + cd ${dir}libjava && aclocal -I ../config -I .. -I . && cd classpath && autoconf + ;; + -unpatch) + patch $pdir -f --no-backup-if-mismatch -R -p0 < $0 + rm -f ${dir}libjava/classpath/configure + ;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +esac +exit 0 + + +--- libjava/classpath/configure.ac.orig 2008-02-11 13:45:20.000000000 +0000 ++++ libjava/classpath/configure.ac 2008-02-11 13:45:57.000000000 +0000 +@@ -702,7 +702,7 @@ + + dnl Check for plugin support headers and libraries. + if test "x${COMPILE_PLUGIN}" = xyes; then +- PKG_CHECK_MODULES(MOZILLA, mozilla-plugin, [MOZILLA_FOUND=yes], [MOZILLA_FOUND=no]) ++ PKG_CHECK_MODULES(MOZILLA, mozilla-plugin libxul-unstable, [MOZILLA_FOUND=yes], [MOZILLA_FOUND=no]) + if test "x${MOZILLA_FOUND}" = xno; then + PKG_CHECK_MODULES(MOZILLA, firefox-plugin firefox-xpcom, [MOZILLA_FOUND=yes], [MOZILLA_FOUND=no]) + fi