Skip to content

GitLab

Commit 4b4741ab authored by Jonathan Carter's avatar Jonathan Carter
Browse files

Update uncommited files

parent 42fd71b0
Expand all Hide whitespace changes
Inline Side-by-side
2020.1/aims-live/aims-live-2020/calamares/branding/aimsdesktop/branding.desc
View file @ 4b4741ab
......@@ -8,7 +8,7 @@ strings:
shortVersion: 2020.1
versionedName: AIMS Desktop 2020.1
shortVersionedName: AIMS Desktop 2020.1
bootloaderEntryName: debian
bootloaderEntryName: AIMS Desktop
productUrl: https://aims.ac.za
supportUrl: https://help.aims.ac.za
knownIssuesUrl: https://help.aims.ac.za
......
2020.1/aims-live/aims-live-2020/calamares/modules/bootloader.conf
View file @ 4b4741ab
......@@ -43,7 +43,7 @@ efiBootMgr: "efibootmgr"
# setting the option here, keep in mind that the name is sanitized
# (problematic characters, see above, are replaced).
#
# efiBootloaderId: "dirname"
efiBootloaderId: "debian"
# Optionally install a copy of the GRUB EFI bootloader as the EFI
# fallback loader (either bootia32.efi or bootx64.efi depending on
......
2020.1/aims-live/aims-live-2020/debian/.debhelper/generated/aims-live/installed-by-dh_install
View file @ 4b4741ab
......@@ -16,4 +16,3 @@
./install-aims-desktop.desktop
./install-aims-desktop
./add-calamares-desktop-icon
./conf/calamares-desktop-icon.desktop
2020.1/aims-live/aims-live-2020/debian/changelog
View file @ 4b4741ab
aims-live (1:2020.10) buster; urgency=medium
* Don't add calamares desktop icon, it doesn't work with
desktop shell extension
* Update calamares branding/boot entries
* Update branding images
-- Jonathan Carter <jcc@debian.org> Fri, 26 Apr 2019 08:45:09 +0000
aims-live (1:2020.9) buster; urgency=medium
* Add script to add calamares icon on desktop
......
2020.1/aims-live/aims-live-2020/debian/install
View file @ 4b4741ab
......@@ -16,4 +16,4 @@ conf/gsettings/96_aims-desktop-live.gschema.override usr/share/glib-2.0/schemas
install-aims-desktop.desktop usr/share/applications
install-aims-desktop usr/bin
add-calamares-desktop-icon usr/bin
conf/calamares-desktop-icon.desktop etc/xdg/autostart
#conf/calamares-desktop-icon.desktop etc/xdg/autostart
2020.1/desktop-base/Makefile deleted 100644 → 0
View file @ 42fd71b0
GRUB_THEMES=futureprototype-theme/grub\
moonlight-theme/grub\
softwaves-theme/grub\
lines-theme/grub\
joy-theme/grub\
spacefun-theme/grub
DEFAULT_BACKGROUND=desktop-background
PIXMAPS=$(wildcard pixmaps/*.png)
DESKTOPFILES=$(wildcard *.desktop)
.PHONY: all clean install install-local
all: build-grub build-emblems build-logos
clean: clean-grub clean-emblems clean-logos
.PHONY: build-grub clean-grub install-grub
build-grub clean-grub install-grub:
@target=`echo $@ | sed s/-grub//`; \
for grub_theme in $(GRUB_THEMES) ; do \
if [ -f $$grub_theme/Makefile ] ; then \
$(MAKE) $$target -C $$grub_theme || exit 1; \
fi \
done
.PHONY: build-emblems clean-emblems install-emblems
build-emblems clean-emblems install-emblems:
@target=`echo $@ | sed s/-emblems//`; \
$(MAKE) $$target -C emblems-debian || exit 1;
.PHONY: build-logos clean-logos install-logos
build-logos clean-logos install-logos:
@target=`echo $@ | sed s/-logos//`; \
$(MAKE) $$target -C debian-logos || exit 1;
install: install-grub install-emblems install-logos install-local
install-local:
# background files
mkdir -p $(DESTDIR)/usr/share/images/desktop-base
cd $(DESTDIR)/usr/share/images/desktop-base && ln -s $(DEFAULT_BACKGROUND) default
# desktop files
mkdir -p $(DESTDIR)/usr/share/desktop-base
$(INSTALL_DATA) $(DESKTOPFILES) $(DESTDIR)/usr/share/desktop-base/
# pixmaps files
mkdir -p $(DESTDIR)/usr/share/pixmaps
$(INSTALL_DATA) $(PIXMAPS) $(DESTDIR)/usr/share/pixmaps/
# Create a 'debian-theme' symlink in plymouth themes folder, pointing at the
# plymouth theme for the currently active 'desktop-theme' alternative.
mkdir -p $(DESTDIR)/usr/share/plymouth/themes
ln -s ../../desktop-base/active-theme/plymouth $(DESTDIR)/usr/share/plymouth/themes/debian-theme
# Set Plasma 5/KDE default wallpaper
install -d $(DESTDIR)/usr/share/plasma/shells/org.kde.plasma.desktop/contents/updates
$(INSTALL_DATA) defaults/plasma5/desktop-base.js $(DESTDIR)/usr/share/plasma/shells/org.kde.plasma.desktop/contents/updates/
# Xfce 4.6
mkdir -p $(DESTDIR)/usr/share/desktop-base/profiles/xdg-config/xfce4/xfconf/xfce-perchannel-xml
$(INSTALL_DATA) $(wildcard profiles/xdg-config/xfce4/xfconf/xfce-perchannel-xml/*) $(DESTDIR)/usr/share/desktop-base/profiles/xdg-config/xfce4/xfconf/xfce-perchannel-xml
# GNOME background descriptors
mkdir -p $(DESTDIR)/usr/share/gnome-background-properties
# Space Fun theme (Squeeze’s default)
### Plymouth theme
install -d $(DESTDIR)/usr/share/plymouth/themes/spacefun
$(INSTALL_DATA) $(wildcard spacefun-theme/plymouth/*) $(DESTDIR)/usr/share/plymouth/themes/spacefun
install -d $(DESTDIR)/usr/share/desktop-base/spacefun-theme
cd $(DESTDIR)/usr/share/desktop-base/spacefun-theme && ln -s /usr/share/plymouth/themes/spacefun plymouth
### Login background
install -d $(DESTDIR)/usr/share/desktop-base/spacefun-theme/login
$(INSTALL_DATA) $(wildcard spacefun-theme/login/*) $(DESTDIR)/usr/share/desktop-base/spacefun-theme/login
### Wallpapers
install -d $(DESTDIR)/usr/share/desktop-base/spacefun-theme/wallpaper/contents/images
$(INSTALL_DATA) spacefun-theme/wallpaper/metadata.desktop $(DESTDIR)/usr/share/desktop-base/spacefun-theme/wallpaper
$(INSTALL_DATA) spacefun-theme/wallpaper/gnome-background.xml $(DESTDIR)/usr/share/desktop-base/spacefun-theme/wallpaper
$(INSTALL_DATA) $(wildcard spacefun-theme/wallpaper/contents/images/*) $(DESTDIR)/usr/share/desktop-base/spacefun-theme/wallpaper/contents/images/
$(INSTALL_DATA) spacefun-theme/gnome-wp-list.xml $(DESTDIR)/usr/share/gnome-background-properties/debian-spacefun.xml
# Wallpaper symlink for KDE
install -d $(DESTDIR)/usr/share/wallpapers
cd $(DESTDIR)/usr/share/wallpapers && ln -s /usr/share/desktop-base/spacefun-theme/wallpaper SpaceFun
### Lockscreen (same as wallpaper)
cd $(DESTDIR)/usr/share/desktop-base/spacefun-theme && ln -s wallpaper lockscreen
# Joy theme (Wheezy’s default)
### Plymouth theme
install -d $(DESTDIR)/usr/share/plymouth/themes/joy
$(INSTALL_DATA) $(wildcard joy-theme/plymouth/*) $(DESTDIR)/usr/share/plymouth/themes/joy
install -d $(DESTDIR)/usr/share/desktop-base/joy-theme
cd $(DESTDIR)/usr/share/desktop-base/joy-theme && ln -s /usr/share/plymouth/themes/joy plymouth
### Login background
install -d $(DESTDIR)/usr/share/desktop-base/joy-theme/login
$(INSTALL_DATA) $(wildcard joy-theme/login/*) $(DESTDIR)/usr/share/desktop-base/joy-theme/login
### Wallpapers
install -d $(DESTDIR)/usr/share/desktop-base/joy-theme/wallpaper/contents/images
$(INSTALL_DATA) joy-theme/wallpaper/metadata.desktop $(DESTDIR)/usr/share/desktop-base/joy-theme/wallpaper
$(INSTALL_DATA) joy-theme/wallpaper/gnome-background.xml $(DESTDIR)/usr/share/desktop-base/joy-theme/wallpaper
$(INSTALL_DATA) $(wildcard joy-theme/wallpaper/contents/images/*) $(DESTDIR)/usr/share/desktop-base/joy-theme/wallpaper/contents/images/
$(INSTALL_DATA) joy-theme/gnome-wp-list.xml $(DESTDIR)/usr/share/gnome-background-properties/debian-joy.xml
# Wallpaper symlink for KDE
install -d $(DESTDIR)/usr/share/wallpapers
cd $(DESTDIR)/usr/share/wallpapers && ln -s /usr/share/desktop-base/joy-theme/wallpaper Joy
### Lockscreen
install -d $(DESTDIR)/usr/share/desktop-base/joy-theme/lockscreen/contents/images
$(INSTALL_DATA) joy-theme/lockscreen/metadata.desktop $(DESTDIR)/usr/share/desktop-base/joy-theme/lockscreen
$(INSTALL_DATA) joy-theme/lockscreen/gnome-background.xml $(DESTDIR)/usr/share/desktop-base/joy-theme/lockscreen
$(INSTALL_DATA) $(wildcard joy-theme/lockscreen/contents/images/*) $(DESTDIR)/usr/share/desktop-base/joy-theme/lockscreen/contents/images/
# Lock screen symlink for KDE
install -d $(DESTDIR)/usr/share/wallpapers
cd $(DESTDIR)/usr/share/wallpapers && ln -s /usr/share/desktop-base/joy-theme/lockscreen JoyLockScreen
# Joy Inksplat theme (Wheezy’s alternate theme)
install -d $(DESTDIR)/usr/share/desktop-base/joy-inksplat-theme
### Plymouth theme
# Reuse « normal » joy theme
cd $(DESTDIR)/usr/share/desktop-base/joy-inksplat-theme \
&& ln -s /usr/share/plymouth/themes/joy plymouth \
### Wallpapers
install -d $(DESTDIR)/usr/share/desktop-base/joy-inksplat-theme/wallpaper/contents/images
$(INSTALL_DATA) joy-inksplat-theme/wallpaper/metadata.desktop $(DESTDIR)/usr/share/desktop-base/joy-inksplat-theme/wallpaper
$(INSTALL_DATA) joy-inksplat-theme/wallpaper/gnome-background.xml $(DESTDIR)/usr/share/desktop-base/joy-inksplat-theme/wallpaper
$(INSTALL_DATA) $(wildcard joy-inksplat-theme/wallpaper/contents/images/*) $(DESTDIR)/usr/share/desktop-base/joy-inksplat-theme/wallpaper/contents/images/
$(INSTALL_DATA) joy-inksplat-theme/gnome-wp-list.xml $(DESTDIR)/usr/share/gnome-background-properties/debian-joy-inksplat.xml
# Wallpaper symlink for KDE
install -d $(DESTDIR)/usr/share/wallpapers
cd $(DESTDIR)/usr/share/wallpapers && ln -s /usr/share/desktop-base/joy-inksplat-theme/wallpaper JoyInksplat
### Lockscreen (same as Joy)
cd $(DESTDIR)/usr/share/desktop-base/joy-inksplat-theme && ln -s /usr/share/desktop-base/joy-theme/lockscreen lockscreen
# Lines theme (Jessie’s default)
### Plymouth theme
install -d $(DESTDIR)/usr/share/plymouth/themes/lines
$(INSTALL_DATA) $(wildcard lines-theme/plymouth/*) $(DESTDIR)/usr/share/plymouth/themes/lines
install -d $(DESTDIR)/usr/share/desktop-base/lines-theme
cd $(DESTDIR)/usr/share/desktop-base/lines-theme && ln -s /usr/share/plymouth/themes/lines plymouth
### Login background
install -d $(DESTDIR)/usr/share/desktop-base/lines-theme/login
$(INSTALL_DATA) $(wildcard lines-theme/login/*) $(DESTDIR)/usr/share/desktop-base/lines-theme/login
### Wallpapers
install -d $(DESTDIR)/usr/share/desktop-base/lines-theme/wallpaper/contents/images
$(INSTALL_DATA) lines-theme/wallpaper/metadata.desktop $(DESTDIR)/usr/share/desktop-base/lines-theme/wallpaper
$(INSTALL_DATA) lines-theme/wallpaper/gnome-background.xml $(DESTDIR)/usr/share/desktop-base/lines-theme/wallpaper
$(INSTALL_DATA) $(wildcard lines-theme/wallpaper/contents/images/*) $(DESTDIR)/usr/share/desktop-base/lines-theme/wallpaper/contents/images/
$(INSTALL_DATA) lines-theme/gnome-wp-list.xml $(DESTDIR)/usr/share/gnome-background-properties/debian-lines.xml
# Wallpaper symlink for KDE
install -d $(DESTDIR)/usr/share/wallpapers
cd $(DESTDIR)/usr/share/wallpapers && ln -s /usr/share/desktop-base/lines-theme/wallpaper Lines
### Lockscreen
install -d $(DESTDIR)/usr/share/desktop-base/lines-theme/lockscreen/contents/images
$(INSTALL_DATA) lines-theme/lockscreen/metadata.desktop $(DESTDIR)/usr/share/desktop-base/lines-theme/lockscreen
$(INSTALL_DATA) lines-theme/lockscreen/gnome-background.xml $(DESTDIR)/usr/share/desktop-base/lines-theme/lockscreen
$(INSTALL_DATA) $(wildcard lines-theme/lockscreen/contents/images/*) $(DESTDIR)/usr/share/desktop-base/lines-theme/lockscreen/contents/images/
# Lock screen symlink for KDE
install -d $(DESTDIR)/usr/share/wallpapers
cd $(DESTDIR)/usr/share/wallpapers && ln -s /usr/share/desktop-base/lines-theme/lockscreen LinesLockScreen
# Soft waves theme (Stretch’s default)
### Plymouth theme
install -d $(DESTDIR)/usr/share/plymouth/themes/softwaves
$(INSTALL_DATA) $(wildcard softwaves-theme/plymouth/*) $(DESTDIR)/usr/share/plymouth/themes/softwaves
install -d $(DESTDIR)/usr/share/desktop-base/softwaves-theme
cd $(DESTDIR)/usr/share/desktop-base/softwaves-theme && ln -s /usr/share/plymouth/themes/softwaves plymouth
### Login background
install -d $(DESTDIR)/usr/share/desktop-base/softwaves-theme/login
$(INSTALL_DATA) $(wildcard softwaves-theme/login/*) $(DESTDIR)/usr/share/desktop-base/softwaves-theme/login
### Wallpapers
install -d $(DESTDIR)/usr/share/desktop-base/softwaves-theme/wallpaper/contents/images
$(INSTALL_DATA) softwaves-theme/wallpaper/metadata.desktop $(DESTDIR)/usr/share/desktop-base/softwaves-theme/wallpaper
$(INSTALL_DATA) softwaves-theme/wallpaper/gnome-background.xml $(DESTDIR)/usr/share/desktop-base/softwaves-theme/wallpaper
$(INSTALL_DATA) $(wildcard softwaves-theme/wallpaper/contents/images/*) $(DESTDIR)/usr/share/desktop-base/softwaves-theme/wallpaper/contents/images/
$(INSTALL_DATA) softwaves-theme/gnome-wp-list.xml $(DESTDIR)/usr/share/gnome-background-properties/debian-softwaves.xml
# Wallpaper symlink for KDE
install -d $(DESTDIR)/usr/share/wallpapers
cd $(DESTDIR)/usr/share/wallpapers && ln -s /usr/share/desktop-base/softwaves-theme/wallpaper SoftWaves
### Lockscreen
install -d $(DESTDIR)/usr/share/desktop-base/softwaves-theme/lockscreen/contents/images
$(INSTALL_DATA) softwaves-theme/lockscreen/metadata.desktop $(DESTDIR)/usr/share/desktop-base/softwaves-theme/lockscreen
$(INSTALL_DATA) softwaves-theme/lockscreen/gnome-background.xml $(DESTDIR)/usr/share/desktop-base/softwaves-theme/lockscreen
$(INSTALL_DATA) $(wildcard softwaves-theme/lockscreen/contents/images/*) $(DESTDIR)/usr/share/desktop-base/softwaves-theme/lockscreen/contents/images/
# Lock screen symlink for KDE
install -d $(DESTDIR)/usr/share/wallpapers
cd $(DESTDIR)/usr/share/wallpapers && ln -s /usr/share/desktop-base/softwaves-theme/lockscreen SoftWavesLockScreen
# futurePrototype theme (Buster’s default)
### Plymouth theme
install -d $(DESTDIR)/usr/share/plymouth/themes/futureprototype
$(INSTALL_DATA) $(wildcard futureprototype-theme/plymouth/*) $(DESTDIR)/usr/share/plymouth/themes/futureprototype
install -d $(DESTDIR)/usr/share/desktop-base/futureprototype-theme
cd $(DESTDIR)/usr/share/desktop-base/futureprototype-theme && ln -s /usr/share/plymouth/themes/futureprototype plymouth
### Login background
install -d $(DESTDIR)/usr/share/desktop-base/futureprototype-theme/login
$(INSTALL_DATA) $(wildcard futureprototype-theme/login/*) $(DESTDIR)/usr/share/desktop-base/futureprototype-theme/login
### Wallpapers
install -d $(DESTDIR)/usr/share/desktop-base/futureprototype-theme/wallpaper/contents/images
$(INSTALL_DATA) futureprototype-theme/wallpaper/metadata.desktop $(DESTDIR)/usr/share/desktop-base/futureprototype-theme/wallpaper
$(INSTALL_DATA) futureprototype-theme/wallpaper/gnome-background.xml $(DESTDIR)/usr/share/desktop-base/futureprototype-theme/wallpaper
$(INSTALL_DATA) $(wildcard futureprototype-theme/wallpaper/contents/images/*) $(DESTDIR)/usr/share/desktop-base/futureprototype-theme/wallpaper/contents/images/
$(INSTALL_DATA) futureprototype-theme/gnome-wp-list.xml $(DESTDIR)/usr/share/gnome-background-properties/debian-futureprototype.xml
# Wallpaper symlink for KDE
install -d $(DESTDIR)/usr/share/wallpapers
cd $(DESTDIR)/usr/share/wallpapers && ln -s /usr/share/desktop-base/futureprototype-theme/wallpaper FuturePrototype
### Lockscreen is using the same image as wallpaper
install -d $(DESTDIR)/usr/share/desktop-base/futureprototype-theme/lockscreen/contents/images
$(INSTALL_DATA) futureprototype-theme/wallpaper/metadata.desktop $(DESTDIR)/usr/share/desktop-base/futureprototype-theme/lockscreen
$(INSTALL_DATA) futureprototype-theme/wallpaper/gnome-background.xml $(DESTDIR)/usr/share/desktop-base/futureprototype-theme/lockscreen
$(INSTALL_DATA) $(wildcard futureprototype-theme/wallpaper/contents/images/*) $(DESTDIR)/usr/share/desktop-base/futureprototype-theme/lockscreen/contents/images/
### Alternate wallpaper with Debian swirl
install -d $(DESTDIR)/usr/share/desktop-base/futureprototype-theme/wallpaper-withlogo/contents/images
$(INSTALL_DATA) futureprototype-theme/wallpaper-withlogo/metadata.desktop $(DESTDIR)/usr/share/desktop-base/futureprototype-theme/wallpaper-withlogo
$(INSTALL_DATA) futureprototype-theme/wallpaper-withlogo/gnome-background.xml $(DESTDIR)/usr/share/desktop-base/futureprototype-theme/wallpaper-withlogo
$(INSTALL_DATA) $(wildcard futureprototype-theme/wallpaper-withlogo/contents/images/*) $(DESTDIR)/usr/share/desktop-base/futureprototype-theme/wallpaper-withlogo/contents/images/
# Lock screen symlink for KDE
install -d $(DESTDIR)/usr/share/wallpapers
cd $(DESTDIR)/usr/share/wallpapers && ln -s /usr/share/desktop-base/futureprototype-theme/wallpaper-withlogo FuturePrototypeWithLogo
# Moonlight theme
### Plymouth theme
install -d $(DESTDIR)/usr/share/plymouth/themes/moonlight
$(INSTALL_DATA) $(wildcard moonlight-theme/plymouth/*) $(DESTDIR)/usr/share/plymouth/themes/moonlight
install -d $(DESTDIR)/usr/share/desktop-base/moonlight-theme
cd $(DESTDIR)/usr/share/desktop-base/moonlight-theme && ln -s /usr/share/plymouth/themes/moonlight plymouth
### Login background
install -d $(DESTDIR)/usr/share/desktop-base/moonlight-theme/login
$(INSTALL_DATA) $(wildcard moonlight-theme/login/*) $(DESTDIR)/usr/share/desktop-base/moonlight-theme/login
### Wallpapers
install -d $(DESTDIR)/usr/share/desktop-base/moonlight-theme/wallpaper/contents/images
$(INSTALL_DATA) moonlight-theme/wallpaper/metadata.desktop $(DESTDIR)/usr/share/desktop-base/moonlight-theme/wallpaper
$(INSTALL_DATA) moonlight-theme/wallpaper/gnome-background.xml $(DESTDIR)/usr/share/desktop-base/moonlight-theme/wallpaper
$(INSTALL_DATA) $(wildcard moonlight-theme/wallpaper/contents/images/*) $(DESTDIR)/usr/share/desktop-base/moonlight-theme/wallpaper/contents/images/
$(INSTALL_DATA) moonlight-theme/gnome-wp-list.xml $(DESTDIR)/usr/share/gnome-background-properties/debian-moonlight.xml
# Wallpaper symlink for KDE
install -d $(DESTDIR)/usr/share/wallpapers
cd $(DESTDIR)/usr/share/wallpapers && ln -s /usr/share/desktop-base/moonlight-theme/wallpaper moonlight
### Lockscreen
install -d $(DESTDIR)/usr/share/desktop-base/moonlight-theme/lockscreen/contents/images
$(INSTALL_DATA) moonlight-theme/lockscreen/metadata.desktop $(DESTDIR)/usr/share/desktop-base/moonlight-theme/lockscreen
$(INSTALL_DATA) moonlight-theme/lockscreen/gnome-background.xml $(DESTDIR)/usr/share/desktop-base/moonlight-theme/lockscreen
$(INSTALL_DATA) $(wildcard moonlight-theme/lockscreen/contents/images/*) $(DESTDIR)/usr/share/desktop-base/moonlight-theme/lockscreen/contents/images/
# Lock screen symlink for KDE
install -d $(DESTDIR)/usr/share/wallpapers
cd $(DESTDIR)/usr/share/wallpapers && ln -s /usr/share/desktop-base/moonlight-theme/lockscreen MoonlightLockScreen
include Makefile.inc
2020.1/desktop-base/Makefile.inc deleted 100644 → 0
View file @ 42fd71b0
INSTALL=install
INSTALL_PROGRAM=$(INSTALL)
# Don't use $(INSTALL) for data as debhelper >= 11 injects
# --strip-program=true which is specific to non-data files
#INSTALL_DATA=$(INSTALL) -m 644
INSTALL_DATA=install -m 644
2020.1/desktop-base/debian-homepage.desktop deleted 100644 → 0
View file @ 42fd71b0
[Desktop Entry]
Version=1.1
Name=Debian Home Page
Comment=The official web site of the Debian Project
Icon=emblem-debian
Type=Link
URL=https://www.debian.org
2020.1/desktop-base/debian-logos/Makefile deleted 100644 → 0
View file @ 42fd71b0
dir = usr/share/desktop-base/debian-logos
.PHONY: build clean install
LOGOS = $(basename $(wildcard *.svg))
$(info Logos: '$(LOGOS)')
RESOLUTIONS := 64 128 256
$(info Resolutions: '$(RESOLUTIONS)')
# The build: target should depend on all PNGs to generate
$(info $(foreach SVG,$(LOGOS),$(foreach RES,$(RESOLUTIONS),$(SVG)-$(RES).png)))
build: $(foreach SVG,$(LOGOS),$(foreach RES,$(RESOLUTIONS),$(SVG)-$(RES).png))
# Dynamically add rules for PNG generation for each resolution, for each logo file
define SVG_TO_PNG_RULE
$1-$2.png: $1.svg
rsvg-convert $$< -h $2 -o $$@.raw
optipng $$@.raw -out $$@
endef
$(foreach LOGO,$(LOGOS),$(foreach RES,$(RESOLUTIONS),$(eval $(call SVG_TO_PNG_RULE,$(LOGO),$(RES)))))
clean:
rm -f *.png.raw
rm -f *.png
install:
install -d $(DESTDIR)/$(dir)
$(INSTALL_DATA) $(wildcard *.svg) $(DESTDIR)/$(dir)
$(INSTALL_DATA) $(wildcard *.png) $(DESTDIR)/$(dir)
include ../Makefile.inc
2020.1/desktop-base/debian-logos/logo-text-version.svg deleted 100644 → 0
View file @ 42fd71b0
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:ns2="http://ns.adobe.com/AdobeIllustrator/10.0/"
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="180.46503mm"
height="53.551666mm"
viewBox="0 0 180.46502 53.551666"
version="1.1"
id="svg901"
inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
sodipodi:docname="logo-text-version.svg">
<defs
id="defs895" />
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="0.98994949"
inkscape:cx="279.50001"
inkscape:cy="287.33664"
inkscape:document-units="mm"
inkscape:current-layer="layer1"
showgrid="false"
units="px"
fit-margin-top="0"
fit-margin-left="0"
fit-margin-right="0"
fit-margin-bottom="0"
inkscape:window-width="1920"
inkscape:window-height="1008"
inkscape:window-x="0"
inkscape:window-y="36"
inkscape:window-maximized="1" />
<metadata
id="metadata898">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Calque 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(-5.3777482,-236.75438)">
<g
style="overflow:visible;fill:#9ab0c9;fill-opacity:1;stroke-width:0.42865211"
id="g1108"
transform="matrix(0.49379584,0,0,0.49379584,51.719596,215.85938)">
<g
ns2:rgbTrio="#4F008000FFFF"
ns2:dimmedPercent="50"
ns2:layer="yes"
id="Layer_1-8"
style="fill:#9ab0c9;fill-opacity:1;stroke-width:0.42865211"
transform="translate(-93.766085,42.315052)">
<g
id="g1085"
style="fill:#9ab0c9;fill-opacity:1;stroke-width:0.42865211">
<path
id="path1061"
d="m 51.986,57.297 c -1.797,0.025 0.34,0.926 2.686,1.287 0.648,-0.506 1.236,-1.018 1.76,-1.516 -1.461,0.358 -2.948,0.366 -4.446,0.229"
ns2:knockout="Off"
inkscape:connector-curvature="0"
style="fill:#9ab0c9;fill-opacity:1;stroke-width:0.42865211" />
<path
id="path1063"
d="m 61.631,54.893 c 1.07,-1.477 1.85,-3.094 2.125,-4.766 -0.24,1.192 -0.887,2.221 -1.496,3.307 -3.359,2.115 -0.316,-1.256 -0.002,-2.537 -3.612,4.546 -0.496,2.726 -0.627,3.996"
ns2:knockout="Off"
inkscape:connector-curvature="0"
style="fill:#9ab0c9;fill-opacity:1;stroke-width:0.42865211" />
<path
id="path1065"
d="m 65.191,45.629 c 0.217,-3.236 -0.637,-2.213 -0.924,-0.978 0.335,0.174 0.6,2.281 0.924,0.978"
ns2:knockout="Off"
inkscape:connector-curvature="0"
style="fill:#9ab0c9;fill-opacity:1;stroke-width:0.42865211" />
<path
id="path1067"
d="m 45.172,1.399 c 0.959,0.172 2.072,0.304 1.916,0.533 1.049,-0.23 1.287,-0.442 -1.916,-0.533"
ns2:knockout="Off"
inkscape:connector-curvature="0"
style="fill:#9ab0c9;fill-opacity:1;stroke-width:0.42865211" />
<path
id="path1069"
d="M 47.088,1.932 46.41,2.072 47.041,2.016 47.088,1.932"
ns2:knockout="Off"
inkscape:connector-curvature="0"
style="fill:#9ab0c9;fill-opacity:1;stroke-width:0.42865211" />
<path
id="path1071"
d="m 76.992,46.856 c 0.107,2.906 -0.85,4.316 -1.713,6.812 l -1.553,0.776 c -1.271,2.468 0.123,1.567 -0.787,3.53 -1.984,1.764 -6.021,5.52 -7.313,5.863 -0.943,-0.021 0.639,-1.113 0.846,-1.541 -2.656,1.824 -2.131,2.738 -6.193,3.846 L 60.16,65.878 C 50.142,70.591 36.226,61.251 36.409,48.507 c -0.107,0.809 -0.304,0.607 -0.526,0.934 -0.517,-6.557 3.028,-13.143 9.007,-15.832 5.848,-2.895 12.704,-1.707 16.893,2.197 -2.301,-3.014 -6.881,-6.209 -12.309,-5.91 -5.317,0.084 -10.291,3.463 -11.951,7.131 -2.724,1.715 -3.04,6.611 -4.227,7.507 -1.597,11.737 3.004,16.808 10.787,22.773 1.225,0.826 0.345,0.951 0.511,1.58 -2.586,-1.211 -4.954,-3.039 -6.901,-5.277 1.033,1.512 2.148,2.982 3.589,4.137 -2.438,-0.826 -5.695,-5.908 -6.646,-6.115 4.203,7.525 17.052,13.197 23.78,10.383 -3.113,0.115 -7.068,0.064 -10.566,-1.229 -1.469,-0.756 -3.467,-2.322 -3.11,-2.615 9.182,3.43 18.667,2.598 26.612,-3.771 2.021,-1.574 4.229,-4.252 4.867,-4.289 -0.961,1.445 0.164,0.695 -0.574,1.971 2.014,-3.248 -0.875,-1.322 2.082,-5.609 l 1.092,1.504 c -0.406,-2.696 3.348,-5.97 2.967,-10.234 0.861,-1.304 0.961,1.403 0.047,4.403 1.268,-3.328 0.334,-3.863 0.66,-6.609 0.352,0.923 0.814,1.904 1.051,2.878 -0.826,-3.216 0.848,-5.416 1.262,-7.285 -0.408,-0.181 -1.275,1.422 -1.473,-2.377 0.029,-1.65 0.459,-0.865 0.625,-1.271 -0.324,-0.186 -1.174,-1.451 -1.691,-3.877 0.375,-0.57 1.002,1.478 1.512,1.562 -0.328,-1.929 -0.893,-3.4 -0.916,-4.88 -1.49,-3.114 -0.527,0.415 -1.736,-1.337 -1.586,-4.947 1.316,-1.148 1.512,-3.396 2.404,3.483 3.775,8.881 4.404,11.117 -0.48,-2.726 -1.256,-5.367 -2.203,-7.922 0.73,0.307 -1.176,-5.609 0.949,-1.691 C 83.519,18.706 76.074,10.902 69.225,7.24 70.063,8.007 71.121,8.97 70.741,9.121 67.335,7.093 67.934,6.935 67.446,6.078 64.671,4.949 64.489,6.169 62.651,6.08 57.421,3.306 56.413,3.601 51.6,1.863 l 0.219,1.023 c -3.465,-1.154 -4.037,0.438 -7.782,0.004 -0.228,-0.178 1.2,-0.644 2.375,-0.815 -3.35,0.442 -3.193,-0.66 -6.471,0.122 0.808,-0.567 1.662,-0.942 2.524,-1.424 -2.732,0.166 -6.522,1.59 -5.352,0.295 -4.456,1.988 -12.37,4.779 -16.811,8.943 l -0.14,-0.933 c -2.035,2.443 -8.874,7.296 -9.419,10.46 l -0.544,0.127 c -1.059,1.793 -1.744,3.825 -2.584,5.67 -1.385,2.36 -2.03,0.908 -1.833,1.278 -2.724,5.523 -4.077,10.164 -5.246,13.97 0.833,1.245 0.02,7.495 0.335,12.497 -1.368,24.704 17.338,48.69 37.785,54.228 2.997,1.072 7.454,1.031 11.245,1.141 -4.473,-1.279 -5.051,-0.678 -9.408,-2.197 -3.143,-1.48 -3.832,-3.17 -6.058,-5.102 l 0.881,1.557 c -4.366,-1.545 -2.539,-1.912 -6.091,-3.037 l 0.941,-1.229 C 28.751,98.334 26.418,96.056 25.78,94.795 l -1.548,0.061 c -1.86,-2.295 -2.851,-3.949 -2.779,-5.23 l -0.5,0.891 c -0.567,-0.973 -6.843,-8.607 -3.587,-6.83 -0.605,-0.553 -1.409,-0.9 -2.281,-2.484 l 0.663,-0.758 c -1.567,-2.016 -2.884,-4.6 -2.784,-5.461 0.836,1.129 1.416,1.34 1.99,1.533 -3.957,-9.818 -4.179,-0.541 -7.176,-9.994 L 8.412,66.472 C 7.926,65.74 7.631,64.945 7.24,64.165 l 0.276,-2.75 C 4.667,58.121 6.719,47.409 7.13,41.534 7.415,39.145 9.508,36.602 11.1,32.614 l -0.97,-0.167 c 1.854,-3.234 10.586,-12.988 14.63,-12.486 1.959,-2.461 -0.389,-0.009 -0.772,-0.629 4.303,-4.453 5.656,-3.146 8.56,-3.947 3.132,-1.859 -2.688,0.725 -1.203,-0.709 5.414,-1.383 3.837,-3.144 10.9,-3.846 0.745,0.424 -1.729,0.655 -2.35,1.205 4.511,-2.207 14.275,-1.705 20.617,1.225 7.359,3.439 15.627,13.605 15.953,23.17 l 0.371,0.1 c -0.188,3.802 0.582,8.199 -0.752,12.238 l 0.908,-1.912"
ns2:knockout="Off"
inkscape:connector-curvature="0"
style="fill:#9ab0c9;fill-opacity:1;stroke-width:0.42865211" />
<path
id="path1073"
d="m 32.372,59.764 -0.252,1.26 c 1.181,1.604 2.118,3.342 3.626,4.596 -1.085,-2.118 -1.891,-2.993 -3.374,-5.856"
ns2:knockout="Off"
inkscape:connector-curvature="0"
style="fill:#9ab0c9;fill-opacity:1;stroke-width:0.42865211" />
<path
id="path1075"
d="m 35.164,59.654 c -0.625,-0.691 -0.995,-1.523 -1.409,-2.352 0.396,1.457 1.207,2.709 1.962,3.982 l -0.553,-1.63"
ns2:knockout="Off"
inkscape:connector-curvature="0"
style="fill:#9ab0c9;fill-opacity:1;stroke-width:0.42865211" />
<path
id="path1077"
d="m 84.568,48.916 -0.264,0.662 c -0.484,3.438 -1.529,6.84 -3.131,9.994 1.77,-3.328 2.915,-6.968 3.395,-10.656"
ns2:knockout="Off"
inkscape:connector-curvature="0"
style="fill:#9ab0c9;fill-opacity:1;stroke-width:0.42865211" />
<path
id="path1079"
d="M 45.527,0.537 C 46.742,0.092 48.514,0.293 49.803,0 48.123,0.141 46.451,0.225 44.8,0.438 l 0.727,0.099"
ns2:knockout="Off"
inkscape:connector-curvature="0"
style="fill:#9ab0c9;fill-opacity:1;stroke-width:0.42865211" />
<path
id="path1081"
d="m 2.872,23.219 c 0.28,2.592 -1.95,3.598 0.494,1.889 1.31,-2.951 -0.512,-0.815 -0.494,-1.889"
ns2:knockout="Off"
inkscape:connector-curvature="0"
style="fill:#9ab0c9;fill-opacity:1;stroke-width:0.42865211" />
<path
id="path1083"
d="M 0,35.215 C 0.563,33.487 0.665,32.449 0.88,31.449 -0.676,33.438 0.164,33.862 0,35.215"
ns2:knockout="Off"
inkscape:connector-curvature="0"
style="fill:#9ab0c9;fill-opacity:1;stroke-width:0.42865211" />
</g>
</g>
</g>
<g
style="overflow:visible;stroke-width:0.26745555"
id="g1021"
transform="matrix(0.98926092,0,0,0.98926092,54.110223,140.5767)">
<g
ns2:rgbTrio="#4F008000FFFF"
ns2:dimmedPercent="50"
ns2:layer="yes"
id="Layer_1"
style="stroke-width:0.26745555">
<g
id="g991"
style="stroke-width:0.26745555">
<path
id="path977"
d="m 13.437,125.506 c -0.045,0.047 -0.045,7.506 -0.138,9.453 -0.092,1.574 -0.232,4.957 -3.568,4.957 -3.429,0 -4.263,-3.939 -4.541,-5.652 -0.324,-1.9 -0.324,-3.477 -0.324,-4.17 0,-2.225 0.139,-8.436 5.375,-8.436 1.576,0 2.456,0.465 3.151,0.834 z M 0,130.975 c 0,13.066 6.951,13.066 7.97,13.066 2.873,0 4.727,-1.576 5.514,-4.309 l 0.093,4.123 c 0.881,-0.047 1.761,-0.139 3.197,-0.139 0.51,0 0.926,0 1.298,0.047 0.371,0 0.741,0.045 1.158,0.092 -0.741,-1.482 -1.297,-4.818 -1.297,-12.049 0,-7.043 0,-18.951 0.602,-22.566 -1.667,0.789 -3.105,1.299 -6.256,1.576 1.251,1.344 1.251,2.039 1.251,8.154 -0.879,-0.277 -1.992,-0.602 -3.892,-0.602 C 1.344,118.369 0,125.598 0,130.975"
ns2:knockout="Off"
inkscape:connector-curvature="0"
style="fill:#f9f9f9;stroke-width:0.26745555" />
<path
id="path979"
d="m 25.13,128.609 c 0.047,-3.846 0.835,-7.275 4.124,-7.275 3.615,0 3.891,3.984 3.799,7.275 z m 12.51,0.465 c 0,-5.422 -1.065,-10.752 -7.923,-10.752 -9.452,0 -9.452,10.475 -9.452,12.697 0,9.406 4.216,13.113 11.306,13.113 3.149,0 4.68,-0.461 5.514,-0.695 -0.046,-1.668 0.185,-2.734 0.465,-4.17 -0.975,0.604 -2.226,1.391 -5.006,1.391 -7.229,0 -7.322,-6.582 -7.322,-8.852 H 37.55 l 0.09,-2.732"
ns2:knockout="Off"
inkscape:connector-curvature="0"
style="fill:#f9f9f9;stroke-width:0.26745555" />
<path
id="path981"
d="m 52.715,131.066 c 0,4.309 -0.787,10.102 -6.162,10.102 -0.742,0 -1.668,-0.141 -2.27,-0.279 -0.093,-1.668 -0.093,-4.541 -0.093,-7.877 0,-3.986 0.416,-6.068 0.742,-7.09 0.972,-3.289 3.15,-3.334 3.566,-3.334 3.522,0 4.217,4.865 4.217,8.478 z m -13.298,5.051 c 0,3.43 0,5.375 -0.556,6.857 1.9,0.742 4.262,1.158 7.09,1.158 1.807,0 7.043,0 9.869,-5.791 1.344,-2.688 1.807,-6.303 1.807,-9.037 0,-1.668 -0.186,-5.328 -1.529,-7.646 -1.296,-2.176 -3.382,-3.289 -5.605,-3.289 -4.449,0 -5.746,3.707 -6.44,5.607 0,-2.363 0.045,-10.611 0.415,-14.828 -3.011,1.391 -4.866,1.621 -6.857,1.807 1.807,0.74 1.807,3.801 1.807,13.764 v 11.398"
ns2:knockout="Off"
inkscape:connector-curvature="0"
style="fill:#f9f9f9;stroke-width:0.26745555" />
<path
id="path983"
d="m 66.535,143.855 c -0.928,-0.139 -1.578,-0.232 -2.922,-0.232 -1.48,0 -2.502,0.094 -3.566,0.232 0.463,-0.881 0.648,-1.299 0.787,-4.309 0.186,-4.125 0.232,-15.154 -0.092,-17.471 -0.232,-1.762 -0.648,-2.039 -1.297,-2.502 3.799,-0.371 4.865,-0.648 6.625,-1.482 -0.369,2.037 -0.418,3.059 -0.418,6.162 -0.091,15.989 -0.138,17.702 0.883,19.602"
ns2:knockout="Off"
inkscape:connector-curvature="0"
style="fill:#f9f9f9;stroke-width:0.26745555" />
<path
id="path985"
d="m 81.373,130.74 c -0.092,2.92 -0.139,4.959 -0.928,6.58 -0.973,2.086 -2.594,2.688 -3.799,2.688 -2.783,0 -3.383,-2.316 -3.383,-4.586 0,-4.355 3.893,-4.682 5.652,-4.682 z m -12.744,5.701 c 0,2.92 0.881,5.838 3.477,7.09 1.158,0.51 2.316,0.51 2.688,0.51 4.264,0 5.699,-3.152 6.58,-5.098 -0.047,2.039 0,3.289 0.139,4.912 0.834,-0.047 1.668,-0.139 3.059,-0.139 0.787,0 1.529,0.092 2.316,0.139 -0.51,-0.787 -0.787,-1.252 -0.928,-3.059 -0.092,-1.76 -0.092,-3.521 -0.092,-5.977 l 0.047,-9.453 c 0,-3.523 -0.928,-6.998 -7.879,-6.998 -4.586,0 -7.273,1.391 -8.617,2.086 0.557,1.02 1.02,1.898 1.436,3.893 1.809,-1.576 4.172,-2.41 6.58,-2.41 3.848,0 3.848,2.549 3.848,6.162 -0.881,-0.045 -1.623,-0.137 -2.875,-0.137 -5.887,10e-4 -9.779,2.268 -9.779,8.479"
ns2:knockout="Off"
inkscape:connector-curvature="0"
style="fill:#f9f9f9;stroke-width:0.26745555" />
<path
id="path987"
d="m 108.063,139.268 c 0.047,1.576 0.047,3.244 0.695,4.588 -1.021,-0.092 -1.623,-0.232 -3.521,-0.232 -1.113,0 -1.715,0.094 -2.596,0.232 0.184,-0.602 0.279,-0.834 0.371,-1.623 0.139,-1.064 0.232,-4.633 0.232,-5.885 v -5.004 c 0,-2.178 0,-5.33 -0.141,-6.441 -0.092,-0.787 -0.322,-2.918 -3.012,-2.918 -2.641,0 -3.521,1.945 -3.846,3.521 -0.369,1.621 -0.369,3.383 -0.369,10.24 0.045,5.932 0.045,6.486 0.508,8.109 -0.787,-0.092 -1.76,-0.184 -3.15,-0.184 -1.113,0 -1.854,0.045 -2.779,0.184 0.324,-0.742 0.51,-1.113 0.602,-3.707 0.094,-2.549 0.279,-15.061 -0.141,-18.025 -0.23,-1.809 -0.695,-2.225 -1.203,-2.688 3.754,-0.186 4.957,-0.789 6.117,-1.389 v 4.91 c 0.555,-1.438 1.713,-4.635 6.348,-4.635 5.793,0 5.838,4.217 5.885,6.996 v 13.951"
ns2:knockout="Off"
inkscape:connector-curvature="0"
style="fill:#f9f9f9;stroke-width:0.26745555" />
<path
id="path989"
d="m 66.926,111.533 -3.838,3.836 -3.836,-3.836 3.836,-3.836 3.838,3.836"
ns2:knockout="Off"
inkscape:connector-curvature="0"
style="fill:#9ab0c9;fill-opacity:1;stroke-width:0.26745555" />
</g>
</g>
</g>
<text
xml:space="preserve"
style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:6.61458302px;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
x="164.66452"
y="260.76608"
id="text1797"><tspan
sodipodi:role="line"
id="tspan1795"
x="164.66452"
y="260.76608"
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:22.57777786px;font-family:Quicksand;-inkscape-font-specification:'Quicksand Bold';fill:#9ab0c9;fill-opacity:1;stroke-width:0.26458332px">10</tspan></text>
</g>
</svg>
2020.1/desktop-base/debian-logos/logo-text.svg deleted 100644 → 0
View file @ 42fd71b0
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:ns2="http://ns.adobe.com/AdobeIllustrator/10.0/"
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"