From: msweet Date: Tue, 14 Dec 2010 21:25:17 +0000 (+0000) Subject: Merge changes from CUPS 1.5svn-r9407. X-Git-Tag: release-1.6.3~58 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c779abb06a2a4c102b65b3f9f65e4ca6a792fff7;p=thirdparty%2Fcups.git Merge changes from CUPS 1.5svn-r9407. git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@2910 a1ca3aef-8c08-0410-bb20-df032aa958be --- diff --git a/backend/usb-unix.c b/backend/usb-unix.c index a1c4a1afdb..03b70d2941 100644 --- a/backend/usb-unix.c +++ b/backend/usb-unix.c @@ -142,7 +142,7 @@ print_device(const char *uri, /* I - Device URI */ } else { - _cupsLangPrintError(stderr, "ERROR", _("Unable to open device file")); + _cupsLangPrintError("ERROR", _("Unable to open device file")); return (CUPS_BACKEND_FAILED); } } diff --git a/conf/cupsd.conf.in b/conf/cupsd.conf.in index 1950e05e3c..790c02b498 100644 --- a/conf/cupsd.conf.in +++ b/conf/cupsd.conf.in @@ -52,7 +52,7 @@ WebInterface @CUPS_WEBIF@ JobPrivateAccess default JobPrivateValues default SubscriptionPrivateAccess default - SubscriptionPrivateAccess default + SubscriptionPrivateValues default # Job-related operations must be done by the owner or an administrator... @@ -95,7 +95,7 @@ WebInterface @CUPS_WEBIF@ JobPrivateAccess default JobPrivateValues default SubscriptionPrivateAccess default - SubscriptionPrivateAccess default + SubscriptionPrivateValues default # Job-related operations must be done by the owner or an administrator... diff --git a/config-scripts/cups-defaults.m4 b/config-scripts/cups-defaults.m4 index 314426632b..412edf1fa4 100644 --- a/config-scripts/cups-defaults.m4 +++ b/config-scripts/cups-defaults.m4 @@ -28,7 +28,7 @@ dnl Mac OS X bundle-based localization support AC_ARG_WITH(bundledir, [ --with-bundledir set Mac OS X localization bundle directory ], CUPS_BUNDLEDIR="$withval", if test "x$uname" = xDarwin; then - CUPS_BUNDLEDIR="/System/Library/Frameworks/ApplicationServices.framework/Frameworks/PrintCore.framework" + CUPS_BUNDLEDIR="/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/PrintCore.framework/Versions/A" LANGUAGES="" else CUPS_BUNDLEDIR="" diff --git a/doc/help/api-raster.html b/doc/help/api-raster.html index 3d7875cdca..ce43c7a6c6 100644 --- a/doc/help/api-raster.html +++ b/doc/help/api-raster.html @@ -4,7 +4,7 @@ Raster API - +