Source: autogen
Version: 1:5.18.3-2
Severity: wishlist

Hi,

Here's another set of patches to break a build dependency loop by moving
TeX Live and friends to Build-Depends-Indep.  As with libtasn1-6, this
will break a loop as shown in the versioned package page linked to by
http://bootstrap.debian.net/source/autogen.html - TeX Live depends on
src:gnutls28 through several paths and gnutls28 build-depends on
autogen.

Thanks in advance for your assistance with the bootstrapping bugs and
for your work on Debian in general!

G'luck,
Peter

-- System Information:
Debian Release: jessie/sid
  APT prefers testing
  APT policy: (990, 'testing')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.14-1-amd64 (SMP w/4 CPU cores)
Locale: LANG=bg_BG.UTF-8, LC_CTYPE=bg_BG.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

-- 
Peter Pentchev  [email protected] [email protected] [email protected]
PGP key:        http://people.FreeBSD.org/~roam/roam.key.asc
Key fingerprint 2EE7 A7A5 17FC 124C F115  C354 651E EFB0 2527 DF13
From f07af1fb1802f3d79af5adbd8279c3defa18841b Mon Sep 17 00:00:00 2001
From: Peter Pentchev <[email protected]>
Date: Thu, 12 Jun 2014 18:01:48 +0300
Subject: [PATCH 1/2] A new PostScript and HTML documentation package.

Move the PostScript and HTML documentation to a brand new autogen-doc
package so that it may be omitted in binary-only builds, e.g. for
bootstrapping.  The new package is architecture-independent, so it shall
only be built once and subsequent binary builds on new architectures
will use the ready-made copy from the Debian archive.
---
 debian/autogen-doc.doc-base | 18 ++++++++++++++++++
 debian/autogen-doc.docs     |  2 ++
 debian/autogen.doc-base     | 18 ------------------
 debian/autogen.docs         |  2 --
 debian/control              | 11 +++++++++++
 5 files changed, 31 insertions(+), 20 deletions(-)
 create mode 100644 debian/autogen-doc.doc-base
 create mode 100644 debian/autogen-doc.docs
 delete mode 100644 debian/autogen.doc-base
 delete mode 100644 debian/autogen.docs

diff --git a/debian/autogen-doc.doc-base b/debian/autogen-doc.doc-base
new file mode 100644
index 0000000..7edf053
--- /dev/null
+++ b/debian/autogen-doc.doc-base
@@ -0,0 +1,18 @@
+Document: autogen
+Title: AutoGen - The Automated Program Generator
+Author: Bruce Korb
+Abstract: AutoGen is a tool designed for generating program files that
+ contain repetitive text with varied substitutions.  Its goal is to simplify
+ the maintenance of programs that contain large amounts of repetitious text.
+ This is especially valuable if there are several blocks of such text that must
+ be kept synchronized.  A common example where this would be useful is in
+ creating and maintaining the code required for processing program options.
+Section: Programming
+
+Format: postscript
+Files: /usr/share/doc/autogen-doc/autogen.ps.gz
+
+Format: HTML
+Index: /usr/share/doc/autogen-doc/html/autogen_toc.html
+Files: /usr/share/doc/autogen-doc/html/*
+
diff --git a/debian/autogen-doc.docs b/debian/autogen-doc.docs
new file mode 100644
index 0000000..c1ec658
--- /dev/null
+++ b/debian/autogen-doc.docs
@@ -0,0 +1,2 @@
+doc/autogen.ps
+doc/html
diff --git a/debian/autogen.doc-base b/debian/autogen.doc-base
deleted file mode 100644
index ca4a3f6..0000000
--- a/debian/autogen.doc-base
+++ /dev/null
@@ -1,18 +0,0 @@
-Document: autogen
-Title: AutoGen - The Automated Program Generator
-Author: Bruce Korb
-Abstract: AutoGen is a tool designed for generating program files that
- contain repetitive text with varied substitutions.  Its goal is to simplify
- the maintenance of programs that contain large amounts of repetitious text.
- This is especially valuable if there are several blocks of such text that must
- be kept synchronized.  A common example where this would be useful is in
- creating and maintaining the code required for processing program options.
-Section: Programming
-
-Format: postscript
-Files: /usr/share/doc/autogen/autogen.ps.gz
-
-Format: HTML
-Index: /usr/share/doc/autogen/html/autogen_toc.html
-Files: /usr/share/doc/autogen/html/*
-
diff --git a/debian/autogen.docs b/debian/autogen.docs
deleted file mode 100644
index c1ec658..0000000
--- a/debian/autogen.docs
+++ /dev/null
@@ -1,2 +0,0 @@
-doc/autogen.ps
-doc/html
diff --git a/debian/control b/debian/control
index ca5ed0d..bfc3a14 100644
--- a/debian/control
+++ b/debian/control
@@ -14,6 +14,7 @@ Package: autogen
 Architecture: any
 Depends: ${shlibs:Depends}, libopts25-dev (= ${binary:Version}),
  ${misc:Depends}
+Recommends: autogen-doc
 Multi-Arch: foreign
 Description: automated text file generator
  AutoGen is a tool designed for generating program files that contain
@@ -28,6 +29,16 @@ Description: automated text file generator
  .
  This package contains the development tools. libopts25-dev contains the
  static libraries and header files. libopts25 contains the shared libraries.
+ autogen-doc contains the PostScript and HTML documentation.
+
+Package: autogen-doc
+Architecture: all
+Description: automated text file generator - documentation
+ AutoGen is a tool designed for generating program files that contain
+ repetitive text with varied substitutions. This is especially valuable if
+ there are several blocks of such text that must be kept synchronized.
+ .
+ This package contains the PostScript and HTML documentation.
 
 Package: libopts25
 Architecture: any
-- 
2.0.0

From addcbef074139710a9fd570f7e3f5666f6562c31 Mon Sep 17 00:00:00 2001
From: Peter Pentchev <[email protected]>
Date: Fri, 13 Jun 2014 12:28:14 +0300
Subject: [PATCH 2/2] Move the doc build dependencies to B-D-I.

This breaks a circular build dependency since TeX Live depends on
src:gnutls28 through several different paths and src:gnutls28
build-depends on autogen.
---
 debian/control | 4 ++--
 debian/rules   | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/debian/control b/debian/control
index bfc3a14..8c2bd06 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: devel
 Priority: optional
 Maintainer: Andreas Metzler <[email protected]>
 Build-Depends: debhelper (>= 9), autotools-dev, gperf, guile-2.0-dev (>= 
2.0.3),
- libxml2-dev, texinfo, texlive, texi2html, cm-super-minimal,
- pkg-config
+ libxml2-dev, pkg-config
+Build-Depends-Indep: texinfo, texlive, texi2html, cm-super-minimal
 Standards-Version: 3.9.5
 Homepage: http://www.gnu.org/software/autogen/
 Vcs-Git: git://anonscm.debian.org/collab-maint/autogen.git
diff --git a/debian/rules b/debian/rules
index 93a70e1..4a1fec6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,8 +11,11 @@ override_dh_auto_configure:
 
 override_dh_auto_build:
        dh_auto_build --verbose
-       $(MAKE) -C doc autogen.ps info
+       $(MAKE) -C doc info
+ifneq (,$(filter autogen-doc, $(shell dh_listpackages)))
+       $(MAKE) -C doc autogen.ps
        cd doc && texi2html -split=chapter -subdir=html autogen.texi
+endif
 
 
 override_dh_auto_clean:
-- 
2.0.0

Attachment: signature.asc
Description: Digital signature

Reply via email to