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
1=== modified file 'debian/changelog'
2--- debian/changelog 2012-01-22 16:57:27 +0000
3+++ debian/changelog 2016-10-27 10:35:08 +0000
4@@ -1,3 +1,11 @@
5+screenlets (0.1.7) xenial; urgency=low
6+
7+ * Update dependencies.
8+ * missing dependencies check before actually show the screenlet
9+ * Weather url fix.
10+
11+ -- Hrotkó Gábor <roti@profi-media.com> Wed, 26 Oct 2016 21:00:15 +0100
12+
13 screenlets (0.1.6) oneiric; urgency=low
14
15 * Fix windows moving around after restart in Unity.
16
17=== modified file 'debian/control'
18--- debian/control 2011-06-07 23:46:05 +0000
19+++ debian/control 2016-10-27 10:35:08 +0000
20@@ -4,9 +4,8 @@
21 Maintainer: Julien Lavergne <julien.lavergne@gmail.com>
22 Uploaders: Python Applications Packaging Team <python-apps-team@lists.alioth.debian.org>
23 Build-Depends: debhelper (>= 7.0.50~),
24- cdbs (>= 0.4.43),
25 python-dev (>= 2.3.5-11)
26-Build-Depends-Indep: python-support (>= 0.6.0),
27+Build-Depends-Indep: dh-python,
28 doc-base
29 Standards-Version: 3.8.2
30 Homepage: http://www.screenlets.org/index.php/Screenlets_Stayinalive
31@@ -23,15 +22,15 @@
32 python-gnome2,
33 python-dbus,
34 python-cairo,
35- python-wnck | python-gnome2-desktop,
36- python-gst0.10,
37+ python-wnck,
38+ python-gst-1.0,
39 python-xdg,
40 python-gconf,
41 python-beautifulsoup,
42+ python-gnomekeyring,
43 Recommends: python-webkit,
44- python-evolution | python-gnome2-desktop,
45- python-rsvg | python-gnome2-desktop,
46- metacity (>= 2.21.4) | xcompmgr | compiz | xfwm4 (>= 4.2) | mutter,
47+ python-rsvg,
48+ metacity (>= 2.21.4) | xcompmgr | compiz | xfwm4 (>= 4.2) | mutter,
49 screenlets-pack-basic,
50 Suggests: screenlets-pack-all
51 XB-Python-Version: ${python:Versions}
52
53=== modified file 'screenlets/hu.po'
54--- screenlets/hu.po 2013-03-05 04:33:07 +0000
55+++ screenlets/hu.po 2016-10-27 10:35:08 +0000
56@@ -207,7 +207,7 @@
57 "%(package)s %(version)s installed, req %(required)s."
58 msgstr ""
59 "\n"
60-"%(package)s %(version)s telepítve, %(required)s kérte."
61+"%(package)s %(version)s telepítve, %(required)s szükséges."
62
63 #: src/lib/__init__.py:1150
64 #, python-format
65
66=== modified file 'src/lib/__init__.py'
67--- src/lib/__init__.py 2012-06-17 12:24:49 +0000
68+++ src/lib/__init__.py 2016-10-27 10:35:08 +0000
69@@ -794,6 +794,9 @@
70 uses_pango=False, is_sizable=True,resize_on_scroll=True, ask_on_option_override=False):
71 """Constructor - should only be subclassed"""
72
73+ if DEBIAN and not self.ignore_requirements:
74+ self.check_requirements()
75+
76 # call gobject and EditableOptions superclasses
77 super(Screenlet, self).__init__()
78 EditableOptions.__init__(self)
79@@ -1104,7 +1107,7 @@
80
81 def check_requirements (self):
82 '''Checks if required DEB packages are installed'''
83-
84+ print "check_requirements"
85 req_feedback = ""
86 fail = False
87
88@@ -1133,10 +1136,10 @@
89
90 installed_version = os.popen(commandstr % package).readline().replace('\n', '').strip()
91
92- if len(installed_version) < 1:
93+ if len(installed_version) < 1 or installed_version == "(none)":
94 req_feedback += _("\n%(package)s %(version)s required, NOT INSTALLED!") % {"package":package, "version":version}
95 fail = True
96- else:
97+ else:
98 req_feedback += _("\n%(package)s %(version)s installed, req %(required)s.") % {"package":package, "version":installed_version, "required":version}
99 # will fail only if dpkg says that version is too old
100 # otherwise it's responsibility of developer to provide
101@@ -1429,11 +1432,6 @@
102 def finish_loading(self):
103 """Called when screenlet finishes loading"""
104
105-
106-
107- if DEBIAN and not self.ignore_requirements:
108- self.check_requirements()
109-
110 self.window.present()
111 self.show()
112
113
114=== modified file 'src/lib/plugins/Weather.py'
115--- src/lib/plugins/Weather.py 2012-05-30 09:48:27 +0000
116+++ src/lib/plugins/Weather.py 2016-10-27 10:35:08 +0000
117@@ -75,7 +75,7 @@
118 result = {}
119 proxies = proxy.Proxy().get_proxy()
120 try:
121- data = urlopen('http://xoap.weather.com/weather/local/'+self.ZIP+'?cc=*&par='+self.partner_key+'&key='+self.api_key+'&unit='+unit,proxies=proxies).read()
122+ data = urlopen('http://wxdata.weather.com/weather/local/'+self.ZIP+'?cc=*&par='+self.partner_key+'&key='+self.api_key+'&unit='+unit,proxies=proxies).read()
123 chunk = self.getBetween(data,"<cc>","<bar>")
124 #Time and date of last update of info
125 result["lsup"] = self.getBetween(chunk,"<lsup>","</lsup>")
126@@ -136,7 +136,7 @@
127 result = []
128 proxies = proxy.Proxy().get_proxy()
129 try:
130- 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()
131+ 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()
132
133 for x in range(5):
134 dfrom = data.find('<day d=\"'+str(x))
135@@ -165,7 +165,7 @@
136 try:
137
138 proxies = proxy.Proxy().get_proxy()
139- 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()
140+ 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()
141 for x in range(1,13):
142 dfrom = data.find('<hour h=\"'+str(x))
143 dto = data.find('</hour>',dfrom)

Subscribers

People subscribed via source and target branches

to status/vote changes: