diff -Nru phpsysinfo-3.4.3/debian/changelog phpsysinfo-3.4.3/debian/changelog --- phpsysinfo-3.4.3/debian/changelog 2023-07-06 11:52:58.000000000 +0000 +++ phpsysinfo-3.4.3/debian/changelog 2023-09-08 14:17:44.000000000 +0000 @@ -1,3 +1,18 @@ +phpsysinfo (3.4.3-3) unstable; urgency=medium + + * Fix armhf and arm64 tests + * Add Security-Contact and CPE to d/u/metadata + + -- William Desportes Fri, 08 Sep 2023 16:17:44 +0200 + +phpsysinfo (3.4.3-2) unstable; urgency=medium + + * Fix running the selenium tests + * Translate into Swedish (Closes: #1049980) + * Update lintian overrides + + -- William Desportes Thu, 07 Sep 2023 20:43:35 +0200 + phpsysinfo (3.4.3-1) unstable; urgency=medium * Translate into Romanian (Closes: #1033388) diff -Nru phpsysinfo-3.4.3/debian/phpsysinfo.lintian-overrides phpsysinfo-3.4.3/debian/phpsysinfo.lintian-overrides --- phpsysinfo-3.4.3/debian/phpsysinfo.lintian-overrides 2023-01-12 19:46:03.000000000 +0000 +++ phpsysinfo-3.4.3/debian/phpsysinfo.lintian-overrides 2023-09-07 18:42:36.000000000 +0000 @@ -16,7 +16,7 @@ phpsysinfo: package-contains-documentation-outside-usr-share-doc [usr/share/phpsysinfo/plugins/updatenotifier/updatenotifier_bootstrap.html] phpsysinfo: package-contains-documentation-outside-usr-share-doc [usr/share/phpsysinfo/plugins/uprecords/uprecords_bootstrap.html] phpsysinfo: package-contains-documentation-outside-usr-share-doc [usr/share/phpsysinfo/plugins/viewer/viewer_bootstrap.html] -phpsysinfo: national-encoding [usr/share/phpsysinfo/js/vendor/sorttable.js] +phpsysinfo: package-contains-documentation-outside-usr-share-doc [usr/share/phpsysinfo/plugins/diskload/diskload_bootstrap.html] # Too old versions in this package compared to Debian ones phpsysinfo: embedded-javascript-library please use libjs-jquery [usr/share/phpsysinfo/js/jQuery/jquery.js] phpsysinfo: embedded-javascript-library please use libjs-jquery-treetable [usr/share/phpsysinfo/js/jQuery/jquery.treeTable.js] diff -Nru phpsysinfo-3.4.3/debian/po/sv.po phpsysinfo-3.4.3/debian/po/sv.po --- phpsysinfo-3.4.3/debian/po/sv.po 1970-01-01 00:00:00.000000000 +0000 +++ phpsysinfo-3.4.3/debian/po/sv.po 2023-09-07 18:36:04.000000000 +0000 @@ -0,0 +1,76 @@ +# Translation of phpSysInfo debconf templates to Swedish +# Copyright (C) The phpSysInfo package copyright holder. +# This file is distributed under the same license as the phpSysInfo package. +# +# Peter Kvillegård , 2023. +# +msgid "" +msgstr "" +"Project-Id-Version: phpsysinfo 3.4.3-1\n" +"Report-Msgid-Bugs-To: phpsysinfo@packages.debian.org\n" +"POT-Creation-Date: 2023-01-14 13:26+0400\n" +"PO-Revision-Date: 2023-08-16 13:19+0200\n" +"Last-Translator: Peter Kvillegård \n" +"Language-Team: Swedish \n" +"Language: sv\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Poedit 3.2.2\n" + +#. Type: multiselect +#. Description +#: ../templates:2001 +msgid "Web server to reconfigure automatically:" +msgstr "Webbserver som ska omkonfigureras automatiskt:" + +#. Type: multiselect +#. Description +#: ../templates:2001 +msgid "" +"Please choose the web server that should be automatically configured to run " +"phpSysInfo." +msgstr "" +"Välj vilken webbserver som ska bli automatiskt konfigurerad att köra " +"phpSysInfo." + +#. Type: boolean +#. Description +#: ../templates:3001 +msgid "Do you want to restart the webservers now if needed?" +msgstr "Vill du starta om webbservrarna nu om det behövs?" + +#. Type: boolean +#. Description +#: ../templates:3001 +msgid "" +"Remember that in order to activate the new configuration the webservers have " +"to be restarted." +msgstr "" +"Kom ihåg att webbservrarna behöver startas om för att aktivera den nya " +"konfigurationen." + +#. Type: note +#. Description +#: ../templates:4001 +msgid "Configuring phpSysInfo with Nginx" +msgstr "Konfigurera phpSysInfo med Nginx" + +#. Type: note +#. Description +#: ../templates:4001 +msgid "" +"The phpSysInfo Nginx configuration file is a location block configuration. " +"Please add the line \"include /etc/phpsysinfo/nginx.conf;\" **inside** a " +"Nginx \"server {...}\" block. For example in '/etc/nginx/sites-enabled/" +"default'. You may need to adjust the socket path in '/etc/phpsysinfo/nginx." +"conf' to another path like '/run/php/php8.2-fpm.sock'. Be sure to restart " +"the webserver afterwards." +msgstr "" +"Nginx-konfigurationsfilen för phpSysInfo är ett block med platskonfiguration " +"(location block configuration). Lägg till raden \"include /etc/phpsysinfo/" +"nginx.conf;\" **inuti** ett \"server {...}\"-block för Nginx. Till exempel i " +"'/etc/nginx/sites-enabled/default'. Du kan behöva ändra sockelsökvägen i '/" +"etc/phpsysinfo/nginx.conf' till en annan sökväg, exempelvis '/run/php/php8.2-" +"fpm.sock'. Se till att starta om webbservern efter detta." diff -Nru phpsysinfo-3.4.3/debian/source/lintian-overrides phpsysinfo-3.4.3/debian/source/lintian-overrides --- phpsysinfo-3.4.3/debian/source/lintian-overrides 2023-01-14 09:25:46.000000000 +0000 +++ phpsysinfo-3.4.3/debian/source/lintian-overrides 2023-09-08 08:29:26.000000000 +0000 @@ -10,6 +10,5 @@ phpsysinfo source: very-long-line-length-in-source-file 1288 > 512 [js/jQuery/jquery.dataTables.js:28] phpsysinfo source: very-long-line-length-in-source-file 582 > 512 [plugins/docker/js/docker.js:57] phpsysinfo source: very-long-line-length-in-source-file 666 > 512 [plugins/quotas/js/quotas.js:58] -phpsysinfo source: very-long-line-length-in-source-file 670 > 512 [js/phpSysInfo/phpsysinfo.js:1303] # Not useful upstream phpsysinfo source: maintainer-manual-page [debian/phpsysinfo.1] \ No newline at end of file diff -Nru phpsysinfo-3.4.3/debian/tests/selenium phpsysinfo-3.4.3/debian/tests/selenium --- phpsysinfo-3.4.3/debian/tests/selenium 2023-01-14 06:30:42.000000000 +0000 +++ phpsysinfo-3.4.3/debian/tests/selenium 2023-09-07 15:57:19.000000000 +0000 @@ -2,8 +2,10 @@ set -eu -# Needed to find lighttpd binary -export PATH="/sbin:/usr/sbin:$PATH" +# Needed to find lighttpd binary and the chromedriver binary +export PATH="/sbin:/usr/sbin:/usr/bin:$PATH" + +chromedriver --version PORT=8888 DOCROOT="$AUTOPKGTEST_TMP/docroot" diff -Nru phpsysinfo-3.4.3/debian/tests/test_phpsysinfo_web.py phpsysinfo-3.4.3/debian/tests/test_phpsysinfo_web.py --- phpsysinfo-3.4.3/debian/tests/test_phpsysinfo_web.py 2023-01-12 23:13:29.000000000 +0000 +++ phpsysinfo-3.4.3/debian/tests/test_phpsysinfo_web.py 2023-09-08 08:29:08.000000000 +0000 @@ -1,10 +1,12 @@ import unittest from selenium import webdriver +from selenium.webdriver.chrome.service import Service from selenium.webdriver.support.wait import WebDriverWait from selenium.webdriver.common.by import By from selenium.webdriver.support.ui import Select import os +import sys class TestPhpSysinfoWeb(unittest.TestCase): @@ -21,7 +23,8 @@ options.add_argument('--disable-dev-shm-usage') options.add_argument('--profile-directory=Default') options.add_argument('--user-data-dir=' + self.data_dir) - self.driver = webdriver.Chrome(options=options) + service = Service(executable_path=r'/usr/bin/chromedriver') + self.driver = webdriver.Chrome(service=service, options=options) def tearDown(self): self.driver.close() @@ -38,7 +41,7 @@ hardware = WebDriverWait(self.driver, 60).until(lambda x: x.find_element(By.ID, "hardware")) - self.assertIn("CPU Speed", hardware.text) + self.assertIn("Processor", hardware.text) footer = WebDriverWait(self.driver, 60).until(lambda x: x.find_element(By.ID, "footer")) footer_link = footer.find_element(By.TAG_NAME, "a") @@ -75,4 +78,7 @@ if __name__ == '__main__': suite = unittest.TestLoader().loadTestsFromTestCase(TestPhpSysinfoWeb) - unittest.TextTestRunner(verbosity=2).run(suite) + result = unittest.TextTestRunner(verbosity=2).run(suite) + + if not result.wasSuccessful(): + sys.exit(1) diff -Nru phpsysinfo-3.4.3/debian/upstream/metadata phpsysinfo-3.4.3/debian/upstream/metadata --- phpsysinfo-3.4.3/debian/upstream/metadata 2023-07-06 11:46:24.000000000 +0000 +++ phpsysinfo-3.4.3/debian/upstream/metadata 2023-09-08 14:17:19.000000000 +0000 @@ -6,3 +6,5 @@ Repository-Browse: https://github.com/phpsysinfo/phpsysinfo Changelog: https://github.com/phpsysinfo/phpsysinfo/blob/main/CHANGELOG.md Donation: https://phpsysinfo.github.io/phpsysinfo/ +Security-Contact: phpsysinfo@yahoo.com +CPE: cpe:/a:phpsysinfo:phpsysinfo