rev 4611 - trunk/packages/qt4-x11/debian
Brian Nelson
pyro at costa.debian.org
Fri Oct 6 16:26:54 UTC 2006
Author: pyro
Date: 2006-10-06 16:26:53 +0000 (Fri, 06 Oct 2006)
New Revision: 4611
Modified:
trunk/packages/qt4-x11/debian/changelog
trunk/packages/qt4-x11/debian/control
trunk/packages/qt4-x11/debian/libqt4-dev.install
trunk/packages/qt4-x11/debian/libqt4-gui.install
trunk/packages/qt4-x11/debian/rules
Log:
* debian/control: removed libqt4-debug-dev since now that the _debug
libs have been removed and debugging symbols are shipped in their
place, this package is no longer needed
* Tar up the demos directory and include it in qt4-doc. Also added the
qtdemo binary to libqt4-dev. (Closes: #390925)
* debian/rules: add -DQT_QLOCALE_USES_FCVT to the configure arguments
when building on arm, like Qt3, to fix a uic problem (Closes: #386460)
* debian/libqt4-gui.install: added usr/lib/libQtAssistantClient.so.*,
since it's now shipped as a shared library; previously it was a static
library
Modified: trunk/packages/qt4-x11/debian/changelog
===================================================================
--- trunk/packages/qt4-x11/debian/changelog 2006-10-06 13:00:51 UTC (rev 4610)
+++ trunk/packages/qt4-x11/debian/changelog 2006-10-06 16:26:53 UTC (rev 4611)
@@ -25,8 +25,22 @@
* debian/libqt4-debug.install: changed the wildcards to match the new
debug lib names. What was once *_debug.so.* is now *.debug. Ick.
- -- Brian Nelson <pyro at debian.org> Fri, 6 Oct 2006 09:00:28 -0400
+ * debian/control: removed libqt4-debug-dev since now that the _debug
+ libs have been removed and debugging symbols are shipped in their
+ place, this package is no longer needed
+ * Tar up the demos directory and include it in qt4-doc. Also added the
+ qtdemo binary to libqt4-dev. (Closes: #390925)
+
+ * debian/rules: add -DQT_QLOCALE_USES_FCVT to the configure arguments
+ when building on arm, like Qt3, to fix a uic problem (Closes: #386460)
+
+ * debian/libqt4-gui.install: added usr/lib/libQtAssistantClient.so.*,
+ since it's now shipped as a shared library; previously it was a static
+ library
+
+ -- Brian Nelson <pyro at debian.org> Fri, 6 Oct 2006 11:59:58 -0400
+
qt4-x11 (4.1.4-1.1) unstable; urgency=medium
* Non-maintainer upload.
Modified: trunk/packages/qt4-x11/debian/control
===================================================================
--- trunk/packages/qt4-x11/debian/control 2006-10-06 13:00:51 UTC (rev 4610)
+++ trunk/packages/qt4-x11/debian/control 2006-10-06 16:26:53 UTC (rev 4611)
@@ -12,7 +12,7 @@
Depends: ${misc:Depends}, libqt4-core (= ${Source-Version}), libqt4-gui (= ${Source-Version}), libqt4-sql (= ${Source-Version}), libqt4-qt3support (= ${Source-Version}), libxext-dev (>= 4.3.0.dfsg.1-4), libxrandr-dev (>= 4.3.0.dfsg.1-4), x11proto-core-dev, libsm-dev (>= 4.3.0.dfsg.1-4), libxmu-dev (>= 4.3.0.dfsg.1-4), libice-dev (>= 4.3.0.dfsg.1-4), libx11-dev (>= 4.3.0.dfsg.1-4), libxt-dev (>= 4.3.0.dfsg.1-4), libxrender-dev, libxcursor-dev, libxinerama-dev, libxi-dev, libmng-dev (>= 1.0.3), libpng12-0-dev, libjpeg62-dev, zlib1g-dev, libfreetype6-dev, xlibmesa-gl-dev | libgl-dev, libglu1-xorg-dev | libglu1-mesa-dev | libglu-dev, libxft-dev, libaudio-dev, libpq-dev
Conflicts: qt3-dev-tools (<= 3:3.3.4-7)
Recommends: qt4-dev-tools
-Suggests: qt4-doc, libqt4-debug-dev
+Suggests: qt4-doc
Description: Qt 4 development files
Qt is a cross-platform C++ application framework. Qt's primary feature
is its rich set of widgets that provide standard GUI functionality.
@@ -22,20 +22,6 @@
.
Homepage: http://www.trolltech.com
-Package: libqt4-debug-dev
-Architecture: any
-Section: libdevel
-Depends: ${shlibs:Depends}, ${misc:Depends}, libqt4-dev (= ${Source-Version}), libqt4-debug (= ${Source-Version})
-Priority: extra
-Description: Qt 4 debugging development files
- Qt is a cross-platform C++ application framework. Qt's primary feature
- is its rich set of widgets that provide standard GUI functionality.
- .
- This packages contains the header files and programs used for building
- debugging versions of Qt applications.
- .
- Homepage: http://www.trolltech.com
-
Package: libqt4-core
Architecture: any
Section: libs
@@ -112,12 +98,12 @@
Package: libqt4-debug
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Qt 4 debugging runtime libraries
+Depends: ${shlibs:Depends}, ${misc:Depends}, libqt4-gui (= ${Source-Version})
+Description: Qt 4 library debugging symbols
Qt is a cross-platform C++ application framework. Qt's primary feature
is its rich set of widgets that provide standard GUI functionality.
.
- This packages contains the debugging libraries for Qt 4.
+ This packages contains the debugging symbols for the Qt 4 libraries.
.
Homepage: http://www.trolltech.com
Modified: trunk/packages/qt4-x11/debian/libqt4-dev.install
===================================================================
--- trunk/packages/qt4-x11/debian/libqt4-dev.install 2006-10-06 13:00:51 UTC (rev 4610)
+++ trunk/packages/qt4-x11/debian/libqt4-dev.install 2006-10-06 16:26:53 UTC (rev 4611)
@@ -13,3 +13,4 @@
usr/bin/qt3to4
usr/bin/rcc
usr/bin/uic3
+usr/bin/qtdemo
Modified: trunk/packages/qt4-x11/debian/libqt4-gui.install
===================================================================
--- trunk/packages/qt4-x11/debian/libqt4-gui.install 2006-10-06 13:00:51 UTC (rev 4610)
+++ trunk/packages/qt4-x11/debian/libqt4-gui.install 2006-10-06 16:26:53 UTC (rev 4611)
@@ -3,6 +3,7 @@
usr/lib/libQtSvg.so.*
usr/lib/libQtDesigner.so.*
usr/lib/libQtDesignerComponents.so.*
+usr/lib/libQtAssistantClient.so.*
usr/lib/qt4/plugins/imageformats/libqjpeg.so
usr/lib/qt4/plugins/imageformats/libqgif.so
usr/lib/qt4/plugins/imageformats/libqmng.so
Modified: trunk/packages/qt4-x11/debian/rules
===================================================================
--- trunk/packages/qt4-x11/debian/rules 2006-10-06 13:00:51 UTC (rev 4610)
+++ trunk/packages/qt4-x11/debian/rules 2006-10-06 16:26:53 UTC (rev 4611)
@@ -12,10 +12,19 @@
DEB_MAKE_BUILD_TARGET := sub-src sub-tools
DEB_MAKE_INSTALL_TARGET := INSTALL_ROOT=$(DEB_DESTDIR) install
DEB_DH_INSTALL_SOURCEDIR := debian/tmp
+
+# Ensure the *.debug files aren't included in any package other than
+# libqt4-debug.
+DEB_DH_INSTALL_ARGS := --exclude=.debug
+
DEB_MAKE_CLEAN_TARGET := confclean distclean
DEB_DH_MAKESHLIBS_ARGS_ALL := -V
+
DEB_INSTALL_CHANGELOGS_ALL := changes-4.2.0
+ifeq ($(DEB_HOST_ARCH),arm)
+ EXTRA_CONFIGURE_OPTS += -DQT_QLOCALE_USES_FCVT
+endif
common-configure-arch::
./configure -confirm-license \
@@ -42,10 +51,12 @@
-qt-sql-sqlite2 \
-I/usr/include/freetype2 \
-lfontconfig \
- -cups
+ -cups \
+ $(EXTRA_CONFIGURE_OPTS)
clean::
- # Extra stuff missed by confclean/distclean
+
+# Extra stuff missed by confclean/distclean
rm -f Makefile \
bin/qmake \
mkspecs/default \
@@ -70,27 +81,29 @@
BINDIR := $(DEB_DESTDIR)/usr/bin
common-install-arch::
- # Tack on -qt4 to the binaries that use the alternatives system
+# Tack on -qt4 to the binaries that use the alternatives system
for f in qmake lupdate lrelease uic moc assistant designer linguist qtconfig; do \
mv "$(BINDIR)/$$f" "$(BINDIR)/$$f-qt4"; \
done
binary-install/qt4-doc::
- # Tar up the examples to include them in qt4-doc
+# Tar up the examples to include them in qt4-doc
-$(MAKE) -k -C examples distclean
tar -cv examples/ | \
gzip -9 > debian/qt4-doc/usr/share/doc/qt4-doc/qt4-examples.tar.gz
+ -$(MAKE) -k -C demos distclean
+ tar -cv demos/ | \
+ gzip -9 > debian/qt4-doc/usr/share/doc/qt4-doc/qt4-demos.tar.gz
+binary-install/libqt4-debug::
+# Run dh_install without the default DEB_DH_INSTALL_ARGS to install the
+# *.debug files.
+ dh_install -plibqt4-debug --sourcedir=$(DEB_DH_INSTALL_SOURCEDIR)
+
# Automatically install lintian overrides, stolen from debian-qt-kde.mk
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -e debian/$(cdbs_curpkg).lintian; then \
install -p -D -m644 debian/$(cdbs_curpkg).lintian \
debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
fi
-
-# Remove debugging library junk from libqt4-dev, it goes in
-#libqt4-debug-dev instead.
-binary-post-install/libqt4-dev::
- rm -f debian/$(cdbs_curpkg)/usr/lib/*_debug.* \
- debian/$(cdbs_curpkg)/usr/lib/pkgconfig/*_debug.*
More information about the pkg-kde-commits
mailing list