kernel 3.0, LO 3.4, FF 6, gfxoverlay-xorg.conf

4 files changed, 66 insertions, 64 deletions

diff --git a/auto/config b/auto/config
index 85afe8b..d21e7aa 100755
--- a/auto/config
+++ b/auto/config
@@ -53,14 +53,14 @@ case $LB_ARCHITECTURE in
 "amd64")
   lb config noauto \
         --linux-flavours generic \
-        --linux-packages "linux-image linux-headers"
+        --linux-packages "linux-image-3.0.0-11 linux-headers-3.0.0-11"
         #--linux-flavours amd64 \
         #--linux-packages "linux-image-2.6 linux-headers-2.6"
 	;;
 "i386")
   lb config noauto \
         --linux-flavours generic \
-        --linux-packages "linux-image linux-headers"
+        --linux-packages "linux-image-3.0.0-11 linux-headers-3.0.0-11"
         #--linux-flavours 686-bigmem \
         #--linux-packages "linux-image-2.6 linux-headers-2.6"
 	;;
diff --git a/build_gfxoverlay.sh b/build_gfxoverlay.sh
index a494fbc..ef332b7 100755
--- a/build_gfxoverlay.sh
+++ b/build_gfxoverlay.sh
@@ -82,6 +82,8 @@ if [ -z "$(find overlay/ -name '*.ko')" ]; then
 fi
 cd overlay
 rm -rf usr/sbin/update-initramfs etc/resolv.conf usr/src/NVIDIA-Linux* usr/src/ati-driver-installer* overlay.sh tmp var/log .??*
+rm -f etc/X11/xorg.conf.1st
+printf 'Section "Device"\n    Identifier     "Device0"\n    Driver         "'"$drv"'"\nEndSection\n' > etc/X11/xorg.conf
 cd ..
 mv overlay "overlay$bit-$drv-$ver"
 
diff --git a/config/lists/office b/config/lists/office
index 7d458a1..8f0b095 100644
--- a/config/lists/office
+++ b/config/lists/office
@@ -1,62 +1,62 @@
 # Libre Office
-libobasis3.3-base
-libobasis3.3-binfilter
-libobasis3.3-calc
-libobasis3.3-core01
-libobasis3.3-core02
-libobasis3.3-core03
-libobasis3.3-core04
-libobasis3.3-core05
-libobasis3.3-core06
-libobasis3.3-core07
-libobasis3.3-de
-libobasis3.3-de-base
-libobasis3.3-de-binfilter
-libobasis3.3-de-calc
-libobasis3.3-de-help
-libobasis3.3-de-math
-libobasis3.3-de-res
-libobasis3.3-de-writer
-libobasis3.3-draw
-libobasis3.3-en-us
-libobasis3.3-en-us-base
-libobasis3.3-en-us-binfilter
-libobasis3.3-en-us-calc
-libobasis3.3-en-us-math
-libobasis3.3-en-us-res
-libobasis3.3-en-us-writer
-libobasis3.3-extension-mediawiki-publisher
-libobasis3.3-extension-nlpsolver
-libobasis3.3-extension-pdf-import
-libobasis3.3-extension-presentation-minimizer
-libobasis3.3-extension-presenter-screen
-libobasis3.3-extension-report-builder
-libobasis3.3-gnome-integration
-libobasis3.3-graphicfilter
-libobasis3.3-images
-libobasis3.3-impress
-libobasis3.3-javafilter
-libobasis3.3-kde-integration
-libobasis3.3-math
-libobasis3.3-ogltrans
-libobasis3.3-ooofonts
-libobasis3.3-ooolinguistic
-libobasis3.3-pyuno
-libobasis3.3-testtool
-libobasis3.3-writer
-libobasis3.3-xsltfilter
-libreoffice3
-libreoffice3-base
-libreoffice3-calc
-libreoffice3-de
-libreoffice3-dict-de-de
-libreoffice3-dict-en
-libreoffice3-dict-es
-libreoffice3-dict-fr
-libreoffice3-draw
-libreoffice3-en-us
-libreoffice3-impress
-libreoffice3-math
-libreoffice3-ure
-libreoffice3-writer
+libobasis3.4-base
+libobasis3.4-binfilter
+libobasis3.4-calc
+libobasis3.4-core01
+libobasis3.4-core02
+libobasis3.4-core03
+libobasis3.4-core04
+libobasis3.4-core05
+libobasis3.4-core06
+libobasis3.4-core07
+libobasis3.4-de
+libobasis3.4-de-base
+libobasis3.4-de-binfilter
+libobasis3.4-de-calc
+libobasis3.4-de-help
+libobasis3.4-de-math
+libobasis3.4-de-res
+libobasis3.4-de-writer
+libobasis3.4-draw
+libobasis3.4-en-us
+libobasis3.4-en-us-base
+libobasis3.4-en-us-binfilter
+libobasis3.4-en-us-calc
+libobasis3.4-en-us-math
+libobasis3.4-en-us-res
+libobasis3.4-en-us-writer
+libobasis3.4-extension-mediawiki-publisher
+libobasis3.4-extension-nlpsolver
+libobasis3.4-extension-pdf-import
+libobasis3.4-extension-presentation-minimizer
+libobasis3.4-extension-presenter-screen
+libobasis3.4-extension-report-builder
+libobasis3.4-gnome-integration
+libobasis3.4-graphicfilter
+libobasis3.4-images
+libobasis3.4-impress
+libobasis3.4-javafilter
+libobasis3.4-kde-integration
+libobasis3.4-math
+libobasis3.4-ogltrans
+libobasis3.4-ooofonts
+libobasis3.4-ooolinguistic
+libobasis3.4-pyuno
+libobasis3.4-testtool
+libobasis3.4-writer
+libobasis3.4-xsltfilter
+libreoffice3.4
+libreoffice3.4-base
+libreoffice3.4-calc
+libreoffice3.4-de
+libreoffice3.4-dict-de-de
+libreoffice3.4-dict-en
+libreoffice3.4-dict-es
+libreoffice3.4-dict-fr
+libreoffice3.4-draw
+libreoffice3.4-en-us
+libreoffice3.4-impress
+libreoffice3.4-math
+libreoffice3.4-ure
+libreoffice3.4-writer
 libreoffice-debian-menus
diff --git a/config/repositories/firefox b/config/repositories/firefox
index 21152b7..7c2328f 100644
--- a/config/repositories/firefox
+++ b/config/repositories/firefox
@@ -1,2 +1,2 @@
-# Firefox 4
-deb http://mozilla.debian.net/ squeeze-backports iceweasel-4.0
+# Firefox
+deb http://mozilla.debian.net/ squeeze-backports iceweasel-release