[SCM] Qt 4 Debian packaging branch, experimental-snapshots, updated. debian/4.5.3-2-14-g74d91d8
Fathi Boudra
fabo at alioth.debian.org
Fri Oct 9 14:29:08 UTC 2009
The following commit has been merged in the experimental-snapshots branch:
commit 74d91d8ebcd2e1f02690c217c58f4a12d5322bb3
Author: Fathi Boudra <fabo at debian.org>
Date: Fri Oct 9 16:27:46 2009 +0200
Reorganize configure options.
Remove -fast and -no-separate-debug-info options
(default values are -no-fast and -no-separate-debug-info).
---
debian/changelog | 3 ++-
debian/rules | 45 ++++++++++++++++++++++-----------------------
2 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 610f6b5..03e1e7e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,7 +20,8 @@ qt4-x11 (4:4.6.0~~tp1+git1336+gc5c58c2-0fabo1) experimental-snapshots; urgency=l
- Add libqt4-multimedia package.
* Update installed files and related lintian files.
* Rewrite debian/rules, converted to dh usage.
- * Build with --no-separate-debug-info. Adjust debian/rules accordingly.
+ * Build with -no-separate-debug-info, it's the default value in Qt 4.6.
+ Adjust debian/rules accordingly by removing -separate-debug-info.
-- Fathi Boudra <fabo at debian.org> Sun, 04 Oct 2009 21:53:47 +0200
diff --git a/debian/rules b/debian/rules
index b012250..68c82ef 100755
--- a/debian/rules
+++ b/debian/rules
@@ -76,44 +76,43 @@ endif
-sysconfdir "/etc/xdg" \
-demosdir "/usr/lib/qt4/demos" \
-examplesdir "/usr/lib/qt4/examples" \
- -platform $(platform_arg) \
-opensource \
- -fast \
- -optimized-qmake \
- -no-rpath \
- -system-zlib \
- -system-libtiff \
- -system-libpng \
- -system-libjpeg \
- -system-nas-sound \
- -qt-gif \
-plugin-sql-mysql \
-plugin-sql-odbc \
-plugin-sql-psql \
-plugin-sql-sqlite \
-plugin-sql-sqlite2 \
-system-sqlite \
- -I/usr/include/freetype2 \
- -lfontconfig \
- -cups \
- -exceptions \
- -dbus \
- -pch \
- -no-separate-debug-info \
+ -xmlpatterns \
+ -multimedia \
-phonon \
-no-phonon-backend \
-svg \
-webkit \
- -xmlpatterns \
+ -script \
+ -scripttools \
+ -platform $(platform_arg) \
+ -system-zlib \
+ -qt-gif \
+ -system-libtiff \
+ -system-libpng \
+ -system-libjpeg \
+ -no-rpath \
+ -optimized-qmake \
+ -dbus \
+ -gtkstyle \
+ -system-nas-sound \
+ -lfontconfig \
+ -I/usr/include/freetype2 \
$(extra_configure_opts)
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
--
Qt 4 Debian packaging
More information about the pkg-kde-commits
mailing list