rev 9445 - in trunk/packages/qt-x11-free/debian: . patches
Modestas Vainius
modax-guest at alioth.debian.org
Wed Feb 20 22:44:02 UTC 2008
Author: modax-guest
Date: 2008-02-20 22:44:02 +0000 (Wed, 20 Feb 2008)
New Revision: 9445
Added:
trunk/packages/qt-x11-free/debian/patches/73_configure_quilt_compat.diff
Modified:
trunk/packages/qt-x11-free/debian/changelog
trunk/packages/qt-x11-free/debian/patches/series
Log:
I'm speculating but this patch will probably fix FTBFS on alpha & mips. Apparently, -2 depends on undefined behaviour (the order how `find` prints files found), so I think we should proceed with -3 upload since -2 is lost.
Modified: trunk/packages/qt-x11-free/debian/changelog
===================================================================
--- trunk/packages/qt-x11-free/debian/changelog 2008-02-20 20:36:20 UTC (rev 9444)
+++ trunk/packages/qt-x11-free/debian/changelog 2008-02-20 22:44:02 UTC (rev 9445)
@@ -1,7 +1,7 @@
-qt-x11-free (3:3.3.8b-3~pre2) unstable; urgency=low
-
- * "Optimized Qt3" release.
+qt-x11-free (3:3.3.8b-3~pre3) unstable; urgency=low
+ * The "Optimized Qt3" release.
+
++ Changes by Modestas Vainius:
* Add 00_qmake_debian_compliant_release_target.diff patch to make 'qmake'
@@ -15,8 +15,14 @@
[fl]?stat64 symbols because previous way is ineffective with -O2. Add
01_export_stat64_symbols.diff patch for that.
* The hack above depends on libc6-dev (>= 2.7-1). Adjust Build-Depends.
+ * Add 73_configure_quilt_compat.diff patch to make ./configure script ignore
+ "project files" under quilt temporary directory (./.pc/). I think that
+ this problem was the cause of FTBFS on alpha & mips since *.pro files
+ under .pc had to be `found` last in order for ./configure to succeed.
+ Probably, this condition was not met on alpha & mips, but it was met on
+ other arches.
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Sun, 17 Feb 2008 15:04:16 +0200
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Thu, 21 Feb 2008 00:17:43 +0200
qt-x11-free (3:3.3.8b-2) unstable; urgency=medium
Added: trunk/packages/qt-x11-free/debian/patches/73_configure_quilt_compat.diff
===================================================================
--- trunk/packages/qt-x11-free/debian/patches/73_configure_quilt_compat.diff (rev 0)
+++ trunk/packages/qt-x11-free/debian/patches/73_configure_quilt_compat.diff 2008-02-20 22:44:02 UTC (rev 9445)
@@ -0,0 +1,11 @@
+--- qt-x11-free-3.3.8b/configure 2008-02-20 23:34:39.000000000 +0200
++++ qt-x11-free-3.3.8b/configure 2008-02-20 23:35:12.000000000 +0200
+@@ -3634,7 +3634,7 @@
+
+ echo "Finding project files. Please wait..."
+ if [ -z "$QMAKE_PROJECTS" ]; then
+- QMAKE_PROJECTS=`find $relpath/. -name '*.pro' -print | sed 's-/\./-/-'`
++ QMAKE_PROJECTS=`find $relpath/. -name '.pc' -prune -o -name '*.pro' -print | sed 's-/\./-/-'`
+ else
+ QT_PROJECTS=
+ for a in `echo $QMAKE_PROJECTS`; do
Modified: trunk/packages/qt-x11-free/debian/patches/series
===================================================================
--- trunk/packages/qt-x11-free/debian/patches/series 2008-02-20 20:36:20 UTC (rev 9444)
+++ trunk/packages/qt-x11-free/debian/patches/series 2008-02-20 22:44:02 UTC (rev 9445)
@@ -53,5 +53,6 @@
68_use-lfbclient_not-lgds.diff
70_bad_typecast_amd64.diff
72_dont_trust_uname-m_use_dpkg-arch_instead.diff
+73_configure_quilt_compat.diff
90_armeabi.diff
More information about the pkg-kde-commits
mailing list