[Pkg-kde-commits] rev 1664 - trunk/packages/qt-x11-free/debian
Adeodato Simó
adeodato at costa.debian.org
Sun Sep 4 22:16:18 UTC 2005
Author: adeodato
Date: 2005-09-04 22:16:17 +0000 (Sun, 04 Sep 2005)
New Revision: 1664
Removed:
trunk/packages/qt-x11-free/debian/libqt3-dev.docs
trunk/packages/qt-x11-free/debian/libqt3-dev.install
trunk/packages/qt-x11-free/debian/libqt3-dev.links
trunk/packages/qt-x11-free/debian/libqt3-ibase.install
trunk/packages/qt-x11-free/debian/libqt3-mysql.install
trunk/packages/qt-x11-free/debian/libqt3-odbc.install
trunk/packages/qt-x11-free/debian/libqt3-psql.install
trunk/packages/qt-x11-free/debian/libqt3-sqlite.install
trunk/packages/qt-x11-free/debian/libqt3.install
trunk/packages/qt-x11-free/debian/libqt3.links
trunk/packages/qt-x11-free/debian/libqt3.postrm
Modified:
trunk/packages/qt-x11-free/debian/changelog
trunk/packages/qt-x11-free/debian/control
trunk/packages/qt-x11-free/debian/rules
Log:
Merge from Chris:
- remove non-threaded libraries.
Modified: trunk/packages/qt-x11-free/debian/changelog
===================================================================
--- trunk/packages/qt-x11-free/debian/changelog 2005-09-04 20:54:29 UTC (rev 1663)
+++ trunk/packages/qt-x11-free/debian/changelog 2005-09-04 22:16:17 UTC (rev 1664)
@@ -1,3 +1,13 @@
+qt-x11-free (3:3.3.4-8) unstable; urgency=low
+
+ +++ Changes by Christopher Martin:
+
+ * No longer build non-threaded libraries. (Closes: #180326)
+ No package in the archive uses them, except a bogus qtdmm
+ build-dependency (#326627).
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Date
+
qt-x11-free (3:3.3.4-7) unstable; urgency=low
* The "Mistakes happen; sadly, sometimes they happen all the same day" release.
Modified: trunk/packages/qt-x11-free/debian/control
===================================================================
--- trunk/packages/qt-x11-free/debian/control 2005-09-04 20:54:29 UTC (rev 1663)
+++ trunk/packages/qt-x11-free/debian/control 2005-09-04 22:16:17 UTC (rev 1664)
@@ -6,21 +6,6 @@
Priority: optional
Standards-Version: 3.6.2
-Package: libqt3
-Architecture: any
-Section: libs
-Replaces: libqt3-gl, qt3-tools (<< 2:3.0.2-20020306-1), libqt3c102, libqt3-mt
-Depends: ${shlibs:Depends}, fontconfig
-Conflicts: libqt3-gl, libqt3c102, libqt3c
-Suggests: libqt3-psql, libqt3-mysql, libqt3-odbc
-Description: Qt GUI Library, Version 3
- This is the Trolltech Qt library, version 3. It's necessary for
- applications that link against the libqt.so.3.
- .
- WARNING: The nonthreaded version of Qt3 is considered deprecated and
- may disappear anytime in the future. Please use libqt3-mt instead
- (Read README.Debian for instructions).
-
Package: libqt3-mt
Architecture: any
Section: libs
@@ -33,22 +18,6 @@
applications that link against the libqt-mt.so.3, e.g. all KDE3
applications.
-Package: libqt3-mysql
-Architecture: any
-Section: libs
-Depends: ${shlibs:Depends}
-Conflicts: libqt3c102-mysql, libqt3c-mysql
-Replaces: libqt3c102-mysql
-Description: MySQL database driver for Qt3
- This package contains the MySQL plugin for Qt3. Install it if you
- intend to use or write Qt programs that are to access a MySQL DB
- and if you are absolutely sure that libqt3-mt-mysql does not
- suit your needs.
- .
- WARNING: The nonthreaded version of Qt3 is considered deprecated and
- may disappear anytime in the future. Please use the proper threaded
- version instead (Read README.Debian for instructions).
-
Package: libqt3-mt-mysql
Architecture: any
Section: libs
@@ -59,22 +28,6 @@
This package contains the threaded MySQL plugin for Qt3. Install it if
you intend to use or write Qt programs that are to access a MySQL DB.
-Package: libqt3-odbc
-Architecture: any
-Section: libs
-Depends: ${shlibs:Depends}
-Conflicts: libqt3c102-odbc, libqt3c-odbc
-Replaces: libqt3c102-odbc
-Description: ODBC database driver for Qt3
- This package contains the ODBC plugin for Qt3. Install it if you
- intend to use or write Qt programs that are to access an ODBC DB
- and if you are absolutely sure that libqt3-mt-odbc does not
- suit your needs.
- .
- WARNING: The nonthreaded version of Qt3 is considered deprecated and
- may disappear anytime in the future. Please use the proper threaded
- version instead (Read README.Debian for instructions).
-
Package: libqt3-mt-odbc
Architecture: any
Section: libs
@@ -85,22 +38,6 @@
This package contains the threaded ODBC plugin for Qt3. Install it if
you intend to use or write Qt programs that are to access an ODBC DB.
-Package: libqt3-psql
-Architecture: any
-Section: libs
-Depends: ${shlibs:Depends}
-Conflicts: libqt3c102-psql, libqt3c-psql
-Replaces: libqt3c102-psql
-Description: PostgreSQL database driver for Qt3
- This package contains the unthreaded PostgreSQL plugin for Qt3.
- Install it if you intend to use or write Qt programs that are
- to access a PostgreSQL DB and if you are absolutely sure that
- libqt3-mt-psql does not suit your needs.
- .
- WARNING: The nonthreaded version of Qt3 is considered deprecated and
- may disappear anytime in the future. Please use the proper threaded
- version instead (Read README.Debian for instructions).
-
Package: libqt3-mt-psql
Architecture: any
Section: libs
@@ -112,22 +49,6 @@
Install it if you intend to use or write Qt programs that are
to access a PostgreSQL DB.
-Package: libqt3-ibase
-Architecture: i386 hurd-i386 kfreebsd-i386 knetbsd-i386 netbsd-i386
-Section: libs
-Depends: ${shlibs:Depends}
-Conflicts: libqt3c102-ibase
-Replaces: libqt3c102-ibase
-Description: InterBase/FireBird database driver for Qt3
- This package contains the InterBase/FireBird plugin for Qt3. Install
- it if you intend to use or write Qt programs that are to access
- an InterBase/FireBird DB and if you are absolutely sure that
- libqt3-mt-ibase does not suit your needs.
- .
- WARNING: The nonthreaded version of Qt3 is considered deprecated and
- may disappear anytime in the future. Please use the proper threaded
- version instead (Read README.Debian for instructions).
-
Package: libqt3-mt-ibase
Architecture: i386 hurd-i386 kfreebsd-i386 knetbsd-i386 netbsd-i386
Section: libs
@@ -139,22 +60,6 @@
for Qt3. Install it if you intend to use or write Qt programs
that are to access an InterBase/FireBird DB.
-Package: libqt3-sqlite
-Architecture: any
-Section: libs
-Depends: ${shlibs:Depends}
-Conflicts: libqt3c102-sqlite
-Replaces: libqt3c102-sqlite
-Description: SQLite database driver for Qt3
- This package contains the SQLite plugin for Qt3. Install it if
- you intend to use or write Qt programs that are to access an
- SQLite DB and if you are absolutely sure that libqt3-mt-sqlite
- does not suit your needs.
- .
- WARNING: The nonthreaded version of Qt3 is considered deprecated and
- may disappear anytime in the future. Please use the proper threaded
- version instead (Read README.Debian for instructions).
-
Package: libqt3-mt-sqlite
Architecture: any
Section: libs
@@ -166,30 +71,6 @@
it if you intend to use or write Qt programs that are to access an
SQLite DB.
-Package: libqt3-dev
-Architecture: any
-Section: libdevel
-Replaces: libqt2-dev, libqt-dev, qt3-doc (<< 2:3.0.2-20020306-1), qt3-tools (<< 2:3.0.3-20020329-1), libqt3-headers (<= 3:3.1.1-3)
-Depends: xlibs-static-dev (>= 4.3.0.dfsg.1-4), libxext-dev (>= 4.3.0.dfsg.1-4), libxrandr-dev (>= 4.3.0.dfsg.1-4), x-dev (>= 4.3.0.dfsg.1-4), 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), libmng-dev (>= 1.0.3), libpng12-dev | libpng12-0-dev, libjpeg62-dev, zlib1g-dev, libfreetype6-dev, libc6-dev, libqt3 (= ${Source-Version}), libqt3-headers (= ${Source-Version}), qt3-dev-tools (= ${Source-Version}), xlibmesa-gl-dev | libgl-dev, libglu1-xorg-dev | libglu1-mesa-dev | libglu-dev, libxft-dev, libxrender-dev, libxcursor-dev, libaudio-dev, libxinerama-dev, libxi-dev
-Recommends: libqt3-compat-headers
-Suggests: libqt3-i18n, qt3-doc
-Conflicts: libqt-dev, libqt3-mt-dev
-Description: Qt development files
- Qt is a C++ class library optimized for graphical user interface
- development. This package contains libqt-mt.so symlink, necessary
- for building threaded Qt applications.
- .
- WARNING: The nonthreaded version of Qt3 is considered deprecated and
- may disappear anytime in the future. Please use libqt3-mt-dev instead
- (Read README.Debian for instructions).
- .
- WARNING 2: 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
- before you send a bugreport.
-
Package: libqt3-mt-dev
Architecture: any
Section: libdevel
@@ -241,7 +122,7 @@
Architecture: any
Section: devel
Depends: ${shlibs:Depends}
-Recommends: libqt3-mt-dev | libqt3-dev
+Recommends: libqt3-mt-dev
Replaces: qt3-tools, libqt3-dev, libqt3-mt-dev, qt3-doc (<= 3:3.1.1-2)
Conflicts: libqt-dev (<< 3:2.3.2-10), uic (<= 3:2.3.2-9)
Description: Qt3 development tools
Deleted: trunk/packages/qt-x11-free/debian/libqt3-dev.docs
Deleted: trunk/packages/qt-x11-free/debian/libqt3-dev.install
Deleted: trunk/packages/qt-x11-free/debian/libqt3-dev.links
Deleted: trunk/packages/qt-x11-free/debian/libqt3-ibase.install
Deleted: trunk/packages/qt-x11-free/debian/libqt3-mysql.install
Deleted: trunk/packages/qt-x11-free/debian/libqt3-odbc.install
Deleted: trunk/packages/qt-x11-free/debian/libqt3-psql.install
Deleted: trunk/packages/qt-x11-free/debian/libqt3-sqlite.install
Deleted: trunk/packages/qt-x11-free/debian/libqt3.install
Deleted: trunk/packages/qt-x11-free/debian/libqt3.links
Deleted: trunk/packages/qt-x11-free/debian/libqt3.postrm
Modified: trunk/packages/qt-x11-free/debian/rules
===================================================================
--- trunk/packages/qt-x11-free/debian/rules 2005-09-04 20:54:29 UTC (rev 1663)
+++ trunk/packages/qt-x11-free/debian/rules 2005-09-04 22:16:17 UTC (rev 1664)
@@ -19,9 +19,8 @@
# build variables (directorys)
DEBIAN = $(shell pwd)/debian
-P_LIBS = $(DEBIAN)/libqt3
+P_LIBS = $(DEBIAN)/libqt3-mt
P_DOC = $(DEBIAN)/qt3-doc
-P_DEV = $(DEBIAN)/libqt3-dev
P_APPSDEV = $(DEBIAN)/qt3-apps-dev
P_HEADERS = $(DEBIAN)/libqt3-headers
P_QTMTDEV = $(DEBIAN)/libqt3-mt-dev
@@ -38,6 +37,7 @@
-translationdir "/usr/share/qt3/translations" \
\
-release \
+ -thread \
-shared \
-fast \
-no-exceptions \
@@ -65,6 +65,9 @@
-system-libjpeg \
-system-nas-sound \
\
+ -enable-opengl \
+ -dlopen-opengl \
+ \
-qt-gif \
-qt-imgfmt-png \
-plugin-imgfmt-mng \
@@ -86,62 +89,36 @@
ifneq ($(DEB_HOST_ARCH_CPU),i386)
CONFIGURE_OPTS += -no-sql-ibase
- IBASE = -Nlibqt3-ibase -Nlibqt3-mt-ibase
+ IBASE = -Nlibqt3-mt-ibase
else
IBASE =
# Completely disable InterBase support because of #317314.
CONFIGURE_OPTS += -no-sql-ibase
- IBASE = -Nlibqt3-ibase -Nlibqt3-mt-ibase
+ IBASE = -Nlibqt3-mt-ibase
endif
ifeq ($(DEB_HOST_ARCH),arm)
CONFIGURE_OPTS += -DQT_QLOCALE_USES_FCVT
endif
-build: patch libqt-stamp libqt-thread-stamp
+build: patch libqt-thread-stamp
touch build-stamp
-libqt-stamp:
+libqt-thread-stamp:
@echo "QTDIR is ${QTDIR}"
- if [ -f "Makefile.cvs" ]; then make -f Makefile.cvs || true; fi
-
dh_testdir
- echo yes | ./configure $(CONFIGURE_OPTS) -no-thread -disable-opengl
+ echo yes | ./configure $(CONFIGURE_OPTS)
- make sub-src sub-plugins
+ # proceed
+ make sub-src sub-plugins sub-tools
make -C src INSTALL_ROOT=$(TMP_INSTALL) install_target
+ make INSTALL_ROOT=$(TMP_INSTALL) install
make INSTALL_ROOT=$(TMP_INSTALL) plugins-install
- # rename the plugins to save them from being overidden
- for a in `find $(TMP_INSTALL)/usr/lib/qt3/plugins/ -name '*.so'`; do rename 's/.so$$/-non-mt.so/' "$$a"; done
-
- # install qmake.cache file
- install -d $(P_DEV)/usr/share/qt3/
- cat .qmake.cache | sed "s#$(QTDIR)#/usr/share/qt3#g" > $(P_DEV)/usr/share/qt3/.qmake.cache
-
- # install qconfig.h for the non-mt build
- install -m 644 -D include/qconfig.h $(P_DEV)/usr/include/qt3/qconfig.h
- install -m 644 -D include/qmodules.h $(P_DEV)/usr/include/qt3/qmodules.h
-
- touch libqt-stamp
-
-libqt-thread-stamp:
-
- dh_testdir
-
- make -C src clean
- make -C plugins/src clean
-
- echo yes | ./configure $(CONFIGURE_OPTS) -thread -enable-opengl -dlopen-opengl
-
- # proceed
- make sub-src sub-plugins sub-tools
- make INSTALL_ROOT=$(TMP_INSTALL) install
-
# archives get accidentally stripped by make install. Copy over unstripped ones for now.
cp lib/lib*.a $(TMP_INSTALL)/usr/lib/
@@ -172,7 +149,7 @@
dh_testdir
-rm -rf debian/patched
- -rm -rf build-stamp libqt-stamp libqt-thread-stamp
+ -rm -rf build-stamp libqt-thread-stamp
-chmod -R u+w *
-chmod a-x doc/html/layout?.png
@@ -404,7 +381,7 @@
dh_installman -pqt3-linguist debian/maintain/man/linguist.1
# copy README.Debian
- for a in libqt3-dev libqt3-mt-dev qt3-doc; do install -D `pwd`/debian/README.Debian `pwd`/debian/"$$a"/usr/share/doc/"$$a"/README.Debian; done
+ for a in libqt3-mt-dev qt3-doc; do install -D `pwd`/debian/README.Debian `pwd`/debian/"$$a"/usr/share/doc/"$$a"/README.Debian; done
# install the qmake binary
rm -rf `pwd`/debian/qt3-dev-tools/usr/bin/qmake
@@ -436,7 +413,7 @@
dh_makeshlibs -a $(IBASE) -V
dh_installdeb -a $(IBASE)
dh_perl -a $(IBASE)
- dh_shlibdeps -a $(IBASE) -l`pwd`/debian/libqt3/usr/lib:`pwd`/debian/libqt3-mt/usr/lib
+ dh_shlibdeps -a $(IBASE) -l`pwd`/debian/libqt3-mt/usr/lib
# fix shlibdeps madness
for a in `find debian/ -name '*.substvars'`; do cat "$$a" | sed 's/, xlibs (>> 4.1.0)//g' > "$$a".new && mv "$$a.new" "$$a"; done
More information about the pkg-kde-commits
mailing list