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 2d70910d5af8abde15cec83531e8161a54a4a5ba..8b3d3582e9879a1f46af67ce12daef92b22b8fd9 100644 (file)
--- 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 516096e6a651f8969b14dc4561d2f02f0cffa23d..026a3f21e0c5f451b8fa7ef09eac2fb07e4fbf66 100644 (file)
--- 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 27f18e9d23ab4f8d205b460a9a69f67668b6e041..0868f711c335a5f5abcc8070f3f73363cdc1f63b 100644 (file)
--- 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 dd8a84ff7233c96f316828c48155af82e45b2ce7..240e3b4900ee85c02723d53e7497056f254dfa0c 100755 (executable)
--- 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