Skip to content
Commits on Source (27)
2022-08-30 Zdenek Dohnal <zdohnal@redhat.com>
config.{sub,guess}: Updated to the latest version (fixes #282)
s-c-p.py: Move requiring Handy version into try: scope (fixes #283)
libhandy is optional, so we don't have to end with traceback.
2022-08-29 Jan Macku <jamacku@redhat.com>
ci(lint): add shell linter - Differential ShellCheck
It performs differential ShellCheck scans and report results directly in
pull request.
documentation: https://github.com/redhat-plumbers-in-action/differential-shellcheck
ci: Add Dependabot to keep GitHub actions up to date
Dependabot will help you to keep you notified about new releases and help you update your workflows.
Interval is set to `monthly` so it won't make too much noise.
2022-08-27 Joachim Philipp <joachim.philipp@gmail.com>
Translated using Weblate (German)
Currently translated at 99.8% (920 of 921 strings)
Co-authored-by: Joachim Philipp <joachim.philipp@gmail.com>
Translate-URL: https://translate.fedoraproject.org/projects/system-config-printer/master/de/
Translation: system-config-printer/master
2022-08-25 Zdenek Dohnal <zdohnal@redhat.com>
Update NEWS
configure.ac: Add configure option for CUPS SERVERBIN (fixes #234)
Update NEWS
appdata: Use system-config-printer.desktop as id (fixes #273)
Although it is against appstream policy, but `appstream-util validate`
passes and the app can be uninstalled via GNOME Software - let's start
using system-config-printer.desktop as id until a better solution is
found.
appdata: add launchable tag to see the icon (fixes #269)
2022-08-24 Till Kamppeter <till.kamppeter@gmail.com>
1.5.17
2022-08-23 Yang Yulin <yylteam@icloud.com>
Translated using Weblate (Chinese (Simplified) (zh_CN))
Currently translated at 97.8% (901 of 921 strings)
Co-authored-by: Yang Yulin <yylteam@icloud.com>
Translate-URL: https://translate.fedoraproject.org/projects/system-config-printer/master/zh_CN/
Translation: system-config-printer/master
2022-08-05 Avi Markovitz <avi.markovitz@gmail.com>
Translated using Weblate (Hebrew)
Currently translated at 100.0% (921 of 921 strings)
Translated using Weblate (Hebrew)
Currently translated at 100.0% (921 of 921 strings)
Co-authored-by: Avi Markovitz <avi.markovitz@gmail.com>
Translate-URL: https://translate.fedoraproject.org/projects/system-config-printer/master/he/
Translation: system-config-printer/master
2022-08-04 Avi Markovitz <avi.markovitz@gmail.com>
Translated using Weblate (Hebrew)
Currently translated at 100.0% (921 of 921 strings)
Co-authored-by: Avi Markovitz <avi.markovitz@gmail.com>
Translate-URL: https://translate.fedoraproject.org/projects/system-config-printer/master/he/
Translation: system-config-printer/master
2022-07-31 Temuri Doghonadze <temuri.doghonadze@gmail.com>
Translated using Weblate (Georgian)
Currently translated at 96.6% (890 of 921 strings)
Co-authored-by: Temuri Doghonadze <temuri.doghonadze@gmail.com>
Translate-URL: https://translate.fedoraproject.org/projects/system-config-printer/master/ka/
Translation: system-config-printer/master
2022-07-21 김인수 <simmon@nplob.com>
Translated using Weblate (Korean)
Currently translated at 100.0% (921 of 921 strings)
Co-authored-by: 김인수 <simmon@nplob.com>
Translate-URL: https://translate.fedoraproject.org/projects/system-config-printer/master/ko/
Translation: system-config-printer/master
2022-06-25 Sergey A <sw@atrus.ru>
Translated using Weblate (Russian)
Currently translated at 100.0% (921 of 921 strings)
Co-authored-by: Sergey A <sw@atrus.ru>
Translate-URL: https://translate.fedoraproject.org/projects/system-config-printer/master/ru/
Translation: system-config-printer/master
2022-06-13 H A <contact+fedora@hen.ee>
Translated using Weblate (Estonian)
Currently translated at 79.1% (729 of 921 strings)
Co-authored-by: H A <contact+fedora@hen.ee>
Translate-URL: https://translate.fedoraproject.org/projects/system-config-printer/master/et/
Translation: system-config-printer/master
2022-05-23 Zdenek Dohnal <zdohnal@redhat.com>
Update NEWS
Update NEWS
2022-05-20 김인수 <simmon@nplob.com>
Translated using Weblate (Korean)
Currently translated at 100.0% (921 of 921 strings)
Co-authored-by: 김인수 <simmon@nplob.com>
Translate-URL: https://translate.fedoraproject.org/projects/system-config-printer/master/ko/
Translation: system-config-printer/master
2022-05-16 Sergey A <sw@atrus.ru>
Translated using Weblate (Russian)
Currently translated at 100.0% (921 of 921 strings)
Co-authored-by: Sergey A <sw@atrus.ru>
Translate-URL: https://translate.fedoraproject.org/projects/system-config-printer/master/ru/
Translation: system-config-printer/master
2022-04-11 Matthijs van der Burgh <MatthijsBurgh@outlook.com>
Migrate from deprecated splittype to urlparse
See https://github.com/python/cpython/blob/3.10/Lib/urllib/parse.py#L1026
2022-03-22 Temuri Doghonadze <temuri.doghonadze@gmail.com>
Translated using Weblate (Georgian)
Currently translated at 93.0% (857 of 921 strings)
Co-authored-by: Temuri Doghonadze <temuri.doghonadze@gmail.com>
Translate-URL: https://translate.fedoraproject.org/projects/system-config-printer/master/ka/
Translation: system-config-printer/master
2022-03-20 Temuri Doghonadze <temuri.doghonadze@gmail.com>
Translated using Weblate (Georgian)
Currently translated at 87.4% (805 of 921 strings)
Co-authored-by: Temuri Doghonadze <temuri.doghonadze@gmail.com>
Translate-URL: https://translate.fedoraproject.org/projects/system-config-printer/master/ka/
Translation: system-config-printer/master
2022-03-10 Temuri Doghonadze <temuri.doghonadze@gmail.com>
Translated using Weblate (Georgian)
Currently translated at 86.7% (799 of 921 strings)
Co-authored-by: Temuri Doghonadze <temuri.doghonadze@gmail.com>
Translate-URL: https://translate.fedoraproject.org/projects/system-config-printer/master/ka/
Translation: system-config-printer/master
2022-02-20 Till Kamppeter <till.kamppeter@gmail.com>
1.5.16
Updated NEWS for 1.5.16.
2022-02-17 Jeremy Bicha <jeremy.bicha@canonical.com>
Support GNOME 42 dark style preference
Adds an optional dependency on libhandy >= 1.5
2022-02-13 Takuro Onoue <kusanaginoturugi@gmail.com>
Translated using Weblate (Japanese)
......@@ -129,6 +306,14 @@
Translate-URL: https://translate.fedoraproject.org/projects/system-config-printer/master/ko/
Translation: system-config-printer/master
2021-10-26 Valentin Villenave <vvillenave@hypra.fr>
Accessibility: use proper names for Printers icon view items
2021-10-23 Valentin Villenave <vvillenave@hypra.fr>
Accessibility: properly assigned labels
2021-10-14 Iñigo Martínez <inigomartinez@gmail.com>
build: Migrate from Intltool to Gettext
......
......@@ -71,6 +71,7 @@ install-exec-local: .stamp-distutils-in-builddir
uninstall-local:
rm -f $(DESTDIR)/$(pythondir)/cupshelpers*.egg-info
rm -rf $(DESTDIR)/$(pythondir)/cupshelpers/__pycache__
rm -rf $(DESTDIR)/$(pythondir)/cupshelpers*.egg
for file in $(EXPORT_MODULES) $(EXPORT_MODULES_GEN); do \
rm -f $(DESTDIR)/$(pythondir)/$$file*; \
done
......@@ -399,5 +400,7 @@ DISTCLEANFILES=*.pyc *.pyo *~ *.bak \
distclean-local:
rm -rf html
rm -rf cupshelpers/__pycache__
rm -rf cupshelpers.egg-info/
rm -rf dist/cupshelpers*.egg
.PHONY: update-po missing-languages run help FORCE
......@@ -1963,6 +1963,7 @@ install-exec-local: .stamp-distutils-in-builddir
uninstall-local:
rm -f $(DESTDIR)/$(pythondir)/cupshelpers*.egg-info
rm -rf $(DESTDIR)/$(pythondir)/cupshelpers/__pycache__
rm -rf $(DESTDIR)/$(pythondir)/cupshelpers*.egg
for file in $(EXPORT_MODULES) $(EXPORT_MODULES_GEN); do \
rm -f $(DESTDIR)/$(pythondir)/$$file*; \
done
......@@ -2092,6 +2093,8 @@ py.test.sh: FORCE
distclean-local:
rm -rf html
rm -rf cupshelpers/__pycache__
rm -rf cupshelpers.egg-info/
rm -rf dist/cupshelpers*.egg
.PHONY: update-po missing-languages run help FORCE
......
1.5.18 changes
--------------
- Add <launchable/> into the .appdata.xml file (#269)
- Accessiblity improvements (#244)
- system-config-printer couldn't be uninstalled vi GNOME Software (#273)
- system-config-printer crashes due missing libhandy (#283)
- Updated config.sub and config.guess to fix configuration error on RiSC (#282)
- Use pkg-config or --with-cups-serverbin-dir for finding SERVERBIN (#234)
1.5.17 changes
--------------
- Migrate from deprecated splittype to urlparse (#268)
- Support GNOME 42 dark style preference (#263)
1.5.16 changes
--------------
- fix preserve_job_files default settings
......
This diff is collapsed.
This diff is collapsed.
......@@ -22,7 +22,7 @@ prefix="/usr/local"
datadir="/usr/local/share"
localedir="/usr/local/share/locale"
pkgdatadir="/usr/local/share/system-config-printer"
VERSION="1.5.16"
VERSION="1.5.18"
PACKAGE="system-config-printer"
DOWNLOADABLE_ONLYPPD=True
DOWNLOADABLE_ONLYFREE=True
......
This diff is collapsed.
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.71 for system-config-printer 1.5.16.
# Generated by GNU Autoconf 2.71 for system-config-printer 1.5.18.
#
#
# Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation,
......@@ -608,8 +608,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='system-config-printer'
PACKAGE_TARNAME='system-config-printer'
PACKAGE_VERSION='1.5.16'
PACKAGE_STRING='system-config-printer 1.5.16'
PACKAGE_VERSION='1.5.18'
PACKAGE_STRING='system-config-printer 1.5.18'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
......@@ -634,10 +634,10 @@ UDEV_RULES_FALSE
UDEV_RULES_TRUE
GLIB_LIBS
GLIB_CFLAGS
cupsserverbindir
PKG_CONFIG_LIBDIR
PKG_CONFIG_PATH
PKG_CONFIG
cupsserverbindir
DESKTOPPREFIX
DESKTOPVENDOR
DATADIRNAME
......@@ -781,6 +781,7 @@ with_python_sys_prefix
with_python_prefix
with_python_exec_prefix
with_desktop_vendor
with_cups_serverbin_dir
with_udev_rules
with_udevdir
with_systemdsystemunitdir
......@@ -1353,7 +1354,7 @@ if test "$ac_init_help" = "long"; then
# 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.16 to adapt to many kinds of systems.
\`configure' configures system-config-printer 1.5.18 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
......@@ -1425,7 +1426,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of system-config-printer 1.5.16:";;
short | recursive ) echo "Configuration of system-config-printer 1.5.18:";;
esac
cat <<\_ACEOF
......@@ -1457,6 +1458,9 @@ Optional Packages:
override the default PYTHON_EXEC_PREFIX
--with-desktop-vendor Specify the vendor for use in calls to
desktop-file-install [default=]
--with-cups-serverbin-dir
set CUPS SERVERBIN dir, default=value from
pkg-config
--with-udev-rules Enable automatic USB print queue configuration
[default=no]
--with-udevdir=DIR Directory for udev helper programs
......@@ -1556,7 +1560,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
system-config-printer configure 1.5.16
system-config-printer configure 1.5.18
generated by GNU Autoconf 2.71
Copyright (C) 2021 Free Software Foundation, Inc.
......@@ -1760,7 +1764,7 @@ cat >config.log <<_ACEOF
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.16, which was
It was created by system-config-printer $as_me 1.5.18, which was
generated by GNU Autoconf 2.71. Invocation command line was
$ $0$ac_configure_args_raw
......@@ -3022,7 +3026,7 @@ fi
# Define the identity of the package.
PACKAGE='system-config-printer'
VERSION='1.5.16'
VERSION='1.5.18'
printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
......@@ -4958,7 +4962,7 @@ else $as_nop
*-*-aix*)
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#if defined __powerpc64__ || defined _ARCH_PPC64
#if defined __powerpc64__ || defined __LP64__
int ok;
#else
error fail
......@@ -5248,7 +5252,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
# be generating 64-bit code.
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#if defined __powerpc64__ || defined _ARCH_PPC64
#if defined __powerpc64__ || defined __LP64__
int ok;
#else
error fail
......@@ -5630,7 +5634,7 @@ then :
else $as_nop
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#ifdef __ELF__
#if defined __ELF__ || (defined __linux__ && defined __EDG__)
Extensible Linking Format
#endif
......@@ -5648,7 +5652,7 @@ rm -rf conftest*
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_elf" >&5
printf "%s\n" "$gl_cv_elf" >&6; }
if test $gl_cv_elf; then
if test $gl_cv_elf = yes; then
# Extract the ELF class of a file (5th byte) in decimal.
# Cf. https://en.wikipedia.org/wiki/Executable_and_Linkable_Format#File_header
if od -A x < /dev/null >/dev/null 2>/dev/null; then
......@@ -5665,19 +5669,22 @@ printf "%s\n" "$gl_cv_elf" >&6; }
echo
}
fi
# Use 'expr', not 'test', to compare the values of func_elfclass, because on
# Solaris 11 OpenIndiana and Solaris 11 OmniOS, the result is 001 or 002,
# not 1 or 2.
case $HOST_CPU_C_ABI_32BIT in
yes)
# 32-bit ABI.
acl_is_expected_elfclass ()
{
test "`func_elfclass | sed -e 's/[ ]//g'`" = 1
expr "`func_elfclass | sed -e 's/[ ]//g'`" = 1 > /dev/null
}
;;
no)
# 64-bit ABI.
acl_is_expected_elfclass ()
{
test "`func_elfclass | sed -e 's/[ ]//g'`" = 2
expr "`func_elfclass | sed -e 's/[ ]//g'`" = 2 > /dev/null
}
;;
*)
......@@ -6207,7 +6214,14 @@ fi
fi
;;
-l*)
names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
dep=`echo "X$dep" | sed -e 's/^X-l//'`
if test "X$dep" != Xc \
|| case $host_os in
linux* | gnu* | k*bsd*-gnu) false ;;
*) true ;;
esac; then
names_next_round="$names_next_round $dep"
fi
;;
*.la)
names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
......@@ -6279,7 +6293,6 @@ fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for CFPreferencesCopyAppValue" >&5
......@@ -6569,8 +6582,9 @@ int
main (void)
{
int result = 0;
/* Test against AIX 5.1 bug: Failures are not distinguishable from successful
returns. */
/* Test against AIX 5.1...7.2 bug: Failures are not distinguishable from
successful returns. This is even documented in
<https://www.ibm.com/support/knowledgecenter/ssw_aix_72/i_bostechref/iconv.html> */
{
iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8");
if (cd_utf8_to_88591 != (iconv_t)(-1))
......@@ -7152,7 +7166,14 @@ fi
fi
;;
-l*)
names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
dep=`echo "X$dep" | sed -e 's/^X-l//'`
if test "X$dep" != Xc \
|| case $host_os in
linux* | gnu* | k*bsd*-gnu) false ;;
*) true ;;
esac; then
names_next_round="$names_next_round $dep"
fi
;;
*.la)
names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
......@@ -7300,7 +7321,8 @@ printf "%s\n" "$ac_res" >&6; }
if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \
|| { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \
&& test "$PACKAGE" != gettext-runtime \
&& test "$PACKAGE" != gettext-tools; }; then
&& test "$PACKAGE" != gettext-tools \
&& test "$PACKAGE" != libintl; }; then
gt_use_preinstalled_gnugettext=yes
else
LIBINTL=
......@@ -7394,7 +7416,9 @@ printf "%s\n" "#define HAVE_DCGETTEXT 1" >>confdefs.h
INTLLIBS="$LIBINTL"
INTLLIBS="$LIBINTL"
......@@ -7444,7 +7468,7 @@ then :
printf %s "(cached) " >&6
else $as_nop
for am_cv_pathless_PYTHON in python python2 python3 python3.11 python3.10 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
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
......@@ -7798,7 +7822,7 @@ printf "%s\n" "$am_cv_python_pyexecdir" >&6; }
fi
PACKAGE="system-config-printer"
VERSION="1.5.16"
VERSION="1.5.18"
GETTEXT_PACKAGE="system-config-printer"
CATOBJEXT=".gmo"
DATADIRNAME=share
......@@ -7830,9 +7854,6 @@ fi
cupsserverbindir="`cups-config --serverbin`"
......@@ -7964,9 +7985,57 @@ printf "%s\n" "no" >&6; }
fi
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for CUPS SERVERBIN dir" >&5
printf %s "checking for CUPS SERVERBIN dir... " >&6; }
# Check whether --with-cups_serverbin_dir was given.
if test ${with_cups_serverbin_dir+y}
then :
withval=$with_cups_serverbin_dir;
cupsserverbindir="$withval"
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $withval" >&5
printf "%s\n" "$withval" >&6; }
else $as_nop
if test "x$PKG_CONFIG" != x
then :
if $PKG_CONFIG --exists cups
then :
cupsserverbindir=$($PKG_CONFIG --variable=cups_serverbin cups)
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $cupsserverbindir" >&5
printf "%s\n" "$cupsserverbindir" >&6; }
else $as_nop
as_fn_error $? "No CUPS pkgconfig file present and no CUPS SERVERBIN dir defined in configure options." "$LINENO" 5
fi
else $as_nop
as_fn_error $? "No pkg-config present and no CUPS SERVERBIN dir defined in configure options." "$LINENO" 5
fi
fi
if test "x$cupsserverbindir" = x
then :
as_fn_error $? "No CUPS SERVERBIN dir defined in CUPS pkgconfig file or configure options." "$LINENO" 5
fi
pkg_failed=no
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for glib-2.0" >&5
printf %s "checking for glib-2.0... " >&6; }
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GLIB" >&5
printf %s "checking for GLIB... " >&6; }
if test -n "$GLIB_CFLAGS"; then
pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS"
......@@ -8006,7 +8075,7 @@ fi
if test $pkg_failed = yes; then
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s\n" "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
......@@ -8024,7 +8093,7 @@ fi
has_glib=no
elif test $pkg_failed = untried; then
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s\n" "no" >&6; }
has_glib=no
else
......@@ -8072,8 +8141,8 @@ fi
if test "x$with_udev_rules" != xno -a "x$with_udevdir" != xno; then
pkg_failed=no
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libudev >= 172" >&5
printf %s "checking for libudev >= 172... " >&6; }
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libudev" >&5
printf %s "checking for libudev... " >&6; }
if test -n "$libudev_CFLAGS"; then
pkg_cv_libudev_CFLAGS="$libudev_CFLAGS"
......@@ -8113,7 +8182,7 @@ fi
if test $pkg_failed = yes; then
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s\n" "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
......@@ -8131,7 +8200,7 @@ fi
has_libudev=no
elif test $pkg_failed = untried; then
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s\n" "no" >&6; }
has_libudev=no
else
......@@ -8143,8 +8212,8 @@ printf "%s\n" "yes" >&6; }
fi
pkg_failed=no
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libusb-1.0" >&5
printf %s "checking for libusb-1.0... " >&6; }
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libusb" >&5
printf %s "checking for libusb... " >&6; }
if test -n "$libusb_CFLAGS"; then
pkg_cv_libusb_CFLAGS="$libusb_CFLAGS"
......@@ -8184,7 +8253,7 @@ fi
if test $pkg_failed = yes; then
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s\n" "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
......@@ -8202,7 +8271,7 @@ fi
has_libusb=no
elif test $pkg_failed = untried; then
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s\n" "no" >&6; }
has_libusb=no
else
......@@ -8223,136 +8292,6 @@ fi
fi
if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
printf %s "checking for $ac_word... " >&6; }
if test ${ac_cv_path_PKG_CONFIG+y}
then :
printf %s "(cached) " >&6
else $as_nop
case $PKG_CONFIG in
[\\/]* | ?:[\\/]*)
ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
case $as_dir in #(((
'') as_dir=./ ;;
*/) ;;
*) as_dir=$as_dir/ ;;
esac
for ac_exec_ext in '' $ac_executable_extensions; do
if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
ac_cv_path_PKG_CONFIG="$as_dir$ac_word$ac_exec_ext"
printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
IFS=$as_save_IFS
;;
esac
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
if test -n "$PKG_CONFIG"; then
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
printf "%s\n" "$PKG_CONFIG" >&6; }
else
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s\n" "no" >&6; }
fi
fi
if test -z "$ac_cv_path_PKG_CONFIG"; then
ac_pt_PKG_CONFIG=$PKG_CONFIG
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
printf %s "checking for $ac_word... " >&6; }
if test ${ac_cv_path_ac_pt_PKG_CONFIG+y}
then :
printf %s "(cached) " >&6
else $as_nop
case $ac_pt_PKG_CONFIG in
[\\/]* | ?:[\\/]*)
ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
case $as_dir in #(((
'') as_dir=./ ;;
*/) ;;
*) as_dir=$as_dir/ ;;
esac
for ac_exec_ext in '' $ac_executable_extensions; do
if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
ac_cv_path_ac_pt_PKG_CONFIG="$as_dir$ac_word$ac_exec_ext"
printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
IFS=$as_save_IFS
;;
esac
fi
ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
if test -n "$ac_pt_PKG_CONFIG"; then
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
printf "%s\n" "$ac_pt_PKG_CONFIG" >&6; }
else
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s\n" "no" >&6; }
fi
if test "x$ac_pt_PKG_CONFIG" = x; then
PKG_CONFIG=""
else
case $cross_compiling:$ac_tool_warned in
yes:)
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
PKG_CONFIG=$ac_pt_PKG_CONFIG
fi
else
PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
fi
fi
if test -n "$PKG_CONFIG"; then
_pkg_min_version=0.9.0
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
printf %s "checking pkg-config is at least version $_pkg_min_version... " >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
printf "%s\n" "yes" >&6; }
else
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s\n" "no" >&6; }
PKG_CONFIG=""
fi
fi
# Check whether --with-systemdsystemunitdir was given.
if test ${with_systemdsystemunitdir+y}
then :
......@@ -8963,7 +8902,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# 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.16, which was
This file was extended by system-config-printer $as_me 1.5.18, which was
generated by GNU Autoconf 2.71. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
......@@ -9022,7 +8961,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config='$ac_cs_config_escaped'
ac_cs_version="\\
system-config-printer config.status 1.5.16
system-config-printer config.status 1.5.18
configured by $0, generated by GNU Autoconf 2.71,
with options \\"\$ac_cs_config\\"
......@@ -9667,7 +9606,9 @@ printf "%s\n" "$as_me: executing $ac_file commands" >&6;}
# presentlang can be used as a fallback for messages
# which are not translated in the desiredlang catalog).
case "$desiredlang" in
"$presentlang"*) useit=yes;;
"$presentlang" | "$presentlang"_* | "$presentlang".* | "$presentlang"@*)
useit=yes
;;
esac
done
if test $useit = yes; then
......
AC_INIT(system-config-printer, 1.5.16)
AC_INIT(system-config-printer, 1.5.18)
AC_CONFIG_SRCDIR(system-config-printer.py)
AM_INIT_AUTOMAKE([dist-xz dist-bzip2 subdir-objects 1.6])
AM_GNU_GETTEXT_VERSION(0.20)
......@@ -33,7 +33,31 @@ fi
AC_SUBST(DESKTOPVENDOR)
AC_SUBST(DESKTOPPREFIX)
cupsserverbindir="`cups-config --serverbin`"
PKG_PROG_PKG_CONFIG
dnl Allow manual definition for CUPS SERVERBIN, if not defined, use value from pkg-config...
AC_MSG_CHECKING([for CUPS SERVERBIN dir])
AC_ARG_WITH([cups_serverbin_dir],
AS_HELP_STRING([--with-cups-serverbin-dir], [set CUPS SERVERBIN dir, default=value from pkg-config]), [
cupsserverbindir="$withval"
AC_MSG_RESULT([$withval])
], [
AS_IF([test "x$PKG_CONFIG" != x], [
AS_IF([$PKG_CONFIG --exists cups], [
cupsserverbindir=$($PKG_CONFIG --variable=cups_serverbin cups)
AC_MSG_RESULT([$cupsserverbindir])
], [
AC_MSG_ERROR([No CUPS pkgconfig file present and no CUPS SERVERBIN dir defined in configure options.])
])
], [
AC_MSG_ERROR([No pkg-config present and no CUPS SERVERBIN dir defined in configure options.])
])
])
AS_IF([test "x$cupsserverbindir" = x], [
AC_MSG_ERROR([No CUPS SERVERBIN dir defined in CUPS pkgconfig file or configure options.])
])
AC_SUBST(cupsserverbindir)
PKG_CHECK_MODULES(GLIB, glib-2.0, has_glib=yes, has_glib=no)
......@@ -66,7 +90,6 @@ if test "x$with_udev_rules" != xno -a "x$with_udevdir" != xno; then
AM_PROG_CC_C_O
fi
PKG_PROG_PKG_CONFIG
AC_ARG_WITH([systemdsystemunitdir],
AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]),
[], [with_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)])
......
system-config-printer (1.5.18-1ubuntu1) lunar; urgency=medium
* Sync with Debian. Remaining changes:
- Add Rename-app-to-Printers.patch
- Add Hide-Printers-app-in-GNOME-and-KDE.patch
- Add Allow-installing-non-free-drivers-from-OpenPrinting.patch
-- Jeremy Bicha <jbicha@ubuntu.com> Tue, 13 Dec 2022 08:11:26 -0500
system-config-printer (1.5.18-1) unstable; urgency=medium
[ Jeremy Bicha ]
* New upstream release
* Drop dark style patch: applied in new release
* debian/control.in: Bump Standards-Version to 4.6.1
* debian/control.in: Set Rules-Requires-Root: no
* Add debian/upstream/metadata
* Remove obsolete maintscript
[ Till Kamppeter ]
* Drop no-longer-needed dependency on python3-requests (LP: #1959440)
* debian/rules: Set --with-cups-serverbin-dir
[ Gunnar Hjalmarsson ]
* debian/rules: Refresh the .pot file when building on Ubuntu (LP: #1971473)
[ Helmut Grohne ]
* Drop obsolete Build-Depends: libxml-parser-perl for intltool
(Closes: #1022989)
-- Jeremy Bicha <jbicha@ubuntu.com> Mon, 12 Dec 2022 16:04:11 -0500
system-config-printer (1.5.18-0ubuntu2) kinetic; urgency=medium
* Needs "./configure ... --with-cups-serverbin-dir=/usr/lib/cups" in Kinetic
-- Till Kamppeter <till.kamppeter@gmail.com> Fri, 09 Sep 2022 13:32:22 +0200
system-config-printer (1.5.18-0ubuntu1) kinetic; urgency=medium
* New upstream release bug fix release.
-- Till Kamppeter <till.kamppeter@gmail.com> Fri, 09 Sep 2022 12:25:22 +0200
system-config-printer (1.5.17-0ubuntu1) kinetic; urgency=medium
* New upstream release.
-- Till Kamppeter <till.kamppeter@gmail.com> Wed, 24 Aug 2022 23:08:15 +0200
system-config-printer (1.5.16-1) unstable; urgency=medium
* New upstream release
* debian/control.in: Build-Depend on autoconf-archive
* debian/control.in: Drop obsolete Build-Depends for intltool
* debian/control.in: Drop obsolete dependency on python3-requests
(LP: #1959440)
-- Jeremy Bicha <jeremy.bicha@canonical.com> Mon, 21 Feb 2022 13:08:22 -0500
system-config-printer (1.5.16-0ubuntu4) kinetic; urgency=medium
* debian/rules: Refresh the .pot file when building (LP: #1971473)
......
......@@ -7,21 +7,20 @@ Section: gnome
Priority: optional
Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
Uploaders: Guido Günther <agx@sigxcpu.org>, Jeremy Bicha <jbicha@debian.org>, Laurent Bigonville <bigon@debian.org>
Uploaders: Guido Günther <agx@sigxcpu.org>, Dmitry Shachnev <mitya57@debian.org>, Jeremy Bicha <jbicha@ubuntu.com>, Laurent Bigonville <bigon@debian.org>
Build-Depends: debhelper-compat (= 13),
autoconf-archive,
dh-sequence-gnome,
dh-sequence-python3,
desktop-file-utils (>= 0.13),
autoconf-archive,
gettext,
libcups2-dev,
libglib2.0-dev,
libudev-dev (>= 172) [linux-any],
libusb-1.0-0-dev,
libxml-parser-perl,
python3-distutils,
xmlto
Standards-Version: 4.5.1
Standards-Version: 4.6.1
Rules-Requires-Root: no
XS-Debian-Vcs-Browser: https://salsa.debian.org/gnome-team/system-config-printer
XS-Debian-Vcs-Git: https://salsa.debian.org/gnome-team/system-config-printer.git
Vcs-Browser: https://salsa.debian.org/gnome-team/system-config-printer/tree/ubuntu/master
......
......@@ -5,19 +5,18 @@ Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
Uploaders: Guido Günther <agx@sigxcpu.org>, @GNOME_TEAM@
Build-Depends: debhelper-compat (= 13),
autoconf-archive,
dh-sequence-gnome,
dh-sequence-python3,
desktop-file-utils (>= 0.13),
autoconf-archive,
gettext,
libcups2-dev,
libglib2.0-dev,
libudev-dev (>= 172) [linux-any],
libusb-1.0-0-dev,
libxml-parser-perl,
python3-distutils,
xmlto
Standards-Version: 4.5.1
Standards-Version: 4.6.1
Rules-Requires-Root: no
XS-Debian-Vcs-Browser: https://salsa.debian.org/gnome-team/system-config-printer
XS-Debian-Vcs-Git: https://salsa.debian.org/gnome-team/system-config-printer.git
Vcs-Browser: https://salsa.debian.org/gnome-team/system-config-printer/tree/ubuntu/master
......
......@@ -7,9 +7,11 @@ Forwarded: not-needed
newprinter.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/newprinter.py b/newprinter.py
index eee8b55..6c4605c 100644
--- a/newprinter.py
+++ b/newprinter.py
@@ -1395,7 +1395,7 @@
@@ -1395,7 +1395,7 @@ class NewPrinterGUI(GtkGUI):
try:
pk = installpackage.PackageKit ()
# The following call means a blocking, synchronous, D-Bus call
......
......@@ -9,7 +9,7 @@ Don't autostart the applet in Unity either
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/print-applet.desktop.in b/print-applet.desktop.in
index 0e38ee1..b5f0ba5 100644
index 1bc003f..cdc070e 100644
--- a/print-applet.desktop.in
+++ b/print-applet.desktop.in
@@ -5,6 +5,6 @@ Exec=system-config-printer-applet
......
......@@ -8,9 +8,11 @@ Settings > Printers > Additional Printer Settings
system-config-printer.desktop.in | 1 +
1 file changed, 1 insertion(+)
diff --git a/system-config-printer.desktop.in b/system-config-printer.desktop.in
index 4f33582..1be241d 100644
--- a/system-config-printer.desktop.in
+++ b/system-config-printer.desktop.in
@@ -8,6 +8,7 @@
@@ -8,6 +8,7 @@ Terminal=false
Type=Application
Icon=printer
StartupNotify=true
......
......@@ -3,12 +3,13 @@ Date: Thu, 17 Feb 2022 11:01:53 -0500
Subject: Rename app to Printers
for better consistency with Unity
---
system-config-printer.desktop.in | 6 +++---
system-config-printer.py | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/system-config-printer.desktop.in b/system-config-printer.desktop.in
index 1be241d..1e91f39 100644
--- a/system-config-printer.desktop.in
+++ b/system-config-printer.desktop.in
@@ -1,7 +1,7 @@
......@@ -22,9 +23,11 @@ for better consistency with Unity
Comment=Configure printers
Exec=system-config-printer
Terminal=false
diff --git a/system-config-printer.py b/system-config-printer.py
index c9689de..c18e251 100755
--- a/system-config-printer.py
+++ b/system-config-printer.py
@@ -763,7 +763,7 @@
@@ -769,7 +769,7 @@ class GUI(GtkGUI):
connected = bool(self.cups)
host = CUPS_server_hostname ()
......
......@@ -8,7 +8,7 @@ Subject: Show Printer Settings in Unity Control Center
2 files changed, 6 insertions(+)
diff --git a/print-applet.desktop.in b/print-applet.desktop.in
index b5f0ba5..4fb726c 100644
index cdc070e..9449632 100644
--- a/print-applet.desktop.in
+++ b/print-applet.desktop.in
@@ -8,3 +8,4 @@ Icon=printer
......@@ -17,7 +17,7 @@ index b5f0ba5..4fb726c 100644
X-GNOME-Autostart-Delay=30
+X-Ubuntu-Gettext-Domain=system-config-printer
diff --git a/system-config-printer.desktop.in b/system-config-printer.desktop.in
index 1d16f2e..e80ff42 100644
index 664a333..4f33582 100644
--- a/system-config-printer.desktop.in
+++ b/system-config-printer.desktop.in
@@ -8,3 +8,8 @@ Terminal=false
......
From: Jeremy Bicha <jeremy.bicha@canonical.com>
Date: Thu, 17 Feb 2022 09:20:10 -0500
Subject: Support GNOME 42 dark style preference
Adds an optional dependency on libhandy >= 1.5
https://github.com/OpenPrinting/system-config-printer/pull/263
---
system-config-printer.py | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/system-config-printer.py b/system-config-printer.py
index f3e2663..698d177 100755
--- a/system-config-printer.py
+++ b/system-config-printer.py
@@ -47,6 +47,16 @@ except RuntimeError as e:
print ("This is a graphical application and requires DISPLAY to be set.")
sys.exit (1)
+# Optional dependency, requires libhandy >= 1.5
+gi.require_version('Handy', '1')
+try:
+ from gi.repository import Handy
+ Handy.init()
+ # Support GNOME 42 dark mode
+ Handy.StyleManager.get_default().set_color_scheme(Handy.ColorScheme.PREFER_LIGHT)
+except:
+ pass
+
def show_help():
print ("\nThis is system-config-printer, " \
"a CUPS server configuration program.\n\n"
......@@ -3,7 +3,6 @@
Allow-installing-packages-from-OpenPrinting.patch
Do-not-autostart-the-applet-on-LXDE-or-Unity.patch
Show-Printer-Settings-in-Unity-Control-Center.patch
Support-GNOME-42-dark-style-preference.patch
Allow-installing-non-free-drivers-from-OpenPrinting.patch
Hide-Printers-app-in-GNOME-and-KDE.patch
Rename-app-to-Printers.patch