X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=debian%2Fcontrol;h=820a106eef27d46c48e04b7e023dbaf73b861ef9;hb=9117ba6e44cb39cfebebf6c867d1f863ef5296d3;hp=2b4d8ce56a1296a0e8e69fd9bf57043c044e65c3;hpb=662bfa45a7b6841505f86948d18ea19baecb2a90;p=lilypond.git

diff --git a/debian/control b/debian/control
index 2b4d8ce56a..820a106eef 100644
--- a/debian/control
+++ b/debian/control
@@ -1,23 +1,24 @@
 Source: lilypond
-Build-Depends: debhelper (>= 9), quilt, python-all-dev (>= 2.6.6-3~), dh-python,
- guile-2.0-dev,
- flex, libfl-dev, bison, texinfo, groff, m4, gettext, mftrace, fontforge,
+Build-Depends: debhelper (>= 10), quilt, python-all-dev (>= 2.6.6-3~), dh-python, dh-exec,
+ libfl-dev, flex, bison, texinfo, groff, m4, gettext, mftrace, fontforge,
  pkg-config, libfreetype6-dev, libpango1.0-dev,
  libfontconfig1-dev, help2man,
- libgmp3-dev, libltdl-dev, ghostscript, texlive-latex-base,
- texlive-generic-recommended, texlive-latex-recommended, autotools-dev, texi2html, texlive-metapost,
+ ghostscript, texlive-latex-base, texlive-generic-recommended,
+ texlive-latex-recommended, autotools-dev, texi2html, texlive-metapost,
  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,
- fonts-ipafont-gothic, fonts-ipafont-mincho, ttf-dejavu, ttf-freefont,
+ fonts-linuxlibertine, fonts-freefont-otf, fonts-ipafont-mincho,
  texlive-lang-cyrillic, fonts-texgyre,
- gsfonts | gsfonts-x11
+ gsfonts | gsfonts-x11,
+ extractpdfmark,
+ libtool, autoconf, automake, libgmp-dev, libltdl-dev, libncurses5-dev,
+ libreadline6-dev
+Build-Conflicts: fonts-noto-cjk
 Section: tex
 Priority: optional
 Maintainer: Don Armstrong <don@debian.org>
-Uploaders: Dr. Tobias Quathamer <toddy@debian.org>
-Standards-Version: 3.9.5
+Uploaders: Anthony Fok <foka@debian.org>,
+           Dr. Tobias Quathamer <toddy@debian.org>
+Standards-Version: 4.1.1
 Homepage: http://lilypond.org/
 Vcs-Git: https://anonscm.debian.org/git/collab-maint/lilypond.git
 Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/lilypond.git
@@ -26,9 +27,10 @@ Package: lilypond
 Architecture: any
 Replaces: lilypond1.3
 Provides: lilypond1.3
-Depends: ${shlibs:Depends}, ${python:Depends}, guile-2.0, ${misc:Depends}, lilypond-data (= ${source:Version}), ghostscript
+Depends: ${shlibs:Depends}, ${python:Depends}, ${misc:Depends}, lilypond-data (= ${source:Version}), ghostscript
 Breaks: ${python:Breaks}
-Recommends: lilypond-doc, texlive-latex-base
+Recommends: texlive-latex-base
+Suggests: lilypond-doc
 Description: program for typesetting sheet music
  LilyPond is a music typesetter, an automated engraving system.  It
  produces beautiful sheet music using a high level description file as input.
@@ -71,7 +73,7 @@ Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, dpkg (>= 1.15.4) | install-info
 Recommends: lilypond-doc-html, lilypond-doc-pdf
 Suggests: lilypond (>= ${source:Version})
-Description: LilyPond Documentation in info format (and meta package)
+Description: LilyPond Documentation in info format (and metapackage)
  LilyPond is a music typesetter, an automated engraving system.  It
  produces beautiful sheet music using a high level description file as input.
  .
@@ -94,7 +96,7 @@ Description: LilyPond PDF Documentation
 Package: lilypond-doc-html
 Section: doc
 Architecture: all
-Depends: ${misc:Depends}, dpkg (>= 1.15.4) | install-info
+Depends: ${misc:Depends}, dpkg (>= 1.15.4) | install-info, lilypond-doc
 Recommends: mozilla-browser | www-browser
 Suggests: lilypond (>= ${source:Version})
 Replaces: lilypond-doc (<< 2.16.2-1~exp+1)
@@ -106,6 +108,20 @@ Description: LilyPond HTML Documentation
  This package contains the HTML documentation for the LilyPond music
  typesetting software.
 
+Package: lilypond-doc-html-ca
+Section: doc
+Architecture: all
+Depends: ${misc:Depends}, dpkg (>= 1.15.4) | install-info, lilypond-doc-html
+Suggests: lilypond (>= ${source:Version})
+Replaces: lilypond-doc (<< 2.16.2-1~exp+1)
+Breaks: lilypond-doc (<< 2.16.2-1~exp+1)
+Description: LilyPond HTML Documentation in Catalan
+ LilyPond is a music typesetter, an automated engraving system.  It
+ produces beautiful sheet music using a high level description file as input.
+ .
+ This package contains the HTML documentation in Catalan for the
+ LilyPond music typesetting software.
+
 Package: lilypond-doc-html-cs
 Section: doc
 Architecture: all
@@ -232,6 +248,21 @@ Description: LilyPond HTML Documentation in Chinese
  This package contains the HTML documentation in Chinese for the
  LilyPond music typesetting software.
 
+Package: lilypond-doc-pdf-ca
+Section: doc
+Architecture: all
+Depends: ${misc:Depends}, dpkg (>= 1.15.4) | install-info
+Recommends: evince | pdf-viewer
+Suggests: lilypond (>= ${source:Version})
+Replaces: lilypond-doc (<< 2.16.2-1~exp+1)
+Breaks: lilypond-doc (<< 2.16.2-1~exp+1)
+Description: LilyPond PDF Documentation in Catalan
+ LilyPond is a music typesetter, an automated engraving system.  It
+ produces beautiful sheet music using a high level description file as input.
+ .
+ This package contains the PDF documentation in Catalan for the
+ LilyPond music typesetting software.
+
 Package: lilypond-doc-pdf-de
 Section: doc
 Architecture: all