[Build-common-hackers] Bug#649151: cdbs: documentation missing

Jonathan Nieder jrnieder at gmail.com
Sat May 26 11:11:57 UTC 2012


Hi,

Jonas Smedegaard wrote:

> That underlying issue apart, contributions to documentation is much 
> appreciated - both aimed at newcomers and existing users, and both 
> editing old pieces and writing new stuff from scratch.

Thanks.  First, the more basic question: what is so bad about cyclic
build-dependencies to justify getting rid of all documentation and
possibly not restoring it before the wheezy release?  cdbs is
architecture: all, and as Loïc hinted in bug#614536, there is even a
proposal that would break the cycle when bootstrapping the first arch
from source if all binaries get wiped out[1].

Patch attached for clarity.

Result of testing:

[...]
 PASS: autotools-lzma.sh
 FAIL: recursive.sh
 PASS: udeb-1.sh
[...]
 PASS: distutils-11.sh
 FAIL: ant-1.sh
 ====================
 2 of 30 tests failed
 ====================

Maybe that's why.  Thanks for keeping cdbs in good shape.

Jonathan

[1] http://wiki.debian.org/DebianBootstrap
-------------- next part --------------
From 9cc652d096782b35ffcc0b2345b746a57cde802a Mon Sep 17 00:00:00 2001
From: Jonathan Nieder <jrnieder at gmail.com>
Date: Sat, 26 May 2012 05:12:09 -0500
Subject: [PATCH] Compile and install documentation again. Closes: bug#649151.

This simply reverts commit 6b0828d3925098f6f0baf83cc798413066f544df.
---
 Makefile.am       |    2 +-
 debian/control.in |   10 +++++++++-
 debian/doc-base   |   12 ++++++++++++
 debian/docs       |    3 +++
 4 files changed, 25 insertions(+), 2 deletions(-)
 create mode 100644 debian/doc-base
 create mode 100644 debian/docs

diff --git a/Makefile.am b/Makefile.am
index 24e48775..d8ad6cce 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,7 +17,7 @@
 
 AUTOMAKE_OPTIONS = 1.8 foreign no-dist
 
-SUBDIRS = . test
+SUBDIRS = . doc test
 
 BUILT_SOURCES =
 
diff --git a/debian/control.in b/debian/control.in
index d7a1cd98..1d34e4ec 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -3,6 +3,7 @@ Section: devel
 Priority: optional
 Maintainer: CDBS Hackers <build-common-hackers at lists.alioth.debian.org>
 Build-Depends-Indep: @cdbs@,
+ graphviz,
  realpath,
  fakeroot,
  python-dev,
@@ -10,6 +11,13 @@ Build-Depends-Indep: @cdbs@,
  python3-all-dev,
  python-central,
  python-support,
+ libxml2-utils,
+ xsltproc,
+ docbook-xml,
+ docbook-xsl,
+ dblatex,
+ texlive-xetex,
+ lmodern,
  ant,
  default-jdk,
  sharutils,
@@ -26,7 +34,7 @@ Package: cdbs
 Architecture: all
 Multi-Arch: foreign
 Recommends: autotools-dev
-Suggests: devscripts
+Suggests: devscripts, doc-base
 Description: common build system for Debian packages
  This package contains the Common Debian Build System, an abstract build
  system based on Makefile inheritance which is completely extensible and
diff --git a/debian/doc-base b/debian/doc-base
new file mode 100644
index 00000000..2108e91c
--- /dev/null
+++ b/debian/doc-base
@@ -0,0 +1,12 @@
+Document: cdbs
+Title: CDBS Documentation
+Author: Marc Dequènes (Duck) <Duck at DuckCorp.org>
+Abstract: Documentation for the Common Debian Build System
+Section: Debian
+
+Format: HTML
+Index: /usr/share/doc/cdbs/cdbs-doc.html
+Files: /usr/share/doc/cdbs/*.html
+
+Format: PDF
+Files: /usr/share/doc/cdbs/cdbs-doc.pdf.gz
diff --git a/debian/docs b/debian/docs
new file mode 100644
index 00000000..7bfedbb8
--- /dev/null
+++ b/debian/docs
@@ -0,0 +1,3 @@
+doc/cdbs-doc.html
+doc/cdbs-doc.pdf
+doc/*.png
-- 
1.7.10



More information about the Build-common-hackers mailing list