From: debacle <debacle@313b444b-1b9f-4f58-a734-7bb04f332e8d>
Date: Thu, 28 Feb 2008 13:28:38 +0000 (+0000)
Subject: Add build-dependency on w3m.
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=developers-reference.git;a=commitdiff_plain;h=e85e4da3e7ff8c27ce45ec1286ca587a01e6066c

Add build-dependency on w3m.
Do not attempt to build Japanese PDF now.
Change changelog for upload.


git-svn-id: svn://anonscm.debian.org/ddp/developers-reference/trunk@4948 313b444b-1b9f-4f58-a734-7bb04f332e8d
---

diff --git a/Makefile b/Makefile
index 2d70910..8b3d358 100644
--- a/Makefile
+++ b/Makefile
@@ -10,6 +10,8 @@ TARGETS		:= $(foreach fmt,$(FORMATS),developers-reference.$(fmt)) \
 		   $(foreach lng,$(LANGS), \
 		       $(foreach fmt,$(FORMATS), \
 		           $(lng)/developers-reference.$(fmt)))
+# list of targets, that currently cannot build
+BLACKLIST	:= ja/developers-reference.pdf
 
 # hopefully overwritten by caller, e.g. debian/rules
 VERSION=unknown
@@ -18,9 +20,8 @@ PUBDATE=unknown
 # programs for creating output
 XP=xsltproc --nonet --novalid --xinclude
 XL=xmllint --nonet --noout --postvalid --xinclude
-# dblatex 0.2.8 has some problems (e.g. #465221), but we can
-# live with that for now (but: Japanese PDF seems to need
-# non-free cyberbit font.)
+# dblatex 0.2.8 has some problems (e.g. #465221 and Japanese does
+# not build)
 # Alternatives:
 # - docbook2pdf (seems to die on UTF-8, #431085); and
 # - fop is currently in contrib, but can go to main, see #366783
@@ -38,7 +39,7 @@ DBK2HTML=$(PWD)/html.xsl
 DBK2HTML1=$(PWD)/txt.xsl
 
 .PHONY:	all
-all:    $(TARGETS)
+all:    $(filter-out $(BLACKLIST), $(TARGETS))
 
 .PHONY: validate
 validate:			$(SOURCES)
@@ -101,7 +102,7 @@ endif
 .PHONY: clean
 clean:
 	rm -f *.fo *.html *.pdf *.txt
-	rm -rf $(LANGS)
+	for L in $(LANGS); do rm -rf `basename ./"$$L"/`; done
 	rm -f version.ent
 	rm -f `find . -name "*~" -o -name "*.bak"`
 	rm -f *~ *.bak .#* core
diff --git a/debian/changelog b/debian/changelog
index 516096e..026a3f2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -46,7 +46,7 @@ developers-reference (3.3.9) unstable; urgency=low
   * Add Vcs-Svn and Vcs-Browser fields pointing to the new SVN
     repository.
 
- -- Andreas Barth <aba@not.so.argh.org>  Sat, 16 Jun 2007 11:41:41 -0600
+ -- W. Martin Borgert <debacle@debian.org>  Thu, 28 Feb 2008 10:16:40 +0000
 
 developers-reference (3.3.8) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 27f18e9..0868f71 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian Documentation Project <debian-doc@lists.debian.org>
 Uploaders: Andreas Barth <aba@not.so.argh.org>
 Standards-Version: 3.7.3
-Build-Depends-Indep: docbook-xsl (>= 1.71.0), dblatex (>= 0.2), xsltproc, libxml2-utils, po4a
+Build-Depends-Indep: docbook-xsl (>= 1.71.0), dblatex (>= 0.2), xsltproc, libxml2-utils, po4a, w3m
 Build-Depends: debhelper (>= 4.1.32)
 Vcs-Svn: svn://svn.debian.org/ddp/developers-reference/trunk
 Vcs-Browser: http://svn.debian.org/wsvn/ddp/developers-reference/trunk?op=log
diff --git a/debian/rules b/debian/rules
index dd8a84f..240e3b4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -30,7 +30,7 @@ PUBDATE		:= $(shell LC_ALL=C date --date="$(DEB_DATE)" -I)
 build:
 	$(checkdir)
 	rm -f version.ent
-	$(MAKE) VERSION=$(DEB_VERSION) PUBDATE=$(PUBDATE) LANGS=$(langs)
+	$(MAKE) VERSION=$(DEB_VERSION) PUBDATE=$(PUBDATE) LANGS="$(langs)"
 	touch build
 
 .PHONY: clean