Przeglądaj źródła

Update version number and license information

Neal Wilson 7 lat temu
rodzic
commit
bdc372c45e
5 zmienionych plików z 58 dodań i 32 usunięć
  1. 29
    7
      README
  2. 4
    4
      src/resources/Info.plist
  3. 17
    13
      src/resources/html/about.html
  4. 6
    6
      src/typica.rc
  5. 2
    2
      src/typica.w

+ 29
- 7
README Wyświetl plik

@@ -1,12 +1,9 @@
1
-Typica is a free cross platform application for recording, managing, and using
2
-common records generated in commercial specialty coffee roasting operations
3
-such as roast profiles and green coffee inventory records.
4
-
5
-Project web site: http://www.randomfield.com/programs/typica/
1
+Typica is a free cross platform application for coffee roasting operations.
2
+More information is available on the project web site: https://typica.us/
6 3
 
7 4
 Typica is free software released under the MIT license as follows:
8 5
 
9
-Copyright 2007-2016 Neal Evan Wilson
6
+Copyright 2007-2017 Neal Evan Wilson
10 7
 
11 8
 Permission is hereby granteed, free of charge, to any person obtaining a copy
12 9
 of this software and associated documentation files (the "Software"), to deal
@@ -54,4 +51,29 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
54 51
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
55 52
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
56 53
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
57
-SOFTWARE.
54
+SOFTWARE.
55
+
56
+Parts of Typica are from qrcode-svg which is also used under the MIT license
57
+as follows:
58
+
59
+The MIT License (MIT)
60
+
61
+Copyright (c) 2016 papnkukn
62
+
63
+Permission is hereby granted, free of charge, to any person obtaining a copy
64
+of this software and associated documentation files (the "Software"), to deal
65
+in the Software without restriction, including without limitation the rights
66
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
67
+copies of the Software, and to permit persons to whom the Software is
68
+furnished to do so, subject to the following conditions:
69
+
70
+The above copyright notice and this permission notice shall be included in all
71
+copies or substantial portions of the Software.
72
+
73
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
74
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
75
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
76
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
77
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
78
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
79
+SOFTWARE.

+ 4
- 4
src/resources/Info.plist Wyświetl plik

@@ -7,7 +7,7 @@
7 7
 	<key>CFBundlePackageType</key>
8 8
 	<string>APPL</string>
9 9
 	<key>CFBundleGetInfoString</key>
10
-	<string>Typica 1.7.0</string>
10
+	<string>Typica 1.8.0</string>
11 11
 	<key>CFBundleSignature</key>
12 12
 	<string>@TYPEINFO@</string>
13 13
 	<key>CFBundleExecutable</key>
@@ -17,10 +17,10 @@
17 17
 	<key>CFBundleDisplayName</key>
18 18
 	<string>Typica</string>
19 19
 	<key>CFBundleShortVersionString</key>
20
-	<string>1.7.0</string>
20
+	<string>1.8.0</string>
21 21
 	<key>CFBundleVersion</key>
22
-	<string>1.7.0</string>
22
+	<string>1.8.0</string>
23 23
 	<key>NSHumanReadableCopyright</key>
24
-	<string>© 2007–2016 Neal Wilson</string>
24
+	<string>© 2007–2017 Neal Wilson</string>
25 25
 </dict>
26 26
 </plist>

+ 17
- 13
src/resources/html/about.html Wyświetl plik

@@ -1,32 +1,30 @@
1 1
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1 plus MathML 2.0 plus SVG 1.1//EN" "http://www.w3.org/2002/04/xhtml-math-svg.dtd">
2 2
 <html xmlns="http://www.w3.org/1999/xhtml">
3 3
 	<head>
4
-		<title>Typica - Data for Coffee Roasters</title>
4
+		<title>Typica - Software for Coffee Roasting Operations</title>
5 5
 		<link rel="stylesheet" type="text/css" href="style.css" />
6 6
 	</head>
7 7
 	<body>
8 8
 		<div id="page">
9 9
 			<div id="topmatter">
10 10
 				<div class="topbanner">
11
-					<a href="http://www.randomfield.com/programs/typica/"><img src="../icons/appicons/logo96.png" height="96px" width="96px" alt="Typica logo" /></a>
12
-					<h1><a href="http://www.randomfield.com/programs/typica/">Typica</a></h1>
13
-					<h2>Version 1.7.0</h2>
11
+					<a href="https://typica.us/"><img src="../icons/appicons/logo96.png" height="96px" width="96px" alt="Typica logo" /></a>
12
+					<h1><a href="https://typica.us/">Typica</a></h1>
13
+					<h2>Version 1.8.0</h2>
14 14
 				</div>
15 15
 			<div id="maintext">
16
-				<p>Copyright &copy; 2007&ndash;2016 Neal Evan Wilson
16
+				<p>Copyright &copy; 2007&ndash;2017 Neal Evan Wilson
17 17
 					<span class="icons">
18
-						<a href="mailto:roaster@wilsonscoffee.com?subject=Thanks%20for%20Typica&amp;body=Message%20initiated%20from%20Typica.">&#9993;</a>
18
+						<a href="mailto:neal@typica.us?subject=Thanks%20for%20Typica&amp;body=Message%20initiated%20from%20Typica.">&#9993;</a>
19 19
 						<a href="https://twitter.com/N3Roaster">&#62217;</a>
20 20
 						<a href="https://github.com/N3Roaster">&#62208;</a>
21
-						<a href="http://appliedcoffeetechnology.tumblr.com/">&#62229;</a>
22
-						<a href="http://www.linkedin.com/profile/view?id=179814079">&#62232;</a>
23 21
 					</span>
24 22
 				</p>
25 23
 				<p>German Translation: Mario Champignon
26
-                                    <span class="icons">
27
-                                        <a href="mailto:mario_champignon@hotmail.com">&#9993;</a>
28
-                                    </span>
29
-                                </p>
24
+                    <span class="icons">
25
+                        <a href="mailto:mario_champignon@hotmail.com">&#9993;</a>
26
+                    </span>
27
+                </p>
30 28
 				
31 29
 				<h3>License Information</h3>
32 30
 				<p>Permission is hereby granted, free of charge, to any person
@@ -93,7 +91,13 @@
93 91
 					<li>The name Michael Bostock may not be used to endorse or promote products derived from this software without specific prior written permission.
94 92
 				</ul>
95 93
 				<p>THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL MICHAEL BOSTOCK BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</p>
96
-
94
+				<p>QR codes are generated by a slightly modified <a href="https://github.com/papnkukn/qrcode-svg">qrcode-svg</a> which is provided under the following license.</p>
95
+				<p>The MIT License (MIT)</p>
96
+				<p>Copyright (c) 2016 papnkukn</p>
97
+				<p>Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:</p>
98
+				<p>The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.</p>
99
+				<p>THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.</p>
100
+				<p>The word "QR Code" is <a href="http://www.denso-wave.com/qrcode/faqpatent-e.html">registered trademark of DENSO WAVE INCORPORATED</a>.</p>
97 101
 			</div>
98 102
 		</div>
99 103
 	</body>

+ 6
- 6
src/typica.rc Wyświetl plik

@@ -1,7 +1,7 @@
1 1
 #include <winver.h>
2 2
 VS_VERSION_INFO	VERSIONINFO
3
-FILEVERSION 	1,7,0,0
4
-PRODUCTVERSION 	1,7,0,0
3
+FILEVERSION 	1,8,0,0
4
+PRODUCTVERSION 	1,8,0,0
5 5
 FILEFLAGSMASK	0x3fL
6 6
 #ifdef _DEBUG
7 7
 	FILEFLAGS	VS_FF_DEBUG
@@ -16,13 +16,13 @@ BEGIN
16 16
 		BLOCK "040904b0"
17 17
 		BEGIN
18 18
 			VALUE "CompanyName", "Wilson's Coffee & Tea\0"
19
-			VALUE "FileDescription", "Typica 1.7.0\0"
20
-			VALUE "FileVersion", "1.7.0\0"
19
+			VALUE "FileDescription", "Typica 1.8.0\0"
20
+			VALUE "FileVersion", "1.8.0\0"
21 21
 			VALUE "InternalName", "Typica\0"
22
-			VALUE "LegalCopyright", "Copyright 2007-2016 Neal Evan Wilson\0"
22
+			VALUE "LegalCopyright", "Copyright 2007-2017 Neal Evan Wilson\0"
23 23
 			VALUE "OriginalFilename", "Typica.exe\0"
24 24
 			VALUE "ProductName", "Typica\0"
25
-			VALUE "ProductVersion", "1.7.0\0"
25
+			VALUE "ProductVersion", "1.8.0\0"
26 26
 		END
27 27
 	END
28 28
 	BLOCK "VarFileInfo"

+ 2
- 2
src/typica.w Wyświetl plik

@@ -22,8 +22,8 @@
22 22
 \mark{\noexpand\nullsec0{A Note on Notation}}
23 23
 \def\pn{Typica}
24 24
 \def\filebase{typica}
25
-\def\version{1.7.0 \number\year-\number\month-\number\day}
26
-\def\years{2007--2016}
25
+\def\version{1.8.0 \number\year-\number\month-\number\day}
26
+\def\years{2007--2017}
27 27
 \def\title{\pn{} (Version \version)}
28 28
 \newskip\dangerskipb
29 29
 \newskip\dangerskip

Ładowanie…
Anuluj
Zapisz