diff -Nru netflix-desktop-0.8.7/debian/bzr-builder.manifest netflix-desktop-0.8.8~ubuntu13.10.1/debian/bzr-builder.manifest --- netflix-desktop-0.8.7/debian/bzr-builder.manifest 2014-01-01 23:21:35.000000000 +0000 +++ netflix-desktop-0.8.8~ubuntu13.10.1/debian/bzr-builder.manifest 2014-04-05 16:16:26.000000000 +0000 @@ -1,2 +1,2 @@ # bzr-builder format 0.3 deb-version {debversion} -lp:netflix-desktop revid:erich.e.hoover@gmail.com-20140101230928-buv1rcgjesgnopll +lp:netflix-desktop revid:erich.e.hoover@gmail.com-20140403020132-fbkwpu8swul8zr1f diff -Nru netflix-desktop-0.8.7/debian/changelog netflix-desktop-0.8.8~ubuntu13.10.1/debian/changelog --- netflix-desktop-0.8.7/debian/changelog 2014-01-01 23:21:35.000000000 +0000 +++ netflix-desktop-0.8.8~ubuntu13.10.1/debian/changelog 2014-04-05 16:16:26.000000000 +0000 @@ -1,8 +1,21 @@ -netflix-desktop (0.8.7-2~ubuntu13.10.1) saucy; urgency=low +netflix-desktop (0.8.8~ubuntu13.10.1) saucy; urgency=low * Auto build. - -- Erich E. Hoover Wed, 01 Jan 2014 23:21:35 +0000 + -- Erich E. Hoover Sat, 05 Apr 2014 16:16:26 +0000 + +netflix-desktop (0.8.8) unstable; urgency=low + * Updated logo for Katsomo. + * Updated logo for Lovefilm. + * Updated logo for Redbox Instant. + * Fixed configuration path for pipelight. + * Add support for 64-bit dual-installed Wine. + * Blacklisted hardware acceleration for nVidia driver 304.88. + * Ensure that a 32-bit prefix is created when 64-bit Wine is installed. + * Blacklisted hardware acceleration for nVidia GeForce GT 440/PCIe/SSE2. + * Default to highest installed Silverlight version when no service is specified. + * Removed dependency on ttf-mscorefonts-installer for wine-compholio 1.7.14 and newer. + -- Erich E. Hoover Xxx, 00 Xxx 0000 00:00:00 -0700 netflix-desktop (0.8.7-2) unstable; urgency=low * Fixed a mistake in the wine-mpg2splt-installer installation script. diff -Nru netflix-desktop-0.8.7/debian/control netflix-desktop-0.8.8~ubuntu13.10.1/debian/control --- netflix-desktop-0.8.7/debian/control 2014-01-01 23:21:35.000000000 +0000 +++ netflix-desktop-0.8.8~ubuntu13.10.1/debian/control 2014-04-05 16:16:25.000000000 +0000 @@ -11,7 +11,7 @@ Multi-Arch: allowed Pre-Depends: dpkg (>= 1.14.12ubuntu3) Depends: wine-compholio (>= 1.7.0-3), - ttf-mscorefonts-installer, + wine-compholio (>= 1.7.14) | ttf-mscorefonts-installer, mesa-utils | glx-utils, fontconfig | debconf, python-pyxattr, diff -Nru netflix-desktop-0.8.7/debian/rules netflix-desktop-0.8.8~ubuntu13.10.1/debian/rules --- netflix-desktop-0.8.7/debian/rules 2014-01-01 23:21:35.000000000 +0000 +++ netflix-desktop-0.8.8~ubuntu13.10.1/debian/rules 2014-04-05 16:16:25.000000000 +0000 @@ -16,12 +16,12 @@ touch $@ -clean: +clean: dh_testdir dh_testroot - rm -f build-stamp + rm -f build-stamp - dh_clean + dh_clean install: build diff -Nru netflix-desktop-0.8.7/services/katsomo-desktop.service netflix-desktop-0.8.8~ubuntu13.10.1/services/katsomo-desktop.service --- netflix-desktop-0.8.7/services/katsomo-desktop.service 2014-01-01 23:21:35.000000000 +0000 +++ netflix-desktop-0.8.8~ubuntu13.10.1/services/katsomo-desktop.service 2014-04-05 16:16:25.000000000 +0000 @@ -1 +1 @@ -katsomo-desktop Katsomo Desktop Katsomo MTV MEDIA http://www.katsomo.fi/ wine-silverlight4-installer 64443f73488f8ffb6d5c2bcbdc87edcb85023215d5fa47518354361a5e6d9eb5 http://www.mtvmedia.fi/logot/png/katsomo.fi_2-2-1.png +katsomo-desktop Katsomo Desktop Katsomo MTV MEDIA http://www.katsomo.fi/ wine-silverlight4-installer be33b65c1745f692ecffb320aa480c94d77a71831020c2b6f1d030c70b5ecd60 http://static3.wikia.nocookie.net/__cb20131030235041/logopedia/images/0/0b/Katsomo.png diff -Nru netflix-desktop-0.8.7/services/lovefilm-desktop.service netflix-desktop-0.8.8~ubuntu13.10.1/services/lovefilm-desktop.service --- netflix-desktop-0.8.7/services/lovefilm-desktop.service 2014-01-01 23:21:35.000000000 +0000 +++ netflix-desktop-0.8.8~ubuntu13.10.1/services/lovefilm-desktop.service 2014-04-05 16:16:25.000000000 +0000 @@ -1 +1 @@ -lovefilm-desktop LOVEFiLM Desktop Lovefilm LOVEFiLM International Ltd. http://www.lovefilm.com/ wine-silverlight5.1-installer,wine-mpg2splt-installer d6b03740d9ae04866a562a826034f0a87dbd973073b482b4884cea06e9daf028 https://twimg0-a.akamaihd.net/profile_images/290083047/lf_normal.png +lovefilm-desktop LOVEFiLM Desktop Lovefilm LOVEFiLM International Ltd. http://www.lovefilm.com/ wine-silverlight5.1-installer,wine-mpg2splt-installer ed0bbf1e9d3c0c84a571ca747e148633b4861184f889b8cd891dc3070f154926 http://www.lovefilm.com/lovefilm/images/error/lf-logo.gif diff -Nru netflix-desktop-0.8.7/services/redbox-desktop.service netflix-desktop-0.8.8~ubuntu13.10.1/services/redbox-desktop.service --- netflix-desktop-0.8.7/services/redbox-desktop.service 2014-01-01 23:21:35.000000000 +0000 +++ netflix-desktop-0.8.8~ubuntu13.10.1/services/redbox-desktop.service 2014-04-05 16:16:25.000000000 +0000 @@ -1 +1 @@ -redbox-desktop Redbox Desktop Redbox Redbox Automated Retail, LLC. http://www.redboxinstant.com/ wine-silverlight4-installer a7b4527a0b30d84f516985b55278a7fb19b17d484994b69bb480a8bfb0e182e7 http://developer.redbox.com/sites/default/files/redbox-icon-512.png +redbox-desktop Redbox Desktop Redbox Redbox Automated Retail, LLC. http://www.redboxinstant.com/ wine-silverlight4-installer a7b4527a0b30d84f516985b55278a7fb19b17d484994b69bb480a8bfb0e182e7 http://developer.redbox.com/sites/default/files/brand/redbox-icon-512.png diff -Nru netflix-desktop-0.8.7/wine-browser-installer/gizmos netflix-desktop-0.8.8~ubuntu13.10.1/wine-browser-installer/gizmos --- netflix-desktop-0.8.7/wine-browser-installer/gizmos 2014-01-01 23:21:35.000000000 +0000 +++ netflix-desktop-0.8.8~ubuntu13.10.1/wine-browser-installer/gizmos 2014-04-05 16:16:25.000000000 +0000 @@ -99,10 +99,10 @@ if [ "${PIPELIGHT_DEFAULT_CONFIG}" != "" ] && \ [ "${PIPELIGHT_TEMP}" != "" ] && \ [ -f "/usr/lib/pipelight/lib${PIPELIGHT_DEFAULT_CONFIG}.so" ] && \ - [ -f "/usr/share/pipelight/${PIPELIGHT_DEFAULT_CONFIG}" ]; then + [ -f "/usr/share/pipelight/configs/${PIPELIGHT_DEFAULT_CONFIG}" ]; then dllPath='C:\\Program Files\\Silverlight\\'"${SILVERLIGHT_VERSION}"'\\'; - cat "/usr/share/pipelight/${PIPELIGHT_DEFAULT_CONFIG}" | sed \ + cat "/usr/share/pipelight/configs/${PIPELIGHT_DEFAULT_CONFIG}" | sed \ -e "s|\(winePath[ \t]*=\).*|\1 ${WINE}|g" \ -e "s|\(winePrefix[ \t]*=\).*|\1 ${WINEPREFIX}|g" \ -e "s|\(dllPath[ \t]*=\).*|\1 ${dllPath}|g" \ diff -Nru netflix-desktop-0.8.7/wine-browser-installer/hw-accel-default netflix-desktop-0.8.8~ubuntu13.10.1/wine-browser-installer/hw-accel-default --- netflix-desktop-0.8.7/wine-browser-installer/hw-accel-default 2014-01-01 23:21:35.000000000 +0000 +++ netflix-desktop-0.8.8~ubuntu13.10.1/wine-browser-installer/hw-accel-default 2014-04-05 16:16:25.000000000 +0000 @@ -20,7 +20,18 @@ exit 0; ;; "NVIDIA Corporation") + case "${OGL_RENDERER}" in + "GeForce GT 440/PCIe/SSE2") + # known NOT to work with OGL_VERSION "4.3.0 NVIDIA 319.32" + # known NOT to work with OGL_VERSION "4.3.0 NVIDIA 331.20" + exit 1; + ;; + esac case "${OGL_VERSION}" in + "2.1.2 NVIDIA 304.88") + # known NOT to work with OGL_RENDERER "GeForce 6150SE nForce 430/integrated/SSE2" + exit 1; + ;; "4.3.0 NVIDIA 310.44") # known NOT to work with OGL_RENDERER "GeForce GTX 460 SE/PCIe/SSE2" exit 1; diff -Nru netflix-desktop-0.8.7/wine-browser-installer/wine-browser netflix-desktop-0.8.8~ubuntu13.10.1/wine-browser-installer/wine-browser --- netflix-desktop-0.8.7/wine-browser-installer/wine-browser 2014-01-01 23:21:35.000000000 +0000 +++ netflix-desktop-0.8.8~ubuntu13.10.1/wine-browser-installer/wine-browser 2014-04-05 16:16:25.000000000 +0000 @@ -24,7 +24,8 @@ fi if [ "${DEPENDENCIES}" = "" ]; then # Automatically select a Silverlight version if no dependencies are given - DEPENDENCIES=$(ls "${PKG_DIR}/wine-silverlight"*".sha256sums" | sed 's|.*/\(.*\)\..*|\1|g' | head -n 1); + DEPENDENCIES=$(ls "${PKG_DIR}/wine-silverlight"*".sha256sums" \ + | sed 's|.*/\(.*\)\..*|\1|g' | sort | tail -n 1); # Automatically select the mpeg2splitter if available if [ -f "${PKG_DIR}/wine-mpg2splt-installer.sha256sums" ]; then DEPENDENCIES="${DEPENDENCIES} wine-mpg2splt-installer"; @@ -173,7 +174,7 @@ done # Make sure the prefix folder exists before testing its attributes -if [ ! -d "${WINEPREFIX}" ]; then +if [ ! -d "${WINEPREFIX}" ]; then mkdir "${WINEPREFIX}"; fi @@ -199,13 +200,14 @@ exit; fi -# Make sure that the MS core true type fonts are installed +# Make sure that the MS core true type fonts are installed if running on an older Wine version COREFONTS=$(fc-list | grep "msttcore"); -if [ "${COREFONTS}" = "" ]; then +HASARIAL=$(${WINE} --patches | grep -c '3d7c4774-9e7f-11e3-9cfc-0090f5c75ad5'); +if [ "${COREFONTS}" = "" ] && [ "${HASARIAL}" -eq "0" ]; then # if fontconfig is unavailable then see if debconf can find it COREFONTS=$(debconf-show ttf-mscorefonts-installer 2>/dev/null | grep "msttcorefonts/accepted-mscorefonts-eula: true"); fi -if [ "${COREFONTS}" = "" ]; then +if [ "${COREFONTS}" = "" ] && [ "${HASARIAL}" -eq "0" ]; then zenity --question --title="${SERVICE}" --text="${gettext_fonts_needed}" --ok-label="Yes" --cancel-label="No"; RET=$?; if [ "$RET" -eq "1" ]; then @@ -238,6 +240,12 @@ cp -a "${PKG_DIR}/browser-profile" "${BROWSER_PROFILE}"; fi +# Ensure a 32-bit prefix (64-bit Wine prefixes are not supported) +if [ ! -f "${WINEPREFIX}/system.reg" ]; then + printf "WINE REGISTRY Version 2\n\n#arch=win32\n" > "${WINEPREFIX}/system.reg" +fi +export WINEARCH="win32"; # Really make sure we use a 32-bit Wine install + # Disable installing Mono and Gecko if [ "${ALLOW_ADDONS}" -eq "1" ]; then export WINEDLLOVERRIDES="mscoree,mshtml,winegstreamer=";