[Pkg-kde-commits] rev 1270 - trunk/packages/qt-x11-free/debian
Adeodato Simó
adeodato@costa.debian.org
Tue, 12 Jul 2005 20:10:46 +0000
Author: adeodato
Date: 2005-07-12 20:10:45 +0000 (Tue, 12 Jul 2005)
New Revision: 1270
Removed:
trunk/packages/qt-x11-free/debian/control.in
Modified:
trunk/packages/qt-x11-free/debian/changelog
trunk/packages/qt-x11-free/debian/control
trunk/packages/qt-x11-free/debian/rules
Log:
* Don't modify debian/control at build time, since doing it in the clean
target it's a release critical bug now:
+ debian/rules: don't invoke type-handling to generate debian/control.
+ debian/control.in: removed.
+ debian/control:
- adjust the list of *-i386 ports to list only the non-dead ones.
- don't build depend on type-handling.
(This stanza can go if we don't ship firebird support.)
Modified: trunk/packages/qt-x11-free/debian/changelog
===================================================================
--- trunk/packages/qt-x11-free/debian/changelog 2005-07-12 17:53:19 UTC (rev 1269)
+++ trunk/packages/qt-x11-free/debian/changelog 2005-07-12 20:10:45 UTC (rev 1270)
@@ -4,8 +4,20 @@
maintainer. Thanks to Martin Loschwitz for all his work over the
years.
- -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Wed, 6 Jul 2005 22:36:54 -0400
+ +++ Changes by Adeodato Simó:
+ * Don't modify debian/control at build time, since doing it in the clean
+ target it's a release critical bug now:
+ + debian/rules: don't invoke type-handling to generate debian/control.
+ + debian/control.in: removed.
+ + debian/control:
+ - adjust the list of *-i386 ports to list only the non-dead ones.
+ - don't build depend on type-handling.
+
+ (This stanza can go if we don't ship firebird support.)
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Tue, 12 Jul 2005 22:09:40 +0200
+
qt-x11-free (3:3.3.4-3) unstable; urgency=medium
* ML: Remove an utterly ugly symlink for linux-g++ that pointed to my
Modified: trunk/packages/qt-x11-free/debian/control
===================================================================
--- trunk/packages/qt-x11-free/debian/control 2005-07-12 17:53:19 UTC (rev 1269)
+++ trunk/packages/qt-x11-free/debian/control 2005-07-12 20:10:45 UTC (rev 1270)
@@ -1,7 +1,7 @@
Source: qt-x11-free
Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Uploaders: Martin Loschwitz <madkiss@debian.org>, Christopher Martin <chrsmrtn@freeshell.org>, Adeodato Simó <asp16@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), 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, postgresql-dev, libaudio-dev, libcupsys2-dev, xlibmesa-gl-dev | libgl-dev, xlibmesa-glu-dev | libglu1-mesa-dev | libglu-dev , libxft-dev, dpatch (>= 1.13), libxrender-dev, libxcursor-dev, firebird2-dev [darwin-i386 freebsd-i386 hurd-i386 kfreebsd-i386 knetbsd-i386 i386 netbsd-i386 openbsd-i386], libsqlite0-dev, type-handling (>= 0.2.1)
+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), 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, postgresql-dev, libaudio-dev, libcupsys2-dev, xlibmesa-gl-dev | libgl-dev, xlibmesa-glu-dev | libglu1-mesa-dev | libglu-dev , libxft-dev, dpatch (>= 1.13), libxrender-dev, libxcursor-dev, firebird2-dev [i386 hurd-i386 kfreebsd-i386 knetbsd-i386 netbsd-i386], libsqlite0-dev
Section: libs
Priority: optional
Standards-Version: 3.6.1
@@ -110,7 +110,7 @@
to access a PostgreSQL DB.
Package: libqt3c102-ibase
-Architecture: darwin-i386 freebsd-i386 hurd-i386 kfreebsd-i386 knetbsd-i386 i386 netbsd-i386 openbsd-i386
+Architecture: i386 hurd-i386 kfreebsd-i386 knetbsd-i386 netbsd-i386
Section: libs
Depends: ${shlibs:Depends}
Description: InterBase/FireBird database driver for Qt3
@@ -124,7 +124,7 @@
version instead (Read README.Debian for instructions).
Package: libqt3c102-mt-ibase
-Architecture: darwin-i386 freebsd-i386 hurd-i386 kfreebsd-i386 knetbsd-i386 i386 netbsd-i386 openbsd-i386
+Architecture: i386 hurd-i386 kfreebsd-i386 knetbsd-i386 netbsd-i386
Section: libs
Depends: ${shlibs:Depends}
Description: InterBase/FireBird database driver for Qt3 (Threaded)
Deleted: trunk/packages/qt-x11-free/debian/control.in
Modified: trunk/packages/qt-x11-free/debian/rules
===================================================================
--- trunk/packages/qt-x11-free/debian/rules 2005-07-12 17:53:19 UTC (rev 1269)
+++ trunk/packages/qt-x11-free/debian/rules 2005-07-12 20:10:45 UTC (rev 1270)
@@ -154,8 +154,6 @@
cd examples/ && find . -name '.obj' | xargs rm -rf
- cat debian/control.in | sed "s/@firebird@/`type-handling i386 any`/g" > debian/control
-
dh_clean
install: build