[SCM] Phonon Multimedia Framework packaging branch, master, updated. debian/4.6.0really4.5.0-2-2-gb0d38a2

Pino Toscano pino-guest at alioth.debian.org
Tue Apr 5 09:12:34 UTC 2011


The following commit has been merged in the master branch:
commit b0d38a238f802d447ecb8006ff06726cfa2b4c11
Author: Pino Toscano <pino at kde.org>
Date:   Tue Apr 5 11:12:05 2011 +0200

    backport macro usage for registerMetaTypes()
    
    ... from upstream branch 4.5
    (commit 974fb5f, patch upstream_PHONON_EXPORT_DEPRECATED.diff)
---
 debian/changelog                                   |    3 ++
 debian/patches/series                              |    1 +
 .../patches/upstream_PHONON_EXPORT_DEPRECATED.diff |   25 ++++++++++++++++++++
 3 files changed, 29 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 48efc15..a546c0c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 phonon (4:4.6.0really4.5.0-3) UNRELEASED; urgency=low
 
+  [ Pino Toscano ]
+  * Backport macro usage for registerMetaTypes() from upstream branch 4.5
+    (commit 974fb5f, patch upstream_PHONON_EXPORT_DEPRECATED.diff).
 
  -- Modestas Vainius <modax at debian.org>  Tue, 05 Apr 2011 11:04:10 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index 4b67d05..953d98d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 phonon-inc.patch
 no_rpath.patch
 phonon_is_not_forced_in_KDE.diff
+upstream_PHONON_EXPORT_DEPRECATED.diff
diff --git a/debian/patches/upstream_PHONON_EXPORT_DEPRECATED.diff b/debian/patches/upstream_PHONON_EXPORT_DEPRECATED.diff
new file mode 100644
index 0000000..9aac625
--- /dev/null
+++ b/debian/patches/upstream_PHONON_EXPORT_DEPRECATED.diff
@@ -0,0 +1,25 @@
+From 974fb5f6ef5e21d5e91df48025f4f7cfb857efc7 Mon Sep 17 00:00:00 2001
+From: Pino Toscano <pino at kde.org>
+Date: Tue, 5 Apr 2011 10:56:14 +0200
+Subject: [PATCH] use PHONON_EXPORT_DEPRECATED instead of PHONON_DEPRECATED+PHONON_EXPORT
+
+---
+ phonon/objectdescription.h |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/phonon/objectdescription.h b/phonon/objectdescription.h
+index 51158fe..b18272c 100644
+--- a/phonon/objectdescription.h
++++ b/phonon/objectdescription.h
+@@ -346,7 +346,7 @@ typedef QPair<QByteArray, QString> DeviceAccess;
+  */
+ typedef QList<DeviceAccess> DeviceAccessList;
+ 
+-void PHONON_DEPRECATED PHONON_EXPORT registerMetaTypes();
++void PHONON_EXPORT_DEPRECATED registerMetaTypes();
+ 
+ } //namespace Phonon
+ 
+-- 
+1.7.4.1
+

-- 
Phonon Multimedia Framework packaging



More information about the pkg-kde-commits mailing list