From e77d72ecb4a5c8857250ccd570facf963aa6545a Mon Sep 17 00:00:00 2001 From: Sarah Hobbs Date: Fri, 30 Nov 2007 14:52:29 +1100 Subject: [PATCH] Import patches-unapplied version 0.44 to ubuntu/hardy Imported using git-ubuntu import. Changelog parent: 4093281c66d1a9cdcc6fe521fa8a23a55e532915 New changelog entries: * xubuntu seed change - libgoffice-gtk-0-4 --> libgoffice-gtk-0-5 --- .bzr/branch/revision-history | 4 +++- .bzr/checkout/dirstate | Bin 3504 -> 3454 bytes .bzr/checkout/merge-hashes | 5 +---- .bzr/repository/inventory.kndx | 4 +++- .bzr/repository/inventory.knit | Bin 68133 -> 69569 bytes ...hu_%4aan__6_23%3a41%3a24_2005_11810.1.kndx | 3 ++- ...hu_%4aan__6_23%3a41%3a24_2005_11810.1.knit | Bin 44946 -> 45196 bytes ...hu_%4aan__6_23%3a41%3a24_2005_11810.5.kndx | 3 ++- ...hu_%4aan__6_23%3a41%3a24_2005_11810.5.knit | Bin 64084 -> 64276 bytes .bzr/repository/revisions.kndx | 4 +++- .bzr/repository/revisions.knit | Bin 51002 -> 51776 bytes debian/changelog | 6 ++++++ livecd.sh | 2 +- 13 files changed, 21 insertions(+), 10 deletions(-) diff --git a/.bzr/branch/revision-history b/.bzr/branch/revision-history index cf1fe434..a00e86aa 100644 --- a/.bzr/branch/revision-history +++ b/.bzr/branch/revision-history @@ -145,4 +145,6 @@ cjwatson@canonical.com-20071024160911-4egvg829efwoni0v cjwatson@canonical.com-20071024221916-bghv57czypc7wpwb cjwatson@canonical.com-20071024222240-yr2ehi0b2rlfip9x cjwatson@canonical.com-20071029215702-otqasvgd1no8g0c3 -cjwatson@canonical.com-20071029220456-dldduflcjy339owi \ No newline at end of file +cjwatson@canonical.com-20071029220456-dldduflcjy339owi +hobbsee@kubuntu.org-20071130034919-hqm6c1l3bvghmbig +hobbsee@kubuntu.org-20071130035249-w93jdz4sdui3op1s \ No newline at end of file diff --git a/.bzr/checkout/dirstate b/.bzr/checkout/dirstate index d50d7ca571a9d8dadedeb00a821e828e233ed880..d8023d96a57aa910003dbb032d46387d44cc7caa 100644 GIT binary patch delta 403 zcmbV|J5B>Z5JV@jK+Z@p0TJ1v?&+SH9Y=^8Z~`>H{TOx^dp*XGa0L(-0TFO5PJnPk z2$CzSpq@(aZT5Zqe0EhJfJG*q&;TuU(3mpKxQh%gV_EPQHe-8m?S|_Thu_Jan__6_23:41:24_2005_11810.1 -hash: 0ec7221c57d8efa364281559e85bcccb7b555274 - file_id: x_LaMont_Jones__Thu_Jan__6_23:41:24_2005_11810.5 -hash: 24872caf33c2401ae7d97f5053940249f3990b51 +hash: d36c7e2062095e1a9d5ac1874eed1feb5ac68cf3 diff --git a/.bzr/repository/inventory.kndx b/.bzr/repository/inventory.kndx index ae03e5c3..241fbfdd 100644 --- a/.bzr/repository/inventory.kndx +++ b/.bzr/repository/inventory.kndx @@ -148,4 +148,6 @@ 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 : 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 +cjwatson@canonical.com-20071029220456-dldduflcjy339owi line-delta 67826 307 147 : +hobbsee@kubuntu.org-20071130034919-hqm6c1l3bvghmbig fulltext 68133 1126 148 : +hobbsee@kubuntu.org-20071130035249-w93jdz4sdui3op1s line-delta 69259 310 149 : \ No newline at end of file diff --git a/.bzr/repository/inventory.knit b/.bzr/repository/inventory.knit index 5d00b17b842b21781d78921efca42c1e4d355ae2..7b9de32bc87cf655f4e48e876b04d21a150e7f04 100644 GIT binary patch delta 1459 zcmV;k1x)&-lmx+_1c0;wB?^BZiwFP!00002|J7I9Zrer>efL)g0-85Ed%rkw;5G${ z21#2W1&Tfqv%9k-ZHiPVO0xX*9oexJ8cmxRiJQI%5~Ur@IeTW#%m#;5(|5DF4`GFP zcCilYZd@PtLsbaIEa#FjsXX^Z{cd3*Z)Mn2^&&LYjH_8duXqYZDVBeH4%rwXxkVu% zAk!=Wy6m*%N6(vXgWcEXB{jk#1H#Juj$as z9}h{M&LPFV8z7yM)2Z1ZE6n7 zy4vMMRAPHT^zzr={`~oupZ*=qbuca%FFLcR;cBSlWp8Sx!;3prC zU+mdX#kLbcN`*a&z@=IiZ!)5Mi^2!~{ea6=OL; zun}1x;c7Z>d=P<6XeAqZ6k64tnKZ-d8(?%l#CUCs3hVkE3SWgC+ZxqPJ3xknRPhX1 zREXr(5L`gWS!ph{Pgav$y_ztp%m;*ie6afBu+4uh!^678{|&_nX#7bTb5L9e;Q|N; z7y=ihcpG(+B00S8YQ+1OQ|;c}N>_4r!p({1H#n&QNqw+46yzFLIP}NM-Pd*@G1VYo zGFdnSGNrV)ds1Z7hUS0}MHI|%AUE>Us@C%Jy5)V>{{vI`28OZ}d)F84aQ}vui32Y; zfF6HD$|p>R@A+^OLIP1Bv?tq8RG&_=MB4*6$FhZN6%9!WtjNcrwyR6CX9J#4`r^L{nm(E=61^`M!Lf-mR4{j<8D)S!0j> z0>Rx|r~?lG03VA80000000RHDQoC-0Fcg2?`3lQJrj+`LAt_PjsNK3-egRIwj=-d8 zzP?bY>K>`f9gcL*OXupw$;SY?sP*LB@nhC=NOK;?_K6@QFs2AmPFVHyS<$n-v&qh$ z#tWVR15}8zAO&X?*3M8XM8$N2DvOOHT5#N0E^J9Nw8dMTz4&l-A;s|vG;thMsv&=e zV02f%dXV1M@Btt2kg+Xa=^NiWu$~{Pn|xJoF(i44!A)}0r+u%61<21Ua5O5!;En2Y z6NgQk_VT@(Ue5$6))5~CbL5Y*smXgU>I*T)uuiyD_i|D%Wgx_PV^ zklZcFsZ+Ryr71Ksma57TUN9}NQM@PN3<-pcqKr_b3#|C>lfN%P7xJQn;Q5fbU?15? N_6^vF2svN^004Hww&?%> delta 11 ScmX>&pJnM3mWC~is$2jaqXY&3 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 f9c32937..e790da61 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 @@ -98,4 +98,5 @@ 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 : 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 +cjwatson@canonical.com-20071029220456-dldduflcjy339owi line-delta 44730 216 97 : +hobbsee@kubuntu.org-20071130035249-w93jdz4sdui3op1s line-delta 44946 250 98 : \ 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 a1e7b45049d1e21f41e5d7a6e3227f1a2aeaf9c0..1df037fee49f3ab3ab280b64cc0f76534cfa792c 100644 GIT binary patch delta 261 zcmV+g0s8)u-vW%`0TnsQor52*oxT-az^$=&va?Wc+!MP|}Y}xSemBvY^ zryaa<7IHA6(lzD0%6VH7%GQ)pV^bGI276K;s~X*l44Yz)O}WSHL7&hDKD(T+x8rvA z1$Y;nms1BzlEKK?bnr?vdzhTEvG1KGX4A+xE8+DEF+*4}w@iCw=YP|rwoL0Styl!I}NJVMO7^jri zl1VcDoP}W%*Oy_OwI9$PHCk9MYbV*hVxkqgG1l2uJAl?uD=l#8f2vw-4hb&)%gDre z_Bli9@T*E{L_a>A(bJTl|C8Zq$j=zLm}Zqb++gIx1wxMLdR#`uI;=s~%xY2B#m;Fb zM8#PP6;~Q)L$!jv+c%tHbWd>fw!`1R#VGq3maOJ;hZ&QifH#fYmVsO8R}9c$E=76h zH;2-@r~&$qn*}O%e-@chg#i#jlh;FZ&Kn>@J`qZ4M93%Yzm?{&yK8L@XO#;7(mytO zOyK^8GjH!IFEP9r6=Lv4P1~~d8y~G?RnfW;#7@?(ZZdCI&SiY}810Jc?qP6F@eC<@ zSo-_w5_GQZJ?I>f7v z>zWe5xUL8=e*$XMm82cbcTj6+q*0tgaS3qPk4M_Ct4#?)kH5(vXY}>=XY{nBmw#w@ zn$inKqYtZ0J+3jb?f{p3xLxBcX^&akc1_jPTu=p?nYI;NjYJr#p;B#4M^m?^V;J2P zT&?NxC+uRB>wg?U#W^9HNq02TKHQ~&?~ diff --git a/debian/changelog b/debian/changelog index fc2b6e1d..86fc5cc4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (0.44) hardy; urgency=low + + * xubuntu seed change - libgoffice-gtk-0-4 --> libgoffice-gtk-0-5 + + -- Sarah Hobbs Fri, 30 Nov 2007 14:52:29 +1100 + livecd-rootfs (0.43) hardy; urgency=low * Add Gobuntu support. diff --git a/livecd.sh b/livecd.sh index 074b0f0f..48604496 100755 --- a/livecd.sh +++ b/livecd.sh @@ -182,7 +182,7 @@ Flags: seen LIVELIST="edubuntu-live^ xresprobe laptop-detect casper lupin-casper" ;; xubuntu) - LIST="$LIST minimal^ standard^ xterm libgoffice-gtk-0-4 xubuntu-desktop^" + LIST="$LIST minimal^ standard^ xterm libgoffice-gtk-0-5 xubuntu-desktop^" LIVELIST="xubuntu-live^ xresprobe laptop-detect casper lupin-casper" ;; gobuntu)