[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: RFS: java-gnome 4.0.13-3



On Tue, Sep 22, 2009 at 03:53:43PM +0530, Onkar Shinde wrote:
> On Tue, Sep 22, 2009 at 3:21 PM, Michael Koch <konqueror@gmx.de> wrote:
> > On Tue, Sep 22, 2009 at 02:50:23PM +0530, Onkar Shinde wrote:
> >> Hi all,
> >>
> >> I am looking for sponsorship for java-gnome 4.0.13-3. This revision
> >> should fix FTBFS on Debian buildd.
> >>
> >> The latest changelog entry for reference.
> >> java-gnome (4.0.13-3) unstable; urgency=low
> >>
> >>   * debian/rules
> >>     - Do not build docs on anything other than i386, amd64, powerpc.
> >>       Fixes FTBFS on Debian as well as Ubuntu buildd.
> >
> > I have a bit of headache with this change. Cant you just disable the doc build?
> > buildd normally only call binary-arch target, not binary-indep target of
> > debian/rules. You can test this on your local machine debuild/dpkg-buildpackge -B
> > when building. I know that in Ubuntu one buildd does all the arch-indep builds.
> > I think it was i386 or amd64. So this should work. An it saves some resources
> > on the buildds. Your solution is more a mess then a solution to me.
> 
> I discussed this in the Ubuntu MOTU IRC channel (assuming there are
> some people who know about both Debian and Ubuntu buildd).[1] I was
> told that
> ideally I should have 'make doc' target called from build-indep, but
> this doesn't work in practice as dpkg-buildpackage always calls both
> build-arch and build-indep targets.
> So I tried following Steve Langasek's suggestion of adding 'make doc'
> in binary-indep. But then the screenshots generated are somehow ugly
> for reason that I don't know.[2]
> 
> I agree that this is more of a hack than a solution. But this is the
> best I have got considering that I have to find a common solution
> which will work on both Debian as well as Ubuntu buildd.
> Meanwhile I will work with upstream to get this working without any
> hacks, once I sync up upstream code and start looking into it.
> 
> [1]http://irclogs.ubuntu.com/2009/09/10/%23ubuntu-motu.txt
> [2]http://img34.imageshack.us/img34/2536/aboutdialog.png

I thought about something like the attached. I dont know why the weird
setting to DISPLAY is needed at all.

Can you please provide in image which provides screenshots side-by-side
to make the problem more clear to? You image above looks normal to me.


Cheers,
Michael
Index: rules
===================================================================
--- rules	(Revision 10736)
+++ rules	(Arbeitskopie)
@@ -4,12 +4,11 @@
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
+export DISPLAY=":99"
 DEB_CONFIGURE_EXTRA_FLAGS += --libdir=/usr/lib/jni jdk=/usr/lib/jvm/default-java
 
-ifneq (,$(filter $(DEB_HOST_ARCH), i386 amd64 powerpc))
-DEB_MAKE_ENVVARS += DISPLAY=":99"
-DEB_MAKE_BUILD_TARGET += doc
-endif 
+build/libjava-gnome-java-doc::
+	$(MAKE) doc
 
 get-orig-source:
 	uscan --force-download --rename

Reply to: