Mirror 1.1.x changes.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/branches/branch-1.2@3768 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/CHANGES-1.1.txt b/CHANGES-1.1.txt
index 0ce6972ae12f6a0cd397c277637d1c6e683fbcf9..417561e992b5f34ec1bfa3fb4c1c6ab528f37db4 100644 (file)
--- a/CHANGES-1.1.txt
+++ b/CHANGES-1.1.txt
@@ -3,6 +3,12 @@ CHANGES-1.1.txt
 
 CHANGES IN CUPS V1.1.20rc1
 
+       - The French and German option-conflict.tmpl template
+         files did not get installed (STR #148)
+       - The cups.list.in file did not work when compiling
+         without shared libraries (STR #149)
+       - The DSOFLAGS included the LDFLAGS, which causes
+         problems on at least HP-UX (STR #150)
        - The fax printer support did not keep track of the fax
          capability bit (STR #144)
        - The appleLangDefault() function could leak a small

diff --git a/Makedefs.in b/Makedefs.in
index 3b7422623de04463b25ae9f5412d5291dd2e2112..1f5c3e2f3bdc4743d257889f99c342e4d909c3df 100644 (file)
--- a/Makedefs.in
+++ b/Makedefs.in
@@ -1,5 +1,5 @@
 #
-# "$Id: Makedefs.in,v 1.36.2.17 2003/04/17 14:21:33 mike Exp $"
+# "$Id: Makedefs.in,v 1.36.2.18 2003/06/14 13:35:49 mike Exp $"
 #
 #   Common makefile definitions for the Common UNIX Printing System (CUPS).
 #
@@ -89,7 +89,7 @@ CFLAGS                =       $(RC_CFLAGS) @CPPFLAGS@ @CFLAGS@ -I.. $(OPTIONS)
 COMMONLIBS     =       @COMMONLIBS@
 CXXFLAGS       =       $(RC_CFLAGS) @CPPFLAGS@ @CXXFLAGS@ -I.. $(OPTIONS)
 CXXLIBS                =       @CXXLIBS@
-DSOFLAGS       =       @LDFLAGS@ @DSOFLAGS@
+DSOFLAGS       =       @DSOFLAGS@
 DSOLIBS                =       @DSOLIBS@ $(COMMONLIBS)
 IMGLIBS                =       @IMGLIBS@ -lm
 LDFLAGS                =       -L../cups -L../filter $(RC_CFLAGS) @LDFLAGS@ $(OPTIM)
@@ -183,5 +183,5 @@ MAN8DIR             =       @MAN8DIR@
 
 
 #
-# End of "$Id: Makedefs.in,v 1.36.2.17 2003/04/17 14:21:33 mike Exp $"
+# End of "$Id: Makedefs.in,v 1.36.2.18 2003/06/14 13:35:49 mike Exp $"
 #

diff --git a/cups.list.in b/cups.list.in
index a3c8b93ce21b3df0b9c71b779c84c765dfa032fe..d430d4489d46fe174a4daf4262b8e15aafa8511f 100644 (file)
--- a/cups.list.in
+++ b/cups.list.in
@@ -1,5 +1,5 @@
 #
-# "$Id: cups.list.in,v 1.13.2.19 2003/05/15 17:48:30 mike Exp $"
+# "$Id: cups.list.in,v 1.13.2.20 2003/06/14 13:35:49 mike Exp $"
 #
 #   ESP Package Manager (EPM) file list for the Common UNIX Printing
 #   System (CUPS).
@@ -46,8 +46,8 @@
 %provides libcupsys2-dev
 
 %format rpm deb portable
-%provides libcups.so.2
-%provides libcupsimage.so.2
+%provides @LIBCUPS@
+%provides @LIBCUPSIMAGE@
 %format all
 
 #
@@ -103,6 +103,8 @@ $CAT8EXT=@CAT8EXT@
 $MAN8EXT=@MAN8EXT@
 $MAN8DIR=@MAN8DIR@
 
+$DSOLIBS=@DSOLIBS@
+
 # Make sure the MD5 password file is now owned by CUPS_USER...
 %postinstall if test -f $SERVERROOT/passwd.md5; then
 %postinstall chown $CUPS_USER $SERVERROOT/passwd.md5
@@ -184,6 +186,7 @@ l 0555 root sys /usr/bsd/lprm $BINDIR/lprm
 %system all
 
 # DSOs
+%if DSOLIBS
 %system hpux
 f 0555 root sys $LIBDIR/libcups.sl.2 cups/libcups.sl.2
 l 0555 root sys $LIBDIR/libcups.sl libcups.sl.2
@@ -203,6 +206,7 @@ l 0555 root sys $LIBDIR/libcups.so libcups.so.2
 f 0555 root sys $LIBDIR/libcupsimage.so.2 filter/libcupsimage.so.2
 l 0555 root sys $LIBDIR/libcupsimage.so libcupsimage.so.2
 %system all
+%endif
 
 # Directories
 d 0755 root sys $LOGDIR -
@@ -408,5 +412,5 @@ f 0444 root sys $AMANDIR/man$MAN8DIR/lpmove.$MAN8EXT man/lpmove.man
 i 0555 root sys cups cups.sh
 
 #
-# End of "$Id: cups.list.in,v 1.13.2.19 2003/05/15 17:48:30 mike Exp $".
+# End of "$Id: cups.list.in,v 1.13.2.20 2003/06/14 13:35:49 mike Exp $".
 #

diff --git a/scheduler/file.c b/scheduler/file.c
index 63ee43cdedafdee9ac212e6d37c0beee59d04618..3f64c4452c59e2c45d3860a04e553c07b35b9e15 100644 (file)
--- a/scheduler/file.c
+++ b/scheduler/file.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: file.c,v 1.1.2.3 2003/04/10 14:13:53 mike Exp $"
+ * "$Id: file.c,v 1.1.2.4 2003/06/14 13:35:50 mike Exp $"
  *
  *   File functions for the Common UNIX Printing System (CUPS).
  *
@@ -830,7 +830,7 @@ cups_fill(cups_file_t *fp)          /* I - CUPS file */
     * Decompress data from the buffer...
     */
 
-    fp->stream.next_out  = fp->buf;
+    fp->stream.next_out  = (Bytef *)fp->buf;
     fp->stream.avail_out = sizeof(fp->buf);
 
     if (inflate(&(fp->stream), Z_NO_FLUSH) == Z_STREAM_END)
@@ -969,5 +969,5 @@ cups_write(int        fd,           /* I - File descriptor */
 
 
 /*
- * End of "$Id: file.c,v 1.1.2.3 2003/04/10 14:13:53 mike Exp $".
+ * End of "$Id: file.c,v 1.1.2.4 2003/06/14 13:35:50 mike Exp $".
  */