rev 4607 - in trunk/packages/qt4-x11/debian: . patches
Brian Nelson
pyro at costa.debian.org
Fri Oct 6 01:57:33 UTC 2006
Author: pyro
Date: 2006-10-06 01:57:32 +0000 (Fri, 06 Oct 2006)
New Revision: 4607
Removed:
trunk/packages/qt4-x11/debian/patches/19_s390_atomic.dpatch
Modified:
trunk/packages/qt4-x11/debian/changelog
trunk/packages/qt4-x11/debian/control
trunk/packages/qt4-x11/debian/patches/00list
trunk/packages/qt4-x11/debian/patches/10_qmake_for_debian.dpatch
trunk/packages/qt4-x11/debian/patches/13_arm_ftbfs_fixes.dpatch
trunk/packages/qt4-x11/debian/rules
Log:
* New upstream release
* Enable Qt's new support for using the system's SQLite 3 library
(Closes: #382238)
* debian/rules: removed the PostgreSQL and MySQL include hacks from the
configure arguments, since the configure script now autodetects them
itself
* debian/patches/10_qmake_for_debian.dpatch: updated for new upstream
* debian/patches/13_arm_ftbfs_fixes.dpatch: updated for new upstream
* debian/patches/19_s390_atomic.dpatch: removed, since it appears to be
obsolete
Modified: trunk/packages/qt4-x11/debian/changelog
===================================================================
--- trunk/packages/qt4-x11/debian/changelog 2006-10-05 08:50:42 UTC (rev 4606)
+++ trunk/packages/qt4-x11/debian/changelog 2006-10-06 01:57:32 UTC (rev 4607)
@@ -1,10 +1,26 @@
-qt4-x11 (4.1.4-2) UNRELEASED; urgency=low
+qt4-x11 (4.2.0-1) UNRELEASED; urgency=low
+ * New upstream release
+
* debian/control: made libqt4-gui conflict/replace libqt4-designer, to
ensure that old package is removed (Closes: #380253)
- -- Brian Nelson <pyro at debian.org> Fri, 28 Jul 2006 18:35:48 -0700
+ * Enable Qt's new support for using the system's SQLite 3 library
+ (Closes: #382238)
+ * debian/rules: removed the PostgreSQL and MySQL include hacks from the
+ configure arguments, since the configure script now autodetects them
+ itself
+
+ * debian/patches/10_qmake_for_debian.dpatch: updated for new upstream
+
+ * debian/patches/13_arm_ftbfs_fixes.dpatch: updated for new upstream
+
+ * debian/patches/19_s390_atomic.dpatch: removed, since it appears to be
+ obsolete
+
+ -- Brian Nelson <pyro at debian.org> Thu, 5 Oct 2006 21:53:41 -0400
+
qt4-x11 (4.1.4-1) unstable; urgency=low
* New upstream release (Closes: #378443)
Modified: trunk/packages/qt4-x11/debian/control
===================================================================
--- trunk/packages/qt4-x11/debian/control 2006-10-05 08:50:42 UTC (rev 4606)
+++ trunk/packages/qt4-x11/debian/control 2006-10-06 01:57:32 UTC (rev 4607)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
Uploaders: Brian Nelson <pyro at debian.org>
-Build-Depends: debhelper (>= 5.0.0), 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), libjpeg62-dev, libjpeg62-dev, zlib1g-dev, libmng-dev (>= 1.0.3), libpng12-dev, libfreetype6-dev, libmysqlclient15-dev, flex, libpq-dev, libaudio-dev, libcupsys2-dev, xlibmesa-gl-dev | libgl-dev, libglu1-xorg-dev | libglu1-mesa-dev | libglu-dev, libxft-dev, libxrender-dev, libxcursor-dev, cdbs (>= 0.4.0), dpatch, libxinerama-dev, libsqlite0-dev
+Build-Depends: debhelper (>= 5.0.0), 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), libjpeg62-dev, libjpeg62-dev, zlib1g-dev, libmng-dev (>= 1.0.3), libpng12-dev, libfreetype6-dev, libmysqlclient15-dev, flex, libpq-dev, libaudio-dev, libcupsys2-dev, xlibmesa-gl-dev | libgl-dev, libglu1-xorg-dev | libglu1-mesa-dev | libglu-dev, libxft-dev, libxrender-dev, libxcursor-dev, cdbs (>= 0.4.0), dpatch, libxinerama-dev, libsqlite0-dev, libsqlite3-dev
Standards-Version: 3.7.2
Package: libqt4-dev
Modified: trunk/packages/qt4-x11/debian/patches/00list
===================================================================
--- trunk/packages/qt4-x11/debian/patches/00list 2006-10-05 08:50:42 UTC (rev 4606)
+++ trunk/packages/qt4-x11/debian/patches/00list 2006-10-06 01:57:32 UTC (rev 4607)
@@ -6,4 +6,3 @@
16_hppa_ldcw_fix
17_alpha_ice
18_disable_opengl_visibility
-19_s390_atomic
Modified: trunk/packages/qt4-x11/debian/patches/10_qmake_for_debian.dpatch
===================================================================
--- trunk/packages/qt4-x11/debian/patches/10_qmake_for_debian.dpatch 2006-10-05 08:50:42 UTC (rev 4606)
+++ trunk/packages/qt4-x11/debian/patches/10_qmake_for_debian.dpatch 2006-10-06 01:57:32 UTC (rev 4607)
@@ -6,26 +6,17 @@
## DP: that use recursively link against all indirectly-used libraries.
@DPATCH@
-diff -urNad qt4-x11-4.1.0~/mkspecs/linux-g++/qmake.conf qt4-x11-4.1.0/mkspecs/linux-g++/qmake.conf
---- qt4-x11-4.1.0~/mkspecs/linux-g++/qmake.conf 2005-12-16 03:51:53.000000000 -0800
-+++ qt4-x11-4.1.0/mkspecs/linux-g++/qmake.conf 2006-01-10 17:57:18.000000000 -0800
-@@ -4,7 +4,7 @@
+diff -urNad qt4-x11-4.2.0~/mkspecs/common/linux.conf qt4-x11-4.2.0/mkspecs/common/linux.conf
+--- qt4-x11-4.2.0~/mkspecs/common/linux.conf 2006-09-29 10:44:55.000000000 -0400
++++ qt4-x11-4.2.0/mkspecs/common/linux.conf 2006-10-05 21:30:21.000000000 -0400
+@@ -19,8 +19,8 @@
+ QMAKE_LIBS_OPENGL_QT = -lGL
+ QMAKE_LIBS_THREAD = -lpthread
- MAKEFILE_GENERATOR = UNIX
- TEMPLATE = app
--CONFIG += qt warn_on release incremental link_prl
-+CONFIG += qt warn_on release incremental
- QT += core gui
- QMAKE_INCREMENTAL_STYLE = sublib
+-QMAKE_MOC = $$[QT_INSTALL_BINS]/moc
+-QMAKE_UIC = $$[QT_INSTALL_BINS]/uic
++QMAKE_MOC = $$[QT_INSTALL_BINS]/moc-qt4
++QMAKE_UIC = $$[QT_INSTALL_BINS]/uic-qt4
-@@ -68,8 +68,8 @@
- QMAKE_LIBS_OPENGL_QT = -lGL
- QMAKE_LIBS_THREAD = -lpthread
-
--QMAKE_MOC = $$[QT_INSTALL_BINS]/moc
--QMAKE_UIC = $$[QT_INSTALL_BINS]/uic
-+QMAKE_MOC = $$[QT_INSTALL_BINS]/moc-qt4
-+QMAKE_UIC = $$[QT_INSTALL_BINS]/uic-qt4
-
- QMAKE_AR = ar cqs
- QMAKE_RANLIB =
+ QMAKE_AR = ar cqs
+ QMAKE_RANLIB =
Modified: trunk/packages/qt4-x11/debian/patches/13_arm_ftbfs_fixes.dpatch
===================================================================
--- trunk/packages/qt4-x11/debian/patches/13_arm_ftbfs_fixes.dpatch 2006-10-05 08:50:42 UTC (rev 4606)
+++ trunk/packages/qt4-x11/debian/patches/13_arm_ftbfs_fixes.dpatch 2006-10-06 01:57:32 UTC (rev 4607)
@@ -6,10 +6,10 @@
## DP: Fixes FTBFS on arm
@DPATCH@
-diff -urNad qt4-x11-4.1.0~/src/corelib/global/qglobal.h qt4-x11-4.1.0/src/corelib/global/qglobal.h
---- qt4-x11-4.1.0~/src/corelib/global/qglobal.h 2005-12-16 06:51:59.000000000 -0500
-+++ qt4-x11-4.1.0/src/corelib/global/qglobal.h 2006-01-07 13:46:59.000000000 -0500
-@@ -715,8 +715,9 @@
+diff -urNad qt4-x11-4.2.0~/src/corelib/global/qglobal.h qt4-x11-4.2.0/src/corelib/global/qglobal.h
+--- qt4-x11-4.2.0~/src/corelib/global/qglobal.h 2006-10-05 21:46:36.000000000 -0400
++++ qt4-x11-4.2.0/src/corelib/global/qglobal.h 2006-10-05 21:46:44.000000000 -0400
+@@ -792,8 +792,9 @@
#if defined(QT_COORD_TYPE)
typedef QT_COORD_TYPE qreal;
@@ -21,15 +21,3 @@
#else
typedef double qreal;
#endif
-diff -urNad qt4-x11-4.1.0~/src/corelib/tools/qchar.h qt4-x11-4.1.0/src/corelib/tools/qchar.h
---- qt4-x11-4.1.0~/src/corelib/tools/qchar.h 2005-12-16 06:52:00.000000000 -0500
-+++ qt4-x11-4.1.0/src/corelib/tools/qchar.h 2006-01-07 13:45:48.000000000 -0500
-@@ -219,7 +219,7 @@
- inline const char toLatin1() const;
- inline const ushort unicode() const { return ucs; }
- #ifdef Q_NO_PACKED_REFERENCE
-- inline ushort &unicode() { return *(&ucs); }
-+ inline ushort &unicode() { return *((ushort*)&ucs); }
- #else
- inline ushort &unicode() { return ucs; }
- #endif
Deleted: trunk/packages/qt4-x11/debian/patches/19_s390_atomic.dpatch
Modified: trunk/packages/qt4-x11/debian/rules
===================================================================
--- trunk/packages/qt4-x11/debian/rules 2006-10-05 08:50:42 UTC (rev 4606)
+++ trunk/packages/qt4-x11/debian/rules 2006-10-06 01:57:32 UTC (rev 4607)
@@ -14,7 +14,7 @@
DEB_DH_INSTALL_SOURCEDIR := debian/tmp
DEB_MAKE_CLEAN_TARGET := confclean distclean
DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_INSTALL_CHANGELOGS_ALL := changes-4.1.4
+DEB_INSTALL_CHANGELOGS_ALL := changes-4.2.0
common-configure-arch::
@@ -37,11 +37,10 @@
-qt-gif \
-qt-sql-psql \
-qt-sql-mysql \
- -qt-sql-sqlite \
+ -qt-sql-slite \
+ -system-sqlite \
-qt-sql-sqlite2 \
- -I/usr/include/mysql \
-I/usr/include/freetype2 \
- -I`pg_config --includedir` \
-lfontconfig \
-cups
More information about the pkg-kde-commits
mailing list