Upgrading to GitLab 11.10.0. Expect errors and see debian-infrastructure-announce@lists.debian.org for further information.

Commit 14575038 authored by Michael Gilbert's avatar Michael Gilbert

release 70.0.3538.54-2

parent b9996a42
chromium-browser (70.0.3538.54-2) unstable; urgency=medium
* The master_preferences files has been moved from /usr/share/chromium to
/etc/chromium to support system level configuration of default options.
-- Michael Gilbert <mgilbert@debian.org> Sun, 14 Oct 2018 23:34:04 +0000
chromium-browser (69.0.3497.100-1) unstable; urgency=medium
* All local extensions that are installed to /usr/share/chromium/extensions
......
chromium-browser (70.0.3538.54-2) unstable; urgency=medium
* Build with gcc 8 (closes: #901368).
* Move the master preferences file to /etc/chromium (closes: #891232).
-- Michael Gilbert <mgilbert@debian.org> Sun, 14 Oct 2018 00:49:46 +0000
chromium-browser (70.0.3538.54-1) unstable; urgency=medium
* New upstream beta release.
......
......@@ -8,13 +8,14 @@ out/Release/resources/en-US.pak usr/lib/chromium/locales
debian/presubj usr/share/bug/chromium
debian/master_preferences usr/share/chromium
debian/initial_bookmarks.html usr/share/chromium
debian/chromium.xml usr/share/gnome-control-center/default-apps
debian/chromium.desktop usr/share/applications
debian/apikeys etc/chromium.d
debian/extensions etc/chromium.d
debian/default-flags etc/chromium.d
debian/etc/chromium etc
debian/etc/README etc/chromium.d
debian/etc/apikeys etc/chromium.d
debian/etc/extensions etc/chromium.d
debian/etc/default-flags etc/chromium.d
......@@ -11,7 +11,6 @@ Rules-Requires-Root: no
Build-Depends:
debhelper (>= 11),
devscripts (>= 2.18.6),
g++-6 (>= 6.4.0-18),
python3,
pkg-config,
ninja-build,
......
Any files placed in this directory will be sourced prior to executing chromium.
......@@ -12,7 +12,7 @@ author: Michael Gilbert <mgilbert@debian.org>
- if (!base::PathService::Get(base::DIR_EXE, &master_prefs))
- return base::FilePath();
- return master_prefs.AppendASCII(installer::kDefaultMasterPrefs);
+ return base::FilePath("/usr/share/chromium/master_preferences");
+ return base::FilePath("/etc/chromium");
}
} // namespace internal
......@@ -9,11 +9,11 @@ export DEB_BUILD_MAINT_OPTIONS=hardening=+all
# indicate that binary targets do not require root
export DEB_RULES_REQUIRES_ROOT=no
# build using a stretch-like environment (to reduce backporting effort)
# default to gcc when compiler environment variables are unset
export AR=ar
export NM=nm
export CC=gcc-6
export CXX=g++-6
export CC?=gcc
export CXX?=g++
# more verbose linker output
export LDFLAGS+=-Wl,--stats
......@@ -152,9 +152,6 @@ override_dh_auto_build-indep: out/Release/gn
override_dh_auto_install-arch:
dh_auto_install
# create /etc/chromium.d README file
echo "Any files placed in this directory will be sourced prior to executing chromium." \
> debian/chromium/etc/chromium.d/README
# update launcher script with build information
sed 's|@BUILD_DIST@|$(shell cat /etc/debian_version)|' \
< debian/scripts/chromium > debian/chromium/usr/bin/chromium
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment