[SCM] icecast2/master: d/p/0001-fix_docdir.patch: Add upstream commit to fix docdir structure.

[unit193-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 683513587ba47cfacba3647b363e918664c1ac1f
Author: Unit 193 <unit193 at ubuntu.com>
Date:   Sat Dec 13 18:22:50 2014 -0500

    d/p/0001-fix_docdir.patch: Add upstream commit to fix docdir structure.

diff --git a/debian/patches/0001-fix_docdir.patch b/debian/patches/0001-fix_docdir.patch
new file mode 100644
index 0000000..4cac242
--- /dev/null
+++ b/debian/patches/0001-fix_docdir.patch
@@ -0,0 +1,83 @@
+From b498d4bd9357b41ade9bb7efff6dffa93784347a Mon Sep 17 00:00:00 2001
+From: "Thomas B. Ruecker" <thomas at ruecker.fi>
+Date: Sat, 13 Dec 2014 19:10:20 +0000
+Subject: [PATCH] Fix for docdir issue with deb/RPM. Fixes #2121
+
+Replaced docdir with otherdocdir and made it relative to docdir.
+This seems to work for debian and plain make install.
+Will test RPM later.
+---
+ doc/assets/css/Makefile.am  | 6 +++---
+ doc/assets/font/Makefile.am | 6 +++---
+ doc/assets/img/Makefile.am  | 6 +++---
+ doc/img/Makefile.am         | 6 +++---
+ 4 files changed, 12 insertions(+), 12 deletions(-)
+
+diff --git a/doc/assets/css/Makefile.am b/doc/assets/css/Makefile.am
+index c5ecd65..bdd0a82 100644
+--- a/doc/assets/css/Makefile.am
++++ b/doc/assets/css/Makefile.am
+@@ -2,7 +2,7 @@
+ 
+ AUTOMAKE_OPTIONS = foreign
+ 
+-docdir = $(datadir)/doc/icecast/assets/css
+-doc_DATA = style.css
++otherdocdir = $(docdir)/assets/css
++otherdoc_DATA = style.css
+ 
+-EXTRA_DIST = $(doc_DATA)
++EXTRA_DIST = $(otherdoc_DATA)
+diff --git a/doc/assets/font/Makefile.am b/doc/assets/font/Makefile.am
+index 56bb7c1..0f6362a 100644
+--- a/doc/assets/font/Makefile.am
++++ b/doc/assets/font/Makefile.am
+@@ -2,12 +2,12 @@
+ 
+ AUTOMAKE_OPTIONS = foreign
+ 
+-docdir = $(datadir)/doc/icecast/assets/font
+-doc_DATA = FiraMono-Bold.eot FiraMono-Regular.eot \
++otherdocdir = $(docdir)/assets/font
++otherdoc_DATA = FiraMono-Bold.eot FiraMono-Regular.eot \
+ 	   FiraSans-Bold.eot FiraSans-BoldItalic.woff \
+ 	   FiraSans-Italic.eot FiraSans-Regular.eot \
+ 	   FiraMono-Bold.woff FiraMono-Regular.woff \
+ 	   FiraSans-BoldItalic.eot FiraSans-Bold.woff \
+     	   FiraSans-Italic.woff FiraSans-Regular.woff
+ 
+-EXTRA_DIST = $(doc_DATA)
++EXTRA_DIST = $(otherdoc_DATA)
+diff --git a/doc/assets/img/Makefile.am b/doc/assets/img/Makefile.am
+index f4c17ee..145b5f7 100644
+--- a/doc/assets/img/Makefile.am
++++ b/doc/assets/img/Makefile.am
+@@ -2,7 +2,7 @@
+ 
+ AUTOMAKE_OPTIONS = foreign
+ 
+-docdir = $(datadir)/doc/icecast/assets/img
+-doc_DATA = xiph-community.svg
++otherdocdir = $(docdir)/assets/img
++otherdoc_DATA = xiph-community.svg
+ 
+-EXTRA_DIST = $(doc_DATA)
++EXTRA_DIST = $(otherdoc_DATA)
+diff --git a/doc/img/Makefile.am b/doc/img/Makefile.am
+index 4ca114b..f612e4d 100644
+--- a/doc/img/Makefile.am
++++ b/doc/img/Makefile.am
+@@ -2,7 +2,7 @@
+ 
+ AUTOMAKE_OPTIONS = foreign
+ 
+-docdir = $(datadir)/doc/icecast/img
+-doc_DATA = listener_auth1.png listener_auth2.png listener_auth3.png masterslave.png relay.png
++otherdocdir = $(docdir)/img
++otherdoc_DATA = listener_auth1.png listener_auth2.png listener_auth3.png masterslave.png relay.png
+ 
+-EXTRA_DIST = $(doc_DATA)
++EXTRA_DIST = $(otherdoc_DATA)
+-- 
+2.1.3
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..a73b99e
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-fix_docdir.patch

-- 
icecast2 packaging