Load cups into easysw/current.

git-svn-id: svn+ssh:https://src.apple.com/svn/cups/easysw/current@92 a1ca3aef-8c08-0410-bb20-df032aa958be

CHANGES.txt

@@ -1,7 +1,59 @@
-CHANGES.txt - 02/25/2006
+CHANGES.txt - 2006-03-20
 ------------------------
 
-CHANGES IN CUPS V1.2.0b1
+CHANGES IN CUPS V1.2rc1
+
+ - Documentation updates (STR #1497)
+ - Added KDE/GNOME icons and a Manage Printers menu item.
+ - Added --enable-image and --enable-pdftops configure
+ options to control whether the image and PDF filters
+ are built and installed (default = yes for all
+ platforms but MacOS X)
+ - Fixed a minor memory leak in the PPD API.
+ - Fixed transcoding issues (STR #1493)
+ - The scheduler now enforces a minimum job cost of 100
+ when doing FilterLimit checks.
+ - The scheduler would leak file descriptors when printing
+ to raw queues (STR #1491)
+ - The IPv6 support did not compile on Tru64 UNIX (STR
+ #1488)
+ - ppdOpen2() now converts the NickName and all UI text to
+ UTF-8 (STR #1475)
+ - The Set Allows Users web page did not work (STR #1486)
+ - When the default policy was not set or set to a non-
+ existing policy, the scheduler did not set the default
+ policy name to "default" (STR #1484)
+ - The Zebra CPCL driver did not use the correct righthand
+ margin for the 4" wide label sizes.
+ - Fixed a problem with the parsing of fractional real
+ numbers in PPD files.
+ - Added Spanish localization files (STR #1480)
+ - Fixed localization of a few scheduler messages (STR
+ #1478)
+ - Fixed support for HEAD requests in the scheduler (STR
+ #1481)
+
+
+CHANGES IN CUPS V1.2b2
+
+ - Updated the CUPS design description.
+ - Added --enable-32bit and --enable-64bit configure
+ options to allow building of separate 32/64-bit
+ libraries on systems that support both environments
+ (STR #1472)
+ - Various compiler warning fixes.
+ - Fixes for Solaris 10 builds against old GNU TLS and
+ LDAP libraries.
+ - Added a cupsArrayUserData() function to retrieve the
+ user data pointer for an array (useful for typing
+ arrays)
+ - The ppdEmitString() function did not compute the
+ required buffer size properly, leading to dropped
+ characters on the end of the printer commands in pstops
+ and imagetops (STR #1470)
+
+
+CHANGES IN CUPS V1.2b1
 
  - The serial backend now supports Equinox 8-port serial
  hubs (STR #526)

CREDITS.txt

@@ -1,37 +1,41 @@
-CREDITS.txt - 02/23/2006
+CREDITS.txt - 2006-02-23
 ------------------------
 
 Few projects are completed by one person, and CUPS is no exception. We'd
 like to thank the following individuals for their contributions:
 
- Nathaniel Barbour - Lots of testing and feedback.
- N. Becker - setsid().
- Jean-Eric Cuendet - GhostScript filters for CUPS.
- Van Dang - HTTP and IPP policeman.
- L. Peter Deutsch - MD5 code.
- Dr. ZP Han - setgid()/setuid().
- Guy Harris - *BSD shared libraries and lots of other fixes.
- Bjoern Jacke - I18N stuff.
- Wang Jian - CUPS RPM corrections.
- Roderick Johnstone - Beta tester of the millenium.
- Till Kamppeter - Bug fixes, beta testing, evangelism.
- Kenshi Muto - Japanese localization, patches, and testing.
- Kiko - Bug fixes.
- Sergey V. Kovalyov - ESP Print Pro and CUPS beta tester.
- Mark Lawrence - Microsoft interoperability testing.
- Jeff Licquia - Bug fixes, beta testing, evangelism.
- Jason McMullan - Original CUPS RPM distributions.
- Wes Morgan - *BSD fixes.
- Ulrich Oldendorf - German locale.
- Giulio Orsero - Bug fixes and testing.
- Kurt Pfeifle - Bug fixes, beta testing, evangelism.
- Gilles QUERRET - French man pages.
- Petter Reinholdtsen - HP-UX compiler stuff.
- Stuart Stevens - HP JetDirect IPP information.
- Andrea Suatoni - IRIX desktop integration and testing.
- Tomohiro Kato - Japanese localization.
- Tim Waugh - Lots of patches, testing, and Linux integration.
- Yugami - LDAP browsing support.
+ Nathaniel Barbour - Lots of testing and feedback.
+ N. Becker - setsid().
+ Jean-Eric Cuendet - GhostScript filters for CUPS.
+ Van Dang - HTTP and IPP policeman.
+ L. Peter Deutsch - MD5 code.
+ Dr. ZP Han - setgid()/setuid().
+ Guy Harris - *BSD shared libraries and lots of other
+ fixes.
+ Bjoern Jacke - I18N stuff.
+ Wang Jian - CUPS RPM corrections.
+ Roderick Johnstone - Beta tester of the millenium.
+ Till Kamppeter - Bug fixes, beta testing, evangelism.
+ Kenshi Muto - Japanese localization, patches, and
+ testing.
+ Kiko - Bug fixes.
+ Sergey V. Kovalyov - ESP Print Pro and CUPS beta tester.
+ Mark Lawrence - Microsoft interoperability testing.
+ Jeff Licquia - Bug fixes, beta testing, evangelism.
+ Jason McMullan - Original CUPS RPM distributions.
+ Wes Morgan - *BSD fixes.
+ Ulrich Oldendorf - German locale.
+ Giulio Orsero - Bug fixes and testing.
+ Kurt Pfeifle - Bug fixes, beta testing, evangelism.
+ Gilles QUERRET - French man pages.
+ Petter Reinholdtsen - HP-UX compiler stuff.
+ Juan Pablo Gonz�lez Riopedre - Spanish localization
+ Stuart Stevens - HP JetDirect IPP information.
+ Andrea Suatoni - IRIX desktop integration and testing.
+ Tomohiro Kato - Japanese localization.
+ Tim Waugh - Lots of patches, testing, and Linux
+ integration.
+ Yugami - LDAP browsing support.
 
 If I've missed someone, please let me know by sending an email to
 "[email protected]".

INSTALL.txt

@@ -1,4 +1,4 @@
-INSTALL - CUPS v1.2b1 - 2006-03-03
+INSTALL - CUPS v1.2b2 - 2006-03-09
 ----------------------------------
 
 This file describes how to compile and install CUPS from source

Makedefs.in

@@ -1,5 +1,5 @@
 #
-# "$Id: Makedefs.in 5229 2006-03-05 16:48:12Z mike $"
+# "$Id: Makedefs.in 5314 2006-03-20 19:06:50Z mike $"
 #
 # Common makefile definitions for the Common UNIX Printing System (CUPS).
 #
@@ -73,6 +73,12 @@ CUPS_PRIMARY_SYSTEM_GROUP = @CUPS_PRIMARY_SYSTEM_GROUP@
 CUPS_CONFIG_FILE_PERM = @CUPS_CONFIG_FILE_PERM@
 CUPS_LOG_FILE_PERM = @CUPS_LOG_FILE_PERM@
 
+#
+# Languages to install...
+#
+
+LANGUAGES = @LANGUAGES@
+
 #
 # Libraries...
 #
@@ -97,11 +103,19 @@ INSTALLSTATIC = @INSTALLSTATIC@
 #
 # Program options...
 #
-# OPTIM defines the common compiler optimization/debugging options.
-# OPTIONS defines other compile-time options (currently only -dDEBUG for
-# extra debug info)
+# ARCHFLAGS Defines the default architecture build options, used
+# when compiling separate 32/64-bit libraries.
+# ARCH32FLAGS Defines the 32-bit architecture build options, used
+# when compiling separate 32/64-bit libraries.
+# ARCH64FLAGS Defines the 64-bit architecture build options, used
+# when compiling separate 32/64-bit libraries.
+# OPTIM Defines the common compiler optimization/debugging options
+# for all architectures.
+# OPTIONS Defines other compile-time options (currently only -DDEBUG
+# for extra debug info)
 #
 
+ARCHFLAGS = @ARCHFLAGS@
 ARFLAGS = @ARFLAGS@
 BACKLIBS = @BACKLIBS@
 CFLAGS = -I.. $(RC_CFLAGS) $(SSLFLAGS) @CPPFLAGS@ @CFLAGS@ \
@@ -114,18 +128,38 @@ CXXLIBS = @CXXLIBS@
 DSOFLAGS = @DSOFLAGS@
 DSOLIBS = @DSOLIBS@ $(COMMONLIBS)
 IMGLIBS = @IMGLIBS@ -lm
+IMGFILTERS = @IMGFILTERS@
 LDFLAGS = -L../cups -L../filter $(RC_CFLAGS) @LDFLAGS@ $(OPTIM)
 LINKCUPS = @LINKCUPS@ $(SSLLIBS)
 LINKCUPSIMAGE = @LINKCUPSIMAGE@
 LIBS = $(LINKCUPS) $(COMMONLIBS)
 OPTIM = @OPTIM@
 OPTIONS =
 PAMLIBS = @PAMLIBS@
+PDFTOPS = @PDFTOPS@
 PHPDIR = @PHPDIR@
 SSLFLAGS = @SSLFLAGS@
 SSLLIBS = @SSLLIBS@
 LAUNCHDLIBS = @LAUNCHDLIBS@
 
+#
+# Separate 32/64-bit library support...
+#
+
+ARCH32FLAGS = @ARCH32FLAGS@
+INSTALL32 = @INSTALL32@
+LIB32CUPS = @LIB32CUPS@
+LIB32CUPSIMAGE = @LIB32CUPSIMAGE@
+LIB32DIR = $(BUILDROOT)@LIB32DIR@
+UNINSTALL32 = @UNINSTALL32@
+
+ARCH64FLAGS = @ARCH64FLAGS@
+INSTALL64 = @INSTALL64@
+LIB64CUPS = @LIB64CUPS@
+LIB64CUPSIMAGE = @LIB64CUPSIMAGE@
+LIB64DIR = $(BUILDROOT)@LIB64DIR@
+UNINSTALL64 = @UNINSTALL64@
+
 #
 # Directories...
 #
@@ -175,6 +209,7 @@ SBINDIR = $(BUILDROOT)@sbindir@
 SERVERBIN = $(BUILDROOT)@CUPS_SERVERBIN@
 SERVERROOT = $(BUILDROOT)@CUPS_SERVERROOT@
 STATEDIR = $(BUILDROOT)@CUPS_STATEDIR@
+XINETD = @XINETD@
 
 MAN1EXT = @MAN1EXT@
 MAN5EXT = @MAN5EXT@
@@ -194,15 +229,23 @@ DBUSDIR = @DBUSDIR@
 #
 
 .SILENT:
-.SUFFIXES: .1 .1.gz .1m .1m.gz .5 .5.gz .7 .7.gz .8 .8.gz .a .c .cxx .h .man .o .gz
+.SUFFIXES: .1 .1.gz .1m .1m.gz .5 .5.gz .7 .7.gz .8 .8.gz .a .c .cxx .h .man .o .32.o .64.o .gz
 
 .c.o:
  echo Compiling $<...
- $(CC) $(OPTIM) $(CFLAGS) -c $<
+ $(CC) $(ARCHFLAGS) $(OPTIM) $(CFLAGS) -c $<
+
+.c.32.o:
+ echo Compiling 32-bit $<...
+ $(CC) $(ARCH32FLAGS) $(OPTIM) $(CFLAGS) -c -o $@ $<
+
+.c.64.o:
+ echo Compiling 64-bit $<...
+ $(CC) $(ARCH64FLAGS) $(OPTIM) $(CFLAGS) -c -o $@ $<
 
 .cxx.o:
  echo Compiling $<...
- $(CXX) $(OPTIM) $(CXXFLAGS) -c $<
+ $(CXX) $(ARCHFLAGS) $(OPTIM) $(CXXFLAGS) -c $<
 
 .man.1 .man.1m .man.5 .man.7 .man.8:
  echo Linking $<...
@@ -216,5 +259,5 @@ DBUSDIR = @DBUSDIR@
 
 
 #
-# End of "$Id: Makedefs.in 5229 2006-03-05 16:48:12Z mike $"
+# End of "$Id: Makedefs.in 5314 2006-03-20 19:06:50Z mike $"
 #

Makefile

@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile 5229 2006-03-05 16:48:12Z mike $"
+# "$Id: Makefile 5314 2006-03-20 19:06:50Z mike $"
 #
 # Top-level Makefile for the Common UNIX Printing System (CUPS).
 #
@@ -29,7 +29,7 @@ include Makedefs
 #
 
 DIRS = cups backend berkeley cgi-bin filter locale man monitor \
- notifier pdftops scheduler systemv test \
+ notifier $(PDFTOPS) scheduler systemv test \
  $(PHPDIR) \
  conf data doc fonts ppd templates
 
@@ -81,7 +81,7 @@ install: installhdrs
  $(INSTALL_DIR) -m 755 $(BINDIR)
  $(INSTALL_SCRIPT) cups-config $(BINDIR)/cups-config
  echo Installing startup script...
- if test "x$(INITDIR)" != "x"; then \
+ if test "x$(INITDIR)" != x; then \
  $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/init.d; \
  $(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/init.d/cups; \
  $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc0.d; \
@@ -93,7 +93,7 @@ install: installhdrs
  $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc5.d; \
  $(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/rc5.d/S99cups; \
  fi
- if test "x$(INITDIR)" = "x" -a "x$(INITDDIR)" != "x"; then \
+ if test "x$(INITDIR)" = x -a "x$(INITDDIR)" != x; then \
  $(INSTALL_DIR) $(BUILDROOT)$(INITDDIR); \
  if test "$(INITDDIR)" = "/System/Library/StartupItems/PrintingServices"; then \
  $(INSTALL_SCRIPT) init/PrintingServices $(BUILDROOT)$(INITDDIR)/PrintingServices; \
@@ -106,11 +106,29 @@ install: installhdrs
  $(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDDIR)/cups; \
  fi \
  fi
- if test "x$(DBUSDIR)" != "x"; then \
+ if test "x$(DBUSDIR)" != x; then \
  echo Installing cups.conf in $(DBUSDIR)...;\
  $(INSTALL_DIR) -m 755 $(BUILDROOT)$(DBUSDIR); \
  $(INSTALL_DATA) packaging/cups-dbus.conf $(BUILDROOT)$(DBUSDIR)/cups.conf; \
  fi
+ if test "x$(XINETD)" != x; then \
+ echo Installing xinetd configuration file for cups-lpd...; \
+ $(INSTALL_DIR) -m 755 $(BUILDROOT)$(XINETD); \
+ $(INSTALL_DATA) init/cups-lpd $(BUILDROOT)$(XINETD)/cups-lpd; \
+ fi
+ if test -d /usr/share/applications; then \
+ echo Installing desktop icons...; \
+ $(INSTALL_DIR) -m 755 $(BUILDROOT)/usr/share/applications; \
+ $(INSTALL_DATA) desktop/cups.desktop $(BUILDROOT)/usr/share/applications; \
+ $(INSTALL_DIR) -m 755 $(BUILDROOT)/usr/share/icons/hicolor/16x16/apps; \
+ $(INSTALL_DATA) desktop/cups-16.png $(BUILDROOT)/usr/share/icons/hicolor/16x16/apps/cups.png; \
+ $(INSTALL_DIR) -m 755 $(BUILDROOT)/usr/share/icons/hicolor/32x32/apps; \
+ $(INSTALL_DATA) desktop/cups-32.png $(BUILDROOT)/usr/share/icons/hicolor/32x32/apps/cups.png; \
+ $(INSTALL_DIR) -m 755 $(BUILDROOT)/usr/share/icons/hicolor/64x64/apps; \
+ $(INSTALL_DATA) desktop/cups-64.png $(BUILDROOT)/usr/share/icons/hicolor/64x64/apps/cups.png; \
+ $(INSTALL_DIR) -m 755 $(BUILDROOT)/usr/share/icons/hicolor/128x128/apps; \
+ $(INSTALL_DATA) desktop/cups-128.png $(BUILDROOT)/usr/share/icons/hicolor/128x128/apps/cups.png; \
+ fi
 
 
 #
@@ -138,7 +156,7 @@ uninstall:
  $(RM) $(BINDIR)/cups-config
  -$(RMDIR) $(BINDIR)
  echo Uninstalling startup script...
- if test "x$(INITDIR)" != "x"; then \
+ if test "x$(INITDIR)" != x; then \
  $(RM) $(BUILDROOT)$(INITDIR)/init.d/cups; \
  $(RMDIR) $(BUILDROOT)$(INITDIR)/init.d; \
  $(RM) $(BUILDROOT)$(INITDIR)/rc0.d/K00cups; \
@@ -150,7 +168,7 @@ uninstall:
  $(RM) $(BUILDROOT)$(INITDIR)/rc5.d/S99cups; \
  $(RMDIR) $(BUILDROOT)$(INITDIR)/rc5.d; \
  fi
- if test "x$(INITDIR)" = "x" -a "x$(INITDDIR)" != "x"; then \
+ if test "x$(INITDIR)" = x -a "x$(INITDDIR)" != x; then \
  if test "$(INITDDIR)" = "/System/Library/StartupItems/PrintingServices"; then \
  $(RM) $(BUILDROOT)$(INITDDIR)/PrintingServices; \
  $(RM) $(BUILDROOT)$(INITDDIR)/StartupParameters.plist; \
@@ -163,11 +181,17 @@ uninstall:
  fi \
  $(RMDIR) $(BUILDROOT)$(INITDDIR); \
  fi
- if test "x$(DBUSDIR)" != "x"; then \
+ if test "x$(DBUSDIR)" != x; then \
  echo Uninstalling cups.conf in $(DBUSDIR)...;\
  $(RM) $(BUILDROOT)$(DBUSDIR)/cups.conf; \
  $(RMDIR) $(BUILDROOT)$(DBUSDIR); \
  fi
+ $(RM) $(BUILDROOT)/etc/xinetd.d/cups-lpd
+ $(RM) $(BUILDROOT)/usr/share/applications/cups.desktop
+ $(RM) $(BUILDROOT)/usr/share/icons/hicolor/16x16/apps/cups.png
+ $(RM) $(BUILDROOT)/usr/share/icons/hicolor/32x32/apps/cups.png
+ $(RM) $(BUILDROOT)/usr/share/icons/hicolor/64x64/apps/cups.png
+ $(RM) $(BUILDROOT)/usr/share/icons/hicolor/128x128/apps/cups.png
 
 
 #
@@ -193,5 +217,5 @@ epm:
 
 
 #
-# End of "$Id: Makefile 5229 2006-03-05 16:48:12Z mike $".
+# End of "$Id: Makefile 5314 2006-03-20 19:06:50Z mike $".
 #

README.txt

@@ -1,4 +1,4 @@
-README - CUPS v1.2b1 - 2006-03-03
+README - CUPS v1.2b2 - 2006-03-09
 ---------------------------------
 
 Looking for compile instructions? Read the file "INSTALL.txt"