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/changelog    2010-10-05 01:09:59.000000000 
+0200
+++ valgrind-3.6.0~svn11254.1/debian/changelog  2010-10-05 00:50:48.000000000 
+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 <stef...@rivera.za.net>  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.000000000 
+0200
+++ valgrind-3.6.0~svn11254.1/debian/control    2010-10-05 00:48:51.000000000 
+0200
@@ -2,7 +2,7 @@
 Section: devel
 Priority: optional
 Maintainer: Andrés Roldán <arol...@debian.org>
-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.000000000 +0200
+++ valgrind-3.6.0~svn11254.1/debian/patches/00list     2010-10-05 
00:56:15.000000000 +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.000000000 +0200
+++ valgrind-3.6.0~svn11254.1/debian/patches/03_catch-doc-bulid-failures.dpatch 
2010-10-05 01:02:38.000000000 +0200
@@ -0,0 +1,81 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 03_catch-doc-bulid-failures.dpatch by Stefano Rivera <stef...@rivera.za.net>
+##
+## 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.am        2010-08-09 
16:11:17.000000000 +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=.bzr' 
valgrind-3.6.0~svn11254.1~/docs/Makefile.in 
valgrind-3.6.0~svn11254.1/docs/Makefile.in
+--- valgrind-3.6.0~svn11254.1~/docs/Makefile.in        2010-08-09 
16:25:04.000000000 +0200
++++ valgrind-3.6.0~svn11254.1/docs/Makefile.in 2010-10-05 01:02:36.892563324 
+0200
+@@ -479,6 +479,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"; \
+@@ -530,10 +531,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; \
+@@ -541,10 +544,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 -Nru valgrind-3.6.0~svn11254/VEX/nanoarm.orig 
valgrind-3.6.0~svn11254.1/VEX/nanoarm.orig
diff -Nru valgrind-3.6.0~svn11254/VEX/orig_amd64/test1.orig 
valgrind-3.6.0~svn11254.1/VEX/orig_amd64/test1.orig
diff -Nru valgrind-3.6.0~svn11254/VEX/orig_amd64/test2.orig 
valgrind-3.6.0~svn11254.1/VEX/orig_amd64/test2.orig
diff -Nru valgrind-3.6.0~svn11254/VEX/orig_arm/nanoarm.orig 
valgrind-3.6.0~svn11254.1/VEX/orig_arm/nanoarm.orig
diff -Nru valgrind-3.6.0~svn11254/VEX/orig_ppc32/date.orig 
valgrind-3.6.0~svn11254.1/VEX/orig_ppc32/date.orig
diff -Nru valgrind-3.6.0~svn11254/VEX/orig_ppc32/loadsafp.orig 
valgrind-3.6.0~svn11254.1/VEX/orig_ppc32/loadsafp.orig
diff -Nru valgrind-3.6.0~svn11254/VEX/orig_ppc32/morefp.orig 
valgrind-3.6.0~svn11254.1/VEX/orig_ppc32/morefp.orig
diff -Nru valgrind-3.6.0~svn11254/VEX/orig_ppc32/return0.orig 
valgrind-3.6.0~svn11254.1/VEX/orig_ppc32/return0.orig
diff -Nru valgrind-3.6.0~svn11254/VEX/orig_x86/exit42.orig 
valgrind-3.6.0~svn11254.1/VEX/orig_x86/exit42.orig
diff -Nru valgrind-3.6.0~svn11254/VEX/orig_x86/fpu_mmx_sse.orig 
valgrind-3.6.0~svn11254.1/VEX/orig_x86/fpu_mmx_sse.orig
diff -Nru valgrind-3.6.0~svn11254/VEX/orig_x86/manyfp.orig 
valgrind-3.6.0~svn11254.1/VEX/orig_x86/manyfp.orig

Attachment: signature.asc
Description: Digital signature

Reply via email to