[Pkg-kde-commits] rev 1300 - people/chrsmrtn/qt-x11-free/debian
Christopher Martin
chrsmrtn-guest@costa.debian.org
Thu, 14 Jul 2005 02:39:32 +0000
Author: chrsmrtn-guest
Date: 2005-07-14 02:39:31 +0000 (Thu, 14 Jul 2005)
New Revision: 1300
Modified:
people/chrsmrtn/qt-x11-free/debian/control
people/chrsmrtn/qt-x11-free/debian/rules
Log:
Sync with dato's changes.
Modified: people/chrsmrtn/qt-x11-free/debian/control
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/control 2005-07-13 22:18:21 UTC (rev 1299)
+++ people/chrsmrtn/qt-x11-free/debian/control 2005-07-14 02:39:31 UTC (rev 1300)
@@ -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 (>= 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), libxrender-dev, libxcursor-dev, 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 (>= 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)
Section: libs
Priority: optional
Standards-Version: 3.6.1
@@ -81,7 +81,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), 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, libxrender-dev, libxcursor-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, 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
Conflicts: libqt-mt-dev, libqt3-emb (<= 3:3.0.3-1)
Recommends: libqt3-compat-headers
Suggests: libqt3-i18n, qt3-doc
Modified: people/chrsmrtn/qt-x11-free/debian/rules
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/rules 2005-07-13 22:18:21 UTC (rev 1299)
+++ people/chrsmrtn/qt-x11-free/debian/rules 2005-07-14 02:39:31 UTC (rev 1300)
@@ -11,10 +11,8 @@
OLD_PATH := $(PATH)
export PATH=$(QTDIR)/bin:$(OLD_PATH)
-DEB_BUILD_GNU_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
DEB_BUILD_GNU_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
# dpatch stuff
include /usr/share/dpatch/dpatch.make
@@ -41,6 +39,65 @@
-no-exceptions -platform linux-g++ -fast -enable-opengl -dlopen-opengl \
-xkb -tablet -xrender -xshape -nis -debug
+CONFIGURE_OPTS = \
+ -prefix "/usr" \
+ -sysconfdir "/etc/qt3" \
+ -datadir "/usr/share/qt3" \
+ -headerdir "/usr/include/qt3" \
+ -docdir "/usr/share/qt3/doc" \
+ -plugindir "/usr/lib/qt3/plugins" \
+ -translationdir "/usr/share/qt3/translations" \
+ \
+ -debug \
+ -thread \
+ -shared \
+ -fast \
+ -no-exceptions \
+ -platform linux-g++ \
+ \
+ -nis \
+ -no-pch \
+ -cups \
+ -stl \
+ -ipv6 \
+ \
+ -sm \
+ -xshape \
+ -xinerama \
+ -xcursor \
+ -xrandr \
+ -xrender \
+ -xft \
+ -tablet \
+ -xkb \
+ \
+ -system-zlib \
+ -system-libpng \
+ -system-libmng \
+ -system-libjpeg \
+ -system-nas-sound \
+ -enable-opengl \
+ -dlopen-opengl \
+ \
+ -qt-gif \
+ -qt-imgfmt-png \
+ -plugin-imgfmt-mng \
+ -qt-imgfmt-jpeg \
+ \
+ -plugin-sql-odbc \
+ -plugin-sql-psql \
+ -plugin-sql-mysql \
+ -plugin-sql-ibase \
+ -plugin-sql-sqlite \
+ \
+ -I/usr/include/mysql \
+ -I/usr/include/freetype2 \
+ -I`pg_config --includedir` \
+ \
+ -lfontconfig \
+ # End of CONFIGURE_OPTS
+ # TODO: Styles as plugins?
+
ifeq ($(DEB_BUILD_GNU_ARCH),i386)
IBASE =
else
@@ -48,7 +105,7 @@
CONFIGURE_OPTS += -no-sql-ibase
endif
-ifeq ($(DEB_BUILD_GNU_ARCH),arm)
+ifeq ($(DEB_HOST_ARCH),arm)
CONFIGURE_OPTS += -DQT_QLOCALE_USES_FCVT
endif