Build,Doc: Update files for 2012.12 release.

6 files changed, 14 insertions, 5 deletions

diff --git a/NEWS b/NEWS
index e5dbc7c..9fcd54e 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,12 @@
+glmark2 2012.12 (20121218)
+==========================
+
+* Add a refraction (2 interface) and reflection benchmark (scene 'reflect').
+* Add a new canvas object which allows rendering to GBM managed surfaces
+  and page flipping to DRM managed framebuffer from a console.
+* Enhancements to visual config mechanism to consider stencil size in the
+  selection criteria and to query all config attribs.
+
 glmark2 2012.11 (20121126)
 ==========================
 
diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index 4bb5b8b..71fde82 100644
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       android:versionCode="1"
-      android:versionName="2012.11" package="org.linaro.glmark2">
+      android:versionName="2012.12" package="org.linaro.glmark2">
     <application android:label="@string/app_name">
         <activity android:name="org.linaro.glmark2.MainActivity"
                   android:label="@string/title_activity_main">
diff --git a/android/jni/Android.mk b/android/jni/Android.mk
index 0f43608..6887d78 100644
--- a/android/jni/Android.mk
+++ b/android/jni/Android.mk
@@ -54,7 +54,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE := libglmark2-android
 LOCAL_STATIC_LIBRARIES := libglmark2-matrix libglmark2-png libglmark2-ideas libglmark2-jpeg
-LOCAL_CFLAGS := -DGLMARK_DATA_PATH="" -DGLMARK_VERSION="\"2012.11\"" \
+LOCAL_CFLAGS := -DGLMARK_DATA_PATH="" -DGLMARK_VERSION="\"2012.12\"" \
                 -DUSE_GLESv2 -Werror -Wall -Wextra -Wnon-virtual-dtor \
                 -Wno-error=unused-parameter
 LOCAL_SHARED_LIBRARIES := liblog libz libEGL libGLESv2 libandroid libdl libstlport
diff --git a/android/jni/Android.ndk.mk b/android/jni/Android.ndk.mk
index 1f3f8b9..0279799 100644
--- a/android/jni/Android.ndk.mk
+++ b/android/jni/Android.ndk.mk
@@ -47,7 +47,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE := libglmark2-android
 LOCAL_STATIC_LIBRARIES := libglmark2-matrix libglmark2-png libglmark2-ideas libglmark2-jpeg
-LOCAL_CFLAGS := -DGLMARK_DATA_PATH="" -DGLMARK_VERSION="\"2012.11\"" \
+LOCAL_CFLAGS := -DGLMARK_DATA_PATH="" -DGLMARK_VERSION="\"2012.12\"" \
                 -DUSE_GLESv2 -Werror -Wall -Wextra -Wnon-virtual-dtor \
                 -Wno-error=unused-parameter
 LOCAL_LDLIBS := -landroid -llog -lGLESv2 -lEGL -lz
diff --git a/doc/glmark2.1.in b/doc/glmark2.1.in
index a58eacb..f2409df 100644
--- a/doc/glmark2.1.in
+++ b/doc/glmark2.1.in
@@ -1,4 +1,4 @@
-.TH @APPNAME@ "1" "November 2012" "@appname@ @appversion@"
+.TH @APPNAME@ "1" "December 2012" "@appname@ @appversion@"
 .SH NAME
 @appname@ \- OpenGL (ES) 2.0 benchmark suite
 .SH SYNOPSIS
diff --git a/wscript b/wscript
index 18cca76..11e7d51 100644
--- a/wscript
+++ b/wscript
@@ -8,7 +8,7 @@ from waflib import Context
 out = 'build'
 top = '.'
 
-VERSION = '2012.11'
+VERSION = '2012.12'
 APPNAME = 'glmark2'
 
 def options(opt):