Hrotkó Gábor has proposed merging lp:~roti-al/screenlets/s1604 into lp:screenlets.
Requested reviews: Screenlets Dev Team (screenlets-dev) Related bugs: Bug #1577219 in Screenlets: "No support for Ubuntu 16.04 Xenial" https://bugs.launchpad.net/screenlets/+bug/1577219 For more details, see: https://code.launchpad.net/~roti-al/screenlets/s1604/+merge/309453 fixes for ubuntu 16.04 -- Your team Screenlets Dev Team is requested to review the proposed merge of lp:~roti-al/screenlets/s1604 into lp:screenlets.
=== modified file 'debian/changelog' --- debian/changelog 2012-01-22 16:57:27 +0000 +++ debian/changelog 2016-10-27 10:23:09 +0000 @@ -1,3 +1,12 @@ +screenlets (0.1.7) xenial; urgency=low + + * Update dependencies. + * missing dependencies check before actually show the screenlet + * Weather url fix. + + -- Hrotkó Gábor <[email protected]> Wed, 26 Oct 2016 21:00:15 CEST + + screenlets (0.1.6) oneiric; urgency=low * Fix windows moving around after restart in Unity. === modified file 'debian/control' --- debian/control 2011-06-07 23:46:05 +0000 +++ debian/control 2016-10-27 10:23:09 +0000 @@ -4,9 +4,8 @@ Maintainer: Julien Lavergne <[email protected]> Uploaders: Python Applications Packaging Team <[email protected]> Build-Depends: debhelper (>= 7.0.50~), - cdbs (>= 0.4.43), python-dev (>= 2.3.5-11) -Build-Depends-Indep: python-support (>= 0.6.0), +Build-Depends-Indep: dh-python, doc-base Standards-Version: 3.8.2 Homepage: http://www.screenlets.org/index.php/Screenlets_Stayinalive @@ -23,15 +22,15 @@ python-gnome2, python-dbus, python-cairo, - python-wnck | python-gnome2-desktop, - python-gst0.10, + python-wnck, + python-gst-1.0, python-xdg, python-gconf, python-beautifulsoup, + python-gnomekeyring, Recommends: python-webkit, - python-evolution | python-gnome2-desktop, - python-rsvg | python-gnome2-desktop, - metacity (>= 2.21.4) | xcompmgr | compiz | xfwm4 (>= 4.2) | mutter, + python-rsvg, + metacity (>= 2.21.4) | xcompmgr | compiz | xfwm4 (>= 4.2) | mutter, screenlets-pack-basic, Suggests: screenlets-pack-all XB-Python-Version: ${python:Versions} === modified file 'screenlets/hu.po' --- screenlets/hu.po 2013-03-05 04:33:07 +0000 +++ screenlets/hu.po 2016-10-27 10:23:09 +0000 @@ -207,7 +207,7 @@ "%(package)s %(version)s installed, req %(required)s." msgstr "" "\n" -"%(package)s %(version)s telepítve, %(required)s kérte." +"%(package)s %(version)s telepítve, %(required)s szükséges." #: src/lib/__init__.py:1150 #, python-format === modified file 'src/lib/__init__.py' --- src/lib/__init__.py 2012-06-17 12:24:49 +0000 +++ src/lib/__init__.py 2016-10-27 10:23:09 +0000 @@ -794,6 +794,9 @@ uses_pango=False, is_sizable=True,resize_on_scroll=True, ask_on_option_override=False): """Constructor - should only be subclassed""" + if DEBIAN and not self.ignore_requirements: + self.check_requirements() + # call gobject and EditableOptions superclasses super(Screenlet, self).__init__() EditableOptions.__init__(self) @@ -1104,7 +1107,7 @@ def check_requirements (self): '''Checks if required DEB packages are installed''' - + print "check_requirements" req_feedback = "" fail = False @@ -1133,10 +1136,10 @@ installed_version = os.popen(commandstr % package).readline().replace('\n', '').strip() - if len(installed_version) < 1: + if len(installed_version) < 1 or installed_version == "(none)": req_feedback += _("\n%(package)s %(version)s required, NOT INSTALLED!") % {"package":package, "version":version} fail = True - else: + else: req_feedback += _("\n%(package)s %(version)s installed, req %(required)s.") % {"package":package, "version":installed_version, "required":version} # will fail only if dpkg says that version is too old # otherwise it's responsibility of developer to provide @@ -1429,11 +1432,6 @@ def finish_loading(self): """Called when screenlet finishes loading""" - - - if DEBIAN and not self.ignore_requirements: - self.check_requirements() - self.window.present() self.show() === modified file 'src/lib/plugins/Weather.py' --- src/lib/plugins/Weather.py 2012-05-30 09:48:27 +0000 +++ src/lib/plugins/Weather.py 2016-10-27 10:23:09 +0000 @@ -75,7 +75,7 @@ result = {} proxies = proxy.Proxy().get_proxy() try: - data = urlopen('http://xoap.weather.com/weather/local/'+self.ZIP+'?cc=*&par='+self.partner_key+'&key='+self.api_key+'&unit='+unit,proxies=proxies).read() + data = urlopen('http://wxdata.weather.com/weather/local/'+self.ZIP+'?cc=*&par='+self.partner_key+'&key='+self.api_key+'&unit='+unit,proxies=proxies).read() chunk = self.getBetween(data,"<cc>","<bar>") #Time and date of last update of info result["lsup"] = self.getBetween(chunk,"<lsup>","</lsup>") @@ -136,7 +136,7 @@ result = [] proxies = proxy.Proxy().get_proxy() try: - data = urlopen('http://xoap.weather.com/weather/local/'+self.ZIP+'?dayf=5&par='+self.partner_key+'&key='+self.api_key+'&unit='+unit,proxies=proxies).read() + data = urlopen('http://wxdata.weather.com/weather/local/'+self.ZIP+'?dayf=5&par='+self.partner_key+'&key='+self.api_key+'&unit='+unit,proxies=proxies).read() for x in range(5): dfrom = data.find('<day d=\"'+str(x)) @@ -165,7 +165,7 @@ try: proxies = proxy.Proxy().get_proxy() - data = urlopen('http://xoap.weather.com/weather/local/'+self.ZIP+'?hbhf=12&par='+self.partner_key+'&key='+self.api_key+'&unit='+unit,proxies=proxies).read() + data = urlopen('http://wxdata.weather.com/weather/local/'+self.ZIP+'?hbhf=12&par='+self.partner_key+'&key='+self.api_key+'&unit='+unit,proxies=proxies).read() for x in range(1,13): dfrom = data.find('<hour h=\"'+str(x)) dto = data.find('</hour>',dfrom)
_______________________________________________ Mailing list: https://launchpad.net/~screenlets-dev Post to : [email protected] Unsubscribe : https://launchpad.net/~screenlets-dev More help : https://help.launchpad.net/ListHelp
