Imported Debian patch 2.12.3-2

diff --git a/debian/changelog b/debian/changelog
index ac23654c0127bd99a1ade28772cee9976669f99b..45fa63e626128687a34e3fa59371637d1fec945f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+lilypond (2.12.3-2) unstable; urgency=low
+
+  * Build-Depend on rsync (Closes: #571670)
+  * Ditch unneded Build-Conflict
+
+ -- Don Armstrong <don@debian.org>  Fri, 26 Feb 2010 17:32:22 -0800
+
 lilypond (2.12.3-1) unstable; urgency=low
 
   * New upstream release

diff --git a/debian/control b/debian/control
index 879be07b35b8c7bf97152084299f50ade77e419c..eabae4086b4f4778c27cfd7e64f03e435e38b8b8 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -5,8 +5,7 @@ Build-Depends: debhelper (>= 5), python-dev (>= 2.4), guile-1.8-dev,
  libfontconfig1-dev, python-support,
  libgmp3-dev, libltdl-dev, ghostscript, texlive-latex-base,
  texlive-generic-recommended, texlive-latex-recommended, autotools-dev, texi2html, texlive-metapost,
- zip
-Build-Conflicts: guile-1.8-dev (= 1.8.2+1-2)
+ zip, rsync
 Build-Depends-Indep: netpbm, imagemagick,
  emacs-intl-fonts, xfonts-intl-arabic, xfonts-intl-asian,
  xfonts-intl-chinese, xfonts-intl-chinese-big, xfonts-intl-european,