update print/system-config-printer to 1.5.12

Approved by:	mentors (implicit)

7 files changed, 155 insertions, 143 deletions

diff --git a/print/system-config-printer/Makefile b/print/system-config-printer/Makefile
index 6fa21d01ee12..27fbe9a13110 100644
--- a/print/system-config-printer/Makefile
+++ b/print/system-config-printer/Makefile
@@ -2,10 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	system-config-printer
-PORTVERSION=	1.4.7
-PORTREVISION=	4
+PORTVERSION=	1.5.12
 CATEGORIES=	print gnome
-MASTER_SITES=	http://cyberelk.net/tim/data/${PORTNAME}/${PORTVERSION:R}/
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	CUPS configuration Gtk+2.0 GUI
@@ -13,7 +11,8 @@ COMMENT=	CUPS configuration Gtk+2.0 GUI
 BUILD_DEPENDS=	xmlto:textproc/xmlto \
 		docbook-xml>0:textproc/docbook-xml
 LIB_DEPENDS=	libcups.so:print/cups
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycups>=0:print/py-pycups@${PY_FLAVOR} \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pycups>=0:print/py-pycups@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pycurl>=0:ftp/py-pycurl@${PY_FLAVOR} \
 		${LOCALBASE}/libexec/cups-pk-helper-mechanism:print/cups-pk-helper
 
@@ -21,8 +20,12 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycups>=0:print/py-pycups@${PY_FLAVOR} \
 PORTSCOUT=	limitw:1,even
 
 GNU_CONFIGURE=	yes
-USES=		desktop-file-utils gettext gmake gnome pathfix pkgconfig \
-		python:2.7 shebangfix tar:xz
+USES=		autoreconf desktop-file-utils gettext gmake pathfix pkgconfig python:3.5+ \
+		shebangfix tar:xz
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	OpenPrinting
+
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 USE_GNOME=	intlhack pygobject3
@@ -43,9 +46,9 @@ post-patch:
 		${WRKSRC}/applet.py ${WRKSRC}/check-device-ids.py \
 		${WRKSRC}/cupshelpers/cupshelpers.py \
 		${WRKSRC}/cupshelpers/xmldriverprefs.py \
-		${WRKSRC}/dbus/org.fedoraproject.Config.Printing.service \
+		${WRKSRC}/dbus/org.fedoraproject.Config.Printing.service.in \
 		${WRKSRC}/newprinter.py ${WRKSRC}/probe_printer.py
 	@${REINPLACE_CMD} -e 's|setup.py install.*|setup.py install -c -O1 --prefix=${PREFIX} --root=${STAGEDIR}|g' \
-		${WRKSRC}/Makefile.in
+		${WRKSRC}/Makefile.am
 
 .include <bsd.port.mk>
diff --git a/print/system-config-printer/distinfo b/print/system-config-printer/distinfo
index 2f959d26bb00..b5defbf82796 100644
--- a/print/system-config-printer/distinfo
+++ b/print/system-config-printer/distinfo
@@ -1,2 +1,3 @@
-SHA256 (system-config-printer-1.4.7.tar.xz) = 6a20074c809109ce0208aa431590cac318edd13ebd96feac08ad2942105c8926
-SIZE (system-config-printer-1.4.7.tar.xz) = 901920
+TIMESTAMP = 1574196192
+SHA256 (OpenPrinting-system-config-printer-1.5.12_GH0.tar.gz) = 3a65b295a41fbc509eb9c4f13537a613611c27f58096a0618e70a2dc60c08dc6
+SIZE (OpenPrinting-system-config-printer-1.5.12_GH0.tar.gz) = 1987891
diff --git a/print/system-config-printer/files/patch-dbus_com.redhat.NewPrinterNotification.conf b/print/system-config-printer/files/patch-dbus_com.redhat.NewPrinterNotification.conf
index ffb4aed2632a..b5a5ec2edc97 100644
--- a/print/system-config-printer/files/patch-dbus_com.redhat.NewPrinterNotification.conf
+++ b/print/system-config-printer/files/patch-dbus_com.redhat.NewPrinterNotification.conf
@@ -1,11 +1,11 @@
---- dbus/com.redhat.NewPrinterNotification.conf.orig	2013-08-29 11:40:22.000000000 +0200
-+++ dbus/com.redhat.NewPrinterNotification.conf	2013-08-29 11:41:16.000000000 +0200
+--- dbus/com.redhat.NewPrinterNotification.conf.orig	2019-10-01 07:08:03.000000000 -0300
++++ dbus/com.redhat.NewPrinterNotification.conf	2019-11-19 17:13:14.984754000 -0400
 @@ -2,7 +2,7 @@
   "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
   "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
  <busconfig>
--	<policy at_console="true">
+-	<policy user="root">
 +	<policy group="operator">
- 		<allow own="com.redhat.NewPrinterNotification"/>
+ 		<allow send_destination="com.redhat.NewPrinterNotification"
+ 		       send_interface="com.redhat.NewPrinterNotification"/>
  	</policy>
- 
diff --git a/print/system-config-printer/files/patch-dbus_com.redhat.PrinterDriversInstaller.conf b/print/system-config-printer/files/patch-dbus_com.redhat.PrinterDriversInstaller.conf
index b8b696813325..682373e16e69 100644
--- a/print/system-config-printer/files/patch-dbus_com.redhat.PrinterDriversInstaller.conf
+++ b/print/system-config-printer/files/patch-dbus_com.redhat.PrinterDriversInstaller.conf
@@ -1,11 +1,11 @@
---- dbus/com.redhat.PrinterDriversInstaller.conf.orig	2013-08-29 11:40:29.000000000 +0200
-+++ dbus/com.redhat.PrinterDriversInstaller.conf	2013-08-29 11:41:25.000000000 +0200
+--- dbus/com.redhat.PrinterDriversInstaller.conf.orig	2019-10-01 07:08:03.000000000 -0300
++++ dbus/com.redhat.PrinterDriversInstaller.conf	2019-11-19 17:20:17.251356000 -0400
 @@ -2,7 +2,7 @@
   "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
   "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
  <busconfig>
--	<policy at_console="true">
+-	<policy user="root">
 +	<policy group="operator">
- 		<allow own="com.redhat.PrinterDriversInstaller"/>
+ 		<allow send_destination="com.redhat.PrinterDriversInstaller"
+ 		       send_interface="com.redhat.PrinterDriversInstaller"/>
  	</policy>
- 
diff --git a/print/system-config-printer/files/patch-dbus_org.fedoraproject.Config.Printing.service b/print/system-config-printer/files/patch-dbus_org.fedoraproject.Config.Printing.service
deleted file mode 100644
index f140224332d7..000000000000
--- a/print/system-config-printer/files/patch-dbus_org.fedoraproject.Config.Printing.service
+++ /dev/null
@@ -1,7 +0,0 @@
---- dbus/org.fedoraproject.Config.Printing.service.orig	2013-08-29 15:35:25.000000000 +0200
-+++ dbus/org.fedoraproject.Config.Printing.service	2013-08-29 15:36:25.000000000 +0200
-@@ -1,3 +1,3 @@
- [D-BUS Service]
- Name=org.fedoraproject.Config.Printing
--Exec=/usr/bin/scp-dbus-service
-+Exec=%%PREFIX%%/bin/scp-dbus-service
diff --git a/print/system-config-printer/files/patch-newprinter.py b/print/system-config-printer/files/patch-newprinter.py
index 508935b85851..0fe39ef6f94a 100644
--- a/print/system-config-printer/files/patch-newprinter.py
+++ b/print/system-config-printer/files/patch-newprinter.py
@@ -1,15 +1,24 @@
---- newprinter.py.orig	2015-01-13 11:56:34.450684352 +0100
-+++ newprinter.py	2015-01-13 11:57:28.467679877 +0100
-@@ -1067,7 +1067,7 @@
- 
-                             (self._host == 'localhost' or
-                              self._host[0] == '/') and
--                            not os.access ("/usr/lib/cups/backend/smb", os.F_OK)):
-+                            not os.access ("%%PREFIX%%/libexec/cups/backend/smb", os.F_OK)):
-                             debugprint ("No smb backend so attempting install")
-                             try:
-                                 pk = installpackage.PackageKit ()
-@@ -1909,7 +1909,7 @@
+--- newprinter.py.orig	2019-11-19 17:32:12.439573000 -0400
++++ newprinter.py	2019-11-19 17:37:00.087735000 -0400
+@@ -1163,7 +1163,7 @@
+                 if (self.device.id and
+                     not self.device.type in ("socket", "lpd", "ipp",
+                                              "http", "https", "bluetooth")):
+-                    name = "%s %s" % (self.device.id_dict["MFG"], 
++                    name = "%s %s" % (self.device.id_dict["MFG"],
+                                       self.device.id_dict["MDL"])
+             except:
+                 nonfatalException ()
+@@ -1411,7 +1411,7 @@
+         # Does the backend need to be installed?
+         if (self.nextnptab_rerun == False and not self.searchedfordriverpackages and
+                (self._host == 'localhost' or self._host[0] == '/') and
+-               not os.access ("/usr/lib/cups/backend/smb", os.F_OK)):
++               not os.access ("%%PREFIX%%/libexec/cups/backend/smb", os.F_OK)):
+             debugprint ("No smb backend so attempting install")
+             try:
+                 pk = installpackage.PackageKit ()
+@@ -2174,7 +2174,7 @@
                  host = device.uri[s:s+e]
          # Try to get make and model via SNMP
          if host:
@@ -18,7 +27,16 @@
              debugprint (host + ": " + repr(args))
              stdout = None
              try:
-@@ -3842,7 +3842,7 @@
+@@ -2382,7 +2382,7 @@
+                     else:
+                         device2.uri = "delete"
+         devices = [x for x in devices if x.uri not in ("hp", "hpfax",
+-                                                       "hal", "beh", "smb", 
++                                                       "hal", "beh", "smb",
+                                                        "scsi", "http", "bjnp",
+                                                        "delete")]
+         newdevices = []
+@@ -4212,7 +4212,7 @@
                  try:
                      # We want this to be in the current natural language,
                      # so we intentionally don't set LC_ALL=C here.
@@ -26,4 +44,4 @@
 +                    p = subprocess.Popen (['%%PREFIX%%/bin/cupstestppd',
                                             '-rvv', filename],
                                            close_fds=True,
-                                           stdin=file("/dev/null"),
+                                           stdin=subprocess.DEVNULL,
diff --git a/print/system-config-printer/pkg-plist b/print/system-config-printer/pkg-plist
index 7885af4d601d..d4e25dddfcdc 100644
--- a/print/system-config-printer/pkg-plist
+++ b/print/system-config-printer/pkg-plist
@@ -8,29 +8,28 @@ etc/dbus-1/system.d/com.redhat.PrinterDriversInstaller.conf
 etc/xdg/autostart/print-applet.desktop
 %%PYTHON_SITELIBDIR%%/cupshelpers-1.0-py%%PYTHON_VER%%.egg-info
 %%PYTHON_SITELIBDIR%%/cupshelpers/__init__.py
-%%PYTHON_SITELIBDIR%%/cupshelpers/__init__.pyc
-%%PYTHON_SITELIBDIR%%/cupshelpers/__init__.pyo
+%%PYTHON_SITELIBDIR%%/cupshelpers/__pycache__/__init__.cpython-36.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/cupshelpers/__pycache__/__init__.cpython-36.pyc
+%%PYTHON_SITELIBDIR%%/cupshelpers/__pycache__/config.cpython-36.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/cupshelpers/__pycache__/config.cpython-36.pyc
+%%PYTHON_SITELIBDIR%%/cupshelpers/__pycache__/cupshelpers.cpython-36.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/cupshelpers/__pycache__/cupshelpers.cpython-36.pyc
+%%PYTHON_SITELIBDIR%%/cupshelpers/__pycache__/installdriver.cpython-36.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/cupshelpers/__pycache__/installdriver.cpython-36.pyc
+%%PYTHON_SITELIBDIR%%/cupshelpers/__pycache__/openprinting.cpython-36.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/cupshelpers/__pycache__/openprinting.cpython-36.pyc
+%%PYTHON_SITELIBDIR%%/cupshelpers/__pycache__/ppds.cpython-36.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/cupshelpers/__pycache__/ppds.cpython-36.pyc
+%%PYTHON_SITELIBDIR%%/cupshelpers/__pycache__/xmldriverprefs.cpython-36.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/cupshelpers/__pycache__/xmldriverprefs.cpython-36.pyc
 %%PYTHON_SITELIBDIR%%/cupshelpers/config.py
-%%PYTHON_SITELIBDIR%%/cupshelpers/config.pyc
-%%PYTHON_SITELIBDIR%%/cupshelpers/config.pyo
 %%PYTHON_SITELIBDIR%%/cupshelpers/cupshelpers.py
-%%PYTHON_SITELIBDIR%%/cupshelpers/cupshelpers.pyc
-%%PYTHON_SITELIBDIR%%/cupshelpers/cupshelpers.pyo
 %%PYTHON_SITELIBDIR%%/cupshelpers/installdriver.py
-%%PYTHON_SITELIBDIR%%/cupshelpers/installdriver.pyc
-%%PYTHON_SITELIBDIR%%/cupshelpers/installdriver.pyo
 %%PYTHON_SITELIBDIR%%/cupshelpers/openprinting.py
-%%PYTHON_SITELIBDIR%%/cupshelpers/openprinting.pyc
-%%PYTHON_SITELIBDIR%%/cupshelpers/openprinting.pyo
 %%PYTHON_SITELIBDIR%%/cupshelpers/ppds.py
-%%PYTHON_SITELIBDIR%%/cupshelpers/ppds.pyc
-%%PYTHON_SITELIBDIR%%/cupshelpers/ppds.pyo
 %%PYTHON_SITELIBDIR%%/cupshelpers/xmldriverprefs.py
-%%PYTHON_SITELIBDIR%%/cupshelpers/xmldriverprefs.pyc
-%%PYTHON_SITELIBDIR%%/cupshelpers/xmldriverprefs.pyo
 man/man1/system-config-printer-applet.1.gz
 man/man1/system-config-printer.1.gz
-share/appdata/system-config-printer.appdata.xml
 share/applications/system-config-printer.desktop
 share/dbus-1/interfaces/org.fedoraproject.Config.Printing.xml
 share/dbus-1/services/org.fedoraproject.Config.Printing.service
@@ -58,22 +57,18 @@ share/locale/he/LC_MESSAGES/system-config-printer.mo
 share/locale/hi/LC_MESSAGES/system-config-printer.mo
 share/locale/hr/LC_MESSAGES/system-config-printer.mo
 share/locale/hu/LC_MESSAGES/system-config-printer.mo
-share/locale/hy/LC_MESSAGES/system-config-printer.mo
 share/locale/id/LC_MESSAGES/system-config-printer.mo
 share/locale/is/LC_MESSAGES/system-config-printer.mo
 share/locale/it/LC_MESSAGES/system-config-printer.mo
 share/locale/ja/LC_MESSAGES/system-config-printer.mo
-share/locale/ka/LC_MESSAGES/system-config-printer.mo
 share/locale/kn/LC_MESSAGES/system-config-printer.mo
 share/locale/ko/LC_MESSAGES/system-config-printer.mo
-share/locale/lo/LC_MESSAGES/system-config-printer.mo
+share/locale/lt/LC_MESSAGES/system-config-printer.mo
 share/locale/lv/LC_MESSAGES/system-config-printer.mo
 share/locale/mai/LC_MESSAGES/system-config-printer.mo
-share/locale/mk/LC_MESSAGES/system-config-printer.mo
 share/locale/ml/LC_MESSAGES/system-config-printer.mo
 share/locale/mr/LC_MESSAGES/system-config-printer.mo
 share/locale/ms/LC_MESSAGES/system-config-printer.mo
-share/locale/my/LC_MESSAGES/system-config-printer.mo
 share/locale/nb/LC_MESSAGES/system-config-printer.mo
 share/locale/nds/LC_MESSAGES/system-config-printer.mo
 share/locale/nl/LC_MESSAGES/system-config-printer.mo
@@ -99,85 +94,87 @@ share/locale/uk/LC_MESSAGES/system-config-printer.mo
 share/locale/vi/LC_MESSAGES/system-config-printer.mo
 share/locale/zh_CN/LC_MESSAGES/system-config-printer.mo
 share/locale/zh_TW/LC_MESSAGES/system-config-printer.mo
-share/system-config-printer/HIG.py
-share/system-config-printer/OpenPrintingRequest.py
-share/system-config-printer/PhysicalDevice.py
-share/system-config-printer/SearchCriterion.py
-share/system-config-printer/ToolbarSearchEntry.py
-share/system-config-printer/applet.py
-share/system-config-printer/asyncconn.py
-share/system-config-printer/asyncipp.py
-share/system-config-printer/asyncpk1.py
-share/system-config-printer/authconn.py
-share/system-config-printer/check-device-ids.py
-share/system-config-printer/config.py
-share/system-config-printer/cupspk.py
-share/system-config-printer/debug.py
-share/system-config-printer/dnssdresolve.py
-share/system-config-printer/errordialogs.py
-share/system-config-printer/firewallsettings.py
-share/system-config-printer/gtkinklevel.py
-share/system-config-printer/gui.py
-share/system-config-printer/icons/i-network-printer.png
-share/system-config-printer/install-printerdriver.py
-share/system-config-printer/installpackage.py
-share/system-config-printer/jobviewer.py
-share/system-config-printer/monitor.py
-share/system-config-printer/newprinter.py
-share/system-config-printer/options.py
-share/system-config-printer/optionwidgets.py
-share/system-config-printer/ppdcache.py
-share/system-config-printer/ppdippstr.py
-share/system-config-printer/ppdsloader.py
-share/system-config-printer/printerproperties.py
-share/system-config-printer/probe_printer.py
-share/system-config-printer/pysmb.py
-share/system-config-printer/scp-dbus-service.py
-share/system-config-printer/serversettings.py
-share/system-config-printer/smburi.py
-share/system-config-printer/statereason.py
-share/system-config-printer/system-config-printer.py
-share/system-config-printer/timedops.py
-share/system-config-printer/troubleshoot/CheckLocalServerPublishing.py
-share/system-config-printer/troubleshoot/CheckNetworkServerSanity.py
-share/system-config-printer/troubleshoot/CheckPPDSanity.py
-share/system-config-printer/troubleshoot/CheckPrinterSanity.py
-share/system-config-printer/troubleshoot/CheckSELinux.py
-share/system-config-printer/troubleshoot/CheckUSBPermissions.py
-share/system-config-printer/troubleshoot/ChooseNetworkPrinter.py
-share/system-config-printer/troubleshoot/ChoosePrinter.py
-share/system-config-printer/troubleshoot/DeviceListed.py
-share/system-config-printer/troubleshoot/ErrorLogCheckpoint.py
-share/system-config-printer/troubleshoot/ErrorLogFetch.py
-share/system-config-printer/troubleshoot/ErrorLogParse.py
-share/system-config-printer/troubleshoot/LocalOrRemote.py
-share/system-config-printer/troubleshoot/Locale.py
-share/system-config-printer/troubleshoot/NetworkCUPSPrinterShared.py
-share/system-config-printer/troubleshoot/PrintTestPage.py
-share/system-config-printer/troubleshoot/PrinterStateReasons.py
-share/system-config-printer/troubleshoot/QueueNotEnabled.py
-share/system-config-printer/troubleshoot/QueueRejectingJobs.py
-share/system-config-printer/troubleshoot/RemoteAddress.py
-share/system-config-printer/troubleshoot/SchedulerNotRunning.py
-share/system-config-printer/troubleshoot/ServerFirewalled.py
-share/system-config-printer/troubleshoot/Shrug.py
-share/system-config-printer/troubleshoot/VerifyPackages.py
-share/system-config-printer/troubleshoot/Welcome.py
-share/system-config-printer/troubleshoot/__init__.py
-share/system-config-printer/troubleshoot/base.py
-share/system-config-printer/ui/AboutDialog.ui
-share/system-config-printer/ui/ConnectDialog.ui
-share/system-config-printer/ui/ConnectingDialog.ui
-share/system-config-printer/ui/InstallDialog.ui
-share/system-config-printer/ui/JobsWindow.ui
-share/system-config-printer/ui/NewPrinterName.ui
-share/system-config-printer/ui/NewPrinterWindow.ui
-share/system-config-printer/ui/PrinterPropertiesDialog.ui
-share/system-config-printer/ui/PrintersWindow.ui
-share/system-config-printer/ui/SMBBrowseDialog.ui
-share/system-config-printer/ui/ServerSettingsDialog.ui
-share/system-config-printer/ui/WaitWindow.ui
-share/system-config-printer/ui/statusicon_popupmenu.ui
-share/system-config-printer/userdefault.py
-share/system-config-printer/xml/preferreddrivers.rng
-share/system-config-printer/xml/validate.py
+share/metainfo/system-config-printer.appdata.xml
+%%DATADIR%%/HIG.py
+%%DATADIR%%/OpenPrintingRequest.py
+%%DATADIR%%/PhysicalDevice.py
+%%DATADIR%%/SearchCriterion.py
+%%DATADIR%%/ToolbarSearchEntry.py
+%%DATADIR%%/applet.py
+%%DATADIR%%/asyncconn.py
+%%DATADIR%%/asyncipp.py
+%%DATADIR%%/asyncpk1.py
+%%DATADIR%%/authconn.py
+%%DATADIR%%/check-device-ids.py
+%%DATADIR%%/config.py
+%%DATADIR%%/cupspk.py
+%%DATADIR%%/debug.py
+%%DATADIR%%/dnssdresolve.py
+%%DATADIR%%/errordialogs.py
+%%DATADIR%%/firewallsettings.py
+%%DATADIR%%/gtkinklevel.py
+%%DATADIR%%/gui.py
+%%DATADIR%%/icons/i-network-printer.png
+%%DATADIR%%/install-printerdriver.py
+%%DATADIR%%/installpackage.py
+%%DATADIR%%/jobviewer.py
+%%DATADIR%%/killtimer.py
+%%DATADIR%%/monitor.py
+%%DATADIR%%/newprinter.py
+%%DATADIR%%/options.py
+%%DATADIR%%/optionwidgets.py
+%%DATADIR%%/ppdcache.py
+%%DATADIR%%/ppdippstr.py
+%%DATADIR%%/ppdsloader.py
+%%DATADIR%%/printerproperties.py
+%%DATADIR%%/probe_printer.py
+%%DATADIR%%/pysmb.py
+%%DATADIR%%/scp-dbus-service.py
+%%DATADIR%%/serversettings.py
+%%DATADIR%%/smburi.py
+%%DATADIR%%/statereason.py
+%%DATADIR%%/system-config-printer.py
+%%DATADIR%%/timedops.py
+%%DATADIR%%/troubleshoot/CheckLocalServerPublishing.py
+%%DATADIR%%/troubleshoot/CheckNetworkServerSanity.py
+%%DATADIR%%/troubleshoot/CheckPPDSanity.py
+%%DATADIR%%/troubleshoot/CheckPrinterSanity.py
+%%DATADIR%%/troubleshoot/CheckSELinux.py
+%%DATADIR%%/troubleshoot/CheckUSBPermissions.py
+%%DATADIR%%/troubleshoot/ChooseNetworkPrinter.py
+%%DATADIR%%/troubleshoot/ChoosePrinter.py
+%%DATADIR%%/troubleshoot/DeviceListed.py
+%%DATADIR%%/troubleshoot/ErrorLogCheckpoint.py
+%%DATADIR%%/troubleshoot/ErrorLogFetch.py
+%%DATADIR%%/troubleshoot/ErrorLogParse.py
+%%DATADIR%%/troubleshoot/LocalOrRemote.py
+%%DATADIR%%/troubleshoot/Locale.py
+%%DATADIR%%/troubleshoot/NetworkCUPSPrinterShared.py
+%%DATADIR%%/troubleshoot/PrintTestPage.py
+%%DATADIR%%/troubleshoot/PrinterStateReasons.py
+%%DATADIR%%/troubleshoot/QueueNotEnabled.py
+%%DATADIR%%/troubleshoot/QueueRejectingJobs.py
+%%DATADIR%%/troubleshoot/RemoteAddress.py
+%%DATADIR%%/troubleshoot/SchedulerNotRunning.py
+%%DATADIR%%/troubleshoot/ServerFirewalled.py
+%%DATADIR%%/troubleshoot/Shrug.py
+%%DATADIR%%/troubleshoot/VerifyPackages.py
+%%DATADIR%%/troubleshoot/Welcome.py
+%%DATADIR%%/troubleshoot/__init__.py
+%%DATADIR%%/troubleshoot/base.py
+%%DATADIR%%/ui/AboutDialog.ui
+%%DATADIR%%/ui/ConnectDialog.ui
+%%DATADIR%%/ui/ConnectingDialog.ui
+%%DATADIR%%/ui/InstallDialog.ui
+%%DATADIR%%/ui/JobsWindow.ui
+%%DATADIR%%/ui/NewPrinterName.ui
+%%DATADIR%%/ui/NewPrinterWindow.ui
+%%DATADIR%%/ui/PrinterPropertiesDialog.ui
+%%DATADIR%%/ui/PrintersWindow.ui
+%%DATADIR%%/ui/SMBBrowseDialog.ui
+%%DATADIR%%/ui/ServerSettingsDialog.ui
+%%DATADIR%%/ui/WaitWindow.ui
+%%DATADIR%%/ui/statusicon_popupmenu.ui
+%%DATADIR%%/userdefault.py
+%%DATADIR%%/xml/preferreddrivers.rng
+%%DATADIR%%/xml/validate.py