*** empty log message ***

diff --git a/debian/rules b/debian/rules
index bc9808489db94b52175f1079ff5527e3da24010e..8ee25305429d36edcb1f7978ba84d7687d5cf3b1 100644 (file)
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,5 @@
 #!/usr/bin/make -f
-# Made with the aid of debhelper by Joey Hess,
-# based on the sample debian/rules file for GNU hello by Ian Jackson.
+# debian/rules for LilyPond in Debian.
 #
 # This is free software; see the GNU General Public Licence
 # version 2 or later for copying conditions.  There is NO warranty.
@@ -8,7 +7,7 @@
 # Currently maintained by Anthony Fok <foka@debian.org>
 # for Debian GNU/Linux.
 
-package = lilypond
+package = lilypond1.7
 
 SHELL = /bin/sh
 r = debian/$(package)
@@ -18,13 +17,6 @@ d = usr/share/doc/$(package)
 include VERSION
 VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(PATCH_LEVEL)
 
-#export CC = gcc-3.2
-#export CXX = g++-3.2
-gcc_version = $(shell g++ --version 2>&1 \
-               | grep '[0-9]\.[0-9]' | head -1 \
-               | sed -e 's/.*[^-.0-9]\([0-9][0-9]*\.[0-9][.0-9]*\).*/\1/' \
-                     -e 's/^\([0-9]\+\).*/\1/')
-
 # "main_memory = 263000" in /etc/texmf/texmf.cnf isn't large enough
 # for latex to process standchen.dvi.latex, so adding extra_mem_* ...
 # export extra_mem_top = 100000
@@ -50,16 +42,11 @@ export DH_OPTIONS
 build: build-stamp
 build-stamp:
        dh_testdir
-
-       if [ "$(gcc_version)" = "3" ]; then ./lexer-gcc-3.1.sh; fi
-       CPPFLAGS=-I`pwd`/lily/out \
        ./configure --enable-checking --enable-debugging \
                --prefix=/usr --enable-optimise \
                --infodir='$${prefix}/share/info' \
                --mandir='$${prefix}/share/man'
-       if [ "$(gcc_version)" = "3" ]; then ./lexer-gcc-3.1.sh; fi
        $(MAKE) MAKE_PFA_FILES=1
-
        touch build-stamp
 
 build-doc: build build-doc-stamp
@@ -68,6 +55,7 @@ build-doc-stamp:
 
        $(MAKE) -C Documentation
        $(MAKE) web
+       find . -type d -name 'out-www' | xargs rm -rf
 
        touch build-doc-stamp
 
@@ -93,12 +81,8 @@ install: build
        # Add here commands to install the package into debian/tmp.
        dh_installdirs
        $(MAKE) prefix=$(PWD)/$(r)/usr MAKE_PFA_FILES=1 install
-
-#      # Change from an absolute symlink to a relative symlink (Lintian)
-#      if [ -L $(r)/usr/share/lilypond/cmtfm ]; then \
-#              rm -f $(r)/usr/share/lilypond/cmtfm; \
-#              ln -s ../texmf/fonts/tfm/public/cm $(r)/usr/share/lilypond/cmtfm; \
-#      fi
+       # Ugh, remove hundred music-glossary copies
+       find . -name 'music-glossary.info-*' | xargs rm -f
 
 # Build architecture-independent files here.
 binary-indep: DH_OPTIONS=-i
@@ -111,13 +95,13 @@ binary-indep: build-doc install
        cd $(r_doc)/$(d) \
            && cp -s `find html/Documentation -name '*.ps.gz'` . \
            && cp -s html/Documentation/pictures/out-www/*.png .
-       # Copy the DVI docs too ...
-       cp -a `find Documentation -name '*.dvi' ! -name 'lily-[0-9]*.dvi'` \
-               $(r_doc)/$(d)/
+#      # Copy the DVI docs too ...
+#      cp -a `find Documentation -name '*.dvi' ! -name 'lily-[0-9]*.dvi'` \
+#              $(r_doc)/$(d)/
        dh_installdocs
        dh_installchangelogs
        dh_link
-       dh_compress -Xusr/share/doc/lilypond/html/
+       dh_compress -X$(d)/html/
        dh_fixperms
        dh_installdeb
        dh_gencontrol
@@ -129,7 +113,8 @@ binary-arch: build install
        dh_testdir
        dh_testroot
        cp -av lilypond-mode.el lilypond-font-lock.el lilypond-indent.el \
-               lilypond.words $(r)/usr/share/emacs/site-lisp/
+               lilypond.words \
+               $(r)/usr/share/emacs/site-lisp/
        dh_installdocs DEDICATION NEWS ROADMAP *.txt
 
 #      dh_installdocs DEDICATION NEWS ROADMAP *.txt \
@@ -141,16 +126,19 @@ binary-arch: build install
 #      cp -a Documentation/misc/[ACN]* $(r)/$(d)/misc/
 
 #      dh_installexamples input
-       find input \( -name '*.*ly' -o -name '*.abc' -o -name '*.tex' -o -name 'TODO' \) \
-               -exec cp -a --parents '{}' $(r)/$(d)/examples ';'
-       for i in `find $(r)/$(d)/examples/ -type d -name out`; do \
-               mv -fv $$i/* $$i/..; rmdir $$i; done
+#      find input \( -name '*.*ly' -o -name '*.abc' -o -name '*.tex' -o -name 'TODO' \) \
+#              -exec cp -a --parents '{}' $(r)/$(d)/examples ';'
+#      for i in `find $(r)/$(d)/examples/ -type d -name out`; do \
+#              mv -fv $$i/* $$i/..; rmdir $$i; done
 #      dh_installmenu
        dh_installemacsen
 #      dh_installcron
 #      dh_installman
 #      dh_undocumented
        dh_installchangelogs ChangeLog
+
+       mv $(r)/usr/share/lilypond/$(VERSION)/dvips/lilypond.map \
+          $(r)/etc/texmf/dvips/lilypond.map
        dh_link usr/share/lilypond/$(VERSION)/tex \
                        usr/share/texmf/tex/lilypond \
                usr/share/lilypond/$(VERSION)/fonts/source \
@@ -159,8 +147,8 @@ binary-arch: build install
                        usr/share/texmf/fonts/afm/public/lilypond \
                usr/share/lilypond/$(VERSION)/fonts/tfm \
                        usr/share/texmf/fonts/tfm/public/lilypond \
-               usr/share/lilypond/$(VERSION)/dvips/lilypond.map \
-                       usr/share/texmf/dvips/config/lilypond.map
+               etc/texmf/dvips/lilypond.map \
+                       usr/share/lilypond/$(VERSION)/dvips/lilypond.map
        dh_strip
        dh_compress
        dh_fixperms

diff --git a/debian/watch b/debian/watch
index 153e127a86f4d842cb86b375ab96a216819ba879..c52667ae0d0a6dffb3cface5a319206ddf5e92a8 100644 (file)
--- a/debian/watch
+++ b/debian/watch
@@ -2,4 +2,4 @@
 # Rename this file to "watch" and then you can run the "uscan" command
 # to check for upstream updates and more.
 # Site         Directory               Pattern                 Version Script
-ftp.cs.uu.nl   /pub/GNU/LilyPond/v1.5  lilypond-*.tar.gz       debian  uupdate
+ftp.lilypond.org       /pub/LilyPond/v1.7      lilypond-*.tar.gz       debian  uupdate