initchroot: include newer xorg driver and reinstate font overriding

This changes the DPI back to 200, which means we need to adjust font sizes.
It also fixes randr and scaling.

Signed-off-by: Andres Salomon <dilinger@debian.org>

diff --git a/%gconf-tree.xml b/%gconf-tree.xml
index 5ac9188a870a339fefc90e1f50dbe9bfbe3ec567..99a98d99481947b03137f04aa02f9bbacc0d4d8f 100644 (file)
--- a/%gconf-tree.xml
+++ b/%gconf-tree.xml
@@ -7,6 +7,17 @@
                                        <stringvalue>/usr/share/pixmaps/backgrounds/gnome/nature/FreshFlower.jpg</stringvalue>
                                </entry>
                        </dir>
+                       <dir name="interface">
+                               <entry name="monospace_font_name" type="string">
+                                       <stringvalue>Monospace 8</stringvalue>
+                               </entry>
+                               <entry name="document_font_name" type="string">
+                                       <stringvalue>Sans 8</stringvalue>
+                               </entry>
+                               <entry name="font_name" type="string">
+                                       <stringvalue>Sans 8</stringvalue>
+                               </entry>
+                       </dir>
                </dir>
        </dir>
        <dir name="apps">
@@ -14,5 +25,33 @@
                        <entry name="sudo-mode" type="bool" value="true">
                        </entry>
                </dir>
+               <dir name="metacity">
+                       <dir name="general">
+                               <entry name="titlebar_font" type="string">
+                                       <stringvalue>Sans Bold 8</stringvalue>
+                               </entry>
+                       </dir>
+               </dir>
+               <dir name="nautilus">
+                       <dir name="preferences">
+                               <entry name="desktop_font" type="string">
+                                       <stringvalue>Sans 8</stringvalue>
+                               </entry>
+                       </dir>
+               </dir>
+               <dir name="epiphany">
+                       <dir name="web">
+                               <entry name="variable_font_size_x-western" type="int" value="8">
+                               </entry>
+                               <entry name="fixed_font_size_x-western" type="int" value="8">
+                               </entry>
+                               <entry name="minimum_font_size_x-western" type="int" value="8">
+                               </entry>
+                               <entry name="minimum_font_size" type="int" value="8">
+                               </entry>
+                               <entry name="use_own_fonts" type="bool" value="true">
+                               </entry>
+                       </dir>
+               </dir>
        </dir>
 </gconf>

diff --git a/initchroot.sh b/initchroot.sh
index bb273401c5ffafed8a92417330fa64df1846c16c..d7565c7b1cdd40edd57e7d89ab9c7ff657ab978e 100755 (executable)
--- a/initchroot.sh
+++ b/initchroot.sh
@@ -150,7 +150,7 @@ echo "en_US.UTF-8 UTF-8" >${ROOT_DIR}/etc/locale.gen
 k="http://lunge.mit.edu/~dilinger/debxo-0.2/initramfs-tools_0.92l.2_all.deb 
  http://lunge.mit.edu/~dilinger/debxo-0.2/ofw-config_0.1_all.deb 
  http://lunge.mit.edu/~dilinger/debxo-0.4/linux-2.6.25.15_2.6.25.15-165_i386.deb 
- http://lunge.mit.edu/~dilinger/debxo-0.4/xserver-xorg-video-geode_2.11.0-0.1_i386.deb"
+ http://lunge.mit.edu/~dilinger/debxo-0.4/xserver-xorg-video-geode_2.11.0-0.2_i386.deb"
 mkdir -p cache
 for i in $k; do
        pkg=$(basename ${i})