rev 9689 - trunk/packages/qt4-x11/debian

[Fathi Boudra]

Author: fabo
Date: 2008-03-09 13:50:07 +0000 (Sun, 09 Mar 2008)
New Revision: 9689

Modified:
   trunk/packages/qt4-x11/debian/changelog
   trunk/packages/qt4-x11/debian/control
   trunk/packages/qt4-x11/debian/rules
Log:
* Re-add LD_LIBRARY_PATH to use lrelease. fixed in Qt >= 4.4.x.
* Clean up and update libqt4-dev dependencies.


Modified: trunk/packages/qt4-x11/debian/changelog
===================================================================
--- trunk/packages/qt4-x11/debian/changelog	2008-03-09 13:22:06 UTC (rev 9688)
+++ trunk/packages/qt4-x11/debian/changelog	2008-03-09 13:50:07 UTC (rev 9689)
@@ -9,13 +9,14 @@
   * Update 01_qmake_for_debian patch:
     * re-introduce link_prl and drop QT_SHARED workaround.
   * Update rules:
-    * Remove exported LD_LIBRARY_PATH and LDFLAGS.
+    * Remove exported LDFLAGS.
     * Remove DEB_CONFIGURE_SCRIPT_ENV.
     * Exclude debug files from dh_shlibdeps using DEB_DH_SHLIBDEPS_ARGS_ALL.
     * Update configure options to use libtiff from system.
     * Remove debug configure option to build with -02.
     * Update common-install-arch target to fix wrong path in pkconfig and prl files.
   * Add libtiff4-dev build dependency.
+  * Update libqt4-dev dependencies.
 
  -- Fathi Boudra <fabo at debian.org>  Sat, 08 Mar 2008 10:09:02 +0100
 

Modified: trunk/packages/qt4-x11/debian/control
===================================================================
--- trunk/packages/qt4-x11/debian/control	2008-03-09 13:22:06 UTC (rev 9688)
+++ trunk/packages/qt4-x11/debian/control	2008-03-09 13:50:07 UTC (rev 9689)
@@ -3,7 +3,14 @@
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Brian Nelson <pyro at debian.org>, Sune Vuorela <debian at pusling.com>, Fathi Boudra <fabo at debian.org>, Ana Beatriz Guerrero Lopez <ana at debian.org>
-Build-Depends: cdbs, debhelper (>= 5), quilt, sharutils, libxext-dev (>= 4.3.0.dfsg.1-4), libxrandr-dev (>= 4.3.0.dfsg.1-4), x11proto-core-dev, 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, libfreetype6-dev, libmysqlclient15-dev, flex, libpq-dev, libaudio-dev, libcupsys2-dev, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libxft-dev, libxrender-dev, libxcursor-dev, libxinerama-dev, libsqlite0-dev, libsqlite3-dev, libdbus-1-dev, libglib2.0-dev, libxi-dev, libtiff4-dev
+Build-Depends: cdbs, debhelper (>= 5), quilt, flex, sharutils,
+ libaudio-dev, libcupsys2-dev, libdbus-1-dev, libfreetype6-dev,
+ libgl1-mesa-dev | libgl-dev, libglib2.0-dev, libglu1-mesa-dev | libglu-dev,
+ libice-dev, libjpeg62-dev, libmng-dev, libmysqlclient15-dev, libpng12-dev,
+ libpq-dev, libsm-dev, libsqlite0-dev, libsqlite3-dev, libtiff4-dev,
+ libx11-dev, libxcursor-dev, libxext-dev, libxft-dev, libxi-dev,
+ libxinerama-dev, libxmu-dev, libxrandr-dev, libxrender-dev, libxt-dev,
+ x11proto-core-dev, zlib1g-dev
 Standards-Version: 3.7.3
 Homepage: http://www.trolltech.com
 Vcs-Svn: svn://svn.debian.org/svn/pkg-kde/trunk/packages/qt4-x11
@@ -12,7 +19,16 @@
 Package: libqt4-dev
 Architecture: any
 Section: libdevel
-Depends: ${shlibs:Depends}, ${misc:Depends}, libqt4-core (= ${binary:Version}), libqt4-gui (= ${binary:Version}), libqt4-sql (= ${binary:Version}), libqt4-qt3support (= ${binary:Version}), libxext-dev (>= 4.3.0.dfsg.1-4), libxrandr-dev (>= 4.3.0.dfsg.1-4), x11proto-core-dev, 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, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libxft-dev, libaudio-dev, libpq-dev, libglib2.0-dev, libsqlite0-dev, libtiff4-dev
+Depends: ${shlibs:Depends}, ${misc:Depends},
+ libqt4-gui (= ${binary:Version}), libqt4-sql (= ${binary:Version}),
+ libqt4-qt3support (= ${binary:Version}),
+ libaudio-dev, libcupsys2-dev, libdbus-1-dev, libfreetype6-dev,
+ libgl1-mesa-dev | libgl-dev, libglib2.0-dev, libglu1-mesa-dev | libglu-dev,
+ libice-dev, libjpeg62-dev, libmng-dev, libmysqlclient15-dev, libpng12-dev,
+ libpq-dev, libsm-dev, libsqlite0-dev, libsqlite3-dev, libtiff4-dev,
+ libx11-dev, libxcursor-dev, libxext-dev, libxft-dev, libxi-dev,
+ libxinerama-dev, libxmu-dev, libxrandr-dev, libxrender-dev, libxt-dev,
+ x11proto-core-dev, zlib1g-dev
 Conflicts: qt3-dev-tools (<= 3:3.3.4-7)
 Suggests: qt4-dev-tools, qt4-doc
 Description: Qt 4 development files

Modified: trunk/packages/qt4-x11/debian/rules
===================================================================
--- trunk/packages/qt4-x11/debian/rules	2008-03-09 13:22:06 UTC (rev 9688)
+++ trunk/packages/qt4-x11/debian/rules	2008-03-09 13:50:07 UTC (rev 9689)
@@ -2,6 +2,8 @@
 
 export QTDIR := $(shell pwd)
 export PATH := $(QTDIR)/bin:$(PATH)
+# workaround to use lrelease. fixed in Qt >= 4.4.x
+export LD_LIBRARY_PATH := $(QTDIR)/lib:$(LD_LIBRARY_PATH)
 
 QTVERSION := $(shell ls changes-* | cut -f2 -d '-')
 CURRENTVERSION := $(shell head -1 debian/changelog  | sed 's/[^(]*(\([^)]*\)).*/\1/')