From 0855153a17a819c3cf6f284819eb0bdf7156d6b8 Mon Sep 17 00:00:00 2001
From: Don Armstrong <don@donarmstrong.com>
Date: Tue, 11 Sep 2012 16:01:39 -0700
Subject: [PATCH] remove todo and gnu makefile; update doc rules

---
 debian/GNUmakefile                 | 41 ------------------------------
 debian/TODO                        | 12 ---------
 debian/lilypond-doc-pdf-de.install |  1 -
 debian/lilypond-doc-pdf-es.install |  1 -
 debian/lilypond-doc-pdf-fr.install |  1 -
 debian/lilypond-doc-pdf-hu.install |  1 -
 debian/lilypond-doc-pdf-it.install |  1 -
 debian/lilypond-doc-pdf-ja.install |  1 -
 debian/update_doc_packages         |  1 -
 9 files changed, 60 deletions(-)
 delete mode 100644 debian/GNUmakefile
 delete mode 100644 debian/TODO

diff --git a/debian/GNUmakefile b/debian/GNUmakefile
deleted file mode 100644
index e4c6cf3a9e..0000000000
--- a/debian/GNUmakefile
+++ /dev/null
@@ -1,41 +0,0 @@
-# debian/Makefile
-
-depth = ..
-
-NAME = debian
-at-dir = $(outdir)/
-at-ext =
-
-CONF_FILES = changelog control copyright emacsen-startup\
- preinst rules watch
-
-EXTRA_DIST_FILES = $(CONF_FILES)\
- README.Debian\
- TODO\
- compat\
- control.foka\
- control.potato\
- lilypond-data.dirs\
- lilypond-data.doc-base\
- lilypond-data.emacsen-startup\
- lilypond-data.install\
- lilypond-data.postinst\
- lilypond-data.postrm\
- lilypond-doc.README.Debian\
- lilypond-doc.dirs\
- lilypond-doc.doc-base\
- lilypond-doc.postinst\
- lilypond-doc.prerm\
- lilypond.doc-base\
- lilypond.install\
- lilypond1.3.copyright\
- #
-
-
-#OUTCONF_FILES = $(addprefix $(outdir)/, $(basename $(CONF_FILES))) $(OUTIN_FILES)
-OUTCONF_FILES = $(OUTIN_FILES)
-OUT_DIST_FILES = $(OUTIN_FILES)
-
-STEPMAKE_TEMPLATES = debian
-include $(depth)/make/stepmake.make 
-
diff --git a/debian/TODO b/debian/TODO
deleted file mode 100644
index 70a3b209b2..0000000000
--- a/debian/TODO
+++ /dev/null
@@ -1,12 +0,0 @@
-To be added to the changelog when a new texinfo is available:
-
-  * Build-Depends: texinfo (>= 4.7-1) to avoid the old HTML tag mismatch
-    for @subsection (<h3>...</h4>) bug in makeinfo.  Thanks to Magnus Henoch
-    for the bug report.  (Closes: Bug#204202)
-
- -- Anthony Fok <foka@debian.org>  Sun, 26 Oct 2003 12:21:35 +0800   
-
-
-  * Inefficient packaging of arch independent data in package lilypond
-   (Closes: Bug#233406)
-  * split font into another package? (Closes: Bug#87700)
diff --git a/debian/lilypond-doc-pdf-de.install b/debian/lilypond-doc-pdf-de.install
index 065d938230..026a776a6e 100644
--- a/debian/lilypond-doc-pdf-de.install
+++ b/debian/lilypond-doc-pdf-de.install
@@ -1,2 +1 @@
 usr/share/doc/lilypond/html/*/*.de.pdf
-usr/share/doc/lilypond/html/*.de.pdf
diff --git a/debian/lilypond-doc-pdf-es.install b/debian/lilypond-doc-pdf-es.install
index 462b2efa94..79f8db167c 100644
--- a/debian/lilypond-doc-pdf-es.install
+++ b/debian/lilypond-doc-pdf-es.install
@@ -1,2 +1 @@
 usr/share/doc/lilypond/html/*/*.es.pdf
-usr/share/doc/lilypond/html/*.es.pdf
diff --git a/debian/lilypond-doc-pdf-fr.install b/debian/lilypond-doc-pdf-fr.install
index 78032d4be8..1cef963d4d 100644
--- a/debian/lilypond-doc-pdf-fr.install
+++ b/debian/lilypond-doc-pdf-fr.install
@@ -1,2 +1 @@
 usr/share/doc/lilypond/html/*/*.fr.pdf
-usr/share/doc/lilypond/html/*.fr.pdf
diff --git a/debian/lilypond-doc-pdf-hu.install b/debian/lilypond-doc-pdf-hu.install
index 7ad3eec8ab..6297047737 100644
--- a/debian/lilypond-doc-pdf-hu.install
+++ b/debian/lilypond-doc-pdf-hu.install
@@ -1,2 +1 @@
 usr/share/doc/lilypond/html/*/*.hu.pdf
-usr/share/doc/lilypond/html/*.hu.pdf
diff --git a/debian/lilypond-doc-pdf-it.install b/debian/lilypond-doc-pdf-it.install
index b6c3aef15b..e4f6d53894 100644
--- a/debian/lilypond-doc-pdf-it.install
+++ b/debian/lilypond-doc-pdf-it.install
@@ -1,2 +1 @@
 usr/share/doc/lilypond/html/*/*.it.pdf
-usr/share/doc/lilypond/html/*.it.pdf
diff --git a/debian/lilypond-doc-pdf-ja.install b/debian/lilypond-doc-pdf-ja.install
index 450aefa878..38481eaa4b 100644
--- a/debian/lilypond-doc-pdf-ja.install
+++ b/debian/lilypond-doc-pdf-ja.install
@@ -1,2 +1 @@
 usr/share/doc/lilypond/html/*/*.ja.pdf
-usr/share/doc/lilypond/html/*.ja.pdf
diff --git a/debian/update_doc_packages b/debian/update_doc_packages
index bd625cfc28..c769ceeb60 100644
--- a/debian/update_doc_packages
+++ b/debian/update_doc_packages
@@ -87,7 +87,6 @@ EOF
 	} else {
 	    print {$install_fh} <<EOF;
 usr/share/doc/lilypond/html/*/*.${lang}.pdf
-usr/share/doc/lilypond/html/*.${lang}.pdf
 EOF
 	}
 	close($install_fh);
-- 
2.39.5