[Pkg-chromium-commit] [pkg-chromium] 01/01: release 38.0.2125.101-4

Michael Gilbert mgilbert at moszumanska.debian.org
Mon Oct 20 02:51:32 UTC 2014 

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

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

commit ee87a9416a0c9e522b914f86a3127eb5893a4768
Author: Michael Gilbert <mgilbert at debian.org>
Date:   Sun Oct 19 22:50:37 2014 -0400

    release 38.0.2125.101-4
---
 debian/changelog                                   | 15 +++++++++++++
 debian/chromium-apikeys.conf                       |  5 +++++
 debian/chromium-apikeys.install                    |  1 +
 debian/chromium.maintscript                        |  6 ++---
 debian/control                                     | 17 +++++++++++++-
 debian/patches/disable/google-api-warning.patch    | 13 +++++++++++
 .../{no-promo.patch => disable/promo.patch}        |  0
 debian/patches/linker-flags.patch                  | 13 -----------
 debian/patches/no-sse2.patch                       | 26 ----------------------
 debian/patches/series                              | 12 +++++-----
 debian/scripts/chromium                            | 11 ++++++++-
 11 files changed, 69 insertions(+), 50 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 80fd6cc..b843aa6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+chromium-browser (38.0.2125.101-4) unstable; urgency=medium
+
+  * Provide information about lack of support for non-sse2 systems.
+  * Include a new package providing Google's API keys (closes: #748867).
+
+ -- Michael Gilbert <mgilbert at debian.org>  Sun, 19 Oct 2014 21:12:49 +0000
+
+chromium-browser (38.0.2125.101-3) unstable; urgency=medium
+
+  * Ignore dpkg files in /etc/chromium.d (closes: #765959).
+  * Remove trailing maintscript arguments (closes: #765528).
+  * Use libjpeg-dev instead of libjpeg8-dev (closes: #765821).
+
+ -- Michael Gilbert <mgilbert at debian.org>  Fri, 17 Oct 2014 21:27:05 +0000
+
 chromium-browser (38.0.2125.101-2) unstable; urgency=medium
 
   * Disable HiDPI (closes: #764883).
diff --git a/debian/chromium-apikeys.conf b/debian/chromium-apikeys.conf
new file mode 100644
index 0000000..8964ef5
--- /dev/null
+++ b/debian/chromium-apikeys.conf
@@ -0,0 +1,5 @@
+# API keys assigned to Debian by Google for access to their services like sync and gmail.
+
+export GOOGLE_API_KEY="AIzaSyCkfPOPZXDKNn8hhgu3JrA62wIgC93d44k"
+export GOOGLE_DEFAULT_CLIENT_ID="811574891467.apps.googleusercontent.com"
+export GOOGLE_DEFAULT_CLIENT_SECRET="kdloedMFGdGla2P1zacGjAQh"
diff --git a/debian/chromium-apikeys.install b/debian/chromium-apikeys.install
new file mode 100644
index 0000000..f6238a5
--- /dev/null
+++ b/debian/chromium-apikeys.install
@@ -0,0 +1 @@
+debian/chromium-apikeys.conf etc/chromium.d
diff --git a/debian/chromium.maintscript b/debian/chromium.maintscript
index fb60277..28a8af3 100644
--- a/debian/chromium.maintscript
+++ b/debian/chromium.maintscript
@@ -1,4 +1,4 @@
 # remove wheezy era conffiles (can be removed post-jessie)
-rm_conffile /etc/chromium/default 37.0.2062.120-3~ -- "$@"
-rm_conffile /etc/chromium/master_preferences 37.0.2062.120-3~ -- "$@"
-rm_conffile /etc/chromium/initial_bookmarks.html 37.0.2062.120-3~ -- "$@"
+rm_conffile /etc/chromium/default 37.0.2062.120-3~
+rm_conffile /etc/chromium/master_preferences 37.0.2062.120-3~
+rm_conffile /etc/chromium/initial_bookmarks.html 37.0.2062.120-3~
diff --git a/debian/control b/debian/control
index 4d365bc..0325dc6 100644
--- a/debian/control
+++ b/debian/control
@@ -55,9 +55,9 @@ Build-Depends:
  libwebp-dev,
  libxtst-dev,
  libsrtp-dev,
+ libjpeg-dev,
  libxml2-dev,
  libxslt1-dev,
- libjpeg8-dev,
  libpulse-dev,
  libspeex-dev,
  libpam0g-dev,
@@ -91,6 +91,8 @@ Depends:
  ${misc:Depends},
  ${shlibs:Depends},
  xdg-utils,
+Recommends:
+ chromium-apikeys,
 Suggests:
  chromium-l10n,
  chromium-inspector,
@@ -147,6 +149,19 @@ Description: web browser - page inspection support
  This package contains the 'inspector', which enables web developers to inspect
  elements of a web page at runtime (HTML, JavaScript, CSS, etc.).
 
+Package: chromium-apikeys
+Architecture: all
+Depends:
+ ${misc:Depends},
+ chromium,
+Description: web browser - Google API keys
+ Web browser that aims to build a safer, faster, and more stable internet
+ browsing experience.
+ .
+ This package provides keys to Google's API for services like sync and gmail
+ and only needs to be installed if you use the "app" interface to those
+ services.
+
 Package: chromedriver
 Architecture: i386 amd64
 Depends:
diff --git a/debian/patches/disable/google-api-warning.patch b/debian/patches/disable/google-api-warning.patch
new file mode 100644
index 0000000..1cae3ec
--- /dev/null
+++ b/debian/patches/disable/google-api-warning.patch
@@ -0,0 +1,13 @@
+description: disable the google api key warning when those aren't found
+
+--- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc
++++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc
+@@ -837,8 +837,6 @@ void StartupBrowserCreatorImpl::AddInfoB
+   if (is_process_startup == chrome::startup::IS_PROCESS_STARTUP &&
+       !command_line_.HasSwitch(switches::kTestType)) {
+     chrome::ShowBadFlagsPrompt(browser);
+-    GoogleApiKeysInfoBarDelegate::Create(InfoBarService::FromWebContents(
+-        browser->tab_strip_model()->GetActiveWebContents()));
+     ObsoleteSystemInfoBarDelegate::Create(InfoBarService::FromWebContents(
+         browser->tab_strip_model()->GetActiveWebContents()));
+ 
diff --git a/debian/patches/no-promo.patch b/debian/patches/disable/promo.patch
similarity index 100%
rename from debian/patches/no-promo.patch
rename to debian/patches/disable/promo.patch
diff --git a/debian/patches/linker-flags.patch b/debian/patches/linker-flags.patch
deleted file mode 100644
index 952a64d..0000000
--- a/debian/patches/linker-flags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-description: flags to avoid memory exhaustion while linking on i386
-
---- a/build/common.gypi
-+++ b/build/common.gypi
-@@ -3401,6 +3401,8 @@
-         'ldflags': [
-           '-Wl,-z,now',
-           '-Wl,-z,relro',
-+          '-Wl,--no-keep-memory',
-+          '-Wl,--reduce-memory-overheads',
-         ],
-       },
-     }],
diff --git a/debian/patches/no-sse2.patch b/debian/patches/no-sse2.patch
deleted file mode 100644
index 76b2f9b..0000000
--- a/debian/patches/no-sse2.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-description: don't set sse2 compiler flags on i386
-author: Michael Gilbert <mgilbert at debian.org>
-debian-bug: http://bugs.debian.org/750361
-
---- a/build/common.gypi
-+++ b/build/common.gypi
-@@ -3655,8 +3655,6 @@
-                 # http://crbug.com/313032 for an example where this has "bit"
-                 # us in the past.
-                 'cflags': [
--                  '-msse2',
--                  '-mfpmath=sse',
-                   '-mmmx',  # Allows mmintrin.h for MMX intrinsics.
-                   '-m32',
-                 ],
---- a/third_party/qcms/qcms.gyp
-+++ b/third_party/qcms/qcms.gyp
-@@ -31,7 +31,7 @@
-       'msvs_disabled_warnings': [ 4018 ],
- 
-       'conditions': [
--        ['target_arch=="ia32" or target_arch=="x64"', {
-+        ['target_arch=="x64"', {
-           'defines': [
-             'SSE2_ENABLE',
-           ],
diff --git a/debian/patches/series b/debian/patches/series
index e5389ae..bf3a3ad 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,15 +1,15 @@
+manpage.patch
+clang.patch
+
+disable/promo.patch
+disable/google-api-warning.patch
+
 nspr.patch
 expat.patch
 prefs.patch
 system-speech.patch
-manpage.patch
 third-party-cookies-off-by-default.patch
 ps-print.patch
-no-promo.patch
 chromedriver-revision.patch
 
-linker-flags.patch
-no-sse2.patch
-clang.patch
-
 missing-include.patch
diff --git a/debian/scripts/chromium b/debian/scripts/chromium
index a5a4d42..4745580 100644
--- a/debian/scripts/chromium
+++ b/debian/scripts/chromium
@@ -23,9 +23,18 @@ usage () {
   echo " See 'man chromium' for more details"
 }
 
+# Check whether this system supports sse2
+if test -z "$(grep sse2 /proc/cpuinfo)"; then
+  echo "The hardware on this system lacks support for the sse2 instruction set."
+  echo "The upstream chromium project no longer supports this configuration."
+  echo "For more information, please read and possibly provide input to their"
+  echo "bug tracking system at http://crbug.com/348761."
+  exit 1
+fi
+
 # Source additional settings
 for file in /etc/chromium.d/*; do
-  test $file = /etc/chromium.d/README || . $file
+  test $file = /etc/chromium.d/README || expr $file : .*\.dpkg > /dev/null || . $file
 done
 
 # Set CHROME_VERSION_EXTRA visible in the About dialog and in about:version

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

More information about the Pkg-chromium-commit mailing list