incorporate dmitry's feedback and add back widget.ini

7 files changed, 15 insertions, 15 deletions

diff --git a/debian/rules b/debian/rules
index 0c842ca16..9b17a20e0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -35,15 +35,13 @@ override_dh_auto_configure:
 
 override_dh_install:
	# install autopilot tests
-	cd tests/autopilot; \
- python setup.py install --root=$(CURDIR)/debian/tmp --install-layout=deb;
+	cd tests/autopilot; python3 setup.py install --root=$(CURDIR)/debian/tmp --install-layout=deb;
	find debian/tmp/usr/lib -name \*.*a -exec rm {} \;
	rm -rf debian/tmp/usr/share/gconf/schemas
	# install uwidgets
-	cd uwidgets; \
- python3 setup.py install --root=$(CURDIR)/debian/tmp --install-layout=deb; \
+	cd uwidgets; python3 setup.py install --root=$(CURDIR)/debian/tmp --install-layout=deb
	install -Dm755 $(CURDIR)/debian/tmp/usr/etc/xdg/autostart/uwidgets-runner.desktop $(CURDIR)/debian/tmp/etc/xdg/autostart/uwidgets-runner.desktop
-	cd $(CURDIR); dh_install --fail-missing
+	dh_install --fail-missing
 
 override_dh_gencontrol:
	dh_gencontrol -- -Vcoreabiversion=$(CORE_ABIVERSION) -Vnuxabiversion=$(NUX_ABIVERSION) -Vunity-default-masterscopes="$(SCOPES_RECOMMENDS)"
diff --git a/uwidgets/LICENSE.md b/uwidgets/LICENSE
index 32b38d425..32b38d425 100644
--- a/uwidgets/LICENSE.md
+++ b/uwidgets/LICENSE
diff --git a/uwidgets/official-widgets/unsplash-background/widget.ini b/uwidgets/official-widgets/unsplash-background/widget.ini
new file mode 100644
index 000000000..d997844a0
--- /dev/null
+++ b/uwidgets/official-widgets/unsplash-background/widget.ini
@@ -0,0 +1,5 @@
+[widget]
+name=Unsplash Background
+summary=A widget to set a random Unsplash wallpaper for the Unity desktop.
+exec=python3 unsplash-background.py
+enabled=true \ No newline at end of file
diff --git a/uwidgets/setup.cfg b/uwidgets/setup.cfg
deleted file mode 100644
index 2b01c174d..000000000
--- a/uwidgets/setup.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-[build_ext]
-include_dirs = /usr/include/cairo
-libraries = cairo
- X11
diff --git a/uwidgets/setup.py b/uwidgets/setup.py
index 335301cf9..49bef351e 100755
--- a/uwidgets/setup.py
+++ b/uwidgets/setup.py
@@ -46,7 +46,7 @@ setup(
 author_email = 'rs2009@ubuntu.com',
 url = 'https://unityd.org',
 classifiers=[
- 'Development Status :: 1 - Production/Stable',
+ 'Development Status :: 5 - Production/Stable',
 
 'Intended Audience :: Developers',
 'Topic :: Software Development :: Build Tools',
@@ -61,7 +61,4 @@ setup(
 ext_modules = [x11],
 install_requires = ['pycairo'],
 scripts = ['uwidgets-runner'],
- extras_require = {
- 'test': ['pytest-xvfb', 'psutil'],
- },
 )
diff --git a/uwidgets/uwidgets-runner b/uwidgets/uwidgets-runner
index 60a771ec8..3efeac56e 100755
--- a/uwidgets/uwidgets-runner
+++ b/uwidgets/uwidgets-runner
@@ -15,8 +15,8 @@ if os.path.exists(widgets_dir):
 if config.get('widget', 'enabled') == 'true':
 os.popen(config.get('widget', 'exec'))
 widgets.append(os.path.basename(widget))
- except:
- print(f'uwidget-runner: error occurred when attempting to run {widget}')
+ except (KeyError, configparser.NoSectionError, configparser.NoOptionError) as e:
+ print(f'uwidget-runner: error occurred when attempting to run {widget}:\n {e}')
 
 if len(widgets) == 0:
 print("No widgets found.")
diff --git a/uwidgets/widget.ini b/uwidgets/widget.ini
new file mode 100644
index 000000000..8c0d94f78
--- /dev/null
+++ b/uwidgets/widget.ini
@@ -0,0 +1,4 @@
+[widget]
+name=Unsplash Background
+summary=A widget to set a random Unsplash wallpaper for the Unity desktop.
+exec=python3 unsplash-background.py \ No newline at end of file