From: Michael R Sweet Date: Wed, 10 Mar 2021 22:01:22 +0000 (-0500) Subject: Do some cleanup of the pkg-config support. X-Git-Tag: v2.4b1~191 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2e9bd60d1c63a09882785f9402a14ec62dee4158;p=thirdparty%2Fcups.git Do some cleanup of the pkg-config support. --- diff --git a/config-scripts/cups-common.m4 b/config-scripts/cups-common.m4 index 136b4908e0..6fa769118d 100644 --- a/config-scripts/cups-common.m4 +++ b/config-scripts/cups-common.m4 @@ -14,18 +14,18 @@ AC_CONFIG_HEADERS([config.h]) dnl Version number information... CUPS_VERSION="AC_PACKAGE_VERSION" -CUPS_REVISION="" +CUPS_API_VERSION="$(echo AC_PACKAGE_VERSION | awk -F. '{print $1 "." $2}')" CUPS_BUILD="cups-$CUPS_VERSION" AC_ARG_WITH([cups_build], AS_HELP_STRING([--with-cups-build], [set "pkg-config --variable=build" string]), [ CUPS_BUILD="$withval" ]) -AC_SUBST([CUPS_VERSION]) -AC_SUBST([CUPS_REVISION]) +AC_SUBST([CUPS_API_VERSION]) AC_SUBST([CUPS_BUILD]) -AC_DEFINE_UNQUOTED([CUPS_SVERSION], ["AC_PACKAGE_NAME v$CUPS_VERSION$CUPS_REVISION"], [Version number]) -AC_DEFINE_UNQUOTED([CUPS_MINIMAL], ["AC_PACKAGE_NAME/$CUPS_VERSION$CUPS_REVISION"], [Version for HTTP headers]) +AC_SUBST([CUPS_VERSION]) +AC_DEFINE_UNQUOTED([CUPS_SVERSION], ["AC_PACKAGE_NAME v$CUPS_VERSION"], [Version number]) +AC_DEFINE_UNQUOTED([CUPS_MINIMAL], ["AC_PACKAGE_NAME/$CUPS_VERSION"], [Version for HTTP headers]) dnl Default compiler flags... CFLAGS="${CFLAGS:=}" @@ -82,9 +82,13 @@ AC_SUBST([INSTALLSTATIC]) dnl Check for pkg-config, which is used for some other tests later on... AC_PATH_TOOL([PKGCONFIG], [pkg-config]) -PKGCONFIG_REQUIRES="" +PKGCONFIG_CFLAGS="" PKGCONFIG_LIBS="" +PKGCONFIG_LIBS_STATIC="" +PKGCONFIG_REQUIRES="" +AC_SUBST([PKGCONFIG_CFLAGS]) AC_SUBST([PKGCONFIG_LIBS]) +AC_SUBST([PKGCONFIG_LIBS_STATIC]) AC_SUBST([PKGCONFIG_REQUIRES]) dnl Check for libraries... @@ -282,7 +286,7 @@ AC_CHECK_HEADER([zlib.h], [ AC_SUBST([INSTALL_GZIP]) AC_SUBST([LIBZ]) -PKGCONFIG_LIBS="$PKGCONFIG_LIBS $LIBZ" +PKGCONFIG_LIBS_STATIC="$PKGCONFIG_LIBS_STATIC $LIBZ" dnl Flags for "ar" command... AS_CASE([host_os_name], [darwin* | *bsd*], [ @@ -360,6 +364,7 @@ AS_CASE([$host_os_name], [darwin*], [ BACKLIBS="$BACKLIBS -framework IOKit" SERVERLIBS="$SERVERLIBS -framework IOKit -weak_framework ApplicationServices" LIBS="-framework CoreFoundation -framework Security $LIBS" + PKGCONFIG_LIBS_STATIC="$PKGCONFIG_LIBS_STATIC -framework CoreFoundation -framework Security" dnl Check for framework headers... AC_CHECK_HEADER([ApplicationServices/ApplicationServices.h], [ diff --git a/config-scripts/cups-directories.m4 b/config-scripts/cups-directories.m4 index 8957c73126..2033d47fae 100644 --- a/config-scripts/cups-directories.m4 +++ b/config-scripts/cups-directories.m4 @@ -62,6 +62,9 @@ dnl Fix "includedir" variable if it hasn't been specified... AS_IF([test "$includedir" = "\${prefix}/include" -a "$prefix" = "/"], [ includedir="/usr/include" ]) +AS_IF([test "$includedir" != "/usr/include"], [ + PKGCONFIG_CFLAGS="$PKGCONFIG_CFLAGS -I$includedir" +]) dnl Fix "localstatedir" variable if it hasn't been specified... AS_IF([test "$localstatedir" = "\${prefix}/var"], [ @@ -94,9 +97,18 @@ AS_IF([test "$libdir" = "\${exec_prefix}/lib"], [ AS_CASE(["$host_os_name"], [linux*], [ AS_IF([test -d /usr/lib64 -a ! -d /usr/lib64/fakeroot], [ libdir="$exec_prefix/lib64" + ], [ + libdir="$exec_prefix/lib" ]) + ], [*], [ + libdir="$exec_prefix/lib" ]) ]) +AS_IF([test "$libdir" = "/usr/lib"], [ + PKGCONFIG_LIBS="-lcups" +], [ + PKGCONFIG_LIBS="-L$libdir -lcups" +]) dnl Setup default locations... # Cache data... diff --git a/config-scripts/cups-dnssd.m4 b/config-scripts/cups-dnssd.m4 index b874764e6c..861fc8493a 100644 --- a/config-scripts/cups-dnssd.m4 +++ b/config-scripts/cups-dnssd.m4 @@ -60,7 +60,7 @@ AS_IF([test $with_dnssd = yes -o $with_dnssd = mdnsresponder], [ DNSSD_BACKEND="dnssd" IPPFIND_BIN="ippfind" IPPFIND_MAN="ippfind.1" - PKGCONFIG_LIBS="$PKGCONFIG_LIBS $DNSSDLIBS" + PKGCONFIG_LIBS_STATIC="$PKGCONFIG_LIBS_STATIC $DNSSDLIBS" ], [ AC_MSG_RESULT([no]) AS_IF([test $with_dnssd = mdnsresponder], [ @@ -72,7 +72,6 @@ AS_IF([test $with_dnssd = yes -o $with_dnssd = mdnsresponder], [ ]) ]) -PKGCONFIG_LIBS="$PKGCONFIG_LIBS $LIBS" dnl Then try Avahi... AS_IF([test $with_dnssd = avahi -o $with_dnssd = yes], [ AS_IF([test "x$PKGCONFIG" = x], [ diff --git a/config-scripts/cups-gssapi.m4 b/config-scripts/cups-gssapi.m4 index 12af60520d..888cd95265 100644 --- a/config-scripts/cups-gssapi.m4 +++ b/config-scripts/cups-gssapi.m4 @@ -70,7 +70,7 @@ AS_IF([test x$enable_gssapi = xyes], [ SAVELIBS="$LIBS" LIBS="$LIBS $LIBGSSAPI" - PKGCONFIG_LIBS="$PKGCONFIG_LIBS $LIBS" + PKGCONFIG_LIBS_STATIC="$PKGCONFIG_LIBS_STATIC $LIBGSSAPI" AC_CHECK_FUNC([__ApplePrivate_gss_acquire_cred_ex_f], [ AC_DEFINE([HAVE_GSS_ACQUIRE_CRED_EX_F], [1], [Have __ApplePrivate_gss_acquire_cred_ex_f function?]) @@ -114,7 +114,6 @@ AS_IF([test x$enable_gssapi = xyes], [ LIBS="$SAVELIBS" ]) -PKGCONFIG_LIBS="$PKGCONFIG_LIBS $LIBGSSAPI" dnl Default GSS service name... AC_ARG_WITH([gssservicename], AS_HELP_STRING([--with-gssservicename], [set default gss service name]), [ diff --git a/config-scripts/cups-tls.m4 b/config-scripts/cups-tls.m4 index b881a6fe14..0d218a569f 100644 --- a/config-scripts/cups-tls.m4 +++ b/config-scripts/cups-tls.m4 @@ -59,7 +59,7 @@ AS_IF([test $with_tls = yes -o $with_tls = gnutls], [ with_tls="gnutls" TLSLIBS="$($PKGCONFIG --libs gnutls)" TLSFLAGS="$($PKGCONFIG --cflags gnutls)" - PKGCONFIG_REQUIRES="$PKGCONFIG_REQUIRES gnutls" + PKGCONFIG_REQUIRES="$PKGCONFIG_REQUIRES gnutls" AC_DEFINE([HAVE_TLS], [1], [Do we support TLS?]) AC_DEFINE([HAVE_GNUTLS], [1], [Do we have the GNU TLS library?]) ], [ @@ -71,7 +71,7 @@ AS_IF([test $with_tls = yes -o $with_tls = gnutls], [ with_tls="gnutls" TLSLIBS="$($LIBGNUTLSCONFIG --libs)" TLSFLAGS="$($LIBGNUTLSCONFIG --cflags)" - PKGCONFIG_LIBS="$PKGCONFIG_LIBS $TLSLIBS" + PKGCONFIG_LIBS_STATIC="$PKGCONFIG_LIBS_STATIC $TLSLIBS" AC_DEFINE([HAVE_TLS], [1], [Do we support TLS?]) AC_DEFINE([HAVE_GNUTLS], [1], [Do we have the GNU TLS library?]) ]) diff --git a/configure b/configure index 20dd130197..6eead76e5c 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.70 for CUPS 2.4rc1. +# Generated by GNU Autoconf 2.70 for CUPS 2.4.0. # # Report bugs to . # @@ -609,8 +609,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='CUPS' PACKAGE_TARNAME='cups' -PACKAGE_VERSION='2.4rc1' -PACKAGE_STRING='CUPS 2.4rc1' +PACKAGE_VERSION='2.4.0' +PACKAGE_STRING='CUPS 2.4.0' PACKAGE_BUGREPORT='https://github.com/openprinting/cups/issues' PACKAGE_URL='https://openprinting.github.io/cups' @@ -775,7 +775,9 @@ LIBUSB LIBPAPER LIBMALLOC PKGCONFIG_REQUIRES +PKGCONFIG_LIBS_STATIC PKGCONFIG_LIBS +PKGCONFIG_CFLAGS PKGCONFIG INSTALLSTATIC CUPS_HTMLVIEW @@ -804,9 +806,9 @@ LDFLAGS CFLAGS CC AWK -CUPS_BUILD -CUPS_REVISION CUPS_VERSION +CUPS_BUILD +CUPS_API_VERSION CODE_SIGN LOCALTARGET host_os @@ -903,6 +905,7 @@ with_dnssd_libs with_dnssd_includes enable_snapped_cupsd enable_snapped_clients +with_our_snap_name with_snapctl with_cups_control_slot with_ondemand @@ -1501,7 +1504,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 CUPS 2.4rc1 to adapt to many kinds of systems. +\`configure' configures CUPS 2.4.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1567,7 +1570,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of CUPS 2.4rc1:";; + short | recursive ) echo "Configuration of CUPS 2.4.0:";; esac cat <<\_ACEOF @@ -1638,12 +1641,14 @@ Optional Packages: mdnsresponder, no, yes) --with-dnssd-libs set directory for DNS Service Discovery library --with-dnssd-includes set directory for DNS Service Discovery header files + --with-our-snap-name Set name of the Snap we are snapped in, only needed + with --enable-snapped-cupsd, default=cups --with-snapctl Set path for snapctl, only needed with --enable-snapped-cupsd, default=/usr/bin/snapctl --with-cups-control-slot Name for cups-control slot as defined in snapcraft.yaml, only needed with - --enable-snapped-cupsd, default=admin + --enable-snapped-cupsd, default=cups-control --with-ondemand=... Specify the on-demand launch interface (launchd, systemd, upstart) --with-systemd set directory for systemd service files @@ -1757,7 +1762,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -CUPS configure 2.4rc1 +CUPS configure 2.4.0 generated by GNU Autoconf 2.70 Copyright (C) 2020 Free Software Foundation, Inc. @@ -2112,7 +2117,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 CUPS $as_me 2.4rc1, which was +It was created by CUPS $as_me 2.4.0, which was generated by GNU Autoconf 2.70. Invocation command line was $ $0$ac_configure_args_raw @@ -3243,8 +3248,8 @@ done ac_config_headers="$ac_config_headers config.h" -CUPS_VERSION="2.4rc1" -CUPS_REVISION="" +CUPS_VERSION="2.4.0" +CUPS_API_VERSION="$(echo 2.4.0 | awk -F. '{print $1 "." $2}')" CUPS_BUILD="cups-$CUPS_VERSION" @@ -3261,10 +3266,10 @@ fi -printf "%s\n" "#define CUPS_SVERSION \"CUPS v$CUPS_VERSION$CUPS_REVISION\"" >>confdefs.h +printf "%s\n" "#define CUPS_SVERSION \"CUPS v$CUPS_VERSION\"" >>confdefs.h -printf "%s\n" "#define CUPS_MINIMAL \"CUPS/$CUPS_VERSION$CUPS_REVISION\"" >>confdefs.h +printf "%s\n" "#define CUPS_MINIMAL \"CUPS/$CUPS_VERSION\"" >>confdefs.h CFLAGS="${CFLAGS:=}" @@ -5589,8 +5594,12 @@ else PKGCONFIG="$ac_cv_path_PKGCONFIG" fi -PKGCONFIG_REQUIRES="" +PKGCONFIG_CFLAGS="" PKGCONFIG_LIBS="" +PKGCONFIG_LIBS_STATIC="" +PKGCONFIG_REQUIRES="" + + @@ -6702,7 +6711,7 @@ fi -PKGCONFIG_LIBS="$PKGCONFIG_LIBS $LIBZ" +PKGCONFIG_LIBS_STATIC="$PKGCONFIG_LIBS_STATIC $LIBZ" case host_os_name in #( darwin* | *bsd*) : @@ -6893,6 +6902,7 @@ case $host_os_name in #( BACKLIBS="$BACKLIBS -framework IOKit" SERVERLIBS="$SERVERLIBS -framework IOKit -weak_framework ApplicationServices" LIBS="-framework CoreFoundation -framework Security $LIBS" + PKGCONFIG_LIBS_STATIC="$PKGCONFIG_LIBS_STATIC -framework CoreFoundation -framework Security" ac_fn_c_check_header_compile "$LINENO" "ApplicationServices/ApplicationServices.h" "ac_cv_header_ApplicationServices_ApplicationServices_h" "$ac_includes_default" if test "x$ac_cv_header_ApplicationServices_ApplicationServices_h" = xyes @@ -7241,6 +7251,12 @@ then : includedir="/usr/include" +fi +if test "$includedir" != "/usr/include" +then : + + PKGCONFIG_CFLAGS="$PKGCONFIG_CFLAGS -I$includedir" + fi if test "$localstatedir" = "\${prefix}/var" @@ -7304,12 +7320,30 @@ then : libdir="$exec_prefix/lib64" +else $as_nop + + libdir="$exec_prefix/lib" + fi ;; #( *) : + + libdir="$exec_prefix/lib" + ;; #( + *) : ;; esac +fi +if test "$libdir" = "/usr/lib" +then : + + PKGCONFIG_LIBS="-lcups" + +else $as_nop + + PKGCONFIG_LIBS="-L$libdir -lcups" + fi # Cache data... @@ -9365,7 +9399,8 @@ fi SAVELIBS="$LIBS" LIBS="$LIBS $LIBGSSAPI" - PKGCONFIG_LIBS="$PKGCONFIG_LIBS $LIBS" + PKGCONFIG_LIBS_STATIC="$PKGCONFIG_LIBS_STATIC $LIBGSSAPI" + ac_fn_c_check_func "$LINENO" "__ApplePrivate_gss_acquire_cred_ex_f" "ac_cv_func___ApplePrivate_gss_acquire_cred_ex_f" if test "x$ac_cv_func___ApplePrivate_gss_acquire_cred_ex_f" = xyes then : @@ -9488,7 +9523,6 @@ fi LIBS="$SAVELIBS" fi -PKGCONFIG_LIBS="$PKGCONFIG_LIBS $LIBGSSAPI" # Check whether --with-gssservicename was given. @@ -9829,7 +9863,7 @@ printf "%s\n" "yes" >&6; } with_tls="gnutls" TLSLIBS="$($PKGCONFIG --libs gnutls)" TLSFLAGS="$($PKGCONFIG --cflags gnutls)" - PKGCONFIG_REQUIRES="$PKGCONFIG_REQUIRES gnutls" + PKGCONFIG_REQUIRES="$PKGCONFIG_REQUIRES gnutls" printf "%s\n" "#define HAVE_TLS 1" >>confdefs.h @@ -9852,7 +9886,7 @@ then : with_tls="gnutls" TLSLIBS="$($LIBGNUTLSCONFIG --libs)" TLSFLAGS="$($LIBGNUTLSCONFIG --cflags)" - PKGCONFIG_LIBS="$PKGCONFIG_LIBS $TLSLIBS" + PKGCONFIG_LIBS_STATIC="$PKGCONFIG_LIBS_STATIC $TLSLIBS" printf "%s\n" "#define HAVE_TLS 1" >>confdefs.h @@ -10663,7 +10697,7 @@ printf "%s\n" "#define HAVE_MDNSRESPONDER 1" >>confdefs.h DNSSD_BACKEND="dnssd" IPPFIND_BIN="ippfind" IPPFIND_MAN="ippfind.1" - PKGCONFIG_LIBS="$PKGCONFIG_LIBS $DNSSDLIBS" + PKGCONFIG_LIBS_STATIC="$PKGCONFIG_LIBS_STATIC $DNSSDLIBS" else $as_nop @@ -10689,7 +10723,6 @@ fi fi -PKGCONFIG_LIBS="$PKGCONFIG_LIBS $LIBS" if test $with_dnssd = avahi -o $with_dnssd = yes then : @@ -10761,6 +10794,22 @@ then : fi +# Check whether --with-our-snap-name was given. +if test ${with_our_snap_name+y} +then : + withval=$with_our_snap_name; + OUR_SNAP_NAME="$withval" + +else $as_nop + + OUR_SNAP_NAME="cups" + +fi + + +printf "%s\n" "#define OUR_SNAP_NAME \"$OUR_SNAP_NAME\"" >>confdefs.h + + # Check whether --with-snapctl was given. if test ${with_snapctl+y} then : @@ -10785,7 +10834,7 @@ then : else $as_nop - CUPS_CONTROL_SLOT="admin" + CUPS_CONTROL_SLOT="cups-control" fi @@ -12864,7 +12913,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 CUPS $as_me 2.4rc1, which was +This file was extended by CUPS $as_me 2.4.0, which was generated by GNU Autoconf 2.70. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -12929,7 +12978,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="\\ -CUPS config.status 2.4rc1 +CUPS config.status 2.4.0 configured by $0, generated by GNU Autoconf 2.70, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index c696f41aab..65ecc0dada 100644 --- a/configure.ac +++ b/configure.ac @@ -13,7 +13,7 @@ dnl We need at least autoconf 2.60... AC_PREREQ([2.60]) dnl Package name and version... -AC_INIT([CUPS], [2.4rc1], [https://github.com/openprinting/cups/issues], [cups], [https://openprinting.github.io/cups]) +AC_INIT([CUPS], [2.4.0], [https://github.com/openprinting/cups/issues], [cups], [https://openprinting.github.io/cups]) dnl This line is provided to ensure that you don't run the autoheader program dnl against this project. Doing so is completely unsupported and WILL cause diff --git a/cups-config.in b/cups-config.in index f6221b6d74..f4bbed325f 100755 --- a/cups-config.in +++ b/cups-config.in @@ -11,7 +11,7 @@ # VERSION="@CUPS_VERSION@" -APIVERSION="2.4" +APIVERSION="@CUPS_API_VERSION@" BUILD="@CUPS_BUILD@" prefix=@prefix@ diff --git a/cups.pc.in b/cups.pc.in index 08cc17df5b..217ff56fee 100644 --- a/cups.pc.in +++ b/cups.pc.in @@ -1,36 +1,29 @@ -#cups pkg-config file - - -VERSION="@CUPS_VERSION@" -APIVERSION="2.3" -BUILD="@CUPS_BUILD@" +# +# CUPS pkg-config file +# +# Copyright © 2021 by OpenPrinting. +# +# Licensed under Apache License v2.0. See the file "LICENSE" for more +# information. +# prefix=@prefix@ exec_prefix=@exec_prefix@ -bindir=@bindir@ includedir=@includedir@ libdir=@libdir@ -datarootdir=@datadir@ -#datadir=@datadir@ -sysconfdir=@sysconfdir@ + +cups_api_version="@CUPS_API_VERSION@" +cups_build="@CUPS_BUILD@" cups_datadir=@CUPS_DATADIR@ cups_serverbin=@CUPS_SERVERBIN@ cups_serverroot=@CUPS_SERVERROOT@ -INSTALLSTATIC=@INSTALLSTATIC@ - - -# flags for compiler and linker... -CFLAGS=" -I${includedir}" -LDFLAGS="@EXPORT_LDFLAGS@ -L${libdir}" -Libs.private: @PKGCONFIG_LIBS@ -Name: "CUPS" -Description: "CUPS API Library" -Requires.private:@PKGCONFIG_REQUIRES@ -api_version=${APIVERSION} -build=${BUILD} -Cflags: ${CFLAGS} -datadir= ${cups_datadir} -Libs: @EXTLINKCUPS@ +Name: CUPS +Description: CUPS API Library +Version: @CUPS_VERSION@ +URL: https://openprinting.github.io/cups/ +Cflags: @PKGCONFIG_CFLAGS@ +Libs: @PKGCONFIG_LIBS@ -Version: ${VERSION} \ No newline at end of file +Requires.private: @PKGCONFIG_REQUIRES@ +Libs.private: @PKGCONFIG_LIBS_STATIC@ diff --git a/doc/index.html.in b/doc/index.html.in index 9c18e7e25f..74a341006c 100644 --- a/doc/index.html.in +++ b/doc/index.html.in @@ -7,12 +7,12 @@ - Home - CUPS @CUPS_VERSION@@CUPS_REVISION@ + Home - CUPS @CUPS_VERSION@
-

CUPS @CUPS_VERSION@

-

CUPS is the standards-based, open source printing system developed by Apple Inc. for macOS® and other UNIX®-like operating systems.

+

OpenPrinting CUPS @CUPS_VERSION@

+

The standards-based, open source printing system developed by OpenPrinting for Linux® and other Unix®-like operating systems. CUPS uses IPP Everywhere™ to support printing to local and network printers.

CUPS for Users

Overview of CUPS

Command-Line Printing and Options

-

User Forum

CUPS for Administrators

@@ -45,10 +44,9 @@

CUPS for Developers

CUPS Programming Manual

Filter and Backend Programming

-

Developer Forum

-
CUPS and the CUPS logo are trademarks of Apple Inc. Copyright © 2007-2019 Apple Inc. All rights reserved.
+
Copyright © 2021 OpenPrinting. All rights reserved.
diff --git a/doc/ja/index.html.in b/doc/ja/index.html.in index 2e8990e663..113d3d9c61 100644 --- a/doc/ja/index.html.in +++ b/doc/ja/index.html.in @@ -7,12 +7,12 @@ - ホーム - CUPS @CUPS_VERSION@@CUPS_REVISION@ + ホーム - CUPS @CUPS_VERSION@

CUPS 管理者向け

@@ -45,10 +44,9 @@

CUPS 開発者向け

CUPS Programming Manual

フィルタとバックエンドのプログラミング

-

開発者フォーラム

-
CUPS and the CUPS logo are trademarks of Apple Inc. Copyright © 2007-2019 Apple Inc. All rights reserved.
+
CUPS and the CUPS logo are trademarks of Apple Inc. Copyright © 2021 OpenPrinting. All rights reserved.
diff --git a/doc/pt_BR/index.html.in b/doc/pt_BR/index.html.in index 1a99dbe949..001b87c0d5 100644 --- a/doc/pt_BR/index.html.in +++ b/doc/pt_BR/index.html.in @@ -7,12 +7,12 @@ - Início - CUPS @CUPS_VERSION@@CUPS_REVISION@ + Início - CUPS @CUPS_VERSION@

CUPS para administradores

@@ -45,10 +44,9 @@

CUPS para desenvolvedores

CUPS Programming Manual

Programação de filtros e backend

-

Fórum de desenvolvedores

-
CUPS e o logo do CUPS são marcas registradas da Apple Inc. Copyright © 2007-2019 Apple Inc. Todos os direitos reservados.
+
CUPS e o logo do CUPS são marcas registradas da Apple Inc. Copyright © 2021 OpenPrinting. Todos os direitos reservados.
diff --git a/doc/ru/index.html.in b/doc/ru/index.html.in index f5b6f0fbf4..f38773def8 100644 --- a/doc/ru/index.html.in +++ b/doc/ru/index.html.in @@ -7,12 +7,12 @@ - Home - CUPS @CUPS_VERSION@@CUPS_REVISION@ + Home - CUPS @CUPS_VERSION@

CUPS для администраторов

@@ -45,10 +44,9 @@

CUPS для разработчиков

CUPS Programming Manual

Разработка фильтров и модулей

-

Форум разработчиков

-
CUPS а также логотип CUPS являются зарегистрированными торговыми марками Apple Inc. Авторские права на CUPS принадлежат (2007-2019) компании Apple Inc. Все права защищены.
+
CUPS а также логотип CUPS являются зарегистрированными торговыми марками Apple Inc. Авторские права на CUPS принадлежат (2921) компании OpenPrinting Все права защищены.
diff --git a/templates/da/header.tmpl.in b/templates/da/header.tmpl.in index d4a9367e7e..6af89c25a8 100644 --- a/templates/da/header.tmpl.in +++ b/templates/da/header.tmpl.in @@ -24,12 +24,12 @@ } } --> - {title} - CUPS @CUPS_VERSION@@CUPS_REVISION@ + {title} - CUPS @CUPS_VERSION@