Don't install banner and self-test files (STR #4518)

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@12278 a1ca3aef-8c08-0410-bb20-df032aa958be

diff --git a/CHANGES.txt b/CHANGES.txt
index bd75b680c6e0e1c4375ea961a419c8a7518eaea6..e0df0d5034ac5b3c64afbe8a28f4ecdbbb2a9a5f 100644 (file)
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,4 @@
-CHANGES.txt - 2.1b1 - 2014-11-19
+CHANGES.txt - 2.1b1 - 2014-12-01
 --------------------------------
 
 CHANGES IN CUPS V2.1b1
@@ -7,3 +7,5 @@ CHANGES IN CUPS V2.1b1
          (<rdar://problem/15146999>)
        - The IPP backend now stops sending print data if the printer indicates
          the job has been aborted or canceled (<rdar://problem/17837631>)
+       - No longer install banner files since third-party banner filters now
+         supply their own (STR #4518)

diff --git a/configure.ac b/configure.ac
index c0817b9c8a5461554c82e091b426dba023ff28d3..3bc86bf1056b1d113ac65a0bffe601395caf5558 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -66,7 +66,6 @@ AC_OUTPUT(Makedefs
          conf/pam.std
          conf/snmp.conf
          cups-config
-         data/testprint
          desktop/cups.desktop
          doc/index.html
          man/client.conf.man

diff --git a/data/Makefile b/data/Makefile
index 4f7f68034e8beed10b9a8fd6b9c4b0e6345a7cc5..6bc4a197d3a374ab9cf8deb8953e2a337af75bb0 100644 (file)
--- a/data/Makefile
+++ b/data/Makefile
@@ -3,7 +3,7 @@
 #
 #   Datafile makefile for CUPS.
 #
-#   Copyright 2007-2011 by Apple Inc.
+#   Copyright 2007-2014 by Apple Inc.
 #   Copyright 1993-2006 by Easy Software Products.
 #
 #   These coded instructions, statements, and computer programs are the
@@ -19,17 +19,6 @@ include ../Makedefs
 # Data files...
 #
 
-BANNERS        =       \
-               classified \
-               confidential \
-               secret \
-               standard \
-               topsecret \
-               unclassified
-
-DATAFILES =    \
-               testprint
-
 PPDCFILES =    \
                epson.h \
                font.defs \
@@ -87,13 +76,7 @@ install:     all install-data install-headers install-libs install-exec
 
 install-data:
        $(INSTALL_DIR) -m 755 $(DATADIR)/banners
-       for file in $(BANNERS); do \
-               $(INSTALL_DATA) $$file $(DATADIR)/banners; \
-       done
        $(INSTALL_DIR) -m 755 $(DATADIR)/data
-       for file in $(DATAFILES); do \
-               $(INSTALL_DATA) $$file $(DATADIR)/data; \
-       done
        $(INSTALL_DIR) -m 755 $(DATADIR)/model
        $(INSTALL_DIR) -m 755 $(DATADIR)/ppdc
        for file in $(PPDCFILES); do \
@@ -128,12 +111,6 @@ install-libs:
 #
 
 uninstall:
-       for file in $(BANNERS); do \
-               $(RM) $(DATADIR)/banners/$$file; \
-       done
-       for file in $(DATAFILES); do \
-               $(RM) $(DATADIR)/data/$$file; \
-       done
        for file in $(PPDCFILES); do \
                $(RM) $(DATADIR)/ppdc/$$file; \
        done

diff --git a/data/classified b/data/classified
deleted file mode 100644 (file)
index ca01a13..0000000
--- a/data/classified
+++ /dev/null
@@ -1,6 +0,0 @@
-#CUPS-BANNER
-Show job-id job-name job-originating-user-name job-originating-host-name job-billing
-Header Classified
-Footer Classified
-Image images/cups.png
-

diff --git a/data/confidential b/data/confidential
deleted file mode 100644 (file)
index f1f0d85..0000000
--- a/data/confidential
+++ /dev/null
@@ -1,6 +0,0 @@
-#CUPS-BANNER
-Show job-id job-name job-originating-user-name job-originating-host-name job-billing
-Header Confidential
-Footer Confidential
-Image images/cups.png
-

diff --git a/data/secret b/data/secret
deleted file mode 100644 (file)
index 66a0e8a..0000000
--- a/data/secret
+++ /dev/null
@@ -1,6 +0,0 @@
-#CUPS-BANNER
-Show job-id job-name job-originating-user-name job-originating-host-name job-billing
-Header Secret
-Footer Secret
-Image images/cups.png
-

diff --git a/data/standard b/data/standard
deleted file mode 100644 (file)
index 31c68a0..0000000
--- a/data/standard
+++ /dev/null
@@ -1,6 +0,0 @@
-#CUPS-BANNER
-Show job-id job-name job-originating-user-name job-originating-host-name job-billing
-Header Cover Page
-Footer Cover Page
-Image images/cups.png
-

diff --git a/data/testprint.in b/data/testprint.in
deleted file mode 100644 (file)
index 8cee3ab..0000000
--- a/data/testprint.in
+++ /dev/null
@@ -1,7 +0,0 @@
-#CUPS-BANNER
-Show printer-name printer-info printer-location printer-make-and-model printer-driver-name printer-driver-version paper-size imageable-area
-Header Printer Test Page
-Footer Printer Test Page
-Notice CUPS @CUPS_VERSION@.
-Image images/cups.png
-Image images/color-wheel.png

diff --git a/data/topsecret b/data/topsecret
deleted file mode 100644 (file)
index d2b87fa..0000000
--- a/data/topsecret
+++ /dev/null
@@ -1,6 +0,0 @@
-#CUPS-BANNER
-Show job-id job-name job-originating-user-name job-originating-host-name job-billing
-Header Top Secret
-Footer Top Secret
-Image images/cups.png
-

diff --git a/data/unclassified b/data/unclassified
deleted file mode 100644 (file)
index 2d1a7d0..0000000
--- a/data/unclassified
+++ /dev/null
@@ -1,6 +0,0 @@
-#CUPS-BANNER
-Show job-id job-name job-originating-user-name job-originating-host-name job-billing
-Header Unclassified
-Footer Unclassified
-Image images/cups.png
-