diff -Nru pipelight-multi-0.2.8~ubuntu12.04.1/debian/bzr-builder.manifest pipelight-multi-0.2.8.1~ubuntu12.04.1/debian/bzr-builder.manifest --- pipelight-multi-0.2.8~ubuntu12.04.1/debian/bzr-builder.manifest 2014-12-10 05:02:45.000000000 +0000 +++ pipelight-multi-0.2.8.1~ubuntu12.04.1/debian/bzr-builder.manifest 2015-01-11 05:12:12.000000000 +0000 @@ -1,2 +1,2 @@ # bzr-builder format 0.3 deb-version {debversion} -lp:pipelight revid:git-v1:b7b5e5471d527a801ad63138e963e1839d61e872 +lp:pipelight revid:git-v1:8a1bdc6c254f597baf5d6f2fdcd43b5a2723fcf2 diff -Nru pipelight-multi-0.2.8~ubuntu12.04.1/debian/changelog pipelight-multi-0.2.8.1~ubuntu12.04.1/debian/changelog --- pipelight-multi-0.2.8~ubuntu12.04.1/debian/changelog 2014-12-10 05:02:45.000000000 +0000 +++ pipelight-multi-0.2.8.1~ubuntu12.04.1/debian/changelog 2015-01-11 05:12:12.000000000 +0000 @@ -1,8 +1,16 @@ -pipelight-multi (0.2.8~ubuntu12.04.1) precise; urgency=low +pipelight-multi (0.2.8.1~ubuntu12.04.1) precise; urgency=low * Auto build. - -- Sebastian Lackner Wed, 10 Dec 2014 05:02:45 +0000 + -- Michael Müller Sun, 11 Jan 2015 05:12:12 +0000 + +pipelight-multi (0.2.8.1) RELEASED; urgency=low + + * Change dependency from wine-compholio to wine-staging for Debian/Ubuntu + * Update checksum for Shockwave + + -- Michael Mueller Sun, 11 Jan 2015 05:09:54 +0100 + pipelight-multi (0.2.8) RELEASED; urgency=low diff -Nru pipelight-multi-0.2.8~ubuntu12.04.1/debian/control pipelight-multi-0.2.8.1~ubuntu12.04.1/debian/control --- pipelight-multi-0.2.8~ubuntu12.04.1/debian/control 2014-12-10 05:02:45.000000000 +0000 +++ pipelight-multi-0.2.8.1~ubuntu12.04.1/debian/control 2015-01-11 05:12:12.000000000 +0000 @@ -10,7 +10,7 @@ Architecture: amd64 i386 Depends: ${shlibs:Depends}, ${misc:Depends}, libx11-6, mesa-utils, ttf-mscorefonts-installer, wget, zenity | kde-baseapps-bin, zenity | qdbus, - wine-compholio (>= 1.7.19-1~), bash (>= 4.0), unzip, cabextract, gnupg + wine-staging, bash (>= 4.0), unzip, cabextract, gnupg Conflicts: pipelight (<< 0.2.0~) Replaces: pipelight (<< 0.2.0~) Description: allows usage of Windows NPAPI plugins through Wine diff -Nru pipelight-multi-0.2.8~ubuntu12.04.1/debian/rules pipelight-multi-0.2.8.1~ubuntu12.04.1/debian/rules --- pipelight-multi-0.2.8~ubuntu12.04.1/debian/rules 2014-12-10 05:02:45.000000000 +0000 +++ pipelight-multi-0.2.8.1~ubuntu12.04.1/debian/rules 2015-01-11 05:12:12.000000000 +0000 @@ -4,9 +4,9 @@ override_dh_auto_configure: ifeq ($(DEB_BUILD_ARCH), amd64) - dh_auto_configure -- --win32-static --gcc-runtime-dlls="" --with-win64 + dh_auto_configure -- --win32-static --gcc-runtime-dlls="" --with-win64 --wine-path="/opt/wine-staging/bin/wine" else - dh_auto_configure -- --win32-static --gcc-runtime-dlls="" + dh_auto_configure -- --win32-static --gcc-runtime-dlls="" --wine-path="/opt/wine-staging/bin/wine" endif override_dh_auto_install: diff -Nru pipelight-multi-0.2.8~ubuntu12.04.1/share/install-dependency pipelight-multi-0.2.8.1~ubuntu12.04.1/share/install-dependency --- pipelight-multi-0.2.8~ubuntu12.04.1/share/install-dependency 2014-12-10 05:02:45.000000000 +0000 +++ pipelight-multi-0.2.8.1~ubuntu12.04.1/share/install-dependency 2015-01-11 05:12:12.000000000 +0000 @@ -933,7 +933,7 @@ wine-shockwave-installer) # http://get.adobe.com/de/shockwave/otherversions/ INS=(install_shockwave "1215155") URL="http://fpdownload.macromedia.com/get/shockwave/default/english/win95nt/latest/sw_lic_full_installer.exe" - SHA="ed1d5eda2ac41a311914f2b1fbaa6d60f7081c0fbea07c990d210a4313c696ba" + SHA="7855a0bb7f776fa16d91423463faca9e0333d3ce294e609ee316cc6e566bb17f" ;; wine-grandstream-installer) INS=(install_grandstream) diff -Nru pipelight-multi-0.2.8~ubuntu12.04.1/share/install-dependency-1434FC73.sig pipelight-multi-0.2.8.1~ubuntu12.04.1/share/install-dependency-1434FC73.sig --- pipelight-multi-0.2.8~ubuntu12.04.1/share/install-dependency-1434FC73.sig 2014-12-10 05:02:45.000000000 +0000 +++ pipelight-multi-0.2.8.1~ubuntu12.04.1/share/install-dependency-1434FC73.sig 2015-01-11 05:12:12.000000000 +0000 @@ -936,7 +936,7 @@ wine-shockwave-installer) # http://get.adobe.com/de/shockwave/otherversions/ INS=(install_shockwave "1215155") URL="http://fpdownload.macromedia.com/get/shockwave/default/english/win95nt/latest/sw_lic_full_installer.exe" - SHA="ed1d5eda2ac41a311914f2b1fbaa6d60f7081c0fbea07c990d210a4313c696ba" + SHA="7855a0bb7f776fa16d91423463faca9e0333d3ce294e609ee316cc6e566bb17f" ;; wine-grandstream-installer) INS=(install_grandstream) @@ -1021,17 +1021,17 @@ -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCAAGBQJUh5RIAAoJEIPHP7IUNPxzrHsP+gK1Mk+T8TWufISlJY+TN06/ -ma7ooGR+BrM7H2dBrVaHVX0xWRmH8UagEBJzWRokNU942H6FuqX9F1gnepfD0tHZ -RpxjbgbUEZvXipmZZ54xSWhG3O5n4fcujRulNY4krCelzy5CalopW4TBK+R3daSf -YFDHxjAtRrGty/JXeNcUBkx0J8MCEmG+sbTGN6vbK5huYKAdbTOpIXhjNQ87dQzU -cMZ01hrjQvWeUYF73HIdPXMAjs1uH+d4DeLolz4o5+iur8pudIakylkA5Y+MPMW3 -cSwnWRfwknfqMiwU5MgeDhLEpqzL1m7TKP0idSZiczyiivF4p95kUAr3llom4H/0 -X+HD+0jAq+DsHtKjKZ9tcckW5Mx/Un2k0XgdqrvUlFmkfI6sbQcqVxXGRSXarOsM -iUE5PNQZaHHbZRdd4W3X2+ukP5D2azLs8Bp4APvgTeVx2JRrebSP0RMDLDjHfDG8 -2YJYz1y+bWlz7P8JvR2Y/pWVMPHnDOD4T35q5VaxkKb7V/0OrbiQ1Rcx5isPgdXg -zWu1bGaBN/csthxsycdDDEzbk0aE+Xf03SoHk0obiz/EOU3DF1TFcO7V2Z6HRzM0 -DQhj1pKUKOSmLE6c5KhlhtolH5znZOL7ubuLazqzdd5dmq1WhIuMP0sKnjg3R0Lc -S/9Xknozl/G8yyfoDOPm -=1sJB +iQIcBAEBCAAGBQJUourRAAoJEIPHP7IUNPxzzfgQAJux19rktOw/wOCBgoo2vRf6 ++wv7mm4PRsn+ESRXfYYSLMnV1gQPw25cqY4J+EnvukXgeBRp3LHHf3tI8gZ1k6bd +onowvZTlOEbrpYTJE4oHPKY50Xk+TKewb45ZqQcInL5ncJetX5ZasddkOLSADw2G +zW5jHZGX6rpVv5ecr9e42x4GuxaS2Z4KyFZagLnVnyJ111WKLSw6cBzAV+oqdQSR +yBvkRiMyVuW2GxP7KbpI77f+Eu0gIU0FDrW8amdCshQydBjrZWr1LRQFC8m9BrJt +sBSk0HhlHzHmEG5PuHYcqVnZW2DIGJwezXSbMxTmuAqpMtIAI/96J6v3QMAq8tlE +V/bFOqUbYTPSvEUe1XRX83lfCHyJJ41zpuBGiSEQGS51GpXFSLWrbqXSQKYWsQKm +g7TbWynsZe3ufhTV0YHVJXwhGGK66EKWFft6w8OfpYqcnVVoFmi8ZJA0193UJtDm +dAzLgWpHPBTNEdIl7EY0OtHBLw5B1VnJdSzZ6DrUsECGjQSFD3HMe9UwSO0hTb2V +SKk3ienYhxvusr9pr8/uRn+x/S0jSIGCf4rUhS7uxiLLFP+e1v1ySvQdq8vRSsJo +y8C1zdNE10rIGKYCwZd6Gy5dqwFZ7gEBXzJ8BBOh6Ec/09d3hfcYohbW4CzHu9OZ +FIb9PaVWpF7+rO2n2luS +=ndXm -----END PGP SIGNATURE----- diff -Nru pipelight-multi-0.2.8~ubuntu12.04.1/src/linux/libpipelight/nppfunctions.c pipelight-multi-0.2.8.1~ubuntu12.04.1/src/linux/libpipelight/nppfunctions.c --- pipelight-multi-0.2.8~ubuntu12.04.1/src/linux/libpipelight/nppfunctions.c 2014-12-10 05:02:45.000000000 +0000 +++ pipelight-multi-0.2.8.1~ubuntu12.04.1/src/linux/libpipelight/nppfunctions.c 2015-01-11 05:12:12.000000000 +0000 @@ -578,22 +578,18 @@ #ifndef __APPLE__ NPWindow windowOverride; if (config.x11WindowID){ - if (!window){ - Display *display = XOpenDisplay(NULL); - if (display) - { - unsigned int border, depth; - Window root; - if (XGetGeometry(display, config.x11WindowID, &root, &windowOverride.x, &windowOverride.y, - &windowOverride.width, &windowOverride.height, &border, &depth)){ - windowOverride.window = (void *)config.x11WindowID; - window = &windowOverride; - } - XCloseDisplay(display); + Display *display = XOpenDisplay(NULL); + if (display) + { + unsigned int border, depth; + Window root; + if (XGetGeometry(display, config.x11WindowID, &root, &windowOverride.x, &windowOverride.y, + &windowOverride.width, &windowOverride.height, &border, &depth)){ + windowOverride.type = NPWindowTypeWindow; + windowOverride.window = (void *)config.x11WindowID; + window = &windowOverride; } - }else{ - DBG_TRACE(" -> result=0"); - return NPERR_NO_ERROR; + XCloseDisplay(display); } } #endif