From 7b1350b7d39874242b578e640fc50a3b4534520e Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Mon, 14 Oct 2024 13:21:23 +0900 Subject: [PATCH] Remove duplication of mime type icons in final packages Signed-off-by: Michele Calgaro --- configure.in | 2 ++ icons/Makefile.am | 6 +----- icons/actions/Makefile.am | 3 +++ icons/{ => actions}/cr16-action-categories.png | Bin icons/{ => actions}/cr16-action-diet.png | Bin icons/{ => actions}/cr16-action-ingredients.png | Bin icons/{ => actions}/cr16-action-properties.png | Bin icons/{ => actions}/cr16-action-trolley.png | Bin icons/{ => actions}/cr16-action-units.png | Bin icons/{ => actions}/cr22-action-categories.png | Bin icons/{ => actions}/cr22-action-diet.png | Bin icons/{ => actions}/cr22-action-ingredients.png | Bin icons/{ => actions}/cr22-action-properties.png | Bin icons/{ => actions}/cr22-action-trolley.png | Bin icons/{ => actions}/cr22-action-units.png | Bin icons/{ => actions}/cr32-action-categories.png | Bin icons/{ => actions}/cr32-action-diet.png | Bin icons/{ => actions}/cr32-action-ingredients.png | Bin icons/{ => actions}/cr32-action-krectip.png | Bin icons/{ => actions}/cr32-action-properties.png | Bin icons/{ => actions}/cr32-action-trolley.png | Bin icons/{ => actions}/cr32-action-units.png | Bin icons/{ => actions}/cr48-action-categories.png | Bin icons/{ => actions}/cr48-action-diet.png | Bin icons/{ => actions}/cr48-action-ingredients.png | Bin icons/{ => actions}/cr48-action-properties.png | Bin icons/{ => actions}/cr48-action-trolley.png | Bin icons/{ => actions}/cr48-action-units.png | Bin icons/mime/Makefile.am | 3 +++ icons/{ => mime}/cr128-mime-krecipes_file.png | Bin icons/{ => mime}/cr16-mime-krecipes_file.png | Bin icons/{ => mime}/cr32-mime-krecipes_file.png | Bin icons/{ => mime}/cr64-mime-krecipes_file.png | Bin 33 files changed, 9 insertions(+), 5 deletions(-) create mode 100644 icons/actions/Makefile.am rename icons/{ => actions}/cr16-action-categories.png (100%) rename icons/{ => actions}/cr16-action-diet.png (100%) rename icons/{ => actions}/cr16-action-ingredients.png (100%) rename icons/{ => actions}/cr16-action-properties.png (100%) rename icons/{ => actions}/cr16-action-trolley.png (100%) rename icons/{ => actions}/cr16-action-units.png (100%) rename icons/{ => actions}/cr22-action-categories.png (100%) rename icons/{ => actions}/cr22-action-diet.png (100%) rename icons/{ => actions}/cr22-action-ingredients.png (100%) rename icons/{ => actions}/cr22-action-properties.png (100%) rename icons/{ => actions}/cr22-action-trolley.png (100%) rename icons/{ => actions}/cr22-action-units.png (100%) rename icons/{ => actions}/cr32-action-categories.png (100%) rename icons/{ => actions}/cr32-action-diet.png (100%) rename icons/{ => actions}/cr32-action-ingredients.png (100%) rename icons/{ => actions}/cr32-action-krectip.png (100%) rename icons/{ => actions}/cr32-action-properties.png (100%) rename icons/{ => actions}/cr32-action-trolley.png (100%) rename icons/{ => actions}/cr32-action-units.png (100%) rename icons/{ => actions}/cr48-action-categories.png (100%) rename icons/{ => actions}/cr48-action-diet.png (100%) rename icons/{ => actions}/cr48-action-ingredients.png (100%) rename icons/{ => actions}/cr48-action-properties.png (100%) rename icons/{ => actions}/cr48-action-trolley.png (100%) rename icons/{ => actions}/cr48-action-units.png (100%) create mode 100644 icons/mime/Makefile.am rename icons/{ => mime}/cr128-mime-krecipes_file.png (100%) rename icons/{ => mime}/cr16-mime-krecipes_file.png (100%) rename icons/{ => mime}/cr32-mime-krecipes_file.png (100%) rename icons/{ => mime}/cr64-mime-krecipes_file.png (100%) diff --git a/configure.in b/configure.in index ca83dca..df15e30 100644 --- a/configure.in +++ b/configure.in @@ -188,6 +188,8 @@ AC_CONFIG_FILES([ doc/et/Makefile ]) AC_CONFIG_FILES([ doc/pt/Makefile ]) AC_CONFIG_FILES([ doc/sv/Makefile ]) AC_CONFIG_FILES([ icons/Makefile ]) +AC_CONFIG_FILES([ icons/actions/Makefile ]) +AC_CONFIG_FILES([ icons/mime/Makefile ]) AC_CONFIG_FILES([ layouts/Makefile ]) AC_CONFIG_FILES([ src/Makefile ]) AC_CONFIG_FILES([ src/backends/Makefile ]) diff --git a/icons/Makefile.am b/icons/Makefile.am index 98c80f8..9a9945b 100644 --- a/icons/Makefile.am +++ b/icons/Makefile.am @@ -1,5 +1 @@ -krecipesdir = $(kde_datadir)/krecipes/icons -krecipes_ICON = AUTO - -KDE_ICON = krecipes_file - +SUBDIRS = actions mime diff --git a/icons/actions/Makefile.am b/icons/actions/Makefile.am new file mode 100644 index 0000000..5d74658 --- /dev/null +++ b/icons/actions/Makefile.am @@ -0,0 +1,3 @@ +krecipesdir = $(kde_datadir)/krecipes/icons +krecipes_ICON = AUTO + diff --git a/icons/cr16-action-categories.png b/icons/actions/cr16-action-categories.png similarity index 100% rename from icons/cr16-action-categories.png rename to icons/actions/cr16-action-categories.png diff --git a/icons/cr16-action-diet.png b/icons/actions/cr16-action-diet.png similarity index 100% rename from icons/cr16-action-diet.png rename to icons/actions/cr16-action-diet.png diff --git a/icons/cr16-action-ingredients.png b/icons/actions/cr16-action-ingredients.png similarity index 100% rename from icons/cr16-action-ingredients.png rename to icons/actions/cr16-action-ingredients.png diff --git a/icons/cr16-action-properties.png b/icons/actions/cr16-action-properties.png similarity index 100% rename from icons/cr16-action-properties.png rename to icons/actions/cr16-action-properties.png diff --git a/icons/cr16-action-trolley.png b/icons/actions/cr16-action-trolley.png similarity index 100% rename from icons/cr16-action-trolley.png rename to icons/actions/cr16-action-trolley.png diff --git a/icons/cr16-action-units.png b/icons/actions/cr16-action-units.png similarity index 100% rename from icons/cr16-action-units.png rename to icons/actions/cr16-action-units.png diff --git a/icons/cr22-action-categories.png b/icons/actions/cr22-action-categories.png similarity index 100% rename from icons/cr22-action-categories.png rename to icons/actions/cr22-action-categories.png diff --git a/icons/cr22-action-diet.png b/icons/actions/cr22-action-diet.png similarity index 100% rename from icons/cr22-action-diet.png rename to icons/actions/cr22-action-diet.png diff --git a/icons/cr22-action-ingredients.png b/icons/actions/cr22-action-ingredients.png similarity index 100% rename from icons/cr22-action-ingredients.png rename to icons/actions/cr22-action-ingredients.png diff --git a/icons/cr22-action-properties.png b/icons/actions/cr22-action-properties.png similarity index 100% rename from icons/cr22-action-properties.png rename to icons/actions/cr22-action-properties.png diff --git a/icons/cr22-action-trolley.png b/icons/actions/cr22-action-trolley.png similarity index 100% rename from icons/cr22-action-trolley.png rename to icons/actions/cr22-action-trolley.png diff --git a/icons/cr22-action-units.png b/icons/actions/cr22-action-units.png similarity index 100% rename from icons/cr22-action-units.png rename to icons/actions/cr22-action-units.png diff --git a/icons/cr32-action-categories.png b/icons/actions/cr32-action-categories.png similarity index 100% rename from icons/cr32-action-categories.png rename to icons/actions/cr32-action-categories.png diff --git a/icons/cr32-action-diet.png b/icons/actions/cr32-action-diet.png similarity index 100% rename from icons/cr32-action-diet.png rename to icons/actions/cr32-action-diet.png diff --git a/icons/cr32-action-ingredients.png b/icons/actions/cr32-action-ingredients.png similarity index 100% rename from icons/cr32-action-ingredients.png rename to icons/actions/cr32-action-ingredients.png diff --git a/icons/cr32-action-krectip.png b/icons/actions/cr32-action-krectip.png similarity index 100% rename from icons/cr32-action-krectip.png rename to icons/actions/cr32-action-krectip.png diff --git a/icons/cr32-action-properties.png b/icons/actions/cr32-action-properties.png similarity index 100% rename from icons/cr32-action-properties.png rename to icons/actions/cr32-action-properties.png diff --git a/icons/cr32-action-trolley.png b/icons/actions/cr32-action-trolley.png similarity index 100% rename from icons/cr32-action-trolley.png rename to icons/actions/cr32-action-trolley.png diff --git a/icons/cr32-action-units.png b/icons/actions/cr32-action-units.png similarity index 100% rename from icons/cr32-action-units.png rename to icons/actions/cr32-action-units.png diff --git a/icons/cr48-action-categories.png b/icons/actions/cr48-action-categories.png similarity index 100% rename from icons/cr48-action-categories.png rename to icons/actions/cr48-action-categories.png diff --git a/icons/cr48-action-diet.png b/icons/actions/cr48-action-diet.png similarity index 100% rename from icons/cr48-action-diet.png rename to icons/actions/cr48-action-diet.png diff --git a/icons/cr48-action-ingredients.png b/icons/actions/cr48-action-ingredients.png similarity index 100% rename from icons/cr48-action-ingredients.png rename to icons/actions/cr48-action-ingredients.png diff --git a/icons/cr48-action-properties.png b/icons/actions/cr48-action-properties.png similarity index 100% rename from icons/cr48-action-properties.png rename to icons/actions/cr48-action-properties.png diff --git a/icons/cr48-action-trolley.png b/icons/actions/cr48-action-trolley.png similarity index 100% rename from icons/cr48-action-trolley.png rename to icons/actions/cr48-action-trolley.png diff --git a/icons/cr48-action-units.png b/icons/actions/cr48-action-units.png similarity index 100% rename from icons/cr48-action-units.png rename to icons/actions/cr48-action-units.png diff --git a/icons/mime/Makefile.am b/icons/mime/Makefile.am new file mode 100644 index 0000000..a08b248 --- /dev/null +++ b/icons/mime/Makefile.am @@ -0,0 +1,3 @@ +krecipesdir = $(datadir)/icons +krecipes_ICON = AUTO + diff --git a/icons/cr128-mime-krecipes_file.png b/icons/mime/cr128-mime-krecipes_file.png similarity index 100% rename from icons/cr128-mime-krecipes_file.png rename to icons/mime/cr128-mime-krecipes_file.png diff --git a/icons/cr16-mime-krecipes_file.png b/icons/mime/cr16-mime-krecipes_file.png similarity index 100% rename from icons/cr16-mime-krecipes_file.png rename to icons/mime/cr16-mime-krecipes_file.png diff --git a/icons/cr32-mime-krecipes_file.png b/icons/mime/cr32-mime-krecipes_file.png similarity index 100% rename from icons/cr32-mime-krecipes_file.png rename to icons/mime/cr32-mime-krecipes_file.png diff --git a/icons/cr64-mime-krecipes_file.png b/icons/mime/cr64-mime-krecipes_file.png similarity index 100% rename from icons/cr64-mime-krecipes_file.png rename to icons/mime/cr64-mime-krecipes_file.png