lubuntu-team · Jan 28, 2018 · Jan 28, 2018 · Jan 28, 2018 · Jan 28, 2018 · Jan 28, 2018
diff --git a/debian/changelog b/debian/changelog
@@ -0,0 +1,5 @@
+lubuntu-about (1.0.0) UNRELEASED; urgency=medium
+
+  * Initial release.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Sat, 27 Jan 2018 22:52:50 -0600
diff --git a/debian/compat b/debian/compat
@@ -0,0 +1 @@
+11
diff --git a/debian/control b/debian/control
@@ -0,0 +1,34 @@
+Source: lubuntu-about
+Section: x11
+Priority: optional
+Maintainer: Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
+Uploaders: Simon Quigley <tsimonq2@ubuntu.com>,
+           Julien Lavergne <gilir@ubuntu.com>
+Build-Depends: debhelper (>= 11),
+               dh-python,
+               pyqt5-dev-tools,
+               python3-all,
+               python3-distutils,
+               python3-distutils-extra,
+               python3-setuptools
+Standards-Version: 4.1.3
+Homepage: https://github.com/lubuntu-team/lubuntu-about
+X-Python3-Version: >= 3.6
+Vcs-Git: https://github.com/lubuntu-team/lubuntu-about
+Vcs-Browser: https://github.com/lubuntu-team/lubuntu-about
+
+Package: lubuntu-about
+Architecture: all
+Depends: lsb-release,
+         neofetch,
+         pyqt5-dev,
+         python3-cpuinfo,
+         python3-psutil,
+         ${misc:Depends},
+         ${python3:Depends}
+Description: Program showing information about a Lubuntu system - libraries
+ A simple entry in Lubuntu's main menu with a command showing some basic
+ hardware and software information, like free memory, processor, OS version,
+ kernel, etc.
+ .
+ This package installs the main executable.
diff --git a/debian/copyright b/debian/copyright
@@ -0,0 +1,22 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: lubuntu-about
+Source: https://github.com/lubuntu-team/lubuntu-about
+
+Files: *
+Copyright: 2018 Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
+License: GPL-3+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <https://www.gnu.org/licenses/>
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
diff --git a/debian/rules b/debian/rules
@@ -0,0 +1,15 @@
+#!/usr/bin/make -f
+
+export DH_VERBOSE = 1
+
+export PYBUILD_NAME=lubuntu-about
+
+%:
+	(cd src && make clean && make)
+	dh $@ --with python3 --buildsystem=pybuild
+
+override_dh_install:
+	dh_missing --fail-missing
+
+override_dh_python3:
+	dh_python3 --no-shebang-rewrite
diff --git a/debian/source/format b/debian/source/format
@@ -0,0 +1 @@
+3.0 (native)
diff --git a/debian/source/options b/debian/source/options
@@ -0,0 +1 @@
+extend-diff-ignore = "^[^/]*[.]egg-info/"
diff --git a/setup.py b/setup.py
@@ -0,0 +1,14 @@
+#!/usr/bin/python3
+# -*- coding: utf-8 -*-
+
+from distutils.core import setup
+import glob
+import os
+from DistUtilsExtra.command import *
+
+setup(name='lubuntu-about',
+      version='1.0.0',
+      packages=['src'],
+      scripts=['src/lubuntu-about'],
+      cmdclass = { "build" : build_extra.build_extra }
+)
diff --git a/src/Makefile b/src/Makefile
@@ -1,8 +1,9 @@
 #!/usr/bin/make -f
 
 all:
-	pyuic5 main.ui -o aboutlubuntu_auto.py
-	pyrcc5 main.qrc -o main_rc.py
+	pyuic5 main.ui -o aboutlubuntu_autowidgets.py
+	pyrcc5 main.qrc -o aboutlubuntu_autoresources.py
+	sed -i "s/main_rc/aboutlubuntu_autoresources/g" aboutlubuntu_autowidgets.py
 
 clean:
-	rm -rvf *_auto.py main_rc.py __pycache__
+	rm -rvf aboutlubuntu_auto*.py __pycache__
diff --git a/src/Lubuntu.png → src/images/Lubuntu.png b/src/Lubuntu.png → src/images/Lubuntu.png
diff --git a/src/main.py → src/lubuntu-about b/src/main.py → src/lubuntu-about
@@ -31,7 +31,7 @@
 from lsb_release import get_distro_information
 from PyQt5.QtWidgets import QWidget, QApplication, QMainWindow
 
-from aboutlubuntu_auto import Ui_Dialog
+from aboutlubuntu_autowidgets import Ui_Dialog
 
 class LubuntuAbout(QMainWindow, Ui_Dialog):
     def __init__(self):
@@ -79,8 +79,14 @@ def setvariables():
 
     cpu = cpuinfo.get_cpu_info()["brand"]
 
-    # FIXME: Please, someone simplify this...
-    graphics = (run(["lspci", "-mm"], stdout=PIPE).stdout.decode('utf-8').split("\n")[2].replace("\"", "").split("VGA compatible controller ")[1].split("Controller")[0])+"Controller"
+    # FIXME: This code is horrible, it shouldn't depend on neofetch and should be reworked.
+    graphicslist = run(["neofetch", "--stdout"], stdout=PIPE).stdout.decode("utf-8").split("\n")
+
+    i = 0
+    while i < len(graphicslist):
+        if "GPU" in graphicslist[i]:
+            graphics = graphicslist[i].replace("GPU: ", "")
+        i += 1
 
     freemem = memcalc(virtual_memory().free)
     totalmem = memcalc(virtual_memory().total)