[Debian-live-changes] r1055 - in dists/trunk/live-helper: . doc examples

[Daniel Baumann]

Author: daniel
Date: 2007-04-13 08:47:00 +0000 (Fri, 13 Apr 2007)
New Revision: 1055

Added:
   dists/trunk/live-helper/examples/
   dists/trunk/live-helper/examples/beryl-hook.sh
Removed:
   dists/trunk/live-helper/doc/examples/
   dists/trunk/live-helper/examples/beryl-hook.sh
Modified:
   dists/trunk/live-helper/Makefile
Log:


Modified: dists/trunk/live-helper/Makefile
===================================================================
--- dists/trunk/live-helper/Makefile	2007-04-13 07:40:37 UTC (rev 1054)
+++ dists/trunk/live-helper/Makefile	2007-04-13 08:47:00 UTC (rev 1055)
@@ -9,7 +9,7 @@
 
 	# Installing shared data
 	mkdir -p $(DESTDIR)/usr/share/live-helper
-	cp -r functions hooks includes lists templates $(DESTDIR)/usr/share/live-helper
+	cp -r examples functions hooks includes lists templates $(DESTDIR)/usr/share/live-helper
 
 	# Installing documentation
 	mkdir -p $(DESTDIR)/usr/share/doc/live-helper

Copied: dists/trunk/live-helper/examples (from rev 1053, dists/trunk/live-helper/doc/examples)

Deleted: dists/trunk/live-helper/examples/beryl-hook.sh
===================================================================
--- dists/trunk/live-helper/doc/examples/beryl-hook.sh	2007-04-13 07:31:46 UTC (rev 1053)
+++ dists/trunk/live-helper/examples/beryl-hook.sh	2007-04-13 08:47:00 UTC (rev 1055)
@@ -1,60 +0,0 @@
-#!/bin/sh
-
-# This is a hook for live-helper(7) to install beryl and enable aixgl.
-# It was originally written by Inigo Tejedor Arrondo <inigo at navarrux.org>.
-#
-# To enable it, copy this hook into your config/chroot_localhooks directory.
-# At boot prompt, type 'linux aixgl', press enter and have fun.
-
-# Update sources.list
-cat >> /etc/apt/sources.list << EOF
-# beryl-project
-deb http://debian.beryl-project.org/ etch main
-EOF
-
-if grep deb-src /etc/apt/sources.list
-then
-	echo "deb-src http://debian.beryl-project.org/ etch main" >> /etc/apt/sources.list
-fi
-
-# Import archive signing key
-wget -O - http://debian.beryl-project.org/root@lupine.me.uk.gpg | apt-key add -
-
-# Update indices
-apt-get update
-
-# Install packages
-PACKAGES="beryl beryl-core beryl-manager beryl-plugins beryl-plugins-unsupported beryl-settings beryl-settings-bindings beryl-settings-simple"
-
-if [ -f /usr/bin/gnome-session ]
-then
-	PACKAGES="${PACKAGES} emerald emerald-themes heliodor"
-fi
-
-if [ -f /usr/bin/kstart ]
-then
-	PACKAGES="${PACKAGES} aquamarine"
-fi
-
-apt-get install --yes ${PACKAGES}
-
-# Add init script
-cat > /etc/init.d/aixgl << EOF
-#!/bin/sh
-
-if cat /proc/cmdline | grep aixgl > /dev/null
-then
-	echo "Configuring xorg for aixgl..."
-
-	echo "" >> /etc/X11/xorg.conf
-	echo "# Added by beryl-hook.sh" >> /etc/X11/xorg.conf
-	echo "Section \"Extensions\"" >> /etc/X11/xorg.conf
-	echo " Option \"Composite\" \"Enable\"" >> /etc/X11/xorg.conf
-	echo "EndSection" >> /etc/X11/xorg.conf
-
-	sed -i -e "s/Section \"Device\""/"Section \"Device\"\n\t Option \"XAANoOffscreenPixmaps\" \"true\"\n\t Option \"AddARGBGLXVisuals\" \"on\"\n\t Option \"AllowGLXWithComposite\" \"true\"/" -e "s/Section \"Module\""/"Section \"Module\"\n\t Load \"i2c\"\n\t Load \"int10\"\n\t Load \"xtrap\"\n\t Load \"vbe\"/" /etc/X11/xorg.conf
-fi
-EOF
-
-chmod 0755 /etc/init.d/aixgl
-update-rc.d aixgl defaults

Copied: dists/trunk/live-helper/examples/beryl-hook.sh (from rev 1054, dists/trunk/live-helper/doc/examples/beryl-hook.sh)