diff -Nru system-config-printer-1.5.11/aclocal.m4 system-config-printer-1.5.12/aclocal.m4 --- system-config-printer-1.5.11/aclocal.m4 2018-01-24 13:35:44.000000000 +0000 +++ system-config-printer-1.5.12/aclocal.m4 2019-10-01 09:52:18.000000000 +0000 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.15 -*- Autoconf -*- +# generated automatically by aclocal 1.16.1 -*- Autoconf -*- -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2018 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -3006,7 +3006,7 @@ AC_SUBST([$1])dnl ]) -# Copyright (C) 2002-2014 Free Software Foundation, Inc. +# Copyright (C) 2002-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -3018,10 +3018,10 @@ # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.15' +[am__api_version='1.16' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.15], [], +m4_if([$1], [1.16.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -3037,14 +3037,14 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.15])dnl +[AM_AUTOMAKE_VERSION([1.16.1])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -3096,7 +3096,7 @@ # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997-2014 Free Software Foundation, Inc. +# Copyright (C) 1997-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -3127,7 +3127,7 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -3318,13 +3318,12 @@ # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. - # _AM_OUTPUT_DEPENDENCY_COMMANDS # ------------------------------ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], @@ -3332,49 +3331,41 @@ # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. - case $CONFIG_FILES in - *\'*) eval set x "$CONFIG_FILES" ;; - *) set x $CONFIG_FILES ;; - esac + # TODO: see whether this extra hack can be removed once we start + # requiring Autoconf 2.70 or later. + AS_CASE([$CONFIG_FILES], + [*\'*], [eval set x "$CONFIG_FILES"], + [*], [set x $CONFIG_FILES]) shift - for mf + # Used to flag and report bootstrapping failures. + am_rc=0 + for am_mf do # Strip MF so we end up with the name of the file. - mf=`echo "$mf" | sed -e 's/:.*$//'` - # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named 'Makefile.in', but - # some people rename them; so instead we look at the file content. - # Grep'ing the first line is not enough: some people post-process - # each Makefile.in and add a new line on top of each file to say so. - # Grep'ing the whole file is not good either: AIX grep has a line + am_mf=`AS_ECHO(["$am_mf"]) | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile which includes + # dependency-tracking related rules and includes. + # Grep'ing the whole file directly is not great: AIX grep has a line # limit of 2048, but all sed's we know have understand at least 4000. - if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then - dirpart=`AS_DIRNAME("$mf")` - else - continue - fi - # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running 'make'. - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` - test -z "$DEPDIR" && continue - am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "$am__include" && continue - am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # Find all dependency output files, they are included files with - # $(DEPDIR) in their names. We invoke sed twice because it is the - # simplest approach to changing $(DEPDIR) to its actual value in the - # expansion. - for file in `sed -n " - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do - # Make sure the directory exists. - test -f "$dirpart/$file" && continue - fdir=`AS_DIRNAME(["$file"])` - AS_MKDIR_P([$dirpart/$fdir]) - # echo "creating $dirpart/$file" - echo '# dummy' > "$dirpart/$file" - done + sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \ + || continue + am_dirpart=`AS_DIRNAME(["$am_mf"])` + am_filepart=`AS_BASENAME(["$am_mf"])` + AM_RUN_LOG([cd "$am_dirpart" \ + && sed -e '/# am--include-marker/d' "$am_filepart" \ + | $MAKE -f - am--depfiles]) || am_rc=$? done + if test $am_rc -ne 0; then + AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments + for automatic dependency tracking. Try re-running configure with the + '--disable-dependency-tracking' option to at least be able to build + the package (albeit without support for automatic dependency tracking).]) + fi + AS_UNSET([am_dirpart]) + AS_UNSET([am_filepart]) + AS_UNSET([am_mf]) + AS_UNSET([am_rc]) + rm -f conftest-deps.mk } ])# _AM_OUTPUT_DEPENDENCY_COMMANDS @@ -3383,18 +3374,17 @@ # ----------------------------- # This macro should only be invoked once -- use via AC_REQUIRE. # -# This code is only required when automatic dependency tracking -# is enabled. FIXME. This creates each '.P' file that we will -# need in order to bootstrap the dependency handling code. +# This code is only required when automatic dependency tracking is enabled. +# This creates each '.Po' and '.Plo' makefile fragment that we'll need in +# order to bootstrap the dependency handling code. AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], [AC_CONFIG_COMMANDS([depfiles], [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], - [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) -]) + [AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"])]) # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -3481,8 +3471,8 @@ AC_REQUIRE([AC_PROG_MKDIR_P])dnl # For better backward compatibility. To be removed once Automake 1.9.x # dies out for good. For more background, see: -# -# +# +# AC_SUBST([mkdir_p], ['$(MKDIR_P)']) # We need awk for the "check" target (and possibly the TAP driver). The # system "awk" is bad on some platforms. @@ -3549,7 +3539,7 @@ Aborting the configuration process, to ensure you take notice of the issue. You can download and install GNU coreutils to get an 'rm' implementation -that behaves properly: . +that behaves properly: . If you want to complete the configuration process using your problematic 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM @@ -3591,7 +3581,7 @@ done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -3612,7 +3602,7 @@ fi AC_SUBST([install_sh])]) -# Copyright (C) 2003-2014 Free Software Foundation, Inc. +# Copyright (C) 2003-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -3633,7 +3623,7 @@ # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -3641,49 +3631,42 @@ # AM_MAKE_INCLUDE() # ----------------- -# Check to see how make treats includes. +# Check whether make has an 'include' directive that can support all +# the idioms we need for our automatic dependency tracking code. AC_DEFUN([AM_MAKE_INCLUDE], -[am_make=${MAKE-make} -cat > confinc << 'END' +[AC_MSG_CHECKING([whether ${MAKE-make} supports the include directive]) +cat > confinc.mk << 'END' am__doit: - @echo this is the am__doit target + @echo this is the am__doit target >confinc.out .PHONY: am__doit END -# If we don't find an include directive, just comment out the code. -AC_MSG_CHECKING([for style of include used by $am_make]) am__include="#" am__quote= -_am_result=none -# First try GNU make style include. -echo "include confinc" > confmf -# Ignore all kinds of additional output from 'make'. -case `$am_make -s -f confmf 2> /dev/null` in #( -*the\ am__doit\ target*) - am__include=include - am__quote= - _am_result=GNU - ;; -esac -# Now try BSD make style include. -if test "$am__include" = "#"; then - echo '.include "confinc"' > confmf - case `$am_make -s -f confmf 2> /dev/null` in #( - *the\ am__doit\ target*) - am__include=.include - am__quote="\"" - _am_result=BSD - ;; - esac -fi -AC_SUBST([am__include]) -AC_SUBST([am__quote]) -AC_MSG_RESULT([$_am_result]) -rm -f confinc confmf -]) +# BSD make does it like this. +echo '.include "confinc.mk" # ignored' > confmf.BSD +# Other make implementations (GNU, Solaris 10, AIX) do it like this. +echo 'include confinc.mk # ignored' > confmf.GNU +_am_result=no +for s in GNU BSD; do + AM_RUN_LOG([${MAKE-make} -f confmf.$s && cat confinc.out]) + AS_CASE([$?:`cat confinc.out 2>/dev/null`], + ['0:this is the am__doit target'], + [AS_CASE([$s], + [BSD], [am__include='.include' am__quote='"'], + [am__include='include' am__quote=''])]) + if test "$am__include" != "#"; then + _am_result="yes ($s style)" + break + fi +done +rm -f confinc.* confmf.* +AC_MSG_RESULT([${_am_result}]) +AC_SUBST([am__include])]) +AC_SUBST([am__quote])]) # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997-2014 Free Software Foundation, Inc. +# Copyright (C) 1997-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -3722,7 +3705,7 @@ # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -3751,7 +3734,7 @@ AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -3798,7 +3781,7 @@ # For backward compatibility. AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -3832,8 +3815,11 @@ dnl Find a Python interpreter. Python versions prior to 2.0 are not dnl supported. (2.0 was released on October 16, 2000). m4_define_default([_AM_PYTHON_INTERPRETER_LIST], -[python python2 python3 python3.3 python3.2 python3.1 python3.0 python2.7 dnl - python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0]) +[python python2 python3 dnl + python3.9 python3.8 python3.7 python3.6 python3.5 python3.4 python3.3 dnl + python3.2 python3.1 python3.0 dnl + python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 dnl + python2.0]) AC_ARG_VAR([PYTHON], [the Python interpreter]) @@ -4033,7 +4019,7 @@ sys.exit(sys.hexversion < minverhex)" AS_IF([AM_RUN_LOG([$1 -c "$prog"])], [$3], [$4])]) -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -4052,7 +4038,7 @@ # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -4133,7 +4119,7 @@ rm -f conftest.file ]) -# Copyright (C) 2009-2014 Free Software Foundation, Inc. +# Copyright (C) 2009-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -4193,7 +4179,7 @@ _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -4221,7 +4207,7 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006-2014 Free Software Foundation, Inc. +# Copyright (C) 2006-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -4240,7 +4226,7 @@ # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004-2014 Free Software Foundation, Inc. +# Copyright (C) 2004-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru system-config-printer-1.5.11/applet.py system-config-printer-1.5.12/applet.py --- system-config-printer-1.5.11/applet.py 2016-05-05 11:02:33.000000000 +0000 +++ system-config-printer-1.5.12/applet.py 2019-09-16 11:55:16.000000000 +0000 @@ -24,8 +24,13 @@ from debug import * import dbus -import dbus.glib + +# set up global default main loop +from dbus.mainloop.glib import DBusGMainLoop +DBusGMainLoop(set_as_default=True) + import dbus.service +import gi from gi.repository import GObject from gi.repository import GLib import time @@ -42,6 +47,7 @@ os.environ['LC_ALL'] = 'C' locale.setlocale (locale.LC_ALL, "") +gi.require_version('Notify', '0.7') from gi.repository import Notify APPDIR="/usr/share/system-config-printer" @@ -453,7 +459,7 @@ except: pass - loop = GObject.MainLoop () + loop = GLib.MainLoop () runloop = RunLoop (session_bus, system_bus, loop) try: runloop.run () diff -Nru system-config-printer-1.5.11/asyncpk1.py system-config-printer-1.5.12/asyncpk1.py --- system-config-printer-1.5.11/asyncpk1.py 2016-05-05 11:02:33.000000000 +0000 +++ system-config-printer-1.5.12/asyncpk1.py 2019-09-16 11:55:16.000000000 +0000 @@ -22,7 +22,9 @@ import dbus from functools import reduce try: + gi.require_version('Gdk', '3.0') from gi.repository import Gdk + gi.require_version('Gtk', '3.0') from gi.repository import Gtk except: pass diff -Nru system-config-printer-1.5.11/authconn.py system-config-printer-1.5.12/authconn.py --- system-config-printer-1.5.11/authconn.py 2018-01-22 17:19:03.000000000 +0000 +++ system-config-printer-1.5.12/authconn.py 2019-09-16 11:55:16.000000000 +0000 @@ -78,11 +78,9 @@ field = auth_info_required[i] label = Gtk.Label (label=_(self.AUTH_FIELD.get (field, field))) label.set_alignment (0, 0.5) - grid.attach (label, 0, 1, i, i + 1) grid.attach (label, 0, i, 1, 1) entry = Gtk.Entry () entry.set_visibility (field != 'password') - grid.attach (entry, 1, 2, i, i + 1, 0, 0) grid.attach (entry, 1, i, 1, 1) self.field_entry.append (entry) @@ -235,6 +233,10 @@ def _authloop (self, fname, fn, *args, **kwds): self._passes = 0 + # remove signature if dbus is not being used and signature is provided + if not self._using_polkit(): + kwds.pop('signature', None) + c = self._connection retry = False while True: diff -Nru system-config-printer-1.5.11/ChangeLog system-config-printer-1.5.12/ChangeLog --- system-config-printer-1.5.11/ChangeLog 2018-01-24 13:36:12.000000000 +0000 +++ system-config-printer-1.5.12/ChangeLog 2019-10-01 10:06:44.000000000 +0000 @@ -1,5 +1,277 @@ +2019-09-30 Zdenek Dohnal + + define specific packagekitglib version + + check if we have required parameters for install-printerdriver (Fedora issue #1754204) + +2019-09-09 Zdenek Dohnal + + Fallback to username/password auth in jobviewer + +2019-07-25 Zdenek Dohnal + + Get rid of deprecation warnings in applet + +2019-06-19 Benjamin Pereto + + FIX: spelling error + +2019-06-18 Pavel Moseev + + fix translation in troubleshoot menu + +2019-05-29 Zdenek Dohnal + + Removing zdohnal from links + +2019-05-27 Zdenek Dohnal + + Update NEWS + + Update NEWS + + Update NEWS + +2019-05-26 GreatBahram + + Use remote server ppd file, in case a printer has been shared via cups. + +2019-05-08 Will Thompson + + Remove more uses of deprecated GObject.SIGNAL_RUN_LAST + 9ae2308a8e02527b34f6216162c88ebae04d8dc4 removed many of these but these + two were left over. + +2019-02-27 Zdenek Dohnal + + lpd queue names printed on the console + +2019-02-18 GreatBahram + + add input and output type into ppds.normalize function + + change normalize comments into doc-string + +2019-01-14 Tomas Korbar + + Fix compatibility with python3 in putFile method + in python3 os.read returns byte object not a string which caused + writing loop to be endless + + by adding b'' comparison we hold compatibility both with python2 + and python3 + + Fix writing of advanced settings + After reading from stream we must return again to line 0 if we + want to read file again + +2019-01-03 Zdenek Dohnal + + Temporary fix for error pop-up window for IPP2.0+ attributes + +2018-12-03 Zdenek Dohnal + + Update NEWS + + udev/udev-configure-printer.c: map and usb_device_devpath strings leaks + + udev/udev-configure-printer.c: device_uri strings leaks + + udev/udev-configure-printer.c:848: error[memleak]: Memory leak: devicefilepath + +2018-11-19 Tomas Korbar + + Fix bad call of cups connection getFile + + Fix bad use of NamedTemporaryFile + - os.stat call expects file path not file object + + Add way how to support signature to dbus call + - If dbus method is called with empty array as an argument then + dbus is not able to determine type of arguments and throws Error + - This commit adds way how to add it in such case + + Make timestamp accessible through whole troubleshoot process + - until now timestamp was accessible only after some conditions + were met which resulted in occasional bug + +2018-11-09 Zdenek Dohnal + + Update aclocal.m4 due new automake version + + Update NEWS + +2018-11-07 Tom Gundersen + + dbus: remove deprecated at_console statement + As described in [0], this likely did not have the intended effect, so + simply remove it. The change in behavior is that up until this patch + it would be possible for root and any non-system user to potentially + own the system-config-printer dbus names. Now this is extended to also + allow any system user. + + [0]: + + CC: David Herrmann + +2018-10-01 zdohnal + + Update NEWS + +2018-09-27 Tomas Korbar + + Fix TypeError raised by debugprint call + - this error is caused by typo in options.py:424 debugprint call + - debugprint function takes only one parameter so i think it should + have been formated string + - fix https://bugzilla.redhat.com/show_bug.cgi?id=1619593 + +2018-08-30 Zdenek Dohnal + + Fix typo in debugprint call (https://github.com/zdohnal/system-config-printer/issues/105) + + define classes for Secret only when libsecret is installed (https://github.com/zdohnal/system-config-printer/issues/118, https://github.com/zdohnal/system-config-printer/issues/115) + +2018-06-26 lafricain79 + + Correction of French word in the code + +2018-06-26 Zdenek Dohnal + + Update NEWS + + Update NEWS + + Update NEWS + +2018-06-20 xoduddk123 + + encoding: Modified to use utf-8 in fdopen() + The following error occurred due to encoding problem in fdopen(). + + root@tykwon:~# cat /var/log/syslog + 2018-02-12T17:08:24.208317+09:00 tykwon kernel: usb 1-1.2: new high-speed USB device number 4 using dwc_otg + 2018-02-12T17:08:24.309341+09:00 tykwon kernel: usb 1-1.2: New USB device found, idVendor=03f0, idProduct=3b2a + 2018-02-12T17:08:24.309398+09:00 tykwon kernel: usb 1-1.2: New USB device strings: Mfr=1, Product=2, SerialNumber=3 + 2018-02-12T17:08:24.309415+09:00 tykwon kernel: usb 1-1.2: Product: HP Color LaserJet MFP M277n + 2018-02-12T17:08:24.309428+09:00 tykwon kernel: usb 1-1.2: Manufacturer: Hewlett-Packard + 2018-02-12T17:08:24.318314+09:00 tykwon kernel: usb 1-1.2: SerialNumber: VNBKK97643 + 2018-02-12T17:08:24.340967+09:00 tykwon root: loading HP Device 001 004 + 2018-02-12T17:08:25.537224+09:00 tykwon python: io/hpmud/musb.c 2185: [307] hpmud_make_usb_uri() bus=001 dev=004 + 2018-02-12T17:08:25.540188+09:00 tykwon python: io/hpmud/musb.c 2282: hpmud_make_usb_uri() uri=hp:/usb/HP_Color_LaserJet_MFP_M277n?serial=VNBKK97643 bytes_read=53 + 2018-02-12T17:08:26.510021+09:00 tykwon kernel: usblp 1-1.2:1.1: usblp0: USB Bidirectional printer dev 4 if 1 alt 0 proto 2 vid 0x03F0 pid 0x3B2A + 2018-02-12T17:08:26.518337+09:00 tykwon kernel: usbcore: registered new interface driver usblp + 2018-02-12T17:08:26.523457+09:00 tykwon systemd[1]: Created slice system-configure\x2dprinter.slice. + 2018-02-12T17:08:26.525835+09:00 tykwon systemd[1]: Started Configure Plugged-In Printer. + 2018-02-12T17:08:26.527132+09:00 tykwon systemd[1]: Reached target Printer. + 2018-02-12T17:08:26.546282+09:00 tykwon udev-configure-printer: add usb-001-004 + 2018-02-12T17:08:26.688365+09:00 tykwon udev-configure-printer: device devpath is /devices/lm1/usb1/1-1/1-1.2 + 2018-02-12T17:08:26.700706+09:00 tykwon udev-configure-printer: MFG:Hewlett-Packard MDL:HP Color LaserJet MFP M277n SERN:- serial:VNBKK97643 + 2018-02-12T17:08:31.788344+09:00 tykwon kernel: usblp0: removed + 2018-02-12T17:08:31.798343+09:00 tykwon kernel: usblp 1-1.2:1.1: usblp0: USB Bidirectional printer dev 4 if 1 alt 0 proto 2 vid 0x03F0 pid 0x3B2A + 2018-02-12T17:08:31.870363+09:00 tykwon udev-configure-printer: URI contains USB serial number + 2018-02-12T17:08:31.871482+09:00 tykwon udev-configure-printer: URI match: usb://HP/Color%20LaserJet%20MFP%20M277n?serial=VNBKK97643&interface=1 + 2018-02-12T17:08:31.872536+09:00 tykwon udev-configure-printer: SERN field matches USB serial number + 2018-02-12T17:08:31.873629+09:00 tykwon udev-configure-printer: URI match: hp:/usb/HP_Color_LaserJet_MFP_M277n?serial=VNBKK97643 + 2018-02-12T17:08:31.874594+09:00 tykwon udev-configure-printer: URI of detected printer: usb://HP/Color%20LaserJet%20MFP%20M277n?serial=VNBKK97643&interface=1, normalized: color laserjet mfp m277n serial vnbkk97643 interface 1 + 2018-02-12T17:08:31.875782+09:00 tykwon udev-configure-printer: URI of print queue: hp:/usb/HP_LaserJet_Professional_P1106?serial=000000000QN926Y1PR1a, normalized: laserjet professional p1106 serial 000000000qn926y1pr1a + 2018-02-12T17:08:31.876985+09:00 tykwon udev-configure-printer: URI of detected printer: hp:/usb/HP_Color_LaserJet_MFP_M277n?serial=VNBKK97643, normalized: color laserjet mfp m277n serial vnbkk97643 + 2018-02-12T17:08:31.878166+09:00 tykwon udev-configure-printer: About to add queue for hp:/usb/HP_Color_LaserJet_MFP_M277n?serial=VNBKK97643 + 2018-02-12T17:08:34.760340+09:00 tykwon udev-add-printer: add_queue: URIs=['hp:/usb/HP_Color_LaserJet_MFP_M277n?serial=VNBKK97643', 'usb://HP/Color%20LaserJet%20MFP%20M277n?serial=VNBKK97643&interface=1'] + 2018-02-12T17:08:34.766174+09:00 tykwon udev-add-printer: D-Bus method call failed: org.freedesktop.DBus.Error.ServiceUnknown: The name com.redhat.NewPrinterNotification was not provided by any .service files + 2018-02-12T17:08:41.722389+09:00 tykwon udev-add-printer: PPD: hplip:1/hp-color_laserjet_pro_mfp_m277-ps.ppd; Status: 0 + 2018-02-12T17:08:45.763635+09:00 tykwon udev-add-printer: File "/lib/udev/udev-add-printer", line 232, in #012 add_queue (sys.argv[1], sys.argv[2:]) + 2018-02-12T17:08:45.764840+09:00 tykwon udev-add-printer: File "/lib/udev/udev-add-printer", line 169, in add_queue#012 installer) + 2018-02-12T17:08:45.765979+09:00 tykwon udev-add-printer: File "/lib/udev/udev-add-printer", line 75, in create_queue#012 (pkgs, exes) = cupshelpers.missingPackagesAndExecutables (ppd) + 2018-02-12T17:08:45.767236+09:00 tykwon udev-add-printer: File "/usr/lib/python3.5/site-packages/cupshelpers/cupshelpers.py", line 889, in missingPackagesAndExecutables#012 executables = missingExecutables(ppd) + 2018-02-12T17:08:45.768527+09:00 tykwon udev-add-printer: File "/usr/lib/python3.5/site-packages/cupshelpers/cupshelpers.py", line 864, in missingExecutables#012 for line in f: + 2018-02-12T17:08:45.769834+09:00 tykwon udev-add-printer: File "/usr/lib/python3.5/encodings/ascii.py", line 26, in decode#012 return codecs.ascii_decode(input, self.errors)[0] + 2018-02-12T17:08:45.771056+09:00 tykwon udev-add-printer: UnicodeDecodeError: 'ascii' codec can't decode byte 0xc3 in position 4175: ordinal not in range(128) + root@tykwon:~# + +2018-06-02 lafricain79 + + New strings for the ppd files + +2018-05-31 Antonio Larrosa + + Fallback to using LC_CTYPE if LC_MESSAGES is empty and fix _language use + On openSUSE, LC_MESSAGES is not set by default, so fallback to LC_CTYPE in + that case. + + Also, self._language is not a list (unlike in other classes) but the language + itself, so if we get the first element, we would be getting the first letter, + not the language. + +2018-04-23 Ettore Atalan + + Update de.po + Improved german translation. + +2018-04-06 zdohnal + + Update NEWS + +2018-04-02 Alan01 + + Update da.po + +2018-03-23 Zdenek Dohnal + + require Gtk and Gdk version 3.0 in asyncpk1.py + +2018-03-10 AsciiWolf + + Fix typo + +2018-03-01 Zdenek Dohnal + + - when you use different component id, add provide for old name (https://github.com/zdohnal/system-config-printer/issues/99) + +2018-02-27 Zdenek Dohnal + + fix other issues in system-config-printer.appdata.xml to be completely valid for new format + + Update NEWS + +2018-02-26 Laurent Bigonville + + Make the appstream file validate with version >= 0.6 + Fixes: #97 + + Set programe name for scp-dbus-service as well + scp-dbus-service can be D-Bus activated, that means that the program + name is never set meaning that the icon and the fancy name in the window + list is never set. + + This completes the fix for bug #53 + + Require proper version of GDK and GTK in scp-dbus-service as well + scp-dbus-service can be D-Bus activated, that means that + gi.require_version() is not called before. + + That needs to be kept in sync with the required version in the main + program file. + + Use ValueError instead of ImportError to catch exception when importing GIR bindings + When importing specific version of GIR bindings, the ValueError + exception is raised instead of ImportError. + + This should make libsecret optional as intended + + Fixes: #94 + +2018-02-08 Jan Alexander Steffens (heftig) + + Fix constructing the auth dialog + 47973c80 (Remove deprecated Gtk objects) broke the auth dialog. + + Fixes https://bugs.archlinux.org/task/57364. + 2018-01-24 Zdenek Dohnal + - version 1.5.11 because of creating bad tag + - version 1.5.10 - don't ship pre-configured scripts diff -Nru system-config-printer-1.5.11/compile system-config-printer-1.5.12/compile --- system-config-printer-1.5.11/compile 2016-10-19 07:34:16.000000000 +0000 +++ system-config-printer-1.5.12/compile 2019-10-01 09:52:19.000000000 +0000 @@ -1,9 +1,9 @@ #! /bin/sh # Wrapper for compilers which do not understand '-c -o'. -scriptversion=2012-10-14.11; # UTC +scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2018 Free Software Foundation, Inc. # Written by Tom Tromey . # # This program is free software; you can redistribute it and/or modify @@ -17,7 +17,7 @@ # 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 . +# along with this program. If not, see . # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -255,7 +255,8 @@ echo "compile $scriptversion" exit $? ;; - cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \ + icl | *[/\\]icl | icl.exe | *[/\\]icl.exe ) func_cl_wrapper "$@" # Doesn't return... ;; esac @@ -339,9 +340,9 @@ # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff -Nru system-config-printer-1.5.11/config.py system-config-printer-1.5.12/config.py --- system-config-printer-1.5.11/config.py 2018-01-24 13:36:10.000000000 +0000 +++ system-config-printer-1.5.12/config.py 2019-10-01 09:54:24.000000000 +0000 @@ -22,7 +22,7 @@ datadir="/usr/local/share" localedir="/usr/local/share/locale" pkgdatadir="/usr/local/share/system-config-printer" -VERSION="1.5.11" +VERSION="1.5.12" PACKAGE="system-config-printer" DOWNLOADABLE_ONLYPPD=True DOWNLOADABLE_ONLYFREE=True diff -Nru system-config-printer-1.5.11/configure system-config-printer-1.5.12/configure --- system-config-printer-1.5.11/configure 2018-01-24 13:35:46.000000000 +0000 +++ system-config-printer-1.5.12/configure 2019-10-01 09:52:19.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for system-config-printer 1.5.11. +# Generated by GNU Autoconf 2.69 for system-config-printer 1.5.12. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -577,8 +577,8 @@ # Identity of this package. PACKAGE_NAME='system-config-printer' PACKAGE_TARNAME='system-config-printer' -PACKAGE_VERSION='1.5.11' -PACKAGE_STRING='system-config-printer 1.5.11' +PACKAGE_VERSION='1.5.12' +PACKAGE_STRING='system-config-printer 1.5.12' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -644,7 +644,6 @@ AMDEPBACKSLASH AMDEP_FALSE AMDEP_TRUE -am__quote am__include DEPDIR OBJEXT @@ -759,7 +758,8 @@ PACKAGE_TARNAME PACKAGE_NAME PATH_SEPARATOR -SHELL' +SHELL +am__quote' ac_subst_files='' ac_user_opts=' enable_option_checking @@ -1334,7 +1334,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures system-config-printer 1.5.11 to adapt to many kinds of systems. +\`configure' configures system-config-printer 1.5.12 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1405,7 +1405,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of system-config-printer 1.5.11:";; + short | recursive ) echo "Configuration of system-config-printer 1.5.12:";; esac cat <<\_ACEOF @@ -1529,7 +1529,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -system-config-printer configure 1.5.11 +system-config-printer configure 1.5.12 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1709,7 +1709,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by system-config-printer $as_me 1.5.11, which was +It was created by system-config-printer $as_me 1.5.12, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2059,7 +2059,7 @@ -am__api_version='1.15' +am__api_version='1.16' ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do @@ -2574,7 +2574,7 @@ # Define the identity of the package. PACKAGE='system-config-printer' - VERSION='1.5.11' + VERSION='1.5.12' cat >>confdefs.h <<_ACEOF @@ -2604,8 +2604,8 @@ # For better backward compatibility. To be removed once Automake 1.9.x # dies out for good. For more background, see: -# -# +# +# mkdir_p='$(MKDIR_P)' # We need awk for the "check" target (and possibly the TAP driver). The @@ -2656,7 +2656,7 @@ Aborting the configuration process, to ensure you take notice of the issue. You can download and install GNU coreutils to get an 'rm' implementation -that behaves properly: . +that behaves properly: . If you want to complete the configuration process using your problematic 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM @@ -3580,45 +3580,45 @@ ac_config_commands="$ac_config_commands depfiles" - -am_make=${MAKE-make} -cat > confinc << 'END' +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5 +$as_echo_n "checking whether ${MAKE-make} supports the include directive... " >&6; } +cat > confinc.mk << 'END' am__doit: - @echo this is the am__doit target + @echo this is the am__doit target >confinc.out .PHONY: am__doit END -# If we don't find an include directive, just comment out the code. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5 -$as_echo_n "checking for style of include used by $am_make... " >&6; } am__include="#" am__quote= -_am_result=none -# First try GNU make style include. -echo "include confinc" > confmf -# Ignore all kinds of additional output from 'make'. -case `$am_make -s -f confmf 2> /dev/null` in #( -*the\ am__doit\ target*) - am__include=include - am__quote= - _am_result=GNU - ;; -esac -# Now try BSD make style include. -if test "$am__include" = "#"; then - echo '.include "confinc"' > confmf - case `$am_make -s -f confmf 2> /dev/null` in #( - *the\ am__doit\ target*) - am__include=.include - am__quote="\"" - _am_result=BSD +# BSD make does it like this. +echo '.include "confinc.mk" # ignored' > confmf.BSD +# Other make implementations (GNU, Solaris 10, AIX) do it like this. +echo 'include confinc.mk # ignored' > confmf.GNU +_am_result=no +for s in GNU BSD; do + { echo "$as_me:$LINENO: ${MAKE-make} -f confmf.$s && cat confinc.out" >&5 + (${MAKE-make} -f confmf.$s && cat confinc.out) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + case $?:`cat confinc.out 2>/dev/null` in #( + '0:this is the am__doit target') : + case $s in #( + BSD) : + am__include='.include' am__quote='"' ;; #( + *) : + am__include='include' am__quote='' ;; +esac ;; #( + *) : ;; - esac -fi - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5 -$as_echo "$_am_result" >&6; } -rm -f confinc confmf +esac + if test "$am__include" != "#"; then + _am_result="yes ($s style)" + break + fi +done +rm -f confinc.* confmf.* +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5 +$as_echo "${_am_result}" >&6; } # Check whether --enable-dependency-tracking was given. if test "${enable_dependency_tracking+set}" = set; then : @@ -6770,7 +6770,7 @@ $as_echo_n "(cached) " >&6 else - for am_cv_pathless_PYTHON in python python2 python3 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do + for am_cv_pathless_PYTHON in python python2 python3 python3.9 python3.8 python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do test "$am_cv_pathless_PYTHON" = none && break prog="import sys # split strings by '.' and convert to numeric. Append some zeros @@ -6991,7 +6991,7 @@ PACKAGE="system-config-printer" -VERSION="1.5.11" +VERSION="1.5.12" GETTEXT_PACKAGE="system-config-printer" CATOBJEXT=".gmo" DATADIRNAME=share @@ -8124,7 +8124,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by system-config-printer $as_me 1.5.11, which was +This file was extended by system-config-printer $as_me 1.5.12, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -8181,7 +8181,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -system-config-printer config.status 1.5.11 +system-config-printer config.status 1.5.12 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -8296,7 +8296,7 @@ # Capture the value of LINGUAS because we need it to compute CATALOGS. LINGUAS="${LINGUAS-%UNSET%}" -AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" +AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}" _ACEOF @@ -8863,29 +8863,35 @@ # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. - case $CONFIG_FILES in - *\'*) eval set x "$CONFIG_FILES" ;; - *) set x $CONFIG_FILES ;; - esac + # TODO: see whether this extra hack can be removed once we start + # requiring Autoconf 2.70 or later. + case $CONFIG_FILES in #( + *\'*) : + eval set x "$CONFIG_FILES" ;; #( + *) : + set x $CONFIG_FILES ;; #( + *) : + ;; +esac shift - for mf + # Used to flag and report bootstrapping failures. + am_rc=0 + for am_mf do # Strip MF so we end up with the name of the file. - mf=`echo "$mf" | sed -e 's/:.*$//'` - # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named 'Makefile.in', but - # some people rename them; so instead we look at the file content. - # Grep'ing the first line is not enough: some people post-process - # each Makefile.in and add a new line on top of each file to say so. - # Grep'ing the whole file is not good either: AIX grep has a line + am_mf=`$as_echo "$am_mf" | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile which includes + # dependency-tracking related rules and includes. + # Grep'ing the whole file directly is not great: AIX grep has a line # limit of 2048, but all sed's we know have understand at least 4000. - if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then - dirpart=`$as_dirname -- "$mf" || -$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$mf" : 'X\(//\)[^/]' \| \ - X"$mf" : 'X\(//\)$' \| \ - X"$mf" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$mf" | + sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \ + || continue + am_dirpart=`$as_dirname -- "$am_mf" || +$as_expr X"$am_mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$am_mf" : 'X\(//\)[^/]' \| \ + X"$am_mf" : 'X\(//\)$' \| \ + X"$am_mf" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$am_mf" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -8903,53 +8909,48 @@ q } s/.*/./; q'` - else - continue - fi - # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running 'make'. - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` - test -z "$DEPDIR" && continue - am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "$am__include" && continue - am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # Find all dependency output files, they are included files with - # $(DEPDIR) in their names. We invoke sed twice because it is the - # simplest approach to changing $(DEPDIR) to its actual value in the - # expansion. - for file in `sed -n " - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do - # Make sure the directory exists. - test -f "$dirpart/$file" && continue - fdir=`$as_dirname -- "$file" || -$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$file" : 'X\(//\)[^/]' \| \ - X"$file" : 'X\(//\)$' \| \ - X"$file" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ + am_filepart=`$as_basename -- "$am_mf" || +$as_expr X/"$am_mf" : '.*/\([^/][^/]*\)/*$' \| \ + X"$am_mf" : 'X\(//\)$' \| \ + X"$am_mf" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X/"$am_mf" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/ q } - /^X\(\/\/\)$/{ + /^X\/\(\/\/\)$/{ s//\1/ q } - /^X\(\/\).*/{ + /^X\/\(\/\).*/{ s//\1/ q } s/.*/./; q'` - as_dir=$dirpart/$fdir; as_fn_mkdir_p - # echo "creating $dirpart/$file" - echo '# dummy' > "$dirpart/$file" - done + { echo "$as_me:$LINENO: cd "$am_dirpart" \ + && sed -e '/# am--include-marker/d' "$am_filepart" \ + | $MAKE -f - am--depfiles" >&5 + (cd "$am_dirpart" \ + && sed -e '/# am--include-marker/d' "$am_filepart" \ + | $MAKE -f - am--depfiles) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } || am_rc=$? done + if test $am_rc -ne 0; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "Something went wrong bootstrapping makefile fragments + for automatic dependency tracking. Try re-running configure with the + '--disable-dependency-tracking' option to at least be able to build + the package (albeit without support for automatic dependency tracking). +See \`config.log' for more details" "$LINENO" 5; } + fi + { am_dirpart=; unset am_dirpart;} + { am_filepart=; unset am_filepart;} + { am_mf=; unset am_mf;} + { am_rc=; unset am_rc;} + rm -f conftest-deps.mk } ;; "po/stamp-it":C) diff -Nru system-config-printer-1.5.11/configure.ac system-config-printer-1.5.12/configure.ac --- system-config-printer-1.5.11/configure.ac 2018-01-24 13:33:40.000000000 +0000 +++ system-config-printer-1.5.12/configure.ac 2019-10-01 09:51:20.000000000 +0000 @@ -1,4 +1,4 @@ -AC_INIT(system-config-printer, 1.5.11) +AC_INIT(system-config-printer, 1.5.12) AC_CONFIG_SRCDIR(system-config-printer.py) AM_INIT_AUTOMAKE([dist-xz dist-bzip2 subdir-objects 1.6]) IT_PROG_INTLTOOL diff -Nru system-config-printer-1.5.11/cupshelpers/cupshelpers.py system-config-printer-1.5.12/cupshelpers/cupshelpers.py --- system-config-printer-1.5.11/cupshelpers/cupshelpers.py 2017-06-20 06:45:18.000000000 +0000 +++ system-config-printer-1.5.12/cupshelpers/cupshelpers.py 2019-09-16 11:55:16.000000000 +0000 @@ -859,7 +859,7 @@ os.unlink (tmpfname) ppd.writeFd (tmpfd) os.lseek (tmpfd, 0, os.SEEK_SET) - f = os.fdopen (tmpfd, "rt") + f = os.fdopen (tmpfd, "rt", encoding="utf-8") search = "*cupsFilter:" for line in f: if line.startswith (search): diff -Nru system-config-printer-1.5.11/cupshelpers/ppds.py system-config-printer-1.5.12/cupshelpers/ppds.py --- system-config-printer-1.5.11/cupshelpers/ppds.py 2017-05-26 07:06:51.000000000 +0000 +++ system-config-printer-1.5.12/cupshelpers/ppds.py 2019-09-16 11:55:16.000000000 +0000 @@ -249,24 +249,29 @@ return (make, model) def normalize (strin): - # This function normalizes manufacturer and model names for comparing. - # The string is turned to lower case and leading and trailing white - # space is removed. After that each sequence of non-alphanumeric - # characters (including white space) is replaced by a single space and - # also at each change between letters and numbers a single space is added. - # This makes the comparison only done by alphanumeric characters and the - # words formed from them. So mostly two strings which sound the same when - # you pronounce them are considered equal. Printer manufacturers do not - # market two models whose names sound the same but differ only by - # upper/lower case, spaces, dashes, ..., but in printer drivers names can - # be easily supplied with these details of the name written in the wrong - # way, especially if the IEEE-1284 device ID of the printer is not known. - # This way we get a very reliable matching of printer model names. - # Examples: - # - Epson PM-A820 -> epson pm a 820 - # - Epson PM A820 -> epson pm a 820 - # - HP PhotoSmart C 8100 -> hp photosmart c 8100 - # - hp Photosmart C8100 -> hp photosmart c 8100 + """ + This function normalizes manufacturer and model names for comparing. + The string is turned to lower case and leading and trailing white + space is removed. After that each sequence of non-alphanumeric + characters (including white space) is replaced by a single space and + also at each change between letters and numbers a single space is added. + This makes the comparison only done by alphanumeric characters and the + words formed from them. So mostly two strings which sound the same when + you pronounce them are considered equal. Printer manufacturers do not + market two models whose names sound the same but differ only by + upper/lower case, spaces, dashes, ..., but in printer drivers names can + be easily supplied with these details of the name written in the wrong + way, especially if the IEEE-1284 device ID of the printer is not known. + This way we get a very reliable matching of printer model names. + Examples: + - Epson PM-A820 -> epson pm a 820 + - Epson PM A820 -> epson pm a 820 + - HP PhotoSmart C 8100 -> hp photosmart c 8100 + - hp Photosmart C8100 -> hp photosmart c 8100 + + @type strin: string that can be the make or the model + @return: a normalized lowercase string in which punctuations have been replaced with spaces. + """ lstrin = strin.strip ().lower () normalized = "" diff -Nru system-config-printer-1.5.11/cupspk.py system-config-printer-1.5.12/cupspk.py --- system-config-printer-1.5.11/cupspk.py 2016-05-05 11:02:33.000000000 +0000 +++ system-config-printer-1.5.12/cupspk.py 2019-09-16 11:55:16.000000000 +0000 @@ -99,6 +99,8 @@ def _call_with_pk_and_fallback(self, use_fallback, pk_function_name, pk_args, fallback_function, *args, **kwds): pk_function = None + # take signature from kwds if is provided + dbus_args_signature = kwds.pop('signature', None) if not use_fallback: cups_pk = self._get_cups_pk() @@ -116,7 +118,7 @@ while True: try: # FIXME: async call or not? - pk_retval = pk_function(*pk_args) + pk_retval = pk_function(*pk_args, signature = dbus_args_signature) # if the PK call has more than one return values, we pop the # first one as the error message @@ -446,7 +448,7 @@ if fd is not None: os.lseek (fd, 0, os.SEEK_SET) buf = os.read (fd, 512) - while buf != '': + while buf != '' and buf != b'': os.write (tmpfd, buf) buf = os.read (fd, 512) else: diff -Nru system-config-printer-1.5.11/dbus/com.redhat.NewPrinterNotification.conf system-config-printer-1.5.12/dbus/com.redhat.NewPrinterNotification.conf --- system-config-printer-1.5.11/dbus/com.redhat.NewPrinterNotification.conf 2016-05-05 11:02:33.000000000 +0000 +++ system-config-printer-1.5.12/dbus/com.redhat.NewPrinterNotification.conf 2019-09-16 11:55:16.000000000 +0000 @@ -2,27 +2,16 @@ "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> - - - - - - - - - + - - - - - - - - - - - - + - - - Mon, 24 Feb 2020 22:15:11 +0100 + system-config-printer (1.5.11-4ubuntu2) focal; urgency=low * Removed debian/patches/33_ipp-over-usb-support.patch: We now let diff -Nru system-config-printer-1.5.11/debian/patches/0003-Use-ValueError-instead-of-ImportError-to-catch-excep.patch system-config-printer-1.5.12/debian/patches/0003-Use-ValueError-instead-of-ImportError-to-catch-excep.patch --- system-config-printer-1.5.11/debian/patches/0003-Use-ValueError-instead-of-ImportError-to-catch-excep.patch 2018-02-26 16:16:55.000000000 +0000 +++ system-config-printer-1.5.12/debian/patches/0003-Use-ValueError-instead-of-ImportError-to-catch-excep.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,28 +0,0 @@ -From: Laurent Bigonville -Date: Mon, 26 Feb 2018 11:17:22 +0100 -Subject: Use ValueError instead of ImportError to catch exception when - importing GIR bindings - -When importing specific version of GIR bindings, the ValueError -exception is raised instead of ImportError. - -This should make libsecret optional as intended - -Fixes: #94 ---- - jobviewer.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/jobviewer.py b/jobviewer.py -index 6d9309f..16b2030 100644 ---- a/jobviewer.py -+++ b/jobviewer.py -@@ -57,7 +57,7 @@ try: - gi.require_version('Secret', '1') - from gi.repository import Secret - USE_SECRET=True --except ImportError: -+except ValueError: - USE_SECRET=False - - import gettext diff -Nru system-config-printer-1.5.11/debian/patches/0004-Fix-constructing-the-auth-dialog.patch system-config-printer-1.5.12/debian/patches/0004-Fix-constructing-the-auth-dialog.patch --- system-config-printer-1.5.11/debian/patches/0004-Fix-constructing-the-auth-dialog.patch 2018-02-26 16:16:55.000000000 +0000 +++ system-config-printer-1.5.12/debian/patches/0004-Fix-constructing-the-auth-dialog.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,27 +0,0 @@ -From: "Jan Alexander Steffens (heftig)" -Date: Thu, 8 Feb 2018 17:01:01 +0100 -Subject: Fix constructing the auth dialog - -47973c80 (Remove deprecated Gtk objects) broke the auth dialog. - -Fixes https://bugs.archlinux.org/task/57364. ---- - authconn.py | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/authconn.py b/authconn.py -index 2a645dc..0f3021c 100644 ---- a/authconn.py -+++ b/authconn.py -@@ -78,11 +78,9 @@ class AuthDialog(Gtk.Dialog): - field = auth_info_required[i] - label = Gtk.Label (label=_(self.AUTH_FIELD.get (field, field))) - label.set_alignment (0, 0.5) -- grid.attach (label, 0, 1, i, i + 1) - grid.attach (label, 0, i, 1, 1) - entry = Gtk.Entry () - entry.set_visibility (field != 'password') -- grid.attach (entry, 1, 2, i, i + 1, 0, 0) - grid.attach (entry, 1, i, 1, 1) - self.field_entry.append (entry) - diff -Nru system-config-printer-1.5.11/debian/patches/0005-Require-proper-version-of-GDK-and-GTK-in-scp-dbus-se.patch system-config-printer-1.5.12/debian/patches/0005-Require-proper-version-of-GDK-and-GTK-in-scp-dbus-se.patch --- system-config-printer-1.5.11/debian/patches/0005-Require-proper-version-of-GDK-and-GTK-in-scp-dbus-se.patch 2018-02-26 16:16:55.000000000 +0000 +++ system-config-printer-1.5.12/debian/patches/0005-Require-proper-version-of-GDK-and-GTK-in-scp-dbus-se.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,30 +0,0 @@ -From: Laurent Bigonville -Date: Mon, 26 Feb 2018 11:54:10 +0100 -Subject: Require proper version of GDK and GTK in scp-dbus-service as well - -scp-dbus-service can be D-Bus activated, that means that -gi.require_version() is not called before. - -That needs to be kept in sync with the required version in the main -program file. ---- - scp-dbus-service.py | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/scp-dbus-service.py b/scp-dbus-service.py -index f0f51ef..3aefc6c 100644 ---- a/scp-dbus-service.py -+++ b/scp-dbus-service.py -@@ -21,9 +21,12 @@ - ## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - - import dbus.service -+import gi - from gi.repository import GObject - from gi.repository import GLib -+gi.require_version('Gdk', '3.0') - from gi.repository import Gdk -+gi.require_version('Gtk', '3.0') - from gi.repository import Gtk - import sys - diff -Nru system-config-printer-1.5.11/debian/patches/0006-Set-programe-name-for-scp-dbus-service-as-well.patch system-config-printer-1.5.12/debian/patches/0006-Set-programe-name-for-scp-dbus-service-as-well.patch --- system-config-printer-1.5.11/debian/patches/0006-Set-programe-name-for-scp-dbus-service-as-well.patch 2018-02-26 16:16:55.000000000 +0000 +++ system-config-printer-1.5.12/debian/patches/0006-Set-programe-name-for-scp-dbus-service-as-well.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,37 +0,0 @@ -From: Laurent Bigonville -Date: Mon, 26 Feb 2018 13:59:26 +0100 -Subject: Set programe name for scp-dbus-service as well - -scp-dbus-service can be D-Bus activated, that means that the program -name is never set meaning that the icon and the fancy name in the window -list is never set. - -This completes the fix for bug #53 ---- - scp-dbus-service.py | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/scp-dbus-service.py b/scp-dbus-service.py -index 3aefc6c..1338836 100644 ---- a/scp-dbus-service.py -+++ b/scp-dbus-service.py -@@ -20,8 +20,8 @@ - ## along with this program; if not, write to the Free Software - ## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - --import dbus.service - import gi -+import dbus.service - from gi.repository import GObject - from gi.repository import GLib - gi.require_version('Gdk', '3.0') -@@ -55,6 +55,9 @@ CONFIG_JOBVIEWER_IFACE=CONFIG_IFACE + ".JobViewer" - g_ppds = None - g_killtimer = None - -+#set program name -+GLib.set_prgname("system-config-printer") -+ - class FetchedPPDs(GObject.GObject): - __gsignals__ = { - 'ready': (GObject.SIGNAL_RUN_LAST, None, ()), diff -Nru system-config-printer-1.5.11/debian/patches/03_install_layout.patch system-config-printer-1.5.12/debian/patches/03_install_layout.patch --- system-config-printer-1.5.11/debian/patches/03_install_layout.patch 2018-02-28 18:59:12.000000000 +0000 +++ system-config-printer-1.5.12/debian/patches/03_install_layout.patch 2020-02-24 21:15:11.000000000 +0000 @@ -16,7 +16,7 @@ # about how distutils works to do this. Unfortunately, distutils --- a/Makefile.in +++ b/Makefile.in -@@ -1964,7 +1964,7 @@ +@@ -1975,7 +1975,7 @@ # Use distutils to install the module. install-exec-local: .stamp-distutils-in-builddir diff -Nru system-config-printer-1.5.11/debian/patches/40_temporary-fix-for-error-pop-up-window-for-ipp-2.x-attributes.patch system-config-printer-1.5.12/debian/patches/40_temporary-fix-for-error-pop-up-window-for-ipp-2.x-attributes.patch --- system-config-printer-1.5.11/debian/patches/40_temporary-fix-for-error-pop-up-window-for-ipp-2.x-attributes.patch 2019-01-07 18:56:20.000000000 +0000 +++ system-config-printer-1.5.12/debian/patches/40_temporary-fix-for-error-pop-up-window-for-ipp-2.x-attributes.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,16 +0,0 @@ ---- a/printerproperties.py -+++ b/printerproperties.py -@@ -1430,12 +1430,7 @@ - except: - nonfatalException() - option_editable = False -- show_error_dialog (_("Error"), -- _("Option '%s' has value '%s' and " -- "cannot be edited.") % -- (option.name, -- value), -- self.parent) -+ debugprint ("Option '%s' has value '%s' and cannot be edited." % (option.name, value)) - option.widget.set_sensitive (option_editable) - if not editable: - option.button.set_sensitive (False) diff -Nru system-config-printer-1.5.11/debian/patches/40-udev-configure-printer-add-checks-for-null.patch system-config-printer-1.5.12/debian/patches/40-udev-configure-printer-add-checks-for-null.patch --- system-config-printer-1.5.11/debian/patches/40-udev-configure-printer-add-checks-for-null.patch 1970-01-01 00:00:00.000000000 +0000 +++ system-config-printer-1.5.12/debian/patches/40-udev-configure-printer-add-checks-for-null.patch 2020-02-24 21:15:11.000000000 +0000 @@ -0,0 +1,35 @@ +--- a/udev/udev-configure-printer.c ++++ b/udev/udev-configure-printer.c +@@ -1411,7 +1411,7 @@ + const char *printer_state_message = NULL; + int state = 0; + size_t i, l; +- char *this_device_uri_n, *device_uri_n; ++ char *this_device_uri_n = NULL, *device_uri_n = NULL; + const char *ps1, *ps2, *pi1, *pi2; + + while (attr && ippGetGroupTag (attr) != IPP_TAG_PRINTER) +@@ -1448,6 +1448,8 @@ + for (i = 0; i < device_uris->n_uris; i++) + { + device_uri_n = normalize_device_uri(device_uris->uri[i]); ++ if (this_device_uri_n == NULL || device_uri_n == NULL) ++ goto skip; + /* As for the same device different URIs can come out when the + device is accessed via the usblp kernel module or via low- + level USB (libusb) we cannot simply compare URIs, must +@@ -1512,8 +1514,12 @@ + firstqueue = 0; + + skip: +- free(device_uri_n); +- free(this_device_uri_n); ++ if (device_uri_n != NULL) ++ free(device_uri_n); ++ device_uri_n = NULL; ++ if (this_device_uri_n != NULL) ++ free(this_device_uri_n); ++ this_device_uri_n = NULL; + if (!attr) + break; + } diff -Nru system-config-printer-1.5.11/debian/patches/43-fix-abrt-in-udev-configure-printer.patch system-config-printer-1.5.12/debian/patches/43-fix-abrt-in-udev-configure-printer.patch --- system-config-printer-1.5.11/debian/patches/43-fix-abrt-in-udev-configure-printer.patch 1970-01-01 00:00:00.000000000 +0000 +++ system-config-printer-1.5.12/debian/patches/43-fix-abrt-in-udev-configure-printer.patch 2020-02-24 21:15:11.000000000 +0000 @@ -0,0 +1,59 @@ +--- a/udev/udev-configure-printer.c ++++ b/udev/udev-configure-printer.c +@@ -1285,7 +1285,8 @@ + { + int i, j; + int havespace = 0; +- char *str; ++ char *str = NULL; ++ char *cropped_str = NULL; + + if (str_orig == NULL) + return NULL; +@@ -1333,7 +1334,11 @@ + (strstr(str, "packard ") == str) || + (strstr(str, "apollo ") == str) || + (strstr(str, "usb ") == str)) +- str = strchr(str, ' ') + 1; ++ { ++ cropped_str = strdup(strchr(str, ' ') + 1); ++ free(str); ++ str = cropped_str; ++ } + + return str; + } +@@ -1448,8 +1453,6 @@ + for (i = 0; i < device_uris->n_uris; i++) + { + device_uri_n = normalize_device_uri(device_uris->uri[i]); +- if (this_device_uri_n == NULL || device_uri_n == NULL) +- goto skip; + /* As for the same device different URIs can come out when the + device is accessed via the usblp kernel module or via low- + level USB (libusb) we cannot simply compare URIs, must +@@ -1509,17 +1512,21 @@ + break; + } + } ++ if (device_uri_n != NULL) ++ { ++ free(device_uri_n); ++ device_uri_n = NULL; ++ } + } + + firstqueue = 0; + + skip: +- if (device_uri_n != NULL) +- free(device_uri_n); +- device_uri_n = NULL; + if (this_device_uri_n != NULL) ++ { + free(this_device_uri_n); + this_device_uri_n = NULL; ++ } + if (!attr) + break; + } diff -Nru system-config-printer-1.5.11/debian/patches/define-classes-for-Secret-only-when-libsecret-is-installe.patch system-config-printer-1.5.12/debian/patches/define-classes-for-Secret-only-when-libsecret-is-installe.patch --- system-config-printer-1.5.11/debian/patches/define-classes-for-Secret-only-when-libsecret-is-installe.patch 2019-08-16 18:11:06.000000000 +0000 +++ system-config-printer-1.5.12/debian/patches/define-classes-for-Secret-only-when-libsecret-is-installe.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,144 +0,0 @@ -From: Zdenek Dohnal -Date: Thu, 30 Aug 2018 11:52:48 +0200 -Subject: define classes for Secret only when libsecret is installed - (https://github.com/zdohnal/system-config-printer/issues/118, - https://github.com/zdohnal/system-config-printer/issues/115) - ---- - jobviewer.py | 123 ++++++++++++++++++++++++++++++----------------------------- - 1 file changed, 62 insertions(+), 61 deletions(-) - -diff --git a/jobviewer.py b/jobviewer.py -index 16b2030..86f5fea 100644 ---- a/jobviewer.py -+++ b/jobviewer.py -@@ -73,67 +73,68 @@ SEARCHING_ICON="document-print-preview" - # We need to call Notify.init before we can check the server for caps - Notify.init('System Config Printer Notification') - --NETWORK_PASSWORD = Secret.Schema.new("org.system.config.printer.store", Secret.SchemaFlags.NONE, -- { -- "user": Secret.SchemaAttributeType.STRING, -- "domain": Secret.SchemaAttributeType.STRING, -- "object": Secret.SchemaAttributeType.STRING, -- "protocol": Secret.SchemaAttributeType.STRING, -- "port": Secret.SchemaAttributeType.INTEGER, -- "server": Secret.SchemaAttributeType.STRING, -- "authtype": Secret.SchemaAttributeType.STRING, -- "uri": Secret.SchemaAttributeType.STRING, -- } -- ) -- -- --class ServiceGet: -- service = Secret.Service() -- -- def on_get_service(self, source, result, unused): -- service = Secret.Service.get_finish(result) -- -- def __init__(self): -- Secret.Service.get(0, -- None, -- self.on_get_service, -- None) -- -- def get_service(self): -- return ServiceGet.service -- -- --class ItemSearch: -- items = list() -- -- def on_search_item(self, source, result, unused): -- items = Secret.Service.search_finish(None, result) -- -- def __init__(self, service, attrs): -- Secret.Service.search(service, -- NETWORK_PASSWORD, -- attrs, -- Secret.SearchFlags.LOAD_SECRETS, -- None, -- self.on_search_item, -- None) -- -- def get_items(self): -- return ItemSearch.items -- -- --class PasswordStore: -- def __init__(self, attrs, name, secret): -- Secret.password_store(NETWORK_PASSWORD, -- attrs, -- Secret.COLLECTION_DEFAULT, -- name, -- secret, -- None, -- self.on_password_stored) -- -- def on_password_stored(self, source, result, unused): -- Secret.password_store_finish(result) -+if USE_SECRET: -+ NETWORK_PASSWORD = Secret.Schema.new("org.system.config.printer.store", Secret.SchemaFlags.NONE, -+ { -+ "user": Secret.SchemaAttributeType.STRING, -+ "domain": Secret.SchemaAttributeType.STRING, -+ "object": Secret.SchemaAttributeType.STRING, -+ "protocol": Secret.SchemaAttributeType.STRING, -+ "port": Secret.SchemaAttributeType.INTEGER, -+ "server": Secret.SchemaAttributeType.STRING, -+ "authtype": Secret.SchemaAttributeType.STRING, -+ "uri": Secret.SchemaAttributeType.STRING, -+ } -+ ) -+ -+ -+ class ServiceGet: -+ service = Secret.Service() -+ -+ def on_get_service(self, source, result, unused): -+ service = Secret.Service.get_finish(result) -+ -+ def __init__(self): -+ Secret.Service.get(0, -+ None, -+ self.on_get_service, -+ None) -+ -+ def get_service(self): -+ return ServiceGet.service -+ -+ -+ class ItemSearch: -+ items = list() -+ -+ def on_search_item(self, source, result, unused): -+ items = Secret.Service.search_finish(None, result) -+ -+ def __init__(self, service, attrs): -+ Secret.Service.search(service, -+ NETWORK_PASSWORD, -+ attrs, -+ Secret.SearchFlags.LOAD_SECRETS, -+ None, -+ self.on_search_item, -+ None) -+ -+ def get_items(self): -+ return ItemSearch.items -+ -+ -+ class PasswordStore: -+ def __init__(self, attrs, name, secret): -+ Secret.password_store(NETWORK_PASSWORD, -+ attrs, -+ Secret.COLLECTION_DEFAULT, -+ name, -+ secret, -+ None, -+ self.on_password_stored) -+ -+ def on_password_stored(self, source, result, unused): -+ Secret.password_store_finish(result) - - - class PrinterURIIndex: diff -Nru system-config-printer-1.5.11/debian/patches/series system-config-printer-1.5.12/debian/patches/series --- system-config-printer-1.5.11/debian/patches/series 2020-02-10 21:55:58.000000000 +0000 +++ system-config-printer-1.5.12/debian/patches/series 2020-02-24 21:15:11.000000000 +0000 @@ -1,7 +1,3 @@ -0003-Use-ValueError-instead-of-ImportError-to-catch-excep.patch -0004-Fix-constructing-the-auth-dialog.patch -0005-Require-proper-version-of-GDK-and-GTK-in-scp-dbus-se.patch -0006-Set-programe-name-for-scp-dbus-service-as-well.patch 03_install_layout.patch 0006-use-paper-size-default-in-etc-papersize.patch 0007-fix-pk-package-name.patch @@ -10,5 +6,5 @@ 06_rename_settings_panel.patch 07_driver-auto-download-configuration.patch 33_no-usb-queues-for-ipp-over-usb-printers.patch -40_temporary-fix-for-error-pop-up-window-for-ipp-2.x-attributes.patch -define-classes-for-Secret-only-when-libsecret-is-installe.patch +40-udev-configure-printer-add-checks-for-null.patch +43-fix-abrt-in-udev-configure-printer.patch diff -Nru system-config-printer-1.5.11/depcomp system-config-printer-1.5.12/depcomp --- system-config-printer-1.5.11/depcomp 2016-10-19 07:34:16.000000000 +0000 +++ system-config-printer-1.5.12/depcomp 2019-10-01 09:52:19.000000000 +0000 @@ -1,9 +1,9 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2013-05-30.07; # UTC +scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2018 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ # 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 . +# along with this program. If not, see . # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -783,9 +783,9 @@ # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff -Nru system-config-printer-1.5.11/install-printerdriver.py system-config-printer-1.5.12/install-printerdriver.py --- system-config-printer-1.5.11/install-printerdriver.py 2016-05-05 11:02:33.000000000 +0000 +++ system-config-printer-1.5.12/install-printerdriver.py 2019-09-30 16:56:24.000000000 +0000 @@ -1,5 +1,7 @@ #!/usr/bin/python3 +import gi +gi.require_version('PackageKitGlib', '1.0') from gi.repository import GLib, PackageKitGlib import sys from debug import * @@ -17,8 +19,18 @@ set_debugging (True) -package = sys.argv[1] -repo = sys.argv[2] +try: + package = sys.argv[1] +except: + debugprint("Missing package name to install.") + sys.exit(1) + +try: + repo = sys.argv[2] +except: + debugprint("Missing name of repo.") + sys.exit(1) + try: repo_gpg_id = sys.argv[3] except: diff -Nru system-config-printer-1.5.11/jobviewer.py system-config-printer-1.5.12/jobviewer.py --- system-config-printer-1.5.11/jobviewer.py 2017-11-23 15:55:41.000000000 +0000 +++ system-config-printer-1.5.12/jobviewer.py 2019-09-16 11:55:16.000000000 +0000 @@ -57,7 +57,7 @@ gi.require_version('Secret', '1') from gi.repository import Secret USE_SECRET=True -except ImportError: +except ValueError: USE_SECRET=False import gettext @@ -73,67 +73,68 @@ # We need to call Notify.init before we can check the server for caps Notify.init('System Config Printer Notification') -NETWORK_PASSWORD = Secret.Schema.new("org.system.config.printer.store", Secret.SchemaFlags.NONE, - { - "user": Secret.SchemaAttributeType.STRING, - "domain": Secret.SchemaAttributeType.STRING, - "object": Secret.SchemaAttributeType.STRING, - "protocol": Secret.SchemaAttributeType.STRING, - "port": Secret.SchemaAttributeType.INTEGER, - "server": Secret.SchemaAttributeType.STRING, - "authtype": Secret.SchemaAttributeType.STRING, - "uri": Secret.SchemaAttributeType.STRING, - } - ) - - -class ServiceGet: - service = Secret.Service() - - def on_get_service(self, source, result, unused): - service = Secret.Service.get_finish(result) - - def __init__(self): - Secret.Service.get(0, - None, - self.on_get_service, - None) - - def get_service(self): - return ServiceGet.service - - -class ItemSearch: - items = list() - - def on_search_item(self, source, result, unused): - items = Secret.Service.search_finish(None, result) - - def __init__(self, service, attrs): - Secret.Service.search(service, - NETWORK_PASSWORD, - attrs, - Secret.SearchFlags.LOAD_SECRETS, - None, - self.on_search_item, - None) - - def get_items(self): - return ItemSearch.items - - -class PasswordStore: - def __init__(self, attrs, name, secret): - Secret.password_store(NETWORK_PASSWORD, - attrs, - Secret.COLLECTION_DEFAULT, - name, - secret, - None, - self.on_password_stored) - - def on_password_stored(self, source, result, unused): - Secret.password_store_finish(result) +if USE_SECRET: + NETWORK_PASSWORD = Secret.Schema.new("org.system.config.printer.store", Secret.SchemaFlags.NONE, + { + "user": Secret.SchemaAttributeType.STRING, + "domain": Secret.SchemaAttributeType.STRING, + "object": Secret.SchemaAttributeType.STRING, + "protocol": Secret.SchemaAttributeType.STRING, + "port": Secret.SchemaAttributeType.INTEGER, + "server": Secret.SchemaAttributeType.STRING, + "authtype": Secret.SchemaAttributeType.STRING, + "uri": Secret.SchemaAttributeType.STRING, + } + ) + + + class ServiceGet: + service = Secret.Service() + + def on_get_service(self, source, result, unused): + service = Secret.Service.get_finish(result) + + def __init__(self): + Secret.Service.get(0, + None, + self.on_get_service, + None) + + def get_service(self): + return ServiceGet.service + + + class ItemSearch: + items = list() + + def on_search_item(self, source, result, unused): + items = Secret.Service.search_finish(None, result) + + def __init__(self, service, attrs): + Secret.Service.search(service, + NETWORK_PASSWORD, + attrs, + Secret.SearchFlags.LOAD_SECRETS, + None, + self.on_search_item, + None) + + def get_items(self): + return ItemSearch.items + + + class PasswordStore: + def __init__(self, attrs, name, secret): + Secret.password_store(NETWORK_PASSWORD, + attrs, + Secret.COLLECTION_DEFAULT, + name, + secret, + None, + self.on_password_stored) + + def on_password_stored(self, source, result, unused): + Secret.password_store_finish(result) class PrinterURIIndex: @@ -1111,7 +1112,12 @@ def display_auth_info_dialog (self, job, keyring_attrs=None): data = self.jobs[job] - auth_info_required = data['auth-info-required'] + try: + auth_info_required = data['auth-info-required'] + except KeyError: + debugprint ("No auth-info-required attribute; " + "guessing instead") + auth_info_required = ['username', 'password'] dialog = authconn.AuthDialog (auth_info_required=auth_info_required, allow_remember=USE_SECRET) dialog.keyring_attrs = keyring_attrs diff -Nru system-config-printer-1.5.11/Makefile.in system-config-printer-1.5.12/Makefile.in --- system-config-printer-1.5.11/Makefile.in 2018-01-24 13:36:07.000000000 +0000 +++ system-config-printer-1.5.12/Makefile.in 2019-10-01 09:54:12.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -117,7 +117,7 @@ am__udev_udev_configure_printer_SOURCES_DIST = \ udev/udev-configure-printer.c am__dirstamp = $(am__leading_dot)dirstamp -@UDEV_RULES_TRUE@am_udev_udev_configure_printer_OBJECTS = udev/udev_udev_configure_printer-udev-configure-printer.$(OBJEXT) +@UDEV_RULES_TRUE@am_udev_udev_configure_printer_OBJECTS = udev/udev_configure_printer-udev-configure-printer.$(OBJEXT) udev_udev_configure_printer_OBJECTS = \ $(am_udev_udev_configure_printer_OBJECTS) am__DEPENDENCIES_1 = @@ -169,7 +169,8 @@ am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles +am__maybe_remake_depfiles = depfiles +am__depfiles_remade = udev/$(DEPDIR)/udev_configure_printer-udev-configure-printer.Po am__mv = mv -f AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) @@ -216,7 +217,8 @@ $(RECURSIVE_CLEAN_TARGETS) \ $(am__extra_recursive_targets) AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - cscope check recheck distdir dist dist-all distcheck + cscope check recheck distdir distdir-am dist dist-all \ + distcheck am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) # Read a list of newline-separated strings from the standard input, # and print each of them once, without duplicates. Input order is @@ -838,8 +840,8 @@ echo ' $(SHELL) ./config.status'; \ $(SHELL) ./config.status;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -908,7 +910,7 @@ udev/$(DEPDIR)/$(am__dirstamp): @$(MKDIR_P) udev/$(DEPDIR) @: > udev/$(DEPDIR)/$(am__dirstamp) -udev/udev_udev_configure_printer-udev-configure-printer.$(OBJEXT): \ +udev/udev_configure_printer-udev-configure-printer.$(OBJEXT): \ udev/$(am__dirstamp) udev/$(DEPDIR)/$(am__dirstamp) udev/udev-configure-printer$(EXEEXT): $(udev_udev_configure_printer_OBJECTS) $(udev_udev_configure_printer_DEPENDENCIES) $(EXTRA_udev_udev_configure_printer_DEPENDENCIES) udev/$(am__dirstamp) @@ -1034,7 +1036,13 @@ distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@udev/$(DEPDIR)/udev_udev_configure_printer-udev-configure-printer.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@udev/$(DEPDIR)/udev_configure_printer-udev-configure-printer.Po@am__quote@ # am--include-marker + +$(am__depfiles_remade): + @$(MKDIR_P) $(@D) + @echo '# dummy' >$@-t && $(am__mv) $@-t $@ + +am--depfiles: $(am__depfiles_remade) .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ @@ -1052,19 +1060,19 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -udev/udev_udev_configure_printer-udev-configure-printer.o: udev/udev-configure-printer.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(udev_udev_configure_printer_CFLAGS) $(CFLAGS) -MT udev/udev_udev_configure_printer-udev-configure-printer.o -MD -MP -MF udev/$(DEPDIR)/udev_udev_configure_printer-udev-configure-printer.Tpo -c -o udev/udev_udev_configure_printer-udev-configure-printer.o `test -f 'udev/udev-configure-printer.c' || echo '$(srcdir)/'`udev/udev-configure-printer.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) udev/$(DEPDIR)/udev_udev_configure_printer-udev-configure-printer.Tpo udev/$(DEPDIR)/udev_udev_configure_printer-udev-configure-printer.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='udev/udev-configure-printer.c' object='udev/udev_udev_configure_printer-udev-configure-printer.o' libtool=no @AMDEPBACKSLASH@ +udev/udev_configure_printer-udev-configure-printer.o: udev/udev-configure-printer.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(udev_udev_configure_printer_CFLAGS) $(CFLAGS) -MT udev/udev_configure_printer-udev-configure-printer.o -MD -MP -MF udev/$(DEPDIR)/udev_configure_printer-udev-configure-printer.Tpo -c -o udev/udev_configure_printer-udev-configure-printer.o `test -f 'udev/udev-configure-printer.c' || echo '$(srcdir)/'`udev/udev-configure-printer.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) udev/$(DEPDIR)/udev_configure_printer-udev-configure-printer.Tpo udev/$(DEPDIR)/udev_configure_printer-udev-configure-printer.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='udev/udev-configure-printer.c' object='udev/udev_configure_printer-udev-configure-printer.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(udev_udev_configure_printer_CFLAGS) $(CFLAGS) -c -o udev/udev_udev_configure_printer-udev-configure-printer.o `test -f 'udev/udev-configure-printer.c' || echo '$(srcdir)/'`udev/udev-configure-printer.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(udev_udev_configure_printer_CFLAGS) $(CFLAGS) -c -o udev/udev_configure_printer-udev-configure-printer.o `test -f 'udev/udev-configure-printer.c' || echo '$(srcdir)/'`udev/udev-configure-printer.c -udev/udev_udev_configure_printer-udev-configure-printer.obj: udev/udev-configure-printer.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(udev_udev_configure_printer_CFLAGS) $(CFLAGS) -MT udev/udev_udev_configure_printer-udev-configure-printer.obj -MD -MP -MF udev/$(DEPDIR)/udev_udev_configure_printer-udev-configure-printer.Tpo -c -o udev/udev_udev_configure_printer-udev-configure-printer.obj `if test -f 'udev/udev-configure-printer.c'; then $(CYGPATH_W) 'udev/udev-configure-printer.c'; else $(CYGPATH_W) '$(srcdir)/udev/udev-configure-printer.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) udev/$(DEPDIR)/udev_udev_configure_printer-udev-configure-printer.Tpo udev/$(DEPDIR)/udev_udev_configure_printer-udev-configure-printer.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='udev/udev-configure-printer.c' object='udev/udev_udev_configure_printer-udev-configure-printer.obj' libtool=no @AMDEPBACKSLASH@ +udev/udev_configure_printer-udev-configure-printer.obj: udev/udev-configure-printer.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(udev_udev_configure_printer_CFLAGS) $(CFLAGS) -MT udev/udev_configure_printer-udev-configure-printer.obj -MD -MP -MF udev/$(DEPDIR)/udev_configure_printer-udev-configure-printer.Tpo -c -o udev/udev_configure_printer-udev-configure-printer.obj `if test -f 'udev/udev-configure-printer.c'; then $(CYGPATH_W) 'udev/udev-configure-printer.c'; else $(CYGPATH_W) '$(srcdir)/udev/udev-configure-printer.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) udev/$(DEPDIR)/udev_configure_printer-udev-configure-printer.Tpo udev/$(DEPDIR)/udev_configure_printer-udev-configure-printer.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='udev/udev-configure-printer.c' object='udev/udev_configure_printer-udev-configure-printer.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(udev_udev_configure_printer_CFLAGS) $(CFLAGS) -c -o udev/udev_udev_configure_printer-udev-configure-printer.obj `if test -f 'udev/udev-configure-printer.c'; then $(CYGPATH_W) 'udev/udev-configure-printer.c'; else $(CYGPATH_W) '$(srcdir)/udev/udev-configure-printer.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(udev_udev_configure_printer_CFLAGS) $(CFLAGS) -c -o udev/udev_configure_printer-udev-configure-printer.obj `if test -f 'udev/udev-configure-printer.c'; then $(CYGPATH_W) 'udev/udev-configure-printer.c'; else $(CYGPATH_W) '$(srcdir)/udev/udev-configure-printer.c'; fi` install-man1: $(man_MANS) @$(NORMAL_INSTALL) @list1=''; \ @@ -1506,7 +1514,7 @@ fi; \ $$success || exit 1 -check-TESTS: +check-TESTS: @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) @@ -1556,7 +1564,10 @@ @am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ @am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) $(am__remove_distdir) test -d "$(distdir)" || mkdir "$(distdir)" @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -1798,7 +1809,7 @@ distclean: distclean-recursive -rm -f $(am__CONFIG_DISTCLEAN_FILES) - -rm -rf udev/$(DEPDIR) + -rm -f udev/$(DEPDIR)/udev_configure_printer-udev-configure-printer.Po -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-local distclean-tags @@ -1849,7 +1860,7 @@ maintainer-clean: maintainer-clean-recursive -rm -f $(am__CONFIG_DISTCLEAN_FILES) -rm -rf $(top_srcdir)/autom4te.cache - -rm -rf udev/$(DEPDIR) + -rm -f udev/$(DEPDIR)/udev_configure_printer-udev-configure-printer.Po -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -1878,9 +1889,9 @@ .MAKE: $(am__recursive_targets) check-am install-am install-strip .PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am all-local \ - am--refresh check check-TESTS check-am clean clean-cscope \ - clean-generic clean-local clean-udevPROGRAMS cscope \ - cscopelist-am ctags ctags-am dist dist-all dist-bzip2 \ + am--depfiles am--refresh check check-TESTS check-am clean \ + clean-cscope clean-generic clean-local clean-udevPROGRAMS \ + cscope cscopelist-am ctags ctags-am dist dist-all dist-bzip2 \ dist-gzip dist-hook dist-lzip dist-shar dist-tarZ dist-xz \ dist-zip distcheck distclean distclean-compile \ distclean-generic distclean-local distclean-tags \ diff -Nru system-config-printer-1.5.11/missing system-config-printer-1.5.12/missing --- system-config-printer-1.5.11/missing 2016-10-19 07:34:16.000000000 +0000 +++ system-config-printer-1.5.12/missing 2019-10-01 09:52:19.000000000 +0000 @@ -1,9 +1,9 @@ #! /bin/sh # Common wrapper for a few potentially missing GNU programs. -scriptversion=2013-10-28.13; # UTC +scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2018 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify @@ -17,7 +17,7 @@ # 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 . +# along with this program. If not, see . # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -101,9 +101,9 @@ exit $st fi -perl_URL=http://www.perl.org/ -flex_URL=http://flex.sourceforge.net/ -gnu_software_URL=http://www.gnu.org/software +perl_URL=https://www.perl.org/ +flex_URL=https://github.com/westes/flex +gnu_software_URL=https://www.gnu.org/software program_details () { @@ -207,9 +207,9 @@ exit $st # Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff -Nru system-config-printer-1.5.11/newprinter.py system-config-printer-1.5.12/newprinter.py --- system-config-printer-1.5.11/newprinter.py 2018-01-22 15:52:40.000000000 +0000 +++ system-config-printer-1.5.12/newprinter.py 2019-09-16 11:55:16.000000000 +0000 @@ -1049,7 +1049,7 @@ debugprint('No packages for driver') return None if len(arches) > 1: - debugprint('Returned more than one matching architecture, please report this as a bug: %s', repr (arches)) + debugprint('Returned more than one matching architecture, please report this as a bug: %s' % repr (arches)) return None pkgs = pkgs[arches[0]] @@ -1454,11 +1454,22 @@ else: port = 631 try: + debugprint('Download ppd file from remote server') conn = http.client.HTTPConnection(resg[0], port) conn.request("GET", "/printers/%s.ppd" % resg[2]) resp = conn.getresponse() if resp.status == 200: self.remotecupsqueue = resg[2] + + ppdcontent = resp.read() + + with tempfile.NamedTemporaryFile () as tmpf: + tmpf.write(ppdcontent) + tmpf.flush() + try: + ppd = cups.PPD(tmpf.name) + except (cups.IPPError, RuntimeError): + raise IOError("Server's ppd file is corrupted.") except: pass @@ -1549,8 +1560,9 @@ elif self.remotecupsqueue: # We have a remote CUPS queue, let the client queue # stay raw so that the driver on the server gets used - ppdname = 'raw' - self.ppd = ppdname + if self.ppd is None: + ppdname = 'raw' + self.ppd = ppdname name = self.remotecupsqueue name = self.makeNameUnique (name) self.entNPName.set_text (name) diff -Nru system-config-printer-1.5.11/NEWS system-config-printer-1.5.12/NEWS --- system-config-printer-1.5.11/NEWS 2018-01-24 13:25:48.000000000 +0000 +++ system-config-printer-1.5.12/NEWS 2019-10-01 09:51:45.000000000 +0000 @@ -1,38 +1,61 @@ -1.5.11 changes +1.5.13 changes -------------- +1.5.12 changes +-------------- +- when you use different component id, add provide for old name (issues/99) +- fix other issues in system-config-printer.appdata.xml to be completely valid + for new format +- make the appstream file validate with version >= 0.6 (issues/97) +- fixes for scp-dbus-services (pull/96) +- use ValueError instead of ImportError (pull/95) +- fix constructing the auth dialog (pull/93) +- update da.po (pull/102) +- use utf-8 in fdopen() (pull/112) +- Fallback to using LC_CTYPE if LC_MESSAGES is empty and fix _language use (pull/108) +- Update de.po (pull/106) +- Fix TypeError raised by debugprint call (pull/121) +- dbus: remove deprecated at_console statement (pull/123) +- fixed several memory leaks reported by Coverity scan +- temporary fix for error pop up message for IPP2.0+ attributes (issues/122) +- lpd queue names printed on the console (issues/132) +- use proper docstring (pull/130) +- remove deprecated SIGNAL_RUN_LAST (pull/134) +- use remote ppd for CUPS shared queues (pull/137) +- get rid of warnings in applet (Fedora issue #1732890) +- check if we have required parameters in install-printerdriver (Fedora issue #1754204) 1.5.10 changes -------------- - printer couldn't be add ( https://bugzilla.redhat.com/show_bug.cgi?id=1419175 ) -- changes from Ubuntu by Till Kamppeter (https://github.com/zdohnal/system-config-printer/pull/64) -- .travis.yml: switch from precise to trusty (https://github.com/zdohnal/system-config-printer/pull/63) -- Replace icons deprecated by GTK 3.0 by non-deprecated ones (https://github.com/zdohnal/system-config-printer/pull/62) -- Add a StartService for systemd based systems (https://github.com/zdohnal/system-config-printer/pull/56) -- French translation update (https://github.com/zdohnal/system-config-printer/pull/57) -- Spelling fixes (https://github.com/zdohnal/system-config-printer/pull/58) -- Syntax fixes (https://github.com/zdohnal/system-config-printer/pull/59) -- Python 3.6 invalid escape sequence deprecation fixes (https://github.com/zdohnal/system-config-printer/pull/60) -- Adds printer properties dialog vertical expansion (https://github.com/zdohnal/system-config-printer/pull/61) -- Replace icons deprecated by GTK 3.0 by non-deprecated ones (https://github.com/zdohnal/system-config-printer/pull/62) -- Improvements of discovered devices/conection type lists in new-printer wizard, more debug output (https://github.com/zdohnal/system-config-printer/pull/65) -- replace libgnome-keyring by libsecret (https://github.com/zdohnal/system-config-printer/issues/51) -- Do not start the applet on GNOME and Cinnamon desktops (https://github.com/zdohnal/system-config-printer/pull/41) -- Do not notify on 'cups-waiting-for-job-completed' because it's not an… (https://github.com/zdohnal/system-config-printer/pull/71) -- Updated Turkish translation (https://github.com/zdohnal/system-config-printer/pull/74) -- Update tr.po (https://github.com/zdohnal/system-config-printer/pull/73) -- TypeError on .update call (https://github.com/zdohnal/system-config-printer/issues/76) -- build: Install appstream metadata to non-deprecated location #77 (https://github.com/zdohnal/system-config-printer/pull/77) -- Addition of some strings for i18n (https://github.com/zdohnal/system-config-printer/pull/81) +- changes from Ubuntu by Till Kamppeter (pull/64) +- .travis.yml: switch from precise to trusty (pull/63) +- Replace icons deprecated by GTK 3.0 by non-deprecated ones (pull/62) +- Add a StartService for systemd based systems (pull/56) +- French translation update (pull/57) +- Spelling fixes (pull/58) +- Syntax fixes (pull/59) +- Python 3.6 invalid escape sequence deprecation fixes (pull/60) +- Adds printer properties dialog vertical expansion (pull/61) +- Replace icons deprecated by GTK 3.0 by non-deprecated ones (pull/62) +- Improvements of discovered devices/conection type lists in new-printer wizard, more debug output (pull/65) +- replace libgnome-keyring by libsecret (issues/51) +- Do not start the applet on GNOME and Cinnamon desktops (pull/41) +- Do not notify on 'cups-waiting-for-job-completed' because it's not an… (pull/71) +- Updated Turkish translation (pull/74) +- Update tr.po (pull/73) +- TypeError on .update call (issues/76) +- build: Install appstream metadata to non-deprecated location #77 (pull/77) +- Addition of some strings for i18n (pull/81) - Update .po and .pot files -- added GenericName and X-GNOME-FullName to system-config-printer.desktop.in (https://github.com/zdohnal/system-config-printer/issues/20) +- added GenericName and X-GNOME-FullName to system-config-printer.desktop.in (issues/20) - removed some deprecated parts of gui - updated translations by files from Zanata - s-c-p doesn't react on ALREADY_ENABLED exception from firewalld - removed deprecated Gtk objects - another deprecated issues - GLib - parent attribute in Gtk.Dialog is deprecated - use transient_for -- system-config-printer.py doesn't have program name (https://github.com/zdohnal/system-config-printer/issues/53) +- system-config-printer.py doesn't have program name (issues/53) - removed macedonian localization because of low rate of translated strings - don't ship pre-configured scripts diff -Nru system-config-printer-1.5.11/options.py system-config-printer-1.5.12/options.py --- system-config-printer-1.5.11/options.py 2017-05-26 07:06:51.000000000 +0000 +++ system-config-printer-1.5.12/options.py 2019-09-16 11:55:16.000000000 +0000 @@ -421,7 +421,7 @@ self.selector.set_active(selected) else: debugprint("Unknown value for %s: %s" % (name, value)) - debugprint("Choices:", supported) + debugprint("Choices: %s" % (supported)) if len(supported) > 0: debugprint("Selecting from choices:", supported[0]) self.selector.set_active(0) diff -Nru system-config-printer-1.5.11/po/da.po system-config-printer-1.5.12/po/da.po --- system-config-printer-1.5.11/po/da.po 2018-01-24 13:24:12.000000000 +0000 +++ system-config-printer-1.5.12/po/da.po 2019-09-16 11:55:16.000000000 +0000 @@ -6,13 +6,14 @@ # Dimitris Glezos , 2011 # Kris , 2015. #zanata # scootergrisen , 2017. #zanata +# Alan Mortensen , 2018. msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/bugzilla\n" "POT-Creation-Date: 2018-01-23 10:27+0100\n" -"PO-Revision-Date: 2017-10-27 03:40-0400\n" -"Last-Translator: scootergrisen \n" +"PO-Revision-Date: 2018-04-02 15:00+0200\n" +"Last-Translator: Alan Mortensen \n" "Language-Team: Danish (http://www.transifex.com/projects/p/system-config-" "printer/language/da/)\n" "Language: da\n" @@ -20,7 +21,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Zanata 3.9.6\n" +"X-Generator: Poedit 1.8.7.1\n" #: ../asyncipp.py:473 ../authconn.py:456 ../authconn.py:458 #: ../errordialogs.py:63 ../pysmb.py:90 ../pysmb.py:92 @@ -787,6 +788,8 @@ "A fax machine or the fax function of a multi-function device connected to a " "USB port." msgstr "" +"En fax eller faxfunktionen på en multifunktionsenhed forbundet til en USB-" +"port." #: ../newprinter.py:3251 msgid "A printer connected to a USB port." @@ -1020,15 +1023,15 @@ #. HP #: ../ppdippstr.py:97 msgid "Print Quality" -msgstr "" +msgstr "Udskriftskvalitet" #: ../ppdippstr.py:98 msgid "Automatic" -msgstr "" +msgstr "Automatisk" #: ../ppdippstr.py:100 msgid "Printing Quality" -msgstr "" +msgstr "Udskriftskvalitet" #: ../ppdippstr.py:101 ../printerproperties.py:324 msgid "Draft" @@ -1040,249 +1043,254 @@ #: ../ppdippstr.py:103 msgid "Normal Color" -msgstr "" +msgstr "Normal farve" #: ../ppdippstr.py:104 msgid "Normal Grayscale" -msgstr "" +msgstr "Normal gråtoneskala" #: ../ppdippstr.py:105 msgid "Draft Color" -msgstr "" +msgstr "Kladdefarve" #: ../ppdippstr.py:106 msgid "Draft Grayscale" -msgstr "" +msgstr "Kladdegråtoneskala" #: ../ppdippstr.py:107 msgid "Best" -msgstr "" +msgstr "Bedst" #: ../ppdippstr.py:108 msgid "High-Resolution Photo" -msgstr "" +msgstr "Foto i høj opløsning" #: ../ppdippstr.py:109 msgid "Fast Draft" -msgstr "" +msgstr "Hurtig kladde" #: ../ppdippstr.py:111 msgid "Installed Cartridges" -msgstr "" +msgstr "Installerede patroner" #: ../ppdippstr.py:112 ../ppdippstr.py:113 msgid "Fast Only" -msgstr "" +msgstr "Kun hurtig" #: ../ppdippstr.py:114 msgid "Photo Only" -msgstr "" +msgstr "Kun foto" #: ../ppdippstr.py:115 msgid "Black and TriColor" -msgstr "" +msgstr "Sort og tre farver" #: ../ppdippstr.py:116 msgid "Photo and TriColor" -msgstr "" +msgstr "Foto og tre farver" #: ../ppdippstr.py:118 msgid "Resolution" -msgstr "" +msgstr "Opløsning" #: ../ppdippstr.py:120 msgid "Color Mode" -msgstr "" +msgstr "Farvetilstand" #: ../ppdippstr.py:121 msgid "Hight Quality Grayscale" -msgstr "" +msgstr "Gråtoneskala i høj kvalitet" #: ../ppdippstr.py:122 msgid "Black Only Grayscale" -msgstr "" +msgstr "Gråtoneskala kun med sort" #: ../ppdippstr.py:124 msgid "Quality" -msgstr "" +msgstr "Kvalitet" #: ../ppdippstr.py:125 -#, fuzzy msgid "High Resolution " -msgstr "Printeropløsning:" +msgstr "Høj opløsning " #: ../ppdippstr.py:126 msgid "Paper source" -msgstr "" +msgstr "Papirkilde" #: ../ppdippstr.py:127 msgid "Auto Source" -msgstr "" +msgstr "Automatisk kilde" #: ../ppdippstr.py:128 msgid "Manual Feed" -msgstr "" +msgstr "Manual indføring" #: ../ppdippstr.py:129 msgid "Middle Tray" -msgstr "" +msgstr "Midterste bakke" #: ../ppdippstr.py:130 msgid "Upper or Only One InputSlot" -msgstr "" +msgstr "Øvre eller kun et inputstik" +# MS #: ../ppdippstr.py:131 msgid "Multi-purpose Tray" -msgstr "" +msgstr "Flerfunktionsbakke" #: ../ppdippstr.py:132 msgid "Drawer 1 " -msgstr "" +msgstr "Skuffe 1 " #: ../ppdippstr.py:133 msgid "Drawer 2 " -msgstr "" +msgstr "Skuffe 2 " #: ../ppdippstr.py:134 msgid "Tray 1" -msgstr "" +msgstr "Bakke 1" #: ../ppdippstr.py:135 msgid "Auto Select" -msgstr "" +msgstr "Vælg automatisk" #: ../ppdippstr.py:137 msgid "Media Type" -msgstr "" +msgstr "Medietype" +# MS har: Bond paper print = Udskrivning på kontraktpapir #: ../ppdippstr.py:138 msgid "Bond" -msgstr "" +msgstr "Kontrakt" #: ../ppdippstr.py:139 msgid "Color" -msgstr "" +msgstr "Farve" #: ../ppdippstr.py:140 msgid "Envelope" -msgstr "" +msgstr "Konvolut" #: ../ppdippstr.py:141 msgid "Labels" -msgstr "" +msgstr "Etiketter" #: ../ppdippstr.py:142 msgid "Standard Paper" -msgstr "" +msgstr "Standardpapir" #: ../ppdippstr.py:143 msgid "Heavy" -msgstr "" +msgstr "Tungt" #: ../ppdippstr.py:144 msgid "Light" -msgstr "" +msgstr "Let" #: ../ppdippstr.py:145 msgid "Recycled" -msgstr "" +msgstr "Genbrugspapir" #: ../ppdippstr.py:146 msgid "Transparency" -msgstr "" +msgstr "Overhead" #: ../ppdippstr.py:147 msgid "Plain Paper" -msgstr "" +msgstr "Almindeligt papir" #: ../ppdippstr.py:148 msgid "Plain" -msgstr "" +msgstr "Almindeligt" +# ) må være en fejl #: ../ppdippstr.py:149 msgid "Photo Paper)" -msgstr "" +msgstr "Fotopapir" +# Transparency og Transparency Film er, så vidt jeg kan se, det samme. Jeg bruger et andet ord, så Overhead ikke optræder to gange. #: ../ppdippstr.py:150 msgid "Transparency Film" -msgstr "" +msgstr "Transparent" #: ../ppdippstr.py:151 msgid "CD or DVD Media" -msgstr "" +msgstr "Cd'er eller dvd'er" #: ../ppdippstr.py:152 msgid "Print Density" -msgstr "" +msgstr "Udskriftstæthed" #: ../ppdippstr.py:153 msgid "Extra Light (1)" -msgstr "" +msgstr "Ekstra lys (1)" #: ../ppdippstr.py:154 msgid "Light (2)" -msgstr "" +msgstr "Lys (2)" #: ../ppdippstr.py:155 msgid "Medium (3)" -msgstr "" +msgstr "Mellem (3)" #: ../ppdippstr.py:156 msgid "Dark (4)" -msgstr "" +msgstr "Mørk (4)" #: ../ppdippstr.py:157 msgid "Extra Dark (5)" -msgstr "" +msgstr "Ekstra mørk (5)" #: ../ppdippstr.py:158 msgid "Copies" -msgstr "" +msgstr "Antal kopier" #: ../ppdippstr.py:160 msgid "Adjustment" -msgstr "" +msgstr "Justering" #: ../ppdippstr.py:161 msgid "Halftone Algorithm" -msgstr "" +msgstr "Rasteralgortime" #: ../ppdippstr.py:164 msgid "Miscellaneous" -msgstr "" +msgstr "Diverse" #: ../ppdippstr.py:165 msgid "N-up Orientation" -msgstr "" +msgstr "N-op-orientering" #: ../ppdippstr.py:166 msgid "N-up Printing" -msgstr "" +msgstr "N-op-udskrivning" #: ../ppdippstr.py:167 msgid "Landscape" -msgstr "" +msgstr "Landskab" +# Et billede som viser havet - en af tre valgmuligheder til N-up Orientation: portrait landscape, seascape +# Kaldes tilsyneladende også reverse landscape: https://www.cs.utexas.edu/facilities/documentation/printing-options #: ../ppdippstr.py:168 msgid "Seascape" -msgstr "" +msgstr "Omvendt landskab" #: ../ppdippstr.py:169 msgid "Media Size" -msgstr "" +msgstr "Mediestørrelse" #: ../ppdippstr.py:170 msgid "Output Mode" -msgstr "" +msgstr "Outputtilstand" #: ../ppdippstr.py:171 msgid "Grayscale" -msgstr "" +msgstr "Gråtoneskala" #. Brother #: ../ppdippstr.py:174 msgid "Two-Sided" -msgstr "" +msgstr "Tosidet" #: ../ppdippstr.py:175 ../system-config-printer.desktop.in.h:1 #: ../system-config-printer.appdata.xml.in.h:1 @@ -1291,60 +1299,60 @@ #: ../ppdippstr.py:176 msgid "Print Settings (Advanced)" -msgstr "" +msgstr "Udskriftsindstillinger (avanceret)" #: ../ppdippstr.py:177 msgid "Color Settings" -msgstr "" +msgstr "Farveindstillinger" #: ../ppdippstr.py:178 msgid "Color Settings (Advanced)" -msgstr "" +msgstr "Farveindstillinger (avanceret)" #: ../ppdippstr.py:179 msgid "Brightness" -msgstr "" +msgstr "Lysstyrke" #: ../ppdippstr.py:180 msgid "Contrast" -msgstr "" +msgstr "Kontrast" #: ../ppdippstr.py:181 msgid "Red" -msgstr "" +msgstr "Rød" #: ../ppdippstr.py:182 msgid "Green" -msgstr "" +msgstr "Grøn" #: ../ppdippstr.py:183 msgid "Blue" -msgstr "" +msgstr "Blå" #. Epson xp serie #: ../ppdippstr.py:186 msgid "_Media Size" -msgstr "" +msgstr "_Mediestørrelse" #: ../ppdippstr.py:187 msgid "_Grayscale" -msgstr "" +msgstr "_Gråtoneskala" #: ../ppdippstr.py:188 msgid "_Brightness" -msgstr "" +msgstr "_Lysstyrke" #: ../ppdippstr.py:189 msgid "_Contrast" -msgstr "" +msgstr "_Kontrast" #: ../ppdippstr.py:190 msgid "_Saturation" -msgstr "" +msgstr "M_ætning" #: ../ppdippstr.py:191 msgid "On" -msgstr "" +msgstr "Tændt" #. Options #: ../ppdippstr.py:193 ../printerproperties.py:957 @@ -1353,186 +1361,189 @@ #: ../ppdippstr.py:194 msgid "Duplexer Installed" -msgstr "" +msgstr "Dupleksenhed installeret" #. Canon #: ../ppdippstr.py:197 msgid "Color Model" -msgstr "" +msgstr "Farvemodel" #: ../ppdippstr.py:198 msgid "Color Precision" -msgstr "" +msgstr "Farvepræcision" #: ../ppdippstr.py:199 msgid "Resolution " -msgstr "" +msgstr "Opløsning" #: ../ppdippstr.py:200 msgid "Printer Features Common" -msgstr "" +msgstr "Fælles printerfunktioner" #: ../ppdippstr.py:201 msgid "CD Hub Size" -msgstr "" +msgstr "Størrelse på cd-hub" #: ../ppdippstr.py:202 msgid "Ink Type" -msgstr "" +msgstr "Blæktype" #: ../ppdippstr.py:203 msgid "Toner Save " -msgstr "" +msgstr "Tonerbesparelse " #: ../ppdippstr.py:204 msgid "ON" -msgstr "" +msgstr "TIL" #: ../ppdippstr.py:205 msgid "Toner Density" -msgstr "" +msgstr "Tonertæthed" #: ../ppdippstr.py:206 msgid "Media Type " -msgstr "" +msgstr "Medietype " #: ../ppdippstr.py:207 msgid "Collate " -msgstr "" +msgstr "Sætvis " #: ../ppdippstr.py:208 msgid "Image Refinement " -msgstr "" +msgstr "Billedforbedring " #: ../ppdippstr.py:209 msgid "Halftones " -msgstr "" +msgstr "Raster " #: ../ppdippstr.py:210 msgid "Duplex" -msgstr "" +msgstr "Dupleks" #: ../ppdippstr.py:211 msgid "OFF" -msgstr "" +msgstr "FRA" #: ../ppdippstr.py:212 msgid "ON (Long-edged Binding)" -msgstr "" +msgstr "TIL (Indbinding på den lange led)" #: ../ppdippstr.py:213 msgid "ON (Short-edged Binding)" -msgstr "" +msgstr "TIL (Indbinding på den korte led)" #. Samsung #: ../ppdippstr.py:215 msgid "Paper Size" -msgstr "" +msgstr "Papirstørrelse" #: ../ppdippstr.py:216 msgid "Paper Type" -msgstr "" +msgstr "Papirtype" #: ../ppdippstr.py:217 msgid "Thin" -msgstr "" +msgstr "Tynd" #: ../ppdippstr.py:218 msgid "Thick" -msgstr "" +msgstr "Tyk" #: ../ppdippstr.py:219 msgid "Thicker" -msgstr "" +msgstr "Tykkere" #: ../ppdippstr.py:220 msgid "Edge Enhance" -msgstr "" +msgstr "Kantforbedring" #: ../ppdippstr.py:221 msgid "Skip Blank Pages" -msgstr "" +msgstr "Spring blanke sider over" #: ../ppdippstr.py:222 msgid "Double-sided Printing" -msgstr "" +msgstr "Dobbeltsidet udskrivning" #: ../ppdippstr.py:224 msgid "Reverse Duplex Printing" -msgstr "" +msgstr "Omvendt dupleksudskrivning" #: ../ppdippstr.py:225 ../ppdippstr.py:228 msgid "Long Edge" -msgstr "" +msgstr "Lang kant" #: ../ppdippstr.py:226 ../ppdippstr.py:229 msgid "Short Edge" -msgstr "" +msgstr "Kort kant" #: ../ppdippstr.py:227 msgid "Two-sided" -msgstr "" +msgstr "Tosidet" #. Ricoh #: ../ppdippstr.py:232 msgid "Finisher" -msgstr "" +msgstr "Efterbehandler" #: ../ppdippstr.py:233 msgid "Option Tray" -msgstr "" +msgstr "Bakketilvalg" #: ../ppdippstr.py:234 msgid "External Tray" -msgstr "" +msgstr "Ekstern bakke" #: ../ppdippstr.py:235 msgid "Internal Tray" -msgstr "" +msgstr "Intern bakke" #: ../ppdippstr.py:236 msgid "Internal Tray 2" -msgstr "" +msgstr "Intern bakke 2" +# http://support.ricoh.com/bb_v1oi/pub_e/oi_view/0001036/0001036377/view/fax/unv/0182.htm +# Et modul der kan forskyde de udskrevne dokumenter, så de ikke ligger oven i hinanden #: ../ppdippstr.py:237 msgid "Internal Shift Tray" -msgstr "" +msgstr "Intern forskydningsbakke" #: ../ppdippstr.py:238 msgid "Not Installed" -msgstr "" +msgstr "Ikke installeret" #: ../ppdippstr.py:239 msgid "Installed" -msgstr "" +msgstr "Installeret" #: ../ppdippstr.py:240 msgid "PageSize" -msgstr "" +msgstr "Sidestørrelse" #: ../ppdippstr.py:241 msgid "InputSlot" -msgstr "" +msgstr "Inputstik" #: ../ppdippstr.py:242 msgid "Tray 2" -msgstr "" +msgstr "Bakke 2" #: ../ppdippstr.py:243 msgid "Tray 3" -msgstr "" +msgstr "Bakke 3" #: ../ppdippstr.py:244 msgid "Tray 4" -msgstr "" +msgstr "Bakke 4" +# Microsoft #: ../ppdippstr.py:245 msgid "Bypass Tray" -msgstr "" +msgstr "Bypassbakke" #: ../ppdippstr.py:246 msgid "Destination" -msgstr "" +msgstr "Destination" #: ../ppdippstr.py:247 ../printerproperties.py:282 msgid "Staple" @@ -1544,15 +1555,15 @@ #: ../ppdippstr.py:249 msgid "Toner Saving" -msgstr "" +msgstr "Tonerbesparelse" #: ../ppdippstr.py:250 msgid "Gradation" -msgstr "" +msgstr "Farveovergang" #: ../ppdippstr.py:251 msgid "Fast" -msgstr "" +msgstr "Hurtig" #. HPIJS options #: ../ppdippstr.py:254 @@ -1565,23 +1576,23 @@ #: ../ppdippstr.py:258 msgid "Draft (Color cartridge)" -msgstr "" +msgstr "Kladde (farvepatron)" #: ../ppdippstr.py:260 msgid "Draft grayscale (Black cartridge)" -msgstr "" +msgstr "Kladde i gråtoner (sort patron)" #: ../ppdippstr.py:262 msgid "Draft grayscale (auto-detect-paper type)" -msgstr "Kladde sort/hvid (autodetektér papirtype)" +msgstr "Kladde i gråtoner (autodetektér papirtype)" #: ../ppdippstr.py:264 msgid "Normal (Color cartridge)" -msgstr "" +msgstr "Normal (farvepatron)" #: ../ppdippstr.py:266 msgid "Normal grayscale (Black cartridge)" -msgstr "" +msgstr "Normal gråtoneskala (sort patron)" #: ../ppdippstr.py:268 msgid "Normal (auto-detect-paper type)" @@ -1589,7 +1600,7 @@ #: ../ppdippstr.py:270 msgid "Normal grayscale (auto-detect-paper type)" -msgstr "Normal sort/hvid (autodetektér papirtype)" +msgstr "Normal gråtoneskala (autodetektér papirtype)" #: ../ppdippstr.py:272 msgid "High quality (auto-detect-paper type)" @@ -1597,15 +1608,15 @@ #: ../ppdippstr.py:274 msgid "High quality grayscale (auto-detect-paper type)" -msgstr "Høj kvalitet sort/hvid (autodetektér papirtype)" +msgstr "Høj kvalitet, gråtoneskala (autodetektér papirtype)" #: ../ppdippstr.py:276 msgid "High quality (Color cartridge)" -msgstr "" +msgstr "Høj kvalitet (farvepatron)" #: ../ppdippstr.py:278 msgid "High quality grayscale (Black cartridge)" -msgstr "" +msgstr "Høj kvalitet, gråtoneskala (sort patron)" #: ../ppdippstr.py:279 msgid "Photo (on photo paper)" @@ -1613,7 +1624,7 @@ #: ../ppdippstr.py:280 msgid "Photo (Color cartridge, on photo paper)" -msgstr "" +msgstr "Foto (farvepatron, på fotopapir)" #: ../ppdippstr.py:282 msgid "Best quality (color on photo paper)" @@ -1660,7 +1671,6 @@ msgstr "Manuel arkindføring" #: ../ppdippstr.py:295 -#, fuzzy msgid "Multi-purpose tray " msgstr "Multifunktionsbakke" @@ -1674,7 +1684,7 @@ #: ../ppdippstr.py:299 msgid "Letter" -msgstr "" +msgstr "Letter" #: ../ppdippstr.py:300 msgid "Photo or 4x6 inch index card" @@ -1734,55 +1744,55 @@ #: ../ppdippstr.py:318 msgid "300 dpi, Color, Color Cartr." -msgstr "" +msgstr "300 dpi, farve, farvepatron" #: ../ppdippstr.py:320 msgid "300 dpi, color, black + color cartridge" -msgstr "300 dpi, farve, sort + farve blækpatron" +msgstr "300 dpi, farve, sort + farvepatron" #: ../ppdippstr.py:322 msgid "300 dpi, Draft, Color, Color Cartr." -msgstr "" +msgstr "300 dpi, kladde, farve, farvepatron" #: ../ppdippstr.py:324 msgid "300 dpi, draft, color, black + color cartridge" -msgstr "300 dpi, kladde, farve, sort + farve blækpatron" +msgstr "300 dpi, kladde, farve, sort + farvepatron" #: ../ppdippstr.py:326 msgid "300 dpi, Draft, Grayscale, Black Cartr." -msgstr "" +msgstr "300 dpi, kladde, gråtoneskala, sort patron" #: ../ppdippstr.py:328 msgid "300 dpi, Grayscale, Black Cartr." -msgstr "" +msgstr "300 dpi, gråtoneskala, sort patron" #: ../ppdippstr.py:330 msgid "300 dpi, draft, grayscale, black + color cartridge" -msgstr "300 dpi, kladde, sort/hvid, sort + farve blækpatron" +msgstr "300 dpi, kladde, gråtoneskala, sort + farvepatron" #: ../ppdippstr.py:332 msgid "300 dpi, grayscale, black + color cartridge" -msgstr "300 dpi, sort/hvid, sort + farve blækpatron" +msgstr "300 dpi, gråtoneskala, sort + farvepatron" #: ../ppdippstr.py:334 msgid "600 dpi, color, black + color cartridge" -msgstr "600 dpi, farve, sort + farve blækpatron" +msgstr "600 dpi, farve, sort + farvepatron" #: ../ppdippstr.py:336 msgid "600 dpi, grayscale, black + color cartridge" -msgstr "600 dpi, sort/hvid, sort + farve blækpatron" +msgstr "600 dpi, gråtoneskala, sort + farvepatron" #: ../ppdippstr.py:338 msgid "600 dpi, photo, black + color cartridge, photo paper" -msgstr "600 dpi, foto, sort + farve blækpatron, fotopapir" +msgstr "600 dpi, foto, sort + farvepatron, fotopapir" #: ../ppdippstr.py:340 msgid "600 dpi, color, black + color cartridge, photo paper, normal" -msgstr "600 dpi, farve, sort + farve blækpatron, fotopapir, normal" +msgstr "600 dpi, farve, sort + farvepatron, fotopapir, normal" #: ../ppdippstr.py:342 msgid "1200 dpi, photo, black + color cartridge, photo paper" -msgstr "1200 dpi, foto, sort + farve blækpatron, fotopapir" +msgstr "1200 dpi, foto, sort + farvepatron, fotopapir" #: ../ppdippstr.py:349 msgid "Internet Printing Protocol (ipp)" @@ -2173,15 +2183,15 @@ #: ../system-config-printer.py:294 msgid "Set As De_fault" -msgstr "Sæt som st_andard" +msgstr "S_æt som standard" #: ../system-config-printer.py:298 msgid "_Create class" -msgstr "_Opret klasse" +msgstr "O_pret klasse" #: ../system-config-printer.py:300 msgid "View Print _Queue" -msgstr "Vis udskrifts_kø" +msgstr "_Vis udskriftskø" #: ../system-config-printer.py:304 msgid "E_nabled" @@ -2189,7 +2199,7 @@ #: ../system-config-printer.py:306 msgid "_Shared" -msgstr "_Delt" +msgstr "De_lt" #: ../system-config-printer.py:311 msgid "Description" @@ -2904,17 +2914,18 @@ msgid "Driver details" msgstr "Driverdetaljer" +# Tilbage til forrige dialog #: ../ui/NewPrinterWindow.ui.h:103 msgid "_Back" -msgstr "_Tilbage" +msgstr "_Forrige" #: ../ui/NewPrinterWindow.ui.h:105 ../ui/PrinterPropertiesDialog.ui.h:3 msgid "_Apply" -msgstr "_Anvend" +msgstr "An_vend" #: ../ui/NewPrinterWindow.ui.h:106 msgid "_Forward" -msgstr "_Fremad" +msgstr "_Næste" #: ../ui/PrinterPropertiesDialog.ui.h:1 msgid "Printer Properties" @@ -3124,17 +3135,18 @@ msgid "Printer resolution:" msgstr "Printeropløsning:" +# Microsoft #: ../ui/PrinterPropertiesDialog.ui.h:64 msgid "Output bin:" -msgstr "Outputspand:" +msgstr "Outputbakke:" #: ../ui/PrinterPropertiesDialog.ui.h:65 msgid "100" -msgstr "" +msgstr "100" #: ../ui/PrinterPropertiesDialog.ui.h:66 msgid "50" -msgstr "" +msgstr "50" #: ../ui/PrinterPropertiesDialog.ui.h:67 msgid "Reset" @@ -3146,7 +3158,7 @@ #: ../ui/PrinterPropertiesDialog.ui.h:69 msgid "1" -msgstr "" +msgstr "1" #: ../ui/PrinterPropertiesDialog.ui.h:70 msgid "Common Options" @@ -3174,11 +3186,11 @@ #: ../ui/PrinterPropertiesDialog.ui.h:76 msgid "0" -msgstr "" +msgstr "0" #: ../ui/PrinterPropertiesDialog.ui.h:77 msgid "1000" -msgstr "" +msgstr "1000" #: ../ui/PrinterPropertiesDialog.ui.h:78 msgid "Image Options" @@ -3222,11 +3234,11 @@ #: ../ui/PrinterPropertiesDialog.ui.h:88 msgid "10.00" -msgstr "" +msgstr "10,00" #: ../ui/PrinterPropertiesDialog.ui.h:89 msgid "6.40" -msgstr "" +msgstr "6,40" #: ../ui/PrinterPropertiesDialog.ui.h:90 msgid "points" @@ -4013,5 +4025,5 @@ "For each queue, you can adjust the default page size and other driver " "options, as well as seeing ink/toner levels and status messages." msgstr "" -"Du kan justere standard-sidestørrelse og andre driver-indstillinger for hver " -"kø, såvel som at se blæk-/toner-niveauer og statusbeskeder." +"Du kan justere standardsidestørrelse og andre driverindstillinger for hver " +"kø, såvel som se blæk-/tonerniveauer og statusbeskeder." diff -Nru system-config-printer-1.5.11/po/de.po system-config-printer-1.5.12/po/de.po --- system-config-printer-1.5.11/po/de.po 2018-01-24 13:24:12.000000000 +0000 +++ system-config-printer-1.5.12/po/de.po 2019-09-16 11:55:16.000000000 +0000 @@ -21,13 +21,14 @@ # Tim Waugh , 2011 # Roman Spirgi , 2015. #zanata # Zdenek Dohnal , 2016. #zanata +# Ettore Atalan , 2018 msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/bugzilla\n" "POT-Creation-Date: 2018-01-23 10:27+0100\n" -"PO-Revision-Date: 2016-10-24 07:16-0400\n" -"Last-Translator: Zdenek Dohnal \n" +"PO-Revision-Date: 2018-04-23 22:10+0200\n" +"Last-Translator: Ettore Atalan \n" "Language-Team: German (http://www.transifex.com/projects/p/system-config-" "printer/language/de/)\n" "Language: de\n" @@ -1036,11 +1037,11 @@ #. HP #: ../ppdippstr.py:97 msgid "Print Quality" -msgstr "" +msgstr "Druckqualität" #: ../ppdippstr.py:98 msgid "Automatic" -msgstr "" +msgstr "Automatisch" #: ../ppdippstr.py:100 msgid "Printing Quality" @@ -1072,11 +1073,11 @@ #: ../ppdippstr.py:107 msgid "Best" -msgstr "" +msgstr "Beste" #: ../ppdippstr.py:108 msgid "High-Resolution Photo" -msgstr "" +msgstr "Hochauflösendes Foto" #: ../ppdippstr.py:109 msgid "Fast Draft" @@ -1084,15 +1085,15 @@ #: ../ppdippstr.py:111 msgid "Installed Cartridges" -msgstr "" +msgstr "Installierte Patronen" #: ../ppdippstr.py:112 ../ppdippstr.py:113 msgid "Fast Only" -msgstr "" +msgstr "Nur schnell" #: ../ppdippstr.py:114 msgid "Photo Only" -msgstr "" +msgstr "Nur Foto" #: ../ppdippstr.py:115 msgid "Black and TriColor" @@ -1104,11 +1105,11 @@ #: ../ppdippstr.py:118 msgid "Resolution" -msgstr "" +msgstr "Auflösung" #: ../ppdippstr.py:120 msgid "Color Mode" -msgstr "" +msgstr "Farbmodus" #: ../ppdippstr.py:121 msgid "Hight Quality Grayscale" @@ -1120,20 +1121,19 @@ #: ../ppdippstr.py:124 msgid "Quality" -msgstr "" +msgstr "Qualität" #: ../ppdippstr.py:125 -#, fuzzy msgid "High Resolution " -msgstr "Auflösung des Druckers:" +msgstr "Hohe Auflösung " #: ../ppdippstr.py:126 msgid "Paper source" -msgstr "" +msgstr "Papierzufuhr" #: ../ppdippstr.py:127 msgid "Auto Source" -msgstr "" +msgstr "Automatische Zufuhr" #: ../ppdippstr.py:128 msgid "Manual Feed" @@ -1169,7 +1169,7 @@ #: ../ppdippstr.py:137 msgid "Media Type" -msgstr "" +msgstr "Medientyp" #: ../ppdippstr.py:138 msgid "Bond" @@ -1177,19 +1177,19 @@ #: ../ppdippstr.py:139 msgid "Color" -msgstr "" +msgstr "Farbe" #: ../ppdippstr.py:140 msgid "Envelope" -msgstr "" +msgstr "Umschlag" #: ../ppdippstr.py:141 msgid "Labels" -msgstr "" +msgstr "Etiketten" #: ../ppdippstr.py:142 msgid "Standard Paper" -msgstr "" +msgstr "Standardpapier" #: ../ppdippstr.py:143 msgid "Heavy" @@ -1201,11 +1201,11 @@ #: ../ppdippstr.py:145 msgid "Recycled" -msgstr "" +msgstr "Wiederverwertet" #: ../ppdippstr.py:146 msgid "Transparency" -msgstr "" +msgstr "Transparenz" #: ../ppdippstr.py:147 msgid "Plain Paper" @@ -1217,7 +1217,7 @@ #: ../ppdippstr.py:149 msgid "Photo Paper)" -msgstr "" +msgstr "Fotopapier)" #: ../ppdippstr.py:150 msgid "Transparency Film" @@ -1229,7 +1229,7 @@ #: ../ppdippstr.py:152 msgid "Print Density" -msgstr "" +msgstr "Druckdichte" #: ../ppdippstr.py:153 msgid "Extra Light (1)" @@ -1237,15 +1237,15 @@ #: ../ppdippstr.py:154 msgid "Light (2)" -msgstr "" +msgstr "Hell (2)" #: ../ppdippstr.py:155 msgid "Medium (3)" -msgstr "" +msgstr "Mittel (3)" #: ../ppdippstr.py:156 msgid "Dark (4)" -msgstr "" +msgstr "Dunkel (4)" #: ../ppdippstr.py:157 msgid "Extra Dark (5)" @@ -1253,11 +1253,11 @@ #: ../ppdippstr.py:158 msgid "Copies" -msgstr "" +msgstr "Kopien" #: ../ppdippstr.py:160 msgid "Adjustment" -msgstr "" +msgstr "Anpassung" #: ../ppdippstr.py:161 msgid "Halftone Algorithm" @@ -1265,7 +1265,7 @@ #: ../ppdippstr.py:164 msgid "Miscellaneous" -msgstr "" +msgstr "Diverses" #: ../ppdippstr.py:165 msgid "N-up Orientation" @@ -1277,28 +1277,28 @@ #: ../ppdippstr.py:167 msgid "Landscape" -msgstr "" +msgstr "Landschaft" #: ../ppdippstr.py:168 msgid "Seascape" -msgstr "" +msgstr "Seelandschaft" #: ../ppdippstr.py:169 msgid "Media Size" -msgstr "" +msgstr "Mediengröße" #: ../ppdippstr.py:170 msgid "Output Mode" -msgstr "" +msgstr "Ausgabemodus" #: ../ppdippstr.py:171 msgid "Grayscale" -msgstr "" +msgstr "Graustufen" #. Brother #: ../ppdippstr.py:174 msgid "Two-Sided" -msgstr "" +msgstr "Zweiseitig" #: ../ppdippstr.py:175 ../system-config-printer.desktop.in.h:1 #: ../system-config-printer.appdata.xml.in.h:1 @@ -1307,60 +1307,60 @@ #: ../ppdippstr.py:176 msgid "Print Settings (Advanced)" -msgstr "" +msgstr "Druckeinstellungen (Erweitert)" #: ../ppdippstr.py:177 msgid "Color Settings" -msgstr "" +msgstr "Farbeinstellungen" #: ../ppdippstr.py:178 msgid "Color Settings (Advanced)" -msgstr "" +msgstr "Farbeinstellungen (Erweitert)" #: ../ppdippstr.py:179 msgid "Brightness" -msgstr "" +msgstr "Helligkeit" #: ../ppdippstr.py:180 msgid "Contrast" -msgstr "" +msgstr "Kontrast" #: ../ppdippstr.py:181 msgid "Red" -msgstr "" +msgstr "Rot" #: ../ppdippstr.py:182 msgid "Green" -msgstr "" +msgstr "Grün" #: ../ppdippstr.py:183 msgid "Blue" -msgstr "" +msgstr "Blau" #. Epson xp serie #: ../ppdippstr.py:186 msgid "_Media Size" -msgstr "" +msgstr "_Mediengröße" #: ../ppdippstr.py:187 msgid "_Grayscale" -msgstr "" +msgstr "_Graustufen" #: ../ppdippstr.py:188 msgid "_Brightness" -msgstr "" +msgstr "_Helligkeit" #: ../ppdippstr.py:189 msgid "_Contrast" -msgstr "" +msgstr "_Kontrast" #: ../ppdippstr.py:190 msgid "_Saturation" -msgstr "" +msgstr "_Sättigung" #: ../ppdippstr.py:191 msgid "On" -msgstr "" +msgstr "Ein" #. Options #: ../ppdippstr.py:193 ../printerproperties.py:957 @@ -1369,20 +1369,20 @@ #: ../ppdippstr.py:194 msgid "Duplexer Installed" -msgstr "" +msgstr "Duplexer installiert" #. Canon #: ../ppdippstr.py:197 msgid "Color Model" -msgstr "" +msgstr "Farbmodell" #: ../ppdippstr.py:198 msgid "Color Precision" -msgstr "" +msgstr "Farbgenauigkeit" #: ../ppdippstr.py:199 msgid "Resolution " -msgstr "" +msgstr "Auflösung " #: ../ppdippstr.py:200 msgid "Printer Features Common" @@ -1394,7 +1394,7 @@ #: ../ppdippstr.py:202 msgid "Ink Type" -msgstr "" +msgstr "Tintenart" #: ../ppdippstr.py:203 msgid "Toner Save " @@ -1402,15 +1402,15 @@ #: ../ppdippstr.py:204 msgid "ON" -msgstr "" +msgstr "EIN" #: ../ppdippstr.py:205 msgid "Toner Density" -msgstr "" +msgstr "Tonerdichte" #: ../ppdippstr.py:206 msgid "Media Type " -msgstr "" +msgstr "Medientyp " #: ../ppdippstr.py:207 msgid "Collate " @@ -1422,15 +1422,15 @@ #: ../ppdippstr.py:209 msgid "Halftones " -msgstr "" +msgstr "Halbtöne " #: ../ppdippstr.py:210 msgid "Duplex" -msgstr "" +msgstr "Duplex" #: ../ppdippstr.py:211 msgid "OFF" -msgstr "" +msgstr "AUS" #: ../ppdippstr.py:212 msgid "ON (Long-edged Binding)" @@ -1443,23 +1443,23 @@ #. Samsung #: ../ppdippstr.py:215 msgid "Paper Size" -msgstr "" +msgstr "Papiergröße" #: ../ppdippstr.py:216 msgid "Paper Type" -msgstr "" +msgstr "Papierart" #: ../ppdippstr.py:217 msgid "Thin" -msgstr "" +msgstr "Dünn" #: ../ppdippstr.py:218 msgid "Thick" -msgstr "" +msgstr "Dick" #: ../ppdippstr.py:219 msgid "Thicker" -msgstr "" +msgstr "Dicker" #: ../ppdippstr.py:220 msgid "Edge Enhance" @@ -1479,15 +1479,15 @@ #: ../ppdippstr.py:225 ../ppdippstr.py:228 msgid "Long Edge" -msgstr "" +msgstr "Lange Seite" #: ../ppdippstr.py:226 ../ppdippstr.py:229 msgid "Short Edge" -msgstr "" +msgstr "Kurze Seite" #: ../ppdippstr.py:227 msgid "Two-sided" -msgstr "" +msgstr "Zweiseitig" #. Ricoh #: ../ppdippstr.py:232 @@ -1516,11 +1516,11 @@ #: ../ppdippstr.py:238 msgid "Not Installed" -msgstr "" +msgstr "Nicht installiert" #: ../ppdippstr.py:239 msgid "Installed" -msgstr "" +msgstr "Installiert" #: ../ppdippstr.py:240 msgid "PageSize" @@ -1548,7 +1548,7 @@ #: ../ppdippstr.py:246 msgid "Destination" -msgstr "" +msgstr "Ziel" #: ../ppdippstr.py:247 ../printerproperties.py:282 msgid "Staple" @@ -1564,11 +1564,11 @@ #: ../ppdippstr.py:250 msgid "Gradation" -msgstr "" +msgstr "Abstufung" #: ../ppdippstr.py:251 msgid "Fast" -msgstr "" +msgstr "Schnell" #. HPIJS options #: ../ppdippstr.py:254 @@ -1581,7 +1581,7 @@ #: ../ppdippstr.py:258 msgid "Draft (Color cartridge)" -msgstr "" +msgstr "Entwurf (Farbpatrone)" #: ../ppdippstr.py:260 msgid "Draft grayscale (Black cartridge)" @@ -1593,7 +1593,7 @@ #: ../ppdippstr.py:264 msgid "Normal (Color cartridge)" -msgstr "" +msgstr "Normal (Farbpatrone)" #: ../ppdippstr.py:266 msgid "Normal grayscale (Black cartridge)" @@ -1617,7 +1617,7 @@ #: ../ppdippstr.py:276 msgid "High quality (Color cartridge)" -msgstr "" +msgstr "Hohe Qualität (Farbpatrone)" #: ../ppdippstr.py:278 msgid "High quality grayscale (Black cartridge)" @@ -1676,9 +1676,8 @@ msgstr "Manueller Einzug" #: ../ppdippstr.py:295 -#, fuzzy msgid "Multi-purpose tray " -msgstr "Multifunktionsschacht" +msgstr "Multifunktionsschacht " #: ../ppdippstr.py:297 msgid "Page size" @@ -1726,7 +1725,7 @@ #: ../ppdippstr.py:309 msgid "Double-sided printing" -msgstr "Duplexdruck" +msgstr "Doppelseitiger Druck" #: ../ppdippstr.py:310 msgid "Long edge (standard)" @@ -1750,7 +1749,7 @@ #: ../ppdippstr.py:318 msgid "300 dpi, Color, Color Cartr." -msgstr "" +msgstr "300 DPI, Farbe, Farbpatrone" #: ../ppdippstr.py:320 msgid "300 dpi, color, black + color cartridge" @@ -1758,7 +1757,7 @@ #: ../ppdippstr.py:322 msgid "300 dpi, Draft, Color, Color Cartr." -msgstr "" +msgstr "300 DPI, Entwirf, Farbe, Farbpatrone" #: ../ppdippstr.py:324 msgid "300 dpi, draft, color, black + color cartridge" @@ -2227,7 +2226,7 @@ #: ../system-config-printer.py:360 ../ui/PrinterPropertiesDialog.ui.h:93 #: ../ui/PrintersWindow.ui.h:9 ../ui/ServerSettingsDialog.ui.h:15 msgid "Add" -msgstr "HInzufügen" +msgstr "Hinzufügen" #: ../system-config-printer.py:377 ../ui/PrinterPropertiesDialog.ui.h:96 msgid "Refresh" diff -Nru system-config-printer-1.5.11/ppdippstr.py system-config-printer-1.5.12/ppdippstr.py --- system-config-printer-1.5.11/ppdippstr.py 2017-12-11 08:29:12.000000000 +0000 +++ system-config-printer-1.5.12/ppdippstr.py 2019-09-16 11:55:16.000000000 +0000 @@ -93,7 +93,7 @@ ppd = TranslationDict ({ "General": _("General"), - #HP + #HP and foo2zjs "Print Quality": _("Print Quality"), "Automatic": _("Automatic"), @@ -118,7 +118,7 @@ "Resolution": _("Resolution"), "Color Mode": _("Color Mode"), - "Hight Quality Grayscale": _("Hight Quality Grayscale"), + "High Quality Grayscale": _("High Quality Grayscale"), "Black Only Grayscale": _("Black Only Grayscale"), "Quality": _("Quality"), @@ -146,7 +146,7 @@ "Transparency": _("Transparency"), "Plain Paper": _("Plain Paper"), "Plain": _("Plain"), - "Photo Paper)": _("Photo Paper)"), + "Photo Paper": _("Photo Paper"), "Transparency Film": _("Transparency Film"), "CD or DVD Media": _("CD or DVD Media"), "Print Density": _("Print Density"), @@ -155,6 +155,7 @@ "Medium (3)": _("Medium (3)"), "Dark (4)": _("Dark (4)"), "Extra Dark (5)": _("Extra Dark (5)"), + "Duplex Printing": _("Duplex Printing"), "Copies": _("Copies"), "Adjustment": _("Adjustment"), @@ -170,10 +171,14 @@ "Output Mode": _("Output Mode"), "Grayscale": _("Grayscale"), - #Brother + #Brother + "Toner save mode": _("Toner save mode"), + "Tray1": _("Tray1"), + "Tray2": _("Tray2"), + "Tray3": _("Tray3"), "Two-Sided": _("Two-Sided"), "Print Settings": _("Print Settings"), - "Print Settings (Advanced)": _("Print Settings (Advanced)"), + "Print Settings (Advanced)": _("Print Settings (Advanced)"), "Color Settings": _("Color Settings"), "Color Settings (Advanced)": _("Color Settings (Advanced)"), "Brightness": _("Brightness"), @@ -189,6 +194,24 @@ "_Contrast": _("_Contrast"), "_Saturation": _("_Saturation"), "On": _("On"), + + #Gutenprint + "2-Sided Printing": _("2-Sided Printing"), + "Shrink Page If Necessary to Fit Borders": _("Shrink Page If Necessary to Fit Borders"), + "Shrink (print the whole page)": _("Shrink (print the whole page)"), + "Crop (preserve dimensions)": _("Crop (preserve dimensions)"), + "Expand (use maximum page area)": _("Expand (use maximum page area)"), + "Borderless": _("Borderless"), + "No": _("No"), + "Yes": _("Yes"), + "Output Control Common": _("Output Control Common"), + "Color Correction": _("Color Correction"), + "Brightness Fine Adjustment": _("Brightness Fine Adjustment"), + "Contrast Fine Adjustment": _("Contrast Fine Adjustment"), + "Saturation Fine Adjustment": _("Saturation Fine Adjustment"), + "Image Type": _("Image Type"), + #Foomatic + "Bidirectional printing": _("Bidirectional printing"), # Options "Installable Options": _("Installable Options"), "Duplexer Installed": _("Duplexer Installed"), @@ -201,22 +224,28 @@ "CD Hub Size": _("CD Hub Size"), "Ink Type": _("Ink Type"), "Toner Save ": _("Toner Save "), - "ON": _("ON"), - "Toner Density": _("Toner Density"), + "ON": _("ON"), + "Toner Density ": _("Toner Density "), "Media Type ": _("Media Type "), "Collate ": _("Collate "), "Image Refinement ": _("Image Refinement "), + "Image Refinement": _("Image Refinement"), "Halftones ": _("Halftones "), "Duplex": _("Duplex"), "OFF": _("OFF"), "ON (Long-edged Binding)": _("ON (Long-edged Binding)"), "ON (Short-edged Binding)": _("ON (Short-edged Binding)"), + "High Quality": _("High Quality"), + "High Quality Grayscale": _("High Quality Grayscale"), + "Controlled by 'Print Quality'": _("Controlled by 'Print Quality'"), + "Paper Destination": _("Paper Destination"), + #Samsung "Paper Size": _("Paper Size"), "Paper Type": _("Paper Type"), "Thin": _("Thin"), "Thick": _("Thick"), - "Thicker": _("Thicker") , + "Thicker": _("Thicker") , "Edge Enhance": _("Edge Enhance"), "Skip Blank Pages": _("Skip Blank Pages"), "Double-sided Printing": _("Double-sided Printing"), @@ -227,12 +256,13 @@ "Two-sided": _("Two-sided"), "Long Edge": _("Long Edge"), "Short Edge": _("Short Edge"), + "Toner Save": _("Toner Save"), #Ricoh "Finisher": _("Finisher"), "Option Tray": _("Option Tray"), "External Tray": _("External Tray"), - "Internal Tray": _("Internal Tray"), + "Internal Tray 1": _("Internal Tray 1"), "Internal Tray 2": _("Internal Tray 2"), "Internal Shift Tray": _("Internal Shift Tray"), "Not Installed": _("Not Installed"), @@ -241,10 +271,11 @@ "InputSlot": _("InputSlot"), "Tray 2": _("Tray 2"), "Tray 3": _("Tray 3"), - "Tray 4": _("Tray 4"), - "Bypass Tray": _("Bypass Tray"), + "Tray 4": _("Tray 4"), + "Bypass Tray": _("Bypass Tray"), + "Collate": _("Collate"), "Destination": _("Destination"), - "Staple": _("Staple"), + "Staple": _("Staple"), "Punch": _("Punch"), "Toner Saving": _("Toner Saving"), "Gradation": _("Gradation"), @@ -255,7 +286,7 @@ "Draft (auto-detect paper type)": _("Draft (auto-detect-paper type)"), "Draft (Color cartridge)": - _("Draft (Color cartridge)"), + _("Draft (Color cartridge)"), "Draft Grayscale (Black cartridge)": _("Draft grayscale (Black cartridge)"), "Draft Grayscale (auto-detect paper type)": @@ -278,13 +309,11 @@ _("High quality grayscale (Black cartridge)"), "Photo (on photo paper)": _("Photo (on photo paper)"), "Photo (Color cartridge, on photo paper)": _("Photo (Color cartridge, on photo paper)"), - "Best Quality (color on photo paper)": - _("Best quality (color on photo paper)"), - "Normal Quality (color on photo paper)": - _("Normal quality (color on photo paper)"), + "Best Quality (color on photo paper)": _("Best quality (color on photo paper)"), + "Normal Quality (color on photo paper)": _("Normal quality (color on photo paper)"), "Media Source": _("Media source"), - "Printer default": _("Printer default"), + "Printer Default": _("Printer Default"), "Photo Tray": _("Photo tray"), "Upper Tray": _("Upper tray"), "Lower Tray": _("Lower tray"), @@ -292,7 +321,8 @@ "Envelope Feeder": _("Envelope feeder"), "Large Capacity Tray": _("Large capacity tray"), "Manual Feeder": _("Manual feeder"), - "Multi Purpose Tray ": _("Multi-purpose tray "), + "Multi-purpose Tray ": _("Multi-purpose tray "), + "Multipurpose Tray": _("Multipurpose tray"), "Page Size": _("Page size"), "Custom": _("Custom"), @@ -306,59 +336,37 @@ "CD or DVD 80 mm": _("CD or DVD 80mm"), "CD or DVD 120 mm": _("CD or DVD 120mm"), - "Double-Sided Printing": _("Double-sided printing"), + "Double-Sided Printing": _("Double-sided Printing"), "Long Edge (Standard)": _("Long edge (standard)"), "Short Edge (Flip)": _("Short edge (flip)"), "Off": _("Off"), - "Resolution, Quality, Ink Type, Media Type": - _("Resolution, quality, ink type, media type"), + "Resolution, Quality, Ink Type, Media Type": _("Resolution, quality, ink type, media type"), "Controlled by 'Printout Mode'": _("Controlled by 'Printout mode'"), - "300 dpi, Color, Color Cartr.": - _("300 dpi, Color, Color Cartr."), - "300 dpi, Color, Black + Color Cartr.": - _("300 dpi, color, black + color cartridge"), - "300 dpi, Draft, Color, Color Cartr.": - _("300 dpi, Draft, Color, Color Cartr."), - "300 dpi, Draft, Color, Black + Color Cartr.": - _("300 dpi, draft, color, black + color cartridge"), - "300 dpi, Draft, Grayscale, Black Cartr.": - _("300 dpi, Draft, Grayscale, Black Cartr."), - "300 dpi, Grayscale, Black Cartr.": - _("300 dpi, Grayscale, Black Cartr."), - "300 dpi, Draft, Grayscale, Black + Color Cartr.": - _("300 dpi, draft, grayscale, black + color cartridge"), - "300 dpi, Grayscale, Black + Color Cartr.": - _("300 dpi, grayscale, black + color cartridge"), - "600 dpi, Color, Black + Color Cartr.": - _("600 dpi, color, black + color cartridge"), - "600 dpi, Grayscale, Black + Color Cartr.": - _("600 dpi, grayscale, black + color cartridge"), - "600 dpi, Photo, Black + Color Cartr., Photo Paper": - _("600 dpi, photo, black + color cartridge, photo paper"), - "600 dpi, Color, Black + Color Cartr., Photo Paper, Normal": - _("600 dpi, color, black + color cartridge, photo paper, normal"), - "1200 dpi, Photo, Black + Color Cartr., Photo Paper": - _("1200 dpi, photo, black + color cartridge, photo paper"), + "300 dpi, Color, Color Cartr.": _("300 dpi, Color, Color Cartr."), + "300 dpi, Color, Black + Color Cartr.": _("300 dpi, color, black + color cartridge"), + "300 dpi, Draft, Color, Color Cartr.": _("300 dpi, Draft, Color, Color Cartr."), + "300 dpi, Draft, Color, Black + Color Cartr.": _("300 dpi, draft, color, black + color cartridge"), + "300 dpi, Draft, Grayscale, Black Cartr.": _("300 dpi, Draft, Grayscale, Black Cartr."), + "300 dpi, Grayscale, Black Cartr.": _("300 dpi, Grayscale, Black Cartr."), + "300 dpi, Draft, Grayscale, Black + Color Cartr.": _("300 dpi, draft, grayscale, black + color cartridge"), + "300 dpi, Grayscale, Black + Color Cartr.": _("300 dpi, grayscale, black + color cartridge"), + "600 dpi, Color, Black + Color Cartr.": _("600 dpi, color, black + color cartridge"), + "600 dpi, Grayscale, Black + Color Cartr.": _("600 dpi, grayscale, black + color cartridge"), + "600 dpi, Photo, Black + Color Cartr., Photo Paper": _("600 dpi, photo, black + color cartridge, photo paper"), + "600 dpi, Color, Black + Color Cartr., Photo Paper, Normal": _("600 dpi, color, black + color cartridge, photo paper, normal"), + "1200 dpi, Photo, Black + Color Cartr., Photo Paper": _("1200 dpi, photo, black + color cartridge, photo paper"), }) ## Common backend descriptions global backends backends = TranslationDict ({ - "Internet Printing Protocol (ipp)": - _("Internet Printing Protocol (ipp)"), - "Internet Printing Protocol (http)": - _("Internet Printing Protocol (http)"), - "Internet Printing Protocol (https)": - _("Internet Printing Protocol (https)"), - "LPD/LPR Host or Printer": - _("LPD/LPR Host or Printer"), - "AppSocket/HP JetDirect": - _("AppSocket/HP JetDirect"), - "Serial Port #1": - _("Serial Port #1"), - "LPT #1": - _("LPT #1"), - "Windows Printer via SAMBA": - _("Windows Printer via SAMBA"), + "Internet Printing Protocol (ipp)": _("Internet Printing Protocol (ipp)"), + "Internet Printing Protocol (http)": _("Internet Printing Protocol (http)"), + "Internet Printing Protocol (https)": _("Internet Printing Protocol (https)"), + "LPD/LPR Host or Printer": _("LPD/LPR Host or Printer"), + "AppSocket/HP JetDirect": _("AppSocket/HP JetDirect"), + "Serial Port #1": _("Serial Port #1"), + "LPT #1": _("LPT #1"), + "Windows Printer via SAMBA": _("Windows Printer via SAMBA"), }) diff -Nru system-config-printer-1.5.11/printerproperties.py system-config-printer-1.5.12/printerproperties.py --- system-config-printer-1.5.11/printerproperties.py 2018-01-22 15:53:38.000000000 +0000 +++ system-config-printer-1.5.12/printerproperties.py 2019-09-16 11:55:16.000000000 +0000 @@ -1430,12 +1430,7 @@ except: nonfatalException() option_editable = False - show_error_dialog (_("Error"), - _("Option '%s' has value '%s' and " - "cannot be edited.") % - (option.name, - value), - self.parent) + debugprint ("Option '%s' has value '%s' and cannot be edited." % (option.name, value)) option.widget.set_sensitive (option_editable) if not editable: option.button.set_sensitive (False) diff -Nru system-config-printer-1.5.11/probe_printer.py system-config-printer-1.5.12/probe_printer.py --- system-config-printer-1.5.11/probe_printer.py 2016-05-05 11:02:33.000000000 +0000 +++ system-config-printer-1.5.12/probe_printer.py 2019-09-16 11:55:16.000000000 +0000 @@ -130,14 +130,14 @@ s = open_socket(self.hostname, 515) if not s: return None - print(name) + debugprint(name) try: s.send(('\2%s\n' % name).encode('UTF-8')) # cmd send job to queue data = s.recv(1024).decode('UTF-8') # receive status - print(repr(data)) + debugprint(repr(data)) except socket.error as msg: - print(msg) + debugprint(msg) try: s.close () except: diff -Nru system-config-printer-1.5.11/scp-dbus-service.py system-config-printer-1.5.12/scp-dbus-service.py --- system-config-printer-1.5.11/scp-dbus-service.py 2016-05-05 11:02:33.000000000 +0000 +++ system-config-printer-1.5.12/scp-dbus-service.py 2019-09-16 11:55:16.000000000 +0000 @@ -20,10 +20,13 @@ ## along with this program; if not, write to the Free Software ## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +import gi import dbus.service from gi.repository import GObject from gi.repository import GLib +gi.require_version('Gdk', '3.0') from gi.repository import Gdk +gi.require_version('Gtk', '3.0') from gi.repository import Gtk import sys @@ -52,10 +55,13 @@ g_ppds = None g_killtimer = None +#set program name +GLib.set_prgname("system-config-printer") + class FetchedPPDs(GObject.GObject): __gsignals__ = { - 'ready': (GObject.SIGNAL_RUN_LAST, None, ()), - 'error': (GObject.SIGNAL_RUN_LAST, None, + 'ready': (GObject.SignalFlags.RUN_LAST, None, ()), + 'error': (GObject.SignalFlags.RUN_LAST, None, (GObject.TYPE_PYOBJECT,)) } @@ -465,6 +471,8 @@ self._jobappletpath = None self._ppds = None self._language = locale.getlocale (locale.LC_MESSAGES)[0] + if not self._language: + self._language = locale.getlocale (locale.LC_CTYPE)[0] def destroy (self): self._cupsconn.destroy () @@ -505,7 +513,7 @@ def GetBestDrivers(self, device_id, device_make_and_model, device_uri, reply_handler, error_handler): GetBestDriversRequest (device_id, device_make_and_model, device_uri, - self._cupsconn, self._language[0], + self._cupsconn, self._language, reply_handler, error_handler) @dbus.service.method(dbus_interface=CONFIG_IFACE, diff -Nru system-config-printer-1.5.11/serversettings.py system-config-printer-1.5.12/serversettings.py --- system-config-printer-1.5.11/serversettings.py 2016-05-05 11:02:33.000000000 +0000 +++ system-config-printer-1.5.12/serversettings.py 2019-09-16 11:55:16.000000000 +0000 @@ -440,6 +440,9 @@ has_browsepoll = True break + # Return to the start of file + f.seek(0) + for line in f: line = line.decode('UTF-8') l = line.lower ().strip () diff -Nru system-config-printer-1.5.11/system-config-printer.appdata.xml.in system-config-printer-1.5.12/system-config-printer.appdata.xml.in --- system-config-printer-1.5.11/system-config-printer.appdata.xml.in 2017-12-11 08:49:33.000000000 +0000 +++ system-config-printer-1.5.12/system-config-printer.appdata.xml.in 2019-09-16 11:55:16.000000000 +0000 @@ -1,33 +1,40 @@ - - system-config-printer.desktop + + org.fedoraproject.systemconfigprinter CC0 GPL-2.0+ - <_name>Print Settings - <_summary>Configure printer queues + Print Settings + Configure printer queues - <_p>With system-config-printer you can add, edit and delete +

With system-config-printer you can add, edit and delete printer queues. It allows you to choose the connection method and - the printer driver. + the printer driver.

- <_p>For each queue, you can adjust the default page size and other +

For each queue, you can adjust the default page size and other driver options, as well as seeing ink/toner levels and status - messages. + messages.

 - https://raw.githubusercontent.com/zdohnal/system-config-printer/master/data/screenshot-mainwindow.png - https://raw.githubusercontent.com/zdohnal/system-config-printer/master/data/screenshot-properties.png + + Main window + https://raw.githubusercontent.com/OpenPrinting/system-config-printer/master/data/screenshot-mainwindow.png + + + Printer properties + https://raw.githubusercontent.com/OpenPrinting/system-config-printer/master/data/screenshot-properties.png + - https://github.com/zdohnal/system-config-printer/ - https://github.com/zdohnal/system-config-printer/issues + https://github.com/OpenPrinting/system-config-printer/ + https://github.com/OpenPrinting/system-config-printer/issues system-config-printer org.fedoraproject.Config.Printing + system-config-printer.desktop - zdohnal@redhat.com - + zdohnal@redhat.com + diff -Nru system-config-printer-1.5.11/test-driver system-config-printer-1.5.12/test-driver --- system-config-printer-1.5.11/test-driver 2018-01-23 09:09:53.000000000 +0000 +++ system-config-printer-1.5.12/test-driver 2019-10-01 09:52:19.000000000 +0000 @@ -1,9 +1,9 @@ #! /bin/sh # test-driver - basic testsuite driver script. -scriptversion=2013-07-13.22; # UTC +scriptversion=2018-03-07.03; # UTC -# Copyright (C) 2011-2014 Free Software Foundation, Inc. +# Copyright (C) 2011-2018 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ # 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 . +# along with this program. If not, see . # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -140,9 +140,9 @@ # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff -Nru system-config-printer-1.5.11/troubleshoot/base.py system-config-printer-1.5.12/troubleshoot/base.py --- system-config-printer-1.5.11/troubleshoot/base.py 2016-05-05 11:02:33.000000000 +0000 +++ system-config-printer-1.5.12/troubleshoot/base.py 2019-09-16 11:55:16.000000000 +0000 @@ -21,12 +21,14 @@ ## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. from gi.repository import Gtk -from gettext import gettext as _ N_ = lambda x: x from debug import * -__all__ = [ '_', - 'debugprint', 'get_debugging', 'set_debugging', +import config +import gettext +gettext.install(domain=config.PACKAGE, localedir=config.localedir) + +__all__ = [ 'debugprint', 'get_debugging', 'set_debugging', 'Question', 'Multichoice', 'TEXT_start_print_admin_tool' ] diff -Nru system-config-printer-1.5.11/troubleshoot/DeviceListed.py system-config-printer-1.5.12/troubleshoot/DeviceListed.py --- system-config-printer-1.5.11/troubleshoot/DeviceListed.py 2016-05-05 11:02:33.000000000 +0000 +++ system-config-printer-1.5.12/troubleshoot/DeviceListed.py 2019-09-16 11:55:16.000000000 +0000 @@ -86,6 +86,7 @@ self.authconn = answers['_authenticated_connection'] try: self.op = TimedOperation (self.authconn.getDevices, + kwargs={'signature': 'iiasas'}, parent=parent) devices = self.op.run () devices_list = [] diff -Nru system-config-printer-1.5.11/troubleshoot/ErrorLogCheckpoint.py system-config-printer-1.5.12/troubleshoot/ErrorLogCheckpoint.py --- system-config-printer-1.5.11/troubleshoot/ErrorLogCheckpoint.py 2016-05-05 11:02:33.000000000 +0000 +++ system-config-printer-1.5.12/troubleshoot/ErrorLogCheckpoint.py 2019-09-16 11:55:16.000000000 +0000 @@ -134,28 +134,28 @@ if 'error_log_checkpoint' in self.answers: return self.answers - with NamedTemporaryFile () as tmpf: - try: - self.op = TimedOperation (self.authconn.getFile, - args=('/admin/log/error_log', - tmpf.file), - parent=parent) - self.op.run () - except (RuntimeError, cups.IPPError) as e: - self.answers['error_log_checkpoint_exc'] = e - except cups.HTTPError as e: - self.answers['error_log_checkpoint_exc'] = e + tmpf = NamedTemporaryFile() + try: + self.op = TimedOperation (self.authconn.getFile, + args=["/admin/log/error_log"], + kwargs={'file': tmpf}, + parent=parent) + self.op.run () + except (RuntimeError, cups.IPPError) as e: + self.answers['error_log_checkpoint_exc'] = e + except cups.HTTPError as e: + self.answers['error_log_checkpoint_exc'] = e - # Abandon the CUPS connection and make another. - answers = self.troubleshooter.answers - factory = answers['_authenticated_connection_factory'] - self.authconn = factory.get_connection () - self.answers['_authenticated_connection'] = self.authconn + # Abandon the CUPS connection and make another. + answers = self.troubleshooter.answers + factory = answers['_authenticated_connection_factory'] + self.authconn = factory.get_connection () + self.answers['_authenticated_connection'] = self.authconn - try: - statbuf = os.stat (tmpf.file) - except OSError: - statbuf = [0, 0, 0, 0, 0, 0, 0] + try: + statbuf = os.stat (tmpf.name) + except OSError: + statbuf = [0, 0, 0, 0, 0, 0, 0] self.answers['error_log_checkpoint'] = statbuf[6] self.persistent_answers['error_log_checkpoint'] = statbuf[6] diff -Nru system-config-printer-1.5.11/troubleshoot/ErrorLogFetch.py system-config-printer-1.5.12/troubleshoot/ErrorLogFetch.py --- system-config-printer-1.5.11/troubleshoot/ErrorLogFetch.py 2016-05-05 11:02:33.000000000 +0000 +++ system-config-printer-1.5.12/troubleshoot/ErrorLogFetch.py 2019-09-16 11:55:16.000000000 +0000 @@ -69,11 +69,11 @@ with NamedTemporaryFile (delete=False) as tmpf: success = False try: - c.getFile ('/admin/log/error_log', tmpf.file) + c.getFile ('/admin/log/error_log', file = tmpf) success = True except cups.HTTPError: try: - os.remove (tmpf.file) + os.remove (tmpf.name) except OSError: pass diff -Nru system-config-printer-1.5.11/troubleshoot/__init__.py system-config-printer-1.5.12/troubleshoot/__init__.py --- system-config-printer-1.5.11/troubleshoot/__init__.py 2016-05-05 11:02:33.000000000 +0000 +++ system-config-printer-1.5.12/troubleshoot/__init__.py 2019-09-16 11:55:16.000000000 +0000 @@ -23,6 +23,8 @@ from gi.repository import Gtk import pprint import sys +import datetime +import time import traceback if __name__ == "__main__": @@ -102,7 +104,9 @@ self.questions = [] self.question_answers = [] - self.answers = {} + # timestamp should be accessible through whole troubleshoot + now = datetime.datetime.fromtimestamp (time.time ()) + self.answers = {'error_log_timestamp': now.strftime ("%F %T")} self.moving_backwards = False main.show_all () diff -Nru system-config-printer-1.5.11/udev/udev-configure-printer.c system-config-printer-1.5.12/udev/udev-configure-printer.c --- system-config-printer-1.5.11/udev/udev-configure-printer.c 2016-05-05 11:02:33.000000000 +0000 +++ system-config-printer-1.5.12/udev/udev-configure-printer.c 2019-09-16 11:55:16.000000000 +0000 @@ -824,6 +824,7 @@ */ syslog (LOG_DEBUG, "Device already handled"); free (usb_device_devpath); + free (devicefilepath); return NULL; } @@ -845,6 +846,7 @@ parse_device_id (device_id, id); udev_device_unref (dev); + free (devicefilepath); return usb_device_devpath; } @@ -1510,6 +1512,8 @@ firstqueue = 0; skip: + free(device_uri_n); + free(this_device_uri_n); if (!attr) break; } @@ -1626,6 +1630,8 @@ if (!id.mfg || !id.mdl) { clear_device_id (&id); + free (map); + free (usb_device_devpath); return 1; } @@ -1649,6 +1655,7 @@ { syslog (LOG_ERR, "no corresponding CUPS device found"); clear_device_id (&id); + free (map); return 0; } @@ -1702,6 +1709,7 @@ clear_device_id (&id); free_device_uris (&device_uris); + free (map); return 0; } diff -Nru system-config-printer-1.5.11/ui/AboutDialog.ui system-config-printer-1.5.12/ui/AboutDialog.ui --- system-config-printer-1.5.11/ui/AboutDialog.ui 2018-01-03 13:04:23.000000000 +0000 +++ system-config-printer-1.5.12/ui/AboutDialog.ui 2019-09-16 11:55:16.000000000 +0000 @@ -8,7 +8,7 @@ normal Copyright © 2006-2012 Red Hat, Inc. A CUPS configuration tool. - https://github.com/zdohnal/system-config-printer/ + https://github.com/OpenPrinting/system-config-printer/ This program 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 2 of the License, or (at your option) any later version. This program 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.