rev 9476 - in trunk/packages/qt4-x11/debian: . patches
Fathi Boudra
fabo at alioth.debian.org
Wed Feb 27 06:59:32 UTC 2008
Author: fabo
Date: 2008-02-27 06:59:31 +0000 (Wed, 27 Feb 2008)
New Revision: 9476
Added:
trunk/packages/qt4-x11/debian/libqt4-dev.lintian
Removed:
trunk/packages/qt4-x11/debian/patches/90_qmake_cxxflags_fpermissive.diff
Modified:
trunk/packages/qt4-x11/debian/changelog
trunk/packages/qt4-x11/debian/copyright
trunk/packages/qt4-x11/debian/libqt4-debug.lintian
trunk/packages/qt4-x11/debian/libqt4-gui.lintian
trunk/packages/qt4-x11/debian/patches/series
trunk/packages/qt4-x11/debian/rules
Log:
* Update lintian overrides.
* Remove -fpermissive flag and patch.
* Install qt_ca.qm.
Modified: trunk/packages/qt4-x11/debian/changelog
===================================================================
--- trunk/packages/qt4-x11/debian/changelog 2008-02-26 20:30:02 UTC (rev 9475)
+++ trunk/packages/qt4-x11/debian/changelog 2008-02-27 06:59:31 UTC (rev 9476)
@@ -19,14 +19,13 @@
to Q3Action (which is logical) But it crashs when it's not a q3action.
* Refresh and enable 0172-prefer-xrandr-over-xinerama patch.
* Remove 0204-fix-tulip-aliasing patch. Merged upstream.
+ * Remove 90_qmake_cxxflags_fpermissive patch.
* Add ${shlibs:Depends} to libqt4-dev. See missing shared library
dependencies thread on debian-devel mailing list.
* Add catalan translation. Thanks to Javier Serrano Polo. (Closes: #459822)
* Update copyright file. Add GPL version 3.
+ * Remove -fpermissive.
- TODO: add a piece of code to generate binary qt_ca translation file
- install/clean binary qt_ca translation file
-
-- Fathi Boudra <fabo at debian.org> Tue, 26 Feb 2008 18:38:27 +0100
qt4-x11 (4.3.3-2) unstable; urgency=low
Modified: trunk/packages/qt4-x11/debian/copyright
===================================================================
--- trunk/packages/qt4-x11/debian/copyright 2008-02-26 20:30:02 UTC (rev 9475)
+++ trunk/packages/qt4-x11/debian/copyright 2008-02-27 06:59:31 UTC (rev 9476)
@@ -9,7 +9,7 @@
Copyright:
- (C) 1994-2007 Trolltech AS.
+ © 1994-2007 Trolltech AS.
License:
Modified: trunk/packages/qt4-x11/debian/libqt4-debug.lintian
===================================================================
--- trunk/packages/qt4-x11/debian/libqt4-debug.lintian 2008-02-26 20:30:02 UTC (rev 9475)
+++ trunk/packages/qt4-x11/debian/libqt4-debug.lintian 2008-02-27 06:59:31 UTC (rev 9476)
@@ -1 +1,74 @@
libqt4-debug: package-name-doesnt-match-sonames
+
+libqt4-debug: sharedobject-in-library-directory-not-actually-a-shlib usr/lib/libQtAssistantClient.so.4.3.4.debug
+libqt4-debug: sharedobject-in-library-directory-not-actually-a-shlib usr/lib/libQtDesigner.so.4.3.4.debug
+libqt4-debug: sharedobject-in-library-directory-not-actually-a-shlib usr/lib/libQtGui.so.4.3.4.debug
+libqt4-debug: sharedobject-in-library-directory-not-actually-a-shlib usr/lib/libQtTest.so.4.3.4.debug
+libqt4-debug: sharedobject-in-library-directory-not-actually-a-shlib usr/lib/libQtDesignerComponents.so.4.3.4.debug
+libqt4-debug: sharedobject-in-library-directory-not-actually-a-shlib usr/lib/libQtOpenGL.so.4.3.4.debug
+libqt4-debug: sharedobject-in-library-directory-not-actually-a-shlib usr/lib/libQtSql.so.4.3.4.debug
+libqt4-debug: sharedobject-in-library-directory-not-actually-a-shlib usr/lib/libQt3Support.so.4.3.4.debug
+libqt4-debug: sharedobject-in-library-directory-not-actually-a-shlib usr/lib/libQtNetwork.so.4.3.4.debug
+libqt4-debug: sharedobject-in-library-directory-not-actually-a-shlib usr/lib/libQtXml.so.4.3.4.debug
+libqt4-debug: sharedobject-in-library-directory-not-actually-a-shlib usr/lib/libQtCore.so.4.3.4.debug
+libqt4-debug: sharedobject-in-library-directory-not-actually-a-shlib usr/lib/libQtSvg.so.4.3.4.debug
+libqt4-debug: sharedobject-in-library-directory-not-actually-a-shlib usr/lib/libQtDBus.so.4.3.4.debug
+libqt4-debug: sharedobject-in-library-directory-not-actually-a-shlib usr/lib/libQtScript.so.4.3.4.debug
+
+libqt4-debug: binary-with-bad-dynamic-table ./usr/lib/libQt3Support.so.4.3.4.debug
+libqt4-debug: binary-with-bad-dynamic-table ./usr/lib/libQtAssistantClient.so.4.3.4.debug
+libqt4-debug: binary-with-bad-dynamic-table ./usr/lib/libQtCore.so.4.3.4.debug
+libqt4-debug: binary-with-bad-dynamic-table ./usr/lib/libQtDBus.so.4.3.4.debug
+libqt4-debug: binary-with-bad-dynamic-table ./usr/lib/libQtDesigner.so.4.3.4.debug
+libqt4-debug: binary-with-bad-dynamic-table ./usr/lib/libQtDesignerComponents.so.4.3.4.debug
+libqt4-debug: binary-with-bad-dynamic-table ./usr/lib/libQtGui.so.4.3.4.debug
+libqt4-debug: binary-with-bad-dynamic-table ./usr/lib/libQtNetwork.so.4.3.4.debug
+libqt4-debug: binary-with-bad-dynamic-table ./usr/lib/libQtOpenGL.so.4.3.4.debug
+libqt4-debug: binary-with-bad-dynamic-table ./usr/lib/libQtScript.so.4.3.4.debug
+libqt4-debug: binary-with-bad-dynamic-table ./usr/lib/libQtSql.so.4.3.4.debug
+libqt4-debug: binary-with-bad-dynamic-table ./usr/lib/libQtSvg.so.4.3.4.debug
+libqt4-debug: binary-with-bad-dynamic-table ./usr/lib/libQtTest.so.4.3.4.debug
+libqt4-debug: binary-with-bad-dynamic-table ./usr/lib/libQtXml.so.4.3.4.debug
+libqt4-debug: binary-with-bad-dynamic-table ./usr/lib/qt4/plugins/accessible/libqtaccessiblecompatwidgets.so.debug
+libqt4-debug: binary-with-bad-dynamic-table ./usr/lib/qt4/plugins/accessible/libqtaccessiblewidgets.so.debug
+libqt4-debug: binary-with-bad-dynamic-table ./usr/lib/qt4/plugins/codecs/libqcncodecs.so.debug
+libqt4-debug: binary-with-bad-dynamic-table ./usr/lib/qt4/plugins/codecs/libqjpcodecs.so.debug
+libqt4-debug: binary-with-bad-dynamic-table ./usr/lib/qt4/plugins/codecs/libqkrcodecs.so.debug
+libqt4-debug: binary-with-bad-dynamic-table ./usr/lib/qt4/plugins/codecs/libqtwcodecs.so.debug
+libqt4-debug: binary-with-bad-dynamic-table ./usr/lib/qt4/plugins/designer/libqt3supportwidgets.so.debug
+libqt4-debug: binary-with-bad-dynamic-table ./usr/lib/qt4/plugins/iconengines/libqsvg.so.debug
+libqt4-debug: binary-with-bad-dynamic-table ./usr/lib/qt4/plugins/imageformats/libqgif.so.debug
+libqt4-debug: binary-with-bad-dynamic-table ./usr/lib/qt4/plugins/imageformats/libqjpeg.so.debug
+libqt4-debug: binary-with-bad-dynamic-table ./usr/lib/qt4/plugins/imageformats/libqmng.so.debug
+libqt4-debug: binary-with-bad-dynamic-table ./usr/lib/qt4/plugins/imageformats/libqsvg.so.debug
+libqt4-debug: binary-with-bad-dynamic-table ./usr/lib/qt4/plugins/imageformats/libqtiff.so.debug
+libqt4-debug: binary-with-bad-dynamic-table ./usr/lib/qt4/plugins/inputmethods/libqimsw-multi.so.debug
+
+libqt4-debug: shared-lib-without-dependency-information ./usr/lib/libQt3Support.so.4.3.4.debug
+libqt4-debug: shared-lib-without-dependency-information ./usr/lib/libQtAssistantClient.so.4.3.4.debug
+libqt4-debug: shared-lib-without-dependency-information ./usr/lib/libQtCore.so.4.3.4.debug
+libqt4-debug: shared-lib-without-dependency-information ./usr/lib/libQtDBus.so.4.3.4.debug
+libqt4-debug: shared-lib-without-dependency-information ./usr/lib/libQtDesigner.so.4.3.4.debug
+libqt4-debug: shared-lib-without-dependency-information ./usr/lib/libQtDesignerComponents.so.4.3.4.debug
+libqt4-debug: shared-lib-without-dependency-information ./usr/lib/libQtGui.so.4.3.4.debug
+libqt4-debug: shared-lib-without-dependency-information ./usr/lib/libQtNetwork.so.4.3.4.debug
+libqt4-debug: shared-lib-without-dependency-information ./usr/lib/libQtOpenGL.so.4.3.4.debug
+libqt4-debug: shared-lib-without-dependency-information ./usr/lib/libQtScript.so.4.3.4.debug
+libqt4-debug: shared-lib-without-dependency-information ./usr/lib/libQtSql.so.4.3.4.debug
+libqt4-debug: shared-lib-without-dependency-information ./usr/lib/libQtSvg.so.4.3.4.debug
+libqt4-debug: shared-lib-without-dependency-information ./usr/lib/libQtTest.so.4.3.4.debug
+libqt4-debug: shared-lib-without-dependency-information ./usr/lib/libQtXml.so.4.3.4.debug
+libqt4-debug: shared-lib-without-dependency-information ./usr/lib/qt4/plugins/accessible/libqtaccessiblecompatwidgets.so.debug
+libqt4-debug: shared-lib-without-dependency-information ./usr/lib/qt4/plugins/accessible/libqtaccessiblewidgets.so.debug
+libqt4-debug: shared-lib-without-dependency-information ./usr/lib/qt4/plugins/codecs/libqcncodecs.so.debug
+libqt4-debug: shared-lib-without-dependency-information ./usr/lib/qt4/plugins/codecs/libqjpcodecs.so.debug
+libqt4-debug: shared-lib-without-dependency-information ./usr/lib/qt4/plugins/codecs/libqkrcodecs.so.debug
+libqt4-debug: shared-lib-without-dependency-information ./usr/lib/qt4/plugins/codecs/libqtwcodecs.so.debug
+libqt4-debug: shared-lib-without-dependency-information ./usr/lib/qt4/plugins/designer/libqt3supportwidgets.so.debug
+libqt4-debug: shared-lib-without-dependency-information ./usr/lib/qt4/plugins/iconengines/libqsvg.so.debug
+libqt4-debug: shared-lib-without-dependency-information ./usr/lib/qt4/plugins/imageformats/libqgif.so.debug
+libqt4-debug: shared-lib-without-dependency-information ./usr/lib/qt4/plugins/imageformats/libqjpeg.so.debug
+libqt4-debug: shared-lib-without-dependency-information ./usr/lib/qt4/plugins/imageformats/libqmng.so.debug
+libqt4-debug: shared-lib-without-dependency-information ./usr/lib/qt4/plugins/imageformats/libqsvg.so.debug
+libqt4-debug: shared-lib-without-dependency-information ./usr/lib/qt4/plugins/imageformats/libqtiff.so.debug
+libqt4-debug: shared-lib-without-dependency-information ./usr/lib/qt4/plugins/inputmethods/libqimsw-multi.so.debug
Added: trunk/packages/qt4-x11/debian/libqt4-dev.lintian
===================================================================
--- trunk/packages/qt4-x11/debian/libqt4-dev.lintian (rev 0)
+++ trunk/packages/qt4-x11/debian/libqt4-dev.lintian 2008-02-27 06:59:31 UTC (rev 9476)
@@ -0,0 +1,4 @@
+libqt4-dev: executable-not-elf-or-script ./usr/share/qt4/mkspecs/macx-pbuilder/Info.plist.app
+libqt4-dev: executable-not-elf-or-script ./usr/share/qt4/mkspecs/macx-xcode/Info.plist.app
+libqt4-dev: executable-not-elf-or-script ./usr/share/qt4/mkspecs/macx-xcode/qmake.conf
+libqt4-dev: executable-not-elf-or-script ./usr/share/qt4/mkspecs/macx-pbuilder/qmake.conf
Modified: trunk/packages/qt4-x11/debian/libqt4-gui.lintian
===================================================================
--- trunk/packages/qt4-x11/debian/libqt4-gui.lintian 2008-02-26 20:30:02 UTC (rev 9475)
+++ trunk/packages/qt4-x11/debian/libqt4-gui.lintian 2008-02-27 06:59:31 UTC (rev 9476)
@@ -1 +1 @@
-libqt4-gui: package-name-doesnt-match-sonames libQtGui4 libQtOpenGL4
+libqt4-gui: package-name-doesnt-match-sonames libQtAssistantClient4 libQtDesigner4 libQtDesignerComponents4 libQtGui4 libQtOpenGL4 libQtSvg4
Deleted: trunk/packages/qt4-x11/debian/patches/90_qmake_cxxflags_fpermissive.diff
Modified: trunk/packages/qt4-x11/debian/patches/series
===================================================================
--- trunk/packages/qt4-x11/debian/patches/series 2008-02-26 20:30:02 UTC (rev 9475)
+++ trunk/packages/qt4-x11/debian/patches/series 2008-02-27 06:59:31 UTC (rev 9476)
@@ -37,5 +37,4 @@
60_m68k_inotify_fix.diff
70_hppa_ldcw_fix.diff
80_hurd_max_path.diff
-90_qmake_cxxflags_fpermissive.diff
91_qmake_lflags_no-undefined.diff
Modified: trunk/packages/qt4-x11/debian/rules
===================================================================
--- trunk/packages/qt4-x11/debian/rules 2008-02-26 20:30:02 UTC (rev 9475)
+++ trunk/packages/qt4-x11/debian/rules 2008-02-27 06:59:31 UTC (rev 9476)
@@ -3,7 +3,6 @@
export QTDIR := $(shell pwd)
export PATH := $(QTDIR)/bin:$(PATH)
export LD_LIBRARY_PATH := $(QTDIR)/lib:$(LD_LIBRARY_PATH)
-export CXXFLAGS := -fpermissive
export LDFLAGS := -Wl,--no-undefined -Wl,--as-needed
QTVERSION := $(shell ls changes-* | cut -f2 -d '-')
@@ -36,7 +35,7 @@
EXTRA_CONFIGURE_OPTS += -DQT_QLOCALE_USES_FCVT
endif
-DEB_CONFIGURE_SCRIPT_ENV += CXXFLAGS="-fpermissive" LDFLAGS="-Wl,--no-undefined -Wl,--as-needed"
+DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--no-undefined -Wl,--as-needed"
ifeq ($(DEB_HOST_ARCH_OS),linux)
PLATFORM_ARG = linux-g++
@@ -138,6 +137,10 @@
sed -i "s|-L/build/buildd/qt4-x11-$(QTVERSION)/lib||g" $(PKGCONFIGDIR)/$$f; \
done
+install/libqt4-core::
+ $(CURDIR)/bin/lrelease-qt4 debian/translations/qt_ca.ts \
+ -qm $(DEB_DESTDIR)/usr/share/qt4/translations/qt_ca.qm
+
install/qt4-designer::
install -D -p -m0644 debian/desktop/designer-qt4.desktop \
debian/qt4-designer/usr/share/applications/designer-qt4.desktop
More information about the pkg-kde-commits
mailing list