[kdevelop/f14/master: 7/7] Merge commit 'origin/f15/master~1' into f14/master

[Rex Dieter]

commit b1cd7957ba2df584e6e5a13fa03bba287d5d9ba6
Merge: d7a95ea b607d9e
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Mar 17 11:50:55 2011 -0500

    Merge commit 'origin/f15/master~1' into f14/master
    
    Conflicts:
    	.gitignore
    	kdevelop.spec
    	sources

 .gitignore    |    3 +--
 kdevelop.spec |   42 ++++++++++++++++++++++++++++++------------
 sources       |    2 +-
 3 files changed, 32 insertions(+), 15 deletions(-)
---
diff --cc kdevelop.spec
index 9fe6d2e,575c7f4..e14090c
--- a/kdevelop.spec
+++ b/kdevelop.spec
@@@ -3,8 -4,8 +4,8 @@@
  Name:    kdevelop
  Summary: Integrated Development Environment for C++/C
  Epoch:   9
- Version: 4.1.2
- Release: 1%{?dist}
+ Version: 4.2.0
 -Release: 1%{?dist}
++Release: 2%{?dist}
  
  License: GPLv2
  URL:     http://www.kdevelop.org/
@@@ -150,14 -151,22 +151,25 @@@ update-mime-database %{_kde4_datadir}/m
  
  
  %changelog
- * Tue Jan 18 2011 Radek Novacek <rnovacek at redhat.com> - 9:4.1.2-1
- - kdevelop-4.1.2
- - fixed typo
++* Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 9:4.2.0-2
++- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
++
+ * Tue Jan 25 2011 Rex Dieter <rdieter at fedoraproject.org> 4.2.0-1
+ - 4.2.0
+ 
+ * Fri Jan 21 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> - 9:4.1.90-1
+ - Update to 4.1.90 (4.2 RC1, uses kdevplatform 1.1.90)
+ 
+ * Tue Dec 28 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 9:4.1.81-1
+ - Update to 4.1.81 (4.2 Beta 2, uses kdevplatform 1.1.81)
  
- * Mon Dec 06 2010 Rex Dieter <rdieter at fedoraproject.org> -  4.1.1-1
+ * Thu Dec 16 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 9:4.1.80-1
+ - Update to 4.1.80 (4.2 Beta 1, required for kdelibs 4.6, #660345, #661077)
+ 
+ * Mon Dec 06 2010 Rex Dieter <rdieter at fedoraproject.org> - 9:4.1.1-1
  - kdevelop-4.1.1
  
- * Mon Dec 06 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.1.0-4
+ * Mon Dec 06 2010 Rex Dieter <rdieter at fedoraproject.org> - 9:4.1.0-4
  - -libs: (versioned) Requires: kdeutils-libs (#656847)
  - -libs: move kdevplatform dep here, make arch'd