Import patches-unapplied version 1.103 to ubuntu/lucid

Imported using git-ubuntu import.

Changelog parent: cb09049c18

New changelog entries:
  * make sure there is no old squashfs around before attempting to squash a
    new one.

.bzr/README

@@ -0,0 +1,3 @@
+This is a Bazaar control directory.
+Do not change any files in this directory.
+See http://bazaar-vcs.org/ for more information about Bazaar.

.bzr/branch-format

@@ -0,0 +1 @@
+Bazaar-NG meta directory, format 1

.bzr/branch/branch.conf

@@ -0,0 +1,2 @@
+parent_location = bzr+ssh://bazaar.launchpad.net/~ubuntu-core-dev/livecd-rootfs/trunk/
+push_location = bzr+ssh://bazaar.launchpad.net/~ubuntu-core-dev/livecd-rootfs/trunk/

.bzr/branch/format

@@ -0,0 +1 @@
+Bazaar Branch Format 6 (bzr 0.15)

.bzr/branch/last-revision

@@ -0,0 +1 @@
+312 ogra@ubuntu.com-20091207104326-192mmbzylr7gz8bk

.bzr/branch/tags

@@ -0,0 +1 @@
+d5:0.10045:lool@dooz.org-20091022120946-ude4k00wrup5zi1u5:0.10158:evan.dandrea@canonical.com-20091118182236-wjse47vyhq4331c34:0.6854:cjwatson@canonical.com-20080922105353-5g6nbd3z6auod9o84:0.6947:ogra@ubuntu.com-20080923105752-3is4oq7h0rvr7m1t4:0.7050:stevenk@ubuntu.com-20080926061032-4cmvys3uwn0urof64:0.7147:ogra@ubuntu.com-20080929212513-932wmh9jhu2254c84:0.7254:cjwatson@canonical.com-20081009012107-bcithv5mtfr13wdr4:0.7350:superm1@ubuntu.com-20081105013351-lgows8lwl8gynab14:0.7450:superm1@ubuntu.com-20081108155125-k9hgpa9dpccasza14:0.7550:stevenk@ubuntu.com-20090110000926-kti0aa3w3gm87tl64:0.7654:cjwatson@canonical.com-20090120234103-0oedx9z8fwfgebmg4:0.7754:cjwatson@canonical.com-20090129172302-12n6za4eg8ti5iqs4:0.7850:stevenk@ubuntu.com-20090323105302-bzrig75pk422ae8o4:0.7954:cjwatson@canonical.com-20090403000814-c0f4i899uyvq3le14:0.8050:stevenk@ubuntu.com-20090416104708-ytmlukba1r2qbok24:0.8154:cjwatson@canonical.com-20090508233530-xqdymqe6ii8eanbt4:0.8254:cjwatson@canonical.com-20090529072059-0303r4t3a2terv5u4:0.8354:cjwatson@canonical.com-20090529093922-h2qylvtfqgwqocs24:0.8460:steve.langasek@canonical.com-20090610202236-hzpkmw79nuly34iu4:0.8554:cjwatson@canonical.com-20090623163248-2e75g8ph1wr63bck4:0.8650:stevenk@ubuntu.com-20090630021433-f32fyu1qvauh1y5y4:0.8754:cjwatson@canonical.com-20090707120821-n7o4gmu5cgvs76314:0.8850:superm1@ubuntu.com-20090723080906-su6zimlrtqy6bmdj4:0.8950:stevenk@ubuntu.com-20090805132344-m6jy87gv6cmus3384:0.9047:ogra@ubuntu.com-20090811090144-eek0pgpf01i0zjim4:0.9150:superm1@ubuntu.com-20090814032033-i87zsm015fivhf494:0.9247:ogra@ubuntu.com-20090821173859-y8ixof4s2zb3vs394:0.9347:ogra@ubuntu.com-20090825163952-pxo05zcb6icy931e4:0.9445:lool@dooz.org-20090827103704-ces9mmhqskcdzxgm4:0.9550:stevenk@ubuntu.com-20090901073549-hyto6dxcpijmyb1u4:0.9654:cjwatson@canonical.com-20090915121422-j8ycjw2o2xsk2fim4:0.9745:lool@dooz.org-20090915225223-bkp0tzqk3dllogno4:0.9840:lool@bee-20090923074648-95yic2eel4ietxl34:0.9945:lool@dooz.org-20091004115344-a657lipup0e45we65:1.10258:evan.dandrea@canonical.com-20091119211317-msuqwz83h8lrtnf45:1.10347:ogra@ubuntu.com-20091207104326-192mmbzylr7gz8bke

.bzr/checkout/conflicts

@@ -0,0 +1 @@
+BZR conflict list format 1

.bzr/checkout/format

@@ -0,0 +1 @@
+Bazaar Working Tree Format 4 (bzr 0.15)

.bzr/checkout/merge-hashes

@@ -0,0 +1,24 @@
+BZR merge-modified list format 1
+file_id: install-20090915121554-otmzarujps4xkdqv-1
+hash: 68235c6b00888aab6a9fdbb1446430fbd0e64de3
+
+file_id: examples-20090915121554-otmzarujps4xkdqv-2
+hash: b6db287e0f6bbfea030c805034e280c9da03421f
+
+file_id: x_LaMont_Jones_<lamont.jones@canonical.com>_Thu_Jan__6_23:41:24_2005_11810.1
+hash: 2ffff6e16e4020a03e86122f99e21e03a037ca3d
+
+file_id: x_LaMont_Jones_<lamont.jones@canonical.com>_Thu_Jan__6_23:41:24_2005_11810.2
+hash: 233e7b0bca2804797b4ebafc1cf13589c73b5831
+
+file_id: x_LaMont_Jones_<lamont.jones@canonical.com>_Thu_Jan__6_23:41:24_2005_11810.5
+hash: 7ea26bb2ca895b5184f4c312c1eb07945751805c
+
+file_id: x_LaMont_Jones_<lamont@debian.org>_Sat_Sep_24_15:53:42_2005_5414.0
+hash: d3964f9dad9f60363c81b688324d95b4ec7c8038
+
+file_id: bzrignore-20090915121918-f5nuhil3asvkoxz4-1
+hash: a855a24b17c220121ca49f1018e3386cf0049822
+
+file_id: x_LaMont_Jones_<lamont.jones@canonical.com>_Thu_Jan__6_23:41:24_2005_11810.6
+hash: 1526d364e7dd50d68aafe0b51bfb7a8427f5b9e2

.bzr/repository/format

@@ -0,0 +1 @@
+Bazaar pack repository format 1 (needs bzr 0.92)

.bzr/repository/indices/585aae83282152e62ec90749692bd0a7.six

@@ -0,0 +1,5 @@
+Bazaar Graph Index 1
+node_ref_lists=0
+key_elements=1
+len=0
+

.bzr/repository/indices/7da3ed26c383b67cfd3650eb71a608aa.six

@@ -0,0 +1,5 @@
+Bazaar Graph Index 1
+node_ref_lists=0
+key_elements=1
+len=0
+

.bzr/repository/indices/b822d61649923ed4df542e791ed76b05.six

@@ -0,0 +1,5 @@
+Bazaar Graph Index 1
+node_ref_lists=0
+key_elements=1
+len=0
+

.bzr/repository/indices/f7010c6d2df52ea2d878abf35c556631.six

@@ -0,0 +1,5 @@
+Bazaar Graph Index 1
+node_ref_lists=0
+key_elements=1
+len=0
+

.bzr/repository/obsolete_packs/41a419b6a2c89cdad0fa3a8a69e40810.six

@@ -0,0 +1,5 @@
+Bazaar Graph Index 1
+node_ref_lists=0
+key_elements=1
+len=0
+

.bzr/repository/obsolete_packs/6792c6f201d789b0dd896142c3ce9985.six

@@ -0,0 +1,5 @@
+Bazaar Graph Index 1
+node_ref_lists=0
+key_elements=1
+len=0
+

.bzr/repository/obsolete_packs/76dc63f757894da0103ab0be8639de0e.six

@@ -0,0 +1,5 @@
+Bazaar Graph Index 1
+node_ref_lists=0
+key_elements=1
+len=0
+

.bzr/repository/obsolete_packs/826cb7622cd5715bc0efed9618a21810.six

@@ -0,0 +1,5 @@
+Bazaar Graph Index 1
+node_ref_lists=0
+key_elements=1
+len=0
+

.bzr/repository/obsolete_packs/a61e6e5a2a28b476892ff5601e954c22.six

@@ -0,0 +1,5 @@
+Bazaar Graph Index 1
+node_ref_lists=0
+key_elements=1
+len=0
+

.bzr/repository/obsolete_packs/c2bce168d3ce0969c0a31c7914f73f7e.six

@@ -0,0 +1,5 @@
+Bazaar Graph Index 1
+node_ref_lists=0
+key_elements=1
+len=0
+

.bzr/repository/obsolete_packs/d6a03141bdc37b53e6da33b0c62f3eee.six

@@ -0,0 +1,5 @@
+Bazaar Graph Index 1
+node_ref_lists=0
+key_elements=1
+len=0
+

.bzr/repository/obsolete_packs/e8bdb3981e054376d3ff1496e3e55f00.six

@@ -0,0 +1,5 @@
+Bazaar Graph Index 1
+node_ref_lists=0
+key_elements=1
+len=0
+

.bzrignore

@@ -0,0 +1,4 @@
+debian/*.debhelper*
+debian/*.substvars
+debian/files
+debian/livecd-rootfs

debian/changelog

@@ -1,3 +1,10 @@
+livecd-rootfs (1.103) lucid; urgency=low
+
+  * make sure there is no old squashfs around before attempting to squash a
+    new one.
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Mon, 07 Dec 2009 11:27:50 +0100
+
 livecd-rootfs (1.102) lucid; urgency=low
 
   * Don't output a newline in filesystem.size.

livecd.sh

@@ -631,6 +631,9 @@ Pin-Priority: 550
       : > livecd.${FSS}.sort
     fi
 
+    # make sure there is no old squashfs idling around
+    rm -f livecd.${FSS}.squashfs
+
     mksquashfs ${ROOT} livecd.${FSS}.squashfs -sort livecd.${FSS}.sort
     chmod 644 livecd.${FSS}.squashfs
   }

test

@@ -1 +0,0 @@
-13168