[SCM] kde-sc/kde-wallpapers packaging branch, master, updated. 4f2541c11416bd48966641b1f03bb468c1f974b6

[Pino Toscano]

The following commit has been merged in the master branch:
commit 4f2541c11416bd48966641b1f03bb468c1f974b6
Author: Pino Toscano <pino at debian.org>
Date:   Tue Nov 29 17:24:28 2011 +0100

    solve the default wallpaper installation
    
    install everything in the kde-wallpapers directory, and then move the default wallpaper to the kde-wallpapers-default directory (created with dh_installdirs)
    
    this way, changing the default wallpaper is just matter of editing the KDE_DEFAULT_WALLPAPER var in d/rules (taking care of adding proper breaks/replaces)
---
 debian/kde-wallpapers-default.dirs    |    1 +
 debian/kde-wallpapers-default.install |    1 -
 debian/kde-wallpapers.install         |   90 ---------------------------------
 debian/rules                          |    9 +++
 4 files changed, 10 insertions(+), 91 deletions(-)

diff --git a/debian/kde-wallpapers-default.dirs b/debian/kde-wallpapers-default.dirs
new file mode 100644
index 0000000..bf318a7
--- /dev/null
+++ b/debian/kde-wallpapers-default.dirs
@@ -0,0 +1 @@
+usr/share/wallpapers/
diff --git a/debian/kde-wallpapers-default.install b/debian/kde-wallpapers-default.install
deleted file mode 100644
index 3e8fd0b..0000000
--- a/debian/kde-wallpapers-default.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/wallpapers/Horos/
diff --git a/debian/kde-wallpapers.install b/debian/kde-wallpapers.install
deleted file mode 100644
index df8f824..0000000
--- a/debian/kde-wallpapers.install
+++ /dev/null
@@ -1,90 +0,0 @@
-usr/share/wallpapers/Aghi/contents/images/1024x768.jpg
-usr/share/wallpapers/Aghi/contents/images/1280x1024.jpg
-usr/share/wallpapers/Aghi/contents/images/1280x800.jpg
-usr/share/wallpapers/Aghi/contents/images/1440x900.jpg
-usr/share/wallpapers/Aghi/contents/images/1600x1200.jpg
-usr/share/wallpapers/Aghi/contents/images/1920x1080.jpg
-usr/share/wallpapers/Aghi/contents/images/1920x1200.jpg
-usr/share/wallpapers/Aghi/contents/images/800x600.jpg
-usr/share/wallpapers/Aghi/contents/screenshot.jpg
-usr/share/wallpapers/Aghi/metadata.desktop
-usr/share/wallpapers/Air/contents/images/1280x1024.jpg
-usr/share/wallpapers/Air/contents/images/1600x1200.jpg
-usr/share/wallpapers/Air/contents/images/1920x1080.jpg
-usr/share/wallpapers/Air/contents/images/1920x1200.jpg
-usr/share/wallpapers/Air/contents/screenshot.png
-usr/share/wallpapers/Air/metadata.desktop
-usr/share/wallpapers/Autumn/contents/images/1280x1024.jpg
-usr/share/wallpapers/Autumn/contents/images/1600x1200.jpg
-usr/share/wallpapers/Autumn/contents/images/1920x1080.jpg
-usr/share/wallpapers/Autumn/contents/images/1920x1200.jpg
-usr/share/wallpapers/Autumn/contents/screenshot.png
-usr/share/wallpapers/Autumn/metadata.desktop
-usr/share/wallpapers/Blue_Wood/contents/images/1280x1024.jpg
-usr/share/wallpapers/Blue_Wood/contents/images/1600x1200.jpg
-usr/share/wallpapers/Blue_Wood/contents/images/1920x1080.jpg
-usr/share/wallpapers/Blue_Wood/contents/images/1920x1200.jpg
-usr/share/wallpapers/Blue_Wood/contents/screenshot.png
-usr/share/wallpapers/Blue_Wood/metadata.desktop
-usr/share/wallpapers/Evening/contents/images/1280x1024.jpg
-usr/share/wallpapers/Evening/contents/images/1600x1200.jpg
-usr/share/wallpapers/Evening/contents/images/1920x1080.jpg
-usr/share/wallpapers/Evening/contents/images/1920x1200.jpg
-usr/share/wallpapers/Evening/contents/screnshot.jpg
-usr/share/wallpapers/Evening/metadata.desktop
-usr/share/wallpapers/Fields_of_Peace/contents/images/1280x1024.JPG
-usr/share/wallpapers/Fields_of_Peace/contents/images/1600x1200.JPG
-usr/share/wallpapers/Fields_of_Peace/contents/images/1920x1200.JPG
-usr/share/wallpapers/Fields_of_Peace/contents/screenshot.png
-usr/share/wallpapers/Fields_of_Peace/metadata.desktop
-usr/share/wallpapers/Finally_Summer_in_Germany/contents/images/1280x1024.jpg
-usr/share/wallpapers/Finally_Summer_in_Germany/contents/images/1600x1200.jpg
-usr/share/wallpapers/Finally_Summer_in_Germany/contents/images/1920x1200.jpg
-usr/share/wallpapers/Finally_Summer_in_Germany/contents/screenshot.png
-usr/share/wallpapers/Finally_Summer_in_Germany/metadata.desktop
-usr/share/wallpapers/Fresh_Morning/contents/images/1280x1024.jpg
-usr/share/wallpapers/Fresh_Morning/contents/images/1600x1200.jpg
-usr/share/wallpapers/Fresh_Morning/contents/images/1920x1200.jpg
-usr/share/wallpapers/Fresh_Morning/contents/screenshot.png
-usr/share/wallpapers/Fresh_Morning/metadata.desktop
-usr/share/wallpapers/Grass/contents/images/1280x1024.jpg
-usr/share/wallpapers/Grass/contents/images/1600x1200.jpg
-usr/share/wallpapers/Grass/contents/images/1920x1080.jpg
-usr/share/wallpapers/Grass/contents/images/1920x1200.jpg
-usr/share/wallpapers/Grass/contents/screenshot.png
-usr/share/wallpapers/Grass/metadata.desktop
-usr/share/wallpapers/Hanami/contents/images/1280x1024.jpg
-usr/share/wallpapers/Hanami/contents/images/1600x1200.jpg
-usr/share/wallpapers/Hanami/contents/images/1920x1080.jpg
-usr/share/wallpapers/Hanami/contents/images/1920x1200.jpg
-usr/share/wallpapers/Hanami/contents/screenshot.png
-usr/share/wallpapers/Hanami/metadata.desktop
-usr/share/wallpapers/Media_Life/contents/images/1280x1024.jpg
-usr/share/wallpapers/Media_Life/contents/images/1280x800.jpg
-usr/share/wallpapers/Media_Life/contents/images/1440x900.jpg
-usr/share/wallpapers/Media_Life/contents/images/1480x925.jpg
-usr/share/wallpapers/Media_Life/contents/images/1600x1200.jpg
-usr/share/wallpapers/Media_Life/contents/images/1680x1050.jpg
-usr/share/wallpapers/Media_Life/contents/images/1920x1200.jpg
-usr/share/wallpapers/Media_Life/contents/screenshot.png
-usr/share/wallpapers/Media_Life/metadata.desktop
-usr/share/wallpapers/Plasmalicious/contents/images/1280x1024.jpg
-usr/share/wallpapers/Plasmalicious/contents/images/1600x1200.jpg
-usr/share/wallpapers/Plasmalicious/contents/images/1920x1200.jpg
-usr/share/wallpapers/Plasmalicious/contents/screenshot.png
-usr/share/wallpapers/Plasmalicious/metadata.desktop
-usr/share/wallpapers/Quadros/contents/images/1024x768.jpg
-usr/share/wallpapers/Quadros/contents/images/1280x1024.jpg
-usr/share/wallpapers/Quadros/contents/images/1280x800.jpg
-usr/share/wallpapers/Quadros/contents/images/1440x900.jpg
-usr/share/wallpapers/Quadros/contents/images/1600x1200.jpg
-usr/share/wallpapers/Quadros/contents/images/1920x1080.jpg
-usr/share/wallpapers/Quadros/contents/images/1920x1200.jpg
-usr/share/wallpapers/Quadros/contents/images/800x600.jpg
-usr/share/wallpapers/Quadros/contents/screenshot.png
-usr/share/wallpapers/Quadros/metadata.desktop
-usr/share/wallpapers/Red_Leaf/contents/images/1280x1024.jpg
-usr/share/wallpapers/Red_Leaf/contents/images/1600x1200.jpg
-usr/share/wallpapers/Red_Leaf/contents/images/1920x1200.jpg
-usr/share/wallpapers/Red_Leaf/contents/screenshot.png
-usr/share/wallpapers/Red_Leaf/metadata.desktop
diff --git a/debian/rules b/debian/rules
index 6a77e53..e014922 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,3 +1,12 @@
 #!/usr/bin/make -f
 
+KDE_DEFAULT_WALLPAPER := Horos
+
 include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
+
+override_dh_auto_install:
+	$(overridden_command) --destdir=$(CURDIR)/debian/kde-wallpapers/
+
+override_dh_install:
+	mv $(CURDIR)/debian/kde-wallpapers/usr/share/wallpapers/$(KDE_DEFAULT_WALLPAPER)/ \
+	   $(CURDIR)/debian/kde-wallpapers-default/usr/share/wallpapers/

-- 
kde-sc/kde-wallpapers packaging