* Use /dev/stderr instead of /dev/tty (Closes: #574629)

* Use py_support to require rebuilds when python's API changes (Closes:
  #380855)
* Fix broken links in some info documentation

diff --git a/debian/changelog b/debian/changelog
index 178bc4661994cb30b2cb078d6841d5ce4ce108fc..f3be69f72abdb4fb4f420cc604bdb9c2970416b7 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,11 @@
 lilypond (2.12.3-7) unstable; urgency=low
 
-  * Ignore test failures on non-i386/amd64 architectures (Closes: #572290)
+  * Use /dev/stderr instead of /dev/tty (Closes: #574629)
+  * Use py_support to require rebuilds when python's API changes (Closes:
+    #380855)
+  * Fix broken links in some info documentation
 
- -- Don Armstrong <don@debian.org>  Tue, 10 Aug 2010 18:09:27 -0700
+ -- Don Armstrong <don@debian.org>  Tue, 24 Aug 2010 15:52:59 -0700
 
 lilypond (2.12.3-6) unstable; urgency=low
 

diff --git a/debian/control b/debian/control
index 62a49cdca1528b30f2820c8f90620e666825f519..3e654d3b6232a08788faa84c57ac3c21b2c76c07 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Build-Depends-Indep: netpbm, imagemagick,
  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, rsync
+ | gsfonts-x11
 Section: tex
 Priority: optional
 Maintainer: Don Armstrong <don@debian.org>
@@ -22,7 +22,7 @@ Package: lilypond
 Architecture: any
 Replaces: lilypond1.3
 Provides: lilypond1.3
-Depends: ${shlibs:Depends}, python, guile-1.8, ${misc:Depends}, lilypond-data (= ${source:Version}), ghostscript
+Depends: ${shlibs:Depends}, ${python:Depends}, guile-1.8, ${misc:Depends}, lilypond-data (= ${source:Version}), ghostscript
 Conflicts: guile-1.8 (= 1.8.2+1-2)
 Recommends: lilypond-doc
 Description: A program for typesetting sheet music

diff --git a/debian/rules b/debian/rules
index 8075ae357bd0a9a6a1992e6e007cf6cde3e338b6..a481b5d27986b57aecc5fd43c936e3163429bc7d 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -59,14 +59,7 @@ build-stamp:
                --infodir='$${prefix}/share/info' \
                --mandir='$${prefix}/share/man'
        $(MAKE)
-       # ignore test failures on architectures which aren't i386 or
-       # amd64 until we properly fix failures when /dev/tty doesn't
-       # exist (#572290)
-       if dpkg-architecture -eamd64 || dpkg-architecture -ei386; then \
-               $(MAKE) test; \
-       else \
-               $(MAKE) test || true; \
-        fi;
+       $(MAKE) test;
 
        touch build-stamp
 
@@ -138,6 +131,7 @@ binary-indep: build-doc install
 
 #      mv $(r_data)/usr/share/lilypond/$(VERSION)/fonts/map/lilypond.map \
 #         $(r_data)/etc/texmf/dvips/lilypond.map
+       rmdir $(CURDIR)/debian/lilypond-doc/usr/share/info/lilypond
 
        dh_link usr/share/lilypond/$(VERSION)/tex \
                        usr/share/texmf/tex/lilypond \
@@ -150,7 +144,9 @@ binary-indep: build-doc install
                usr/share/lilypond/$(VERSION)/fonts/type1 \
                        usr/share/texmf/fonts/type1/public/lilypond \
                etc/texmf/dvips/lilypond.map \
-                       usr/share/lilypond/$(VERSION)/dvips/lilypond.map
+                       usr/share/lilypond/$(VERSION)/dvips/lilypond.map \
+               usr/share/doc/lilypond/ \
+                       usr/share/doc/lilypond/html/Documentation/user
 
        dh_pysupport /usr/share/lilypond/${VERSION}/python
 
@@ -173,6 +169,7 @@ binary-arch: build install
        dh_installchangelogs Documentation/misc/CHANGES* Documentation/misc/ChangeLog*
 
        dh_strip
+       dh_pysupport /usr/share/lilypond/${VERSION}/python
        dh_compress
        dh_fixperms
        dh_installdeb

diff --git a/scm/lily.scm b/scm/lily.scm
index 93956a82e412cc9abb35ad6e58a3cd49052c7ff3..c5c0cfabb04643db3a52ca43f9b8f5a7e5d22670 100644 (file)
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -673,9 +673,7 @@ PIDs or the number of the process."
          (if separate-logs
              (open-file (if (string-or-symbol? (ly:get-option 'log-file))
                             (format "~a.log" (ly:get-option 'log-file))
-                            (if (access? "/dev/tty" W_OK)
-                                "/dev/tty"
-                                "/dev/null")) "a") #f))
+                            "/dev/stderr") "a") #f))
         (do-measurements (ly:get-option 'dump-profile))
         (handler (lambda (key failed-file)
                    (set! failed (append (list failed-file) failed)))))