Merge branch 'master' of git://git.mageia.org/software/desktop/kde/config

23 files changed, 32 insertions, 50 deletions

diff --git a/Makefile b/Makefile
index 23f7b7a..66865d5 100644
--- a/Makefile
+++ b/Makefile
@@ -19,3 +19,6 @@ localdist: tar
 tar: localcopy
 	tar cfa $(PACKAGE)-$(PKGVERSION).$(DATE).tar.xz $(PACKAGE)-$(PKGVERSION)
 	rm -rf $(PACKAGE)-$(PKGVERSION)
+	
+export:
+	git archive --prefix $(PACKAGE)-$(PKGVERSION)/ HEAD | xz -9 > $(PACKAGE)-$(PKGVERSION).$(DATE).tar.xz
diff --git a/kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/background.png b/kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/background.png
deleted file mode 100755
index 53525f9..0000000
--- a/kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/background.png
+++ /dev/null
diff --git a/kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/description.txt b/kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/description.txt
deleted file mode 100644
index e5667f3..0000000
--- a/kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/description.txt
+++ /dev/null
@@ -1,49 +0,0 @@
-# rev. 3.2
-
-SCALE ON
-BACKGROUND_IMAGE 0 0 background.png
-SCALE OFF
-
-#logo is centered
-
-IMAGE_REL CC -100 130 CC logo.png
-
-
-#ANIM_REL 1 CB -300 0 LB 30 icon1_anim.png 85 1
-#WAIT_STATE kded
-IMAGE_REL CC -347 35 CC bubble1.png
-WAIT_STATE kded
-
-#ANIM_REL 2 CB -215 0 LB 30 icon2_anim.png 85 1
-#WAIT_STATE kcminit
-IMAGE_REL CC -347 35 CC bubble2.png
-WAIT_STATE kcminit
-
-#ANIM_REL 3 CB -130 0 LB 30 icon3_anim.png 85 1
-#WAIT_STATE ksmserver
-IMAGE_REL CC -347 35 CC bubble3.png
-WAIT_STATE ksmserver
-
-#ANIM_REL 4 CB -45 0 LB 30 icon4_anim.png 85 1
-#WAIT_STATE wm
-IMAGE_REL CC -347 35 CC bubble4.png
-WAIT_STATE wm
-
-#ANIM_REL 5 CB 60 0 LB 30 icon5_anim.png 85 1
-#WAIT_STATE desktop
-IMAGE_REL CC -347 35 CC bubble5.png
-WAIT_STATE desktop
-
-WAIT_STATE ready
-
-# show the icons fully right before the splash goes away
-#STOP_ANIM 1
-#IMAGE_REL CB -300 0 LB icon1.png
-#STOP_ANIM 2
-#IMAGE_REL CB -215 0 LB icon2.png
-#STOP_ANIM 3
-#IMAGE_REL CB -130 0 LB icon3.png
-#STOP_ANIM 4
-#IMAGE_REL CB -45 0 LB icon4.png
-#STOP_ANIM 5
-#IMAGE_REL CB 60 0 LB icon5.png
diff --git a/kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/icon1.png b/kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/icon1.png
deleted file mode 100644
index 93daa84..0000000
--- a/kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/icon1.png
+++ /dev/null
diff --git a/kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/icon1_anim.png b/kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/icon1_anim.png
deleted file mode 100644
index 3b065f5..0000000
--- a/kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/icon1_anim.png
+++ /dev/null
diff --git a/kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/icon2.png b/kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/icon2.png
deleted file mode 100644
index 2078ad1..0000000
--- a/kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/icon2.png
+++ /dev/null
diff --git a/kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/icon2_anim.png b/kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/icon2_anim.png
deleted file mode 100644
index 36f1afc..0000000
--- a/kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/icon2_anim.png
+++ /dev/null
diff --git a/kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/icon3.png b/kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/icon3.png
deleted file mode 100644
index 48b2ffe..0000000
--- a/kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/icon3.png
+++ /dev/null
diff --git a/kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/icon3_anim.png b/kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/icon3_anim.png
deleted file mode 100644
index 28bb493..0000000
--- a/kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/icon3_anim.png
+++ /dev/null
diff --git a/kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/icon4.png b/kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/icon4.png
deleted file mode 100644
index 15699e2..0000000
--- a/kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/icon4.png
+++ /dev/null
diff --git a/kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/icon4_anim.png b/kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/icon4_anim.png
deleted file mode 100644
index 9309db5..0000000
--- a/kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/icon4_anim.png
+++ /dev/null
diff --git a/kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/icon5.png b/kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/icon5.png
deleted file mode 100644
index 4540cb3..0000000
--- a/kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/icon5.png
+++ /dev/null
diff --git a/kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/icon5_anim.png b/kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/icon5_anim.png
deleted file mode 100644
index de690c1..0000000
--- a/kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/icon5_anim.png
+++ /dev/null
diff --git a/kde4-profiles/common/share/apps/ksplash/Themes/Default/2560x1920/background.png b/kde4-profiles/common/share/apps/ksplash/Themes/Default/2560x1920/background.png
new file mode 100755
index 0000000..dec22f6
--- /dev/null
+++ b/kde4-profiles/common/share/apps/ksplash/Themes/Default/2560x1920/background.png
diff --git a/kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/bubble1.png b/kde4-profiles/common/share/apps/ksplash/Themes/Default/2560x1920/bubble1.png
index 84c6888..84c6888 100755
--- a/kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/bubble1.png
+++ b/kde4-profiles/common/share/apps/ksplash/Themes/Default/2560x1920/bubble1.png
diff --git a/kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/bubble2.png b/kde4-profiles/common/share/apps/ksplash/Themes/Default/2560x1920/bubble2.png
index 4a661ab..4a661ab 100755
--- a/kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/bubble2.png
+++ b/kde4-profiles/common/share/apps/ksplash/Themes/Default/2560x1920/bubble2.png
diff --git a/kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/bubble3.png b/kde4-profiles/common/share/apps/ksplash/Themes/Default/2560x1920/bubble3.png
index d34a20a..d34a20a 100755
--- a/kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/bubble3.png
+++ b/kde4-profiles/common/share/apps/ksplash/Themes/Default/2560x1920/bubble3.png
diff --git a/kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/bubble4.png b/kde4-profiles/common/share/apps/ksplash/Themes/Default/2560x1920/bubble4.png
index f93046d..f93046d 100755
--- a/kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/bubble4.png
+++ b/kde4-profiles/common/share/apps/ksplash/Themes/Default/2560x1920/bubble4.png
diff --git a/kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/bubble5.png b/kde4-profiles/common/share/apps/ksplash/Themes/Default/2560x1920/bubble5.png
index 1549e65..1549e65 100755
--- a/kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/bubble5.png
+++ b/kde4-profiles/common/share/apps/ksplash/Themes/Default/2560x1920/bubble5.png
diff --git a/kde4-profiles/common/share/apps/ksplash/Themes/Default/2560x1920/description.txt b/kde4-profiles/common/share/apps/ksplash/Themes/Default/2560x1920/description.txt
new file mode 100644
index 0000000..2d72e3f
--- /dev/null
+++ b/kde4-profiles/common/share/apps/ksplash/Themes/Default/2560x1920/description.txt
@@ -0,0 +1,28 @@
+# rev. 4.2
+
+SCALE ON
+BACKGROUND_IMAGE 0 0 background.png
+SCALE OFF
+
+#logo is centered
+
+IMAGE_REL CC -100 10 CC logo.png
+
+
+
+IMAGE_REL CC -347 -85 CC bubble1.png
+WAIT_STATE kded
+
+IMAGE_REL CC -347 -85 CC bubble2.png
+WAIT_STATE kcminit
+
+IMAGE_REL CC -347 -85 CC bubble3.png
+WAIT_STATE ksmserver
+
+IMAGE_REL CC -347 -85 CC bubble4.png
+WAIT_STATE wm
+
+IMAGE_REL CC -347 -85 CC bubble5.png
+WAIT_STATE desktop
+
+WAIT_STATE ready
diff --git a/kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/logo.png b/kde4-profiles/common/share/apps/ksplash/Themes/Default/2560x1920/logo.png
index dce2b6a..dce2b6a 100755
--- a/kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/logo.png
+++ b/kde4-profiles/common/share/apps/ksplash/Themes/Default/2560x1920/logo.png
diff --git a/kde4-profiles/common/share/apps/ksplash/Themes/Default/Preview.png b/kde4-profiles/common/share/apps/ksplash/Themes/Default/Preview.png
index b1104f9..b932b69 100755
--- a/kde4-profiles/common/share/apps/ksplash/Themes/Default/Preview.png
+++ b/kde4-profiles/common/share/apps/ksplash/Themes/Default/Preview.png
diff --git a/kde4-profiles/common/share/apps/ksplash/Themes/Default/Theme.rc b/kde4-profiles/common/share/apps/ksplash/Themes/Default/Theme.rc
index d2d6f9f..fd9ab88 100644
--- a/kde4-profiles/common/share/apps/ksplash/Themes/Default/Theme.rc
+++ b/kde4-profiles/common/share/apps/ksplash/Themes/Default/Theme.rc
@@ -1,7 +1,7 @@
 [KSplash Theme: Default]
 Name = Mageia Splash Screen
 Description = Mageia Splash Screen using KSplashX
-Version = 3.2
+Version = 4.1
 Author = Mageia Atelier Team
 Homepage = http://www.mageia.org