[SCM] qtmultimedia packaging branch, master, updated. 4e7e7f8588ce1c24412eb58221942da6885d9bd4

[Timo Jyrinki]

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

The following commit has been merged in the master branch:
commit 86d06fcd6d73058711274de6c0aa5957a1be1469
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Thu Feb 14 15:16:45 2013 +0000

    Wrong file was renamed, fix that and remove unneeded Replaces
---
 debian/control                                     |    3 ---
 ...aquick-p5.install => libqt5multimedia5.install} |    0
 debian/libqt5multimediaquick-p5.install            |    2 +-
 debian/libqt5multimediaquick5.install              |    1 -
 4 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/debian/control b/debian/control
index 0977f7d..2f2ee84 100644
--- a/debian/control
+++ b/debian/control
@@ -44,7 +44,6 @@ Package: libqt5multimediaquick-p5
 Architecture: any
 Multi-Arch: same
 Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
-Replaces: libqt5multimediaquick5
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Qt 5 Multimedia Quick module
  Qt is a cross-platform C++ application framework. Qt's primary feature
@@ -69,7 +68,6 @@ Package: qtdeclarative5-qtmultimedia-plugin
 Architecture: any
 Multi-Arch: same
 Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
-Replaces: libqt5declarative5-qtmultimedia-plugin
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Qt 5 Multimedia QML plugin
  Qt is a cross-platform C++ application framework. Qt's primary feature
@@ -92,7 +90,6 @@ Package: libqgsttools-p1
 Architecture: any
 Multi-Arch: same
 Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
-Replaces: libqgsttools
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: GStreamer tools for  Qt 5 Multimedia module
  Qt is a cross-platform C++ application framework. Qt's primary feature
diff --git a/debian/libqt5multimediaquick-p5.install b/debian/libqt5multimedia5.install
similarity index 100%
copy from debian/libqt5multimediaquick-p5.install
copy to debian/libqt5multimedia5.install
diff --git a/debian/libqt5multimediaquick-p5.install b/debian/libqt5multimediaquick-p5.install
index cf6038f..4b5f2c0 100644
--- a/debian/libqt5multimediaquick-p5.install
+++ b/debian/libqt5multimediaquick-p5.install
@@ -1 +1 @@
-usr/lib/*/libQt5Multimedia.so.*
+usr/lib/*/libQt5MultimediaQuick_p.so.*
diff --git a/debian/libqt5multimediaquick5.install b/debian/libqt5multimediaquick5.install
deleted file mode 100644
index 4b5f2c0..0000000
--- a/debian/libqt5multimediaquick5.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/libQt5MultimediaQuick_p.so.*

-- 
qtmultimedia packaging