[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: [debian-edu-commits] r80669 - in branches/wheezy/debian-edu-artwork: art/kde debian



Hi,

On Freitag, 14. Juni 2013, schweer-guest@alioth.debian.org wrote:
> Author: schweer-guest
> Date: 2013-06-14 16:00:27 +0000 (Fri, 14 Jun 2013)
> New Revision: 80669
> 
> Modified:
>    branches/wheezy/debian-edu-artwork/art/kde/Makefile.am
>    branches/wheezy/debian-edu-artwork/debian/changelog
>    branches/wheezy/debian-edu-artwork/debian/debian-edu-artwork.links
> Log:
> * Store wallpaper image files in /usr/share/wallpapers/Debian-Edu and
>   link /usr/share/kde4/apps/ksplash/Themes/Debian-Edu to it.

this doesnt work, we need to link the images inside the dir:

$ ls debian/debian-edu-artwork/usr/share/wallpapers/
debian-edu-wallpaper01_1600x1200.png  debian-edu-wallpaper01_1920x1200.svg  debian-edu-wallpaper02_1920x1200.png
debian-edu-wallpaper01_1600x1200.svg  debian-edu-wallpaper02_1600x1200.png  debian-edu-wallpaper02_1920x1200.svg
debian-edu-wallpaper01_1920x1080.png  debian-edu-wallpaper02_1600x1200.svg  debian-edu-wallpaper.png.desktop
debian-edu-wallpaper01_1920x1080.svg  debian-edu-wallpaper02_1920x1080.png
debian-edu-wallpaper01_1920x1200.png  debian-edu-wallpaper02_1920x1080.svg

$ ls debian/debian-edu-artwork/usr/share/kde4/apps/ksplash/Themes/Debian-Edu/
1600x1200  Preview.png  Theme.rc


> Modified:
> branches/wheezy/debian-edu-artwork/debian/debian-edu-artwork.links
> +/usr/share/wallpapers/Debian-Edu
> /usr/share/kde4/apps/ksplash/Themes/Debian-Edu

this fails to build, try it. Actually, please always build the package before committing changes... 

Anyway, this is because dh_link can only link files, but no directories.

So I removed it and tried this in debian/rules instead:

binary-install/debian-edu-artwork::
        cd debian/debian-edu-artwork/usr/share/gconf/defaults && \
                mv 50_debian-edu-artwork 50_debian-edu-artwork.entries 
        cd debian/debian-edu-artwork/usr/share/kde4/apps/ksplash/Themes/ && ln -s ../../../../wallpapers/Debian-Edu usr/share/kde4/apps/ksplash/Themes/

(The second line is new...)

This however leads to the problem described at the top of this email...


cheers,
	Holger

Attachment: signature.asc
Description: This is a digitally signed message part.


Reply to: