diff -Nru netflix-desktop-0.8.8~ubuntu14.10.1/debian/bzr-builder.manifest netflix-desktop-0.8.9/debian/bzr-builder.manifest --- netflix-desktop-0.8.8~ubuntu14.10.1/debian/bzr-builder.manifest 2014-05-11 04:04:33.000000000 +0000 +++ netflix-desktop-0.8.9/debian/bzr-builder.manifest 2015-01-15 23:03:00.000000000 +0000 @@ -1,2 +1,2 @@ # bzr-builder format 0.3 deb-version {debversion} -lp:netflix-desktop revid:erich.e.hoover@gmail.com-20140403020132-fbkwpu8swul8zr1f +lp:netflix-desktop revid:erich.e.hoover@gmail.com-20150115223055-uorafxt14wi2q1ic diff -Nru netflix-desktop-0.8.8~ubuntu14.10.1/debian/changelog netflix-desktop-0.8.9/debian/changelog --- netflix-desktop-0.8.8~ubuntu14.10.1/debian/changelog 2014-05-11 04:04:33.000000000 +0000 +++ netflix-desktop-0.8.9/debian/changelog 2015-01-15 23:03:00.000000000 +0000 @@ -1,8 +1,20 @@ -netflix-desktop (0.8.8~ubuntu14.10.1) utopic; urgency=low +netflix-desktop (0.8.9-1~ubuntu14.10.1) utopic; urgency=low * Auto build. - -- Erich E. Hoover Sun, 11 May 2014 04:04:33 +0000 + -- Erich E. Hoover Thu, 15 Jan 2015 23:03:00 +0000 + +netflix-desktop (0.8.9-1) unstable; urgency=low + * Fix path check for wine-staging. + * Fix incorrect path to new Silverlight 5.1 version. + -- Erich E. Hoover Thu, 15 Jan 2015 15:30:36 -0700 + +netflix-desktop (0.8.9) unstable; urgency=low + * Updated logo for Netflix. + * Updated the German translation. + * Updated dependency on wine-compholio to wine-staging. + * Updated Silverlight 5.1 download URL to version 5.1.30514.0. + -- Erich E. Hoover Mon, 12 Jan 2015 12:11:45 -0700 netflix-desktop (0.8.8) unstable; urgency=low * Updated logo for Katsomo. @@ -15,7 +27,7 @@ * 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 + -- Erich E. Hoover Sun, 11 May 2014 04:04:33 +0000 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.8~ubuntu14.10.1/debian/control netflix-desktop-0.8.9/debian/control --- netflix-desktop-0.8.8~ubuntu14.10.1/debian/control 2014-05-11 04:04:33.000000000 +0000 +++ netflix-desktop-0.8.9/debian/control 2015-01-15 23:02:59.000000000 +0000 @@ -10,8 +10,8 @@ Architecture: all Multi-Arch: allowed Pre-Depends: dpkg (>= 1.14.12ubuntu3) -Depends: wine-compholio (>= 1.7.0-3), - wine-compholio (>= 1.7.14) | ttf-mscorefonts-installer, +Depends: wine-staging | wine-compholio (>= 1.7.0-3), + wine-staging | wine-compholio (>= 1.7.14) | ttf-mscorefonts-installer, mesa-utils | glx-utils, fontconfig | debconf, python-pyxattr, diff -Nru netflix-desktop-0.8.8~ubuntu14.10.1/plugins/wine-silverlight5.1-installer.config-script netflix-desktop-0.8.9/plugins/wine-silverlight5.1-installer.config-script --- netflix-desktop-0.8.8~ubuntu14.10.1/plugins/wine-silverlight5.1-installer.config-script 2014-05-11 04:04:33.000000000 +0000 +++ netflix-desktop-0.8.9/plugins/wine-silverlight5.1-installer.config-script 2015-01-15 23:02:59.000000000 +0000 @@ -4,4 +4,4 @@ . "${PKG_DIR}/gizmos" # Setup the plugin configuration to use this specific version of Silverlight (for profiles with more than one version) -setup_silverlight 5.1.20913.0; +setup_silverlight 5.1.30514.0; diff -Nru netflix-desktop-0.8.8~ubuntu14.10.1/plugins/wine-silverlight5.1-installer.install-script netflix-desktop-0.8.9/plugins/wine-silverlight5.1-installer.install-script --- netflix-desktop-0.8.8~ubuntu14.10.1/plugins/wine-silverlight5.1-installer.install-script 2014-05-11 04:04:33.000000000 +0000 +++ netflix-desktop-0.8.9/plugins/wine-silverlight5.1-installer.install-script 2015-01-15 23:02:59.000000000 +0000 @@ -7,7 +7,7 @@ # Move the installation to a version-specific folder that nothing will touch PROGRAM_FILES="${WINEPREFIX}/drive_c/Program Files"; mkdir "${PROGRAM_FILES}/Silverlight" 2>/dev/null; # create the destination folder if necessary -mv "${PROGRAM_FILES}/Microsoft Silverlight/5.1.20913.0" "${PROGRAM_FILES}/Silverlight/5.1.20913.0"; +mv "${PROGRAM_FILES}/Microsoft Silverlight/5.1.30514.0" "${PROGRAM_FILES}/Silverlight/5.1.30514.0"; # Wait for Wine to finish building the .desktop files TIMEOUT="10"; while "${WINESERVER}" --kill=0 && [ "${TIMEOUT}" -ne "0" ]; do diff -Nru netflix-desktop-0.8.8~ubuntu14.10.1/plugins/wine-silverlight5.1-installer.plugin netflix-desktop-0.8.9/plugins/wine-silverlight5.1-installer.plugin --- netflix-desktop-0.8.8~ubuntu14.10.1/plugins/wine-silverlight5.1-installer.plugin 2014-05-11 04:04:33.000000000 +0000 +++ netflix-desktop-0.8.9/plugins/wine-silverlight5.1-installer.plugin 2015-01-15 23:02:59.000000000 +0000 @@ -1 +1 @@ -wine-silverlight5.1-installer Silverlight 5.1 Microsoft Corporation 6254f18b680a2ab4d007e5a8a344539ee819bd33d1d054e1302fcd964d63f732 http://silverlight.dlservice.microsoft.com/download/6/B/8/6B885B0B-73D4-4BCE-BFFF-154B4A402D22/20913.00/Silverlight.exe +wine-silverlight5.1-installer Silverlight 5.1 Microsoft Corporation afa7a7081d30b00a4f57c32932bd6d84940bb43b3f5feb0828ff988c80e2d485 http://download.microsoft.com/download/F/8/C/F8C0EACB-92D0-4722-9B18-965DD2A681E9/30514.00/Silverlight.exe diff -Nru netflix-desktop-0.8.8~ubuntu14.10.1/po/de.po netflix-desktop-0.8.9/po/de.po --- netflix-desktop-0.8.8~ubuntu14.10.1/po/de.po 2014-05-11 04:04:33.000000000 +0000 +++ netflix-desktop-0.8.9/po/de.po 2015-01-15 23:02:59.000000000 +0000 @@ -7,23 +7,23 @@ msgstr "" "Project-Id-Version: netflix-desktop\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-07-27 13:33-0600\n" -"PO-Revision-Date: 2013-01-17 16:16+0000\n" -"Last-Translator: Dennis Baudys \n" +"POT-Creation-Date: 2013-08-11 19:34-0600\n" +"PO-Revision-Date: 2014-11-26 14:59+0000\n" +"Last-Translator: Tobias Bannert \n" "Language-Team: German \n" -"Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-01-18 06:21+0000\n" -"X-Generator: Launchpad (build 16430)\n" +"X-Launchpad-Export-Date: 2014-11-27 07:25+0000\n" +"X-Generator: Launchpad (build 17261)\n" +"Language: de\n" #: wine-browser-installer/wine-browser:19 #: wine-browser-installer/wine-browser-installer.install-files:12 msgid "On Demand Wine Browser" -msgstr "On-Demand-Wine-Browser" +msgstr "Auf-Abruf-Wine-Browser" -#: wine-browser-installer/wine-browser:44 +#: wine-browser-installer/wine-browser:51 #, sh-format msgid "" "Not all of the components required by $SERVICE were downloaded, would you " @@ -34,7 +34,7 @@ "werden. Möchten Sie diese jetzt herunterladen? (Es werden eine " "Internetverbindung und Systemverwalterrechte benötigt.)" -#: wine-browser-installer/wine-browser:45 +#: wine-browser-installer/wine-browser:52 msgid "" "MS true type fonts are not properly installed, would you like to download " "and install them now? (requires an Internet connection and sudo permissions)" @@ -43,8 +43,8 @@ "jetzt herunterladen und installieren? (Es werden eine Internetverbindung und " "Systemverwalterrechte benötigt.)" -#: wine-browser-installer/wine-browser:46 -#, fuzzy, sh-format +#: wine-browser-installer/wine-browser:53 +#, sh-format msgid "" "It appears that you still have not installed the MS true type fonts. You " "need to accept the license agreement and install these fonts for $SERVICE to " @@ -54,8 +54,8 @@ "installiert hätten. Sie müssen die Lizenzbestimmungen akzeptieren und diese " "Schriften installieren, damit $SERVICE richtig funktioniert." -#: wine-browser-installer/wine-browser:47 -#, fuzzy, sh-format +#: wine-browser-installer/wine-browser:54 +#, sh-format msgid "" "Compositing is not available, please enable compositing support and relaunch " "$SERVICE." @@ -63,39 +63,42 @@ "Compositing ist in der X11-Konfigurationsdatei deaktiviert. Bitte aktivieren " "Sie die Compositing-Unterstützung und starten Sie $SERVICE erneut." -#: wine-browser-installer/wine-browser:75 +#: wine-browser-installer/wine-browser:120 #, sh-format msgid "Unrecognized command-line argument '$arg', usage:" msgstr "Befehlszeilenargument »$arg« wurde nicht erkannt. Aufruf:" -#: wine-browser-installer/wine-browser:77 +#: wine-browser-installer/wine-browser:122 msgid "[options]" msgstr "[Optionen]" -#: wine-browser-installer/wine-browser:79 +#: wine-browser-installer/wine-browser:124 msgid "Options:" msgstr "Optionen:" -#: wine-browser-installer/wine-browser:80 +#: wine-browser-installer/wine-browser:125 msgid "Show Wine debug output." msgstr "Die Fehlerdiagnoseausgabe von Wine anzeigen." -#: wine-browser-installer/wine-browser:81 +#: wine-browser-installer/wine-browser:126 msgid "Collect a Wine '+relay' log." msgstr "Ein »+relay«-Protokoll von Wine erstellen lassen." -#: wine-browser-installer/wine-browser:82 +#: wine-browser-installer/wine-browser:127 msgid "Allow Wine Gecko and Wine Mono within the prefix." msgstr "" -#: wine-browser-installer/wine-browser:116 +#: wine-browser-installer/wine-browser:128 +msgid "Launch in windowed mode (disable fullscreen mode)." +msgstr "Im Fenstermodus starten (Vollbildmodus deaktivieren)." + +#: wine-browser-installer/wine-browser:171 #, sh-format msgid "Unable to test extended attributes at location '${WINEPREFIX}'." msgstr "" "Erweiterte Attribute am Ort »${WINEPREFIX}« können nicht getestet werden." -#: wine-browser-installer/wine-browser:118 -#, fuzzy +#: wine-browser-installer/wine-browser:173 msgid "" "It appears that you do not have extended file system attributes enabled. " "Please enable the user_xattr option for your filesystem and try again." @@ -104,7 +107,7 @@ "hätten. Bitte aktivieren Sie die user_xattr Option für Ihr Dateisystem und " "versuchen Sie es erneut." -#: wine-browser-installer/wine-browser:120 +#: wine-browser-installer/wine-browser:175 msgid "" "An unexpected error code was returned when testing for extended file system " "attributes." @@ -112,20 +115,20 @@ "Ein unerwarteter Fehlercode wurde beim Testen nach erweiterten " "Dateisystemattributen zurückgegeben." -#: wine-browser-installer/wine-browser:181 +#: wine-browser-installer/wine-browser:244 msgid "Performing local installation..." -msgstr "" +msgstr "Lokale Installation wird durchgeführt …" -#: wine-browser-installer/wine-browser:184 +#: wine-browser-installer/wine-browser:247 msgid "Performing profile upgrade..." -msgstr "" +msgstr "Profilaktualisierung wird durchgeführt …" -#: wine-browser-installer/install-files:19 +#: wine-browser-installer/install-files:20 #, sh-format msgid "$SERVICE is NOT fully installed." msgstr "$SERVICE ist NICHT vollständig installiert." -#: wine-browser-installer/install-files:20 +#: wine-browser-installer/install-files:21 #, sh-format msgid "" "Please run 'dpkg-reconfigure $PACKAGE' to perform the installation again" @@ -133,25 +136,25 @@ "Führen Sie bitte »dpkg-reconfigure $PACKAGE« aus, um die Installation erneut " "auszuführen." -#: wine-browser-installer/install-files:36 +#: wine-browser-installer/install-files:37 #, sh-format msgid "Failed to install '$filename'." msgstr "Installation von »$filename« gescheitert." -#: wine-browser-installer/install-files:42 +#: wine-browser-installer/install-files:43 #, sh-format msgid "Failed to download '$filename'." msgstr "Herunterladen von »$filename« gescheitert." -#: wine-browser-installer/install-files:55 +#: wine-browser-installer/install-files:56 msgid "Everything downloaded and installed." msgstr "Alles wurde heruntergeladen und installiert." -#: wine-browser-installer/install-files:57 +#: wine-browser-installer/install-files:58 msgid "One or more components could not be installed." msgstr "Eine oder mehrere Komponenten konnten nicht installiert weden." -#: wine-browser-installer/download-missing-files:17 +#: wine-browser-installer/download-missing-files:23 #, sh-format msgid "Downloading '${filename}'..." msgstr "»${filename}« wird heruntergeladen …" @@ -167,19 +170,39 @@ #: debian/services:1 #, sh-format msgid "Netflix Desktop" -msgstr "Netflix-Arbeitsfläche" +msgstr "Netflix-Schreibtisch" #: debian/services:2 #, sh-format msgid "LOVEFiLM Desktop" -msgstr "LOVEFiLM-Arbeitsfläche" +msgstr "LOVEFiLM-Schreibtisch" #: debian/services:3 #, sh-format msgid "Redbox Desktop" -msgstr "Redbox-Arbeitsfläche" +msgstr "Redbox-Schreibtisch" #: debian/services:4 #, sh-format msgid "Maxdome Desktop" -msgstr "Maxdome-Arbeitsfläche" +msgstr "Maxdome-Schreibtisch" + +#: debian/services:5 +#, sh-format +msgid "Katsomo Desktop" +msgstr "Katsomo-Schreibtisch" + +#: debian/plugins:1 +#, sh-format +msgid "Silverlight 4.0" +msgstr "Silverlight 4.0" + +#: debian/plugins:2 +#, sh-format +msgid "Silverlight 5.0" +msgstr "Silverlight 5.0" + +#: debian/plugins:3 +#, sh-format +msgid "Silverlight 5.1" +msgstr "Silverlight 5.1" diff -Nru netflix-desktop-0.8.8~ubuntu14.10.1/services/netflix-desktop.service netflix-desktop-0.8.9/services/netflix-desktop.service --- netflix-desktop-0.8.8~ubuntu14.10.1/services/netflix-desktop.service 2014-05-11 04:04:33.000000000 +0000 +++ netflix-desktop-0.8.9/services/netflix-desktop.service 2015-01-15 23:02:59.000000000 +0000 @@ -1 +1 @@ -netflix-desktop Netflix Desktop Netflix Netflix, Inc. http://www.netflix.com/ wine-silverlight5.1-installer 2b844bc6a0b5c2bbcdbb0c403475b10ca4a7dff3210a7c4f5d9521841cf052b1 http://developer.netflix.com/files/Netflix_API2_57x57.png +netflix-desktop Netflix Desktop Netflix Netflix, Inc. http://www.netflix.com/ wine-silverlight5.1-installer 465c0102fffa3d9264f587b9ec899fd3781d67957765c89db54c42b928c7f2f0 http://cdn-0.nflximg.com/en_us/home/logo_v7.png diff -Nru netflix-desktop-0.8.8~ubuntu14.10.1/services/tvoveral-desktop.service netflix-desktop-0.8.9/services/tvoveral-desktop.service --- netflix-desktop-0.8.8~ubuntu14.10.1/services/tvoveral-desktop.service 1970-01-01 00:00:00.000000000 +0000 +++ netflix-desktop-0.8.9/services/tvoveral-desktop.service 2015-01-15 23:02:59.000000000 +0000 @@ -0,0 +1 @@ +tvoveral-desktop Tv Overal Desktop TvOveral Belgacom http://sphinx.skynet.be/tv-overal/live-tv/ wine-silverlight5.1-installer ebadae53ab69af2dfb8046cc0a331fe95d74f34c0d50c2d4e1c6815ae0756869 http://tveverywhere.staticskynet.be/v_cb2b218/images/splash-screen/tv.png diff -Nru netflix-desktop-0.8.8~ubuntu14.10.1/services/yelotv-desktop.service netflix-desktop-0.8.9/services/yelotv-desktop.service --- netflix-desktop-0.8.8~ubuntu14.10.1/services/yelotv-desktop.service 1970-01-01 00:00:00.000000000 +0000 +++ netflix-desktop-0.8.9/services/yelotv-desktop.service 2015-01-15 23:02:59.000000000 +0000 @@ -0,0 +1 @@ +yelotv-desktop Yelo TV Desktop YeloTV Telenet http://yelotv.be/ wine-silverlight5.1-installer d3d33115e9a9a7513981437d3a476272d0d73009c18cd2e91c2aeae2b6270b14 http://yelotv.be/css/site/yelo-logo.png diff -Nru netflix-desktop-0.8.8~ubuntu14.10.1/wine-browser-installer/wine-browser netflix-desktop-0.8.9/wine-browser-installer/wine-browser --- netflix-desktop-0.8.8~ubuntu14.10.1/wine-browser-installer/wine-browser 2014-05-11 04:04:33.000000000 +0000 +++ netflix-desktop-0.8.9/wine-browser-installer/wine-browser 2015-01-15 23:02:59.000000000 +0000 @@ -37,7 +37,7 @@ SERVICE_SUMS="${PKG_DIR}/${PACKAGE}.sha256sums"; LOCAL_SUMS="${WINEPREFIX}/wine-browser-installer.sha256sums"; GLOBAL_SUMS="${PKG_DIR}/wine-browser-installer.sha256sums"; -WINE="/opt/wine-compholio/bin/wine"; +WINE=$(PATH="/opt/wine-staging/bin:/opt/wine-compholio/bin:${PATH}" which wine); SHOWDEBUG="0"; RELAYLOG="0"; ${PKG_DIR}/hw-accel-default; HW_ACCELERATION_DISABLED=$?; @@ -53,8 +53,6 @@ if [ "${SUDO}" = "" ]; then SUDO=$(which beesu 2>/dev/null); fi -# If the patched Wine is unavailable then use the system installed version -test -x "${WINE}" || WINE=$(which wine); export WINE; # Reformat the dependency list so it is easy to loop over