Prep for 3.0b1:

- Update documentation/copyrights/etc.
- Update configure script to set CUPS_DATADIR and CUPS_SERVERROOT, remove all
  others.
- Update ippeveps to use Xpdf pdftops or Apple cgpdftops.
- Install ippevepcl/ps to /usr/bin only, no more "ippeveprinter" subdir under
  serverbin.

Author: michaelrsweet

Makedefs.in

@@ -1,7 +1,7 @@
 #
 # Common makefile definitions for libcups.
 #
-# Copyright © 2021-2022 by OpenPrinting.
+# Copyright © 2021-2023 by OpenPrinting.
 #
 # Licensed under Apache License v2.0.  See the file "LICENSE" for more
 # information.
@@ -162,6 +162,9 @@ srcdir		=	@srcdir@
 sysconfdir	=	@sysconfdir@
 top_srcdir	=	@top_srcdir@
 
+CUPS_DATADIR	=	@CUPS_DATADIR@
+CUPS_SERVERROOT	=	@CUPS_SERVERROOT@
+
 BUILDROOT	=	$(DSTROOT)$(DESTDIR)
 
 

README.md

@@ -5,7 +5,6 @@ The CUPS Library v3 (libcups)
 ![Apache 2.0](https://img.shields.io/github/license/michaelrsweet/libcups)
 [![Build and Test](https://github.com/michaelrsweet/libcups/workflows/Build%20and%20Test/badge.svg)](https://github.com/michaelrsweet/libcups/actions/workflows/build.yml)
 [![Coverity Scan](https://img.shields.io/coverity/scan/24180)](https://scan.coverity.com/projects/michaelrsweet-libcups)
-[![LGTM Grade](https://img.shields.io/lgtm/grade/cpp/github/michaelrsweet/libcups)](https://lgtm.com/projects/g/michaelrsweet/libcups/?mode=list)
 
 > *Note:* This is a major release update of the CUPS library that breaks both
 > binary and source compatibility with prior releases of CUPS.

config.h.in

@@ -1,7 +1,7 @@
 /*
  * Configuration file for libcups.
  *
- * Copyright © 2020-2022 by OpenPrinting
+ * Copyright © 2020-2023 by OpenPrinting
  * Copyright © 2007-2019 by Apple Inc.
  * Copyright © 1997-2007 by Easy Software Products.
  *
@@ -35,18 +35,8 @@
  *       variables at run-time...
  */
 
-// TODO: Cleanup directories
-#define CUPS_BINDIR	"/usr/bin"
-#define CUPS_CACHEDIR	"/var/cache/cups"
 #define CUPS_DATADIR    "/usr/share/cups"
-#define CUPS_DOCROOT	"/usr/share/doc/cups"
-#define CUPS_LOCALEDIR	"/usr/share/locale"
-#define CUPS_LOGDIR	"/var/logs/cups"
-#define CUPS_REQUESTS	"/var/spool/cups"
-#define CUPS_SBINDIR	"/usr/sbin"
-#define CUPS_SERVERBIN	"/usr/lib/cups"
 #define CUPS_SERVERROOT	"/etc/cups"
-#define CUPS_STATEDIR	"/var/run/cups"
 
 
 /*

configure

@@ -2,7 +2,7 @@
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.71 for libcups 3.0b1.
 #
-# Report bugs to <https://github.com/michaelrsweet/libcups/issues>.
+# Report bugs to <https://github.com/OpenPrinting/libcups/issues>.
 #
 #
 # Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation,
@@ -267,7 +267,7 @@ then :
     printf "%s\n" "$0: be upgraded to zsh 4.3.4 or later."
   else
     printf "%s\n" "$0: Please tell bug-autoconf@gnu.org and
-$0: https://github.com/michaelrsweet/libcups/issues about
+$0: https://github.com/OpenPrinting/libcups/issues about
 $0: your system, including any error possibly output before
 $0: this message. Then install a modern shell, or manually
 $0: run the script under such a shell if you do have one."
@@ -612,7 +612,7 @@ PACKAGE_NAME='libcups'
 PACKAGE_TARNAME='cups'
 PACKAGE_VERSION='3.0b1'
 PACKAGE_STRING='libcups 3.0b1'
-PACKAGE_BUGREPORT='https://github.com/michaelrsweet/libcups/issues'
+PACKAGE_BUGREPORT='https://github.com/OpenPrinting/libcups/issues'
 PACKAGE_URL='https://openprinting.github.io/cups'
 
 # Factoring default headers for most tests.
@@ -649,6 +649,8 @@ ac_includes_default="\
 ac_header_c_list=
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
+CUPS_SERVERROOT
+CUPS_DATADIR
 WARNINGS
 OPTIONS
 CSFLAGS
@@ -1407,7 +1409,7 @@ Some influential environment variables:
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
 
-Report bugs to <https://github.com/michaelrsweet/libcups/issues>.
+Report bugs to <https://github.com/OpenPrinting/libcups/issues>.
 libcups home page: <https://openprinting.github.io/cups>.
 _ACEOF
 ac_status=$?
@@ -5492,6 +5494,43 @@ else $as_nop
 
 fi
 
+if test "$datarootdir" = "\${prefix}/share"
+then :
+
+    if test "$prefix" = "/"
+then :
+
+	datarootdir="/usr/share"
+
+else $as_nop
+
+	datarootdir="$prefix/share"
+
+fi
+
+fi
+
+if test "$datadir" = "\${prefix}/share"
+then :
+
+    if test "$prefix" = "/"
+then :
+
+	datadir="/usr/share"
+
+else $as_nop
+
+	datadir="$prefix/share"
+
+fi
+
+elif test "$datadir" = "\${datarootdir}"
+then :
+
+    datadir="$datarootdir"
+
+fi
+
 if test "$includedir" = NONE -o "$includedir" = "\${prefix}/include"
 then :
 
@@ -5505,6 +5544,44 @@ then :
 
 fi
 
+if test "$sysconfdir" = "\${prefix}/etc"
+then :
+
+    if test "$prefix" = "/"
+then :
+
+	if test "$host_os_name" = darwin
+then :
+
+	    sysconfdir="/private/etc"
+
+else $as_nop
+
+	    sysconfdir="/etc"
+
+fi
+
+else $as_nop
+
+	sysconfdir="$prefix/etc"
+
+fi
+
+fi
+
+
+CUPS_DATADIR="$datadir/cups"
+
+printf "%s\n" "#define CUPS_DATADIR \"$datadir/cups\"" >>confdefs.h
+
+
+
+CUPS_SERVERROOT="$sysconfdir/cups"
+
+printf "%s\n" "#define CUPS_SERVERROOT \"$sysconfdir/cups\"" >>confdefs.h
+
+
+
 
 CUPS_DEFAULT_DOMAINSOCKET=""
 
@@ -6117,7 +6194,7 @@ $config_files
 Configuration headers:
 $config_headers
 
-Report bugs to <https://github.com/michaelrsweet/libcups/issues>.
+Report bugs to <https://github.com/OpenPrinting/libcups/issues>.
 libcups home page: <https://openprinting.github.io/cups>."
 
 _ACEOF

configure.ac

@@ -1,7 +1,7 @@
 dnl
 dnl Configuration script for libcups.
 dnl
-dnl Copyright © 2020-2022 by OpenPrinting
+dnl Copyright © 2020-2023 by OpenPrinting
 dnl Copyright © 2007-2020 by Apple Inc.
 dnl Copyright © 1997-2007 by Easy Software Products, all rights reserved.
 dnl
@@ -13,7 +13,7 @@ dnl We need at least autoconf 2.71...
 AC_PREREQ([2.71])
 
 dnl Package name and version...
-AC_INIT([libcups],[3.0b1],[https://github.com/michaelrsweet/libcups/issues],[cups],[https://openprinting.github.io/cups])
+AC_INIT([libcups],[3.0b1],[https://github.com/OpenPrinting/libcups/issues],[cups],[https://openprinting.github.io/cups])
 AC_CONFIG_HEADERS([config.h])
 
 LIBCUPS_VERSION="AC_PACKAGE_VERSION"
@@ -566,21 +566,61 @@ AC_ARG_WITH([ldflags], AS_HELP_STRING([--with-ldflags=...], [Specify additional
 ])
 
 
-dnl Fix prefix and includedir...
+dnl Fix prefix, datadir, datarootdir, includedir, and sysconfdir...
 AS_IF([test "$prefix" = NONE], [
     # Default prefix isn't bound until AC_OUTPUT...
     realprefix="/usr/local"
 ], [
     realprefix="$prefix"
 ])
 
+AS_IF([test "$datarootdir" = "\${prefix}/share"], [
+    AS_IF([test "$prefix" = "/"], [
+	datarootdir="/usr/share"
+    ], [
+	datarootdir="$prefix/share"
+    ])
+])
+
+AS_IF([test "$datadir" = "\${prefix}/share"], [
+    AS_IF([test "$prefix" = "/"], [
+	datadir="/usr/share"
+    ], [
+	datadir="$prefix/share"
+    ])
+], [test "$datadir" = "\${datarootdir}"], [
+    datadir="$datarootdir"
+])
+
 AS_IF([test "$includedir" = NONE -o "$includedir" = "\${prefix}/include"], [
     includedir="$realprefix/include$INCLUDE_PREFIX"
 ])
 AS_IF([test "$includedir" != "/usr/include" -a "$includedir" != "/usr/local/include"], [
     PKGCONFIG_CFLAGS="-I\${includedir} $PKGCONFIG_CFLAGS"
 ])
 
+AS_IF([test "$sysconfdir" = "\${prefix}/etc"], [
+    AS_IF([test "$prefix" = "/"], [
+	AS_IF([test "$host_os_name" = darwin], [
+	    sysconfdir="/private/etc"
+	], [
+	    sysconfdir="/etc"
+	])
+    ], [
+	sysconfdir="$prefix/etc"
+    ])
+])
+
+
+dnl CUPS_DATADIR and CUPS_SERVERROOT
+CUPS_DATADIR="$datadir/cups"
+AC_DEFINE_UNQUOTED([CUPS_DATADIR], ["$datadir/cups"], [Location of data files.])
+AC_SUBST([CUPS_DATADIR])
+
+CUPS_SERVERROOT="$sysconfdir/cups"
+AC_DEFINE_UNQUOTED([CUPS_SERVERROOT], ["$sysconfdir/cups"], [Location of server configuration files.])
+AC_SUBST([CUPS_SERVERROOT])
+
 
 dnl Domain socket support...
 CUPS_DEFAULT_DOMAINSOCKET=""

cups/Makefile

@@ -1,7 +1,7 @@
 #
 # Library Makefile for libcups.
 #
-# Copyright © 2021-2022 by OpenPrinting.
+# Copyright © 2021-2023 by OpenPrinting.
 #
 # Licensed under Apache License v2.0.  See the file "LICENSE" for more
 # information.

doc/cupspm.epub

@@ -16,15 +16,15 @@
   text-align: justify;
 }
 --></style>
-    <meta name="creator" content="mantohtml v2022.1005">
+    <meta name="creator" content="mantohtml v2.0.1">
     <title>Documentation</title>
   </head>
   <body>
-    <h1 id="ippevepclps-7">ippevepcl/ps(7)</h1>
-    <h2 id="ippevepclps-7.name">Name</h2>
+    <h1 id="ippevepclps-1">ippevepcl/ps(1)</h1>
+    <h2 id="ippevepclps-1.name">Name</h2>
 <p>ippevepcl/ps - pcl and postscript print commands for ippeveprinter
 </p>
-    <h2 id="ippevepclps-7.synopsis">Synopsis</h2>
+    <h2 id="ippevepclps-1.synopsis">Synopsis</h2>
 <p><strong>ippevepcl</strong>
 [
 <em>filename</em>
@@ -35,7 +35,7 @@ <h2 id="ippevepclps-7.synopsis">Synopsis</h2>
 <em>filename</em>
 ]
 </p>
-    <h2 id="ippevepclps-7.description">Description</h2>
+    <h2 id="ippevepclps-1.description">Description</h2>
 <p><strong>ippevepcl</strong>
 and
 <strong>ippeveps</strong>
@@ -47,26 +47,26 @@ <h2 id="ippevepclps-7.description">Description</h2>
 Status and progress messages are sent to the standard error.
 </p>
     <p><strong>ippevepcl</strong>
-prints to B&W HP PCL laser printers and supports printing of HP PCL (application/vnd.hp-pcl), PWG Raster (image/pwg-raster), and Apple Raster (image/urf) print files.
+prints to B&amp;W HP PCL laser printers and supports printing of HP PCL (application/vnd.hp-pcl), PWG Raster (image/pwg-raster), and Apple Raster (image/urf) print files.
 </p>
     <p><strong>ippeveps</strong>
 print to Adobe PostScript printers and supports printing of PDF (application/pdf), PostScript (application/postscript), JPEG (image/jpeg), PWG Raster (image/pwg-raster), and Apple Raster (image/urf) print files.
 Printer-specific commands are read from a supplied PPD file.
 If no PPD file is specified, generic commands suitable for any Level 2 or Level 3 PostScript printer are used instead to specify duplex printing and media size.
 </p>
-    <h2 id="ippevepclps-7.exit-status">Exit Status</h2>
+    <h2 id="ippevepclps-1.exit-status">Exit Status</h2>
 <p>These programs return 1 on error and 0 on success.
 </p>
-    <h2 id="ippevepclps-7.environment">Environment</h2>
+    <h2 id="ippevepclps-1.environment">Environment</h2>
 <p>These program inherit the environment provided by the
 <strong>ippeveprinter</strong>
 program.
 </p>
-    <h2 id="ippevepclps-7.see-also">See Also</h2>
+    <h2 id="ippevepclps-1.see-also">See Also</h2>
 <p><strong>ippeveprinter</strong>(8)
 
 </p>
-    <h2 id="ippevepclps-7.copyright">Copyright</h2>
-<p>Copyright &copy; 2021 by OpenPrinting.
+    <h2 id="ippevepclps-1.copyright">Copyright</h2>
+<p>Copyright &copy; 2021-2023 by OpenPrinting.
   </body>
 </html>