From e348e454fc7aeda88baa441f70d6b70231f5bb53 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sat, 26 Jan 2019 17:05:43 +0100 Subject: [PATCH] move control scripts from data/neutrino-scripts to data/control Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/f74f2aef5ca5f47b007cc66ad445ba373e12d143 Author: vanhofen Date: 2019-01-26 (Sat, 26 Jan 2019) Origin message was: ------------------ - move control scripts from data/neutrino-scripts to data/control ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- configure.ac | 2 +- data/Makefile.am | 2 +- data/{neutrino-scripts => control}/Makefile.am | 0 data/{neutrino-scripts => control}/audioplayer.end | 0 data/{neutrino-scripts => control}/audioplayer.start | 0 data/{neutrino-scripts => control}/deepstandby.off | 0 data/{neutrino-scripts => control}/deepstandby.on | 0 data/{neutrino-scripts => control}/flash.start | 0 data/{neutrino-scripts => control}/inactivity.on | 0 data/{neutrino-scripts => control}/migration.sh | 0 data/{neutrino-scripts => control}/movieplayer.end | 0 data/{neutrino-scripts => control}/movieplayer.start | 0 data/{neutrino-scripts => control}/neutrino.start | 0 data/{neutrino-scripts => control}/pictureviewer.end | 0 data/{neutrino-scripts => control}/pictureviewer.start | 0 data/{neutrino-scripts => control}/recording.end | 0 data/{neutrino-scripts => control}/recording.start | 0 data/{neutrino-scripts => control}/recording.timer | 0 data/{neutrino-scripts => control}/standby.off | 0 data/{neutrino-scripts => control}/standby.on | 0 20 files changed, 2 insertions(+), 2 deletions(-) rename data/{neutrino-scripts => control}/Makefile.am (100%) rename data/{neutrino-scripts => control}/audioplayer.end (100%) rename data/{neutrino-scripts => control}/audioplayer.start (100%) rename data/{neutrino-scripts => control}/deepstandby.off (100%) rename data/{neutrino-scripts => control}/deepstandby.on (100%) rename data/{neutrino-scripts => control}/flash.start (100%) rename data/{neutrino-scripts => control}/inactivity.on (100%) rename data/{neutrino-scripts => control}/migration.sh (100%) rename data/{neutrino-scripts => control}/movieplayer.end (100%) rename data/{neutrino-scripts => control}/movieplayer.start (100%) rename data/{neutrino-scripts => control}/neutrino.start (100%) rename data/{neutrino-scripts => control}/pictureviewer.end (100%) rename data/{neutrino-scripts => control}/pictureviewer.start (100%) rename data/{neutrino-scripts => control}/recording.end (100%) rename data/{neutrino-scripts => control}/recording.start (100%) rename data/{neutrino-scripts => control}/recording.timer (100%) rename data/{neutrino-scripts => control}/standby.off (100%) rename data/{neutrino-scripts => control}/standby.on (100%) diff --git a/configure.ac b/configure.ac index 3e98d1491..dd8e65ed6 100644 --- a/configure.ac +++ b/configure.ac @@ -326,6 +326,7 @@ AC_OUTPUT([ Makefile data/Makefile data/config/Makefile +data/control/Makefile data/fonts/Makefile data/icons/Makefile data/icons/buttons/Makefile @@ -351,7 +352,6 @@ data/lcd/clock/Makefile data/lcd/icons/Makefile data/license/Makefile data/locale/Makefile -data/neutrino-scripts/Makefile data/pictures/Makefile data/pictures/backgrounds/Makefile data/pictures/screensaver/Makefile diff --git a/data/Makefile.am b/data/Makefile.am index 0d9a5c5b9..7225b4509 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,5 +1,6 @@ SUBDIRS = \ config \ + control \ fonts \ icons \ inetradio \ @@ -7,7 +8,6 @@ SUBDIRS = \ iso-codes \ license \ locale \ - neutrino-scripts \ pictures \ policy \ scripts \ diff --git a/data/neutrino-scripts/Makefile.am b/data/control/Makefile.am similarity index 100% rename from data/neutrino-scripts/Makefile.am rename to data/control/Makefile.am diff --git a/data/neutrino-scripts/audioplayer.end b/data/control/audioplayer.end similarity index 100% rename from data/neutrino-scripts/audioplayer.end rename to data/control/audioplayer.end diff --git a/data/neutrino-scripts/audioplayer.start b/data/control/audioplayer.start similarity index 100% rename from data/neutrino-scripts/audioplayer.start rename to data/control/audioplayer.start diff --git a/data/neutrino-scripts/deepstandby.off b/data/control/deepstandby.off similarity index 100% rename from data/neutrino-scripts/deepstandby.off rename to data/control/deepstandby.off diff --git a/data/neutrino-scripts/deepstandby.on b/data/control/deepstandby.on similarity index 100% rename from data/neutrino-scripts/deepstandby.on rename to data/control/deepstandby.on diff --git a/data/neutrino-scripts/flash.start b/data/control/flash.start similarity index 100% rename from data/neutrino-scripts/flash.start rename to data/control/flash.start diff --git a/data/neutrino-scripts/inactivity.on b/data/control/inactivity.on similarity index 100% rename from data/neutrino-scripts/inactivity.on rename to data/control/inactivity.on diff --git a/data/neutrino-scripts/migration.sh b/data/control/migration.sh similarity index 100% rename from data/neutrino-scripts/migration.sh rename to data/control/migration.sh diff --git a/data/neutrino-scripts/movieplayer.end b/data/control/movieplayer.end similarity index 100% rename from data/neutrino-scripts/movieplayer.end rename to data/control/movieplayer.end diff --git a/data/neutrino-scripts/movieplayer.start b/data/control/movieplayer.start similarity index 100% rename from data/neutrino-scripts/movieplayer.start rename to data/control/movieplayer.start diff --git a/data/neutrino-scripts/neutrino.start b/data/control/neutrino.start similarity index 100% rename from data/neutrino-scripts/neutrino.start rename to data/control/neutrino.start diff --git a/data/neutrino-scripts/pictureviewer.end b/data/control/pictureviewer.end similarity index 100% rename from data/neutrino-scripts/pictureviewer.end rename to data/control/pictureviewer.end diff --git a/data/neutrino-scripts/pictureviewer.start b/data/control/pictureviewer.start similarity index 100% rename from data/neutrino-scripts/pictureviewer.start rename to data/control/pictureviewer.start diff --git a/data/neutrino-scripts/recording.end b/data/control/recording.end similarity index 100% rename from data/neutrino-scripts/recording.end rename to data/control/recording.end diff --git a/data/neutrino-scripts/recording.start b/data/control/recording.start similarity index 100% rename from data/neutrino-scripts/recording.start rename to data/control/recording.start diff --git a/data/neutrino-scripts/recording.timer b/data/control/recording.timer similarity index 100% rename from data/neutrino-scripts/recording.timer rename to data/control/recording.timer diff --git a/data/neutrino-scripts/standby.off b/data/control/standby.off similarity index 100% rename from data/neutrino-scripts/standby.off rename to data/control/standby.off diff --git a/data/neutrino-scripts/standby.on b/data/control/standby.on similarity index 100% rename from data/neutrino-scripts/standby.on rename to data/control/standby.on