Bug#597180: A Patch

2010-10-08 Thread gregor herrmann 
clone 597180 -1
retitle -1 catch manpage build failures
severity -1 normal
tags -1 + patch
thanks

On Fri, 08 Oct 2010 23:37:18 +0200, Mehdi Dogguy wrote:

> > I'm just not sure if adding the patch is a good idea for an upload
> > now; AFAICS adding the build-dep is enough to fix the actual bug, and
> > at this stage of the release preparation the release team might
> > prefer a minimal change. (In general I think it's a good idea to
> > catch the errors.)
> Adding the build-dependency should be enough.

Thanks for the quick reply and the confirmation!

I've now cloned the bug to keep the idea of catching manpage build
problems, and uploaded an NMU which only adds the build-dep.

Cheers,
gregor
 
-- 
 .''`.   http://info.comodo.priv.at/ -- GPG key IDs: 0x8649AA06, 0x00F3CFE4
 : :' :  Debian GNU/Linux user, admin, & developer - http://www.debian.org/
 `. `'   Member of VIBE!AT & SPI, fellow of Free Software Foundation Europe
   `-NP: The Dubliners: Farewell to Ireland


signature.asc
Description: Digital signature

Bug#597180: A Patch

2010-10-08 Thread Mehdi Dogguy 
On 10/08/2010 10:40 PM, gregor herrmann wrote:
> On Tue, 05 Oct 2010 01:27:00 +0200, Stefano Rivera wrote:
> 
>> Here is a debdiff that will catch future manpage build failures (the
>> policy issue), and add the necessary Build-Depends.
> 
> Nice, thanks for your work.
> 
> I'm just not sure if adding the patch is a good idea for an upload
> now; AFAICS adding the build-dep is enough to fix the actual bug, and
> at this stage of the release preparation the release team might
> prefer a minimal change. (In general I think it's a good idea to
> catch the errors.)
> 
> Cc'ing the RT to get their opinion.
> 

Adding the build-dependency should be enough.

Cheers,

-- 
Mehdi Dogguy مهدي الدڤي
http://dogguy.org/



--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Bug#597180: A Patch

2010-10-08 Thread gregor herrmann 
On Tue, 05 Oct 2010 01:27:00 +0200, Stefano Rivera wrote:

> Here is a debdiff that will catch future manpage build failures (the
> policy issue), and add the necessary Build-Depends.

Nice, thanks for your work.

I'm just not sure if adding the patch is a good idea for an upload
now; AFAICS adding the build-dep is enough to fix the actual bug, and
at this stage of the release preparation the release team might
prefer a minimal change. (In general I think it's a good idea to
catch the errors.)

Cc'ing the RT to get their opinion.

Cheers,
gregor

-- 
 .''`.   http://info.comodo.priv.at/ -- GPG key IDs: 0x8649AA06, 0x00F3CFE4
 : :' :  Debian GNU/Linux user, admin, & developer - http://www.debian.org/
 `. `'   Member of VIBE!AT & SPI, fellow of Free Software Foundation Europe
   `-NP: The Dubliners: Champion at keeping them rolling


signature.asc
Description: Digital signature

Bug#597180: A Patch

2010-10-04 Thread Stefano Rivera 
severity 597180 important
tags 597180 + patch
thanks

Justification: Policy 4.6, Squeeze RC Policy 4

Here is a debdiff that will catch future manpage build failures (the
policy issue), and add the necessary Build-Depends.

SR

-- 
Stefano Rivera
  http://tumbleweed.org.za/
  H: +27 21 465 6908 C: +27 72 419 8559  UCT: x3127
diff -Nru valgrind-3.6.0~svn11254/autom4te.cache/output.0 
valgrind-3.6.0~svn11254.1/autom4te.cache/output.0
diff -Nru valgrind-3.6.0~svn11254/autom4te.cache/output.1 
valgrind-3.6.0~svn11254.1/autom4te.cache/output.1
diff -Nru valgrind-3.6.0~svn11254/autom4te.cache/requests 
valgrind-3.6.0~svn11254.1/autom4te.cache/requests
diff -Nru valgrind-3.6.0~svn11254/autom4te.cache/traces.0 
valgrind-3.6.0~svn11254.1/autom4te.cache/traces.0
diff -Nru valgrind-3.6.0~svn11254/autom4te.cache/traces.1 
valgrind-3.6.0~svn11254.1/autom4te.cache/traces.1
diff -Nru valgrind-3.6.0~svn11254/debian/changelog 
valgrind-3.6.0~svn11254.1/debian/changelog
--- valgrind-3.6.0~svn11254/debian/changelog2010-10-05 01:09:59.0 
+0200
+++ valgrind-3.6.0~svn11254.1/debian/changelog  2010-10-05 00:50:48.0 
+0200
@@ -1,3 +1,11 @@
+valgrind (1:3.6.0~svn11254.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Build-Depend on docbook-xml (Closes: #597180)
+  * Detect errors while building manpages.
+
+ -- Stefano Rivera   Tue, 05 Oct 2010 00:49:02 +0200
+
 valgrind (1:3.6.0~svn11254) unstable; urgency=low
 
   * New SVN snapshot.
diff -Nru valgrind-3.6.0~svn11254/debian/control 
valgrind-3.6.0~svn11254.1/debian/control
--- valgrind-3.6.0~svn11254/debian/control  2010-10-05 01:09:59.0 
+0200
+++ valgrind-3.6.0~svn11254.1/debian/control2010-10-05 00:48:51.0 
+0200
@@ -2,7 +2,7 @@
 Section: devel
 Priority: optional
 Maintainer: Andrés Roldán 
-Build-Depends: debhelper (>> 3.0.0), libc6-dev (>> 2.3.0), autotools-dev, 
dpatch (>> 2.0.0), gdb, gcc-multilib [amd64], libc6-dev-i386 (>> 2.3.0) 
[amd64], docbook, docbook-xsl, xsltproc
+Build-Depends: debhelper (>> 3.0.0), libc6-dev (>> 2.3.0), autotools-dev, 
dpatch (>> 2.0.0), gdb, gcc-multilib [amd64], libc6-dev-i386 (>> 2.3.0) 
[amd64], docbook, docbook-xml, docbook-xsl, xsltproc
 Standards-Version: 3.7.3.0
 
 Package: valgrind
diff -Nru valgrind-3.6.0~svn11254/debian/patches/00list 
valgrind-3.6.0~svn11254.1/debian/patches/00list
--- valgrind-3.6.0~svn11254/debian/patches/00list   2010-10-05 
01:09:59.0 +0200
+++ valgrind-3.6.0~svn11254.1/debian/patches/00list 2010-10-05 
00:56:15.0 +0200
@@ -2,3 +2,4 @@
 #01_pcm-ioctl
 01_more-vg-n-segments
 02_version
+03_catch-doc-bulid-failures
diff -Nru 
valgrind-3.6.0~svn11254/debian/patches/03_catch-doc-bulid-failures.dpatch 
valgrind-3.6.0~svn11254.1/debian/patches/03_catch-doc-bulid-failures.dpatch
--- valgrind-3.6.0~svn11254/debian/patches/03_catch-doc-bulid-failures.dpatch   
1970-01-01 02:00:00.0 +0200
+++ valgrind-3.6.0~svn11254.1/debian/patches/03_catch-doc-bulid-failures.dpatch 
2010-10-05 01:02:38.0 +0200
@@ -0,0 +1,81 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 03_catch-doc-bulid-failures.dpatch by Stefano Rivera 
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Detect failure in doc building (Closes: #597180)
+
+...@dpatch@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' 
valgrind-3.6.0~svn11254.1~/docs/Makefile.am 
valgrind-3.6.0~svn11254.1/docs/Makefile.am
+--- valgrind-3.6.0~svn11254.1~/docs/Makefile.am2010-08-09 
16:11:17.0 +0200
 valgrind-3.6.0~svn11254.1/docs/Makefile.am 2010-10-05 01:00:49.268280973 
+0200
+@@ -125,6 +125,7 @@
+ 
+ # the valgrind manpages
+ man-pages:
++  set -e; \
+   for x in $(XSL_MAN_STYLES) ; do \
+   if test -f $$x; then \
+   echo "Using manpage stylesheet: $$x"; \
+@@ -176,10 +177,12 @@
+ # be the one to handle the else/endif parts, not GNU make
+ # as we intend.
+ install-data-hook:
++  set -e; \
+   if test -r html ; then \
+   mkdir -p $(DESTDIR)$(datadir)/doc/valgrind; \
+   cp -r html $(DESTDIR)$(datadir)/doc/valgrind; \
+   fi
++  set -e; \
+   for f in *.1 ; do \
+   if test -r $$f ; then \
+   mkdir -p $(DESTDIR)$(mandir)/man1; \
+@@ -187,10 +190,12 @@
+   fi \
+   done
+  ifeq ($(BUILD_ALL_DOCS),yes)
++  set -e; \
+   if test -r index.pdf ; then \
+   mkdir -p $(DESTDIR)$(datadir)/doc/valgrind; \
+   cp index.pdf 
$(DESTDIR)$(datadir)/doc/valgrind/valgrind_manual.pdf; \
+   fi
++  set -e; \
+   if test -r index.ps ; then \
+   mkdir -p $(DESTDIR)$(datadir)/doc/valgrind; \
+   cp index.ps 
$(DESTDIR)$(datadir)/doc/valgrind/valgrind_manual.ps; \
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.