Merge branch 'master' into issue#15

Author: tillkamppeter

.gitignore

@@ -1,3 +1,5 @@
+*~
+*/*~
 *.o
 *.pdf
 .vscode/
@@ -9,6 +11,8 @@ aclocal.*
 autom4te.cache/
 build-aux/
 configure
+config.guess
+config.sub
 config.log
 config.status
 Makefile

CHANGES.md

@@ -0,0 +1,40 @@
+# CHANGES - Common Print Dialog Backends - CUPS Backend - v2.0b1 - 2022-12-12
+
+## CHANGES IN V2.0b1 (12th December 2022)
+
+- Added function to query for human readable names of options/choices
+
+  With the added functionality of cpdb-libs to poll human-readable
+  names for options/attributes and their choices this commit adds a
+  simple function to provide human-readable strings for the
+  user-settable printer IPP attributes of CUPS queues.
+
+- Added support for common CUPS/cups-filters options
+
+  Options like number-up, page-set, output-order, ... Available for
+  all CUPS queues, not specific to particular printer.
+
+- Added get_media_size() function
+
+- Support for media sizes to have multiple margin variants (like
+  standard and borderless)
+
+- Do not send media-col attribute to frontend as user-settable option
+
+- Adapted to renamed API functions and data types of cpdb-libs 2.x
+
+- Updated signal names to match those emitted from CPDB frontend
+
+- Made "make dist" generate a complete source tarball
+
+- Fixed some potential crasher bugs following warnings about
+  incompatible pointer types.
+
+- Updated README.md
+
+  + On update the old version of the backend needs to get killed
+  + Common Print Dialog -> Common Print Dialog Backends
+  + Requires cpdb-libs 2.0.0 or newer
+  + Updated instructions for running the backend.
+  + Added link to Gaurav Guleria's GSoC work, minor fixes
+  + Use third person.

COPYING

@@ -0,0 +1,39 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: cpdb-backend-cups
+Upstream-Contact: OpenPrinting <[email protected]>
+Source: https://github.com/OpenPrinting/cpdb-backend-cups/releases
+
+Files: *
+Copyright: 2017, Nilanjana Lodh
+ 2017-2022, Till Kamppeter
+ 2020, Priydarshi Singh
+ 2022, Gaurav Guleria
+License: MIT
+
+License: MIT
+ The MIT License
+ .
+ Permission is hereby granted, free of charge, to any person
+ obtaining a copy of this software and associated
+ documentation files (the "Software"), to deal in the Software
+ without restriction, including without limitation the rights to
+ use, copy, modify, merge, publish, distribute, sublicense,
+ and/or sell copies of the Software, and to permit persons to
+ whom the Software is furnished to do so, subject to the
+ following conditions:
+ .
+ The above copyright notice and this permission notice shall
+ be included in all copies or substantial portions of the
+ Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT
+ WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+ INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR
+ PURPOSE AND NONINFRINGEMENT. IN NO EVENT
+ SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ CONNECTION WITH THE SOFTWARE OR THE USE OR
+ OTHER DEALINGS IN THE SOFTWARE.

LICENSE.md

@@ -1,6 +1,9 @@
 MIT License
 
 Copyright (c) 2017 Nilanjana Lodh
+Copyright (c) 2017-2022 Till Kamppeter
+Copyright (c) 2020 Priydarshi Singh
+Copyright (c) 2022 Gaurav Guleria
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

Makefile.am

@@ -2,5 +2,8 @@ AUTOMAKE_OPTIONS = foreign
 SUBDIRS = src data
 
 EXTRA_DIST = \
+	README.md \
 	autogen.sh \
-	LICENSE.md
+	LICENSE.md \
+	COPYING \
+	CHANGES.md

README.md

@@ -11,10 +11,10 @@ The [Common Print Dialog Backends](https://openprinting.github.io/achievements/#
 - [cpdb-libs](https://github.com/OpenPrinting/cpdb-libs): Version >= 2.0.0 (or GIT Master)
 
 - [CUPS](https://github.com/OpenPrinting/cups): Version >= 2.2
-`sudo apt install cups libcups2-dev`
+  `sudo apt install cups libcups2-dev`
 
 - GLIB 2.0:
-`sudo apt install libglib2.0-dev`
+  `sudo apt install libglib2.0-dev`
 
 ## Build and installation
 
@@ -39,8 +39,10 @@ The current source code you find on the [OpenPrinting GitHub](https://github.com
 
 The backend is auto-activated when a frontend (like a CPDB-supporting print dialog or the example frontend `demo/print_frontend` of cpdb-libs) is started, so there is no need to run it explicitly.
 
-However, if you wish to see the debug statements in the backend code, you can run `/usr/local/lib/print-backends/cups
+However, if you wish to see the debug statements in the backend code, you can run `/usr/local/lib/print-backends/cups`
 
 ## More Info
 
-[Nilanjana Lodh's Google Summer of Code 2017 Final Report](https://nilanjanalodh.github.io/common-print-dialog-gsoc17/)
+- [Nilanjana Lodh's Google Summer of Code 2017 Final Report](https://nilanjanalodh.github.io/common-print-dialog-gsoc17/)
+
+- [Gaurav Guleria's Google Summer of Code 2022 Final Report](https://github.com/TinyTrebuchet/gsoc22/)

configure.ac

@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.69])
-AC_INIT([cpdb-backend-cups], [2.0.0], [https://github.com/OpenPrinting/cpdb-backend-cups/issues/], [cpdb-backend-cups], [https://github.com/OpenPrinting/cpdb-backend-cups])
+AC_INIT([cpdb-backend-cups], [2.0b1], [https://github.com/OpenPrinting/cpdb-backend-cups/issues/], [cpdb-backend-cups], [https://github.com/OpenPrinting/cpdb-backend-cups])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_SRCDIR([src/print_backend_cups.c])
 AM_INIT_AUTOMAKE([-Wall foreign])