From 4a7ff01dd54b33b88d494b201940f352a250f58f Mon Sep 17 00:00:00 2001
From: vanhofen <vanhofen@gmx.de>
Date: Sun, 16 Dec 2018 01:17:01 +0100
Subject: [PATCH] data: move config data to new config subdir

Origin commit data
------------------
Branch: ni/coolstream
Commit: https://github.com/neutrino-images/ni-neutrino/commit/cbdedb7103340c80de6a2198c7bfc9147b2237e5
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-12-16 (Sun, 16 Dec 2018)

Origin message was:
------------------
- data: move config data to new config subdir

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
---
 configure.ac                                      |  1 +
 data/Makefile.am                                  | 14 +-------------
 data/config/Makefile.am                           | 12 ++++++++++++
 data/{ => config}/bad_package_pattern.list.sample |  0
 data/{ => config}/cables.xml                      |  0
 data/{ => config}/encoding.conf                   |  0
 data/{ => config}/epglanguages.conf               |  0
 data/{ => config}/epgmap.xml                      |  0
 data/{ => config}/mk_terrestrial_xml.pl           |  0
 data/{ => config}/providermap.xml                 |  0
 data/{ => config}/satellites.xml                  |  0
 data/{ => config}/settingsupdate.conf             |  0
 data/{ => config}/terrestrial.xml                 |  0
 data/{ => config}/tobackup.conf                   |  0
 14 files changed, 14 insertions(+), 13 deletions(-)
 create mode 100644 data/config/Makefile.am
 rename data/{ => config}/bad_package_pattern.list.sample (100%)
 rename data/{ => config}/cables.xml (100%)
 rename data/{ => config}/encoding.conf (100%)
 rename data/{ => config}/epglanguages.conf (100%)
 rename data/{ => config}/epgmap.xml (100%)
 rename data/{ => config}/mk_terrestrial_xml.pl (100%)
 rename data/{ => config}/providermap.xml (100%)
 rename data/{ => config}/satellites.xml (100%)
 rename data/{ => config}/settingsupdate.conf (100%)
 rename data/{ => config}/terrestrial.xml (100%)
 rename data/{ => config}/tobackup.conf (100%)

diff --git a/configure.ac b/configure.ac
index adf0bbff1..c52b22c8f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -320,6 +320,7 @@ AC_SUBST(LIBCOOLSTREAM_STATIC_DIR)
 AC_OUTPUT([
 Makefile
 data/Makefile
+data/config/Makefile
 data/fonts/Makefile
 data/icons/Makefile
 data/icons/buttons/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index 67c3559c1..35f4be8a1 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,4 +1,5 @@
 SUBDIRS = \
+	config \
 	fonts \
 	icons \
 	inetradio \
@@ -18,16 +19,3 @@ SUBDIRS = \
 if BOXTYPE_TRIPLE
 SUBDIRS += lcd
 endif
-
-configdir = $(CONFIGDIR)
-
-config_DATA = \
-	bad_package_pattern.list.sample \
-	cables.xml \
-	encoding.conf \
-	epglanguages.conf \
-	providermap.xml \
-	satellites.xml \
-	settingsupdate.conf \
-	terrestrial.xml \
-	tobackup.conf
diff --git a/data/config/Makefile.am b/data/config/Makefile.am
new file mode 100644
index 000000000..21f47ed77
--- /dev/null
+++ b/data/config/Makefile.am
@@ -0,0 +1,12 @@
+installdir = $(CONFIGDIR)
+
+install_DATA = \
+	bad_package_pattern.list.sample \
+	cables.xml \
+	encoding.conf \
+	epglanguages.conf \
+	providermap.xml \
+	satellites.xml \
+	settingsupdate.conf \
+	terrestrial.xml \
+	tobackup.conf
diff --git a/data/bad_package_pattern.list.sample b/data/config/bad_package_pattern.list.sample
similarity index 100%
rename from data/bad_package_pattern.list.sample
rename to data/config/bad_package_pattern.list.sample
diff --git a/data/cables.xml b/data/config/cables.xml
similarity index 100%
rename from data/cables.xml
rename to data/config/cables.xml
diff --git a/data/encoding.conf b/data/config/encoding.conf
similarity index 100%
rename from data/encoding.conf
rename to data/config/encoding.conf
diff --git a/data/epglanguages.conf b/data/config/epglanguages.conf
similarity index 100%
rename from data/epglanguages.conf
rename to data/config/epglanguages.conf
diff --git a/data/epgmap.xml b/data/config/epgmap.xml
similarity index 100%
rename from data/epgmap.xml
rename to data/config/epgmap.xml
diff --git a/data/mk_terrestrial_xml.pl b/data/config/mk_terrestrial_xml.pl
similarity index 100%
rename from data/mk_terrestrial_xml.pl
rename to data/config/mk_terrestrial_xml.pl
diff --git a/data/providermap.xml b/data/config/providermap.xml
similarity index 100%
rename from data/providermap.xml
rename to data/config/providermap.xml
diff --git a/data/satellites.xml b/data/config/satellites.xml
similarity index 100%
rename from data/satellites.xml
rename to data/config/satellites.xml
diff --git a/data/settingsupdate.conf b/data/config/settingsupdate.conf
similarity index 100%
rename from data/settingsupdate.conf
rename to data/config/settingsupdate.conf
diff --git a/data/terrestrial.xml b/data/config/terrestrial.xml
similarity index 100%
rename from data/terrestrial.xml
rename to data/config/terrestrial.xml
diff --git a/data/tobackup.conf b/data/config/tobackup.conf
similarity index 100%
rename from data/tobackup.conf
rename to data/config/tobackup.conf