[deja-dup: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/deja-dup

[Kai Engert]

commit 0c1a7fb3dca14404815f9a57df40e4084bf56e4f
Merge: 34086bc ae6b049
Author: Kai Engert <kaie at redhat.com>
Date:   Mon Jan 20 13:00:26 2014 +0100

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/deja-dup
    
    Conflicts:
    	deja-dup.spec
    	sources

 .gitignore    |    2 ++
 deja-dup.spec |   13 +++++++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)
---
diff --cc deja-dup.spec
index bead395,0f7b83c..5356a97
--- a/deja-dup.spec
+++ b/deja-dup.spec
@@@ -6,10 -6,9 +6,10 @@@ Summary:        Simple backup tool and 
  Group:          Applications/Archiving
  License:        GPLv3+
  URL:            https://launchpad.net/deja-dup
- Source0:        http://launchpad.net/%{name}/26/%{version}/+download/%{name}-%{version}.tar.xz
 -Source0:        http://launchpad.net/%{name}/28/%{version}/+download/%{name}-%{version}.tar.xz
++Source0:        http://launchpad.net/%{name}/30/%{version}/+download/%{name}-%{version}.tar.xz
  
 -BuildRequires:  gettext desktop-file-utils intltool
 +BuildRequires:  cmake
 +BuildRequires:  gettext desktop-file-utils intltool scrollkeeper
  BuildRequires:  yelp-tools pango-devel cairo-devel vala-devel
  BuildRequires:  libtool glib2-devel libnotify-devel
  BuildRequires:  libpeas-devel
@@@ -87,10 -85,15 +87,19 @@@ glib-compile-schemas %{_datadir}/glib-2
  %{_datadir}/icons/hicolor/scalable/devices/deja-dup-cloud.svg
  
  %changelog
 +* Mon Jan 20 2014 Kai Engert <kaie at redhat.com> - 29.4-1
 +- Update to 29.4
 +- Change configure to cmake
 +
+ * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 27.3.1-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+ 
+ * Thu Jun 20 2013 Rahul Sundaram <sundaram at fedoraproject.org> - 27.3.1-1
+ - update to 27.3.1-1
+ 
+ * Fri Mar 29 2013 Kalev Lember <kalevlember at gmail.com> - 26.0-1
+ - Update to 26.0
+ 
  * Fri Jan 25 2013 Rahul Sundaram <sundaram at fedoraproject.org> - 25.3-1
  - upstream release 25.3