From 10f89cd793affaf9687dfbc734bb876cb8dae06d Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Tue, 25 Jul 2023 15:48:31 +0900 Subject: [PATCH] Move icons folder to main level. Signed-off-by: Michele Calgaro (cherry picked from commit 26f5e607201a08e103dc7f356c225c4f3506c3c0) --- Makefile.am | 2 +- {src/icons => icons}/Makefile.am | 0 {src/icons => icons}/hi16-action-dvdcopy.png | Bin {src/icons => icons}/hi16-action-mp4.png | Bin {src/icons => icons}/hi16-action-mpeg.png | Bin {src/icons => icons}/hi22-action-author.png | Bin {src/icons => icons}/hi22-action-cycle.png | Bin {src/icons => icons}/hi22-action-dvdcopy.png | Bin {src/icons => icons}/hi22-action-mp4.png | Bin {src/icons => icons}/hi22-action-mpeg.png | Bin {src/icons => icons}/hi22-action-title.png | Bin {src/icons => icons}/hi32-action-author.png | Bin {src/icons => icons}/hi32-action-dvdcopy.png | Bin {src/icons => icons}/hi32-action-mp4.png | Bin {src/icons => icons}/hi32-action-mpeg.png | Bin {src/icons => icons}/hi48-action-author.png | Bin {src/icons => icons}/hi48-action-dvdcopy.png | Bin {src/icons => icons}/hi48-action-mencoder.png | Bin {src/icons => icons}/hi48-action-mp4.png | Bin {src/icons => icons}/hi48-action-mpeg.png | Bin {src/icons => icons}/hi48-action-mplayer.png | Bin src/Makefile.am | 1 - 22 files changed, 1 insertion(+), 2 deletions(-) rename {src/icons => icons}/Makefile.am (100%) rename {src/icons => icons}/hi16-action-dvdcopy.png (100%) rename {src/icons => icons}/hi16-action-mp4.png (100%) rename {src/icons => icons}/hi16-action-mpeg.png (100%) rename {src/icons => icons}/hi22-action-author.png (100%) rename {src/icons => icons}/hi22-action-cycle.png (100%) rename {src/icons => icons}/hi22-action-dvdcopy.png (100%) rename {src/icons => icons}/hi22-action-mp4.png (100%) rename {src/icons => icons}/hi22-action-mpeg.png (100%) rename {src/icons => icons}/hi22-action-title.png (100%) rename {src/icons => icons}/hi32-action-author.png (100%) rename {src/icons => icons}/hi32-action-dvdcopy.png (100%) rename {src/icons => icons}/hi32-action-mp4.png (100%) rename {src/icons => icons}/hi32-action-mpeg.png (100%) rename {src/icons => icons}/hi48-action-author.png (100%) rename {src/icons => icons}/hi48-action-dvdcopy.png (100%) rename {src/icons => icons}/hi48-action-mencoder.png (100%) rename {src/icons => icons}/hi48-action-mp4.png (100%) rename {src/icons => icons}/hi48-action-mpeg.png (100%) rename {src/icons => icons}/hi48-action-mplayer.png (100%) diff --git a/Makefile.am b/Makefile.am index 6ed4cf7..6a9b16e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = doc libdvdnav k9Mplayer libk9copy k9author k9decmpeg k9devices k9vamps \ +SUBDIRS = doc icons libdvdnav k9Mplayer libk9copy k9author k9decmpeg k9devices k9vamps \ po src $(top_srcdir)/configure.in: configure.in.in $(top_srcdir)/subdirs diff --git a/src/icons/Makefile.am b/icons/Makefile.am similarity index 100% rename from src/icons/Makefile.am rename to icons/Makefile.am diff --git a/src/icons/hi16-action-dvdcopy.png b/icons/hi16-action-dvdcopy.png similarity index 100% rename from src/icons/hi16-action-dvdcopy.png rename to icons/hi16-action-dvdcopy.png diff --git a/src/icons/hi16-action-mp4.png b/icons/hi16-action-mp4.png similarity index 100% rename from src/icons/hi16-action-mp4.png rename to icons/hi16-action-mp4.png diff --git a/src/icons/hi16-action-mpeg.png b/icons/hi16-action-mpeg.png similarity index 100% rename from src/icons/hi16-action-mpeg.png rename to icons/hi16-action-mpeg.png diff --git a/src/icons/hi22-action-author.png b/icons/hi22-action-author.png similarity index 100% rename from src/icons/hi22-action-author.png rename to icons/hi22-action-author.png diff --git a/src/icons/hi22-action-cycle.png b/icons/hi22-action-cycle.png similarity index 100% rename from src/icons/hi22-action-cycle.png rename to icons/hi22-action-cycle.png diff --git a/src/icons/hi22-action-dvdcopy.png b/icons/hi22-action-dvdcopy.png similarity index 100% rename from src/icons/hi22-action-dvdcopy.png rename to icons/hi22-action-dvdcopy.png diff --git a/src/icons/hi22-action-mp4.png b/icons/hi22-action-mp4.png similarity index 100% rename from src/icons/hi22-action-mp4.png rename to icons/hi22-action-mp4.png diff --git a/src/icons/hi22-action-mpeg.png b/icons/hi22-action-mpeg.png similarity index 100% rename from src/icons/hi22-action-mpeg.png rename to icons/hi22-action-mpeg.png diff --git a/src/icons/hi22-action-title.png b/icons/hi22-action-title.png similarity index 100% rename from src/icons/hi22-action-title.png rename to icons/hi22-action-title.png diff --git a/src/icons/hi32-action-author.png b/icons/hi32-action-author.png similarity index 100% rename from src/icons/hi32-action-author.png rename to icons/hi32-action-author.png diff --git a/src/icons/hi32-action-dvdcopy.png b/icons/hi32-action-dvdcopy.png similarity index 100% rename from src/icons/hi32-action-dvdcopy.png rename to icons/hi32-action-dvdcopy.png diff --git a/src/icons/hi32-action-mp4.png b/icons/hi32-action-mp4.png similarity index 100% rename from src/icons/hi32-action-mp4.png rename to icons/hi32-action-mp4.png diff --git a/src/icons/hi32-action-mpeg.png b/icons/hi32-action-mpeg.png similarity index 100% rename from src/icons/hi32-action-mpeg.png rename to icons/hi32-action-mpeg.png diff --git a/src/icons/hi48-action-author.png b/icons/hi48-action-author.png similarity index 100% rename from src/icons/hi48-action-author.png rename to icons/hi48-action-author.png diff --git a/src/icons/hi48-action-dvdcopy.png b/icons/hi48-action-dvdcopy.png similarity index 100% rename from src/icons/hi48-action-dvdcopy.png rename to icons/hi48-action-dvdcopy.png diff --git a/src/icons/hi48-action-mencoder.png b/icons/hi48-action-mencoder.png similarity index 100% rename from src/icons/hi48-action-mencoder.png rename to icons/hi48-action-mencoder.png diff --git a/src/icons/hi48-action-mp4.png b/icons/hi48-action-mp4.png similarity index 100% rename from src/icons/hi48-action-mp4.png rename to icons/hi48-action-mp4.png diff --git a/src/icons/hi48-action-mpeg.png b/icons/hi48-action-mpeg.png similarity index 100% rename from src/icons/hi48-action-mpeg.png rename to icons/hi48-action-mpeg.png diff --git a/src/icons/hi48-action-mplayer.png b/icons/hi48-action-mplayer.png similarity index 100% rename from src/icons/hi48-action-mplayer.png rename to icons/hi48-action-mplayer.png diff --git a/src/Makefile.am b/src/Makefile.am index 60661c4..efa34fc 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -52,7 +52,6 @@ AM_CXXFLAGS = -O3 -g3 applnkMultimedia_DATA = k9copy.desktop applnkMultimediadir = $(xdg_appsdir) -SUBDIRS = icons konquerorServicesMenusdir = $(kde_datadir)/konqueror/servicemenus