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)

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

diff --git a/CHANGES.txt b/CHANGES.txt
index 92ba77dafed987fd0c12e09c7fb8e3ba74ce4a09..19fc321549cddd57d297ccf95ce3e2b9248a9e20 100644 (file)
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,8 +1,14 @@
-CHANGES.txt - 06/11/2003
+CHANGES.txt - 06/14/2003
 ------------------------
 
 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 29b6b1b03443097859e6b2e5c7b22ea2657e9dd5..1a48da1fd3b9e098199683b00d01c4fd6a3cc285 100644 (file)
--- a/Makedefs.in
+++ b/Makedefs.in
@@ -1,5 +1,5 @@
 #
-# "$Id: Makedefs.in,v 1.60 2003/04/17 14:20:47 mike Exp $"
+# "$Id: Makedefs.in,v 1.61 2003/06/14 13:33:21 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.60 2003/04/17 14:20:47 mike Exp $"
+# End of "$Id: Makedefs.in,v 1.61 2003/06/14 13:33:21 mike Exp $"
 #

diff --git a/cups.list.in b/cups.list.in
index 4ada170d2accfd2f137a95c2c141b0606a6df5b0..6a73b4f3538f95f00533a15e566d3e88ecf1f0f1 100644 (file)
--- a/cups.list.in
+++ b/cups.list.in
@@ -1,5 +1,5 @@
 #
-# "$Id: cups.list.in,v 1.48 2003/05/15 17:48:16 mike Exp $"
+# "$Id: cups.list.in,v 1.49 2003/06/14 13:33:21 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 -
@@ -498,5 +502,5 @@ f 0444 root sys $AMANDIR/fr/man$MAN8DIR/lpmove.$MAN8EXT man/lpmove.man
 i 0555 root sys cups cups.sh
 
 #
-# End of "$Id: cups.list.in,v 1.48 2003/05/15 17:48:16 mike Exp $".
+# End of "$Id: cups.list.in,v 1.49 2003/06/14 13:33:21 mike Exp $".
 #

diff --git a/scheduler/file.c b/scheduler/file.c
index 886510fd35c797304c71c9ad08304463bbefb46f..fc17bcb4aeac746428b7b8efc8bb5fe1bfdb7ec0 100644 (file)
--- a/scheduler/file.c
+++ b/scheduler/file.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: file.c,v 1.3 2003/04/10 12:57:44 mike Exp $"
+ * "$Id: file.c,v 1.4 2003/06/14 13:33:22 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.3 2003/04/10 12:57:44 mike Exp $".
+ * End of "$Id: file.c,v 1.4 2003/06/14 13:33:22 mike Exp $".
  */

diff --git a/templates/de/Makefile b/templates/de/Makefile
index 79b75ebc975efe132efe4b803aedd5beb6d411c2..1c175462fb228f34c388e8e012b0f54c97b278c3 100644 (file)
--- a/templates/de/Makefile
+++ b/templates/de/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile,v 1.1 2003/01/16 20:04:18 mike Exp $"
+# "$Id: Makefile,v 1.2 2003/06/14 13:33:23 mike Exp $"
 #
 #   Template makefile for the Common UNIX Printing System (CUPS).
 #
@@ -56,6 +56,7 @@ FILES =       add-class.tmpl \
                modify-class.tmpl \
                modify-printer.tmpl \
                option-boolean.tmpl \
+               option-conflict.tmpl \
                option-header.tmpl \
                option-pickmany.tmpl \
                option-pickone.tmpl \
@@ -101,5 +102,5 @@ install:
 
 
 #
-# End of "$Id: Makefile,v 1.1 2003/01/16 20:04:18 mike Exp $".
+# End of "$Id: Makefile,v 1.2 2003/06/14 13:33:23 mike Exp $".
 #

diff --git a/templates/de/option-conflict.tmpl b/templates/de/option-conflict.tmpl
new file mode 100644 (file)
index 0000000..ac93296
--- /dev/null
+++ b/templates/de/option-conflict.tmpl
@@ -0,0 +1,7 @@
+<P><B>Störung:</B> Die folgenden Wahlen widersprechen:</P>
+
+<UL>
+{[ckeyword]<LI><A HREF="#{ckeyword}">{ckeytext}</A></LI>
+}</UL>
+
+<P>Ändern Sie bitte eine oder mehr der Wahlen, um die Konflikte zu beheben.

diff --git a/templates/fr/Makefile b/templates/fr/Makefile
index a141f6b14a3469cdbc447cefb60f92461d372db3..b1ce51b030ccf543b8ac60df4111d5052270d445 100644 (file)
--- a/templates/fr/Makefile
+++ b/templates/fr/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile,v 1.3 2002/12/17 19:00:23 swdev Exp $"
+# "$Id: Makefile,v 1.4 2003/06/14 13:33:24 mike Exp $"
 #
 #   Template makefile for the Common UNIX Printing System (CUPS).
 #
@@ -56,6 +56,7 @@ FILES =       add-class.tmpl \
                modify-class.tmpl \
                modify-printer.tmpl \
                option-boolean.tmpl \
+               option-conflict.tmpl \
                option-header.tmpl \
                option-pickmany.tmpl \
                option-pickone.tmpl \
@@ -101,5 +102,5 @@ install:
 
 
 #
-# End of "$Id: Makefile,v 1.3 2002/12/17 19:00:23 swdev Exp $".
+# End of "$Id: Makefile,v 1.4 2003/06/14 13:33:24 mike Exp $".
 #