summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>2010-12-14 21:25:17 +0000
committermsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>2010-12-14 21:25:17 +0000
commitc779abb06a2a4c102b65b3f9f65e4ca6a792fff7 (patch)
tree5e8da09129ec17662d8b59b5729e116a3c95d11a
parent229681c188bf1940a4963a5796df4be65bb00825 (diff)
downloadcups-c779abb06a2a4c102b65b3f9f65e4ca6a792fff7.tar.gz
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
Diffstat
-rw-r--r--backend/usb-unix.c2
-rw-r--r--conf/cupsd.conf.in4
-rw-r--r--config-scripts/cups-defaults.m42
-rw-r--r--doc/help/api-raster.html2
-rw-r--r--doc/help/postscript-driver.html2
-rw-r--r--doc/help/ppd-compiler.html2
-rw-r--r--doc/help/raster-driver.html2
-rw-r--r--doc/help/spec-ppd.html4
-rw-r--r--filter/spec-ppd.shtml2
-rw-r--r--locale/Makefile6
-rw-r--r--test/ipp-1.1.test1
11 files changed, 15 insertions, 14 deletions
diff --git a/backend/usb-unix.c b/backend/usb-unix.c
index a1c4a1afd..03b70d294 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 1950e05e3..790c02b49 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...
<Limit Create-Job Print-Job Print-URI Validate-Job>
@@ -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...
<Limit Create-Job Print-Job Print-URI Validate-Job>
diff --git a/config-scripts/cups-defaults.m4 b/config-scripts/cups-defaults.m4
index 314426632..412edf1fa 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 3d7875cdc..ce43c7a6c 100644
--- a/doc/help/api-raster.html
+++ b/doc/help/api-raster.html
@@ -4,7 +4,7 @@
<head>
<title>Raster API</title>
<meta name="keywords" content="Programming">
-<meta name="creator" content="Mini-XML v2.6">
+<meta name="creator" content="Mini-XML v2.7">
<style type="text/css"><!--
BODY {
font-family: lucida grande, geneva, helvetica, arial, sans-serif;
diff --git a/doc/help/postscript-driver.html b/doc/help/postscript-driver.html
index b74dc0364..78056c9c4 100644
--- a/doc/help/postscript-driver.html
+++ b/doc/help/postscript-driver.html
@@ -4,7 +4,7 @@
<head>
<title>Developing PostScript Printer Drivers</title>
<meta name="keywords" content="Programming">
-<meta name="creator" content="Mini-XML v2.6">
+<meta name="creator" content="Mini-XML v2.7">
<style type="text/css"><!--
BODY {
font-family: lucida grande, geneva, helvetica, arial, sans-serif;
diff --git a/doc/help/ppd-compiler.html b/doc/help/ppd-compiler.html
index 9a40ca88e..c4a14f029 100644
--- a/doc/help/ppd-compiler.html
+++ b/doc/help/ppd-compiler.html
@@ -4,7 +4,7 @@
<head>
<title>Introduction to the PPD Compiler</title>
<meta name="keywords" content="Programming">
-<meta name="creator" content="Mini-XML v2.6">
+<meta name="creator" content="Mini-XML v2.7">
<style type="text/css"><!--
BODY {
font-family: lucida grande, geneva, helvetica, arial, sans-serif;
diff --git a/doc/help/raster-driver.html b/doc/help/raster-driver.html
index 40346a66a..a7e7a62c5 100644
--- a/doc/help/raster-driver.html
+++ b/doc/help/raster-driver.html
@@ -4,7 +4,7 @@
<head>
<title>Developing Raster Printer Drivers</title>
<meta name="keywords" content="Programming">
-<meta name="creator" content="Mini-XML v2.6">
+<meta name="creator" content="Mini-XML v2.7">
<style type="text/css"><!--
BODY {
font-family: lucida grande, geneva, helvetica, arial, sans-serif;
diff --git a/doc/help/spec-ppd.html b/doc/help/spec-ppd.html
index 1343d71f2..e7da98a8a 100644
--- a/doc/help/spec-ppd.html
+++ b/doc/help/spec-ppd.html
@@ -4,7 +4,7 @@
<head>
<title>CUPS PPD Extensions</title>
<meta name="keywords" content="Specifications">
-<meta name="creator" content="Mini-XML v2.6">
+<meta name="creator" content="Mini-XML v2.7">
<style type="text/css"><!--
BODY {
font-family: lucida grande, geneva, helvetica, arial, sans-serif;
@@ -752,7 +752,7 @@ f(x) = density * x <sup style='font-size: 100%'>gamma</sup>
<h3><span class='info'>CUPS 1.4/Mac OS X 10.6</span><a name='cupsUIResolver'>cupsUIResolver</a></h3>
-<p class='summary'>*cupsUIResolution resolver: "*Keyword1 OptionKeyword1 *Keyword2 OptionKeyword2 ..."</p>
+<p class='summary'>*cupsUIResolver resolver: "*Keyword1 OptionKeyword1 *Keyword2 OptionKeyword2 ..."</p>
<p>Specifies two or more options to mark/select to resolve a constraint. The "resolver" string identifies a particular action to take for one or more <a href='#cupsUIConstraints'><tt>cupsUIConstraints</tt></a>. The same action can be used for multiple constraints. The option keyword pairs are treated as an ordered list of option selections to try - only the first N selections will be used, where N is the minimum number of selections required. Because <a href="api-ppd.html#cupsResolveConflicts"><code>cupsResolveConflicts()</code></a> will not change the most recent option selection passed to it, at least two options from the constraints must be listed to avoid situations where conflicts cannot be resolved.</p>
diff --git a/filter/spec-ppd.shtml b/filter/spec-ppd.shtml
index 96fb88133..3e58a3b01 100644
--- a/filter/spec-ppd.shtml
+++ b/filter/spec-ppd.shtml
@@ -317,7 +317,7 @@ f(x) = density * x <sup style='font-size: 100%'>gamma</sup>
<h3><span class='info'>CUPS 1.4/Mac OS X 10.6</span><a name='cupsUIResolver'>cupsUIResolver</a></h3>
-<p class='summary'>*cupsUIResolution resolver: "*Keyword1 OptionKeyword1 *Keyword2 OptionKeyword2 ..."</p>
+<p class='summary'>*cupsUIResolver resolver: "*Keyword1 OptionKeyword1 *Keyword2 OptionKeyword2 ..."</p>
<p>Specifies two or more options to mark/select to resolve a constraint. The "resolver" string identifies a particular action to take for one or more <a href='#cupsUIConstraints'><tt>cupsUIConstraints</tt></a>. The same action can be used for multiple constraints. The option keyword pairs are treated as an ordered list of option selections to try - only the first N selections will be used, where N is the minimum number of selections required. Because <a href="api-ppd.html#cupsResolveConflicts"><code>cupsResolveConflicts()</code></a> will not change the most recent option selection passed to it, at least two options from the constraints must be listed to avoid situations where conflicts cannot be resolved.</p>
diff --git a/locale/Makefile b/locale/Makefile
index 1039addc7..8b672deb5 100644
--- a/locale/Makefile
+++ b/locale/Makefile
@@ -80,8 +80,8 @@ install-languages:
done
install-langbundle: po2strings
- $(INSTALL_DIR) -m 755 "$(BUILDROOT)$(CUPS_BUNDLEDIR)/Resources/English.lproj"
- $(INSTALL_DATA) cups.strings "$(BUILDROOT)$(CUPS_BUNDLEDIR)/Resources/English.lproj"
+ $(INSTALL_DIR) -m 755 "$(BUILDROOT)$(BUNDLEDIR)/Resources/English.lproj"
+ $(INSTALL_DATA) cups.strings "$(BUILDROOT)$(BUNDLEDIR)/Resources/English.lproj"
#
@@ -117,7 +117,7 @@ uninstall-languages:
done
uninstall-langbundle:
- $(RM) "$(BUILDROOT)$(CUPS_BUNDLEDIR)/Resources/English.lproj/cups.strings"
+ $(RM) "$(BUILDROOT)$(BUNDLEDIR)/Resources/English.lproj/cups.strings"
#
diff --git a/test/ipp-1.1.test b/test/ipp-1.1.test
index dc3147090..8f1dcb4ae 100644
--- a/test/ipp-1.1.test
+++ b/test/ipp-1.1.test
@@ -681,6 +681,7 @@
ATTR name requesting-user-name $user
STATUS successful-ok
+ STATUS client-error-not-possible
}
View Lorry Controller Status