]> git.ipfire.org Git - thirdparty/cups.git/commitdiff
projects / thirdparty / cups.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 229681c)
Merge changes from CUPS 1.5svn-r9407.
authormsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Tue, 14 Dec 2010 21:25:17 +0000 (21:25 +0000)
committermsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Tue, 14 Dec 2010 21:25:17 +0000 (21:25 +0000)
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@2910 a1ca3aef-8c08-0410-bb20-df032aa958be

backend/usb-unix.c patch | blob | blame | history
conf/cupsd.conf.in patch | blob | blame | history
config-scripts/cups-defaults.m4 patch | blob | blame | history
doc/help/api-raster.html patch | blob | blame | history
doc/help/postscript-driver.html patch | blob | blame | history
doc/help/ppd-compiler.html patch | blob | blame | history
doc/help/raster-driver.html patch | blob | blame | history
doc/help/spec-ppd.html patch | blob | blame | history
filter/spec-ppd.shtml patch | blob | blame | history
locale/Makefile patch | blob | blame | history
test/ipp-1.1.test patch | blob | blame | history

diff --git a/backend/usb-unix.c b/backend/usb-unix.c
index a1c4a1afdb76d1535775966d9c3b47bafb489d59..03b70d2941cb8202937546c65b89e898b3d95b4b 100644 (file)
--- 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 1950e05e3c6543d44dda519b6364ca589c851981..790c02b4981fd4bfafa81d91a79d535ba7c3533f 100644 (file)
--- 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 314426632be310162a0250612e723cbce4f2e42e..412edf1fa4c441cb5c921d886a5db55ef2ac2d2d 100644 (file)
--- 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 3d7875cdca9485cc50a36e5ece7f9bd1c26b7aba..ce43c7a6c67606c152e916cc9019321f52259075 100644 (file)
--- 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 b74dc0364f6bbe9c92bd931a6017083c45002c3c..78056c9c4b4c42c666619d30d684208fa58877fd 100644 (file)
--- 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 9a40ca88e6b84e93919865595089adc3cef21cbb..c4a14f029b80b3c250dc37dcfca56c41648e7dd7 100644 (file)
--- 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 40346a66acad8b031653370fb62672ffc206cfd3..a7e7a62c532f59fab117c8fb967962c51f0a3435 100644 (file)
--- 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 1343d71f2fe82c1f8c889e0e4bd1c4e99d320993..e7da98a8a9a0cc0c3519df997469604ff1ebd396 100644 (file)
--- 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 96fb881338eed892e24371ec78e9e3504de4a9e4..3e58a3b010f15cdba027bf297acab60d87ca9b3a 100644 (file)
--- 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 1039addc7d77550ecf12b4e945266fdcd42342bf..8b672deb5cb9c96116e4b0e366d19ebe0e9c69cf 100644 (file)
--- 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 dc3147090aafbbbe4968543bd3c8d85653209962..8f1dcb4aebbcf8c31c0aac261856e0048bb8de22 100644 (file)
--- 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
 }
 
 
Unnamed repository; edit this file 'description' to name the repository.