Bug#480798: Don't build depend on libxul-dev
patch 480798 + patch
thanks
On Mon, May 12, 2008 at 09:07:24AM +0200, Mike Hommey wrote:
> Package: gcj-4.1
> Severity: wishlist
> User: glandium@debian.org
> Usertags: xulrunner-transition
>
> With the upcoming xulrunner transition, libxul-dev is going to disappear.
>
> I already sent instructions on what you should be doing in
> http://lists.debian.org/debian-release/2008/05/msg00009.html
>
> This bug report is mostly to help follow the transition going.
>
> FYI, I will start NMUing plugins and components next week, and will break
> the remaining packages by uploading xulrunner 1.9 in unstable on May 25.
>
> Though help will be appreciated, I'll also prepare updated packages for
> these during this week and next.
Here is the patch to implement the change. Please upload a new package
with the patch applied ASAP. Without action from your part within the
next week, I'll upload a NMU.
Thanks,
Mike
diff -u gcj-4.1-4.1.2/debian/patches/libjava-backport-updates2.dpatch gcj-4.1-4.1.2/debian/patches/libjava-backport-updates2.dpatch
--- gcj-4.1-4.1.2/debian/patches/libjava-backport-updates2.dpatch
+++ gcj-4.1-4.1.2/debian/patches/libjava-backport-updates2.dpatch
@@ -727,11 +727,11 @@
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
- echo "$as_me:$LINENO: checking for seamonkey-plugin" >&5
-echo $ECHO_N "checking for seamonkey-plugin... $ECHO_C" >&6
-+ echo "$as_me:$LINENO: checking for seamonkey-plugin seamonkey-xpcom" >&5
-+echo $ECHO_N "checking for seamonkey-plugin seamonkey-xpcom... $ECHO_C" >&6
++ echo "$as_me:$LINENO: checking for iceape-plugin iceape-xpcom" >&5
++echo $ECHO_N "checking for seamonkey-plugin iceape-xpcom... $ECHO_C" >&6
- if $PKG_CONFIG --exists "seamonkey-plugin" ; then
-+ if $PKG_CONFIG --exists "seamonkey-plugin seamonkey-xpcom" ; then
++ if $PKG_CONFIG --exists "iceape-plugin iceape-xpcom" ; then
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
succeeded=yes
@@ -739,14 +739,14 @@
echo "$as_me:$LINENO: checking MOZILLA_CFLAGS" >&5
echo $ECHO_N "checking MOZILLA_CFLAGS... $ECHO_C" >&6
- MOZILLA_CFLAGS=`$PKG_CONFIG --cflags "seamonkey-plugin"`
-+ MOZILLA_CFLAGS=`$PKG_CONFIG --cflags "seamonkey-plugin seamonkey-xpcom"`
++ MOZILLA_CFLAGS=`$PKG_CONFIG --cflags "iceape-plugin iceape-xpcom"`
echo "$as_me:$LINENO: result: $MOZILLA_CFLAGS" >&5
echo "${ECHO_T}$MOZILLA_CFLAGS" >&6
echo "$as_me:$LINENO: checking MOZILLA_LIBS" >&5
echo $ECHO_N "checking MOZILLA_LIBS... $ECHO_C" >&6
- MOZILLA_LIBS=`$PKG_CONFIG --libs "seamonkey-plugin"`
-+ MOZILLA_LIBS=`$PKG_CONFIG --libs "seamonkey-plugin seamonkey-xpcom"`
++ MOZILLA_LIBS=`$PKG_CONFIG --libs "iceape-plugin iceape-xpcom"`
echo "$as_me:$LINENO: result: $MOZILLA_LIBS" >&5
echo "${ECHO_T}$MOZILLA_LIBS" >&6
else
@@ -755,7 +755,7 @@
## If we have a custom action on failure, don't print errors, but
## do set a variable so people can do so.
- MOZILLA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "seamonkey-plugin"`
-+ MOZILLA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "seamonkey-plugin seamonkey-xpcom"`
++ MOZILLA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "iceape-plugin iceape-xpcom"`
fi
@@ -7635,7 +7635,7 @@
fi
if test "x${MOZILLA_FOUND}" = xno; then
- PKG_CHECK_MODULES(MOZILLA, seamonkey-plugin, [MOZILLA_FOUND=yes], [MOZILLA_FOUND=no])
-+ PKG_CHECK_MODULES(MOZILLA, seamonkey-plugin seamonkey-xpcom, [MOZILLA_FOUND=yes], [MOZILLA_FOUND=no])
++ PKG_CHECK_MODULES(MOZILLA, iceape-plugin iceape-xpcom, [MOZILLA_FOUND=yes], [MOZILLA_FOUND=no])
fi
PKG_CHECK_MODULES(GLIB, glib-2.0)
diff -u gcj-4.1-4.1.2/debian/control gcj-4.1-4.1.2/debian/control
--- gcj-4.1-4.1.2/debian/control
+++ gcj-4.1-4.1.2/debian/control
@@ -4,7 +4,7 @@
Maintainer: Debian GCC Maintainers <debian-gcc@lists.debian.org>
Uploaders: Matthias Klose <doko@debian.org>
Standards-Version: 3.7.2
-Build-Depends: dpkg-dev (>= 1.13.9), gcc-4.1-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], lib64z1-dev [i386 powerpc sparc s390], lib32z1-dev [amd64 ppc64 kfreebsd-amd64], libunwind7-dev (>= 0.98.5-6) [ia64], libatomic-ops-dev [ia64], m4, autoconf, autoconf2.13, automake1.9, libtool, autogen, gawk, expect-tcl8.3 [hppa], dejagnu [!none !hurd-i386], bzip2, binutils (>= 2.17cvs20070426) | binutils-multiarch (>= 2.17cvs20070426), binutils-hppa64 (>= 2.17cvs20070426) [hppa], debhelper (>= 5.0), gperf (>= 3.0.1), bison (>= 1:2.3), flex, gettext, texinfo (>= 4.3), zlib1g-dev, libmpfr-dev (>= 2.3.0~rc1.dfsg.1) [!avr], locales [!hurd-i386 !knetbsd-i386 !netbsd-i386 !m68k], procps [!hurd-i386], sharutils, libmagic-dev [!arm !armel !hppa !mips !mipsel !knetbsd-i386 !netbsd-i386], libasound2-dev [!arm !armel !hppa !mips !mipsel !knetbsd-i386 !netbsd-i386 !hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], libxtst-dev [!arm !armel !hppa !mips !mipsel !knetbsd-i386 !netbsd-i386], libxt-dev [!arm !armel !hppa !mips !mipsel !knetbsd-i386 !netbsd-i386], libgtk2.0-dev (>= 2.4.4-2) [!arm !armel !hppa !mips !mipsel !knetbsd-i386 !netbsd-i386], libart-2.0-dev [!arm !armel !hppa !mips !mipsel !knetbsd-i386 !netbsd-i386], libcairo2-dev [!arm !armel !hppa !mips !mipsel !knetbsd-i386 !netbsd-i386], libgconf2-dev [!arm !armel !hppa !mips !mipsel !knetbsd-i386 !netbsd-i386], libxul-dev [!armel !arm !m68k !mips !mipsel !knetbsd-i386 !netbsd-i386], fastjar [!arm !armel !hppa !mips !mipsel !knetbsd-i386 !netbsd-i386], ecj (>= 3.3.0-2) [!arm !armel !hppa !mips !mipsel !knetbsd-i386 !netbsd-i386], zip [!arm !armel !hppa !mips !mipsel !knetbsd-i386 !netbsd-i386], gcj-4.1 [!arm !armel !hppa !mips !mipsel !knetbsd-i386 !netbsd-i386], gcc-4.1-source (>= 4.1.2), gcc-4.1-source (<< 4.1.3), gcc-4.1 (>= 4.1.2), realpath (>= 1.9.12), chrpath, lsb-release, make (>= 3.81)
+Build-Depends: dpkg-dev (>= 1.13.9), gcc-4.1-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], lib64z1-dev [i386 powerpc sparc s390], lib32z1-dev [amd64 ppc64 kfreebsd-amd64], libunwind7-dev (>= 0.98.5-6) [ia64], libatomic-ops-dev [ia64], m4, autoconf, autoconf2.13, automake1.9, libtool, autogen, gawk, expect-tcl8.3 [hppa], dejagnu [!none !hurd-i386], bzip2, binutils (>= 2.17cvs20070426) | binutils-multiarch (>= 2.17cvs20070426), binutils-hppa64 (>= 2.17cvs20070426) [hppa], debhelper (>= 5.0), gperf (>= 3.0.1), bison (>= 1:2.3), flex, gettext, texinfo (>= 4.3), zlib1g-dev, libmpfr-dev (>= 2.3.0~rc1.dfsg.1) [!avr], locales [!hurd-i386 !knetbsd-i386 !netbsd-i386 !m68k], procps [!hurd-i386], sharutils, libmagic-dev [!arm !armel !hppa !mips !mipsel !knetbsd-i386 !netbsd-i386], libasound2-dev [!arm !armel !hppa !mips !mipsel !knetbsd-i386 !netbsd-i386 !hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], libxtst-dev [!arm !armel !hppa !mips !mipsel !knetbsd-i386 !netbsd-i386], libxt-dev [!arm !armel !hppa !mips !mipsel !knetbsd-i386 !netbsd-i386], libgtk2.0-dev (>= 2.4.4-2) [!arm !armel !hppa !mips !mipsel !knetbsd-i386 !netbsd-i386], libart-2.0-dev [!arm !armel !hppa !mips !mipsel !knetbsd-i386 !netbsd-i386], libcairo2-dev [!arm !armel !hppa !mips !mipsel !knetbsd-i386 !netbsd-i386], libgconf2-dev [!arm !armel !hppa !mips !mipsel !knetbsd-i386 !netbsd-i386], iceape-dev (>= 1.1.9-5) [!armel !arm !m68k !mips !mipsel !knetbsd-i386 !netbsd-i386], fastjar [!arm !armel !hppa !mips !mipsel !knetbsd-i386 !netbsd-i386], ecj (>= 3.3.0-2) [!arm !armel !hppa !mips !mipsel !knetbsd-i386 !netbsd-i386], zip [!arm !armel !hppa !mips !mipsel !knetbsd-i386 !netbsd-i386], gcj-4.1 [!arm !armel !hppa !mips !mipsel !knetbsd-i386 !netbsd-i386], gcc-4.1-source (>= 4.1.2), gcc-4.1-source (<< 4.1.3), gcc-4.1 (>= 4.1.2), realpath (>= 1.9.12), chrpath, lsb-release, make (>= 3.81)
Build-Depends-Indep: gjdoc
Package: gcj-4.1-base
diff -u gcj-4.1-4.1.2/debian/rules.conf gcj-4.1-4.1.2/debian/rules.conf
--- gcj-4.1-4.1.2/debian/rules.conf
+++ gcj-4.1-4.1.2/debian/rules.conf
@@ -132,7 +132,7 @@
endif
# plugin
JAVA_BUILD_DEP += libgconf2-dev [java_no_archs],
- JAVA_BUILD_DEP += libxul-dev [java_plugin_no_archs],
+ JAVA_BUILD_DEP += iceape-dev (>= 1.1.9-5) [java_plugin_no_archs],
JAVA_BUILD_DEP += fastjar [java_no_archs],
JAVA_BUILD_DEP += ecj (>= 3.3.0-2) [java_no_archs], zip [java_no_archs],
# gcj-4.1 needed for gjavah-4.1.
Reply to: