From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Thu, 17 Apr 2003 18:31:29 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: release/1.6.10~4
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=fb5a15cc9a1957b28b46d5b5e0f20925936a2c53;p=lilypond.git

*** empty log message ***
---

diff --git a/debian/changelog b/debian/changelog
index f6f5318564..19ea35c77b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,10 +3,11 @@ lilypond (1.6.9-1) unstable; urgency=low
   * New upstream release.
   * Depend on mftrace iso pktrace.
   * Add guile-1.6-dev as alternative dependency to libguile-dev
+  * Bugfix for docdir when with changed package name.
   * Remove netpbm, bibtex2html dependencies.
   * Remove gcc-3.x/lexer kludge.
 
- --  <janneke@gnu.org>  Tue, 15 Apr 2003 14:25:54 +0200
+ -- Jan Nieuwenhuizen <janneke@gnu.org>  Tue, 15 Apr 2003 14:25:54 +0200
 
 lilypond (1.6.6-2) unstable; urgency=high
 
diff --git a/debian/control b/debian/control
index 47bbbcc933..7a6ba8bba3 100644
--- a/debian/control
+++ b/debian/control
@@ -32,14 +32,3 @@ Suggests: lilypond (>= ${Source-Version}), postscript-viewer, www-browser
 Description: LilyPond Documentation in HTML, PS and DVI formats
  This package contains the HTML, PostScript and DVI documentation for the
  LilyPond music typesetting software.
-
-Package: lilypond1.3
-Architecture: arm i386 m68k powerpc sparc
-Depends: lilypond (>= ${Source-Version})
-Description: Dummy package for transition to new stable lilypond.
- This dummy package provides a transition from the previous lilypond1.3
- package back to a newer lilypond because the stable 1.4 and now 1.6 series
- have arrived.
- .
- Please feel free to remove this dummy package after you have upgraded
- to the latest lilypond.
diff --git a/debian/rules b/debian/rules
index f14364b547..d1d36a4a16 100644
--- a/debian/rules
+++ b/debian/rules
@@ -55,6 +55,7 @@ build-doc-stamp:
 
 	$(MAKE) -C Documentation
 	$(MAKE) web
+	find . -type d -name 'out-www' | xargs rm -rf
 
 	touch build-doc-stamp
 
@@ -98,13 +99,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
@@ -128,10 +129,10 @@ 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
diff --git a/debian/watch b/debian/watch
index 153e127a86..0c86236f56 100644
--- 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.6	lilypond-*.tar.gz	debian	uupdate