diff options
| author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2011-09-14 22:44:45 +0000 |
|---|---|---|
| committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2011-09-14 22:44:45 +0000 |
| commit | 83e080011117b6125721e132de22edb18266e5eb (patch) | |
| tree | bb8fd72df96757839578ea2fa98f9fd1d9c53036 /packaging | |
| parent | 85dda01c84763aecc4d31e15246d0ac5986eedae (diff) | |
| download | cups-83e080011117b6125721e132de22edb18266e5eb.tar.gz | |
Merge changes from CUPS 1.6svn-r10002
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@3421 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/cups.list.in | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/packaging/cups.list.in b/packaging/cups.list.in index c901371db..b94dbfc72 100644 --- a/packaging/cups.list.in +++ b/packaging/cups.list.in @@ -225,9 +225,7 @@ $XINETD=@XINETD@ $LIB32DIR=@LIB32DIR@ $LIB64DIR=@LIB64DIR@ -$IMGFILTERS=@IMGFILTERS@ $MDNS=@MDNS@ -$PDFTOPS=@PDFTOPS@ $CUPS_USER=@CUPS_USER@ $CUPS_GROUP=@CUPS_GROUP@ @@ -243,6 +241,7 @@ $MAN7EXT=@MAN7EXT@ $MAN8EXT=@MAN8EXT@ $MAN8DIR=@MAN8DIR@ +$LIBZ=@LIBZ@ $DSOLIBS=@DSOLIBS@ # Make sure the MD5 password file is now owned by CUPS_USER... @@ -489,11 +488,7 @@ f 0444 root sys $DATADIR/banners/standard data/standard f 0444 root sys $DATADIR/banners/topsecret data/topsecret f 0444 root sys $DATADIR/banners/unclassified data/unclassified -d 0755 root sys $DATADIR/charsets - -f 0444 root sys $DATADIR/charsets/utf-8 data/utf-8 - d 0755 root sys $DATADIR/data - -f 0444 root sys $DATADIR/data/psglyphs data/psglyphs f 0444 root sys $DATADIR/data/testprint data/testprint d 0755 root sys $DATADIR/drv - @@ -502,9 +497,6 @@ f 0444 root sys $DATADIR/drv/sample.drv ppdc/sample.drv d 0755 root sys $DATADIR/examples - f 0444 root sys $DATADIR/examples examples/*.drv -d 0755 root sys $DATADIR/fonts - -f 0444 root sys $DATADIR/fonts fonts/Monospace* - d 0755 root sys $DATADIR/ipptool - f 0444 root sys $DATADIR/ipptool/create-printer-subscription.test test/create-printer-subscription.test f 0444 root sys $DATADIR/ipptool/get-completed-jobs.test test/get-completed-jobs.test @@ -570,8 +562,9 @@ d 0755 root sys $SERVERROOT - d 0755 root $CUPS_GROUP $SERVERROOT/interfaces - d 0755 root $CUPS_GROUP $SERVERROOT/ppd - d 0700 root $CUPS_GROUP $SERVERROOT/ssl - -c $CUPS_PERM root $CUPS_GROUP $SERVERROOT/ conf/*.conf +c $CUPS_PERM root $CUPS_GROUP $SERVERROOT/cupsd.conf conf/cupsd.conf f $CUPS_PERM root $CUPS_GROUP $SERVERROOT/cupsd.conf.default conf/cupsd.conf +c $CUPS_PERM root $CUPS_GROUP $SERVERROOT/snmp.conf conf/snmp.conf %if PAMDIR d 0755 root sys $PAMDIR - @@ -587,10 +580,8 @@ f 0444 root sys $INCLUDEDIR/cups/array.h cups/array.h f 0444 root sys $INCLUDEDIR/cups/backend.h cups/backend.h f 0444 root sys $INCLUDEDIR/cups/cups.h cups/cups.h f 0444 root sys $INCLUDEDIR/cups/dir.h cups/dir.h -f 0444 root sys $INCLUDEDIR/cups/driver.h driver/driver.h f 0444 root sys $INCLUDEDIR/cups/file.h cups/file.h f 0444 root sys $INCLUDEDIR/cups/http.h cups/http.h -f 0444 root sys $INCLUDEDIR/cups/image.h filter/image.h f 0444 root sys $INCLUDEDIR/cups/ipp.h cups/ipp.h f 0444 root sys $INCLUDEDIR/cups/mime.h scheduler/mime.h f 0444 root sys $INCLUDEDIR/cups/language.h cups/language.h |