merge debian experimental into debian branch

[lilypond.git] / debian / control

diff --git a/debian/control b/debian/control
index 6831cc0186026543865e21c37f070fb5335f4ae8..77b17bc503e07c31d1a969edbbcce07583f20076 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,21 +1,20 @@
 Source: lilypond
 Source: lilypond

-Build-Depends: debhelper (>= 5), python-dev (>= 2.4), guile-1.8-dev,
+Build-Depends: debhelper (>= 9), python-all-dev (>= 2.6.6-3~), guile-1.8-dev,

  flex, bison, texinfo, groff, m4, gettext, mftrace, fontforge,
  pkg-config, libfreetype6-dev, libpango1.0-dev,
  flex, bison, texinfo, groff, m4, gettext, mftrace, fontforge,
  pkg-config, libfreetype6-dev, libpango1.0-dev,

- libfontconfig1-dev, python-support,
+ libfontconfig1-dev, help2man,

  libgmp3-dev, libltdl-dev, ghostscript, texlive-latex-base,
  texlive-generic-recommended, texlive-latex-recommended, autotools-dev, texi2html, texlive-metapost,
  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,
  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>
 Section: tex
 Priority: optional
 Maintainer: Don Armstrong <don@debian.org>

-Standards-Version: 3.9.2
+Standards-Version: 3.9.3

 Homepage: http://lilypond.org/
 Vcs-Git: git://git.donarmstrong.com/lilypond.git
 Vcs-Browser: http://git.donarmstrong.com/lilypond.git
 Homepage: http://lilypond.org/
 Vcs-Git: git://git.donarmstrong.com/lilypond.git
 Vcs-Browser: http://git.donarmstrong.com/lilypond.git


@@ -25,6 +24,7 @@ Architecture: any
 Replaces: lilypond1.3
 Provides: lilypond1.3
 Depends: ${shlibs:Depends}, ${python:Depends}, guile-1.8, ${misc:Depends}, lilypond-data (= ${source:Version}), ghostscript
 Replaces: lilypond1.3
 Provides: lilypond1.3
 Depends: ${shlibs:Depends}, ${python:Depends}, guile-1.8, ${misc:Depends}, lilypond-data (= ${source:Version}), ghostscript

+Breaks: ${python:Breaks}

 Recommends: lilypond-doc, texlive-latex-base
 Description: program for typesetting sheet music
  LilyPond is a music typesetter, an automated engraving system.  It
 Recommends: lilypond-doc, texlive-latex-base
 Description: program for typesetting sheet music
  LilyPond is a music typesetter, an automated engraving system.  It


@@ -53,6 +53,7 @@ Description: program for typesetting sheet music
 Package: lilypond-data
 Architecture: all
 Depends: texinfo | texlive-texinfo, texlive-base-bin, ${python:Depends}, ${misc:Depends}
 Package: lilypond-data
 Architecture: all
 Depends: texinfo | texlive-texinfo, texlive-base-bin, ${python:Depends}, ${misc:Depends}

+Breaks: ${python:Breaks}

 Recommends: lilypond (>= ${source:Version})
 Description: LilyPond music typesetter (data files)
  LilyPond is a music typesetter, an automated engraving system.  It
 Recommends: lilypond (>= ${source:Version})
 Description: LilyPond music typesetter (data files)
  LilyPond is a music typesetter, an automated engraving system.  It


@@ -123,6 +124,18 @@ Description: LilyPond HTML Documentation in German
  This package contains the HTML documentation in German for the
  LilyPond music typesetting software.
 
  This package contains the HTML documentation in German for the
  LilyPond music typesetting software.
 

+Package: lilypond-doc-html-es
+Section: doc
+Architecture: all
+Depends: ${misc:Depends}, dpkg (>= 1.15.4) | install-info, lilypond-doc-html
+Suggests: lilypond (>= ${source:Version})
+Description: LilyPond HTML Documentation in Spanish
+ 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 Spanish for the
+ LilyPond music typesetting software.
+

 Package: lilypond-doc-html-fr
 Section: doc
 Architecture: all
 Package: lilypond-doc-html-fr
 Section: doc
 Architecture: all


@@ -260,3 +273,16 @@ Description: LilyPond PDF Documentation in Italian
  This package contains the PDF documentation in Italian for the
  LilyPond music typesetting software.
 
  This package contains the PDF documentation in Italian for the
  LilyPond music typesetting software.
 

+Package: lilypond-doc-pdf-nl
+Section: doc
+Architecture: all
+Depends: ${misc:Depends}, dpkg (>= 1.15.4) | install-info
+Recommends: evince | pdf-viewer
+Suggests: lilypond (>= ${source:Version})
+Description: LilyPond PDF Documentation in Dutch
+ 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 Dutch for the
+ LilyPond music typesetting software.
+