- Mention in copyright that full GPL is included in the manual.

- Register installed documents with doc-base.

7 files changed, 100 insertions, 8 deletions

diff --git a/debian/archlist b/debian/archlist
new file mode 100644
index 000000000..b6f89aaaf
--- /dev/null
+++ b/debian/archlist
@@ -0,0 +1,15 @@
+# List of architectures
+# Note: use exactly _one_ <tab> between fields!
+
+#Code	Name
+i386	Intel x86
+alpha	Alpha
+arm	ARM
+hppa	PA-RISC (hppa)
+ia64	IA-64
+m68k	Motorola 680x0
+mips	Mips
+mipsel	Mipsel
+powerpc	PowerPC
+s390	S/390
+sparc	Sparc
diff --git a/debian/changelog b/debian/changelog
index 6270e247c..6bba74d66 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+installation-guide (2005xxxx) UNRELEASED; urgency=low
+
+  * Mention in copyright that full GPL is included in the manual.
+    Closes: #334925
+  * Register installed documents with doc-base.
+
+ -- Frans Pop <fjp@debian.org>  Sat, 22 Oct 2005 21:01:52 +0200
+
 installation-guide (20051019) unstable; urgency=low
 
   [ Joey Hess ]
diff --git a/debian/copyright b/debian/copyright
index 35c98a6d7..485e0001c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,5 @@
-The installation manual is copyright 1996 Bruce Perens; 1996, 1997 Sven
-Rudolph; 1998 Igor Grobman, James Treacy; 1998-2002 Adam Di Carlo; 2003 Chris
-Tillman; and by other contributors. It is licensed under the terms of the GNU
-GPL.
+The Installation Guide is copyright 1996 Bruce Perens; 1996, 1997 Sven Rudolph;
+1998 Igor Grobman, James Treacy; 1998-2002 Adam Di Carlo; 2003 Chris Tillman;
+and by other contributors. It is licensed under the terms of the GNU GPL.
+
+A copy of the GPL is included in an appendix of the Installation Guide.
diff --git a/debian/doc-base.TEMPLATE b/debian/doc-base.TEMPLATE
new file mode 100644
index 000000000..f2910cc97
--- /dev/null
+++ b/debian/doc-base.TEMPLATE
@@ -0,0 +1,16 @@
+Document: installation-guide-%ARCH%-%LANG%
+Title: Debian Installation Guide for %ARCH_FULL% in %LANG_FULL%
+Author: Debian Installer team
+Abstract: Manual describing how to install a Debian system
+ using the Debian Installer.
+Section: Debian/Installation
+
+Format: pdf
+Files: /usr/share/doc/installation-guide-%ARCH%/%LANG%/install.%LANG%.pdf.gz
+
+Format: text
+Files: /usr/share/doc/installation-guide-%ARCH%/%LANG%/install.%LANG%.txt.gz
+
+Format: HTML
+Index: /usr/share/doc/installation-guide-%ARCH%/%LANG%/index.html
+Files: /usr/share/doc/installation-guide-%ARCH%/%LANG%/*.html
diff --git a/debian/getfromlist b/debian/getfromlist
new file mode 100755
index 000000000..7cbafa234
--- /dev/null
+++ b/debian/getfromlist
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+if [ -z "$1" ] || [ ! -f "$1" ] ; then
+	exit 1
+fi
+
+egrep -v "^[[:space:]]*(|#.*)$" $1 | cut -f 1
diff --git a/debian/langlist b/debian/langlist
new file mode 100644
index 000000000..60e6dc0f0
--- /dev/null
+++ b/debian/langlist
@@ -0,0 +1,24 @@
+# Note: use exactly _one_ <tab> between fields!
+
+#Code	Name
+en	English
+#ca	Catalan
+cs	Czech
+#da	Danish
+de	German
+#el	Greek
+es	Spanish
+#eu	Basque
+fr	French
+#fi	Finnish
+#it	Italian
+ja	Japanese
+#ko	Korean
+#nl	Dutch
+pt	Portuguese (PT)
+pt_BR	Portuguese (BR)
+#tl	Tagalog
+#ro	Romanian
+ru	Russian
+zh_CN	Chinese (simplified)
+zh_TW	Chinese (traditional)
diff --git a/debian/rules b/debian/rules
index ef69de923..8e9bffad0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,7 @@
 #!/usr/bin/make -f
 
-ARCHS=alpha arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc
+ARCHS=$(shell cd debian; ./getfromlist archlist)
+LANGS=$(shell cd debian; ./getfromlist langlist)
 VERSION=$(shell LC_ALL=C dpkg-parsechangelog | grep ^Version: | cut -d ' ' -f 2)
 DATE=$(shell echo $(VERSION) | cut -d '.' -f 1)
 SUITE=$(shell LC_ALL=C dpkg-parsechangelog | grep ^Distribution: | cut -d ' ' -f 2)
@@ -15,8 +16,27 @@ clean:
 	dh_testroot
 	dh_clean build-stamp
 	rm -rf $(MANTMP)
+	dh_clean doc-base-stamp
+	rm -rf debian/installation-guide-*.doc-base.*
 	rm -rf build/build.out build/build.tmp build/build.po
 
+doc-base: doc-base-stamp
+doc-base-stamp:
+	@echo $(ARCHS)
+	rm -f $@
+	rm -rf debian/installation-guide-*.doc-base.*
+	set -e && cd debian && \
+	    for arch in $(ARCHS) ; do \
+		for lang in $(LANGS) ; do \
+		    arch_full="$$(grep "^$$arch[[:space:]]" archlist | cut -f 2)" ; \
+		    lang_full="$$(grep "^$$lang[[:space:]]" langlist | cut -f 2)" ; \
+		    sed -e "s/%ARCH%/$$arch/g" -e "s/%ARCH_FULL%/$$arch_full/g" \
+			-e "s/%LANG%/$$lang/g" -e "s/%LANG_FULL%/$$lang_full/g" \
+			doc-base.TEMPLATE > installation-guide-$$arch.doc-base.$$lang ; \
+		done ; \
+	    done
+	touch $@
+
 build: build-stamp
 build-stamp:
 	rm -f $@
@@ -24,8 +44,8 @@ build-stamp:
 	set -e && cd build && \
 	    for arch in $(ARCHS) ; do \
 		official_build=1 manual_release=$(SUITE) \
-		architectures="$$arch" noarchdir=1 \
-		destination=$(MANTMP)/$$arch \
+		architectures="$$arch" languages="$(LANGS)" \
+		destination=$(MANTMP)/$$arch noarchdir=1 \
 		./build.sh ; \
 	    done
 	touch $@
@@ -38,7 +58,7 @@ install: build
 	
 binary-arch:
 
-binary-indep: install
+binary-indep: install doc-base
 	dh_testdir
 	dh_testroot
 	dh_installchangelogs
@@ -47,6 +67,7 @@ binary-indep: install
 	done
 	dh_compress
 	dh_fixperms
+	dh_installdeb
 	dh_gencontrol -- -Vkernel:Package='$(KERNELPACKAGE)'
 	dh_builddeb