[Pkg-chromium-commit] [SCM] Git repository for pkg-chromium branch, experimental, updated. debian/21.0.1180.57_r148591-1-4-g2bb621a

[Shawn Landden]

The following commit has been merged in the experimental branch:
commit 3c6a1499070ba24704516b787d30ba0bc702c332
Author: Shawn Landden <shawnlandden at gmail.com>
Date:   Tue Aug 7 15:58:15 2012 -0700

    master_prefs: don't go straight to internet, don't prompt to change default browser
    
    also an initial bookmarks file with Debian.org and Debian.org news
    
    Don't load chromium or debian.org internet pages immediately.

diff --git a/debian/chromium.install b/debian/chromium.install
index eb9a864..3366d3c 100644
--- a/debian/chromium.install
+++ b/debian/chromium.install
@@ -14,4 +14,5 @@ debian/tmp/usr/lib/chromium/pseudo_locales/fake-bidi.pak
 debian/chromium.desktop usr/share/applications
 debian/chromium.xml usr/share/gnome-control-center/default-apps
 debian/master_preferences etc/chromium
+debian/initial_bookmarks.html etc/chromium
 debian/presubj usr/share/bug/chromium
diff --git a/debian/initial_bookmarks.html b/debian/initial_bookmarks.html
new file mode 100644
index 0000000..b0fe65a
--- /dev/null
+++ b/debian/initial_bookmarks.html
@@ -0,0 +1,11 @@
+<!DOCTYPE NETSCAPE-Bookmark-file-1>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
+<TITLE>Bookmarks</TITLE>
+<H1>Bookmarks</H1>
+<DL><p>
+    <DT><H3 PERSONAL_TOOLBAR_FOLDER="true">Bookmarks Bar</H3>
+    <DL><p>
+        <DT><A HREF="http://www.debian.org/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABJ0lEQVQ4jcWTsVKDQBCGPxkbTQs0FmGcoUnjyAt4D3FDG94EfBKSFukpOXpGOxoLaGyCrdqJ1WUuFzLGyq1ubv/9d//79y6woiReexTBDoSHEAAjSvmgRuJBUmxNvGMXL3jJJkQG4OMqH1cBfBImLrtNSby2m+6LK8JeIaYG0rl8h6wVYjJJ9hOs+E4A3vGTB3i0CSTFtsPZmNgDdoWYWqLcvG+J8g5Zm/cdsq4I+wMpDaQKMdnFc1I1VhM4AAui4Iu3wQT1PAd24Rz2Uh+uuAng9aijtlW/yzW3wRKGlWnnnIQOWdtuVIS9rd8BGIkH3U0nRkrlIYW2ViGmJXfDB/eZvUwAPEFtT6GnayA9uUCm1lNLdHa0RPmRx/9CMrttfw39uX57wB98n5EuURHvVgAAAABJRU5ErkJggg==">Debian.org</A>
+        <DT><A HREF="http://www.debian.org/News/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABJ0lEQVQ4jcWTsVKDQBCGPxkbTQs0FmGcoUnjyAt4D3FDG94EfBKSFukpOXpGOxoLaGyCrdqJ1WUuFzLGyq1ubv/9d//79y6woiReexTBDoSHEAAjSvmgRuJBUmxNvGMXL3jJJkQG4OMqH1cBfBImLrtNSby2m+6LK8JeIaYG0rl8h6wVYjJJ9hOs+E4A3vGTB3i0CSTFtsPZmNgDdoWYWqLcvG+J8g5Zm/cdsq4I+wMpDaQKMdnFc1I1VhM4AAui4Iu3wQT1PAd24Rz2Uh+uuAng9aijtlW/yzW3wRKGlWnnnIQOWdtuVIS9rd8BGIkH3U0nRkrlIYW2ViGmJXfDB/eZvUwAPEFtT6GnayA9uUCm1lNLdHa0RPmRx/9CMrttfw39uX57wB98n5EuURHvVgAAAABJRU5ErkJggg==">Latest News</A>
+    </DL><p>
+</DL><p>
diff --git a/debian/master_preferences b/debian/master_preferences
index 2389f6a..db54668 100644
--- a/debian/master_preferences
+++ b/debian/master_preferences
@@ -1,19 +1,20 @@
 {
   "distribution": {
+     "import_bookmarks": false,
+     "import_bookmarks_from_file": "/etc/chromium/initial_bookmarks.html",
      "skip_first_run_ui": true,
      "make_chrome_default": false,
      "make_chrome_default_for_user": false,
      "create_all_shortcuts": true,
-     "show_welcome_page": true
+     "show_welcome_page": false
   },
   "browser": {
-     "show_home_button": true
+     "show_home_button": true,
+     "check_default_browser" : false
   },
   "bookmark_bar": {
      "show_on_all_tabs": true
   },
-  "first_run_tabs": [
-     "http://www.debian.org"
-  ],
   "homepage": "http://www.debian.org"
 }
+

-- 
Git repository for pkg-chromium