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 d50d7ca5..d8023d96 100644 Binary files a/.bzr/checkout/dirstate and b/.bzr/checkout/dirstate differ diff --git a/.bzr/checkout/merge-hashes b/.bzr/checkout/merge-hashes index 91772c3a..2688eb8f 100644 --- a/.bzr/checkout/merge-hashes +++ b/.bzr/checkout/merge-hashes @@ -1,6 +1,3 @@ BZR merge-modified list format 1 -file_id: x_LaMont_Jones__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 5d00b17b..7b9de32b 100644 Binary files a/.bzr/repository/inventory.knit and b/.bzr/repository/inventory.knit differ 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 a1e7b450..1df037fe 100644 Binary files a/.bzr/repository/knits/5b/x_%4ca%4dont_%4aones_%3clamont.jones@canonical.com%3e_%54hu_%4aan__6_23%3a41%3a24_2005_11810.1.knit and b/.bzr/repository/knits/5b/x_%4ca%4dont_%4aones_%3clamont.jones@canonical.com%3e_%54hu_%4aan__6_23%3a41%3a24_2005_11810.1.knit differ 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 45ef61ab..9139bf89 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 @@ -101,4 +101,5 @@ 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 : -cjwatson@canonical.com-20071029215702-otqasvgd1no8g0c3 line-delta 63731 353 100 : \ No newline at end of file +cjwatson@canonical.com-20071029215702-otqasvgd1no8g0c3 line-delta 63731 353 100 : +hobbsee@kubuntu.org-20071130034919-hqm6c1l3bvghmbig line-delta 64084 192 101 : \ 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 42db2347..b27071f7 100644 Binary files a/.bzr/repository/knits/5f/x_%4ca%4dont_%4aones_%3clamont.jones@canonical.com%3e_%54hu_%4aan__6_23%3a41%3a24_2005_11810.5.knit and b/.bzr/repository/knits/5f/x_%4ca%4dont_%4aones_%3clamont.jones@canonical.com%3e_%54hu_%4aan__6_23%3a41%3a24_2005_11810.5.knit differ diff --git a/.bzr/repository/revisions.kndx b/.bzr/repository/revisions.kndx index fd0176ff..86897d55 100644 --- a/.bzr/repository/revisions.kndx +++ b/.bzr/repository/revisions.kndx @@ -148,4 +148,6 @@ 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 : cjwatson@canonical.com-20071029215702-otqasvgd1no8g0c3 fulltext 50276 366 146 : -cjwatson@canonical.com-20071029220456-dldduflcjy339owi fulltext 50642 360 147 : \ No newline at end of file +cjwatson@canonical.com-20071029220456-dldduflcjy339owi fulltext 50642 360 147 : +hobbsee@kubuntu.org-20071130034919-hqm6c1l3bvghmbig fulltext 51002 394 148 : +hobbsee@kubuntu.org-20071130035249-w93jdz4sdui3op1s fulltext 51396 380 149 : \ No newline at end of file diff --git a/.bzr/repository/revisions.knit b/.bzr/repository/revisions.knit index 08d2d146..e9a08c38 100644 Binary files a/.bzr/repository/revisions.knit and b/.bzr/repository/revisions.knit differ 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)