[Pkg-kde-commits] rev 1707 - in trunk/packages/qt-x11-free/debian:
. patches
Christopher Martin
chrsmrtn-guest at costa.debian.org
Tue Sep 6 13:54:55 UTC 2005
Author: chrsmrtn-guest
Date: 2005-09-06 13:54:55 +0000 (Tue, 06 Sep 2005)
New Revision: 1707
Added:
trunk/packages/qt-x11-free/debian/patches/10_arm_gcc4.dpatch
Removed:
trunk/packages/qt-x11-free/debian/patches/08_arm_gcc4.dpatch
Modified:
trunk/packages/qt-x11-free/debian/control
trunk/packages/qt-x11-free/debian/patches/00list
trunk/packages/qt-x11-free/debian/rules
Log:
Rename a patch to keep a clean number order. Merge some minor
remove-trailing-spaces style fixes from people/chrsmrtn.
Modified: trunk/packages/qt-x11-free/debian/control
===================================================================
--- trunk/packages/qt-x11-free/debian/control 2005-09-06 13:53:27 UTC (rev 1706)
+++ trunk/packages/qt-x11-free/debian/control 2005-09-06 13:54:55 UTC (rev 1707)
@@ -15,7 +15,7 @@
Suggests: libqt3-mt-psql, libqt3-mt-mysql, libqt3-mt-odbc
Description: Qt GUI Library (Threaded runtime version), Version 3
This is the Trolltech Qt library, version 3. It's necessary for
- applications that link against the libqt-mt.so.3, e.g. all KDE3
+ applications that link against the libqt-mt.so.3, e.g. all KDE3
applications.
Package: libqt3-mt-dbg
@@ -55,8 +55,8 @@
Replaces: libqt3-psql (<= 2:3.1.1+cvs.20021220-1), libqt3c102-mt-psql
Conflicts: libqt3c102-mt-psql, libqt3c-mt-psql
Description: PostgreSQL database driver for Qt3 (Threaded)
- This package contains the threaded PostgreSQL plugin for Qt3.
- Install it if you intend to use or write Qt programs that are
+ This package contains the threaded PostgreSQL plugin for Qt3.
+ Install it if you intend to use or write Qt programs that are
to access a PostgreSQL DB.
Package: libqt3-mt-ibase
@@ -66,10 +66,10 @@
Conflicts: libqt3c102-mt-ibase
Replaces: libqt3c102-mt-ibase
Description: InterBase/FireBird database driver for Qt3 (Threaded)
- This package contains the threaded InterBase/FireBird plugin
- for Qt3. Install it if you intend to use or write Qt programs
+ This package contains the threaded InterBase/FireBird plugin
+ for Qt3. Install it if you intend to use or write Qt programs
that are to access an InterBase/FireBird DB.
-
+
Package: libqt3-mt-sqlite
Architecture: any
Section: libs
@@ -77,7 +77,7 @@
Conflicts: libqt3c102-mt-sqlite
Replaces: libqt3c102-mt-sqlite
Description: SQLite database driver for Qt3 (Threaded)
- This package contains the threaded SQLite plugin for Qt3. Install
+ This package contains the threaded SQLite plugin for Qt3. Install
it if you intend to use or write Qt programs that are to access an
SQLite DB.
@@ -91,16 +91,16 @@
Suggests: libqt3-i18n, qt3-doc
Description: Qt development files (Threaded)
Qt is a C++ class library optimized for graphical user interface
- development. This package contains the libqt-mt.so symlink, necessary
- for building threaded Qt applications as well as the libqui.so symlink
- and the necessary header files for libqui.so. (See README.Debian and
+ development. This package contains the libqt-mt.so symlink, necessary
+ for building threaded Qt applications as well as the libqui.so symlink
+ and the necessary header files for libqui.so. (See README.Debian and
the Qt Documentation for instructions on libqui.so)
.
- WARNING: If you plan to build some older Qt3 applications, you will
+ WARNING: If you plan to build some older Qt3 applications, you will
most probably have to install the libqt3-compat-headers package. It
contains all the headers which are not part of the official Qt3 API
anymore but which are still used by some programs. So if you encounter
- problems with missing header files, please install this package first
+ problems with missing header files, please install this package first
before you send a bugreport.
Package: libqt3-headers
@@ -109,8 +109,8 @@
Recommends: libqt3-mt-dev
Replaces: libqt3-mt-dev, libqt3-dev, libqt3-plugins-headers
Description: Qt3 header files
- This package contains all header files for libqt and libqt-mt which come
- with Qt3. If you want to compile or develop programs which use Qt3, you
+ This package contains all header files for libqt and libqt-mt which come
+ with Qt3. If you want to compile or develop programs which use Qt3, you
have to install this package.
Package: libqt3-compat-headers
@@ -122,10 +122,10 @@
Description: Qt 1.x and 2.x compatibility includes
This package contains header files that are intended for build
compatibility for applications that build with Qt3 but still use
- deprecated includes. It is meant as an intermediate solution and
+ deprecated includes. It is meant as an intermediate solution and
these header files are not part of the official Qt3 API.
- All sourcecode that is still using the headers of this package is
- subject to be changed to use the new header files which are in
+ All sourcecode that is still using the headers of this package is
+ subject to be changed to use the new header files which are in
libqt3-headers.
Package: qt3-dev-tools
@@ -139,7 +139,7 @@
This package contains all tools that are necessary to build programs
that are written using Qt3. These are: qmake, uic and moc.
For Qt3 development, you most likely want to install this package.
-
+
Package: qt3-designer
Architecture: any
Section: devel
@@ -164,14 +164,14 @@
Depends: libqt3-mt-dev
Replaces: qt3-tools, libqt3-dev, libqt3-mt-dev
Description: Qt3 Developer applications development files
- This package is intended for developers who want to develop applications
+ This package is intended for developers who want to develop applications
using the additional static libraries that ship with the applications
included with Qt; the Qt Designer and the Qt Assistant.
It allows integrating additional enhancements into the Qt Designer
respectively faciliate the Qt Assistant from within your Qt application
to interactively call the Assistant for displaying online help that the
developer includes with his application.
-
+
Package: qt3-linguist
Architecture: any
Section: devel
@@ -183,7 +183,7 @@
tool perfect for translating any Qt-based application into other
languages and can be used and installed independently of any Qt
development files by the translator.
-
+
Package: qt3-assistant
Architecture: any
Section: x11
@@ -191,16 +191,16 @@
Replaces: qt3-tools, libqt3-dev, libqt3-mt-dev
Description: The Qt3 assistant application
This package contains the Qt3 Assistant, an easy to use frontend for
- the complete Qt3 documentation and serves as an online help viewer for
+ the complete Qt3 documentation and serves as an online help viewer for
any Qt program that wants to give the usesr access to online help.
Within the Qt tools it is used as the help viewer for the online help
- for the Qt3 Designer and Linguist as well as qmake and the Qt 3 API
+ for the Qt3 Designer and Linguist as well as qmake and the Qt 3 API
documentation.
.
Developers of Qt Application who want to faciliate the Qt Assistant for online
help display should refer to the README.Debian file for libqt3-mt-dev and
the package qt3-apps-dev.
-
+
Package: qt3-qtconfig
Architecture: any
Section: x11
@@ -214,7 +214,7 @@
according to his desktop settings in KDE. However, if you need to run
CJK-fonts or other non-latin scripts, you will most likely want to
install this package.
-
+
Package: qt3-dev-tools-embedded
Architecture: any
Section: devel
@@ -251,7 +251,7 @@
This package contains the internationalization files for the Qt library.
Qt applications that are internationalized will need to depend on this package
for full internationalization support of the application towards the end user.
-
+
Package: qt3-doc
Architecture: all
Section: doc
Modified: trunk/packages/qt-x11-free/debian/patches/00list
===================================================================
--- trunk/packages/qt-x11-free/debian/patches/00list 2005-09-06 13:53:27 UTC (rev 1706)
+++ trunk/packages/qt-x11-free/debian/patches/00list 2005-09-06 13:54:55 UTC (rev 1707)
@@ -4,9 +4,9 @@
05_qvfb_cpp
06_disable_rpath
07_gcc4_workarounds_fixes_postscript
-08_arm_gcc4
08_thread_default
09_amd64_lib64
+10_arm_gcc4
14_fix_kmenu
15_unify_declarations_glibc
16_fix_opengl_check
Deleted: trunk/packages/qt-x11-free/debian/patches/08_arm_gcc4.dpatch
Copied: trunk/packages/qt-x11-free/debian/patches/10_arm_gcc4.dpatch (from rev 1701, trunk/packages/qt-x11-free/debian/patches/08_arm_gcc4.dpatch)
Modified: trunk/packages/qt-x11-free/debian/rules
===================================================================
--- trunk/packages/qt-x11-free/debian/rules 2005-09-06 13:53:27 UTC (rev 1706)
+++ trunk/packages/qt-x11-free/debian/rules 2005-09-06 13:54:55 UTC (rev 1707)
@@ -233,7 +233,7 @@
## all packages
# install the overrides files
for a in debian/overrides/*; do install -d debian/`echo "$$a" | sed 's/debian\/overrides\///g'`/usr/share/lintian/overrides; done
- for a in debian/overrides/*; do cp "$$a" debian/`echo "$$a" | sed 's/debian\/overrides\///g'`/usr/share/lintian/overrides/`echo "$$a" | sed 's/debian\/overrides\///g'`; done
+ for a in debian/overrides/*; do cp "$$a" debian/`echo "$$a" | sed 's/debian\/overrides\///g'`/usr/share/lintian/overrides/`echo "$$a" | sed 's/debian\/overrides\///g'`; done
chmod 644 debian/qt3-dev-tools/usr/share/qt3/mkspecs/aix-g++-64/qplatformdefs.h
chmod 644 debian/qt3-dev-tools/usr/share/qt3/mkspecs/macx-pbuilder/Info.plist.app
More information about the pkg-kde-commits
mailing list