diff options
| author | Fathi Boudra <fabo@debian.org> | 2009-10-12 10:56:28 +0200 |
|---|---|---|
| committer | Fathi Boudra <fabo@debian.org> | 2009-10-12 10:56:28 +0200 |
| commit | ed3b801916f03170ec9b3e72d6d406b90885678e (patch) | |
| tree | d2cbb83e09d1158767611e6402c8958ececd7039 | |
| parent | 5c6de5fc91ec14181b3ba8e750d441d47f593f4a (diff) | |
| parent | f46f9ee5e38aeefa4bd12b4e515b1f8e8f60ab28 (diff) | |
| download | qt4-x11-ed3b801916f03170ec9b3e72d6d406b90885678e.tar.gz | |
Merge branch 'master' into experimental-snapshots
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rwxr-xr-x | debian/rules | 11 |
2 files changed, 14 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog index c5c71ed..9e32c28 100644 --- a/debian/changelog +++ b/debian/changelog @@ -24,6 +24,14 @@ qt4-x11 (4:4.6.0~~tp1+git1336+gc5c58c2-0fabo1) experimental-snapshots; urgency=l -- Fathi Boudra <fabo@debian.org> Sun, 04 Oct 2009 21:53:47 +0200 +qt4-x11 (4:4.5.3-3) unstable; urgency=low + + * Remove -fast configure option. Qt configure has -no-fast as default value + and will generate Makefiles for all project files, including bootstrap. + (Closes: #550127) + + -- Fathi Boudra <fabo@debian.org> Fri, 09 Oct 2009 13:53:57 +0200 + qt4-x11 (4:4.5.3-2) unstable; urgency=low * Update debian/rules: cleanup make target usage by removing sub-src and diff --git a/debian/rules b/debian/rules index 27a1a25..1a89bac 100755 --- a/debian/rules +++ b/debian/rules @@ -101,6 +101,7 @@ endif -optimized-qmake \ -dbus \ -no-separate-debug-info \ + -verbose \ -gtkstyle \ -system-nas-sound \ -lfontconfig \ @@ -109,11 +110,11 @@ endif override_dh_auto_build: $(MAKE) -# # Build documentations -# $(MAKE) docs -# # Build translations -# $(MAKE) ts -# $(MAKE) qm + # Build documentations + $(MAKE) docs + # Build translations + $(MAKE) ts + $(MAKE) qm # Workaround: It's a known qmake limitation. # It can't generate install rules for files that don't exist yet like docs. ./config.status |