[kdevelop] Update to 4.2.82 (beta 2) Rebase include unistd.h patch

Jaroslav Reznik jreznik at fedoraproject.org
Tue Feb 14 11:41:44 UTC 2012


commit dd31b24327c265a52025933d09817a6ed5d5ae3a
Author: Jaroslav Reznik <jreznik at redhat.com>
Date:   Tue Feb 14 12:41:21 2012 +0100

    Update to 4.2.82 (beta 2)
    Rebase include unistd.h patch

 .gitignore                             |    1 +
 kdevelop-4.2.81-include-unistd-h.patch |   11 -----------
 kdevelop.spec                          |    6 +++++-
 sources                                |    2 +-
 4 files changed, 7 insertions(+), 13 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index acdeba0..ccd2b4c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /kdevelop-4.2.2.tar.bz2
 /kdevelop-4.2.3.tar.bz2
 /kdevelop-4.2.81.tar.bz2
+/kdevelop-4.2.82.tar.bz2
diff --git a/kdevelop-4.2.81-include-unistd-h.patch b/kdevelop-4.2.81-include-unistd-h.patch
index ed0041c..2cccd39 100644
--- a/kdevelop-4.2.81-include-unistd-h.patch
+++ b/kdevelop-4.2.81-include-unistd-h.patch
@@ -9,14 +9,3 @@ diff -up kdevelop-4.2.81/debuggers/gdb/unittests/debugeeslow.cpp.include-unistd-
  
  void foo() {
      static int i=0;
-diff -up kdevelop-4.2.81/debuggers/gdb/unittests/debugeethreads.cpp.include-unistd-h kdevelop-4.2.81/debuggers/gdb/unittests/debugeethreads.cpp
---- kdevelop-4.2.81/debuggers/gdb/unittests/debugeethreads.cpp.include-unistd-h	2012-01-25 08:38:42.787000144 +0100
-+++ kdevelop-4.2.81/debuggers/gdb/unittests/debugeethreads.cpp	2012-01-25 08:38:53.546304118 +0100
-@@ -17,6 +17,7 @@
- */
- #include <iostream>
- #include <QtCore/QThread>
-+#include <unistd.h>
- 
- class TestThread : public QThread
- {
diff --git a/kdevelop.spec b/kdevelop.spec
index f913a3e..82b0a9b 100644
--- a/kdevelop.spec
+++ b/kdevelop.spec
@@ -4,7 +4,7 @@
 Name:    kdevelop
 Summary: Integrated Development Environment for C++/C
 Epoch:   9
-Version: 4.2.81
+Version: 4.2.82
 Release: 1%{?dist}
 
 License: GPLv2
@@ -153,6 +153,10 @@ update-mime-database %{_kde4_datadir}/mime &> /dev/null
 
 
 %changelog
+* Tue Feb 14 2012 Jaroslav Reznik <jreznik at redhat.com> 9:4.2.82-1
+- Update to 4.2.82 (beta 2)
+- Rebase include unistd.h patch
+
 * Mon Jan 23 2012 Radek Novacek <rnovacek at redhat.com> 9:4.2.81-1
 - Update to 4.2.81 (1.3 beta)
 - Drop upstreamed patch
diff --git a/sources b/sources
index 1b8243b..c38f08d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5114730407d4a16b88ab2fc633419c21  kdevelop-4.2.81.tar.bz2
+a2dd296408fd928a7ed320a8e5fb7f6a  kdevelop-4.2.82.tar.bz2


More information about the scm-commits mailing list