[Pkg-nagios-changes] [pkg-icinga2] 01/04: Patch 10_move_htmldocs_to_subdir is upstream

[Markus Frosch]

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

lazyfrosch-guest pushed a commit to branch master
in repository pkg-icinga2.

commit 102ee28b4563372da10353ea4fb36e22be376d4b
Author: Markus Frosch <markus at lazyfrosch.de>
Date:   Tue Oct 22 15:40:20 2013 +0200

    Patch 10_move_htmldocs_to_subdir is upstream
---
 debian/patches/10_move_htmldocs_to_subdir |   37 -----------------------------
 debian/patches/series                     |    1 -
 2 files changed, 38 deletions(-)

diff --git a/debian/patches/10_move_htmldocs_to_subdir b/debian/patches/10_move_htmldocs_to_subdir
deleted file mode 100644
index 8697079..0000000
--- a/debian/patches/10_move_htmldocs_to_subdir
+++ /dev/null
@@ -1,37 +0,0 @@
-Description: install html documentation into subdirectory
-Author: Markus Frosch <markus at lazyfrosch.de>
-Origin: maintainer
-Bug: https://dev.icinga.org/issues/4876
-Last-Update: 2013-10-15
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/doc/Makefile.am
-+++ b/doc/Makefile.am
-@@ -52,7 +52,7 @@
- CLEANFILES = \
- 	index.html
- 
--icinga2docdir = ${docdir}
-+icinga2docdir = ${docdir}/htdocs
- icinga2doc_DATA = \
- 	index.html \
- 	$(DOCVIEWER_FILES)
---- a/doc/strapdownjs/Makefile.am
-+++ b/doc/strapdownjs/Makefile.am
-@@ -1,7 +1,7 @@
- SUBDIRS = \
- 	themes
- 
--icinga2docdir = ${docdir}/strapdownjs
-+icinga2docdir = ${docdir}/htdocs/strapdownjs
- icinga2doc_DATA = \
- 	strapdown.js \
- 	strapdown.css
---- a/doc/strapdownjs/themes/Makefile.am
-+++ b/doc/strapdownjs/themes/Makefile.am
-@@ -1,4 +1,4 @@
--icinga2docdir = ${docdir}/strapdownjs/themes
-+icinga2docdir = ${docdir}/htdocs/strapdownjs/themes
- icinga2doc_DATA = \
- 	bootstrap.min.css \
- 	bootstrap-responsive.min.css \
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index fae8211..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-#10_move_htmldocs_to_subdir

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