Author: alexander Date: 2006-06-03 01:34:14 -0600 (Sat, 03 Jun 2006) New Revision: 1572
Added: trunk/packages/xfce/settings/desktop.xml Modified: trunk/packages/xfce/Makefile trunk/scripts/functions Log: Added a branded background image to Xfce (thanks to Jeremy Huntwork). Modified: trunk/packages/xfce/Makefile =================================================================== --- trunk/packages/xfce/Makefile 2006-05-26 02:14:06 UTC (rev 1571) +++ trunk/packages/xfce/Makefile 2006-06-03 07:34:14 UTC (rev 1572) @@ -8,6 +8,10 @@ URL-$(FILE)= http://www.xfce.org/archive/$(DIR)/fat_tarballs/$(FILE) SHA-$(FILE)= d60827c2b0087e11575440ae53f18cb7d225ad7b +BG= lfsrules-1600-1200.jpg +URL-$(BG)= http://www.linuxfromscratch.org/blfs/artwork/wallpapers/$(BG) +SHA-$(BG)= 8f4abcc49ccc37874a1d2bf958ee7db024e21a3a + # Targets include $(ROOT)/scripts/functions @@ -16,7 +20,7 @@ chroot "$(MP)" $(chenv-blfs) \ 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)' -stage2: Makefile $(FILE) +stage2: Makefile $(FILE) $(BG) $(std_build) compile-stage2: @@ -28,15 +32,14 @@ --libexecdir=/usr/sbin --enable-compositor ; \ make $(PM) ; \ make install ; cd .. ; done - # FIXME: maybe copy to /etc/X11/xinit/xinitrc? The default there - # calls xterm and twm, and none of these programs exist on the CD - cp $(ROOT)/root/.xinitrc /root/ + cp $(ROOT)/root/.xinitrc /etc/X11/xinit/xinitrc cp ../desktop-files/* /usr/share/applications rm -f `grep -L 'include type="system"' /etc/xdg/xfce4/desktop/menu.xml*` for f in /etc/xdg/xfce4/panel/contents.xml* ; do ../cleanup-panel.pl $$f ; done sed -i -e '/Xft.dpi/d' /etc/xdg/xfce4/xinitrc mkdir -p /etc/xdg/xfce4/mcs_settings cp ../settings/* /etc/xdg/xfce4/mcs_settings + cp ../$(BG) /usr/share/xfce4/backdrops/ clean: -rm -rf $(DIR) Added: trunk/packages/xfce/settings/desktop.xml =================================================================== --- trunk/packages/xfce/settings/desktop.xml (rev 0) +++ trunk/packages/xfce/settings/desktop.xml 2006-06-03 07:34:14 UTC (rev 1572) @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE mcs-option SYSTEM "mcs-option.dtd"> + +<mcs-option> + <option name="brightness_0_0" type="int" value="0"/> + <option name="color1_0_0" type="color" value=" 7936, 16128, 28416, 65535"/> + <option name="color2_0_0" type="color" value=" 26880, 34048, 46848, 65535"/> + <option name="colorstyle_0_0" type="int" value="1"/> + <option name="imagepath_0_0" type="string" value="/usr/share/xfce4/backdrops/lfsrules-1600-1200.jpg"/> + <option name="imagestyle_0_0" type="int" value="3"/> + <option name="showdm" type="int" value="1"/> + <option name="showdmi" type="int" value="1"/> + <option name="showimage_0_0" type="int" value="1"/> + <option name="showwl" type="int" value="1"/> + <option name="showwli" type="int" value="1"/> +</mcs-option> Modified: trunk/scripts/functions =================================================================== --- trunk/scripts/functions 2006-05-26 02:14:06 UTC (rev 1571) +++ trunk/scripts/functions 2006-06-03 07:34:14 UTC (rev 1572) @@ -57,7 +57,7 @@ @ln -sf $(SRC)/$(1) . endef -%.gz %.tgz %.bz2 %.zip %.patch %.diff %.rules %.ttf: +%.gz %.tgz %.bz2 %.zip %.patch %.diff %.rules %.ttf %.jpg: $(call download,$@,$(URL-$@),$(SHA-$@)) wget-list-entry: -- http://linuxfromscratch.org/mailman/listinfo/livecd FAQ: http://www.linuxfromscratch.org/faq/ Unsubscribe: See the above information page
