[mate-desktop: 5/5] Merge branch 'f19'

[Dan Mashal]

commit e33bd84f559bf441b8c22950e6e55f35e7d86124
Merge: 4c04a6c 2743208
Author: Dan Mashal <dan.mashal at fedoraproject.org>
Date:   Fri May 31 10:23:55 2013 -0700

    Merge branch 'f19'
    
    Conflicts:
    	mate-desktop.spec

 mate-desktop.spec |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)
---
diff --cc mate-desktop.spec
index 30deb01,0d59cee..f6b50fe
--- a/mate-desktop.spec
+++ b/mate-desktop.spec
@@@ -1,7 -1,7 +1,7 @@@
  Summary:        Shared code for mate-panel, mate-session, mate-file-manager, etc
  Name:           mate-desktop
  Version:        1.6.1
--Release:        5%{?dist}
++Release:        6%{?dist}
  URL:            http://mate-desktop.org
  Source0:        http://pub.mate-desktop.org/releases/1.6/%{name}-%{version}.tar.xz
  # fix fedora backgrounds and
@@@ -148,8 -146,8 +147,12 @@@ f
  
  
  %changelog
- * Fri May 31 2013 Dan Mashal <dan.mashal at fedoraproject.org> - 1.6.1-5
++* Fri May 31 2013 Dan Mashal <dan.mashal at fedoraproject.org> - 1.6.1-6
 +- Obsolete all mate-conf packages for depsolving issues.
++- Keep changelogs in sync and bump release version.
++
+ * Tue May 28 2013 Dan Mashal <dan.mashal at fedoraproject.org> - 1.6.1-5
+ - Remove mate-notification-daemon from hard requires.
  
  * Sat May 25 2013 Dan Mashal <dan.mashal at fedoraproject.org> - 1.6.1-4
  - Own mateconf gsettings dir