diff options
| author | Fathi BOUDRA <fabo@debian.org> | 2009-10-15 23:24:06 +0200 |
|---|---|---|
| committer | Fathi BOUDRA <fabo@debian.org> | 2009-10-15 23:24:06 +0200 |
| commit | a98fa61482d8d645dcb179ba0653ac162891d831 (patch) | |
| tree | d1dcc9aba597605b217b1dab9269d9806f5e73ff /debian/patches | |
| parent | c0eec5d2d53a583287d304b12b7b3be32a1020fb (diff) | |
| parent | 6913fd7cb80baf19e22ea3d51b025e512414a1d2 (diff) | |
| download | qt4-x11-a98fa61482d8d645dcb179ba0653ac162891d831.tar.gz | |
Merge branch 'master' into experimental-snapshots
Conflicts:
debian/changelog
debian/qt4-demos-dbg.install
Diffstat (limited to 'debian/patches')
| -rw-r--r-- | debian/patches/08_configure_quilt_compat.diff | 14 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
2 files changed, 15 insertions, 0 deletions
diff --git a/debian/patches/08_configure_quilt_compat.diff b/debian/patches/08_configure_quilt_compat.diff new file mode 100644 index 0000000..1c008d2 --- /dev/null +++ b/debian/patches/08_configure_quilt_compat.diff @@ -0,0 +1,14 @@ +Avoid '.pc' directories created by quilt. +It breaks qmake projects search. + +--- a/configure ++++ b/configure +@@ -7146,7 +7146,7 @@ fi + # .projects.3 -> the rest + rm -f .projects .projects.1 .projects.2 .projects.3 + +-QMAKE_PROJECTS=`find "$relpath/." -name '*.pro' -print | sed 's-/\./-/-'` ++QMAKE_PROJECTS=`find "$relpath/." -name '.pc' -prune -o -name '*.pro' -print | sed 's-/\./-/-'` + if [ -z "$AWK" ]; then + for p in `echo $QMAKE_PROJECTS`; do + echo "$p" >> .projects diff --git a/debian/patches/series b/debian/patches/series index 6857718..111a55b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -14,6 +14,7 @@ 04_launch_uic-qt4.diff 05_append_qt4_target.diff 07_trust_dpkg-arch_over_uname-m.diff +08_configure_quilt_compat.diff 09_qmake_lflags_as-needed.diff 10_config_tests_fixes.diff 11_build_translations.diff |