[Pkg-kde-commits] rev 1426 - in people/chrsmrtn/qt-x11-free/debian:
. patches
chrsmrtn-guest at costa.debian.org
chrsmrtn-guest at costa.debian.org
Sat Aug 13 22:54:22 UTC 2005
Author: chrsmrtn-guest
Date: 2005-08-11 07:41:16 +0000 (Thu, 11 Aug 2005)
New Revision: 1426
Added:
people/chrsmrtn/qt-x11-free/debian/patches/10_arm_gcc4.dpatch
Modified:
people/chrsmrtn/qt-x11-free/debian/changelog
people/chrsmrtn/qt-x11-free/debian/patches/00list
Log:
Add dato's arm patch, and sync the changelog.
Modified: people/chrsmrtn/qt-x11-free/debian/changelog
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/changelog 2005-08-10 10:13:43 UTC (rev 1425)
+++ people/chrsmrtn/qt-x11-free/debian/changelog 2005-08-11 07:41:16 UTC (rev 1426)
@@ -1,31 +1,15 @@
-qt-x11-free (3:3.3.4-5) unstable; urgency=low
+qt-x11-free (3:3.3.4-6) unstable; urgency=low
- !!! Sync with the next gcc4 upload !!!
-
+++ Changes by Christopher Martin:
- * Add sundry fixes from KDE's qt-copy. (Closes: #303065)
-
* No longer build non-threaded libraries. (Closes: #180326)
* Added a libqt3c102-mt-dbg package. (Closes: #235396)
- * Fix qt3-designer's appearance in the KDE menu. (Closes: #290402)
-
- * Don't use lib64 on amd64. (Closes: #311562)
-
- * Don't duplicate the information in the qvfb manpage. (Closes: #282217)
-
* Make the Qt3 documentation available from /usr/share/doc/qt3-doc, and
therefore also usable in dwww and doc-central. (Closes: #185900)
(Closes: #284407, #294630)
- * Add linguist manpage. Thanks to Jeremy Laine. (Closes: #268882)
-
- * Include createcw source for qt3-designer. (Closes: #305919)
-
- * Add missing qvfbhdr.h. (Closes: #182366)
-
* Apply packaging patches from Brian Nelson to allow Qt3 to co-exist
with Qt4 packages. (Closes: #306879)
@@ -41,10 +25,114 @@
* Revamp the OpenGL linking patch, and add patches for gcc4.
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Wed, 6 Jul 2005 22:36:54 -0400
+
+qt-x11-free (3:3.3.4-4) unstable; urgency=low
+
+ * The "Three transitions and one maintainer switch" release.
+
+ * Cope with the following ongoing transitions in unstable:
+ - C++ ABI transition.
+ - X.org transition.
+ - PostgreSQL 8.0 transition.
+
+ * Move the package to the Debian Qt/KDE team, as agreed with the
+ maintainer. Thanks to Martin Loschwitz for all his work over the
+ years.
+
+ +++ Changes by Adeodato Simó:
+
+ * Transition to the new C++ ABI. Rename all the library packages as
+ necessary: every libqt3c102-* goes back to libqt3-* now. Changes based
+ on the patch provided by Matthias Klose in Ubuntu Bug 10723.
+
+ + debian/control:
+ - renamed library packages.
+ - add conflicts and replaces against the libqt3c102-* packages, or
+ change the existing libqt3-* ones.
+ - change the existing recommends and suggests on libqt3c102-* to
+ libqt3-*.
+ - adjusted descriptions where appropriate.
+
+ + debian/rules:
+ - s/c102// in various places.
+
+ + debian/*.install, debian/*.links:
+ - renamed as appropriate.
+
+ + debian/patches/31_gcc4_buildkey.dpatch:
+ - new patch picked from the Fedora Qt packages to ensure a stable
+ buildkey accross compiler upgrades now that GCC 4 is the default.
+ Kudos to Christopher Martin for finding about the existence of this
+ patch.
+
+ The above solves trouble for users when using qt3-designer with g++ 4.0,
+ so this upload closes: #317768.
+
+ Also, disabling InterBase support has been necessary in this upload,
+ because nobody has cared to make firebird2 not FTBFS with g++ 4.0. Dropped
+ the libqt3-ibase and libqt3-mt-ibase packages, which can be reintroduced
+ as soon as #317314 gets fixed.
+
+ + debian/control:
+ - don't build-depend on firebird2-dev.
+
+ + debian/rules:
+ - unconditionally use -no-sql-ibase and -Nlibqt3{,-mt}-ibase.
+
+ * Transition to the new X.org packages:
+ + debian/control:
+ - build-depend in libglu1-xorg-dev instead of xlibmesa-glu-dev; make the
+ same change in the dependencies of libqt3-dev and libqt3-mt-dev.
+ - add libxinerama-dev and libxkbfile-dev to build-dependencies; add
+ libxinerama-dev to the dependencies of libqt3-dev and libqt3-mt-dev as
+ well (closes: #319305).
+ - add libxi-dev to the dependencies of libqt3-dev and libqt3-mt-dev. [cm]
+
+ * Transition to the new PostgreSQL 8.0 packaging (closes: #317500):
+ + debian/control: build-depend on libpq-dev instead of postgresql-dev.
+ + debian/rules: invoke pg_config to determine the include directory.
+
+ * Don't modify debian/control at build time, since doing it in the clean
+ target it's a release critical bug now:
+ + debian/rules: don't invoke type-handling to generate debian/control.
+ + debian/control.in: removed.
+ + debian/control:
+ - adjust the list of *-i386 ports to list only the non-dead ones.
+ - don't build depend on type-handling.
+
+ * Overhaul arch detection in debian/rules:
+ - use DEB_HOST_ARCH instead of DEB_BUILD_GNU_CPU to detect arm.
+ - use DEB_HOST_ARCH_CPU instead of DEB_BUILD_GNU_CPU to detect an i386 CPU
+ (needs the new dpkg).
+
+ +++ Changes by Christopher Martin:
+
+ * Add sundry fixes from KDE's qt-copy. (Closes: #303065)
+
+ * Fix qt3-designer's appearance in the KDE menu. (Closes: #290402)
+
+ * Don't use lib64 on amd64. (Closes: #311562)
+
+ * Don't duplicate the information in the qvfb manpage. (Closes: #282217)
+
+ While we're at it, realize that a whole bunch of manpages were suffering
+ the same, and fix them (designer, makeqpf, mergetr, findtr, msg2qm,
+ qtconfig, createcw, qembed, qt20fix). [dato]
+
+ * Add linguist manpage. Thanks to Jeremy Laine. (Closes: #268882)
+
+ * Include createcw source for qt3-designer. (Closes: #305919)
+
+ * Add missing qvfbhdr.h. (Closes: #182366, the qinterlacestyle.h
+ mentioned in this bug report was already included in recent versions.)
+
* Many minor changes to improve lintian compliance.
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Wed, 6 Jul 2005 22:36:54 -0400
+ * Bump Standards-Version to 3.6.2 (no changes required).
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Tue, 26 Jul 2005 19:06:03 +0200
+
qt-x11-free (3:3.3.4-3) unstable; urgency=medium
* ML: Remove an utterly ugly symlink for linux-g++ that pointed to my
Modified: people/chrsmrtn/qt-x11-free/debian/patches/00list
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/patches/00list 2005-08-10 10:13:43 UTC (rev 1425)
+++ people/chrsmrtn/qt-x11-free/debian/patches/00list 2005-08-11 07:41:16 UTC (rev 1426)
@@ -5,6 +5,7 @@
06_disable_rpath.dpatch
08_thread_default.dpatch
09_amd64_lib64.dpatch
+10_arm_gcc4
14_fix_kmenu.dpatch
15_unify_declarations_glibc.dpatch
16_fix_opengl_check.dpatch
Added: people/chrsmrtn/qt-x11-free/debian/patches/10_arm_gcc4.dpatch
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/patches/10_arm_gcc4.dpatch 2005-08-10 10:13:43 UTC (rev 1425)
+++ people/chrsmrtn/qt-x11-free/debian/patches/10_arm_gcc4.dpatch 2005-08-11 07:41:16 UTC (rev 1426)
@@ -0,0 +1,32 @@
+#! /bin/sh -e
+
+if [ $# -lt 1 ]; then
+ echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+ exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
+
+case "$1" in
+ -patch) patch -p1 ${patch_opts} < $0;;
+ -unpatch) patch -R -p1 ${patch_opts} < $0;;
+ *)
+ echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+ exit 1;;
+esac
+
+exit 0
+
+ at DPATCH@
+--- qt/include/qglobal.h
++++ qt/include/qglobal.h
+@@ -300,7 +300,7 @@
+ supposedly know what you are doing.) */
+ # if (defined(__arm__) || defined(__ARMEL__)) && !defined(QT_MOC_CPP)
+ # define Q_PACKED __attribute__ ((packed))
+-# if __GNUC__ == 3 && __GNUC_MINOR__ >= 4
++# if __GNUC__ == 3 && __GNUC_MINOR__ >= 4 || __GNUC__ > 3
+ # define Q_NO_PACKED_REFERENCE
+ # endif
+ # endif
More information about the Pkg-kde-commits
mailing list