Skip to content

Commit

Permalink
Drop cupstestdsc program and related documentation (Issue #5450)
Browse files Browse the repository at this point in the history
  • Loading branch information
michaelrsweet committed Dec 6, 2018
1 parent 51c22b8 commit dc5c941
Show file tree
Hide file tree
Showing 11 changed files with 4 additions and 690 deletions.
1 change: 1 addition & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ Changes in CUPS v2.3b6
- Kerberos credentials might be truncated (Issue #5435)
- The handling of `MaxJobTime 0` did not match the documentation (Issue #5438)
- Fixed a bug adding a queue with the `-E` option (Issue #5440)
- The `cupstestdsc` program has been removed (Issue #5450)
- The scheduler was being backgrounded on macOS, causing applications to spin
(rdar:https://40436080)
- The scheduler did not validate that required initial request attributes were
Expand Down
5 changes: 1 addition & 4 deletions doc/Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#
# Documentation makefile for CUPS.
#
# Copyright 2007-2017 by Apple Inc.
# Copyright 2007-2018 by Apple Inc.
# Copyright 1997-2007 by Easy Software Products.
#
# Licensed under Apache License v2.0. See the file "LICENSE" for more information.
Expand Down Expand Up @@ -68,7 +68,6 @@ HELPFILES = \
help/man-cupsd-helper.html \
help/man-cupsd-logs.html \
help/man-cupsenable.html \
help/man-cupstestdsc.html \
help/man-cupstestppd.html \
help/man-filter.html \
help/man-ipptool.html \
Expand Down Expand Up @@ -107,8 +106,6 @@ HELPFILES = \
help/spec-command.html \
help/spec-design.html \
help/spec-ipp.html \
help/spec-pdf.html \
help/spec-postscript.html \
help/spec-ppd.html \
help/spec-raster.html \
help/spec-stp.html \
Expand Down
44 changes: 0 additions & 44 deletions doc/help/man-cupstestdsc.html

This file was deleted.

15 changes: 0 additions & 15 deletions doc/help/spec-pdf.html

This file was deleted.

143 changes: 0 additions & 143 deletions doc/help/spec-postscript.html

This file was deleted.

1 change: 0 additions & 1 deletion man/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ include ../Makedefs
MAN1 = cancel.$(MAN1EXT) \
cups.$(MAN1EXT) \
cups-config.$(MAN1EXT) \
cupstestdsc.$(MAN1EXT) \
cupstestppd.$(MAN1EXT) \
$(IPPFIND_MAN) \
ipptool.$(MAN1EXT) \
Expand Down
42 changes: 0 additions & 42 deletions man/cupstestdsc.man

This file was deleted.

2 changes: 0 additions & 2 deletions packaging/cups.list.in
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,6 @@ l 0755 root sys /usr/etc/lpc $SBINDIR/lpc
# User commands
d 0755 root sys $BINDIR -
f 0555 root sys $BINDIR/cancel systemv/cancel
f 0555 root sys $BINDIR/cupstestdsc systemv/cupstestdsc
f 0555 root sys $BINDIR/cupstestppd systemv/cupstestppd
f 0555 root sys $BINDIR/ipptool test/ipptool
f 0555 root sys $BINDIR/lp systemv/lp
Expand Down Expand Up @@ -624,7 +623,6 @@ d 0755 root sys $MANDIR/man7 -

f 0444 root sys $MANDIR/man1/cancel.$MAN1EXT man/cancel.$MAN1EXT
f 0444 root sys $MANDIR/man1/cups.$MAN1EXT man/cups.$MAN1EXT
f 0444 root sys $MANDIR/man1/cupstestdsc.$MAN1EXT man/cupstestdsc.$MAN1EXT
f 0444 root sys $MANDIR/man1/cupstestppd.$MAN1EXT man/cupstestppd.$MAN1EXT
f 0444 root sys $MANDIR/man1/ippfind.$MAN1EXT man/ippfind.$MAN1EXT
f 0444 root sys $MANDIR/man1/ipptool.$MAN1EXT man/ipptool.$MAN1EXT
Expand Down
2 changes: 0 additions & 2 deletions packaging/cups.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,6 @@ rm -rf $RPM_BUILD_ROOT
%endif

/usr/bin/cancel
/usr/bin/cupstestdsc
/usr/bin/cupstestppd
/usr/bin/ipptool
/usr/bin/lp*
Expand Down Expand Up @@ -333,7 +332,6 @@ rm -rf $RPM_BUILD_ROOT
%dir /usr/share/man/man1
/usr/share/man/man1/cancel.1.gz
/usr/share/man/man1/cups.1.gz
/usr/share/man/man1/cupstestdsc.1.gz
/usr/share/man/man1/cupstestppd.1.gz
%if %{?_with_dnssd:1}%{!?_with_dnssd:0}
# DNS-SD
Expand Down
16 changes: 2 additions & 14 deletions systemv/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@

include ../Makedefs

TARGETS = cancel cupsaccept cupsaddsmb cupsctl cupstestdsc cupstestppd \
TARGETS = cancel cupsaccept cupsaddsmb cupsctl cupstestppd \
lp lpadmin lpinfo lpmove lpoptions lpstat
OBJS = cancel.o cupsaccept.o cupsaddsmb.o cupsctl.o cupstestdsc.o \
OBJS = cancel.o cupsaccept.o cupsaddsmb.o cupsctl.o \
cupstestppd.o lp.o lpadmin.o lpinfo.o lpmove.o lpoptions.o \
lpstat.o

Expand Down Expand Up @@ -95,7 +95,6 @@ install-exec:
echo Installing System V user printing commands in $(BINDIR)
$(INSTALL_DIR) -m 755 $(BINDIR)
$(INSTALL_BIN) cancel $(BINDIR)
$(INSTALL_BIN) cupstestdsc $(BINDIR)
$(INSTALL_BIN) cupstestppd $(BINDIR)
$(INSTALL_BIN) lp $(BINDIR)
$(INSTALL_BIN) lpoptions $(BINDIR)
Expand Down Expand Up @@ -129,7 +128,6 @@ install-libs:

uninstall:
$(RM) $(BINDIR)/cancel
$(RM) $(BINDIR)/cupstestdsc
$(RM) $(BINDIR)/cupstestppd
$(RM) $(BINDIR)/lp
$(RM) $(BINDIR)/lpoptions
Expand Down Expand Up @@ -193,16 +191,6 @@ cupsctl: cupsctl.o ../cups/$(LIBCUPS)
$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@


#
# cupstestdsc
#

cupstestdsc: cupstestdsc.o ../cups/$(LIBCUPS)
echo Linking $@...
$(LD_CC) $(LDFLAGS) -o $@ cupstestdsc.o $(LIBS)
$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@


#
# cupstestppd
#
Expand Down

0 comments on commit dc5c941

Please sign in to comment.