[SCM] Qt 4 packaging branch, master, updated. debian/4.8.5+dfsg-2-7-g17175f6
Lisandro Damián Nicanor Pérez
lisandro at alioth.debian.org
Mon Aug 19 18:50:44 UTC 2013
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qt4-x11.git;a=commitdiff;h=17175f6
The following commit has been merged in the master branch:
commit 17175f62f62521da707954830a1c6b867b17f2eb
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date: Mon Aug 19 15:50:19 2013 -0300
Install m68k headers.
---
debian/changelog | 1 +
debian/libqt4-dev.install | 2 ++
2 files changed, 3 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 6fd593f..dbb2cc4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ qt4-x11 (4:4.8.5+dfsg-3) UNRELEASED; urgency=low
[ Lisandro Damián Nicanor Pérez Meyer ]
* Add Add-support-for-the-Linux-m68k-platform.patch for supporting the m68k
architecture (Closes: 660963).
+ - Install m68k headers.
* Change libqt4-opengl-dev dependency on libgl1-mesa-dev to
libgl1-mesa-dev | libgl1-dev, thus allowing other implementations of
libgl1 to be used (Closes: #718992).
diff --git a/debian/libqt4-dev.install b/debian/libqt4-dev.install
index 28ea80f..0a0245c 100644
--- a/debian/libqt4-dev.install
+++ b/debian/libqt4-dev.install
@@ -174,6 +174,7 @@ usr/include/qt4/Qt/qatomic_generic.h
usr/include/qt4/Qt/qatomic_i386.h
usr/include/qt4/Qt/qatomic_ia64.h
usr/include/qt4/Qt/qatomic_integrity.h
+usr/include/qt4/Qt/qatomic_m68k.h
usr/include/qt4/Qt/qatomic_macosx.h
usr/include/qt4/Qt/qatomic_mips.h
usr/include/qt4/Qt/qatomic_parisc.h
@@ -1357,6 +1358,7 @@ usr/include/qt4/QtCore/qatomic_generic.h
usr/include/qt4/QtCore/qatomic_i386.h
usr/include/qt4/QtCore/qatomic_ia64.h
usr/include/qt4/QtCore/qatomic_integrity.h
+usr/include/qt4/QtCore/qatomic_m68k.h
usr/include/qt4/QtCore/qatomic_macosx.h
usr/include/qt4/QtCore/qatomic_mips.h
usr/include/qt4/QtCore/qatomic_parisc.h
--
Qt 4 packaging
More information about the pkg-kde-commits
mailing list