8 files changed, 14 insertions, 14 deletions

diff --git a/NEWS b/NEWS
index ba48b9c..50057e6 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-Version 1.0.5 (?)
+Version 2.0.0 (Jan ? 2012)
 * Added support for Lua 5.2
 * Added HTML reference manual
 * Added CMake build support
diff --git a/build-packages.sh b/build-packages.sh
index db5903b..2dacb8c 100755
--- a/build-packages.sh
+++ b/build-packages.sh
@@ -5,7 +5,7 @@
 # Build packages. Use current checked out version, or a specific tag/commit.
 
 # Files requiring a version bump
-VERSION_FILES="lua-cjson-1.1devel-1.rockspec lua-cjson.spec lua_cjson.c manual.txt runtests.sh tests/test.lua"
+VERSION_FILES="lua-cjson-2.0devel-1.rockspec lua-cjson.spec lua_cjson.c manual.txt runtests.sh tests/test.lua"
 
 [ "$1" ] && BRANCH="$1" || BRANCH="`git describe --match '1.[0-9]*'`"
 VERSION="`git describe --match '1.[0-9]*' $BRANCH`"
@@ -25,8 +25,8 @@ git archive --prefix="$PREFIX/" "$BRANCH" | tar xf - -C "$BUILDROOT"
 cd "$BUILDROOT"
 
 cd "$PREFIX"
-rename 1.1devel "$VERSION" $VERSION_FILES
-perl -pi -e "s/\\b1.1devel\\b/$VERSION/g" ${VERSION_FILES/1.1devel/$VERSION};
+rename 2.0devel "$VERSION" $VERSION_FILES
+perl -pi -e "s/\\b2.0devel\\b/$VERSION/g" ${VERSION_FILES/2.0devel/$VERSION};
 cd ..
 
 make -C "$PREFIX" doc
diff --git a/lua-cjson-1.1devel-1.rockspec b/lua-cjson-2.0devel-1.rockspec
index c8c4367..9a2ac04 100644
--- a/lua-cjson-1.1devel-1.rockspec
+++ b/lua-cjson-2.0devel-1.rockspec
@@ -1,8 +1,8 @@
 package = "lua-cjson"
-version = "1.1devel-1"
+version = "2.0devel-1"
 
 source = {
-    url = "http://www.kyne.com.au/~mark/software/download/lua-cjson-1.1devel.zip",
+    url = "http://www.kyne.com.au/~mark/software/download/lua-cjson-2.0devel.zip",
 }
 
 description = {
diff --git a/lua-cjson.spec b/lua-cjson.spec
index 4642857..108651c 100644
--- a/lua-cjson.spec
+++ b/lua-cjson.spec
@@ -3,7 +3,7 @@
 %define luadatadir %{_datadir}/lua/%{luaver}
 
 Name:           lua-cjson
-Version:        1.1devel
+Version:        2.0devel
 Release:        1%{?dist}
 Summary:        A fast JSON encoding/parsing library for Lua
 
diff --git a/lua_cjson.c b/lua_cjson.c
index f5af350..b14c242 100644
--- a/lua_cjson.c
+++ b/lua_cjson.c
@@ -51,7 +51,7 @@
 #endif
 
 #ifndef CJSON_VERSION
-#define CJSON_VERSION   "1.1devel"
+#define CJSON_VERSION   "2.0devel"
 #endif
 
 /* Workaround for Solaris platforms missing isinf() */
diff --git a/manual.txt b/manual.txt
index 35b2c2e..8ca4778 100644
--- a/manual.txt
+++ b/manual.txt
@@ -1,4 +1,4 @@
-= Lua CJSON 1.1devel Manual =
+= Lua CJSON 2.0devel Manual =
 Mark Pulford <mark@kyne.com.au>
 :revdate: November 30, 2011
 
@@ -84,7 +84,7 @@ the included RPM spec file. Install the +rpm-build+ package (or
 similar) then:
 
 [source,sh]
-rpmbuild -tb lua-cjson-1.1devel.tar.gz
+rpmbuild -tb lua-cjson-2.0devel.tar.gz
 rpm -Uvh $newly_built_lua_cjson_rpm
 
 
@@ -97,7 +97,7 @@ modules on a wide range of platforms (including Windows).
 Extract the Lua CJSON source package into a directory and run:
 
 [source,sh]
-cd lua-cjson-1.1devel
+cd lua-cjson-2.0devel
 luarocks make
 
 [NOTE]
@@ -536,7 +536,7 @@ The name of the Lua CJSON module (+"cjson"+).
 _VERSION
 ~~~~~~~~
 
-The version number of the Lua CJSON module (Eg, +"1.1devel"+).
+The version number of the Lua CJSON module (Eg, +"2.0devel"+).
 
 
 null
diff --git a/runtests.sh b/runtests.sh
index a301488..cdc33e6 100755
--- a/runtests.sh
+++ b/runtests.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 PLATFORM="`uname -s`"
-[ "$1" ] && VERSION="$1" || VERSION="1.1devel"
+[ "$1" ] && VERSION="$1" || VERSION="2.0devel"
 
 set -e
 
diff --git a/tests/test.lua b/tests/test.lua
index 8c50b02..ac6419a 100755
--- a/tests/test.lua
+++ b/tests/test.lua
@@ -92,7 +92,7 @@ local cjson_tests = {
     -- Test API variables
     { "Check module name, version",
       function () return json._NAME, json._VERSION end, { },
-      true, { "cjson", "1.1devel" } },
+      true, { "cjson", "2.0devel" } },
 
     -- Test decoding simple types
     { "Decode string",