diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-06-25 14:27:05 -0500 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-06-25 14:27:05 -0500 |
| commit | b84a56c1e3e97e626dabcf19369c50d43f4206d6 (patch) | |
| tree | 1c6cba0e3617ad54cf009b9d898ae31ba0774c04 /debian | |
| parent | bcf824f9d02a94d16b32144199ab06d888789999 (diff) | |
| download | tde-packaging-b84a56c1e3e97e626dabcf19369c50d43f4206d6.tar.gz tde-packaging-b84a56c1e3e97e626dabcf19369c50d43f4206d6.zip | |
Fix koffice FTBFS on Debian and Ubuntu
Diffstat (limited to 'debian')
| -rwxr-xr-x | debian/lenny/applications/koffice/debian/rules | 3 | ||||
| -rwxr-xr-x | debian/squeeze/applications/koffice/debian/rules | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/debian/lenny/applications/koffice/debian/rules b/debian/lenny/applications/koffice/debian/rules index f53720c55..5b73d5bb7 100755 --- a/debian/lenny/applications/koffice/debian/rules +++ b/debian/lenny/applications/koffice/debian/rules @@ -1,7 +1,5 @@ #!/usr/bin/make -f -PKG_CONFIG_PATH := /opt/trinity/lib/pkgconfig/:$(PKG_CONFIG_PATH) - include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk @@ -11,6 +9,7 @@ DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_PREFIX := /opt/trinity DEB_CONFIGURE_INFODIR := /opt/trinity/share/info +DEB_CONFIGURE_SCRIPT_ENV += PKG_CONFIG_PATH=/opt/trinity/lib/pkgconfig:$PKG_CONFIG_PATH cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) diff --git a/debian/squeeze/applications/koffice/debian/rules b/debian/squeeze/applications/koffice/debian/rules index f53720c55..5b73d5bb7 100755 --- a/debian/squeeze/applications/koffice/debian/rules +++ b/debian/squeeze/applications/koffice/debian/rules @@ -1,7 +1,5 @@ #!/usr/bin/make -f -PKG_CONFIG_PATH := /opt/trinity/lib/pkgconfig/:$(PKG_CONFIG_PATH) - include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk @@ -11,6 +9,7 @@ DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_PREFIX := /opt/trinity DEB_CONFIGURE_INFODIR := /opt/trinity/share/info +DEB_CONFIGURE_SCRIPT_ENV += PKG_CONFIG_PATH=/opt/trinity/lib/pkgconfig:$PKG_CONFIG_PATH cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) |