diff --git a/Makefile b/Makefile index 320fafa..4896acc 100644 --- a/Makefile +++ b/Makefile @@ -82,7 +82,6 @@ uninstall: $(RM) "$${PATH_FILE_MO}"; \ done @for SIZE in 16x16 32x32 48x48 scalable; do \ - $(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}/apps/com.ublinux.${PKGNAME}.svg"; \ $(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}/apps/com.ublinux.${PKGNAME}.png"; \ done @for FILE_SVG in $(wildcard *.svg); do \ @@ -116,18 +115,16 @@ install: check uninstall done @for SIZE in 16 32 48; do \ install -dm755 "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}x$${SIZE}/apps"; \ - rsvg-convert -w $${SIZE} -h $${SIZE} -f svg --keep-image-data "com.ublinux.${PKGNAME}.svg" -o "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}x$${SIZE}/apps/com.ublinux.${PKGNAME}.svg"; \ + rsvg-convert -w $${SIZE} -h $${SIZE} -f svg --keep-image-data "icons/apps/com.ublinux.${PKGNAME}.svg" -o "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}x$${SIZE}/apps/com.ublinux.${PKGNAME}.svg"; \ done @for FILE_ICON in $(wildcard icons/*/*.svg); do \ SUB_NAME=$${FILE_ICON#*/}; SUB_NAME=$${SUB_NAME%/*}; \ install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/$${SUB_NAME}" $${FILE_ICON}; \ done - @install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/apps/" "com.ublinux.${PKGNAME}.svg" @cp ./com.ublinux.${PKGNAME}.policy ./compile/com.ublinux.${PKGNAME}${PKGIDENT}.policy @sed -e 's+/usr/bin+${PREFIX}/bin+' -e 's+.run+${PKGIDENT}.run+g' ./compile/com.ublinux.${PKGNAME}${PKGIDENT}.policy -i @install -Dm755 -t "${DESTDIR}${PREFIX}/bin/" "${CMAKE_BUILD_DIR}/${PKGNAME}" @install -Dm644 -t "${DESTDIR}${PREFIX}/share/applications/" "${PKGNAME}.desktop" - @install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/" "com.ublinux.${PKGNAME}.svg" @if [[ "${PREFIX}" == @("/usr"|"/usr/") ]]; then \ install -Dm644 -t "${DESTDIR}${PREFIX}/share/polkit-1/actions/" "com.ublinux.${PKGNAME}.policy"; \ else \ diff --git a/gresource.xml b/gresource.xml index e05ccdb..3cfc297 100644 --- a/gresource.xml +++ b/gresource.xml @@ -16,9 +16,6 @@ ubl-settings-logging.css - - ubl-settings-logging-banner.png - journals_list.csv logging_services.csv diff --git a/com.ublinux.ubl-settings-logging.svg b/icons/apps/com.ublinux.ubl-settings-logging.svg similarity index 100% rename from com.ublinux.ubl-settings-logging.svg rename to icons/apps/com.ublinux.ubl-settings-logging.svg diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index f92bf0d..c111278 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -48,7 +48,6 @@ set(DEPENDFILES ../ubl-settings-logging-terminal.glade ../ubl-settings-logging-saving.glade ../gresource.xml - ../ubl-settings-logging-banner.png ../ubl-settings-logging.css ../journals_list.csv ../logging_services.csv diff --git a/ubl-settings-logging-banner.png b/ubl-settings-logging-banner.png deleted file mode 100644 index 8eb67cb..0000000 Binary files a/ubl-settings-logging-banner.png and /dev/null differ diff --git a/ubl-settings-logging-logrotate.glade b/ubl-settings-logging-logrotate.glade index da8d952..7d041d2 100644 --- a/ubl-settings-logging-logrotate.glade +++ b/ubl-settings-logging-logrotate.glade @@ -635,7 +635,7 @@ True False True - 3 + 3 False @@ -1223,6 +1223,18 @@ 5 + + + False + True + 0 + + + + + True + False + 5 True @@ -1232,7 +1244,7 @@ False True - 6 + 0 @@ -1241,11 +1253,13 @@ False True 3 + 3 + 3 False True - 7 + 1 @@ -1259,14 +1273,14 @@ False True - 8 + 2 False True - 0 + 1 @@ -1292,7 +1306,7 @@ False True - 1 + 2