From 900204ce11fd5671988820d350dba3c79a3c9455 Mon Sep 17 00:00:00 2001
From: Felix Geyer <debfx-pkg@fobos.de>
Date: Fri, 2 Mar 2012 22:13:05 +0100
Subject: [PATCH 1/5] 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.
---
debian/changelog | 8 ++++++++
debian/control | 24 ++++++++++++++++++++----
debian/libqt4-dev-bin.install | 7 +++++++
debian/libqt4-dev-bin.links | 3 +++
debian/libqt4-dev-bin.manpages | 1 +
debian/libqt4-dev-bin.postinst | 15 +++++++++++++++
debian/libqt4-dev-bin.prerm | 13 +++++++++++++
debian/libqt4-dev.install | 7 -------
debian/libqt4-dev.links | 3 ---
debian/libqt4-dev.manpages | 1 -
debian/libqt4-dev.postinst | 15 ---------------
debian/libqt4-dev.prerm | 13 -------------
12 files changed, 67 insertions(+), 43 deletions(-)
create mode 100644 debian/libqt4-dev-bin.install
create mode 100644 debian/libqt4-dev-bin.links
create mode 100644 debian/libqt4-dev-bin.manpages
create mode 100644 debian/libqt4-dev-bin.postinst
create mode 100644 debian/libqt4-dev-bin.prerm
delete mode 100644 debian/libqt4-dev.manpages
delete mode 100644 debian/libqt4-dev.postinst
delete mode 100644 debian/libqt4-dev.prerm
diff --git a/debian/changelog b/debian/changelog
index f139692..e623ba3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
qt4-x11 (4:4.8.0-2) UNRELEASED; urgency=low
+ [ Fathi Boudra ]
* Revert debian/compat to 8:
- drop mv-qt4-bin-dbg.sh script.
- drop elfutils build dependency.
@@ -10,6 +11,13 @@ qt4-x11 (4:4.8.0-2) UNRELEASED; urgency=low
The patch was partly merged in Qt 4.8.
* Add CVE-2011-3922.patch: Stack-buffer-overflow in glyph handling.
+ [ Felix Geyer ]
+ * 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.
+
-- Fathi Boudra <fabo@debian.org> Wed, 04 Jan 2012 22:15:56 +0200
qt4-x11 (4:4.8.0-1) experimental; urgency=low
diff --git a/debian/control b/debian/control
index 67f88fb..57e995d 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-bin.manpages b/debian/libqt4-dev-bin.manpages
new file mode 100644
index 0000000..644bed7
--- /dev/null
+++ b/debian/libqt4-dev-bin.manpages
@@ -0,0 +1 @@
+debian/manpages/moc-qt4.1
diff --git a/debian/libqt4-dev-bin.postinst b/debian/libqt4-dev-bin.postinst
new file mode 100644
index 0000000..9e3c347
--- /dev/null
+++ b/debian/libqt4-dev-bin.postinst
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+set -e
+
+update-alternatives --install \
+ /usr/bin/moc moc "/usr/bin/moc-qt4" "40" \
+ --slave /usr/share/man/man1/moc.1.gz moc.1.gz \
+ "/usr/share/man/man1/moc-qt4.1.gz"
+
+update-alternatives --install \
+ /usr/bin/uic uic "/usr/bin/uic-qt4" "40" \
+ --slave /usr/share/man/man1/uic.1.gz uic.1.gz \
+ "/usr/share/man/man1/uic-qt4.1.gz"
+
+#DEBHELPER#
diff --git a/debian/libqt4-dev-bin.prerm b/debian/libqt4-dev-bin.prerm
new file mode 100644
index 0000000..d822876
--- /dev/null
+++ b/debian/libqt4-dev-bin.prerm
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+ upgrade) ;;
+ remove|failed-upgrade|deconfigure)
+ update-alternatives --remove moc "/usr/bin/moc-qt4"
+ update-alternatives --remove uic "/usr/bin/uic-qt4"
+ ;;
+esac
+
+#DEBHELPER#
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
diff --git a/debian/libqt4-dev.manpages b/debian/libqt4-dev.manpages
deleted file mode 100644
index 644bed7..0000000
--- a/debian/libqt4-dev.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/manpages/moc-qt4.1
diff --git a/debian/libqt4-dev.postinst b/debian/libqt4-dev.postinst
deleted file mode 100644
index 9e3c347..0000000
--- a/debian/libqt4-dev.postinst
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-set -e
-
-update-alternatives --install \
- /usr/bin/moc moc "/usr/bin/moc-qt4" "40" \
- --slave /usr/share/man/man1/moc.1.gz moc.1.gz \
- "/usr/share/man/man1/moc-qt4.1.gz"
-
-update-alternatives --install \
- /usr/bin/uic uic "/usr/bin/uic-qt4" "40" \
- --slave /usr/share/man/man1/uic.1.gz uic.1.gz \
- "/usr/share/man/man1/uic-qt4.1.gz"
-
-#DEBHELPER#
diff --git a/debian/libqt4-dev.prerm b/debian/libqt4-dev.prerm
deleted file mode 100644
index d822876..0000000
--- a/debian/libqt4-dev.prerm
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-set -e
-
-case "$1" in
- upgrade) ;;
- remove|failed-upgrade|deconfigure)
- update-alternatives --remove moc "/usr/bin/moc-qt4"
- update-alternatives --remove uic "/usr/bin/uic-qt4"
- ;;
-esac
-
-#DEBHELPER#
--
1.7.9.1