Makefile fixes for DSO installation.

Added SuSE PAM config file.

Updated version numbers in distribution files.

Added new EPSON printers to escp2.drv.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@1313 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/CHANGES.txt b/CHANGES.txt
index c71ef889ed130c19ea07a2729b732f1750db293f..ceb2113e39087a25e39750b797c2f9d162eed9c2 100644 (file)
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,7 +4,7 @@ CHANGES.txt - 08/04/2000
 CHANGES IN CUPS v1.1.3
 
        - Makefile fixes.
-       - Documentation fixes.
+       - Documentation updates.
        - Enabled pstoraster debug messages for everything
          (only logged when LogLevel set to "debug"...)
        - Changed the Input/OutputAttributes fix in
@@ -28,6 +28,18 @@ CHANGES IN CUPS v1.1.3
          an unauthenticated "root" user is sent.
        - The cancel-job, hold-job, release-job, and restart-job
          operations didn't log the authenticated username.
+       - The cups-lpd mini-daemon now checks for a
+         document-format option before forcing raw mode with
+         filter mode 'l'.
+       - The pstops filter assumed that a file with a Trailer
+         comment would also have an EOF comment.
+       - Added new cupsSetPasswordCB(), cupsSetServer(),
+         cupsSetUser(), and ippSetPort() functions to better
+         support client applications (especially GUIs...)
+       - The CUPS-add-class and CUPS-add-printer operations
+         didn't reset the printer-name attribute on remote
+         print queues that had to be renamed when a local
+         printer was defined with the same name.
 
 
 CHANGES IN CUPS v1.1.2

diff --git a/cups.list b/cups.list
index 094f1ab5a8125a69a3d05f7ef6721c1866ae8b9b..1d14c7f0a2b901a64df006892f9016ac92b0413a 100644 (file)
--- a/cups.list
+++ b/cups.list
@@ -1,5 +1,5 @@
 #
-# "$Id: cups.list,v 1.77 2000/08/04 14:53:49 mike Exp $"
+# "$Id: cups.list,v 1.78 2000/08/24 17:54:26 mike Exp $"
 #
 #   ESP Package Manager (EPM) file list for the Common UNIX Printing
 #   System (CUPS).
@@ -28,7 +28,7 @@
 %vendor Easy Software Products
 %license LICENSE.txt
 %readme README.txt
-%version 1.1.2
+%version 1.1.3
 %incompat printpro
 
 %system all
@@ -311,10 +311,12 @@ f 0644 root sys $SERVERROOT/mime.types conf/mime.types
 c 0644 root sys $SERVERROOT/printers.conf conf/printers.conf
 
 %system linux
-# Linux version needs PAM...
-%requires /lib/libpam.so.0
 d 0555 root sys $PAMDIR -
 c 0644 root sys $PAMDIR/cups data/cups.pam
+c 0644 root sys $PAMDIR/cups.suse data/cups.suse
+%install if test -f /lib/security/pam_unix.so; then
+%install     mv $PAMDIR/cups.suse $PAMDIR/cups
+%install fi
 %system all
 
 # Developer files
@@ -505,5 +507,5 @@ f 0444 root sys $MANDIR/man5/printers.conf.5 man/printers.conf.man
 i 0555 root sys cups cups.sh
 
 #
-# End of "$Id: cups.list,v 1.77 2000/08/04 14:53:49 mike Exp $".
+# End of "$Id: cups.list,v 1.78 2000/08/24 17:54:26 mike Exp $".
 #

diff --git a/cups/Makefile b/cups/Makefile
index 1cb01a578656622b5d2531ff6d727ece7b892d91..4e9e71bd646201882399859e2eabca5b76c598ae 100644 (file)
--- a/cups/Makefile
+++ b/cups/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile,v 1.41 2000/08/18 17:24:41 mike Exp $"
+# "$Id: Makefile,v 1.42 2000/08/24 17:54:27 mike Exp $"
 #
 #   Support library Makefile for the Common UNIX Printing System (CUPS).
 #
@@ -76,8 +76,8 @@ install:      all
        $(INSTALL_LIB) $(LIBCUPS) $(LIBDIR)
        if test $(LIBCUPS) != "libcups.a" -a $(LIBCUPS) != "libcups.la"; then \
                $(INSTALL_LIB) libcups.a $(LIBDIR); \
-               $(RM) `basename $(LIBCUPS) .2`; \
-               $(LN) $(LIBCUPS) `basename $(LIBCUPS) .2`; \
+               $(RM) `basename $(LIBDIR)/$(LIBCUPS) .2`; \
+               $(LN) $(LIBCUPS) `basename $(LIBDIR)/$(LIBCUPS) .2`; \
        fi
 
 
@@ -162,5 +162,5 @@ $(OBJS):    ../Makedefs ../config.h
 
 
 #
-# End of "$Id: Makefile,v 1.41 2000/08/18 17:24:41 mike Exp $".
+# End of "$Id: Makefile,v 1.42 2000/08/24 17:54:27 mike Exp $".
 #

diff --git a/data/Makefile b/data/Makefile
index 64f0240ccc3d1d88ca848f715fa40781b2d43d67..758047c6040353910a50bd84f8bc28317c0f9531 100644 (file)
--- a/data/Makefile
+++ b/data/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile,v 1.10 2000/07/07 17:02:38 mike Exp $"
+# "$Id: Makefile,v 1.11 2000/08/24 17:54:27 mike Exp $"
 #
 #   Datafile makefile for the Common UNIX Printing System (CUPS).
 #
@@ -94,10 +94,14 @@ install:
        -if test "$(PAMDIR)" != ""; then \
                $(MKDIR) $(PAMDIR); \
                $(CHMOD) ugo+rx $(PAMDIR); \
-               $(INSTALL_DATA) cups.pam $(PAMDIR)/cups; \
+               if test -f /lib/security/pam_unix.so; then \
+                       $(INSTALL_DATA) cups.suse $(PAMDIR)/cups; \
+               else \
+                       $(INSTALL_DATA) cups.pam $(PAMDIR)/cups; \
+               fi \
        fi
 
 
 #
-# End of "$Id: Makefile,v 1.10 2000/07/07 17:02:38 mike Exp $".
+# End of "$Id: Makefile,v 1.11 2000/08/24 17:54:27 mike Exp $".
 #

diff --git a/data/cups.suse b/data/cups.suse
new file mode 100644 (file)
index 0000000..0c26fbe
--- /dev/null
+++ b/data/cups.suse
@@ -0,0 +1,2 @@
+auth   required        /lib/security/pam_unix.so nullok shadow
+account        required        /lib/security/pam_unix.so

diff --git a/filter/Makefile b/filter/Makefile
index 20ee91932bca34a7191c0557fb6e365294522ac2..27e38dd4636459bbf3956c2dfdede19e88097d06 100644 (file)
--- a/filter/Makefile
+++ b/filter/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile,v 1.36 2000/08/18 17:24:42 mike Exp $"
+# "$Id: Makefile,v 1.37 2000/08/24 17:54:28 mike Exp $"
 #
 #   Filter makefile for the Common UNIX Printing System (CUPS).
 #
@@ -71,8 +71,8 @@ install:
        $(CHMOD) ugo+rx $(LIBDIR)
        $(INSTALL_LIB) $(LIBCUPSIMAGE) $(LIBDIR)
        -if test $(LIBCUPSIMAGE) != "libcupsimage.a" -a $(LIBCUPSIMAGE) != "libcupsimage.la"; then \
-               $(RM) `basename $(LIBCUPSIMAGE) .2`; \
-               $(LN) $(LIBCUPSIMAGE) `basename $(LIBCUPSIMAGE) .2`; \
+               $(RM) `basename $(LIBDIR)/$(LIBCUPSIMAGE) .2`; \
+               $(LN) $(LIBCUPSIMAGE) `basename $(LIBDIR)/$(LIBCUPSIMAGE) .2`; \
        fi
 
 
@@ -203,5 +203,5 @@ $(OBJS):    ../Makedefs ../cups/cups.h ../cups/ppd.h ../cups/language.h
 
 
 #
-# End of "$Id: Makefile,v 1.36 2000/08/18 17:24:42 mike Exp $".
+# End of "$Id: Makefile,v 1.37 2000/08/24 17:54:28 mike Exp $".
 #