[SCM] qtcreator packaging branch, master, updated. ccd61477c413cd0009bfdab7d01479d4c347a17e

[Lisandro Damián Nicanor Pérez]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtcreator.git;a=commitdiff;h=fc93704

The following commit has been merged in the master branch:
commit fc93704cb538002d3186840f71d6735efec9f324
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Wed May 22 16:42:51 2013 -0300

    Changelog improvement.
---
 debian/changelog                      |    2 ++
 debian/patches/posix_rt_nonlinux.diff |   26 --------------------------
 2 files changed, 2 insertions(+), 26 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 77b78d4..773a9b6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,8 @@ qtcreator (2.7.0-1) UNRELEASED; urgency=low
         the bundled one.
         - Add botan_system_lib.diff slightly adapted from openSUSE.
         - Build-depend on libbotan1.10-dev and pkg-config.
+  * Remove posix_rt_nonlinux.diff. It applies against 3rd party botan, but we
+    are now using the system botan. 
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 22 May 2013 15:40:28 -0300
 
diff --git a/debian/patches/posix_rt_nonlinux.diff b/debian/patches/posix_rt_nonlinux.diff
deleted file mode 100644
index b6a48db..0000000
--- a/debian/patches/posix_rt_nonlinux.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-Description: Build tm_posix.cpp on kFreeBSD and Hurd to fix a crash
- because of an undefined symbol.
-Author: Felix Geyer <fgeyer at debian.org>
-Forwarded: not-needed
-Bug-Debian: http://bugs.debian.org/683933
-
---- qtcreator-2.5.0.orig/src/libs/3rdparty/botan/src/src.pro
-+++ qtcreator-2.5.0/src/libs/3rdparty/botan/src/src.pro
-@@ -282,7 +282,7 @@ unix {
-            timer/gettimeofday/tm_unix.h
- }
- 
--linux*-g++*|freebsd*-g++* {
-+linux*-g++*|freebsd*-g++*|glibc*-g++*|hurd*-g++* {
-     HEADERS += timer/posix_rt/tm_posix.h
- }
- 
-@@ -566,7 +566,7 @@ unix {
-            timer/gettimeofday/tm_unix.cpp
- }
- 
--linux*|freebsd* {
-+linux*|freebsd*|glibc*|hurd* {
-     SOURCES += timer/posix_rt/tm_posix.cpp
- 
-     LIBS += -lrt

-- 
qtcreator packaging