[SCM] Qt 4 packaging branch, experimental, updated. debian/4.8.0-1-37-g829510c

[Didier Raboud]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qt4-x11.git;a=commitdiff;h=8ea9118

The following commit has been merged in the experimental branch:
commit 8ea9118596d414351d6e31934499aee4e920d1d0
Author: Felix Geyer <debfx-pkg at fobos.de>
Date:   Fri Mar 2 22:13:05 2012 +0100

    Make it possible to install libqt4-dev from a foreign architecture while having all binaries in the native architecture.
    
    Move binaries from libqt4-dev into the new package libqt4-dev-bin.
    Mark libqt4-dev-bin, qt4-qmake and qt4-linguist-tools as Multi-Arch: foreign.
    
    Reviewed-by: Didier Raboud <odyx at debian.org>
---
 debian/changelog                                   |    5 ++++
 debian/control                                     |   24 ++++++++++++++++---
 debian/libqt4-dev-bin.install                      |    7 +++++
 debian/libqt4-dev-bin.links                        |    3 ++
 ...libqt4-dev.manpages => libqt4-dev-bin.manpages} |    0
 ...libqt4-dev.postinst => libqt4-dev-bin.postinst} |    0
 debian/{libqt4-dev.prerm => libqt4-dev-bin.prerm}  |    0
 debian/libqt4-dev.install                          |    7 -----
 debian/libqt4-dev.links                            |    3 --
 9 files changed, 35 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 083211f..de28c9f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,11 @@ qt4-x11 (4:4.8.1-0r1) UNRELEASED; urgency=low
   * Update symbol files.
   * Add QTBUG-24718_Fix_a_crash_in_cursorToX_when_new_block_is_added.patch,
     cherry-picked from upstream.
+  * Make it possible to install libqt4-dev from a foreign architecture while
+    having all binaries in the native architecture.
+    - Move binaries from libqt4-dev into the new package libqt4-dev-bin.
+    - Mark libqt4-dev-bin, qt4-qmake and qt4-linguist-tools as
+      Multi-Arch: foreign.
 
   [ Didier Raboud ]
   * Merge the 4:4.7.4-3 unstable release: drop fix-format.diff, merged
diff --git a/debian/control b/debian/control
index 95c295a..d58da9b 100644
--- a/debian/control
+++ b/debian/control
@@ -529,10 +529,10 @@ Depends: libqt4-dbus (= ${binary:Version}),
          libqt4-xmlpatterns (= ${binary:Version}),
          libqtcore4 (= ${binary:Version}),
          libqtgui4 (= ${binary:Version}),
+         libqt4-dev-bin (= ${binary:Version}),
          qt4-linguist-tools (= ${binary:Version}),
          qt4-qmake (= ${binary:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends}
+         ${misc:Depends}
 Recommends: libqt4-opengl-dev (= ${binary:Version}), libqtwebkit-dev (>= 2.0~)
 Breaks: g++-4.6 (<< 4.6.0-7~) [armel],
         libqt4-opengl-dev (<< 4.4.0-2),
@@ -550,8 +550,22 @@ Description: Qt 4 development files
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
  .
- This package contains the header development files and development programs
- used for building Qt 4 applications.
+ This package contains the header development files used for building Qt 4
+ applications.
+
+Package: libqt4-dev-bin
+Architecture: any
+Multi-Arch: foreign
+Section: devel
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Breaks: libqt4-dev (<< 4:4.8.0-2)
+Replaces: libqt4-dev (<< 4:4.8.0-2)
+Description: Qt 4 development programs
+ Qt is a cross-platform C++ application framework. Qt's primary feature
+ is its rich set of widgets that provide standard GUI functionality.
+ .
+ This package contains the development programs used for building Qt 4
+ applications.
 
 Package: libqt4-private-dev
 Architecture: any
@@ -730,6 +744,7 @@ Description: Qt 4 development tools
 
 Package: qt4-qmake
 Architecture: any
+Multi-Arch: foreign
 Section: devel
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Breaks: libqt4-dev (<< 4.5.0~beta1+snapshot20090114-1)
@@ -791,6 +806,7 @@ Description: Qt 4 QML viewer
 
 Package: qt4-linguist-tools
 Architecture: any
+Multi-Arch: foreign
 Section: devel
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Breaks: libqt4-dev (<< 4:4.7.3-2)
diff --git a/debian/libqt4-dev-bin.install b/debian/libqt4-dev-bin.install
new file mode 100644
index 0000000..5502220
--- /dev/null
+++ b/debian/libqt4-dev-bin.install
@@ -0,0 +1,7 @@
+usr/bin/moc-qt4
+usr/bin/qdbuscpp2xml
+usr/bin/qdbusxml2cpp
+usr/bin/qt3to4
+usr/bin/rcc
+usr/bin/uic-qt4
+usr/bin/uic3
diff --git a/debian/libqt4-dev-bin.links b/debian/libqt4-dev-bin.links
new file mode 100644
index 0000000..3087c6c
--- /dev/null
+++ b/debian/libqt4-dev-bin.links
@@ -0,0 +1,3 @@
+usr/bin/moc-qt4         usr/share/qt4/bin/moc
+usr/bin/uic-qt4         usr/share/qt4/bin/uic
+usr/bin/rcc             usr/share/qt4/bin/rcc
diff --git a/debian/libqt4-dev.manpages b/debian/libqt4-dev-bin.manpages
similarity index 100%
rename from debian/libqt4-dev.manpages
rename to debian/libqt4-dev-bin.manpages
diff --git a/debian/libqt4-dev.postinst b/debian/libqt4-dev-bin.postinst
similarity index 100%
rename from debian/libqt4-dev.postinst
rename to debian/libqt4-dev-bin.postinst
diff --git a/debian/libqt4-dev.prerm b/debian/libqt4-dev-bin.prerm
similarity index 100%
rename from debian/libqt4-dev.prerm
rename to debian/libqt4-dev-bin.prerm
diff --git a/debian/libqt4-dev.install b/debian/libqt4-dev.install
index 339e066..6942e37 100644
--- a/debian/libqt4-dev.install
+++ b/debian/libqt4-dev.install
@@ -5,13 +5,6 @@
 #usr/lib/libQtOpenVG.prl
 #usr/lib/libQtOpenVG.so
 #usr/lib/pkgconfig/QtOpenVG.pc
-usr/bin/moc-qt4
-usr/bin/qdbuscpp2xml
-usr/bin/qdbusxml2cpp
-usr/bin/qt3to4
-usr/bin/rcc
-usr/bin/uic-qt4
-usr/bin/uic3
 usr/include/qt4/Qt/Qt3Support
 usr/include/qt4/Qt/QtCore
 usr/include/qt4/Qt/QtDBus
diff --git a/debian/libqt4-dev.links b/debian/libqt4-dev.links
index f9230c4..0246a65 100644
--- a/debian/libqt4-dev.links
+++ b/debian/libqt4-dev.links
@@ -1,5 +1,2 @@
 usr/include/qt4         usr/share/qt4/include
-usr/bin/moc-qt4         usr/share/qt4/bin/moc
-usr/bin/uic-qt4         usr/share/qt4/bin/uic
-usr/bin/rcc             usr/share/qt4/bin/rcc
 usr/lib/qt4/plugins     usr/share/qt4/plugins

-- 
Qt 4 packaging