tags 247542 patch
thanks

On Mon, Mar 21, 2005 at 06:41:40PM +0100, Samuel Mimram wrote:
> The bug mentionned in the BR does not seem to be solved :

> % make
> *** Building HTML ***
> test -d ./html || mkdir ./html
> cd ./html && gtkdoc-mkhtml mediastreamer ../mediastreamer-docs.sgml
> /usr/bin/gtkdoc-mkhtml: line 42: /usr/bin/openjade: No such file or 
> directory
> make: *** [html-build.stamp] Error 127

> Am I missing something?

> I have the 1.3-3 version of gtk-doc-tools.

> Thanks for your help.

My fault; I had openjade1.3 installed in the build env on this sponsored
upload, and gtk-doc does not build-conflict with openjade1.3 which provides
an alternative for /usr/bin/openjade.

The attached patch adds the missing build-conflict.  Loïc, given the impact
of this (and the previous) bug, I'm going to go ahead and fix my botched
sponsor upload with an NMU; catch me on IRC or by mail if you have any
concerns with this.

Thanks,
-- 
Steve Langasek
postmodern programmer
diff -u gtk-doc-1.3/debian/control gtk-doc-1.3/debian/control
--- gtk-doc-1.3/debian/control
+++ gtk-doc-1.3/debian/control
@@ -5,7 +5,7 @@
 Uploaders: Sebastian Rittau <[EMAIL PROTECTED]>, Debian GNOME Maintainers 
<[EMAIL PROTECTED]>, Akira TAGOH <[EMAIL PROTECTED]>, Andreas Rottmann <[EMAIL 
PROTECTED]>, Andrew Lau <[EMAIL PROTECTED]>, Carlos Perellà MarÃn <[EMAIL 
PROTECTED]>, Ed Boraas <[EMAIL PROTECTED]>, Edd Dumbill <[EMAIL PROTECTED]>, 
Emil Soleyman-Zomalan <[EMAIL PROTECTED]>, Gustavo Noronha Silva <[EMAIL 
PROTECTED]>, J.H.M. Dassen (Ray) <[EMAIL PROTECTED]>, Joe Drew <[EMAIL 
PROTECTED]>, Johannes Rohr <[EMAIL PROTECTED]>, Jordi Mallach <[EMAIL 
PROTECTED]>, Jose Carlos Garcia Sogo <[EMAIL PROTECTED]>, Josselin Mouette 
<[EMAIL PROTECTED]>, Marc 'HE' Brockschmidt <[EMAIL PROTECTED]>, OndÅej Surà 
<[EMAIL PROTECTED]>, Rob Bradford <[EMAIL PROTECTED]>, Robert McQueen <[EMAIL 
PROTECTED]>, Ross Burton <[EMAIL PROTECTED]>, Sebastien Bacher <[EMAIL 
PROTECTED]>, Sjoerd Simons <[EMAIL PROTECTED]>, Takuo KITAME <[EMAIL PROTECTED]>
 Standards-Version: 3.6.1
 Build-Depends-Indep: cdbs, debhelper (>= 4.1.0), docbook-dsssl, xsltproc, jade 
(>= 1.2.1-35), libxml2-utils, docbook-xml, docbook-xsl, gnome-pkg-tools
-Build-Conflicts-Indep: openjade
+Build-Conflicts-Indep: openjade, openjade1.3
 
 Package: gtk-doc-tools
 Architecture: all
diff -u gtk-doc-1.3/debian/control.in gtk-doc-1.3/debian/control.in
--- gtk-doc-1.3/debian/control.in
+++ gtk-doc-1.3/debian/control.in
@@ -5,7 +5,7 @@
 Uploaders: Sebastian Rittau <[EMAIL PROTECTED]>, @GNOME_TEAM@
 Standards-Version: 3.6.1
 Build-Depends-Indep: cdbs, debhelper (>= 4.1.0), docbook-dsssl, xsltproc, jade 
(>= 1.2.1-35), libxml2-utils, docbook-xml, docbook-xsl, gnome-pkg-tools
-Build-Conflicts-Indep: openjade
+Build-Conflicts-Indep: openjade, openjade1.3
 
 Package: gtk-doc-tools
 Architecture: all
diff -u gtk-doc-1.3/debian/changelog gtk-doc-1.3/debian/changelog
--- gtk-doc-1.3/debian/changelog
+++ gtk-doc-1.3/debian/changelog
@@ -1,3 +1,12 @@
+gtk-doc (1.3-3.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Build-conflict with openjade1.3 as well as with openjade, since
+    /usr/bin/openjade is an alternative (and we want /usr/bin/jade to be
+    picked up instead).  Closes: #247542
+
+ -- Steve Langasek <[EMAIL PROTECTED]>  Mon, 21 Mar 2005 14:48:21 -0800
+
 gtk-doc (1.3-3) unstable; urgency=high
 
   * Urgency high because of FTBFS caused by this package

Attachment: signature.asc
Description: Digital signature

Reply via email to