Use dblatex instead of fop, as long fop is in contrib.

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

diff --git a/debian/changelog b/debian/changelog
index 166233ce087aec50e92887d4af60eb62675d18c0..0529cfe727a666457b4aa4859a43a5ffdbe3f7ca 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
 developers-reference (3.3.9) unstable; urgency=low
 
   * Packaging changes:
-    - bump standards-version to 3.7.2 (no change)
+    - bump standards-version to 3.7.3 (no change)
     - fix debian/copyright
     - move debhelper to Build-Depends.
     - add pdf for French version.

diff --git a/debian/control b/debian/control
index 51cacabc21f54be667a3af8638493f22af9c7c48..19eabc74fce830dace8855d57040fc13152d0bd8 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: doc
 Priority: optional
 Maintainer: Debian Documentation Project <debian-doc@lists.debian.org>
 Uploaders: Andreas Barth <aba@not.so.argh.org>
-Standards-Version: 3.7.2
-Build-Depends-Indep: docbook-xsl (>= 1.71.0), dblatex (>= 0.2), fop (>= 1:0.93), xsltproc, libxml2-utils, po4a
+Standards-Version: 3.7.3
+Build-Depends-Indep: docbook-xsl (>= 1.71.0), dblatex (>= 0.2), xsltproc, libxml2-utils, po4a
 Build-Depends: debhelper (>= 4.1.32)
 
 Package: developers-reference

diff --git a/debian/developers-reference-fr.doc-base b/debian/developers-reference-fr.doc-base
index 40ed3007b0847b953f42b206687fcd550b426dc5..db2747bec40cc1ad3fe68703ed234b487629ca8d 100644 (file)
--- a/debian/developers-reference-fr.doc-base
+++ b/debian/developers-reference-fr.doc-base
@@ -10,8 +10,8 @@ Abstract: Overview of available resources, standard package
 Section: Debian
 
 Format: HTML
-Index: /usr/share/doc/developers-reference-fr/index.fr.html
+Index: /usr/share/doc/developers-reference-fr/index.html
 Files: /usr/share/doc/developers-reference-fr/*.html
 
 Format: PDF
-Files: /usr/share/doc/developers-reference-fr/developers-reference.fr.pdf
+Files: /usr/share/doc/developers-reference-fr/developers-reference.pdf

diff --git a/debian/developers-reference-ja.doc-base b/debian/developers-reference-ja.doc-base
index 6da6b1886985061da653bac72dfeccbddd1eaed4..3f2ab43e3f94e1e884634797e85ca499e28807a2 100644 (file)
--- a/debian/developers-reference-ja.doc-base
+++ b/debian/developers-reference-ja.doc-base
@@ -10,5 +10,5 @@ Abstract: Overview of available resources, standard package
 Section: Debian
 
 Format: HTML
-Index: /usr/share/doc/developers-reference-ja/index.ja.html
+Index: /usr/share/doc/developers-reference-ja/index.html
 Files: /usr/share/doc/developers-reference-ja/*.html

diff --git a/debian/developers-reference.doc-base b/debian/developers-reference.doc-base
index 362024a00cc5ebdd11654d7abc4464b63a913fd5..8d3be9726a2527c604498f14c5def22d652f6da5 100644 (file)
--- a/debian/developers-reference.doc-base
+++ b/debian/developers-reference.doc-base
@@ -13,7 +13,7 @@ Format: text
 Files: /usr/share/doc/developers-reference/developers-reference.txt.gz
 
 Format: HTML
-Index: /usr/share/doc/developers-reference/index.en.html
+Index: /usr/share/doc/developers-reference/index.html
 Files: /usr/share/doc/developers-reference/*.html
 
 Format: PDF

diff --git a/debian/rules b/debian/rules
index 906ff702cdff2f336930d45aafc9f374c1f1dcd2..dd8a84ff7233c96f316828c48155af82e45b2ce7 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -11,7 +11,7 @@ docbasedir    := $(prefix)$(docbaserel)
 
 # list of language packages, in the form pkg-LANG; must jibe
 # with debian/control
-langs          := fr ja
+langs          := fr
 
 # tool abstraction
 install_file   := install -o root -g root -m 644 -p
@@ -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)
+       $(MAKE) VERSION=$(DEB_VERSION) PUBDATE=$(PUBDATE) LANGS=$(langs)
        touch build
 
 .PHONY: clean