[Pkg-chromium-commit] [pkg-chromium] 01/01: release 52.0.2743.82-2
Michael Gilbert
mgilbert at moszumanska.debian.org
Mon Jul 25 04:30:35 UTC 2016
This is an automated email from the git hooks/post-receive script.
mgilbert pushed a commit to branch master
in repository pkg-chromium.
commit 33944a5ce88c9dca58a94934e67806eceb033b43
Author: Michael Gilbert <mgilbert at debian.org>
Date: Mon Jul 25 03:33:08 2016 +0000
release 52.0.2743.82-2
---
debian/changelog | 11 +++++++++++
debian/control | 5 +++--
debian/patches/master-preferences.patch | 2 +-
debian/patches/series | 1 -
debian/patches/system/speechd.patch | 14 --------------
debian/rules | 6 +++---
6 files changed, 18 insertions(+), 21 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 5e3af8b..6b56cee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+chromium-browser (52.0.2743.82-2) unstable; urgency=medium
+
+ * Bump standards version.
+ * Drop no longer needed speechd patch.
+ * Build complete debugging symbols again.
+ * Link against libusb 1.0 (closes: #810403).
+ * Fix path to master_preferences (closes: #830274).
+ * Add an explicit dependency on libnettle6 (closes: #832125).
+
+ -- Michael Gilbert <mgilbert at debian.org> Sun, 24 Jul 2016 22:02:56 +0000
+
chromium-browser (52.0.2743.82-1) unstable; urgency=medium
* New upstream stable release:
diff --git a/debian/control b/debian/control
index 9f4e0e2..02c3570 100644
--- a/debian/control
+++ b/debian/control
@@ -43,7 +43,6 @@ Build-Depends:
libpci-dev,
libcap-dev,
libdrm-dev,
- libusb-dev,
libicu-dev,
libffi-dev,
libkrb5-dev,
@@ -69,6 +68,7 @@ Build-Depends:
libspeechd-dev (>= 0.8.4),
libminizip-dev,
libhunspell-dev,
+ libusb-1.0-0-dev,
libmodpbase64-dev,
libgnome-keyring-dev,
libnss3-dev (>= 3.12.3),
@@ -81,7 +81,7 @@ Build-Depends:
libgcrypt20-dev,
fonts-ipafont-gothic,
fonts-ipafont-mincho,
-Standards-Version: 3.9.7
+Standards-Version: 3.9.8
Package: chromium
Architecture: i386 amd64
@@ -91,6 +91,7 @@ Depends:
${shlibs:Depends},
x11-utils,
xdg-utils,
+ libnettle6,
Recommends:
fonts-liberation,
Suggests:
diff --git a/debian/patches/master-preferences.patch b/debian/patches/master-preferences.patch
index 6296fb8..f21eba9 100644
--- a/debian/patches/master-preferences.patch
+++ b/debian/patches/master-preferences.patch
@@ -11,7 +11,7 @@ description: search for master_preferences in /usr/share/chromium
- if (!PathService::Get(base::DIR_EXE, &master_prefs))
- return base::FilePath();
- return master_prefs.AppendASCII(installer::kDefaultMasterPrefs);
-+ return base::FilePath("/usr/share/chromium");
++ return base::FilePath("/usr/share/chromium/master_preferences");
}
} // namespace internal
diff --git a/debian/patches/series b/debian/patches/series
index 4b7cbf6..d6167b5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -18,4 +18,3 @@ system/clang.patch
system/ffmpeg.patch
webui.patch
-system/speechd.patch
diff --git a/debian/patches/system/speechd.patch b/debian/patches/system/speechd.patch
deleted file mode 100644
index df7431c..0000000
--- a/debian/patches/system/speechd.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-description: fix path to speechd headers
-author: Michael Gilbert <mgilbert at debian.org>
-
---- a/build/linux/system.gyp
-+++ b/build/linux/system.gyp
-@@ -1162,7 +1162,7 @@
- # speech-dispatcher < 0.8 we can get rid of all this (including
- # third_party/speech-dispatcher) and just include
- # speech-dispatcher/libspeechd.h unconditionally.
-- 'libspeechd_h_prefix%': '',
-+ 'libspeechd_h_prefix%': 'speech-dispatcher/',
- },
- 'action_name': 'generate_libspeechd_loader',
- 'inputs': [
diff --git a/debian/rules b/debian/rules
index 5b46df8..abc2bc6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -48,6 +48,7 @@ defines+=enable_hidpi=1 \
linux_link_libpci=1 \
linux_link_gsettings=1 \
linux_link_libspeechd=1 \
+ linux_link_pulseaudio=1 \
linux_link_gnome_keyring=1 \
# system libraries to use
@@ -59,10 +60,10 @@ defines+=use_system_re2=1 \
use_system_expat=1 \
use_system_libpng=1 \
use_system_libxml=1 \
+ use_system_libusb=1 \
use_system_libjpeg=1 \
use_system_libwebp=1 \
use_system_libxslt=1 \
- use_system_libsrtp=1 \
use_system_jsoncpp=1 \
use_system_libevent=1 \
use_system_harfbuzz=1 \
@@ -81,10 +82,9 @@ defines+=use_system_icu=0 \
#want_separate_host_toolset=0 \
# reduce the size of debugging symbols
-defines+=remove_webcore_debug_symbols=1
+# defines+=remove_webcore_debug_symbols=1
# some notes about embedded libraries
-# use_system_libusb=0 requires modified source that exposes libusb_interrupt_handle_event api
# use_system_libvpx=0 need to run unbundler
# use_system_sqlite=0 build fails
# can't use system nss since net/third_party/nss is heavily patched
--
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