Merge lp:~roti-al/screenlets/s1604 into lp:screenlets

Proposed by Hrotkó Gábor on 2016-10-27
Status: Merged
Merged at revision: 849
Proposed branch: lp:~roti-al/screenlets/s1604
Merge into: lp:screenlets
Diff against target: 143 lines (+24/-19)
5 files modified
debian/changelog (+8/-0)
debian/control (+6/-7)
screenlets/hu.po (+1/-1)
src/lib/__init__.py (+6/-8)
src/lib/plugins/Weather.py (+3/-3)
To merge this branch: bzr merge lp:~roti-al/screenlets/s1604
Reviewer Review Type Date Requested Status
Hrotkó Gábor Approve on 2017-01-30
Review via email: mp+309453@code.launchpad.net

Description of the change

fixes for ubuntu 16.04

To post a comment you must log in.
lp:~roti-al/screenlets/s1604 updated on 2016-10-27
850. By Hrotkó Gábor on 2016-10-27

changelog fomrat fix

Hrotkó Gábor (roti-al) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2012-01-22 16:57:27 +0000
+++ debian/changelog 2016-10-27 10:35:08 +0000
@@ -1,3 +1,11 @@
1screenlets (0.1.7) xenial; urgency=low
2
3 * Update dependencies.
4 * missing dependencies check before actually show the screenlet
5 * Weather url fix.
6
7 -- Hrotkó Gábor <roti@profi-media.com> Wed, 26 Oct 2016 21:00:15 +0100
8
1screenlets (0.1.6) oneiric; urgency=low9screenlets (0.1.6) oneiric; urgency=low
210
3 * Fix windows moving around after restart in Unity.11 * Fix windows moving around after restart in Unity.
412
=== modified file 'debian/control'
--- debian/control 2011-06-07 23:46:05 +0000
+++ debian/control 2016-10-27 10:35:08 +0000
@@ -4,9 +4,8 @@
4Maintainer: Julien Lavergne <julien.lavergne@gmail.com>4Maintainer: Julien Lavergne <julien.lavergne@gmail.com>
5Uploaders: Python Applications Packaging Team <python-apps-team@lists.alioth.debian.org>5Uploaders: Python Applications Packaging Team <python-apps-team@lists.alioth.debian.org>
6Build-Depends: debhelper (>= 7.0.50~),6Build-Depends: debhelper (>= 7.0.50~),
7 cdbs (>= 0.4.43),
8 python-dev (>= 2.3.5-11)7 python-dev (>= 2.3.5-11)
9Build-Depends-Indep: python-support (>= 0.6.0),8Build-Depends-Indep: dh-python,
10 doc-base9 doc-base
11Standards-Version: 3.8.210Standards-Version: 3.8.2
12Homepage: http://www.screenlets.org/index.php/Screenlets_Stayinalive11Homepage: http://www.screenlets.org/index.php/Screenlets_Stayinalive
@@ -23,15 +22,15 @@
23 python-gnome2,22 python-gnome2,
24 python-dbus,23 python-dbus,
25 python-cairo,24 python-cairo,
26 python-wnck | python-gnome2-desktop,25 python-wnck,
27 python-gst0.10,26 python-gst-1.0,
28 python-xdg,27 python-xdg,
29 python-gconf,28 python-gconf,
30 python-beautifulsoup,29 python-beautifulsoup,
30 python-gnomekeyring,
31Recommends: python-webkit,31Recommends: python-webkit,
32 python-evolution | python-gnome2-desktop,32 python-rsvg,
33 python-rsvg | python-gnome2-desktop,33 metacity (>= 2.21.4) | xcompmgr | compiz | xfwm4 (>= 4.2) | mutter,
34 metacity (>= 2.21.4) | xcompmgr | compiz | xfwm4 (>= 4.2) | mutter,
35 screenlets-pack-basic,34 screenlets-pack-basic,
36Suggests: screenlets-pack-all35Suggests: screenlets-pack-all
37XB-Python-Version: ${python:Versions}36XB-Python-Version: ${python:Versions}
3837
=== modified file 'screenlets/hu.po'
--- screenlets/hu.po 2013-03-05 04:33:07 +0000
+++ screenlets/hu.po 2016-10-27 10:35:08 +0000
@@ -207,7 +207,7 @@
207"%(package)s %(version)s installed, req %(required)s."207"%(package)s %(version)s installed, req %(required)s."
208msgstr ""208msgstr ""
209"\n"209"\n"
210"%(package)s %(version)s telepítve, %(required)s kérte."210"%(package)s %(version)s telepítve, %(required)s szükséges."
211211
212#: src/lib/__init__.py:1150212#: src/lib/__init__.py:1150
213#, python-format213#, python-format
214214
=== 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:35:08 +0000
@@ -794,6 +794,9 @@
794 uses_pango=False, is_sizable=True,resize_on_scroll=True, ask_on_option_override=False):794 uses_pango=False, is_sizable=True,resize_on_scroll=True, ask_on_option_override=False):
795 """Constructor - should only be subclassed"""795 """Constructor - should only be subclassed"""
796 796
797 if DEBIAN and not self.ignore_requirements:
798 self.check_requirements()
799
797 # call gobject and EditableOptions superclasses800 # call gobject and EditableOptions superclasses
798 super(Screenlet, self).__init__()801 super(Screenlet, self).__init__()
799 EditableOptions.__init__(self)802 EditableOptions.__init__(self)
@@ -1104,7 +1107,7 @@
1104 1107
1105 def check_requirements (self):1108 def check_requirements (self):
1106 '''Checks if required DEB packages are installed'''1109 '''Checks if required DEB packages are installed'''
11071110 print "check_requirements"
1108 req_feedback = ""1111 req_feedback = ""
1109 fail = False1112 fail = False
11101113
@@ -1133,10 +1136,10 @@
11331136
1134 installed_version = os.popen(commandstr % package).readline().replace('\n', '').strip()1137 installed_version = os.popen(commandstr % package).readline().replace('\n', '').strip()
11351138
1136 if len(installed_version) < 1:1139 if len(installed_version) < 1 or installed_version == "(none)":
1137 req_feedback += _("\n%(package)s %(version)s required, NOT INSTALLED!") % {"package":package, "version":version}1140 req_feedback += _("\n%(package)s %(version)s required, NOT INSTALLED!") % {"package":package, "version":version}
1138 fail = True1141 fail = True
1139 else:1142 else:
1140 req_feedback += _("\n%(package)s %(version)s installed, req %(required)s.") % {"package":package, "version":installed_version, "required":version}1143 req_feedback += _("\n%(package)s %(version)s installed, req %(required)s.") % {"package":package, "version":installed_version, "required":version}
1141 # will fail only if dpkg says that version is too old1144 # will fail only if dpkg says that version is too old
1142 # otherwise it's responsibility of developer to provide1145 # otherwise it's responsibility of developer to provide
@@ -1429,11 +1432,6 @@
1429 def finish_loading(self):1432 def finish_loading(self):
1430 """Called when screenlet finishes loading"""1433 """Called when screenlet finishes loading"""
1431 1434
1432
1433
1434 if DEBIAN and not self.ignore_requirements:
1435 self.check_requirements()
1436
1437 self.window.present()1435 self.window.present()
1438 self.show()1436 self.show()
14391437
14401438
=== 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:35:08 +0000
@@ -75,7 +75,7 @@
75 result = {}75 result = {}
76 proxies = proxy.Proxy().get_proxy()76 proxies = proxy.Proxy().get_proxy()
77 try:77 try:
78 data = urlopen('http://xoap.weather.com/weather/local/'+self.ZIP+'?cc=*&par='+self.partner_key+'&key='+self.api_key+'&unit='+unit,proxies=proxies).read()78 data = urlopen('http://wxdata.weather.com/weather/local/'+self.ZIP+'?cc=*&par='+self.partner_key+'&key='+self.api_key+'&unit='+unit,proxies=proxies).read()
79 chunk = self.getBetween(data,"<cc>","<bar>")79 chunk = self.getBetween(data,"<cc>","<bar>")
80 #Time and date of last update of info80 #Time and date of last update of info
81 result["lsup"] = self.getBetween(chunk,"<lsup>","</lsup>") 81 result["lsup"] = self.getBetween(chunk,"<lsup>","</lsup>")
@@ -136,7 +136,7 @@
136 result = []136 result = []
137 proxies = proxy.Proxy().get_proxy()137 proxies = proxy.Proxy().get_proxy()
138 try:138 try:
139 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()139 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()
140140
141 for x in range(5):141 for x in range(5):
142 dfrom = data.find('<day d=\"'+str(x))142 dfrom = data.find('<day d=\"'+str(x))
@@ -165,7 +165,7 @@
165 try:165 try:
166 166
167 proxies = proxy.Proxy().get_proxy()167 proxies = proxy.Proxy().get_proxy()
168 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()168 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()
169 for x in range(1,13):169 for x in range(1,13):
170 dfrom = data.find('<hour h=\"'+str(x))170 dfrom = data.find('<hour h=\"'+str(x))
171 dto = data.find('</hour>',dfrom) 171 dto = data.find('</hour>',dfrom)

Subscribers

People subscribed via source and target branches

to status/vote changes: