Bump version number strings and dates for 1.2 release.

6 files changed, 16 insertions, 18 deletions

diff --git a/README b/README
index 3585b43d..81a98f4c 100644
--- a/README
+++ b/README
@@ -21,9 +21,8 @@ supporting multi-threaded operation. In the absence of a thread library
 it will run single-threaded, but by adding one significant benefits in
 rendering speed on multi-core platforms can be obtained.
 
-We don't support interactive features such as form filling, javascript and
-transitions, but such features can be added on by integrators if they so
-desire.
+Interactive features such as form filling, javascript and transitions
+are in development and partially supported by the Android application.
 
 LICENSE
 
@@ -46,12 +45,9 @@ For commercial licensing please contact sales@artifex.com.
 COMPILING
 
 If you are compiling from source you will need several third party libraries:
-freetype2, jbig2dec, libjpeg, openjpeg, and zlib. We have prepared a package
-(mupdf-thirdparty.zip) that you can unzip in the mupdf source tree if you don't
-have them installed on your system.
-
-You must unpack mupdf-thirdparty.zip to build using the Visual Studio or Xcode
-projects, or the example android makefiles.
+freetype2, jbig2dec, libjpeg, openjpeg, and zlib. These libraries are contained
+in the source archive. If you are using git, they are included as git
+submodules.
 
 DOWNLOAD
 
@@ -59,6 +55,10 @@ The latest development source is available directly from the git repository:
 
 	git clone http://mupdf.com/repos/mupdf.git
 
+In the mupdf directory, update the third party libraries:
+
+	git submodule update --init
+
 INSTALLING (UNIX)
 
 Typing "make prefix=/usr/local install" will install the binaries, man-pages,
diff --git a/android/ReadMe.txt b/android/ReadMe.txt
index fc885d83..5120fc6b 100644
--- a/android/ReadMe.txt
+++ b/android/ReadMe.txt
@@ -115,9 +115,7 @@ capable of building for android is capable of doing a normal hosted
 build.
 
 On windows (where you are using cygwin), or on linux/macos, this can be
-as simple as running 'make' in the top level directory. Even if the
-make process fails, it should get far enough to generate you the required
-'generated' directory, and you can continue through these instructions.
+as simple as running 'make generate' in the top level directory.
 
 11) Change into mupdf's android directory. Copy the
 android/local.properties.sample file to be android/local.properties and
diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml
index 28995d2e..06ff9983 100644
--- a/android/res/values/strings.xml
+++ b/android/res/values/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_name">MuPDF</string>
-    <string name="version">1.1 (Build 6)</string>
+    <string name="version">1.2</string>
     <string name="no_media_warning">Storage Media not present</string>
     <string name="no_media_hint">Sharing the storage media with a PC can make it inaccessible</string>
     <string name="open_failed">Unable to open document</string>
diff --git a/apps/pdfapp.c b/apps/pdfapp.c
index 6a0e8054..d26071b5 100644
--- a/apps/pdfapp.c
+++ b/apps/pdfapp.c
@@ -44,8 +44,8 @@ static void pdfapp_error(pdfapp_t *app, char *msg)
 char *pdfapp_version(pdfapp_t *app)
 {
 	return
-		"MuPDF 1.1\n"
-		"Copyright 2006-2012 Artifex Software, Inc.\n";
+		"MuPDF 1.2\n"
+		"Copyright 2006-2013 Artifex Software, Inc.\n";
 }
 
 char *pdfapp_usage(pdfapp_t *app)
diff --git a/fitz/memento.c b/fitz/memento.c
index 7c3c6200..bbd0455f 100644
--- a/fitz/memento.c
+++ b/fitz/memento.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001-2012 Artifex Software, Inc.
+/* Copyright (C) 2001-2013 Artifex Software, Inc.
    All Rights Reserved.
 
    This software is provided AS-IS with no warranty, either express or
diff --git a/ios/Info.plist b/ios/Info.plist
index 2b181b3d..0595910d 100644
--- a/ios/Info.plist
+++ b/ios/Info.plist
@@ -19,11 +19,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.1</string>
+	<string>1.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.1</string>
+	<string>1.2</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UIFileSharingEnabled</key>