Bug#480800: Don't build depend on libxul-dev
On Sat, May 17, 2008 at 09:51:59AM +0200, Mike Hommey wrote:
> tag 480800 + patch
> thanks
>
> On Mon, May 12, 2008 at 09:07:24AM +0200, Mike Hommey wrote:
> > Package: gcj-4.2
> > 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. Though untested, it should
> work. Note that it would still generate unexpected output if xulrunner-1.9
> happens to be installed during the build. Maybe a Build-Conflict would
> be good to add.
>
> Anyways, please upload a new package with the patch applied ASAP. Without
> action from your part within the next week, I'll upload a NMU.
Better with the patch actually attached...
Mike
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
@@ -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.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, expect-tcl8.3 [hppa], 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], 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], libxul-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, expect-tcl8.3 [hppa], 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], 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], iceape-dev (>= 1.1.9-5) [!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
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
@@ -144,7 +144,7 @@
ifeq ($(java_plugin_backend),xulrunner-1.9)
JAVA_BUILD_DEP += xulrunner-1.9-dev [java_plugin_no_archs],
else
- JAVA_BUILD_DEP += libxul-dev [java_plugin_no_archs],
+ JAVA_BUILD_DEP += iceape-dev (>= 1.1.9-5) [java_plugin_no_archs],
endif
JAVA_BUILD_DEP += g++-4.2 [armel],
endif
Reply to: