[SCM] Qt 4 Debian packaging branch, master, updated. debian/4.6.0-1-47-g7168ddd

Fathi Boudra fabo at alioth.debian.org
Sun Jan 31 19:35:31 UTC 2010 

The following commit has been merged in the master branch:
commit f5834cc912268a796205ef42ad93f4140407a3bf
Author: Fathi Boudra <fabo at debian.org>
Date:   Sun Jan 31 20:35:02 2010 +0100

    Refresh patches.
    Fix Phonon update patch: wrong paths.
---
 debian/patches/21_qt_ia32_library_path.diff |    6 ++--
 debian/patches/40_alpha_ice.diff            |    4 +-
 debian/patches/81_hurd_architecture.diff    |    2 +-
 debian/patches/82_hurd_SA_SIGINFO.diff      |    2 +-
 debian/patches/97_update_phonon_4.3.80.diff |   28 +++++++++++++-------------
 5 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/debian/patches/21_qt_ia32_library_path.diff b/debian/patches/21_qt_ia32_library_path.diff
index 7e1a377..2344e4d 100644
--- a/debian/patches/21_qt_ia32_library_path.diff
+++ b/debian/patches/21_qt_ia32_library_path.diff
@@ -17,7 +17,7 @@ Author: Bo Thorsen <bo at sonofthor.dk>
  QT_BEGIN_NAMESPACE
  
  #ifndef QT_NO_SETTINGS
-@@ -213,6 +217,22 @@ QLibraryInfo::buildKey()
+@@ -211,6 +215,22 @@ QLibraryInfo::buildKey()
      return QString::fromLatin1(QT_BUILD_KEY);
  }
  
@@ -40,7 +40,7 @@ Author: Bo Thorsen <bo at sonofthor.dk>
  /*!
      \since 4.6
      Returns the installation date for this build of Qt. The install date will
-@@ -432,7 +452,7 @@ QLibraryInfo::location(LibraryLocation l
+@@ -430,7 +450,7 @@ QLibraryInfo::location(LibraryLocation l
          if (loc == PrefixPath) {
              // we make the prefix path absolute to the executable's directory
  #ifdef BOOTSTRAPPING
@@ -49,7 +49,7 @@ Author: Bo Thorsen <bo at sonofthor.dk>
  #else
              if (QCoreApplication::instance()) {
  #ifdef Q_OS_MAC
-@@ -441,21 +461,21 @@ QLibraryInfo::location(LibraryLocation l
+@@ -439,21 +459,21 @@ QLibraryInfo::location(LibraryLocation l
                      QCFType<CFURLRef> urlRef = CFBundleCopyBundleURL(bundleRef);
                      if (urlRef) {
                          QCFString path = CFURLCopyFileSystemPath(urlRef, kCFURLPOSIXPathStyle);
diff --git a/debian/patches/40_alpha_ice.diff b/debian/patches/40_alpha_ice.diff
index 7669799..3c98e70 100644
--- a/debian/patches/40_alpha_ice.diff
+++ b/debian/patches/40_alpha_ice.diff
@@ -1,6 +1,6 @@
 --- a/src/corelib/global/qlibraryinfo.cpp
 +++ b/src/corelib/global/qlibraryinfo.cpp
-@@ -79,12 +79,7 @@ class QLibraryInfoPrivate
+@@ -83,12 +83,7 @@ class QLibraryInfoPrivate
  {
  public:
      static QSettings *findConfiguration();
@@ -14,7 +14,7 @@
      static QSettings *configuration()
      {
          QLibrarySettings *ls = qt_library_settings();
-@@ -92,6 +87,13 @@ public:
+@@ -96,6 +91,13 @@ public:
      }
  };
  
diff --git a/debian/patches/81_hurd_architecture.diff b/debian/patches/81_hurd_architecture.diff
index 151e620..f437848 100644
--- a/debian/patches/81_hurd_architecture.diff
+++ b/debian/patches/81_hurd_architecture.diff
@@ -6,7 +6,7 @@ Author: Pino Toscano <pino at kde.org>
 Forwarded: no
 --- a/configure
 +++ b/configure
-@@ -2723,6 +2723,17 @@
+@@ -2723,6 +2723,17 @@ fi
  
  if [ -z "${CFG_HOST_ARCH}" ]; then
      case "$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_MACHINE" in
diff --git a/debian/patches/82_hurd_SA_SIGINFO.diff b/debian/patches/82_hurd_SA_SIGINFO.diff
index 8f789dd..2a8631d 100644
--- a/debian/patches/82_hurd_SA_SIGINFO.diff
+++ b/debian/patches/82_hurd_SA_SIGINFO.diff
@@ -4,7 +4,7 @@ Author: Pino Toscano <pino at kde.org>
 Forwarded: no
 --- a/src/testlib/qtestcase.cpp
 +++ b/src/testlib/qtestcase.cpp
-@@ -1521,7 +1521,11 @@
+@@ -1521,7 +1521,11 @@ FatalSignalHandler::FatalSignalHandler()
  #ifndef Q_WS_QWS
          // Don't overwrite any non-default handlers
          // however, we need to replace the default QWS handlers
diff --git a/debian/patches/97_update_phonon_4.3.80.diff b/debian/patches/97_update_phonon_4.3.80.diff
index 8b943df..1c38214 100644
--- a/debian/patches/97_update_phonon_4.3.80.diff
+++ b/debian/patches/97_update_phonon_4.3.80.diff
@@ -70,7 +70,7 @@ Author: Fathi Boudra <fabo at debian.org>
  
  static void arts_sink_dispose (GObject * object)
 --- /dev/null
-+++ b/gstreamer/audiodataoutput.cpp
++++ b/src/3rdparty/phonon/gstreamer/audiodataoutput.cpp
 @@ -0,0 +1,143 @@
 +/*  This file is part of the KDE project
 +    Copyright (C) 2006 Matthias Kretz <kretz at kde.org>
@@ -216,7 +216,7 @@ Author: Fathi Boudra <fabo at debian.org>
 +// vim: sw=4 ts=4
 +
 --- /dev/null
-+++ b/gstreamer/audiodataoutput.h
++++ b/src/3rdparty/phonon/gstreamer/audiodataoutput.h
 @@ -0,0 +1,84 @@
 +/*  This file is part of the KDE project
 +    Copyright (C) 2006 Matthias Kretz <kretz at kde.org>
@@ -1468,7 +1468,7 @@ Author: Fathi Boudra <fabo at debian.org>
  }
  } //namespace Phonon::Gstreamer
 --- /dev/null
-+++ b/gstreamer/phonon-config-gstreamer.h.cmake
++++ b/src/3rdparty/phonon/gstreamer/phonon-config-gstreamer.h.cmake
 @@ -0,0 +1,5 @@
 +/* GStreamer install plugin definitions */
 +
@@ -1774,7 +1774,7 @@ Author: Fathi Boudra <fabo at debian.org>
          m_renderWidget->setGeometry(m_videoWidget->calculateDrawFrameRect());
      }
 --- /dev/null
-+++ b/Mainpage.dox
++++ b/src/3rdparty/phonon/Mainpage.dox
 @@ -0,0 +1,64 @@
 +/** @mainpage The Phonon Library API Reference
 +
@@ -1880,7 +1880,7 @@ Author: Fathi Boudra <fabo at debian.org>
          virtual void setStreamSize(qint64 newSize);
          virtual void setStreamSeekable(bool s);
 --- /dev/null
-+++ b/phonon/audiodataoutput.cpp
++++ b/src/3rdparty/phonon/phonon/audiodataoutput.cpp
 @@ -0,0 +1,68 @@
 +/*  This file is part of the KDE project
 +    Copyright (C) 2005 Matthias Kretz <kretz at kde.org>
@@ -1951,7 +1951,7 @@ Author: Fathi Boudra <fabo at debian.org>
 +#undef PHONON_CLASSNAME
 +// vim: sw=4 ts=4 tw=80
 --- /dev/null
-+++ b/phonon/audiodataoutput.h
++++ b/src/3rdparty/phonon/phonon/audiodataoutput.h
 @@ -0,0 +1,129 @@
 +/*  This file is part of the KDE project
 +    Copyright (C) 2005-2006 Matthias Kretz <kretz at kde.org>
@@ -2083,7 +2083,7 @@ Author: Fathi Boudra <fabo at debian.org>
 +// vim: sw=4 ts=4 tw=80
 +#endif // Phonon_AUDIODATAOUTPUT_H
 --- /dev/null
-+++ b/phonon/audiodataoutputinterface.h
++++ b/src/3rdparty/phonon/phonon/audiodataoutputinterface.h
 @@ -0,0 +1,44 @@
 +/*  This file is part of the KDE project
 +    Copyright (C) 2008 Matthias Kretz <kretz at kde.org>
@@ -2130,7 +2130,7 @@ Author: Fathi Boudra <fabo at debian.org>
 +
 +#endif // PHONON_AUDIODATAOUTPUTINTERFACE_H
 --- /dev/null
-+++ b/phonon/audiodataoutput_p.h
++++ b/src/3rdparty/phonon/phonon/audiodataoutput_p.h
 @@ -0,0 +1,48 @@
 +/*  This file is part of the KDE project
 +    Copyright (C) 2006 Matthias Kretz <kretz at kde.org>
@@ -2351,7 +2351,7 @@ Author: Fathi Boudra <fabo at debian.org>
          Phonon::AudioOutputAdaptor *adaptor;
  #endif
 --- /dev/null
-+++ b/phonon/backend/Mainpage.dox
++++ b/src/3rdparty/phonon/phonon/backend/Mainpage.dox
 @@ -0,0 +1,109 @@
 +/** \mainpage Phonon Backend Interface
 +
@@ -3307,7 +3307,7 @@ Author: Fathi Boudra <fabo at debian.org>
  
  int GlobalConfig::audioCaptureDeviceFor(Phonon::Category category, int override) const
 --- /dev/null
-+++ b/phonon/globalconfig.h
++++ b/src/3rdparty/phonon/phonon/globalconfig.h
 @@ -0,0 +1,71 @@
 +/*  This file is part of the KDE project
 +Copyright (C) 2006-2008 Matthias Kretz <kretz at kde.org>
@@ -4191,7 +4191,7 @@ Author: Fathi Boudra <fabo at debian.org>
 -// vim: sw=4 ts=4 tw=80
 -#endif // PHONONNAMESPACE_H
 --- /dev/null
-+++ b/phonon/pulsesupport.cpp
++++ b/src/3rdparty/phonon/phonon/pulsesupport.cpp
 @@ -0,0 +1,968 @@
 +/*  This file is part of the KDE project
 +    Copyright (C) 2009 Colin Guthrie <cguthrie at mandriva.org>
@@ -5162,7 +5162,7 @@ Author: Fathi Boudra <fabo at debian.org>
 +
 +// vim: sw=4 ts=4
 --- /dev/null
-+++ b/phonon/pulsesupport_p.h
++++ b/src/3rdparty/phonon/phonon/pulsesupport_p.h
 @@ -0,0 +1,74 @@
 +/*  This file is part of the KDE project
 +    Copyright (C) 2009 Colin Guthrie <cguthrie at mandriva.org>
@@ -5296,7 +5296,7 @@ Author: Fathi Boudra <fabo at debian.org>
          QPointer<MediaObject> media;
          bool ticking;
 --- /dev/null
-+++ b/phonon/swiftslider.cpp
++++ b/src/3rdparty/phonon/phonon/swiftslider.cpp
 @@ -0,0 +1,103 @@
 +/*  This file is part of the KDE project
 +    Copyright (C) 2006-2008 Ricardo Villalba <rvm at escomposlinux.org>
@@ -5402,7 +5402,7 @@ Author: Fathi Boudra <fabo at debian.org>
 +
 +#include "moc_swiftslider_p.cpp"
 --- /dev/null
-+++ b/phonon/swiftslider_p.h
++++ b/src/3rdparty/phonon/phonon/swiftslider_p.h
 @@ -0,0 +1,68 @@
 +/*  This file is part of the KDE project
 +    Copyright (C) 2006-2008 Ricardo Villalba <rvm at escomposlinux.org>

-- 
Qt 4 Debian packaging

More information about the pkg-kde-commits mailing list