[routino] 07/09: Drop install_documenation patch, install all documentation except INSTALL*.txt.

[Sebastiaan Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository routino.

commit 7d39928e9800c0581ce55e33af6af4bd5e3b1be0
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Sep 15 23:30:43 2015 +0200

    Drop install_documenation patch, install all documentation except INSTALL*.txt.
---
 debian/changelog                     |  2 ++
 debian/patches/install_documentation | 15 ---------------
 debian/patches/series                |  1 -
 debian/rules                         |  4 ++++
 4 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e40d881..6e5c03e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,8 @@ routino (3.0-1) UNRELEASED; urgency=medium
   * Merge fix_tests patch into rename_router patch.
   * Add doc-base registration for HTML documentation.
   * Add build dependency on libgraphics-magick-perl for create-icons.pl.
+  * Drop install_documenation patch, install all documentation except
+    INSTALL*.txt.
 
  -- Bas Couwenberg <sebastic at debian.org>  Sun, 13 Sep 2015 10:47:14 +0200
 
diff --git a/debian/patches/install_documentation b/debian/patches/install_documentation
deleted file mode 100644
index becefcd..0000000
--- a/debian/patches/install_documentation
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Install Documentation
-Author: Thibaut Gridel <tgridel at free.fr>
-Forwarded: not-needed
-
---- a/doc/Makefile
-+++ b/doc/Makefile
-@@ -25,7 +25,7 @@ include ../Makefile.conf
- # Files to install
- 
- HTML_FILES=$(notdir $(wildcard html/*.html)) $(notdir $(wildcard html/*.css))
--TXT_FILES=*.txt
-+TXT_FILES="ALGORITHM.txt  CONFIGURATION.txt  DATA.txt  DATALIFE.txt LIMITS.txt NEWS.txt  OUTPUT.txt  README.txt  TAGGING.txt  USAGE.txt"
- TOP_FILES=../agpl-3.0.txt
- 
- ########
diff --git a/debian/patches/series b/debian/patches/series
index 16c2ea2..5e7deff 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,6 @@
 install_path
 rename_router
 web_path
-install_documentation
 maploader
 mapprops
 hardening
diff --git a/debian/rules b/debian/rules
index 10d8039..854c06b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -47,6 +47,10 @@ override_dh_auto_install:
 	# Strip RPATH
 	chrpath --delete debian/*/usr/bin/*
 
+	# Remove upstream install documentation
+	rm -f debian/*/usr/share/doc/routino/INSTALL.txt*
+	rm -f debian/*/usr/share/doc/routino/INSTALL-MS-WIN.txt*
+
 override_dh_install:
 	dh_install --list-missing
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/routino.git