From 36d9d07e9d75a8b7d6e5723808e7b72feca93485 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sun, 23 Aug 2020 16:00:16 +0200 Subject: Drop all distro-theming packages and dependencies and default to Blue-Submarine GTK theme, Adwaita Icon theme and 'Sans' font. --- .../org.ArcticaProject.arctica-greeter.gschema.xml | 6 +- ...ca-greeter-theme-debian-buster.gschema.override | 2 - ...r-theme-debian-futureprototype.gschema.override | 4 - ...greeter-theme-debian-softwaves.gschema.override | 4 - ...a-greeter-theme-debian-stretch.gschema.override | 2 - ...0_arctica-greeter-theme-debian.gschema.override | 5 - ...ctica-greeter-theme-ubuntumate.gschema.override | 16 --- debian/arctica-greeter-theme-debian-buster.install | 2 - ...ca-greeter-theme-debian-futureprototype.install | 1 - .../arctica-greeter-theme-debian-softwaves.install | 1 - .../arctica-greeter-theme-debian-stretch.install | 2 - debian/arctica-greeter-theme-debian.install | 2 - debian/arctica-greeter-theme-ubuntumate.install | 1 - debian/control | 113 +-------------------- debian/rules | 1 - debian/theme-debian-logo-bare.png | Bin 14716 -> 0 bytes debian/theme-debian-logo-v09.png | Bin 4042 -> 0 bytes debian/theme-debian-logo-v10.png | Bin 9076 -> 0 bytes 18 files changed, 8 insertions(+), 154 deletions(-) delete mode 100644 debian/30_arctica-greeter-theme-debian-buster.gschema.override delete mode 100644 debian/30_arctica-greeter-theme-debian-futureprototype.gschema.override delete mode 100644 debian/30_arctica-greeter-theme-debian-softwaves.gschema.override delete mode 100644 debian/30_arctica-greeter-theme-debian-stretch.gschema.override delete mode 100644 debian/30_arctica-greeter-theme-debian.gschema.override delete mode 100644 debian/30_arctica-greeter-theme-ubuntumate.gschema.override delete mode 100644 debian/arctica-greeter-theme-debian-buster.install delete mode 100644 debian/arctica-greeter-theme-debian-futureprototype.install delete mode 100644 debian/arctica-greeter-theme-debian-softwaves.install delete mode 100644 debian/arctica-greeter-theme-debian-stretch.install delete mode 100644 debian/arctica-greeter-theme-debian.install delete mode 100644 debian/arctica-greeter-theme-ubuntumate.install delete mode 100644 debian/theme-debian-logo-bare.png delete mode 100644 debian/theme-debian-logo-v09.png delete mode 100644 debian/theme-debian-logo-v10.png diff --git a/data/org.ArcticaProject.arctica-greeter.gschema.xml b/data/org.ArcticaProject.arctica-greeter.gschema.xml index ffee269..9efc200 100644 --- a/data/org.ArcticaProject.arctica-greeter.gschema.xml +++ b/data/org.ArcticaProject.arctica-greeter.gschema.xml @@ -34,15 +34,15 @@ Logo file to use - 'Numix' + 'Blue-Submarine' GTK+ theme to use - 'Numix' + 'Adwaita' Icon theme to use - 'Cabin 11' + 'Sans 11' Font to use diff --git a/debian/30_arctica-greeter-theme-debian-buster.gschema.override b/debian/30_arctica-greeter-theme-debian-buster.gschema.override deleted file mode 100644 index 92c0bf6..0000000 --- a/debian/30_arctica-greeter-theme-debian-buster.gschema.override +++ /dev/null @@ -1,2 +0,0 @@ -[org.ArcticaProject.arctica-greeter] -logo='/usr/share/arctica-greeter/theme-debian-logo-v10.png' diff --git a/debian/30_arctica-greeter-theme-debian-futureprototype.gschema.override b/debian/30_arctica-greeter-theme-debian-futureprototype.gschema.override deleted file mode 100644 index 932560f..0000000 --- a/debian/30_arctica-greeter-theme-debian-futureprototype.gschema.override +++ /dev/null @@ -1,4 +0,0 @@ -[org.ArcticaProject.arctica-greeter] -background='/usr/share/desktop-base/futureprototype-theme/login/background.svg' -background-color='#6E829A' -togglebox-button-bgcolor='#6E829A' diff --git a/debian/30_arctica-greeter-theme-debian-softwaves.gschema.override b/debian/30_arctica-greeter-theme-debian-softwaves.gschema.override deleted file mode 100644 index b63d0a1..0000000 --- a/debian/30_arctica-greeter-theme-debian-softwaves.gschema.override +++ /dev/null @@ -1,4 +0,0 @@ -[org.ArcticaProject.arctica-greeter] -background='/usr/share/desktop-base/softwaves-theme/login/background.svg' -background-color='#274d63' -togglebox-button-bgcolor='#274d63' diff --git a/debian/30_arctica-greeter-theme-debian-stretch.gschema.override b/debian/30_arctica-greeter-theme-debian-stretch.gschema.override deleted file mode 100644 index 3f49b53..0000000 --- a/debian/30_arctica-greeter-theme-debian-stretch.gschema.override +++ /dev/null @@ -1,2 +0,0 @@ -[org.ArcticaProject.arctica-greeter] -logo='/usr/share/arctica-greeter/theme-debian-logo-v09.png' diff --git a/debian/30_arctica-greeter-theme-debian.gschema.override b/debian/30_arctica-greeter-theme-debian.gschema.override deleted file mode 100644 index b21ed60..0000000 --- a/debian/30_arctica-greeter-theme-debian.gschema.override +++ /dev/null @@ -1,5 +0,0 @@ -[org.ArcticaProject.arctica-greeter] -background='/usr/share/desktop-base/active-theme/login/background.svg' -background-color='#404040' -togglebox-button-bgcolor='#404040' -logo='' diff --git a/debian/30_arctica-greeter-theme-ubuntumate.gschema.override b/debian/30_arctica-greeter-theme-ubuntumate.gschema.override deleted file mode 100644 index ab4d43b..0000000 --- a/debian/30_arctica-greeter-theme-ubuntumate.gschema.override +++ /dev/null @@ -1,16 +0,0 @@ -[org.ArcticaProject.arctica-greeter] -background='/usr/share/backgrounds/ubuntu-mate-common/Green-Wall.png' -background-color='#aabf61' -togglebox-font-fgcolor='#ffffff' -togglebox-button-bgcolor='#aabf61' -theme-name='Ambiant-MATE' -icon-theme-name='Ambiant-MATE' -font-name='Ubuntu 11' -xft-antialias=true -xft-dpi=96 -xft-hintstyle='hintslight' -xft-rgba='rgb' -draw-user-backgrounds=false -only-on-monitor='auto' -logo='' -menubar-fgcolor='red' diff --git a/debian/arctica-greeter-theme-debian-buster.install b/debian/arctica-greeter-theme-debian-buster.install deleted file mode 100644 index 3996f9d..0000000 --- a/debian/arctica-greeter-theme-debian-buster.install +++ /dev/null @@ -1,2 +0,0 @@ -debian/30_arctica-greeter-theme-debian-buster.gschema.override usr/share/glib-2.0/schemas/ -debian/theme-debian-logo-v10.png usr/share/arctica-greeter/ diff --git a/debian/arctica-greeter-theme-debian-futureprototype.install b/debian/arctica-greeter-theme-debian-futureprototype.install deleted file mode 100644 index f9bbae7..0000000 --- a/debian/arctica-greeter-theme-debian-futureprototype.install +++ /dev/null @@ -1 +0,0 @@ -debian/30_arctica-greeter-theme-debian-futureprototype.gschema.override usr/share/glib-2.0/schemas/ diff --git a/debian/arctica-greeter-theme-debian-softwaves.install b/debian/arctica-greeter-theme-debian-softwaves.install deleted file mode 100644 index 567ef08..0000000 --- a/debian/arctica-greeter-theme-debian-softwaves.install +++ /dev/null @@ -1 +0,0 @@ -debian/30_arctica-greeter-theme-debian-softwaves.gschema.override usr/share/glib-2.0/schemas/ diff --git a/debian/arctica-greeter-theme-debian-stretch.install b/debian/arctica-greeter-theme-debian-stretch.install deleted file mode 100644 index 730aedb..0000000 --- a/debian/arctica-greeter-theme-debian-stretch.install +++ /dev/null @@ -1,2 +0,0 @@ -debian/30_arctica-greeter-theme-debian-stretch.gschema.override usr/share/glib-2.0/schemas/ -debian/theme-debian-logo-v09.png usr/share/arctica-greeter/ diff --git a/debian/arctica-greeter-theme-debian.install b/debian/arctica-greeter-theme-debian.install deleted file mode 100644 index 1c8e7d1..0000000 --- a/debian/arctica-greeter-theme-debian.install +++ /dev/null @@ -1,2 +0,0 @@ -debian/30_arctica-greeter-theme-debian.gschema.override usr/share/glib-2.0/schemas/ - diff --git a/debian/arctica-greeter-theme-ubuntumate.install b/debian/arctica-greeter-theme-ubuntumate.install deleted file mode 100644 index c0b9564..0000000 --- a/debian/arctica-greeter-theme-ubuntumate.install +++ /dev/null @@ -1 +0,0 @@ -debian/30_arctica-greeter-theme-ubuntumate.gschema.override usr/share/glib-2.0/schemas/ diff --git a/debian/control b/debian/control index 94f1561..ebce98b 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,8 @@ Section: x11 Priority: optional Maintainer: Mike Gabriel Standards-Version: 4.1.1 -Build-Depends: at-spi2-core, +Build-Depends: adwaita-icon-theme, + at-spi2-core, dbus-x11, debhelper (>= 9), dh-autoreconf, @@ -19,8 +20,7 @@ Build-Depends: at-spi2-core, libpam-freerdp2-dev, libpam-x2go-dev, libpixman-1-dev, - numix-gtk-theme, - numix-icon-theme, + mate-themes, valac (>= 0.20.0), valgrind [amd64], xvfb, @@ -33,14 +33,12 @@ Package: arctica-greeter Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends}, - fonts-cantarell, - fonts-cabin, + adwaita-icon-theme, lightdm, marco, network-manager, - numix-gtk-theme, - numix-icon-theme, mate-settings-daemon, + mate-themes, systemd, python3, x11-xkb-utils, @@ -89,104 +87,3 @@ Description: LightDM Arctica Greeter - Remote Login Support - X2Go Desktop Sessions - Windows RDP sessions (FreeRDP) - Citrix Remote Desktop Sessions - -Package: arctica-greeter-theme-debian -Architecture: all -Depends: ${misc:Depends}, - arctica-greeter, - libglib2.0-bin, - desktop-base, -Breaks: arctica-greeter-theme-ubuntumate, - arctica-greeter-theme-debian-softwaves, - arctica-greeter-theme-debian-futureprototype, -Replaces: arctica-greeter-theme-ubuntumate, - arctica-greeter-theme-debian-softwaves, - arctica-greeter-theme-debian-futureprototype, -Description: LightDM Arctica Greeter - Debian Theme (active theme) - A greeter shell for the LightDM login manager. Arctica Greeter can be used as - local display manager as well as thin client login manager. - . - This package themes Arctica Greeter with a Debian look'n'feel. It will use - the currently active Debian theme. - -Package: arctica-greeter-theme-debian-softwaves -Architecture: all -Depends: ${misc:Depends}, - arctica-greeter, - libglib2.0-bin, - desktop-base (>= 9~), -Breaks: arctica-greeter-theme-ubuntumate, - arctica-greeter-theme-debian, - arctica-greeter-theme-debian-futureprototype, -Replaces: arctica-greeter-theme-ubuntumate, - arctica-greeter-theme-debian, - arctica-greeter-theme-debian-futureprototype, -Description: LightDM Arctica Greeter - Debian Theme (softwaves) - A greeter shell for the LightDM login manager. Arctica Greeter can be used as - local display manager as well as thin client login manager. - . - This package themes Arctica Greeter with the softwaves theme. - -Package: arctica-greeter-theme-debian-stretch -Architecture: all -Depends: ${misc:Depends}, - arctica-greeter-theme-debian-softwaves, - libglib2.0-bin, - desktop-base (>= 9~), -Breaks: arctica-greeter-theme-debian-buster, -Replaces: arctica-greeter-theme-debian-buster, -Description: LightDM Arctica Greeter - Debian 9 (stretch) Theme - A greeter shell for the LightDM login manager. Arctica Greeter can be used as - local display manager as well as thin client login manager. - . - This package themes Arctica Greeter with Debian 9 (aka stretch) look'n'feel. - -Package: arctica-greeter-theme-debian-futureprototype -Architecture: all -Depends: ${misc:Depends}, - arctica-greeter, - libglib2.0-bin, - desktop-base (>= 10~), -Breaks: arctica-greeter-theme-ubuntumate, - arctica-greeter-theme-debian, - arctica-greeter-theme-debian-softwaves, -Replaces: arctica-greeter-theme-ubuntumate, - arctica-greeter-theme-debian, - arctica-greeter-theme-debian-softwaves, -Description: LightDM Arctica Greeter - Debian Theme (futurePrototype) - A greeter shell for the LightDM login manager. Arctica Greeter can be used as - local display manager as well as thin client login manager. - . - This package themes Arctica Greeter with the futurePrototype theme. - -Package: arctica-greeter-theme-debian-buster -Architecture: all -Depends: ${misc:Depends}, - arctica-greeter-theme-debian-futureprototype, - libglib2.0-bin, - desktop-base (>= 9~), -Breaks: arctica-greeter-theme-debian-stretch, -Replaces: arctica-greeter-theme-debian-stretch, -Description: LightDM Arctica Greeter - Debian 10 (buster) Theme - A greeter shell for the LightDM login manager. Arctica Greeter can be used as - local display manager as well as thin client login manager. - . - This package themes Arctica Greeter with Debian 10 (aka buster) look'n'feel. - -Package: arctica-greeter-theme-ubuntumate -Architecture: all -Depends: ${misc:Depends}, - arctica-greeter, - libglib2.0-bin, - ubuntu-mate-wallpapers-common, -Breaks: arctica-greeter-theme-debian, - arctica-greeter-theme-debian-softwaves, - arctica-greeter-theme-debian-futureprototype, -Replaces: arctica-greeter-theme-debian, - arctica-greeter-theme-debian-softwaves, - arctica-greeter-theme-debian-futureprototype, -Description: LightDM Arctica Greeter - Ubuntu MATE Theme - A greeter shell for the LightDM login manager. Arctica Greeter can be used as - local display manager as well as thin client login manager. - . - This package themes Arctica Greeter with a Ubuntu MATE look'n'feel. diff --git a/debian/rules b/debian/rules index 988c2dc..4a9d4e4 100755 --- a/debian/rules +++ b/debian/rules @@ -36,6 +36,5 @@ override_dh_auto_clean: rm -f tests/arctica_greeter_test_vala.stamp rm -f src/*.c rm -f tests/*.c - rm -f debian/theme-debian-logo.png override_dh_auto_test: diff --git a/debian/theme-debian-logo-bare.png b/debian/theme-debian-logo-bare.png deleted file mode 100644 index 0270c14..0000000 Binary files a/debian/theme-debian-logo-bare.png and /dev/null differ diff --git a/debian/theme-debian-logo-v09.png b/debian/theme-debian-logo-v09.png deleted file mode 100644 index 0f4868d..0000000 Binary files a/debian/theme-debian-logo-v09.png and /dev/null differ diff --git a/debian/theme-debian-logo-v10.png b/debian/theme-debian-logo-v10.png deleted file mode 100644 index ea17b67..0000000 Binary files a/debian/theme-debian-logo-v10.png and /dev/null differ -- cgit v1.2.3