[kscreen: 3/3] Merge branch 'f18'

[Daniel Vrátil]

commit 472aae8e40985dedffcb150786e2515c169d3a99
Merge: 64fff00 094644e
Author: Dan Vrátil <dvratil at redhat.com>
Date:   Sun Jan 20 16:55:02 2013 +0100

    Merge branch 'f18'
    
    Conflicts:
    	kscreen.spec

 .gitignore   |    1 +
 kscreen.spec |   25 +++++++++++++------------
 sources      |    2 +-
 3 files changed, 15 insertions(+), 13 deletions(-)
---
diff --cc kscreen.spec
index e06c3c1,654a6e5..2c63e4c
--- a/kscreen.spec
+++ b/kscreen.spec
@@@ -10,14 -8,8 +8,11 @@@ Summary:        KDE Display Management 
  License:        GPLv2 or GPLv3
  URL:            https://projects.kde.org/projects/playground/base/kscreen
  
- # This is a git snapshot, use following commands to generate the tarball:
- #  git clone git://anongit.kde.org/kscreen
- #  git archive --prefix=kscreen-%{version}/ master | gzip > ../kscreen-%{version}-%{snap}.tar.gz
- Source0:        kscreen-%{version}-%{snap}.tar.gz
+ Source0:        http://download.kde.org/unstable/kscreen/%{version}/src/kscreen-%{version}.tar.bz2
  
 +Provides:       kde-display-management
 +Conflicts:      kded_randrmonitor
 +
  BuildRequires:  kdelibs4-devel
  BuildRequires:  libkscreen-devel
  BuildRequires:  qjson-devel >= 0.8.1
@@@ -51,11 -44,11 +47,16 @@@ make install/fast DESTDIR=%{buildroot} 
  
  
  %changelog
+ * Sun Jan 20 2013 Dan Vrátil <dvratil at redhat.com> 1:0.0.71-1
+  - update to 0.0.71 - first official release
+  - install kscreen-console, which has been moved from libkscreen
+  - the KCM is now called kcm_kscreen
+ 
 +* Wed Jan 09 2013 Dan Vrátil <dvratil at redhat.com> 0.9.0-5.20121228git
 + - Update description, we don't ship the Plasma applet yet
 + - Provides kde-display-management, a metapackage for KScreen and kded_randrmonitor
 + - Conflicts with kded_randrmonitor
 +
  * Wed Jan 09 2013 Rex Dieter <rdieter at fedoraproject.org> 0.9.0-4.20121228git
  - BR: qjson-devel >= 0.8.1
  - License: GPLv2 or GPLv3