diff --git a/Makefile b/Makefile index ed881e9..657c220 100644 --- a/Makefile +++ b/Makefile @@ -40,6 +40,8 @@ install: mkdir -p $(DESTDIR)/etc/default/kdm.d $(INSTALL) kdm-theme/kdm.d/10_desktop-base $(DESTDIR)/etc/default/kdm.d + mkdir -p $(DESTDIR)/usr/share/kde4/apps/kdm/themes/joy + $(INSTALL) $(wildcard kdm-theme/joy/*) $(DESTDIR)/usr/share/kde4/apps/kdm/themes/joy mkdir -p $(DESTDIR)/usr/share/kde4/apps/kdm/themes/spacefun $(INSTALL) $(wildcard kdm-theme/spacefun/*) $(DESTDIR)/usr/share/kde4/apps/kdm/themes/spacefun mkdir -p $(DESTDIR)/usr/share/kde4/apps/kdm/themes/debian-moreblue @@ -50,19 +52,19 @@ install: $(INSTALL) $(wildcard kdm-theme/nightly/*) $(DESTDIR)/usr/share/kde4/apps/kdm/themes/nightly # KSPLASH theme - install -d $(DESTDIR)/usr/share/kde4/apps/ksplash/Themes/spacefun - $(INSTALL) ksplash-theme/spacefun/Preview.png $(DESTDIR)/usr/share/kde4/apps/ksplash/Themes/spacefun - $(INSTALL) ksplash-theme/spacefun/Theme.rc $(DESTDIR)/usr/share/kde4/apps/ksplash/Themes/spacefun - install -d $(DESTDIR)/usr/share/kde4/apps/ksplash/Themes/spacefun/1024x768 - $(INSTALL) $(wildcard ksplash-theme/spacefun/1024x768/*) $(DESTDIR)/usr/share/kde4/apps/ksplash/Themes/spacefun/1024x768 - install -d $(DESTDIR)/usr/share/kde4/apps/ksplash/Themes/spacefun/1280x1024 - $(INSTALL) $(wildcard ksplash-theme/spacefun/1280x1024/*) $(DESTDIR)/usr/share/kde4/apps/ksplash/Themes/spacefun/1280x1024 - install -d $(DESTDIR)/usr/share/kde4/apps/ksplash/Themes/spacefun/1366x768 - $(INSTALL) $(wildcard ksplash-theme/spacefun/1366x768/*) $(DESTDIR)/usr/share/kde4/apps/ksplash/Themes/spacefun/1366x768 - install -d $(DESTDIR)/usr/share/kde4/apps/ksplash/Themes/spacefun/1600x1200 - $(INSTALL) $(wildcard ksplash-theme/spacefun/1600x1200/*) $(DESTDIR)/usr/share/kde4/apps/ksplash/Themes/spacefun/1600x1200 - install -d $(DESTDIR)/usr/share/kde4/apps/ksplash/Themes/spacefun/1920x1080 - $(INSTALL) $(wildcard ksplash-theme/spacefun/1920x1080/*) $(DESTDIR)/usr/share/kde4/apps/ksplash/Themes/spacefun/1920x1080 + install -d $(DESTDIR)/usr/share/kde4/apps/ksplash/Themes/joy + $(INSTALL) ksplash-theme/joy/Preview.png $(DESTDIR)/usr/share/kde4/apps/ksplash/Themes/joy + $(INSTALL) ksplash-theme/joy/Theme.rc $(DESTDIR)/usr/share/kde4/apps/ksplash/Themes/joy + install -d $(DESTDIR)/usr/share/kde4/apps/ksplash/Themes/joy/1024x768 + $(INSTALL) $(wildcard ksplash-theme/joy/1024x768/*) $(DESTDIR)/usr/share/kde4/apps/ksplash/Themes/joy/1024x768 + install -d $(DESTDIR)/usr/share/kde4/apps/ksplash/Themes/joy/1280x1024 + $(INSTALL) $(wildcard ksplash-theme/joy/1280x1024/*) $(DESTDIR)/usr/share/kde4/apps/ksplash/Themes/joy/1280x1024 + install -d $(DESTDIR)/usr/share/kde4/apps/ksplash/Themes/joy/1366x768 + $(INSTALL) $(wildcard ksplash-theme/joy/1366x768/*) $(DESTDIR)/usr/share/kde4/apps/ksplash/Themes/joy/1366x768 + install -d $(DESTDIR)/usr/share/kde4/apps/ksplash/Themes/joy/1600x1200 + $(INSTALL) $(wildcard ksplash-theme/joy/1600x1200/*) $(DESTDIR)/usr/share/kde4/apps/ksplash/Themes/joy/1600x1200 + install -d $(DESTDIR)/usr/share/kde4/apps/ksplash/Themes/joy/1920x1080 + $(INSTALL) $(wildcard ksplash-theme/joy/1920x1080/*) $(DESTDIR)/usr/share/kde4/apps/ksplash/Themes/joy/1920x1080 # KDE Config mkdir -p $(DESTDIR)/usr/share/desktop-base/profiles/kde-profile/share/config @@ -80,8 +82,7 @@ install: $(INSTALL) gdm3/10_desktop-base $(DESTDIR)/usr/share/gdm/greeter-config # grub - $(INSTALL) grub/spacefun-grub.png $(DESTDIR)/usr/share/images/desktop-base/ - $(INSTALL) grub/spacefun-grub-widescreen.png $(DESTDIR)/usr/share/images/desktop-base/ + $(INSTALL) grub/joy-grub.png $(DESTDIR)/usr/share/images/desktop-base/ $(INSTALL) grub/grub_background.sh $(DESTDIR)/usr/share/desktop-base/ # plymouth diff --git a/backgrounds/joy-ink-splash.png b/backgrounds/joy-ink-splash.png new file mode 100644 index 0000000..084e0ef Binary files /dev/null and b/backgrounds/joy-ink-splash.png differ diff --git a/backgrounds/joy-wallpaper.svg b/backgrounds/joy-wallpaper.svg new file mode 100644 index 0000000..40cd5f1 --- /dev/null +++ b/backgrounds/joy-wallpaper.svg @@ -0,0 +1,185 @@ + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/debian/changelog b/debian/changelog index 9ae50af..b073222 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,18 @@ +desktop-base (7.0.0~exp1) UNRELEASED; urgency=low + + * Adding myself as a maintainer + * We've got a new theme -- `joy' by Adrien Aubourg. Thanks, Adrien! + - Theme added to backgrounds. + - Theme added for Grub + - Background changed for GDM3 + - Theme added for KDM & changed that to default. + - Theme added for ksplash & changed to default. + * Standards bump to 3.9.3 + * Pre-Dependency added for dpkg (>= 1.15.7.2~), since we use dpkg helpers + in our preinst. + + -- Paul Tagliamonte Wed, 20 Jun 2012 20:41:04 -0400 + desktop-base (6.0.7) unstable; urgency=low [ Josselin Mouette ] diff --git a/debian/compat b/debian/compat index 1e8b314..ec63514 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -6 +9 diff --git a/debian/control b/debian/control index 71d16a0..31a8cfc 100644 --- a/debian/control +++ b/debian/control @@ -5,10 +5,11 @@ Maintainer: Gustavo Franco Uploaders: Loïc Minier , Fathi Boudra , Yves-Alexis Perez , - Josselin Mouette -Build-Depends: cdbs (>= 0.4.93), debhelper (>= 8.1.3) + Josselin Mouette , + Paul Tagliamonte +Build-Depends: cdbs (>= 0.4.93), debhelper (>= 9) # libusplash-dev, imagemagick, librsvg2-bin -Standards-Version: 3.9.2 +Standards-Version: 3.9.3 Homepage: http://www.debian.org/devel/debian-desktop Vcs-Browser: http://svn.debian.org/wsvn/debian-desktop/packages/trunk/desktop-base Vcs-Svn: svn://svn.debian.org/debian-desktop/packages/trunk/desktop-base @@ -16,6 +17,7 @@ Vcs-Svn: svn://svn.debian.org/debian-desktop/packages/trunk/desktop-base Package: desktop-base Architecture: all Depends: librsvg2-common +Pre-Depends: dpkg (>= 1.15.7.2~) Suggests: gnome | kde-standard | xfce4 | wmaker Description: common files for the Debian Desktop This package contains various miscellaneous files which are used by diff --git a/debian/postinst b/debian/postinst index 82e0cbf..c1a44c7 100644 --- a/debian/postinst +++ b/debian/postinst @@ -1,4 +1,5 @@ #!/bin/bash -e +set -e #DEBHELPER# @@ -17,6 +18,16 @@ fi if [ "$1" = "configure" -o "$1" = "abort-upgrade" ]; then # Alternatives for the background + update-alternatives --install \ + /usr/share/images/desktop-base/desktop-background \ + desktop-background \ + /usr/share/images/desktop-base/joy-ink-splash.png 70 + + update-alternatives --install \ + /usr/share/images/desktop-base/desktop-background \ + desktop-background \ + /usr/share/images/desktop-base/joy-wallpaper.svg 70 + update-alternatives --install \ /usr/share/images/desktop-base/desktop-background \ desktop-background \ @@ -67,17 +78,7 @@ if [ "$1" = "configure" -o "$1" = "abort-upgrade" ]; then update-alternatives --install \ /usr/share/images/desktop-base/desktop-grub.png \ desktop-grub \ - /usr/share/images/desktop-base/spacefun-grub.png 15 - - update-alternatives --install \ - /usr/share/images/desktop-base/desktop-grub.png \ - desktop-grub \ - /usr/share/images/desktop-base/spacefun-grub-widescreen.png 14 - - update-alternatives --install \ - /usr/share/images/desktop-base/desktop-grub.png \ - desktop-grub \ - /usr/share/images/desktop-base/moreblue-orbit-grub.png 10 + /usr/share/images/desktop-base/joy-grub.png 15 # GRUB background if which update-grub2 > /dev/null ; then diff --git a/debian/postrm b/debian/postrm index 63e6d12..1400763 100644 --- a/debian/postrm +++ b/debian/postrm @@ -1,4 +1,5 @@ #!/bin/sh -e +set -e #DEBHELPER# diff --git a/debian/preinst b/debian/preinst index 5613d2a..96662ad 100644 --- a/debian/preinst +++ b/debian/preinst @@ -1,4 +1,5 @@ #!/bin/sh -e +set -e #DEBHELPER# if dpkg-maintscript-helper supports rm_conffile 2>/dev/null; then diff --git a/debian/prerm b/debian/prerm index 8e8579a..621428b 100644 --- a/debian/prerm +++ b/debian/prerm @@ -1,4 +1,5 @@ #!/bin/sh -e +set -e #DEBHELPER# diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..89ae9db --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/gdm3/background.svg b/gdm3/background.svg index d5a5c9e..ad5f09a 100644 --- a/gdm3/background.svg +++ b/gdm3/background.svg @@ -10,525 +10,39 @@ xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="1024" - height="768" - id="svg2915" + width="1920" + height="1080" + id="svg2" version="1.1" - inkscape:version="0.48+devel r9734" - sodipodi:docname="background.svg" - inkscape:export-filename="/home/valessio/svn/debianart/themes/spacefun/wallpaper/wallpaper_1440x1152.png" + inkscape:version="0.48.3.1 r9886" + inkscape:export-filename="/home/adrien/Dropbox/wheezy_artwork/exports/proposal_1_full/wallpaper_1920x1080.png" inkscape:export-xdpi="90" - inkscape:export-ydpi="90"> + inkscape:export-ydpi="90" + sodipodi:docname="Adau_-_base_1.svg"> - + id="defs4"> + id="linearGradient3755"> + id="stop3757" /> - + id="stop3759" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + inkscape:window-y="19" + inkscape:window-maximized="1" /> + id="metadata7"> image/svg+xml - + + id="layer1" + transform="translate(0,27.637817)"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + y="-27.637817" /> + diff --git a/grub/joy-grub.png b/grub/joy-grub.png new file mode 100644 index 0000000..0b49b65 Binary files /dev/null and b/grub/joy-grub.png differ diff --git a/kdm-theme/joy/KdmGreeterTheme.desktop b/kdm-theme/joy/KdmGreeterTheme.desktop new file mode 100644 index 0000000..f344d5e --- /dev/null +++ b/kdm-theme/joy/KdmGreeterTheme.desktop @@ -0,0 +1,8 @@ +[KdmGreeterTheme] +Encoding=UTF-8 +Greeter=joy.xml +Name=Joy +Description=Joy KDM Theme +Author=Adrien Aubourg, Yves-Alexis Perez, Paul Tagliamonte, based on GDM theme +Copyright=(c) 2012 Paul Tagliamonte +Screenshot=screenshot.png diff --git a/kdm-theme/joy/background.png b/kdm-theme/joy/background.png new file mode 100644 index 0000000..73d9e7e Binary files /dev/null and b/kdm-theme/joy/background.png differ diff --git a/kdm-theme/joy/boundingbox.png b/kdm-theme/joy/boundingbox.png new file mode 100644 index 0000000..72a9b1d Binary files /dev/null and b/kdm-theme/joy/boundingbox.png differ diff --git a/kdm-theme/joy/icon-reboot.png b/kdm-theme/joy/icon-reboot.png new file mode 100644 index 0000000..a78520b Binary files /dev/null and b/kdm-theme/joy/icon-reboot.png differ diff --git a/kdm-theme/joy/icon-session.png b/kdm-theme/joy/icon-session.png new file mode 100644 index 0000000..f9d9555 Binary files /dev/null and b/kdm-theme/joy/icon-session.png differ diff --git a/kdm-theme/joy/joy.xml b/kdm-theme/joy/joy.xml new file mode 100644 index 0000000..2d1234b --- /dev/null +++ b/kdm-theme/joy/joy.xml @@ -0,0 +1,162 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Login failed. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + %c + + + + diff --git a/kdm-theme/joy/screenshot.png b/kdm-theme/joy/screenshot.png new file mode 100644 index 0000000..7d3dc1e Binary files /dev/null and b/kdm-theme/joy/screenshot.png differ diff --git a/kdm-theme/kdm.d/10_desktop-base b/kdm-theme/kdm.d/10_desktop-base index 10a6eb9..dfb91ad 100644 --- a/kdm-theme/kdm.d/10_desktop-base +++ b/kdm-theme/kdm.d/10_desktop-base @@ -1,3 +1,3 @@ USETHEME="true" -THEME="/usr/share/kde4/apps/kdm/themes/spacefun" -WALLPAPER="/usr/share/kde4/apps/kdm/themes/spacefun/background.png" +THEME="/usr/share/kde4/apps/kdm/themes/joy" +WALLPAPER="/usr/share/kde4/apps/kdm/themes/joy/background.png" diff --git a/ksplash-theme/joy/1024x768/background.png b/ksplash-theme/joy/1024x768/background.png new file mode 100644 index 0000000..50e57de Binary files /dev/null and b/ksplash-theme/joy/1024x768/background.png differ diff --git a/ksplash-theme/joy/1280x1024/background.png b/ksplash-theme/joy/1280x1024/background.png new file mode 100644 index 0000000..f61416c Binary files /dev/null and b/ksplash-theme/joy/1280x1024/background.png differ diff --git a/ksplash-theme/joy/1366x768/background.png b/ksplash-theme/joy/1366x768/background.png new file mode 100644 index 0000000..26c4b35 Binary files /dev/null and b/ksplash-theme/joy/1366x768/background.png differ diff --git a/ksplash-theme/joy/1600x1200/background.png b/ksplash-theme/joy/1600x1200/background.png new file mode 100644 index 0000000..ee334bc Binary files /dev/null and b/ksplash-theme/joy/1600x1200/background.png differ diff --git a/ksplash-theme/joy/1600x1200/description.txt b/ksplash-theme/joy/1600x1200/description.txt new file mode 100644 index 0000000..7904dbc --- /dev/null +++ b/ksplash-theme/joy/1600x1200/description.txt @@ -0,0 +1,42 @@ +SCALE ON +BACKGROUND_IMAGE 0 0 background.png +SCALE OFF + +# the image is 390x234, make it centered, all icons need the same adjustment too +IMAGE_REL CC 0 0 CC rectangle.png + +# these have their relative positions to the rectangle adjusted by -195,-117 +# (i.e. half of the rectangle size) +# 3,32 +ANIM_REL 1 CC -192 -50 LT 30 icon1_anim.png 85 1 +WAIT_STATE kded + +# 69,32 +ANIM_REL 2 CC -126 -50 LT 30 icon2_anim.png 85 1 +WAIT_STATE kcminit + +# 135,32 +ANIM_REL 3 CC -60 -50 LT 29 icon3_anim.png 85 1 +WAIT_STATE ksmserver + +# 201,32 +ANIM_REL 4 CC 6 -50 LT 30 icon4_anim.png 85 1 +WAIT_STATE wm + +# 263,15 +ANIM_REL 5 CC 68 -88 LT 30 icon5_anim.png 85 1 +WAIT_STATE desktop + +WAIT_STATE ready + +# show the icons fully right before the splash goes away +STOP_ANIM 1 +IMAGE_REL CC -192 -50 LT icon1.png +STOP_ANIM 2 +IMAGE_REL CC -126 -50 LT icon2.png +STOP_ANIM 3 +IMAGE_REL CC -60 -50 LT icon3.png +STOP_ANIM 4 +IMAGE_REL CC 6 -50 LT icon4.png +STOP_ANIM 5 +IMAGE_REL CC 68 -88 LT icon5.png diff --git a/ksplash-theme/joy/1600x1200/icon1.png b/ksplash-theme/joy/1600x1200/icon1.png new file mode 100644 index 0000000..93daa84 Binary files /dev/null and b/ksplash-theme/joy/1600x1200/icon1.png differ diff --git a/ksplash-theme/joy/1600x1200/icon1_anim.png b/ksplash-theme/joy/1600x1200/icon1_anim.png new file mode 100644 index 0000000..3b065f5 Binary files /dev/null and b/ksplash-theme/joy/1600x1200/icon1_anim.png differ diff --git a/ksplash-theme/joy/1600x1200/icon2.png b/ksplash-theme/joy/1600x1200/icon2.png new file mode 100644 index 0000000..2078ad1 Binary files /dev/null and b/ksplash-theme/joy/1600x1200/icon2.png differ diff --git a/ksplash-theme/joy/1600x1200/icon2_anim.png b/ksplash-theme/joy/1600x1200/icon2_anim.png new file mode 100644 index 0000000..36f1afc Binary files /dev/null and b/ksplash-theme/joy/1600x1200/icon2_anim.png differ diff --git a/ksplash-theme/joy/1600x1200/icon3.png b/ksplash-theme/joy/1600x1200/icon3.png new file mode 100644 index 0000000..48b2ffe Binary files /dev/null and b/ksplash-theme/joy/1600x1200/icon3.png differ diff --git a/ksplash-theme/joy/1600x1200/icon3_anim.png b/ksplash-theme/joy/1600x1200/icon3_anim.png new file mode 100644 index 0000000..8b36220 Binary files /dev/null and b/ksplash-theme/joy/1600x1200/icon3_anim.png differ diff --git a/ksplash-theme/joy/1600x1200/icon4.png b/ksplash-theme/joy/1600x1200/icon4.png new file mode 100644 index 0000000..15699e2 Binary files /dev/null and b/ksplash-theme/joy/1600x1200/icon4.png differ diff --git a/ksplash-theme/joy/1600x1200/icon4_anim.png b/ksplash-theme/joy/1600x1200/icon4_anim.png new file mode 100644 index 0000000..9309db5 Binary files /dev/null and b/ksplash-theme/joy/1600x1200/icon4_anim.png differ diff --git a/ksplash-theme/joy/1600x1200/icon5.png b/ksplash-theme/joy/1600x1200/icon5.png new file mode 100644 index 0000000..4540cb3 Binary files /dev/null and b/ksplash-theme/joy/1600x1200/icon5.png differ diff --git a/ksplash-theme/joy/1600x1200/icon5_anim.png b/ksplash-theme/joy/1600x1200/icon5_anim.png new file mode 100644 index 0000000..de690c1 Binary files /dev/null and b/ksplash-theme/joy/1600x1200/icon5_anim.png differ diff --git a/ksplash-theme/joy/1600x1200/rectangle.png b/ksplash-theme/joy/1600x1200/rectangle.png new file mode 100644 index 0000000..791b26c Binary files /dev/null and b/ksplash-theme/joy/1600x1200/rectangle.png differ diff --git a/ksplash-theme/joy/1920x1080/background.png b/ksplash-theme/joy/1920x1080/background.png new file mode 100644 index 0000000..34bde3e Binary files /dev/null and b/ksplash-theme/joy/1920x1080/background.png differ diff --git a/ksplash-theme/joy/Preview.png b/ksplash-theme/joy/Preview.png new file mode 100644 index 0000000..d4d9ad7 Binary files /dev/null and b/ksplash-theme/joy/Preview.png differ diff --git a/ksplash-theme/joy/Theme.rc b/ksplash-theme/joy/Theme.rc new file mode 100644 index 0000000..a6a28ab --- /dev/null +++ b/ksplash-theme/joy/Theme.rc @@ -0,0 +1,9 @@ +[KSplash Theme: joy] +Name = Joy Splash Screen +Description = Debian Joy Splash Screen, with both 4:3 and 16:9, based largely on work by the authors listed... +Version = 1.0 +Author = Adrien Aubourg , Paul Tagliamonte , Nuno Pinheiro , Riccardo Iaconelli +Homepage = http://wiki.debian.org/DebianArt/Themes/SpaceFun + +# Theme behaviour settings. +Engine = KSplashX diff --git a/profiles/kde-profile/share/config/ksplashrc b/profiles/kde-profile/share/config/ksplashrc index 45410c9..eb9593b 100644 --- a/profiles/kde-profile/share/config/ksplashrc +++ b/profiles/kde-profile/share/config/ksplashrc @@ -1,2 +1,2 @@ [KSplash] -Theme=spacefun +Theme=joy diff --git a/source/joy/blank.svg b/source/joy/blank.svg new file mode 100644 index 0000000..ad5f09a --- /dev/null +++ b/source/joy/blank.svg @@ -0,0 +1,94 @@ + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/source/joy/joy.svg b/source/joy/joy.svg new file mode 100644 index 0000000..40cd5f1 --- /dev/null +++ b/source/joy/joy.svg @@ -0,0 +1,185 @@ + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + +