diff -Nru lubuntu-default-settings-0.6/.bzr/branch/branch.conf lubuntu-default-settings-0.7~ppa9~1/.bzr/branch/branch.conf
--- lubuntu-default-settings-0.6/.bzr/branch/branch.conf	1970-01-01 00:00:00.000000000 +0000
+++ lubuntu-default-settings-0.7~ppa9~1/.bzr/branch/branch.conf	2010-02-28 23:40:03.000000000 +0000
@@ -0,0 +1,2 @@
+parent_location = ../lubuntu-default-settings/
+submit_branch = file:///media/data/Projects/lubuntu/lucid-packaging/lubuntu-default-settings/
diff -Nru lubuntu-default-settings-0.6/.bzr/branch/format lubuntu-default-settings-0.7~ppa9~1/.bzr/branch/format
--- lubuntu-default-settings-0.6/.bzr/branch/format	1970-01-01 00:00:00.000000000 +0000
+++ lubuntu-default-settings-0.7~ppa9~1/.bzr/branch/format	2010-02-23 20:03:36.000000000 +0000
@@ -0,0 +1 @@
+Bazaar Branch Format 6 (bzr 0.15)
diff -Nru lubuntu-default-settings-0.6/.bzr/branch/last-revision lubuntu-default-settings-0.7~ppa9~1/.bzr/branch/last-revision
--- lubuntu-default-settings-0.6/.bzr/branch/last-revision	1970-01-01 00:00:00.000000000 +0000
+++ lubuntu-default-settings-0.7~ppa9~1/.bzr/branch/last-revision	2010-04-28 22:27:49.000000000 +0000
@@ -0,0 +1 @@
+73 gilir@ubuntu.com-20100428222742-3rkwu2e76dy29yww
diff -Nru lubuntu-default-settings-0.6/.bzr/branch/tags lubuntu-default-settings-0.7~ppa9~1/.bzr/branch/tags
--- lubuntu-default-settings-0.6/.bzr/branch/tags	1970-01-01 00:00:00.000000000 +0000
+++ lubuntu-default-settings-0.7~ppa9~1/.bzr/branch/tags	2010-02-28 23:40:03.000000000 +0000
@@ -0,0 +1 @@
+d3:0.148:gilir@ubuntu.com-20091105175313-yhnym7ck1wgwo22t3:0.248:gilir@ubuntu.com-20091127233957-4uinp5dcf5f84a0d3:0.348:gilir@ubuntu.com-20091213111237-jpjzs66ge27kcorl3:0.448:gilir@ubuntu.com-20100124185752-ox905ponjjsq5m0k3:0.548:gilir@ubuntu.com-20100217193938-d4d4vutum5w82noe3:0.648:gilir@ubuntu.com-20100228233534-dsznamq30a4umzmme
\ No newline at end of file
diff -Nru lubuntu-default-settings-0.6/.bzr/branch-format lubuntu-default-settings-0.7~ppa9~1/.bzr/branch-format
--- lubuntu-default-settings-0.6/.bzr/branch-format	1970-01-01 00:00:00.000000000 +0000
+++ lubuntu-default-settings-0.7~ppa9~1/.bzr/branch-format	2010-02-23 20:03:35.000000000 +0000
@@ -0,0 +1 @@
+Bazaar-NG meta directory, format 1
diff -Nru lubuntu-default-settings-0.6/.bzr/checkout/conflicts lubuntu-default-settings-0.7~ppa9~1/.bzr/checkout/conflicts
--- lubuntu-default-settings-0.6/.bzr/checkout/conflicts	1970-01-01 00:00:00.000000000 +0000
+++ lubuntu-default-settings-0.7~ppa9~1/.bzr/checkout/conflicts	2010-04-28 22:27:39.000000000 +0000
@@ -0,0 +1 @@
+BZR conflict list format 1
Binary files /tmp/i0zzy97OUY/lubuntu-default-settings-0.6/.bzr/checkout/dirstate and /tmp/jJaPPO5OkT/lubuntu-default-settings-0.7~ppa9~1/.bzr/checkout/dirstate differ
diff -Nru lubuntu-default-settings-0.6/.bzr/checkout/format lubuntu-default-settings-0.7~ppa9~1/.bzr/checkout/format
--- lubuntu-default-settings-0.6/.bzr/checkout/format	1970-01-01 00:00:00.000000000 +0000
+++ lubuntu-default-settings-0.7~ppa9~1/.bzr/checkout/format	2010-02-23 20:03:36.000000000 +0000
@@ -0,0 +1 @@
+Bazaar Working Tree Format 6 (bzr 1.14)
diff -Nru lubuntu-default-settings-0.6/.bzr/checkout/merge-hashes lubuntu-default-settings-0.7~ppa9~1/.bzr/checkout/merge-hashes
--- lubuntu-default-settings-0.6/.bzr/checkout/merge-hashes	1970-01-01 00:00:00.000000000 +0000
+++ lubuntu-default-settings-0.7~ppa9~1/.bzr/checkout/merge-hashes	2010-04-28 22:24:15.000000000 +0000
@@ -0,0 +1,15 @@
+BZR merge-modified list format 1
+file_id: lxdm.conf-20100214105318-0p94vgi8pan77b0l-3
+hash: e0ffb33680b09627b4eeca15fbc35584f93fbd23
+
+file_id: rc.xml-20090905200420-demo27yfyp19mw7b-36
+hash: a27b6e8c19e546c77a5a059b69bd434f9a9d6c77
+
+file_id: changelog-20090905200420-demo27yfyp19mw7b-6
+hash: 4e784a69021974c2ca420df35da00ddc45f8f48a
+
+file_id: startlubuntu-20090905200420-demo27yfyp19mw7b-17
+hash: 64ed8ff8eaeddfd0288d728f7621194fdc8d4e7e
+
+file_id: startlubuntunetbook-20100214104823-mttmzks5sa757aj8-1
+hash: e4ba9efcac984b4f9e8cd1a982678c0b6bbabbe9
diff -Nru lubuntu-default-settings-0.6/.bzr/README lubuntu-default-settings-0.7~ppa9~1/.bzr/README
--- lubuntu-default-settings-0.6/.bzr/README	1970-01-01 00:00:00.000000000 +0000
+++ lubuntu-default-settings-0.7~ppa9~1/.bzr/README	2010-02-23 20:03:35.000000000 +0000
@@ -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.
diff -Nru lubuntu-default-settings-0.6/.bzr/repository/format lubuntu-default-settings-0.7~ppa9~1/.bzr/repository/format
--- lubuntu-default-settings-0.6/.bzr/repository/format	1970-01-01 00:00:00.000000000 +0000
+++ lubuntu-default-settings-0.7~ppa9~1/.bzr/repository/format	2010-02-23 20:03:35.000000000 +0000
@@ -0,0 +1 @@
+Bazaar pack repository format 1 (needs bzr 0.92)
Binary files /tmp/i0zzy97OUY/lubuntu-default-settings-0.6/.bzr/repository/indices/067e03d824dcb4c4afa1012bf3480b5d.iix and /tmp/jJaPPO5OkT/lubuntu-default-settings-0.7~ppa9~1/.bzr/repository/indices/067e03d824dcb4c4afa1012bf3480b5d.iix differ
Binary files /tmp/i0zzy97OUY/lubuntu-default-settings-0.6/.bzr/repository/indices/067e03d824dcb4c4afa1012bf3480b5d.rix and /tmp/jJaPPO5OkT/lubuntu-default-settings-0.7~ppa9~1/.bzr/repository/indices/067e03d824dcb4c4afa1012bf3480b5d.rix differ
diff -Nru lubuntu-default-settings-0.6/.bzr/repository/indices/067e03d824dcb4c4afa1012bf3480b5d.six lubuntu-default-settings-0.7~ppa9~1/.bzr/repository/indices/067e03d824dcb4c4afa1012bf3480b5d.six
--- lubuntu-default-settings-0.6/.bzr/repository/indices/067e03d824dcb4c4afa1012bf3480b5d.six	1970-01-01 00:00:00.000000000 +0000
+++ lubuntu-default-settings-0.7~ppa9~1/.bzr/repository/indices/067e03d824dcb4c4afa1012bf3480b5d.six	2010-02-27 17:07:53.000000000 +0000
@@ -0,0 +1,5 @@
+Bazaar Graph Index 1
+node_ref_lists=0
+key_elements=1
+len=0
+
Binary files /tmp/i0zzy97OUY/lubuntu-default-settings-0.6/.bzr/repository/indices/067e03d824dcb4c4afa1012bf3480b5d.tix and /tmp/jJaPPO5OkT/lubuntu-default-settings-0.7~ppa9~1/.bzr/repository/indices/067e03d824dcb4c4afa1012bf3480b5d.tix differ
Binary files /tmp/i0zzy97OUY/lubuntu-default-settings-0.6/.bzr/repository/indices/bf0f9abafb4256728d724c6e996d589e.iix and /tmp/jJaPPO5OkT/lubuntu-default-settings-0.7~ppa9~1/.bzr/repository/indices/bf0f9abafb4256728d724c6e996d589e.iix differ
Binary files /tmp/i0zzy97OUY/lubuntu-default-settings-0.6/.bzr/repository/indices/bf0f9abafb4256728d724c6e996d589e.rix and /tmp/jJaPPO5OkT/lubuntu-default-settings-0.7~ppa9~1/.bzr/repository/indices/bf0f9abafb4256728d724c6e996d589e.rix differ
diff -Nru lubuntu-default-settings-0.6/.bzr/repository/indices/bf0f9abafb4256728d724c6e996d589e.six lubuntu-default-settings-0.7~ppa9~1/.bzr/repository/indices/bf0f9abafb4256728d724c6e996d589e.six
--- lubuntu-default-settings-0.6/.bzr/repository/indices/bf0f9abafb4256728d724c6e996d589e.six	1970-01-01 00:00:00.000000000 +0000
+++ lubuntu-default-settings-0.7~ppa9~1/.bzr/repository/indices/bf0f9abafb4256728d724c6e996d589e.six	2010-03-07 13:34:56.000000000 +0000
@@ -0,0 +1,5 @@
+Bazaar Graph Index 1
+node_ref_lists=0
+key_elements=1
+len=0
+
Binary files /tmp/i0zzy97OUY/lubuntu-default-settings-0.6/.bzr/repository/indices/bf0f9abafb4256728d724c6e996d589e.tix and /tmp/jJaPPO5OkT/lubuntu-default-settings-0.7~ppa9~1/.bzr/repository/indices/bf0f9abafb4256728d724c6e996d589e.tix differ
Binary files /tmp/i0zzy97OUY/lubuntu-default-settings-0.6/.bzr/repository/indices/c1467814dc1f5bef094692d97758d6e3.iix and /tmp/jJaPPO5OkT/lubuntu-default-settings-0.7~ppa9~1/.bzr/repository/indices/c1467814dc1f5bef094692d97758d6e3.iix differ
Binary files /tmp/i0zzy97OUY/lubuntu-default-settings-0.6/.bzr/repository/indices/c1467814dc1f5bef094692d97758d6e3.rix and /tmp/jJaPPO5OkT/lubuntu-default-settings-0.7~ppa9~1/.bzr/repository/indices/c1467814dc1f5bef094692d97758d6e3.rix differ
diff -Nru lubuntu-default-settings-0.6/.bzr/repository/indices/c1467814dc1f5bef094692d97758d6e3.six lubuntu-default-settings-0.7~ppa9~1/.bzr/repository/indices/c1467814dc1f5bef094692d97758d6e3.six
--- lubuntu-default-settings-0.6/.bzr/repository/indices/c1467814dc1f5bef094692d97758d6e3.six	1970-01-01 00:00:00.000000000 +0000
+++ lubuntu-default-settings-0.7~ppa9~1/.bzr/repository/indices/c1467814dc1f5bef094692d97758d6e3.six	2010-04-28 22:27:49.000000000 +0000
@@ -0,0 +1,5 @@
+Bazaar Graph Index 1
+node_ref_lists=0
+key_elements=1
+len=0
+
Binary files /tmp/i0zzy97OUY/lubuntu-default-settings-0.6/.bzr/repository/indices/c1467814dc1f5bef094692d97758d6e3.tix and /tmp/jJaPPO5OkT/lubuntu-default-settings-0.7~ppa9~1/.bzr/repository/indices/c1467814dc1f5bef094692d97758d6e3.tix differ
Binary files /tmp/i0zzy97OUY/lubuntu-default-settings-0.6/.bzr/repository/indices/ca2b93a99485688f595212603ab9328e.iix and /tmp/jJaPPO5OkT/lubuntu-default-settings-0.7~ppa9~1/.bzr/repository/indices/ca2b93a99485688f595212603ab9328e.iix differ
Binary files /tmp/i0zzy97OUY/lubuntu-default-settings-0.6/.bzr/repository/indices/ca2b93a99485688f595212603ab9328e.rix and /tmp/jJaPPO5OkT/lubuntu-default-settings-0.7~ppa9~1/.bzr/repository/indices/ca2b93a99485688f595212603ab9328e.rix differ
diff -Nru lubuntu-default-settings-0.6/.bzr/repository/indices/ca2b93a99485688f595212603ab9328e.six lubuntu-default-settings-0.7~ppa9~1/.bzr/repository/indices/ca2b93a99485688f595212603ab9328e.six
--- lubuntu-default-settings-0.6/.bzr/repository/indices/ca2b93a99485688f595212603ab9328e.six	1970-01-01 00:00:00.000000000 +0000
+++ lubuntu-default-settings-0.7~ppa9~1/.bzr/repository/indices/ca2b93a99485688f595212603ab9328e.six	2010-02-23 20:03:35.000000000 +0000
@@ -0,0 +1,5 @@
+Bazaar Graph Index 1
+node_ref_lists=0
+key_elements=1
+len=0
+
Binary files /tmp/i0zzy97OUY/lubuntu-default-settings-0.6/.bzr/repository/indices/ca2b93a99485688f595212603ab9328e.tix and /tmp/jJaPPO5OkT/lubuntu-default-settings-0.7~ppa9~1/.bzr/repository/indices/ca2b93a99485688f595212603ab9328e.tix differ
Binary files /tmp/i0zzy97OUY/lubuntu-default-settings-0.6/.bzr/repository/obsolete_packs/60e6867a64cb1b465d2351cf9e3ba1e2.iix and /tmp/jJaPPO5OkT/lubuntu-default-settings-0.7~ppa9~1/.bzr/repository/obsolete_packs/60e6867a64cb1b465d2351cf9e3ba1e2.iix differ
Binary files /tmp/i0zzy97OUY/lubuntu-default-settings-0.6/.bzr/repository/obsolete_packs/60e6867a64cb1b465d2351cf9e3ba1e2.pack and /tmp/jJaPPO5OkT/lubuntu-default-settings-0.7~ppa9~1/.bzr/repository/obsolete_packs/60e6867a64cb1b465d2351cf9e3ba1e2.pack differ
Binary files /tmp/i0zzy97OUY/lubuntu-default-settings-0.6/.bzr/repository/obsolete_packs/60e6867a64cb1b465d2351cf9e3ba1e2.rix and /tmp/jJaPPO5OkT/lubuntu-default-settings-0.7~ppa9~1/.bzr/repository/obsolete_packs/60e6867a64cb1b465d2351cf9e3ba1e2.rix differ
diff -Nru lubuntu-default-settings-0.6/.bzr/repository/obsolete_packs/60e6867a64cb1b465d2351cf9e3ba1e2.six lubuntu-default-settings-0.7~ppa9~1/.bzr/repository/obsolete_packs/60e6867a64cb1b465d2351cf9e3ba1e2.six
--- lubuntu-default-settings-0.6/.bzr/repository/obsolete_packs/60e6867a64cb1b465d2351cf9e3ba1e2.six	1970-01-01 00:00:00.000000000 +0000
+++ lubuntu-default-settings-0.7~ppa9~1/.bzr/repository/obsolete_packs/60e6867a64cb1b465d2351cf9e3ba1e2.six	2010-04-10 16:52:38.000000000 +0000
@@ -0,0 +1,5 @@
+Bazaar Graph Index 1
+node_ref_lists=0
+key_elements=1
+len=0
+
Binary files /tmp/i0zzy97OUY/lubuntu-default-settings-0.6/.bzr/repository/obsolete_packs/60e6867a64cb1b465d2351cf9e3ba1e2.tix and /tmp/jJaPPO5OkT/lubuntu-default-settings-0.7~ppa9~1/.bzr/repository/obsolete_packs/60e6867a64cb1b465d2351cf9e3ba1e2.tix differ
Binary files /tmp/i0zzy97OUY/lubuntu-default-settings-0.6/.bzr/repository/obsolete_packs/612d3fff783b06472db3376303ede278.iix and /tmp/jJaPPO5OkT/lubuntu-default-settings-0.7~ppa9~1/.bzr/repository/obsolete_packs/612d3fff783b06472db3376303ede278.iix differ
Binary files /tmp/i0zzy97OUY/lubuntu-default-settings-0.6/.bzr/repository/obsolete_packs/612d3fff783b06472db3376303ede278.pack and /tmp/jJaPPO5OkT/lubuntu-default-settings-0.7~ppa9~1/.bzr/repository/obsolete_packs/612d3fff783b06472db3376303ede278.pack differ
Binary files /tmp/i0zzy97OUY/lubuntu-default-settings-0.6/.bzr/repository/obsolete_packs/612d3fff783b06472db3376303ede278.rix and /tmp/jJaPPO5OkT/lubuntu-default-settings-0.7~ppa9~1/.bzr/repository/obsolete_packs/612d3fff783b06472db3376303ede278.rix differ
diff -Nru lubuntu-default-settings-0.6/.bzr/repository/obsolete_packs/612d3fff783b06472db3376303ede278.six lubuntu-default-settings-0.7~ppa9~1/.bzr/repository/obsolete_packs/612d3fff783b06472db3376303ede278.six
--- lubuntu-default-settings-0.6/.bzr/repository/obsolete_packs/612d3fff783b06472db3376303ede278.six	1970-01-01 00:00:00.000000000 +0000
+++ lubuntu-default-settings-0.7~ppa9~1/.bzr/repository/obsolete_packs/612d3fff783b06472db3376303ede278.six	2010-04-10 16:49:51.000000000 +0000
@@ -0,0 +1,5 @@
+Bazaar Graph Index 1
+node_ref_lists=0
+key_elements=1
+len=0
+
Binary files /tmp/i0zzy97OUY/lubuntu-default-settings-0.6/.bzr/repository/obsolete_packs/612d3fff783b06472db3376303ede278.tix and /tmp/jJaPPO5OkT/lubuntu-default-settings-0.7~ppa9~1/.bzr/repository/obsolete_packs/612d3fff783b06472db3376303ede278.tix differ
Binary files /tmp/i0zzy97OUY/lubuntu-default-settings-0.6/.bzr/repository/obsolete_packs/7d231433c82f6f024161d8b4dcaabf6a.iix and /tmp/jJaPPO5OkT/lubuntu-default-settings-0.7~ppa9~1/.bzr/repository/obsolete_packs/7d231433c82f6f024161d8b4dcaabf6a.iix differ
Binary files /tmp/i0zzy97OUY/lubuntu-default-settings-0.6/.bzr/repository/obsolete_packs/7d231433c82f6f024161d8b4dcaabf6a.pack and /tmp/jJaPPO5OkT/lubuntu-default-settings-0.7~ppa9~1/.bzr/repository/obsolete_packs/7d231433c82f6f024161d8b4dcaabf6a.pack differ
Binary files /tmp/i0zzy97OUY/lubuntu-default-settings-0.6/.bzr/repository/obsolete_packs/7d231433c82f6f024161d8b4dcaabf6a.rix and /tmp/jJaPPO5OkT/lubuntu-default-settings-0.7~ppa9~1/.bzr/repository/obsolete_packs/7d231433c82f6f024161d8b4dcaabf6a.rix differ
diff -Nru lubuntu-default-settings-0.6/.bzr/repository/obsolete_packs/7d231433c82f6f024161d8b4dcaabf6a.six lubuntu-default-settings-0.7~ppa9~1/.bzr/repository/obsolete_packs/7d231433c82f6f024161d8b4dcaabf6a.six
--- lubuntu-default-settings-0.6/.bzr/repository/obsolete_packs/7d231433c82f6f024161d8b4dcaabf6a.six	1970-01-01 00:00:00.000000000 +0000
+++ lubuntu-default-settings-0.7~ppa9~1/.bzr/repository/obsolete_packs/7d231433c82f6f024161d8b4dcaabf6a.six	2010-04-10 16:49:57.000000000 +0000
@@ -0,0 +1,5 @@
+Bazaar Graph Index 1
+node_ref_lists=0
+key_elements=1
+len=0
+
Binary files /tmp/i0zzy97OUY/lubuntu-default-settings-0.6/.bzr/repository/obsolete_packs/7d231433c82f6f024161d8b4dcaabf6a.tix and /tmp/jJaPPO5OkT/lubuntu-default-settings-0.7~ppa9~1/.bzr/repository/obsolete_packs/7d231433c82f6f024161d8b4dcaabf6a.tix differ
Binary files /tmp/i0zzy97OUY/lubuntu-default-settings-0.6/.bzr/repository/obsolete_packs/b6b6d491d07e0dce41e7ed4f8ca345a5.iix and /tmp/jJaPPO5OkT/lubuntu-default-settings-0.7~ppa9~1/.bzr/repository/obsolete_packs/b6b6d491d07e0dce41e7ed4f8ca345a5.iix differ
Binary files /tmp/i0zzy97OUY/lubuntu-default-settings-0.6/.bzr/repository/obsolete_packs/b6b6d491d07e0dce41e7ed4f8ca345a5.pack and /tmp/jJaPPO5OkT/lubuntu-default-settings-0.7~ppa9~1/.bzr/repository/obsolete_packs/b6b6d491d07e0dce41e7ed4f8ca345a5.pack differ
Binary files /tmp/i0zzy97OUY/lubuntu-default-settings-0.6/.bzr/repository/obsolete_packs/b6b6d491d07e0dce41e7ed4f8ca345a5.rix and /tmp/jJaPPO5OkT/lubuntu-default-settings-0.7~ppa9~1/.bzr/repository/obsolete_packs/b6b6d491d07e0dce41e7ed4f8ca345a5.rix differ
diff -Nru lubuntu-default-settings-0.6/.bzr/repository/obsolete_packs/b6b6d491d07e0dce41e7ed4f8ca345a5.six lubuntu-default-settings-0.7~ppa9~1/.bzr/repository/obsolete_packs/b6b6d491d07e0dce41e7ed4f8ca345a5.six
--- lubuntu-default-settings-0.6/.bzr/repository/obsolete_packs/b6b6d491d07e0dce41e7ed4f8ca345a5.six	1970-01-01 00:00:00.000000000 +0000
+++ lubuntu-default-settings-0.7~ppa9~1/.bzr/repository/obsolete_packs/b6b6d491d07e0dce41e7ed4f8ca345a5.six	2010-03-20 10:00:09.000000000 +0000
@@ -0,0 +1,5 @@
+Bazaar Graph Index 1
+node_ref_lists=0
+key_elements=1
+len=0
+
Binary files /tmp/i0zzy97OUY/lubuntu-default-settings-0.6/.bzr/repository/obsolete_packs/b6b6d491d07e0dce41e7ed4f8ca345a5.tix and /tmp/jJaPPO5OkT/lubuntu-default-settings-0.7~ppa9~1/.bzr/repository/obsolete_packs/b6b6d491d07e0dce41e7ed4f8ca345a5.tix differ
Binary files /tmp/i0zzy97OUY/lubuntu-default-settings-0.6/.bzr/repository/obsolete_packs/bc5d8eab6f5ec769353e9fc78b62ae99.iix and /tmp/jJaPPO5OkT/lubuntu-default-settings-0.7~ppa9~1/.bzr/repository/obsolete_packs/bc5d8eab6f5ec769353e9fc78b62ae99.iix differ
Binary files /tmp/i0zzy97OUY/lubuntu-default-settings-0.6/.bzr/repository/obsolete_packs/bc5d8eab6f5ec769353e9fc78b62ae99.pack and /tmp/jJaPPO5OkT/lubuntu-default-settings-0.7~ppa9~1/.bzr/repository/obsolete_packs/bc5d8eab6f5ec769353e9fc78b62ae99.pack differ
Binary files /tmp/i0zzy97OUY/lubuntu-default-settings-0.6/.bzr/repository/obsolete_packs/bc5d8eab6f5ec769353e9fc78b62ae99.rix and /tmp/jJaPPO5OkT/lubuntu-default-settings-0.7~ppa9~1/.bzr/repository/obsolete_packs/bc5d8eab6f5ec769353e9fc78b62ae99.rix differ
diff -Nru lubuntu-default-settings-0.6/.bzr/repository/obsolete_packs/bc5d8eab6f5ec769353e9fc78b62ae99.six lubuntu-default-settings-0.7~ppa9~1/.bzr/repository/obsolete_packs/bc5d8eab6f5ec769353e9fc78b62ae99.six
--- lubuntu-default-settings-0.6/.bzr/repository/obsolete_packs/bc5d8eab6f5ec769353e9fc78b62ae99.six	1970-01-01 00:00:00.000000000 +0000
+++ lubuntu-default-settings-0.7~ppa9~1/.bzr/repository/obsolete_packs/bc5d8eab6f5ec769353e9fc78b62ae99.six	2010-04-28 22:27:49.000000000 +0000
@@ -0,0 +1,5 @@
+Bazaar Graph Index 1
+node_ref_lists=0
+key_elements=1
+len=0
+
Binary files /tmp/i0zzy97OUY/lubuntu-default-settings-0.6/.bzr/repository/obsolete_packs/bc5d8eab6f5ec769353e9fc78b62ae99.tix and /tmp/jJaPPO5OkT/lubuntu-default-settings-0.7~ppa9~1/.bzr/repository/obsolete_packs/bc5d8eab6f5ec769353e9fc78b62ae99.tix differ
Binary files /tmp/i0zzy97OUY/lubuntu-default-settings-0.6/.bzr/repository/obsolete_packs/c6a754238168afd554ddd6a0eaba74d8.iix and /tmp/jJaPPO5OkT/lubuntu-default-settings-0.7~ppa9~1/.bzr/repository/obsolete_packs/c6a754238168afd554ddd6a0eaba74d8.iix differ
Binary files /tmp/i0zzy97OUY/lubuntu-default-settings-0.6/.bzr/repository/obsolete_packs/c6a754238168afd554ddd6a0eaba74d8.pack and /tmp/jJaPPO5OkT/lubuntu-default-settings-0.7~ppa9~1/.bzr/repository/obsolete_packs/c6a754238168afd554ddd6a0eaba74d8.pack differ
Binary files /tmp/i0zzy97OUY/lubuntu-default-settings-0.6/.bzr/repository/obsolete_packs/c6a754238168afd554ddd6a0eaba74d8.rix and /tmp/jJaPPO5OkT/lubuntu-default-settings-0.7~ppa9~1/.bzr/repository/obsolete_packs/c6a754238168afd554ddd6a0eaba74d8.rix differ
diff -Nru lubuntu-default-settings-0.6/.bzr/repository/obsolete_packs/c6a754238168afd554ddd6a0eaba74d8.six lubuntu-default-settings-0.7~ppa9~1/.bzr/repository/obsolete_packs/c6a754238168afd554ddd6a0eaba74d8.six
--- lubuntu-default-settings-0.6/.bzr/repository/obsolete_packs/c6a754238168afd554ddd6a0eaba74d8.six	1970-01-01 00:00:00.000000000 +0000
+++ lubuntu-default-settings-0.7~ppa9~1/.bzr/repository/obsolete_packs/c6a754238168afd554ddd6a0eaba74d8.six	2010-04-28 22:24:14.000000000 +0000
@@ -0,0 +1,5 @@
+Bazaar Graph Index 1
+node_ref_lists=0
+key_elements=1
+len=0
+
Binary files /tmp/i0zzy97OUY/lubuntu-default-settings-0.6/.bzr/repository/obsolete_packs/c6a754238168afd554ddd6a0eaba74d8.tix and /tmp/jJaPPO5OkT/lubuntu-default-settings-0.7~ppa9~1/.bzr/repository/obsolete_packs/c6a754238168afd554ddd6a0eaba74d8.tix differ
Binary files /tmp/i0zzy97OUY/lubuntu-default-settings-0.6/.bzr/repository/obsolete_packs/eb8bb9686326fe834eb8e92390c97cef.iix and /tmp/jJaPPO5OkT/lubuntu-default-settings-0.7~ppa9~1/.bzr/repository/obsolete_packs/eb8bb9686326fe834eb8e92390c97cef.iix differ
Binary files /tmp/i0zzy97OUY/lubuntu-default-settings-0.6/.bzr/repository/obsolete_packs/eb8bb9686326fe834eb8e92390c97cef.pack and /tmp/jJaPPO5OkT/lubuntu-default-settings-0.7~ppa9~1/.bzr/repository/obsolete_packs/eb8bb9686326fe834eb8e92390c97cef.pack differ
Binary files /tmp/i0zzy97OUY/lubuntu-default-settings-0.6/.bzr/repository/obsolete_packs/eb8bb9686326fe834eb8e92390c97cef.rix and /tmp/jJaPPO5OkT/lubuntu-default-settings-0.7~ppa9~1/.bzr/repository/obsolete_packs/eb8bb9686326fe834eb8e92390c97cef.rix differ
diff -Nru lubuntu-default-settings-0.6/.bzr/repository/obsolete_packs/eb8bb9686326fe834eb8e92390c97cef.six lubuntu-default-settings-0.7~ppa9~1/.bzr/repository/obsolete_packs/eb8bb9686326fe834eb8e92390c97cef.six
--- lubuntu-default-settings-0.6/.bzr/repository/obsolete_packs/eb8bb9686326fe834eb8e92390c97cef.six	1970-01-01 00:00:00.000000000 +0000
+++ lubuntu-default-settings-0.7~ppa9~1/.bzr/repository/obsolete_packs/eb8bb9686326fe834eb8e92390c97cef.six	2010-04-10 18:48:41.000000000 +0000
@@ -0,0 +1,5 @@
+Bazaar Graph Index 1
+node_ref_lists=0
+key_elements=1
+len=0
+
Binary files /tmp/i0zzy97OUY/lubuntu-default-settings-0.6/.bzr/repository/obsolete_packs/eb8bb9686326fe834eb8e92390c97cef.tix and /tmp/jJaPPO5OkT/lubuntu-default-settings-0.7~ppa9~1/.bzr/repository/obsolete_packs/eb8bb9686326fe834eb8e92390c97cef.tix differ
Binary files /tmp/i0zzy97OUY/lubuntu-default-settings-0.6/.bzr/repository/obsolete_packs/f6a4071d8f258f6f04653fe904aca8a3.iix and /tmp/jJaPPO5OkT/lubuntu-default-settings-0.7~ppa9~1/.bzr/repository/obsolete_packs/f6a4071d8f258f6f04653fe904aca8a3.iix differ
Binary files /tmp/i0zzy97OUY/lubuntu-default-settings-0.6/.bzr/repository/obsolete_packs/f6a4071d8f258f6f04653fe904aca8a3.pack and /tmp/jJaPPO5OkT/lubuntu-default-settings-0.7~ppa9~1/.bzr/repository/obsolete_packs/f6a4071d8f258f6f04653fe904aca8a3.pack differ
Binary files /tmp/i0zzy97OUY/lubuntu-default-settings-0.6/.bzr/repository/obsolete_packs/f6a4071d8f258f6f04653fe904aca8a3.rix and /tmp/jJaPPO5OkT/lubuntu-default-settings-0.7~ppa9~1/.bzr/repository/obsolete_packs/f6a4071d8f258f6f04653fe904aca8a3.rix differ
diff -Nru lubuntu-default-settings-0.6/.bzr/repository/obsolete_packs/f6a4071d8f258f6f04653fe904aca8a3.six lubuntu-default-settings-0.7~ppa9~1/.bzr/repository/obsolete_packs/f6a4071d8f258f6f04653fe904aca8a3.six
--- lubuntu-default-settings-0.6/.bzr/repository/obsolete_packs/f6a4071d8f258f6f04653fe904aca8a3.six	1970-01-01 00:00:00.000000000 +0000
+++ lubuntu-default-settings-0.7~ppa9~1/.bzr/repository/obsolete_packs/f6a4071d8f258f6f04653fe904aca8a3.six	2010-03-20 10:00:39.000000000 +0000
@@ -0,0 +1,5 @@
+Bazaar Graph Index 1
+node_ref_lists=0
+key_elements=1
+len=0
+
Binary files /tmp/i0zzy97OUY/lubuntu-default-settings-0.6/.bzr/repository/obsolete_packs/f6a4071d8f258f6f04653fe904aca8a3.tix and /tmp/jJaPPO5OkT/lubuntu-default-settings-0.7~ppa9~1/.bzr/repository/obsolete_packs/f6a4071d8f258f6f04653fe904aca8a3.tix differ
Binary files /tmp/i0zzy97OUY/lubuntu-default-settings-0.6/.bzr/repository/pack-names and /tmp/jJaPPO5OkT/lubuntu-default-settings-0.7~ppa9~1/.bzr/repository/pack-names differ
Binary files /tmp/i0zzy97OUY/lubuntu-default-settings-0.6/.bzr/repository/packs/067e03d824dcb4c4afa1012bf3480b5d.pack and /tmp/jJaPPO5OkT/lubuntu-default-settings-0.7~ppa9~1/.bzr/repository/packs/067e03d824dcb4c4afa1012bf3480b5d.pack differ
Binary files /tmp/i0zzy97OUY/lubuntu-default-settings-0.6/.bzr/repository/packs/bf0f9abafb4256728d724c6e996d589e.pack and /tmp/jJaPPO5OkT/lubuntu-default-settings-0.7~ppa9~1/.bzr/repository/packs/bf0f9abafb4256728d724c6e996d589e.pack differ
Binary files /tmp/i0zzy97OUY/lubuntu-default-settings-0.6/.bzr/repository/packs/c1467814dc1f5bef094692d97758d6e3.pack and /tmp/jJaPPO5OkT/lubuntu-default-settings-0.7~ppa9~1/.bzr/repository/packs/c1467814dc1f5bef094692d97758d6e3.pack differ
Binary files /tmp/i0zzy97OUY/lubuntu-default-settings-0.6/.bzr/repository/packs/ca2b93a99485688f595212603ab9328e.pack and /tmp/jJaPPO5OkT/lubuntu-default-settings-0.7~ppa9~1/.bzr/repository/packs/ca2b93a99485688f595212603ab9328e.pack differ
diff -Nru lubuntu-default-settings-0.6/.bzr-builddeb/default.conf lubuntu-default-settings-0.7~ppa9~1/.bzr-builddeb/default.conf
--- lubuntu-default-settings-0.6/.bzr-builddeb/default.conf	1970-01-01 00:00:00.000000000 +0000
+++ lubuntu-default-settings-0.7~ppa9~1/.bzr-builddeb/default.conf	2010-02-23 20:03:36.000000000 +0000
@@ -0,0 +1,2 @@
+[BUILDDEB]
+native = True
diff -Nru lubuntu-default-settings-0.6/debian/changelog lubuntu-default-settings-0.7~ppa9~1/debian/changelog
--- lubuntu-default-settings-0.6/debian/changelog	2010-02-28 23:35:48.000000000 +0000
+++ lubuntu-default-settings-0.7~ppa9~1/debian/changelog	2010-09-26 16:53:14.000000000 +0000
@@ -1,3 +1,31 @@
+lubuntu-default-settings (0.7~ppa9~1) lucid; urgency=low
+
+  * debian/prerm:
+   - Don't remove alternative on upgrade (LP: #625485)
+
+ -- Julien Lavergne <gilir@ubuntu.com>  Sun, 26 Sep 2010 18:52:41 +0200
+
+lubuntu-default-settings (0.7~ppa8) lucid; urgency=low
+
+  * usr/bin/start* :
+   - Ensure the menu prefix
+  * etc/xdg/lubuntu/lxdm/lxdm.conf
+   - Make Lubuntu the default session by using the [base] session key.
+   - Remove last_*, not provided by lxdm.conf in recent lxdm version.
+  * usr/share/lubuntu/openbox/rc.xml
+   - Add missing shortcuts for volume-up and volume-down, and launching
+     various applications. Thanks Kendall Weaver for the patch.
+  * debian/control
+   - Depends on the re-written pcmanfm2 (>= 0.7.0)
+   - Wrap build-depends and depends.
+  * usr/share/lubuntu/openbox/menu.xml:
+   - Use new command to launch desktop settings.
+  * autostart: 
+   - Use new pcmanfm --desktop command to start pcmanfm with desktop management
+  * Use pcmanfm2.desktop in lxpanel panel settings.
+
+ -- Julien Lavergne <gilir@ubuntu.com>  Thu, 29 Apr 2010 00:27:53 +0200
+
 lubuntu-default-settings (0.6) lucid; urgency=low
 
   * Set iconsize to 22 and panel height to 24 for panel settings. It displays
diff -Nru lubuntu-default-settings-0.6/debian/control lubuntu-default-settings-0.7~ppa9~1/debian/control
--- lubuntu-default-settings-0.6/debian/control	2010-02-28 23:35:48.000000000 +0000
+++ lubuntu-default-settings-0.7~ppa9~1/debian/control	2010-04-10 16:51:46.000000000 +0000
@@ -2,7 +2,8 @@
 Section: x11
 Priority: optional
 Maintainer: Julien Lavergne <gilir@ubuntu.com>
-Build-Depends: debhelper (>= 7), intltool
+Build-Depends: debhelper (>= 7), 
+               intltool
 Standards-Version: 3.8.3
 Homepage: https://launchpad.net/~lubuntu-desktop
 Vcs-Bzr: lp:~lubuntu-desktop/+junk/lubuntu-default-settings
@@ -10,6 +11,10 @@
 
 Package: lubuntu-default-settings
 Architecture: all
-Depends: ${misc:Depends}, lxsession (>= 0.4.1), lubuntu-artwork (>= 0.4), elementary-icon-theme
+Depends: ${misc:Depends}, 
+         lxsession (>= 0.4.1), 
+         lubuntu-artwork (>= 0.4), 
+         elementary-icon-theme,
+         pcmanfm2 (>= 0.7.0)
 Description: default settings for Lubuntu
  Various system settings tailored for Lubuntu.
diff -Nru lubuntu-default-settings-0.6/debian/prerm lubuntu-default-settings-0.7~ppa9~1/debian/prerm
--- lubuntu-default-settings-0.6/debian/prerm	2010-02-28 23:35:48.000000000 +0000
+++ lubuntu-default-settings-0.7~ppa9~1/debian/prerm	2010-09-26 16:53:37.000000000 +0000
@@ -2,7 +2,7 @@
 
 set -e
 
-if [ "$1" = "remove" ] || [ "$1" = upgrade ]; then
+if [ "$1" = "remove" ] ; then
   update-alternatives --remove lxdm.conf /etc/xdg/lubuntu/lxdm/lxdm.conf 
 fi
 
diff -Nru lubuntu-default-settings-0.6/etc/xdg/lubuntu/libfm/libfm.conf lubuntu-default-settings-0.7~ppa9~1/etc/xdg/lubuntu/libfm/libfm.conf
--- lubuntu-default-settings-0.6/etc/xdg/lubuntu/libfm/libfm.conf	1970-01-01 00:00:00.000000000 +0000
+++ lubuntu-default-settings-0.7~ppa9~1/etc/xdg/lubuntu/libfm/libfm.conf	2010-03-17 22:08:28.000000000 +0000
@@ -0,0 +1,14 @@
+[config]
+single_click=0
+use_trash=1
+confirm_del=1
+terminal=lxterminal %s
+thumbnail_local=1
+thumbnail_max=2048
+
+[ui]
+big_icon_size=48
+small_icon_size=24
+pane_icon_size=24
+thumbnail_size=128
+show_thumbnail=1
diff -Nru lubuntu-default-settings-0.6/etc/xdg/lubuntu/lxdm/lxdm.conf lubuntu-default-settings-0.7~ppa9~1/etc/xdg/lubuntu/lxdm/lxdm.conf
--- lubuntu-default-settings-0.6/etc/xdg/lubuntu/lxdm/lxdm.conf	2010-02-28 23:35:48.000000000 +0000
+++ lubuntu-default-settings-0.7~ppa9~1/etc/xdg/lubuntu/lxdm/lxdm.conf	2010-04-28 22:24:14.000000000 +0000
@@ -1,13 +1,9 @@
 [base]
 # autologin=dgod
-# session=/usr/bin/startlubuntu
+session=/usr/bin/startlubuntu
 # numlock=0
 greeter=/usr/lib/lxdm/lxdm-greeter-gtk
 
-last_session=Lubuntu.desktop
-
-last_lang=
-
 [server]
 # arg=/usr/bin/X -nr vt1
 
diff -Nru lubuntu-default-settings-0.6/etc/xdg/lxsession/Lubuntu/autostart lubuntu-default-settings-0.7~ppa9~1/etc/xdg/lxsession/Lubuntu/autostart
--- lubuntu-default-settings-0.6/etc/xdg/lxsession/Lubuntu/autostart	2010-02-28 23:35:48.000000000 +0000
+++ lubuntu-default-settings-0.7~ppa9~1/etc/xdg/lxsession/Lubuntu/autostart	2010-03-07 12:11:06.000000000 +0000
@@ -2,5 +2,5 @@
 @lxpanel --profile Lubuntu
 @xscreensaver -no-splash
 @gnome-power-manager
-@pcmanfm -d
+@pcmanfm --desktop --profile lubuntu
 @/usr/lib/policykit-1-gnome/polkit-gnome-authentication-agent-1
diff -Nru lubuntu-default-settings-0.6/etc/xdg/lxsession/Lubuntu-Netbook/autostart lubuntu-default-settings-0.7~ppa9~1/etc/xdg/lxsession/Lubuntu-Netbook/autostart
--- lubuntu-default-settings-0.6/etc/xdg/lxsession/Lubuntu-Netbook/autostart	2010-02-28 23:35:48.000000000 +0000
+++ lubuntu-default-settings-0.7~ppa9~1/etc/xdg/lxsession/Lubuntu-Netbook/autostart	2010-02-28 23:44:24.000000000 +0000
@@ -3,5 +3,5 @@
 @lxpanel --profile Lubuntu
 @xscreensaver -no-splash
 @gnome-power-manager
-@pcmanfm -d
+@pcmanfm --desktop
 @/usr/lib/policykit-1-gnome/polkit-gnome-authentication-agent-1
diff -Nru lubuntu-default-settings-0.6/etc/xdg/pcmanfm/lubuntu.conf lubuntu-default-settings-0.7~ppa9~1/etc/xdg/pcmanfm/lubuntu.conf
--- lubuntu-default-settings-0.6/etc/xdg/pcmanfm/lubuntu.conf	1970-01-01 00:00:00.000000000 +0000
+++ lubuntu-default-settings-0.7~ppa9~1/etc/xdg/pcmanfm/lubuntu.conf	2010-03-17 22:14:40.000000000 +0000
@@ -0,0 +1,20 @@
+[config]
+bm_open_method=0
+su_cmd=gksu %s
+
+[desktop]
+wallpaper_mode=1
+wallpaper=/usr/share/lubuntu/wallpapers/lubuntu-default-wallpaper.png
+desktop_bg=#000000
+desktop_fg=#ffffff
+desktop_shadow=#000000
+
+[ui]
+always_show_tabs=0
+hide_close_btn=0
+win_width=798
+win_height=547
+view_mode=0
+show_hidden=0
+sort_type=0
+sort_by=2
diff -Nru lubuntu-default-settings-0.6/usr/bin/startlubuntu lubuntu-default-settings-0.7~ppa9~1/usr/bin/startlubuntu
--- lubuntu-default-settings-0.6/usr/bin/startlubuntu	2010-02-28 23:35:48.000000000 +0000
+++ lubuntu-default-settings-0.7~ppa9~1/usr/bin/startlubuntu	2010-04-28 22:26:55.000000000 +0000
@@ -44,6 +44,9 @@
 # Clean up after GDM (GDM sets the number of desktops to one)
 xprop -root -remove _NET_NUMBER_OF_DESKTOPS -remove _NET_DESKTOP_NAMES -remove _NET_CURRENT_DESKTOP 2> /dev/null
 
+#Ensure the menu prefix
+export XDG_MENU_PREFIX="lxde-"
+
 # Enable GTK+2 integration for OpenOffice.org, if available.
 export SAL_USE_VCLPLUGIN=gtk
 
diff -Nru lubuntu-default-settings-0.6/usr/bin/startlubuntu-netbook lubuntu-default-settings-0.7~ppa9~1/usr/bin/startlubuntu-netbook
--- lubuntu-default-settings-0.6/usr/bin/startlubuntu-netbook	2010-02-28 23:35:48.000000000 +0000
+++ lubuntu-default-settings-0.7~ppa9~1/usr/bin/startlubuntu-netbook	2010-04-28 22:27:04.000000000 +0000
@@ -44,6 +44,9 @@
 # Clean up after GDM (GDM sets the number of desktops to one)
 xprop -root -remove _NET_NUMBER_OF_DESKTOPS -remove _NET_DESKTOP_NAMES -remove _NET_CURRENT_DESKTOP 2> /dev/null
 
+#Ensure the menu prefix
+export XDG_MENU_PREFIX="lxde-"
+
 # Enable GTK+2 integration for OpenOffice.org, if available.
 export SAL_USE_VCLPLUGIN=gtk
 
diff -Nru lubuntu-default-settings-0.6/usr/share/lubuntu/openbox/menu.xml lubuntu-default-settings-0.7~ppa9~1/usr/share/lubuntu/openbox/menu.xml
--- lubuntu-default-settings-0.6/usr/share/lubuntu/openbox/menu.xml	2010-02-28 23:35:48.000000000 +0000
+++ lubuntu-default-settings-0.7~ppa9~1/usr/share/lubuntu/openbox/menu.xml	2010-03-20 09:58:02.000000000 +0000
@@ -25,7 +25,7 @@
   <item label="Desktop Settings">
     <action name="Execute">
       <startupnotify><enabled>yes</enabled></startupnotify>
-      <command>pcmanfm --show-pref 2</command>
+      <command>pcmanfm --desktop-pref</command>
     </action>
   </item>
   <item label="Window Management Settings">
diff -Nru lubuntu-default-settings-0.6/usr/share/lubuntu/openbox/rc.xml lubuntu-default-settings-0.7~ppa9~1/usr/share/lubuntu/openbox/rc.xml
--- lubuntu-default-settings-0.6/usr/share/lubuntu/openbox/rc.xml	2010-02-28 23:35:48.000000000 +0000
+++ lubuntu-default-settings-0.7~ppa9~1/usr/share/lubuntu/openbox/rc.xml	2010-04-28 22:24:14.000000000 +0000
@@ -329,6 +329,48 @@
       </action>
     </keybind>  
     
+    <keybind key="XF86AudioRaiseVolume">
+      <action name="Execute">
+          <command>amixer -q sset Master 3%+</command>
+      </action>
+    </keybind>
+
+    <keybind key="XF86AudioLowerVolume">
+      <action name="Execute">
+          <command>amixer -q sset Master 3%-</command>
+      </action>
+    </keybind>
+
+    <keybind key="XF86AudioMute">
+      <action name="Execute">
+          <command>amixer -q sset Master toggle</command>
+      </action>
+    </keybind>
+
+    <keybind key="XF86WWW">
+      <action name="Execute">
+          <command>x-terminal-emulator</command>
+      </action>
+    </keybind>
+
+    <keybind key="XF86Calculator">
+      <action name="Execute">
+          <command>galculator</command>
+      </action>
+    </keybind>
+
+    <keybind key="XF86MyComputer">
+      <action name="Execute">
+          <command>pcmanfm2</command>
+      </action>
+    </keybind>
+
+    <keybind key="XF86Terminal">
+      <action name="Execute">
+          <command>x-terminal-emulator</command>
+      </action>
+    </keybind>
+
    <!-- Keybindings for Multimedia Keys and LCD Backlight (alternative when not using gnome-power-manager or xfce4-volumed)
    <keybind key="XF86AudioMute">
       <action name="Execute">
@@ -361,13 +403,6 @@
       </action>
     </keybind> -->
 
-    <!-- Taking Screenshots -->
-    <keybind key="Print">
-      <action name="Execute">
-        <execute>scrot</execute>
-      </action>
-    </keybind>
-
   </keyboard>
   <mouse>
     <dragThreshold>8</dragThreshold>
diff -Nru lubuntu-default-settings-0.6/usr/share/lxpanel/profile/Lubuntu/panels/panel lubuntu-default-settings-0.7~ppa9~1/usr/share/lxpanel/profile/Lubuntu/panels/panel
--- lubuntu-default-settings-0.6/usr/share/lxpanel/profile/Lubuntu/panels/panel	2010-02-28 23:35:48.000000000 +0000
+++ lubuntu-default-settings-0.7~ppa9~1/usr/share/lxpanel/profile/Lubuntu/panels/panel	2010-02-24 20:40:14.000000000 +0000
@@ -44,7 +44,7 @@
     type = launchbar
     Config {
         Button {
-            id=pcmanfm.desktop
+            id=pcmanfm2.desktop
         }
         Button {
             id=chromium-browser.desktop