From 7ffcc262f6b067bbb86e8f43fb1b27889431c458 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Tue, 5 Aug 2014 19:17:30 +0900 Subject: Added basic TDEPasswd 'We apologize' handbook to Debian/Ubuntu distros. This relates to bug 1928. --- ubuntu/maverick/tdebase/debian/tdepasswd-trinity.install | 3 +++ 1 file changed, 3 insertions(+) (limited to 'ubuntu/maverick/tdebase') diff --git a/ubuntu/maverick/tdebase/debian/tdepasswd-trinity.install b/ubuntu/maverick/tdebase/debian/tdepasswd-trinity.install index 43a7beeaa..a951e7daf 100644 --- a/ubuntu/maverick/tdebase/debian/tdepasswd-trinity.install +++ b/ubuntu/maverick/tdebase/debian/tdepasswd-trinity.install @@ -33,3 +33,6 @@ debian/tmp/opt/trinity/share/apps/tdm/pics/users/Teddybear.png debian/tmp/opt/trinity/share/apps/tdm/pics/users/Turtle.png debian/tmp/opt/trinity/share/config.kcfg/kcm_useraccount.kcfg debian/tmp/opt/trinity/share/config.kcfg/kcm_useraccount_pass.kcfg +debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdepasswd/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdepasswd/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdepasswd/index.docbook -- cgit v1.2.1 From 4ac8a1a8905b7058a85e3fa072f0d86eeb3ddc90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Tue, 19 Aug 2014 03:27:37 +0200 Subject: Remove unneeded plasma wrappers in tdebase on Debian and Ubuntu --- ubuntu/maverick/tdebase/debian/plasma-desktop.autodetect | 14 -------------- ubuntu/maverick/tdebase/debian/plasma.autodetect | 14 -------------- ubuntu/maverick/tdebase/debian/rules | 2 -- 3 files changed, 30 deletions(-) delete mode 100755 ubuntu/maverick/tdebase/debian/plasma-desktop.autodetect delete mode 100755 ubuntu/maverick/tdebase/debian/plasma.autodetect (limited to 'ubuntu/maverick/tdebase') diff --git a/ubuntu/maverick/tdebase/debian/plasma-desktop.autodetect b/ubuntu/maverick/tdebase/debian/plasma-desktop.autodetect deleted file mode 100755 index b083cb277..000000000 --- a/ubuntu/maverick/tdebase/debian/plasma-desktop.autodetect +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash - -DESKTOP_SESSION="$DESKTOP_SESSION" -echo "You are running $DESKTOP_SESSION" - -if [[ "$DESKTOP_SESSION" == "trinity" ]] -then - # Do nothing, this is Trinity - echo "I detected Trinity" -else - # This is KDE4, start plasma-desktop - echo "I detected KDE4" - /usr/bin/plasma-desktop.kde4 -fi diff --git a/ubuntu/maverick/tdebase/debian/plasma.autodetect b/ubuntu/maverick/tdebase/debian/plasma.autodetect deleted file mode 100755 index c23f68909..000000000 --- a/ubuntu/maverick/tdebase/debian/plasma.autodetect +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash - -DESKTOP_SESSION="$DESKTOP_SESSION" -echo "You are running $DESKTOP_SESSION" - -if [[ "$DESKTOP_SESSION" == "trinity" ]] -then - # Do nothing, this is Trinity - echo "I detected Trinity" -else - # This is KDE4, start plasma - echo "I detected KDE4" - /usr/bin/plasma.kde4 -fi diff --git a/ubuntu/maverick/tdebase/debian/rules b/ubuntu/maverick/tdebase/debian/rules index 1d062ca42..1192433cb 100755 --- a/ubuntu/maverick/tdebase/debian/rules +++ b/ubuntu/maverick/tdebase/debian/rules @@ -291,5 +291,3 @@ binary-install/tdebase-trinity-bin:: binary-install/ksmserver-trinity:: install -p -D -m644 debian/tmp/opt/trinity/share/apps/tdm/sessions/tde.desktop debian/ksmserver-trinity/usr/share/xsessions/trinity.desktop - install -p -D -m755 debian/plasma.autodetect debian/ksmserver-trinity/usr/bin/plasma - install -p -D -m755 debian/plasma-desktop.autodetect debian/ksmserver-trinity/usr/bin/plasma-desktop -- cgit v1.2.1 From 34d83f4eeb0d7e4dd5b8e992b440df9628d78945 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Wed, 3 Sep 2014 00:29:20 +0900 Subject: Added 'minimalist' TDM style to Debian/Ubuntu distributions. --- ubuntu/maverick/tdebase/debian/tdm-trinity.install | 1 + 1 file changed, 1 insertion(+) (limited to 'ubuntu/maverick/tdebase') diff --git a/ubuntu/maverick/tdebase/debian/tdm-trinity.install b/ubuntu/maverick/tdebase/debian/tdm-trinity.install index 04241c097..afcf37d7b 100644 --- a/ubuntu/maverick/tdebase/debian/tdm-trinity.install +++ b/ubuntu/maverick/tdebase/debian/tdm-trinity.install @@ -44,6 +44,7 @@ debian/tmp/opt/trinity/share/apps/tdm/themes/circles/GdmGreeterTheme.desktop debian/tmp/opt/trinity/share/apps/tdm/themes/circles/help.png debian/tmp/opt/trinity/share/apps/tdm/themes/circles/options.png debian/tmp/opt/trinity/share/apps/tdm/themes/circles/screenshot.png +debian/tmp/opt/trinity/share/apps/tdm/themes/minimalist debian/tmp/opt/trinity/share/apps/tdm/themes/o2_enterprise debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdm/common debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdm/index.cache.bz2 -- cgit v1.2.1 From cde178b6c88ea57c9df1242a6d6d28f9a1e0c588 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Wed, 10 Sep 2014 22:51:32 +0900 Subject: Removed old wallpapers and add 3 new ones. The removed wallpapers will be moved to tdeartwork soon. Here are the changes required for Debian/Ubuntu distros. --- .../tdebase/debian/tdebase-data-trinity.install | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) (limited to 'ubuntu/maverick/tdebase') diff --git a/ubuntu/maverick/tdebase/debian/tdebase-data-trinity.install b/ubuntu/maverick/tdebase/debian/tdebase-data-trinity.install index 0ae53f571..e0e7efb95 100644 --- a/ubuntu/maverick/tdebase/debian/tdebase-data-trinity.install +++ b/ubuntu/maverick/tdebase/debian/tdebase-data-trinity.install @@ -1165,30 +1165,28 @@ debian/tmp/opt/trinity/share/sounds/KDE_Window_UnSticky.ogg debian/tmp/opt/trinity/share/sounds/KDE_Window_UnSticky.wav debian/tmp/opt/trinity/share/wallpapers/All-Good-People-1.jpg debian/tmp/opt/trinity/share/wallpapers/All-Good-People-1.jpg.desktop +debian/tmp/opt/trinity/share/wallpapers/aghi.jpg +debian/tmp/opt/trinity/share/wallpapers/aghi.jpg.desktop +debian/tmp/opt/trinity/share/wallpapers/airplane.jpg +debian/tmp/opt/trinity/share/wallpapers/airplane.jpg.desktop debian/tmp/opt/trinity/share/wallpapers/alta-badia.jpg debian/tmp/opt/trinity/share/wallpapers/alta-badia.jpg.desktop debian/tmp/opt/trinity/share/wallpapers/andes-venezolanos.svgz debian/tmp/opt/trinity/share/wallpapers/andes-venezolanos.svgz.desktop +debian/tmp/opt/trinity/share/wallpapers/another-view.jpg +debian/tmp/opt/trinity/share/wallpapers/another-view.jpg.desktop debian/tmp/opt/trinity/share/wallpapers/aurora.svgz debian/tmp/opt/trinity/share/wallpapers/aurora.svgz.desktop -debian/tmp/opt/trinity/share/wallpapers/aghi.jpg -debian/tmp/opt/trinity/share/wallpapers/aghi.jpg.desktop debian/tmp/opt/trinity/share/wallpapers/blue-bend.jpg debian/tmp/opt/trinity/share/wallpapers/blue-bend.jpg.desktop debian/tmp/opt/trinity/share/wallpapers/celtic.svgz debian/tmp/opt/trinity/share/wallpapers/celtic.svgz.desktop -debian/tmp/opt/trinity/share/wallpapers/Chicken-Songs-2.jpg -debian/tmp/opt/trinity/share/wallpapers/Chicken-Songs-2.jpg.desktop debian/tmp/opt/trinity/share/wallpapers/default_blue.jpg debian/tmp/opt/trinity/share/wallpapers/default_blue.jpg.desktop -debian/tmp/opt/trinity/share/wallpapers/default_gears.jpg -debian/tmp/opt/trinity/share/wallpapers/default_gears.jpg.desktop debian/tmp/opt/trinity/share/wallpapers/floating-leaves.jpg debian/tmp/opt/trinity/share/wallpapers/floating-leaves.jpg.desktop debian/tmp/opt/trinity/share/wallpapers/green_curtain.jpg debian/tmp/opt/trinity/share/wallpapers/green_curtain.jpg.desktop -debian/tmp/opt/trinity/share/wallpapers/globe.svgz -debian/tmp/opt/trinity/share/wallpapers/globe.svgz.desktop debian/tmp/opt/trinity/share/wallpapers/here-gear.svgz debian/tmp/opt/trinity/share/wallpapers/here-gear.svgz.desktop debian/tmp/opt/trinity/share/wallpapers/horse-head-nebula.png @@ -1203,6 +1201,8 @@ debian/tmp/opt/trinity/share/wallpapers/lineart.svgz debian/tmp/opt/trinity/share/wallpapers/lineart.svgz.desktop debian/tmp/opt/trinity/share/wallpapers/moon.svgz debian/tmp/opt/trinity/share/wallpapers/moon.svgz.desktop +debian/tmp/opt/trinity/share/wallpapers/mountain-lake.jpg +debian/tmp/opt/trinity/share/wallpapers/mountain-lake.jpg.desktop debian/tmp/opt/trinity/share/wallpapers/No-Ones-Laughing-3.jpg debian/tmp/opt/trinity/share/wallpapers/No-Ones-Laughing-3.jpg.desktop debian/tmp/opt/trinity/share/wallpapers/seaofconero.jpg @@ -1211,16 +1211,12 @@ debian/tmp/opt/trinity/share/wallpapers/soft-green.jpg debian/tmp/opt/trinity/share/wallpapers/soft-green.jpg.desktop debian/tmp/opt/trinity/share/wallpapers/stelvio.jpg debian/tmp/opt/trinity/share/wallpapers/stelvio.jpg.desktop -debian/tmp/opt/trinity/share/wallpapers/stripes.jpg -debian/tmp/opt/trinity/share/wallpapers/stripes.jpg.desktop debian/tmp/opt/trinity/share/wallpapers/sunshine-after-the-rain.jpg debian/tmp/opt/trinity/share/wallpapers/sunshine-after-the-rain.jpg.desktop debian/tmp/opt/trinity/share/wallpapers/Time-For-Lunch-2.jpg debian/tmp/opt/trinity/share/wallpapers/Time-For-Lunch-2.jpg.desktop debian/tmp/opt/trinity/share/wallpapers/Totally-New-Product-1.jpg debian/tmp/opt/trinity/share/wallpapers/Totally-New-Product-1.jpg.desktop -debian/tmp/opt/trinity/share/wallpapers/triplegears.jpg -debian/tmp/opt/trinity/share/wallpapers/triplegears.jpg.desktop debian/tmp/opt/trinity/share/wallpapers/Won-Ton-Soup-3.jpg debian/tmp/opt/trinity/share/wallpapers/Won-Ton-Soup-3.jpg.desktop debian/tmp/opt/trinity/share/wallpapers/world-desktop.jpg -- cgit v1.2.1 From 8f10473b8d0eaea7b2c986a084706692e85297e6 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sun, 14 Sep 2014 23:25:24 +0900 Subject: Added new TDE default background. Changes required for Debian/Ubuntu distros. --- .../tdebase/debian/patches/disable_starttde_wallpaper.diff | 8 ++++---- ubuntu/maverick/tdebase/debian/tdebase-data-trinity.install | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'ubuntu/maverick/tdebase') diff --git a/ubuntu/maverick/tdebase/debian/patches/disable_starttde_wallpaper.diff b/ubuntu/maverick/tdebase/debian/patches/disable_starttde_wallpaper.diff index 3949f4040..598cd7092 100644 --- a/ubuntu/maverick/tdebase/debian/patches/disable_starttde_wallpaper.diff +++ b/ubuntu/maverick/tdebase/debian/patches/disable_starttde_wallpaper.diff @@ -7,10 +7,10 @@ -# Make sure a default wallpaper is set. -if [ ! -e "$tdehome/share/config/kdesktoprc" ]; then - # With Trinity this file should exist, but test first. -- if [ -r /usr/share/wallpapers/isadora.png.desktop ]; then +- if [ -r $TDEDIR/share/wallpapers/Trinity-lineart.svg.desktop ]; then -cat >"$tdehome/share/config/kdesktoprc" <"$tdehome/share/config/kdesktoprc" < Date: Thu, 18 Sep 2014 11:59:21 +0900 Subject: Reinstated removed wallpapers. Here are the changes required for Debian/Ubuntu distros. --- .../tdebase/debian/tdebase-data-trinity.install | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) (limited to 'ubuntu/maverick/tdebase') diff --git a/ubuntu/maverick/tdebase/debian/tdebase-data-trinity.install b/ubuntu/maverick/tdebase/debian/tdebase-data-trinity.install index a6e7cb9ba..740f0b2ce 100644 --- a/ubuntu/maverick/tdebase/debian/tdebase-data-trinity.install +++ b/ubuntu/maverick/tdebase/debian/tdebase-data-trinity.install @@ -1181,22 +1181,24 @@ debian/tmp/opt/trinity/share/wallpapers/blue-bend.jpg debian/tmp/opt/trinity/share/wallpapers/blue-bend.jpg.desktop debian/tmp/opt/trinity/share/wallpapers/celtic.svgz debian/tmp/opt/trinity/share/wallpapers/celtic.svgz.desktop +debian/tmp/opt/trinity/share/wallpapers/Chicken-Songs-2.jpg +debian/tmp/opt/trinity/share/wallpapers/Chicken-Songs-2.jpg.desktop debian/tmp/opt/trinity/share/wallpapers/default_blue.jpg debian/tmp/opt/trinity/share/wallpapers/default_blue.jpg.desktop +debian/tmp/opt/trinity/share/wallpapers/default_gears.jpg +debian/tmp/opt/trinity/share/wallpapers/default_gears.jpg.desktop debian/tmp/opt/trinity/share/wallpapers/floating-leaves.jpg debian/tmp/opt/trinity/share/wallpapers/floating-leaves.jpg.desktop debian/tmp/opt/trinity/share/wallpapers/green_curtain.jpg debian/tmp/opt/trinity/share/wallpapers/green_curtain.jpg.desktop +debian/tmp/opt/trinity/share/wallpapers/globe.svgz +debian/tmp/opt/trinity/share/wallpapers/globe.svgz.desktop debian/tmp/opt/trinity/share/wallpapers/here-gear.svgz debian/tmp/opt/trinity/share/wallpapers/here-gear.svgz.desktop debian/tmp/opt/trinity/share/wallpapers/horse-head-nebula.png debian/tmp/opt/trinity/share/wallpapers/horse-head-nebula.png.desktop debian/tmp/opt/trinity/share/wallpapers/isadora.png debian/tmp/opt/trinity/share/wallpapers/isadora.png.desktop -debian/tmp/opt/trinity/share/wallpapers/Trinity4.png -debian/tmp/opt/trinity/share/wallpapers/Trinity4.png.desktop -debian/tmp/opt/trinity/share/wallpapers/Trinity-lineart.svg -debian/tmp/opt/trinity/share/wallpapers/Trinity-lineart.svg.desktop debian/tmp/opt/trinity/share/wallpapers/konqui.svgz debian/tmp/opt/trinity/share/wallpapers/konqui.svgz.desktop debian/tmp/opt/trinity/share/wallpapers/lineart.svgz @@ -1213,12 +1215,20 @@ debian/tmp/opt/trinity/share/wallpapers/soft-green.jpg debian/tmp/opt/trinity/share/wallpapers/soft-green.jpg.desktop debian/tmp/opt/trinity/share/wallpapers/stelvio.jpg debian/tmp/opt/trinity/share/wallpapers/stelvio.jpg.desktop +debian/tmp/opt/trinity/share/wallpapers/stripes.jpg +debian/tmp/opt/trinity/share/wallpapers/stripes.jpg.desktop debian/tmp/opt/trinity/share/wallpapers/sunshine-after-the-rain.jpg debian/tmp/opt/trinity/share/wallpapers/sunshine-after-the-rain.jpg.desktop debian/tmp/opt/trinity/share/wallpapers/Time-For-Lunch-2.jpg debian/tmp/opt/trinity/share/wallpapers/Time-For-Lunch-2.jpg.desktop debian/tmp/opt/trinity/share/wallpapers/Totally-New-Product-1.jpg debian/tmp/opt/trinity/share/wallpapers/Totally-New-Product-1.jpg.desktop +debian/tmp/opt/trinity/share/wallpapers/Trinity4.png +debian/tmp/opt/trinity/share/wallpapers/Trinity4.png.desktop +debian/tmp/opt/trinity/share/wallpapers/Trinity-lineart.svg +debian/tmp/opt/trinity/share/wallpapers/Trinity-lineart.svg.desktop +debian/tmp/opt/trinity/share/wallpapers/triplegears.jpg +debian/tmp/opt/trinity/share/wallpapers/triplegears.jpg.desktop debian/tmp/opt/trinity/share/wallpapers/Won-Ton-Soup-3.jpg debian/tmp/opt/trinity/share/wallpapers/Won-Ton-Soup-3.jpg.desktop debian/tmp/opt/trinity/share/wallpapers/world-desktop.jpg -- cgit v1.2.1