From 9520743f2d63ee95526873098ed3968dcdf313f4 Mon Sep 17 00:00:00 2001 From: msweet Date: Mon, 8 Jul 2013 13:47:51 +0000 Subject: [PATCH] Prep for 1.7rc1. git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@11107 a1ca3aef-8c08-0410-bb20-df032aa958be --- CHANGES-IPPTOOL.txt | 4 +- CHANGES.txt | 2 +- INSTALL.txt | 11 +++--- IPPTOOL.txt | 69 ++++++++++++++++++----------------- Makefile | 8 ++-- README.txt | 2 +- config-scripts/cups-common.m4 | 2 +- 7 files changed, 49 insertions(+), 49 deletions(-) diff --git a/CHANGES-IPPTOOL.txt b/CHANGES-IPPTOOL.txt index c05f4c40f..9c5de0eba 100644 --- a/CHANGES-IPPTOOL.txt +++ b/CHANGES-IPPTOOL.txt @@ -1,10 +1,10 @@ -CHANGES-IPPTOOL.txt - 2013-06-06 +CHANGES-IPPTOOL.txt - 2013-07-08 -------------------------------- This file provides a list of changes to the ipptool binary distribution posted on cups.org. -2013-06-06 +2013-07-08 - New ippfind tool now included with ipptool. - Added support for automatically extending the timeout when all of the diff --git a/CHANGES.txt b/CHANGES.txt index f0d18edbc..3f121f095 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,4 @@ -CHANGES.txt - 1.7rc1 - 2013-07-03 +CHANGES.txt - 1.7rc1 - 2013-07-08 --------------------------------- CHANGES IN CUPS V1.7rc1 diff --git a/INSTALL.txt b/INSTALL.txt index 2ec6992cc..96c014c07 100644 --- a/INSTALL.txt +++ b/INSTALL.txt @@ -1,5 +1,5 @@ -INSTALL - CUPS v1.7b1 - 2013-04-18 ----------------------------------- +INSTALL - CUPS v1.7rc1 - 2013-07-08 +----------------------------------- This file describes how to compile and install CUPS from source code. For more information on CUPS see the file called "README.txt". A complete change log can @@ -147,7 +147,7 @@ INSTALLING THE SOFTWARE The EPM software is available at: - http://www.epmhome.org/ + http://www.msweet.org/ CREATING BINARY DISTRIBUTIONS WITH EPM @@ -197,10 +197,9 @@ GETTING DEBUG LOGGING FROM CUPS REPORTING PROBLEMS If you have problems, READ THE DOCUMENTATION FIRST! If the documentation - does not solve your problems, please post a message on the "cups.general" - forum at: + does not solve your problems, please post a message on the users forum at: - http://www.cups.org/newsgroups.php + http://www.cups.org/ Include your operating system and version, compiler and version, and any errors or problems you've run into. The "config.log" file and the output diff --git a/IPPTOOL.txt b/IPPTOOL.txt index 31d6fe4ee..a64950ca8 100644 --- a/IPPTOOL.txt +++ b/IPPTOOL.txt @@ -1,4 +1,4 @@ -IPPTOOL.txt - 2013-06-06 +IPPTOOL.txt - 2013-07-08 ------------------------ See the file CHANGES-IPPTOOL.txt for a list of changes to this software. @@ -6,15 +6,25 @@ See the file CHANGES-IPPTOOL.txt for a list of changes to this software. INTRODUCTION - CUPS includes a user program called ipptool that can be used to send - arbitrary IPP requests to a CUPS server or IPP printer. This tool started - life as part of the CUPS automated test suite and has grown to support - complex conformance tests and a simple way to query printer, job, and - subscription attributes. + CUPS includes two user programs for IPP printers. The first is called + ipptool and can be used to send arbitrary IPP requests to a CUPS server or + IPP printer. This tool started life as part of the CUPS automated test + suite and has grown to support complex conformance tests and a simple way + to query printer, job, and subscription attributes. - CUPS also includes a user program called ippfind that can be used to find - IPP printers that have registered themselves using Bonjour (DNS-SD, mDNS, - and Zeroconf) and run commands such as ipptool. + The second program called ippfind that can be used to find IPP printers + that have registered themselves using Bonjour (DNS-SD, mDNS, and Zeroconf) + and run commands such as ipptool. + + +READING THE DOCUMENTATION + + Full documentation on the ipptool command can be found in the + "man-ipptool.html" and "man-ipptoolfile.html" files; the latter describes + the test file format supported by ipptool. + + Full documentation on the ippfind command can be found in the + "man-ippfind.html" file. IPPFIND BASIC USAGE @@ -29,10 +39,10 @@ IPPFIND BASIC USAGE ippfind --txt-color T - To run the IPP Everywhere conformance test file on every registered IPP - printer, run the following command instead: + And to run the IPP Everywhere conformance test file on every registered IPP + printer, run the following command: - ippfind --exec ipptool -t '{}' ipp-everywhere.test \; + ippfind _ipp._tcp,_print --exec ipptool -t '{}' ipp-everywhere.test \; IPPTOOL BASIC USAGE @@ -173,37 +183,28 @@ IPP EVERYWHERE TESTING 372 pages including the 90 pages produced by the regular IPP test suite. -READING THE DOCUMENTATION - - The command usage is described in the ipptest(1) man page, while the file - format is described in the ipptestfile(5) man page. Both are provided in - HTML format with the standalone releases of ipptool. - - GETTING SUPPORT AND OTHER RESOURCES - If you have problems, READ THE DOCUMENTATION FIRST! We also provide many + If you have problems, READ THE DOCUMENTATION FIRST! We also provide discussion forums which are available at: - http://www.cups.org/newsgroups.php - - See the CUPS web site at "http://www.cups.org/" for other resources. + http://www.cups.org/ REPORTING BUGS - If you believe you have discovered a bug in ipptool, please fill out the - bug form at: + If you believe you have discovered a bug in ippfind or ipptool, please fill + out the bug form at: http://www.cups.org/str.php - Be sure to identify the version of CUPS and ipptool (if you downloaded the - standalone version) you are using, the printer (if any) and firmware - version, and include any files that apply. + Be sure to identify the version of CUPS and ippfind/ipptool (if you + downloaded the standalone version) you are using, the printer (if any) and + firmware version, and include any files that apply. - If you downloaded the standalone version of ipptool, please also re-run the - test with debug logging enabled. Run the following commands on Windows to - enable debug logging: + If you downloaded the standalone version of ippfind/ipptool, please also + re-run the command with debug logging enabled. Run the following commands + on Windows to enable debug logging: setdebug.bat @@ -212,9 +213,9 @@ REPORTING BUGS CUPS_DEBUG_LOG=ipptool.log; export CUPS_DEBUG_LOG CUPS_DEBUG_LEVEL=6; export CUPS_DEBUG_LEVEL - Then when you run the ipptool command a new "ipptool.log" file will be - created with detailed information - attach this file to the bug you file - as well. + Then when you run the ippfind or ipptool command a new "ipptool.log" file + will be created with detailed information - attach this file to the bug you + file as well. LEGAL STUFF diff --git a/Makefile b/Makefile index 14d049442..9b252c648 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ # # Top-level Makefile for CUPS. # -# Copyright 2007-2012 by Apple Inc. +# Copyright 2007-2013 by Apple Inc. # Copyright 1997-2007 by Easy Software Products, all rights reserved. # # These coded instructions, statements, and computer programs are the @@ -242,7 +242,7 @@ debugcheck: all unittests # -# Create HTML documentation... +# Create HTML documentation using Mini-XML's mxmldoc (http://www.msweet.org/)... # apihelp: @@ -259,7 +259,7 @@ framedhelp: # -# Create an Xcode docset... +# Create an Xcode docset using Mini-XML's mxmldoc (http://www.msweet.org/)... # docset: apihelp @@ -295,7 +295,7 @@ sloc: # -# Make software distributions using EPM (http://www.epmhome.org/)... +# Make software distributions using EPM (http://www.msweet.org/)... # EPMFLAGS = -v --output-dir dist $(EPMARCH) diff --git a/README.txt b/README.txt index eb82d1e4b..4415bd054 100644 --- a/README.txt +++ b/README.txt @@ -1,4 +1,4 @@ -README - CUPS v1.7rc1 - 2013-07-03 +README - CUPS v1.7rc1 - 2013-07-08 ---------------------------------- ******************************************************* diff --git a/config-scripts/cups-common.m4 b/config-scripts/cups-common.m4 index 6a30e4809..1336c4236 100644 --- a/config-scripts/cups-common.m4 +++ b/config-scripts/cups-common.m4 @@ -20,7 +20,7 @@ dnl Set the name of the config header file... AC_CONFIG_HEADER(config.h) dnl Version number information... -CUPS_VERSION="1.7b1" +CUPS_VERSION="1.7rc1" CUPS_REVISION="" #if test -z "$CUPS_REVISION" -a -d .svn; then # CUPS_REVISION="-r`svnversion . | awk -F: '{print $NF}' | sed -e '1,$s/[[a-zA-Z]]*//g'`" -- 2.39.2