[Pkg-chromium-commit] [pkg-chromium] 02/02: move master_preferences back to /etc/chromium

[Shawn Landden]

This is an automated email from the git hooks/post-receive script.

shawnl-guest pushed a commit to branch master
in repository pkg-chromium.

commit 07cb4205830a34ecaa36597aa7fdff68e579e4cf
Author: Shawn Landden <shawn at churchofgit.com>
Date:   Mon Apr 27 13:26:04 2015 -0700

    move master_preferences back to /etc/chromium
---
 debian/changelog           | 5 +++--
 debian/chromium.conffiles  | 1 +
 debian/chromium.install    | 1 -
 debian/patches/prefs.patch | 4 ++--
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0d568e1..911db1b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,11 @@
 chromium-browser (42.0.2311.90-3) UNRELEASED; urgency=medium
 
   [ Shawn Landden ]
-  * First run
-    - No welcome page ( https://www.google.com/intl/en/chrome/browser/welcome.html )
+  * Supress first run welcome page
+     - ( https://www.google.com/intl/en/chrome/browser/welcome.html )
   * Turn off safebrowsing
   * Turn off pinging Google on 404 and other HTTP errors (when server doesn't send page)
+  * Move master_preferences back to /etc/chromium to match SuSe
   [ Michael Gilbert ]
   * Simplify build information.
 
diff --git a/debian/chromium.conffiles b/debian/chromium.conffiles
new file mode 100644
index 0000000..b6d212d
--- /dev/null
+++ b/debian/chromium.conffiles
@@ -0,0 +1 @@
+debian/master_preferences etc/chromium
diff --git a/debian/chromium.install b/debian/chromium.install
index d0e0b59..e5018c6 100644
--- a/debian/chromium.install
+++ b/debian/chromium.install
@@ -10,7 +10,6 @@ out/Release/resources/*.pak usr/lib/chromium/locales
 
 debian/presubj usr/share/bug/chromium
 
-debian/master_preferences usr/lib/chromium
 debian/initial_bookmarks.html usr/lib/chromium
 
 debian/chromium.xml usr/share/gnome-control-center/default-apps
diff --git a/debian/patches/prefs.patch b/debian/patches/prefs.patch
index 4841b20..f3a17d9 100644
--- a/debian/patches/prefs.patch
+++ b/debian/patches/prefs.patch
@@ -1,4 +1,4 @@
-description: search for master_preferences in /usr/lib/chromium
+description: search for master_preferences in /etc/chromium
 
 --- a/chrome/browser/first_run/first_run_internal_linux.cc
 +++ b/chrome/browser/first_run/first_run_internal_linux.cc
@@ -9,7 +9,7 @@ description: search for master_preferences in /usr/lib/chromium
 -  base::FilePath master_prefs;
 -  if (!PathService::Get(base::DIR_EXE, &master_prefs))
 -    return base::FilePath();
-+  base::FilePath master_prefs = base::FilePath("/usr/lib/chromium");
++  base::FilePath master_prefs = base::FilePath("/etc/chromium");
    return master_prefs.AppendASCII(installer::kDefaultMasterPrefs);
  }
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-chromium/pkg-chromium.git