[Pkg-kde-commits] rev 1348 - people/chrsmrtn/qt-x11-free/debian
Christopher Martin
chrsmrtn-guest at costa.debian.org
Thu Jul 21 22:25:18 UTC 2005
Author: chrsmrtn-guest
Date: 2005-07-21 22:25:17 +0000 (Thu, 21 Jul 2005)
New Revision: 1348
Added:
people/chrsmrtn/qt-x11-free/debian/libqt3-mt-ibase.install
people/chrsmrtn/qt-x11-free/debian/libqt3-mt-mysql.install
people/chrsmrtn/qt-x11-free/debian/libqt3-mt-odbc.install
people/chrsmrtn/qt-x11-free/debian/libqt3-mt-psql.install
people/chrsmrtn/qt-x11-free/debian/libqt3-mt-sqlite.install
people/chrsmrtn/qt-x11-free/debian/libqt3-mt.install
people/chrsmrtn/qt-x11-free/debian/libqt3-mt.links
people/chrsmrtn/qt-x11-free/debian/libqt3-mt.postrm
Removed:
people/chrsmrtn/qt-x11-free/debian/libqt3c102-mt-ibase.install
people/chrsmrtn/qt-x11-free/debian/libqt3c102-mt-mysql.install
people/chrsmrtn/qt-x11-free/debian/libqt3c102-mt-odbc.install
people/chrsmrtn/qt-x11-free/debian/libqt3c102-mt-psql.install
people/chrsmrtn/qt-x11-free/debian/libqt3c102-mt-sqlite.install
people/chrsmrtn/qt-x11-free/debian/libqt3c102-mt.install
people/chrsmrtn/qt-x11-free/debian/libqt3c102-mt.links
people/chrsmrtn/qt-x11-free/debian/libqt3c102-mt.postrm
Modified:
people/chrsmrtn/qt-x11-free/debian/control
people/chrsmrtn/qt-x11-free/debian/rules
Log:
Sync with dato: gcc 4.0 transition.
Modified: people/chrsmrtn/qt-x11-free/debian/control
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/control 2005-07-21 22:23:14 UTC (rev 1347)
+++ people/chrsmrtn/qt-x11-free/debian/control 2005-07-21 22:25:17 UTC (rev 1348)
@@ -1,77 +1,81 @@
Source: qt-x11-free
Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
Uploaders: Martin Loschwitz <madkiss at debian.org>, Christopher Martin <chrsmrtn at freeshell.org>, Adeodato Simó <asp16 at alu.ua.es>
-Build-Depends: debhelper (>= 4.1.26), 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), libxrender-dev, libxcursor-dev, libxinerama-dev, libxkbfile-dev, libxi-dev, libjpeg62-dev, zlib1g-dev, libmng-dev (>= 1.0.3), libpng12-dev | libpng12-0-dev, libfreetype6-dev (>= 2.1.10), libiodbc2-dev (>= 3.51.2-4), libmysqlclient12-dev | libmysqlclient-dev, flex, libpq-dev, libaudio-dev, libcupsys2-dev, xlibmesa-gl-dev | libgl-dev, libglu1-xorg-dev | libglu1-mesa-dev | libglu-dev, libxft-dev, dpatch (>= 1.13), firebird2-dev [i386 hurd-i386 kfreebsd-i386 knetbsd-i386 netbsd-i386], libsqlite0-dev, binutils (>= 2.14.90.0.7)
+Build-Depends: debhelper (>= 4.1.26), 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), libxrender-dev, libxcursor-dev, libxinerama-dev, libxkbfile-dev, libxi-dev, libjpeg62-dev, zlib1g-dev, libmng-dev (>= 1.0.3), libpng12-dev | libpng12-0-dev, libfreetype6-dev, libiodbc2-dev (>= 3.51.2-4), libmysqlclient12-dev | libmysqlclient-dev, flex, libpq-dev, libaudio-dev, libcupsys2-dev, xlibmesa-gl-dev | libgl-dev, libglu1-xorg-dev | libglu1-mesa-dev | libglu-dev, libxft-dev, dpatch (>= 1.13), firebird2-dev [i386 hurd-i386 kfreebsd-i386 knetbsd-i386 netbsd-i386], libsqlite0-dev, binutils (>= 2.14.90.0.7)
Section: libs
Priority: optional
Standards-Version: 3.6.2
-Package: libqt3c102-mt
+Package: libqt3-mt
Architecture: any
Section: libs
-Replaces: qt3-tools (<< 2:3.0.2-20020306-1), libqt3-helper, libqt3, libqt3-mt
+Replaces: qt3-tools (<< 2:3.0.2-20020306-1), libqt3-helper, libqt3, libqt3c102-mt
Depends: ${shlibs:Depends}, fontconfig
-Conflicts: libqt3-mt, libqui1-emb, libqt3c-mt
-Suggests: libqt3c102-mt-psql, libqt3c102-mt-mysql, libqt3c102-mt-odbc
+Conflicts: libqt3c102-mt, libqui1-emb, libqt3c-mt
+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.
-Package: libqt3c102-mt-dbg
+Package: libqt3-mt-dbg
Section: libdevel
Architecture: any
Priority: extra
-Depends: libqt3c102-mt (= ${Source-Version})
+Depends: libqt3-mt (= ${Source-Version})
Description: debugging symbols for libqt3-mt
This package contains the debugging symbols associated with libqt3-mt.
They will automatically be used by gdb for debugging Qt-related
issues.
-Package: libqt3c102-mt-mysql
+Package: libqt3-mt-mysql
Architecture: any
Section: libs
Depends: ${shlibs:Depends}
-Replaces: libqt3-mysql (<= 2:3.1.1+cvs.20021220-1)
-Conflicts: libqt3-mt-mysql, libqt3c-mt-mysql
+Replaces: libqt3-mysql (<= 2:3.1.1+cvs.20021220-1), libqt3c102-mt-mysql
+Conflicts: libqt3c102-mt-mysql, libqt3c-mt-mysql
Description: MySQL database driver for Qt3 (Threaded)
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: libqt3c102-mt-odbc
+Package: libqt3-mt-odbc
Architecture: any
Section: libs
Depends: ${shlibs:Depends}
-Replaces: libqt3-odbc (<= 2:3.1.1+cvs.20021220-1)
-Conflicts: libqt3-mt-odbc, libqt3c-mt-odbc
+Replaces: libqt3-odbc (<= 2:3.1.1+cvs.20021220-1), libqt3c102-mt-odbc
+Conflicts: libqt3c102-mt-odbc, libqt3c-mt-odbc
Description: ODBC database driver for Qt3 (Threaded)
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: libqt3c102-mt-psql
+Package: libqt3-mt-psql
Architecture: any
Section: libs
Depends: ${shlibs:Depends}
-Replaces: libqt3-psql (<= 2:3.1.1+cvs.20021220-1)
-Conflicts: libqt3-mt-psql, libqt3c-mt-psql
+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
to access a PostgreSQL DB.
-Package: libqt3c102-mt-ibase
+Package: libqt3-mt-ibase
Architecture: i386 hurd-i386 kfreebsd-i386 knetbsd-i386 netbsd-i386
Section: libs
Depends: ${shlibs:Depends}
+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
that are to access an InterBase/FireBird DB.
-Package: libqt3c102-mt-sqlite
+Package: libqt3-mt-sqlite
Architecture: any
Section: libs
Depends: ${shlibs:Depends}
+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
it if you intend to use or write Qt programs that are to access an
@@ -81,7 +85,7 @@
Architecture: any
Section: libdevel
Replaces: libqt-mt-dev, libqt3-dev (>= 3.0.5-4), libqt3-helper, libqt3-headers (<= 3:3.1.1-3), libqt3-emb (<= 3:3.0.3-1)
-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), libxrender-dev, libxcursor-dev, libxinerama-dev, libxi-dev, libmng-dev (>= 1.0.3), libpng12-0-dev, libjpeg62-dev, zlib1g-dev, libfreetype6-dev, libc6-dev, libqt3c102-mt (= ${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, libaudio-dev
+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), libxrender-dev, libxcursor-dev, libxinerama-dev, libxi-dev, libmng-dev (>= 1.0.3), libpng12-0-dev, libjpeg62-dev, zlib1g-dev, libfreetype6-dev, libc6-dev, libqt3-mt (= ${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, libaudio-dev
Conflicts: libqt-mt-dev, libqt3-emb (<= 3:3.0.3-1)
Recommends: libqt3-compat-headers
Suggests: libqt3-i18n, qt3-doc
@@ -242,7 +246,7 @@
Package: libqt3-i18n
Architecture: all
Section: libs
-Recommends: libqt3c102-mt
+Recommends: libqt3-mt
Description: i18n files for Qt3 library
This package contains the internationalization files for the Qt library.
Qt applications that are internationalized will need to depend on this package
Added: people/chrsmrtn/qt-x11-free/debian/libqt3-mt-ibase.install
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/libqt3-mt-ibase.install 2005-07-21 22:23:14 UTC (rev 1347)
+++ people/chrsmrtn/qt-x11-free/debian/libqt3-mt-ibase.install 2005-07-21 22:25:17 UTC (rev 1348)
@@ -0,0 +1 @@
+usr/lib/qt3/plugins/sqldrivers/libqsqlibase.so
Added: people/chrsmrtn/qt-x11-free/debian/libqt3-mt-mysql.install
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/libqt3-mt-mysql.install 2005-07-21 22:23:14 UTC (rev 1347)
+++ people/chrsmrtn/qt-x11-free/debian/libqt3-mt-mysql.install 2005-07-21 22:25:17 UTC (rev 1348)
@@ -0,0 +1 @@
+usr/lib/qt3/plugins/sqldrivers/libqsqlmysql.so
Added: people/chrsmrtn/qt-x11-free/debian/libqt3-mt-odbc.install
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/libqt3-mt-odbc.install 2005-07-21 22:23:14 UTC (rev 1347)
+++ people/chrsmrtn/qt-x11-free/debian/libqt3-mt-odbc.install 2005-07-21 22:25:17 UTC (rev 1348)
@@ -0,0 +1 @@
+usr/lib/qt3/plugins/sqldrivers/libqsqlodbc.so
Added: people/chrsmrtn/qt-x11-free/debian/libqt3-mt-psql.install
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/libqt3-mt-psql.install 2005-07-21 22:23:14 UTC (rev 1347)
+++ people/chrsmrtn/qt-x11-free/debian/libqt3-mt-psql.install 2005-07-21 22:25:17 UTC (rev 1348)
@@ -0,0 +1 @@
+usr/lib/qt3/plugins/sqldrivers/libqsqlpsql.so
Added: people/chrsmrtn/qt-x11-free/debian/libqt3-mt-sqlite.install
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/libqt3-mt-sqlite.install 2005-07-21 22:23:14 UTC (rev 1347)
+++ people/chrsmrtn/qt-x11-free/debian/libqt3-mt-sqlite.install 2005-07-21 22:25:17 UTC (rev 1348)
@@ -0,0 +1 @@
+usr/lib/qt3/plugins/sqldrivers/libqsqlite.so
Added: people/chrsmrtn/qt-x11-free/debian/libqt3-mt.install
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/libqt3-mt.install 2005-07-21 22:23:14 UTC (rev 1347)
+++ people/chrsmrtn/qt-x11-free/debian/libqt3-mt.install 2005-07-21 22:25:17 UTC (rev 1348)
@@ -0,0 +1,3 @@
+usr/lib/libqt-mt.so.*
+usr/lib/libqui.so.1.*
+usr/lib/qt3/plugins/imageformats/libqmng.so
Added: people/chrsmrtn/qt-x11-free/debian/libqt3-mt.links
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/libqt3-mt.links 2005-07-21 22:23:14 UTC (rev 1347)
+++ people/chrsmrtn/qt-x11-free/debian/libqt3-mt.links 2005-07-21 22:25:17 UTC (rev 1348)
@@ -0,0 +1,5 @@
+/usr/lib/libqui.so.1.0.0 /usr/lib/libqui.so.1
+/usr/lib/libqui.so.1.0.0 /usr/share/qt3/lib/libqui.so.1
+/usr/lib/libqui.so.1.0.0 /usr/share/qt3/lib/libqui.so.1.0
+/usr/lib/libqt-mt.so.3.3.4 /usr/share/qt3/lib/libqt-mt.so.3
+/usr/lib/libqt-mt.so.3.3.4 /usr/share/qt3/lib/libqt-mt.so.3.3
Added: people/chrsmrtn/qt-x11-free/debian/libqt3-mt.postrm
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/libqt3-mt.postrm 2005-07-21 22:23:14 UTC (rev 1347)
+++ people/chrsmrtn/qt-x11-free/debian/libqt3-mt.postrm 2005-07-21 22:25:17 UTC (rev 1348)
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+if [ "$1" = "purge" ]; then
+ if [ -d "/usr/share/doc/libqt3c102-mt/" ]; then
+ rm -rf /usr/share/doc/libqt3c102-mt/
+ fi
+fi
+
+#DEBHELPER#
Deleted: people/chrsmrtn/qt-x11-free/debian/libqt3c102-mt-ibase.install
Deleted: people/chrsmrtn/qt-x11-free/debian/libqt3c102-mt-mysql.install
Deleted: people/chrsmrtn/qt-x11-free/debian/libqt3c102-mt-odbc.install
Deleted: people/chrsmrtn/qt-x11-free/debian/libqt3c102-mt-psql.install
Deleted: people/chrsmrtn/qt-x11-free/debian/libqt3c102-mt-sqlite.install
Deleted: people/chrsmrtn/qt-x11-free/debian/libqt3c102-mt.install
Deleted: people/chrsmrtn/qt-x11-free/debian/libqt3c102-mt.links
Deleted: people/chrsmrtn/qt-x11-free/debian/libqt3c102-mt.postrm
Modified: people/chrsmrtn/qt-x11-free/debian/rules
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/rules 2005-07-21 22:23:14 UTC (rev 1347)
+++ people/chrsmrtn/qt-x11-free/debian/rules 2005-07-21 22:25:17 UTC (rev 1348)
@@ -19,7 +19,7 @@
# build variables (directorys)
DEBIAN = $(shell pwd)/debian
-P_LIBS = $(DEBIAN)/libqt3c102-mt
+P_LIBS = $(DEBIAN)/libqt3-mt
P_DOC = $(DEBIAN)/qt3-doc
P_APPSDEV = $(DEBIAN)/qt3-apps-dev
P_HEADERS = $(DEBIAN)/libqt3-headers
@@ -88,7 +88,7 @@
ifneq ($(DEB_HOST_ARCH_CPU),i386)
CONFIGURE_OPTS += -no-sql-ibase
- IBASE = -Nlibqt3c102-mt-ibase
+ IBASE = -Nlibqt3-mt-ibase
else
IBASE =
endif
@@ -387,7 +387,7 @@
dh_link -pqt3-assistant usr/share/qt3/doc/html usr/share/doc/qt3-assistant/html
dh_link -pqt3-linguist usr/share/qt3/doc/html usr/share/doc/qt3-linguist/html
dh_link -pqt3-dev-tools usr/share/qt3/doc/html usr/share/doc/qt3-dev-tools/html
-
+
# install the manpages we have
dh_installman -pqt3-designer debian/maintain/man/createcw.1
dh_installman -pqt3-dev-tools-compat debian/maintain/man/qt20fix.1 debian/maintain/man/mergetr.1 debian/maintain/man/findtr.1 debian/maintain/man/msg2qm.1
@@ -413,7 +413,7 @@
rm -rf debian/qt3-designer/usr/share/qt3/tools/conv2ui/.moc
rm -rf debian/qt3-designer/usr/share/qt3/tools/conv2ui/.obj
rm -f debian/qt3-designer/usr/share/qt3/tools/conv2ui/Makefile
-
+
# run remaining debhelper scripts
dh_installdocs -a $(IBASE) -XREADME.Debian
dh_installmenu -a $(IBASE)
@@ -421,7 +421,7 @@
dh_installchangelogs -a $(IBASE) changes-3.3.4
dh_link -a $(IBASE)
- dh_strip -a $(IBASE) --dbg-package=libqt3c102-mt
+ dh_strip -a $(IBASE) --dbg-package=libqt3-mt
dh_compress -a $(IBASE)
dh_fixperms -a $(IBASE)
@@ -429,7 +429,7 @@
dh_makeshlibs -a $(IBASE) -V
dh_installdeb -a $(IBASE)
dh_perl -a $(IBASE)
- dh_shlibdeps -a $(IBASE) -l`pwd`/debian/libqt3c102-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