From a787d4b7797568f96c0f2947b4c4cb64659f5526 Mon Sep 17 00:00:00 2001 From: Eshat Cakar Date: Sat, 28 Jul 2012 11:01:37 +0000 Subject: [PATCH] Rename kdm-theme and ksplash-theme source folders to kdm and ksplash. --- Makefile | 22 +++++++++--------- debian/changelog | 1 + .../joy/KdmGreeterTheme.desktop | 0 {kdm-theme => kdm}/joy/background.svg | 0 {kdm-theme => kdm}/joy/joy.xml | 0 {kdm-theme => kdm}/joy/lineedit_active.png | Bin {kdm-theme => kdm}/joy/lineedit_normal.png | Bin {kdm-theme => kdm}/joy/lock.png | Bin {kdm-theme => kdm}/joy/rectangle.png | Bin {kdm-theme => kdm}/joy/screenshot.png | Bin {kdm-theme => kdm}/joy/session_normal.png | Bin {kdm-theme => kdm}/joy/system_normal.png | Bin {kdm-theme => kdm}/joy/user_icon.png | Bin {kdm-theme => kdm}/kdm.d/10_desktop-base | 0 .../joy/1024x768/background.png | Bin .../joy/1280x1024/background.png | Bin .../joy/1280x800/background.png | Bin .../joy/1366x768/background.png | Bin .../joy/1600x1200/background.png | Bin .../joy/1600x1200/description.txt | 0 .../joy/1600x1200/icon1.png | Bin .../joy/1600x1200/icon1_anim.png | Bin .../joy/1600x1200/icon2.png | Bin .../joy/1600x1200/icon2_anim.png | Bin .../joy/1600x1200/icon3.png | Bin .../joy/1600x1200/icon3_anim.png | Bin .../joy/1600x1200/icon4.png | Bin .../joy/1600x1200/icon4_anim.png | Bin .../joy/1600x1200/icon5.png | Bin .../joy/1600x1200/icon5_anim.png | Bin .../joy/1600x1200/rectangle.png | Bin .../joy/1920x1080/background.png | Bin .../joy/1920x1200/background.png | Bin {ksplash-theme => ksplash}/joy/Preview.png | Bin {ksplash-theme => ksplash}/joy/Theme.rc | 0 35 files changed, 12 insertions(+), 11 deletions(-) rename {kdm-theme => kdm}/joy/KdmGreeterTheme.desktop (100%) rename {kdm-theme => kdm}/joy/background.svg (100%) rename {kdm-theme => kdm}/joy/joy.xml (100%) rename {kdm-theme => kdm}/joy/lineedit_active.png (100%) rename {kdm-theme => kdm}/joy/lineedit_normal.png (100%) rename {kdm-theme => kdm}/joy/lock.png (100%) rename {kdm-theme => kdm}/joy/rectangle.png (100%) rename {kdm-theme => kdm}/joy/screenshot.png (100%) rename {kdm-theme => kdm}/joy/session_normal.png (100%) rename {kdm-theme => kdm}/joy/system_normal.png (100%) rename {kdm-theme => kdm}/joy/user_icon.png (100%) rename {kdm-theme => kdm}/kdm.d/10_desktop-base (100%) rename {ksplash-theme => ksplash}/joy/1024x768/background.png (100%) rename {ksplash-theme => ksplash}/joy/1280x1024/background.png (100%) rename {ksplash-theme => ksplash}/joy/1280x800/background.png (100%) rename {ksplash-theme => ksplash}/joy/1366x768/background.png (100%) rename {ksplash-theme => ksplash}/joy/1600x1200/background.png (100%) rename {ksplash-theme => ksplash}/joy/1600x1200/description.txt (100%) rename {ksplash-theme => ksplash}/joy/1600x1200/icon1.png (100%) rename {ksplash-theme => ksplash}/joy/1600x1200/icon1_anim.png (100%) rename {ksplash-theme => ksplash}/joy/1600x1200/icon2.png (100%) rename {ksplash-theme => ksplash}/joy/1600x1200/icon2_anim.png (100%) rename {ksplash-theme => ksplash}/joy/1600x1200/icon3.png (100%) rename {ksplash-theme => ksplash}/joy/1600x1200/icon3_anim.png (100%) rename {ksplash-theme => ksplash}/joy/1600x1200/icon4.png (100%) rename {ksplash-theme => ksplash}/joy/1600x1200/icon4_anim.png (100%) rename {ksplash-theme => ksplash}/joy/1600x1200/icon5.png (100%) rename {ksplash-theme => ksplash}/joy/1600x1200/icon5_anim.png (100%) rename {ksplash-theme => ksplash}/joy/1600x1200/rectangle.png (100%) rename {ksplash-theme => ksplash}/joy/1920x1080/background.png (100%) rename {ksplash-theme => ksplash}/joy/1920x1200/background.png (100%) rename {ksplash-theme => ksplash}/joy/Preview.png (100%) rename {ksplash-theme => ksplash}/joy/Theme.rc (100%) diff --git a/Makefile b/Makefile index dd0b84f..c3d567f 100644 --- a/Makefile +++ b/Makefile @@ -55,28 +55,28 @@ install: # KDM theme mkdir -p $(DESTDIR)/etc/default/kdm.d - $(INSTALL) kdm-theme/kdm.d/10_desktop-base $(DESTDIR)/etc/default/kdm.d + $(INSTALL) kdm/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 + $(INSTALL) $(wildcard kdm/joy/*) $(DESTDIR)/usr/share/kde4/apps/kdm/themes/joy # KSPLASH theme 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) ksplash/joy/Preview.png $(DESTDIR)/usr/share/kde4/apps/ksplash/Themes/joy + $(INSTALL) ksplash/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) $(wildcard ksplash/joy/1024x768/*) $(DESTDIR)/usr/share/kde4/apps/ksplash/Themes/joy/1024x768 install -d $(DESTDIR)/usr/share/kde4/apps/ksplash/Themes/joy/1280x800 - $(INSTALL) $(wildcard ksplash-theme/joy/1280x800/*) $(DESTDIR)/usr/share/kde4/apps/ksplash/Themes/joy/1280x800 + $(INSTALL) $(wildcard ksplash/joy/1280x800/*) $(DESTDIR)/usr/share/kde4/apps/ksplash/Themes/joy/1280x800 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) $(wildcard ksplash/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) $(wildcard ksplash/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) $(wildcard ksplash/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 + $(INSTALL) $(wildcard ksplash/joy/1920x1080/*) $(DESTDIR)/usr/share/kde4/apps/ksplash/Themes/joy/1920x1080 install -d $(DESTDIR)/usr/share/kde4/apps/ksplash/Themes/joy/1920x1200 - $(INSTALL) $(wildcard ksplash-theme/joy/1920x1200/*) $(DESTDIR)/usr/share/kde4/apps/ksplash/Themes/joy/1920x1200 + $(INSTALL) $(wildcard ksplash/joy/1920x1200/*) $(DESTDIR)/usr/share/kde4/apps/ksplash/Themes/joy/1920x1200 # Xfce 4.6 diff --git a/debian/changelog b/debian/changelog index acc2988..3b3d4db 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ desktop-base (7.0.1) UNRELEASED; urgency=low * Make 1366x768 ksplash background really that resolution. (Closes: #679306) * Fix typo in plymouth theme. (Closes: #679357) * Updated ink-splated kde wallpaper, to fix alignment issues. + * Rename kdm-theme and ksplash-theme source folders to kdm and ksplash. [ Paul Tagliamonte ] * Add ${misc:Depends} to the Depends for the binary package. We're using diff --git a/kdm-theme/joy/KdmGreeterTheme.desktop b/kdm/joy/KdmGreeterTheme.desktop similarity index 100% rename from kdm-theme/joy/KdmGreeterTheme.desktop rename to kdm/joy/KdmGreeterTheme.desktop diff --git a/kdm-theme/joy/background.svg b/kdm/joy/background.svg similarity index 100% rename from kdm-theme/joy/background.svg rename to kdm/joy/background.svg diff --git a/kdm-theme/joy/joy.xml b/kdm/joy/joy.xml similarity index 100% rename from kdm-theme/joy/joy.xml rename to kdm/joy/joy.xml diff --git a/kdm-theme/joy/lineedit_active.png b/kdm/joy/lineedit_active.png similarity index 100% rename from kdm-theme/joy/lineedit_active.png rename to kdm/joy/lineedit_active.png diff --git a/kdm-theme/joy/lineedit_normal.png b/kdm/joy/lineedit_normal.png similarity index 100% rename from kdm-theme/joy/lineedit_normal.png rename to kdm/joy/lineedit_normal.png diff --git a/kdm-theme/joy/lock.png b/kdm/joy/lock.png similarity index 100% rename from kdm-theme/joy/lock.png rename to kdm/joy/lock.png diff --git a/kdm-theme/joy/rectangle.png b/kdm/joy/rectangle.png similarity index 100% rename from kdm-theme/joy/rectangle.png rename to kdm/joy/rectangle.png diff --git a/kdm-theme/joy/screenshot.png b/kdm/joy/screenshot.png similarity index 100% rename from kdm-theme/joy/screenshot.png rename to kdm/joy/screenshot.png diff --git a/kdm-theme/joy/session_normal.png b/kdm/joy/session_normal.png similarity index 100% rename from kdm-theme/joy/session_normal.png rename to kdm/joy/session_normal.png diff --git a/kdm-theme/joy/system_normal.png b/kdm/joy/system_normal.png similarity index 100% rename from kdm-theme/joy/system_normal.png rename to kdm/joy/system_normal.png diff --git a/kdm-theme/joy/user_icon.png b/kdm/joy/user_icon.png similarity index 100% rename from kdm-theme/joy/user_icon.png rename to kdm/joy/user_icon.png diff --git a/kdm-theme/kdm.d/10_desktop-base b/kdm/kdm.d/10_desktop-base similarity index 100% rename from kdm-theme/kdm.d/10_desktop-base rename to kdm/kdm.d/10_desktop-base diff --git a/ksplash-theme/joy/1024x768/background.png b/ksplash/joy/1024x768/background.png similarity index 100% rename from ksplash-theme/joy/1024x768/background.png rename to ksplash/joy/1024x768/background.png diff --git a/ksplash-theme/joy/1280x1024/background.png b/ksplash/joy/1280x1024/background.png similarity index 100% rename from ksplash-theme/joy/1280x1024/background.png rename to ksplash/joy/1280x1024/background.png diff --git a/ksplash-theme/joy/1280x800/background.png b/ksplash/joy/1280x800/background.png similarity index 100% rename from ksplash-theme/joy/1280x800/background.png rename to ksplash/joy/1280x800/background.png diff --git a/ksplash-theme/joy/1366x768/background.png b/ksplash/joy/1366x768/background.png similarity index 100% rename from ksplash-theme/joy/1366x768/background.png rename to ksplash/joy/1366x768/background.png diff --git a/ksplash-theme/joy/1600x1200/background.png b/ksplash/joy/1600x1200/background.png similarity index 100% rename from ksplash-theme/joy/1600x1200/background.png rename to ksplash/joy/1600x1200/background.png diff --git a/ksplash-theme/joy/1600x1200/description.txt b/ksplash/joy/1600x1200/description.txt similarity index 100% rename from ksplash-theme/joy/1600x1200/description.txt rename to ksplash/joy/1600x1200/description.txt diff --git a/ksplash-theme/joy/1600x1200/icon1.png b/ksplash/joy/1600x1200/icon1.png similarity index 100% rename from ksplash-theme/joy/1600x1200/icon1.png rename to ksplash/joy/1600x1200/icon1.png diff --git a/ksplash-theme/joy/1600x1200/icon1_anim.png b/ksplash/joy/1600x1200/icon1_anim.png similarity index 100% rename from ksplash-theme/joy/1600x1200/icon1_anim.png rename to ksplash/joy/1600x1200/icon1_anim.png diff --git a/ksplash-theme/joy/1600x1200/icon2.png b/ksplash/joy/1600x1200/icon2.png similarity index 100% rename from ksplash-theme/joy/1600x1200/icon2.png rename to ksplash/joy/1600x1200/icon2.png diff --git a/ksplash-theme/joy/1600x1200/icon2_anim.png b/ksplash/joy/1600x1200/icon2_anim.png similarity index 100% rename from ksplash-theme/joy/1600x1200/icon2_anim.png rename to ksplash/joy/1600x1200/icon2_anim.png diff --git a/ksplash-theme/joy/1600x1200/icon3.png b/ksplash/joy/1600x1200/icon3.png similarity index 100% rename from ksplash-theme/joy/1600x1200/icon3.png rename to ksplash/joy/1600x1200/icon3.png diff --git a/ksplash-theme/joy/1600x1200/icon3_anim.png b/ksplash/joy/1600x1200/icon3_anim.png similarity index 100% rename from ksplash-theme/joy/1600x1200/icon3_anim.png rename to ksplash/joy/1600x1200/icon3_anim.png diff --git a/ksplash-theme/joy/1600x1200/icon4.png b/ksplash/joy/1600x1200/icon4.png similarity index 100% rename from ksplash-theme/joy/1600x1200/icon4.png rename to ksplash/joy/1600x1200/icon4.png diff --git a/ksplash-theme/joy/1600x1200/icon4_anim.png b/ksplash/joy/1600x1200/icon4_anim.png similarity index 100% rename from ksplash-theme/joy/1600x1200/icon4_anim.png rename to ksplash/joy/1600x1200/icon4_anim.png diff --git a/ksplash-theme/joy/1600x1200/icon5.png b/ksplash/joy/1600x1200/icon5.png similarity index 100% rename from ksplash-theme/joy/1600x1200/icon5.png rename to ksplash/joy/1600x1200/icon5.png diff --git a/ksplash-theme/joy/1600x1200/icon5_anim.png b/ksplash/joy/1600x1200/icon5_anim.png similarity index 100% rename from ksplash-theme/joy/1600x1200/icon5_anim.png rename to ksplash/joy/1600x1200/icon5_anim.png diff --git a/ksplash-theme/joy/1600x1200/rectangle.png b/ksplash/joy/1600x1200/rectangle.png similarity index 100% rename from ksplash-theme/joy/1600x1200/rectangle.png rename to ksplash/joy/1600x1200/rectangle.png diff --git a/ksplash-theme/joy/1920x1080/background.png b/ksplash/joy/1920x1080/background.png similarity index 100% rename from ksplash-theme/joy/1920x1080/background.png rename to ksplash/joy/1920x1080/background.png diff --git a/ksplash-theme/joy/1920x1200/background.png b/ksplash/joy/1920x1200/background.png similarity index 100% rename from ksplash-theme/joy/1920x1200/background.png rename to ksplash/joy/1920x1200/background.png diff --git a/ksplash-theme/joy/Preview.png b/ksplash/joy/Preview.png similarity index 100% rename from ksplash-theme/joy/Preview.png rename to ksplash/joy/Preview.png diff --git a/ksplash-theme/joy/Theme.rc b/ksplash/joy/Theme.rc similarity index 100% rename from ksplash-theme/joy/Theme.rc rename to ksplash/joy/Theme.rc