Preparing for 1.4 release.mate-screensaver-1.4.0

2 files changed, 90 insertions, 18 deletions

diff --git a/ChangeLog b/ChangeLog
index 71d7db1..50e3642 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,75 @@
+commit c3ffeed1a2f6ca874d7659e60195d5682175d323
+Author: Stefano Karapetsas <[email protected]>
+Date:   Thu Jul 12 15:20:16 2012 +0200
+
+    add po gnome copyrights file
+
+ po/gnome-copyrights.txt |  936 +++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 936 insertions(+)
+
+commit 16f130591e7aff07e31ea7f1aea7bf294591ef80
+Author: Stefano Karapetsas <[email protected]>
+Date:   Thu Jul 12 15:19:52 2012 +0200
+
+    use mate logo instead of gnome one (thanks to Rowen_Stipe)
+
+ data/images/mate-logo-white.svg |  138 +++++++++++++++++++++++++++++++++++----
+ 1 file changed, 126 insertions(+), 12 deletions(-)
+
+commit 113e07aab983171b14e781d97ff385fcf48ca58f
+Author: Stefano Karapetsas <[email protected]>
+Date:   Sat May 26 13:02:08 2012 +0200
+
+    fix summary in configure.ac
+
+ configure.ac |   15 +++++++--------
+ 1 file changed, 7 insertions(+), 8 deletions(-)
+
+commit 2c5525c07a233d39d3bb50bf55aff3c611a84e3b
+Author: Stefano Karapetsas <[email protected]>
+Date:   Sat May 26 12:26:55 2012 +0200
+
+    move is_program_in_path() functon
+
+ src/gs-lock-plug.c |   30 +++++++++++++++---------------
+ 1 file changed, 15 insertions(+), 15 deletions(-)
+
+commit bd675919a09f0fc9c8dded090b746c3cec03fdf2
+Author: Stefano Karapetsas <[email protected]>
+Date:   Fri May 25 15:10:50 2012 +0200
+
+    removed distro/ubuntu folder
+
+ distro/ubuntu/build                |   38 ------------------------------------
+ distro/ubuntu/mate-screensaver.pam |    2 --
+ distro/ubuntu/postinst             |   11 -----------
+ distro/ubuntu/postrm               |    8 --------
+ distro/ubuntu/preinst              |    8 --------
+ distro/ubuntu/prerm                |   11 -----------
+ 6 files changed, 78 deletions(-)
+
+commit f51cc7168688b39495a55fa37a38d3a1a1fdce6b
+Author: Stefano Karapetsas <[email protected]>
+Date:   Fri May 25 14:49:24 2012 +0200
+
+    add GDM support for user switch
+
+ src/gs-lock-plug.c |   77 ++++++++++++++++++++++++++++++++++++++++++----------
+ 1 file changed, 63 insertions(+), 14 deletions(-)
+
+commit 7147ea499581b17738a31207bc0e3af36f675574
+Author: Stefano Karapetsas <[email protected]>
+Date:   Wed Mar 7 22:25:48 2012 +0100
+
+    update to 1.2
+
+ AUTHORS      |    7 +-
+ ChangeLog    |  490 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
+ README       |   21 +--
+ autogen.sh   |    4 +-
+ configure.ac |    2 +-
+ 5 files changed, 496 insertions(+), 28 deletions(-)
+
 commit 54177b5f8b76f05395ba760b7294a4ea2456adc8
 Author: Steve Zesch <[email protected]>
 Date:   Tue Jan 10 14:32:07 2012 -0500
@@ -5,7 +77,7 @@ Date:   Tue Jan 10 14:32:07 2012 -0500
     Changed mate.gr.jp to gnome.gr.jp as requested in issue #86
 
  po/ChangeLog |   88 +++++++++++++++++++++++++++++-----------------------------
- po/ja.po     |    4 +-
+ po/ja.po     |    4 +--
  2 files changed, 46 insertions(+), 46 deletions(-)
 
 commit 9d56c4253a096555c112bdbd1e0f115e207a13fe
@@ -15,7 +87,7 @@ Date:   Thu Dec 15 11:55:51 2011 +0100
     fixed pam for debian/ubuntu
 
  distro/ubuntu/mate-screensaver.pam |    5 ++---
- 1 files changed, 2 insertions(+), 3 deletions(-)
+ 1 file changed, 2 insertions(+), 3 deletions(-)
 
 commit f5c9e6aff100a5c740ffa85ab7154ca4a3f06dfe
 Author: Stefano Karapetsas <[email protected]>
@@ -48,7 +120,7 @@ Date:   Mon Nov 14 18:47:21 2011 -0300
     updating autogen.sh
 
  autogen.sh |   15 ++++++++-------
- 1 files changed, 8 insertions(+), 7 deletions(-)
+ 1 file changed, 8 insertions(+), 7 deletions(-)
 
 commit d02290be62508e6ec69e9dc87d6ce38c76af1f46
 Author: Perberos <[email protected]>
@@ -77,7 +149,7 @@ Date:   Sun Nov 6 11:13:28 2011 -0300
     mate-menus no es necesario
 
  distro/archlinux/PKGBUILD |    3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
+ 1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit 99b77b6da47f2cf186616a5bdaabf4fb23ff9ebc
 Author: Perberos <[email protected]>
@@ -95,9 +167,9 @@ Date:   Sun Nov 6 10:21:31 2011 -0300
 
     allman
 
- src/gs-monitor.c              |  419 +++++++++++++-----------------
+ src/gs-monitor.c              |  419 +++++++++++++----------------
  src/mate-screensaver-dialog.c |  583 +++++++++++++++++++----------------------
- src/mate-screensaver.c        |   91 ++++----
+ src/mate-screensaver.c        |   91 +++----
  src/mate-screensaver.h        |    2 +-
  4 files changed, 490 insertions(+), 605 deletions(-)
 
@@ -108,7 +180,7 @@ Date:   Sat Nov 5 11:22:38 2011 -0300
     cambiando la posicion del boton vista previa, para que se vea equilibrado
 
  data/mate-screensaver-preferences.ui |   46 +++++++++++-----------------------
- 1 files changed, 15 insertions(+), 31 deletions(-)
+ 1 file changed, 15 insertions(+), 31 deletions(-)
 
 commit f60fe9a0e93e5a988f0025c94daf104a4e0d1055
 Author: Perberos <[email protected]>
@@ -118,7 +190,7 @@ Date:   Sat Nov 5 10:59:33 2011 -0300
 
  distro/ubuntu/build                |    5 +++++
  distro/ubuntu/mate-screensaver.pam |    3 +++
- 2 files changed, 8 insertions(+), 0 deletions(-)
+ 2 files changed, 8 insertions(+)
 
 commit 3137f394f1c36916177dab7a4528cabe93b5fba3
 Author: Perberos <[email protected]>
@@ -137,7 +209,7 @@ Date:   Fri Nov 4 23:38:21 2011 -0300
     hay un error al intentar bloquear la pantalla, voy a deshabilitar la opcion de bloquear por defecto
 
  data/mate-screensaver.schemas.in |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 1edf6684b4713b0848f425d474fc1a43b073942d
 Author: Perberos <[email protected]>
@@ -171,7 +243,7 @@ Date:   Fri Nov 4 22:37:08 2011 -0300
  src/gs-job.c.orig                       |  567 -------
  src/gs-job.h.orig                       |   69 -
  src/gs-listener-dbus.c.orig             | 2272 --------------------------
- src/gs-listener-dbus.h.orig             |   89 -
+ src/gs-listener-dbus.h.orig             |   89 --
  src/gs-lock-plug.c.orig                 | 2050 ------------------------
  src/gs-lock-plug.h.orig                 |   82 -
  src/gs-manager.c.orig                   | 2030 ------------------------
@@ -200,7 +272,7 @@ Date:   Fri Nov 4 22:37:08 2011 -0300
  src/test-passwd.c.orig                  |  288 ----
  src/test-watcher.c.orig                 |  106 --
  src/test-window.c.orig                  |  180 ---
- 55 files changed, 0 insertions(+), 25348 deletions(-)
+ 55 files changed, 25348 deletions(-)
 
 commit 497dc1c333aeb0c327f073317e3c55491687f4cd
 Author: Perberos <[email protected]>
@@ -209,7 +281,7 @@ Date:   Fri Nov 4 22:31:11 2011 -0300
     actualizando readme
 
  README |    6 +++++-
- 1 files changed, 5 insertions(+), 1 deletions(-)
+ 1 file changed, 5 insertions(+), 1 deletion(-)
 
 commit 515c3ef7b02ccded0024402cacb6244f94a1eb02
 Author: Perberos <[email protected]>
@@ -456,8 +528,8 @@ Date:   Fri Nov 4 22:16:15 2011 -0300
  src/gs-watcher.h.orig                        |   65 +
  src/gs-window-x11.c                          | 2647 ++++++++++++++++++++++++++
  src/gs-window-x11.c.orig                     | 2647 ++++++++++++++++++++++++++
- src/gs-window.h                              |  106 +
- src/gs-window.h.orig                         |  106 +
+ src/gs-window.h                              |  106 ++
+ src/gs-window.h.orig                         |  106 ++
  src/mate-screensaver-command.c               |  551 ++++++
  src/mate-screensaver-command.c.orig          |  551 ++++++
  src/mate-screensaver-dialog.c                |  665 +++++++
@@ -482,8 +554,8 @@ Date:   Fri Nov 4 22:16:15 2011 -0300
  src/test-fade.c.orig                         |  134 ++
  src/test-passwd.c                            |  288 +++
  src/test-passwd.c.orig                       |  288 +++
- src/test-watcher.c                           |  106 +
- src/test-watcher.c.orig                      |  106 +
+ src/test-watcher.c                           |  106 ++
+ src/test-watcher.c.orig                      |  106 ++
  src/test-window.c                            |  180 ++
  src/test-window.c.orig                       |  180 ++
- 255 files changed, 127227 insertions(+), 0 deletions(-)
+ 255 files changed, 127227 insertions(+)
diff --git a/configure.ac b/configure.ac
index 65126a6..e29c232 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ dnl -*- mode: m4 -*-
 
 AC_PREREQ(2.60)
 AC_INIT([mate-screensaver],
-        [1.2.0],
+        [1.4.0],
         [http://www.mate-desktop.org/])
 
 AC_CONFIG_SRCDIR(src/mate-screensaver.c)