netpbm and fonts are required to run the tests during the binary build; migrate the...

diff --git a/debian/changelog b/debian/changelog
index 89a3636ecf6b977a5d9fb42fed4cb21456610611..1403fec5a5c18d4ce147bd23bb5b3cb0954dc229 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+lilypond (2.16.0-1~exp+2) experimental; urgency=low
+
+  * netpbm and fonts are required to run the tests during the binary
+    build; migrate the Build-Depends-Indep to Build-Depends.
+
+ -- Don Armstrong <don@debian.org>  Tue, 02 Oct 2012 17:33:29 -0700
+
 lilypond (2.16.0-1~exp+1) experimental; urgency=low
 
   * New upstream release (Closes: #686788)

diff --git a/debian/control b/debian/control
index e275dc10942a5f5ae7ff573d2dd1fa8ddf176cea..77b17bc503e07c31d1a969edbbcce07583f20076 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -5,13 +5,12 @@ Build-Depends: debhelper (>= 9), python-all-dev (>= 2.6.6-3~), guile-1.8-dev,
  libfontconfig1-dev, help2man,
  libgmp3-dev, libltdl-dev, ghostscript, texlive-latex-base,
  texlive-generic-recommended, texlive-latex-recommended, autotools-dev, texi2html, texlive-metapost,
- zip, rsync, texlive-fonts-recommended, dblatex
-Build-Depends-Indep: netpbm, imagemagick,
+ zip, rsync, texlive-fonts-recommended, dblatex, netpbm, imagemagick, 
  emacs-intl-fonts, xfonts-intl-arabic, xfonts-intl-asian,
  xfonts-intl-chinese, xfonts-intl-chinese-big, xfonts-intl-european,
  xfonts-intl-japanese, xfonts-intl-japanese-big, xfonts-intl-phonetic,
- ttf-kochi-gothic, ttf-kochi-mincho, ttf-dejavu, ttf-freefont, gsfonts
- | gsfonts-x11
+ ttf-kochi-gothic, ttf-kochi-mincho, ttf-dejavu, ttf-freefont,
+ gsfonts | gsfonts-x11
 Section: tex
 Priority: optional
 Maintainer: Don Armstrong <don@debian.org>