diff options
| author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2009-07-01 16:36:51 +0000 |
|---|---|---|
| committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2009-07-01 16:36:51 +0000 |
| commit | 85b5d1dfa791308c7de8ca4195f8ccda256b92c3 (patch) | |
| tree | d51d125fb74a09707fae874ff2cff84c8fab067b /cgi-bin/makedocset.c | |
| parent | 4e6f60f000516756b3d46d42728d5a6c14f1f5fa (diff) | |
| download | cups-85b5d1dfa791308c7de8ca4195f8ccda256b92c3.tar.gz | |
Merge fixes from CUPS 1.4.0 (r8739).
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1586 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'cgi-bin/makedocset.c')
| -rw-r--r-- | cgi-bin/makedocset.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/cgi-bin/makedocset.c b/cgi-bin/makedocset.c index 501b1f499..7d90c8073 100644 --- a/cgi-bin/makedocset.c +++ b/cgi-bin/makedocset.c @@ -357,7 +357,7 @@ write_index(const char *path, /* I - File to write */ static void write_info(const char *path, /* I - File to write */ - const char *revision) /* I - Version number */ + const char *revision) /* I - Subversion revision number */ { cups_file_t *fp; /* File */ @@ -379,14 +379,22 @@ write_info(const char *path, /* I - File to write */ "\t<key>CFBundleName</key>\n" "\t<string>CUPS Documentation</string>\n" "\t<key>CFBundleVersion</key>\n" - "\t<string>1.4.%s</string>\n" + "\t<string>%d.%d.%s</string>\n" + "\t<key>CFBundleShortVersionString</key>\n" + "\t<string>%d.%d.%d</string>\n" "\t<key>DocSetFeedName</key>\n" "\t<string>cups.org</string>\n" "\t<key>DocSetFeedURL</key>\n" - "\t<string>http://www.cups.org/org.cups.docset.xar" + "\t<string>http://www.cups.org/org.cups.docset.atom" "</string>\n" + "\t<key>DocSetPublisherIdentifier</key>\n" + "\t<string>org.cups</string>\n" + "\t<key>DocSetPublisherName</key>\n" + "\t<string>CUPS</string>\n" "</dict>\n" - "</plist>\n", revision); + "</plist>\n", + CUPS_VERSION_MAJOR, CUPS_VERSION_MINOR, revision, + CUPS_VERSION_MAJOR, CUPS_VERSION_MINOR, CUPS_VERSION_PATCH); cupsFileClose(fp); } |