From cfc1d978df582a280b680b7f46027b05020f140f Mon Sep 17 00:00:00 2001
From: Steve Zesch <stevezesch2@gmail.com>
Date: Wed, 22 Feb 2012 21:13:37 -0500
Subject: Preparing for 1.2 release

---
 ChangeLog    | 44 ++++++++++++++++++++++++++++++++++++++++++++
 autogen.sh   |  4 ++--
 configure.in |  4 ++--
 3 files changed, 48 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 56077c7..4eaf97c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,47 @@
+commit bc53751054ab3b2e693620311e6cd80bccb8b831
+Author: Perberos <perberos@gmail.com>
+Date:   Wed Feb 22 01:58:42 2012 -0300
+
+    some ugly gtk3 porting
+
+ libmate-desktop/libmateui/mate-bg-crossfade.h |   15 ++-
+ libmate-desktop/libmateui/mate-bg.h           |   26 ++--
+ libmate-desktop/mate-bg-crossfade.c           |   84 +++++++----
+ libmate-desktop/mate-bg.c                     |  199 +++++++++++++++++-------
+ 4 files changed, 222 insertions(+), 102 deletions(-)
+
+commit 23d4ca43c7d3659ad619c0534424ef16b94be6ca
+Author: Perberos <perberos@gmail.com>
+Date:   Wed Feb 22 01:57:43 2012 -0300
+
+        set patch on archlinux script
+
+ distro/archlinux/PKGBUILD |   15 ++++++++-------
+ 1 files changed, 8 insertions(+), 7 deletions(-)
+
+commit 341fc293a5edc0dda25c4a8d465d19bd293fb6da
+Author: Perberos <perberos@gmail.com>
+Date:   Wed Feb 22 01:57:06 2012 -0300
+
+    GOptionEntry was added on glib 2.6
+
+ mate-about/mate-about.c |   41 ++++++++++++++++++++++++++++++++---------
+ mate-about/mate-about.h |   43 +++++++++++++++++++++++++++++++++++++++----
+ 2 files changed, 71 insertions(+), 13 deletions(-)
+
+commit c72d30463c6def093499fac8b4b55885975e799d
+Author: stefano <stefano@aspire5633.(none)>
+Date:   Sun Jan 29 16:12:00 2012 +0100
+
+    fix some things for MATE
+
+ AUTHORS      |   13 ++-
+ ChangeLog    |  364 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ MAINTAINERS  |    4 +-
+ README       |   19 +---
+ configure.in |    4 +-
+ 5 files changed, 383 insertions(+), 21 deletions(-)
+
 commit 63feb69a05a25164862e1cc05b75f5c995ba112c
 Author: Steve Zesch <stevezesch2@gmail.com>
 Date:   Mon Jan 9 22:15:23 2012 -0500
diff --git a/autogen.sh b/autogen.sh
index 81f2422..ac5f901 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -12,7 +12,7 @@ PKG_NAME="mate-desktop"
     exit 1
 }
 
-which mate-autogen.sh || {
+which mate-autogen || {
     echo "You need to install mate-common from the MATE Git"
     exit 1
 }
@@ -21,5 +21,5 @@ REQUIRED_AUTOMAKE_VERSION=1.9
 USE_MATE2_MACROS=1
 USE_COMMON_DOC_BUILD=yes
 
-. mate-autogen.sh
+. mate-autogen
 
diff --git a/configure.in b/configure.in
index 0b165d9..7e8640b 100644
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 m4_define([mate_platform], [1])
-m4_define([mate_minor], [1])
-m4_define([mate_micro], [1])
+m4_define([mate_minor], [2])
+m4_define([mate_micro], [0])
 
 m4_define(mate_version, [mate_platform.mate_minor.mate_micro]),
 
-- 
cgit v1.2.1