From 4093281c66d1a9cdcc6fe521fa8a23a55e532915 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Mon, 29 Oct 2007 17:57:17 -0400
Subject: [PATCH] Import patches-unapplied version 0.43 to ubuntu/hardy

Imported using git-ubuntu import.

Changelog parent: f609db997c96d787a76ee6b7f38bda790ebb13d7

New changelog entries:
  * Add Gobuntu support.
---
 .bzr/branch/revision-history                  |   4 +++-
 .bzr/checkout/dirstate                        | Bin 3506 -> 3504 bytes
 .bzr/repository/inventory.kndx                |   4 +++-
 .bzr/repository/inventory.knit                | Bin 67454 -> 68133 bytes
 ...hu_%4aan__6_23%3a41%3a24_2005_11810.1.kndx |   4 +++-
 ...hu_%4aan__6_23%3a41%3a24_2005_11810.1.knit | Bin 44485 -> 44946 bytes
 ...hu_%4aan__6_23%3a41%3a24_2005_11810.5.kndx |   3 ++-
 ...hu_%4aan__6_23%3a41%3a24_2005_11810.5.knit | Bin 63731 -> 64084 bytes
 .bzr/repository/revisions.kndx                |   4 +++-
 .bzr/repository/revisions.knit                | Bin 50276 -> 51002 bytes
 debian/changelog                              |   6 ++++++
 livecd.sh                                     |  14 +++++++++-----
 12 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/.bzr/branch/revision-history b/.bzr/branch/revision-history
index fdc9ba72..cf1fe434 100644
--- a/.bzr/branch/revision-history
+++ b/.bzr/branch/revision-history
@@ -143,4 +143,6 @@ doko@salsa-20071007121443-tsaye6lzm7b0h2dv
 cjwatson@canonical.com-20071018135643-4b1vd4ii2vho8epy
 cjwatson@canonical.com-20071024160911-4egvg829efwoni0v
 cjwatson@canonical.com-20071024221916-bghv57czypc7wpwb
-cjwatson@canonical.com-20071024222240-yr2ehi0b2rlfip9x
\ No newline at end of file
+cjwatson@canonical.com-20071024222240-yr2ehi0b2rlfip9x
+cjwatson@canonical.com-20071029215702-otqasvgd1no8g0c3
+cjwatson@canonical.com-20071029220456-dldduflcjy339owi
\ No newline at end of file
diff --git a/.bzr/checkout/dirstate b/.bzr/checkout/dirstate
index c5d5020674106ae854a889ef49f429fc7b072ebb..d50d7ca571a9d8dadedeb00a821e828e233ed880 100644
GIT binary patch
delta 433
zcmb7=Pf7zZ6o-SQ)ZRcSD0SgRij%xdk^whyq0@q3HzT;qB$J_?f7sUAcGD|3cm)rj
zb|v1*6BtF@b<y4L!Q*@1`@MHwJ5MJq?h(cb)Ms!I5aLmv^-ONegU$7L2@q6|qk7eC
z7dP1=9E|<z`h{&>eEYiGYum-G2}2Q;8`(H+tTj&{HUYI1e5_*<P+%T23KE5}C9&Wt
zQHm0TDFuO+NJ>fXGW~zh&Ham^oTQ_^OW_Pzv;(vG3#~tooHX{`v%P9|ucq_V;Ia~_
zr{VdqrPoF%Y`Mpn)dJ&0B}}-$V&K*U3=%LtwTi?DV=Oo-e=H|cPZ!b34+ptE{j)4&
ZG<23%nX}x1*>KSMqr0`(&H4Vk`3(bJeRlu=

delta 435
zcmb7>%}N4M7={lGQg#Cc29b+)1LyyoX%k1ICc#Kh_ntqsKZYT6#*Meo;2m@Yl{eNU
zbc~>t3%}L-!OQbK@O?DC8gJ+I7!g4^l(dS;F~wmhjLRIm$rNgwKly2v6jgCn@7$AC
z+U_Uw>YZ;betuu?{WsT_Q8QXvf+RG;F(<4ZdF!2qR5Ob`wj)ZdOc3`8GXPO687P5L
ziYx}k7u~xwmHn%*-?n;6v>(PHrLVw)9hkLWXr)d!(kR@D^>{L4!Ys<nh<P^GtCM}R
zGz4-91wn)%$30C#AP{1#iE)TqYmKuOA%GC10=#T2^9~G_gCbZCyMLC?YS;^wH;=(`
U2WAwYD|OgB+VX+*#lfuh13nviJ^%m!

diff --git a/.bzr/repository/inventory.kndx b/.bzr/repository/inventory.kndx
index e1fd8dbc..ae03e5c3 100644
--- a/.bzr/repository/inventory.kndx
+++ b/.bzr/repository/inventory.kndx
@@ -146,4 +146,6 @@ doko@salsa-20071007121443-tsaye6lzm7b0h2dv line-delta 64945 373 141 :
 cjwatson@canonical.com-20071018135643-4b1vd4ii2vho8epy line-delta 65318 373 142 :
 cjwatson@canonical.com-20071024160911-4egvg829efwoni0v fulltext 65691 1086 143 :
 cjwatson@canonical.com-20071024221916-bghv57czypc7wpwb line-delta 66777 373 144 :
-cjwatson@canonical.com-20071024222240-yr2ehi0b2rlfip9x line-delta 67150 304 145 :
\ No newline at end of file
+cjwatson@canonical.com-20071024222240-yr2ehi0b2rlfip9x line-delta 67150 304 145 :
+cjwatson@canonical.com-20071029215702-otqasvgd1no8g0c3 line-delta 67454 372 146 :
+cjwatson@canonical.com-20071029220456-dldduflcjy339owi line-delta 67826 307 147 :
\ No newline at end of file
diff --git a/.bzr/repository/inventory.knit b/.bzr/repository/inventory.knit
index bc73f3e0a473060302817a94523ab20272b29210..5d00b17b842b21781d78921efca42c1e4d355ae2 100644
GIT binary patch
delta 696
zcmV;p0!RJ+js&HY1c0;weg}UaiwFP!00002|Fx67Zrm^sgnK;&!NS$~!sVYNJ7=Ue
zk}f^5B9}TDIx>-H<(#Jv&wvxSJ;coxvm|Hc1Gv$$PB}6E^b5<H(-)5^r^(~I_xW@y
zg=j&@UV>?byv^k&uG<(O<!%&SG0OtTPN^1SP&Nz_<ba_H)JZYuPPcy+t%*iJBX+QZ
z=JS*`N+mBZEav5e<-iSR3vJUShMU5HUl)ZxG<s()4sn`^UB>HcXZIDq<y72bPPDq4
zx!liqs>1&1BD^=b8Oy!<etdS1n4GgtsyhvLQoCwy96$$R51b`DQO$Y8G}4?$&VJxh
zOMQ%=_=o3eHmuOOxb=UCaNtsTft|HD^z9(fB54z~1Q8Sh^bw4T$|(DGY5HBeLfuHt
zK0P!bccA`arZf5Hg2P<TywJ)&kh^)~K2IC@uwRe=8H{g94WZXjD+7Lzy;fG(fQl-Y
zD2J{^Le%m-7_C+J3Wid+@)tFK0OV^Ll!XHT03VA80000000MviwUWzf!!Qs<_x=i@
zMOI0wktNwqn$UG<cioGz9*Kf26<c}r>+2Ls={C^KFbvGxb1!pt!x&N|=6Jz8rubqo
zrWg!%OOyHqXRHFo8_t=KYGFHTPrft9TUj>g5{MuM8i8DJ)+%FU306t3gcPzyVO<NR
ztzF%ESFkzEp?H4|@$6zw!;Sbf^q4nPQZl%6xMS#GH}o+Sx-G<9-W7c49J!b8Yghe>
zZz*QIOVN#b*5!4F{WMq}?}NW0vwdFc_rpo=FlwzdFINIqT<A$$YJeKp5-5q-yNUCF
zaqqgcr{n{N$<+VovEO(e&W2=n&3Zf_Y^bdfe8rUVrUoo<=u|y5sx2#T8&$f}O5u^W
eKTF|r@(L46Mak2)aM3>aEX5be1=2%o0ssIn;Z92c

delta 11
ScmZ2Fh2>u#OT!k%I(7gbP6UVm

diff --git a/.bzr/repository/knits/5b/x_%4ca%4dont_%4aones_%3clamont.jones@canonical.com%3e_%54hu_%4aan__6_23%3a41%3a24_2005_11810.1.kndx b/.bzr/repository/knits/5b/x_%4ca%4dont_%4aones_%3clamont.jones@canonical.com%3e_%54hu_%4aan__6_23%3a41%3a24_2005_11810.1.kndx
index 12452dd8..f9c32937 100644
--- a/.bzr/repository/knits/5b/x_%4ca%4dont_%4aones_%3clamont.jones@canonical.com%3e_%54hu_%4aan__6_23%3a41%3a24_2005_11810.1.kndx
+++ b/.bzr/repository/knits/5b/x_%4ca%4dont_%4aones_%3clamont.jones@canonical.com%3e_%54hu_%4aan__6_23%3a41%3a24_2005_11810.1.kndx
@@ -96,4 +96,6 @@ doko@salsa-20071007121443-tsaye6lzm7b0h2dv line-delta 43430 247 91 :
 cjwatson@canonical.com-20071018135643-4b1vd4ii2vho8epy line-delta 43677 264 92 :
 cjwatson@canonical.com-20071024160911-4egvg829efwoni0v line-delta 43941 153 93 :
 cjwatson@canonical.com-20071024221916-bghv57czypc7wpwb line-delta 44094 175 94 :
-cjwatson@canonical.com-20071024222240-yr2ehi0b2rlfip9x line-delta 44269 216 95 :
\ No newline at end of file
+cjwatson@canonical.com-20071024222240-yr2ehi0b2rlfip9x line-delta 44269 216 95 :
+cjwatson@canonical.com-20071029215702-otqasvgd1no8g0c3 line-delta 44485 245 96 :
+cjwatson@canonical.com-20071029220456-dldduflcjy339owi line-delta 44730 216 97 :
\ No newline at end of file
diff --git a/.bzr/repository/knits/5b/x_%4ca%4dont_%4aones_%3clamont.jones@canonical.com%3e_%54hu_%4aan__6_23%3a41%3a24_2005_11810.1.knit b/.bzr/repository/knits/5b/x_%4ca%4dont_%4aones_%3clamont.jones@canonical.com%3e_%54hu_%4aan__6_23%3a41%3a24_2005_11810.1.knit
index 19a79c36684a9743d8c7e3c40cacbc241b828194..a1e7b45049d1e21f41e5d7a6e3227f1a2aeaf9c0 100644
GIT binary patch
delta 474
zcmV<00VV#$+X9l`0<guce;<no0000000RHLlFd$pFce1jJjGqAq2#uu?J)kti4r&d
zBpTzow1r@>cZ9;kw>L8jAAp4qaL#uY-x9{DrwH!zVADkL*4aq0cXlWoeKCP(IEqSe
zWl%6m-*#F$&m(O*bP@~*>CkSpwoPRkwAzMJwWZ+brRBV8xst6^e^O_dW3IE6J43$&
z=h;Y<+6m6EDCIf4Kfl(G_3o{{zl3@0LUcdZ10B|GtmObMVCOwNP&3Cg!!+;rG^XO;
zI~apI8u|zyCmgQ+MDwZaXt@D+qL_oI;Ke04I)R(5(pxTpVTrgpJ4C<oM%gbF`a~9n
z0ssIXiwFP!00002fB&73xlY6|6h(V~#VbLIN6$;_WLShmjVP%dFW`~!lahF%{5=c>
zACT@g=N#!?<Gf_5;4hn77pgDbRjS#$a`N=eC88B5M=4SFhKCYDOT}MyrAFE^Xb6K7
z$)YjI4?;v2&G0+Sq-+YKQBj3nCnqO{o#+HR*eUrMec&_EP?{FF!;@C`@a5*PKR}y5
zWA*z}p^fRTKOO<j;gw3R@bQPk<G-j)t*-56c?Ni++JPM5-LG(Sg0Sb_o`nUD8j-~s
Q4*to007=^KE{_2K0JJja1ONa4

delta 9
RcmbPqpXumrrVU5e0st9h1vmfz

diff --git a/.bzr/repository/knits/5f/x_%4ca%4dont_%4aones_%3clamont.jones@canonical.com%3e_%54hu_%4aan__6_23%3a41%3a24_2005_11810.5.kndx b/.bzr/repository/knits/5f/x_%4ca%4dont_%4aones_%3clamont.jones@canonical.com%3e_%54hu_%4aan__6_23%3a41%3a24_2005_11810.5.kndx
index 88ca44a5..45ef61ab 100644
--- a/.bzr/repository/knits/5f/x_%4ca%4dont_%4aones_%3clamont.jones@canonical.com%3e_%54hu_%4aan__6_23%3a41%3a24_2005_11810.5.kndx
+++ b/.bzr/repository/knits/5f/x_%4ca%4dont_%4aones_%3clamont.jones@canonical.com%3e_%54hu_%4aan__6_23%3a41%3a24_2005_11810.5.kndx
@@ -100,4 +100,5 @@ doko@salsa-20071004110523-ab0qzrldakrxi9ap line-delta 62619 284 95 :
 cjwatson@canonical.com-20071004132601-q4vup64i8pslbjqf line-delta 62903 165 96 :
 doko@salsa-20071007121443-tsaye6lzm7b0h2dv line-delta 63068 245 97 :
 cjwatson@canonical.com-20071018135643-4b1vd4ii2vho8epy line-delta 63313 202 98 :
-cjwatson@canonical.com-20071024221916-bghv57czypc7wpwb line-delta 63515 216 99 :
\ No newline at end of file
+cjwatson@canonical.com-20071024221916-bghv57czypc7wpwb line-delta 63515 216 99 :
+cjwatson@canonical.com-20071029215702-otqasvgd1no8g0c3 line-delta 63731 353 100 :
\ No newline at end of file
diff --git a/.bzr/repository/knits/5f/x_%4ca%4dont_%4aones_%3clamont.jones@canonical.com%3e_%54hu_%4aan__6_23%3a41%3a24_2005_11810.5.knit b/.bzr/repository/knits/5f/x_%4ca%4dont_%4aones_%3clamont.jones@canonical.com%3e_%54hu_%4aan__6_23%3a41%3a24_2005_11810.5.knit
index 2f395be6f4e784447311c8cf40cae9d817a7875f..42db23475debe548812545242b79697684a9d424 100644
GIT binary patch
delta 365
zcmV-z0h0dn@dMQK1F-Y>e;<no0000000RG|l+8-SFcgK?_9;SfGmuJ?^p{~k5Ep`?
zptvmDCYd2lo75&9XVHhZr5zO9NE-+z*_`j>T*yhbRvC@>#}_zj^eqQ%wBk_Ra8m~~
z3{w))oRT;VX<*zZ*waA}ZL&ki86pYdsbr<dqkY6;!b_S*EC~|<e@p@)ds=2GNPviX
zNs5yUhh9!_P6s87VZtIzyoK;_S?N#^pswt+>(FslDdxj@)`OX}1S<z{Jb;sR;J@%m
zf~ryQ-yjjeB%;fMTurY1FLZxF_H%}QM)xziAJM%tTx>iN4=uzio49*^dfE9kD2-Za
zU8}g0!uLp);c>@{V;?sM-Yhm4(>*@CzU}<$QBbY4s-Y^7b)W^bqPWZ>5Yir<X$pTO
z?EQWMUVJNck_9>s#WbxcC90qqFayp>?hpst$QD&yqjWG`)&=;P#X6tu){|N+{1v=!
LI3IP@RRjP4Q&gvK

delta 9
Rcmcceh57SG<_({J0017722KC~

diff --git a/.bzr/repository/revisions.kndx b/.bzr/repository/revisions.kndx
index 4ea5d50e..fd0176ff 100644
--- a/.bzr/repository/revisions.kndx
+++ b/.bzr/repository/revisions.kndx
@@ -146,4 +146,6 @@ doko@salsa-20071007121443-tsaye6lzm7b0h2dv fulltext 48401 392 141 :
 cjwatson@canonical.com-20071018135643-4b1vd4ii2vho8epy fulltext 48793 388 142 :
 cjwatson@canonical.com-20071024160911-4egvg829efwoni0v fulltext 49181 367 143 :
 cjwatson@canonical.com-20071024221916-bghv57czypc7wpwb fulltext 49548 373 144 :
-cjwatson@canonical.com-20071024222240-yr2ehi0b2rlfip9x fulltext 49921 355 145 :
\ No newline at end of file
+cjwatson@canonical.com-20071024222240-yr2ehi0b2rlfip9x fulltext 49921 355 145 :
+cjwatson@canonical.com-20071029215702-otqasvgd1no8g0c3 fulltext 50276 366 146 :
+cjwatson@canonical.com-20071029220456-dldduflcjy339owi fulltext 50642 360 147 :
\ No newline at end of file
diff --git a/.bzr/repository/revisions.knit b/.bzr/repository/revisions.knit
index 03bdb0b48e3b0cfcd990be49fd128e90c2fd872e..08d2d14625a1e036f62c6796186e852758aba777 100644
GIT binary patch
delta 741
zcmV<B0vi3~hy%Kg1F&Soe;<no0000000RG=lFx43AP|S|ehS1Phe+Oq0sm9hR-zvI
z2tBUGfOlzaaDa8YdHSHFtG)EnZ~|uZ{k}nLCPeEUQ9plUirzgdblzEo^G^At1jZW9
zpaWht3`(C~F>WW#oo`P}3DOb`4Pq-B-GNaZ!YC@C)Tm@@GzZa&e;PD&Toi|3Hv5_7
zm&K-JLQlW>**fy$Bbq$S>FM7d52y4*$>hU=sizes)@{ZmAFjuEM&8pL)e6zzq(!Yq
z;4q@j7p4U^%4}C-T}>6^l-w+iR`>L4Q&W=cVq(H&?J4J-sJn^*?4*Rx(wldtrzMw?
zF*+27+#K;_hDY+Ee>M5;$BRoB5-;oOL)snow|a3{G32@8aDT01Fw_4?OUO&I@*2RL
zEgK=slU=(%l<YHge-BuLUrk8X#NoET5{FAR9|JmdE;IWV9cH^3rOV)bnqmh0ZT*1V
z5&3kJ917#~7e7?-4#;K$2#^8*03VA80000000RG=lFx4Ae;^Qt?|urzp*JV|H>k0-
z(muo<BMf7g)`k>VSJ|gut8J7^FYOI9!}t4U#0I&96p?#=v$dr7%h{M>aCSMkw6=_p
zjuK`VBSNayFW&#17WaJR+@!aFG%_7CBlFr!QfqA}=hEv=8N($|#l}&YP7*GgQ-&>k
zWTkZtwL<RkfA6$}i2l4sqlcwFe(muv*GG(|lvi7OEHMgkgIH6(p39S^J$BRx%LF5%
za!zvUm7J82LTW2KjMR-9^f&=VH;Z%d`?DWSjZqCNlxo*Yk0~`=87Yi9u#SC{{-p>#
zZmAH2;GsF~&Be|zWLUtK5NEV~uALkNKOJxN=5(=nTc4{8_iddsOy85HvLmcb_0^Vb
z_B19v6UQ++?$qNw;F8k?at%<1+xd#3U3c>_+vuL!o&AD`C2Zh)n^US&*#V!e@31>!
XzuhE<2BQDrhid)<P_dzkkOBYz8n<dl

delta 9
Qcmdnh$NZ#&c|*z(02aUmlK=n!

diff --git a/debian/changelog b/debian/changelog
index 7b6f1fea..fc2b6e1d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+livecd-rootfs (0.43) hardy; urgency=low
+
+  * Add Gobuntu support.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Mon, 29 Oct 2007 17:57:17 -0400
+
 livecd-rootfs (0.42) hardy; urgency=low
 
   * Create /spu directory and spu group for powerpc+ps3 builds.
diff --git a/livecd.sh b/livecd.sh
index c4b233cb..074b0f0f 100755
--- a/livecd.sh
+++ b/livecd.sh
@@ -65,7 +65,6 @@ export DEBIAN_FRONTEND=noninteractive
 export LANG=C
 export CASPER_GENERATE_UUID=1
 SRCMIRROR=http://archive.ubuntu.com/ubuntu
-COMP="main restricted"
 ARCH=$(dpkg --print-installation-architecture)
 OPTMIRROR=
 
@@ -89,7 +88,6 @@ select_mirror () {
 	    USERMIRROR=http://ports.ubuntu.com/ubuntu-ports
 	    SECMIRROR=${USERMIRROR}
 	    SECSRCMIRROR=${SRCMIRROR}
-	    #COMP="main restricted universe"
 	    ;;
 	*)
 	    USERMIRROR=http://ports.ubuntu.com/ubuntu-ports
@@ -131,15 +129,15 @@ esac; done;
 shift $((OPTIND-1))
 
 if (( $# == 0 )) || [ "X$1" = "Xall" ]; then
-    set -- ubuntu kubuntu edubuntu xubuntu base
+    set -- ubuntu kubuntu edubuntu xubuntu gobuntu base
     if [ "$ARCH" = "i386" ]; then
-        set -- ubuntu ubuntu-lpia kubuntu edubuntu xubuntu base
+        set -- ubuntu ubuntu-lpia kubuntu edubuntu xubuntu gobuntu base
     fi
 fi
 
 for arg in "$@"; do
     case "$arg" in
-	ubuntu|ubuntu-lpia|edubuntu|kubuntu|xubuntu|base|tocd)
+	ubuntu|ubuntu-lpia|edubuntu|kubuntu|xubuntu|gobuntu|base|tocd)
 	    ;;
 	*)
 	    echo bad name >&2;
@@ -154,6 +152,7 @@ for FS in "$@"; do
     IMG=livecd.${FSS}.fsimg
     MOUNTS="${ROOT}dev/pts ${ROOT}dev/shm ${ROOT}.dev ${ROOT}dev ${ROOT}proc ${ROOT}sys"
     DEV=""
+    COMP="main restricted"
 
     select_mirror
 
@@ -186,6 +185,11 @@ Flags: seen
 	    LIST="$LIST minimal^ standard^ xterm libgoffice-gtk-0-4 xubuntu-desktop^"
 	    LIVELIST="xubuntu-live^ xresprobe laptop-detect casper lupin-casper"
 	    ;;
+	gobuntu)
+	    LIST="$LIST minimal^ standard^ gobuntu-desktop^"
+	    LIVELIST="gobuntu-live^ xresprobe laptop-detect casper lupin-casper"
+	    COMP="main"
+	    ;;
 	base)
 	    LIST="$LIST minimal^ standard^"
 	    LIVELIST="casper lupin-casper"