From 021036598a306d8cf7204d6d62ff090278f7ecf1 Mon Sep 17 00:00:00 2001 From: "Pawel \"l0ner\" Soltys" Date: Thu, 2 Feb 2012 14:19:49 +0100 Subject: qt3: removed no-rpath patch - cleaned up and commented - removed default ./configure options - added documentation build - changed make to make sub-tools so we don't build examples and tutorials change it back to make to get them - added unset _p patch so we free the variables after we don't need them anymore - removed libtool slay - moved libmng from makedepends to depends. Since we are using it, it is more like runtime dependency, than build-only optdep. - fixed another typo in patches (001-qiconview-rebuildcontainer.patch) - added accidentaly removed qt-unixodbc.patch - added postgresql and mysql include and library location to ./configure options those should probably be detected automatically. fix needed. - added links to tools provided by qt3 with naming scheme qt3* so we can run them with qt4 installed. - changed optdepends from libs to full packages - added optdepens descriptions - changed builddepds from full packages to libraries - added post-install message about new naming scheme of the provided tools. --- arch/3.5.13/trinity-base/trinity-qt3/PKGBUILD | 183 +++++++++++++---------- arch/3.5.13/trinity-base/trinity-qt3/qt3.install | 11 +- 2 files changed, 112 insertions(+), 82 deletions(-) diff --git a/arch/3.5.13/trinity-base/trinity-qt3/PKGBUILD b/arch/3.5.13/trinity-base/trinity-qt3/PKGBUILD index c5e79d43b..291fedd33 100644 --- a/arch/3.5.13/trinity-base/trinity-qt3/PKGBUILD +++ b/arch/3.5.13/trinity-base/trinity-qt3/PKGBUILD @@ -9,11 +9,19 @@ arch=('i686' 'x86_64') url="http://trinitydesktop.org" license=('GPL') groups=('trinity-base') -depends=('libpng' 'libjpeg' 'libxmu' 'libxcursor' 'libxinerama' 'mesa' - 'libxft' 'libxrandr') -makedepends=('mysql' 'postgresql' 'sqlite3' 'unixodbc' 'libmng' 'libxi') - # cups [add for cups support, add -cups to ./configure opts] -optdepends=('libmysqlclient' 'postgresql-libs' 'unixodbc') +depends=('libpng' 'libjpeg' 'libxmu' 'libmng' + 'libxcursor' 'libxinerama' 'mesa' 'libxft' 'libxrandr') +makedepends=('libxi' + 'libmysqlclient' 'postgresql-libs' 'unixodbc' 'libcups') + #'mysql' 'postgresql' 'sqlite3' 'unixodbc' 'libxi' 'cups') + # cups - add for cups support + # cups is enabled by default in ./configure + # remove -no-cups if you want cups support in qt3 +optdepends=('cups: The CUPS Printing System - for printing support' + 'postgresql: A sophisticated object-relational DBMS - databse support' + 'unixodbc: ODBC API for linux - databse support' + 'mysql: A fast SQL database server - databse support' + #'libmysqlclient' 'postgresql-libs' 'unixodbc' 'cups') provides=('qt3' 'qt3-enhanced') replaces=('qt3-enhanced' 'qt3') options=('libtool' '!emptydirs') @@ -21,21 +29,40 @@ install='qt3.install' source=('http://mirror.ets.kth.se/trinity/releases/3.5.13/dependencies/qt3-3.3.8.d.tar.gz' 'qt-patches.tar.bz2') md5sums=('78dc675e84aed595375449818cbb589a' - 'de4d95f8d236ecc85bad4876efd8fdf0') + '4091a624930738779f76764f4cb6ac5f') _prefix="/opt/qt3" build() { - msg "Patching source code..." - cd $srcdir/qt3 - # apply other qt patches from debian/gentoo and kde + msg "Patching source code..." + # apply qt patches from debian/gentoo and kde for patch in $srcdir/qt-patches/*.patch; do _p=`basename $patch` msg "Applying patch $_p.." patch -Np0 -i $patch done + unset _p patch + + # Originally this was done in a patch but probably it's a bad idea + # Besides we need the rpath, since we don't install qt in the default + # system dirs. If we would install into default /usr hierarchy + # we would uncomment this. See Beyond Linux From Scratch book + # for more info. + # sed -i '/QMAKE_RPATH/d' mkspecs/linux*/qmake.conf + + # These are probably arch-specific. They were present in old qt3 + # PKGBULD, they were present in kdemod3 PKGBUILD, they are present + # here. + sed -i 's|-cp -P -f|-cp -L -f|' qmake/Makefile.unix + sed -i "s|-O2|$CXXFLAGS|" mkspecs/linux-g++/qmake.conf + sed -i "s|-O2|$CXXFLAGS|" mkspecs/linux-g++-32/qmake.conf + sed -i "s|-O2|$CXXFLAGS|" mkspecs/linux-g++-64/qmake.conf + sed -i "s|-I. |$CXXFLAGS -I. |" qmake/Makefile.unix + + # auto license acceptance + sed -i "s|read acceptance|acceptance=yes|" configure msg "Setting enviroment variables..." export QTDIR="${srcdir}/qt3/" @@ -44,50 +71,42 @@ build() { export QMAKESPEC=$QTDIR/mkspecs/linux-g++ if [ "$CARCH" = "x86_64" ]; then - export ARCH="-64" + export ARCH="-64" else unset ARCH fi - - cd "${srcdir}/qt3" - + + # Remove useless to us mkspecs rm -rf mkspecs/{*aix*,*bsd*,cygwin*,dgux*,darwin*,hpux*,hurd*,irix*,lynxos*,macx*,qnx*,reliant*,sco*,solaris*,tru64*,unixware*,win32*} - sed -i 's|-cp -P -f|-cp -L -f|' qmake/Makefile.unix - rm -rf doc/html examples tutorial - sed -i "s|sub-tutorial sub-examples||" Makefile - sed -i "s|-O2|$CXXFLAGS|" mkspecs/linux-g++/qmake.conf - sed -i "s|-O2|$CXXFLAGS|" mkspecs/linux-g++-32/qmake.conf - sed -i "s|-O2|$CXXFLAGS|" mkspecs/linux-g++-64/qmake.conf - sed -i "s|-I. |$CXXFLAGS -I. |" qmake/Makefile.unix - - # auto license acceptance - sed -i "s|read acceptance|acceptance=yes|" configure - msg "Starting configure..." - #make -C qmake || return 1 ./configure \ -prefix ${_prefix} \ - -platform linux-g++${ARCH} \ -sysconfdir /etc/qt \ - -release \ - -sm \ - -nis \ - -stl \ - -no-g++-exceptions \ + -I/usr/include/mysql \ + -I/usr/include/postgresql/server \ + -lpq \ + -lmysqlclient \ + -L/usr/lib/mysql \ + -qt-gif \ + -system-zlib \ + -system-libpng \ + -system-libjpeg \ + -system-libmng \ + -plugin-imgfmt-png \ + -plugin-imgfmt-jpeg \ + -plugin-imgfmt-mng \ + -plugin-sql-mysql \ + -plugin-sql-psql \ + -plugin-sql-sqlite \ + -plugin-sql-odbc \ + -platform linux-g++${ARCH} \ + -no-exceptions \ -thread \ - -shared \ -dlopen-opengl \ - -no-ipv6 \ - -system-zlib \ - -{system-lib,plugin-imgfmt-}{png,jpeg,mng} \ - -qt-gif \ - -xinerama \ - -xcursor \ - -xrender \ - -xft \ - -plugin-sql-{mysql,psql,sqlite,odbc} + -no-ipv6 # 64bit fixes pulled from extras/qt3 PKGBUILD + # this is Arch-specific # fix /opt/qt/lib path [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/qt3/src/Makefile [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/qt3/tools/designer/designer/Makefile @@ -98,20 +117,19 @@ build() { msg "Building - $pkgname..." # build sql plugins - cd "${srcdir}"/qt3 - make -C qmake - cd "${srcdir}"/qt3/plugins/src/sqldrivers/mysql - "${srcdir}"/qt3/bin/qmake -o Makefile "INCPATH+=/usr/include/mysql" "LIBS+=-L/usr/lib/mysql -lmysqlclient" mysql.pro - cd "${srcdir}"/qt3/plugins/src/sqldrivers/psql - "${srcdir}"/qt3/bin/qmake -o Makefile "INCPATH+=/usr/src/include /usr/include/postgresql/server" "LIBS+=-L/usr/lib -lpq" psql.pro + # do we need this, I don't think so. + #cd "${srcdir}"/qt3 + #make -C qmake + #cd "${srcdir}"/qt3/plugins/src/sqldrivers/mysql + #"${srcdir}"/qt3/bin/qmake -o Makefile "INCPATH+=/usr/include/mysql" "LIBS+=-L/usr/lib/mysql -lmysqlclient" mysql.pro + #cd "${srcdir}"/qt3/plugins/src/sqldrivers/psql + #"${srcdir}"/qt3/bin/qmake -o Makefile "INCPATH+=/usr/src/include /usr/include/postgresql/server" "LIBS+=-L/usr/lib -lpq" psql.pro cd "${srcdir}"/qt3 - # fix the broken makefiles - # sed -i 's|[[:space:]]*strip.*doc/html.*$|#|g' src/Makefile - - # build rest - make + # build rest, but without tutorials and examples + # of you want them, remove sub-tools + make sub-tools } @@ -121,24 +139,24 @@ package() { make INSTALL_ROOT="$pkgdir" install - msg "Cleaning package..." - - rm -rf "${pkgdir}"$_prefix/{phrasebooks,templates,translations} - sed -i "s|-L${srcdir}/qt3/lib ||g" "${pkgdir}"$_prefix/lib/*.prl - rm -f "${pkgdir}"${_prefix}/mkspecs/linux-g++$ARCH/linux-g++$ARCH - - # Fix issues with GCC4 - sed -i 's/\(char\*\)/const char*/g' $pkgdir$_prefix/include/*.h - # Fix the mess we did fixing issues with GCC4 - sed -i 's/const u char/const uchar/g' $pkgdir$_prefix/include/*.h - sed -i 's/u const char/const uchar/g' $pkgdir$_prefix/include/*.h - sed -i 's/const const/const/g' $pkgdir$_prefix/include/*.h - sed -i 's/uconst/ unsigned /g' $pkgdir$_prefix/include/*.h - - sed -ie 's/define QTIMER_H/&\n#include "qglobal.h"/g' $pkgdir$_prefix/include/qtimer.h - + # install qmake install -D -m755 qmake/qmake "${pkgdir}"$_prefix/bin/qmake + # install doc pages which are missed by make install + install -d -m755 "${pkgdir}"$_prefix/doc/ + cp -r "${srcdir}"/qt3/doc "${pkgdir}"$_prefix/doc + + # install link the apps provided by qt3 so we don't collide with + # qt4 and can run them. + ln -sf $_prefix/bin/assistant "${pkgdir}"$_prefix/bin/qt3assistant + ln -sf $_prefix/bin/designer "${pkgdir}"$_prefix/bin/qt3designer + ln -sf $_prefix/bin/linguist "${pkgdir}"$_prefix/bin/qt3linguist + ln -sf $_prefix/bin/lrelease "${pkgdir}"$_prefix/bin/qt3lrelease + ln -sf $_prefix/bin/lupdate "${pkgdir}"$_prefix/bin/qt3lupdate + ln -sf $_prefix/bin/moc "${pkgdir}"$_prefix/bin/qt3moc + ln -sf $_prefix/bin/qmake "${pkgdir}"$_prefix/bin/qt3qmake + ln -sf $_prefix/bin/qtconfig "${pkgdir}"$_prefix/bin/qt3config + # Build ld.so.conf file install -d -m755 ${pkgdir}/etc/ld.so.conf.d/ echo "${_prefix}/lib" >> ${pkgdir}/etc/ld.so.conf.d/qt3.conf @@ -150,20 +168,25 @@ package() { echo "export PATH+=:${_prefix}/bin" >> ${pkgdir}/etc/profile.d/qt3.sh echo "export PKG_CONFIG_PATH+=:${_prefix}/pkgconfig" >> ${pkgdir}/etc/profile.d/qt3.sh - # ln -sf $_prefix/bin/qtconfig "${pkgdir}"$_prefix/bin/qt3config + msg "Cleaning package..." - # install man pages - install -d -m755 "${pkgdir}"$_prefix/man - cp -r "${srcdir}"/qt3/doc/man/{man1,man3} "${pkgdir}"$_prefix/man/ + #rm -rf "${pkgdir}"$_prefix/{phrasebooks,templates,translations} + + # remove any link to the compiled libraries present in + # $srcdir, which won't be present in non-building system. + sed -i "s|-L${srcdir}/qt3/lib ||g" "${pkgdir}"$_prefix/lib/*.prl + + #rm -f "${pkgdir}"${_prefix}/mkspecs/linux-g++$ARCH/linux-g++$ARCH - # libtoolslay - find $startdir/pkg -name '*.la' -exec rm {} \; + # Fix issues with GCC4 + sed -i 's/\(char\*\)/const char*/g' $pkgdir$_prefix/include/*.h + # Fix the mess we did fixing issues with GCC4 + sed -i 's/const u char/const uchar/g' $pkgdir$_prefix/include/*.h + sed -i 's/u const char/const uchar/g' $pkgdir$_prefix/include/*.h + sed -i 's/const const/const/g' $pkgdir$_prefix/include/*.h + sed -i 's/uconst/ unsigned /g' $pkgdir$_prefix/include/*.h - # Arch64 fix - #if [ "$CARCH" = "x86_64" ]; then - # [ -d $pkgdir$_prefix/mkspecs/linux-g++ ] || mkdir $pkgdir$_prefix/mkspecs/linux-g++ - # cd $pkgdir$_prefix/mkspecs/linux-g++ - # ln -s -v ../linux-g++-64/* . - #fi + # missing include "qglobal.h" in include/qtimer.h fix + sed -ie 's/define QTIMER_H/&\n#include "qglobal.h"/g' $pkgdir$_prefix/include/qtimer.h } diff --git a/arch/3.5.13/trinity-base/trinity-qt3/qt3.install b/arch/3.5.13/trinity-base/trinity-qt3/qt3.install index 2a8dc4c98..3d7119d05 100644 --- a/arch/3.5.13/trinity-base/trinity-qt3/qt3.install +++ b/arch/3.5.13/trinity-base/trinity-qt3/qt3.install @@ -1,12 +1,19 @@ post_install() { ldconfig &> /dev/null + echo "Note that the tools provided by this package (assistant, designer," + echo "linguist, lrelease, lupdate, moc, qmake and qtconfig) have been" + echo "renamet to qt3 to ensure compatibility with Qt4 and should" + echo "be run through new command scheme." + echo "\nIn order to update PATH to include Qt3 binaries location, You should" + echo "reboot your system. Before you do that you can access Qt3 bin path by" + echo "sourcing /etc/profile.d/qt3.sh" } post_upgrade() { - post_install + ldconfig &> /dev/null } post_remove() { - post_install + ldconfig &> /dev/null } -- cgit v1.2.1 From bc023a95f98a5a96390dd89704a6c1bf90dd62e1 Mon Sep 17 00:00:00 2001 From: "Pawel \"l0ner\" Soltys" Date: Thu, 2 Feb 2012 14:41:29 +0100 Subject: qt3: fixed typo in previous commit --- arch/3.5.13/trinity-base/trinity-qt3/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/3.5.13/trinity-base/trinity-qt3/PKGBUILD b/arch/3.5.13/trinity-base/trinity-qt3/PKGBUILD index 291fedd33..e84164311 100644 --- a/arch/3.5.13/trinity-base/trinity-qt3/PKGBUILD +++ b/arch/3.5.13/trinity-base/trinity-qt3/PKGBUILD @@ -20,7 +20,7 @@ makedepends=('libxi' optdepends=('cups: The CUPS Printing System - for printing support' 'postgresql: A sophisticated object-relational DBMS - databse support' 'unixodbc: ODBC API for linux - databse support' - 'mysql: A fast SQL database server - databse support' + 'mysql: A fast SQL database server - databse support') #'libmysqlclient' 'postgresql-libs' 'unixodbc' 'cups') provides=('qt3' 'qt3-enhanced') replaces=('qt3-enhanced' 'qt3') -- cgit v1.2.1 From 1e718ffb0bb4a4ccb65fcb9496bb9c90ec8627ee Mon Sep 17 00:00:00 2001 From: "Pawel \"l0ner\" Soltys" Date: Thu, 2 Feb 2012 14:48:43 +0100 Subject: qt3: patch package update --- .../trinity-base/trinity-qt3/qt-patches.tar.bz2 | Bin 13639 -> 13657 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/arch/3.5.13/trinity-base/trinity-qt3/qt-patches.tar.bz2 b/arch/3.5.13/trinity-base/trinity-qt3/qt-patches.tar.bz2 index 4794e9291..59bff7fa4 100644 Binary files a/arch/3.5.13/trinity-base/trinity-qt3/qt-patches.tar.bz2 and b/arch/3.5.13/trinity-base/trinity-qt3/qt-patches.tar.bz2 differ -- cgit v1.2.1 From 60c364df098e3d11d845ea925c7bf082f6ff6d6c Mon Sep 17 00:00:00 2001 From: "Pawel \"l0ner\" Soltys" Date: Thu, 2 Feb 2012 15:53:23 +0100 Subject: qt3: updated patchset --- arch/3.5.13/trinity-base/trinity-qt3/PKGBUILD | 2 +- .../trinity-base/trinity-qt3/qt-patches.tar.bz2 | Bin 13657 -> 13665 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/3.5.13/trinity-base/trinity-qt3/PKGBUILD b/arch/3.5.13/trinity-base/trinity-qt3/PKGBUILD index e84164311..d8e3a0d15 100644 --- a/arch/3.5.13/trinity-base/trinity-qt3/PKGBUILD +++ b/arch/3.5.13/trinity-base/trinity-qt3/PKGBUILD @@ -29,7 +29,7 @@ install='qt3.install' source=('http://mirror.ets.kth.se/trinity/releases/3.5.13/dependencies/qt3-3.3.8.d.tar.gz' 'qt-patches.tar.bz2') md5sums=('78dc675e84aed595375449818cbb589a' - '4091a624930738779f76764f4cb6ac5f') + '71d5f647da82d2a6f5e0e13549f1e865') _prefix="/opt/qt3" diff --git a/arch/3.5.13/trinity-base/trinity-qt3/qt-patches.tar.bz2 b/arch/3.5.13/trinity-base/trinity-qt3/qt-patches.tar.bz2 index 59bff7fa4..cb53bd9df 100644 Binary files a/arch/3.5.13/trinity-base/trinity-qt3/qt-patches.tar.bz2 and b/arch/3.5.13/trinity-base/trinity-qt3/qt-patches.tar.bz2 differ -- cgit v1.2.1 From d8f38be7a2e26328e505e7bbf21157b090b3871c Mon Sep 17 00:00:00 2001 From: "Pawel \"l0ner\" Soltys" Date: Thu, 2 Feb 2012 17:09:49 +0100 Subject: qt3: final (hopefully?) commit - changed posgresql-lib dep to postgresql since postgers.h is provided by second one, and not by the first and is needed at the compilation stage - fixed messages in qt3.install file --- arch/3.5.13/trinity-base/trinity-qt3/PKGBUILD | 2 +- arch/3.5.13/trinity-base/trinity-qt3/qt3.install | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/3.5.13/trinity-base/trinity-qt3/PKGBUILD b/arch/3.5.13/trinity-base/trinity-qt3/PKGBUILD index d8e3a0d15..33a47a69a 100644 --- a/arch/3.5.13/trinity-base/trinity-qt3/PKGBUILD +++ b/arch/3.5.13/trinity-base/trinity-qt3/PKGBUILD @@ -12,7 +12,7 @@ groups=('trinity-base') depends=('libpng' 'libjpeg' 'libxmu' 'libmng' 'libxcursor' 'libxinerama' 'mesa' 'libxft' 'libxrandr') makedepends=('libxi' - 'libmysqlclient' 'postgresql-libs' 'unixodbc' 'libcups') + 'libmysqlclient' 'postgresql' 'unixodbc' 'libcups') #'mysql' 'postgresql' 'sqlite3' 'unixodbc' 'libxi' 'cups') # cups - add for cups support # cups is enabled by default in ./configure diff --git a/arch/3.5.13/trinity-base/trinity-qt3/qt3.install b/arch/3.5.13/trinity-base/trinity-qt3/qt3.install index 3d7119d05..b059a2caa 100644 --- a/arch/3.5.13/trinity-base/trinity-qt3/qt3.install +++ b/arch/3.5.13/trinity-base/trinity-qt3/qt3.install @@ -4,7 +4,8 @@ post_install() { echo "linguist, lrelease, lupdate, moc, qmake and qtconfig) have been" echo "renamet to qt3 to ensure compatibility with Qt4 and should" echo "be run through new command scheme." - echo "\nIn order to update PATH to include Qt3 binaries location, You should" + echo "" + echo "In order to update PATH to include Qt3 binaries location, You should" echo "reboot your system. Before you do that you can access Qt3 bin path by" echo "sourcing /etc/profile.d/qt3.sh" } -- cgit v1.2.1 From 5ac9d61df81a9914609dbf208c3609a72d0bad1f Mon Sep 17 00:00:00 2001 From: "Pawel \"l0ner\" Soltys" Date: Thu, 2 Feb 2012 17:59:20 +0100 Subject: dbus-tqt: changed tqtinterface dep to arts, since we need profile scripts provided by arts --- arch/3.5.13/trinity-base/trinity-dbus-tqt/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/3.5.13/trinity-base/trinity-dbus-tqt/PKGBUILD b/arch/3.5.13/trinity-base/trinity-dbus-tqt/PKGBUILD index fb68f2239..9236fba9d 100644 --- a/arch/3.5.13/trinity-base/trinity-dbus-tqt/PKGBUILD +++ b/arch/3.5.13/trinity-base/trinity-dbus-tqt/PKGBUILD @@ -9,7 +9,7 @@ url='http://www.trinitydesktop.org' license=('GPL') groups=('trinity-base') pkgdesc="Trinity TQt DBus wrapper" -depends=('trinity-tqtinterface' 'dbus-core') +depends=('trinity-arts' 'dbus-core') makedepends=('pkgconfig' 'cmake') options=('libtool' '!strip') source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/dependencies/dbus-tqt-3.5.13.tar.gz) -- cgit v1.2.1 From f3029bbb4170ec134b5b330a1a956da6f3bc0613 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 4 Feb 2012 02:35:00 -0600 Subject: Rename strings on Debian and Ubuntu --- debian/lenny/tdelibs/debian/man/lnusertemp-trinity.sgml | 4 ++-- debian/squeeze/tdelibs/debian/man/lnusertemp-trinity.sgml | 4 ++-- ubuntu/lucid_automake/kdelibs/debian/man/lnusertemp-kde3.sgml | 4 ++-- ubuntu/maverick/tdelibs/debian/man/lnusertemp-trinity.sgml | 4 ++-- ubuntu/maverick_automake/kdelibs/debian/man/lnusertemp-kde3.sgml | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/debian/lenny/tdelibs/debian/man/lnusertemp-trinity.sgml b/debian/lenny/tdelibs/debian/man/lnusertemp-trinity.sgml index 1ab3ff715..2332768a6 100644 --- a/debian/lenny/tdelibs/debian/man/lnusertemp-trinity.sgml +++ b/debian/lenny/tdelibs/debian/man/lnusertemp-trinity.sgml @@ -93,8 +93,8 @@ manpage.1: manpage.sgml &dhpackage; will create the first two resources in directories under /tmp (or - KDETMP if defined in the environment) and will use - /var/tmp (or KDEVARTMP if + TDETMP if defined in the environment) and will use + /var/tmp (or TDEVARTMP if defined in the environment) for the cache resource (in order to survive system reboots). The temporary directories created for resources are usually of the form diff --git a/debian/squeeze/tdelibs/debian/man/lnusertemp-trinity.sgml b/debian/squeeze/tdelibs/debian/man/lnusertemp-trinity.sgml index 1ab3ff715..2332768a6 100644 --- a/debian/squeeze/tdelibs/debian/man/lnusertemp-trinity.sgml +++ b/debian/squeeze/tdelibs/debian/man/lnusertemp-trinity.sgml @@ -93,8 +93,8 @@ manpage.1: manpage.sgml &dhpackage; will create the first two resources in directories under /tmp (or - KDETMP if defined in the environment) and will use - /var/tmp (or KDEVARTMP if + TDETMP if defined in the environment) and will use + /var/tmp (or TDEVARTMP if defined in the environment) for the cache resource (in order to survive system reboots). The temporary directories created for resources are usually of the form diff --git a/ubuntu/lucid_automake/kdelibs/debian/man/lnusertemp-kde3.sgml b/ubuntu/lucid_automake/kdelibs/debian/man/lnusertemp-kde3.sgml index a75709316..2d0bf81a5 100644 --- a/ubuntu/lucid_automake/kdelibs/debian/man/lnusertemp-kde3.sgml +++ b/ubuntu/lucid_automake/kdelibs/debian/man/lnusertemp-kde3.sgml @@ -93,8 +93,8 @@ manpage.1: manpage.sgml &dhpackage; will create the first two resources in directories under /tmp (or - KDETMP if defined in the environment) and will use - /var/tmp (or KDEVARTMP if + TDETMP if defined in the environment) and will use + /var/tmp (or TDEVARTMP if defined in the environment) for the cache resource (in order to survive system reboots). The temporary directories created for resources are usually of the form diff --git a/ubuntu/maverick/tdelibs/debian/man/lnusertemp-trinity.sgml b/ubuntu/maverick/tdelibs/debian/man/lnusertemp-trinity.sgml index 1ab3ff715..2332768a6 100644 --- a/ubuntu/maverick/tdelibs/debian/man/lnusertemp-trinity.sgml +++ b/ubuntu/maverick/tdelibs/debian/man/lnusertemp-trinity.sgml @@ -93,8 +93,8 @@ manpage.1: manpage.sgml &dhpackage; will create the first two resources in directories under /tmp (or - KDETMP if defined in the environment) and will use - /var/tmp (or KDEVARTMP if + TDETMP if defined in the environment) and will use + /var/tmp (or TDEVARTMP if defined in the environment) for the cache resource (in order to survive system reboots). The temporary directories created for resources are usually of the form diff --git a/ubuntu/maverick_automake/kdelibs/debian/man/lnusertemp-kde3.sgml b/ubuntu/maverick_automake/kdelibs/debian/man/lnusertemp-kde3.sgml index a75709316..2d0bf81a5 100644 --- a/ubuntu/maverick_automake/kdelibs/debian/man/lnusertemp-kde3.sgml +++ b/ubuntu/maverick_automake/kdelibs/debian/man/lnusertemp-kde3.sgml @@ -93,8 +93,8 @@ manpage.1: manpage.sgml &dhpackage; will create the first two resources in directories under /tmp (or - KDETMP if defined in the environment) and will use - /var/tmp (or KDEVARTMP if + TDETMP if defined in the environment) and will use + /var/tmp (or TDEVARTMP if defined in the environment) for the cache resource (in order to survive system reboots). The temporary directories created for resources are usually of the form -- cgit v1.2.1 From 422429b5737a4f3fe95f2d350192a580a8b37d3f Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 4 Feb 2012 18:15:05 -0600 Subject: Add tdeinit_phase1 binary to Debian and Ubuntu --- debian/lenny/tdebase/debian/tdebase-trinity-bin.install | 1 + debian/squeeze/tdebase/debian/tdebase-trinity-bin.install | 1 + ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.install | 1 + 3 files changed, 3 insertions(+) diff --git a/debian/lenny/tdebase/debian/tdebase-trinity-bin.install b/debian/lenny/tdebase/debian/tdebase-trinity-bin.install index 8549b03b9..b90f777a8 100644 --- a/debian/lenny/tdebase/debian/tdebase-trinity-bin.install +++ b/debian/lenny/tdebase/debian/tdebase-trinity-bin.install @@ -1,4 +1,5 @@ debian/tmp/opt/trinity/bin/krootbacking +debian/tmp/opt/trinity/bin/tdeinit_phase1 debian/tmp/opt/trinity/bin/tdmtsak debian/tmp/opt/trinity/bin/tsak debian/tmp/opt/trinity/bin/kdebugdialog diff --git a/debian/squeeze/tdebase/debian/tdebase-trinity-bin.install b/debian/squeeze/tdebase/debian/tdebase-trinity-bin.install index 8549b03b9..b90f777a8 100644 --- a/debian/squeeze/tdebase/debian/tdebase-trinity-bin.install +++ b/debian/squeeze/tdebase/debian/tdebase-trinity-bin.install @@ -1,4 +1,5 @@ debian/tmp/opt/trinity/bin/krootbacking +debian/tmp/opt/trinity/bin/tdeinit_phase1 debian/tmp/opt/trinity/bin/tdmtsak debian/tmp/opt/trinity/bin/tsak debian/tmp/opt/trinity/bin/kdebugdialog diff --git a/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.install b/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.install index 8549b03b9..b90f777a8 100644 --- a/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.install +++ b/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.install @@ -1,4 +1,5 @@ debian/tmp/opt/trinity/bin/krootbacking +debian/tmp/opt/trinity/bin/tdeinit_phase1 debian/tmp/opt/trinity/bin/tdmtsak debian/tmp/opt/trinity/bin/tsak debian/tmp/opt/trinity/bin/kdebugdialog -- cgit v1.2.1 From 67c29959bba58dab9643c351f319526883881b59 Mon Sep 17 00:00:00 2001 From: "Pawel \"l0ner\" Soltys" Date: Sun, 5 Feb 2012 14:41:27 +0100 Subject: kdebase: removed useless async patch, modularity v1 --- arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD | 24 +++++++++++++++------ .../trinity-base/trinity-kdebase/patches.tar.bz2 | Bin 5013 -> 4810 bytes 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD b/arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD index 657b674ec..022189a58 100644 --- a/arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD +++ b/arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Pawel 'l0ner' Soltys # Contributor: Calvin Morrison -pkgname=trinity-kdebase +pkgname=('trinity-kdebase' 'trinity-kdm' 'trinity-kate' 'trinity-konqueror') pkgver=3513 pkgrel=4 arch=('i686' 'x86_64') @@ -33,7 +33,7 @@ source=('http://mirror.ets.kth.se/trinity/releases/3.5.13/kdebase-3.5.13.tar.gz' 'kdm-trinity' 'trinity.desktop') md5sums=('d1f7e1f94eeb46b981fe1ba144179840' - 'bf0cc14276148d5f6bd46828367825a6' + '22160aaf726fbd1a58b2f4c5483e51fb' '895f5d7351aa73ba1f57b0ad27081d69' 'bb3004513d703d6b72ce70aa240af3a3' 'e6afdd7ca60c4c59b851135785347e75' @@ -51,7 +51,7 @@ build() { [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh [ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh - #export CMAKE_PREFIX_PATH=${QTDIR}:${TDEDIR} + export CMAKE_PREFIX_PATH=${QTDIR}:${TDEDIR} #export CMAKE_INCLUDE_PATH=${TDEDIR}/include/dbus-1-tqt/:${TDEDIR}/include/dbus-1.0/:${TDEDIR}/include:${TDEDIR}/include/libkrandr #export LD_LIBRARY_PATH=${TDEDIR}/lib:${TDEDIR}/lib/kde3:${QTDIR}/lib:$LD_LIBRARY_PATH #export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${QTDIR}/lib/pkgconfig:$PKG_CONFIG_PATH @@ -73,7 +73,6 @@ build() { msg "Starting cmake..." cmake ${srcdir}/kdebase --debug-output \ -DCMAKE_INSTALL_PREFIX=${TDEDIR} \ - -DCMAKE_VERBOSE_MAKEFILE=ON \ -DQT_VERSION=3 \ -DSYSCONF_INSTALL_DIR=/etc \ -DWITH_XFIXES=ON \ @@ -92,11 +91,14 @@ build() { -DWITH_XEXT=ON \ -DWITH_PAM=ON \ -DBUILD_ALL=ON \ - -DCMAKE_INCLUDE_DIR=/opt/trinity/include/dbus-1.0:/opt/qt/include/tqt:/opt/trinity/include/dbus-1.0 + -DCMAKE_INCLUDE_DIR=$QTDIR/include/tqt make + + #-DCMAKE_INCLUDE_DIR=/opt/trinity/include/dbus-1.0 \ + } -package() { +package_trinity-kdebase() { msg "Packaging - $pkgname-$pkgver" cd ${srcdir}/build @@ -148,3 +150,13 @@ package() { done } + +package_trinity-kdm() { +pkgdesc="Trinity Display Manager" +} +package_trinity-kate() { +pkgdesc="Trinity - A fast texteditor with an Emacs-style document interface" +} +package_trinity-konqueror() { +pkgdesc="Trinity Swiss Army application, file and web browser." +} diff --git a/arch/3.5.13/trinity-base/trinity-kdebase/patches.tar.bz2 b/arch/3.5.13/trinity-base/trinity-kdebase/patches.tar.bz2 index 2e74ade35..31a31d946 100644 Binary files a/arch/3.5.13/trinity-base/trinity-kdebase/patches.tar.bz2 and b/arch/3.5.13/trinity-base/trinity-kdebase/patches.tar.bz2 differ -- cgit v1.2.1 From 558ed6b6800377665dfed9342cb9794787b2e06d Mon Sep 17 00:00:00 2001 From: "Pawel \"l0ner\" Soltys" Date: Mon, 6 Feb 2012 13:36:59 +0100 Subject: hal: path fix in package() function --- arch/3.5.13/trinity-base/hal/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/3.5.13/trinity-base/hal/PKGBUILD b/arch/3.5.13/trinity-base/hal/PKGBUILD index 599b66d59..8408f8c3e 100644 --- a/arch/3.5.13/trinity-base/hal/PKGBUILD +++ b/arch/3.5.13/trinity-base/hal/PKGBUILD @@ -82,7 +82,7 @@ build() { } package() { - cd $srcdir/${pkgname}-${pkgver} + cd $srcdir/${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/etc/rc.d" install -m755 -d "${pkgdir}/media" -- cgit v1.2.1 From 50c5d7d02c5f1f6498581677c084255ba51ee1a6 Mon Sep 17 00:00:00 2001 From: "Pawel \"l0ner\" Soltys" Date: Mon, 6 Feb 2012 13:38:11 +0100 Subject: tqtinterface: changed install prefix to /opt/trinity --- arch/3.5.13/trinity-base/trinity-tqtinterface/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/3.5.13/trinity-base/trinity-tqtinterface/PKGBUILD b/arch/3.5.13/trinity-base/trinity-tqtinterface/PKGBUILD index da4086888..8d6647d14 100644 --- a/arch/3.5.13/trinity-base/trinity-tqtinterface/PKGBUILD +++ b/arch/3.5.13/trinity-base/trinity-tqtinterface/PKGBUILD @@ -20,7 +20,7 @@ md5sums=('d54cc9fd0b35555298efd17c32471a2b' install='trinity-tqtinterface.install' # istead of using prefix, we will use QTDIR from qt3 profile -#_prefix=/opt/qt3 +_prefix=/opt/trinity build() { msg "Setting PATH, CMAKE and Trinity Environment variables" @@ -34,7 +34,7 @@ build() { msg "Starting cmake..." cmake "../dependencies/tqtinterface" \ - -DCMAKE_INSTALL_PREFIX=${QTDIR} \ + -DCMAKE_INSTALL_PREFIX=${_prefix} \ -DQT_PREFIX_DIR=${QTDIR} \ -DQT_INCLUDE_DIR=${QTDIR}/include \ -DMOC_EXECUTABLE=${QTDIR}/bin/moc \ -- cgit v1.2.1 From 7112f45ec9f7ef574a783dcff014521bf28f1ef1 Mon Sep 17 00:00:00 2001 From: "Pawel \"l0ner\" Soltys" Date: Mon, 6 Feb 2012 13:38:28 +0100 Subject: kdebase: fixes in patches split PKGBUILD --- arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD | 128 ++++++++++++++------- .../trinity-base/trinity-kdebase/patches.tar.bz2 | Bin 4810 -> 3671 bytes 2 files changed, 88 insertions(+), 40 deletions(-) diff --git a/arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD b/arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD index 022189a58..f40f55b46 100644 --- a/arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD +++ b/arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD @@ -1,9 +1,9 @@ # Maintainer: Pawel 'l0ner' Soltys # Contributor: Calvin Morrison -pkgname=('trinity-kdebase' 'trinity-kdm' 'trinity-kate' 'trinity-konqueror') +pkgname=('trinity-kdebase' 'trinity-kdm' 'trinity-console' 'trinity-kate' 'trinity-konqueror') pkgver=3513 -pkgrel=4 +pkgrel=5 arch=('i686' 'x86_64') url='http://www.trinitydesktop.org' license=('GPL') @@ -11,16 +11,14 @@ groups=('trinity-base') pkgdesc="Trinity Desktop Enviroment base components" depends=('trinity-dbus-tqt' 'trinity-kdelibs' 'hal' 'xorg-server' 'xorg-xset' 'xorg-xsetroot' 'xorg-xprop' 'xorg-xmessage' 'xorg-xinit' 'xorg-iceauth' - 'libxtst') - # 'libltdl' - # 'openexr' - # 'libxkbfile' + 'libxtst' 'libraw1394') -makedepends=('pkgconfig' 'cmake' 'autoconf' 'imake' 'xorg-bdftopcf') +makedepends=('pkgconfig' 'cmake' 'autoconf' 'imake' 'xorg-bdftopcf' 'smbclient') optdepends=('desktop-file-utils: Command line utilities for working with desktop entries' 'pciutils: PCI bus configuration space access library and tools' 'xscreensaver: Screen saver and locker for the X Window System' - 'xorg-fonts-75dpi: X.org 75dpi fonts collection') + 'xorg-fonts-75dpi: X.org 75dpi fonts collection' + 'samba: file sharing over SMB') confilicts=('kdemod3-kdebase') options=('libtool') source=('http://mirror.ets.kth.se/trinity/releases/3.5.13/kdebase-3.5.13.tar.gz' @@ -33,7 +31,7 @@ source=('http://mirror.ets.kth.se/trinity/releases/3.5.13/kdebase-3.5.13.tar.gz' 'kdm-trinity' 'trinity.desktop') md5sums=('d1f7e1f94eeb46b981fe1ba144179840' - '22160aaf726fbd1a58b2f4c5483e51fb' + '327e4d68bd1fc4d29bdb273e81f90415' '895f5d7351aa73ba1f57b0ad27081d69' 'bb3004513d703d6b72ce70aa240af3a3' 'e6afdd7ca60c4c59b851135785347e75' @@ -51,7 +49,7 @@ build() { [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh [ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh - export CMAKE_PREFIX_PATH=${QTDIR}:${TDEDIR} + #export CMAKE_PREFIX_PATH=${QTDIR}:${TDEDIR} #export CMAKE_INCLUDE_PATH=${TDEDIR}/include/dbus-1-tqt/:${TDEDIR}/include/dbus-1.0/:${TDEDIR}/include:${TDEDIR}/include/libkrandr #export LD_LIBRARY_PATH=${TDEDIR}/lib:${TDEDIR}/lib/kde3:${QTDIR}/lib:$LD_LIBRARY_PATH #export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${QTDIR}/lib/pkgconfig:$PKG_CONFIG_PATH @@ -67,19 +65,14 @@ build() { #sed -ie 's/applications-merged/tde-applications-merged/g' applnk/CMakeLists.txt msg "Creating out-of-source build directory: ${srcdir}/build" - mkdir -p build - cd build + mkdir -p ../build + cd ../build msg "Starting cmake..." - cmake ${srcdir}/kdebase --debug-output \ + cmake ${srcdir}/kdebase \ -DCMAKE_INSTALL_PREFIX=${TDEDIR} \ - -DQT_VERSION=3 \ -DSYSCONF_INSTALL_DIR=/etc \ -DWITH_XFIXES=ON \ - -DWITH_HAL=ON \ - -DWITH_ARTS=ON \ - -DWITH_SASL=ON \ - -DWITH_OPENEXR=ON \ -DWITH_XCOMPOSITE=ON \ -DWITH_XCURSOR=ON \ -DWITH_XRANDR=ON \ @@ -90,36 +83,50 @@ build() { -DWITH_XINERAMA=ON \ -DWITH_XEXT=ON \ -DWITH_PAM=ON \ - -DBUILD_ALL=ON \ - -DCMAKE_INCLUDE_DIR=$QTDIR/include/tqt + -DWITH_HAL=ON \ + -DWITH_ARTS=ON \ + -DWITH_SASL=ON \ + -DWITH_OPENEXR=ON \ + -DWITH_SAMBA=ON \ + -DWITH_LIBUSB=ON \ + -DWITH_LDAP=ON \ + -DWITH_LIBRAW1394=ON \ + -DWITH_I8K=ON \ + -DBUILD_ALL=ON make - #-DCMAKE_INCLUDE_DIR=/opt/trinity/include/dbus-1.0 \ - } package_trinity-kdebase() { - msg "Packaging - $pkgname-$pkgver" - cd ${srcdir}/build + pkgdesc='Trinity Desktop Enviroment' - make DESTDIR="$pkgdir" install + msg "Packaging - $pkgname-$pkgver" + _splitfolders="applnk drkonqi kappfinder kcheckpass kcminit kcontrol + kdcop kdebugdialog kdeeject kdepasswd kdeprint kdesktop + kdesu kdialog kfind khelpcenter khotkeys kicker kioslave + klipper kmenuedit knetattach kpager kpersonalizer kreadconfig + krootbacking kscreensaver ksmserver ksplashml kstart ksysguard + ksystraycmd ktip kwin l10n kxkb nsplugins pics tqt3integration + tsak doc/faq doc/glossary doc/kcontrol doc/kdcop + doc/kdebugdialog doc/kdeprint doc/kdesu doc/kfind + doc/khelpcenter doc/kicker doc/kinfocenter doc/kioslave + doc/klipper doc/kmenuedit doc/knetattach doc/kompmgr doc/kpager + doc/ksplashml doc/ksysguard doc/kxkb doc/quickstart + doc/userguide doc/visualdict" + for _dir in $_splitfolders; do + cd ${srcdir}/build/$_dir + make DESTDIR="$pkgdir" install + done # install X11 session file install -d -m755 ${pkgdir}/etc/X11/sessions install -m755 ${srcdir}/trinity.desktop ${pkgdir}/etc/X11/sessions/trinity.desktop - # update the Xsession file, this resolves problem with kdm dropping back - # to the login screen - patch -N ${pkgdir}${TDEDIR}/share/config/kdm/Xsession < ${srcdir}/Xsession.patch - # create the starttrinity link # do we need this? wouldn't be better to rename startkde script # to starttrinity? Well, whathever. ln -sf ${pkgdir}$TDEDIR/bin/startkde ${pkgdir}$TDEDIR/bin/starttrinity - # install kdm rc.d script. We need this to start kdm from rc.d - install -D -m755 ${srcdir}/kdm-trinity "${pkgdir}"/etc/rc.d/kdm-trinity - # install mkpamserv script, so we can auto-generate pam.d configs in post_install() install -D -m755 ${srcdir}/kdebase/mkpamserv ${pkgdir}${TDEDIR}/bin/mkpamserv @@ -127,11 +134,6 @@ package_trinity-kdebase() { # in the config file doens't exist. Maybe this should be provided by dbus bindings? # No, after riconsidering I'm not gonna provide it unless it's required. - # Add image for default user avatar. This removes kdm complains about missing - # default avatar from kdm.log - install -D -m 644 $srcdir/kdm-default-face.png ${pkgdir}$TDEDIR/share/apps/kdm/faces/.default.face.icon - install -D -m 644 $srcdir/kdm-default-face.png ${pkgdir}$TDEDIR/share/apps/kdm/pics/users/arch-kdm.png - # Install nice arch logo to use in the shutdown dialog install -D -m 644 $srcdir/arch-kdeshutdown.png ${pkgdir}$TDEDIR/share/apps/ksmserver/pics/shutdownkonq.png @@ -152,11 +154,57 @@ package_trinity-kdebase() { } package_trinity-kdm() { -pkgdesc="Trinity Display Manager" + pkgdesc="Trinity Display Manager" + + msg "Packaging - $pkgname-$pkgver" + _splitfolders="kdm kdmlib doc/kdm" + for _dir in $_splitfolders; do + cd ${srcdir}/build/$_dir + make DESTDIR="$pkgdir" install + done + + # update the Xsession file, this resolves problem with kdm dropping back + # to the login screen + patch -N ${pkgdir}${TDEDIR}/share/config/kdm/Xsession < ${srcdir}/Xsession.patch + + # install kdm rc.d script. We need this to start kdm from rc.d + install -D -m755 ${srcdir}/kdm-trinity "${pkgdir}"/etc/rc.d/kdm-trinity + + # Add image for default user avatar. This removes kdm complains about missing + # default avatar from kdm.log + install -D -m 644 $srcdir/kdm-default-face.png ${pkgdir}$TDEDIR/share/apps/kdm/faces/.default.face.icon + install -D -m 644 $srcdir/kdm-default-face.png ${pkgdir}$TDEDIR/share/apps/kdm/pics/users/arch-kdm.png } + +package_trinity-console() { + pkgdesc="Trinity - an X termnal emulator" + + msg "Packaging - $pkgname-$pkgver" + _splitfolders="konsole doc/konsole" + for _dir in $_splitfolders; do + cd ${srcdir}/build/$_dir + make DESTDIR="$pkgdir" install + done +} + package_trinity-kate() { -pkgdesc="Trinity - A fast texteditor with an Emacs-style document interface" + pkgdesc="Trinity - A fast texteditor with an Emacs-style document interface" + + msg "Packaging - $pkgname-$pkgver" + _splitfolders="kate doc/kate doc/kwrite" + for _dir in $_splitfolders; do + cd ${srcdir}/build/$_dir + make DESTDIR="$pkgdir" install + done } + package_trinity-konqueror() { -pkgdesc="Trinity Swiss Army application, file and web browser." + pkgdesc="Trinity Swiss Army application, file and web browser." + + msg "Packaging - $pkgname-$pkgver" + _splitfolders="konqueror libkonq doc/konqueror" + for _dir in $_splitfolders; do + cd ${srcdir}/build/$_dir + make DESTDIR="$pkgdir" install + done } diff --git a/arch/3.5.13/trinity-base/trinity-kdebase/patches.tar.bz2 b/arch/3.5.13/trinity-base/trinity-kdebase/patches.tar.bz2 index 31a31d946..0a0b90c54 100644 Binary files a/arch/3.5.13/trinity-base/trinity-kdebase/patches.tar.bz2 and b/arch/3.5.13/trinity-base/trinity-kdebase/patches.tar.bz2 differ -- cgit v1.2.1 From c842e232a760d91b1f4372600893b6091a18bad3 Mon Sep 17 00:00:00 2001 From: "Pawel \"l0ner\" Soltys" Date: Mon, 6 Feb 2012 20:29:16 +0100 Subject: qt3: added runtime dep postgresql-libs --- arch/3.5.13/trinity-base/trinity-qt3/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/3.5.13/trinity-base/trinity-qt3/PKGBUILD b/arch/3.5.13/trinity-base/trinity-qt3/PKGBUILD index 33a47a69a..030a9990a 100644 --- a/arch/3.5.13/trinity-base/trinity-qt3/PKGBUILD +++ b/arch/3.5.13/trinity-base/trinity-qt3/PKGBUILD @@ -9,7 +9,7 @@ arch=('i686' 'x86_64') url="http://trinitydesktop.org" license=('GPL') groups=('trinity-base') -depends=('libpng' 'libjpeg' 'libxmu' 'libmng' +depends=('libpng' 'libjpeg' 'libxmu' 'libmng' 'postgresql-libs' 'libxcursor' 'libxinerama' 'mesa' 'libxft' 'libxrandr') makedepends=('libxi' 'libmysqlclient' 'postgresql' 'unixodbc' 'libcups') -- cgit v1.2.1 From 5e768206199aad8d1874aaf398b43a50c1ed1bdc Mon Sep 17 00:00:00 2001 From: "Pawel \"l0ner\" Soltys" Date: Mon, 6 Feb 2012 20:29:22 +0100 Subject: kdebase: split pkgs deps mods --- arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD | 24 ++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD b/arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD index f40f55b46..9b17c67d2 100644 --- a/arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD +++ b/arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Pawel 'l0ner' Soltys # Contributor: Calvin Morrison -pkgname=('trinity-kdebase' 'trinity-kdm' 'trinity-console' 'trinity-kate' 'trinity-konqueror') +pkgname=('trinity-kdebase' 'trinity-kdm' 'trinity-konsole' 'trinity-kate' 'trinity-konqueror') pkgver=3513 pkgrel=5 arch=('i686' 'x86_64') @@ -9,16 +9,10 @@ url='http://www.trinitydesktop.org' license=('GPL') groups=('trinity-base') pkgdesc="Trinity Desktop Enviroment base components" -depends=('trinity-dbus-tqt' 'trinity-kdelibs' 'hal' - 'xorg-server' 'xorg-xset' 'xorg-xsetroot' 'xorg-xprop' 'xorg-xmessage' 'xorg-xinit' 'xorg-iceauth' - 'libxtst' 'libraw1394') +depends=('trinity-kdelibs' 'hal' + 'postgresql-libs') makedepends=('pkgconfig' 'cmake' 'autoconf' 'imake' 'xorg-bdftopcf' 'smbclient') -optdepends=('desktop-file-utils: Command line utilities for working with desktop entries' - 'pciutils: PCI bus configuration space access library and tools' - 'xscreensaver: Screen saver and locker for the X Window System' - 'xorg-fonts-75dpi: X.org 75dpi fonts collection' - 'samba: file sharing over SMB') confilicts=('kdemod3-kdebase') options=('libtool') source=('http://mirror.ets.kth.se/trinity/releases/3.5.13/kdebase-3.5.13.tar.gz' @@ -39,7 +33,6 @@ md5sums=('d1f7e1f94eeb46b981fe1ba144179840' 'c963ef6e37c9051119972a58c67f05fb' '376d85d213cf3c04cb0912e5cccd68bd' '1418e45fea5a9738544cbd264c36373b') -install='trinity-kdebase.install' build() { cd $srcdir/kdebase @@ -99,6 +92,15 @@ build() { package_trinity-kdebase() { pkgdesc='Trinity Desktop Enviroment' + depends=('trinity-dbus-tqt' + 'xorg-server' 'xorg-xset' 'xorg-xsetroot' 'xorg-xprop' 'xorg-xmessage' 'xorg-xinit' 'xorg-iceauth' + 'libxtst' 'libraw1394') + optdepends=('desktop-file-utils: Command line utilities for working with desktop entries' + 'pciutils: PCI bus configuration space access library and tools' + 'xscreensaver: Screen saver and locker for the X Window System' + 'xorg-fonts-75dpi: X.org 75dpi fonts collection' + 'samba: file sharing over SMB') + install='trinity-kdebase.install' msg "Packaging - $pkgname-$pkgver" _splitfolders="applnk drkonqi kappfinder kcheckpass kcminit kcontrol @@ -176,7 +178,7 @@ package_trinity-kdm() { install -D -m 644 $srcdir/kdm-default-face.png ${pkgdir}$TDEDIR/share/apps/kdm/pics/users/arch-kdm.png } -package_trinity-console() { +package_trinity-konsole() { pkgdesc="Trinity - an X termnal emulator" msg "Packaging - $pkgname-$pkgver" -- cgit v1.2.1 From f8de04b474a6ab365bb357cea36bfe0aee5cb88d Mon Sep 17 00:00:00 2001 From: "Pawel \"l0ner\" Soltys" Date: Mon, 6 Feb 2012 23:52:39 +0100 Subject: arts, dbus-tqt-1, dbus-tqt, pyqt3, tqtinterface: minor fixups --- arch/3.5.13/trinity-base/trinity-arts/PKGBUILD | 36 ++------------- .../trinity-base/trinity-arts/trinity.profile.csh | 21 --------- .../trinity-base/trinity-arts/trinity.profile.sh | 14 ------ .../trinity-base/trinity-dbus-tqt-1/PKGBUILD | 54 ++++++++++------------ arch/3.5.13/trinity-base/trinity-dbus-tqt/PKGBUILD | 1 - .../trinity-kdebase/trinity-kdebase.install | 6 +-- arch/3.5.13/trinity-base/trinity-pyqt3/PKGBUILD | 6 ++- .../trinity-base/trinity-tqtinterface/PKGBUILD | 28 ++++++++--- .../trinity-tqtinterface/trinity.profile.csh | 21 +++++++++ .../trinity-tqtinterface/trinity.profile.sh | 14 ++++++ 10 files changed, 93 insertions(+), 108 deletions(-) delete mode 100644 arch/3.5.13/trinity-base/trinity-arts/trinity.profile.csh delete mode 100644 arch/3.5.13/trinity-base/trinity-arts/trinity.profile.sh create mode 100644 arch/3.5.13/trinity-base/trinity-tqtinterface/trinity.profile.csh create mode 100644 arch/3.5.13/trinity-base/trinity-tqtinterface/trinity.profile.sh diff --git a/arch/3.5.13/trinity-base/trinity-arts/PKGBUILD b/arch/3.5.13/trinity-base/trinity-arts/PKGBUILD index 6e8d65267..991f16eac 100644 --- a/arch/3.5.13/trinity-base/trinity-arts/PKGBUILD +++ b/arch/3.5.13/trinity-base/trinity-arts/PKGBUILD @@ -3,7 +3,7 @@ pkgname=trinity-arts pkgver=3513 -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64') url='http://www.trinitydesktop.com' license=('GPL') @@ -15,21 +15,15 @@ depends=('trinity-tqtinterface' makedepends=('pkgconfig' 'cmake') conflicts=('kdemod3-arts' 'arts') options=('libtool' '!emptydirs') -source=('http://mirror.ets.kth.se/trinity/releases/3.5.13/dependencies/arts-3.5.13.tar.gz' - 'trinity.profile.sh' 'trinity.profile.csh') -md5sums=('109124dabb1aaa9d44eb32e43b549142' - '72c6c4fb492c1f4b4741fad1dd70d62f' - '915e14c6264a6b9c46a6a20b16cdcd06') +source=('http://mirror.ets.kth.se/trinity/releases/3.5.13/dependencies/arts-3.5.13.tar.gz') +md5sums=('109124dabb1aaa9d44eb32e43b549142') install='trinity-arts.install' -_prefix="/opt/trinity" - build() { - - # Do we need this? msg "Setting PATH, CMAKE and Trinity Environment variables" # Source the QT and KDE profile [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh + [ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh cd $srcdir msg "Creating out-of-source build directory: ${srcdir}/build" @@ -38,7 +32,7 @@ build() { msg "Starting cmake..." cmake ${srcdir}/dependencies/arts/ \ - -DCMAKE_INSTALL_PREFIX=${_prefix} + -DCMAKE_INSTALL_PREFIX=${TDEDIR} msg "Building $pkgname..." make @@ -49,26 +43,6 @@ package() { msg "Packaging - $pkgname-$pkgver" cd ${srcdir}/build - make DESTDIR="$pkgdir" install - # since this is first package to provide - # binaries, include headers and libs from trinity - # it should contain sripts which would add - # their location into system variables - # this mean that this package should provide - # /etc/ld.so.conf.d/trinity.conf - lib locations for linker - # /etc/profile.d/trinity.sh - $PATH and other system variables for bash - # /etc/profile.d/trinity.csh - $PATH and other system variables for csh - # up until now it was done in the kdelibs PKGBUILD/package - - # Create and install ld.so.conf.d file - install -d -m755 $pkgdir/etc/ld.so.conf.d/ - echo $_prefix/lib > $pkgdir/etc/ld.so.conf.d/trinity.conf - echo $_prefix/lib/kde >> $pkgdir/etc/ld.so.conf.d/trinity.conf - - # Install profiles - install -D -m644 $srcdir/trinity.profile.sh $pkgdir/etc/profile.d/trinity.sh - install -D -m644 $srcdir/trinity.profile.csh $pkgdir/etc/profile.d/trinity.csh - } diff --git a/arch/3.5.13/trinity-base/trinity-arts/trinity.profile.csh b/arch/3.5.13/trinity-base/trinity-arts/trinity.profile.csh deleted file mode 100644 index 7fc995130..000000000 --- a/arch/3.5.13/trinity-base/trinity-arts/trinity.profile.csh +++ /dev/null @@ -1,21 +0,0 @@ -setenv TDEDIR /opt/trinity -setenv TDEDIRS /usr:$TDEDIR -setenv PATH $PATH:$TDEDIR/bin - -if ( ! $?PKG_CONFIG_PATH ) then - setenv PKG_CONFIG_PATH $TDEDIR/lib/pkgconfig -else - setenv PKG_CONFIG_PATH $TDEDIR/lib/pkgconfig:$PKG_CONFIG_PATH -endif - -if ( ! $?XDG_DATA_DIRS ) then - setenv XDG_DATA_DIRS $TDEDIR/share -else - setenv XDG_DATA_DIRS $TDEDIR/share:$XDG_DATA_DIRS -endif - -if ( ! $?XDG_CONFIG_DIRS ) then - setenv XDG_CONFIG_DIRS $TDEDIR/etc/xdg -else - setenv XDG_CONFIG_DIRS $TDEDIR/etc/xdg:$XDG_CONFIG_DIRS -endif diff --git a/arch/3.5.13/trinity-base/trinity-arts/trinity.profile.sh b/arch/3.5.13/trinity-base/trinity-arts/trinity.profile.sh deleted file mode 100644 index 70e503534..000000000 --- a/arch/3.5.13/trinity-base/trinity-arts/trinity.profile.sh +++ /dev/null @@ -1,14 +0,0 @@ -export TDEDIR=/opt/trinity -export TDEDIRS=$TDEDIR -export PATH=$PATH:$TDEDIR/bin -export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$TDEDIR/lib/pkgconfig -if [ ! -z $XDG_DATA_DIRS ]; then - export XDG_DATA_DIRS=$XDG_DATA_DIRS:$TDEDIR/share -else - export XDG_DATA_DIRS=$TDEDIR/share -fi -if [ ! -z $XDG_CONFIG_DIRS ]; then - export XDG_CONFIG_DIRS=$XDG_CONFIG_DIRS:$TDEDIR/etc/xdg -else - export XDG_CONFIG_DIRS=$TDEDIR/etc/xdg -fi \ No newline at end of file diff --git a/arch/3.5.13/trinity-base/trinity-dbus-tqt-1/PKGBUILD b/arch/3.5.13/trinity-base/trinity-dbus-tqt-1/PKGBUILD index e181b8928..7b64c3544 100644 --- a/arch/3.5.13/trinity-base/trinity-dbus-tqt-1/PKGBUILD +++ b/arch/3.5.13/trinity-base/trinity-dbus-tqt-1/PKGBUILD @@ -16,40 +16,34 @@ options=('libtool' '!strip') source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/dependencies/dbus-1-tqt-3.5.13.tar.gz) md5sums=('a7ba1071f4bf7b5930f805b4036f8a97') -_prefix="/opt/trinity" - build() { + msg "Setting PATH, CMAKE and Trinity Environment variables" + [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh + [ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh + + #export CMAKE_PREFIX_PATH=${QTDIR}:${_prefix} + #export CMAKE_INCLUDE_PATH=${QTDIR}/include/tqt:/usr/include/dbus-1.0:${_prefix}/include:${_prefix}/include/libkrandr + #export LD_LIBRARY_PATH=${_prefix}/lib:${_prefix}/lib/trinity:$LD_LIBRARY_PATH + #export PKG_CONFIG_PATH=:${_prefix}/lib/pkgconfig:${QTDIR}/lib/pkgconfig + + cd $srcdir + msg "Creating out-of-source build directory: ${srcdir}/${_builddir}" + mkdir -p build + cd build + + msg "Starting cmake..." + cmake ${srcdir}/dependencies/dbus-1-tqt \ + -DCMAKE_INSTALL_PREFIX=${TDEDIR} \ + -DCMAKE_VERBOSE_MAKEFILE=ON + + msg "Building - $pkgname..." + make - msg "Setting PATH, CMAKE and Trinity Environment variables" - . /etc/profile.d/qt3.sh - export CMAKE_PREFIX_PATH=${QTDIR}:${_prefix} - export CMAKE_INCLUDE_PATH=${QTDIR}/include/tqt: \ - /usr/include/dbus-1.0: \ - ${_prefix}/include: \ - ${_prefix}/include/libkrandr - export LD_LIBRARY_PATH=${_prefix}/lib:${_prefix}/lib/trinity:$LD_LIBRARY_PATH - export PKG_CONFIG_PATH=:${_prefix}/lib/pkgconfig:${QTDIR}/lib/pkgconfig - - cd $srcdir - msg "Creating out-of-source build directory: ${srcdir}/${_builddir}" - mkdir -p build - cd build - - msg "Starting cmake..." - cmake ${srcdir}/dependencies/dbus-1-tqt \ - -DCMAKE_INSTALL_PREFIX=${_prefix} \ - -DCMAKE_VERBOSE_MAKEFILE=ON - - msg "Building - $pkgname..." - make -# -DWITH_QT3=ON \ -# -DQTDIR=/opt/qt \ -# -DQT_LIBRARY_DIRS=/opt/qt/lib \ } package() { - msg "Packaging - $pkgname-$pkgver" + msg "Packaging - $pkgname-$pkgver" # cd ${srcdir}/${_svnmod} - cd ${srcdir}/build - make DESTDIR="${pkgdir}" install + cd ${srcdir}/build + make DESTDIR="${pkgdir}" install } diff --git a/arch/3.5.13/trinity-base/trinity-dbus-tqt/PKGBUILD b/arch/3.5.13/trinity-base/trinity-dbus-tqt/PKGBUILD index 9236fba9d..3d7f01520 100644 --- a/arch/3.5.13/trinity-base/trinity-dbus-tqt/PKGBUILD +++ b/arch/3.5.13/trinity-base/trinity-dbus-tqt/PKGBUILD @@ -17,7 +17,6 @@ md5sums=('46ae165c068271485c827f6fc6687a9a') install='trinity-dbus-tqt.install' build() { - msg "Setting PATH, CMAKE and Trinity Environment variables" # Source the QT and TDE profile [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh diff --git a/arch/3.5.13/trinity-base/trinity-kdebase/trinity-kdebase.install b/arch/3.5.13/trinity-base/trinity-kdebase/trinity-kdebase.install index fa5fdeea2..82f34a0b0 100644 --- a/arch/3.5.13/trinity-base/trinity-kdebase/trinity-kdebase.install +++ b/arch/3.5.13/trinity-base/trinity-kdebase/trinity-kdebase.install @@ -1,9 +1,9 @@ post_install() { ldconfig &> /dev/null mkpamserv trinity - echo "Please remember that you can change your kdesu backend" - echo "from su to sudo by adding following lines to your" - echo "~/.trinity/share/kdesurc or to $TDEDIR/share/config/kdesurc:" + echo "Please remember that you can change your kdesu backend from su to sudo" + echo "by adding following lines to your ~/.trinity/share/kdesurc or to the" + echo "$TDEDIR/share/config/kdesurc:" echo "[super-user-command]" echo "super-user-command=sudo" } diff --git a/arch/3.5.13/trinity-base/trinity-pyqt3/PKGBUILD b/arch/3.5.13/trinity-base/trinity-pyqt3/PKGBUILD index 2aca1f16c..3dbcc58ef 100644 --- a/arch/3.5.13/trinity-base/trinity-pyqt3/PKGBUILD +++ b/arch/3.5.13/trinity-base/trinity-pyqt3/PKGBUILD @@ -22,12 +22,14 @@ md5sums=('f1d120495d1aaf393819e988c0a7bb7e') build() { cd ${srcdir}/PyQt-x11-gpl-${pkgver} + [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh + [ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh + msg "Starting configure..." - . /etc/profile.d/qt3.sh export QMAKESPEC="/opt/qt/mkspecs/default" - echo yes | python2.7 configure.py -q /opt/qt/ + echo yes | python2.7 configure.py -q ${QTDIR} msg "Building ${pkgname}..." make diff --git a/arch/3.5.13/trinity-base/trinity-tqtinterface/PKGBUILD b/arch/3.5.13/trinity-base/trinity-tqtinterface/PKGBUILD index 8d6647d14..2a12c76d5 100644 --- a/arch/3.5.13/trinity-base/trinity-tqtinterface/PKGBUILD +++ b/arch/3.5.13/trinity-base/trinity-tqtinterface/PKGBUILD @@ -14,14 +14,13 @@ makedepends=('pkgconfig' 'cmake') conflicts=('kdemod3-tqtinterface') makeopts=('libtool' '!emptydirs') source=('http://mirror.ets.kth.se/trinity/releases/3.5.13/dependencies/tqtinterface-3.5.13.tar.gz' - 'tqtpc-location.patch') + 'tqtpc-location.patch' 'trinity.profile.sh' 'trinity.profile.csh') md5sums=('d54cc9fd0b35555298efd17c32471a2b' - 'c15745c944d98cb7c4cb553f0ca421d4') + 'c15745c944d98cb7c4cb553f0ca421d4' + '72c6c4fb492c1f4b4741fad1dd70d62f' + '915e14c6264a6b9c46a6a20b16cdcd06') install='trinity-tqtinterface.install' -# istead of using prefix, we will use QTDIR from qt3 profile -_prefix=/opt/trinity - build() { msg "Setting PATH, CMAKE and Trinity Environment variables" # Source the QT and KDE profile @@ -34,7 +33,7 @@ build() { msg "Starting cmake..." cmake "../dependencies/tqtinterface" \ - -DCMAKE_INSTALL_PREFIX=${_prefix} \ + -DCMAKE_INSTALL_PREFIX=/opt/trinity \ -DQT_PREFIX_DIR=${QTDIR} \ -DQT_INCLUDE_DIR=${QTDIR}/include \ -DMOC_EXECUTABLE=${QTDIR}/bin/moc \ @@ -56,4 +55,21 @@ package() { #mkdir -p ${pkgdir}/usr/bin #cp -Rp ${srcdir}/${_svnmod}/qtinterface/uic-tqt ${pkgdir}/usr/bin + # it should contain sripts which would add + # their location into system variables + # this mean that this package should provide + # /etc/ld.so.conf.d/trinity.conf - lib locations for linker + # /etc/profile.d/trinity.sh - $PATH and other system variables for bash + # /etc/profile.d/trinity.csh - $PATH and other system variables for csh + # up until now it was done in the kdelibs PKGBUILD/package + + # Create and install ld.so.conf.d file + install -d -m755 $pkgdir/etc/ld.so.conf.d/ + echo $TDEDIR/lib > $pkgdir/etc/ld.so.conf.d/trinity.conf + echo $TDEDIR/lib/trinity >> $pkgdir/etc/ld.so.conf.d/trinity.conf + + # Install profiles + install -D -m755 $srcdir/trinity.profile.sh $pkgdir/etc/profile.d/trinity.sh + install -D -m755 $srcdir/trinity.profile.csh $pkgdir/etc/profile.d/trinity.csh + } diff --git a/arch/3.5.13/trinity-base/trinity-tqtinterface/trinity.profile.csh b/arch/3.5.13/trinity-base/trinity-tqtinterface/trinity.profile.csh new file mode 100644 index 000000000..7fc995130 --- /dev/null +++ b/arch/3.5.13/trinity-base/trinity-tqtinterface/trinity.profile.csh @@ -0,0 +1,21 @@ +setenv TDEDIR /opt/trinity +setenv TDEDIRS /usr:$TDEDIR +setenv PATH $PATH:$TDEDIR/bin + +if ( ! $?PKG_CONFIG_PATH ) then + setenv PKG_CONFIG_PATH $TDEDIR/lib/pkgconfig +else + setenv PKG_CONFIG_PATH $TDEDIR/lib/pkgconfig:$PKG_CONFIG_PATH +endif + +if ( ! $?XDG_DATA_DIRS ) then + setenv XDG_DATA_DIRS $TDEDIR/share +else + setenv XDG_DATA_DIRS $TDEDIR/share:$XDG_DATA_DIRS +endif + +if ( ! $?XDG_CONFIG_DIRS ) then + setenv XDG_CONFIG_DIRS $TDEDIR/etc/xdg +else + setenv XDG_CONFIG_DIRS $TDEDIR/etc/xdg:$XDG_CONFIG_DIRS +endif diff --git a/arch/3.5.13/trinity-base/trinity-tqtinterface/trinity.profile.sh b/arch/3.5.13/trinity-base/trinity-tqtinterface/trinity.profile.sh new file mode 100644 index 000000000..70e503534 --- /dev/null +++ b/arch/3.5.13/trinity-base/trinity-tqtinterface/trinity.profile.sh @@ -0,0 +1,14 @@ +export TDEDIR=/opt/trinity +export TDEDIRS=$TDEDIR +export PATH=$PATH:$TDEDIR/bin +export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$TDEDIR/lib/pkgconfig +if [ ! -z $XDG_DATA_DIRS ]; then + export XDG_DATA_DIRS=$XDG_DATA_DIRS:$TDEDIR/share +else + export XDG_DATA_DIRS=$TDEDIR/share +fi +if [ ! -z $XDG_CONFIG_DIRS ]; then + export XDG_CONFIG_DIRS=$XDG_CONFIG_DIRS:$TDEDIR/etc/xdg +else + export XDG_CONFIG_DIRS=$TDEDIR/etc/xdg +fi \ No newline at end of file -- cgit v1.2.1 From f3015da184595eff90a3aca4f81df9c6a1be7966 Mon Sep 17 00:00:00 2001 From: "Pawel \"l0ner\" Soltys" Date: Tue, 7 Feb 2012 13:25:32 +0100 Subject: ktorrent: added fox for tqt detection --- arch/3.5.13/trinity-apps/trinity-ktorrent/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/3.5.13/trinity-apps/trinity-ktorrent/PKGBUILD b/arch/3.5.13/trinity-apps/trinity-ktorrent/PKGBUILD index 5a1863c7c..dbb404541 100644 --- a/arch/3.5.13/trinity-apps/trinity-ktorrent/PKGBUILD +++ b/arch/3.5.13/trinity-apps/trinity-ktorrent/PKGBUILD @@ -29,13 +29,13 @@ build() { cd "$srcdir/${_builddir}" cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" + sed -i -e "s@/usr/include/tqt@$TDEDIR/include/tqt@" admin/acinclude.m4.in make -f admin/Makefile.common msg "Starting configure..." ./configure --with-qt-dir=${QTDIR} \ --prefix=${_prefix} \ --enable-closure \ - --enable-torrent-mimetype \ --with-extra-includes=${_prefix}/include:/usr/include/dbus-1.0:${_prefix}/include/libkrandr \ --with-extra-libs=${_prefix}/lib:${_prefix}/lib/trinity:${_prefix}/pkgconfig -- cgit v1.2.1 From a953819a4c10cdb248389187b4ef52e514cc22f4 Mon Sep 17 00:00:00 2001 From: "Pawel \"l0ner\" Soltys" Date: Tue, 7 Feb 2012 13:25:59 +0100 Subject: konversation: added fix for tqt detection --- arch/3.5.13/trinity-apps/trinity-konversation/PKGBUILD | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/arch/3.5.13/trinity-apps/trinity-konversation/PKGBUILD b/arch/3.5.13/trinity-apps/trinity-konversation/PKGBUILD index 197073ea1..e3a81c70b 100644 --- a/arch/3.5.13/trinity-apps/trinity-konversation/PKGBUILD +++ b/arch/3.5.13/trinity-apps/trinity-konversation/PKGBUILD @@ -23,9 +23,13 @@ build() { export PKG_CONFIG_PATH=${_prefix}/lib/pkgconfig:${QTDIR}/lib/pkgconfig msg "Starting autoconf..." - cd "$srcdir/$cmpdir" + cd "$srcdir/$_builddir" cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" + + # fix for correct Qt/TQt detection + sed -i -e "s@/usr/include/tqt@${TDEDIR}/include/tqt@" admin/acinclude.m4.in + make -f admin/Makefile.common msg "Starting configure..." -- cgit v1.2.1 From 02f1b16acf118c4b8c6d948fdd900a562d994d20 Mon Sep 17 00:00:00 2001 From: "Pawel \"l0ner\" Soltys" Date: Tue, 7 Feb 2012 13:42:54 +0100 Subject: hal: reverted rc.d script name hald to hal --- arch/3.5.13/trinity-base/hal/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/3.5.13/trinity-base/hal/PKGBUILD b/arch/3.5.13/trinity-base/hal/PKGBUILD index 8408f8c3e..f4a30f075 100644 --- a/arch/3.5.13/trinity-base/hal/PKGBUILD +++ b/arch/3.5.13/trinity-base/hal/PKGBUILD @@ -86,7 +86,7 @@ package() { make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/etc/rc.d" install -m755 -d "${pkgdir}/media" - install -m755 "${srcdir}/hald" "${pkgdir}/etc/rc.d/" + install -m755 "${srcdir}/hald" "${pkgdir}/etc/rc.d/hal" install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -- cgit v1.2.1 From 68c96634329a0eebafbe2dd8e619157152ca60d7 Mon Sep 17 00:00:00 2001 From: "Pawel \"l0ner\" Soltys" Date: Tue, 7 Feb 2012 14:45:05 +0100 Subject: kdeaccessibilty: added tqt detection fix --- arch/3.5.13/trinity-extras/trinity-kdeaccessibility/PKGBUILD | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/3.5.13/trinity-extras/trinity-kdeaccessibility/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-kdeaccessibility/PKGBUILD index cff62b43b..9cf32f31b 100644 --- a/arch/3.5.13/trinity-extras/trinity-kdeaccessibility/PKGBUILD +++ b/arch/3.5.13/trinity-extras/trinity-kdeaccessibility/PKGBUILD @@ -30,6 +30,7 @@ build() { cd "$srcdir/kdeaccessibility" cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" + sed -i -e "s@/usr/include/tqt@$TDEDIR/include/tqt@" admin/acinclude.m4.in make -f admin/Makefile.common msg "Starting configure..." -- cgit v1.2.1 From 4d68a22f4f5b16802bf92f8f1d4752d4f879737d Mon Sep 17 00:00:00 2001 From: "Pawel \"l0ner\" Soltys" Date: Tue, 7 Feb 2012 18:07:49 +0100 Subject: i18n: minor fixups, dropped _prefix variable --- arch/3.5.13/trinity-extras/trinity-i18n/PKGBUILD | 58 ++++++++++++------------ 1 file changed, 28 insertions(+), 30 deletions(-) diff --git a/arch/3.5.13/trinity-extras/trinity-i18n/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-i18n/PKGBUILD index 417343986..01f86aefa 100644 --- a/arch/3.5.13/trinity-extras/trinity-i18n/PKGBUILD +++ b/arch/3.5.13/trinity-extras/trinity-i18n/PKGBUILD @@ -27,7 +27,7 @@ pkgname=('trinity-i18n-af' 'trinity-i18n-ar' 'trinity-i18n-az' 'trinity-i18n-uz-cyrillic' 'trinity-i18n-vi' 'trinity-i18n-wa' ' trinity-i18n-zh_cn' 'trinity-i18n-zh_tw') pkgver=3513 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://www.trinitydesktop.org' license=('GPL') @@ -39,36 +39,34 @@ options=('libtool' '!strip') source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/kde-i18n-3.5.13.tar.gz) md5sums=('7c919c7cb85f454fed46767082a87773') -_prefix=/opt/trinity - build() { - msg "Setting Trinity Environment variables" - export LD_LIBRARY_PATH=${_prefix}/lib:${_prefix}/lib/trinity:$LD_LIBRARY_PATH - export PKG_CONFIG_PATH=${_prefix}/lib/pkgconfig:${QTDIR}/lib/pkgconfig - - cd $srcdir/kde-i18n - rm HOW.TO.BUILD TRINITY.RELEASE - - for _filename in *.tar.bz2; do - _dir=`echo "$_filename" | cut -d'.' -f1-3` - _newname=`echo "$_dir" | cut -d'-' -f2-4` - - if [ ! -d trinity-${newname} ]; then - msg "Extracting $_filename..." - tar xfj $_filename - mv $_dir trinity-${_newname} - fi - - cd trinity-${_newname} - - msg "Starting trinity-${_newname} configure..." - ./configure --prefix=${_prefix} > /dev/null - - msg "Building trinity-${_newname}..." - make > /dev/null - - cd .. - done + msg "Setting Trinity Environment variables" + [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh + [ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh + + cd $srcdir/kde-i18n + rm HOW.TO.BUILD TRINITY.RELEASE + + for _filename in *.tar.bz2; do + _dir=`echo "$_filename" | cut -d'.' -f1-3` + _newname=`echo "$_dir" | cut -d'-' -f2-4` + + if [ ! -d trinity-${newname} ]; then + msg "Extracting $_filename..." + tar xfj $_filename + mv $_dir trinity-${_newname} + fi + + cd trinity-${_newname} + + msg "Starting trinity-${_newname} configure..." + ./configure --prefix=${TDEDIR} > /dev/null + + msg "Building trinity-${_newname}..." + make > /dev/null + + cd .. + done } package_trinity-i18n-af() { -- cgit v1.2.1 From 660df8002d800ae3ed661dfbc825259f0ddeeefa Mon Sep 17 00:00:00 2001 From: "Pawel \"l0ner\" Soltys" Date: Tue, 7 Feb 2012 18:13:11 +0100 Subject: kdeaccessibility: minor fixups, dropped _prefix variable --- .../trinity-kdeaccessibility/PKGBUILD | 54 ++++++++++------------ 1 file changed, 24 insertions(+), 30 deletions(-) diff --git a/arch/3.5.13/trinity-extras/trinity-kdeaccessibility/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-kdeaccessibility/PKGBUILD index 9cf32f31b..0b24cbf04 100644 --- a/arch/3.5.13/trinity-extras/trinity-kdeaccessibility/PKGBUILD +++ b/arch/3.5.13/trinity-extras/trinity-kdeaccessibility/PKGBUILD @@ -3,7 +3,7 @@ pkgname=trinity-kdeaccessibility pkgver=3513 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://www.trinitydesktop.org' license=('GPL') @@ -15,38 +15,32 @@ options=('libtool' '!strip') source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/kdeaccessibility-3.5.13.tar.gz) md5sums=('ce31b01c1831046fb28aab172f2423bf') -_prefix=/opt/trinity - build() { - - msg "Setting Trinity Environment variables" - export LD_LIBRARY_PATH=${_prefix}/lib:${_prefix}/lib/trinity:$LD_LIBRARY_PATH - export PKG_CONFIG_PATH=${_prefix}/lib/pkgconfig:${QTDIR}/lib/pkgconfig - - #msg "Patching..." - #patch -N -d ${srcdir} -p0 < kdeaccessibility.patch + msg "Setting Trinity Environment variables" + [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh + [ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh - msg "Starting automake..." - cd "$srcdir/kdeaccessibility" - cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" - cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" - sed -i -e "s@/usr/include/tqt@$TDEDIR/include/tqt@" admin/acinclude.m4.in - make -f admin/Makefile.common - - msg "Starting configure..." - ./configure --with-qt-dir=${QTDIR} \ - --prefix=${_prefix} \ - --enable-closure \ - --with-alsa \ - --with-extra-includes=${_prefix}/include:/usr/include/dbus-1.0:${_prefix}/include/libkrandr \ - --with-extra-libs=${_prefix}/lib:${_prefix}/lib/trinity:${_prefix}/pkgconfig - - msg "Building ${pkgname}..." - make + msg "Starting automake..." + cd "$srcdir/kdeaccessibility" + cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" + cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" + sed -i -e "s@/usr/include/tqt@$TDEDIR/include/tqt@" admin/acinclude.m4.in + make -f admin/Makefile.common + + msg "Starting configure..." + ./configure --with-qt-dir=${QTDIR} \ + --prefix=${TDEDIR} \ + --enable-closure \ + --with-alsa \ + #--with-extra-includes=${_prefix}/include:/usr/include/dbus-1.0:${_prefix}/include/libkrandr \ + #--with-extra-libs=${_prefix}/lib:${_prefix}/lib/trinity:${_prefix}/pkgconfig + + msg "Building ${pkgname}..." + make } package() { - msg "Packaging - $pkgname-$pkgver" - cd ${srcdir}/kdeaccesibility - make DESTDIR="${pkgdir}" install + msg "Packaging - $pkgname-$pkgver" + cd ${srcdir}/kdeaccesibility + make DESTDIR="${pkgdir}" install } -- cgit v1.2.1 From 087f118e8ba039a7054b2a4d451791fcfc527bbf Mon Sep 17 00:00:00 2001 From: "Pawel \"l0ner\" Soltys" Date: Tue, 7 Feb 2012 18:13:35 +0100 Subject: kdeaddons: minor fixups, dropped _prefix variable --- arch/3.5.13/trinity-extras/trinity-kdeaddons/PKGBUILD | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/arch/3.5.13/trinity-extras/trinity-kdeaddons/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-kdeaddons/PKGBUILD index abe0836fa..8ceafefde 100644 --- a/arch/3.5.13/trinity-extras/trinity-kdeaddons/PKGBUILD +++ b/arch/3.5.13/trinity-extras/trinity-kdeaddons/PKGBUILD @@ -19,30 +19,25 @@ options=('libtool' '!strip') source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/kdeaddons-3.5.13.tar.gz) md5sums=('f5fa96a5d99d1bc33600f609881eaee6') -_prefix=/opt/trinity - build() { - msg "Setting Trinity Environment variables" - export LD_LIBRARY_PATH=${_prefix}/lib:${_prefix}/lib/trinity:$LD_LIBRARY_PATH - export PKG_CONFIG_PATH=${_prefix}/lib/pkgconfig:${QTDIR}/lib/pkgconfig - - #msg "Patching..." - #patch -N -d ${srcdir} -p0 < kdeaddons.patch + [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh + [ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh msg "Starting automake..." cd "$srcdir/kdeaddons" cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" + sed -i -e "s@/usr/include/tqt@$TDEDIR/include/tqt@" admin/acinclude.m4.in make -f admin/Makefile.common msg "Starting configure..." ./configure --with-qt-dir=${QTDIR} \ - --prefix=${_prefix} \ + --prefix=${TDEDIR} \ --enable-closure \ --with-{sdl,xmms} \ - --with-extra-includes=${_prefix}/include:/usr/include/dbus-1.0:${_prefix}/include/libkrandr \ - --with-extra-libs=${_prefix}/lib:${_prefix}/lib/trinity:${_prefix}/pkgconfig + #--with-extra-includes=${TDEDIR}/include:/usr/include/dbus-1.0:${TDEDIR}/include/libkrandr \ + #--with-extra-libs=${TDEDIR}/lib:${TDEDIR}/lib/trinity:${TDEDIR}/pkgconfig msg "Building ${pkgname}..." make -- cgit v1.2.1 From ba8871e16db9c824eeb6b1b12490b2ea5908278c Mon Sep 17 00:00:00 2001 From: "Pawel \"l0ner\" Soltys" Date: Tue, 7 Feb 2012 18:13:57 +0100 Subject: kdeadmin: minor fixups, dropped _prefix variable --- .../trinity-extras/trinity-kdeadmin/PKGBUILD | 23 +++++++--------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/arch/3.5.13/trinity-extras/trinity-kdeadmin/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-kdeadmin/PKGBUILD index 69928cf46..6ba924328 100644 --- a/arch/3.5.13/trinity-extras/trinity-kdeadmin/PKGBUILD +++ b/arch/3.5.13/trinity-extras/trinity-kdeadmin/PKGBUILD @@ -3,7 +3,7 @@ pkgname=trinity-kdeadmin pkgver=3513 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://www.trinitydesktop.org' license=('GPL') @@ -11,38 +11,29 @@ groups=('trinity-extras') pkgdesc="Trinity system administration utils" depends=('trinity-kdelibs') makedepends=('pkgconfig' 'autoconf' 'automake') -optdepends=() -provides=($pkgname) -conflicts=() -replaces=() options=('libtool' '!strip') source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/kdeadmin-3.5.13.tar.gz) md5sums=('b8bbabf353070a3e730464e0ce2960e2') -_prefix=/opt/trinity - build() { - msg "Setting Trinity Environment variables" - export LD_LIBRARY_PATH=${_prefix}/lib:${_prefix}/lib/trinity:$LD_LIBRARY_PATH - export PKG_CONFIG_PATH=${_prefix}/lib/pkgconfig:${QTDIR}/lib/pkgconfig - - #msg "Patching..." - #patch -N -d ${srcdir} -p0 < kdeadmin.patch + [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh + [ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh msg "Starting automake..." cd "$srcdir/kdeadmin" cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" + sed -i -e "s@/usr/include/tqt@$TDEDIR/include/tqt@" admin/acinclude.m4.in make -f admin/Makefile.common msg "Starting configure..." ./configure --with-qt-dir=${QTDIR} \ - --prefix=${_prefix} \ + --prefix=${TDEDIR} \ --enable-closure \ --with-shadow \ - --with-extra-includes=${_prefix}/include:/usr/include/dbus-1.0:${_prefix}/include/libkrandr \ - --with-extra-libs=${_prefix}/lib:${_prefix}/lib/trinity:${_prefix}/pkgconfig + --with-extra-includes=${TDEDIR}/include:/usr/include/dbus-1.0:${TDEDIR}/include/libkrandr \ + --with-extra-libs=${TDEDIR}/lib:${TDEDIR}/lib/trinity:${TDEDIR}/pkgconfig msg "Building ${pkgname}..." make -- cgit v1.2.1 From 4cf9e0b4711496b2f3bb775d262c13437e75a46d Mon Sep 17 00:00:00 2001 From: "Pawel \"l0ner\" Soltys" Date: Tue, 7 Feb 2012 18:14:22 +0100 Subject: kdeartwork: minor fixups, dropped _prefix variable --- arch/3.5.13/trinity-extras/trinity-kdeartwork/PKGBUILD | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/arch/3.5.13/trinity-extras/trinity-kdeartwork/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-kdeartwork/PKGBUILD index 18960152d..3561960d5 100644 --- a/arch/3.5.13/trinity-extras/trinity-kdeartwork/PKGBUILD +++ b/arch/3.5.13/trinity-extras/trinity-kdeartwork/PKGBUILD @@ -3,7 +3,7 @@ pkgname=trinity-kdeartwork pkgver=3513 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://www.trinitydesktop.org' license=('GPL') @@ -17,12 +17,8 @@ md5sums=('24f85eb3e5a9106de48a3e81d2575ffe') build() { msg "Setting PATH, CMAKE and Trinity Environment variables" - export CMAKE_PREFIX_PATH=/opt/qt:/opt/trinity - export CMAKE_INCLUDE_PATH=/opt/qt/include/tqt:/usr/include/dbus-1.0:/opt/trinity/include - export LD_LIBRARY_PATH=/opt/trinity/lib:/opt/trinity/lib/kde3:$LD_LIBRARY_PATH - export PKG_CONFIG_PATH=:/opt/qt/lib/pkgconfig - - _prefix="/opt/trinity" + [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh + [ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh cd $srcdir msg "Creating out-of-source build directory: ${srcdir}/build" @@ -31,7 +27,7 @@ build() { msg "Starting cmake..." cmake ${srcdir}/kdeartwork \ - -DCMAKE_INSTALL_PREFIX=${_prefix} \ + -DCMAKE_INSTALL_PREFIX=${TDEDIR} \ -DCMAKE_VERBOSE_MAKEFILE=ON \ -DWITH_XSCREENSAVER=ON \ -DWITH_LIBART=ON \ @@ -45,5 +41,5 @@ package() { msg "Packaging - $pkgname-$pkgver" cd ${srcdir}/build - make DESTDIR="$pkgdir/" install + make DESTDIR="$pkgdir" install } -- cgit v1.2.1 From c0be9a88ba118323a2720f1e9982f88fb6602e23 Mon Sep 17 00:00:00 2001 From: "Pawel \"l0ner\" Soltys" Date: Tue, 7 Feb 2012 18:14:48 +0100 Subject: kdeedu: minor fixups, dropped _prefix variable --- arch/3.5.13/trinity-extras/trinity-kdeedu/PKGBUILD | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/arch/3.5.13/trinity-extras/trinity-kdeedu/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-kdeedu/PKGBUILD index 9cb3418d7..e50e88bab 100644 --- a/arch/3.5.13/trinity-extras/trinity-kdeedu/PKGBUILD +++ b/arch/3.5.13/trinity-extras/trinity-kdeedu/PKGBUILD @@ -3,7 +3,7 @@ pkgname=trinity-kdeedu pkgver=3513 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://www.trinitydesktop.org' license=('GPL') @@ -15,29 +15,25 @@ options=('libtool' '!strip') source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/kdeedu-3.5.13.tar.gz) md5sums=('37a14a67c4d00babc3015c6a31698cb0') -_prefix=/opt/trinity - build() { msg "Setting Trinity Environment variables" - export LD_LIBRARY_PATH=${_prefix}/lib:${_prefix}/lib/trinity:$LD_LIBRARY_PATH - export PKG_CONFIG_PATH=${_prefix}/lib/pkgconfig:${QTDIR}/lib/pkgconfig - - #msg "Patching..." - #patch -N -d ${srcdir} -p0 < kdeedu.patch + [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh + [ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh msg "Starting automake..." cd "$srcdir/kdeedu" cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" + sed -i -e "s@/usr/include/tqt@$TDEDIR/include/tqt@" admin/acinclude.m4.in make -f admin/Makefile.common msg "Starting configure..." ./configure --with-qt-dir=${QTDIR} \ - --prefix=${_prefix} \ - --enable-closure \ - --with-extra-includes=${_prefix}/include:/usr/include/dbus-1.0:${_prefix}/include/libkrandr \ - --with-extra-libs=${_prefix}/lib:${_prefix}/lib/trinity:${_prefix}/pkgconfig + --prefix=${TDEDIR} \ + --enable-closure + #--with-extra-includes=${TDEDIR}/include:/usr/include/dbus-1.0:${TDEDIR}/include/libkrandr \ + #--with-extra-libs=${TDEDIR}/lib:${TDEDIR}/lib/trinity:${TDEDIR}/pkgconfig msg "Building ${pkgname}..." make -- cgit v1.2.1 From ee1fdbd0432c23cda7facead05948c2c90a0c4ee Mon Sep 17 00:00:00 2001 From: "Pawel \"l0ner\" Soltys" Date: Tue, 7 Feb 2012 18:15:05 +0100 Subject: kdegames: minor fixups, dropped _prefix variable --- .../3.5.13/trinity-extras/trinity-kdegames/PKGBUILD | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/arch/3.5.13/trinity-extras/trinity-kdegames/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-kdegames/PKGBUILD index 8a6df3f6a..6cdc98e0d 100644 --- a/arch/3.5.13/trinity-extras/trinity-kdegames/PKGBUILD +++ b/arch/3.5.13/trinity-extras/trinity-kdegames/PKGBUILD @@ -3,7 +3,7 @@ pkgname=trinity-kdegames pkgver=3513 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://www.trinitydesktop.org' license=('GPL') @@ -15,29 +15,26 @@ options=('libtool' '!strip') source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/kdegames-3.5.13.tar.gz) md5sums=('6c63e161050939f53921bfceb923a19e') -_prefix=/opt/trinity - build() { msg "Setting Trinity Environment variables" - export LD_LIBRARY_PATH=${_prefix}/lib:${_prefix}/lib/trinity:$LD_LIBRARY_PATH - export PKG_CONFIG_PATH=${_prefix}/lib/pkgconfig:${QTDIR}/lib/pkgconfig - - #msg "Patching..." - #patch -N -d ${srcdir} -p0 < kdegames.patch + [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh + [ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh + msg "Starting automake..." cd "$srcdir/kdegames" cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" + sed -i -e "s@/usr/include/tqt@$TDEDIR/include/tqt@" admin/acinclude.m4.in make -f admin/Makefile.common msg "Starting configure..." ./configure --with-qt-dir=${QTDIR} \ - --prefix=${_prefix} \ - --enable-closure \ - --with-extra-includes=${_prefix}/include:/usr/include/dbus-1.0:${_prefix}/include/libkrandr \ - --with-extra-libs=${_prefix}/lib:${_prefix}/lib/trinity:${_prefix}/pkgconfig + --prefix=${TDEDIR} \ + --enable-closure + #--with-extra-includes=${TDEDIR}/include:/usr/include/dbus-1.0:${TDEDIR}/include/libkrandr \ + #--with-extra-libs=${TDEDIR}/lib:${TDEDIR}/lib/trinity:${TDEDIR}/pkgconfig msg "Building ${pkgname}..." make -- cgit v1.2.1 From 40d9f429614a8b2d5c150d2111916ab8a6fc50df Mon Sep 17 00:00:00 2001 From: "Pawel \"l0ner\" Soltys" Date: Tue, 7 Feb 2012 18:15:17 +0100 Subject: kdegraphics: minor fixups, dropped _prefix variable --- arch/3.5.13/trinity-extras/trinity-kdegraphics/PKGBUILD | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/arch/3.5.13/trinity-extras/trinity-kdegraphics/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-kdegraphics/PKGBUILD index 8f1ed8b4c..49650579a 100644 --- a/arch/3.5.13/trinity-extras/trinity-kdegraphics/PKGBUILD +++ b/arch/3.5.13/trinity-extras/trinity-kdegraphics/PKGBUILD @@ -3,7 +3,7 @@ pkgname=trinity-kdegraphics pkgver=3513 -pkgrel=1.0 +pkgrel=2 arch=('i686' 'x86_64') url='http://www.trinitydesktop.com' license=('GPL') @@ -20,16 +20,10 @@ options=('libtool' '!strip') source=('http://mirror.ets.kth.se/trinity/releases/3.5.13/kdegraphics-3.5.13.tar.gz' 'ksnapshot.patch') md5sums=('a75c254cd1060343cd04c6744bce6798' '635ed9478cb3edde4fda84f3bac85438') -_prefix="/opt/trinity" - build() { msg "Setting PATH, CMAKE and Trinity Environment variables" - . /etc/profile.d/qt3.sh - - export CMAKE_PREFIX_PATH=/opt/qt:${_prefix} - export CMAKE_INCLUDE_PATH=/opt/qt/include:/opt/qt/include/tqt:/usr/include/dbus-1.0:/opt/trinity/include:/opt/trinity/include/libkrandr:/usr/include:/usr/include/lcms - export LD_LIBRARY_PATH=/opt/trinity/lib:/opt/trinity/lib/kde3:/usr/lib:$LD_LIBRARY_PATH - export PKG_CONFIG_PATH=:/opt/trinity/lib/pkgconfig:/opt/qt/lib/pkgconfig + [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh + [ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh msg "Patching..." patch -p0 -i ${srcdir}/ksnapshot.patch @@ -41,7 +35,7 @@ build() { msg "Starting cmake..." cmake ${srcdir}/kdegraphics \ - -DCMAKE_INSTALL_PREFIX=${_prefix} \ + -DCMAKE_INSTALL_PREFIX=${TDEDIR} \ -DCMAKE_VERBOSE_MAKEFILE=ON \ -DQT_VERSION=3 \ -DCMAKE_CXX_FLAGS="-fpermissive" \ @@ -59,8 +53,6 @@ build() { package() { msg "Packaging - $pkgname-$pkgver" cd ${srcdir}/build - make DESTDIR="$pkgdir" install - cd ${startdir} } -- cgit v1.2.1 From 5326d007b4e94498e9faf8fa22ac9736d624fe87 Mon Sep 17 00:00:00 2001 From: "Pawel \"l0ner\" Soltys" Date: Tue, 7 Feb 2012 18:15:35 +0100 Subject: kdemultimedia: minor fixups, dropped _prefix variable --- .../3.5.13/trinity-extras/trinity-kdemultimedia/PKGBUILD | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/arch/3.5.13/trinity-extras/trinity-kdemultimedia/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-kdemultimedia/PKGBUILD index 12e75db87..b812735ba 100644 --- a/arch/3.5.13/trinity-extras/trinity-kdemultimedia/PKGBUILD +++ b/arch/3.5.13/trinity-extras/trinity-kdemultimedia/PKGBUILD @@ -3,7 +3,7 @@ pkgname=trinity-kdemultimedia pkgver=3513 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://www.trinitydesktop.org' license=('GPL') @@ -15,13 +15,10 @@ options=('libtool' '!strip') source=('http://mirror.ets.kth.se/trinity/releases/3.5.13/kdemultimedia-3.5.13.tar.gz' 'xine_artsplugin.patch') md5sums=('6d906b8a8fd0928e01ecd600175381c0' 'bb045d94e8dca80d73af4add43b7fc15') -_prefix=/opt/trinity - build() { - msg "Setting Trinity Environment variables" - export LD_LIBRARY_PATH=${_prefix}/lib:${_prefix}/lib/trinity:$LD_LIBRARY_PATH - export PKG_CONFIG_PATH=${_prefix}/lib/pkgconfig:${QTDIR}/lib/pkgconfig + [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh + [ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh msg "Patching..." patch -p0 -i ${srcdir}/xine_artsplugin.patch @@ -30,13 +27,12 @@ build() { cd "$srcdir/kdemultimedia" cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" + sed -i -e "s@/usr/include/tqt@$TDEDIR/include/tqt@" admin/acinclude.m4.in make -f admin/Makefile.common msg "Starting configure..." ./configure --with-qt-dir=${QTDIR} \ - --prefix=${_prefix} \ - --with-extra-includes=${_prefix}/include:/usr/include/dbus-1.0:${_prefix}/include/libkrandr \ - --with-extra-libs=${_prefix}/lib:${_prefix}/lib/trinity:${_prefix}/pkgconfig \ + --prefix=${TDEDIR} \ --enable-closure \ --with-vorbis \ --with-alsa \ @@ -49,6 +45,8 @@ build() { --with-xine #--with-gstreamer #--with-akode \ + #--with-extra-includes=${TDEDIR}/include:/usr/include/dbus-1.0:${TDEDIR}/include/libkrandr \ + #--with-extra-libs=${TDEDIR}/lib:${TDEDIR}/lib/trinity:${TDEDIR}/pkgconfig \ msg "Building ${pkgname}..." make -- cgit v1.2.1 From b56b9bf5441e324ee4d159746f797f788dc3ac9d Mon Sep 17 00:00:00 2001 From: "Pawel \"l0ner\" Soltys" Date: Tue, 7 Feb 2012 18:15:52 +0100 Subject: kdenetwork: minor fixups, dropped _prefix variable --- arch/3.5.13/trinity-extras/trinity-kdenetwork/PKGBUILD | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/arch/3.5.13/trinity-extras/trinity-kdenetwork/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-kdenetwork/PKGBUILD index 82d8bebab..a24800eef 100644 --- a/arch/3.5.13/trinity-extras/trinity-kdenetwork/PKGBUILD +++ b/arch/3.5.13/trinity-extras/trinity-kdenetwork/PKGBUILD @@ -3,7 +3,7 @@ pkgname=trinity-kdenetwork pkgver=3513 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://www.trinitydesktop.org' license=('GPL') @@ -26,12 +26,8 @@ md5sums=('349f197c9af4bf0d9b8773f26829415e' build() { msg "Setting PATH, CMAKE and Trinity Environment variables" - export CMAKE_PREFIX_PATH=/opt/qt:/opt/trinity - export CMAKE_INCLUDE_PATH=/opt/qt/include/tqt:/usr/include/dbus-1.0:/opt/trinity/include - export LD_LIBRARY_PATH=/opt/trinity/lib:/opt/trinity/lib/kde3:$LD_LIBRARY_PATH - export PKG_CONFIG_PATH=:/opt/qt/lib/pkgconfig - - _prefix="/opt/trinity" + [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh + [ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh patch -p0 -i ${srcdir}/kdenetwork.patch mv ${srcdir}/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/qname.cc ${srcdir}/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/tqname.cc @@ -44,7 +40,7 @@ build() { msg "Starting cmake..." cmake ${srcdir}/kdenetwork \ - -DCMAKE_INSTALL_PREFIX=${_prefix} \ + -DCMAKE_INSTALL_PREFIX=$TDEDIR \ -DCMAKE_VERBOSE_MAKEFILE=ON \ -DWITH_JINGLE=ON \ -DWITH_SPEEX=ON \ @@ -60,6 +56,5 @@ build() { package() { msg "Packaging - $pkgname-$pkgver" cd ${srcdir}/build - - make DESTDIR="$pkgdir/" install + make DESTDIR="$pkgdir" install } -- cgit v1.2.1 From c5e4f66b883c6402de44dac4fc057a5d70b4bc28 Mon Sep 17 00:00:00 2001 From: "Pawel \"l0ner\" Soltys" Date: Tue, 7 Feb 2012 18:16:09 +0100 Subject: kdepim: minor fixups, dropped _prefix variable --- arch/3.5.13/trinity-extras/trinity-kdepim/PKGBUILD | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/arch/3.5.13/trinity-extras/trinity-kdepim/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-kdepim/PKGBUILD index 7a49f3bcf..dcb645557 100644 --- a/arch/3.5.13/trinity-extras/trinity-kdepim/PKGBUILD +++ b/arch/3.5.13/trinity-extras/trinity-kdepim/PKGBUILD @@ -25,18 +25,11 @@ source=('http://mirror.ets.kth.se/trinity/releases/3.5.13/kdepim-3.5.13.tar.gz') source=('http://anduin.linuxfromscratch.org/sources/trinity/kdepim-3.5.13.tar.gz') md5sums=('4488062d5400bdd99642fe0b72ebcf9a') -_prefix="/opt/trinity" - build() { - msg "Setting PATH, CMAKE and Trinity Environment variables" - export CMAKE_PREFIX_PATH=/opt/qt:/opt/trinity - . /etc/profile.d/qt3.sh - - export CMAKE_INCLUDE_PATH=/opt/qt/include:/opt/qt/include/tqt:/usr/include/dbus-1.0:/opt/trinity/include:/opt/trinity/include/libkrandr:/usr/include - export LD_LIBRARY_PATH=/opt/trinity/lib:/opt/trinity/lib/kde3:$LD_LIBRARY_PATH - export PKG_CONFIG_PATH=:/opt/trinity/lib/pkgconfig:/opt/qt/lib/pkgconfig - + [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh + [ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh + cd $srcdir msg "Creating out-of-source build directory: ${srcdir}/build" mkdir -p build @@ -44,7 +37,7 @@ build() { msg "Starting cmake..." cmake ${srcdir}/kdepim \ - -DCMAKE_INSTALL_PREFIX=${_prefix} \ + -DCMAKE_INSTALL_PREFIX=${TDEDIR} \ -DCMAKE_VERBOSE_MAKEFILE=ON \ -DWITH_SASL=ON \ -DWITH_NEWDISTRLISTS=ON \ @@ -71,8 +64,6 @@ build() { package() { msg "Packaging - $pkgname-$pkgver" cd ${srcdir}/build - make DESTDIR="$pkgdir" install - cd ${startdir} } -- cgit v1.2.1 From 8d78df1ac9194431625b089d9966051185e8673e Mon Sep 17 00:00:00 2001 From: "Pawel \"l0ner\" Soltys" Date: Tue, 7 Feb 2012 18:16:21 +0100 Subject: kdesdk: minor fixups, dropped _prefix variable --- arch/3.5.13/trinity-extras/trinity-kdesdk/PKGBUILD | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/arch/3.5.13/trinity-extras/trinity-kdesdk/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-kdesdk/PKGBUILD index ace4fc543..b7cec01c2 100644 --- a/arch/3.5.13/trinity-extras/trinity-kdesdk/PKGBUILD +++ b/arch/3.5.13/trinity-extras/trinity-kdesdk/PKGBUILD @@ -3,7 +3,7 @@ pkgname=trinity-kdesdk pkgver=3513 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://www.trinitydesktop.org' license=('GPL') @@ -19,38 +19,33 @@ md5sums=('130662f683be1a49d56a713c5ae87e46' build() { msg "Setting PATH, CMAKE and Trinity Environment variables" - export CMAKE_PREFIX_PATH=/opt/qt:/opt/trinity - export CMAKE_INCLUDE_PATH=/opt/qt/include/tqt:/usr/include/dbus-1.0:/opt/trinity/include:/opt/trinity/include/kde - export LD_LIBRARY_PATH=/opt/trinity/lib:/opt/trinity/lib/kde:$LD_LIBRARY_PATH - export PKG_CONFIG_PATH=:/opt/qt/lib/pkgconfig - - _prefix="/opt/trinity" + [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh + [ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh patch -N -d ${srcdir} -p0 < kdesdk.patch cd $srcdir/kdesdk msg "Starting configure..." - cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" + sed -i -e "s@/usr/include/tqt@$TDEDIR/include/tqt@" admin/acinclude.m4.in make -f admin/Makefile.common msg "Starting configure..." ./configure --with-qt-dir=${QTDIR} \ - --prefix=${_prefix} \ + --prefix=${TDEDIR} \ --enable-closure \ - --with-extra-includes=${_prefix}/include:/usr/include/dbus-1.0:${_prefix}/include/libkrandr \ - --with-extra-libs=${_prefix}/lib:${_prefix}/lib/trinity:${_prefix}/pkgconfig \ --with-berkeley-db \ --with-subversion + #--with-extra-includes=${TDEDIR}/include:/usr/include/dbus-1.0:${TDEDIR}/include/libkrandr \ + #--with-extra-libs=${TDEDIR}/lib:${TDEDIR}/lib/trinity:${TDEDIR}/pkgconfig \ make - #msg "Starting cmake..." #cmake ${srcdir}/kdesdk \ - # -DCMAKE_INSTALL_PREFIX=${_prefix} \ + # -DCMAKE_INSTALL_PREFIX=${TDEDIR} \ # -DCMAKE_VERBOSE_MAKEFILE=ON \ # -DWITH_DBSEARCHENGINE=ON \ # -DWITH_KCAL=ON \ @@ -76,6 +71,5 @@ build() { package() { msg "Packaging - $pkgname-$pkgver" cd ${srcdir}/kdesdk - make DESTDIR="$pkgdir" install } -- cgit v1.2.1 From a95ed34055befaff4158b33ea0b240f1627e8290 Mon Sep 17 00:00:00 2001 From: "Pawel \"l0ner\" Soltys" Date: Tue, 7 Feb 2012 18:16:37 +0100 Subject: kdetoys: minor fixups, dropped _prefix variable --- arch/3.5.13/trinity-extras/trinity-kdetoys/PKGBUILD | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/arch/3.5.13/trinity-extras/trinity-kdetoys/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-kdetoys/PKGBUILD index 1de2a3b95..bd20aa2e7 100644 --- a/arch/3.5.13/trinity-extras/trinity-kdetoys/PKGBUILD +++ b/arch/3.5.13/trinity-extras/trinity-kdetoys/PKGBUILD @@ -3,7 +3,7 @@ pkgname=trinity-kdetoys pkgver=3513 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://www.trinitydesktop.org' license=('GPL') @@ -15,26 +15,24 @@ options=('libtool' '!strip') source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/kdetoys-3.5.13.tar.gz) md5sums=('823dd778c1e9e15972a509f4eee4434d') -_prefix=/opt/trinity - build() { - msg "Setting Trinity Environment variables" - export LD_LIBRARY_PATH=${_prefix}/lib:${_prefix}/lib/trinity:$LD_LIBRARY_PATH - export PKG_CONFIG_PATH=${_prefix}/lib/pkgconfig:${QTDIR}/lib/pkgconfig + [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh + [ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh msg "Starting automake..." cd "$srcdir/kdetoys" cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" + sed -i -e "s@/usr/include/tqt@$TDEDIR/include/tqt@" admin/acinclude.m4.in make -f admin/Makefile.common msg "Starting configure..." ./configure --with-qt-dir=${QTDIR} \ - --prefix=${_prefix} \ - --enable-closure \ - --with-extra-includes=${_prefix}/include:/usr/include/dbus-1.0:${_prefix}/include/libkrandr \ - --with-extra-libs=${_prefix}/lib:${_prefix}/lib/trinity:${_prefix}/pkgconfig + --prefix=${TDEDIR} \ + --enable-closure + #--with-extra-includes=${TDEDIR}/include:/usr/include/dbus-1.0:${TDEDIR}/include/libkrandr \ + #--with-extra-libs=${TDEDIR}/lib:${TDEDIR}/lib/trinity:${TDEDIR}/pkgconfig msg "Building ${pkgname}..." make -- cgit v1.2.1 From e73b7f16737a5495824740aa533d6d40c04b08e5 Mon Sep 17 00:00:00 2001 From: "Pawel \"l0ner\" Soltys" Date: Tue, 7 Feb 2012 18:16:52 +0100 Subject: kdeutils: minor fixups, dropped _prefix variable --- arch/3.5.13/trinity-extras/trinity-kdeutils/PKGBUILD | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/arch/3.5.13/trinity-extras/trinity-kdeutils/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-kdeutils/PKGBUILD index 38633c7fd..bd9a4da9d 100644 --- a/arch/3.5.13/trinity-extras/trinity-kdeutils/PKGBUILD +++ b/arch/3.5.13/trinity-extras/trinity-kdeutils/PKGBUILD @@ -3,7 +3,7 @@ pkgname=trinity-kdeutils pkgver=3513 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://www.trinitydesktop.org' license=('GPL') @@ -15,27 +15,24 @@ options=('libtool' '!strip') source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/kdeutils-3.5.13.tar.gz) md5sums=('e2cd6695606c5c91b3380dcc7f1a6a83') -_prefix=/opt/trinity - build() { - msg "Setting Trinity Environment variables" - export LD_LIBRARY_PATH=${_prefix}/lib:${_prefix}/lib/trinity:$LD_LIBRARY_PATH - export PKG_CONFIG_PATH=${_prefix}/lib/pkgconfig:${QTDIR}/lib/pkgconfig - + [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh + [ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh msg "Starting automake..." cd "$srcdir/kdeutils" cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" + sed -i -e "s@/usr/include/tqt@$TDEDIR/include/tqt@" admin/acinclude.m4.in make -f admin/Makefile.common msg "Starting configure..." ./configure --with-qt-dir=${QTDIR} \ - --prefix=${_prefix} \ - --enable-closure \ - --with-extra-includes=${_prefix}/include:/usr/include/dbus-1.0:${_prefix}/include/libkrandr \ - --with-extra-libs=${_prefix}/lib:${_prefix}/lib/trinity:${_prefix}/pkgconfig + --prefix=${TDEDIR} \ + --enable-closure + #--with-extra-includes=${TDEDIR}/include:/usr/include/dbus-1.0:${TDEDIR}/include/libkrandr \ + #--with-extra-libs=${TDEDIR}/lib:${TDEDIR}/lib/trinity:${TDEDIR}/pkgconfig #--with-xmms #--with-snmp \ -- cgit v1.2.1 From f5d00df4063996cd922178182af6c4d484d6a248 Mon Sep 17 00:00:00 2001 From: "Pawel \"l0ner\" Soltys" Date: Tue, 7 Feb 2012 18:17:10 +0100 Subject: kdevelop: minor fixups, dropped _prefix variable --- arch/3.5.13/trinity-extras/trinity-kdevelop/PKGBUILD | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/arch/3.5.13/trinity-extras/trinity-kdevelop/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-kdevelop/PKGBUILD index 2e3945c16..ff47e08f4 100644 --- a/arch/3.5.13/trinity-extras/trinity-kdevelop/PKGBUILD +++ b/arch/3.5.13/trinity-extras/trinity-kdevelop/PKGBUILD @@ -2,8 +2,8 @@ # Contributor: Calvin Morrison pkgname=trinity-kdevelop -pkgver=12345 -pkgrel=1.0 +pkgver=3513 +pkgrel=2 arch=('i686' 'x86_64') url='http://www.trinitydesktop.org' license=('GPL') @@ -17,14 +17,9 @@ md5sums=('777bd77e4f2dc6a5b5b45a370dcf6da0' 'ab23854b1658adc1da4621cb589ec1be') build() { - msg "Setting PATH, CMAKE and Trinity Environment variables" - export CMAKE_PREFIX_PATH=/opt/qt:/opt/trinity - CMAKE_INCLUDE_PATH=/opt/qt/include:/opt/qt/include/tqt:/usr/include/dbus-1.0:/opt/trinity/include:/opt/trinity/include/libkrandr - export LD_LIBRARY_PATH=/opt/trinity/lib:/opt/trinity/lib/kde3:$LD_LIBRARY_PATH - export PKG_CONFIG_PATH=:/opt/trinity/lib/pkgconfig:/opt/qt/lib/pkgconfig - - _prefix="/opt/trinity" + [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh + [ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh msg "Patching..." # apply second part of Francois Andriot patch @@ -37,7 +32,7 @@ build() { msg "Starting cmake..." cmake ${srcdir}/kdevelop \ - -DCMAKE_INSTALL_PREFIX=${_prefix} \ + -DCMAKE_INSTALL_PREFIX=${TDEDIR} \ -DCMAKE_VERBOSE_MAKEFILE=ON \ -DQT_VERSION=3 \ -DWITH_QT3=ON \ @@ -51,6 +46,5 @@ build() { package() { msg "Packaging - $pkgname-$pkgver" cd ${srcdir}/build - make DESTDIR="$pkgdir/" install } -- cgit v1.2.1 From 476f266bccdfc98a3eb09bf6642dc85e640df012 Mon Sep 17 00:00:00 2001 From: "Pawel \"l0ner\" Soltys" Date: Tue, 7 Feb 2012 18:17:27 +0100 Subject: kdewebdev: minor fixups, dropped _prefix variable --- arch/3.5.13/trinity-extras/trinity-kdewebdev/PKGBUILD | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/arch/3.5.13/trinity-extras/trinity-kdewebdev/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-kdewebdev/PKGBUILD index 49e067fd6..aeb365b82 100644 --- a/arch/3.5.13/trinity-extras/trinity-kdewebdev/PKGBUILD +++ b/arch/3.5.13/trinity-extras/trinity-kdewebdev/PKGBUILD @@ -3,7 +3,7 @@ pkgname=trinity-webdev pkgver=3513 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://www.trinitydesktop.org' license=('GPL') @@ -18,13 +18,8 @@ md5sums=('4f56a6c4b5916615ca3615f8e8f868c6' build() { msg "Setting PATH, CMAKE and Trinity Environment variables" - export CMAKE_PREFIX_PATH=/opt/qt:/opt/trinity - export CMAKE_INCLUDE_PATH=/opt/qt/include/tqt:/usr/include/dbus-1.0:/opt/trinity/include - export LD_LIBRARY_PATH=/opt/trinity/lib:/opt/trinity/lib/kde3:$LD_LIBRARY_PATH - export PKG_CONFIG_PATH=:/opt/qt/lib/pkgconfig - - _prefix="/opt/trinity" - + [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh + [ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh patch -N -d ${srcdir} -p0 < kdewebdev.patch cd $srcdir @@ -34,7 +29,7 @@ build() { msg "Starting cmake..." cmake ${srcdir}/kdewebdev \ - -DCMAKE_INSTALL_PREFIX=${_prefix} \ + -DCMAKE_INSTALL_PREFIX=${TDEDIR} \ -DCMAKE_VERBOSE_MAKEFILE=ON \ -DBUILD_ALL=ON make @@ -43,5 +38,5 @@ build() { package() { msg "Packaging - $pkgname-$pkgver" cd ${srcdir}/build - make DESTDIR="$pkgdir/" install + make DESTDIR="$pkgdir" install } -- cgit v1.2.1 From 60ab053f8a577b3f2c4d9624c2172d3fe862b345 Mon Sep 17 00:00:00 2001 From: "Pawel \"l0ner\" Soltys" Date: Tue, 7 Feb 2012 18:17:58 +0100 Subject: libcaldav: minor fixups, dropped _prefix variable --- arch/3.5.13/trinity-extras/trinity-libcaldav/PKGBUILD | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/arch/3.5.13/trinity-extras/trinity-libcaldav/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-libcaldav/PKGBUILD index 933a98c7d..97ce89858 100644 --- a/arch/3.5.13/trinity-extras/trinity-libcaldav/PKGBUILD +++ b/arch/3.5.13/trinity-extras/trinity-libcaldav/PKGBUILD @@ -20,9 +20,10 @@ md5sums=('fba66a6c605a6d7be67a638cd29667b6' '5ce5bd3c1ed4d5004a864130a971f737' 'c136e14af1923c2cf6dc5beb93da2ba4') -_prefix=/usr - build() { + msg "Setting enviroment variables..." + [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh + [ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh # patch for Changelog version patch -p0 -i ${srcdir}/Changelog.patch || return 1 @@ -31,10 +32,10 @@ build() { cd ${srcdir}/libcaldav-${pkgver} msg "Running ./autogen.sh for autoreconf" - ./autogen.sh --prefix=${_prefix} + ./autogen.sh --prefix=${TDEDIR} # --includedir=/usr/include # msg "Running configure" -# ./configure --prefix=${_prefix} +# ./configure --prefix=${TDEDIR} make || return 1 } -- cgit v1.2.1 From 7a1eb964151e0e73ac1a73a735a1f17e63657274 Mon Sep 17 00:00:00 2001 From: "Pawel \"l0ner\" Soltys" Date: Tue, 7 Feb 2012 18:18:09 +0100 Subject: libcarddav: minor fixups, dropped _prefix variable --- arch/3.5.13/trinity-extras/trinity-libcarddav/PKGBUILD | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/arch/3.5.13/trinity-extras/trinity-libcarddav/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-libcarddav/PKGBUILD index 918d9a853..f08419908 100644 --- a/arch/3.5.13/trinity-extras/trinity-libcarddav/PKGBUILD +++ b/arch/3.5.13/trinity-extras/trinity-libcarddav/PKGBUILD @@ -18,10 +18,11 @@ source=("http://quickbuild.pearsoncomputing.net:58080/2056019/libcarddav_${pkgve md5sums=('42a0fe57ba4c639aad53024f6c8d5614' '63ef0b91ff27dfb7c48ca0f07866af79') -_prefix=/usr - build() { cd ${srcdir} + msg "setting environment variables..." + [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh + [ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh # apply libcarddav patch msg "Applying Patch: libcarddav.patch" @@ -29,9 +30,9 @@ build() { cd ${srcdir}/libcarddav-${pkgver} msg "Running ./autogen.sh for autoreconf" - ./autogen.sh --prefix=${_prefix} + ./autogen.sh --prefix=${TDEDIR} # msg "Running configure" - # ./configure --prefix=${_prefix} + # ./configure --prefix=${TDEDIR} make || return 1 } -- cgit v1.2.1 From 863856c143f1631a8987e74852b4bfea5e972e4a Mon Sep 17 00:00:00 2001 From: "Pawel \"l0ner\" Soltys" Date: Tue, 7 Feb 2012 18:18:31 +0100 Subject: libkdcraw: minor fixups, dropped _prefix variable --- .../3.5.13/trinity-extras/trinity-libkdcraw/PKGBUILD | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/arch/3.5.13/trinity-extras/trinity-libkdcraw/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-libkdcraw/PKGBUILD index 6fdf2d303..17e05aa0b 100644 --- a/arch/3.5.13/trinity-extras/trinity-libkdcraw/PKGBUILD +++ b/arch/3.5.13/trinity-extras/trinity-libkdcraw/PKGBUILD @@ -3,40 +3,38 @@ pkgname=trinity-libkdcraw pkgver=3513 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://www.trinitydesktop.org' license=('GPL') groups=('trinity-extras') pkgdesc="Trinity DCRaw library" depends=('trinity-kdelibs') -#openmpi + #openmpi makedepends=('pkgconfig' 'autoconf' 'automake') options=('libtool' '!strip') source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/libraries/libkdcraw-3.5.13.tar.gz) md5sums=('770dd734dc427337a1a2e61b6b0874ae') -_prefix=/opt/trinity - build() { - msg "Setting Trinity Environment variables" - export LD_LIBRARY_PATH=${_prefix}/lib:${_prefix}/lib/trinity:$LD_LIBRARY_PATH - export PKG_CONFIG_PATH=${_prefix}/lib/pkgconfig:${QTDIR}/lib/pkgconfig + [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh + [ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh msg "Starting automake..." cd "$srcdir/libraries/libkdcraw" cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" + sed -i -e "s@/usr/include/tqt@$TDEDIR/include/tqt@" admin/acinclude.m4.in make -f admin/Makefile.common msg "Starting configure..." ./configure --with-qt-dir=${QTDIR} \ - --prefix=${_prefix} \ + --prefix=${TDEDIR} \ --enable-closure \ - --enable-openmp \ - --with-extra-includes=${_prefix}/include:/usr/include/dbus-1.0:${_prefix}/include/libkrandr \ - --with-extra-libs=${_prefix}/lib:${_prefix}/lib/trinity:${_prefix}/pkgconfig + --enable-openmp + #--with-extra-includes=${TDEDIR}/include:/usr/include/dbus-1.0:${TDEDIR}/include/libkrandr \ + #--with-extra-libs=${TDEDIR}/lib:${TDEDIR}/lib/trinity:${TDEDIR}/pkgconfig msg "Building ${pkgname}..." make -- cgit v1.2.1 From 837b397fce734bb30015c7eda7061a75981cb3a6 Mon Sep 17 00:00:00 2001 From: "Pawel \"l0ner\" Soltys" Date: Tue, 7 Feb 2012 18:18:46 +0100 Subject: libkexiv2: minor fixups, dropped _prefix variable --- arch/3.5.13/trinity-extras/trinity-libkexiv2/PKGBUILD | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/arch/3.5.13/trinity-extras/trinity-libkexiv2/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-libkexiv2/PKGBUILD index 20dd82265..585cc5010 100644 --- a/arch/3.5.13/trinity-extras/trinity-libkexiv2/PKGBUILD +++ b/arch/3.5.13/trinity-extras/trinity-libkexiv2/PKGBUILD @@ -3,7 +3,7 @@ pkgname=trinity-libkexiv2 pkgver=3513 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://www.trinitydesktop.org' license=('GPL') @@ -15,26 +15,24 @@ options=('libtool' '!strip') source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/libraries/libkexiv2-3.5.13.tar.gz) md5sums=('74b160da8ea95f25048757b5fe692f85') -_prefix=/opt/trinity - build() { - msg "Setting Trinity Environment variables" - export LD_LIBRARY_PATH=${_prefix}/lib:${_prefix}/lib/trinity:$LD_LIBRARY_PATH - export PKG_CONFIG_PATH=${_prefix}/lib/pkgconfig:${QTDIR}/lib/pkgconfig + [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh + [ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh msg "Starting automake..." cd "$srcdir/libraries/libkexiv2" cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" + sed -i -e "s@/usr/include/tqt@$TDEDIR/include/tqt@" admin/acinclude.m4.in make -f admin/Makefile.common msg "Starting configure..." ./configure --with-qt-dir=${QTDIR} \ - --prefix=${_prefix} \ - --enable-closure \ - --with-extra-includes=${_prefix}/include:/usr/include/dbus-1.0:${_prefix}/include/libkrandr \ - --with-extra-libs=${_prefix}/lib:${_prefix}/lib/trinity:${_prefix}/pkgconfig + --prefix=${TDEDIR} \ + --enable-closure + #--with-extra-includes=${TDEDIR}/include:/usr/include/dbus-1.0:${TDEDIR}/include/libkrandr \ + #--with-extra-libs=${TDEDIR}/lib:${TDEDIR}/lib/trinity:${TDEDIR}/pkgconfig msg "Building ${pkgname}..." make -- cgit v1.2.1 From f1638a688ac157ef64bcc1ff950538b89ed7aa4a Mon Sep 17 00:00:00 2001 From: "Pawel \"l0ner\" Soltys" Date: Tue, 7 Feb 2012 18:19:04 +0100 Subject: libkipi: minor fixups, dropped _prefix variable --- arch/3.5.13/trinity-extras/trinity-libkipi/PKGBUILD | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/arch/3.5.13/trinity-extras/trinity-libkipi/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-libkipi/PKGBUILD index e66eb1a4a..6ff3593c5 100644 --- a/arch/3.5.13/trinity-extras/trinity-libkipi/PKGBUILD +++ b/arch/3.5.13/trinity-extras/trinity-libkipi/PKGBUILD @@ -3,7 +3,7 @@ pkgname=trinity-libkipi pkgver=3513 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://www.trinitydesktop.org' license=('GPL') @@ -15,26 +15,24 @@ options=('libtool' '!strip') source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/libraries/libkipi-3.5.13.tar.gz) md5sums=('22cb0ba7507cac99140cd1c0180cbe99') -_prefix=/opt/trinity - build() { - msg "Setting Trinity Environment variables" - export LD_LIBRARY_PATH=${_prefix}/lib:${_prefix}/lib/trinity:$LD_LIBRARY_PATH - export PKG_CONFIG_PATH=${_prefix}/lib/pkgconfig:${QTDIR}/lib/pkgconfig + [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh + [ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh msg "Starting automake..." cd "$srcdir/libraries/libkipi" cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" + sed -i -e "s@/usr/include/tqt@$TDEDIR/include/tqt@" admin/acinclude.m4.in make -f admin/Makefile.common msg "Starting configure..." ./configure --with-qt-dir=${QTDIR} \ - --prefix=${_prefix} \ - --enable-closure \ - --with-extra-includes=${_prefix}/include:/usr/include/dbus-1.0:${_prefix}/include/libkrandr \ - --with-extra-libs=${_prefix}/lib:${_prefix}/lib/trinity:${_prefix}/pkgconfig + --prefix=${TDEDIR} \ + --enable-closure + #--with-extra-includes=${TDEDIR}/include:/usr/include/dbus-1.0:${TDEDIR}/include/libkrandr \ + #--with-extra-libs=${TDEDIR}/lib:${TDEDIR}/lib/trinity:${TDEDIR}/pkgconfig msg "Building ${pkgname}..." make -- cgit v1.2.1 From 7f4e6156bfa4df3a99451b3bfc524126eb054d7a Mon Sep 17 00:00:00 2001 From: "Pawel \"l0ner\" Soltys" Date: Tue, 7 Feb 2012 19:30:48 +0100 Subject: added script for auto building --- arch/3.5.13/trinity-base/mkpkg | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100755 arch/3.5.13/trinity-base/mkpkg diff --git a/arch/3.5.13/trinity-base/mkpkg b/arch/3.5.13/trinity-base/mkpkg new file mode 100755 index 000000000..14681745c --- /dev/null +++ b/arch/3.5.13/trinity-base/mkpkg @@ -0,0 +1,15 @@ +#!/bin/bash + +# +pkgarray="qt3 tqtinterface arts dbus-tqt kdelibs kdebase" +arch=`uname -m` + +for i in $pkgarray; do + cd trinity-${i} + makepkg -s -c -i --noconfirm + cd .. +done + +#mkdir binaires-$arch + +mv `find . -name *.tar.xz` binaries-$arch -- cgit v1.2.1 From f85e858c12e3b3b90e10a6f990c8688c1cb810ed Mon Sep 17 00:00:00 2001 From: "Pawel \"l0ner\" Soltys" Date: Tue, 7 Feb 2012 19:45:21 +0100 Subject: kdelibs: fixed error on missing lidcop --- arch/3.5.13/trinity-base/trinity-kdelibs/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/3.5.13/trinity-base/trinity-kdelibs/PKGBUILD b/arch/3.5.13/trinity-base/trinity-kdelibs/PKGBUILD index aa3ba2e80..83e3d7af2 100644 --- a/arch/3.5.13/trinity-base/trinity-kdelibs/PKGBUILD +++ b/arch/3.5.13/trinity-base/trinity-kdelibs/PKGBUILD @@ -35,8 +35,8 @@ build() { # compiles without exporting this, since we have profiles #export CMAKE_PREFIX_PATH=${QTDIR}:${TDEDIR} #export PATH=$PATH:${TDEDIR}/bin - #export CMAKE_INCLUDE_PATH=/usr/include/dbus-1.0:${TDEDIR}/bin - #export LD_LIBRARY_PATH=${TDEDIR}/lib:${QTDIR}/lib:${TDEDIR}/lib/trinity:$LD_LIBRARY_PATH + #export CMAKE_INCLUDE_PATH=/usr/include/dbus-1.0 + export LD_LIBRARY_PATH=${TDEDIR}/lib:${QTDIR}/lib:${TDEDIR}/lib/trinity:$LD_LIBRARY_PATH msg "Patching..." patch -N -d ${srcdir} -p0 < ${srcdir}/docpath.patch -- cgit v1.2.1 From 784405e8180ea3d82b9c983dc6980b395a10099b Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 7 Feb 2012 13:25:53 -0600 Subject: Update Debian and Ubuntu packaging files for new TDE include directory name --- debian/lenny/applications/adept/debian/cdbs/kde.mk | 2 +- debian/lenny/applications/adept/debian/rules | 2 +- .../lenny/applications/amarok/debian/cdbs/kde.mk | 2 +- debian/lenny/applications/amarok/debian/rules | 2 +- debian/lenny/applications/basket/debian/rules | 2 +- .../applications/bibletime/debian/cdbs/kde.mk | 2 +- debian/lenny/applications/bibletime/debian/rules | 2 +- .../debian/cdbs/kde.mk | 2 +- .../compizconfig-backend-kconfig/debian/rules | 4 +- .../applications/desktop-effects-tde/debian/rules | 2 +- .../lenny/applications/digikam/debian/cdbs/kde.mk | 2 +- .../digikam/debian/digikam-trinity.install | 2 +- debian/lenny/applications/digikam/debian/rules | 2 +- .../applications/filelight-l10n/debian/cdbs/kde.mk | 2 +- .../lenny/applications/filelight-l10n/debian/rules | 4 +- .../applications/filelight/debian/cdbs/kde.mk | 2 +- debian/lenny/applications/filelight/debian/rules | 2 +- .../applications/gtk-qt-engine/debian/cdbs/kde.mk | 2 +- .../lenny/applications/gtk-qt-engine/debian/rules | 4 +- .../lenny/applications/gwenview/debian/cdbs/kde.mk | 2 +- debian/lenny/applications/gwenview/debian/rules | 2 +- debian/lenny/applications/k3b/debian/cdbs/kde.mk | 2 +- debian/lenny/applications/k3b/debian/rules | 4 +- debian/lenny/applications/k3b/debian/trinity.mk | 2 +- .../lenny/applications/k9copy/debian/cdbs/kde.mk | 2 +- debian/lenny/applications/k9copy/debian/rules | 4 +- .../applications/kaffeine-mozilla/debian/rules | 2 +- .../lenny/applications/kaffeine/debian/cdbs/kde.mk | 2 +- .../kaffeine/debian/kaffeine-trinity.install | 2 +- debian/lenny/applications/kaffeine/debian/rules | 2 +- .../lenny/applications/katapult/debian/cdbs/kde.mk | 2 +- debian/lenny/applications/katapult/debian/rules | 2 +- .../lenny/applications/kbarcode/debian/cdbs/kde.mk | 2 +- debian/lenny/applications/kbarcode/debian/rules | 2 +- debian/lenny/applications/kbfx/debian/rules | 6 +- .../applications/kbookreader/debian/cdbs/kde.mk | 2 +- debian/lenny/applications/kbookreader/debian/rules | 4 +- .../applications/kchmviewer/debian/debiandirs | 2 +- debian/lenny/applications/kchmviewer/debian/rules | 4 +- .../lenny/applications/kcpuload/debian/cdbs/kde.mk | 2 +- debian/lenny/applications/kcpuload/debian/rules | 4 +- .../kdbusnotification/debian/cdbs/kde.mk | 2 +- .../applications/kdbusnotification/debian/rules | 4 +- .../lenny/applications/kdiff3/debian/cdbs/kde.mk | 2 +- debian/lenny/applications/kdiff3/debian/rules | 4 +- .../lenny/applications/kdirstat/debian/cdbs/kde.mk | 2 +- debian/lenny/applications/kdirstat/debian/rules | 4 +- debian/lenny/applications/kdpkg/debian/rules | 2 +- debian/lenny/applications/keep/debian/cdbs/kde.mk | 2 +- .../keep/debian/patches/kubuntu_01_kdepot.diff | 4 +- debian/lenny/applications/keep/debian/rules | 4 +- debian/lenny/applications/kerry/debian/cdbs/kde.mk | 2 +- debian/lenny/applications/kerry/debian/rules | 2 +- debian/lenny/applications/kile/debian/cdbs/kde.mk | 2 +- debian/lenny/applications/kile/debian/rules | 4 +- debian/lenny/applications/kima/debian/rules | 2 +- .../lenny/applications/kio-apt/debian/cdbs/kde.mk | 2 +- debian/lenny/applications/kio-apt/debian/rules | 4 +- .../kio-umountwrapper/debian/cdbs/kde.mk | 2 +- .../applications/kio-umountwrapper/debian/rules | 4 +- .../lenny/applications/kmplayer/debian/cdbs/kde.mk | 2 +- debian/lenny/applications/kmplayer/debian/rules | 4 +- .../applications/kmyfirewall/debian/debiandirs | 2 +- debian/lenny/applications/kmyfirewall/debian/rules | 8 +- .../lenny/applications/kmymoney/debian/cdbs/kde.mk | 2 +- .../kmymoney/debian/kmymoney2-trinity-dev.install | 2 +- debian/lenny/applications/kmymoney/debian/rules | 4 +- debian/lenny/applications/knemo/debian/cdbs/kde.mk | 2 +- debian/lenny/applications/knemo/debian/rules | 4 +- debian/lenny/applications/knetload/debian/rules | 4 +- .../applications/knetstats/debian/cdbs/kde.mk | 2 +- debian/lenny/applications/knetstats/debian/rules | 2 +- .../knetworkmanager8/debian/cdbs/kde.mk | 2 +- .../applications/knetworkmanager8/debian/rules | 2 +- .../lenny/applications/knights/debian/debiandirs | 2 +- debian/lenny/applications/knights/debian/rules | 4 +- debian/lenny/applications/knowit/debian/rules | 2 +- debian/lenny/applications/knutclient/debian/rules | 2 +- .../lenny/applications/koffice/debian/cdbs/kde.mk | 2 +- .../koffice/debian/koffice-dev-trinity.install | 2 +- debian/lenny/applications/koffice/debian/rules | 2 +- .../applications/konversation/debian/cdbs/kde.mk | 2 +- .../lenny/applications/konversation/debian/rules | 4 +- .../applications/kopete-otr/debian/cdbs/kde.mk | 2 +- debian/lenny/applications/kopete-otr/debian/rules | 4 +- debian/lenny/applications/kpicosim/debian/rules | 4 +- .../lenny/applications/kpilot/debian/cdbs/kde.mk | 2 +- debian/lenny/applications/kpilot/debian/rules | 4 +- .../applications/kpowersave/debian/cdbs/kde.mk | 2 +- debian/lenny/applications/kpowersave/debian/rules | 4 +- debian/lenny/applications/kradio/debian/rules | 2 +- debian/lenny/applications/krename/debian/rules | 4 +- .../lenny/applications/krusader/debian/cdbs/kde.mk | 2 +- debian/lenny/applications/krusader/debian/rules | 4 +- .../ksplash-engine-moodin/debian/debiandirs | 2 +- .../ksplash-engine-moodin/debian/rules | 4 +- debian/lenny/applications/ksquirrel/debian/rules | 2 +- .../lenny/applications/kstreamripper/debian/rules | 4 +- .../applications/ksystemlog/debian/cdbs/kde.mk | 2 +- debian/lenny/applications/ksystemlog/debian/rules | 4 +- .../lenny/applications/ktechlab/debian/debiandirs | 2 +- debian/lenny/applications/ktechlab/debian/rules | 10 +- .../lenny/applications/ktorrent/debian/cdbs/kde.mk | 2 +- debian/lenny/applications/ktorrent/debian/rules | 4 +- .../applications/kuickshow/debian/cdbs/kde.mk | 2 +- debian/lenny/applications/kuickshow/debian/rules | 4 +- debian/lenny/applications/kvirc/debian/rules | 2 +- debian/lenny/applications/kvkbd/debian/cdbs/kde.mk | 2 +- debian/lenny/applications/kvkbd/debian/rules | 4 +- debian/lenny/applications/kvpnc/debian/rules | 4 +- debian/lenny/applications/piklab/debian/rules | 4 +- debian/lenny/applications/potracegui/debian/rules | 2 +- debian/lenny/applications/smb4k/debian/cdbs/kde.mk | 2 +- debian/lenny/applications/smb4k/debian/rules | 2 +- .../applications/soundkonverter/debian/cdbs/kde.mk | 2 +- .../lenny/applications/soundkonverter/debian/rules | 4 +- .../lenny/applications/tde-guidance/debian/rules | 2 +- .../applications/tde-style-lipstik/debian/rules | 4 +- .../tde-systemsettings/debian/cdbs/kde.mk | 2 +- .../applications/tde-systemsettings/debian/rules | 2 +- .../lenny/applications/tdesudo/debian/cdbs/kde.mk | 2 +- debian/lenny/applications/tdesudo/debian/rules | 4 +- .../lenny/applications/tdmtheme/debian/cdbs/kde.mk | 2 +- debian/lenny/applications/tdmtheme/debian/rules | 4 +- debian/lenny/applications/tellico/debian/rules | 2 +- .../twin-style-crystal/debian/cdbs/kde.mk | 2 +- .../applications/twin-style-crystal/debian/rules | 2 +- .../lenny/applications/yakuake/debian/cdbs/kde.mk | 2 +- debian/lenny/applications/yakuake/debian/rules | 2 +- debian/lenny/dependencies/arts/debian/rules | 2 +- .../libraries/kipi-plugins/debian/cdbs/kde.mk | 2 +- debian/lenny/libraries/kipi-plugins/debian/rules | 4 +- .../lenny/libraries/libkdcraw/debian/cdbs/kde.mk | 2 +- debian/lenny/libraries/libkdcraw/debian/rules | 2 +- .../lenny/libraries/libkexiv2/debian/cdbs/kde.mk | 2 +- debian/lenny/libraries/libkexiv2/debian/rules | 2 +- debian/lenny/libraries/libkipi/debian/cdbs/kde.mk | 2 +- debian/lenny/libraries/libkipi/debian/rules | 2 +- debian/lenny/libraries/libksquirrel/debian/rules | 2 +- debian/lenny/libraries/mlt++/debian/rules | 2 +- debian/lenny/libraries/mlt/debian/rules | 10 +- .../debian/libpythonize0-trinity-dev.install | 2 +- .../lenny/libraries/pytdeextensions/debian/rules | 8 +- debian/lenny/tde-i18n/debian/debiandirs | 2 +- debian/lenny/tde-i18n/debian/rules | 2 +- debian/lenny/tdeaccessibility/debian/cdbs/kde.mk | 2 +- .../tdeaccessibility/debian/ksayit-trinity.install | 2 +- .../debian/patches/common/kubuntu_01_kdepot.diff | 6 +- debian/lenny/tdeaccessibility/debian/rules | 2 +- debian/lenny/tdeaddons/debian/cdbs/kde.mk | 2 +- .../debian/patches/common/kubuntu_01_kdepot.diff | 6 +- debian/lenny/tdeaddons/debian/rules | 2 +- debian/lenny/tdeadmin/debian/cdbs/kde.mk | 2 +- .../debian/patches/common/kubuntu_01_kdepot.diff | 6 +- debian/lenny/tdeadmin/debian/rules | 2 +- debian/lenny/tdeartwork/debian/cdbs/kde.mk | 2 +- debian/lenny/tdeartwork/debian/rules | 2 +- debian/lenny/tdebindings/debian/cdbs/kde.mk | 2 +- .../debian/libkjsembed-trinity-dev.install | 2 +- .../debian/libsmokeqt-trinity-dev.install | 2 +- .../debian/patches/common/kubuntu_01_kdepot.diff | 6 +- debian/lenny/tdebindings/debian/rules | 2 +- debian/lenny/tdeedu/debian/cdbs/kde.mk | 2 +- debian/lenny/tdeedu/debian/kstars-trinity.install | 4 +- .../tdeedu/debian/libkiten-dev-trinity.install | 2 +- .../tdeedu/debian/libtdeedu-dev-trinity.install | 2 +- .../debian/patches/common/kubuntu_01_kdepot.diff | 6 +- debian/lenny/tdeedu/debian/rules | 4 +- .../tdegames/debian/atlantik-trinity-dev.install | 4 +- debian/lenny/tdegames/debian/cdbs/kde.mk | 2 +- .../lenny/tdegames/debian/kolf-trinity-dev.install | 2 +- .../debian/libtdegames-trinity-dev.install | 4 +- .../debian/patches/common/kubuntu_01_kdepot.diff | 6 +- debian/lenny/tdegames/debian/rules | 2 +- debian/lenny/tdegraphics/debian/cdbs/kde.mk | 2 +- .../tdegraphics/debian/libpoppler-tqt-dev.install | 6 +- .../debian/patches/common/kubuntu_01_kdepot.diff | 6 +- .../debian/tdegraphics-dev-trinity.install | 362 ++--- debian/lenny/tdelibs/debian/cdbs/kde.mk | 2 +- debian/lenny/tdelibs/debian/changelog | 2 +- debian/lenny/tdelibs/debian/rules | 2 +- .../tdelibs/debian/tdelibs4-trinity-dev.install | 18 +- debian/lenny/tdemultimedia/debian/cdbs/kde.mk | 2 +- .../debian/patches/common/kubuntu_01_kdepot.diff | 6 +- debian/lenny/tdemultimedia/debian/rules | 6 +- .../debian/tdemultimedia-trinity-dev.install | 268 ++-- debian/lenny/tdenetwork/debian/cdbs/kde.mk | 2 +- .../lenny/tdenetwork/debian/kopete-trinity.install | 8 +- .../debian/patches/common/kubuntu_01_kdepot.diff | 6 +- debian/lenny/tdenetwork/debian/rules | 2 +- .../debian/tdenetwork-trinity-dev.install | 128 +- debian/lenny/tdepim/debian/changelog | 2 +- .../tdepim/debian/libindex0-trinity-dev.install | 2 +- .../tdepim/debian/libkcal2-trinity-dev.install | 4 +- .../tdepim/debian/libkgantt0-trinity-dev.install | 2 +- .../debian/libkleopatra1-trinity-dev.install | 6 +- .../debian/libkpimexchange1-trinity-dev.install | 4 +- .../tdepim/debian/libksieve0-trinity-dev.install | 2 +- .../tdepim/debian/libktnef1-trinity-dev.install | 2 +- .../tdepim/debian/libmimelib1-trinity-dev.install | 2 +- .../tdepim/debian/libtdepim1-trinity-dev.install | 2 +- .../lenny/tdepim/debian/tdepim-trinity-dev.install | 26 +- debian/lenny/tdesdk/debian/cdbs/kde.mk | 2 +- debian/lenny/tdesdk/debian/changelog | 2 +- .../lenny/tdesdk/debian/kbabel-trinity-dev.install | 42 +- debian/lenny/tdesdk/debian/kmtrace-trinity.install | 2 +- debian/lenny/tdesdk/debian/kspy-trinity.install | 2 +- .../lenny/tdesdk/debian/kunittest-trinity.install | 2 +- .../debian/libcvsservice-trinity-dev.install | 6 +- .../debian/patches/common/kubuntu_01_kdepot.diff | 6 +- debian/lenny/tdesdk/debian/rules | 2 +- .../tdesdk/debian/tdesdk-misc-trinity.install | 2 +- debian/lenny/tdetoys/debian/amor-trinity.install | 2 +- debian/lenny/tdetoys/debian/cdbs/kde.mk | 2 +- debian/lenny/tdetoys/debian/changelog | 2 +- .../debian/patches/common/kubuntu_01_kdepot.diff | 6 +- debian/lenny/tdetoys/debian/rules | 4 +- debian/lenny/tdeutils/debian/cdbs/kde.mk | 2 +- .../debian/patches/common/kubuntu_01_kdepot.diff | 6 +- debian/lenny/tdeutils/debian/rules | 2 +- .../tdeutils/debian/tdeutils-trinity-dev.install | 30 +- debian/lenny/tdevelop/debian/cdbs/kde.mk | 2 +- .../debian/patches/common/kubuntu_01_kdepot.diff | 6 +- debian/lenny/tdevelop/debian/rules | 2 +- .../tdevelop/debian/tdevelop-trinity-dev.install | 2 +- debian/lenny/tdewebdev/debian/cdbs/kde.mk | 2 +- .../tdewebdev/debian/kommander-trinity-dev.install | 4 +- .../debian/patches/common/kubuntu_01_kdepot.diff | 6 +- debian/lenny/tdewebdev/debian/rules | 2 +- .../squeeze/applications/adept/debian/cdbs/kde.mk | 2 +- debian/squeeze/applications/adept/debian/rules | 2 +- .../squeeze/applications/amarok/debian/cdbs/kde.mk | 2 +- debian/squeeze/applications/amarok/debian/rules | 2 +- debian/squeeze/applications/basket/debian/rules | 2 +- .../applications/bibletime/debian/cdbs/kde.mk | 2 +- debian/squeeze/applications/bibletime/debian/rules | 2 +- .../debian/cdbs/kde.mk | 2 +- .../compizconfig-backend-kconfig/debian/rules | 4 +- .../applications/desktop-effects-tde/debian/rules | 2 +- .../applications/digikam/debian/cdbs/kde.mk | 2 +- .../digikam/debian/digikam-trinity.install | 2 +- debian/squeeze/applications/digikam/debian/rules | 2 +- .../applications/filelight-l10n/debian/cdbs/kde.mk | 2 +- .../applications/filelight-l10n/debian/rules | 4 +- .../applications/filelight/debian/cdbs/kde.mk | 2 +- debian/squeeze/applications/filelight/debian/rules | 2 +- .../applications/gtk-qt-engine/debian/cdbs/kde.mk | 2 +- .../applications/gtk-qt-engine/debian/rules | 4 +- .../applications/gwenview/debian/cdbs/kde.mk | 2 +- debian/squeeze/applications/gwenview/debian/rules | 2 +- debian/squeeze/applications/k3b/debian/cdbs/kde.mk | 2 +- debian/squeeze/applications/k3b/debian/rules | 4 +- debian/squeeze/applications/k3b/debian/trinity.mk | 2 +- .../squeeze/applications/k9copy/debian/cdbs/kde.mk | 2 +- debian/squeeze/applications/k9copy/debian/rules | 4 +- .../applications/kaffeine-mozilla/debian/rules | 2 +- .../applications/kaffeine/debian/cdbs/kde.mk | 2 +- .../kaffeine/debian/kaffeine-trinity.install | 2 +- debian/squeeze/applications/kaffeine/debian/rules | 2 +- .../applications/katapult/debian/cdbs/kde.mk | 2 +- debian/squeeze/applications/katapult/debian/rules | 2 +- .../applications/kbarcode/debian/cdbs/kde.mk | 2 +- debian/squeeze/applications/kbarcode/debian/rules | 2 +- debian/squeeze/applications/kbfx/debian/rules | 6 +- .../applications/kbookreader/debian/cdbs/kde.mk | 2 +- .../squeeze/applications/kbookreader/debian/rules | 4 +- .../applications/kchmviewer/debian/debiandirs | 2 +- .../squeeze/applications/kchmviewer/debian/rules | 4 +- .../applications/kcpuload/debian/cdbs/kde.mk | 2 +- debian/squeeze/applications/kcpuload/debian/rules | 4 +- .../kdbusnotification/debian/cdbs/kde.mk | 2 +- .../applications/kdbusnotification/debian/rules | 4 +- .../squeeze/applications/kdiff3/debian/cdbs/kde.mk | 2 +- debian/squeeze/applications/kdiff3/debian/rules | 4 +- .../applications/kdirstat/debian/cdbs/kde.mk | 2 +- debian/squeeze/applications/kdirstat/debian/rules | 4 +- debian/squeeze/applications/kdpkg/debian/rules | 2 +- .../squeeze/applications/keep/debian/cdbs/kde.mk | 2 +- .../keep/debian/patches/kubuntu_01_kdepot.diff | 4 +- debian/squeeze/applications/keep/debian/rules | 4 +- .../squeeze/applications/kerry/debian/cdbs/kde.mk | 2 +- debian/squeeze/applications/kerry/debian/rules | 2 +- .../squeeze/applications/kile/debian/cdbs/kde.mk | 2 +- debian/squeeze/applications/kile/debian/rules | 4 +- debian/squeeze/applications/kima/debian/rules | 2 +- .../applications/kio-apt/debian/cdbs/kde.mk | 2 +- debian/squeeze/applications/kio-apt/debian/rules | 4 +- .../kio-umountwrapper/debian/cdbs/kde.mk | 2 +- .../applications/kio-umountwrapper/debian/rules | 4 +- .../applications/kmplayer/debian/cdbs/kde.mk | 2 +- debian/squeeze/applications/kmplayer/debian/rules | 4 +- .../applications/kmyfirewall/debian/debiandirs | 2 +- .../squeeze/applications/kmyfirewall/debian/rules | 8 +- .../applications/kmymoney/debian/cdbs/kde.mk | 2 +- .../kmymoney/debian/kmymoney2-trinity-dev.install | 2 +- debian/squeeze/applications/kmymoney/debian/rules | 4 +- .../squeeze/applications/knemo/debian/cdbs/kde.mk | 2 +- debian/squeeze/applications/knemo/debian/rules | 4 +- debian/squeeze/applications/knetload/debian/rules | 4 +- .../applications/knetstats/debian/cdbs/kde.mk | 2 +- debian/squeeze/applications/knetstats/debian/rules | 2 +- .../knetworkmanager8/debian/cdbs/kde.mk | 2 +- .../applications/knetworkmanager8/debian/rules | 2 +- .../squeeze/applications/knights/debian/debiandirs | 2 +- debian/squeeze/applications/knights/debian/rules | 4 +- debian/squeeze/applications/knowit/debian/rules | 2 +- .../squeeze/applications/knutclient/debian/rules | 2 +- .../applications/koffice/debian/cdbs/kde.mk | 2 +- .../koffice/debian/koffice-dev-trinity.install | 2 +- debian/squeeze/applications/koffice/debian/rules | 2 +- .../applications/konversation/debian/cdbs/kde.mk | 2 +- .../squeeze/applications/konversation/debian/rules | 4 +- .../applications/kopete-otr/debian/cdbs/kde.mk | 2 +- .../squeeze/applications/kopete-otr/debian/rules | 4 +- debian/squeeze/applications/kpicosim/debian/rules | 4 +- .../squeeze/applications/kpilot/debian/cdbs/kde.mk | 2 +- debian/squeeze/applications/kpilot/debian/rules | 4 +- .../applications/kpowersave/debian/cdbs/kde.mk | 2 +- .../squeeze/applications/kpowersave/debian/rules | 4 +- debian/squeeze/applications/kradio/debian/rules | 2 +- debian/squeeze/applications/krename/debian/rules | 4 +- .../applications/krusader/debian/cdbs/kde.mk | 2 +- debian/squeeze/applications/krusader/debian/rules | 4 +- .../ksplash-engine-moodin/debian/debiandirs | 2 +- .../ksplash-engine-moodin/debian/rules | 4 +- debian/squeeze/applications/ksquirrel/debian/rules | 2 +- .../applications/kstreamripper/debian/rules | 4 +- .../applications/ksystemlog/debian/cdbs/kde.mk | 2 +- .../squeeze/applications/ksystemlog/debian/rules | 4 +- .../applications/ktechlab/debian/debiandirs | 2 +- debian/squeeze/applications/ktechlab/debian/rules | 10 +- .../applications/ktorrent/debian/cdbs/kde.mk | 2 +- debian/squeeze/applications/ktorrent/debian/rules | 4 +- .../applications/kuickshow/debian/cdbs/kde.mk | 2 +- debian/squeeze/applications/kuickshow/debian/rules | 4 +- debian/squeeze/applications/kvirc/debian/rules | 2 +- .../squeeze/applications/kvkbd/debian/cdbs/kde.mk | 2 +- debian/squeeze/applications/kvkbd/debian/rules | 4 +- debian/squeeze/applications/kvpnc/debian/rules | 4 +- debian/squeeze/applications/piklab/debian/rules | 4 +- .../squeeze/applications/potracegui/debian/rules | 2 +- .../squeeze/applications/smb4k/debian/cdbs/kde.mk | 2 +- debian/squeeze/applications/smb4k/debian/rules | 2 +- .../applications/soundkonverter/debian/cdbs/kde.mk | 2 +- .../applications/soundkonverter/debian/rules | 4 +- .../squeeze/applications/tde-guidance/debian/rules | 2 +- .../applications/tde-style-lipstik/debian/rules | 4 +- .../tde-systemsettings/debian/cdbs/kde.mk | 2 +- .../applications/tde-systemsettings/debian/rules | 2 +- .../applications/tdesudo/debian/cdbs/kde.mk | 2 +- debian/squeeze/applications/tdesudo/debian/rules | 4 +- .../applications/tdmtheme/debian/cdbs/kde.mk | 2 +- debian/squeeze/applications/tdmtheme/debian/rules | 4 +- debian/squeeze/applications/tellico/debian/rules | 2 +- .../twin-style-crystal/debian/cdbs/kde.mk | 2 +- .../applications/twin-style-crystal/debian/rules | 2 +- .../applications/yakuake/debian/cdbs/kde.mk | 2 +- debian/squeeze/applications/yakuake/debian/rules | 2 +- debian/squeeze/dependencies/arts/debian/rules | 2 +- .../libraries/kipi-plugins/debian/cdbs/kde.mk | 2 +- debian/squeeze/libraries/kipi-plugins/debian/rules | 4 +- .../squeeze/libraries/libkdcraw/debian/cdbs/kde.mk | 2 +- debian/squeeze/libraries/libkdcraw/debian/rules | 2 +- .../squeeze/libraries/libkexiv2/debian/cdbs/kde.mk | 2 +- debian/squeeze/libraries/libkexiv2/debian/rules | 2 +- .../squeeze/libraries/libkipi/debian/cdbs/kde.mk | 2 +- debian/squeeze/libraries/libkipi/debian/rules | 2 +- debian/squeeze/libraries/libksquirrel/debian/rules | 2 +- debian/squeeze/libraries/mlt++/debian/rules | 2 +- debian/squeeze/libraries/mlt/debian/rules | 10 +- .../debian/libpythonize0-trinity-dev.install | 2 +- .../squeeze/libraries/pytdeextensions/debian/rules | 8 +- debian/squeeze/tde-i18n/debian/debiandirs | 2 +- debian/squeeze/tde-i18n/debian/rules | 2 +- debian/squeeze/tdeaccessibility/debian/cdbs/kde.mk | 2 +- .../tdeaccessibility/debian/ksayit-trinity.install | 2 +- .../debian/patches/common/kubuntu_01_kdepot.diff | 6 +- debian/squeeze/tdeaccessibility/debian/rules | 2 +- debian/squeeze/tdeaddons/debian/cdbs/kde.mk | 2 +- .../debian/patches/common/kubuntu_01_kdepot.diff | 6 +- debian/squeeze/tdeaddons/debian/rules | 2 +- debian/squeeze/tdeadmin/debian/cdbs/kde.mk | 2 +- .../debian/patches/common/kubuntu_01_kdepot.diff | 6 +- debian/squeeze/tdeadmin/debian/rules | 2 +- debian/squeeze/tdeartwork/debian/cdbs/kde.mk | 2 +- debian/squeeze/tdeartwork/debian/rules | 2 +- debian/squeeze/tdebindings/debian/cdbs/kde.mk | 2 +- .../debian/libkjsembed-trinity-dev.install | 2 +- .../debian/libsmokeqt-trinity-dev.install | 2 +- .../debian/patches/common/kubuntu_01_kdepot.diff | 6 +- debian/squeeze/tdebindings/debian/rules | 2 +- debian/squeeze/tdeedu/debian/cdbs/kde.mk | 2 +- .../squeeze/tdeedu/debian/kstars-trinity.install | 4 +- .../tdeedu/debian/libkiten-dev-trinity.install | 2 +- .../tdeedu/debian/libtdeedu-dev-trinity.install | 2 +- .../debian/patches/common/kubuntu_01_kdepot.diff | 6 +- debian/squeeze/tdeedu/debian/rules | 4 +- .../tdegames/debian/atlantik-trinity-dev.install | 4 +- debian/squeeze/tdegames/debian/cdbs/kde.mk | 2 +- .../tdegames/debian/kolf-trinity-dev.install | 2 +- .../debian/libtdegames-trinity-dev.install | 4 +- .../debian/patches/common/kubuntu_01_kdepot.diff | 6 +- debian/squeeze/tdegames/debian/rules | 2 +- debian/squeeze/tdegraphics/debian/cdbs/kde.mk | 2 +- .../tdegraphics/debian/libpoppler-tqt-dev.install | 6 +- .../debian/patches/common/kubuntu_01_kdepot.diff | 6 +- .../debian/tdegraphics-dev-trinity.install | 362 ++--- debian/squeeze/tdelibs/debian/cdbs/kde.mk | 2 +- debian/squeeze/tdelibs/debian/changelog | 2 +- debian/squeeze/tdelibs/debian/rules | 2 +- .../tdelibs/debian/tdelibs4-trinity-dev.install | 18 +- debian/squeeze/tdemultimedia/debian/cdbs/kde.mk | 2 +- .../debian/patches/common/kubuntu_01_kdepot.diff | 6 +- debian/squeeze/tdemultimedia/debian/rules | 6 +- .../debian/tdemultimedia-trinity-dev.install | 268 ++-- debian/squeeze/tdenetwork/debian/cdbs/kde.mk | 2 +- .../tdenetwork/debian/kopete-trinity.install | 8 +- .../debian/patches/common/kubuntu_01_kdepot.diff | 6 +- debian/squeeze/tdenetwork/debian/rules | 2 +- .../debian/tdenetwork-trinity-dev.install | 128 +- debian/squeeze/tdepim/debian/changelog | 2 +- .../tdepim/debian/libindex0-trinity-dev.install | 2 +- .../tdepim/debian/libkcal2-trinity-dev.install | 4 +- .../tdepim/debian/libkgantt0-trinity-dev.install | 2 +- .../debian/libkleopatra1-trinity-dev.install | 6 +- .../debian/libkpimexchange1-trinity-dev.install | 4 +- .../tdepim/debian/libksieve0-trinity-dev.install | 2 +- .../tdepim/debian/libktnef1-trinity-dev.install | 2 +- .../tdepim/debian/libmimelib1-trinity-dev.install | 2 +- .../tdepim/debian/libtdepim1-trinity-dev.install | 2 +- .../tdepim/debian/tdepim-trinity-dev.install | 26 +- debian/squeeze/tdesdk/debian/cdbs/kde.mk | 2 +- debian/squeeze/tdesdk/debian/changelog | 2 +- .../tdesdk/debian/kbabel-trinity-dev.install | 42 +- .../squeeze/tdesdk/debian/kmtrace-trinity.install | 2 +- debian/squeeze/tdesdk/debian/kspy-trinity.install | 2 +- .../tdesdk/debian/kunittest-trinity.install | 2 +- .../debian/libcvsservice-trinity-dev.install | 6 +- .../debian/patches/common/kubuntu_01_kdepot.diff | 6 +- debian/squeeze/tdesdk/debian/rules | 2 +- .../tdesdk/debian/tdesdk-misc-trinity.install | 2 +- debian/squeeze/tdetoys/debian/amor-trinity.install | 2 +- debian/squeeze/tdetoys/debian/cdbs/kde.mk | 2 +- debian/squeeze/tdetoys/debian/changelog | 2 +- .../debian/patches/common/kubuntu_01_kdepot.diff | 6 +- debian/squeeze/tdetoys/debian/rules | 4 +- debian/squeeze/tdeutils/debian/cdbs/kde.mk | 2 +- .../debian/patches/common/kubuntu_01_kdepot.diff | 6 +- debian/squeeze/tdeutils/debian/rules | 2 +- .../tdeutils/debian/tdeutils-trinity-dev.install | 30 +- debian/squeeze/tdevelop/debian/cdbs/kde.mk | 2 +- .../debian/patches/common/kubuntu_01_kdepot.diff | 6 +- debian/squeeze/tdevelop/debian/rules | 2 +- .../tdevelop/debian/tdevelop-trinity-dev.install | 2 +- debian/squeeze/tdewebdev/debian/cdbs/kde.mk | 2 +- .../tdewebdev/debian/kommander-trinity-dev.install | 4 +- .../debian/patches/common/kubuntu_01_kdepot.diff | 6 +- debian/squeeze/tdewebdev/debian/rules | 2 +- .../applications/abakus/debian/rules | 10 +- .../applications/adept/debian/cdbs/kde.mk | 2 +- .../lucid_automake/applications/adept/debian/rules | 2 +- .../applications/amarok/debian/cdbs/kde.mk | 2 +- .../applications/amarok/debian/rules | 2 +- .../applications/basket/debian/rules | 2 +- .../applications/bibletime/debian/cdbs/kde.mk | 2 +- .../applications/bibletime/debian/rules | 2 +- .../debian/cdbs/kde.mk | 2 +- .../compizconfig-backend-kconfig/debian/rules | 4 +- .../applications/desktop-effects-kde/debian/rules | 2 +- .../applications/digikam/debian/cdbs/kde.mk | 2 +- .../digikam/debian/digikam-kde3.install | 2 +- .../applications/digikam/debian/rules | 2 +- .../applications/dolphin/debian/cdbs/kde.mk | 2 +- .../applications/dolphin/debian/rules | 2 +- .../applications/filelight-l10n/debian/cdbs/kde.mk | 2 +- .../applications/filelight-l10n/debian/rules | 4 +- .../applications/filelight/debian/cdbs/kde.mk | 2 +- .../applications/filelight/debian/rules | 2 +- .../applications/gtk-qt-engine/debian/rules | 8 +- .../applications/gwenview/debian/cdbs/kde.mk | 2 +- .../applications/gwenview/debian/rules | 2 +- .../applications/k3b/debian/cdbs/kde.mk | 2 +- .../lucid_automake/applications/k3b/debian/kde3.mk | 2 +- .../lucid_automake/applications/k3b/debian/rules | 4 +- .../applications/k9copy/debian/cdbs/kde.mk | 2 +- .../applications/k9copy/debian/rules | 4 +- .../applications/kaffeine-mozilla/debian/rules | 2 +- .../applications/kaffeine/debian/cdbs/kde.mk | 2 +- .../kaffeine/debian/kaffeine-kde3.install | 2 +- .../applications/kaffeine/debian/rules | 2 +- .../applications/katapult/debian/cdbs/kde.mk | 2 +- .../applications/katapult/debian/rules | 2 +- .../applications/kbarcode/debian/cdbs/kde.mk | 2 +- .../applications/kbarcode/debian/rules | 2 +- .../lucid_automake/applications/kbfx/debian/rules | 6 +- .../applications/kbookreader/debian/cdbs/kde.mk | 2 +- .../applications/kbookreader/debian/rules | 4 +- .../applications/kchmviewer/debian/debiandirs | 2 +- .../applications/kchmviewer/debian/rules | 4 +- .../applications/kcpuload/debian/cdbs/kde.mk | 2 +- .../applications/kcpuload/debian/rules | 4 +- .../applications/kde-guidance/debian/rules | 2 +- .../applications/kde-style-lipstik/debian/rules | 4 +- .../applications/kde-style-qtcurve/debian/rules | 8 +- .../kde-systemsettings/debian/cdbs/kde.mk | 2 +- .../applications/kde-systemsettings/debian/rules | 2 +- .../applications/kdesudo/debian/cdbs/kde.mk | 2 +- .../applications/kdesudo/debian/rules | 4 +- .../kdesvn/debian/libsvnqt-kde3-dev.install | 2 +- .../applications/kdesvn/debian/rules | 8 +- .../applications/kdiff3/debian/cdbs/kde.mk | 2 +- .../applications/kdiff3/debian/rules | 4 +- .../applications/kdirstat/debian/cdbs/kde.mk | 2 +- .../applications/kdirstat/debian/rules | 4 +- .../lucid_automake/applications/kdpkg/debian/rules | 2 +- .../applications/keep/debian/cdbs/kde.mk | 2 +- .../keep/debian/patches/kubuntu_01_kdepot.diff | 4 +- .../lucid_automake/applications/keep/debian/rules | 4 +- .../applications/kerry/debian/cdbs/kde.mk | 2 +- .../lucid_automake/applications/kerry/debian/rules | 2 +- .../applications/kgtk-qt3/debian/cdbs/kde.mk | 2 +- .../applications/kgtk-qt3/debian/rules | 8 +- .../applications/kile/debian/cdbs/kde.mk | 2 +- .../lucid_automake/applications/kile/debian/rules | 4 +- .../lucid_automake/applications/kima/debian/rules | 2 +- .../applications/kio-apt/debian/cdbs/kde.mk | 2 +- .../applications/kio-apt/debian/rules | 4 +- .../applications/kio-locate/debian/rules | 2 +- .../kio-umountwrapper/debian/cdbs/kde.mk | 2 +- .../applications/kio-umountwrapper/debian/rules | 4 +- .../applications/kmplayer/debian/cdbs/kde.mk | 2 +- .../applications/kmplayer/debian/rules | 4 +- .../applications/kmyfirewall/debian/debiandirs | 2 +- .../applications/kmyfirewall/debian/rules | 8 +- .../applications/kmymoney/debian/cdbs/kde.mk | 2 +- .../kmymoney/debian/kmymoney2-trinity-dev.install | 2 +- .../applications/kmymoney/debian/rules | 4 +- .../applications/knemo/debian/cdbs/kde.mk | 2 +- .../lucid_automake/applications/knemo/debian/rules | 4 +- .../applications/knetload/debian/rules | 4 +- .../applications/knetstats/debian/cdbs/kde.mk | 2 +- .../applications/knetstats/debian/rules | 2 +- .../knetworkmanager/debian/cdbs/kde.mk | 2 +- .../applications/knetworkmanager/debian/rules | 2 +- .../applications/knights/debian/debiandirs | 2 +- .../applications/knights/debian/rules | 4 +- .../applications/knowit/debian/rules | 2 +- .../applications/knutclient/debian/rules | 2 +- .../applications/koffice/debian/cdbs/kde.mk | 2 +- .../koffice/debian/koffice-dev-kde3.install | 2 +- .../applications/koffice/debian/rules | 2 +- .../applications/konversation/debian/cdbs/kde.mk | 2 +- .../applications/konversation/debian/rules | 4 +- .../applications/kopete-otr/debian/cdbs/kde.mk | 2 +- .../applications/kopete-otr/debian/rules | 4 +- .../applications/kpicosim/debian/rules | 4 +- .../applications/kpilot/debian/cdbs/kde.mk | 2 +- .../applications/kpilot/debian/rules | 4 +- .../applications/kpowersave/debian/cdbs/kde.mk | 2 +- .../applications/kpowersave/debian/rules | 4 +- .../applications/kradio/debian/rules | 2 +- .../applications/krename/debian/rules | 4 +- .../applications/krusader/debian/cdbs/kde.mk | 2 +- .../applications/krusader/debian/rules | 4 +- .../ksplash-engine-moodin/debian/debiandirs | 2 +- .../ksplash-engine-moodin/debian/rules | 4 +- .../applications/ksquirrel/debian/rules | 2 +- .../applications/kstreamripper/debian/rules | 4 +- .../applications/ksystemlog/debian/cdbs/kde.mk | 2 +- .../applications/ksystemlog/debian/rules | 4 +- .../applications/ktechlab/debian/debiandirs | 2 +- .../applications/ktechlab/debian/rules | 10 +- .../applications/ktorrent/debian/cdbs/kde.mk | 2 +- .../applications/ktorrent/debian/rules | 4 +- .../applications/kuickshow/debian/cdbs/kde.mk | 2 +- .../applications/kuickshow/debian/rules | 4 +- .../lucid_automake/applications/kvirc/debian/rules | 2 +- .../applications/kvkbd/debian/cdbs/kde.mk | 2 +- .../lucid_automake/applications/kvkbd/debian/rules | 4 +- .../kwin-style-crystal/debian/cdbs/kde.mk | 2 +- .../applications/kwin-style-crystal/debian/rules | 2 +- .../applications/piklab/debian/rules | 4 +- .../applications/potracegui/debian/rules | 2 +- .../applications/rosegarden/debian/rules | 8 +- .../applications/smb4k/debian/cdbs/kde.mk | 2 +- .../lucid_automake/applications/smb4k/debian/rules | 2 +- .../applications/soundkonverter/debian/cdbs/kde.mk | 2 +- .../applications/soundkonverter/debian/rules | 4 +- .../applications/tdmtheme/debian/cdbs/kde.mk | 2 +- .../applications/tdmtheme/debian/rules | 4 +- .../applications/tellico/debian/rules | 2 +- .../applications/wlassistant/debian/rules | 4 +- .../applications/yakuake/debian/cdbs/kde.mk | 2 +- .../applications/yakuake/debian/rules | 2 +- .../arts/debian/libarts1-kde3-dev.install | 162 +-- .../arts/debian/libartsc0-kde3-dev.install | 4 +- .../lucid_automake/dependencies/arts/debian/rules | 4 +- .../dependencies/tqtinterface/debian/rules | 4 +- ubuntu/lucid_automake/kde-i18n/debian/debiandirs | 2 +- ubuntu/lucid_automake/kde-i18n/debian/rules | 2 +- .../kdeaccessibility/debian/cdbs/kde.mk | 2 +- .../kdeaccessibility/debian/ksayit-kde3.install | 2 +- .../debian/patches/common/kubuntu_01_kdepot.diff | 6 +- .../lucid_automake/kdeaccessibility/debian/rules | 2 +- ubuntu/lucid_automake/kdeaddons/debian/cdbs/kde.mk | 2 +- .../debian/patches/common/kubuntu_01_kdepot.diff | 6 +- ubuntu/lucid_automake/kdeaddons/debian/rules | 2 +- ubuntu/lucid_automake/kdeadmin/debian/cdbs/kde.mk | 2 +- .../debian/patches/common/kubuntu_01_kdepot.diff | 6 +- ubuntu/lucid_automake/kdeadmin/debian/rules | 2 +- .../lucid_automake/kdeartwork/debian/cdbs/kde.mk | 2 +- .../debian/patches/common/kubuntu_01_kdepot.diff | 6 +- ubuntu/lucid_automake/kdeartwork/debian/rules | 2 +- ubuntu/lucid_automake/kdebase/debian/cdbs/kde.mk | 2 +- .../kdebase/debian/kdebase-kde3-dev.install | 78 +- .../kdebase/debian/libkonq4-kde3-dev.install | 42 +- ubuntu/lucid_automake/kdebase/debian/rules | 2 +- .../lucid_automake/kdebindings/debian/cdbs/kde.mk | 2 +- .../debian/libkjsembed-kde3-dev.install | 2 +- .../kdebindings/debian/libsmokeqt-kde3-dev.install | 2 +- .../debian/patches/common/kubuntu_01_kdepot.diff | 6 +- ubuntu/lucid_automake/kdebindings/debian/rules | 2 +- ubuntu/lucid_automake/kdeedu/debian/cdbs/kde.mk | 2 +- .../kdeedu/debian/kstars-kde3.install | 4 +- .../kdeedu/debian/libkdeedu-dev-kde3.install | 2 +- .../kdeedu/debian/libkiten-dev-kde3.install | 2 +- .../debian/patches/common/kubuntu_01_kdepot.diff | 6 +- ubuntu/lucid_automake/kdeedu/debian/rules | 4 +- .../kdegames/debian/atlantik-kde3-dev.install | 4 +- ubuntu/lucid_automake/kdegames/debian/cdbs/kde.mk | 2 +- .../kdegames/debian/kolf-kde3-dev.install | 2 +- .../kdegames/debian/libkdegames-kde3-dev.install | 4 +- .../debian/patches/common/kubuntu_01_kdepot.diff | 6 +- ubuntu/lucid_automake/kdegames/debian/rules | 2 +- .../lucid_automake/kdegraphics/debian/cdbs/kde.mk | 2 +- .../debian/kdegraphics-dev-kde3.install | 362 ++--- .../debian/patches/common/kubuntu_01_kdepot.diff | 6 +- ubuntu/lucid_automake/kdegraphics/debian/rules | 4 +- ubuntu/lucid_automake/kdelibs/debian/cdbs/kde.mk | 2 +- ubuntu/lucid_automake/kdelibs/debian/changelog | 6 +- .../kdelibs/debian/kdelibs4-kde3-dev.install | 1414 ++++++++++---------- ubuntu/lucid_automake/kdelibs/debian/rules | 4 +- .../kdemultimedia/debian/cdbs/kde.mk | 2 +- .../debian/kdemultimedia-kde3-dev.install | 268 ++-- .../debian/patches/common/kubuntu_01_kdepot.diff | 6 +- ubuntu/lucid_automake/kdemultimedia/debian/rules | 6 +- .../lucid_automake/kdenetwork/debian/cdbs/kde.mk | 2 +- .../kdenetwork/debian/kdenetwork-kde3-dev.install | 128 +- .../kdenetwork/debian/kopete-kde3.install | 8 +- .../debian/patches/common/kubuntu_01_kdepot.diff | 6 +- ubuntu/lucid_automake/kdenetwork/debian/rules | 2 +- ubuntu/lucid_automake/kdepim/debian/cdbs/kde.mk | 2 +- ubuntu/lucid_automake/kdepim/debian/changelog | 2 +- .../kdepim/debian/kdepim-kde3-dev.install | 28 +- .../kdepim/debian/libindex0-kde3-dev.install | 2 +- .../kdepim/debian/libkcal2-kde3-dev.install | 4 +- .../kdepim/debian/libkdepim1-kde3-dev.install | 2 +- .../kdepim/debian/libkgantt0-kde3-dev.install | 2 +- .../kdepim/debian/libkleopatra1-kde3-dev.install | 6 +- .../debian/libkpimexchange1-kde3-dev.install | 4 +- .../kdepim/debian/libksieve0-kde3-dev.install | 2 +- .../kdepim/debian/libktnef1-kde3-dev.install | 2 +- .../kdepim/debian/libmimelib1-kde3-dev.install | 2 +- .../debian/patches/common/kubuntu_01_kdepot.diff | 6 +- ubuntu/lucid_automake/kdepim/debian/rules | 2 +- ubuntu/lucid_automake/kdesdk/debian/cdbs/kde.mk | 2 +- ubuntu/lucid_automake/kdesdk/debian/changelog | 2 +- .../kdesdk/debian/kbabel-kde3-dev.install | 42 +- .../kdesdk/debian/kdesdk-misc-kde3.install | 2 +- .../kdesdk/debian/kmtrace-kde3.install | 2 +- .../lucid_automake/kdesdk/debian/kspy-kde3.install | 2 +- .../kdesdk/debian/kunittest-kde3.install | 2 +- .../kdesdk/debian/libcvsservice-kde3-dev.install | 6 +- .../debian/patches/common/kubuntu_01_kdepot.diff | 6 +- ubuntu/lucid_automake/kdesdk/debian/rules | 2 +- .../kdetoys/debian/amor-kde3.install | 2 +- ubuntu/lucid_automake/kdetoys/debian/cdbs/kde.mk | 2 +- ubuntu/lucid_automake/kdetoys/debian/changelog | 2 +- .../debian/patches/common/kubuntu_01_kdepot.diff | 6 +- ubuntu/lucid_automake/kdetoys/debian/rules | 4 +- ubuntu/lucid_automake/kdeutils/debian/cdbs/kde.mk | 2 +- .../kdeutils/debian/kdeutils-kde3-dev.install | 30 +- .../debian/patches/common/kubuntu_01_kdepot.diff | 6 +- ubuntu/lucid_automake/kdeutils/debian/rules | 2 +- ubuntu/lucid_automake/kdevelop/debian/cdbs/kde.mk | 2 +- .../kdevelop/debian/kdevelop-kde3-dev.install | 2 +- .../debian/patches/common/kubuntu_01_kdepot.diff | 6 +- ubuntu/lucid_automake/kdevelop/debian/rules | 2 +- ubuntu/lucid_automake/kdewebdev/debian/cdbs/kde.mk | 2 +- .../kdewebdev/debian/kommander-kde3-dev.install | 4 +- .../debian/patches/common/kubuntu_01_kdepot.diff | 6 +- ubuntu/lucid_automake/kdewebdev/debian/rules | 2 +- .../libraries/kipi-plugins/debian/cdbs/kde.mk | 2 +- .../libraries/kipi-plugins/debian/rules | 4 +- .../libraries/libkdcraw/debian/cdbs/kde.mk | 2 +- .../libraries/libkdcraw/debian/rules | 2 +- .../libraries/libkexiv2/debian/cdbs/kde.mk | 2 +- .../libraries/libkexiv2/debian/rules | 2 +- .../libraries/libkipi/debian/cdbs/kde.mk | 2 +- .../lucid_automake/libraries/libkipi/debian/rules | 2 +- .../libraries/libksquirrel/debian/rules | 2 +- ubuntu/lucid_automake/libraries/mlt++/debian/rules | 2 +- ubuntu/lucid_automake/libraries/mlt/debian/rules | 10 +- .../debian/libpythonize0-kde3-dev.install | 2 +- .../libraries/pytdeextensions/debian/rules | 8 +- .../libraries/python-kde3/debian/rules | 6 +- .../maverick/applications/adept/debian/cdbs/kde.mk | 2 +- ubuntu/maverick/applications/adept/debian/rules | 2 +- .../applications/amarok/debian/cdbs/kde.mk | 2 +- ubuntu/maverick/applications/amarok/debian/rules | 2 +- ubuntu/maverick/applications/basket/debian/rules | 2 +- .../applications/bibletime/debian/cdbs/kde.mk | 2 +- .../maverick/applications/bibletime/debian/rules | 2 +- .../debian/cdbs/kde.mk | 2 +- .../compizconfig-backend-kconfig/debian/rules | 4 +- .../applications/desktop-effects-tde/debian/rules | 2 +- .../applications/digikam/debian/cdbs/kde.mk | 2 +- .../digikam/debian/digikam-trinity.install | 2 +- ubuntu/maverick/applications/digikam/debian/rules | 2 +- .../applications/filelight-l10n/debian/cdbs/kde.mk | 2 +- .../applications/filelight-l10n/debian/rules | 4 +- .../applications/filelight/debian/cdbs/kde.mk | 2 +- .../maverick/applications/filelight/debian/rules | 2 +- .../applications/gtk-qt-engine/debian/cdbs/kde.mk | 2 +- .../applications/gtk-qt-engine/debian/rules | 4 +- .../applications/gwenview/debian/cdbs/kde.mk | 2 +- ubuntu/maverick/applications/gwenview/debian/rules | 2 +- .../maverick/applications/k3b/debian/cdbs/kde.mk | 2 +- ubuntu/maverick/applications/k3b/debian/rules | 4 +- ubuntu/maverick/applications/k3b/debian/trinity.mk | 2 +- .../applications/k9copy/debian/cdbs/kde.mk | 2 +- ubuntu/maverick/applications/k9copy/debian/rules | 4 +- .../applications/kaffeine-mozilla/debian/rules | 2 +- .../applications/kaffeine/debian/cdbs/kde.mk | 2 +- .../kaffeine/debian/kaffeine-trinity.install | 2 +- ubuntu/maverick/applications/kaffeine/debian/rules | 2 +- .../applications/katapult/debian/cdbs/kde.mk | 2 +- ubuntu/maverick/applications/katapult/debian/rules | 2 +- .../applications/kbarcode/debian/cdbs/kde.mk | 2 +- ubuntu/maverick/applications/kbarcode/debian/rules | 2 +- ubuntu/maverick/applications/kbfx/debian/rules | 6 +- .../applications/kbookreader/debian/cdbs/kde.mk | 2 +- .../maverick/applications/kbookreader/debian/rules | 4 +- .../applications/kchmviewer/debian/debiandirs | 2 +- .../maverick/applications/kchmviewer/debian/rules | 4 +- .../applications/kcpuload/debian/cdbs/kde.mk | 2 +- ubuntu/maverick/applications/kcpuload/debian/rules | 4 +- .../kdbusnotification/debian/cdbs/kde.mk | 2 +- .../applications/kdbusnotification/debian/rules | 4 +- .../applications/kdiff3/debian/cdbs/kde.mk | 2 +- ubuntu/maverick/applications/kdiff3/debian/rules | 4 +- .../applications/kdirstat/debian/cdbs/kde.mk | 2 +- ubuntu/maverick/applications/kdirstat/debian/rules | 4 +- ubuntu/maverick/applications/kdpkg/debian/rules | 2 +- .../maverick/applications/keep/debian/cdbs/kde.mk | 2 +- .../keep/debian/patches/kubuntu_01_kdepot.diff | 4 +- ubuntu/maverick/applications/keep/debian/rules | 4 +- .../maverick/applications/kerry/debian/cdbs/kde.mk | 2 +- ubuntu/maverick/applications/kerry/debian/rules | 2 +- .../maverick/applications/kile/debian/cdbs/kde.mk | 2 +- ubuntu/maverick/applications/kile/debian/rules | 4 +- ubuntu/maverick/applications/kima/debian/rules | 2 +- .../applications/kio-apt/debian/cdbs/kde.mk | 2 +- ubuntu/maverick/applications/kio-apt/debian/rules | 4 +- .../kio-umountwrapper/debian/cdbs/kde.mk | 2 +- .../applications/kio-umountwrapper/debian/rules | 4 +- .../applications/kmplayer/debian/cdbs/kde.mk | 2 +- ubuntu/maverick/applications/kmplayer/debian/rules | 4 +- .../applications/kmyfirewall/debian/debiandirs | 2 +- .../maverick/applications/kmyfirewall/debian/rules | 8 +- .../applications/kmymoney/debian/cdbs/kde.mk | 2 +- .../kmymoney/debian/kmymoney2-trinity-dev.install | 2 +- ubuntu/maverick/applications/kmymoney/debian/rules | 4 +- .../maverick/applications/knemo/debian/cdbs/kde.mk | 2 +- ubuntu/maverick/applications/knemo/debian/rules | 4 +- ubuntu/maverick/applications/knetload/debian/rules | 4 +- .../applications/knetstats/debian/cdbs/kde.mk | 2 +- .../maverick/applications/knetstats/debian/rules | 2 +- .../knetworkmanager8/debian/cdbs/kde.mk | 2 +- .../applications/knetworkmanager8/debian/rules | 2 +- .../applications/knights/debian/debiandirs | 2 +- ubuntu/maverick/applications/knights/debian/rules | 4 +- ubuntu/maverick/applications/knowit/debian/rules | 2 +- .../maverick/applications/knutclient/debian/rules | 2 +- .../applications/koffice/debian/cdbs/kde.mk | 2 +- .../koffice/debian/koffice-dev-trinity.install | 2 +- ubuntu/maverick/applications/koffice/debian/rules | 2 +- .../applications/konversation/debian/cdbs/kde.mk | 2 +- .../applications/konversation/debian/rules | 4 +- .../applications/kopete-otr/debian/cdbs/kde.mk | 2 +- .../maverick/applications/kopete-otr/debian/rules | 4 +- ubuntu/maverick/applications/kpicosim/debian/rules | 4 +- .../applications/kpilot/debian/cdbs/kde.mk | 2 +- ubuntu/maverick/applications/kpilot/debian/rules | 4 +- .../applications/kpowersave/debian/cdbs/kde.mk | 2 +- .../maverick/applications/kpowersave/debian/rules | 4 +- ubuntu/maverick/applications/kradio/debian/rules | 2 +- ubuntu/maverick/applications/krename/debian/rules | 4 +- .../applications/krusader/debian/cdbs/kde.mk | 2 +- ubuntu/maverick/applications/krusader/debian/rules | 4 +- .../ksplash-engine-moodin/debian/debiandirs | 2 +- .../ksplash-engine-moodin/debian/rules | 4 +- .../maverick/applications/ksquirrel/debian/rules | 2 +- .../applications/kstreamripper/debian/rules | 4 +- .../applications/ksystemlog/debian/cdbs/kde.mk | 2 +- .../maverick/applications/ksystemlog/debian/rules | 4 +- .../applications/ktechlab/debian/debiandirs | 2 +- ubuntu/maverick/applications/ktechlab/debian/rules | 10 +- .../applications/ktorrent/debian/cdbs/kde.mk | 2 +- ubuntu/maverick/applications/ktorrent/debian/rules | 4 +- .../applications/kuickshow/debian/cdbs/kde.mk | 2 +- .../maverick/applications/kuickshow/debian/rules | 4 +- ubuntu/maverick/applications/kvirc/debian/rules | 2 +- .../maverick/applications/kvkbd/debian/cdbs/kde.mk | 2 +- ubuntu/maverick/applications/kvkbd/debian/rules | 4 +- ubuntu/maverick/applications/kvpnc/debian/rules | 4 +- ubuntu/maverick/applications/piklab/debian/rules | 4 +- .../maverick/applications/potracegui/debian/rules | 2 +- .../maverick/applications/smb4k/debian/cdbs/kde.mk | 2 +- ubuntu/maverick/applications/smb4k/debian/rules | 2 +- .../applications/soundkonverter/debian/cdbs/kde.mk | 2 +- .../applications/soundkonverter/debian/rules | 4 +- .../applications/tde-guidance/debian/rules | 2 +- .../applications/tde-style-lipstik/debian/rules | 4 +- .../tde-systemsettings/debian/cdbs/kde.mk | 2 +- .../applications/tde-systemsettings/debian/rules | 2 +- .../applications/tdesudo/debian/cdbs/kde.mk | 2 +- ubuntu/maverick/applications/tdesudo/debian/rules | 4 +- .../applications/tdmtheme/debian/cdbs/kde.mk | 2 +- ubuntu/maverick/applications/tdmtheme/debian/rules | 4 +- ubuntu/maverick/applications/tellico/debian/rules | 2 +- .../twin-style-crystal/debian/cdbs/kde.mk | 2 +- .../applications/twin-style-crystal/debian/rules | 2 +- .../applications/yakuake/debian/cdbs/kde.mk | 2 +- ubuntu/maverick/applications/yakuake/debian/rules | 2 +- ubuntu/maverick/dependencies/arts/debian/rules | 2 +- .../kdegraphics.automake/debian/cdbs/kde.mk | 2 +- .../debian/kdegraphics-dev-trinity.install | 362 ++--- .../debian/libpoppler-tqt-dev.install | 6 +- .../debian/patches/common/kubuntu_01_kdepot.diff | 6 +- ubuntu/maverick/kdegraphics.automake/debian/rules | 4 +- ubuntu/maverick/kdevelop.cmake/debian/cdbs/kde.mk | 2 +- .../debian/kdevelop-trinity-dev.install | 2 +- .../libraries/kipi-plugins/debian/cdbs/kde.mk | 2 +- .../maverick/libraries/kipi-plugins/debian/rules | 4 +- .../libraries/libkdcraw/debian/cdbs/kde.mk | 2 +- ubuntu/maverick/libraries/libkdcraw/debian/rules | 2 +- .../libraries/libkexiv2/debian/cdbs/kde.mk | 2 +- ubuntu/maverick/libraries/libkexiv2/debian/rules | 2 +- .../maverick/libraries/libkipi/debian/cdbs/kde.mk | 2 +- ubuntu/maverick/libraries/libkipi/debian/rules | 2 +- .../maverick/libraries/libksquirrel/debian/rules | 2 +- ubuntu/maverick/libraries/mlt++/debian/rules | 2 +- ubuntu/maverick/libraries/mlt/debian/rules | 10 +- .../debian/libpythonize0-trinity-dev.install | 2 +- .../libraries/pytdeextensions/debian/rules | 8 +- ubuntu/maverick/tde-i18n/debian/debiandirs | 2 +- ubuntu/maverick/tde-i18n/debian/rules | 2 +- .../maverick/tdeaccessibility/debian/cdbs/kde.mk | 2 +- .../tdeaccessibility/debian/ksayit-trinity.install | 2 +- .../debian/patches/common/kubuntu_01_kdepot.diff | 6 +- ubuntu/maverick/tdeaccessibility/debian/rules | 2 +- ubuntu/maverick/tdeaddons/debian/cdbs/kde.mk | 2 +- .../debian/patches/common/kubuntu_01_kdepot.diff | 6 +- ubuntu/maverick/tdeaddons/debian/rules | 2 +- ubuntu/maverick/tdeadmin/debian/cdbs/kde.mk | 2 +- .../debian/patches/common/kubuntu_01_kdepot.diff | 6 +- ubuntu/maverick/tdeadmin/debian/rules | 2 +- ubuntu/maverick/tdeartwork/debian/cdbs/kde.mk | 2 +- ubuntu/maverick/tdeartwork/debian/rules | 2 +- ubuntu/maverick/tdebindings/debian/cdbs/kde.mk | 2 +- .../debian/libkjsembed-trinity-dev.install | 2 +- .../debian/libsmokeqt-trinity-dev.install | 2 +- .../debian/patches/common/kubuntu_01_kdepot.diff | 6 +- ubuntu/maverick/tdebindings/debian/rules | 2 +- ubuntu/maverick/tdeedu/debian/cdbs/kde.mk | 2 +- .../maverick/tdeedu/debian/kstars-trinity.install | 4 +- .../tdeedu/debian/libkiten-dev-trinity.install | 2 +- .../tdeedu/debian/libtdeedu-dev-trinity.install | 2 +- .../debian/patches/common/kubuntu_01_kdepot.diff | 6 +- ubuntu/maverick/tdeedu/debian/rules | 4 +- .../tdegames/debian/atlantik-trinity-dev.install | 4 +- ubuntu/maverick/tdegames/debian/cdbs/kde.mk | 2 +- .../tdegames/debian/kolf-trinity-dev.install | 2 +- .../debian/libtdegames-trinity-dev.install | 4 +- .../debian/patches/common/kubuntu_01_kdepot.diff | 6 +- ubuntu/maverick/tdegames/debian/rules | 2 +- ubuntu/maverick/tdegraphics/debian/cdbs/kde.mk | 2 +- .../tdegraphics/debian/libpoppler-tqt-dev.install | 6 +- .../debian/patches/common/kubuntu_01_kdepot.diff | 6 +- .../debian/tdegraphics-dev-trinity.install | 362 ++--- ubuntu/maverick/tdelibs/debian/cdbs/kde.mk | 2 +- ubuntu/maverick/tdelibs/debian/changelog | 2 +- ubuntu/maverick/tdelibs/debian/rules | 2 +- .../tdelibs/debian/tdelibs4-trinity-dev.install | 18 +- ubuntu/maverick/tdemultimedia/debian/cdbs/kde.mk | 2 +- .../debian/patches/common/kubuntu_01_kdepot.diff | 6 +- ubuntu/maverick/tdemultimedia/debian/rules | 6 +- .../debian/tdemultimedia-trinity-dev.install | 268 ++-- ubuntu/maverick/tdenetwork/debian/cdbs/kde.mk | 2 +- .../tdenetwork/debian/kopete-trinity.install | 8 +- .../debian/patches/common/kubuntu_01_kdepot.diff | 6 +- ubuntu/maverick/tdenetwork/debian/rules | 2 +- .../debian/tdenetwork-trinity-dev.install | 128 +- ubuntu/maverick/tdepim/debian/changelog | 2 +- .../tdepim/debian/libindex0-trinity-dev.install | 2 +- .../tdepim/debian/libkcal2-trinity-dev.install | 4 +- .../tdepim/debian/libkgantt0-trinity-dev.install | 2 +- .../debian/libkleopatra1-trinity-dev.install | 6 +- .../debian/libkpimexchange1-trinity-dev.install | 4 +- .../tdepim/debian/libksieve0-trinity-dev.install | 2 +- .../tdepim/debian/libktnef1-trinity-dev.install | 2 +- .../tdepim/debian/libmimelib1-trinity-dev.install | 2 +- .../tdepim/debian/libtdepim1-trinity-dev.install | 2 +- .../tdepim/debian/tdepim-trinity-dev.install | 26 +- ubuntu/maverick/tdesdk/debian/cdbs/kde.mk | 2 +- ubuntu/maverick/tdesdk/debian/changelog | 2 +- .../tdesdk/debian/kbabel-trinity-dev.install | 42 +- .../maverick/tdesdk/debian/kmtrace-trinity.install | 2 +- ubuntu/maverick/tdesdk/debian/kspy-trinity.install | 2 +- .../tdesdk/debian/kunittest-trinity.install | 2 +- .../debian/libcvsservice-trinity-dev.install | 6 +- .../debian/patches/common/kubuntu_01_kdepot.diff | 6 +- ubuntu/maverick/tdesdk/debian/rules | 2 +- .../tdesdk/debian/tdesdk-misc-trinity.install | 2 +- .../maverick/tdetoys/debian/amor-trinity.install | 2 +- ubuntu/maverick/tdetoys/debian/cdbs/kde.mk | 2 +- ubuntu/maverick/tdetoys/debian/changelog | 2 +- .../debian/patches/common/kubuntu_01_kdepot.diff | 6 +- ubuntu/maverick/tdetoys/debian/rules | 4 +- ubuntu/maverick/tdeutils/debian/cdbs/kde.mk | 2 +- .../debian/patches/common/kubuntu_01_kdepot.diff | 6 +- ubuntu/maverick/tdeutils/debian/rules | 2 +- .../tdeutils/debian/tdeutils-trinity-dev.install | 30 +- ubuntu/maverick/tdevelop/debian/cdbs/kde.mk | 2 +- .../debian/patches/common/kubuntu_01_kdepot.diff | 6 +- ubuntu/maverick/tdevelop/debian/rules | 2 +- .../tdevelop/debian/tdevelop-trinity-dev.install | 2 +- ubuntu/maverick/tdewebdev/debian/cdbs/kde.mk | 2 +- .../tdewebdev/debian/kommander-trinity-dev.install | 4 +- .../debian/patches/common/kubuntu_01_kdepot.diff | 6 +- ubuntu/maverick/tdewebdev/debian/rules | 2 +- .../applications/abakus/debian/rules | 10 +- .../applications/adept/debian/cdbs/kde.mk | 2 +- .../applications/adept/debian/rules | 2 +- .../applications/amarok/debian/cdbs/kde.mk | 2 +- .../applications/amarok/debian/rules | 2 +- .../applications/basket/debian/rules | 2 +- .../applications/bibletime/debian/cdbs/kde.mk | 2 +- .../applications/bibletime/debian/rules | 2 +- .../debian/cdbs/kde.mk | 2 +- .../compizconfig-backend-kconfig/debian/rules | 4 +- .../applications/desktop-effects-kde/debian/rules | 2 +- .../applications/digikam/debian/cdbs/kde.mk | 2 +- .../digikam/debian/digikam-kde3.install | 2 +- .../applications/digikam/debian/rules | 2 +- .../applications/dolphin/debian/cdbs/kde.mk | 2 +- .../applications/dolphin/debian/rules | 2 +- .../applications/filelight-l10n/debian/cdbs/kde.mk | 2 +- .../applications/filelight-l10n/debian/rules | 4 +- .../applications/filelight/debian/cdbs/kde.mk | 2 +- .../applications/filelight/debian/rules | 2 +- .../applications/gtk-qt-engine/debian/rules | 8 +- .../applications/gwenview/debian/cdbs/kde.mk | 2 +- .../applications/gwenview/debian/rules | 2 +- .../applications/k3b/debian/cdbs/kde.mk | 2 +- .../applications/k3b/debian/kde3.mk | 2 +- .../applications/k3b/debian/rules | 4 +- .../applications/k9copy/debian/cdbs/kde.mk | 2 +- .../applications/k9copy/debian/rules | 4 +- .../applications/kaffeine-mozilla/debian/rules | 2 +- .../applications/kaffeine/debian/cdbs/kde.mk | 2 +- .../kaffeine/debian/kaffeine-kde3.install | 2 +- .../applications/kaffeine/debian/rules | 2 +- .../applications/katapult/debian/cdbs/kde.mk | 2 +- .../applications/katapult/debian/rules | 2 +- .../applications/kbarcode/debian/cdbs/kde.mk | 2 +- .../applications/kbarcode/debian/rules | 2 +- .../applications/kbfx/debian/rules | 6 +- .../applications/kchmviewer/debian/debiandirs | 2 +- .../applications/kchmviewer/debian/rules | 4 +- .../applications/kcpuload/debian/cdbs/kde.mk | 2 +- .../applications/kcpuload/debian/rules | 4 +- .../applications/kde-guidance/debian/rules | 2 +- .../applications/kde-style-lipstik/debian/rules | 4 +- .../applications/kde-style-qtcurve/debian/rules | 8 +- .../kde-systemsettings/debian/cdbs/kde.mk | 2 +- .../applications/kde-systemsettings/debian/rules | 2 +- .../applications/kdesudo/debian/cdbs/kde.mk | 2 +- .../applications/kdesudo/debian/rules | 4 +- .../kdesvn/debian/libsvnqt-kde3-dev.install | 2 +- .../applications/kdesvn/debian/rules | 8 +- .../applications/kdiff3/debian/cdbs/kde.mk | 2 +- .../applications/kdiff3/debian/rules | 4 +- .../applications/kdirstat/debian/cdbs/kde.mk | 2 +- .../applications/kdirstat/debian/rules | 4 +- .../applications/kdpkg/debian/rules | 2 +- .../applications/keep/debian/cdbs/kde.mk | 2 +- .../keep/debian/patches/kubuntu_01_kdepot.diff | 4 +- .../applications/keep/debian/rules | 4 +- .../applications/kerry/debian/cdbs/kde.mk | 2 +- .../applications/kerry/debian/rules | 2 +- .../applications/kgtk-qt3/debian/cdbs/kde.mk | 2 +- .../applications/kgtk-qt3/debian/rules | 8 +- .../applications/kile/debian/cdbs/kde.mk | 2 +- .../applications/kile/debian/rules | 4 +- .../applications/kima/debian/rules | 2 +- .../applications/kio-apt/debian/cdbs/kde.mk | 2 +- .../applications/kio-apt/debian/rules | 4 +- .../applications/kio-locate/debian/rules | 2 +- .../kio-umountwrapper/debian/cdbs/kde.mk | 2 +- .../applications/kio-umountwrapper/debian/rules | 4 +- .../applications/kmplayer/debian/cdbs/kde.mk | 2 +- .../applications/kmplayer/debian/rules | 4 +- .../applications/kmyfirewall/debian/debiandirs | 2 +- .../applications/kmyfirewall/debian/rules | 8 +- .../applications/knemo/debian/cdbs/kde.mk | 2 +- .../applications/knemo/debian/rules | 4 +- .../applications/knetload/debian/rules | 4 +- .../applications/knetstats/debian/cdbs/kde.mk | 2 +- .../applications/knetstats/debian/rules | 2 +- .../knetworkmanager/debian/cdbs/kde.mk | 2 +- .../applications/knetworkmanager/debian/rules | 2 +- .../applications/knights/debian/debiandirs | 2 +- .../applications/knights/debian/rules | 4 +- .../applications/knowit/debian/rules | 2 +- .../applications/knutclient/debian/rules | 2 +- .../applications/koffice/debian/cdbs/kde.mk | 2 +- .../koffice/debian/koffice-dev-kde3.install | 2 +- .../applications/koffice/debian/rules | 2 +- .../applications/konversation/debian/cdbs/kde.mk | 2 +- .../applications/konversation/debian/rules | 4 +- .../applications/kopete-otr/debian/cdbs/kde.mk | 2 +- .../applications/kopete-otr/debian/rules | 4 +- .../applications/kpicosim/debian/rules | 4 +- .../applications/kpilot/debian/cdbs/kde.mk | 2 +- .../applications/kpilot/debian/rules | 4 +- .../applications/kpowersave/debian/cdbs/kde.mk | 2 +- .../applications/kpowersave/debian/rules | 4 +- .../applications/kradio/debian/rules | 2 +- .../applications/krename/debian/rules | 4 +- .../applications/krusader/debian/cdbs/kde.mk | 2 +- .../applications/krusader/debian/rules | 4 +- .../ksplash-engine-moodin/debian/debiandirs | 2 +- .../ksplash-engine-moodin/debian/rules | 4 +- .../applications/ksquirrel/debian/rules | 2 +- .../applications/ksystemlog/debian/cdbs/kde.mk | 2 +- .../applications/ksystemlog/debian/rules | 4 +- .../applications/ktechlab/debian/debiandirs | 2 +- .../applications/ktechlab/debian/rules | 10 +- .../applications/ktorrent/debian/cdbs/kde.mk | 2 +- .../applications/ktorrent/debian/rules | 4 +- .../applications/kuickshow/debian/cdbs/kde.mk | 2 +- .../applications/kuickshow/debian/rules | 4 +- .../applications/kvirc/debian/rules | 2 +- .../applications/kvkbd/debian/cdbs/kde.mk | 2 +- .../applications/kvkbd/debian/rules | 4 +- .../kwin-style-crystal/debian/cdbs/kde.mk | 2 +- .../applications/kwin-style-crystal/debian/rules | 2 +- .../applications/piklab/debian/rules | 4 +- .../applications/potracegui/debian/rules | 2 +- .../applications/rosegarden/debian/rules | 8 +- .../applications/smb4k/debian/cdbs/kde.mk | 2 +- .../applications/smb4k/debian/rules | 2 +- .../applications/soundkonverter/debian/cdbs/kde.mk | 2 +- .../applications/soundkonverter/debian/rules | 4 +- .../applications/tdmtheme/debian/cdbs/kde.mk | 2 +- .../applications/tdmtheme/debian/rules | 4 +- .../applications/tellico/debian/rules | 2 +- .../applications/wlassistant/debian/rules | 4 +- .../applications/yakuake/debian/cdbs/kde.mk | 2 +- .../applications/yakuake/debian/rules | 2 +- .../arts/debian/libarts1-kde3-dev.install | 162 +-- .../arts/debian/libartsc0-kde3-dev.install | 4 +- .../dependencies/arts/debian/rules | 4 +- .../dependencies/tqtinterface/debian/rules | 4 +- .../maverick_automake/kde-i18n/debian/debiandirs | 2 +- ubuntu/maverick_automake/kde-i18n/debian/rules | 2 +- .../kdeaccessibility/debian/cdbs/kde.mk | 2 +- .../kdeaccessibility/debian/ksayit-kde3.install | 2 +- .../debian/patches/common/kubuntu_01_kdepot.diff | 6 +- .../kdeaccessibility/debian/rules | 2 +- .../maverick_automake/kdeaddons/debian/cdbs/kde.mk | 2 +- .../debian/patches/common/kubuntu_01_kdepot.diff | 6 +- ubuntu/maverick_automake/kdeaddons/debian/rules | 2 +- .../maverick_automake/kdeadmin/debian/cdbs/kde.mk | 2 +- .../debian/patches/common/kubuntu_01_kdepot.diff | 6 +- ubuntu/maverick_automake/kdeadmin/debian/rules | 2 +- .../kdeartwork/debian/cdbs/kde.mk | 2 +- .../debian/patches/common/kubuntu_01_kdepot.diff | 6 +- ubuntu/maverick_automake/kdeartwork/debian/rules | 2 +- .../maverick_automake/kdebase/debian/cdbs/kde.mk | 2 +- .../kdebase/debian/kdebase-kde3-dev.install | 78 +- .../kdebase/debian/libkonq4-kde3-dev.install | 42 +- ubuntu/maverick_automake/kdebase/debian/rules | 2 +- .../kdebindings/debian/cdbs/kde.mk | 2 +- .../debian/libkjsembed-kde3-dev.install | 2 +- .../kdebindings/debian/libsmokeqt-kde3-dev.install | 2 +- .../debian/patches/common/kubuntu_01_kdepot.diff | 6 +- ubuntu/maverick_automake/kdebindings/debian/rules | 2 +- ubuntu/maverick_automake/kdeedu/debian/cdbs/kde.mk | 2 +- .../kdeedu/debian/kstars-kde3.install | 4 +- .../kdeedu/debian/libkdeedu-dev-kde3.install | 2 +- .../kdeedu/debian/libkiten-dev-kde3.install | 2 +- .../debian/patches/common/kubuntu_01_kdepot.diff | 6 +- ubuntu/maverick_automake/kdeedu/debian/rules | 4 +- .../kdegames/debian/atlantik-kde3-dev.install | 4 +- .../maverick_automake/kdegames/debian/cdbs/kde.mk | 2 +- .../kdegames/debian/kolf-kde3-dev.install | 2 +- .../kdegames/debian/libkdegames-kde3-dev.install | 4 +- .../debian/patches/common/kubuntu_01_kdepot.diff | 6 +- ubuntu/maverick_automake/kdegames/debian/rules | 2 +- .../kdegraphics/debian/cdbs/kde.mk | 2 +- .../debian/kdegraphics-dev-kde3.install | 362 ++--- .../debian/patches/common/kubuntu_01_kdepot.diff | 6 +- ubuntu/maverick_automake/kdegraphics/debian/rules | 4 +- .../maverick_automake/kdelibs/debian/cdbs/kde.mk | 2 +- ubuntu/maverick_automake/kdelibs/debian/changelog | 6 +- .../kdelibs/debian/kdelibs4-kde3-dev.install | 1414 ++++++++++---------- ubuntu/maverick_automake/kdelibs/debian/rules | 4 +- .../kdemultimedia/debian/cdbs/kde.mk | 2 +- .../debian/kdemultimedia-kde3-dev.install | 268 ++-- .../debian/patches/common/kubuntu_01_kdepot.diff | 6 +- .../maverick_automake/kdemultimedia/debian/rules | 6 +- .../kdenetwork/debian/cdbs/kde.mk | 2 +- .../kdenetwork/debian/kdenetwork-kde3-dev.install | 128 +- .../kdenetwork/debian/kopete-kde3.install | 8 +- .../debian/patches/common/kubuntu_01_kdepot.diff | 6 +- ubuntu/maverick_automake/kdenetwork/debian/rules | 2 +- ubuntu/maverick_automake/kdepim/debian/cdbs/kde.mk | 2 +- ubuntu/maverick_automake/kdepim/debian/changelog | 2 +- .../kdepim/debian/kdepim-kde3-dev.install | 28 +- .../kdepim/debian/libindex0-kde3-dev.install | 2 +- .../kdepim/debian/libkcal2-kde3-dev.install | 4 +- .../kdepim/debian/libkdepim1-kde3-dev.install | 2 +- .../kdepim/debian/libkgantt0-kde3-dev.install | 2 +- .../kdepim/debian/libkleopatra1-kde3-dev.install | 6 +- .../debian/libkpimexchange1-kde3-dev.install | 4 +- .../kdepim/debian/libksieve0-kde3-dev.install | 2 +- .../kdepim/debian/libktnef1-kde3-dev.install | 2 +- .../kdepim/debian/libmimelib1-kde3-dev.install | 2 +- .../debian/patches/common/kubuntu_01_kdepot.diff | 6 +- ubuntu/maverick_automake/kdepim/debian/rules | 2 +- ubuntu/maverick_automake/kdesdk/debian/cdbs/kde.mk | 2 +- ubuntu/maverick_automake/kdesdk/debian/changelog | 2 +- .../kdesdk/debian/kbabel-kde3-dev.install | 42 +- .../kdesdk/debian/kdesdk-misc-kde3.install | 2 +- .../kdesdk/debian/kmtrace-kde3.install | 2 +- .../kdesdk/debian/kspy-kde3.install | 2 +- .../kdesdk/debian/kunittest-kde3.install | 2 +- .../kdesdk/debian/libcvsservice-kde3-dev.install | 6 +- .../debian/patches/common/kubuntu_01_kdepot.diff | 6 +- ubuntu/maverick_automake/kdesdk/debian/rules | 2 +- .../kdetoys/debian/amor-kde3.install | 2 +- .../maverick_automake/kdetoys/debian/cdbs/kde.mk | 2 +- ubuntu/maverick_automake/kdetoys/debian/changelog | 2 +- .../debian/patches/common/kubuntu_01_kdepot.diff | 6 +- ubuntu/maverick_automake/kdetoys/debian/rules | 4 +- .../maverick_automake/kdeutils/debian/cdbs/kde.mk | 2 +- .../kdeutils/debian/kdeutils-kde3-dev.install | 30 +- .../debian/patches/common/kubuntu_01_kdepot.diff | 6 +- ubuntu/maverick_automake/kdeutils/debian/rules | 2 +- .../maverick_automake/kdevelop/debian/cdbs/kde.mk | 2 +- .../kdevelop/debian/kdevelop-kde3-dev.install | 2 +- .../debian/patches/common/kubuntu_01_kdepot.diff | 6 +- ubuntu/maverick_automake/kdevelop/debian/rules | 2 +- .../maverick_automake/kdewebdev/debian/cdbs/kde.mk | 2 +- .../kdewebdev/debian/kommander-kde3-dev.install | 4 +- .../debian/patches/common/kubuntu_01_kdepot.diff | 6 +- ubuntu/maverick_automake/kdewebdev/debian/rules | 2 +- .../libraries/kipi-plugins/debian/cdbs/kde.mk | 2 +- .../libraries/kipi-plugins/debian/rules | 4 +- .../libraries/libkdcraw/debian/cdbs/kde.mk | 2 +- .../libraries/libkdcraw/debian/rules | 2 +- .../libraries/libkexiv2/debian/cdbs/kde.mk | 2 +- .../libraries/libkexiv2/debian/rules | 2 +- .../libraries/libkipi/debian/cdbs/kde.mk | 2 +- .../libraries/libkipi/debian/rules | 2 +- .../libraries/libksquirrel/debian/rules | 2 +- .../maverick_automake/libraries/mlt++/debian/rules | 2 +- .../maverick_automake/libraries/mlt/debian/rules | 10 +- .../debian/libpythonize0-kde3-dev.install | 2 +- .../libraries/pytdeextensions/debian/rules | 8 +- .../libraries/python-kde3/debian/rules | 6 +- 1184 files changed, 5766 insertions(+), 5766 deletions(-) diff --git a/debian/lenny/applications/adept/debian/cdbs/kde.mk b/debian/lenny/applications/adept/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/lenny/applications/adept/debian/cdbs/kde.mk +++ b/debian/lenny/applications/adept/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/lenny/applications/adept/debian/rules b/debian/lenny/applications/adept/debian/rules index 9c80b51c7..ee86e8e4f 100755 --- a/debian/lenny/applications/adept/debian/rules +++ b/debian/lenny/applications/adept/debian/rules @@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/debian/lenny/applications/amarok/debian/cdbs/kde.mk b/debian/lenny/applications/amarok/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/lenny/applications/amarok/debian/cdbs/kde.mk +++ b/debian/lenny/applications/amarok/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/lenny/applications/amarok/debian/rules b/debian/lenny/applications/amarok/debian/rules index 1e2caae64..deb43ebf7 100755 --- a/debian/lenny/applications/amarok/debian/rules +++ b/debian/lenny/applications/amarok/debian/rules @@ -5,7 +5,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/patchsys-quilt.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/debian/lenny/applications/basket/debian/rules b/debian/lenny/applications/basket/debian/rules index 5af81349e..0e699603a 100755 --- a/debian/lenny/applications/basket/debian/rules +++ b/debian/lenny/applications/basket/debian/rules @@ -3,7 +3,7 @@ #export DH_VERBOSE=1 -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/debian/lenny/applications/bibletime/debian/cdbs/kde.mk b/debian/lenny/applications/bibletime/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/lenny/applications/bibletime/debian/cdbs/kde.mk +++ b/debian/lenny/applications/bibletime/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/lenny/applications/bibletime/debian/rules b/debian/lenny/applications/bibletime/debian/rules index 1ef64a83d..ea4b62326 100755 --- a/debian/lenny/applications/bibletime/debian/rules +++ b/debian/lenny/applications/bibletime/debian/rules @@ -9,7 +9,7 @@ DEB_DH_INSTALL_SOURCEDIR := debian DEB_BUILDDIR = $(DEB_SRCDIR) -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/debian/lenny/applications/compizconfig-backend-kconfig/debian/cdbs/kde.mk b/debian/lenny/applications/compizconfig-backend-kconfig/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/lenny/applications/compizconfig-backend-kconfig/debian/cdbs/kde.mk +++ b/debian/lenny/applications/compizconfig-backend-kconfig/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/lenny/applications/compizconfig-backend-kconfig/debian/rules b/debian/lenny/applications/compizconfig-backend-kconfig/debian/rules index 820ba5a3b..c5dd59ccb 100755 --- a/debian/lenny/applications/compizconfig-backend-kconfig/debian/rules +++ b/debian/lenny/applications/compizconfig-backend-kconfig/debian/rules @@ -4,14 +4,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde post-patches:: debian/stamp-bootstrap diff --git a/debian/lenny/applications/desktop-effects-tde/debian/rules b/debian/lenny/applications/desktop-effects-tde/debian/rules index 7bdd258a5..7bf3e3306 100755 --- a/debian/lenny/applications/desktop-effects-tde/debian/rules +++ b/debian/lenny/applications/desktop-effects-tde/debian/rules @@ -2,7 +2,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/debian/lenny/applications/digikam/debian/cdbs/kde.mk b/debian/lenny/applications/digikam/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/lenny/applications/digikam/debian/cdbs/kde.mk +++ b/debian/lenny/applications/digikam/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/lenny/applications/digikam/debian/digikam-trinity.install b/debian/lenny/applications/digikam/debian/digikam-trinity.install index 87c7fe33f..49fc16b82 100644 --- a/debian/lenny/applications/digikam/debian/digikam-trinity.install +++ b/debian/lenny/applications/digikam/debian/digikam-trinity.install @@ -1,5 +1,5 @@ opt/trinity/bin/digi* -/opt/trinity/include/kde +/opt/trinity/include/tde opt/trinity/lib /opt/trinity/share/apps/digikam /opt/trinity/share/apps/konqueror/servicemenus/digikam*.desktop diff --git a/debian/lenny/applications/digikam/debian/rules b/debian/lenny/applications/digikam/debian/rules index d4b31de95..18181fd83 100755 --- a/debian/lenny/applications/digikam/debian/rules +++ b/debian/lenny/applications/digikam/debian/rules @@ -6,7 +6,7 @@ include /usr/share/cdbs/1/rules/utils.mk include debian/cdbs/debian-qt-kde.mk -include /usr/share/gnome-pkg-tools/1/rules/sf-get-source.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/debian/lenny/applications/filelight-l10n/debian/cdbs/kde.mk b/debian/lenny/applications/filelight-l10n/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/lenny/applications/filelight-l10n/debian/cdbs/kde.mk +++ b/debian/lenny/applications/filelight-l10n/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/lenny/applications/filelight-l10n/debian/rules b/debian/lenny/applications/filelight-l10n/debian/rules index 7eea2f6e2..9255102ce 100755 --- a/debian/lenny/applications/filelight-l10n/debian/rules +++ b/debian/lenny/applications/filelight-l10n/debian/rules @@ -7,7 +7,7 @@ include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 @@ -17,7 +17,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine #DEB_PATCHDIRS := debian/patches/common debian/patches #DEB_INSTALL_DOCS_ALL := -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/usr/trinity/lib --with-extra-includes=/opt/trinity/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/usr/trinity/lib --with-extra-includes=/opt/trinity/include/tde post-patches:: debian/stamp-bootstrap diff --git a/debian/lenny/applications/filelight/debian/cdbs/kde.mk b/debian/lenny/applications/filelight/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/lenny/applications/filelight/debian/cdbs/kde.mk +++ b/debian/lenny/applications/filelight/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/lenny/applications/filelight/debian/rules b/debian/lenny/applications/filelight/debian/rules index a7c79577a..838448085 100755 --- a/debian/lenny/applications/filelight/debian/rules +++ b/debian/lenny/applications/filelight/debian/rules @@ -8,7 +8,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/patchsys-quilt.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/debian/lenny/applications/gtk-qt-engine/debian/cdbs/kde.mk b/debian/lenny/applications/gtk-qt-engine/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/lenny/applications/gtk-qt-engine/debian/cdbs/kde.mk +++ b/debian/lenny/applications/gtk-qt-engine/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/lenny/applications/gtk-qt-engine/debian/rules b/debian/lenny/applications/gtk-qt-engine/debian/rules index f2ac92c96..0247f6ef3 100755 --- a/debian/lenny/applications/gtk-qt-engine/debian/rules +++ b/debian/lenny/applications/gtk-qt-engine/debian/rules @@ -15,7 +15,7 @@ include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk include debian/cdbs/debian-qt-kde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 @@ -24,7 +24,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib -DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/kde" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" +DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/tde" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" binary-install/gtk-qt-engine-trinity:: mkdir -p $(CURDIR)/debian/gtk-qt-engine-trinity/opt/trinity/share/kgtk/ diff --git a/debian/lenny/applications/gwenview/debian/cdbs/kde.mk b/debian/lenny/applications/gwenview/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/lenny/applications/gwenview/debian/cdbs/kde.mk +++ b/debian/lenny/applications/gwenview/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/lenny/applications/gwenview/debian/rules b/debian/lenny/applications/gwenview/debian/rules index c231b336f..81fd87521 100755 --- a/debian/lenny/applications/gwenview/debian/rules +++ b/debian/lenny/applications/gwenview/debian/rules @@ -7,7 +7,7 @@ include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/debian/lenny/applications/k3b/debian/cdbs/kde.mk b/debian/lenny/applications/k3b/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/lenny/applications/k3b/debian/cdbs/kde.mk +++ b/debian/lenny/applications/k3b/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/lenny/applications/k3b/debian/rules b/debian/lenny/applications/k3b/debian/rules index fa308829e..664df39cf 100755 --- a/debian/lenny/applications/k3b/debian/rules +++ b/debian/lenny/applications/k3b/debian/rules @@ -4,14 +4,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include debian/cdbs/kde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde5 +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde5 DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_PREFIX := /opt/trinity DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) -DEB_CONFIGURE_EXTRA_FLAGS = --with-k3bsetup=no --with-extra-libs=/opt/trinity/lib --includedir="/opt/trinity/include/kde" +DEB_CONFIGURE_EXTRA_FLAGS = --with-k3bsetup=no --with-extra-libs=/opt/trinity/lib --includedir="/opt/trinity/include/tde" DEB_INSTALL_MANPAGES_k3b = debian/k3b.1 diff --git a/debian/lenny/applications/k3b/debian/trinity.mk b/debian/lenny/applications/k3b/debian/trinity.mk index c48d5d5af..cd71193a1 100644 --- a/debian/lenny/applications/k3b/debian/trinity.mk +++ b/debian/lenny/applications/k3b/debian/trinity.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama --without-arts $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "/opt/trinity/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "/opt/trinity/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/lenny/applications/k9copy/debian/cdbs/kde.mk b/debian/lenny/applications/k9copy/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/lenny/applications/k9copy/debian/cdbs/kde.mk +++ b/debian/lenny/applications/k9copy/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/lenny/applications/k9copy/debian/rules b/debian/lenny/applications/k9copy/debian/rules index 860ee9e84..7f17e00f5 100755 --- a/debian/lenny/applications/k9copy/debian/rules +++ b/debian/lenny/applications/k9copy/debian/rules @@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/class/kde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 @@ -13,7 +13,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_INSTALL_MANPAGES_k9copy = k9copy-trinity.1 -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --includedir="/opt/trinity/include/kde" --mandir="/opt/trinity/share/man" --infodir="/opt/trinity/share/info" +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --includedir="/opt/trinity/include/tde" --mandir="/opt/trinity/share/man" --infodir="/opt/trinity/share/info" post-patches:: debian/stamp-bootstrap diff --git a/debian/lenny/applications/kaffeine-mozilla/debian/rules b/debian/lenny/applications/kaffeine-mozilla/debian/rules index 86b977b3f..80fe9807b 100755 --- a/debian/lenny/applications/kaffeine-mozilla/debian/rules +++ b/debian/lenny/applications/kaffeine-mozilla/debian/rules @@ -14,7 +14,7 @@ export DH_OPTIONS DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/debian/lenny/applications/kaffeine/debian/cdbs/kde.mk b/debian/lenny/applications/kaffeine/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/lenny/applications/kaffeine/debian/cdbs/kde.mk +++ b/debian/lenny/applications/kaffeine/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/lenny/applications/kaffeine/debian/kaffeine-trinity.install b/debian/lenny/applications/kaffeine/debian/kaffeine-trinity.install index 825837cba..4777ef63c 100644 --- a/debian/lenny/applications/kaffeine/debian/kaffeine-trinity.install +++ b/debian/lenny/applications/kaffeine/debian/kaffeine-trinity.install @@ -13,7 +13,7 @@ debian/tmp/opt/trinity/share/doc/ debian/tmp/opt/trinity/share/icons/ debian/tmp/opt/trinity/share/mimelnk/application/x-kaffeine.desktop debian/tmp/opt/trinity/share/locale/ -debian/tmp/opt/trinity/include/kde/kaffeine/*h +debian/tmp/opt/trinity/include/tde/kaffeine/*h debian/tmp/opt/trinity/share/services/kaffeineoggvorbis.desktop debian/tmp/opt/trinity/lib/trinity/libkaffeineoggvorbis.la debian/tmp/opt/trinity/lib/trinity/libkaffeineoggvorbis.so diff --git a/debian/lenny/applications/kaffeine/debian/rules b/debian/lenny/applications/kaffeine/debian/rules index efff35a86..43e1e0d24 100755 --- a/debian/lenny/applications/kaffeine/debian/rules +++ b/debian/lenny/applications/kaffeine/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/debian/lenny/applications/katapult/debian/cdbs/kde.mk b/debian/lenny/applications/katapult/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/lenny/applications/katapult/debian/cdbs/kde.mk +++ b/debian/lenny/applications/katapult/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/lenny/applications/katapult/debian/rules b/debian/lenny/applications/katapult/debian/rules index f29a6a564..e48ac244a 100755 --- a/debian/lenny/applications/katapult/debian/rules +++ b/debian/lenny/applications/katapult/debian/rules @@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/debian/lenny/applications/kbarcode/debian/cdbs/kde.mk b/debian/lenny/applications/kbarcode/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/lenny/applications/kbarcode/debian/cdbs/kde.mk +++ b/debian/lenny/applications/kbarcode/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/lenny/applications/kbarcode/debian/rules b/debian/lenny/applications/kbarcode/debian/rules index bb554f410..35a033bc7 100755 --- a/debian/lenny/applications/kbarcode/debian/rules +++ b/debian/lenny/applications/kbarcode/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/patchsys-quilt.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/debian/lenny/applications/kbfx/debian/rules b/debian/lenny/applications/kbfx/debian/rules index 5ea2ffc62..9d710b00d 100755 --- a/debian/lenny/applications/kbfx/debian/rules +++ b/debian/lenny/applications/kbfx/debian/rules @@ -7,21 +7,21 @@ URL = http://www.$(DEB_SOURCE_PACKAGE).org/release/0.4.9/testing/$(UPFILENAME) DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib #CMAKE_LIBRARY_PATH := /opt/trinity/lib -#CMAKE_INCLUDE_PATH := /opt/trinity/include/kde +#CMAKE_INCLUDE_PATH := /opt/trinity/include/tde include debian/cmake.mk include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) -DEB_CMAKE_EXTRA_FLAGS = -DLIB_SUFFIX="" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/kde" -DCMAKE_INSTALL_PREFIX="/opt/trinity/" +DEB_CMAKE_EXTRA_FLAGS = -DLIB_SUFFIX="" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/tde" -DCMAKE_INSTALL_PREFIX="/opt/trinity/" get-orig-source: @@dh_testdir diff --git a/debian/lenny/applications/kbookreader/debian/cdbs/kde.mk b/debian/lenny/applications/kbookreader/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/lenny/applications/kbookreader/debian/cdbs/kde.mk +++ b/debian/lenny/applications/kbookreader/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/lenny/applications/kbookreader/debian/rules b/debian/lenny/applications/kbookreader/debian/rules index 4ceef7d99..b3b57fdb9 100755 --- a/debian/lenny/applications/kbookreader/debian/rules +++ b/debian/lenny/applications/kbookreader/debian/rules @@ -4,14 +4,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/class/kde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --includedir="/opt/trinity/include/kde" --mandir="/opt/trinity/share/man" --infodir="/opt/trinity/share/info" +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --includedir="/opt/trinity/include/tde" --mandir="/opt/trinity/share/man" --infodir="/opt/trinity/share/info" post-patches:: debian/stamp-bootstrap diff --git a/debian/lenny/applications/kchmviewer/debian/debiandirs b/debian/lenny/applications/kchmviewer/debian/debiandirs index cb33e0ee3..893052e08 100644 --- a/debian/lenny/applications/kchmviewer/debian/debiandirs +++ b/debian/lenny/applications/kchmviewer/debian/debiandirs @@ -1,6 +1,6 @@ export kde_prefix=/usr export sysconfdir=/etc -export kde_includedir=/usr/include/kde +export kde_includedir=/usr/include/tde export infodir=/usr/share/info export mandir=/usr/share/man export qtdir=/usr/share/qt3 diff --git a/debian/lenny/applications/kchmviewer/debian/rules b/debian/lenny/applications/kchmviewer/debian/rules index 0466e25ea..72c3fd5bb 100755 --- a/debian/lenny/applications/kchmviewer/debian/rules +++ b/debian/lenny/applications/kchmviewer/debian/rules @@ -9,7 +9,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 @@ -27,7 +27,7 @@ CFLAGS = -Wall -g CONFIGURE_OPTIONS_KDE = \ --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \ --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib \ - --includedir=/opt/trinity/include/kde --mandir=/opt/trinity/share/man \ + --includedir=/opt/trinity/include/tde --mandir=/opt/trinity/share/man \ --with-qt-dir=$(qtdir) \ --sysconfdir=$(sysconfdir) \ --infodir=/opt/trinity/share/info \ diff --git a/debian/lenny/applications/kcpuload/debian/cdbs/kde.mk b/debian/lenny/applications/kcpuload/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/lenny/applications/kcpuload/debian/cdbs/kde.mk +++ b/debian/lenny/applications/kcpuload/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/lenny/applications/kcpuload/debian/rules b/debian/lenny/applications/kcpuload/debian/rules index 2ab783f6d..fae495f36 100755 --- a/debian/lenny/applications/kcpuload/debian/rules +++ b/debian/lenny/applications/kcpuload/debian/rules @@ -5,7 +5,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 @@ -79,7 +79,7 @@ configure-stamp: # run configure with build tree $(objdir) cd $(objdir) && \ - ../configure --disable-debug --enable-final --libexecdir=/opt/trinity/bin --sysconfdir=/etc --libdir=/opt/trinity/lib --includedir=/opt/include/kde --with-qt-includes=/usr/include/qt3 --mandir=/opt/trinity/share/man --infodir=/opt/trinity/share/info --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib + ../configure --disable-debug --enable-final --libexecdir=/opt/trinity/bin --sysconfdir=/etc --libdir=/opt/trinity/lib --includedir=/opt/include/tde --with-qt-includes=/usr/include/qt3 --mandir=/opt/trinity/share/man --infodir=/opt/trinity/share/info --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib touch configure-stamp diff --git a/debian/lenny/applications/kdbusnotification/debian/cdbs/kde.mk b/debian/lenny/applications/kdbusnotification/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/lenny/applications/kdbusnotification/debian/cdbs/kde.mk +++ b/debian/lenny/applications/kdbusnotification/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/lenny/applications/kdbusnotification/debian/rules b/debian/lenny/applications/kdbusnotification/debian/rules index 3fbf27bb0..d47788b3a 100755 --- a/debian/lenny/applications/kdbusnotification/debian/rules +++ b/debian/lenny/applications/kdbusnotification/debian/rules @@ -5,7 +5,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 @@ -78,7 +78,7 @@ configure-stamp: # run configure with build tree $(objdir) cd $(objdir) && \ - ../configure --disable-debug --enable-final --libexecdir=/opt/trinity/bin --sysconfdir=/etc --libdir=/opt/trinity/lib --includedir=/opt/include/kde --with-qt-includes=/usr/include/qt3 --mandir=/opt/trinity/share/man --infodir=/opt/trinity/share/info --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib + ../configure --disable-debug --enable-final --libexecdir=/opt/trinity/bin --sysconfdir=/etc --libdir=/opt/trinity/lib --includedir=/opt/include/tde --with-qt-includes=/usr/include/qt3 --mandir=/opt/trinity/share/man --infodir=/opt/trinity/share/info --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib touch configure-stamp diff --git a/debian/lenny/applications/kdiff3/debian/cdbs/kde.mk b/debian/lenny/applications/kdiff3/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/lenny/applications/kdiff3/debian/cdbs/kde.mk +++ b/debian/lenny/applications/kdiff3/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/lenny/applications/kdiff3/debian/rules b/debian/lenny/applications/kdiff3/debian/rules index 90b33c108..e76778235 100755 --- a/debian/lenny/applications/kdiff3/debian/rules +++ b/debian/lenny/applications/kdiff3/debian/rules @@ -4,7 +4,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 @@ -37,7 +37,7 @@ config.status: cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in make -f admin/Makefile.common cvs - CFLAGS="$(CFLAGS)" ./configure --disable-rpath --prefix=/opt/trinity --with-qt-includes=/usr/include/qt3 --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --mandir=/opt/trinity/share/man --infodir=/opt/trinity/share/info --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde + CFLAGS="$(CFLAGS)" ./configure --disable-rpath --prefix=/opt/trinity --with-qt-includes=/usr/include/qt3 --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --mandir=/opt/trinity/share/man --infodir=/opt/trinity/share/info --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde build: build-stamp diff --git a/debian/lenny/applications/kdirstat/debian/cdbs/kde.mk b/debian/lenny/applications/kdirstat/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/lenny/applications/kdirstat/debian/cdbs/kde.mk +++ b/debian/lenny/applications/kdirstat/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/lenny/applications/kdirstat/debian/rules b/debian/lenny/applications/kdirstat/debian/rules index cf2a8db06..b15f5a9a5 100755 --- a/debian/lenny/applications/kdirstat/debian/rules +++ b/debian/lenny/applications/kdirstat/debian/rules @@ -4,14 +4,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde LDFLAGS += -Wl,--as-needed diff --git a/debian/lenny/applications/kdpkg/debian/rules b/debian/lenny/applications/kdpkg/debian/rules index 59fc3d5a5..b2822c5b3 100755 --- a/debian/lenny/applications/kdpkg/debian/rules +++ b/debian/lenny/applications/kdpkg/debian/rules @@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/autotools.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/debian/lenny/applications/keep/debian/cdbs/kde.mk b/debian/lenny/applications/keep/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/lenny/applications/keep/debian/cdbs/kde.mk +++ b/debian/lenny/applications/keep/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/lenny/applications/keep/debian/patches/kubuntu_01_kdepot.diff b/debian/lenny/applications/keep/debian/patches/kubuntu_01_kdepot.diff index 55238c41a..782118729 100644 --- a/debian/lenny/applications/keep/debian/patches/kubuntu_01_kdepot.diff +++ b/debian/lenny/applications/keep/debian/patches/kubuntu_01_kdepot.diff @@ -5,7 +5,7 @@ diff -Nur keep-0.4.0/admin/cvs.sh keep-0.4.0.new/admin/cvs.sh if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/usr/include/kde/kde.pot ++kdepotpath=/usr/include/tde/kde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -16,5 +16,5 @@ diff -Nur keep-0.4.0/admin/cvs.sh keep-0.4.0.new/admin/cvs.sh - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot if ! test -f $kdepotpath; then - kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot + kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot fi diff --git a/debian/lenny/applications/keep/debian/rules b/debian/lenny/applications/keep/debian/rules index 49dc42fae..b6eae04ee 100755 --- a/debian/lenny/applications/keep/debian/rules +++ b/debian/lenny/applications/keep/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 @@ -14,7 +14,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_INSTALL_MANPAGES_keep := keep.1 -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde post-patches:: debian/stamp-bootstrap diff --git a/debian/lenny/applications/kerry/debian/cdbs/kde.mk b/debian/lenny/applications/kerry/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/lenny/applications/kerry/debian/cdbs/kde.mk +++ b/debian/lenny/applications/kerry/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/lenny/applications/kerry/debian/rules b/debian/lenny/applications/kerry/debian/rules index 0d08e83f9..7dc0fbe23 100755 --- a/debian/lenny/applications/kerry/debian/rules +++ b/debian/lenny/applications/kerry/debian/rules @@ -5,7 +5,7 @@ include /usr/share/cdbs/1/rules/simple-patchsys.mk # include /usr/share/cdbs/1/class/kde.mk include debian/cdbs/debian-qt-kde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/debian/lenny/applications/kile/debian/cdbs/kde.mk b/debian/lenny/applications/kile/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/lenny/applications/kile/debian/cdbs/kde.mk +++ b/debian/lenny/applications/kile/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/lenny/applications/kile/debian/rules b/debian/lenny/applications/kile/debian/rules index 2d31b63e0..3e19a08ea 100755 --- a/debian/lenny/applications/kile/debian/rules +++ b/debian/lenny/applications/kile/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/patchsys-quilt.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 @@ -15,7 +15,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--as-needed" DEB_DH_INSTALL_ARGS := --sourcedir=debian/tmp DEB_INSTALL_MANPAGES_kile := debian/kile.1 -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde post-patches:: debian/stamp-bootstrap diff --git a/debian/lenny/applications/kima/debian/rules b/debian/lenny/applications/kima/debian/rules index a353777b4..519575104 100755 --- a/debian/lenny/applications/kima/debian/rules +++ b/debian/lenny/applications/kima/debian/rules @@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/autotools.mk DEB_CONFIGURE_EXTRA_FLAGS += --disable-rpath -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/debian/lenny/applications/kio-apt/debian/cdbs/kde.mk b/debian/lenny/applications/kio-apt/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/lenny/applications/kio-apt/debian/cdbs/kde.mk +++ b/debian/lenny/applications/kio-apt/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/lenny/applications/kio-apt/debian/rules b/debian/lenny/applications/kio-apt/debian/rules index a6d8c580a..9b82c21ad 100755 --- a/debian/lenny/applications/kio-apt/debian/rules +++ b/debian/lenny/applications/kio-apt/debian/rules @@ -5,14 +5,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include debian/cdbs/kde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde post-patches:: debian/stamp-bootstrap diff --git a/debian/lenny/applications/kio-umountwrapper/debian/cdbs/kde.mk b/debian/lenny/applications/kio-umountwrapper/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/lenny/applications/kio-umountwrapper/debian/cdbs/kde.mk +++ b/debian/lenny/applications/kio-umountwrapper/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/lenny/applications/kio-umountwrapper/debian/rules b/debian/lenny/applications/kio-umountwrapper/debian/rules index ce61aac65..ae8903f41 100755 --- a/debian/lenny/applications/kio-umountwrapper/debian/rules +++ b/debian/lenny/applications/kio-umountwrapper/debian/rules @@ -4,14 +4,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include debian/cdbs/kde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde post-patches:: debian/stamp-bootstrap diff --git a/debian/lenny/applications/kmplayer/debian/cdbs/kde.mk b/debian/lenny/applications/kmplayer/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/lenny/applications/kmplayer/debian/cdbs/kde.mk +++ b/debian/lenny/applications/kmplayer/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/lenny/applications/kmplayer/debian/rules b/debian/lenny/applications/kmplayer/debian/rules index b23d91457..63bf848d1 100755 --- a/debian/lenny/applications/kmplayer/debian/rules +++ b/debian/lenny/applications/kmplayer/debian/rules @@ -5,7 +5,7 @@ include /usr/share/cdbs/1/rules/simple-patchsys.mk include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 @@ -18,7 +18,7 @@ ifeq ($(GCC_VERSION),4.3) CXX = g++ -fpermissive endif -DEB_CONFIGURE_EXTRA_FLAGS := --enable-maintainer-mode --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --enable-maintainer-mode --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp DEB_INSTALL_MANPAGES_kmplayer = kmplayer.1 diff --git a/debian/lenny/applications/kmyfirewall/debian/debiandirs b/debian/lenny/applications/kmyfirewall/debian/debiandirs index 959f97f68..8b51d74fa 100644 --- a/debian/lenny/applications/kmyfirewall/debian/debiandirs +++ b/debian/lenny/applications/kmyfirewall/debian/debiandirs @@ -1,6 +1,6 @@ export kde_prefix=/usr export sysconfdir=/etc -export kde_includedir=/usr/include/kde +export kde_includedir=/usr/include/tde export infodir=/usr/share/info export mandir=/usr/share/man export qtdir=/usr/share/qt3 diff --git a/debian/lenny/applications/kmyfirewall/debian/rules b/debian/lenny/applications/kmyfirewall/debian/rules index 1993e3bfe..a8d1312d8 100755 --- a/debian/lenny/applications/kmyfirewall/debian/rules +++ b/debian/lenny/applications/kmyfirewall/debian/rules @@ -6,7 +6,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 @@ -56,7 +56,7 @@ endif ifneq "$(wildcard /usr/share/misc/config.guess)" "" cp -f /usr/share/misc/config.guess config.guess endif - CFLAGS="$(CFLAGS)" PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) $(configkde) --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde + CFLAGS="$(CFLAGS)" PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) $(configkde) --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde build: build-stamp @@ -65,7 +65,7 @@ build-stamp: config.status dh_testdir # Add here commands to compile the package. - env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde $(MAKE) + env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde $(MAKE) touch build-stamp @@ -94,7 +94,7 @@ install: build dh_clean -k # Add here commands to install the package into debian/kmyfirewall. - env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde $(MAKE) install DESTDIR=$(CURDIR)/debian/kmyfirewall-trinity + env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde $(MAKE) install DESTDIR=$(CURDIR)/debian/kmyfirewall-trinity rm -f debian/kmyfirewall-trinity/opt/trinity/lib/*.so chrpath -d debian/kmyfirewall-trinity/opt/trinity/bin/kmyfirewall debian/kmyfirewall-trinity/opt/trinity/lib/*.so.* debian/kmyfirewall-trinity/opt/trinity/lib/trinity/*.so diff --git a/debian/lenny/applications/kmymoney/debian/cdbs/kde.mk b/debian/lenny/applications/kmymoney/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/lenny/applications/kmymoney/debian/cdbs/kde.mk +++ b/debian/lenny/applications/kmymoney/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/lenny/applications/kmymoney/debian/kmymoney2-trinity-dev.install b/debian/lenny/applications/kmymoney/debian/kmymoney2-trinity-dev.install index 4c3b73990..f8c5dc4e3 100644 --- a/debian/lenny/applications/kmymoney/debian/kmymoney2-trinity-dev.install +++ b/debian/lenny/applications/kmymoney/debian/kmymoney2-trinity-dev.install @@ -1,3 +1,3 @@ -opt/trinity/include/kde/kmymoney/* +opt/trinity/include/tde/kmymoney/* opt/trinity/lib/lib*.la opt/trinity/lib/lib*.so diff --git a/debian/lenny/applications/kmymoney/debian/rules b/debian/lenny/applications/kmymoney/debian/rules index efb7a96ea..1bb4dc1bf 100755 --- a/debian/lenny/applications/kmymoney/debian/rules +++ b/debian/lenny/applications/kmymoney/debian/rules @@ -4,14 +4,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde --disable-sqlite3 +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde --disable-sqlite3 LDFLAGS += -Wl,--as-needed diff --git a/debian/lenny/applications/knemo/debian/cdbs/kde.mk b/debian/lenny/applications/knemo/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/lenny/applications/knemo/debian/cdbs/kde.mk +++ b/debian/lenny/applications/knemo/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/lenny/applications/knemo/debian/rules b/debian/lenny/applications/knemo/debian/rules index 143b4cd5e..fd71fe17f 100755 --- a/debian/lenny/applications/knemo/debian/rules +++ b/debian/lenny/applications/knemo/debian/rules @@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include debian/cdbs/kde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 @@ -13,7 +13,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_INSTALL_DOCS_knemo = -XNEWS -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde post-patches:: debian/stamp-bootstrap diff --git a/debian/lenny/applications/knetload/debian/rules b/debian/lenny/applications/knetload/debian/rules index c0beba707..843a04ceb 100755 --- a/debian/lenny/applications/knetload/debian/rules +++ b/debian/lenny/applications/knetload/debian/rules @@ -2,7 +2,7 @@ # Sample debian/rules that uses debhelper. # GNU copyright 1997 to 1999 by Joey Hess. -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 @@ -74,7 +74,7 @@ configure-stamp: # run configure with build tree $(objdir) cd $(objdir) && \ - ../configure $(configkde) --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde + ../configure $(configkde) --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde touch configure-stamp diff --git a/debian/lenny/applications/knetstats/debian/cdbs/kde.mk b/debian/lenny/applications/knetstats/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/lenny/applications/knetstats/debian/cdbs/kde.mk +++ b/debian/lenny/applications/knetstats/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/lenny/applications/knetstats/debian/rules b/debian/lenny/applications/knetstats/debian/rules index 9d3414239..62349e5af 100755 --- a/debian/lenny/applications/knetstats/debian/rules +++ b/debian/lenny/applications/knetstats/debian/rules @@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include debian/cdbs/kde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/debian/lenny/applications/knetworkmanager8/debian/cdbs/kde.mk b/debian/lenny/applications/knetworkmanager8/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/lenny/applications/knetworkmanager8/debian/cdbs/kde.mk +++ b/debian/lenny/applications/knetworkmanager8/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/lenny/applications/knetworkmanager8/debian/rules b/debian/lenny/applications/knetworkmanager8/debian/rules index 97955e38b..e2e99d9d9 100755 --- a/debian/lenny/applications/knetworkmanager8/debian/rules +++ b/debian/lenny/applications/knetworkmanager8/debian/rules @@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/patchsys-quilt.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/debian/lenny/applications/knights/debian/debiandirs b/debian/lenny/applications/knights/debian/debiandirs index d341195a1..ba70ea3fb 100644 --- a/debian/lenny/applications/knights/debian/debiandirs +++ b/debian/lenny/applications/knights/debian/debiandirs @@ -1,6 +1,6 @@ export kde_prefix=/usr export sysconfdir=/etc -export kde_includedir=/usr/include/kde +export kde_includedir=/usr/include/tde export infodir=/usr/share/info export mandir=/usr/share/man export qtdir=/usr/share/qt3 diff --git a/debian/lenny/applications/knights/debian/rules b/debian/lenny/applications/knights/debian/rules index d7e8330c7..fc447c09a 100755 --- a/debian/lenny/applications/knights/debian/rules +++ b/debian/lenny/applications/knights/debian/rules @@ -6,7 +6,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 @@ -51,7 +51,7 @@ config.status: configure patch if [ -f doc/Makefile.in ]; then cp doc/Makefile.in doc/Makefile.in.backup; else mv doc/Makefile.in.backup doc/Makefile.in; fi CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \ - --disable-debug --disable-rpath --sysconfdir=/etc --includedir=/opt/trinity/include/kde --infodir=/opt/trinity/share/info --mandir=/opt/trinity/share/man --with-qt-dir=/usr/share/qt3 --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib + --disable-debug --disable-rpath --sysconfdir=/etc --includedir=/opt/trinity/include/tde --infodir=/opt/trinity/share/info --mandir=/opt/trinity/share/man --with-qt-dir=/usr/share/qt3 --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib build: build-stamp diff --git a/debian/lenny/applications/knowit/debian/rules b/debian/lenny/applications/knowit/debian/rules index bd6992a4a..5af8a0aa8 100755 --- a/debian/lenny/applications/knowit/debian/rules +++ b/debian/lenny/applications/knowit/debian/rules @@ -7,7 +7,7 @@ DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/debian/lenny/applications/knutclient/debian/rules b/debian/lenny/applications/knutclient/debian/rules index 7e8adfc25..a7655e11e 100755 --- a/debian/lenny/applications/knutclient/debian/rules +++ b/debian/lenny/applications/knutclient/debian/rules @@ -11,7 +11,7 @@ DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/debian/lenny/applications/koffice/debian/cdbs/kde.mk b/debian/lenny/applications/koffice/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/lenny/applications/koffice/debian/cdbs/kde.mk +++ b/debian/lenny/applications/koffice/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/lenny/applications/koffice/debian/koffice-dev-trinity.install b/debian/lenny/applications/koffice/debian/koffice-dev-trinity.install index 936153c99..4b80b83ec 100644 --- a/debian/lenny/applications/koffice/debian/koffice-dev-trinity.install +++ b/debian/lenny/applications/koffice/debian/koffice-dev-trinity.install @@ -1,4 +1,4 @@ -debian/tmp/opt/trinity/include/kde +debian/tmp/opt/trinity/include/tde debian/tmp/opt/trinity/lib/libkarboncommon.la debian/tmp/opt/trinity/lib/libkarboncommon.so debian/tmp/opt/trinity/lib/libkchartcommon.la diff --git a/debian/lenny/applications/koffice/debian/rules b/debian/lenny/applications/koffice/debian/rules index 9bc0b9c76..0c94bbdc9 100755 --- a/debian/lenny/applications/koffice/debian/rules +++ b/debian/lenny/applications/koffice/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/debian/lenny/applications/konversation/debian/cdbs/kde.mk b/debian/lenny/applications/konversation/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/lenny/applications/konversation/debian/cdbs/kde.mk +++ b/debian/lenny/applications/konversation/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/lenny/applications/konversation/debian/rules b/debian/lenny/applications/konversation/debian/rules index 67bc3bb74..359d5f809 100755 --- a/debian/lenny/applications/konversation/debian/rules +++ b/debian/lenny/applications/konversation/debian/rules @@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/patchsys-quilt.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 @@ -13,7 +13,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_DH_STRIP_ARGS := --dbg-package=konversation-trinity-dbg DEB_INSTALL_DOCS_ALL = -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde post-patches:: debian/stamp-bootstrap diff --git a/debian/lenny/applications/kopete-otr/debian/cdbs/kde.mk b/debian/lenny/applications/kopete-otr/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/lenny/applications/kopete-otr/debian/cdbs/kde.mk +++ b/debian/lenny/applications/kopete-otr/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/lenny/applications/kopete-otr/debian/rules b/debian/lenny/applications/kopete-otr/debian/rules index 8b49a1a4b..abfd36cfc 100755 --- a/debian/lenny/applications/kopete-otr/debian/rules +++ b/debian/lenny/applications/kopete-otr/debian/rules @@ -3,14 +3,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/kde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde post-patches:: debian/stamp-bootstrap diff --git a/debian/lenny/applications/kpicosim/debian/rules b/debian/lenny/applications/kpicosim/debian/rules index 3541dc742..8d66d9609 100755 --- a/debian/lenny/applications/kpicosim/debian/rules +++ b/debian/lenny/applications/kpicosim/debian/rules @@ -9,7 +9,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 @@ -52,7 +52,7 @@ build-stamp: config.status dh_testdir # Add here commands to compile the package. - env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde $(MAKE) + env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde $(MAKE) #docbook-to-man debian/kpicosim.sgml > kpicosim.1 touch build-stamp diff --git a/debian/lenny/applications/kpilot/debian/cdbs/kde.mk b/debian/lenny/applications/kpilot/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/lenny/applications/kpilot/debian/cdbs/kde.mk +++ b/debian/lenny/applications/kpilot/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/lenny/applications/kpilot/debian/rules b/debian/lenny/applications/kpilot/debian/rules index 8b49a1a4b..abfd36cfc 100755 --- a/debian/lenny/applications/kpilot/debian/rules +++ b/debian/lenny/applications/kpilot/debian/rules @@ -3,14 +3,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/kde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde post-patches:: debian/stamp-bootstrap diff --git a/debian/lenny/applications/kpowersave/debian/cdbs/kde.mk b/debian/lenny/applications/kpowersave/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/lenny/applications/kpowersave/debian/cdbs/kde.mk +++ b/debian/lenny/applications/kpowersave/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/lenny/applications/kpowersave/debian/rules b/debian/lenny/applications/kpowersave/debian/rules index 2c4fb87d0..49718160e 100755 --- a/debian/lenny/applications/kpowersave/debian/rules +++ b/debian/lenny/applications/kpowersave/debian/rules @@ -4,7 +4,7 @@ include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 @@ -12,7 +12,7 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_INSTALL_DOCS_ALL := AUTHORS NEWS -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde post-patches:: debian/stamp-bootstrap diff --git a/debian/lenny/applications/kradio/debian/rules b/debian/lenny/applications/kradio/debian/rules index a55c7fd87..4ec00e4dc 100755 --- a/debian/lenny/applications/kradio/debian/rules +++ b/debian/lenny/applications/kradio/debian/rules @@ -9,7 +9,7 @@ DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/debian/lenny/applications/krename/debian/rules b/debian/lenny/applications/krename/debian/rules index ece39aee4..86f185efb 100755 --- a/debian/lenny/applications/krename/debian/rules +++ b/debian/lenny/applications/krename/debian/rules @@ -6,14 +6,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde ### Libtool and Automake updates post-patches:: debian/stamp-autothings-update diff --git a/debian/lenny/applications/krusader/debian/cdbs/kde.mk b/debian/lenny/applications/krusader/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/lenny/applications/krusader/debian/cdbs/kde.mk +++ b/debian/lenny/applications/krusader/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/lenny/applications/krusader/debian/rules b/debian/lenny/applications/krusader/debian/rules index 9ff5fba71..139132dbb 100755 --- a/debian/lenny/applications/krusader/debian/rules +++ b/debian/lenny/applications/krusader/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 @@ -16,7 +16,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_DESTDIR = $(CURDIR)/debian/krusader-trinity/ -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde post-patches:: debian/stamp-bootstrap diff --git a/debian/lenny/applications/ksplash-engine-moodin/debian/debiandirs b/debian/lenny/applications/ksplash-engine-moodin/debian/debiandirs index 304c32ae4..58237d430 100644 --- a/debian/lenny/applications/ksplash-engine-moodin/debian/debiandirs +++ b/debian/lenny/applications/ksplash-engine-moodin/debian/debiandirs @@ -1,6 +1,6 @@ export kde_prefix=/opt/trinity export sysconfdir=/etc -export kde_includedir=/opt/trinity/include/kde +export kde_includedir=/opt/trinity/include/tde export infodir=/opt/trinity/share/info export mandir=/opt/trinity/share/man export qtdir=/opt/trinity/share/qt3 diff --git a/debian/lenny/applications/ksplash-engine-moodin/debian/rules b/debian/lenny/applications/ksplash-engine-moodin/debian/rules index 2b5a4f326..047b8ca76 100755 --- a/debian/lenny/applications/ksplash-engine-moodin/debian/rules +++ b/debian/lenny/applications/ksplash-engine-moodin/debian/rules @@ -4,7 +4,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 @@ -49,7 +49,7 @@ patch: patch-stamp config.status: configure patch dh_testdir - CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) $(configkde) --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde + CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) $(configkde) --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde build: build-stamp diff --git a/debian/lenny/applications/ksquirrel/debian/rules b/debian/lenny/applications/ksquirrel/debian/rules index aeeceb417..8f8161523 100755 --- a/debian/lenny/applications/ksquirrel/debian/rules +++ b/debian/lenny/applications/ksquirrel/debian/rules @@ -9,7 +9,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/debian/lenny/applications/kstreamripper/debian/rules b/debian/lenny/applications/kstreamripper/debian/rules index 319fe9f4a..27cc7e874 100755 --- a/debian/lenny/applications/kstreamripper/debian/rules +++ b/debian/lenny/applications/kstreamripper/debian/rules @@ -3,10 +3,10 @@ include /usr/share/cdbs/1/rules/debhelper.mk DEB_INSTALL_MANPAGES_kstreamripper:=debian/kstreamripper.1 build/kstreamripper:: - env PATH=/opt/trinity/bin:$(PATH) QTDIR=/usr/share/qt3 CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde DESTDIR=$(DEB_DESTDIR)/opt/trinity $(MAKE) + env PATH=/opt/trinity/bin:$(PATH) QTDIR=/usr/share/qt3 CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde DESTDIR=$(DEB_DESTDIR)/opt/trinity $(MAKE) install/kstreamripper:: - env PATH=/opt/trinity/bin:$(PATH) QTDIR=/usr/share/qt3 CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde $(MAKE) install + env PATH=/opt/trinity/bin:$(PATH) QTDIR=/usr/share/qt3 CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde $(MAKE) install mkdir -p $(DEB_DESTDIR)/opt/trinity/share/pixmaps/ mkdir -p $(DEB_DESTDIR)/opt/trinity/share/doc/HTML/ install -m 644 ./src/hi32-app-kstreamripper.png \ diff --git a/debian/lenny/applications/ksystemlog/debian/cdbs/kde.mk b/debian/lenny/applications/ksystemlog/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/lenny/applications/ksystemlog/debian/cdbs/kde.mk +++ b/debian/lenny/applications/ksystemlog/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/lenny/applications/ksystemlog/debian/rules b/debian/lenny/applications/ksystemlog/debian/rules index 115c9a97e..6571b56cb 100755 --- a/debian/lenny/applications/ksystemlog/debian/rules +++ b/debian/lenny/applications/ksystemlog/debian/rules @@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 @@ -13,7 +13,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_INSTALL_MANPAGES_ksystemlog-trinity := ksystemlog.1 -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde post-patches:: debian/stamp-bootstrap diff --git a/debian/lenny/applications/ktechlab/debian/debiandirs b/debian/lenny/applications/ktechlab/debian/debiandirs index d35ab77aa..dfe8aa8ab 100644 --- a/debian/lenny/applications/ktechlab/debian/debiandirs +++ b/debian/lenny/applications/ktechlab/debian/debiandirs @@ -1,7 +1,7 @@ export kde_confdir=/etc/trinity export kde_prefix=/opt/trinity export kde_bindir=/opt/trinity/bin -export kde_includedir=/opt/trinity/include/kde +export kde_includedir=/opt/trinity/include/tde export kde_libdir=/opt/trinity/lib export kde_cgidir=/opt/trinity/lib/cgi-bin export kde_moduledir=/opt/trinity/lib/trinity diff --git a/debian/lenny/applications/ktechlab/debian/rules b/debian/lenny/applications/ktechlab/debian/rules index cadc4e546..1e1e53c9c 100755 --- a/debian/lenny/applications/ktechlab/debian/rules +++ b/debian/lenny/applications/ktechlab/debian/rules @@ -5,7 +5,7 @@ -include debian/debiandirs -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 @@ -45,7 +45,7 @@ endif ifneq "$(wildcard /usr/share/misc/config.guess)" "" cp -f /usr/share/misc/config.guess config.guess endif - PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) $(configkde) --prefix=/opt/trinity + PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) $(configkde) --prefix=/opt/trinity build: build-stamp debian/ktechlab.xpm @@ -55,7 +55,7 @@ build-stamp: config.status make -f admin/Makefile.common cvs touch debian/stamp-bootstrap - env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde $(MAKE) + env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde $(MAKE) touch build-stamp clean: @@ -85,8 +85,8 @@ install: build dh_testroot dh_clean -k dh_installdirs - env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde $(MAKE) install DESTDIR=$(CURDIR)/debian/ktechlab-trinity - env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde $(MAKE) -C po install DESTDIR=$(CURDIR)/debian/ktechlab-trinity + env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde $(MAKE) install DESTDIR=$(CURDIR)/debian/ktechlab-trinity + env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde $(MAKE) -C po install DESTDIR=$(CURDIR)/debian/ktechlab-trinity install -D -m 644 debian/ktechlab.xpm debian/ktechlab-trinity/opt/trinity/share/pixmaps/ktechlab.xpm chrpath -d $(CURDIR)/debian/ktechlab-trinity/opt/trinity/bin/ktechlab chrpath -d $(CURDIR)/debian/ktechlab-trinity/opt/trinity/bin/microbe diff --git a/debian/lenny/applications/ktorrent/debian/cdbs/kde.mk b/debian/lenny/applications/ktorrent/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/lenny/applications/ktorrent/debian/cdbs/kde.mk +++ b/debian/lenny/applications/ktorrent/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/lenny/applications/ktorrent/debian/rules b/debian/lenny/applications/ktorrent/debian/rules index 46a8b920a..5590816c2 100755 --- a/debian/lenny/applications/ktorrent/debian/rules +++ b/debian/lenny/applications/ktorrent/debian/rules @@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include debian/cdbs/debian-qt-kde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 @@ -13,7 +13,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_INSTALL_MANPAGES_ktorrent = ktorrent.1 -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde build/ktorrent-trinity:: docbook2x-man debian/ktorrent.1.docbook diff --git a/debian/lenny/applications/kuickshow/debian/cdbs/kde.mk b/debian/lenny/applications/kuickshow/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/lenny/applications/kuickshow/debian/cdbs/kde.mk +++ b/debian/lenny/applications/kuickshow/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/lenny/applications/kuickshow/debian/rules b/debian/lenny/applications/kuickshow/debian/rules index 6b1798055..191172fdc 100755 --- a/debian/lenny/applications/kuickshow/debian/rules +++ b/debian/lenny/applications/kuickshow/debian/rules @@ -5,14 +5,14 @@ include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde post-patches:: debian/stamp-bootstrap diff --git a/debian/lenny/applications/kvirc/debian/rules b/debian/lenny/applications/kvirc/debian/rules index a0130f2ac..bd103aecd 100755 --- a/debian/lenny/applications/kvirc/debian/rules +++ b/debian/lenny/applications/kvirc/debian/rules @@ -17,7 +17,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/autotools.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/debian/lenny/applications/kvkbd/debian/cdbs/kde.mk b/debian/lenny/applications/kvkbd/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/lenny/applications/kvkbd/debian/cdbs/kde.mk +++ b/debian/lenny/applications/kvkbd/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/lenny/applications/kvkbd/debian/rules b/debian/lenny/applications/kvkbd/debian/rules index 2aabc75db..305c1e4df 100755 --- a/debian/lenny/applications/kvkbd/debian/rules +++ b/debian/lenny/applications/kvkbd/debian/rules @@ -4,14 +4,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde makebuilddir/kvkbd-trinity:: make -f Makefile.cvs diff --git a/debian/lenny/applications/kvpnc/debian/rules b/debian/lenny/applications/kvpnc/debian/rules index 8e7f6fc6f..00d853fcc 100755 --- a/debian/lenny/applications/kvpnc/debian/rules +++ b/debian/lenny/applications/kvpnc/debian/rules @@ -8,14 +8,14 @@ include /usr/share/cdbs/1/rules/utils.mk DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--as-needed" DEB_INSTALL_MANPAGES_kvpnc-trinity := debian/kvpnc-trinity.1 -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde makebuilddir/kvpnc-trinity:: cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in diff --git a/debian/lenny/applications/piklab/debian/rules b/debian/lenny/applications/piklab/debian/rules index ba5677a64..e0a25dd7f 100755 --- a/debian/lenny/applications/piklab/debian/rules +++ b/debian/lenny/applications/piklab/debian/rules @@ -3,7 +3,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 @@ -48,7 +48,7 @@ endif ./configure CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs -Wl,--as-needed" \ --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \ --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib \ - --with-extra-includes=/opt/trinity/include/kde \ + --with-extra-includes=/opt/trinity/include/tde \ --mandir=/opt/trinity/share/man --infodir=/opt/trinity/share/info --enable-rpath touch $@ diff --git a/debian/lenny/applications/potracegui/debian/rules b/debian/lenny/applications/potracegui/debian/rules index 4eeace3c8..6be58cd48 100755 --- a/debian/lenny/applications/potracegui/debian/rules +++ b/debian/lenny/applications/potracegui/debian/rules @@ -11,7 +11,7 @@ DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/debian/lenny/applications/smb4k/debian/cdbs/kde.mk b/debian/lenny/applications/smb4k/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/lenny/applications/smb4k/debian/cdbs/kde.mk +++ b/debian/lenny/applications/smb4k/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/lenny/applications/smb4k/debian/rules b/debian/lenny/applications/smb4k/debian/rules index a7f5808ef..db6aa90dd 100755 --- a/debian/lenny/applications/smb4k/debian/rules +++ b/debian/lenny/applications/smb4k/debian/rules @@ -7,7 +7,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/autotools.mk include debian/cdbs/kde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/debian/lenny/applications/soundkonverter/debian/cdbs/kde.mk b/debian/lenny/applications/soundkonverter/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/lenny/applications/soundkonverter/debian/cdbs/kde.mk +++ b/debian/lenny/applications/soundkonverter/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/lenny/applications/soundkonverter/debian/rules b/debian/lenny/applications/soundkonverter/debian/rules index 16846b152..831240224 100755 --- a/debian/lenny/applications/soundkonverter/debian/rules +++ b/debian/lenny/applications/soundkonverter/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/patchsys-quilt.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 @@ -14,7 +14,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/debian/lenny/applications/tde-guidance/debian/rules b/debian/lenny/applications/tde-guidance/debian/rules index f3f46453f..e21db2b6b 100755 --- a/debian/lenny/applications/tde-guidance/debian/rules +++ b/debian/lenny/applications/tde-guidance/debian/rules @@ -12,7 +12,7 @@ DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp DEB_UPDATE_RCD_PARAMS := multiuser DEB_INSTALL_MANPAGES_tde-guidance-trinity := debian/displayconfig-trinity.1 debian/mountconfig-trinity.1 debian/serviceconfig-trinity.1 debian/userconfig-trinity.1 PYSUPPORT_PATH = $(DEB_DESTDIR)/opt/trinity/share/python-support -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde LDFLAGS_APPEND := -L/opt/trinity/lib install/tde-guidance-trinity:: diff --git a/debian/lenny/applications/tde-style-lipstik/debian/rules b/debian/lenny/applications/tde-style-lipstik/debian/rules index c25c8d5bd..b20ff9228 100755 --- a/debian/lenny/applications/tde-style-lipstik/debian/rules +++ b/debian/lenny/applications/tde-style-lipstik/debian/rules @@ -9,7 +9,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 @@ -37,7 +37,7 @@ config.status: patch configure CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \ --prefix=/opt/trinity --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info \ --disable-debug --enable-final \ - --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde + --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde # --with-qt-includes=/usr/include/qt3 --with-qt-libraries=/usr/lib/qt3/ build: build-stamp diff --git a/debian/lenny/applications/tde-systemsettings/debian/cdbs/kde.mk b/debian/lenny/applications/tde-systemsettings/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/lenny/applications/tde-systemsettings/debian/cdbs/kde.mk +++ b/debian/lenny/applications/tde-systemsettings/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/lenny/applications/tde-systemsettings/debian/rules b/debian/lenny/applications/tde-systemsettings/debian/rules index 82d5c2429..588264407 100755 --- a/debian/lenny/applications/tde-systemsettings/debian/rules +++ b/debian/lenny/applications/tde-systemsettings/debian/rules @@ -6,7 +6,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include debian/cdbs/kde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/debian/lenny/applications/tdesudo/debian/cdbs/kde.mk b/debian/lenny/applications/tdesudo/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/lenny/applications/tdesudo/debian/cdbs/kde.mk +++ b/debian/lenny/applications/tdesudo/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/lenny/applications/tdesudo/debian/rules b/debian/lenny/applications/tdesudo/debian/rules index f3b2afb13..5a63a69a9 100755 --- a/debian/lenny/applications/tdesudo/debian/rules +++ b/debian/lenny/applications/tdesudo/debian/rules @@ -4,14 +4,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include debian/cdbs/kde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde DEB_INSTALL_MANPAGES_tdesudo-trinity = tdesudo-trinity.1 diff --git a/debian/lenny/applications/tdmtheme/debian/cdbs/kde.mk b/debian/lenny/applications/tdmtheme/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/lenny/applications/tdmtheme/debian/cdbs/kde.mk +++ b/debian/lenny/applications/tdmtheme/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/lenny/applications/tdmtheme/debian/rules b/debian/lenny/applications/tdmtheme/debian/rules index 0eb4fad95..8e74fc2cb 100755 --- a/debian/lenny/applications/tdmtheme/debian/rules +++ b/debian/lenny/applications/tdmtheme/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/patchsys-quilt.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 @@ -13,7 +13,7 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--as-needed" -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde post-patches:: debian/stamp-bootstrap diff --git a/debian/lenny/applications/tellico/debian/rules b/debian/lenny/applications/tellico/debian/rules index e22c0c6f2..b21fb6bd9 100755 --- a/debian/lenny/applications/tellico/debian/rules +++ b/debian/lenny/applications/tellico/debian/rules @@ -5,7 +5,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/debian/lenny/applications/twin-style-crystal/debian/cdbs/kde.mk b/debian/lenny/applications/twin-style-crystal/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/lenny/applications/twin-style-crystal/debian/cdbs/kde.mk +++ b/debian/lenny/applications/twin-style-crystal/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/lenny/applications/twin-style-crystal/debian/rules b/debian/lenny/applications/twin-style-crystal/debian/rules index 5e522ca06..8cda3384a 100755 --- a/debian/lenny/applications/twin-style-crystal/debian/rules +++ b/debian/lenny/applications/twin-style-crystal/debian/rules @@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/debian/lenny/applications/yakuake/debian/cdbs/kde.mk b/debian/lenny/applications/yakuake/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/lenny/applications/yakuake/debian/cdbs/kde.mk +++ b/debian/lenny/applications/yakuake/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/lenny/applications/yakuake/debian/rules b/debian/lenny/applications/yakuake/debian/rules index 176f45bc3..f5bd922f5 100755 --- a/debian/lenny/applications/yakuake/debian/rules +++ b/debian/lenny/applications/yakuake/debian/rules @@ -3,7 +3,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/kde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/debian/lenny/dependencies/arts/debian/rules b/debian/lenny/dependencies/arts/debian/rules index c6720ab40..95cd29258 100755 --- a/debian/lenny/dependencies/arts/debian/rules +++ b/debian/lenny/dependencies/arts/debian/rules @@ -14,7 +14,7 @@ include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk include debian/cdbs/debian-qt-kde.mk -DEB_CMAKE_EXTRA_FLAGS := -DPKGCONFIG_INSTALL_DIR="/usr/lib/pkgconfig" -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/kde" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" -DWITH_GCC_VISIBILITY="ON" +DEB_CMAKE_EXTRA_FLAGS := -DPKGCONFIG_INSTALL_DIR="/usr/lib/pkgconfig" -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/tde" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" -DWITH_GCC_VISIBILITY="ON" # Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to # never build in parallel, regardless of DEB_BUILD_OPTIONS. diff --git a/debian/lenny/libraries/kipi-plugins/debian/cdbs/kde.mk b/debian/lenny/libraries/kipi-plugins/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/lenny/libraries/kipi-plugins/debian/cdbs/kde.mk +++ b/debian/lenny/libraries/kipi-plugins/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/lenny/libraries/kipi-plugins/debian/rules b/debian/lenny/libraries/kipi-plugins/debian/rules index ec3d9a4a3..e277fb614 100755 --- a/debian/lenny/libraries/kipi-plugins/debian/rules +++ b/debian/lenny/libraries/kipi-plugins/debian/rules @@ -9,7 +9,7 @@ include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/patchsys-quilt.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 @@ -18,7 +18,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--as-needed" -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde clean :: rm -f po/*/*.gmo diff --git a/debian/lenny/libraries/libkdcraw/debian/cdbs/kde.mk b/debian/lenny/libraries/libkdcraw/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/lenny/libraries/libkdcraw/debian/cdbs/kde.mk +++ b/debian/lenny/libraries/libkdcraw/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/lenny/libraries/libkdcraw/debian/rules b/debian/lenny/libraries/libkdcraw/debian/rules index 0606b98a9..7785e4bcc 100755 --- a/debian/lenny/libraries/libkdcraw/debian/rules +++ b/debian/lenny/libraries/libkdcraw/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/patchsys-quilt.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/debian/lenny/libraries/libkexiv2/debian/cdbs/kde.mk b/debian/lenny/libraries/libkexiv2/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/lenny/libraries/libkexiv2/debian/cdbs/kde.mk +++ b/debian/lenny/libraries/libkexiv2/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/lenny/libraries/libkexiv2/debian/rules b/debian/lenny/libraries/libkexiv2/debian/rules index dc80327f0..28a1c06e8 100755 --- a/debian/lenny/libraries/libkexiv2/debian/rules +++ b/debian/lenny/libraries/libkexiv2/debian/rules @@ -8,7 +8,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/debian/lenny/libraries/libkipi/debian/cdbs/kde.mk b/debian/lenny/libraries/libkipi/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/lenny/libraries/libkipi/debian/cdbs/kde.mk +++ b/debian/lenny/libraries/libkipi/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/lenny/libraries/libkipi/debian/rules b/debian/lenny/libraries/libkipi/debian/rules index 903f7c7b1..94eb41df3 100755 --- a/debian/lenny/libraries/libkipi/debian/rules +++ b/debian/lenny/libraries/libkipi/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/debian/lenny/libraries/libksquirrel/debian/rules b/debian/lenny/libraries/libksquirrel/debian/rules index fa3c9c335..fa07f7f8c 100755 --- a/debian/lenny/libraries/libksquirrel/debian/rules +++ b/debian/lenny/libraries/libksquirrel/debian/rules @@ -9,7 +9,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/debian/lenny/libraries/mlt++/debian/rules b/debian/lenny/libraries/mlt++/debian/rules index cf8cb1984..0232c83be 100755 --- a/debian/lenny/libraries/mlt++/debian/rules +++ b/debian/lenny/libraries/mlt++/debian/rules @@ -3,7 +3,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/debian/lenny/libraries/mlt/debian/rules b/debian/lenny/libraries/mlt/debian/rules index 771793fff..3889b6a3a 100755 --- a/debian/lenny/libraries/mlt/debian/rules +++ b/debian/lenny/libraries/mlt/debian/rules @@ -3,7 +3,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 @@ -47,10 +47,10 @@ configure-stamp: QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2 - CFLAGS="$(CFLAGS)" PATH=/opt/trinity/bin:$(PATH) LD_LIBRARY_PATH=/opt/trinity/lib:$(LD_LIBRARY_PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde ./configure --enable-gpl \ + CFLAGS="$(CFLAGS)" PATH=/opt/trinity/bin:$(PATH) LD_LIBRARY_PATH=/opt/trinity/lib:$(LD_LIBRARY_PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde ./configure --enable-gpl \ --luma-compress --disable-mmx $(CONFIGURE_OPTS) \ --avformat-shared=/usr --avformat-swscale \ - --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde + --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde touch configure-stamp @@ -58,7 +58,7 @@ build: configure-stamp build-stamp build-stamp: dh_testdir - env PATH=/opt/trinity/bin:$(PATH) LD_LIBRARY_PATH=/opt/trinity/lib:$(LD_LIBRARY_PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde $(MAKE) -j $(NCPUS) + env PATH=/opt/trinity/bin:$(PATH) LD_LIBRARY_PATH=/opt/trinity/lib:$(LD_LIBRARY_PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde $(MAKE) -j $(NCPUS) touch build-stamp @@ -81,7 +81,7 @@ install: build dh_clean -k dh_installdirs opt/trinity/lib/mlt0.2.5/modules opt/trinity/share/mlt0.2.5 - env PATH=/opt/trinity/bin:$(PATH) LD_LIBRARY_PATH=/opt/trinity/lib:$(LD_LIBRARY_PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp + env PATH=/opt/trinity/bin:$(PATH) LD_LIBRARY_PATH=/opt/trinity/lib:$(LD_LIBRARY_PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp # mkdir debian/tmp/opt/trinity # mv debian/tmp/opt/trinity/lib debian/tmp/opt/trinity/ diff --git a/debian/lenny/libraries/pytdeextensions/debian/libpythonize0-trinity-dev.install b/debian/lenny/libraries/pytdeextensions/debian/libpythonize0-trinity-dev.install index f50fc4e15..d7e5bd651 100644 --- a/debian/lenny/libraries/pytdeextensions/debian/libpythonize0-trinity-dev.install +++ b/debian/lenny/libraries/pytdeextensions/debian/libpythonize0-trinity-dev.install @@ -1,4 +1,4 @@ -opt/trinity/include/kde/pythonize.h +opt/trinity/include/tde/pythonize.h opt/trinity/lib/libpythonize.a opt/trinity/lib/libpythonize.la opt/trinity/lib/libpythonize.so diff --git a/debian/lenny/libraries/pytdeextensions/debian/rules b/debian/lenny/libraries/pytdeextensions/debian/rules index 1acb32f7d..4dcfaaae8 100755 --- a/debian/lenny/libraries/pytdeextensions/debian/rules +++ b/debian/lenny/libraries/pytdeextensions/debian/rules @@ -8,7 +8,7 @@ include debian/python-distutils-jaunty.mk include /usr/share/cdbs/1/rules/patchsys-quilt.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 @@ -16,7 +16,7 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde install/pytdeextensions-trinity:: # We have no idea if the built product is site-packages or dist-packages @@ -45,8 +45,8 @@ install/libpythonize0-trinity:: # fix binary-or-shlib-defines-rpath chrpath -d debian/tmp/opt/trinity/lib/libpythonize.so.* # fix include directory location - mkdir -p debian/tmp/opt/trinity/include/kde - mv debian/tmp/opt/trinity/include/*.h debian/tmp/opt/trinity/include/kde + mkdir -p debian/tmp/opt/trinity/include/tde + mv debian/tmp/opt/trinity/include/*.h debian/tmp/opt/trinity/include/tde clean:: rm -rf build diff --git a/debian/lenny/tde-i18n/debian/debiandirs b/debian/lenny/tde-i18n/debian/debiandirs index ba667b86e..2d0da0c80 100644 --- a/debian/lenny/tde-i18n/debian/debiandirs +++ b/debian/lenny/tde-i18n/debian/debiandirs @@ -1,6 +1,6 @@ export kde_prefix=/opt/trinity export sysconfdir=/etc -export kde_includedir=/opt/trinity/include/kde +export kde_includedir=/opt/trinity/include/tde export infodir=/opt/trinity/share/info export mandir=/opt/trinity/share/man export qtdir=/opt/trinity/share/qt3 diff --git a/debian/lenny/tde-i18n/debian/rules b/debian/lenny/tde-i18n/debian/rules index f49804687..e275e35df 100755 --- a/debian/lenny/tde-i18n/debian/rules +++ b/debian/lenny/tde-i18n/debian/rules @@ -24,7 +24,7 @@ I18N_INSTALL := $(patsubst $(I18N_DIR_PAT),install__%,$(I18N_DIRS)) -include debian/debiandirs -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/debian/lenny/tdeaccessibility/debian/cdbs/kde.mk b/debian/lenny/tdeaccessibility/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/lenny/tdeaccessibility/debian/cdbs/kde.mk +++ b/debian/lenny/tdeaccessibility/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/lenny/tdeaccessibility/debian/ksayit-trinity.install b/debian/lenny/tdeaccessibility/debian/ksayit-trinity.install index 2f5be2460..f4a7297c0 100644 --- a/debian/lenny/tdeaccessibility/debian/ksayit-trinity.install +++ b/debian/lenny/tdeaccessibility/debian/ksayit-trinity.install @@ -1,5 +1,5 @@ debian/tmp/opt/trinity/bin/ksayit -debian/tmp/opt/trinity/include/kde/ksayit_fxplugin.h +debian/tmp/opt/trinity/include/tde/ksayit_fxplugin.h debian/tmp/opt/trinity/lib/trinity/libFreeverb_plugin.la debian/tmp/opt/trinity/lib/trinity/libFreeverb_plugin.so debian/tmp/opt/trinity/lib/libKTTSD_Lib.la diff --git a/debian/lenny/tdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff b/debian/lenny/tdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff index 0caf5361a..c02687784 100644 --- a/debian/lenny/tdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/lenny/tdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/opt/trinity/include/kde/kde.pot ++kdepotpath=/opt/trinity/include/tde/kde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/debian/lenny/tdeaccessibility/debian/rules b/debian/lenny/tdeaccessibility/debian/rules index 0f40f42e0..ce879ebd4 100755 --- a/debian/lenny/tdeaccessibility/debian/rules +++ b/debian/lenny/tdeaccessibility/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/debian/lenny/tdeaddons/debian/cdbs/kde.mk b/debian/lenny/tdeaddons/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/lenny/tdeaddons/debian/cdbs/kde.mk +++ b/debian/lenny/tdeaddons/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/lenny/tdeaddons/debian/patches/common/kubuntu_01_kdepot.diff b/debian/lenny/tdeaddons/debian/patches/common/kubuntu_01_kdepot.diff index 0caf5361a..c02687784 100644 --- a/debian/lenny/tdeaddons/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/lenny/tdeaddons/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/opt/trinity/include/kde/kde.pot ++kdepotpath=/opt/trinity/include/tde/kde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/debian/lenny/tdeaddons/debian/rules b/debian/lenny/tdeaddons/debian/rules index c872980f3..5d337bfab 100755 --- a/debian/lenny/tdeaddons/debian/rules +++ b/debian/lenny/tdeaddons/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/debian/lenny/tdeadmin/debian/cdbs/kde.mk b/debian/lenny/tdeadmin/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/lenny/tdeadmin/debian/cdbs/kde.mk +++ b/debian/lenny/tdeadmin/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/lenny/tdeadmin/debian/patches/common/kubuntu_01_kdepot.diff b/debian/lenny/tdeadmin/debian/patches/common/kubuntu_01_kdepot.diff index 0caf5361a..c02687784 100644 --- a/debian/lenny/tdeadmin/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/lenny/tdeadmin/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/opt/trinity/include/kde/kde.pot ++kdepotpath=/opt/trinity/include/tde/kde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/debian/lenny/tdeadmin/debian/rules b/debian/lenny/tdeadmin/debian/rules index 19e9ac01b..9c9ccadda 100755 --- a/debian/lenny/tdeadmin/debian/rules +++ b/debian/lenny/tdeadmin/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/debian/lenny/tdeartwork/debian/cdbs/kde.mk b/debian/lenny/tdeartwork/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/lenny/tdeartwork/debian/cdbs/kde.mk +++ b/debian/lenny/tdeartwork/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/lenny/tdeartwork/debian/rules b/debian/lenny/tdeartwork/debian/rules index 3e16d1ff2..82a71627a 100755 --- a/debian/lenny/tdeartwork/debian/rules +++ b/debian/lenny/tdeartwork/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/debian/lenny/tdebindings/debian/cdbs/kde.mk b/debian/lenny/tdebindings/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/lenny/tdebindings/debian/cdbs/kde.mk +++ b/debian/lenny/tdebindings/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/lenny/tdebindings/debian/libkjsembed-trinity-dev.install b/debian/lenny/tdebindings/debian/libkjsembed-trinity-dev.install index 62a36de6e..540ad0ca2 100644 --- a/debian/lenny/tdebindings/debian/libkjsembed-trinity-dev.install +++ b/debian/lenny/tdebindings/debian/libkjsembed-trinity-dev.install @@ -1,4 +1,4 @@ -debian/tmp/opt/trinity/include/kde/kjsembed/* +debian/tmp/opt/trinity/include/tde/kjsembed/* debian/tmp/opt/trinity/lib/libkjsembed.so debian/tmp/opt/trinity/lib/libkjsembed.la diff --git a/debian/lenny/tdebindings/debian/libsmokeqt-trinity-dev.install b/debian/lenny/tdebindings/debian/libsmokeqt-trinity-dev.install index 2904a6815..99a21c1de 100644 --- a/debian/lenny/tdebindings/debian/libsmokeqt-trinity-dev.install +++ b/debian/lenny/tdebindings/debian/libsmokeqt-trinity-dev.install @@ -1,3 +1,3 @@ -debian/tmp/opt/trinity/include/kde/smoke.h +debian/tmp/opt/trinity/include/tde/smoke.h debian/tmp/opt/trinity/lib/libsmokeqt.so debian/tmp/opt/trinity/lib/libsmokeqt.la diff --git a/debian/lenny/tdebindings/debian/patches/common/kubuntu_01_kdepot.diff b/debian/lenny/tdebindings/debian/patches/common/kubuntu_01_kdepot.diff index 0caf5361a..c02687784 100644 --- a/debian/lenny/tdebindings/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/lenny/tdebindings/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/opt/trinity/include/kde/kde.pot ++kdepotpath=/opt/trinity/include/tde/kde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/debian/lenny/tdebindings/debian/rules b/debian/lenny/tdebindings/debian/rules index 6c5a7ddad..6498e0a4d 100755 --- a/debian/lenny/tdebindings/debian/rules +++ b/debian/lenny/tdebindings/debian/rules @@ -11,7 +11,7 @@ DEB_BUILDDIR := $(DEB_SRCDIR) include /usr/share/cdbs/1/rules/patchsys-quilt.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/debian/lenny/tdeedu/debian/cdbs/kde.mk b/debian/lenny/tdeedu/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/lenny/tdeedu/debian/cdbs/kde.mk +++ b/debian/lenny/tdeedu/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/lenny/tdeedu/debian/kstars-trinity.install b/debian/lenny/tdeedu/debian/kstars-trinity.install index 4db6bf7e7..61544b793 100644 --- a/debian/lenny/tdeedu/debian/kstars-trinity.install +++ b/debian/lenny/tdeedu/debian/kstars-trinity.install @@ -1,7 +1,7 @@ etc/trinity/kstarsrc opt/trinity/bin/kstars -/opt/trinity/include/kde/kstarsinterface.h -/opt/trinity/include/kde/simclockinterface.h +/opt/trinity/include/tde/kstarsinterface.h +/opt/trinity/include/tde/simclockinterface.h /opt/trinity/share/applications/kde/kstars.desktop /opt/trinity/share/config.kcfg/kstars.kcfg /opt/trinity/share/doc/kde/HTML/en/kstars/common diff --git a/debian/lenny/tdeedu/debian/libkiten-dev-trinity.install b/debian/lenny/tdeedu/debian/libkiten-dev-trinity.install index ca0848fd9..e64535480 100644 --- a/debian/lenny/tdeedu/debian/libkiten-dev-trinity.install +++ b/debian/lenny/tdeedu/debian/libkiten-dev-trinity.install @@ -1,3 +1,3 @@ -/opt/trinity/include/kde/libkiten +/opt/trinity/include/tde/libkiten opt/trinity/lib/libkiten.la opt/trinity/lib/libkiten.so diff --git a/debian/lenny/tdeedu/debian/libtdeedu-dev-trinity.install b/debian/lenny/tdeedu/debian/libtdeedu-dev-trinity.install index be3af1e7b..1695e3cf1 100644 --- a/debian/lenny/tdeedu/debian/libtdeedu-dev-trinity.install +++ b/debian/lenny/tdeedu/debian/libtdeedu-dev-trinity.install @@ -1,4 +1,4 @@ -/opt/trinity/include/kde/libtdeedu +/opt/trinity/include/tde/libtdeedu opt/trinity/lib/libextdate.la opt/trinity/lib/libextdate.so opt/trinity/lib/libtdeeducore.la diff --git a/debian/lenny/tdeedu/debian/patches/common/kubuntu_01_kdepot.diff b/debian/lenny/tdeedu/debian/patches/common/kubuntu_01_kdepot.diff index 0caf5361a..c02687784 100644 --- a/debian/lenny/tdeedu/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/lenny/tdeedu/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/opt/trinity/include/kde/kde.pot ++kdepotpath=/opt/trinity/include/tde/kde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/debian/lenny/tdeedu/debian/rules b/debian/lenny/tdeedu/debian/rules index b19d3d32f..059005f50 100755 --- a/debian/lenny/tdeedu/debian/rules +++ b/debian/lenny/tdeedu/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 @@ -14,7 +14,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_DH_INSTALL_SOURCEDIR := $(DEB_DESTDIR) -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --includedir="/opt/trinity/include/kde" --mandir="/opt/trinity/share/man" --infodir="/opt/trinity/share/info" +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --includedir="/opt/trinity/include/tde" --mandir="/opt/trinity/share/man" --infodir="/opt/trinity/share/info" # Ensure that kig's python scripting built successfully. common-build-arch:: diff --git a/debian/lenny/tdegames/debian/atlantik-trinity-dev.install b/debian/lenny/tdegames/debian/atlantik-trinity-dev.install index b9052ce9a..b7dea632a 100644 --- a/debian/lenny/tdegames/debian/atlantik-trinity-dev.install +++ b/debian/lenny/tdegames/debian/atlantik-trinity-dev.install @@ -1,5 +1,5 @@ -/opt/trinity/include/kde/atlantik -/opt/trinity/include/kde/atlantic +/opt/trinity/include/tde/atlantik +/opt/trinity/include/tde/atlantic /opt/trinity/lib/libatlantic.so /opt/trinity/lib/libatlantikclient.so /opt/trinity/lib/libatlantikui.so diff --git a/debian/lenny/tdegames/debian/cdbs/kde.mk b/debian/lenny/tdegames/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/lenny/tdegames/debian/cdbs/kde.mk +++ b/debian/lenny/tdegames/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/lenny/tdegames/debian/kolf-trinity-dev.install b/debian/lenny/tdegames/debian/kolf-trinity-dev.install index 4da86d1b2..ff0a2b177 100644 --- a/debian/lenny/tdegames/debian/kolf-trinity-dev.install +++ b/debian/lenny/tdegames/debian/kolf-trinity-dev.install @@ -1,2 +1,2 @@ -/opt/trinity/include/kde/kolf +/opt/trinity/include/tde/kolf /opt/trinity/lib/libkolf.so diff --git a/debian/lenny/tdegames/debian/libtdegames-trinity-dev.install b/debian/lenny/tdegames/debian/libtdegames-trinity-dev.install index 354fa3840..eca00d487 100644 --- a/debian/lenny/tdegames/debian/libtdegames-trinity-dev.install +++ b/debian/lenny/tdegames/debian/libtdegames-trinity-dev.install @@ -1,4 +1,4 @@ -/opt/trinity/include/kde/*.h -/opt/trinity/include/kde/kgame +/opt/trinity/include/tde/*.h +/opt/trinity/include/tde/kgame /opt/trinity/lib/libtdegames.so /opt/trinity/lib/libtdegames.la diff --git a/debian/lenny/tdegames/debian/patches/common/kubuntu_01_kdepot.diff b/debian/lenny/tdegames/debian/patches/common/kubuntu_01_kdepot.diff index 0caf5361a..c02687784 100644 --- a/debian/lenny/tdegames/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/lenny/tdegames/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/opt/trinity/include/kde/kde.pot ++kdepotpath=/opt/trinity/include/tde/kde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/debian/lenny/tdegames/debian/rules b/debian/lenny/tdegames/debian/rules index 0ba5f21cb..5a24cd5ae 100755 --- a/debian/lenny/tdegames/debian/rules +++ b/debian/lenny/tdegames/debian/rules @@ -7,7 +7,7 @@ include /usr/share/cdbs/1/rules/utils.mk export kde_bindir = /opt/trinity/games -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/debian/lenny/tdegraphics/debian/cdbs/kde.mk b/debian/lenny/tdegraphics/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/lenny/tdegraphics/debian/cdbs/kde.mk +++ b/debian/lenny/tdegraphics/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/lenny/tdegraphics/debian/libpoppler-tqt-dev.install b/debian/lenny/tdegraphics/debian/libpoppler-tqt-dev.install index 57d9ec1d0..7e7ce35c8 100644 --- a/debian/lenny/tdegraphics/debian/libpoppler-tqt-dev.install +++ b/debian/lenny/tdegraphics/debian/libpoppler-tqt-dev.install @@ -1,3 +1,3 @@ -debian/tmp/opt/trinity/include/kde/poppler-link-qt3.h -debian/tmp/opt/trinity/include/kde/poppler-page-transition.h -debian/tmp/opt/trinity/include/kde/poppler-qt.h +debian/tmp/opt/trinity/include/tde/poppler-link-qt3.h +debian/tmp/opt/trinity/include/tde/poppler-page-transition.h +debian/tmp/opt/trinity/include/tde/poppler-qt.h diff --git a/debian/lenny/tdegraphics/debian/patches/common/kubuntu_01_kdepot.diff b/debian/lenny/tdegraphics/debian/patches/common/kubuntu_01_kdepot.diff index 0caf5361a..c02687784 100644 --- a/debian/lenny/tdegraphics/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/lenny/tdegraphics/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/opt/trinity/include/kde/kde.pot ++kdepotpath=/opt/trinity/include/tde/kde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/debian/lenny/tdegraphics/debian/tdegraphics-dev-trinity.install b/debian/lenny/tdegraphics/debian/tdegraphics-dev-trinity.install index 608149acc..4d50b4fc5 100644 --- a/debian/lenny/tdegraphics/debian/tdegraphics-dev-trinity.install +++ b/debian/lenny/tdegraphics/debian/tdegraphics-dev-trinity.install @@ -1,184 +1,184 @@ -debian/tmp/opt/trinity/include/kde/dom/SVGAElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGAltGlyphDefElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGAltGlyphElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGAngle.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimateColorElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimateElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimateMotionElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimateTransformElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedAngle.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedBoolean.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedEnumeration.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedInteger.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedLength.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedLengthList.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedNumber.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedNumberList.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedPathData.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedPoints.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedPreserveAspectRatio.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedRect.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedString.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedTransformList.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimationElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGCSSRule.h -debian/tmp/opt/trinity/include/kde/dom/SVGCircleElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGClipPathElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGColor.h -debian/tmp/opt/trinity/include/kde/dom/SVGColorProfileElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGColorProfileRule.h -debian/tmp/opt/trinity/include/kde/dom/SVGComponentTransferFunctionElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGCursorElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGDefinitionSrcElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGDefsElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGDescElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGDocument.h -debian/tmp/opt/trinity/include/kde/dom/SVGElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGElementInstance.h -debian/tmp/opt/trinity/include/kde/dom/SVGElementInstanceList.h -debian/tmp/opt/trinity/include/kde/dom/SVGEllipseElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGEvent.h -debian/tmp/opt/trinity/include/kde/dom/SVGException.h -debian/tmp/opt/trinity/include/kde/dom/SVGExternalResourcesRequired.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEBlendElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEColorMatrixElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEComponentTransferElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFECompositeElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEConvolveMatrixElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEDiffuseLightingElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEDisplacementMapElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEDistantLightElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEFloodElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEFuncAElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEFuncBElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEFuncGElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEFuncRElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEGaussianBlurElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEImageElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEMergeElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEMergeNodeElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEMorphologyElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEOffsetElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEPointLightElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFESpecularLightingElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFESpotLightElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFETileElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFETurbulenceElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFilterElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFilterPrimitiveStandardAttributes.h -debian/tmp/opt/trinity/include/kde/dom/SVGFitToViewBox.h -debian/tmp/opt/trinity/include/kde/dom/SVGFontElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFontFaceElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFontFaceFormatElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFontFaceNameElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFontFaceSrcElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFontFaceUriElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGForeignObjectElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGGElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGGlyphElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGGlyphRefElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGGradientElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGHKernElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGICCColor.h -debian/tmp/opt/trinity/include/kde/dom/SVGImageElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGLangSpace.h -debian/tmp/opt/trinity/include/kde/dom/SVGLength.h -debian/tmp/opt/trinity/include/kde/dom/SVGLengthList.h -debian/tmp/opt/trinity/include/kde/dom/SVGLineElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGLinearGradientElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGLocatable.h -debian/tmp/opt/trinity/include/kde/dom/SVGMPathElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGMarkerElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGMaskElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGMatrix.h -debian/tmp/opt/trinity/include/kde/dom/SVGMetadataElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGMissingGlyphElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGNumber.h -debian/tmp/opt/trinity/include/kde/dom/SVGNumberList.h -debian/tmp/opt/trinity/include/kde/dom/SVGPaint.h -debian/tmp/opt/trinity/include/kde/dom/SVGPathElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGPathSeg.h -debian/tmp/opt/trinity/include/kde/dom/SVGPathSegArc.h -debian/tmp/opt/trinity/include/kde/dom/SVGPathSegClosePath.h -debian/tmp/opt/trinity/include/kde/dom/SVGPathSegCurvetoCubic.h -debian/tmp/opt/trinity/include/kde/dom/SVGPathSegCurvetoCubicSmooth.h -debian/tmp/opt/trinity/include/kde/dom/SVGPathSegCurvetoQuadratic.h -debian/tmp/opt/trinity/include/kde/dom/SVGPathSegCurvetoQuadraticSmooth.h -debian/tmp/opt/trinity/include/kde/dom/SVGPathSegLineto.h -debian/tmp/opt/trinity/include/kde/dom/SVGPathSegLinetoHorizontal.h -debian/tmp/opt/trinity/include/kde/dom/SVGPathSegLinetoVertical.h -debian/tmp/opt/trinity/include/kde/dom/SVGPathSegList.h -debian/tmp/opt/trinity/include/kde/dom/SVGPathSegMoveto.h -debian/tmp/opt/trinity/include/kde/dom/SVGPatternElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGPoint.h -debian/tmp/opt/trinity/include/kde/dom/SVGPointList.h -debian/tmp/opt/trinity/include/kde/dom/SVGPolygonElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGPolylineElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGPreserveAspectRatio.h -debian/tmp/opt/trinity/include/kde/dom/SVGRadialGradientElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGRect.h -debian/tmp/opt/trinity/include/kde/dom/SVGRectElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGRenderingIntent.h -debian/tmp/opt/trinity/include/kde/dom/SVGSVGElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGScriptElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGSetElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGStopElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGStringList.h -debian/tmp/opt/trinity/include/kde/dom/SVGStylable.h -debian/tmp/opt/trinity/include/kde/dom/SVGStyleElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGSwitchElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGSymbolElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGTRefElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGTSpanElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGTests.h -debian/tmp/opt/trinity/include/kde/dom/SVGTextContentElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGTextElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGTextPathElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGTextPositioningElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGTitleElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGTransform.h -debian/tmp/opt/trinity/include/kde/dom/SVGTransformList.h -debian/tmp/opt/trinity/include/kde/dom/SVGTransformable.h -debian/tmp/opt/trinity/include/kde/dom/SVGURIReference.h -debian/tmp/opt/trinity/include/kde/dom/SVGUnitTypes.h -debian/tmp/opt/trinity/include/kde/dom/SVGUseElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGVKernElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGViewElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGViewSpec.h -debian/tmp/opt/trinity/include/kde/dom/SVGWindow.h -debian/tmp/opt/trinity/include/kde/dom/SVGZoomAndPan.h -debian/tmp/opt/trinity/include/kde/dom/SVGZoomEvent.h -debian/tmp/opt/trinity/include/kde/kfaximage.h -debian/tmp/opt/trinity/include/kde/kmultipageInterface.h -debian/tmp/opt/trinity/include/kde/ksvg/CanvasFactory.h -debian/tmp/opt/trinity/include/kde/ksvg/CanvasItem.h -debian/tmp/opt/trinity/include/kde/ksvg/CanvasItems.h -debian/tmp/opt/trinity/include/kde/ksvg/DocumentFactory.h -debian/tmp/opt/trinity/include/kde/ksvg/KSVGCanvas.h -debian/tmp/opt/trinity/include/kde/ksvg/ksvg_plugin.h -debian/tmp/opt/trinity/include/kde/kviewshell/anchor.h -debian/tmp/opt/trinity/include/kde/kviewshell/bookmark.h -debian/tmp/opt/trinity/include/kde/kviewshell/pageView.h -debian/tmp/opt/trinity/include/kde/kviewshell/documentPageCache.h -debian/tmp/opt/trinity/include/kde/kviewshell/documentRenderer.h -debian/tmp/opt/trinity/include/kde/kviewshell/documentWidget.h -debian/tmp/opt/trinity/include/kde/kviewshell/history.h -debian/tmp/opt/trinity/include/kde/kviewshell/hyperlink.h -debian/tmp/opt/trinity/include/kde/kviewshell/kmultipage.h -debian/tmp/opt/trinity/include/kde/kviewshell/length.h -debian/tmp/opt/trinity/include/kde/kviewshell/pageNumber.h -debian/tmp/opt/trinity/include/kde/kviewshell/pageSize.h -debian/tmp/opt/trinity/include/kde/kviewshell/renderedDocumentPage.h -debian/tmp/opt/trinity/include/kde/kviewshell/renderedDocumentPagePixmap.h -debian/tmp/opt/trinity/include/kde/kviewshell/renderedDocumentPagePrinter.h -debian/tmp/opt/trinity/include/kde/kviewshell/selection.h -debian/tmp/opt/trinity/include/kde/kviewshell/simplePageSize.h -debian/tmp/opt/trinity/include/kde/kviewshell/textBox.h -debian/tmp/opt/trinity/include/kde/kviewshell/zoom.h -debian/tmp/opt/trinity/include/kde/kviewshell/zoomlimits.h -debian/tmp/opt/trinity/include/kde/libtext2path-0.1/BezierPath.h -debian/tmp/opt/trinity/include/kde/libtext2path-0.1/Glyph.h -debian/tmp/opt/trinity/include/kde/libtext2path-0.1/GlyphTracer.h +debian/tmp/opt/trinity/include/tde/dom/SVGAElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGAltGlyphDefElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGAltGlyphElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGAngle.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimateColorElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimateElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimateMotionElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimateTransformElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedAngle.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedBoolean.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedEnumeration.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedInteger.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedLength.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedLengthList.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedNumber.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedNumberList.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedPathData.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedPoints.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedPreserveAspectRatio.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedRect.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedString.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedTransformList.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimationElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGCSSRule.h +debian/tmp/opt/trinity/include/tde/dom/SVGCircleElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGClipPathElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGColor.h +debian/tmp/opt/trinity/include/tde/dom/SVGColorProfileElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGColorProfileRule.h +debian/tmp/opt/trinity/include/tde/dom/SVGComponentTransferFunctionElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGCursorElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGDefinitionSrcElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGDefsElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGDescElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGDocument.h +debian/tmp/opt/trinity/include/tde/dom/SVGElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGElementInstance.h +debian/tmp/opt/trinity/include/tde/dom/SVGElementInstanceList.h +debian/tmp/opt/trinity/include/tde/dom/SVGEllipseElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGEvent.h +debian/tmp/opt/trinity/include/tde/dom/SVGException.h +debian/tmp/opt/trinity/include/tde/dom/SVGExternalResourcesRequired.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEBlendElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEColorMatrixElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEComponentTransferElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFECompositeElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEConvolveMatrixElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEDiffuseLightingElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEDisplacementMapElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEDistantLightElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEFloodElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEFuncAElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEFuncBElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEFuncGElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEFuncRElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEGaussianBlurElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEImageElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEMergeElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEMergeNodeElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEMorphologyElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEOffsetElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEPointLightElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFESpecularLightingElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFESpotLightElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFETileElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFETurbulenceElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFilterElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFilterPrimitiveStandardAttributes.h +debian/tmp/opt/trinity/include/tde/dom/SVGFitToViewBox.h +debian/tmp/opt/trinity/include/tde/dom/SVGFontElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFontFaceElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFontFaceFormatElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFontFaceNameElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFontFaceSrcElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFontFaceUriElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGForeignObjectElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGGElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGGlyphElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGGlyphRefElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGGradientElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGHKernElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGICCColor.h +debian/tmp/opt/trinity/include/tde/dom/SVGImageElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGLangSpace.h +debian/tmp/opt/trinity/include/tde/dom/SVGLength.h +debian/tmp/opt/trinity/include/tde/dom/SVGLengthList.h +debian/tmp/opt/trinity/include/tde/dom/SVGLineElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGLinearGradientElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGLocatable.h +debian/tmp/opt/trinity/include/tde/dom/SVGMPathElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGMarkerElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGMaskElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGMatrix.h +debian/tmp/opt/trinity/include/tde/dom/SVGMetadataElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGMissingGlyphElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGNumber.h +debian/tmp/opt/trinity/include/tde/dom/SVGNumberList.h +debian/tmp/opt/trinity/include/tde/dom/SVGPaint.h +debian/tmp/opt/trinity/include/tde/dom/SVGPathElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGPathSeg.h +debian/tmp/opt/trinity/include/tde/dom/SVGPathSegArc.h +debian/tmp/opt/trinity/include/tde/dom/SVGPathSegClosePath.h +debian/tmp/opt/trinity/include/tde/dom/SVGPathSegCurvetoCubic.h +debian/tmp/opt/trinity/include/tde/dom/SVGPathSegCurvetoCubicSmooth.h +debian/tmp/opt/trinity/include/tde/dom/SVGPathSegCurvetoQuadratic.h +debian/tmp/opt/trinity/include/tde/dom/SVGPathSegCurvetoQuadraticSmooth.h +debian/tmp/opt/trinity/include/tde/dom/SVGPathSegLineto.h +debian/tmp/opt/trinity/include/tde/dom/SVGPathSegLinetoHorizontal.h +debian/tmp/opt/trinity/include/tde/dom/SVGPathSegLinetoVertical.h +debian/tmp/opt/trinity/include/tde/dom/SVGPathSegList.h +debian/tmp/opt/trinity/include/tde/dom/SVGPathSegMoveto.h +debian/tmp/opt/trinity/include/tde/dom/SVGPatternElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGPoint.h +debian/tmp/opt/trinity/include/tde/dom/SVGPointList.h +debian/tmp/opt/trinity/include/tde/dom/SVGPolygonElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGPolylineElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGPreserveAspectRatio.h +debian/tmp/opt/trinity/include/tde/dom/SVGRadialGradientElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGRect.h +debian/tmp/opt/trinity/include/tde/dom/SVGRectElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGRenderingIntent.h +debian/tmp/opt/trinity/include/tde/dom/SVGSVGElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGScriptElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGSetElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGStopElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGStringList.h +debian/tmp/opt/trinity/include/tde/dom/SVGStylable.h +debian/tmp/opt/trinity/include/tde/dom/SVGStyleElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGSwitchElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGSymbolElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGTRefElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGTSpanElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGTests.h +debian/tmp/opt/trinity/include/tde/dom/SVGTextContentElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGTextElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGTextPathElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGTextPositioningElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGTitleElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGTransform.h +debian/tmp/opt/trinity/include/tde/dom/SVGTransformList.h +debian/tmp/opt/trinity/include/tde/dom/SVGTransformable.h +debian/tmp/opt/trinity/include/tde/dom/SVGURIReference.h +debian/tmp/opt/trinity/include/tde/dom/SVGUnitTypes.h +debian/tmp/opt/trinity/include/tde/dom/SVGUseElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGVKernElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGViewElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGViewSpec.h +debian/tmp/opt/trinity/include/tde/dom/SVGWindow.h +debian/tmp/opt/trinity/include/tde/dom/SVGZoomAndPan.h +debian/tmp/opt/trinity/include/tde/dom/SVGZoomEvent.h +debian/tmp/opt/trinity/include/tde/kfaximage.h +debian/tmp/opt/trinity/include/tde/kmultipageInterface.h +debian/tmp/opt/trinity/include/tde/ksvg/CanvasFactory.h +debian/tmp/opt/trinity/include/tde/ksvg/CanvasItem.h +debian/tmp/opt/trinity/include/tde/ksvg/CanvasItems.h +debian/tmp/opt/trinity/include/tde/ksvg/DocumentFactory.h +debian/tmp/opt/trinity/include/tde/ksvg/KSVGCanvas.h +debian/tmp/opt/trinity/include/tde/ksvg/ksvg_plugin.h +debian/tmp/opt/trinity/include/tde/kviewshell/anchor.h +debian/tmp/opt/trinity/include/tde/kviewshell/bookmark.h +debian/tmp/opt/trinity/include/tde/kviewshell/pageView.h +debian/tmp/opt/trinity/include/tde/kviewshell/documentPageCache.h +debian/tmp/opt/trinity/include/tde/kviewshell/documentRenderer.h +debian/tmp/opt/trinity/include/tde/kviewshell/documentWidget.h +debian/tmp/opt/trinity/include/tde/kviewshell/history.h +debian/tmp/opt/trinity/include/tde/kviewshell/hyperlink.h +debian/tmp/opt/trinity/include/tde/kviewshell/kmultipage.h +debian/tmp/opt/trinity/include/tde/kviewshell/length.h +debian/tmp/opt/trinity/include/tde/kviewshell/pageNumber.h +debian/tmp/opt/trinity/include/tde/kviewshell/pageSize.h +debian/tmp/opt/trinity/include/tde/kviewshell/renderedDocumentPage.h +debian/tmp/opt/trinity/include/tde/kviewshell/renderedDocumentPagePixmap.h +debian/tmp/opt/trinity/include/tde/kviewshell/renderedDocumentPagePrinter.h +debian/tmp/opt/trinity/include/tde/kviewshell/selection.h +debian/tmp/opt/trinity/include/tde/kviewshell/simplePageSize.h +debian/tmp/opt/trinity/include/tde/kviewshell/textBox.h +debian/tmp/opt/trinity/include/tde/kviewshell/zoom.h +debian/tmp/opt/trinity/include/tde/kviewshell/zoomlimits.h +debian/tmp/opt/trinity/include/tde/libtext2path-0.1/BezierPath.h +debian/tmp/opt/trinity/include/tde/libtext2path-0.1/Glyph.h +debian/tmp/opt/trinity/include/tde/libtext2path-0.1/GlyphTracer.h debian/tmp/opt/trinity/lib/libtdeinit_kview.la debian/tmp/opt/trinity/lib/libtdeinit_mrmlsearch.la debian/tmp/opt/trinity/lib/libkghostviewlib.la diff --git a/debian/lenny/tdelibs/debian/cdbs/kde.mk b/debian/lenny/tdelibs/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/lenny/tdelibs/debian/cdbs/kde.mk +++ b/debian/lenny/tdelibs/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/lenny/tdelibs/debian/changelog b/debian/lenny/tdelibs/debian/changelog index dd416c496..8eda5d307 100644 --- a/debian/lenny/tdelibs/debian/changelog +++ b/debian/lenny/tdelibs/debian/changelog @@ -2087,7 +2087,7 @@ tdelibs (4:3.4.0-0pre5) alioth; urgency=low output them expanded even when --expandvars is not used. (Closes: #287822) * Fixed the ability of the build system to find kde.pot, even when it is not - located at TDEDIR/include/kde.pot. This allows the use of targets such as + located at TDEDIR/include/tde.pot. This allows the use of targets such as "package-messages" without specifying includedir. (Closes: #283858) * Now that graphviz is in main, add it to Build-Depends-Indep together with diff --git a/debian/lenny/tdelibs/debian/rules b/debian/lenny/tdelibs/debian/rules index 24b56bf2a..2e2bdf3ee 100755 --- a/debian/lenny/tdelibs/debian/rules +++ b/debian/lenny/tdelibs/debian/rules @@ -20,7 +20,7 @@ DEB_KDE_APIDOX := yes version=Debian Package $(DEB_VERSION) DEB_OPT_FLAG += -DDEBIAN_VERSION=$(DEB_VERSION) -DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/kde" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" -DWITH_GCC_VISIBILITY="ON" \ +DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/tde" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" -DWITH_GCC_VISIBILITY="ON" \ -DWITH_LIBART="ON" -DWITH_LIBIDN="ON" -DWITH_TIFF="ON" -DWITH_JASPER="ON" -DWITH_OPENEXR="ON" -DWITH_AVAHI="ON" -DWITH_ASPELL="ON" -DWITH_HSPELL="ON" -DWITH_ELFICON="ON" # Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to diff --git a/debian/lenny/tdelibs/debian/tdelibs4-trinity-dev.install b/debian/lenny/tdelibs/debian/tdelibs4-trinity-dev.install index 3d2e8e43b..a9044b322 100644 --- a/debian/lenny/tdelibs/debian/tdelibs4-trinity-dev.install +++ b/debian/lenny/tdelibs/debian/tdelibs4-trinity-dev.install @@ -197,13 +197,13 @@ debian/tmp/opt/trinity/include/kdatewidget.h debian/tmp/opt/trinity/include/kdcopactionproxy.h debian/tmp/opt/trinity/include/kdcoppropertyproxy.h debian/tmp/opt/trinity/include/kdcopservicestarter.h -debian/tmp/opt/trinity/include/kdebugclasses.h -debian/tmp/opt/trinity/include/kdebug.h -debian/tmp/opt/trinity/include/kdedmodule.h -debian/tmp/opt/trinity/include/kde_file.h +debian/tmp/opt/trinity/include/tdebugclasses.h +debian/tmp/opt/trinity/include/tdebug.h +debian/tmp/opt/trinity/include/tdedmodule.h +debian/tmp/opt/trinity/include/tde_file.h debian/tmp/opt/trinity/include/tdelibs_export.h -debian/tmp/opt/trinity/include/kdemacros.h -debian/tmp/opt/trinity/include/kde.pot +debian/tmp/opt/trinity/include/tdemacros.h +debian/tmp/opt/trinity/include/tde.pot debian/tmp/opt/trinity/include/tdeprint/driver.h debian/tmp/opt/trinity/include/tdeprint/kiconselectaction.h debian/tmp/opt/trinity/include/tdeprint/kmjob.h @@ -221,7 +221,7 @@ debian/tmp/opt/trinity/include/tdeprint/kprintdialogpage.h debian/tmp/opt/trinity/include/tdeprint/lpr/lprhandler.h debian/tmp/opt/trinity/include/tdeprint/lpr/lprsettings.h debian/tmp/opt/trinity/include/tdeprint/lpr/printcapentry.h -debian/tmp/opt/trinity/include/kdesktopfile.h +debian/tmp/opt/trinity/include/tdesktopfile.h debian/tmp/opt/trinity/include/tdesu/client.h debian/tmp/opt/trinity/include/tdesu/defaults.h debian/tmp/opt/trinity/include/tdesu/kcookie.h @@ -231,7 +231,7 @@ debian/tmp/opt/trinity/include/tdesu/pty.h debian/tmp/opt/trinity/include/tdesu/ssh.h debian/tmp/opt/trinity/include/tdesu/stub.h debian/tmp/opt/trinity/include/tdesu/su.h -debian/tmp/opt/trinity/include/kde_terminal_interface.h +debian/tmp/opt/trinity/include/tde_terminal_interface.h debian/tmp/opt/trinity/include/tdeversion.h debian/tmp/opt/trinity/include/kdialogbase.h debian/tmp/opt/trinity/include/kdialog.h @@ -717,7 +717,7 @@ debian/tmp/opt/trinity/include/networkstatusindicator.h debian/tmp/opt/trinity/include/connectionmanager.h debian/tmp/opt/trinity/include/serviceiface.h debian/tmp/opt/trinity/include/provideriface.h -#debian/tmp/opt/trinity/include/kdemm +#debian/tmp/opt/trinity/include/tdemm debian/tmp/opt/trinity/lib/libnetworkstatus.la debian/tmp/opt/trinity/lib/libnetworkstatus.so diff --git a/debian/lenny/tdemultimedia/debian/cdbs/kde.mk b/debian/lenny/tdemultimedia/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/lenny/tdemultimedia/debian/cdbs/kde.mk +++ b/debian/lenny/tdemultimedia/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/lenny/tdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff b/debian/lenny/tdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff index 0caf5361a..c02687784 100644 --- a/debian/lenny/tdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/lenny/tdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/opt/trinity/include/kde/kde.pot ++kdepotpath=/opt/trinity/include/tde/kde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/debian/lenny/tdemultimedia/debian/rules b/debian/lenny/tdemultimedia/debian/rules index abe114b59..aff6738b2 100755 --- a/debian/lenny/tdemultimedia/debian/rules +++ b/debian/lenny/tdemultimedia/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 @@ -14,9 +14,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_CONFIGURE_EXTRA_FLAGS := \ --with-alsa --with-arts-alsa \ - --with-extra-includes=/usr/include/speex:/opt/trinity/include/kde/arts \ + --with-extra-includes=/usr/include/speex:/opt/trinity/include/tde/arts \ --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib - # The include/kde/arts one should be temporary. See + # The include/tde/arts one should be temporary. See # "juk/Makefile.am: arts_includes vs ARTS_CFLAGS" in -talk. DOC_HTML_PRUNE := kcontrol-trinity diff --git a/debian/lenny/tdemultimedia/debian/tdemultimedia-trinity-dev.install b/debian/lenny/tdemultimedia/debian/tdemultimedia-trinity-dev.install index a6b4265bd..4edb170bf 100644 --- a/debian/lenny/tdemultimedia/debian/tdemultimedia-trinity-dev.install +++ b/debian/lenny/tdemultimedia/debian/tdemultimedia-trinity-dev.install @@ -1,137 +1,137 @@ -debian/tmp/opt/trinity/include/kde/arts/artsbuilder.h -debian/tmp/opt/trinity/include/kde/arts/artsbuilder.idl -debian/tmp/opt/trinity/include/kde/arts/artsgui.h -debian/tmp/opt/trinity/include/kde/arts/artsgui.idl -debian/tmp/opt/trinity/include/kde/arts/artsmidi.h -debian/tmp/opt/trinity/include/kde/arts/artsmidi.idl -debian/tmp/opt/trinity/include/kde/arts/artsmodules.h -debian/tmp/opt/trinity/include/kde/arts/artsmodules.idl -debian/tmp/opt/trinity/include/kde/arts/artsmodulescommon.h -debian/tmp/opt/trinity/include/kde/arts/artsmodulescommon.idl -debian/tmp/opt/trinity/include/kde/arts/artsmoduleseffects.h -debian/tmp/opt/trinity/include/kde/arts/artsmoduleseffects.idl -debian/tmp/opt/trinity/include/kde/arts/artsmodulesmixers.h -debian/tmp/opt/trinity/include/kde/arts/artsmodulesmixers.idl -debian/tmp/opt/trinity/include/kde/arts/artsmodulessynth.h -debian/tmp/opt/trinity/include/kde/arts/artsmodulessynth.idl -debian/tmp/opt/trinity/include/kde/arts/kartswidget.h -debian/tmp/opt/trinity/include/kde/arts/kframe_impl.h -debian/tmp/opt/trinity/include/kde/arts/klayoutbox_impl.h -debian/tmp/opt/trinity/include/kde/arts/kwidget_impl.h -debian/tmp/opt/trinity/include/kde/arts/kwidgetrepo.h -debian/tmp/opt/trinity/include/kde/audiocdencoder.h -debian/tmp/opt/trinity/include/kde/cmodule.h -debian/tmp/opt/trinity/include/kde/effectview.h -debian/tmp/opt/trinity/include/kde/equalizerview.h -debian/tmp/opt/trinity/include/kde/ksaver.h -debian/tmp/opt/trinity/include/kde/libkcddb/cache.h -debian/tmp/opt/trinity/include/kde/libkcddb/cddb.h -debian/tmp/opt/trinity/include/kde/libkcddb/cdinfo.h -debian/tmp/opt/trinity/include/kde/libkcddb/client.h -debian/tmp/opt/trinity/include/kde/libkcddb/config.h -debian/tmp/opt/trinity/include/kde/libkcddb/configbase.h -debian/tmp/opt/trinity/include/kde/mimetypetree.h -debian/tmp/opt/trinity/include/kde/mpeglib/decoder/cddaPlugin.h -debian/tmp/opt/trinity/include/kde/mpeglib/decoder/command.h -debian/tmp/opt/trinity/include/kde/mpeglib/decoder/commandPipe.h -debian/tmp/opt/trinity/include/kde/mpeglib/decoder/decoderPlugin.h -debian/tmp/opt/trinity/include/kde/mpeglib/decoder/mpegPlugin.h -debian/tmp/opt/trinity/include/kde/mpeglib/decoder/mpgPlugin.h -debian/tmp/opt/trinity/include/kde/mpeglib/decoder/nukePlugin.h -debian/tmp/opt/trinity/include/kde/mpeglib/decoder/splayPlugin.h -debian/tmp/opt/trinity/include/kde/mpeglib/decoder/tplayPlugin.h -debian/tmp/opt/trinity/include/kde/mpeglib/decoder/vorbisPlugin.h -debian/tmp/opt/trinity/include/kde/mpeglib/decoder/yuvPlugin.h -debian/tmp/opt/trinity/include/kde/mpeglib/frame/IOFrameQueue.h -debian/tmp/opt/trinity/include/kde/mpeglib/frame/audioFrame.h -debian/tmp/opt/trinity/include/kde/mpeglib/frame/audioFrameQueue.h -debian/tmp/opt/trinity/include/kde/mpeglib/frame/floatFrame.h -debian/tmp/opt/trinity/include/kde/mpeglib/frame/frame.h -debian/tmp/opt/trinity/include/kde/mpeglib/frame/frameQueue.h -debian/tmp/opt/trinity/include/kde/mpeglib/frame/framer.h -debian/tmp/opt/trinity/include/kde/mpeglib/frame/pcmFrame.h -debian/tmp/opt/trinity/include/kde/mpeglib/frame/rawDataBuffer.h -debian/tmp/opt/trinity/include/kde/mpeglib/frame/rawFrame.h -debian/tmp/opt/trinity/include/kde/mpeglib/input/bufferInputStream.h -debian/tmp/opt/trinity/include/kde/mpeglib/input/cddaInputStream.h -debian/tmp/opt/trinity/include/kde/mpeglib/input/cdromInputStream.h -debian/tmp/opt/trinity/include/kde/mpeglib/input/fileInputStream.h -debian/tmp/opt/trinity/include/kde/mpeglib/input/httpInputStream.h -debian/tmp/opt/trinity/include/kde/mpeglib/input/inputDetector.h -debian/tmp/opt/trinity/include/kde/mpeglib/input/inputPlugin.h -debian/tmp/opt/trinity/include/kde/mpeglib/input/inputStream.h -debian/tmp/opt/trinity/include/kde/mpeglib/input/threadSafeInputStream.h -debian/tmp/opt/trinity/include/kde/mpeglib/mpegutil/mpegStreamPlayer.h -debian/tmp/opt/trinity/include/kde/mpeglib/mpegutil/mpegSystemHeader.h -debian/tmp/opt/trinity/include/kde/mpeglib/mpegutil/mpegSystemStream.h -debian/tmp/opt/trinity/include/kde/mpeglib/mpegutil/mpegVideoLength.h -debian/tmp/opt/trinity/include/kde/mpeglib/mpegutil/pesSystemStream.h -debian/tmp/opt/trinity/include/kde/mpeglib/mpegutil/psSystemStream.h -debian/tmp/opt/trinity/include/kde/mpeglib/mpegutil/tsSystemStream.h -debian/tmp/opt/trinity/include/kde/mpeglib/oggvorbis/oggFrame.h -debian/tmp/opt/trinity/include/kde/mpeglib/oggvorbis/ovFramer.h -debian/tmp/opt/trinity/include/kde/mpeglib/oggvorbis/vorbisDecoder.h -debian/tmp/opt/trinity/include/kde/mpeglib/oggvorbis/vorbisInfo.h -debian/tmp/opt/trinity/include/kde/mpeglib/output/artsOutputStream.h -debian/tmp/opt/trinity/include/kde/mpeglib/output/audioTime.h -debian/tmp/opt/trinity/include/kde/mpeglib/output/avSyncer.h -debian/tmp/opt/trinity/include/kde/mpeglib/output/dspX11OutputStream.h -debian/tmp/opt/trinity/include/kde/mpeglib/output/outPlugin.h -debian/tmp/opt/trinity/include/kde/mpeglib/output/outputStream.h -debian/tmp/opt/trinity/include/kde/mpeglib/output/pluginInfo.h -debian/tmp/opt/trinity/include/kde/mpeglib/output/threadSafeOutputStream.h -debian/tmp/opt/trinity/include/kde/mpeglib/splay/mpegAudioFrame.h -debian/tmp/opt/trinity/include/kde/mpeglib/splay/mpegAudioInfo.h -debian/tmp/opt/trinity/include/kde/mpeglib/splay/splayDecoder.h -debian/tmp/opt/trinity/include/kde/mpeglib/util/abstract/abs_thread.h -debian/tmp/opt/trinity/include/kde/mpeglib/util/abstract/threadQueue.h -debian/tmp/opt/trinity/include/kde/mpeglib/util/dynBuffer.h -debian/tmp/opt/trinity/include/kde/mpeglib/util/file/fileAccess.h -debian/tmp/opt/trinity/include/kde/mpeglib/util/mmx/mm_accel.h -debian/tmp/opt/trinity/include/kde/mpeglib/util/mmx/mmx.h -debian/tmp/opt/trinity/include/kde/mpeglib/util/mmx/mmx_asm.h -debian/tmp/opt/trinity/include/kde/mpeglib/util/render/pictureArray.h -debian/tmp/opt/trinity/include/kde/mpeglib/util/render/yuvPicture.h -debian/tmp/opt/trinity/include/kde/mpeglib/util/syncClock.h -debian/tmp/opt/trinity/include/kde/mpeglib/util/timeStamp.h -debian/tmp/opt/trinity/include/kde/mpeglib/util/timeStampArray.h -debian/tmp/opt/trinity/include/kde/mpeglib/util/timeWrapper.h -debian/tmp/opt/trinity/include/kde/mpeglib/util/yaf/yafcore/buffer.h -debian/tmp/opt/trinity/include/kde/mpeglib/util/yaf/yafcore/inputDecoder.h -debian/tmp/opt/trinity/include/kde/mpeglib/util/yaf/yafcore/inputInterface.h -debian/tmp/opt/trinity/include/kde/mpeglib/util/yaf/yafcore/outputInterface.h -debian/tmp/opt/trinity/include/kde/mpeglib/util/yaf/yafcore/yaf_control.h -debian/tmp/opt/trinity/include/kde/mpeglib/util/yaf/yafxplayer/inputDecoderXPlayer.h -debian/tmp/opt/trinity/include/kde/mpeglib/util/yaf/yafxplayer/inputDecoderYAF.h -debian/tmp/opt/trinity/include/kde/mpeglib/util/yaf/yafxplayer/yafOutputStream.h -debian/tmp/opt/trinity/include/kde/mpeglib_artsplug/decoderBaseObject.h -debian/tmp/opt/trinity/include/kde/mpeglib_artsplug/decoderBaseObject.idl -debian/tmp/opt/trinity/include/kde/mpeglib_artsplug/decoderBaseObject_impl.h -debian/tmp/opt/trinity/include/kde/mpeglib_artsplug/splayPlayObject.h -debian/tmp/opt/trinity/include/kde/mpeglib_artsplug/splayPlayObject.idl -debian/tmp/opt/trinity/include/kde/mpeglib_artsplug/splayPlayObject_impl.h -debian/tmp/opt/trinity/include/kde/noatun/app.h -debian/tmp/opt/trinity/include/kde/noatun/controls.h -debian/tmp/opt/trinity/include/kde/noatun/conversion.h -debian/tmp/opt/trinity/include/kde/noatun/downloader.h -debian/tmp/opt/trinity/include/kde/noatun/effects.h -debian/tmp/opt/trinity/include/kde/noatun/engine.h -debian/tmp/opt/trinity/include/kde/noatun/equalizer.h -debian/tmp/opt/trinity/include/kde/noatun/noatunarts.h -debian/tmp/opt/trinity/include/kde/noatun/player.h -debian/tmp/opt/trinity/include/kde/noatun/playlist.h -debian/tmp/opt/trinity/include/kde/noatun/playlistsaver.h -debian/tmp/opt/trinity/include/kde/noatun/plugin.h -debian/tmp/opt/trinity/include/kde/noatun/pluginloader.h -debian/tmp/opt/trinity/include/kde/noatun/pref.h -debian/tmp/opt/trinity/include/kde/noatun/scrollinglabel.h -debian/tmp/opt/trinity/include/kde/noatun/stdaction.h -debian/tmp/opt/trinity/include/kde/noatun/stereobuttonaction.h -debian/tmp/opt/trinity/include/kde/noatun/tags.h -debian/tmp/opt/trinity/include/kde/noatun/vequalizer.h -debian/tmp/opt/trinity/include/kde/noatun/video.h -debian/tmp/opt/trinity/include/kde/noatun/winskinvis.h -debian/tmp/opt/trinity/include/kde/plugin_deps.h +debian/tmp/opt/trinity/include/tde/arts/artsbuilder.h +debian/tmp/opt/trinity/include/tde/arts/artsbuilder.idl +debian/tmp/opt/trinity/include/tde/arts/artsgui.h +debian/tmp/opt/trinity/include/tde/arts/artsgui.idl +debian/tmp/opt/trinity/include/tde/arts/artsmidi.h +debian/tmp/opt/trinity/include/tde/arts/artsmidi.idl +debian/tmp/opt/trinity/include/tde/arts/artsmodules.h +debian/tmp/opt/trinity/include/tde/arts/artsmodules.idl +debian/tmp/opt/trinity/include/tde/arts/artsmodulescommon.h +debian/tmp/opt/trinity/include/tde/arts/artsmodulescommon.idl +debian/tmp/opt/trinity/include/tde/arts/artsmoduleseffects.h +debian/tmp/opt/trinity/include/tde/arts/artsmoduleseffects.idl +debian/tmp/opt/trinity/include/tde/arts/artsmodulesmixers.h +debian/tmp/opt/trinity/include/tde/arts/artsmodulesmixers.idl +debian/tmp/opt/trinity/include/tde/arts/artsmodulessynth.h +debian/tmp/opt/trinity/include/tde/arts/artsmodulessynth.idl +debian/tmp/opt/trinity/include/tde/arts/kartswidget.h +debian/tmp/opt/trinity/include/tde/arts/kframe_impl.h +debian/tmp/opt/trinity/include/tde/arts/klayoutbox_impl.h +debian/tmp/opt/trinity/include/tde/arts/kwidget_impl.h +debian/tmp/opt/trinity/include/tde/arts/kwidgetrepo.h +debian/tmp/opt/trinity/include/tde/audiocdencoder.h +debian/tmp/opt/trinity/include/tde/cmodule.h +debian/tmp/opt/trinity/include/tde/effectview.h +debian/tmp/opt/trinity/include/tde/equalizerview.h +debian/tmp/opt/trinity/include/tde/ksaver.h +debian/tmp/opt/trinity/include/tde/libkcddb/cache.h +debian/tmp/opt/trinity/include/tde/libkcddb/cddb.h +debian/tmp/opt/trinity/include/tde/libkcddb/cdinfo.h +debian/tmp/opt/trinity/include/tde/libkcddb/client.h +debian/tmp/opt/trinity/include/tde/libkcddb/config.h +debian/tmp/opt/trinity/include/tde/libkcddb/configbase.h +debian/tmp/opt/trinity/include/tde/mimetypetree.h +debian/tmp/opt/trinity/include/tde/mpeglib/decoder/cddaPlugin.h +debian/tmp/opt/trinity/include/tde/mpeglib/decoder/command.h +debian/tmp/opt/trinity/include/tde/mpeglib/decoder/commandPipe.h +debian/tmp/opt/trinity/include/tde/mpeglib/decoder/decoderPlugin.h +debian/tmp/opt/trinity/include/tde/mpeglib/decoder/mpegPlugin.h +debian/tmp/opt/trinity/include/tde/mpeglib/decoder/mpgPlugin.h +debian/tmp/opt/trinity/include/tde/mpeglib/decoder/nukePlugin.h +debian/tmp/opt/trinity/include/tde/mpeglib/decoder/splayPlugin.h +debian/tmp/opt/trinity/include/tde/mpeglib/decoder/tplayPlugin.h +debian/tmp/opt/trinity/include/tde/mpeglib/decoder/vorbisPlugin.h +debian/tmp/opt/trinity/include/tde/mpeglib/decoder/yuvPlugin.h +debian/tmp/opt/trinity/include/tde/mpeglib/frame/IOFrameQueue.h +debian/tmp/opt/trinity/include/tde/mpeglib/frame/audioFrame.h +debian/tmp/opt/trinity/include/tde/mpeglib/frame/audioFrameQueue.h +debian/tmp/opt/trinity/include/tde/mpeglib/frame/floatFrame.h +debian/tmp/opt/trinity/include/tde/mpeglib/frame/frame.h +debian/tmp/opt/trinity/include/tde/mpeglib/frame/frameQueue.h +debian/tmp/opt/trinity/include/tde/mpeglib/frame/framer.h +debian/tmp/opt/trinity/include/tde/mpeglib/frame/pcmFrame.h +debian/tmp/opt/trinity/include/tde/mpeglib/frame/rawDataBuffer.h +debian/tmp/opt/trinity/include/tde/mpeglib/frame/rawFrame.h +debian/tmp/opt/trinity/include/tde/mpeglib/input/bufferInputStream.h +debian/tmp/opt/trinity/include/tde/mpeglib/input/cddaInputStream.h +debian/tmp/opt/trinity/include/tde/mpeglib/input/cdromInputStream.h +debian/tmp/opt/trinity/include/tde/mpeglib/input/fileInputStream.h +debian/tmp/opt/trinity/include/tde/mpeglib/input/httpInputStream.h +debian/tmp/opt/trinity/include/tde/mpeglib/input/inputDetector.h +debian/tmp/opt/trinity/include/tde/mpeglib/input/inputPlugin.h +debian/tmp/opt/trinity/include/tde/mpeglib/input/inputStream.h +debian/tmp/opt/trinity/include/tde/mpeglib/input/threadSafeInputStream.h +debian/tmp/opt/trinity/include/tde/mpeglib/mpegutil/mpegStreamPlayer.h +debian/tmp/opt/trinity/include/tde/mpeglib/mpegutil/mpegSystemHeader.h +debian/tmp/opt/trinity/include/tde/mpeglib/mpegutil/mpegSystemStream.h +debian/tmp/opt/trinity/include/tde/mpeglib/mpegutil/mpegVideoLength.h +debian/tmp/opt/trinity/include/tde/mpeglib/mpegutil/pesSystemStream.h +debian/tmp/opt/trinity/include/tde/mpeglib/mpegutil/psSystemStream.h +debian/tmp/opt/trinity/include/tde/mpeglib/mpegutil/tsSystemStream.h +debian/tmp/opt/trinity/include/tde/mpeglib/oggvorbis/oggFrame.h +debian/tmp/opt/trinity/include/tde/mpeglib/oggvorbis/ovFramer.h +debian/tmp/opt/trinity/include/tde/mpeglib/oggvorbis/vorbisDecoder.h +debian/tmp/opt/trinity/include/tde/mpeglib/oggvorbis/vorbisInfo.h +debian/tmp/opt/trinity/include/tde/mpeglib/output/artsOutputStream.h +debian/tmp/opt/trinity/include/tde/mpeglib/output/audioTime.h +debian/tmp/opt/trinity/include/tde/mpeglib/output/avSyncer.h +debian/tmp/opt/trinity/include/tde/mpeglib/output/dspX11OutputStream.h +debian/tmp/opt/trinity/include/tde/mpeglib/output/outPlugin.h +debian/tmp/opt/trinity/include/tde/mpeglib/output/outputStream.h +debian/tmp/opt/trinity/include/tde/mpeglib/output/pluginInfo.h +debian/tmp/opt/trinity/include/tde/mpeglib/output/threadSafeOutputStream.h +debian/tmp/opt/trinity/include/tde/mpeglib/splay/mpegAudioFrame.h +debian/tmp/opt/trinity/include/tde/mpeglib/splay/mpegAudioInfo.h +debian/tmp/opt/trinity/include/tde/mpeglib/splay/splayDecoder.h +debian/tmp/opt/trinity/include/tde/mpeglib/util/abstract/abs_thread.h +debian/tmp/opt/trinity/include/tde/mpeglib/util/abstract/threadQueue.h +debian/tmp/opt/trinity/include/tde/mpeglib/util/dynBuffer.h +debian/tmp/opt/trinity/include/tde/mpeglib/util/file/fileAccess.h +debian/tmp/opt/trinity/include/tde/mpeglib/util/mmx/mm_accel.h +debian/tmp/opt/trinity/include/tde/mpeglib/util/mmx/mmx.h +debian/tmp/opt/trinity/include/tde/mpeglib/util/mmx/mmx_asm.h +debian/tmp/opt/trinity/include/tde/mpeglib/util/render/pictureArray.h +debian/tmp/opt/trinity/include/tde/mpeglib/util/render/yuvPicture.h +debian/tmp/opt/trinity/include/tde/mpeglib/util/syncClock.h +debian/tmp/opt/trinity/include/tde/mpeglib/util/timeStamp.h +debian/tmp/opt/trinity/include/tde/mpeglib/util/timeStampArray.h +debian/tmp/opt/trinity/include/tde/mpeglib/util/timeWrapper.h +debian/tmp/opt/trinity/include/tde/mpeglib/util/yaf/yafcore/buffer.h +debian/tmp/opt/trinity/include/tde/mpeglib/util/yaf/yafcore/inputDecoder.h +debian/tmp/opt/trinity/include/tde/mpeglib/util/yaf/yafcore/inputInterface.h +debian/tmp/opt/trinity/include/tde/mpeglib/util/yaf/yafcore/outputInterface.h +debian/tmp/opt/trinity/include/tde/mpeglib/util/yaf/yafcore/yaf_control.h +debian/tmp/opt/trinity/include/tde/mpeglib/util/yaf/yafxplayer/inputDecoderXPlayer.h +debian/tmp/opt/trinity/include/tde/mpeglib/util/yaf/yafxplayer/inputDecoderYAF.h +debian/tmp/opt/trinity/include/tde/mpeglib/util/yaf/yafxplayer/yafOutputStream.h +debian/tmp/opt/trinity/include/tde/mpeglib_artsplug/decoderBaseObject.h +debian/tmp/opt/trinity/include/tde/mpeglib_artsplug/decoderBaseObject.idl +debian/tmp/opt/trinity/include/tde/mpeglib_artsplug/decoderBaseObject_impl.h +debian/tmp/opt/trinity/include/tde/mpeglib_artsplug/splayPlayObject.h +debian/tmp/opt/trinity/include/tde/mpeglib_artsplug/splayPlayObject.idl +debian/tmp/opt/trinity/include/tde/mpeglib_artsplug/splayPlayObject_impl.h +debian/tmp/opt/trinity/include/tde/noatun/app.h +debian/tmp/opt/trinity/include/tde/noatun/controls.h +debian/tmp/opt/trinity/include/tde/noatun/conversion.h +debian/tmp/opt/trinity/include/tde/noatun/downloader.h +debian/tmp/opt/trinity/include/tde/noatun/effects.h +debian/tmp/opt/trinity/include/tde/noatun/engine.h +debian/tmp/opt/trinity/include/tde/noatun/equalizer.h +debian/tmp/opt/trinity/include/tde/noatun/noatunarts.h +debian/tmp/opt/trinity/include/tde/noatun/player.h +debian/tmp/opt/trinity/include/tde/noatun/playlist.h +debian/tmp/opt/trinity/include/tde/noatun/playlistsaver.h +debian/tmp/opt/trinity/include/tde/noatun/plugin.h +debian/tmp/opt/trinity/include/tde/noatun/pluginloader.h +debian/tmp/opt/trinity/include/tde/noatun/pref.h +debian/tmp/opt/trinity/include/tde/noatun/scrollinglabel.h +debian/tmp/opt/trinity/include/tde/noatun/stdaction.h +debian/tmp/opt/trinity/include/tde/noatun/stereobuttonaction.h +debian/tmp/opt/trinity/include/tde/noatun/tags.h +debian/tmp/opt/trinity/include/tde/noatun/vequalizer.h +debian/tmp/opt/trinity/include/tde/noatun/video.h +debian/tmp/opt/trinity/include/tde/noatun/winskinvis.h +debian/tmp/opt/trinity/include/tde/plugin_deps.h debian/tmp/opt/trinity/lib/libarts_mpeglib.so debian/tmp/opt/trinity/lib/libarts_splay.so debian/tmp/opt/trinity/lib/libartsbuilder.so diff --git a/debian/lenny/tdenetwork/debian/cdbs/kde.mk b/debian/lenny/tdenetwork/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/lenny/tdenetwork/debian/cdbs/kde.mk +++ b/debian/lenny/tdenetwork/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/lenny/tdenetwork/debian/kopete-trinity.install b/debian/lenny/tdenetwork/debian/kopete-trinity.install index c4a342dc5..1901f005e 100644 --- a/debian/lenny/tdenetwork/debian/kopete-trinity.install +++ b/debian/lenny/tdenetwork/debian/kopete-trinity.install @@ -1,9 +1,9 @@ debian/tmp/opt/trinity/bin/kopete debian/tmp/opt/trinity/bin/kopete_latexconvert.sh -debian/tmp/opt/trinity/include/kde/kopete/kopetepicture.h -debian/tmp/opt/trinity/include/kde/kopete/kopeteprefs.h -debian/tmp/opt/trinity/include/kde/kopete/ui/addressbooklinkwidget.h -debian/tmp/opt/trinity/include/kde/kopete/webcamwidget.h +debian/tmp/opt/trinity/include/tde/kopete/kopetepicture.h +debian/tmp/opt/trinity/include/tde/kopete/kopeteprefs.h +debian/tmp/opt/trinity/include/tde/kopete/ui/addressbooklinkwidget.h +debian/tmp/opt/trinity/include/tde/kopete/webcamwidget.h debian/tmp/opt/trinity/lib/kconf_update_bin/kopete-account-kconf_update debian/tmp/opt/trinity/lib/kconf_update_bin/kopete-nameTracking-kconf_update debian/tmp/opt/trinity/lib/kconf_update_bin/kopete-pluginloader2-kconf_update diff --git a/debian/lenny/tdenetwork/debian/patches/common/kubuntu_01_kdepot.diff b/debian/lenny/tdenetwork/debian/patches/common/kubuntu_01_kdepot.diff index 0caf5361a..c02687784 100644 --- a/debian/lenny/tdenetwork/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/lenny/tdenetwork/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/opt/trinity/include/kde/kde.pot ++kdepotpath=/opt/trinity/include/tde/kde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/debian/lenny/tdenetwork/debian/rules b/debian/lenny/tdenetwork/debian/rules index 90babf808..71afe376c 100755 --- a/debian/lenny/tdenetwork/debian/rules +++ b/debian/lenny/tdenetwork/debian/rules @@ -17,7 +17,7 @@ include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/debian/lenny/tdenetwork/debian/tdenetwork-trinity-dev.install b/debian/lenny/tdenetwork/debian/tdenetwork-trinity-dev.install index cc69d4cba..4915aaa12 100644 --- a/debian/lenny/tdenetwork/debian/tdenetwork-trinity-dev.install +++ b/debian/lenny/tdenetwork/debian/tdenetwork-trinity-dev.install @@ -1,66 +1,66 @@ -debian/tmp/opt/trinity/include/kde/kopete/kabcpersistence.h -debian/tmp/opt/trinity/include/kde/kopete/kopete_export.h -debian/tmp/opt/trinity/include/kde/kopete/kopeteaccount.h -debian/tmp/opt/trinity/include/kde/kopete/kopeteaccountmanager.h -debian/tmp/opt/trinity/include/kde/kopete/kopeteaway.h -debian/tmp/opt/trinity/include/kde/kopete/kopeteawayaction.h -debian/tmp/opt/trinity/include/kde/kopete/kopeteawaydialog.h -debian/tmp/opt/trinity/include/kde/kopete/kopeteblacklister.h -debian/tmp/opt/trinity/include/kde/kopete/kopetechatsession.h -debian/tmp/opt/trinity/include/kde/kopete/kopetechatsessionmanager.h -debian/tmp/opt/trinity/include/kde/kopete/kopetecommandhandler.h -debian/tmp/opt/trinity/include/kde/kopete/kopetecontact.h -debian/tmp/opt/trinity/include/kde/kopete/kopetecontactlist.h -debian/tmp/opt/trinity/include/kde/kopete/kopetecontactlistelement.h -debian/tmp/opt/trinity/include/kde/kopete/kopetecontactproperty.h -debian/tmp/opt/trinity/include/kde/kopete/kopeteeventpresentation.h -debian/tmp/opt/trinity/include/kde/kopete/kopeteglobal.h -debian/tmp/opt/trinity/include/kde/kopete/kopetegroup.h -debian/tmp/opt/trinity/include/kde/kopete/kopetemessage.h -debian/tmp/opt/trinity/include/kde/kopete/kopetemessageevent.h -debian/tmp/opt/trinity/include/kde/kopete/kopetemessagehandler.h -debian/tmp/opt/trinity/include/kde/kopete/kopetemessagehandlerchain.h -debian/tmp/opt/trinity/include/kde/kopete/kopetemetacontact.h -debian/tmp/opt/trinity/include/kde/kopete/kopetemimetypehandler.h -debian/tmp/opt/trinity/include/kde/kopete/kopetenotifydataobject.h -debian/tmp/opt/trinity/include/kde/kopete/kopeteonlinestatus.h -debian/tmp/opt/trinity/include/kde/kopete/kopeteonlinestatusmanager.h -debian/tmp/opt/trinity/include/kde/kopete/kopetepassword.h -debian/tmp/opt/trinity/include/kde/kopete/kopetepasswordedaccount.h -debian/tmp/opt/trinity/include/kde/kopete/kopeteplugin.h -debian/tmp/opt/trinity/include/kde/kopete/kopeteprotocol.h -debian/tmp/opt/trinity/include/kde/kopete/kopetesimplemessagehandler.h -debian/tmp/opt/trinity/include/kde/kopete/kopetetask.h -debian/tmp/opt/trinity/include/kde/kopete/kopetetransfermanager.h -debian/tmp/opt/trinity/include/kde/kopete/kopeteuiglobal.h -debian/tmp/opt/trinity/include/kde/kopete/kopeteversion.h -debian/tmp/opt/trinity/include/kde/kopete/managedconnectionaccount.h -debian/tmp/opt/trinity/include/kde/kopete/ui/accountselector.h -debian/tmp/opt/trinity/include/kde/kopete/ui/addcontactpage.h -debian/tmp/opt/trinity/include/kde/kopete/ui/addressbookselectordialog.h -debian/tmp/opt/trinity/include/kde/kopete/ui/addressbookselectorwidget.h -debian/tmp/opt/trinity/include/kde/kopete/ui/editaccountwidget.h -debian/tmp/opt/trinity/include/kde/kopete/ui/fileconfirmbase.h -debian/tmp/opt/trinity/include/kde/kopete/ui/kopeteawaydialogbase.h -debian/tmp/opt/trinity/include/kde/kopete/ui/kopetecontactaction.h -debian/tmp/opt/trinity/include/kde/kopete/ui/kopetefileconfirmdialog.h -debian/tmp/opt/trinity/include/kde/kopete/ui/kopetelistview.h -debian/tmp/opt/trinity/include/kde/kopete/ui/kopetelistviewitem.h -debian/tmp/opt/trinity/include/kde/kopete/ui/kopetelistviewsearchline.h -debian/tmp/opt/trinity/include/kde/kopete/ui/kopetepassworddialog.h -debian/tmp/opt/trinity/include/kde/kopete/ui/kopetepasswordwidget.h -debian/tmp/opt/trinity/include/kde/kopete/ui/kopetepasswordwidgetbase.h -debian/tmp/opt/trinity/include/kde/kopete/ui/kopetestdaction.h -debian/tmp/opt/trinity/include/kde/kopete/ui/kopeteview.h -debian/tmp/opt/trinity/include/kde/kopete/ui/kopeteviewplugin.h -debian/tmp/opt/trinity/include/kde/kopete/ui/userinfodialog.h -debian/tmp/opt/trinity/include/kde/rss/article.h -debian/tmp/opt/trinity/include/kde/rss/document.h -debian/tmp/opt/trinity/include/kde/rss/global.h -debian/tmp/opt/trinity/include/kde/rss/image.h -debian/tmp/opt/trinity/include/kde/rss/librss.h -debian/tmp/opt/trinity/include/kde/rss/loader.h -debian/tmp/opt/trinity/include/kde/rss/textinput.h +debian/tmp/opt/trinity/include/tde/kopete/kabcpersistence.h +debian/tmp/opt/trinity/include/tde/kopete/kopete_export.h +debian/tmp/opt/trinity/include/tde/kopete/kopeteaccount.h +debian/tmp/opt/trinity/include/tde/kopete/kopeteaccountmanager.h +debian/tmp/opt/trinity/include/tde/kopete/kopeteaway.h +debian/tmp/opt/trinity/include/tde/kopete/kopeteawayaction.h +debian/tmp/opt/trinity/include/tde/kopete/kopeteawaydialog.h +debian/tmp/opt/trinity/include/tde/kopete/kopeteblacklister.h +debian/tmp/opt/trinity/include/tde/kopete/kopetechatsession.h +debian/tmp/opt/trinity/include/tde/kopete/kopetechatsessionmanager.h +debian/tmp/opt/trinity/include/tde/kopete/kopetecommandhandler.h +debian/tmp/opt/trinity/include/tde/kopete/kopetecontact.h +debian/tmp/opt/trinity/include/tde/kopete/kopetecontactlist.h +debian/tmp/opt/trinity/include/tde/kopete/kopetecontactlistelement.h +debian/tmp/opt/trinity/include/tde/kopete/kopetecontactproperty.h +debian/tmp/opt/trinity/include/tde/kopete/kopeteeventpresentation.h +debian/tmp/opt/trinity/include/tde/kopete/kopeteglobal.h +debian/tmp/opt/trinity/include/tde/kopete/kopetegroup.h +debian/tmp/opt/trinity/include/tde/kopete/kopetemessage.h +debian/tmp/opt/trinity/include/tde/kopete/kopetemessageevent.h +debian/tmp/opt/trinity/include/tde/kopete/kopetemessagehandler.h +debian/tmp/opt/trinity/include/tde/kopete/kopetemessagehandlerchain.h +debian/tmp/opt/trinity/include/tde/kopete/kopetemetacontact.h +debian/tmp/opt/trinity/include/tde/kopete/kopetemimetypehandler.h +debian/tmp/opt/trinity/include/tde/kopete/kopetenotifydataobject.h +debian/tmp/opt/trinity/include/tde/kopete/kopeteonlinestatus.h +debian/tmp/opt/trinity/include/tde/kopete/kopeteonlinestatusmanager.h +debian/tmp/opt/trinity/include/tde/kopete/kopetepassword.h +debian/tmp/opt/trinity/include/tde/kopete/kopetepasswordedaccount.h +debian/tmp/opt/trinity/include/tde/kopete/kopeteplugin.h +debian/tmp/opt/trinity/include/tde/kopete/kopeteprotocol.h +debian/tmp/opt/trinity/include/tde/kopete/kopetesimplemessagehandler.h +debian/tmp/opt/trinity/include/tde/kopete/kopetetask.h +debian/tmp/opt/trinity/include/tde/kopete/kopetetransfermanager.h +debian/tmp/opt/trinity/include/tde/kopete/kopeteuiglobal.h +debian/tmp/opt/trinity/include/tde/kopete/kopeteversion.h +debian/tmp/opt/trinity/include/tde/kopete/managedconnectionaccount.h +debian/tmp/opt/trinity/include/tde/kopete/ui/accountselector.h +debian/tmp/opt/trinity/include/tde/kopete/ui/addcontactpage.h +debian/tmp/opt/trinity/include/tde/kopete/ui/addressbookselectordialog.h +debian/tmp/opt/trinity/include/tde/kopete/ui/addressbookselectorwidget.h +debian/tmp/opt/trinity/include/tde/kopete/ui/editaccountwidget.h +debian/tmp/opt/trinity/include/tde/kopete/ui/fileconfirmbase.h +debian/tmp/opt/trinity/include/tde/kopete/ui/kopeteawaydialogbase.h +debian/tmp/opt/trinity/include/tde/kopete/ui/kopetecontactaction.h +debian/tmp/opt/trinity/include/tde/kopete/ui/kopetefileconfirmdialog.h +debian/tmp/opt/trinity/include/tde/kopete/ui/kopetelistview.h +debian/tmp/opt/trinity/include/tde/kopete/ui/kopetelistviewitem.h +debian/tmp/opt/trinity/include/tde/kopete/ui/kopetelistviewsearchline.h +debian/tmp/opt/trinity/include/tde/kopete/ui/kopetepassworddialog.h +debian/tmp/opt/trinity/include/tde/kopete/ui/kopetepasswordwidget.h +debian/tmp/opt/trinity/include/tde/kopete/ui/kopetepasswordwidgetbase.h +debian/tmp/opt/trinity/include/tde/kopete/ui/kopetestdaction.h +debian/tmp/opt/trinity/include/tde/kopete/ui/kopeteview.h +debian/tmp/opt/trinity/include/tde/kopete/ui/kopeteviewplugin.h +debian/tmp/opt/trinity/include/tde/kopete/ui/userinfodialog.h +debian/tmp/opt/trinity/include/tde/rss/article.h +debian/tmp/opt/trinity/include/tde/rss/document.h +debian/tmp/opt/trinity/include/tde/rss/global.h +debian/tmp/opt/trinity/include/tde/rss/image.h +debian/tmp/opt/trinity/include/tde/rss/librss.h +debian/tmp/opt/trinity/include/tde/rss/loader.h +debian/tmp/opt/trinity/include/tde/rss/textinput.h debian/tmp/opt/trinity/lib/libtdeinit_kdict.la debian/tmp/opt/trinity/lib/libtdeinit_ksirc.la debian/tmp/opt/trinity/lib/libkopete.la @@ -73,4 +73,4 @@ debian/tmp/opt/trinity/lib/libkopete_videodevice.la debian/tmp/opt/trinity/lib/libkopete_videodevice.so debian/tmp/opt/trinity/lib/librss.la debian/tmp/opt/trinity/lib/librss.so -debian/tmp/opt/trinity/include/kde/kopete/kopetepluginmanager.h +debian/tmp/opt/trinity/include/tde/kopete/kopetepluginmanager.h diff --git a/debian/lenny/tdepim/debian/changelog b/debian/lenny/tdepim/debian/changelog index 24807570c..53b6c5851 100644 --- a/debian/lenny/tdepim/debian/changelog +++ b/debian/lenny/tdepim/debian/changelog @@ -706,7 +706,7 @@ tdepim (4:3.5.6-0ubuntu3) feisty; urgency=low - Activates networkstatus support for kmail (patch from SuSE) * debian/control: - New package networkstatus-dev - * ./libtdepim1-dev.install: added /usr/include/kde/kpimprefs.h + * ./libtdepim1-dev.install: added /usr/include/tde/kpimprefs.h -- Anthony Mercatante Fri, 02 Feb 2007 15:37:42 +0100 diff --git a/debian/lenny/tdepim/debian/libindex0-trinity-dev.install b/debian/lenny/tdepim/debian/libindex0-trinity-dev.install index acbb26191..8c2903ede 100644 --- a/debian/lenny/tdepim/debian/libindex0-trinity-dev.install +++ b/debian/lenny/tdepim/debian/libindex0-trinity-dev.install @@ -1,4 +1,4 @@ /opt/trinity/bin/indexlib-config -/opt/trinity/include/kde/index +/opt/trinity/include/tde/index /opt/trinity/lib/libindex.la /opt/trinity/lib/libindex.so diff --git a/debian/lenny/tdepim/debian/libkcal2-trinity-dev.install b/debian/lenny/tdepim/debian/libkcal2-trinity-dev.install index 7dcc98ca7..75a5523ca 100644 --- a/debian/lenny/tdepim/debian/libkcal2-trinity-dev.install +++ b/debian/lenny/tdepim/debian/libkcal2-trinity-dev.install @@ -1,5 +1,5 @@ -/opt/trinity/include/kde/libemailfunctions/idmapper.h -/opt/trinity/include/kde/libkcal +/opt/trinity/include/tde/libemailfunctions/idmapper.h +/opt/trinity/include/tde/libkcal /opt/trinity/lib/libkcal.la /opt/trinity/lib/libkcal.so /opt/trinity/lib/libkcal_resourceremote.la diff --git a/debian/lenny/tdepim/debian/libkgantt0-trinity-dev.install b/debian/lenny/tdepim/debian/libkgantt0-trinity-dev.install index c386be142..290f743b7 100644 --- a/debian/lenny/tdepim/debian/libkgantt0-trinity-dev.install +++ b/debian/lenny/tdepim/debian/libkgantt0-trinity-dev.install @@ -1,3 +1,3 @@ -/opt/trinity/include/kde/kgantt +/opt/trinity/include/tde/kgantt /opt/trinity/lib/libkgantt.la /opt/trinity/lib/libkgantt.so diff --git a/debian/lenny/tdepim/debian/libkleopatra1-trinity-dev.install b/debian/lenny/tdepim/debian/libkleopatra1-trinity-dev.install index cab0f039e..6015f5c08 100644 --- a/debian/lenny/tdepim/debian/libkleopatra1-trinity-dev.install +++ b/debian/lenny/tdepim/debian/libkleopatra1-trinity-dev.install @@ -1,6 +1,6 @@ -/opt/trinity/include/kde/gpgme++ -/opt/trinity/include/kde/kleo -/opt/trinity/include/kde/qgpgme +/opt/trinity/include/tde/gpgme++ +/opt/trinity/include/tde/kleo +/opt/trinity/include/tde/qgpgme /opt/trinity/lib/libgpgme++.la /opt/trinity/lib/libgpgme++.so /opt/trinity/lib/libkleopatra.la diff --git a/debian/lenny/tdepim/debian/libkpimexchange1-trinity-dev.install b/debian/lenny/tdepim/debian/libkpimexchange1-trinity-dev.install index 8bf3b312e..ed8bb8407 100644 --- a/debian/lenny/tdepim/debian/libkpimexchange1-trinity-dev.install +++ b/debian/lenny/tdepim/debian/libkpimexchange1-trinity-dev.install @@ -1,4 +1,4 @@ -/opt/trinity/include/kde/tdepim/exchangeaccount.h -/opt/trinity/include/kde/tdepim/exchangeclient.h +/opt/trinity/include/tde/tdepim/exchangeaccount.h +/opt/trinity/include/tde/tdepim/exchangeclient.h /opt/trinity/lib/libkpimexchange.la /opt/trinity/lib/libkpimexchange.so diff --git a/debian/lenny/tdepim/debian/libksieve0-trinity-dev.install b/debian/lenny/tdepim/debian/libksieve0-trinity-dev.install index 08cf59222..32aa3d12d 100644 --- a/debian/lenny/tdepim/debian/libksieve0-trinity-dev.install +++ b/debian/lenny/tdepim/debian/libksieve0-trinity-dev.install @@ -1,3 +1,3 @@ -/opt/trinity/include/kde/ksieve +/opt/trinity/include/tde/ksieve /opt/trinity/lib/libksieve.la /opt/trinity/lib/libksieve.so diff --git a/debian/lenny/tdepim/debian/libktnef1-trinity-dev.install b/debian/lenny/tdepim/debian/libktnef1-trinity-dev.install index 5c74d9348..1cea927e9 100644 --- a/debian/lenny/tdepim/debian/libktnef1-trinity-dev.install +++ b/debian/lenny/tdepim/debian/libktnef1-trinity-dev.install @@ -1,3 +1,3 @@ -/opt/trinity/include/kde/ktnef +/opt/trinity/include/tde/ktnef /opt/trinity/lib/libktnef.la /opt/trinity/lib/libktnef.so diff --git a/debian/lenny/tdepim/debian/libmimelib1-trinity-dev.install b/debian/lenny/tdepim/debian/libmimelib1-trinity-dev.install index c5092b6a9..3a5428f6e 100644 --- a/debian/lenny/tdepim/debian/libmimelib1-trinity-dev.install +++ b/debian/lenny/tdepim/debian/libmimelib1-trinity-dev.install @@ -1,3 +1,3 @@ -/opt/trinity/include/kde/mimelib +/opt/trinity/include/tde/mimelib /opt/trinity/lib/libmimelib.la /opt/trinity/lib/libmimelib.so diff --git a/debian/lenny/tdepim/debian/libtdepim1-trinity-dev.install b/debian/lenny/tdepim/debian/libtdepim1-trinity-dev.install index 4f6d52f46..56ca2ebc8 100644 --- a/debian/lenny/tdepim/debian/libtdepim1-trinity-dev.install +++ b/debian/lenny/tdepim/debian/libtdepim1-trinity-dev.install @@ -1,3 +1,3 @@ -/opt/trinity/include/kde/tdepimmacros.h +/opt/trinity/include/tde/tdepimmacros.h /opt/trinity/lib/libtdepim.la /opt/trinity/lib/libtdepim.so diff --git a/debian/lenny/tdepim/debian/tdepim-trinity-dev.install b/debian/lenny/tdepim/debian/tdepim-trinity-dev.install index 848758727..b94111037 100644 --- a/debian/lenny/tdepim/debian/tdepim-trinity-dev.install +++ b/debian/lenny/tdepim/debian/tdepim-trinity-dev.install @@ -1,15 +1,15 @@ -/opt/trinity/include/kde/KNotesAppIface.h -/opt/trinity/include/kde/KNotesIface.h -/opt/trinity/include/kde/akregator -/opt/trinity/include/kde/calendar -/opt/trinity/include/kde/kabc -/opt/trinity/include/kde/kaddressbook -/opt/trinity/include/kde/kmail -/opt/trinity/include/kde/kmailIface.h -/opt/trinity/include/kde/kmailicalIface.h -/opt/trinity/include/kde/kmailpartIface.h -/opt/trinity/include/kde/kontact -/opt/trinity/include/kde/korganizer +/opt/trinity/include/tde/KNotesAppIface.h +/opt/trinity/include/tde/KNotesIface.h +/opt/trinity/include/tde/akregator +/opt/trinity/include/tde/calendar +/opt/trinity/include/tde/kabc +/opt/trinity/include/tde/kaddressbook +/opt/trinity/include/tde/kmail +/opt/trinity/include/tde/kmailIface.h +/opt/trinity/include/tde/kmailicalIface.h +/opt/trinity/include/tde/kmailpartIface.h +/opt/trinity/include/tde/kontact +/opt/trinity/include/tde/korganizer /opt/trinity/lib/libkabckolab.la /opt/trinity/lib/libkabckolab.so /opt/trinity/lib/libkabcscalix.la @@ -81,4 +81,4 @@ /opt/trinity/lib/libgwsoap.la /opt/trinity/lib/libgwsoap.so -/opt/trinity/include/kde/kpimprefs.h +/opt/trinity/include/tde/kpimprefs.h diff --git a/debian/lenny/tdesdk/debian/cdbs/kde.mk b/debian/lenny/tdesdk/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/lenny/tdesdk/debian/cdbs/kde.mk +++ b/debian/lenny/tdesdk/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/lenny/tdesdk/debian/changelog b/debian/lenny/tdesdk/debian/changelog index 276fb1d78..1bbe6e2e4 100644 --- a/debian/lenny/tdesdk/debian/changelog +++ b/debian/lenny/tdesdk/debian/changelog @@ -931,7 +931,7 @@ tdesdk (2.2.2-3) unstable; urgency=low tdesdk (2.2.2-2) unstable; urgency=low - * Moved kspy.h to /usr/include/kde (closes: Bug#122448, Bug#122449). + * Moved kspy.h to /usr/include/tde (closes: Bug#122448, Bug#122449). -- Ben Burton Thu, 6 Dec 2001 09:50:47 -0600 diff --git a/debian/lenny/tdesdk/debian/kbabel-trinity-dev.install b/debian/lenny/tdesdk/debian/kbabel-trinity-dev.install index a792b2b6d..ace31ea6a 100644 --- a/debian/lenny/tdesdk/debian/kbabel-trinity-dev.install +++ b/debian/lenny/tdesdk/debian/kbabel-trinity-dev.install @@ -1,24 +1,24 @@ -debian/tmp/opt/trinity/include/kde/kbabel/catalog.h -debian/tmp/opt/trinity/include/kde/kbabel/catalogfileplugin.h -debian/tmp/opt/trinity/include/kde/kbabel/catalogitem.h -debian/tmp/opt/trinity/include/kde/kbabel/catalogsettings.h -debian/tmp/opt/trinity/include/kde/kbabel/catalogview.h -debian/tmp/opt/trinity/include/kde/kbabel/dictchooser.h -debian/tmp/opt/trinity/include/kde/kbabel/dictionarymenu.h -debian/tmp/opt/trinity/include/kde/kbabel/editcmd.h -debian/tmp/opt/trinity/include/kde/kbabel/findoptions.h -debian/tmp/opt/trinity/include/kde/kbabel/itempart.h -debian/tmp/opt/trinity/include/kde/kbabel/kbabeldatatool.h -debian/tmp/opt/trinity/include/kde/kbabel/kbabeldictbox.h -debian/tmp/opt/trinity/include/kde/kbabel/kbabeldictiface.h -debian/tmp/opt/trinity/include/kde/kbabel/kbproject.h -debian/tmp/opt/trinity/include/kde/kbabel/kbprojectmanager.h -debian/tmp/opt/trinity/include/kde/kbabel/msgfmt.h -debian/tmp/opt/trinity/include/kde/kbabel/poinfo.h -debian/tmp/opt/trinity/include/kde/kbabel/projectsettings.h -debian/tmp/opt/trinity/include/kde/kbabel/regexpextractor.h -debian/tmp/opt/trinity/include/kde/kbabel/searchengine.h -debian/tmp/opt/trinity/include/kde/kbabel/tagextractor.h +debian/tmp/opt/trinity/include/tde/kbabel/catalog.h +debian/tmp/opt/trinity/include/tde/kbabel/catalogfileplugin.h +debian/tmp/opt/trinity/include/tde/kbabel/catalogitem.h +debian/tmp/opt/trinity/include/tde/kbabel/catalogsettings.h +debian/tmp/opt/trinity/include/tde/kbabel/catalogview.h +debian/tmp/opt/trinity/include/tde/kbabel/dictchooser.h +debian/tmp/opt/trinity/include/tde/kbabel/dictionarymenu.h +debian/tmp/opt/trinity/include/tde/kbabel/editcmd.h +debian/tmp/opt/trinity/include/tde/kbabel/findoptions.h +debian/tmp/opt/trinity/include/tde/kbabel/itempart.h +debian/tmp/opt/trinity/include/tde/kbabel/kbabeldatatool.h +debian/tmp/opt/trinity/include/tde/kbabel/kbabeldictbox.h +debian/tmp/opt/trinity/include/tde/kbabel/kbabeldictiface.h +debian/tmp/opt/trinity/include/tde/kbabel/kbproject.h +debian/tmp/opt/trinity/include/tde/kbabel/kbprojectmanager.h +debian/tmp/opt/trinity/include/tde/kbabel/msgfmt.h +debian/tmp/opt/trinity/include/tde/kbabel/poinfo.h +debian/tmp/opt/trinity/include/tde/kbabel/projectsettings.h +debian/tmp/opt/trinity/include/tde/kbabel/regexpextractor.h +debian/tmp/opt/trinity/include/tde/kbabel/searchengine.h +debian/tmp/opt/trinity/include/tde/kbabel/tagextractor.h debian/tmp/opt/trinity/lib/libkbabelcommon.la debian/tmp/opt/trinity/lib/libkbabelcommon.so debian/tmp/opt/trinity/lib/libkbabeldictplugin.la diff --git a/debian/lenny/tdesdk/debian/kmtrace-trinity.install b/debian/lenny/tdesdk/debian/kmtrace-trinity.install index 119b5196d..35b5af1a5 100644 --- a/debian/lenny/tdesdk/debian/kmtrace-trinity.install +++ b/debian/lenny/tdesdk/debian/kmtrace-trinity.install @@ -2,7 +2,7 @@ debian/tmp/opt/trinity/bin/demangle debian/tmp/opt/trinity/bin/kminspector debian/tmp/opt/trinity/bin/kmmatch debian/tmp/opt/trinity/bin/kmtrace -debian/tmp/opt/trinity/include/kde/ktrace.h +debian/tmp/opt/trinity/include/tde/ktrace.h debian/tmp/opt/trinity/lib/kmtrace/libktrace.la debian/tmp/opt/trinity/lib/kmtrace/libktrace.so debian/tmp/opt/trinity/lib/kmtrace/libktrace_s.a diff --git a/debian/lenny/tdesdk/debian/kspy-trinity.install b/debian/lenny/tdesdk/debian/kspy-trinity.install index 3b7d6d778..fc17ede2c 100644 --- a/debian/lenny/tdesdk/debian/kspy-trinity.install +++ b/debian/lenny/tdesdk/debian/kspy-trinity.install @@ -1,4 +1,4 @@ -debian/tmp/opt/trinity/include/kde/kspy.h +debian/tmp/opt/trinity/include/tde/kspy.h debian/tmp/opt/trinity/lib/libkspy.la debian/tmp/opt/trinity/lib/libkspy.so debian/tmp/opt/trinity/lib/libkspy.so.1 diff --git a/debian/lenny/tdesdk/debian/kunittest-trinity.install b/debian/lenny/tdesdk/debian/kunittest-trinity.install index f002cd796..e183f0e74 100644 --- a/debian/lenny/tdesdk/debian/kunittest-trinity.install +++ b/debian/lenny/tdesdk/debian/kunittest-trinity.install @@ -4,4 +4,4 @@ debian/tmp/opt/trinity/lib/libkunittestgui.la debian/tmp/opt/trinity/lib/libkunittestgui.so debian/tmp/opt/trinity/lib/libkunittestgui.so.0 debian/tmp/opt/trinity/lib/libkunittestgui.so.0.0.0 -debian/tmp/opt/trinity/include/kde/kunittest/runnergui.h +debian/tmp/opt/trinity/include/tde/kunittest/runnergui.h diff --git a/debian/lenny/tdesdk/debian/libcvsservice-trinity-dev.install b/debian/lenny/tdesdk/debian/libcvsservice-trinity-dev.install index ac87e6efb..566e0b7a1 100644 --- a/debian/lenny/tdesdk/debian/libcvsservice-trinity-dev.install +++ b/debian/lenny/tdesdk/debian/libcvsservice-trinity-dev.install @@ -1,6 +1,6 @@ -debian/tmp/opt/trinity/include/kde/cvsjob_stub.h -debian/tmp/opt/trinity/include/kde/cvsservice_stub.h -debian/tmp/opt/trinity/include/kde/repository_stub.h +debian/tmp/opt/trinity/include/tde/cvsjob_stub.h +debian/tmp/opt/trinity/include/tde/cvsservice_stub.h +debian/tmp/opt/trinity/include/tde/repository_stub.h debian/tmp/opt/trinity/lib/libcvsservice.la debian/tmp/opt/trinity/lib/libcvsservice.so debian/tmp/opt/trinity/lib/libtdeinit_cvsaskpass.la diff --git a/debian/lenny/tdesdk/debian/patches/common/kubuntu_01_kdepot.diff b/debian/lenny/tdesdk/debian/patches/common/kubuntu_01_kdepot.diff index 0caf5361a..c02687784 100644 --- a/debian/lenny/tdesdk/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/lenny/tdesdk/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/opt/trinity/include/kde/kde.pot ++kdepotpath=/opt/trinity/include/tde/kde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/debian/lenny/tdesdk/debian/rules b/debian/lenny/tdesdk/debian/rules index e7b228f2b..d63a59865 100755 --- a/debian/lenny/tdesdk/debian/rules +++ b/debian/lenny/tdesdk/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/debian/lenny/tdesdk/debian/tdesdk-misc-trinity.install b/debian/lenny/tdesdk/debian/tdesdk-misc-trinity.install index cc229ce19..4b2589f6c 100644 --- a/debian/lenny/tdesdk/debian/tdesdk-misc-trinity.install +++ b/debian/lenny/tdesdk/debian/tdesdk-misc-trinity.install @@ -1,4 +1,4 @@ -debian/tmp/opt/trinity/include/kde/kprofilemethod.h +debian/tmp/opt/trinity/include/tde/kprofilemethod.h debian/tmp/opt/trinity/lib/trinity/kabcformat_kdeaccounts.la debian/tmp/opt/trinity/lib/trinity/kabcformat_kdeaccounts.so debian/tmp/opt/trinity/lib/trinity/plugins/styles/scheck.so diff --git a/debian/lenny/tdetoys/debian/amor-trinity.install b/debian/lenny/tdetoys/debian/amor-trinity.install index b616db701..56a51c1b0 100644 --- a/debian/lenny/tdetoys/debian/amor-trinity.install +++ b/debian/lenny/tdetoys/debian/amor-trinity.install @@ -1,5 +1,5 @@ debian/tmp/opt/trinity/bin/amor -debian/tmp/opt/trinity/include/kde/AmorIface.h +debian/tmp/opt/trinity/include/tde/AmorIface.h debian/tmp/opt/trinity/share/apps/amor debian/tmp/opt/trinity/share/applications/kde/amor.desktop debian/tmp/opt/trinity/share/doc/kde/HTML/en/amor/*.bz2 diff --git a/debian/lenny/tdetoys/debian/cdbs/kde.mk b/debian/lenny/tdetoys/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/lenny/tdetoys/debian/cdbs/kde.mk +++ b/debian/lenny/tdetoys/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/lenny/tdetoys/debian/changelog b/debian/lenny/tdetoys/debian/changelog index 5406c86c9..232db2401 100644 --- a/debian/lenny/tdetoys/debian/changelog +++ b/debian/lenny/tdetoys/debian/changelog @@ -609,7 +609,7 @@ tdetoys (4:2.2.2-3) unstable; urgency=low tdetoys (4:2.2.2-2) unstable; urgency=low - * Moved AmorIface.h to /usr/include/kde (closes: Bug#122447). + * Moved AmorIface.h to /usr/include/tde (closes: Bug#122447). -- Ben Burton Sun, 9 Dec 2001 09:07:02 -0600 diff --git a/debian/lenny/tdetoys/debian/patches/common/kubuntu_01_kdepot.diff b/debian/lenny/tdetoys/debian/patches/common/kubuntu_01_kdepot.diff index 0caf5361a..c02687784 100644 --- a/debian/lenny/tdetoys/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/lenny/tdetoys/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/opt/trinity/include/kde/kde.pot ++kdepotpath=/opt/trinity/include/tde/kde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/debian/lenny/tdetoys/debian/rules b/debian/lenny/tdetoys/debian/rules index 29a5978c3..57c3cf2c9 100755 --- a/debian/lenny/tdetoys/debian/rules +++ b/debian/lenny/tdetoys/debian/rules @@ -5,14 +5,14 @@ include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --includedir="/opt/trinity/include/kde" --mandir="/opt/trinity/share/man" --infodir="/opt/trinity/share/info" +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --includedir="/opt/trinity/include/tde" --mandir="/opt/trinity/share/man" --infodir="/opt/trinity/share/info" DEB_DH_STRIP_ARGS := --dbg-package=tdetoys-trinity-dbg diff --git a/debian/lenny/tdeutils/debian/cdbs/kde.mk b/debian/lenny/tdeutils/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/lenny/tdeutils/debian/cdbs/kde.mk +++ b/debian/lenny/tdeutils/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/lenny/tdeutils/debian/patches/common/kubuntu_01_kdepot.diff b/debian/lenny/tdeutils/debian/patches/common/kubuntu_01_kdepot.diff index 0caf5361a..c02687784 100644 --- a/debian/lenny/tdeutils/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/lenny/tdeutils/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/opt/trinity/include/kde/kde.pot ++kdepotpath=/opt/trinity/include/tde/kde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/debian/lenny/tdeutils/debian/rules b/debian/lenny/tdeutils/debian/rules index f7cd135a4..a83c83fdf 100755 --- a/debian/lenny/tdeutils/debian/rules +++ b/debian/lenny/tdeutils/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/debian/lenny/tdeutils/debian/tdeutils-trinity-dev.install b/debian/lenny/tdeutils/debian/tdeutils-trinity-dev.install index a3c425a38..ca7081194 100644 --- a/debian/lenny/tdeutils/debian/tdeutils-trinity-dev.install +++ b/debian/lenny/tdeutils/debian/tdeutils-trinity-dev.install @@ -1,18 +1,18 @@ -debian/tmp/opt/trinity/include/kde/kmultiformlistbox.h -debian/tmp/opt/trinity/include/kde/kmultiformlistboxentry.h -debian/tmp/opt/trinity/include/kde/kmultiformlistboxfactory.h -debian/tmp/opt/trinity/include/kde/ksim/chart.h -debian/tmp/opt/trinity/include/kde/ksim/common.h -debian/tmp/opt/trinity/include/kde/ksim/ksimconfig.h -debian/tmp/opt/trinity/include/kde/ksim/label.h -debian/tmp/opt/trinity/include/kde/ksim/led.h -debian/tmp/opt/trinity/include/kde/ksim/pluginglobal.h -debian/tmp/opt/trinity/include/kde/ksim/pluginloader.h -debian/tmp/opt/trinity/include/kde/ksim/pluginmodule.h -debian/tmp/opt/trinity/include/kde/ksim/progress.h -debian/tmp/opt/trinity/include/kde/ksim/themeloader.h -debian/tmp/opt/trinity/include/kde/ksim/themetypes.h -debian/tmp/opt/trinity/include/kde/kwidgetstreamer.h +debian/tmp/opt/trinity/include/tde/kmultiformlistbox.h +debian/tmp/opt/trinity/include/tde/kmultiformlistboxentry.h +debian/tmp/opt/trinity/include/tde/kmultiformlistboxfactory.h +debian/tmp/opt/trinity/include/tde/ksim/chart.h +debian/tmp/opt/trinity/include/tde/ksim/common.h +debian/tmp/opt/trinity/include/tde/ksim/ksimconfig.h +debian/tmp/opt/trinity/include/tde/ksim/label.h +debian/tmp/opt/trinity/include/tde/ksim/led.h +debian/tmp/opt/trinity/include/tde/ksim/pluginglobal.h +debian/tmp/opt/trinity/include/tde/ksim/pluginloader.h +debian/tmp/opt/trinity/include/tde/ksim/pluginmodule.h +debian/tmp/opt/trinity/include/tde/ksim/progress.h +debian/tmp/opt/trinity/include/tde/ksim/themeloader.h +debian/tmp/opt/trinity/include/tde/ksim/themetypes.h +debian/tmp/opt/trinity/include/tde/kwidgetstreamer.h debian/tmp/opt/trinity/lib/libkcmlaptop.la debian/tmp/opt/trinity/lib/libkcmlaptop.so debian/tmp/opt/trinity/lib/libtdeinit_ark.la diff --git a/debian/lenny/tdevelop/debian/cdbs/kde.mk b/debian/lenny/tdevelop/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/lenny/tdevelop/debian/cdbs/kde.mk +++ b/debian/lenny/tdevelop/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/lenny/tdevelop/debian/patches/common/kubuntu_01_kdepot.diff b/debian/lenny/tdevelop/debian/patches/common/kubuntu_01_kdepot.diff index 0caf5361a..c02687784 100644 --- a/debian/lenny/tdevelop/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/lenny/tdevelop/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/opt/trinity/include/kde/kde.pot ++kdepotpath=/opt/trinity/include/tde/kde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/debian/lenny/tdevelop/debian/rules b/debian/lenny/tdevelop/debian/rules index f5bce32b3..21f2c166a 100755 --- a/debian/lenny/tdevelop/debian/rules +++ b/debian/lenny/tdevelop/debian/rules @@ -9,7 +9,7 @@ include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/debian/lenny/tdevelop/debian/tdevelop-trinity-dev.install b/debian/lenny/tdevelop/debian/tdevelop-trinity-dev.install index 5c24ba5bb..f9f8c82ab 100644 --- a/debian/lenny/tdevelop/debian/tdevelop-trinity-dev.install +++ b/debian/lenny/tdevelop/debian/tdevelop-trinity-dev.install @@ -1,3 +1,3 @@ -debian/tmp/opt/trinity/include/kde +debian/tmp/opt/trinity/include/tde debian/tmp/opt/trinity/lib/lib*.so debian/tmp/opt/trinity/lib/lib*.la diff --git a/debian/lenny/tdewebdev/debian/cdbs/kde.mk b/debian/lenny/tdewebdev/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/lenny/tdewebdev/debian/cdbs/kde.mk +++ b/debian/lenny/tdewebdev/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/lenny/tdewebdev/debian/kommander-trinity-dev.install b/debian/lenny/tdewebdev/debian/kommander-trinity-dev.install index 54d904432..8d8db707b 100644 --- a/debian/lenny/tdewebdev/debian/kommander-trinity-dev.install +++ b/debian/lenny/tdewebdev/debian/kommander-trinity-dev.install @@ -1,7 +1,7 @@ -debian/tmp/opt/trinity/include/kde/kommander* +debian/tmp/opt/trinity/include/tde/kommander* debian/tmp/opt/trinity/lib/libkommanderplugin.la debian/tmp/opt/trinity/lib/libkommanderplugin.so debian/tmp/opt/trinity/lib/libkommanderwidget.la debian/tmp/opt/trinity/lib/libkommanderwidget.so debian/tmp/opt/trinity/lib/libkommanderwidgets.so -debian/tmp/opt/trinity/include/kde/specials.h +debian/tmp/opt/trinity/include/tde/specials.h diff --git a/debian/lenny/tdewebdev/debian/patches/common/kubuntu_01_kdepot.diff b/debian/lenny/tdewebdev/debian/patches/common/kubuntu_01_kdepot.diff index 1f825f642..698deb926 100644 --- a/debian/lenny/tdewebdev/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/lenny/tdewebdev/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/usr/include/kde/kde.pot ++kdepotpath=/usr/include/tde/kde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/debian/lenny/tdewebdev/debian/rules b/debian/lenny/tdewebdev/debian/rules index 2dcf9658d..888f66bcf 100755 --- a/debian/lenny/tdewebdev/debian/rules +++ b/debian/lenny/tdewebdev/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/debian/squeeze/applications/adept/debian/cdbs/kde.mk b/debian/squeeze/applications/adept/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/squeeze/applications/adept/debian/cdbs/kde.mk +++ b/debian/squeeze/applications/adept/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/squeeze/applications/adept/debian/rules b/debian/squeeze/applications/adept/debian/rules index 9c80b51c7..ee86e8e4f 100755 --- a/debian/squeeze/applications/adept/debian/rules +++ b/debian/squeeze/applications/adept/debian/rules @@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/debian/squeeze/applications/amarok/debian/cdbs/kde.mk b/debian/squeeze/applications/amarok/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/squeeze/applications/amarok/debian/cdbs/kde.mk +++ b/debian/squeeze/applications/amarok/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/squeeze/applications/amarok/debian/rules b/debian/squeeze/applications/amarok/debian/rules index 1e2caae64..deb43ebf7 100755 --- a/debian/squeeze/applications/amarok/debian/rules +++ b/debian/squeeze/applications/amarok/debian/rules @@ -5,7 +5,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/patchsys-quilt.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/debian/squeeze/applications/basket/debian/rules b/debian/squeeze/applications/basket/debian/rules index 5af81349e..0e699603a 100755 --- a/debian/squeeze/applications/basket/debian/rules +++ b/debian/squeeze/applications/basket/debian/rules @@ -3,7 +3,7 @@ #export DH_VERBOSE=1 -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/debian/squeeze/applications/bibletime/debian/cdbs/kde.mk b/debian/squeeze/applications/bibletime/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/squeeze/applications/bibletime/debian/cdbs/kde.mk +++ b/debian/squeeze/applications/bibletime/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/squeeze/applications/bibletime/debian/rules b/debian/squeeze/applications/bibletime/debian/rules index 1ef64a83d..ea4b62326 100755 --- a/debian/squeeze/applications/bibletime/debian/rules +++ b/debian/squeeze/applications/bibletime/debian/rules @@ -9,7 +9,7 @@ DEB_DH_INSTALL_SOURCEDIR := debian DEB_BUILDDIR = $(DEB_SRCDIR) -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/debian/squeeze/applications/compizconfig-backend-kconfig/debian/cdbs/kde.mk b/debian/squeeze/applications/compizconfig-backend-kconfig/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/squeeze/applications/compizconfig-backend-kconfig/debian/cdbs/kde.mk +++ b/debian/squeeze/applications/compizconfig-backend-kconfig/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/squeeze/applications/compizconfig-backend-kconfig/debian/rules b/debian/squeeze/applications/compizconfig-backend-kconfig/debian/rules index 820ba5a3b..c5dd59ccb 100755 --- a/debian/squeeze/applications/compizconfig-backend-kconfig/debian/rules +++ b/debian/squeeze/applications/compizconfig-backend-kconfig/debian/rules @@ -4,14 +4,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde post-patches:: debian/stamp-bootstrap diff --git a/debian/squeeze/applications/desktop-effects-tde/debian/rules b/debian/squeeze/applications/desktop-effects-tde/debian/rules index 7bdd258a5..7bf3e3306 100755 --- a/debian/squeeze/applications/desktop-effects-tde/debian/rules +++ b/debian/squeeze/applications/desktop-effects-tde/debian/rules @@ -2,7 +2,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/debian/squeeze/applications/digikam/debian/cdbs/kde.mk b/debian/squeeze/applications/digikam/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/squeeze/applications/digikam/debian/cdbs/kde.mk +++ b/debian/squeeze/applications/digikam/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/squeeze/applications/digikam/debian/digikam-trinity.install b/debian/squeeze/applications/digikam/debian/digikam-trinity.install index 87c7fe33f..49fc16b82 100644 --- a/debian/squeeze/applications/digikam/debian/digikam-trinity.install +++ b/debian/squeeze/applications/digikam/debian/digikam-trinity.install @@ -1,5 +1,5 @@ opt/trinity/bin/digi* -/opt/trinity/include/kde +/opt/trinity/include/tde opt/trinity/lib /opt/trinity/share/apps/digikam /opt/trinity/share/apps/konqueror/servicemenus/digikam*.desktop diff --git a/debian/squeeze/applications/digikam/debian/rules b/debian/squeeze/applications/digikam/debian/rules index d4b31de95..18181fd83 100755 --- a/debian/squeeze/applications/digikam/debian/rules +++ b/debian/squeeze/applications/digikam/debian/rules @@ -6,7 +6,7 @@ include /usr/share/cdbs/1/rules/utils.mk include debian/cdbs/debian-qt-kde.mk -include /usr/share/gnome-pkg-tools/1/rules/sf-get-source.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/debian/squeeze/applications/filelight-l10n/debian/cdbs/kde.mk b/debian/squeeze/applications/filelight-l10n/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/squeeze/applications/filelight-l10n/debian/cdbs/kde.mk +++ b/debian/squeeze/applications/filelight-l10n/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/squeeze/applications/filelight-l10n/debian/rules b/debian/squeeze/applications/filelight-l10n/debian/rules index 7eea2f6e2..9255102ce 100755 --- a/debian/squeeze/applications/filelight-l10n/debian/rules +++ b/debian/squeeze/applications/filelight-l10n/debian/rules @@ -7,7 +7,7 @@ include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 @@ -17,7 +17,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine #DEB_PATCHDIRS := debian/patches/common debian/patches #DEB_INSTALL_DOCS_ALL := -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/usr/trinity/lib --with-extra-includes=/opt/trinity/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/usr/trinity/lib --with-extra-includes=/opt/trinity/include/tde post-patches:: debian/stamp-bootstrap diff --git a/debian/squeeze/applications/filelight/debian/cdbs/kde.mk b/debian/squeeze/applications/filelight/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/squeeze/applications/filelight/debian/cdbs/kde.mk +++ b/debian/squeeze/applications/filelight/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/squeeze/applications/filelight/debian/rules b/debian/squeeze/applications/filelight/debian/rules index a7c79577a..838448085 100755 --- a/debian/squeeze/applications/filelight/debian/rules +++ b/debian/squeeze/applications/filelight/debian/rules @@ -8,7 +8,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/patchsys-quilt.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/debian/squeeze/applications/gtk-qt-engine/debian/cdbs/kde.mk b/debian/squeeze/applications/gtk-qt-engine/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/squeeze/applications/gtk-qt-engine/debian/cdbs/kde.mk +++ b/debian/squeeze/applications/gtk-qt-engine/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/squeeze/applications/gtk-qt-engine/debian/rules b/debian/squeeze/applications/gtk-qt-engine/debian/rules index f2ac92c96..0247f6ef3 100755 --- a/debian/squeeze/applications/gtk-qt-engine/debian/rules +++ b/debian/squeeze/applications/gtk-qt-engine/debian/rules @@ -15,7 +15,7 @@ include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk include debian/cdbs/debian-qt-kde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 @@ -24,7 +24,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib -DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/kde" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" +DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/tde" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" binary-install/gtk-qt-engine-trinity:: mkdir -p $(CURDIR)/debian/gtk-qt-engine-trinity/opt/trinity/share/kgtk/ diff --git a/debian/squeeze/applications/gwenview/debian/cdbs/kde.mk b/debian/squeeze/applications/gwenview/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/squeeze/applications/gwenview/debian/cdbs/kde.mk +++ b/debian/squeeze/applications/gwenview/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/squeeze/applications/gwenview/debian/rules b/debian/squeeze/applications/gwenview/debian/rules index c231b336f..81fd87521 100755 --- a/debian/squeeze/applications/gwenview/debian/rules +++ b/debian/squeeze/applications/gwenview/debian/rules @@ -7,7 +7,7 @@ include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/debian/squeeze/applications/k3b/debian/cdbs/kde.mk b/debian/squeeze/applications/k3b/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/squeeze/applications/k3b/debian/cdbs/kde.mk +++ b/debian/squeeze/applications/k3b/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/squeeze/applications/k3b/debian/rules b/debian/squeeze/applications/k3b/debian/rules index fa308829e..664df39cf 100755 --- a/debian/squeeze/applications/k3b/debian/rules +++ b/debian/squeeze/applications/k3b/debian/rules @@ -4,14 +4,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include debian/cdbs/kde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde5 +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde5 DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_PREFIX := /opt/trinity DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) -DEB_CONFIGURE_EXTRA_FLAGS = --with-k3bsetup=no --with-extra-libs=/opt/trinity/lib --includedir="/opt/trinity/include/kde" +DEB_CONFIGURE_EXTRA_FLAGS = --with-k3bsetup=no --with-extra-libs=/opt/trinity/lib --includedir="/opt/trinity/include/tde" DEB_INSTALL_MANPAGES_k3b = debian/k3b.1 diff --git a/debian/squeeze/applications/k3b/debian/trinity.mk b/debian/squeeze/applications/k3b/debian/trinity.mk index c48d5d5af..cd71193a1 100644 --- a/debian/squeeze/applications/k3b/debian/trinity.mk +++ b/debian/squeeze/applications/k3b/debian/trinity.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama --without-arts $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "/opt/trinity/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "/opt/trinity/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/squeeze/applications/k9copy/debian/cdbs/kde.mk b/debian/squeeze/applications/k9copy/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/squeeze/applications/k9copy/debian/cdbs/kde.mk +++ b/debian/squeeze/applications/k9copy/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/squeeze/applications/k9copy/debian/rules b/debian/squeeze/applications/k9copy/debian/rules index 860ee9e84..7f17e00f5 100755 --- a/debian/squeeze/applications/k9copy/debian/rules +++ b/debian/squeeze/applications/k9copy/debian/rules @@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/class/kde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 @@ -13,7 +13,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_INSTALL_MANPAGES_k9copy = k9copy-trinity.1 -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --includedir="/opt/trinity/include/kde" --mandir="/opt/trinity/share/man" --infodir="/opt/trinity/share/info" +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --includedir="/opt/trinity/include/tde" --mandir="/opt/trinity/share/man" --infodir="/opt/trinity/share/info" post-patches:: debian/stamp-bootstrap diff --git a/debian/squeeze/applications/kaffeine-mozilla/debian/rules b/debian/squeeze/applications/kaffeine-mozilla/debian/rules index 86b977b3f..80fe9807b 100755 --- a/debian/squeeze/applications/kaffeine-mozilla/debian/rules +++ b/debian/squeeze/applications/kaffeine-mozilla/debian/rules @@ -14,7 +14,7 @@ export DH_OPTIONS DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/debian/squeeze/applications/kaffeine/debian/cdbs/kde.mk b/debian/squeeze/applications/kaffeine/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/squeeze/applications/kaffeine/debian/cdbs/kde.mk +++ b/debian/squeeze/applications/kaffeine/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/squeeze/applications/kaffeine/debian/kaffeine-trinity.install b/debian/squeeze/applications/kaffeine/debian/kaffeine-trinity.install index 825837cba..4777ef63c 100644 --- a/debian/squeeze/applications/kaffeine/debian/kaffeine-trinity.install +++ b/debian/squeeze/applications/kaffeine/debian/kaffeine-trinity.install @@ -13,7 +13,7 @@ debian/tmp/opt/trinity/share/doc/ debian/tmp/opt/trinity/share/icons/ debian/tmp/opt/trinity/share/mimelnk/application/x-kaffeine.desktop debian/tmp/opt/trinity/share/locale/ -debian/tmp/opt/trinity/include/kde/kaffeine/*h +debian/tmp/opt/trinity/include/tde/kaffeine/*h debian/tmp/opt/trinity/share/services/kaffeineoggvorbis.desktop debian/tmp/opt/trinity/lib/trinity/libkaffeineoggvorbis.la debian/tmp/opt/trinity/lib/trinity/libkaffeineoggvorbis.so diff --git a/debian/squeeze/applications/kaffeine/debian/rules b/debian/squeeze/applications/kaffeine/debian/rules index efff35a86..43e1e0d24 100755 --- a/debian/squeeze/applications/kaffeine/debian/rules +++ b/debian/squeeze/applications/kaffeine/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/debian/squeeze/applications/katapult/debian/cdbs/kde.mk b/debian/squeeze/applications/katapult/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/squeeze/applications/katapult/debian/cdbs/kde.mk +++ b/debian/squeeze/applications/katapult/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/squeeze/applications/katapult/debian/rules b/debian/squeeze/applications/katapult/debian/rules index f29a6a564..e48ac244a 100755 --- a/debian/squeeze/applications/katapult/debian/rules +++ b/debian/squeeze/applications/katapult/debian/rules @@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/debian/squeeze/applications/kbarcode/debian/cdbs/kde.mk b/debian/squeeze/applications/kbarcode/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/squeeze/applications/kbarcode/debian/cdbs/kde.mk +++ b/debian/squeeze/applications/kbarcode/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/squeeze/applications/kbarcode/debian/rules b/debian/squeeze/applications/kbarcode/debian/rules index bb554f410..35a033bc7 100755 --- a/debian/squeeze/applications/kbarcode/debian/rules +++ b/debian/squeeze/applications/kbarcode/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/patchsys-quilt.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/debian/squeeze/applications/kbfx/debian/rules b/debian/squeeze/applications/kbfx/debian/rules index 5ea2ffc62..9d710b00d 100755 --- a/debian/squeeze/applications/kbfx/debian/rules +++ b/debian/squeeze/applications/kbfx/debian/rules @@ -7,21 +7,21 @@ URL = http://www.$(DEB_SOURCE_PACKAGE).org/release/0.4.9/testing/$(UPFILENAME) DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib #CMAKE_LIBRARY_PATH := /opt/trinity/lib -#CMAKE_INCLUDE_PATH := /opt/trinity/include/kde +#CMAKE_INCLUDE_PATH := /opt/trinity/include/tde include debian/cmake.mk include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) -DEB_CMAKE_EXTRA_FLAGS = -DLIB_SUFFIX="" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/kde" -DCMAKE_INSTALL_PREFIX="/opt/trinity/" +DEB_CMAKE_EXTRA_FLAGS = -DLIB_SUFFIX="" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/tde" -DCMAKE_INSTALL_PREFIX="/opt/trinity/" get-orig-source: @@dh_testdir diff --git a/debian/squeeze/applications/kbookreader/debian/cdbs/kde.mk b/debian/squeeze/applications/kbookreader/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/squeeze/applications/kbookreader/debian/cdbs/kde.mk +++ b/debian/squeeze/applications/kbookreader/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/squeeze/applications/kbookreader/debian/rules b/debian/squeeze/applications/kbookreader/debian/rules index 4ceef7d99..b3b57fdb9 100755 --- a/debian/squeeze/applications/kbookreader/debian/rules +++ b/debian/squeeze/applications/kbookreader/debian/rules @@ -4,14 +4,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/class/kde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --includedir="/opt/trinity/include/kde" --mandir="/opt/trinity/share/man" --infodir="/opt/trinity/share/info" +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --includedir="/opt/trinity/include/tde" --mandir="/opt/trinity/share/man" --infodir="/opt/trinity/share/info" post-patches:: debian/stamp-bootstrap diff --git a/debian/squeeze/applications/kchmviewer/debian/debiandirs b/debian/squeeze/applications/kchmviewer/debian/debiandirs index cb33e0ee3..893052e08 100644 --- a/debian/squeeze/applications/kchmviewer/debian/debiandirs +++ b/debian/squeeze/applications/kchmviewer/debian/debiandirs @@ -1,6 +1,6 @@ export kde_prefix=/usr export sysconfdir=/etc -export kde_includedir=/usr/include/kde +export kde_includedir=/usr/include/tde export infodir=/usr/share/info export mandir=/usr/share/man export qtdir=/usr/share/qt3 diff --git a/debian/squeeze/applications/kchmviewer/debian/rules b/debian/squeeze/applications/kchmviewer/debian/rules index 0466e25ea..72c3fd5bb 100755 --- a/debian/squeeze/applications/kchmviewer/debian/rules +++ b/debian/squeeze/applications/kchmviewer/debian/rules @@ -9,7 +9,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 @@ -27,7 +27,7 @@ CFLAGS = -Wall -g CONFIGURE_OPTIONS_KDE = \ --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \ --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib \ - --includedir=/opt/trinity/include/kde --mandir=/opt/trinity/share/man \ + --includedir=/opt/trinity/include/tde --mandir=/opt/trinity/share/man \ --with-qt-dir=$(qtdir) \ --sysconfdir=$(sysconfdir) \ --infodir=/opt/trinity/share/info \ diff --git a/debian/squeeze/applications/kcpuload/debian/cdbs/kde.mk b/debian/squeeze/applications/kcpuload/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/squeeze/applications/kcpuload/debian/cdbs/kde.mk +++ b/debian/squeeze/applications/kcpuload/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/squeeze/applications/kcpuload/debian/rules b/debian/squeeze/applications/kcpuload/debian/rules index 2ab783f6d..fae495f36 100755 --- a/debian/squeeze/applications/kcpuload/debian/rules +++ b/debian/squeeze/applications/kcpuload/debian/rules @@ -5,7 +5,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 @@ -79,7 +79,7 @@ configure-stamp: # run configure with build tree $(objdir) cd $(objdir) && \ - ../configure --disable-debug --enable-final --libexecdir=/opt/trinity/bin --sysconfdir=/etc --libdir=/opt/trinity/lib --includedir=/opt/include/kde --with-qt-includes=/usr/include/qt3 --mandir=/opt/trinity/share/man --infodir=/opt/trinity/share/info --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib + ../configure --disable-debug --enable-final --libexecdir=/opt/trinity/bin --sysconfdir=/etc --libdir=/opt/trinity/lib --includedir=/opt/include/tde --with-qt-includes=/usr/include/qt3 --mandir=/opt/trinity/share/man --infodir=/opt/trinity/share/info --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib touch configure-stamp diff --git a/debian/squeeze/applications/kdbusnotification/debian/cdbs/kde.mk b/debian/squeeze/applications/kdbusnotification/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/squeeze/applications/kdbusnotification/debian/cdbs/kde.mk +++ b/debian/squeeze/applications/kdbusnotification/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/squeeze/applications/kdbusnotification/debian/rules b/debian/squeeze/applications/kdbusnotification/debian/rules index 3fbf27bb0..d47788b3a 100755 --- a/debian/squeeze/applications/kdbusnotification/debian/rules +++ b/debian/squeeze/applications/kdbusnotification/debian/rules @@ -5,7 +5,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 @@ -78,7 +78,7 @@ configure-stamp: # run configure with build tree $(objdir) cd $(objdir) && \ - ../configure --disable-debug --enable-final --libexecdir=/opt/trinity/bin --sysconfdir=/etc --libdir=/opt/trinity/lib --includedir=/opt/include/kde --with-qt-includes=/usr/include/qt3 --mandir=/opt/trinity/share/man --infodir=/opt/trinity/share/info --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib + ../configure --disable-debug --enable-final --libexecdir=/opt/trinity/bin --sysconfdir=/etc --libdir=/opt/trinity/lib --includedir=/opt/include/tde --with-qt-includes=/usr/include/qt3 --mandir=/opt/trinity/share/man --infodir=/opt/trinity/share/info --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib touch configure-stamp diff --git a/debian/squeeze/applications/kdiff3/debian/cdbs/kde.mk b/debian/squeeze/applications/kdiff3/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/squeeze/applications/kdiff3/debian/cdbs/kde.mk +++ b/debian/squeeze/applications/kdiff3/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/squeeze/applications/kdiff3/debian/rules b/debian/squeeze/applications/kdiff3/debian/rules index 90b33c108..e76778235 100755 --- a/debian/squeeze/applications/kdiff3/debian/rules +++ b/debian/squeeze/applications/kdiff3/debian/rules @@ -4,7 +4,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 @@ -37,7 +37,7 @@ config.status: cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in make -f admin/Makefile.common cvs - CFLAGS="$(CFLAGS)" ./configure --disable-rpath --prefix=/opt/trinity --with-qt-includes=/usr/include/qt3 --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --mandir=/opt/trinity/share/man --infodir=/opt/trinity/share/info --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde + CFLAGS="$(CFLAGS)" ./configure --disable-rpath --prefix=/opt/trinity --with-qt-includes=/usr/include/qt3 --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --mandir=/opt/trinity/share/man --infodir=/opt/trinity/share/info --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde build: build-stamp diff --git a/debian/squeeze/applications/kdirstat/debian/cdbs/kde.mk b/debian/squeeze/applications/kdirstat/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/squeeze/applications/kdirstat/debian/cdbs/kde.mk +++ b/debian/squeeze/applications/kdirstat/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/squeeze/applications/kdirstat/debian/rules b/debian/squeeze/applications/kdirstat/debian/rules index cf2a8db06..b15f5a9a5 100755 --- a/debian/squeeze/applications/kdirstat/debian/rules +++ b/debian/squeeze/applications/kdirstat/debian/rules @@ -4,14 +4,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde LDFLAGS += -Wl,--as-needed diff --git a/debian/squeeze/applications/kdpkg/debian/rules b/debian/squeeze/applications/kdpkg/debian/rules index 59fc3d5a5..b2822c5b3 100755 --- a/debian/squeeze/applications/kdpkg/debian/rules +++ b/debian/squeeze/applications/kdpkg/debian/rules @@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/autotools.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/debian/squeeze/applications/keep/debian/cdbs/kde.mk b/debian/squeeze/applications/keep/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/squeeze/applications/keep/debian/cdbs/kde.mk +++ b/debian/squeeze/applications/keep/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/squeeze/applications/keep/debian/patches/kubuntu_01_kdepot.diff b/debian/squeeze/applications/keep/debian/patches/kubuntu_01_kdepot.diff index 55238c41a..782118729 100644 --- a/debian/squeeze/applications/keep/debian/patches/kubuntu_01_kdepot.diff +++ b/debian/squeeze/applications/keep/debian/patches/kubuntu_01_kdepot.diff @@ -5,7 +5,7 @@ diff -Nur keep-0.4.0/admin/cvs.sh keep-0.4.0.new/admin/cvs.sh if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/usr/include/kde/kde.pot ++kdepotpath=/usr/include/tde/kde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -16,5 +16,5 @@ diff -Nur keep-0.4.0/admin/cvs.sh keep-0.4.0.new/admin/cvs.sh - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot if ! test -f $kdepotpath; then - kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot + kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot fi diff --git a/debian/squeeze/applications/keep/debian/rules b/debian/squeeze/applications/keep/debian/rules index 49dc42fae..b6eae04ee 100755 --- a/debian/squeeze/applications/keep/debian/rules +++ b/debian/squeeze/applications/keep/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 @@ -14,7 +14,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_INSTALL_MANPAGES_keep := keep.1 -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde post-patches:: debian/stamp-bootstrap diff --git a/debian/squeeze/applications/kerry/debian/cdbs/kde.mk b/debian/squeeze/applications/kerry/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/squeeze/applications/kerry/debian/cdbs/kde.mk +++ b/debian/squeeze/applications/kerry/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/squeeze/applications/kerry/debian/rules b/debian/squeeze/applications/kerry/debian/rules index 0d08e83f9..7dc0fbe23 100755 --- a/debian/squeeze/applications/kerry/debian/rules +++ b/debian/squeeze/applications/kerry/debian/rules @@ -5,7 +5,7 @@ include /usr/share/cdbs/1/rules/simple-patchsys.mk # include /usr/share/cdbs/1/class/kde.mk include debian/cdbs/debian-qt-kde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/debian/squeeze/applications/kile/debian/cdbs/kde.mk b/debian/squeeze/applications/kile/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/squeeze/applications/kile/debian/cdbs/kde.mk +++ b/debian/squeeze/applications/kile/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/squeeze/applications/kile/debian/rules b/debian/squeeze/applications/kile/debian/rules index 2d31b63e0..3e19a08ea 100755 --- a/debian/squeeze/applications/kile/debian/rules +++ b/debian/squeeze/applications/kile/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/patchsys-quilt.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 @@ -15,7 +15,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--as-needed" DEB_DH_INSTALL_ARGS := --sourcedir=debian/tmp DEB_INSTALL_MANPAGES_kile := debian/kile.1 -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde post-patches:: debian/stamp-bootstrap diff --git a/debian/squeeze/applications/kima/debian/rules b/debian/squeeze/applications/kima/debian/rules index a353777b4..519575104 100755 --- a/debian/squeeze/applications/kima/debian/rules +++ b/debian/squeeze/applications/kima/debian/rules @@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/autotools.mk DEB_CONFIGURE_EXTRA_FLAGS += --disable-rpath -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/debian/squeeze/applications/kio-apt/debian/cdbs/kde.mk b/debian/squeeze/applications/kio-apt/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/squeeze/applications/kio-apt/debian/cdbs/kde.mk +++ b/debian/squeeze/applications/kio-apt/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/squeeze/applications/kio-apt/debian/rules b/debian/squeeze/applications/kio-apt/debian/rules index a6d8c580a..9b82c21ad 100755 --- a/debian/squeeze/applications/kio-apt/debian/rules +++ b/debian/squeeze/applications/kio-apt/debian/rules @@ -5,14 +5,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include debian/cdbs/kde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde post-patches:: debian/stamp-bootstrap diff --git a/debian/squeeze/applications/kio-umountwrapper/debian/cdbs/kde.mk b/debian/squeeze/applications/kio-umountwrapper/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/squeeze/applications/kio-umountwrapper/debian/cdbs/kde.mk +++ b/debian/squeeze/applications/kio-umountwrapper/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/squeeze/applications/kio-umountwrapper/debian/rules b/debian/squeeze/applications/kio-umountwrapper/debian/rules index ce61aac65..ae8903f41 100755 --- a/debian/squeeze/applications/kio-umountwrapper/debian/rules +++ b/debian/squeeze/applications/kio-umountwrapper/debian/rules @@ -4,14 +4,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include debian/cdbs/kde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde post-patches:: debian/stamp-bootstrap diff --git a/debian/squeeze/applications/kmplayer/debian/cdbs/kde.mk b/debian/squeeze/applications/kmplayer/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/squeeze/applications/kmplayer/debian/cdbs/kde.mk +++ b/debian/squeeze/applications/kmplayer/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/squeeze/applications/kmplayer/debian/rules b/debian/squeeze/applications/kmplayer/debian/rules index b23d91457..63bf848d1 100755 --- a/debian/squeeze/applications/kmplayer/debian/rules +++ b/debian/squeeze/applications/kmplayer/debian/rules @@ -5,7 +5,7 @@ include /usr/share/cdbs/1/rules/simple-patchsys.mk include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 @@ -18,7 +18,7 @@ ifeq ($(GCC_VERSION),4.3) CXX = g++ -fpermissive endif -DEB_CONFIGURE_EXTRA_FLAGS := --enable-maintainer-mode --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --enable-maintainer-mode --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp DEB_INSTALL_MANPAGES_kmplayer = kmplayer.1 diff --git a/debian/squeeze/applications/kmyfirewall/debian/debiandirs b/debian/squeeze/applications/kmyfirewall/debian/debiandirs index 959f97f68..8b51d74fa 100644 --- a/debian/squeeze/applications/kmyfirewall/debian/debiandirs +++ b/debian/squeeze/applications/kmyfirewall/debian/debiandirs @@ -1,6 +1,6 @@ export kde_prefix=/usr export sysconfdir=/etc -export kde_includedir=/usr/include/kde +export kde_includedir=/usr/include/tde export infodir=/usr/share/info export mandir=/usr/share/man export qtdir=/usr/share/qt3 diff --git a/debian/squeeze/applications/kmyfirewall/debian/rules b/debian/squeeze/applications/kmyfirewall/debian/rules index 1993e3bfe..a8d1312d8 100755 --- a/debian/squeeze/applications/kmyfirewall/debian/rules +++ b/debian/squeeze/applications/kmyfirewall/debian/rules @@ -6,7 +6,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 @@ -56,7 +56,7 @@ endif ifneq "$(wildcard /usr/share/misc/config.guess)" "" cp -f /usr/share/misc/config.guess config.guess endif - CFLAGS="$(CFLAGS)" PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) $(configkde) --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde + CFLAGS="$(CFLAGS)" PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) $(configkde) --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde build: build-stamp @@ -65,7 +65,7 @@ build-stamp: config.status dh_testdir # Add here commands to compile the package. - env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde $(MAKE) + env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde $(MAKE) touch build-stamp @@ -94,7 +94,7 @@ install: build dh_clean -k # Add here commands to install the package into debian/kmyfirewall. - env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde $(MAKE) install DESTDIR=$(CURDIR)/debian/kmyfirewall-trinity + env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde $(MAKE) install DESTDIR=$(CURDIR)/debian/kmyfirewall-trinity rm -f debian/kmyfirewall-trinity/opt/trinity/lib/*.so chrpath -d debian/kmyfirewall-trinity/opt/trinity/bin/kmyfirewall debian/kmyfirewall-trinity/opt/trinity/lib/*.so.* debian/kmyfirewall-trinity/opt/trinity/lib/trinity/*.so diff --git a/debian/squeeze/applications/kmymoney/debian/cdbs/kde.mk b/debian/squeeze/applications/kmymoney/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/squeeze/applications/kmymoney/debian/cdbs/kde.mk +++ b/debian/squeeze/applications/kmymoney/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/squeeze/applications/kmymoney/debian/kmymoney2-trinity-dev.install b/debian/squeeze/applications/kmymoney/debian/kmymoney2-trinity-dev.install index 4c3b73990..f8c5dc4e3 100644 --- a/debian/squeeze/applications/kmymoney/debian/kmymoney2-trinity-dev.install +++ b/debian/squeeze/applications/kmymoney/debian/kmymoney2-trinity-dev.install @@ -1,3 +1,3 @@ -opt/trinity/include/kde/kmymoney/* +opt/trinity/include/tde/kmymoney/* opt/trinity/lib/lib*.la opt/trinity/lib/lib*.so diff --git a/debian/squeeze/applications/kmymoney/debian/rules b/debian/squeeze/applications/kmymoney/debian/rules index efb7a96ea..1bb4dc1bf 100755 --- a/debian/squeeze/applications/kmymoney/debian/rules +++ b/debian/squeeze/applications/kmymoney/debian/rules @@ -4,14 +4,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde --disable-sqlite3 +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde --disable-sqlite3 LDFLAGS += -Wl,--as-needed diff --git a/debian/squeeze/applications/knemo/debian/cdbs/kde.mk b/debian/squeeze/applications/knemo/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/squeeze/applications/knemo/debian/cdbs/kde.mk +++ b/debian/squeeze/applications/knemo/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/squeeze/applications/knemo/debian/rules b/debian/squeeze/applications/knemo/debian/rules index 143b4cd5e..fd71fe17f 100755 --- a/debian/squeeze/applications/knemo/debian/rules +++ b/debian/squeeze/applications/knemo/debian/rules @@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include debian/cdbs/kde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 @@ -13,7 +13,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_INSTALL_DOCS_knemo = -XNEWS -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde post-patches:: debian/stamp-bootstrap diff --git a/debian/squeeze/applications/knetload/debian/rules b/debian/squeeze/applications/knetload/debian/rules index c0beba707..843a04ceb 100755 --- a/debian/squeeze/applications/knetload/debian/rules +++ b/debian/squeeze/applications/knetload/debian/rules @@ -2,7 +2,7 @@ # Sample debian/rules that uses debhelper. # GNU copyright 1997 to 1999 by Joey Hess. -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 @@ -74,7 +74,7 @@ configure-stamp: # run configure with build tree $(objdir) cd $(objdir) && \ - ../configure $(configkde) --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde + ../configure $(configkde) --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde touch configure-stamp diff --git a/debian/squeeze/applications/knetstats/debian/cdbs/kde.mk b/debian/squeeze/applications/knetstats/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/squeeze/applications/knetstats/debian/cdbs/kde.mk +++ b/debian/squeeze/applications/knetstats/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/squeeze/applications/knetstats/debian/rules b/debian/squeeze/applications/knetstats/debian/rules index 9d3414239..62349e5af 100755 --- a/debian/squeeze/applications/knetstats/debian/rules +++ b/debian/squeeze/applications/knetstats/debian/rules @@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include debian/cdbs/kde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/debian/squeeze/applications/knetworkmanager8/debian/cdbs/kde.mk b/debian/squeeze/applications/knetworkmanager8/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/squeeze/applications/knetworkmanager8/debian/cdbs/kde.mk +++ b/debian/squeeze/applications/knetworkmanager8/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/squeeze/applications/knetworkmanager8/debian/rules b/debian/squeeze/applications/knetworkmanager8/debian/rules index 97955e38b..e2e99d9d9 100755 --- a/debian/squeeze/applications/knetworkmanager8/debian/rules +++ b/debian/squeeze/applications/knetworkmanager8/debian/rules @@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/patchsys-quilt.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/debian/squeeze/applications/knights/debian/debiandirs b/debian/squeeze/applications/knights/debian/debiandirs index d341195a1..ba70ea3fb 100644 --- a/debian/squeeze/applications/knights/debian/debiandirs +++ b/debian/squeeze/applications/knights/debian/debiandirs @@ -1,6 +1,6 @@ export kde_prefix=/usr export sysconfdir=/etc -export kde_includedir=/usr/include/kde +export kde_includedir=/usr/include/tde export infodir=/usr/share/info export mandir=/usr/share/man export qtdir=/usr/share/qt3 diff --git a/debian/squeeze/applications/knights/debian/rules b/debian/squeeze/applications/knights/debian/rules index d7e8330c7..fc447c09a 100755 --- a/debian/squeeze/applications/knights/debian/rules +++ b/debian/squeeze/applications/knights/debian/rules @@ -6,7 +6,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 @@ -51,7 +51,7 @@ config.status: configure patch if [ -f doc/Makefile.in ]; then cp doc/Makefile.in doc/Makefile.in.backup; else mv doc/Makefile.in.backup doc/Makefile.in; fi CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \ - --disable-debug --disable-rpath --sysconfdir=/etc --includedir=/opt/trinity/include/kde --infodir=/opt/trinity/share/info --mandir=/opt/trinity/share/man --with-qt-dir=/usr/share/qt3 --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib + --disable-debug --disable-rpath --sysconfdir=/etc --includedir=/opt/trinity/include/tde --infodir=/opt/trinity/share/info --mandir=/opt/trinity/share/man --with-qt-dir=/usr/share/qt3 --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib build: build-stamp diff --git a/debian/squeeze/applications/knowit/debian/rules b/debian/squeeze/applications/knowit/debian/rules index bd6992a4a..5af8a0aa8 100755 --- a/debian/squeeze/applications/knowit/debian/rules +++ b/debian/squeeze/applications/knowit/debian/rules @@ -7,7 +7,7 @@ DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/debian/squeeze/applications/knutclient/debian/rules b/debian/squeeze/applications/knutclient/debian/rules index 7e8adfc25..a7655e11e 100755 --- a/debian/squeeze/applications/knutclient/debian/rules +++ b/debian/squeeze/applications/knutclient/debian/rules @@ -11,7 +11,7 @@ DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/debian/squeeze/applications/koffice/debian/cdbs/kde.mk b/debian/squeeze/applications/koffice/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/squeeze/applications/koffice/debian/cdbs/kde.mk +++ b/debian/squeeze/applications/koffice/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/squeeze/applications/koffice/debian/koffice-dev-trinity.install b/debian/squeeze/applications/koffice/debian/koffice-dev-trinity.install index 936153c99..4b80b83ec 100644 --- a/debian/squeeze/applications/koffice/debian/koffice-dev-trinity.install +++ b/debian/squeeze/applications/koffice/debian/koffice-dev-trinity.install @@ -1,4 +1,4 @@ -debian/tmp/opt/trinity/include/kde +debian/tmp/opt/trinity/include/tde debian/tmp/opt/trinity/lib/libkarboncommon.la debian/tmp/opt/trinity/lib/libkarboncommon.so debian/tmp/opt/trinity/lib/libkchartcommon.la diff --git a/debian/squeeze/applications/koffice/debian/rules b/debian/squeeze/applications/koffice/debian/rules index 9bc0b9c76..0c94bbdc9 100755 --- a/debian/squeeze/applications/koffice/debian/rules +++ b/debian/squeeze/applications/koffice/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/debian/squeeze/applications/konversation/debian/cdbs/kde.mk b/debian/squeeze/applications/konversation/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/squeeze/applications/konversation/debian/cdbs/kde.mk +++ b/debian/squeeze/applications/konversation/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/squeeze/applications/konversation/debian/rules b/debian/squeeze/applications/konversation/debian/rules index 67bc3bb74..359d5f809 100755 --- a/debian/squeeze/applications/konversation/debian/rules +++ b/debian/squeeze/applications/konversation/debian/rules @@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/patchsys-quilt.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 @@ -13,7 +13,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_DH_STRIP_ARGS := --dbg-package=konversation-trinity-dbg DEB_INSTALL_DOCS_ALL = -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde post-patches:: debian/stamp-bootstrap diff --git a/debian/squeeze/applications/kopete-otr/debian/cdbs/kde.mk b/debian/squeeze/applications/kopete-otr/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/squeeze/applications/kopete-otr/debian/cdbs/kde.mk +++ b/debian/squeeze/applications/kopete-otr/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/squeeze/applications/kopete-otr/debian/rules b/debian/squeeze/applications/kopete-otr/debian/rules index 8b49a1a4b..abfd36cfc 100755 --- a/debian/squeeze/applications/kopete-otr/debian/rules +++ b/debian/squeeze/applications/kopete-otr/debian/rules @@ -3,14 +3,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/kde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde post-patches:: debian/stamp-bootstrap diff --git a/debian/squeeze/applications/kpicosim/debian/rules b/debian/squeeze/applications/kpicosim/debian/rules index 3541dc742..8d66d9609 100755 --- a/debian/squeeze/applications/kpicosim/debian/rules +++ b/debian/squeeze/applications/kpicosim/debian/rules @@ -9,7 +9,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 @@ -52,7 +52,7 @@ build-stamp: config.status dh_testdir # Add here commands to compile the package. - env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde $(MAKE) + env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde $(MAKE) #docbook-to-man debian/kpicosim.sgml > kpicosim.1 touch build-stamp diff --git a/debian/squeeze/applications/kpilot/debian/cdbs/kde.mk b/debian/squeeze/applications/kpilot/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/squeeze/applications/kpilot/debian/cdbs/kde.mk +++ b/debian/squeeze/applications/kpilot/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/squeeze/applications/kpilot/debian/rules b/debian/squeeze/applications/kpilot/debian/rules index 8b49a1a4b..abfd36cfc 100755 --- a/debian/squeeze/applications/kpilot/debian/rules +++ b/debian/squeeze/applications/kpilot/debian/rules @@ -3,14 +3,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/kde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde post-patches:: debian/stamp-bootstrap diff --git a/debian/squeeze/applications/kpowersave/debian/cdbs/kde.mk b/debian/squeeze/applications/kpowersave/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/squeeze/applications/kpowersave/debian/cdbs/kde.mk +++ b/debian/squeeze/applications/kpowersave/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/squeeze/applications/kpowersave/debian/rules b/debian/squeeze/applications/kpowersave/debian/rules index 2c4fb87d0..49718160e 100755 --- a/debian/squeeze/applications/kpowersave/debian/rules +++ b/debian/squeeze/applications/kpowersave/debian/rules @@ -4,7 +4,7 @@ include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 @@ -12,7 +12,7 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_INSTALL_DOCS_ALL := AUTHORS NEWS -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde post-patches:: debian/stamp-bootstrap diff --git a/debian/squeeze/applications/kradio/debian/rules b/debian/squeeze/applications/kradio/debian/rules index a55c7fd87..4ec00e4dc 100755 --- a/debian/squeeze/applications/kradio/debian/rules +++ b/debian/squeeze/applications/kradio/debian/rules @@ -9,7 +9,7 @@ DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/debian/squeeze/applications/krename/debian/rules b/debian/squeeze/applications/krename/debian/rules index ece39aee4..86f185efb 100755 --- a/debian/squeeze/applications/krename/debian/rules +++ b/debian/squeeze/applications/krename/debian/rules @@ -6,14 +6,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde ### Libtool and Automake updates post-patches:: debian/stamp-autothings-update diff --git a/debian/squeeze/applications/krusader/debian/cdbs/kde.mk b/debian/squeeze/applications/krusader/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/squeeze/applications/krusader/debian/cdbs/kde.mk +++ b/debian/squeeze/applications/krusader/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/squeeze/applications/krusader/debian/rules b/debian/squeeze/applications/krusader/debian/rules index 9ff5fba71..139132dbb 100755 --- a/debian/squeeze/applications/krusader/debian/rules +++ b/debian/squeeze/applications/krusader/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 @@ -16,7 +16,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_DESTDIR = $(CURDIR)/debian/krusader-trinity/ -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde post-patches:: debian/stamp-bootstrap diff --git a/debian/squeeze/applications/ksplash-engine-moodin/debian/debiandirs b/debian/squeeze/applications/ksplash-engine-moodin/debian/debiandirs index 304c32ae4..58237d430 100644 --- a/debian/squeeze/applications/ksplash-engine-moodin/debian/debiandirs +++ b/debian/squeeze/applications/ksplash-engine-moodin/debian/debiandirs @@ -1,6 +1,6 @@ export kde_prefix=/opt/trinity export sysconfdir=/etc -export kde_includedir=/opt/trinity/include/kde +export kde_includedir=/opt/trinity/include/tde export infodir=/opt/trinity/share/info export mandir=/opt/trinity/share/man export qtdir=/opt/trinity/share/qt3 diff --git a/debian/squeeze/applications/ksplash-engine-moodin/debian/rules b/debian/squeeze/applications/ksplash-engine-moodin/debian/rules index 2b5a4f326..047b8ca76 100755 --- a/debian/squeeze/applications/ksplash-engine-moodin/debian/rules +++ b/debian/squeeze/applications/ksplash-engine-moodin/debian/rules @@ -4,7 +4,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 @@ -49,7 +49,7 @@ patch: patch-stamp config.status: configure patch dh_testdir - CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) $(configkde) --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde + CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) $(configkde) --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde build: build-stamp diff --git a/debian/squeeze/applications/ksquirrel/debian/rules b/debian/squeeze/applications/ksquirrel/debian/rules index aeeceb417..8f8161523 100755 --- a/debian/squeeze/applications/ksquirrel/debian/rules +++ b/debian/squeeze/applications/ksquirrel/debian/rules @@ -9,7 +9,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/debian/squeeze/applications/kstreamripper/debian/rules b/debian/squeeze/applications/kstreamripper/debian/rules index 319fe9f4a..27cc7e874 100755 --- a/debian/squeeze/applications/kstreamripper/debian/rules +++ b/debian/squeeze/applications/kstreamripper/debian/rules @@ -3,10 +3,10 @@ include /usr/share/cdbs/1/rules/debhelper.mk DEB_INSTALL_MANPAGES_kstreamripper:=debian/kstreamripper.1 build/kstreamripper:: - env PATH=/opt/trinity/bin:$(PATH) QTDIR=/usr/share/qt3 CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde DESTDIR=$(DEB_DESTDIR)/opt/trinity $(MAKE) + env PATH=/opt/trinity/bin:$(PATH) QTDIR=/usr/share/qt3 CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde DESTDIR=$(DEB_DESTDIR)/opt/trinity $(MAKE) install/kstreamripper:: - env PATH=/opt/trinity/bin:$(PATH) QTDIR=/usr/share/qt3 CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde $(MAKE) install + env PATH=/opt/trinity/bin:$(PATH) QTDIR=/usr/share/qt3 CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde $(MAKE) install mkdir -p $(DEB_DESTDIR)/opt/trinity/share/pixmaps/ mkdir -p $(DEB_DESTDIR)/opt/trinity/share/doc/HTML/ install -m 644 ./src/hi32-app-kstreamripper.png \ diff --git a/debian/squeeze/applications/ksystemlog/debian/cdbs/kde.mk b/debian/squeeze/applications/ksystemlog/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/squeeze/applications/ksystemlog/debian/cdbs/kde.mk +++ b/debian/squeeze/applications/ksystemlog/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/squeeze/applications/ksystemlog/debian/rules b/debian/squeeze/applications/ksystemlog/debian/rules index 115c9a97e..6571b56cb 100755 --- a/debian/squeeze/applications/ksystemlog/debian/rules +++ b/debian/squeeze/applications/ksystemlog/debian/rules @@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 @@ -13,7 +13,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_INSTALL_MANPAGES_ksystemlog-trinity := ksystemlog.1 -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde post-patches:: debian/stamp-bootstrap diff --git a/debian/squeeze/applications/ktechlab/debian/debiandirs b/debian/squeeze/applications/ktechlab/debian/debiandirs index d35ab77aa..dfe8aa8ab 100644 --- a/debian/squeeze/applications/ktechlab/debian/debiandirs +++ b/debian/squeeze/applications/ktechlab/debian/debiandirs @@ -1,7 +1,7 @@ export kde_confdir=/etc/trinity export kde_prefix=/opt/trinity export kde_bindir=/opt/trinity/bin -export kde_includedir=/opt/trinity/include/kde +export kde_includedir=/opt/trinity/include/tde export kde_libdir=/opt/trinity/lib export kde_cgidir=/opt/trinity/lib/cgi-bin export kde_moduledir=/opt/trinity/lib/trinity diff --git a/debian/squeeze/applications/ktechlab/debian/rules b/debian/squeeze/applications/ktechlab/debian/rules index cadc4e546..1e1e53c9c 100755 --- a/debian/squeeze/applications/ktechlab/debian/rules +++ b/debian/squeeze/applications/ktechlab/debian/rules @@ -5,7 +5,7 @@ -include debian/debiandirs -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 @@ -45,7 +45,7 @@ endif ifneq "$(wildcard /usr/share/misc/config.guess)" "" cp -f /usr/share/misc/config.guess config.guess endif - PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) $(configkde) --prefix=/opt/trinity + PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) $(configkde) --prefix=/opt/trinity build: build-stamp debian/ktechlab.xpm @@ -55,7 +55,7 @@ build-stamp: config.status make -f admin/Makefile.common cvs touch debian/stamp-bootstrap - env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde $(MAKE) + env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde $(MAKE) touch build-stamp clean: @@ -85,8 +85,8 @@ install: build dh_testroot dh_clean -k dh_installdirs - env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde $(MAKE) install DESTDIR=$(CURDIR)/debian/ktechlab-trinity - env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde $(MAKE) -C po install DESTDIR=$(CURDIR)/debian/ktechlab-trinity + env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde $(MAKE) install DESTDIR=$(CURDIR)/debian/ktechlab-trinity + env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde $(MAKE) -C po install DESTDIR=$(CURDIR)/debian/ktechlab-trinity install -D -m 644 debian/ktechlab.xpm debian/ktechlab-trinity/opt/trinity/share/pixmaps/ktechlab.xpm chrpath -d $(CURDIR)/debian/ktechlab-trinity/opt/trinity/bin/ktechlab chrpath -d $(CURDIR)/debian/ktechlab-trinity/opt/trinity/bin/microbe diff --git a/debian/squeeze/applications/ktorrent/debian/cdbs/kde.mk b/debian/squeeze/applications/ktorrent/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/squeeze/applications/ktorrent/debian/cdbs/kde.mk +++ b/debian/squeeze/applications/ktorrent/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/squeeze/applications/ktorrent/debian/rules b/debian/squeeze/applications/ktorrent/debian/rules index 46a8b920a..5590816c2 100755 --- a/debian/squeeze/applications/ktorrent/debian/rules +++ b/debian/squeeze/applications/ktorrent/debian/rules @@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include debian/cdbs/debian-qt-kde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 @@ -13,7 +13,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_INSTALL_MANPAGES_ktorrent = ktorrent.1 -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde build/ktorrent-trinity:: docbook2x-man debian/ktorrent.1.docbook diff --git a/debian/squeeze/applications/kuickshow/debian/cdbs/kde.mk b/debian/squeeze/applications/kuickshow/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/squeeze/applications/kuickshow/debian/cdbs/kde.mk +++ b/debian/squeeze/applications/kuickshow/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/squeeze/applications/kuickshow/debian/rules b/debian/squeeze/applications/kuickshow/debian/rules index 6b1798055..191172fdc 100755 --- a/debian/squeeze/applications/kuickshow/debian/rules +++ b/debian/squeeze/applications/kuickshow/debian/rules @@ -5,14 +5,14 @@ include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde post-patches:: debian/stamp-bootstrap diff --git a/debian/squeeze/applications/kvirc/debian/rules b/debian/squeeze/applications/kvirc/debian/rules index a0130f2ac..bd103aecd 100755 --- a/debian/squeeze/applications/kvirc/debian/rules +++ b/debian/squeeze/applications/kvirc/debian/rules @@ -17,7 +17,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/autotools.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/debian/squeeze/applications/kvkbd/debian/cdbs/kde.mk b/debian/squeeze/applications/kvkbd/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/squeeze/applications/kvkbd/debian/cdbs/kde.mk +++ b/debian/squeeze/applications/kvkbd/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/squeeze/applications/kvkbd/debian/rules b/debian/squeeze/applications/kvkbd/debian/rules index 2aabc75db..305c1e4df 100755 --- a/debian/squeeze/applications/kvkbd/debian/rules +++ b/debian/squeeze/applications/kvkbd/debian/rules @@ -4,14 +4,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde makebuilddir/kvkbd-trinity:: make -f Makefile.cvs diff --git a/debian/squeeze/applications/kvpnc/debian/rules b/debian/squeeze/applications/kvpnc/debian/rules index 8e7f6fc6f..00d853fcc 100755 --- a/debian/squeeze/applications/kvpnc/debian/rules +++ b/debian/squeeze/applications/kvpnc/debian/rules @@ -8,14 +8,14 @@ include /usr/share/cdbs/1/rules/utils.mk DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--as-needed" DEB_INSTALL_MANPAGES_kvpnc-trinity := debian/kvpnc-trinity.1 -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde makebuilddir/kvpnc-trinity:: cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in diff --git a/debian/squeeze/applications/piklab/debian/rules b/debian/squeeze/applications/piklab/debian/rules index ba5677a64..e0a25dd7f 100755 --- a/debian/squeeze/applications/piklab/debian/rules +++ b/debian/squeeze/applications/piklab/debian/rules @@ -3,7 +3,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 @@ -48,7 +48,7 @@ endif ./configure CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs -Wl,--as-needed" \ --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \ --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib \ - --with-extra-includes=/opt/trinity/include/kde \ + --with-extra-includes=/opt/trinity/include/tde \ --mandir=/opt/trinity/share/man --infodir=/opt/trinity/share/info --enable-rpath touch $@ diff --git a/debian/squeeze/applications/potracegui/debian/rules b/debian/squeeze/applications/potracegui/debian/rules index 4eeace3c8..6be58cd48 100755 --- a/debian/squeeze/applications/potracegui/debian/rules +++ b/debian/squeeze/applications/potracegui/debian/rules @@ -11,7 +11,7 @@ DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/debian/squeeze/applications/smb4k/debian/cdbs/kde.mk b/debian/squeeze/applications/smb4k/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/squeeze/applications/smb4k/debian/cdbs/kde.mk +++ b/debian/squeeze/applications/smb4k/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/squeeze/applications/smb4k/debian/rules b/debian/squeeze/applications/smb4k/debian/rules index a7f5808ef..db6aa90dd 100755 --- a/debian/squeeze/applications/smb4k/debian/rules +++ b/debian/squeeze/applications/smb4k/debian/rules @@ -7,7 +7,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/autotools.mk include debian/cdbs/kde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/debian/squeeze/applications/soundkonverter/debian/cdbs/kde.mk b/debian/squeeze/applications/soundkonverter/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/squeeze/applications/soundkonverter/debian/cdbs/kde.mk +++ b/debian/squeeze/applications/soundkonverter/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/squeeze/applications/soundkonverter/debian/rules b/debian/squeeze/applications/soundkonverter/debian/rules index 16846b152..831240224 100755 --- a/debian/squeeze/applications/soundkonverter/debian/rules +++ b/debian/squeeze/applications/soundkonverter/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/patchsys-quilt.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 @@ -14,7 +14,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/debian/squeeze/applications/tde-guidance/debian/rules b/debian/squeeze/applications/tde-guidance/debian/rules index f3f46453f..e21db2b6b 100755 --- a/debian/squeeze/applications/tde-guidance/debian/rules +++ b/debian/squeeze/applications/tde-guidance/debian/rules @@ -12,7 +12,7 @@ DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp DEB_UPDATE_RCD_PARAMS := multiuser DEB_INSTALL_MANPAGES_tde-guidance-trinity := debian/displayconfig-trinity.1 debian/mountconfig-trinity.1 debian/serviceconfig-trinity.1 debian/userconfig-trinity.1 PYSUPPORT_PATH = $(DEB_DESTDIR)/opt/trinity/share/python-support -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde LDFLAGS_APPEND := -L/opt/trinity/lib install/tde-guidance-trinity:: diff --git a/debian/squeeze/applications/tde-style-lipstik/debian/rules b/debian/squeeze/applications/tde-style-lipstik/debian/rules index c25c8d5bd..b20ff9228 100755 --- a/debian/squeeze/applications/tde-style-lipstik/debian/rules +++ b/debian/squeeze/applications/tde-style-lipstik/debian/rules @@ -9,7 +9,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 @@ -37,7 +37,7 @@ config.status: patch configure CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \ --prefix=/opt/trinity --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info \ --disable-debug --enable-final \ - --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde + --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde # --with-qt-includes=/usr/include/qt3 --with-qt-libraries=/usr/lib/qt3/ build: build-stamp diff --git a/debian/squeeze/applications/tde-systemsettings/debian/cdbs/kde.mk b/debian/squeeze/applications/tde-systemsettings/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/squeeze/applications/tde-systemsettings/debian/cdbs/kde.mk +++ b/debian/squeeze/applications/tde-systemsettings/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/squeeze/applications/tde-systemsettings/debian/rules b/debian/squeeze/applications/tde-systemsettings/debian/rules index 82d5c2429..588264407 100755 --- a/debian/squeeze/applications/tde-systemsettings/debian/rules +++ b/debian/squeeze/applications/tde-systemsettings/debian/rules @@ -6,7 +6,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include debian/cdbs/kde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/debian/squeeze/applications/tdesudo/debian/cdbs/kde.mk b/debian/squeeze/applications/tdesudo/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/squeeze/applications/tdesudo/debian/cdbs/kde.mk +++ b/debian/squeeze/applications/tdesudo/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/squeeze/applications/tdesudo/debian/rules b/debian/squeeze/applications/tdesudo/debian/rules index f3b2afb13..5a63a69a9 100755 --- a/debian/squeeze/applications/tdesudo/debian/rules +++ b/debian/squeeze/applications/tdesudo/debian/rules @@ -4,14 +4,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include debian/cdbs/kde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde DEB_INSTALL_MANPAGES_tdesudo-trinity = tdesudo-trinity.1 diff --git a/debian/squeeze/applications/tdmtheme/debian/cdbs/kde.mk b/debian/squeeze/applications/tdmtheme/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/squeeze/applications/tdmtheme/debian/cdbs/kde.mk +++ b/debian/squeeze/applications/tdmtheme/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/squeeze/applications/tdmtheme/debian/rules b/debian/squeeze/applications/tdmtheme/debian/rules index 0eb4fad95..8e74fc2cb 100755 --- a/debian/squeeze/applications/tdmtheme/debian/rules +++ b/debian/squeeze/applications/tdmtheme/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/patchsys-quilt.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 @@ -13,7 +13,7 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--as-needed" -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde post-patches:: debian/stamp-bootstrap diff --git a/debian/squeeze/applications/tellico/debian/rules b/debian/squeeze/applications/tellico/debian/rules index e22c0c6f2..b21fb6bd9 100755 --- a/debian/squeeze/applications/tellico/debian/rules +++ b/debian/squeeze/applications/tellico/debian/rules @@ -5,7 +5,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/debian/squeeze/applications/twin-style-crystal/debian/cdbs/kde.mk b/debian/squeeze/applications/twin-style-crystal/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/squeeze/applications/twin-style-crystal/debian/cdbs/kde.mk +++ b/debian/squeeze/applications/twin-style-crystal/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/squeeze/applications/twin-style-crystal/debian/rules b/debian/squeeze/applications/twin-style-crystal/debian/rules index 5e522ca06..8cda3384a 100755 --- a/debian/squeeze/applications/twin-style-crystal/debian/rules +++ b/debian/squeeze/applications/twin-style-crystal/debian/rules @@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/debian/squeeze/applications/yakuake/debian/cdbs/kde.mk b/debian/squeeze/applications/yakuake/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/squeeze/applications/yakuake/debian/cdbs/kde.mk +++ b/debian/squeeze/applications/yakuake/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/squeeze/applications/yakuake/debian/rules b/debian/squeeze/applications/yakuake/debian/rules index 176f45bc3..f5bd922f5 100755 --- a/debian/squeeze/applications/yakuake/debian/rules +++ b/debian/squeeze/applications/yakuake/debian/rules @@ -3,7 +3,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/kde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/debian/squeeze/dependencies/arts/debian/rules b/debian/squeeze/dependencies/arts/debian/rules index c6720ab40..95cd29258 100755 --- a/debian/squeeze/dependencies/arts/debian/rules +++ b/debian/squeeze/dependencies/arts/debian/rules @@ -14,7 +14,7 @@ include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk include debian/cdbs/debian-qt-kde.mk -DEB_CMAKE_EXTRA_FLAGS := -DPKGCONFIG_INSTALL_DIR="/usr/lib/pkgconfig" -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/kde" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" -DWITH_GCC_VISIBILITY="ON" +DEB_CMAKE_EXTRA_FLAGS := -DPKGCONFIG_INSTALL_DIR="/usr/lib/pkgconfig" -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/tde" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" -DWITH_GCC_VISIBILITY="ON" # Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to # never build in parallel, regardless of DEB_BUILD_OPTIONS. diff --git a/debian/squeeze/libraries/kipi-plugins/debian/cdbs/kde.mk b/debian/squeeze/libraries/kipi-plugins/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/squeeze/libraries/kipi-plugins/debian/cdbs/kde.mk +++ b/debian/squeeze/libraries/kipi-plugins/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/squeeze/libraries/kipi-plugins/debian/rules b/debian/squeeze/libraries/kipi-plugins/debian/rules index ec3d9a4a3..e277fb614 100755 --- a/debian/squeeze/libraries/kipi-plugins/debian/rules +++ b/debian/squeeze/libraries/kipi-plugins/debian/rules @@ -9,7 +9,7 @@ include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/patchsys-quilt.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 @@ -18,7 +18,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--as-needed" -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde clean :: rm -f po/*/*.gmo diff --git a/debian/squeeze/libraries/libkdcraw/debian/cdbs/kde.mk b/debian/squeeze/libraries/libkdcraw/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/squeeze/libraries/libkdcraw/debian/cdbs/kde.mk +++ b/debian/squeeze/libraries/libkdcraw/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/squeeze/libraries/libkdcraw/debian/rules b/debian/squeeze/libraries/libkdcraw/debian/rules index 0606b98a9..7785e4bcc 100755 --- a/debian/squeeze/libraries/libkdcraw/debian/rules +++ b/debian/squeeze/libraries/libkdcraw/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/patchsys-quilt.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/debian/squeeze/libraries/libkexiv2/debian/cdbs/kde.mk b/debian/squeeze/libraries/libkexiv2/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/squeeze/libraries/libkexiv2/debian/cdbs/kde.mk +++ b/debian/squeeze/libraries/libkexiv2/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/squeeze/libraries/libkexiv2/debian/rules b/debian/squeeze/libraries/libkexiv2/debian/rules index dc80327f0..28a1c06e8 100755 --- a/debian/squeeze/libraries/libkexiv2/debian/rules +++ b/debian/squeeze/libraries/libkexiv2/debian/rules @@ -8,7 +8,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/debian/squeeze/libraries/libkipi/debian/cdbs/kde.mk b/debian/squeeze/libraries/libkipi/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/squeeze/libraries/libkipi/debian/cdbs/kde.mk +++ b/debian/squeeze/libraries/libkipi/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/squeeze/libraries/libkipi/debian/rules b/debian/squeeze/libraries/libkipi/debian/rules index 903f7c7b1..94eb41df3 100755 --- a/debian/squeeze/libraries/libkipi/debian/rules +++ b/debian/squeeze/libraries/libkipi/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/debian/squeeze/libraries/libksquirrel/debian/rules b/debian/squeeze/libraries/libksquirrel/debian/rules index fa3c9c335..fa07f7f8c 100755 --- a/debian/squeeze/libraries/libksquirrel/debian/rules +++ b/debian/squeeze/libraries/libksquirrel/debian/rules @@ -9,7 +9,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/debian/squeeze/libraries/mlt++/debian/rules b/debian/squeeze/libraries/mlt++/debian/rules index cf8cb1984..0232c83be 100755 --- a/debian/squeeze/libraries/mlt++/debian/rules +++ b/debian/squeeze/libraries/mlt++/debian/rules @@ -3,7 +3,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/debian/squeeze/libraries/mlt/debian/rules b/debian/squeeze/libraries/mlt/debian/rules index 771793fff..3889b6a3a 100755 --- a/debian/squeeze/libraries/mlt/debian/rules +++ b/debian/squeeze/libraries/mlt/debian/rules @@ -3,7 +3,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 @@ -47,10 +47,10 @@ configure-stamp: QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2 - CFLAGS="$(CFLAGS)" PATH=/opt/trinity/bin:$(PATH) LD_LIBRARY_PATH=/opt/trinity/lib:$(LD_LIBRARY_PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde ./configure --enable-gpl \ + CFLAGS="$(CFLAGS)" PATH=/opt/trinity/bin:$(PATH) LD_LIBRARY_PATH=/opt/trinity/lib:$(LD_LIBRARY_PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde ./configure --enable-gpl \ --luma-compress --disable-mmx $(CONFIGURE_OPTS) \ --avformat-shared=/usr --avformat-swscale \ - --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde + --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde touch configure-stamp @@ -58,7 +58,7 @@ build: configure-stamp build-stamp build-stamp: dh_testdir - env PATH=/opt/trinity/bin:$(PATH) LD_LIBRARY_PATH=/opt/trinity/lib:$(LD_LIBRARY_PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde $(MAKE) -j $(NCPUS) + env PATH=/opt/trinity/bin:$(PATH) LD_LIBRARY_PATH=/opt/trinity/lib:$(LD_LIBRARY_PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde $(MAKE) -j $(NCPUS) touch build-stamp @@ -81,7 +81,7 @@ install: build dh_clean -k dh_installdirs opt/trinity/lib/mlt0.2.5/modules opt/trinity/share/mlt0.2.5 - env PATH=/opt/trinity/bin:$(PATH) LD_LIBRARY_PATH=/opt/trinity/lib:$(LD_LIBRARY_PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp + env PATH=/opt/trinity/bin:$(PATH) LD_LIBRARY_PATH=/opt/trinity/lib:$(LD_LIBRARY_PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp # mkdir debian/tmp/opt/trinity # mv debian/tmp/opt/trinity/lib debian/tmp/opt/trinity/ diff --git a/debian/squeeze/libraries/pytdeextensions/debian/libpythonize0-trinity-dev.install b/debian/squeeze/libraries/pytdeextensions/debian/libpythonize0-trinity-dev.install index f50fc4e15..d7e5bd651 100644 --- a/debian/squeeze/libraries/pytdeextensions/debian/libpythonize0-trinity-dev.install +++ b/debian/squeeze/libraries/pytdeextensions/debian/libpythonize0-trinity-dev.install @@ -1,4 +1,4 @@ -opt/trinity/include/kde/pythonize.h +opt/trinity/include/tde/pythonize.h opt/trinity/lib/libpythonize.a opt/trinity/lib/libpythonize.la opt/trinity/lib/libpythonize.so diff --git a/debian/squeeze/libraries/pytdeextensions/debian/rules b/debian/squeeze/libraries/pytdeextensions/debian/rules index 1acb32f7d..4dcfaaae8 100755 --- a/debian/squeeze/libraries/pytdeextensions/debian/rules +++ b/debian/squeeze/libraries/pytdeextensions/debian/rules @@ -8,7 +8,7 @@ include debian/python-distutils-jaunty.mk include /usr/share/cdbs/1/rules/patchsys-quilt.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 @@ -16,7 +16,7 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde install/pytdeextensions-trinity:: # We have no idea if the built product is site-packages or dist-packages @@ -45,8 +45,8 @@ install/libpythonize0-trinity:: # fix binary-or-shlib-defines-rpath chrpath -d debian/tmp/opt/trinity/lib/libpythonize.so.* # fix include directory location - mkdir -p debian/tmp/opt/trinity/include/kde - mv debian/tmp/opt/trinity/include/*.h debian/tmp/opt/trinity/include/kde + mkdir -p debian/tmp/opt/trinity/include/tde + mv debian/tmp/opt/trinity/include/*.h debian/tmp/opt/trinity/include/tde clean:: rm -rf build diff --git a/debian/squeeze/tde-i18n/debian/debiandirs b/debian/squeeze/tde-i18n/debian/debiandirs index ba667b86e..2d0da0c80 100644 --- a/debian/squeeze/tde-i18n/debian/debiandirs +++ b/debian/squeeze/tde-i18n/debian/debiandirs @@ -1,6 +1,6 @@ export kde_prefix=/opt/trinity export sysconfdir=/etc -export kde_includedir=/opt/trinity/include/kde +export kde_includedir=/opt/trinity/include/tde export infodir=/opt/trinity/share/info export mandir=/opt/trinity/share/man export qtdir=/opt/trinity/share/qt3 diff --git a/debian/squeeze/tde-i18n/debian/rules b/debian/squeeze/tde-i18n/debian/rules index f49804687..e275e35df 100755 --- a/debian/squeeze/tde-i18n/debian/rules +++ b/debian/squeeze/tde-i18n/debian/rules @@ -24,7 +24,7 @@ I18N_INSTALL := $(patsubst $(I18N_DIR_PAT),install__%,$(I18N_DIRS)) -include debian/debiandirs -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/debian/squeeze/tdeaccessibility/debian/cdbs/kde.mk b/debian/squeeze/tdeaccessibility/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/squeeze/tdeaccessibility/debian/cdbs/kde.mk +++ b/debian/squeeze/tdeaccessibility/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/squeeze/tdeaccessibility/debian/ksayit-trinity.install b/debian/squeeze/tdeaccessibility/debian/ksayit-trinity.install index 2f5be2460..f4a7297c0 100644 --- a/debian/squeeze/tdeaccessibility/debian/ksayit-trinity.install +++ b/debian/squeeze/tdeaccessibility/debian/ksayit-trinity.install @@ -1,5 +1,5 @@ debian/tmp/opt/trinity/bin/ksayit -debian/tmp/opt/trinity/include/kde/ksayit_fxplugin.h +debian/tmp/opt/trinity/include/tde/ksayit_fxplugin.h debian/tmp/opt/trinity/lib/trinity/libFreeverb_plugin.la debian/tmp/opt/trinity/lib/trinity/libFreeverb_plugin.so debian/tmp/opt/trinity/lib/libKTTSD_Lib.la diff --git a/debian/squeeze/tdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff b/debian/squeeze/tdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff index 0caf5361a..c02687784 100644 --- a/debian/squeeze/tdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/squeeze/tdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/opt/trinity/include/kde/kde.pot ++kdepotpath=/opt/trinity/include/tde/kde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/debian/squeeze/tdeaccessibility/debian/rules b/debian/squeeze/tdeaccessibility/debian/rules index 0f40f42e0..ce879ebd4 100755 --- a/debian/squeeze/tdeaccessibility/debian/rules +++ b/debian/squeeze/tdeaccessibility/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/debian/squeeze/tdeaddons/debian/cdbs/kde.mk b/debian/squeeze/tdeaddons/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/squeeze/tdeaddons/debian/cdbs/kde.mk +++ b/debian/squeeze/tdeaddons/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/squeeze/tdeaddons/debian/patches/common/kubuntu_01_kdepot.diff b/debian/squeeze/tdeaddons/debian/patches/common/kubuntu_01_kdepot.diff index 0caf5361a..c02687784 100644 --- a/debian/squeeze/tdeaddons/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/squeeze/tdeaddons/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/opt/trinity/include/kde/kde.pot ++kdepotpath=/opt/trinity/include/tde/kde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/debian/squeeze/tdeaddons/debian/rules b/debian/squeeze/tdeaddons/debian/rules index c872980f3..5d337bfab 100755 --- a/debian/squeeze/tdeaddons/debian/rules +++ b/debian/squeeze/tdeaddons/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/debian/squeeze/tdeadmin/debian/cdbs/kde.mk b/debian/squeeze/tdeadmin/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/squeeze/tdeadmin/debian/cdbs/kde.mk +++ b/debian/squeeze/tdeadmin/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/squeeze/tdeadmin/debian/patches/common/kubuntu_01_kdepot.diff b/debian/squeeze/tdeadmin/debian/patches/common/kubuntu_01_kdepot.diff index 0caf5361a..c02687784 100644 --- a/debian/squeeze/tdeadmin/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/squeeze/tdeadmin/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/opt/trinity/include/kde/kde.pot ++kdepotpath=/opt/trinity/include/tde/kde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/debian/squeeze/tdeadmin/debian/rules b/debian/squeeze/tdeadmin/debian/rules index 19e9ac01b..9c9ccadda 100755 --- a/debian/squeeze/tdeadmin/debian/rules +++ b/debian/squeeze/tdeadmin/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/debian/squeeze/tdeartwork/debian/cdbs/kde.mk b/debian/squeeze/tdeartwork/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/squeeze/tdeartwork/debian/cdbs/kde.mk +++ b/debian/squeeze/tdeartwork/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/squeeze/tdeartwork/debian/rules b/debian/squeeze/tdeartwork/debian/rules index 3e16d1ff2..82a71627a 100755 --- a/debian/squeeze/tdeartwork/debian/rules +++ b/debian/squeeze/tdeartwork/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/debian/squeeze/tdebindings/debian/cdbs/kde.mk b/debian/squeeze/tdebindings/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/squeeze/tdebindings/debian/cdbs/kde.mk +++ b/debian/squeeze/tdebindings/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/squeeze/tdebindings/debian/libkjsembed-trinity-dev.install b/debian/squeeze/tdebindings/debian/libkjsembed-trinity-dev.install index 62a36de6e..540ad0ca2 100644 --- a/debian/squeeze/tdebindings/debian/libkjsembed-trinity-dev.install +++ b/debian/squeeze/tdebindings/debian/libkjsembed-trinity-dev.install @@ -1,4 +1,4 @@ -debian/tmp/opt/trinity/include/kde/kjsembed/* +debian/tmp/opt/trinity/include/tde/kjsembed/* debian/tmp/opt/trinity/lib/libkjsembed.so debian/tmp/opt/trinity/lib/libkjsembed.la diff --git a/debian/squeeze/tdebindings/debian/libsmokeqt-trinity-dev.install b/debian/squeeze/tdebindings/debian/libsmokeqt-trinity-dev.install index 2904a6815..99a21c1de 100644 --- a/debian/squeeze/tdebindings/debian/libsmokeqt-trinity-dev.install +++ b/debian/squeeze/tdebindings/debian/libsmokeqt-trinity-dev.install @@ -1,3 +1,3 @@ -debian/tmp/opt/trinity/include/kde/smoke.h +debian/tmp/opt/trinity/include/tde/smoke.h debian/tmp/opt/trinity/lib/libsmokeqt.so debian/tmp/opt/trinity/lib/libsmokeqt.la diff --git a/debian/squeeze/tdebindings/debian/patches/common/kubuntu_01_kdepot.diff b/debian/squeeze/tdebindings/debian/patches/common/kubuntu_01_kdepot.diff index 0caf5361a..c02687784 100644 --- a/debian/squeeze/tdebindings/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/squeeze/tdebindings/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/opt/trinity/include/kde/kde.pot ++kdepotpath=/opt/trinity/include/tde/kde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/debian/squeeze/tdebindings/debian/rules b/debian/squeeze/tdebindings/debian/rules index 6c5a7ddad..6498e0a4d 100755 --- a/debian/squeeze/tdebindings/debian/rules +++ b/debian/squeeze/tdebindings/debian/rules @@ -11,7 +11,7 @@ DEB_BUILDDIR := $(DEB_SRCDIR) include /usr/share/cdbs/1/rules/patchsys-quilt.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/debian/squeeze/tdeedu/debian/cdbs/kde.mk b/debian/squeeze/tdeedu/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/squeeze/tdeedu/debian/cdbs/kde.mk +++ b/debian/squeeze/tdeedu/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/squeeze/tdeedu/debian/kstars-trinity.install b/debian/squeeze/tdeedu/debian/kstars-trinity.install index 4db6bf7e7..61544b793 100644 --- a/debian/squeeze/tdeedu/debian/kstars-trinity.install +++ b/debian/squeeze/tdeedu/debian/kstars-trinity.install @@ -1,7 +1,7 @@ etc/trinity/kstarsrc opt/trinity/bin/kstars -/opt/trinity/include/kde/kstarsinterface.h -/opt/trinity/include/kde/simclockinterface.h +/opt/trinity/include/tde/kstarsinterface.h +/opt/trinity/include/tde/simclockinterface.h /opt/trinity/share/applications/kde/kstars.desktop /opt/trinity/share/config.kcfg/kstars.kcfg /opt/trinity/share/doc/kde/HTML/en/kstars/common diff --git a/debian/squeeze/tdeedu/debian/libkiten-dev-trinity.install b/debian/squeeze/tdeedu/debian/libkiten-dev-trinity.install index ca0848fd9..e64535480 100644 --- a/debian/squeeze/tdeedu/debian/libkiten-dev-trinity.install +++ b/debian/squeeze/tdeedu/debian/libkiten-dev-trinity.install @@ -1,3 +1,3 @@ -/opt/trinity/include/kde/libkiten +/opt/trinity/include/tde/libkiten opt/trinity/lib/libkiten.la opt/trinity/lib/libkiten.so diff --git a/debian/squeeze/tdeedu/debian/libtdeedu-dev-trinity.install b/debian/squeeze/tdeedu/debian/libtdeedu-dev-trinity.install index be3af1e7b..1695e3cf1 100644 --- a/debian/squeeze/tdeedu/debian/libtdeedu-dev-trinity.install +++ b/debian/squeeze/tdeedu/debian/libtdeedu-dev-trinity.install @@ -1,4 +1,4 @@ -/opt/trinity/include/kde/libtdeedu +/opt/trinity/include/tde/libtdeedu opt/trinity/lib/libextdate.la opt/trinity/lib/libextdate.so opt/trinity/lib/libtdeeducore.la diff --git a/debian/squeeze/tdeedu/debian/patches/common/kubuntu_01_kdepot.diff b/debian/squeeze/tdeedu/debian/patches/common/kubuntu_01_kdepot.diff index 0caf5361a..c02687784 100644 --- a/debian/squeeze/tdeedu/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/squeeze/tdeedu/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/opt/trinity/include/kde/kde.pot ++kdepotpath=/opt/trinity/include/tde/kde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/debian/squeeze/tdeedu/debian/rules b/debian/squeeze/tdeedu/debian/rules index b19d3d32f..059005f50 100755 --- a/debian/squeeze/tdeedu/debian/rules +++ b/debian/squeeze/tdeedu/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 @@ -14,7 +14,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_DH_INSTALL_SOURCEDIR := $(DEB_DESTDIR) -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --includedir="/opt/trinity/include/kde" --mandir="/opt/trinity/share/man" --infodir="/opt/trinity/share/info" +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --includedir="/opt/trinity/include/tde" --mandir="/opt/trinity/share/man" --infodir="/opt/trinity/share/info" # Ensure that kig's python scripting built successfully. common-build-arch:: diff --git a/debian/squeeze/tdegames/debian/atlantik-trinity-dev.install b/debian/squeeze/tdegames/debian/atlantik-trinity-dev.install index b9052ce9a..b7dea632a 100644 --- a/debian/squeeze/tdegames/debian/atlantik-trinity-dev.install +++ b/debian/squeeze/tdegames/debian/atlantik-trinity-dev.install @@ -1,5 +1,5 @@ -/opt/trinity/include/kde/atlantik -/opt/trinity/include/kde/atlantic +/opt/trinity/include/tde/atlantik +/opt/trinity/include/tde/atlantic /opt/trinity/lib/libatlantic.so /opt/trinity/lib/libatlantikclient.so /opt/trinity/lib/libatlantikui.so diff --git a/debian/squeeze/tdegames/debian/cdbs/kde.mk b/debian/squeeze/tdegames/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/squeeze/tdegames/debian/cdbs/kde.mk +++ b/debian/squeeze/tdegames/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/squeeze/tdegames/debian/kolf-trinity-dev.install b/debian/squeeze/tdegames/debian/kolf-trinity-dev.install index 4da86d1b2..ff0a2b177 100644 --- a/debian/squeeze/tdegames/debian/kolf-trinity-dev.install +++ b/debian/squeeze/tdegames/debian/kolf-trinity-dev.install @@ -1,2 +1,2 @@ -/opt/trinity/include/kde/kolf +/opt/trinity/include/tde/kolf /opt/trinity/lib/libkolf.so diff --git a/debian/squeeze/tdegames/debian/libtdegames-trinity-dev.install b/debian/squeeze/tdegames/debian/libtdegames-trinity-dev.install index 354fa3840..eca00d487 100644 --- a/debian/squeeze/tdegames/debian/libtdegames-trinity-dev.install +++ b/debian/squeeze/tdegames/debian/libtdegames-trinity-dev.install @@ -1,4 +1,4 @@ -/opt/trinity/include/kde/*.h -/opt/trinity/include/kde/kgame +/opt/trinity/include/tde/*.h +/opt/trinity/include/tde/kgame /opt/trinity/lib/libtdegames.so /opt/trinity/lib/libtdegames.la diff --git a/debian/squeeze/tdegames/debian/patches/common/kubuntu_01_kdepot.diff b/debian/squeeze/tdegames/debian/patches/common/kubuntu_01_kdepot.diff index 0caf5361a..c02687784 100644 --- a/debian/squeeze/tdegames/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/squeeze/tdegames/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/opt/trinity/include/kde/kde.pot ++kdepotpath=/opt/trinity/include/tde/kde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/debian/squeeze/tdegames/debian/rules b/debian/squeeze/tdegames/debian/rules index 0ba5f21cb..5a24cd5ae 100755 --- a/debian/squeeze/tdegames/debian/rules +++ b/debian/squeeze/tdegames/debian/rules @@ -7,7 +7,7 @@ include /usr/share/cdbs/1/rules/utils.mk export kde_bindir = /opt/trinity/games -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/debian/squeeze/tdegraphics/debian/cdbs/kde.mk b/debian/squeeze/tdegraphics/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/squeeze/tdegraphics/debian/cdbs/kde.mk +++ b/debian/squeeze/tdegraphics/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/squeeze/tdegraphics/debian/libpoppler-tqt-dev.install b/debian/squeeze/tdegraphics/debian/libpoppler-tqt-dev.install index 57d9ec1d0..7e7ce35c8 100644 --- a/debian/squeeze/tdegraphics/debian/libpoppler-tqt-dev.install +++ b/debian/squeeze/tdegraphics/debian/libpoppler-tqt-dev.install @@ -1,3 +1,3 @@ -debian/tmp/opt/trinity/include/kde/poppler-link-qt3.h -debian/tmp/opt/trinity/include/kde/poppler-page-transition.h -debian/tmp/opt/trinity/include/kde/poppler-qt.h +debian/tmp/opt/trinity/include/tde/poppler-link-qt3.h +debian/tmp/opt/trinity/include/tde/poppler-page-transition.h +debian/tmp/opt/trinity/include/tde/poppler-qt.h diff --git a/debian/squeeze/tdegraphics/debian/patches/common/kubuntu_01_kdepot.diff b/debian/squeeze/tdegraphics/debian/patches/common/kubuntu_01_kdepot.diff index 0caf5361a..c02687784 100644 --- a/debian/squeeze/tdegraphics/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/squeeze/tdegraphics/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/opt/trinity/include/kde/kde.pot ++kdepotpath=/opt/trinity/include/tde/kde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/debian/squeeze/tdegraphics/debian/tdegraphics-dev-trinity.install b/debian/squeeze/tdegraphics/debian/tdegraphics-dev-trinity.install index 608149acc..4d50b4fc5 100644 --- a/debian/squeeze/tdegraphics/debian/tdegraphics-dev-trinity.install +++ b/debian/squeeze/tdegraphics/debian/tdegraphics-dev-trinity.install @@ -1,184 +1,184 @@ -debian/tmp/opt/trinity/include/kde/dom/SVGAElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGAltGlyphDefElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGAltGlyphElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGAngle.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimateColorElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimateElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimateMotionElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimateTransformElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedAngle.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedBoolean.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedEnumeration.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedInteger.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedLength.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedLengthList.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedNumber.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedNumberList.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedPathData.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedPoints.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedPreserveAspectRatio.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedRect.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedString.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedTransformList.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimationElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGCSSRule.h -debian/tmp/opt/trinity/include/kde/dom/SVGCircleElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGClipPathElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGColor.h -debian/tmp/opt/trinity/include/kde/dom/SVGColorProfileElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGColorProfileRule.h -debian/tmp/opt/trinity/include/kde/dom/SVGComponentTransferFunctionElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGCursorElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGDefinitionSrcElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGDefsElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGDescElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGDocument.h -debian/tmp/opt/trinity/include/kde/dom/SVGElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGElementInstance.h -debian/tmp/opt/trinity/include/kde/dom/SVGElementInstanceList.h -debian/tmp/opt/trinity/include/kde/dom/SVGEllipseElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGEvent.h -debian/tmp/opt/trinity/include/kde/dom/SVGException.h -debian/tmp/opt/trinity/include/kde/dom/SVGExternalResourcesRequired.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEBlendElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEColorMatrixElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEComponentTransferElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFECompositeElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEConvolveMatrixElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEDiffuseLightingElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEDisplacementMapElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEDistantLightElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEFloodElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEFuncAElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEFuncBElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEFuncGElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEFuncRElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEGaussianBlurElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEImageElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEMergeElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEMergeNodeElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEMorphologyElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEOffsetElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEPointLightElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFESpecularLightingElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFESpotLightElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFETileElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFETurbulenceElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFilterElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFilterPrimitiveStandardAttributes.h -debian/tmp/opt/trinity/include/kde/dom/SVGFitToViewBox.h -debian/tmp/opt/trinity/include/kde/dom/SVGFontElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFontFaceElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFontFaceFormatElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFontFaceNameElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFontFaceSrcElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFontFaceUriElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGForeignObjectElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGGElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGGlyphElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGGlyphRefElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGGradientElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGHKernElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGICCColor.h -debian/tmp/opt/trinity/include/kde/dom/SVGImageElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGLangSpace.h -debian/tmp/opt/trinity/include/kde/dom/SVGLength.h -debian/tmp/opt/trinity/include/kde/dom/SVGLengthList.h -debian/tmp/opt/trinity/include/kde/dom/SVGLineElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGLinearGradientElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGLocatable.h -debian/tmp/opt/trinity/include/kde/dom/SVGMPathElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGMarkerElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGMaskElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGMatrix.h -debian/tmp/opt/trinity/include/kde/dom/SVGMetadataElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGMissingGlyphElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGNumber.h -debian/tmp/opt/trinity/include/kde/dom/SVGNumberList.h -debian/tmp/opt/trinity/include/kde/dom/SVGPaint.h -debian/tmp/opt/trinity/include/kde/dom/SVGPathElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGPathSeg.h -debian/tmp/opt/trinity/include/kde/dom/SVGPathSegArc.h -debian/tmp/opt/trinity/include/kde/dom/SVGPathSegClosePath.h -debian/tmp/opt/trinity/include/kde/dom/SVGPathSegCurvetoCubic.h -debian/tmp/opt/trinity/include/kde/dom/SVGPathSegCurvetoCubicSmooth.h -debian/tmp/opt/trinity/include/kde/dom/SVGPathSegCurvetoQuadratic.h -debian/tmp/opt/trinity/include/kde/dom/SVGPathSegCurvetoQuadraticSmooth.h -debian/tmp/opt/trinity/include/kde/dom/SVGPathSegLineto.h -debian/tmp/opt/trinity/include/kde/dom/SVGPathSegLinetoHorizontal.h -debian/tmp/opt/trinity/include/kde/dom/SVGPathSegLinetoVertical.h -debian/tmp/opt/trinity/include/kde/dom/SVGPathSegList.h -debian/tmp/opt/trinity/include/kde/dom/SVGPathSegMoveto.h -debian/tmp/opt/trinity/include/kde/dom/SVGPatternElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGPoint.h -debian/tmp/opt/trinity/include/kde/dom/SVGPointList.h -debian/tmp/opt/trinity/include/kde/dom/SVGPolygonElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGPolylineElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGPreserveAspectRatio.h -debian/tmp/opt/trinity/include/kde/dom/SVGRadialGradientElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGRect.h -debian/tmp/opt/trinity/include/kde/dom/SVGRectElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGRenderingIntent.h -debian/tmp/opt/trinity/include/kde/dom/SVGSVGElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGScriptElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGSetElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGStopElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGStringList.h -debian/tmp/opt/trinity/include/kde/dom/SVGStylable.h -debian/tmp/opt/trinity/include/kde/dom/SVGStyleElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGSwitchElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGSymbolElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGTRefElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGTSpanElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGTests.h -debian/tmp/opt/trinity/include/kde/dom/SVGTextContentElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGTextElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGTextPathElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGTextPositioningElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGTitleElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGTransform.h -debian/tmp/opt/trinity/include/kde/dom/SVGTransformList.h -debian/tmp/opt/trinity/include/kde/dom/SVGTransformable.h -debian/tmp/opt/trinity/include/kde/dom/SVGURIReference.h -debian/tmp/opt/trinity/include/kde/dom/SVGUnitTypes.h -debian/tmp/opt/trinity/include/kde/dom/SVGUseElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGVKernElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGViewElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGViewSpec.h -debian/tmp/opt/trinity/include/kde/dom/SVGWindow.h -debian/tmp/opt/trinity/include/kde/dom/SVGZoomAndPan.h -debian/tmp/opt/trinity/include/kde/dom/SVGZoomEvent.h -debian/tmp/opt/trinity/include/kde/kfaximage.h -debian/tmp/opt/trinity/include/kde/kmultipageInterface.h -debian/tmp/opt/trinity/include/kde/ksvg/CanvasFactory.h -debian/tmp/opt/trinity/include/kde/ksvg/CanvasItem.h -debian/tmp/opt/trinity/include/kde/ksvg/CanvasItems.h -debian/tmp/opt/trinity/include/kde/ksvg/DocumentFactory.h -debian/tmp/opt/trinity/include/kde/ksvg/KSVGCanvas.h -debian/tmp/opt/trinity/include/kde/ksvg/ksvg_plugin.h -debian/tmp/opt/trinity/include/kde/kviewshell/anchor.h -debian/tmp/opt/trinity/include/kde/kviewshell/bookmark.h -debian/tmp/opt/trinity/include/kde/kviewshell/pageView.h -debian/tmp/opt/trinity/include/kde/kviewshell/documentPageCache.h -debian/tmp/opt/trinity/include/kde/kviewshell/documentRenderer.h -debian/tmp/opt/trinity/include/kde/kviewshell/documentWidget.h -debian/tmp/opt/trinity/include/kde/kviewshell/history.h -debian/tmp/opt/trinity/include/kde/kviewshell/hyperlink.h -debian/tmp/opt/trinity/include/kde/kviewshell/kmultipage.h -debian/tmp/opt/trinity/include/kde/kviewshell/length.h -debian/tmp/opt/trinity/include/kde/kviewshell/pageNumber.h -debian/tmp/opt/trinity/include/kde/kviewshell/pageSize.h -debian/tmp/opt/trinity/include/kde/kviewshell/renderedDocumentPage.h -debian/tmp/opt/trinity/include/kde/kviewshell/renderedDocumentPagePixmap.h -debian/tmp/opt/trinity/include/kde/kviewshell/renderedDocumentPagePrinter.h -debian/tmp/opt/trinity/include/kde/kviewshell/selection.h -debian/tmp/opt/trinity/include/kde/kviewshell/simplePageSize.h -debian/tmp/opt/trinity/include/kde/kviewshell/textBox.h -debian/tmp/opt/trinity/include/kde/kviewshell/zoom.h -debian/tmp/opt/trinity/include/kde/kviewshell/zoomlimits.h -debian/tmp/opt/trinity/include/kde/libtext2path-0.1/BezierPath.h -debian/tmp/opt/trinity/include/kde/libtext2path-0.1/Glyph.h -debian/tmp/opt/trinity/include/kde/libtext2path-0.1/GlyphTracer.h +debian/tmp/opt/trinity/include/tde/dom/SVGAElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGAltGlyphDefElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGAltGlyphElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGAngle.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimateColorElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimateElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimateMotionElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimateTransformElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedAngle.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedBoolean.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedEnumeration.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedInteger.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedLength.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedLengthList.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedNumber.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedNumberList.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedPathData.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedPoints.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedPreserveAspectRatio.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedRect.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedString.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedTransformList.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimationElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGCSSRule.h +debian/tmp/opt/trinity/include/tde/dom/SVGCircleElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGClipPathElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGColor.h +debian/tmp/opt/trinity/include/tde/dom/SVGColorProfileElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGColorProfileRule.h +debian/tmp/opt/trinity/include/tde/dom/SVGComponentTransferFunctionElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGCursorElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGDefinitionSrcElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGDefsElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGDescElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGDocument.h +debian/tmp/opt/trinity/include/tde/dom/SVGElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGElementInstance.h +debian/tmp/opt/trinity/include/tde/dom/SVGElementInstanceList.h +debian/tmp/opt/trinity/include/tde/dom/SVGEllipseElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGEvent.h +debian/tmp/opt/trinity/include/tde/dom/SVGException.h +debian/tmp/opt/trinity/include/tde/dom/SVGExternalResourcesRequired.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEBlendElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEColorMatrixElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEComponentTransferElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFECompositeElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEConvolveMatrixElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEDiffuseLightingElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEDisplacementMapElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEDistantLightElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEFloodElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEFuncAElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEFuncBElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEFuncGElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEFuncRElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEGaussianBlurElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEImageElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEMergeElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEMergeNodeElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEMorphologyElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEOffsetElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEPointLightElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFESpecularLightingElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFESpotLightElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFETileElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFETurbulenceElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFilterElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFilterPrimitiveStandardAttributes.h +debian/tmp/opt/trinity/include/tde/dom/SVGFitToViewBox.h +debian/tmp/opt/trinity/include/tde/dom/SVGFontElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFontFaceElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFontFaceFormatElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFontFaceNameElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFontFaceSrcElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFontFaceUriElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGForeignObjectElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGGElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGGlyphElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGGlyphRefElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGGradientElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGHKernElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGICCColor.h +debian/tmp/opt/trinity/include/tde/dom/SVGImageElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGLangSpace.h +debian/tmp/opt/trinity/include/tde/dom/SVGLength.h +debian/tmp/opt/trinity/include/tde/dom/SVGLengthList.h +debian/tmp/opt/trinity/include/tde/dom/SVGLineElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGLinearGradientElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGLocatable.h +debian/tmp/opt/trinity/include/tde/dom/SVGMPathElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGMarkerElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGMaskElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGMatrix.h +debian/tmp/opt/trinity/include/tde/dom/SVGMetadataElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGMissingGlyphElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGNumber.h +debian/tmp/opt/trinity/include/tde/dom/SVGNumberList.h +debian/tmp/opt/trinity/include/tde/dom/SVGPaint.h +debian/tmp/opt/trinity/include/tde/dom/SVGPathElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGPathSeg.h +debian/tmp/opt/trinity/include/tde/dom/SVGPathSegArc.h +debian/tmp/opt/trinity/include/tde/dom/SVGPathSegClosePath.h +debian/tmp/opt/trinity/include/tde/dom/SVGPathSegCurvetoCubic.h +debian/tmp/opt/trinity/include/tde/dom/SVGPathSegCurvetoCubicSmooth.h +debian/tmp/opt/trinity/include/tde/dom/SVGPathSegCurvetoQuadratic.h +debian/tmp/opt/trinity/include/tde/dom/SVGPathSegCurvetoQuadraticSmooth.h +debian/tmp/opt/trinity/include/tde/dom/SVGPathSegLineto.h +debian/tmp/opt/trinity/include/tde/dom/SVGPathSegLinetoHorizontal.h +debian/tmp/opt/trinity/include/tde/dom/SVGPathSegLinetoVertical.h +debian/tmp/opt/trinity/include/tde/dom/SVGPathSegList.h +debian/tmp/opt/trinity/include/tde/dom/SVGPathSegMoveto.h +debian/tmp/opt/trinity/include/tde/dom/SVGPatternElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGPoint.h +debian/tmp/opt/trinity/include/tde/dom/SVGPointList.h +debian/tmp/opt/trinity/include/tde/dom/SVGPolygonElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGPolylineElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGPreserveAspectRatio.h +debian/tmp/opt/trinity/include/tde/dom/SVGRadialGradientElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGRect.h +debian/tmp/opt/trinity/include/tde/dom/SVGRectElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGRenderingIntent.h +debian/tmp/opt/trinity/include/tde/dom/SVGSVGElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGScriptElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGSetElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGStopElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGStringList.h +debian/tmp/opt/trinity/include/tde/dom/SVGStylable.h +debian/tmp/opt/trinity/include/tde/dom/SVGStyleElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGSwitchElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGSymbolElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGTRefElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGTSpanElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGTests.h +debian/tmp/opt/trinity/include/tde/dom/SVGTextContentElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGTextElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGTextPathElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGTextPositioningElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGTitleElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGTransform.h +debian/tmp/opt/trinity/include/tde/dom/SVGTransformList.h +debian/tmp/opt/trinity/include/tde/dom/SVGTransformable.h +debian/tmp/opt/trinity/include/tde/dom/SVGURIReference.h +debian/tmp/opt/trinity/include/tde/dom/SVGUnitTypes.h +debian/tmp/opt/trinity/include/tde/dom/SVGUseElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGVKernElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGViewElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGViewSpec.h +debian/tmp/opt/trinity/include/tde/dom/SVGWindow.h +debian/tmp/opt/trinity/include/tde/dom/SVGZoomAndPan.h +debian/tmp/opt/trinity/include/tde/dom/SVGZoomEvent.h +debian/tmp/opt/trinity/include/tde/kfaximage.h +debian/tmp/opt/trinity/include/tde/kmultipageInterface.h +debian/tmp/opt/trinity/include/tde/ksvg/CanvasFactory.h +debian/tmp/opt/trinity/include/tde/ksvg/CanvasItem.h +debian/tmp/opt/trinity/include/tde/ksvg/CanvasItems.h +debian/tmp/opt/trinity/include/tde/ksvg/DocumentFactory.h +debian/tmp/opt/trinity/include/tde/ksvg/KSVGCanvas.h +debian/tmp/opt/trinity/include/tde/ksvg/ksvg_plugin.h +debian/tmp/opt/trinity/include/tde/kviewshell/anchor.h +debian/tmp/opt/trinity/include/tde/kviewshell/bookmark.h +debian/tmp/opt/trinity/include/tde/kviewshell/pageView.h +debian/tmp/opt/trinity/include/tde/kviewshell/documentPageCache.h +debian/tmp/opt/trinity/include/tde/kviewshell/documentRenderer.h +debian/tmp/opt/trinity/include/tde/kviewshell/documentWidget.h +debian/tmp/opt/trinity/include/tde/kviewshell/history.h +debian/tmp/opt/trinity/include/tde/kviewshell/hyperlink.h +debian/tmp/opt/trinity/include/tde/kviewshell/kmultipage.h +debian/tmp/opt/trinity/include/tde/kviewshell/length.h +debian/tmp/opt/trinity/include/tde/kviewshell/pageNumber.h +debian/tmp/opt/trinity/include/tde/kviewshell/pageSize.h +debian/tmp/opt/trinity/include/tde/kviewshell/renderedDocumentPage.h +debian/tmp/opt/trinity/include/tde/kviewshell/renderedDocumentPagePixmap.h +debian/tmp/opt/trinity/include/tde/kviewshell/renderedDocumentPagePrinter.h +debian/tmp/opt/trinity/include/tde/kviewshell/selection.h +debian/tmp/opt/trinity/include/tde/kviewshell/simplePageSize.h +debian/tmp/opt/trinity/include/tde/kviewshell/textBox.h +debian/tmp/opt/trinity/include/tde/kviewshell/zoom.h +debian/tmp/opt/trinity/include/tde/kviewshell/zoomlimits.h +debian/tmp/opt/trinity/include/tde/libtext2path-0.1/BezierPath.h +debian/tmp/opt/trinity/include/tde/libtext2path-0.1/Glyph.h +debian/tmp/opt/trinity/include/tde/libtext2path-0.1/GlyphTracer.h debian/tmp/opt/trinity/lib/libtdeinit_kview.la debian/tmp/opt/trinity/lib/libtdeinit_mrmlsearch.la debian/tmp/opt/trinity/lib/libkghostviewlib.la diff --git a/debian/squeeze/tdelibs/debian/cdbs/kde.mk b/debian/squeeze/tdelibs/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/squeeze/tdelibs/debian/cdbs/kde.mk +++ b/debian/squeeze/tdelibs/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/squeeze/tdelibs/debian/changelog b/debian/squeeze/tdelibs/debian/changelog index dd416c496..8eda5d307 100644 --- a/debian/squeeze/tdelibs/debian/changelog +++ b/debian/squeeze/tdelibs/debian/changelog @@ -2087,7 +2087,7 @@ tdelibs (4:3.4.0-0pre5) alioth; urgency=low output them expanded even when --expandvars is not used. (Closes: #287822) * Fixed the ability of the build system to find kde.pot, even when it is not - located at TDEDIR/include/kde.pot. This allows the use of targets such as + located at TDEDIR/include/tde.pot. This allows the use of targets such as "package-messages" without specifying includedir. (Closes: #283858) * Now that graphviz is in main, add it to Build-Depends-Indep together with diff --git a/debian/squeeze/tdelibs/debian/rules b/debian/squeeze/tdelibs/debian/rules index 24b56bf2a..2e2bdf3ee 100755 --- a/debian/squeeze/tdelibs/debian/rules +++ b/debian/squeeze/tdelibs/debian/rules @@ -20,7 +20,7 @@ DEB_KDE_APIDOX := yes version=Debian Package $(DEB_VERSION) DEB_OPT_FLAG += -DDEBIAN_VERSION=$(DEB_VERSION) -DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/kde" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" -DWITH_GCC_VISIBILITY="ON" \ +DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/tde" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" -DWITH_GCC_VISIBILITY="ON" \ -DWITH_LIBART="ON" -DWITH_LIBIDN="ON" -DWITH_TIFF="ON" -DWITH_JASPER="ON" -DWITH_OPENEXR="ON" -DWITH_AVAHI="ON" -DWITH_ASPELL="ON" -DWITH_HSPELL="ON" -DWITH_ELFICON="ON" # Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to diff --git a/debian/squeeze/tdelibs/debian/tdelibs4-trinity-dev.install b/debian/squeeze/tdelibs/debian/tdelibs4-trinity-dev.install index 3d2e8e43b..a9044b322 100644 --- a/debian/squeeze/tdelibs/debian/tdelibs4-trinity-dev.install +++ b/debian/squeeze/tdelibs/debian/tdelibs4-trinity-dev.install @@ -197,13 +197,13 @@ debian/tmp/opt/trinity/include/kdatewidget.h debian/tmp/opt/trinity/include/kdcopactionproxy.h debian/tmp/opt/trinity/include/kdcoppropertyproxy.h debian/tmp/opt/trinity/include/kdcopservicestarter.h -debian/tmp/opt/trinity/include/kdebugclasses.h -debian/tmp/opt/trinity/include/kdebug.h -debian/tmp/opt/trinity/include/kdedmodule.h -debian/tmp/opt/trinity/include/kde_file.h +debian/tmp/opt/trinity/include/tdebugclasses.h +debian/tmp/opt/trinity/include/tdebug.h +debian/tmp/opt/trinity/include/tdedmodule.h +debian/tmp/opt/trinity/include/tde_file.h debian/tmp/opt/trinity/include/tdelibs_export.h -debian/tmp/opt/trinity/include/kdemacros.h -debian/tmp/opt/trinity/include/kde.pot +debian/tmp/opt/trinity/include/tdemacros.h +debian/tmp/opt/trinity/include/tde.pot debian/tmp/opt/trinity/include/tdeprint/driver.h debian/tmp/opt/trinity/include/tdeprint/kiconselectaction.h debian/tmp/opt/trinity/include/tdeprint/kmjob.h @@ -221,7 +221,7 @@ debian/tmp/opt/trinity/include/tdeprint/kprintdialogpage.h debian/tmp/opt/trinity/include/tdeprint/lpr/lprhandler.h debian/tmp/opt/trinity/include/tdeprint/lpr/lprsettings.h debian/tmp/opt/trinity/include/tdeprint/lpr/printcapentry.h -debian/tmp/opt/trinity/include/kdesktopfile.h +debian/tmp/opt/trinity/include/tdesktopfile.h debian/tmp/opt/trinity/include/tdesu/client.h debian/tmp/opt/trinity/include/tdesu/defaults.h debian/tmp/opt/trinity/include/tdesu/kcookie.h @@ -231,7 +231,7 @@ debian/tmp/opt/trinity/include/tdesu/pty.h debian/tmp/opt/trinity/include/tdesu/ssh.h debian/tmp/opt/trinity/include/tdesu/stub.h debian/tmp/opt/trinity/include/tdesu/su.h -debian/tmp/opt/trinity/include/kde_terminal_interface.h +debian/tmp/opt/trinity/include/tde_terminal_interface.h debian/tmp/opt/trinity/include/tdeversion.h debian/tmp/opt/trinity/include/kdialogbase.h debian/tmp/opt/trinity/include/kdialog.h @@ -717,7 +717,7 @@ debian/tmp/opt/trinity/include/networkstatusindicator.h debian/tmp/opt/trinity/include/connectionmanager.h debian/tmp/opt/trinity/include/serviceiface.h debian/tmp/opt/trinity/include/provideriface.h -#debian/tmp/opt/trinity/include/kdemm +#debian/tmp/opt/trinity/include/tdemm debian/tmp/opt/trinity/lib/libnetworkstatus.la debian/tmp/opt/trinity/lib/libnetworkstatus.so diff --git a/debian/squeeze/tdemultimedia/debian/cdbs/kde.mk b/debian/squeeze/tdemultimedia/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/squeeze/tdemultimedia/debian/cdbs/kde.mk +++ b/debian/squeeze/tdemultimedia/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/squeeze/tdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff b/debian/squeeze/tdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff index 0caf5361a..c02687784 100644 --- a/debian/squeeze/tdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/squeeze/tdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/opt/trinity/include/kde/kde.pot ++kdepotpath=/opt/trinity/include/tde/kde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/debian/squeeze/tdemultimedia/debian/rules b/debian/squeeze/tdemultimedia/debian/rules index abe114b59..aff6738b2 100755 --- a/debian/squeeze/tdemultimedia/debian/rules +++ b/debian/squeeze/tdemultimedia/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 @@ -14,9 +14,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_CONFIGURE_EXTRA_FLAGS := \ --with-alsa --with-arts-alsa \ - --with-extra-includes=/usr/include/speex:/opt/trinity/include/kde/arts \ + --with-extra-includes=/usr/include/speex:/opt/trinity/include/tde/arts \ --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib - # The include/kde/arts one should be temporary. See + # The include/tde/arts one should be temporary. See # "juk/Makefile.am: arts_includes vs ARTS_CFLAGS" in -talk. DOC_HTML_PRUNE := kcontrol-trinity diff --git a/debian/squeeze/tdemultimedia/debian/tdemultimedia-trinity-dev.install b/debian/squeeze/tdemultimedia/debian/tdemultimedia-trinity-dev.install index a6b4265bd..4edb170bf 100644 --- a/debian/squeeze/tdemultimedia/debian/tdemultimedia-trinity-dev.install +++ b/debian/squeeze/tdemultimedia/debian/tdemultimedia-trinity-dev.install @@ -1,137 +1,137 @@ -debian/tmp/opt/trinity/include/kde/arts/artsbuilder.h -debian/tmp/opt/trinity/include/kde/arts/artsbuilder.idl -debian/tmp/opt/trinity/include/kde/arts/artsgui.h -debian/tmp/opt/trinity/include/kde/arts/artsgui.idl -debian/tmp/opt/trinity/include/kde/arts/artsmidi.h -debian/tmp/opt/trinity/include/kde/arts/artsmidi.idl -debian/tmp/opt/trinity/include/kde/arts/artsmodules.h -debian/tmp/opt/trinity/include/kde/arts/artsmodules.idl -debian/tmp/opt/trinity/include/kde/arts/artsmodulescommon.h -debian/tmp/opt/trinity/include/kde/arts/artsmodulescommon.idl -debian/tmp/opt/trinity/include/kde/arts/artsmoduleseffects.h -debian/tmp/opt/trinity/include/kde/arts/artsmoduleseffects.idl -debian/tmp/opt/trinity/include/kde/arts/artsmodulesmixers.h -debian/tmp/opt/trinity/include/kde/arts/artsmodulesmixers.idl -debian/tmp/opt/trinity/include/kde/arts/artsmodulessynth.h -debian/tmp/opt/trinity/include/kde/arts/artsmodulessynth.idl -debian/tmp/opt/trinity/include/kde/arts/kartswidget.h -debian/tmp/opt/trinity/include/kde/arts/kframe_impl.h -debian/tmp/opt/trinity/include/kde/arts/klayoutbox_impl.h -debian/tmp/opt/trinity/include/kde/arts/kwidget_impl.h -debian/tmp/opt/trinity/include/kde/arts/kwidgetrepo.h -debian/tmp/opt/trinity/include/kde/audiocdencoder.h -debian/tmp/opt/trinity/include/kde/cmodule.h -debian/tmp/opt/trinity/include/kde/effectview.h -debian/tmp/opt/trinity/include/kde/equalizerview.h -debian/tmp/opt/trinity/include/kde/ksaver.h -debian/tmp/opt/trinity/include/kde/libkcddb/cache.h -debian/tmp/opt/trinity/include/kde/libkcddb/cddb.h -debian/tmp/opt/trinity/include/kde/libkcddb/cdinfo.h -debian/tmp/opt/trinity/include/kde/libkcddb/client.h -debian/tmp/opt/trinity/include/kde/libkcddb/config.h -debian/tmp/opt/trinity/include/kde/libkcddb/configbase.h -debian/tmp/opt/trinity/include/kde/mimetypetree.h -debian/tmp/opt/trinity/include/kde/mpeglib/decoder/cddaPlugin.h -debian/tmp/opt/trinity/include/kde/mpeglib/decoder/command.h -debian/tmp/opt/trinity/include/kde/mpeglib/decoder/commandPipe.h -debian/tmp/opt/trinity/include/kde/mpeglib/decoder/decoderPlugin.h -debian/tmp/opt/trinity/include/kde/mpeglib/decoder/mpegPlugin.h -debian/tmp/opt/trinity/include/kde/mpeglib/decoder/mpgPlugin.h -debian/tmp/opt/trinity/include/kde/mpeglib/decoder/nukePlugin.h -debian/tmp/opt/trinity/include/kde/mpeglib/decoder/splayPlugin.h -debian/tmp/opt/trinity/include/kde/mpeglib/decoder/tplayPlugin.h -debian/tmp/opt/trinity/include/kde/mpeglib/decoder/vorbisPlugin.h -debian/tmp/opt/trinity/include/kde/mpeglib/decoder/yuvPlugin.h -debian/tmp/opt/trinity/include/kde/mpeglib/frame/IOFrameQueue.h -debian/tmp/opt/trinity/include/kde/mpeglib/frame/audioFrame.h -debian/tmp/opt/trinity/include/kde/mpeglib/frame/audioFrameQueue.h -debian/tmp/opt/trinity/include/kde/mpeglib/frame/floatFrame.h -debian/tmp/opt/trinity/include/kde/mpeglib/frame/frame.h -debian/tmp/opt/trinity/include/kde/mpeglib/frame/frameQueue.h -debian/tmp/opt/trinity/include/kde/mpeglib/frame/framer.h -debian/tmp/opt/trinity/include/kde/mpeglib/frame/pcmFrame.h -debian/tmp/opt/trinity/include/kde/mpeglib/frame/rawDataBuffer.h -debian/tmp/opt/trinity/include/kde/mpeglib/frame/rawFrame.h -debian/tmp/opt/trinity/include/kde/mpeglib/input/bufferInputStream.h -debian/tmp/opt/trinity/include/kde/mpeglib/input/cddaInputStream.h -debian/tmp/opt/trinity/include/kde/mpeglib/input/cdromInputStream.h -debian/tmp/opt/trinity/include/kde/mpeglib/input/fileInputStream.h -debian/tmp/opt/trinity/include/kde/mpeglib/input/httpInputStream.h -debian/tmp/opt/trinity/include/kde/mpeglib/input/inputDetector.h -debian/tmp/opt/trinity/include/kde/mpeglib/input/inputPlugin.h -debian/tmp/opt/trinity/include/kde/mpeglib/input/inputStream.h -debian/tmp/opt/trinity/include/kde/mpeglib/input/threadSafeInputStream.h -debian/tmp/opt/trinity/include/kde/mpeglib/mpegutil/mpegStreamPlayer.h -debian/tmp/opt/trinity/include/kde/mpeglib/mpegutil/mpegSystemHeader.h -debian/tmp/opt/trinity/include/kde/mpeglib/mpegutil/mpegSystemStream.h -debian/tmp/opt/trinity/include/kde/mpeglib/mpegutil/mpegVideoLength.h -debian/tmp/opt/trinity/include/kde/mpeglib/mpegutil/pesSystemStream.h -debian/tmp/opt/trinity/include/kde/mpeglib/mpegutil/psSystemStream.h -debian/tmp/opt/trinity/include/kde/mpeglib/mpegutil/tsSystemStream.h -debian/tmp/opt/trinity/include/kde/mpeglib/oggvorbis/oggFrame.h -debian/tmp/opt/trinity/include/kde/mpeglib/oggvorbis/ovFramer.h -debian/tmp/opt/trinity/include/kde/mpeglib/oggvorbis/vorbisDecoder.h -debian/tmp/opt/trinity/include/kde/mpeglib/oggvorbis/vorbisInfo.h -debian/tmp/opt/trinity/include/kde/mpeglib/output/artsOutputStream.h -debian/tmp/opt/trinity/include/kde/mpeglib/output/audioTime.h -debian/tmp/opt/trinity/include/kde/mpeglib/output/avSyncer.h -debian/tmp/opt/trinity/include/kde/mpeglib/output/dspX11OutputStream.h -debian/tmp/opt/trinity/include/kde/mpeglib/output/outPlugin.h -debian/tmp/opt/trinity/include/kde/mpeglib/output/outputStream.h -debian/tmp/opt/trinity/include/kde/mpeglib/output/pluginInfo.h -debian/tmp/opt/trinity/include/kde/mpeglib/output/threadSafeOutputStream.h -debian/tmp/opt/trinity/include/kde/mpeglib/splay/mpegAudioFrame.h -debian/tmp/opt/trinity/include/kde/mpeglib/splay/mpegAudioInfo.h -debian/tmp/opt/trinity/include/kde/mpeglib/splay/splayDecoder.h -debian/tmp/opt/trinity/include/kde/mpeglib/util/abstract/abs_thread.h -debian/tmp/opt/trinity/include/kde/mpeglib/util/abstract/threadQueue.h -debian/tmp/opt/trinity/include/kde/mpeglib/util/dynBuffer.h -debian/tmp/opt/trinity/include/kde/mpeglib/util/file/fileAccess.h -debian/tmp/opt/trinity/include/kde/mpeglib/util/mmx/mm_accel.h -debian/tmp/opt/trinity/include/kde/mpeglib/util/mmx/mmx.h -debian/tmp/opt/trinity/include/kde/mpeglib/util/mmx/mmx_asm.h -debian/tmp/opt/trinity/include/kde/mpeglib/util/render/pictureArray.h -debian/tmp/opt/trinity/include/kde/mpeglib/util/render/yuvPicture.h -debian/tmp/opt/trinity/include/kde/mpeglib/util/syncClock.h -debian/tmp/opt/trinity/include/kde/mpeglib/util/timeStamp.h -debian/tmp/opt/trinity/include/kde/mpeglib/util/timeStampArray.h -debian/tmp/opt/trinity/include/kde/mpeglib/util/timeWrapper.h -debian/tmp/opt/trinity/include/kde/mpeglib/util/yaf/yafcore/buffer.h -debian/tmp/opt/trinity/include/kde/mpeglib/util/yaf/yafcore/inputDecoder.h -debian/tmp/opt/trinity/include/kde/mpeglib/util/yaf/yafcore/inputInterface.h -debian/tmp/opt/trinity/include/kde/mpeglib/util/yaf/yafcore/outputInterface.h -debian/tmp/opt/trinity/include/kde/mpeglib/util/yaf/yafcore/yaf_control.h -debian/tmp/opt/trinity/include/kde/mpeglib/util/yaf/yafxplayer/inputDecoderXPlayer.h -debian/tmp/opt/trinity/include/kde/mpeglib/util/yaf/yafxplayer/inputDecoderYAF.h -debian/tmp/opt/trinity/include/kde/mpeglib/util/yaf/yafxplayer/yafOutputStream.h -debian/tmp/opt/trinity/include/kde/mpeglib_artsplug/decoderBaseObject.h -debian/tmp/opt/trinity/include/kde/mpeglib_artsplug/decoderBaseObject.idl -debian/tmp/opt/trinity/include/kde/mpeglib_artsplug/decoderBaseObject_impl.h -debian/tmp/opt/trinity/include/kde/mpeglib_artsplug/splayPlayObject.h -debian/tmp/opt/trinity/include/kde/mpeglib_artsplug/splayPlayObject.idl -debian/tmp/opt/trinity/include/kde/mpeglib_artsplug/splayPlayObject_impl.h -debian/tmp/opt/trinity/include/kde/noatun/app.h -debian/tmp/opt/trinity/include/kde/noatun/controls.h -debian/tmp/opt/trinity/include/kde/noatun/conversion.h -debian/tmp/opt/trinity/include/kde/noatun/downloader.h -debian/tmp/opt/trinity/include/kde/noatun/effects.h -debian/tmp/opt/trinity/include/kde/noatun/engine.h -debian/tmp/opt/trinity/include/kde/noatun/equalizer.h -debian/tmp/opt/trinity/include/kde/noatun/noatunarts.h -debian/tmp/opt/trinity/include/kde/noatun/player.h -debian/tmp/opt/trinity/include/kde/noatun/playlist.h -debian/tmp/opt/trinity/include/kde/noatun/playlistsaver.h -debian/tmp/opt/trinity/include/kde/noatun/plugin.h -debian/tmp/opt/trinity/include/kde/noatun/pluginloader.h -debian/tmp/opt/trinity/include/kde/noatun/pref.h -debian/tmp/opt/trinity/include/kde/noatun/scrollinglabel.h -debian/tmp/opt/trinity/include/kde/noatun/stdaction.h -debian/tmp/opt/trinity/include/kde/noatun/stereobuttonaction.h -debian/tmp/opt/trinity/include/kde/noatun/tags.h -debian/tmp/opt/trinity/include/kde/noatun/vequalizer.h -debian/tmp/opt/trinity/include/kde/noatun/video.h -debian/tmp/opt/trinity/include/kde/noatun/winskinvis.h -debian/tmp/opt/trinity/include/kde/plugin_deps.h +debian/tmp/opt/trinity/include/tde/arts/artsbuilder.h +debian/tmp/opt/trinity/include/tde/arts/artsbuilder.idl +debian/tmp/opt/trinity/include/tde/arts/artsgui.h +debian/tmp/opt/trinity/include/tde/arts/artsgui.idl +debian/tmp/opt/trinity/include/tde/arts/artsmidi.h +debian/tmp/opt/trinity/include/tde/arts/artsmidi.idl +debian/tmp/opt/trinity/include/tde/arts/artsmodules.h +debian/tmp/opt/trinity/include/tde/arts/artsmodules.idl +debian/tmp/opt/trinity/include/tde/arts/artsmodulescommon.h +debian/tmp/opt/trinity/include/tde/arts/artsmodulescommon.idl +debian/tmp/opt/trinity/include/tde/arts/artsmoduleseffects.h +debian/tmp/opt/trinity/include/tde/arts/artsmoduleseffects.idl +debian/tmp/opt/trinity/include/tde/arts/artsmodulesmixers.h +debian/tmp/opt/trinity/include/tde/arts/artsmodulesmixers.idl +debian/tmp/opt/trinity/include/tde/arts/artsmodulessynth.h +debian/tmp/opt/trinity/include/tde/arts/artsmodulessynth.idl +debian/tmp/opt/trinity/include/tde/arts/kartswidget.h +debian/tmp/opt/trinity/include/tde/arts/kframe_impl.h +debian/tmp/opt/trinity/include/tde/arts/klayoutbox_impl.h +debian/tmp/opt/trinity/include/tde/arts/kwidget_impl.h +debian/tmp/opt/trinity/include/tde/arts/kwidgetrepo.h +debian/tmp/opt/trinity/include/tde/audiocdencoder.h +debian/tmp/opt/trinity/include/tde/cmodule.h +debian/tmp/opt/trinity/include/tde/effectview.h +debian/tmp/opt/trinity/include/tde/equalizerview.h +debian/tmp/opt/trinity/include/tde/ksaver.h +debian/tmp/opt/trinity/include/tde/libkcddb/cache.h +debian/tmp/opt/trinity/include/tde/libkcddb/cddb.h +debian/tmp/opt/trinity/include/tde/libkcddb/cdinfo.h +debian/tmp/opt/trinity/include/tde/libkcddb/client.h +debian/tmp/opt/trinity/include/tde/libkcddb/config.h +debian/tmp/opt/trinity/include/tde/libkcddb/configbase.h +debian/tmp/opt/trinity/include/tde/mimetypetree.h +debian/tmp/opt/trinity/include/tde/mpeglib/decoder/cddaPlugin.h +debian/tmp/opt/trinity/include/tde/mpeglib/decoder/command.h +debian/tmp/opt/trinity/include/tde/mpeglib/decoder/commandPipe.h +debian/tmp/opt/trinity/include/tde/mpeglib/decoder/decoderPlugin.h +debian/tmp/opt/trinity/include/tde/mpeglib/decoder/mpegPlugin.h +debian/tmp/opt/trinity/include/tde/mpeglib/decoder/mpgPlugin.h +debian/tmp/opt/trinity/include/tde/mpeglib/decoder/nukePlugin.h +debian/tmp/opt/trinity/include/tde/mpeglib/decoder/splayPlugin.h +debian/tmp/opt/trinity/include/tde/mpeglib/decoder/tplayPlugin.h +debian/tmp/opt/trinity/include/tde/mpeglib/decoder/vorbisPlugin.h +debian/tmp/opt/trinity/include/tde/mpeglib/decoder/yuvPlugin.h +debian/tmp/opt/trinity/include/tde/mpeglib/frame/IOFrameQueue.h +debian/tmp/opt/trinity/include/tde/mpeglib/frame/audioFrame.h +debian/tmp/opt/trinity/include/tde/mpeglib/frame/audioFrameQueue.h +debian/tmp/opt/trinity/include/tde/mpeglib/frame/floatFrame.h +debian/tmp/opt/trinity/include/tde/mpeglib/frame/frame.h +debian/tmp/opt/trinity/include/tde/mpeglib/frame/frameQueue.h +debian/tmp/opt/trinity/include/tde/mpeglib/frame/framer.h +debian/tmp/opt/trinity/include/tde/mpeglib/frame/pcmFrame.h +debian/tmp/opt/trinity/include/tde/mpeglib/frame/rawDataBuffer.h +debian/tmp/opt/trinity/include/tde/mpeglib/frame/rawFrame.h +debian/tmp/opt/trinity/include/tde/mpeglib/input/bufferInputStream.h +debian/tmp/opt/trinity/include/tde/mpeglib/input/cddaInputStream.h +debian/tmp/opt/trinity/include/tde/mpeglib/input/cdromInputStream.h +debian/tmp/opt/trinity/include/tde/mpeglib/input/fileInputStream.h +debian/tmp/opt/trinity/include/tde/mpeglib/input/httpInputStream.h +debian/tmp/opt/trinity/include/tde/mpeglib/input/inputDetector.h +debian/tmp/opt/trinity/include/tde/mpeglib/input/inputPlugin.h +debian/tmp/opt/trinity/include/tde/mpeglib/input/inputStream.h +debian/tmp/opt/trinity/include/tde/mpeglib/input/threadSafeInputStream.h +debian/tmp/opt/trinity/include/tde/mpeglib/mpegutil/mpegStreamPlayer.h +debian/tmp/opt/trinity/include/tde/mpeglib/mpegutil/mpegSystemHeader.h +debian/tmp/opt/trinity/include/tde/mpeglib/mpegutil/mpegSystemStream.h +debian/tmp/opt/trinity/include/tde/mpeglib/mpegutil/mpegVideoLength.h +debian/tmp/opt/trinity/include/tde/mpeglib/mpegutil/pesSystemStream.h +debian/tmp/opt/trinity/include/tde/mpeglib/mpegutil/psSystemStream.h +debian/tmp/opt/trinity/include/tde/mpeglib/mpegutil/tsSystemStream.h +debian/tmp/opt/trinity/include/tde/mpeglib/oggvorbis/oggFrame.h +debian/tmp/opt/trinity/include/tde/mpeglib/oggvorbis/ovFramer.h +debian/tmp/opt/trinity/include/tde/mpeglib/oggvorbis/vorbisDecoder.h +debian/tmp/opt/trinity/include/tde/mpeglib/oggvorbis/vorbisInfo.h +debian/tmp/opt/trinity/include/tde/mpeglib/output/artsOutputStream.h +debian/tmp/opt/trinity/include/tde/mpeglib/output/audioTime.h +debian/tmp/opt/trinity/include/tde/mpeglib/output/avSyncer.h +debian/tmp/opt/trinity/include/tde/mpeglib/output/dspX11OutputStream.h +debian/tmp/opt/trinity/include/tde/mpeglib/output/outPlugin.h +debian/tmp/opt/trinity/include/tde/mpeglib/output/outputStream.h +debian/tmp/opt/trinity/include/tde/mpeglib/output/pluginInfo.h +debian/tmp/opt/trinity/include/tde/mpeglib/output/threadSafeOutputStream.h +debian/tmp/opt/trinity/include/tde/mpeglib/splay/mpegAudioFrame.h +debian/tmp/opt/trinity/include/tde/mpeglib/splay/mpegAudioInfo.h +debian/tmp/opt/trinity/include/tde/mpeglib/splay/splayDecoder.h +debian/tmp/opt/trinity/include/tde/mpeglib/util/abstract/abs_thread.h +debian/tmp/opt/trinity/include/tde/mpeglib/util/abstract/threadQueue.h +debian/tmp/opt/trinity/include/tde/mpeglib/util/dynBuffer.h +debian/tmp/opt/trinity/include/tde/mpeglib/util/file/fileAccess.h +debian/tmp/opt/trinity/include/tde/mpeglib/util/mmx/mm_accel.h +debian/tmp/opt/trinity/include/tde/mpeglib/util/mmx/mmx.h +debian/tmp/opt/trinity/include/tde/mpeglib/util/mmx/mmx_asm.h +debian/tmp/opt/trinity/include/tde/mpeglib/util/render/pictureArray.h +debian/tmp/opt/trinity/include/tde/mpeglib/util/render/yuvPicture.h +debian/tmp/opt/trinity/include/tde/mpeglib/util/syncClock.h +debian/tmp/opt/trinity/include/tde/mpeglib/util/timeStamp.h +debian/tmp/opt/trinity/include/tde/mpeglib/util/timeStampArray.h +debian/tmp/opt/trinity/include/tde/mpeglib/util/timeWrapper.h +debian/tmp/opt/trinity/include/tde/mpeglib/util/yaf/yafcore/buffer.h +debian/tmp/opt/trinity/include/tde/mpeglib/util/yaf/yafcore/inputDecoder.h +debian/tmp/opt/trinity/include/tde/mpeglib/util/yaf/yafcore/inputInterface.h +debian/tmp/opt/trinity/include/tde/mpeglib/util/yaf/yafcore/outputInterface.h +debian/tmp/opt/trinity/include/tde/mpeglib/util/yaf/yafcore/yaf_control.h +debian/tmp/opt/trinity/include/tde/mpeglib/util/yaf/yafxplayer/inputDecoderXPlayer.h +debian/tmp/opt/trinity/include/tde/mpeglib/util/yaf/yafxplayer/inputDecoderYAF.h +debian/tmp/opt/trinity/include/tde/mpeglib/util/yaf/yafxplayer/yafOutputStream.h +debian/tmp/opt/trinity/include/tde/mpeglib_artsplug/decoderBaseObject.h +debian/tmp/opt/trinity/include/tde/mpeglib_artsplug/decoderBaseObject.idl +debian/tmp/opt/trinity/include/tde/mpeglib_artsplug/decoderBaseObject_impl.h +debian/tmp/opt/trinity/include/tde/mpeglib_artsplug/splayPlayObject.h +debian/tmp/opt/trinity/include/tde/mpeglib_artsplug/splayPlayObject.idl +debian/tmp/opt/trinity/include/tde/mpeglib_artsplug/splayPlayObject_impl.h +debian/tmp/opt/trinity/include/tde/noatun/app.h +debian/tmp/opt/trinity/include/tde/noatun/controls.h +debian/tmp/opt/trinity/include/tde/noatun/conversion.h +debian/tmp/opt/trinity/include/tde/noatun/downloader.h +debian/tmp/opt/trinity/include/tde/noatun/effects.h +debian/tmp/opt/trinity/include/tde/noatun/engine.h +debian/tmp/opt/trinity/include/tde/noatun/equalizer.h +debian/tmp/opt/trinity/include/tde/noatun/noatunarts.h +debian/tmp/opt/trinity/include/tde/noatun/player.h +debian/tmp/opt/trinity/include/tde/noatun/playlist.h +debian/tmp/opt/trinity/include/tde/noatun/playlistsaver.h +debian/tmp/opt/trinity/include/tde/noatun/plugin.h +debian/tmp/opt/trinity/include/tde/noatun/pluginloader.h +debian/tmp/opt/trinity/include/tde/noatun/pref.h +debian/tmp/opt/trinity/include/tde/noatun/scrollinglabel.h +debian/tmp/opt/trinity/include/tde/noatun/stdaction.h +debian/tmp/opt/trinity/include/tde/noatun/stereobuttonaction.h +debian/tmp/opt/trinity/include/tde/noatun/tags.h +debian/tmp/opt/trinity/include/tde/noatun/vequalizer.h +debian/tmp/opt/trinity/include/tde/noatun/video.h +debian/tmp/opt/trinity/include/tde/noatun/winskinvis.h +debian/tmp/opt/trinity/include/tde/plugin_deps.h debian/tmp/opt/trinity/lib/libarts_mpeglib.so debian/tmp/opt/trinity/lib/libarts_splay.so debian/tmp/opt/trinity/lib/libartsbuilder.so diff --git a/debian/squeeze/tdenetwork/debian/cdbs/kde.mk b/debian/squeeze/tdenetwork/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/squeeze/tdenetwork/debian/cdbs/kde.mk +++ b/debian/squeeze/tdenetwork/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/squeeze/tdenetwork/debian/kopete-trinity.install b/debian/squeeze/tdenetwork/debian/kopete-trinity.install index c4a342dc5..1901f005e 100644 --- a/debian/squeeze/tdenetwork/debian/kopete-trinity.install +++ b/debian/squeeze/tdenetwork/debian/kopete-trinity.install @@ -1,9 +1,9 @@ debian/tmp/opt/trinity/bin/kopete debian/tmp/opt/trinity/bin/kopete_latexconvert.sh -debian/tmp/opt/trinity/include/kde/kopete/kopetepicture.h -debian/tmp/opt/trinity/include/kde/kopete/kopeteprefs.h -debian/tmp/opt/trinity/include/kde/kopete/ui/addressbooklinkwidget.h -debian/tmp/opt/trinity/include/kde/kopete/webcamwidget.h +debian/tmp/opt/trinity/include/tde/kopete/kopetepicture.h +debian/tmp/opt/trinity/include/tde/kopete/kopeteprefs.h +debian/tmp/opt/trinity/include/tde/kopete/ui/addressbooklinkwidget.h +debian/tmp/opt/trinity/include/tde/kopete/webcamwidget.h debian/tmp/opt/trinity/lib/kconf_update_bin/kopete-account-kconf_update debian/tmp/opt/trinity/lib/kconf_update_bin/kopete-nameTracking-kconf_update debian/tmp/opt/trinity/lib/kconf_update_bin/kopete-pluginloader2-kconf_update diff --git a/debian/squeeze/tdenetwork/debian/patches/common/kubuntu_01_kdepot.diff b/debian/squeeze/tdenetwork/debian/patches/common/kubuntu_01_kdepot.diff index 0caf5361a..c02687784 100644 --- a/debian/squeeze/tdenetwork/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/squeeze/tdenetwork/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/opt/trinity/include/kde/kde.pot ++kdepotpath=/opt/trinity/include/tde/kde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/debian/squeeze/tdenetwork/debian/rules b/debian/squeeze/tdenetwork/debian/rules index 90babf808..71afe376c 100755 --- a/debian/squeeze/tdenetwork/debian/rules +++ b/debian/squeeze/tdenetwork/debian/rules @@ -17,7 +17,7 @@ include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/debian/squeeze/tdenetwork/debian/tdenetwork-trinity-dev.install b/debian/squeeze/tdenetwork/debian/tdenetwork-trinity-dev.install index cc69d4cba..4915aaa12 100644 --- a/debian/squeeze/tdenetwork/debian/tdenetwork-trinity-dev.install +++ b/debian/squeeze/tdenetwork/debian/tdenetwork-trinity-dev.install @@ -1,66 +1,66 @@ -debian/tmp/opt/trinity/include/kde/kopete/kabcpersistence.h -debian/tmp/opt/trinity/include/kde/kopete/kopete_export.h -debian/tmp/opt/trinity/include/kde/kopete/kopeteaccount.h -debian/tmp/opt/trinity/include/kde/kopete/kopeteaccountmanager.h -debian/tmp/opt/trinity/include/kde/kopete/kopeteaway.h -debian/tmp/opt/trinity/include/kde/kopete/kopeteawayaction.h -debian/tmp/opt/trinity/include/kde/kopete/kopeteawaydialog.h -debian/tmp/opt/trinity/include/kde/kopete/kopeteblacklister.h -debian/tmp/opt/trinity/include/kde/kopete/kopetechatsession.h -debian/tmp/opt/trinity/include/kde/kopete/kopetechatsessionmanager.h -debian/tmp/opt/trinity/include/kde/kopete/kopetecommandhandler.h -debian/tmp/opt/trinity/include/kde/kopete/kopetecontact.h -debian/tmp/opt/trinity/include/kde/kopete/kopetecontactlist.h -debian/tmp/opt/trinity/include/kde/kopete/kopetecontactlistelement.h -debian/tmp/opt/trinity/include/kde/kopete/kopetecontactproperty.h -debian/tmp/opt/trinity/include/kde/kopete/kopeteeventpresentation.h -debian/tmp/opt/trinity/include/kde/kopete/kopeteglobal.h -debian/tmp/opt/trinity/include/kde/kopete/kopetegroup.h -debian/tmp/opt/trinity/include/kde/kopete/kopetemessage.h -debian/tmp/opt/trinity/include/kde/kopete/kopetemessageevent.h -debian/tmp/opt/trinity/include/kde/kopete/kopetemessagehandler.h -debian/tmp/opt/trinity/include/kde/kopete/kopetemessagehandlerchain.h -debian/tmp/opt/trinity/include/kde/kopete/kopetemetacontact.h -debian/tmp/opt/trinity/include/kde/kopete/kopetemimetypehandler.h -debian/tmp/opt/trinity/include/kde/kopete/kopetenotifydataobject.h -debian/tmp/opt/trinity/include/kde/kopete/kopeteonlinestatus.h -debian/tmp/opt/trinity/include/kde/kopete/kopeteonlinestatusmanager.h -debian/tmp/opt/trinity/include/kde/kopete/kopetepassword.h -debian/tmp/opt/trinity/include/kde/kopete/kopetepasswordedaccount.h -debian/tmp/opt/trinity/include/kde/kopete/kopeteplugin.h -debian/tmp/opt/trinity/include/kde/kopete/kopeteprotocol.h -debian/tmp/opt/trinity/include/kde/kopete/kopetesimplemessagehandler.h -debian/tmp/opt/trinity/include/kde/kopete/kopetetask.h -debian/tmp/opt/trinity/include/kde/kopete/kopetetransfermanager.h -debian/tmp/opt/trinity/include/kde/kopete/kopeteuiglobal.h -debian/tmp/opt/trinity/include/kde/kopete/kopeteversion.h -debian/tmp/opt/trinity/include/kde/kopete/managedconnectionaccount.h -debian/tmp/opt/trinity/include/kde/kopete/ui/accountselector.h -debian/tmp/opt/trinity/include/kde/kopete/ui/addcontactpage.h -debian/tmp/opt/trinity/include/kde/kopete/ui/addressbookselectordialog.h -debian/tmp/opt/trinity/include/kde/kopete/ui/addressbookselectorwidget.h -debian/tmp/opt/trinity/include/kde/kopete/ui/editaccountwidget.h -debian/tmp/opt/trinity/include/kde/kopete/ui/fileconfirmbase.h -debian/tmp/opt/trinity/include/kde/kopete/ui/kopeteawaydialogbase.h -debian/tmp/opt/trinity/include/kde/kopete/ui/kopetecontactaction.h -debian/tmp/opt/trinity/include/kde/kopete/ui/kopetefileconfirmdialog.h -debian/tmp/opt/trinity/include/kde/kopete/ui/kopetelistview.h -debian/tmp/opt/trinity/include/kde/kopete/ui/kopetelistviewitem.h -debian/tmp/opt/trinity/include/kde/kopete/ui/kopetelistviewsearchline.h -debian/tmp/opt/trinity/include/kde/kopete/ui/kopetepassworddialog.h -debian/tmp/opt/trinity/include/kde/kopete/ui/kopetepasswordwidget.h -debian/tmp/opt/trinity/include/kde/kopete/ui/kopetepasswordwidgetbase.h -debian/tmp/opt/trinity/include/kde/kopete/ui/kopetestdaction.h -debian/tmp/opt/trinity/include/kde/kopete/ui/kopeteview.h -debian/tmp/opt/trinity/include/kde/kopete/ui/kopeteviewplugin.h -debian/tmp/opt/trinity/include/kde/kopete/ui/userinfodialog.h -debian/tmp/opt/trinity/include/kde/rss/article.h -debian/tmp/opt/trinity/include/kde/rss/document.h -debian/tmp/opt/trinity/include/kde/rss/global.h -debian/tmp/opt/trinity/include/kde/rss/image.h -debian/tmp/opt/trinity/include/kde/rss/librss.h -debian/tmp/opt/trinity/include/kde/rss/loader.h -debian/tmp/opt/trinity/include/kde/rss/textinput.h +debian/tmp/opt/trinity/include/tde/kopete/kabcpersistence.h +debian/tmp/opt/trinity/include/tde/kopete/kopete_export.h +debian/tmp/opt/trinity/include/tde/kopete/kopeteaccount.h +debian/tmp/opt/trinity/include/tde/kopete/kopeteaccountmanager.h +debian/tmp/opt/trinity/include/tde/kopete/kopeteaway.h +debian/tmp/opt/trinity/include/tde/kopete/kopeteawayaction.h +debian/tmp/opt/trinity/include/tde/kopete/kopeteawaydialog.h +debian/tmp/opt/trinity/include/tde/kopete/kopeteblacklister.h +debian/tmp/opt/trinity/include/tde/kopete/kopetechatsession.h +debian/tmp/opt/trinity/include/tde/kopete/kopetechatsessionmanager.h +debian/tmp/opt/trinity/include/tde/kopete/kopetecommandhandler.h +debian/tmp/opt/trinity/include/tde/kopete/kopetecontact.h +debian/tmp/opt/trinity/include/tde/kopete/kopetecontactlist.h +debian/tmp/opt/trinity/include/tde/kopete/kopetecontactlistelement.h +debian/tmp/opt/trinity/include/tde/kopete/kopetecontactproperty.h +debian/tmp/opt/trinity/include/tde/kopete/kopeteeventpresentation.h +debian/tmp/opt/trinity/include/tde/kopete/kopeteglobal.h +debian/tmp/opt/trinity/include/tde/kopete/kopetegroup.h +debian/tmp/opt/trinity/include/tde/kopete/kopetemessage.h +debian/tmp/opt/trinity/include/tde/kopete/kopetemessageevent.h +debian/tmp/opt/trinity/include/tde/kopete/kopetemessagehandler.h +debian/tmp/opt/trinity/include/tde/kopete/kopetemessagehandlerchain.h +debian/tmp/opt/trinity/include/tde/kopete/kopetemetacontact.h +debian/tmp/opt/trinity/include/tde/kopete/kopetemimetypehandler.h +debian/tmp/opt/trinity/include/tde/kopete/kopetenotifydataobject.h +debian/tmp/opt/trinity/include/tde/kopete/kopeteonlinestatus.h +debian/tmp/opt/trinity/include/tde/kopete/kopeteonlinestatusmanager.h +debian/tmp/opt/trinity/include/tde/kopete/kopetepassword.h +debian/tmp/opt/trinity/include/tde/kopete/kopetepasswordedaccount.h +debian/tmp/opt/trinity/include/tde/kopete/kopeteplugin.h +debian/tmp/opt/trinity/include/tde/kopete/kopeteprotocol.h +debian/tmp/opt/trinity/include/tde/kopete/kopetesimplemessagehandler.h +debian/tmp/opt/trinity/include/tde/kopete/kopetetask.h +debian/tmp/opt/trinity/include/tde/kopete/kopetetransfermanager.h +debian/tmp/opt/trinity/include/tde/kopete/kopeteuiglobal.h +debian/tmp/opt/trinity/include/tde/kopete/kopeteversion.h +debian/tmp/opt/trinity/include/tde/kopete/managedconnectionaccount.h +debian/tmp/opt/trinity/include/tde/kopete/ui/accountselector.h +debian/tmp/opt/trinity/include/tde/kopete/ui/addcontactpage.h +debian/tmp/opt/trinity/include/tde/kopete/ui/addressbookselectordialog.h +debian/tmp/opt/trinity/include/tde/kopete/ui/addressbookselectorwidget.h +debian/tmp/opt/trinity/include/tde/kopete/ui/editaccountwidget.h +debian/tmp/opt/trinity/include/tde/kopete/ui/fileconfirmbase.h +debian/tmp/opt/trinity/include/tde/kopete/ui/kopeteawaydialogbase.h +debian/tmp/opt/trinity/include/tde/kopete/ui/kopetecontactaction.h +debian/tmp/opt/trinity/include/tde/kopete/ui/kopetefileconfirmdialog.h +debian/tmp/opt/trinity/include/tde/kopete/ui/kopetelistview.h +debian/tmp/opt/trinity/include/tde/kopete/ui/kopetelistviewitem.h +debian/tmp/opt/trinity/include/tde/kopete/ui/kopetelistviewsearchline.h +debian/tmp/opt/trinity/include/tde/kopete/ui/kopetepassworddialog.h +debian/tmp/opt/trinity/include/tde/kopete/ui/kopetepasswordwidget.h +debian/tmp/opt/trinity/include/tde/kopete/ui/kopetepasswordwidgetbase.h +debian/tmp/opt/trinity/include/tde/kopete/ui/kopetestdaction.h +debian/tmp/opt/trinity/include/tde/kopete/ui/kopeteview.h +debian/tmp/opt/trinity/include/tde/kopete/ui/kopeteviewplugin.h +debian/tmp/opt/trinity/include/tde/kopete/ui/userinfodialog.h +debian/tmp/opt/trinity/include/tde/rss/article.h +debian/tmp/opt/trinity/include/tde/rss/document.h +debian/tmp/opt/trinity/include/tde/rss/global.h +debian/tmp/opt/trinity/include/tde/rss/image.h +debian/tmp/opt/trinity/include/tde/rss/librss.h +debian/tmp/opt/trinity/include/tde/rss/loader.h +debian/tmp/opt/trinity/include/tde/rss/textinput.h debian/tmp/opt/trinity/lib/libtdeinit_kdict.la debian/tmp/opt/trinity/lib/libtdeinit_ksirc.la debian/tmp/opt/trinity/lib/libkopete.la @@ -73,4 +73,4 @@ debian/tmp/opt/trinity/lib/libkopete_videodevice.la debian/tmp/opt/trinity/lib/libkopete_videodevice.so debian/tmp/opt/trinity/lib/librss.la debian/tmp/opt/trinity/lib/librss.so -debian/tmp/opt/trinity/include/kde/kopete/kopetepluginmanager.h +debian/tmp/opt/trinity/include/tde/kopete/kopetepluginmanager.h diff --git a/debian/squeeze/tdepim/debian/changelog b/debian/squeeze/tdepim/debian/changelog index 24807570c..53b6c5851 100644 --- a/debian/squeeze/tdepim/debian/changelog +++ b/debian/squeeze/tdepim/debian/changelog @@ -706,7 +706,7 @@ tdepim (4:3.5.6-0ubuntu3) feisty; urgency=low - Activates networkstatus support for kmail (patch from SuSE) * debian/control: - New package networkstatus-dev - * ./libtdepim1-dev.install: added /usr/include/kde/kpimprefs.h + * ./libtdepim1-dev.install: added /usr/include/tde/kpimprefs.h -- Anthony Mercatante Fri, 02 Feb 2007 15:37:42 +0100 diff --git a/debian/squeeze/tdepim/debian/libindex0-trinity-dev.install b/debian/squeeze/tdepim/debian/libindex0-trinity-dev.install index acbb26191..8c2903ede 100644 --- a/debian/squeeze/tdepim/debian/libindex0-trinity-dev.install +++ b/debian/squeeze/tdepim/debian/libindex0-trinity-dev.install @@ -1,4 +1,4 @@ /opt/trinity/bin/indexlib-config -/opt/trinity/include/kde/index +/opt/trinity/include/tde/index /opt/trinity/lib/libindex.la /opt/trinity/lib/libindex.so diff --git a/debian/squeeze/tdepim/debian/libkcal2-trinity-dev.install b/debian/squeeze/tdepim/debian/libkcal2-trinity-dev.install index 7dcc98ca7..75a5523ca 100644 --- a/debian/squeeze/tdepim/debian/libkcal2-trinity-dev.install +++ b/debian/squeeze/tdepim/debian/libkcal2-trinity-dev.install @@ -1,5 +1,5 @@ -/opt/trinity/include/kde/libemailfunctions/idmapper.h -/opt/trinity/include/kde/libkcal +/opt/trinity/include/tde/libemailfunctions/idmapper.h +/opt/trinity/include/tde/libkcal /opt/trinity/lib/libkcal.la /opt/trinity/lib/libkcal.so /opt/trinity/lib/libkcal_resourceremote.la diff --git a/debian/squeeze/tdepim/debian/libkgantt0-trinity-dev.install b/debian/squeeze/tdepim/debian/libkgantt0-trinity-dev.install index c386be142..290f743b7 100644 --- a/debian/squeeze/tdepim/debian/libkgantt0-trinity-dev.install +++ b/debian/squeeze/tdepim/debian/libkgantt0-trinity-dev.install @@ -1,3 +1,3 @@ -/opt/trinity/include/kde/kgantt +/opt/trinity/include/tde/kgantt /opt/trinity/lib/libkgantt.la /opt/trinity/lib/libkgantt.so diff --git a/debian/squeeze/tdepim/debian/libkleopatra1-trinity-dev.install b/debian/squeeze/tdepim/debian/libkleopatra1-trinity-dev.install index cab0f039e..6015f5c08 100644 --- a/debian/squeeze/tdepim/debian/libkleopatra1-trinity-dev.install +++ b/debian/squeeze/tdepim/debian/libkleopatra1-trinity-dev.install @@ -1,6 +1,6 @@ -/opt/trinity/include/kde/gpgme++ -/opt/trinity/include/kde/kleo -/opt/trinity/include/kde/qgpgme +/opt/trinity/include/tde/gpgme++ +/opt/trinity/include/tde/kleo +/opt/trinity/include/tde/qgpgme /opt/trinity/lib/libgpgme++.la /opt/trinity/lib/libgpgme++.so /opt/trinity/lib/libkleopatra.la diff --git a/debian/squeeze/tdepim/debian/libkpimexchange1-trinity-dev.install b/debian/squeeze/tdepim/debian/libkpimexchange1-trinity-dev.install index 8bf3b312e..ed8bb8407 100644 --- a/debian/squeeze/tdepim/debian/libkpimexchange1-trinity-dev.install +++ b/debian/squeeze/tdepim/debian/libkpimexchange1-trinity-dev.install @@ -1,4 +1,4 @@ -/opt/trinity/include/kde/tdepim/exchangeaccount.h -/opt/trinity/include/kde/tdepim/exchangeclient.h +/opt/trinity/include/tde/tdepim/exchangeaccount.h +/opt/trinity/include/tde/tdepim/exchangeclient.h /opt/trinity/lib/libkpimexchange.la /opt/trinity/lib/libkpimexchange.so diff --git a/debian/squeeze/tdepim/debian/libksieve0-trinity-dev.install b/debian/squeeze/tdepim/debian/libksieve0-trinity-dev.install index 08cf59222..32aa3d12d 100644 --- a/debian/squeeze/tdepim/debian/libksieve0-trinity-dev.install +++ b/debian/squeeze/tdepim/debian/libksieve0-trinity-dev.install @@ -1,3 +1,3 @@ -/opt/trinity/include/kde/ksieve +/opt/trinity/include/tde/ksieve /opt/trinity/lib/libksieve.la /opt/trinity/lib/libksieve.so diff --git a/debian/squeeze/tdepim/debian/libktnef1-trinity-dev.install b/debian/squeeze/tdepim/debian/libktnef1-trinity-dev.install index 5c74d9348..1cea927e9 100644 --- a/debian/squeeze/tdepim/debian/libktnef1-trinity-dev.install +++ b/debian/squeeze/tdepim/debian/libktnef1-trinity-dev.install @@ -1,3 +1,3 @@ -/opt/trinity/include/kde/ktnef +/opt/trinity/include/tde/ktnef /opt/trinity/lib/libktnef.la /opt/trinity/lib/libktnef.so diff --git a/debian/squeeze/tdepim/debian/libmimelib1-trinity-dev.install b/debian/squeeze/tdepim/debian/libmimelib1-trinity-dev.install index c5092b6a9..3a5428f6e 100644 --- a/debian/squeeze/tdepim/debian/libmimelib1-trinity-dev.install +++ b/debian/squeeze/tdepim/debian/libmimelib1-trinity-dev.install @@ -1,3 +1,3 @@ -/opt/trinity/include/kde/mimelib +/opt/trinity/include/tde/mimelib /opt/trinity/lib/libmimelib.la /opt/trinity/lib/libmimelib.so diff --git a/debian/squeeze/tdepim/debian/libtdepim1-trinity-dev.install b/debian/squeeze/tdepim/debian/libtdepim1-trinity-dev.install index 4f6d52f46..56ca2ebc8 100644 --- a/debian/squeeze/tdepim/debian/libtdepim1-trinity-dev.install +++ b/debian/squeeze/tdepim/debian/libtdepim1-trinity-dev.install @@ -1,3 +1,3 @@ -/opt/trinity/include/kde/tdepimmacros.h +/opt/trinity/include/tde/tdepimmacros.h /opt/trinity/lib/libtdepim.la /opt/trinity/lib/libtdepim.so diff --git a/debian/squeeze/tdepim/debian/tdepim-trinity-dev.install b/debian/squeeze/tdepim/debian/tdepim-trinity-dev.install index 848758727..b94111037 100644 --- a/debian/squeeze/tdepim/debian/tdepim-trinity-dev.install +++ b/debian/squeeze/tdepim/debian/tdepim-trinity-dev.install @@ -1,15 +1,15 @@ -/opt/trinity/include/kde/KNotesAppIface.h -/opt/trinity/include/kde/KNotesIface.h -/opt/trinity/include/kde/akregator -/opt/trinity/include/kde/calendar -/opt/trinity/include/kde/kabc -/opt/trinity/include/kde/kaddressbook -/opt/trinity/include/kde/kmail -/opt/trinity/include/kde/kmailIface.h -/opt/trinity/include/kde/kmailicalIface.h -/opt/trinity/include/kde/kmailpartIface.h -/opt/trinity/include/kde/kontact -/opt/trinity/include/kde/korganizer +/opt/trinity/include/tde/KNotesAppIface.h +/opt/trinity/include/tde/KNotesIface.h +/opt/trinity/include/tde/akregator +/opt/trinity/include/tde/calendar +/opt/trinity/include/tde/kabc +/opt/trinity/include/tde/kaddressbook +/opt/trinity/include/tde/kmail +/opt/trinity/include/tde/kmailIface.h +/opt/trinity/include/tde/kmailicalIface.h +/opt/trinity/include/tde/kmailpartIface.h +/opt/trinity/include/tde/kontact +/opt/trinity/include/tde/korganizer /opt/trinity/lib/libkabckolab.la /opt/trinity/lib/libkabckolab.so /opt/trinity/lib/libkabcscalix.la @@ -81,4 +81,4 @@ /opt/trinity/lib/libgwsoap.la /opt/trinity/lib/libgwsoap.so -/opt/trinity/include/kde/kpimprefs.h +/opt/trinity/include/tde/kpimprefs.h diff --git a/debian/squeeze/tdesdk/debian/cdbs/kde.mk b/debian/squeeze/tdesdk/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/squeeze/tdesdk/debian/cdbs/kde.mk +++ b/debian/squeeze/tdesdk/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/squeeze/tdesdk/debian/changelog b/debian/squeeze/tdesdk/debian/changelog index 276fb1d78..1bbe6e2e4 100644 --- a/debian/squeeze/tdesdk/debian/changelog +++ b/debian/squeeze/tdesdk/debian/changelog @@ -931,7 +931,7 @@ tdesdk (2.2.2-3) unstable; urgency=low tdesdk (2.2.2-2) unstable; urgency=low - * Moved kspy.h to /usr/include/kde (closes: Bug#122448, Bug#122449). + * Moved kspy.h to /usr/include/tde (closes: Bug#122448, Bug#122449). -- Ben Burton Thu, 6 Dec 2001 09:50:47 -0600 diff --git a/debian/squeeze/tdesdk/debian/kbabel-trinity-dev.install b/debian/squeeze/tdesdk/debian/kbabel-trinity-dev.install index a792b2b6d..ace31ea6a 100644 --- a/debian/squeeze/tdesdk/debian/kbabel-trinity-dev.install +++ b/debian/squeeze/tdesdk/debian/kbabel-trinity-dev.install @@ -1,24 +1,24 @@ -debian/tmp/opt/trinity/include/kde/kbabel/catalog.h -debian/tmp/opt/trinity/include/kde/kbabel/catalogfileplugin.h -debian/tmp/opt/trinity/include/kde/kbabel/catalogitem.h -debian/tmp/opt/trinity/include/kde/kbabel/catalogsettings.h -debian/tmp/opt/trinity/include/kde/kbabel/catalogview.h -debian/tmp/opt/trinity/include/kde/kbabel/dictchooser.h -debian/tmp/opt/trinity/include/kde/kbabel/dictionarymenu.h -debian/tmp/opt/trinity/include/kde/kbabel/editcmd.h -debian/tmp/opt/trinity/include/kde/kbabel/findoptions.h -debian/tmp/opt/trinity/include/kde/kbabel/itempart.h -debian/tmp/opt/trinity/include/kde/kbabel/kbabeldatatool.h -debian/tmp/opt/trinity/include/kde/kbabel/kbabeldictbox.h -debian/tmp/opt/trinity/include/kde/kbabel/kbabeldictiface.h -debian/tmp/opt/trinity/include/kde/kbabel/kbproject.h -debian/tmp/opt/trinity/include/kde/kbabel/kbprojectmanager.h -debian/tmp/opt/trinity/include/kde/kbabel/msgfmt.h -debian/tmp/opt/trinity/include/kde/kbabel/poinfo.h -debian/tmp/opt/trinity/include/kde/kbabel/projectsettings.h -debian/tmp/opt/trinity/include/kde/kbabel/regexpextractor.h -debian/tmp/opt/trinity/include/kde/kbabel/searchengine.h -debian/tmp/opt/trinity/include/kde/kbabel/tagextractor.h +debian/tmp/opt/trinity/include/tde/kbabel/catalog.h +debian/tmp/opt/trinity/include/tde/kbabel/catalogfileplugin.h +debian/tmp/opt/trinity/include/tde/kbabel/catalogitem.h +debian/tmp/opt/trinity/include/tde/kbabel/catalogsettings.h +debian/tmp/opt/trinity/include/tde/kbabel/catalogview.h +debian/tmp/opt/trinity/include/tde/kbabel/dictchooser.h +debian/tmp/opt/trinity/include/tde/kbabel/dictionarymenu.h +debian/tmp/opt/trinity/include/tde/kbabel/editcmd.h +debian/tmp/opt/trinity/include/tde/kbabel/findoptions.h +debian/tmp/opt/trinity/include/tde/kbabel/itempart.h +debian/tmp/opt/trinity/include/tde/kbabel/kbabeldatatool.h +debian/tmp/opt/trinity/include/tde/kbabel/kbabeldictbox.h +debian/tmp/opt/trinity/include/tde/kbabel/kbabeldictiface.h +debian/tmp/opt/trinity/include/tde/kbabel/kbproject.h +debian/tmp/opt/trinity/include/tde/kbabel/kbprojectmanager.h +debian/tmp/opt/trinity/include/tde/kbabel/msgfmt.h +debian/tmp/opt/trinity/include/tde/kbabel/poinfo.h +debian/tmp/opt/trinity/include/tde/kbabel/projectsettings.h +debian/tmp/opt/trinity/include/tde/kbabel/regexpextractor.h +debian/tmp/opt/trinity/include/tde/kbabel/searchengine.h +debian/tmp/opt/trinity/include/tde/kbabel/tagextractor.h debian/tmp/opt/trinity/lib/libkbabelcommon.la debian/tmp/opt/trinity/lib/libkbabelcommon.so debian/tmp/opt/trinity/lib/libkbabeldictplugin.la diff --git a/debian/squeeze/tdesdk/debian/kmtrace-trinity.install b/debian/squeeze/tdesdk/debian/kmtrace-trinity.install index 119b5196d..35b5af1a5 100644 --- a/debian/squeeze/tdesdk/debian/kmtrace-trinity.install +++ b/debian/squeeze/tdesdk/debian/kmtrace-trinity.install @@ -2,7 +2,7 @@ debian/tmp/opt/trinity/bin/demangle debian/tmp/opt/trinity/bin/kminspector debian/tmp/opt/trinity/bin/kmmatch debian/tmp/opt/trinity/bin/kmtrace -debian/tmp/opt/trinity/include/kde/ktrace.h +debian/tmp/opt/trinity/include/tde/ktrace.h debian/tmp/opt/trinity/lib/kmtrace/libktrace.la debian/tmp/opt/trinity/lib/kmtrace/libktrace.so debian/tmp/opt/trinity/lib/kmtrace/libktrace_s.a diff --git a/debian/squeeze/tdesdk/debian/kspy-trinity.install b/debian/squeeze/tdesdk/debian/kspy-trinity.install index 3b7d6d778..fc17ede2c 100644 --- a/debian/squeeze/tdesdk/debian/kspy-trinity.install +++ b/debian/squeeze/tdesdk/debian/kspy-trinity.install @@ -1,4 +1,4 @@ -debian/tmp/opt/trinity/include/kde/kspy.h +debian/tmp/opt/trinity/include/tde/kspy.h debian/tmp/opt/trinity/lib/libkspy.la debian/tmp/opt/trinity/lib/libkspy.so debian/tmp/opt/trinity/lib/libkspy.so.1 diff --git a/debian/squeeze/tdesdk/debian/kunittest-trinity.install b/debian/squeeze/tdesdk/debian/kunittest-trinity.install index f002cd796..e183f0e74 100644 --- a/debian/squeeze/tdesdk/debian/kunittest-trinity.install +++ b/debian/squeeze/tdesdk/debian/kunittest-trinity.install @@ -4,4 +4,4 @@ debian/tmp/opt/trinity/lib/libkunittestgui.la debian/tmp/opt/trinity/lib/libkunittestgui.so debian/tmp/opt/trinity/lib/libkunittestgui.so.0 debian/tmp/opt/trinity/lib/libkunittestgui.so.0.0.0 -debian/tmp/opt/trinity/include/kde/kunittest/runnergui.h +debian/tmp/opt/trinity/include/tde/kunittest/runnergui.h diff --git a/debian/squeeze/tdesdk/debian/libcvsservice-trinity-dev.install b/debian/squeeze/tdesdk/debian/libcvsservice-trinity-dev.install index ac87e6efb..566e0b7a1 100644 --- a/debian/squeeze/tdesdk/debian/libcvsservice-trinity-dev.install +++ b/debian/squeeze/tdesdk/debian/libcvsservice-trinity-dev.install @@ -1,6 +1,6 @@ -debian/tmp/opt/trinity/include/kde/cvsjob_stub.h -debian/tmp/opt/trinity/include/kde/cvsservice_stub.h -debian/tmp/opt/trinity/include/kde/repository_stub.h +debian/tmp/opt/trinity/include/tde/cvsjob_stub.h +debian/tmp/opt/trinity/include/tde/cvsservice_stub.h +debian/tmp/opt/trinity/include/tde/repository_stub.h debian/tmp/opt/trinity/lib/libcvsservice.la debian/tmp/opt/trinity/lib/libcvsservice.so debian/tmp/opt/trinity/lib/libtdeinit_cvsaskpass.la diff --git a/debian/squeeze/tdesdk/debian/patches/common/kubuntu_01_kdepot.diff b/debian/squeeze/tdesdk/debian/patches/common/kubuntu_01_kdepot.diff index 0caf5361a..c02687784 100644 --- a/debian/squeeze/tdesdk/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/squeeze/tdesdk/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/opt/trinity/include/kde/kde.pot ++kdepotpath=/opt/trinity/include/tde/kde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/debian/squeeze/tdesdk/debian/rules b/debian/squeeze/tdesdk/debian/rules index e7b228f2b..d63a59865 100755 --- a/debian/squeeze/tdesdk/debian/rules +++ b/debian/squeeze/tdesdk/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/debian/squeeze/tdesdk/debian/tdesdk-misc-trinity.install b/debian/squeeze/tdesdk/debian/tdesdk-misc-trinity.install index cc229ce19..4b2589f6c 100644 --- a/debian/squeeze/tdesdk/debian/tdesdk-misc-trinity.install +++ b/debian/squeeze/tdesdk/debian/tdesdk-misc-trinity.install @@ -1,4 +1,4 @@ -debian/tmp/opt/trinity/include/kde/kprofilemethod.h +debian/tmp/opt/trinity/include/tde/kprofilemethod.h debian/tmp/opt/trinity/lib/trinity/kabcformat_kdeaccounts.la debian/tmp/opt/trinity/lib/trinity/kabcformat_kdeaccounts.so debian/tmp/opt/trinity/lib/trinity/plugins/styles/scheck.so diff --git a/debian/squeeze/tdetoys/debian/amor-trinity.install b/debian/squeeze/tdetoys/debian/amor-trinity.install index b616db701..56a51c1b0 100644 --- a/debian/squeeze/tdetoys/debian/amor-trinity.install +++ b/debian/squeeze/tdetoys/debian/amor-trinity.install @@ -1,5 +1,5 @@ debian/tmp/opt/trinity/bin/amor -debian/tmp/opt/trinity/include/kde/AmorIface.h +debian/tmp/opt/trinity/include/tde/AmorIface.h debian/tmp/opt/trinity/share/apps/amor debian/tmp/opt/trinity/share/applications/kde/amor.desktop debian/tmp/opt/trinity/share/doc/kde/HTML/en/amor/*.bz2 diff --git a/debian/squeeze/tdetoys/debian/cdbs/kde.mk b/debian/squeeze/tdetoys/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/squeeze/tdetoys/debian/cdbs/kde.mk +++ b/debian/squeeze/tdetoys/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/squeeze/tdetoys/debian/changelog b/debian/squeeze/tdetoys/debian/changelog index 5406c86c9..232db2401 100644 --- a/debian/squeeze/tdetoys/debian/changelog +++ b/debian/squeeze/tdetoys/debian/changelog @@ -609,7 +609,7 @@ tdetoys (4:2.2.2-3) unstable; urgency=low tdetoys (4:2.2.2-2) unstable; urgency=low - * Moved AmorIface.h to /usr/include/kde (closes: Bug#122447). + * Moved AmorIface.h to /usr/include/tde (closes: Bug#122447). -- Ben Burton Sun, 9 Dec 2001 09:07:02 -0600 diff --git a/debian/squeeze/tdetoys/debian/patches/common/kubuntu_01_kdepot.diff b/debian/squeeze/tdetoys/debian/patches/common/kubuntu_01_kdepot.diff index 0caf5361a..c02687784 100644 --- a/debian/squeeze/tdetoys/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/squeeze/tdetoys/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/opt/trinity/include/kde/kde.pot ++kdepotpath=/opt/trinity/include/tde/kde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/debian/squeeze/tdetoys/debian/rules b/debian/squeeze/tdetoys/debian/rules index 29a5978c3..57c3cf2c9 100755 --- a/debian/squeeze/tdetoys/debian/rules +++ b/debian/squeeze/tdetoys/debian/rules @@ -5,14 +5,14 @@ include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --includedir="/opt/trinity/include/kde" --mandir="/opt/trinity/share/man" --infodir="/opt/trinity/share/info" +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --includedir="/opt/trinity/include/tde" --mandir="/opt/trinity/share/man" --infodir="/opt/trinity/share/info" DEB_DH_STRIP_ARGS := --dbg-package=tdetoys-trinity-dbg diff --git a/debian/squeeze/tdeutils/debian/cdbs/kde.mk b/debian/squeeze/tdeutils/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/squeeze/tdeutils/debian/cdbs/kde.mk +++ b/debian/squeeze/tdeutils/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/squeeze/tdeutils/debian/patches/common/kubuntu_01_kdepot.diff b/debian/squeeze/tdeutils/debian/patches/common/kubuntu_01_kdepot.diff index 0caf5361a..c02687784 100644 --- a/debian/squeeze/tdeutils/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/squeeze/tdeutils/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/opt/trinity/include/kde/kde.pot ++kdepotpath=/opt/trinity/include/tde/kde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/debian/squeeze/tdeutils/debian/rules b/debian/squeeze/tdeutils/debian/rules index f7cd135a4..a83c83fdf 100755 --- a/debian/squeeze/tdeutils/debian/rules +++ b/debian/squeeze/tdeutils/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/debian/squeeze/tdeutils/debian/tdeutils-trinity-dev.install b/debian/squeeze/tdeutils/debian/tdeutils-trinity-dev.install index a3c425a38..ca7081194 100644 --- a/debian/squeeze/tdeutils/debian/tdeutils-trinity-dev.install +++ b/debian/squeeze/tdeutils/debian/tdeutils-trinity-dev.install @@ -1,18 +1,18 @@ -debian/tmp/opt/trinity/include/kde/kmultiformlistbox.h -debian/tmp/opt/trinity/include/kde/kmultiformlistboxentry.h -debian/tmp/opt/trinity/include/kde/kmultiformlistboxfactory.h -debian/tmp/opt/trinity/include/kde/ksim/chart.h -debian/tmp/opt/trinity/include/kde/ksim/common.h -debian/tmp/opt/trinity/include/kde/ksim/ksimconfig.h -debian/tmp/opt/trinity/include/kde/ksim/label.h -debian/tmp/opt/trinity/include/kde/ksim/led.h -debian/tmp/opt/trinity/include/kde/ksim/pluginglobal.h -debian/tmp/opt/trinity/include/kde/ksim/pluginloader.h -debian/tmp/opt/trinity/include/kde/ksim/pluginmodule.h -debian/tmp/opt/trinity/include/kde/ksim/progress.h -debian/tmp/opt/trinity/include/kde/ksim/themeloader.h -debian/tmp/opt/trinity/include/kde/ksim/themetypes.h -debian/tmp/opt/trinity/include/kde/kwidgetstreamer.h +debian/tmp/opt/trinity/include/tde/kmultiformlistbox.h +debian/tmp/opt/trinity/include/tde/kmultiformlistboxentry.h +debian/tmp/opt/trinity/include/tde/kmultiformlistboxfactory.h +debian/tmp/opt/trinity/include/tde/ksim/chart.h +debian/tmp/opt/trinity/include/tde/ksim/common.h +debian/tmp/opt/trinity/include/tde/ksim/ksimconfig.h +debian/tmp/opt/trinity/include/tde/ksim/label.h +debian/tmp/opt/trinity/include/tde/ksim/led.h +debian/tmp/opt/trinity/include/tde/ksim/pluginglobal.h +debian/tmp/opt/trinity/include/tde/ksim/pluginloader.h +debian/tmp/opt/trinity/include/tde/ksim/pluginmodule.h +debian/tmp/opt/trinity/include/tde/ksim/progress.h +debian/tmp/opt/trinity/include/tde/ksim/themeloader.h +debian/tmp/opt/trinity/include/tde/ksim/themetypes.h +debian/tmp/opt/trinity/include/tde/kwidgetstreamer.h debian/tmp/opt/trinity/lib/libkcmlaptop.la debian/tmp/opt/trinity/lib/libkcmlaptop.so debian/tmp/opt/trinity/lib/libtdeinit_ark.la diff --git a/debian/squeeze/tdevelop/debian/cdbs/kde.mk b/debian/squeeze/tdevelop/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/squeeze/tdevelop/debian/cdbs/kde.mk +++ b/debian/squeeze/tdevelop/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/squeeze/tdevelop/debian/patches/common/kubuntu_01_kdepot.diff b/debian/squeeze/tdevelop/debian/patches/common/kubuntu_01_kdepot.diff index 0caf5361a..c02687784 100644 --- a/debian/squeeze/tdevelop/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/squeeze/tdevelop/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/opt/trinity/include/kde/kde.pot ++kdepotpath=/opt/trinity/include/tde/kde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/debian/squeeze/tdevelop/debian/rules b/debian/squeeze/tdevelop/debian/rules index f5bce32b3..21f2c166a 100755 --- a/debian/squeeze/tdevelop/debian/rules +++ b/debian/squeeze/tdevelop/debian/rules @@ -9,7 +9,7 @@ include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/debian/squeeze/tdevelop/debian/tdevelop-trinity-dev.install b/debian/squeeze/tdevelop/debian/tdevelop-trinity-dev.install index 5c24ba5bb..f9f8c82ab 100644 --- a/debian/squeeze/tdevelop/debian/tdevelop-trinity-dev.install +++ b/debian/squeeze/tdevelop/debian/tdevelop-trinity-dev.install @@ -1,3 +1,3 @@ -debian/tmp/opt/trinity/include/kde +debian/tmp/opt/trinity/include/tde debian/tmp/opt/trinity/lib/lib*.so debian/tmp/opt/trinity/lib/lib*.la diff --git a/debian/squeeze/tdewebdev/debian/cdbs/kde.mk b/debian/squeeze/tdewebdev/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/squeeze/tdewebdev/debian/cdbs/kde.mk +++ b/debian/squeeze/tdewebdev/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/squeeze/tdewebdev/debian/kommander-trinity-dev.install b/debian/squeeze/tdewebdev/debian/kommander-trinity-dev.install index 54d904432..8d8db707b 100644 --- a/debian/squeeze/tdewebdev/debian/kommander-trinity-dev.install +++ b/debian/squeeze/tdewebdev/debian/kommander-trinity-dev.install @@ -1,7 +1,7 @@ -debian/tmp/opt/trinity/include/kde/kommander* +debian/tmp/opt/trinity/include/tde/kommander* debian/tmp/opt/trinity/lib/libkommanderplugin.la debian/tmp/opt/trinity/lib/libkommanderplugin.so debian/tmp/opt/trinity/lib/libkommanderwidget.la debian/tmp/opt/trinity/lib/libkommanderwidget.so debian/tmp/opt/trinity/lib/libkommanderwidgets.so -debian/tmp/opt/trinity/include/kde/specials.h +debian/tmp/opt/trinity/include/tde/specials.h diff --git a/debian/squeeze/tdewebdev/debian/patches/common/kubuntu_01_kdepot.diff b/debian/squeeze/tdewebdev/debian/patches/common/kubuntu_01_kdepot.diff index 1f825f642..698deb926 100644 --- a/debian/squeeze/tdewebdev/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/squeeze/tdewebdev/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/usr/include/kde/kde.pot ++kdepotpath=/usr/include/tde/kde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/debian/squeeze/tdewebdev/debian/rules b/debian/squeeze/tdewebdev/debian/rules index 2dcf9658d..888f66bcf 100755 --- a/debian/squeeze/tdewebdev/debian/rules +++ b/debian/squeeze/tdewebdev/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/ubuntu/lucid_automake/applications/abakus/debian/rules b/ubuntu/lucid_automake/applications/abakus/debian/rules index b4b19e7d1..c5622a9ec 100755 --- a/ubuntu/lucid_automake/applications/abakus/debian/rules +++ b/ubuntu/lucid_automake/applications/abakus/debian/rules @@ -3,7 +3,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/langcore.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info @@ -19,18 +19,18 @@ debian/abakus.xpm: src/hi64-app-abakus.png common-build-arch:: build-stamp build-stamp: debian/abakus.xpm - env PATH=/opt/kde3/bin:$(PATH) QTDIR=/usr/share/qt3 CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/kde $(SCONS) configure prefix=$(DEB_DESTDIR)/opt/kde3 - env PATH=/opt/kde3/bin:$(PATH) QTDIR=/usr/share/qt3 CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/kde $(SCONS) + env PATH=/opt/kde3/bin:$(PATH) QTDIR=/usr/share/qt3 CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/tde $(SCONS) configure prefix=$(DEB_DESTDIR)/opt/kde3 + env PATH=/opt/kde3/bin:$(PATH) QTDIR=/usr/share/qt3 CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/tde $(SCONS) touch build-stamp common-install-arch:: - env PATH=/opt/kde3/bin:$(PATH) QTDIR=/usr/share/qt3 CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/kde $(SCONS) install + env PATH=/opt/kde3/bin:$(PATH) QTDIR=/usr/share/qt3 CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/tde $(SCONS) install install -D -m 644 debian/abakus.xpm debian/abakus-kde3/opt/kde3/share/pixmaps/abakus.xpm chrpath -d debian/abakus-kde3/opt/kde3/bin/abakus dh_icons -pabakus clean:: - #env PATH=/opt/kde3/bin:$(PATH) QTDIR=/usr/share/qt3 CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/kde $(SCONS) --clean + #env PATH=/opt/kde3/bin:$(PATH) QTDIR=/usr/share/qt3 CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/tde $(SCONS) --clean rm -f debian/abakus.xpm rm -rf cache rm -rf .sconf_temp diff --git a/ubuntu/lucid_automake/applications/adept/debian/cdbs/kde.mk b/ubuntu/lucid_automake/applications/adept/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/lucid_automake/applications/adept/debian/cdbs/kde.mk +++ b/ubuntu/lucid_automake/applications/adept/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/lucid_automake/applications/adept/debian/rules b/ubuntu/lucid_automake/applications/adept/debian/rules index 13770997f..6b550c841 100755 --- a/ubuntu/lucid_automake/applications/adept/debian/rules +++ b/ubuntu/lucid_automake/applications/adept/debian/rules @@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info diff --git a/ubuntu/lucid_automake/applications/amarok/debian/cdbs/kde.mk b/ubuntu/lucid_automake/applications/amarok/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/lucid_automake/applications/amarok/debian/cdbs/kde.mk +++ b/ubuntu/lucid_automake/applications/amarok/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/lucid_automake/applications/amarok/debian/rules b/ubuntu/lucid_automake/applications/amarok/debian/rules index 476020719..25c96653a 100755 --- a/ubuntu/lucid_automake/applications/amarok/debian/rules +++ b/ubuntu/lucid_automake/applications/amarok/debian/rules @@ -5,7 +5,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/patchsys-quilt.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info diff --git a/ubuntu/lucid_automake/applications/basket/debian/rules b/ubuntu/lucid_automake/applications/basket/debian/rules index 24b31b701..95af63da6 100755 --- a/ubuntu/lucid_automake/applications/basket/debian/rules +++ b/ubuntu/lucid_automake/applications/basket/debian/rules @@ -3,7 +3,7 @@ #export DH_VERBOSE=1 -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info diff --git a/ubuntu/lucid_automake/applications/bibletime/debian/cdbs/kde.mk b/ubuntu/lucid_automake/applications/bibletime/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/lucid_automake/applications/bibletime/debian/cdbs/kde.mk +++ b/ubuntu/lucid_automake/applications/bibletime/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/lucid_automake/applications/bibletime/debian/rules b/ubuntu/lucid_automake/applications/bibletime/debian/rules index 2225129be..977f3da4a 100755 --- a/ubuntu/lucid_automake/applications/bibletime/debian/rules +++ b/ubuntu/lucid_automake/applications/bibletime/debian/rules @@ -9,7 +9,7 @@ DEB_DH_INSTALL_SOURCEDIR := debian DEB_BUILDDIR = $(DEB_SRCDIR) -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info diff --git a/ubuntu/lucid_automake/applications/compizconfig-backend-kconfig/debian/cdbs/kde.mk b/ubuntu/lucid_automake/applications/compizconfig-backend-kconfig/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/lucid_automake/applications/compizconfig-backend-kconfig/debian/cdbs/kde.mk +++ b/ubuntu/lucid_automake/applications/compizconfig-backend-kconfig/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/lucid_automake/applications/compizconfig-backend-kconfig/debian/rules b/ubuntu/lucid_automake/applications/compizconfig-backend-kconfig/debian/rules index 0e85996b0..4aacc890d 100755 --- a/ubuntu/lucid_automake/applications/compizconfig-backend-kconfig/debian/rules +++ b/ubuntu/lucid_automake/applications/compizconfig-backend-kconfig/debian/rules @@ -4,14 +4,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/tde post-patches:: debian/stamp-bootstrap diff --git a/ubuntu/lucid_automake/applications/desktop-effects-kde/debian/rules b/ubuntu/lucid_automake/applications/desktop-effects-kde/debian/rules index cc2cc1242..630c17e4d 100755 --- a/ubuntu/lucid_automake/applications/desktop-effects-kde/debian/rules +++ b/ubuntu/lucid_automake/applications/desktop-effects-kde/debian/rules @@ -2,7 +2,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info diff --git a/ubuntu/lucid_automake/applications/digikam/debian/cdbs/kde.mk b/ubuntu/lucid_automake/applications/digikam/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/lucid_automake/applications/digikam/debian/cdbs/kde.mk +++ b/ubuntu/lucid_automake/applications/digikam/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/lucid_automake/applications/digikam/debian/digikam-kde3.install b/ubuntu/lucid_automake/applications/digikam/debian/digikam-kde3.install index 299a95917..f0a354851 100644 --- a/ubuntu/lucid_automake/applications/digikam/debian/digikam-kde3.install +++ b/ubuntu/lucid_automake/applications/digikam/debian/digikam-kde3.install @@ -1,5 +1,5 @@ opt/kde3/bin/digi* -/opt/kde3/include/kde +/opt/kde3/include/tde opt/kde3/lib /opt/kde3/share/apps/digikam /opt/kde3/share/apps/konqueror/servicemenus/digikam*.desktop diff --git a/ubuntu/lucid_automake/applications/digikam/debian/rules b/ubuntu/lucid_automake/applications/digikam/debian/rules index 6d17f8853..4490608ea 100755 --- a/ubuntu/lucid_automake/applications/digikam/debian/rules +++ b/ubuntu/lucid_automake/applications/digikam/debian/rules @@ -6,7 +6,7 @@ include /usr/share/cdbs/1/rules/utils.mk include debian/cdbs/debian-qt-kde.mk -include /usr/share/gnome-pkg-tools/1/rules/sf-get-source.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info diff --git a/ubuntu/lucid_automake/applications/dolphin/debian/cdbs/kde.mk b/ubuntu/lucid_automake/applications/dolphin/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/lucid_automake/applications/dolphin/debian/cdbs/kde.mk +++ b/ubuntu/lucid_automake/applications/dolphin/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/lucid_automake/applications/dolphin/debian/rules b/ubuntu/lucid_automake/applications/dolphin/debian/rules index 7eb2c2c66..ede258ac2 100755 --- a/ubuntu/lucid_automake/applications/dolphin/debian/rules +++ b/ubuntu/lucid_automake/applications/dolphin/debian/rules @@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info diff --git a/ubuntu/lucid_automake/applications/filelight-l10n/debian/cdbs/kde.mk b/ubuntu/lucid_automake/applications/filelight-l10n/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/lucid_automake/applications/filelight-l10n/debian/cdbs/kde.mk +++ b/ubuntu/lucid_automake/applications/filelight-l10n/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/lucid_automake/applications/filelight-l10n/debian/rules b/ubuntu/lucid_automake/applications/filelight-l10n/debian/rules index 5fd4108c5..95a17eb35 100755 --- a/ubuntu/lucid_automake/applications/filelight-l10n/debian/rules +++ b/ubuntu/lucid_automake/applications/filelight-l10n/debian/rules @@ -7,7 +7,7 @@ include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info @@ -17,7 +17,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine #DEB_PATCHDIRS := debian/patches/common debian/patches #DEB_INSTALL_DOCS_ALL := -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/usr/kde3/lib --with-extra-includes=/opt/kde3/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/usr/kde3/lib --with-extra-includes=/opt/kde3/include/tde post-patches:: debian/stamp-bootstrap diff --git a/ubuntu/lucid_automake/applications/filelight/debian/cdbs/kde.mk b/ubuntu/lucid_automake/applications/filelight/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/lucid_automake/applications/filelight/debian/cdbs/kde.mk +++ b/ubuntu/lucid_automake/applications/filelight/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/lucid_automake/applications/filelight/debian/rules b/ubuntu/lucid_automake/applications/filelight/debian/rules index 0d73ddc4d..4f3418cfc 100755 --- a/ubuntu/lucid_automake/applications/filelight/debian/rules +++ b/ubuntu/lucid_automake/applications/filelight/debian/rules @@ -8,7 +8,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/patchsys-quilt.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info diff --git a/ubuntu/lucid_automake/applications/gtk-qt-engine/debian/rules b/ubuntu/lucid_automake/applications/gtk-qt-engine/debian/rules index 56eb66129..a8e9a7f73 100755 --- a/ubuntu/lucid_automake/applications/gtk-qt-engine/debian/rules +++ b/ubuntu/lucid_automake/applications/gtk-qt-engine/debian/rules @@ -9,7 +9,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info @@ -19,13 +19,13 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib configure/gtk-qt-engine-kde3:: - env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/kde cmake -D CMAKE_INSTALL_PREFIX=/opt/kde3 . + env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/tde cmake -D CMAKE_INSTALL_PREFIX=/opt/kde3 . build/gtk-qt-engine-kde3:: - env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/kde $(MAKE) + env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/tde $(MAKE) install/gtk-qt-engine-kde3:: - env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/kde $(MAKE) install DESTDIR=$(CURDIR)/debian/gtk-qt-engine-kde3 + env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/tde $(MAKE) install DESTDIR=$(CURDIR)/debian/gtk-qt-engine-kde3 mkdir -p $(CURDIR)/debian/gtk-qt-engine-kde3/opt/kde3/share/kgtk/ cp -Rp $(CURDIR)/debian/.gtkrc-2.0-kde4 $(CURDIR)/debian/gtk-qt-engine-kde3/opt/kde3/share/kgtk/ cp -Rp $(CURDIR)/debian/.gtkrc-2.0-kde-kde4 $(CURDIR)/debian/gtk-qt-engine-kde3/opt/kde3/share/kgtk/ diff --git a/ubuntu/lucid_automake/applications/gwenview/debian/cdbs/kde.mk b/ubuntu/lucid_automake/applications/gwenview/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/lucid_automake/applications/gwenview/debian/cdbs/kde.mk +++ b/ubuntu/lucid_automake/applications/gwenview/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/lucid_automake/applications/gwenview/debian/rules b/ubuntu/lucid_automake/applications/gwenview/debian/rules index 9abe0f2a9..68310c09f 100755 --- a/ubuntu/lucid_automake/applications/gwenview/debian/rules +++ b/ubuntu/lucid_automake/applications/gwenview/debian/rules @@ -7,7 +7,7 @@ include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info diff --git a/ubuntu/lucid_automake/applications/k3b/debian/cdbs/kde.mk b/ubuntu/lucid_automake/applications/k3b/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/lucid_automake/applications/k3b/debian/cdbs/kde.mk +++ b/ubuntu/lucid_automake/applications/k3b/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/lucid_automake/applications/k3b/debian/kde3.mk b/ubuntu/lucid_automake/applications/k3b/debian/kde3.mk index e0bcb2308..0d41a4441 100644 --- a/ubuntu/lucid_automake/applications/k3b/debian/kde3.mk +++ b/ubuntu/lucid_automake/applications/k3b/debian/kde3.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama --without-arts $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "/opt/kde3/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "/opt/kde3/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/lucid_automake/applications/k3b/debian/rules b/ubuntu/lucid_automake/applications/k3b/debian/rules index 4a0edb003..fe5e3c0ab 100755 --- a/ubuntu/lucid_automake/applications/k3b/debian/rules +++ b/ubuntu/lucid_automake/applications/k3b/debian/rules @@ -4,14 +4,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include debian/cdbs/kde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde5 +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde5 DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) -DEB_CONFIGURE_EXTRA_FLAGS = --with-k3bsetup=no --with-extra-libs=/opt/kde3/lib --includedir="/opt/kde3/include/kde" +DEB_CONFIGURE_EXTRA_FLAGS = --with-k3bsetup=no --with-extra-libs=/opt/kde3/lib --includedir="/opt/kde3/include/tde" DEB_INSTALL_MANPAGES_k3b = debian/k3b.1 diff --git a/ubuntu/lucid_automake/applications/k9copy/debian/cdbs/kde.mk b/ubuntu/lucid_automake/applications/k9copy/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/lucid_automake/applications/k9copy/debian/cdbs/kde.mk +++ b/ubuntu/lucid_automake/applications/k9copy/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/lucid_automake/applications/k9copy/debian/rules b/ubuntu/lucid_automake/applications/k9copy/debian/rules index 4fbc09fd4..57fc8996d 100755 --- a/ubuntu/lucid_automake/applications/k9copy/debian/rules +++ b/ubuntu/lucid_automake/applications/k9copy/debian/rules @@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/class/kde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info @@ -13,7 +13,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_INSTALL_MANPAGES_k9copy = k9copy-kde3.1 -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --includedir="/opt/kde3/include/kde" --mandir="/opt/kde3/share/man" --infodir="/opt/kde3/share/info" +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --includedir="/opt/kde3/include/tde" --mandir="/opt/kde3/share/man" --infodir="/opt/kde3/share/info" post-patches:: debian/stamp-bootstrap diff --git a/ubuntu/lucid_automake/applications/kaffeine-mozilla/debian/rules b/ubuntu/lucid_automake/applications/kaffeine-mozilla/debian/rules index 3969b2d3a..5531403d1 100755 --- a/ubuntu/lucid_automake/applications/kaffeine-mozilla/debian/rules +++ b/ubuntu/lucid_automake/applications/kaffeine-mozilla/debian/rules @@ -14,7 +14,7 @@ export DH_OPTIONS DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info diff --git a/ubuntu/lucid_automake/applications/kaffeine/debian/cdbs/kde.mk b/ubuntu/lucid_automake/applications/kaffeine/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/lucid_automake/applications/kaffeine/debian/cdbs/kde.mk +++ b/ubuntu/lucid_automake/applications/kaffeine/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/lucid_automake/applications/kaffeine/debian/kaffeine-kde3.install b/ubuntu/lucid_automake/applications/kaffeine/debian/kaffeine-kde3.install index c15880d49..a9bc9a8a7 100644 --- a/ubuntu/lucid_automake/applications/kaffeine/debian/kaffeine-kde3.install +++ b/ubuntu/lucid_automake/applications/kaffeine/debian/kaffeine-kde3.install @@ -13,7 +13,7 @@ debian/tmp/opt/kde3/share/doc/ debian/tmp/opt/kde3/share/icons/ debian/tmp/opt/kde3/share/mimelnk/application/x-kaffeine.desktop debian/tmp/opt/kde3/share/locale/ -debian/tmp/opt/kde3/include/kde/kaffeine/*h +debian/tmp/opt/kde3/include/tde/kaffeine/*h debian/tmp/opt/kde3/share/services/kaffeineoggvorbis.desktop debian/tmp/opt/kde3/lib/kde3/libkaffeineoggvorbis.la debian/tmp/opt/kde3/lib/kde3/libkaffeineoggvorbis.so diff --git a/ubuntu/lucid_automake/applications/kaffeine/debian/rules b/ubuntu/lucid_automake/applications/kaffeine/debian/rules index 8200dd0cd..df6abf852 100755 --- a/ubuntu/lucid_automake/applications/kaffeine/debian/rules +++ b/ubuntu/lucid_automake/applications/kaffeine/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info diff --git a/ubuntu/lucid_automake/applications/katapult/debian/cdbs/kde.mk b/ubuntu/lucid_automake/applications/katapult/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/lucid_automake/applications/katapult/debian/cdbs/kde.mk +++ b/ubuntu/lucid_automake/applications/katapult/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/lucid_automake/applications/katapult/debian/rules b/ubuntu/lucid_automake/applications/katapult/debian/rules index 4b40fd262..0d819995a 100755 --- a/ubuntu/lucid_automake/applications/katapult/debian/rules +++ b/ubuntu/lucid_automake/applications/katapult/debian/rules @@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info diff --git a/ubuntu/lucid_automake/applications/kbarcode/debian/cdbs/kde.mk b/ubuntu/lucid_automake/applications/kbarcode/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/lucid_automake/applications/kbarcode/debian/cdbs/kde.mk +++ b/ubuntu/lucid_automake/applications/kbarcode/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/lucid_automake/applications/kbarcode/debian/rules b/ubuntu/lucid_automake/applications/kbarcode/debian/rules index 75ea19eb3..fecd78311 100755 --- a/ubuntu/lucid_automake/applications/kbarcode/debian/rules +++ b/ubuntu/lucid_automake/applications/kbarcode/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/patchsys-quilt.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info diff --git a/ubuntu/lucid_automake/applications/kbfx/debian/rules b/ubuntu/lucid_automake/applications/kbfx/debian/rules index 4bdcaeca3..f7455fa2d 100755 --- a/ubuntu/lucid_automake/applications/kbfx/debian/rules +++ b/ubuntu/lucid_automake/applications/kbfx/debian/rules @@ -7,21 +7,21 @@ URL = http://www.$(DEB_SOURCE_PACKAGE).org/release/0.4.9/testing/$(UPFILENAME) DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib #CMAKE_LIBRARY_PATH := /opt/kde3/lib -#CMAKE_INCLUDE_PATH := /opt/kde3/include/kde +#CMAKE_INCLUDE_PATH := /opt/kde3/include/tde include debian/cmake.mk include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) -DEB_CMAKE_EXTRA_FLAGS = -DLIB_SUFFIX="" -DCMAKE_LIBRARY_PATH="/opt/kde3/lib" -DCMAKE_INCLUDE_PATH="/opt/kde3/include/kde" -DCMAKE_INSTALL_PREFIX="/opt/kde3/" +DEB_CMAKE_EXTRA_FLAGS = -DLIB_SUFFIX="" -DCMAKE_LIBRARY_PATH="/opt/kde3/lib" -DCMAKE_INCLUDE_PATH="/opt/kde3/include/tde" -DCMAKE_INSTALL_PREFIX="/opt/kde3/" get-orig-source: @@dh_testdir diff --git a/ubuntu/lucid_automake/applications/kbookreader/debian/cdbs/kde.mk b/ubuntu/lucid_automake/applications/kbookreader/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/lucid_automake/applications/kbookreader/debian/cdbs/kde.mk +++ b/ubuntu/lucid_automake/applications/kbookreader/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/lucid_automake/applications/kbookreader/debian/rules b/ubuntu/lucid_automake/applications/kbookreader/debian/rules index 4ceef7d99..b3b57fdb9 100755 --- a/ubuntu/lucid_automake/applications/kbookreader/debian/rules +++ b/ubuntu/lucid_automake/applications/kbookreader/debian/rules @@ -4,14 +4,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/class/kde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --includedir="/opt/trinity/include/kde" --mandir="/opt/trinity/share/man" --infodir="/opt/trinity/share/info" +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --includedir="/opt/trinity/include/tde" --mandir="/opt/trinity/share/man" --infodir="/opt/trinity/share/info" post-patches:: debian/stamp-bootstrap diff --git a/ubuntu/lucid_automake/applications/kchmviewer/debian/debiandirs b/ubuntu/lucid_automake/applications/kchmviewer/debian/debiandirs index a0aa0550c..1efd0b6bb 100644 --- a/ubuntu/lucid_automake/applications/kchmviewer/debian/debiandirs +++ b/ubuntu/lucid_automake/applications/kchmviewer/debian/debiandirs @@ -1,6 +1,6 @@ export kde_prefix=/usr export sysconfdir=/etc -export kde_includedir=/usr/include/kde +export kde_includedir=/usr/include/tde export infodir=/usr/share/info export mandir=/usr/share/man export qtdir=/usr/share/qt3 diff --git a/ubuntu/lucid_automake/applications/kchmviewer/debian/rules b/ubuntu/lucid_automake/applications/kchmviewer/debian/rules index 4adaf88da..b28da52db 100755 --- a/ubuntu/lucid_automake/applications/kchmviewer/debian/rules +++ b/ubuntu/lucid_automake/applications/kchmviewer/debian/rules @@ -9,7 +9,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info @@ -27,7 +27,7 @@ CFLAGS = -Wall -g CONFIGURE_OPTIONS_KDE = \ --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \ --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib \ - --includedir=/opt/kde3/include/kde --mandir=/opt/kde3/share/man \ + --includedir=/opt/kde3/include/tde --mandir=/opt/kde3/share/man \ --with-qt-dir=$(qtdir) \ --sysconfdir=$(sysconfdir) \ --infodir=/opt/kde3/share/info \ diff --git a/ubuntu/lucid_automake/applications/kcpuload/debian/cdbs/kde.mk b/ubuntu/lucid_automake/applications/kcpuload/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/lucid_automake/applications/kcpuload/debian/cdbs/kde.mk +++ b/ubuntu/lucid_automake/applications/kcpuload/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/lucid_automake/applications/kcpuload/debian/rules b/ubuntu/lucid_automake/applications/kcpuload/debian/rules index abd1a1b0c..ecfe01330 100755 --- a/ubuntu/lucid_automake/applications/kcpuload/debian/rules +++ b/ubuntu/lucid_automake/applications/kcpuload/debian/rules @@ -5,7 +5,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info @@ -79,7 +79,7 @@ configure-stamp: # run configure with build tree $(objdir) cd $(objdir) && \ - ../configure --disable-debug --enable-final --libexecdir=/opt/kde3/bin --sysconfdir=/etc --libdir=/opt/kde3/lib --includedir=/opt/include/kde --with-qt-includes=/usr/include/qt3 --mandir=/opt/kde3/share/man --infodir=/opt/kde3/share/info --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib + ../configure --disable-debug --enable-final --libexecdir=/opt/kde3/bin --sysconfdir=/etc --libdir=/opt/kde3/lib --includedir=/opt/include/tde --with-qt-includes=/usr/include/qt3 --mandir=/opt/kde3/share/man --infodir=/opt/kde3/share/info --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib touch configure-stamp diff --git a/ubuntu/lucid_automake/applications/kde-guidance/debian/rules b/ubuntu/lucid_automake/applications/kde-guidance/debian/rules index 6de018978..aa04e3439 100755 --- a/ubuntu/lucid_automake/applications/kde-guidance/debian/rules +++ b/ubuntu/lucid_automake/applications/kde-guidance/debian/rules @@ -12,7 +12,7 @@ DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp DEB_UPDATE_RCD_PARAMS := multiuser DEB_INSTALL_MANPAGES_kde-guidance-kde3 := debian/displayconfig-kde3.1 debian/mountconfig-kde3.1 debian/serviceconfig-kde3.1 debian/userconfig-kde3.1 PYSUPPORT_PATH = $(DEB_DESTDIR)/opt/kde3/share/python-support -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/tde LDFLAGS_APPEND := -L/opt/kde3/lib install/kde-guidance-kde3:: diff --git a/ubuntu/lucid_automake/applications/kde-style-lipstik/debian/rules b/ubuntu/lucid_automake/applications/kde-style-lipstik/debian/rules index dd1616d51..7fca75e60 100755 --- a/ubuntu/lucid_automake/applications/kde-style-lipstik/debian/rules +++ b/ubuntu/lucid_automake/applications/kde-style-lipstik/debian/rules @@ -9,7 +9,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info @@ -37,7 +37,7 @@ config.status: patch configure CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \ --prefix=/opt/kde3 --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info \ --disable-debug --enable-final \ - --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/kde + --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/tde # --with-qt-includes=/usr/include/qt3 --with-qt-libraries=/usr/lib/qt3/ build: build-stamp diff --git a/ubuntu/lucid_automake/applications/kde-style-qtcurve/debian/rules b/ubuntu/lucid_automake/applications/kde-style-qtcurve/debian/rules index 66599ff61..4e41fdf0f 100755 --- a/ubuntu/lucid_automake/applications/kde-style-qtcurve/debian/rules +++ b/ubuntu/lucid_automake/applications/kde-style-qtcurve/debian/rules @@ -9,7 +9,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info @@ -41,7 +41,7 @@ ifneq "$(wildcard /usr/share/misc/config.guess)" "" cp -f /usr/share/misc/config.guess config.guess endif mkdir build - cd build; env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/kde cmake .. + cd build; env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/tde cmake .. touch config.status build: build-stamp @@ -50,7 +50,7 @@ build-stamp: config.status dh_testdir # Add here commands to compile the package. - cd build; env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/kde $(MAKE) + cd build; env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/tde $(MAKE) #docbook-to-man debian/kde-style-qtcurve.sgml > kde-style-qtcurve.1 touch $@ @@ -74,7 +74,7 @@ install: build dh_installdirs # Add here commands to install the package into debian/kde-style-qtcurve-kde3. - cd build; env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/kde $(MAKE) DESTDIR=$(CURDIR)/debian/kde-style-qtcurve-kde3 install + cd build; env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/tde $(MAKE) DESTDIR=$(CURDIR)/debian/kde-style-qtcurve-kde3 install # Build architecture-independent files here. diff --git a/ubuntu/lucid_automake/applications/kde-systemsettings/debian/cdbs/kde.mk b/ubuntu/lucid_automake/applications/kde-systemsettings/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/lucid_automake/applications/kde-systemsettings/debian/cdbs/kde.mk +++ b/ubuntu/lucid_automake/applications/kde-systemsettings/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/lucid_automake/applications/kde-systemsettings/debian/rules b/ubuntu/lucid_automake/applications/kde-systemsettings/debian/rules index edce0b70e..edf857fe8 100755 --- a/ubuntu/lucid_automake/applications/kde-systemsettings/debian/rules +++ b/ubuntu/lucid_automake/applications/kde-systemsettings/debian/rules @@ -6,7 +6,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include debian/cdbs/kde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info diff --git a/ubuntu/lucid_automake/applications/kdesudo/debian/cdbs/kde.mk b/ubuntu/lucid_automake/applications/kdesudo/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/lucid_automake/applications/kdesudo/debian/cdbs/kde.mk +++ b/ubuntu/lucid_automake/applications/kdesudo/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/lucid_automake/applications/kdesudo/debian/rules b/ubuntu/lucid_automake/applications/kdesudo/debian/rules index 7a35701f7..d103095b0 100755 --- a/ubuntu/lucid_automake/applications/kdesudo/debian/rules +++ b/ubuntu/lucid_automake/applications/kdesudo/debian/rules @@ -4,14 +4,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include debian/cdbs/kde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/tde DEB_INSTALL_MANPAGES_kdesudo-kde3 = kdesudo-kde3.1 diff --git a/ubuntu/lucid_automake/applications/kdesvn/debian/libsvnqt-kde3-dev.install b/ubuntu/lucid_automake/applications/kdesvn/debian/libsvnqt-kde3-dev.install index a0adce2e6..15c878d0f 100644 --- a/ubuntu/lucid_automake/applications/kdesvn/debian/libsvnqt-kde3-dev.install +++ b/ubuntu/lucid_automake/applications/kdesvn/debian/libsvnqt-kde3-dev.install @@ -1,2 +1,2 @@ debian/tmp/opt/kde3/lib*/*.so -debian/tmp/opt/kde3/include/kde/svnqt/ +debian/tmp/opt/kde3/include/tde/svnqt/ diff --git a/ubuntu/lucid_automake/applications/kdesvn/debian/rules b/ubuntu/lucid_automake/applications/kdesvn/debian/rules index f7ce7d21e..3ca36df63 100755 --- a/ubuntu/lucid_automake/applications/kdesvn/debian/rules +++ b/ubuntu/lucid_automake/applications/kdesvn/debian/rules @@ -7,14 +7,14 @@ include /usr/share/cdbs/1/class/cmake.mk include /usr/share/cdbs/1/rules/utils.mk include /usr/share/cdbs/1/rules/patchsys-quilt.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) -DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_LIBRARY_PATH="/opt/kde3/lib" -DCMAKE_INCLUDE_PATH="/opt/kde3/include/kde" -DCMAKE_CXX_FLAGS="-I/opt/kde3/include/kde" -DCMAKE_LDFLAGS="-L/opt/kde3/lib" +DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_LIBRARY_PATH="/opt/kde3/lib" -DCMAKE_INCLUDE_PATH="/opt/kde3/include/tde" -DCMAKE_CXX_FLAGS="-I/opt/kde3/include/tde" -DCMAKE_LDFLAGS="-L/opt/kde3/lib" DEB_COMPRESS_EXCLUDE := .dcl .docbook -license .tag .sty .el @@ -25,7 +25,7 @@ DEB_SHLIBDEPS_INCLUDE := debian/tmp/opt/kde3/lib common-install-impl:: mkdir -p debian/tmp/opt/kde3 - mkdir -p debian/tmp/opt/kde3/include/kde + mkdir -p debian/tmp/opt/kde3/include/tde mkdir -p debian/tmp/usr/lib mkdir -p debian/tmp/opt/kde3/lib mkdir -p debian/tmp/usr/lib/kde3 @@ -40,7 +40,7 @@ common-install-impl:: cp -Rp debian/tmp/usr/lib/* debian/tmp/opt/kde3/lib/ cp -Rp debian/tmp/usr/lib64/* debian/tmp/opt/kde3/lib/ cp -Rp debian/tmp/usr/share debian/tmp/opt/kde3/ - cp -Rp debian/tmp/usr/include/* debian/tmp/opt/kde3/include/kde/ + cp -Rp debian/tmp/usr/include/* debian/tmp/opt/kde3/include/tde/ rm -rf debian/tmp/usr/bin rm -rf debian/tmp/usr/lib/kde3 rm -rf debian/tmp/usr/lib64/kde3 diff --git a/ubuntu/lucid_automake/applications/kdiff3/debian/cdbs/kde.mk b/ubuntu/lucid_automake/applications/kdiff3/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/lucid_automake/applications/kdiff3/debian/cdbs/kde.mk +++ b/ubuntu/lucid_automake/applications/kdiff3/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/lucid_automake/applications/kdiff3/debian/rules b/ubuntu/lucid_automake/applications/kdiff3/debian/rules index 47c04654d..9f888108b 100755 --- a/ubuntu/lucid_automake/applications/kdiff3/debian/rules +++ b/ubuntu/lucid_automake/applications/kdiff3/debian/rules @@ -4,7 +4,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info @@ -37,7 +37,7 @@ config.status: cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in make -f admin/Makefile.common cvs - CFLAGS="$(CFLAGS)" ./configure --disable-rpath --prefix=/opt/kde3 --with-qt-includes=/usr/include/qt3 --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --mandir=/opt/kde3/share/man --infodir=/opt/kde3/share/info --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/kde + CFLAGS="$(CFLAGS)" ./configure --disable-rpath --prefix=/opt/kde3 --with-qt-includes=/usr/include/qt3 --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --mandir=/opt/kde3/share/man --infodir=/opt/kde3/share/info --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/tde build: build-stamp diff --git a/ubuntu/lucid_automake/applications/kdirstat/debian/cdbs/kde.mk b/ubuntu/lucid_automake/applications/kdirstat/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/lucid_automake/applications/kdirstat/debian/cdbs/kde.mk +++ b/ubuntu/lucid_automake/applications/kdirstat/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/lucid_automake/applications/kdirstat/debian/rules b/ubuntu/lucid_automake/applications/kdirstat/debian/rules index 0fc2239be..94480096a 100755 --- a/ubuntu/lucid_automake/applications/kdirstat/debian/rules +++ b/ubuntu/lucid_automake/applications/kdirstat/debian/rules @@ -4,14 +4,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/tde LDFLAGS += -Wl,--as-needed diff --git a/ubuntu/lucid_automake/applications/kdpkg/debian/rules b/ubuntu/lucid_automake/applications/kdpkg/debian/rules index a28235e24..523c190f9 100755 --- a/ubuntu/lucid_automake/applications/kdpkg/debian/rules +++ b/ubuntu/lucid_automake/applications/kdpkg/debian/rules @@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/autotools.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info diff --git a/ubuntu/lucid_automake/applications/keep/debian/cdbs/kde.mk b/ubuntu/lucid_automake/applications/keep/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/lucid_automake/applications/keep/debian/cdbs/kde.mk +++ b/ubuntu/lucid_automake/applications/keep/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/lucid_automake/applications/keep/debian/patches/kubuntu_01_kdepot.diff b/ubuntu/lucid_automake/applications/keep/debian/patches/kubuntu_01_kdepot.diff index 55238c41a..782118729 100644 --- a/ubuntu/lucid_automake/applications/keep/debian/patches/kubuntu_01_kdepot.diff +++ b/ubuntu/lucid_automake/applications/keep/debian/patches/kubuntu_01_kdepot.diff @@ -5,7 +5,7 @@ diff -Nur keep-0.4.0/admin/cvs.sh keep-0.4.0.new/admin/cvs.sh if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/usr/include/kde/kde.pot ++kdepotpath=/usr/include/tde/kde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -16,5 +16,5 @@ diff -Nur keep-0.4.0/admin/cvs.sh keep-0.4.0.new/admin/cvs.sh - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot if ! test -f $kdepotpath; then - kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot + kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot fi diff --git a/ubuntu/lucid_automake/applications/keep/debian/rules b/ubuntu/lucid_automake/applications/keep/debian/rules index 56e2ebe81..97c2a8db1 100755 --- a/ubuntu/lucid_automake/applications/keep/debian/rules +++ b/ubuntu/lucid_automake/applications/keep/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info @@ -14,7 +14,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_INSTALL_MANPAGES_keep := keep.1 -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/tde post-patches:: debian/stamp-bootstrap diff --git a/ubuntu/lucid_automake/applications/kerry/debian/cdbs/kde.mk b/ubuntu/lucid_automake/applications/kerry/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/lucid_automake/applications/kerry/debian/cdbs/kde.mk +++ b/ubuntu/lucid_automake/applications/kerry/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/lucid_automake/applications/kerry/debian/rules b/ubuntu/lucid_automake/applications/kerry/debian/rules index da887ee76..2ea562d2d 100755 --- a/ubuntu/lucid_automake/applications/kerry/debian/rules +++ b/ubuntu/lucid_automake/applications/kerry/debian/rules @@ -5,7 +5,7 @@ include /usr/share/cdbs/1/rules/simple-patchsys.mk # include /usr/share/cdbs/1/class/kde.mk include debian/cdbs/debian-qt-kde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info diff --git a/ubuntu/lucid_automake/applications/kgtk-qt3/debian/cdbs/kde.mk b/ubuntu/lucid_automake/applications/kgtk-qt3/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/lucid_automake/applications/kgtk-qt3/debian/cdbs/kde.mk +++ b/ubuntu/lucid_automake/applications/kgtk-qt3/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/lucid_automake/applications/kgtk-qt3/debian/rules b/ubuntu/lucid_automake/applications/kgtk-qt3/debian/rules index 8abf4e1bb..06af1d1f6 100755 --- a/ubuntu/lucid_automake/applications/kgtk-qt3/debian/rules +++ b/ubuntu/lucid_automake/applications/kgtk-qt3/debian/rules @@ -9,7 +9,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info @@ -20,12 +20,12 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib configure/kgtk-qt3-kde3:: - env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/kde cmake -D CMAKE_INSTALL_PREFIX=/opt/kde3 . + env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/tde cmake -D CMAKE_INSTALL_PREFIX=/opt/kde3 . build/kgtk-qt3-kde3:: - env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/kde $(MAKE) + env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/tde $(MAKE) install/kgtk-qt3-kde3:: - env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/kde $(MAKE) install DESTDIR=$(CURDIR)/debian/kgtk-qt3-kde3 + env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/tde $(MAKE) install DESTDIR=$(CURDIR)/debian/kgtk-qt3-kde3 mkdir -p $(CURDIR)/debian/kgtk-qt3-kde3/opt/kde3/share/kgtk/ cp -Rp $(CURDIR)/debian/preload $(CURDIR)/debian/kgtk-qt3-kde3/opt/kde3/share/kgtk/ diff --git a/ubuntu/lucid_automake/applications/kile/debian/cdbs/kde.mk b/ubuntu/lucid_automake/applications/kile/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/lucid_automake/applications/kile/debian/cdbs/kde.mk +++ b/ubuntu/lucid_automake/applications/kile/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/lucid_automake/applications/kile/debian/rules b/ubuntu/lucid_automake/applications/kile/debian/rules index 6ec0fe0ce..812129d56 100755 --- a/ubuntu/lucid_automake/applications/kile/debian/rules +++ b/ubuntu/lucid_automake/applications/kile/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/patchsys-quilt.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info @@ -15,7 +15,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--as-needed" DEB_DH_INSTALL_ARGS := --sourcedir=debian/tmp DEB_INSTALL_MANPAGES_kile := debian/kile.1 -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/tde post-patches:: debian/stamp-bootstrap diff --git a/ubuntu/lucid_automake/applications/kima/debian/rules b/ubuntu/lucid_automake/applications/kima/debian/rules index 28d982425..8ca5c7a4b 100755 --- a/ubuntu/lucid_automake/applications/kima/debian/rules +++ b/ubuntu/lucid_automake/applications/kima/debian/rules @@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/autotools.mk DEB_CONFIGURE_EXTRA_FLAGS += --disable-rpath -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info diff --git a/ubuntu/lucid_automake/applications/kio-apt/debian/cdbs/kde.mk b/ubuntu/lucid_automake/applications/kio-apt/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/lucid_automake/applications/kio-apt/debian/cdbs/kde.mk +++ b/ubuntu/lucid_automake/applications/kio-apt/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/lucid_automake/applications/kio-apt/debian/rules b/ubuntu/lucid_automake/applications/kio-apt/debian/rules index c0da898ed..4519af06b 100755 --- a/ubuntu/lucid_automake/applications/kio-apt/debian/rules +++ b/ubuntu/lucid_automake/applications/kio-apt/debian/rules @@ -5,14 +5,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include debian/cdbs/kde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/tde post-patches:: debian/stamp-bootstrap diff --git a/ubuntu/lucid_automake/applications/kio-locate/debian/rules b/ubuntu/lucid_automake/applications/kio-locate/debian/rules index b0cae30c5..feca774bb 100755 --- a/ubuntu/lucid_automake/applications/kio-locate/debian/rules +++ b/ubuntu/lucid_automake/applications/kio-locate/debian/rules @@ -2,7 +2,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info diff --git a/ubuntu/lucid_automake/applications/kio-umountwrapper/debian/cdbs/kde.mk b/ubuntu/lucid_automake/applications/kio-umountwrapper/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/lucid_automake/applications/kio-umountwrapper/debian/cdbs/kde.mk +++ b/ubuntu/lucid_automake/applications/kio-umountwrapper/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/lucid_automake/applications/kio-umountwrapper/debian/rules b/ubuntu/lucid_automake/applications/kio-umountwrapper/debian/rules index c29c730f8..b1fb26a87 100755 --- a/ubuntu/lucid_automake/applications/kio-umountwrapper/debian/rules +++ b/ubuntu/lucid_automake/applications/kio-umountwrapper/debian/rules @@ -4,14 +4,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include debian/cdbs/kde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/tde post-patches:: debian/stamp-bootstrap diff --git a/ubuntu/lucid_automake/applications/kmplayer/debian/cdbs/kde.mk b/ubuntu/lucid_automake/applications/kmplayer/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/lucid_automake/applications/kmplayer/debian/cdbs/kde.mk +++ b/ubuntu/lucid_automake/applications/kmplayer/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/lucid_automake/applications/kmplayer/debian/rules b/ubuntu/lucid_automake/applications/kmplayer/debian/rules index 7f45f88c3..627d1d6b3 100755 --- a/ubuntu/lucid_automake/applications/kmplayer/debian/rules +++ b/ubuntu/lucid_automake/applications/kmplayer/debian/rules @@ -5,7 +5,7 @@ include /usr/share/cdbs/1/rules/simple-patchsys.mk include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info @@ -18,7 +18,7 @@ ifeq ($(GCC_VERSION),4.3) CXX = g++ -fpermissive endif -DEB_CONFIGURE_EXTRA_FLAGS := --enable-maintainer-mode --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --enable-maintainer-mode --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/tde DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp DEB_INSTALL_MANPAGES_kmplayer = kmplayer.1 diff --git a/ubuntu/lucid_automake/applications/kmyfirewall/debian/debiandirs b/ubuntu/lucid_automake/applications/kmyfirewall/debian/debiandirs index 0fb38ea11..3f7ee894a 100644 --- a/ubuntu/lucid_automake/applications/kmyfirewall/debian/debiandirs +++ b/ubuntu/lucid_automake/applications/kmyfirewall/debian/debiandirs @@ -1,6 +1,6 @@ export kde_prefix=/usr export sysconfdir=/etc -export kde_includedir=/usr/include/kde +export kde_includedir=/usr/include/tde export infodir=/usr/share/info export mandir=/usr/share/man export qtdir=/usr/share/qt3 diff --git a/ubuntu/lucid_automake/applications/kmyfirewall/debian/rules b/ubuntu/lucid_automake/applications/kmyfirewall/debian/rules index e0333883c..61ad9e5cb 100755 --- a/ubuntu/lucid_automake/applications/kmyfirewall/debian/rules +++ b/ubuntu/lucid_automake/applications/kmyfirewall/debian/rules @@ -6,7 +6,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info @@ -56,7 +56,7 @@ endif ifneq "$(wildcard /usr/share/misc/config.guess)" "" cp -f /usr/share/misc/config.guess config.guess endif - CFLAGS="$(CFLAGS)" PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/kde ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) $(configkde) --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/kde + CFLAGS="$(CFLAGS)" PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/tde ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) $(configkde) --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/tde build: build-stamp @@ -65,7 +65,7 @@ build-stamp: config.status dh_testdir # Add here commands to compile the package. - env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/kde $(MAKE) + env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/tde $(MAKE) touch build-stamp @@ -94,7 +94,7 @@ install: build dh_clean -k # Add here commands to install the package into debian/kmyfirewall. - env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/kde $(MAKE) install DESTDIR=$(CURDIR)/debian/kmyfirewall-kde3 + env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/tde $(MAKE) install DESTDIR=$(CURDIR)/debian/kmyfirewall-kde3 rm -f debian/kmyfirewall-kde3/opt/kde3/lib/*.so chrpath -d debian/kmyfirewall-kde3/opt/kde3/bin/kmyfirewall debian/kmyfirewall-kde3/opt/kde3/lib/*.so.* debian/kmyfirewall-kde3/opt/kde3/lib/kde3/*.so diff --git a/ubuntu/lucid_automake/applications/kmymoney/debian/cdbs/kde.mk b/ubuntu/lucid_automake/applications/kmymoney/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/lucid_automake/applications/kmymoney/debian/cdbs/kde.mk +++ b/ubuntu/lucid_automake/applications/kmymoney/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/lucid_automake/applications/kmymoney/debian/kmymoney2-trinity-dev.install b/ubuntu/lucid_automake/applications/kmymoney/debian/kmymoney2-trinity-dev.install index 4c3b73990..f8c5dc4e3 100644 --- a/ubuntu/lucid_automake/applications/kmymoney/debian/kmymoney2-trinity-dev.install +++ b/ubuntu/lucid_automake/applications/kmymoney/debian/kmymoney2-trinity-dev.install @@ -1,3 +1,3 @@ -opt/trinity/include/kde/kmymoney/* +opt/trinity/include/tde/kmymoney/* opt/trinity/lib/lib*.la opt/trinity/lib/lib*.so diff --git a/ubuntu/lucid_automake/applications/kmymoney/debian/rules b/ubuntu/lucid_automake/applications/kmymoney/debian/rules index efb7a96ea..1bb4dc1bf 100755 --- a/ubuntu/lucid_automake/applications/kmymoney/debian/rules +++ b/ubuntu/lucid_automake/applications/kmymoney/debian/rules @@ -4,14 +4,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde --disable-sqlite3 +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde --disable-sqlite3 LDFLAGS += -Wl,--as-needed diff --git a/ubuntu/lucid_automake/applications/knemo/debian/cdbs/kde.mk b/ubuntu/lucid_automake/applications/knemo/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/lucid_automake/applications/knemo/debian/cdbs/kde.mk +++ b/ubuntu/lucid_automake/applications/knemo/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/lucid_automake/applications/knemo/debian/rules b/ubuntu/lucid_automake/applications/knemo/debian/rules index ebd1b1375..ad411b75e 100755 --- a/ubuntu/lucid_automake/applications/knemo/debian/rules +++ b/ubuntu/lucid_automake/applications/knemo/debian/rules @@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include debian/cdbs/kde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info @@ -13,7 +13,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_INSTALL_DOCS_knemo = -XNEWS -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/tde post-patches:: debian/stamp-bootstrap diff --git a/ubuntu/lucid_automake/applications/knetload/debian/rules b/ubuntu/lucid_automake/applications/knetload/debian/rules index 717d830b4..3f76befc1 100755 --- a/ubuntu/lucid_automake/applications/knetload/debian/rules +++ b/ubuntu/lucid_automake/applications/knetload/debian/rules @@ -2,7 +2,7 @@ # Sample debian/rules that uses debhelper. # GNU copyright 1997 to 1999 by Joey Hess. -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info @@ -74,7 +74,7 @@ configure-stamp: # run configure with build tree $(objdir) cd $(objdir) && \ - ../configure $(configkde) --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/kde + ../configure $(configkde) --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/tde touch configure-stamp diff --git a/ubuntu/lucid_automake/applications/knetstats/debian/cdbs/kde.mk b/ubuntu/lucid_automake/applications/knetstats/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/lucid_automake/applications/knetstats/debian/cdbs/kde.mk +++ b/ubuntu/lucid_automake/applications/knetstats/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/lucid_automake/applications/knetstats/debian/rules b/ubuntu/lucid_automake/applications/knetstats/debian/rules index c2b268692..ebd2e2c1e 100755 --- a/ubuntu/lucid_automake/applications/knetstats/debian/rules +++ b/ubuntu/lucid_automake/applications/knetstats/debian/rules @@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include debian/cdbs/kde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info diff --git a/ubuntu/lucid_automake/applications/knetworkmanager/debian/cdbs/kde.mk b/ubuntu/lucid_automake/applications/knetworkmanager/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/lucid_automake/applications/knetworkmanager/debian/cdbs/kde.mk +++ b/ubuntu/lucid_automake/applications/knetworkmanager/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/lucid_automake/applications/knetworkmanager/debian/rules b/ubuntu/lucid_automake/applications/knetworkmanager/debian/rules index 802c24008..95f9fb7ba 100755 --- a/ubuntu/lucid_automake/applications/knetworkmanager/debian/rules +++ b/ubuntu/lucid_automake/applications/knetworkmanager/debian/rules @@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/patchsys-quilt.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info diff --git a/ubuntu/lucid_automake/applications/knights/debian/debiandirs b/ubuntu/lucid_automake/applications/knights/debian/debiandirs index 62b4b368a..3310385b4 100644 --- a/ubuntu/lucid_automake/applications/knights/debian/debiandirs +++ b/ubuntu/lucid_automake/applications/knights/debian/debiandirs @@ -1,6 +1,6 @@ export kde_prefix=/usr export sysconfdir=/etc -export kde_includedir=/usr/include/kde +export kde_includedir=/usr/include/tde export infodir=/usr/share/info export mandir=/usr/share/man export qtdir=/usr/share/qt3 diff --git a/ubuntu/lucid_automake/applications/knights/debian/rules b/ubuntu/lucid_automake/applications/knights/debian/rules index 29ea724f0..78daf9b03 100755 --- a/ubuntu/lucid_automake/applications/knights/debian/rules +++ b/ubuntu/lucid_automake/applications/knights/debian/rules @@ -6,7 +6,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info @@ -51,7 +51,7 @@ config.status: configure patch if [ -f doc/Makefile.in ]; then cp doc/Makefile.in doc/Makefile.in.backup; else mv doc/Makefile.in.backup doc/Makefile.in; fi CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \ - --disable-debug --disable-rpath --sysconfdir=/etc --includedir=/opt/kde3/include/kde --infodir=/opt/kde3/share/info --mandir=/opt/kde3/share/man --with-qt-dir=/usr/share/qt3 --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib + --disable-debug --disable-rpath --sysconfdir=/etc --includedir=/opt/kde3/include/tde --infodir=/opt/kde3/share/info --mandir=/opt/kde3/share/man --with-qt-dir=/usr/share/qt3 --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib build: build-stamp diff --git a/ubuntu/lucid_automake/applications/knowit/debian/rules b/ubuntu/lucid_automake/applications/knowit/debian/rules index 14ca8b2c8..4df8d63e7 100755 --- a/ubuntu/lucid_automake/applications/knowit/debian/rules +++ b/ubuntu/lucid_automake/applications/knowit/debian/rules @@ -7,7 +7,7 @@ DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info diff --git a/ubuntu/lucid_automake/applications/knutclient/debian/rules b/ubuntu/lucid_automake/applications/knutclient/debian/rules index d6a7e77ec..f80dda84c 100755 --- a/ubuntu/lucid_automake/applications/knutclient/debian/rules +++ b/ubuntu/lucid_automake/applications/knutclient/debian/rules @@ -11,7 +11,7 @@ DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info diff --git a/ubuntu/lucid_automake/applications/koffice/debian/cdbs/kde.mk b/ubuntu/lucid_automake/applications/koffice/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/lucid_automake/applications/koffice/debian/cdbs/kde.mk +++ b/ubuntu/lucid_automake/applications/koffice/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/lucid_automake/applications/koffice/debian/koffice-dev-kde3.install b/ubuntu/lucid_automake/applications/koffice/debian/koffice-dev-kde3.install index c16c93985..479cc82aa 100644 --- a/ubuntu/lucid_automake/applications/koffice/debian/koffice-dev-kde3.install +++ b/ubuntu/lucid_automake/applications/koffice/debian/koffice-dev-kde3.install @@ -1,4 +1,4 @@ -debian/tmp/opt/kde3/include/kde +debian/tmp/opt/kde3/include/tde debian/tmp/opt/kde3/lib/libkarboncommon.la debian/tmp/opt/kde3/lib/libkarboncommon.so debian/tmp/opt/kde3/lib/libkchartcommon.la diff --git a/ubuntu/lucid_automake/applications/koffice/debian/rules b/ubuntu/lucid_automake/applications/koffice/debian/rules index 4ac1792e5..e8e6bfd40 100755 --- a/ubuntu/lucid_automake/applications/koffice/debian/rules +++ b/ubuntu/lucid_automake/applications/koffice/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info diff --git a/ubuntu/lucid_automake/applications/konversation/debian/cdbs/kde.mk b/ubuntu/lucid_automake/applications/konversation/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/lucid_automake/applications/konversation/debian/cdbs/kde.mk +++ b/ubuntu/lucid_automake/applications/konversation/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/lucid_automake/applications/konversation/debian/rules b/ubuntu/lucid_automake/applications/konversation/debian/rules index d6b5c064e..74c8823fc 100755 --- a/ubuntu/lucid_automake/applications/konversation/debian/rules +++ b/ubuntu/lucid_automake/applications/konversation/debian/rules @@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/patchsys-quilt.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info @@ -13,7 +13,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_DH_STRIP_ARGS := --dbg-package=konversation-kde3-dbg DEB_INSTALL_DOCS_ALL = -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/tde post-patches:: debian/stamp-bootstrap diff --git a/ubuntu/lucid_automake/applications/kopete-otr/debian/cdbs/kde.mk b/ubuntu/lucid_automake/applications/kopete-otr/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/lucid_automake/applications/kopete-otr/debian/cdbs/kde.mk +++ b/ubuntu/lucid_automake/applications/kopete-otr/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/lucid_automake/applications/kopete-otr/debian/rules b/ubuntu/lucid_automake/applications/kopete-otr/debian/rules index 8df8fc911..0e26fd9c8 100755 --- a/ubuntu/lucid_automake/applications/kopete-otr/debian/rules +++ b/ubuntu/lucid_automake/applications/kopete-otr/debian/rules @@ -3,14 +3,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/kde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/tde post-patches:: debian/stamp-bootstrap diff --git a/ubuntu/lucid_automake/applications/kpicosim/debian/rules b/ubuntu/lucid_automake/applications/kpicosim/debian/rules index b210dc942..a1949f79e 100755 --- a/ubuntu/lucid_automake/applications/kpicosim/debian/rules +++ b/ubuntu/lucid_automake/applications/kpicosim/debian/rules @@ -9,7 +9,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info @@ -52,7 +52,7 @@ build-stamp: config.status dh_testdir # Add here commands to compile the package. - env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/kde $(MAKE) + env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/tde $(MAKE) #docbook-to-man debian/kpicosim.sgml > kpicosim.1 touch build-stamp diff --git a/ubuntu/lucid_automake/applications/kpilot/debian/cdbs/kde.mk b/ubuntu/lucid_automake/applications/kpilot/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/lucid_automake/applications/kpilot/debian/cdbs/kde.mk +++ b/ubuntu/lucid_automake/applications/kpilot/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/lucid_automake/applications/kpilot/debian/rules b/ubuntu/lucid_automake/applications/kpilot/debian/rules index 8b49a1a4b..abfd36cfc 100755 --- a/ubuntu/lucid_automake/applications/kpilot/debian/rules +++ b/ubuntu/lucid_automake/applications/kpilot/debian/rules @@ -3,14 +3,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/kde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde post-patches:: debian/stamp-bootstrap diff --git a/ubuntu/lucid_automake/applications/kpowersave/debian/cdbs/kde.mk b/ubuntu/lucid_automake/applications/kpowersave/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/lucid_automake/applications/kpowersave/debian/cdbs/kde.mk +++ b/ubuntu/lucid_automake/applications/kpowersave/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/lucid_automake/applications/kpowersave/debian/rules b/ubuntu/lucid_automake/applications/kpowersave/debian/rules index 135ce2862..25f0708df 100755 --- a/ubuntu/lucid_automake/applications/kpowersave/debian/rules +++ b/ubuntu/lucid_automake/applications/kpowersave/debian/rules @@ -4,7 +4,7 @@ include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info @@ -12,7 +12,7 @@ DEB_CONFIGURE_INFODIR := /opt/kde3/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_INSTALL_DOCS_ALL := AUTHORS NEWS -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/tde post-patches:: debian/stamp-bootstrap diff --git a/ubuntu/lucid_automake/applications/kradio/debian/rules b/ubuntu/lucid_automake/applications/kradio/debian/rules index d9a2241b4..71ffdf9b0 100755 --- a/ubuntu/lucid_automake/applications/kradio/debian/rules +++ b/ubuntu/lucid_automake/applications/kradio/debian/rules @@ -9,7 +9,7 @@ DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info diff --git a/ubuntu/lucid_automake/applications/krename/debian/rules b/ubuntu/lucid_automake/applications/krename/debian/rules index f8aeeb92b..332f8a71f 100755 --- a/ubuntu/lucid_automake/applications/krename/debian/rules +++ b/ubuntu/lucid_automake/applications/krename/debian/rules @@ -6,14 +6,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/tde ### Libtool and Automake updates post-patches:: debian/stamp-autothings-update diff --git a/ubuntu/lucid_automake/applications/krusader/debian/cdbs/kde.mk b/ubuntu/lucid_automake/applications/krusader/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/lucid_automake/applications/krusader/debian/cdbs/kde.mk +++ b/ubuntu/lucid_automake/applications/krusader/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/lucid_automake/applications/krusader/debian/rules b/ubuntu/lucid_automake/applications/krusader/debian/rules index fded0c074..5ddb5ac8b 100755 --- a/ubuntu/lucid_automake/applications/krusader/debian/rules +++ b/ubuntu/lucid_automake/applications/krusader/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info @@ -16,7 +16,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_DESTDIR = $(CURDIR)/debian/krusader-kde3/ -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/tde post-patches:: debian/stamp-bootstrap diff --git a/ubuntu/lucid_automake/applications/ksplash-engine-moodin/debian/debiandirs b/ubuntu/lucid_automake/applications/ksplash-engine-moodin/debian/debiandirs index fab210452..e760e0339 100644 --- a/ubuntu/lucid_automake/applications/ksplash-engine-moodin/debian/debiandirs +++ b/ubuntu/lucid_automake/applications/ksplash-engine-moodin/debian/debiandirs @@ -1,6 +1,6 @@ export kde_prefix=/opt/kde3 export sysconfdir=/etc -export kde_includedir=/opt/kde3/include/kde +export kde_includedir=/opt/kde3/include/tde export infodir=/opt/kde3/share/info export mandir=/opt/kde3/share/man export qtdir=/opt/kde3/share/qt3 diff --git a/ubuntu/lucid_automake/applications/ksplash-engine-moodin/debian/rules b/ubuntu/lucid_automake/applications/ksplash-engine-moodin/debian/rules index e99736549..bc9ab21dc 100755 --- a/ubuntu/lucid_automake/applications/ksplash-engine-moodin/debian/rules +++ b/ubuntu/lucid_automake/applications/ksplash-engine-moodin/debian/rules @@ -4,7 +4,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info @@ -49,7 +49,7 @@ patch: patch-stamp config.status: configure patch dh_testdir - CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) $(configkde) --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/kde + CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) $(configkde) --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/tde build: build-stamp diff --git a/ubuntu/lucid_automake/applications/ksquirrel/debian/rules b/ubuntu/lucid_automake/applications/ksquirrel/debian/rules index ab60b519d..9d05b71b2 100755 --- a/ubuntu/lucid_automake/applications/ksquirrel/debian/rules +++ b/ubuntu/lucid_automake/applications/ksquirrel/debian/rules @@ -9,7 +9,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info diff --git a/ubuntu/lucid_automake/applications/kstreamripper/debian/rules b/ubuntu/lucid_automake/applications/kstreamripper/debian/rules index 319fe9f4a..27cc7e874 100755 --- a/ubuntu/lucid_automake/applications/kstreamripper/debian/rules +++ b/ubuntu/lucid_automake/applications/kstreamripper/debian/rules @@ -3,10 +3,10 @@ include /usr/share/cdbs/1/rules/debhelper.mk DEB_INSTALL_MANPAGES_kstreamripper:=debian/kstreamripper.1 build/kstreamripper:: - env PATH=/opt/trinity/bin:$(PATH) QTDIR=/usr/share/qt3 CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde DESTDIR=$(DEB_DESTDIR)/opt/trinity $(MAKE) + env PATH=/opt/trinity/bin:$(PATH) QTDIR=/usr/share/qt3 CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde DESTDIR=$(DEB_DESTDIR)/opt/trinity $(MAKE) install/kstreamripper:: - env PATH=/opt/trinity/bin:$(PATH) QTDIR=/usr/share/qt3 CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde $(MAKE) install + env PATH=/opt/trinity/bin:$(PATH) QTDIR=/usr/share/qt3 CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde $(MAKE) install mkdir -p $(DEB_DESTDIR)/opt/trinity/share/pixmaps/ mkdir -p $(DEB_DESTDIR)/opt/trinity/share/doc/HTML/ install -m 644 ./src/hi32-app-kstreamripper.png \ diff --git a/ubuntu/lucid_automake/applications/ksystemlog/debian/cdbs/kde.mk b/ubuntu/lucid_automake/applications/ksystemlog/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/lucid_automake/applications/ksystemlog/debian/cdbs/kde.mk +++ b/ubuntu/lucid_automake/applications/ksystemlog/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/lucid_automake/applications/ksystemlog/debian/rules b/ubuntu/lucid_automake/applications/ksystemlog/debian/rules index 7d54a2353..52740d44f 100755 --- a/ubuntu/lucid_automake/applications/ksystemlog/debian/rules +++ b/ubuntu/lucid_automake/applications/ksystemlog/debian/rules @@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info @@ -13,7 +13,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_INSTALL_MANPAGES_ksystemlog-kde3 := ksystemlog.1 -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/tde post-patches:: debian/stamp-bootstrap diff --git a/ubuntu/lucid_automake/applications/ktechlab/debian/debiandirs b/ubuntu/lucid_automake/applications/ktechlab/debian/debiandirs index 22305506e..c43770893 100644 --- a/ubuntu/lucid_automake/applications/ktechlab/debian/debiandirs +++ b/ubuntu/lucid_automake/applications/ktechlab/debian/debiandirs @@ -1,7 +1,7 @@ export kde_confdir=/etc/kde3 export kde_prefix=/opt/kde3 export kde_bindir=/opt/kde3/bin -export kde_includedir=/opt/kde3/include/kde +export kde_includedir=/opt/kde3/include/tde export kde_libdir=/opt/kde3/lib export kde_cgidir=/opt/kde3/lib/cgi-bin export kde_moduledir=/opt/kde3/lib/kde3 diff --git a/ubuntu/lucid_automake/applications/ktechlab/debian/rules b/ubuntu/lucid_automake/applications/ktechlab/debian/rules index 6a006f9b9..148f5d807 100755 --- a/ubuntu/lucid_automake/applications/ktechlab/debian/rules +++ b/ubuntu/lucid_automake/applications/ktechlab/debian/rules @@ -5,7 +5,7 @@ -include debian/debiandirs -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info @@ -45,7 +45,7 @@ endif ifneq "$(wildcard /usr/share/misc/config.guess)" "" cp -f /usr/share/misc/config.guess config.guess endif - PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/kde CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) $(configkde) --prefix=/opt/kde3 + PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/tde CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) $(configkde) --prefix=/opt/kde3 build: build-stamp debian/ktechlab.xpm @@ -55,7 +55,7 @@ build-stamp: config.status make -f admin/Makefile.common cvs touch debian/stamp-bootstrap - env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/kde $(MAKE) + env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/tde $(MAKE) touch build-stamp clean: @@ -85,8 +85,8 @@ install: build dh_testroot dh_clean -k dh_installdirs - env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/kde $(MAKE) install DESTDIR=$(CURDIR)/debian/ktechlab-kde3 - env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/kde $(MAKE) -C po install DESTDIR=$(CURDIR)/debian/ktechlab-kde3 + env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/tde $(MAKE) install DESTDIR=$(CURDIR)/debian/ktechlab-kde3 + env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/tde $(MAKE) -C po install DESTDIR=$(CURDIR)/debian/ktechlab-kde3 install -D -m 644 debian/ktechlab.xpm debian/ktechlab-kde3/opt/kde3/share/pixmaps/ktechlab.xpm chrpath -d $(CURDIR)/debian/ktechlab-kde3/opt/kde3/bin/ktechlab chrpath -d $(CURDIR)/debian/ktechlab-kde3/opt/kde3/bin/microbe diff --git a/ubuntu/lucid_automake/applications/ktorrent/debian/cdbs/kde.mk b/ubuntu/lucid_automake/applications/ktorrent/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/lucid_automake/applications/ktorrent/debian/cdbs/kde.mk +++ b/ubuntu/lucid_automake/applications/ktorrent/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/lucid_automake/applications/ktorrent/debian/rules b/ubuntu/lucid_automake/applications/ktorrent/debian/rules index dd1796ce0..901fd1ba9 100755 --- a/ubuntu/lucid_automake/applications/ktorrent/debian/rules +++ b/ubuntu/lucid_automake/applications/ktorrent/debian/rules @@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include debian/cdbs/debian-qt-kde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info @@ -13,7 +13,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_INSTALL_MANPAGES_ktorrent = ktorrent.1 -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/tde build/ktorrent-kde3:: docbook2x-man debian/ktorrent.1.docbook diff --git a/ubuntu/lucid_automake/applications/kuickshow/debian/cdbs/kde.mk b/ubuntu/lucid_automake/applications/kuickshow/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/lucid_automake/applications/kuickshow/debian/cdbs/kde.mk +++ b/ubuntu/lucid_automake/applications/kuickshow/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/lucid_automake/applications/kuickshow/debian/rules b/ubuntu/lucid_automake/applications/kuickshow/debian/rules index b4456db14..e2ada6f11 100755 --- a/ubuntu/lucid_automake/applications/kuickshow/debian/rules +++ b/ubuntu/lucid_automake/applications/kuickshow/debian/rules @@ -5,14 +5,14 @@ include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/tde post-patches:: debian/stamp-bootstrap diff --git a/ubuntu/lucid_automake/applications/kvirc/debian/rules b/ubuntu/lucid_automake/applications/kvirc/debian/rules index 99cd63353..c4c197f5f 100755 --- a/ubuntu/lucid_automake/applications/kvirc/debian/rules +++ b/ubuntu/lucid_automake/applications/kvirc/debian/rules @@ -17,7 +17,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/autotools.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info diff --git a/ubuntu/lucid_automake/applications/kvkbd/debian/cdbs/kde.mk b/ubuntu/lucid_automake/applications/kvkbd/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/lucid_automake/applications/kvkbd/debian/cdbs/kde.mk +++ b/ubuntu/lucid_automake/applications/kvkbd/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/lucid_automake/applications/kvkbd/debian/rules b/ubuntu/lucid_automake/applications/kvkbd/debian/rules index 4a7760310..00815e27a 100755 --- a/ubuntu/lucid_automake/applications/kvkbd/debian/rules +++ b/ubuntu/lucid_automake/applications/kvkbd/debian/rules @@ -4,14 +4,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/tde makebuilddir/kvkbd-kde3:: make -f Makefile.cvs diff --git a/ubuntu/lucid_automake/applications/kwin-style-crystal/debian/cdbs/kde.mk b/ubuntu/lucid_automake/applications/kwin-style-crystal/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/lucid_automake/applications/kwin-style-crystal/debian/cdbs/kde.mk +++ b/ubuntu/lucid_automake/applications/kwin-style-crystal/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/lucid_automake/applications/kwin-style-crystal/debian/rules b/ubuntu/lucid_automake/applications/kwin-style-crystal/debian/rules index 78792cee1..2d8c7040b 100755 --- a/ubuntu/lucid_automake/applications/kwin-style-crystal/debian/rules +++ b/ubuntu/lucid_automake/applications/kwin-style-crystal/debian/rules @@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info diff --git a/ubuntu/lucid_automake/applications/piklab/debian/rules b/ubuntu/lucid_automake/applications/piklab/debian/rules index 1ded36029..374483481 100755 --- a/ubuntu/lucid_automake/applications/piklab/debian/rules +++ b/ubuntu/lucid_automake/applications/piklab/debian/rules @@ -3,7 +3,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info @@ -48,7 +48,7 @@ endif ./configure CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs -Wl,--as-needed" \ --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \ --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib \ - --with-extra-includes=/opt/kde3/include/kde \ + --with-extra-includes=/opt/kde3/include/tde \ --mandir=/opt/kde3/share/man --infodir=/opt/kde3/share/info --enable-rpath touch $@ diff --git a/ubuntu/lucid_automake/applications/potracegui/debian/rules b/ubuntu/lucid_automake/applications/potracegui/debian/rules index 9da36fbe6..1cf0e0262 100755 --- a/ubuntu/lucid_automake/applications/potracegui/debian/rules +++ b/ubuntu/lucid_automake/applications/potracegui/debian/rules @@ -11,7 +11,7 @@ DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info diff --git a/ubuntu/lucid_automake/applications/rosegarden/debian/rules b/ubuntu/lucid_automake/applications/rosegarden/debian/rules index a871ea6a6..538b8d2b7 100755 --- a/ubuntu/lucid_automake/applications/rosegarden/debian/rules +++ b/ubuntu/lucid_automake/applications/rosegarden/debian/rules @@ -7,7 +7,7 @@ include /usr/share/dpatch/dpatch.make -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info @@ -35,14 +35,14 @@ configure: configure-stamp configure-stamp: dh_testdir - env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/kde CMAKE_INSTALL_PREFIX=/usr cmake . + env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/tde CMAKE_INSTALL_PREFIX=/usr cmake . touch configure-stamp build: build-stamp build-stamp: configure-stamp patch-stamp dh_testdir - env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/kde make + env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/tde make touch build-stamp clean: unpatch @@ -64,7 +64,7 @@ install: build dh_clean -k dh_installdirs - env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/kde make install DESTDIR=`pwd`/debian/tmp + env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/tde make install DESTDIR=`pwd`/debian/tmp find debian/tmp/opt/kde3/share -type f -exec chmod 664 {} \; # Build architecture-independent files here. diff --git a/ubuntu/lucid_automake/applications/smb4k/debian/cdbs/kde.mk b/ubuntu/lucid_automake/applications/smb4k/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/lucid_automake/applications/smb4k/debian/cdbs/kde.mk +++ b/ubuntu/lucid_automake/applications/smb4k/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/lucid_automake/applications/smb4k/debian/rules b/ubuntu/lucid_automake/applications/smb4k/debian/rules index a264124c9..14e052547 100755 --- a/ubuntu/lucid_automake/applications/smb4k/debian/rules +++ b/ubuntu/lucid_automake/applications/smb4k/debian/rules @@ -7,7 +7,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/autotools.mk include debian/cdbs/kde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info diff --git a/ubuntu/lucid_automake/applications/soundkonverter/debian/cdbs/kde.mk b/ubuntu/lucid_automake/applications/soundkonverter/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/lucid_automake/applications/soundkonverter/debian/cdbs/kde.mk +++ b/ubuntu/lucid_automake/applications/soundkonverter/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/lucid_automake/applications/soundkonverter/debian/rules b/ubuntu/lucid_automake/applications/soundkonverter/debian/rules index a045cdcf5..0589244d1 100755 --- a/ubuntu/lucid_automake/applications/soundkonverter/debian/rules +++ b/ubuntu/lucid_automake/applications/soundkonverter/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/patchsys-quilt.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info @@ -14,7 +14,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info diff --git a/ubuntu/lucid_automake/applications/tdmtheme/debian/cdbs/kde.mk b/ubuntu/lucid_automake/applications/tdmtheme/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/lucid_automake/applications/tdmtheme/debian/cdbs/kde.mk +++ b/ubuntu/lucid_automake/applications/tdmtheme/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/lucid_automake/applications/tdmtheme/debian/rules b/ubuntu/lucid_automake/applications/tdmtheme/debian/rules index bcd40a219..4dd552400 100755 --- a/ubuntu/lucid_automake/applications/tdmtheme/debian/rules +++ b/ubuntu/lucid_automake/applications/tdmtheme/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/patchsys-quilt.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info @@ -13,7 +13,7 @@ DEB_CONFIGURE_INFODIR := /opt/kde3/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--as-needed" -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/tde post-patches:: debian/stamp-bootstrap diff --git a/ubuntu/lucid_automake/applications/tellico/debian/rules b/ubuntu/lucid_automake/applications/tellico/debian/rules index e747c841f..c52d68960 100755 --- a/ubuntu/lucid_automake/applications/tellico/debian/rules +++ b/ubuntu/lucid_automake/applications/tellico/debian/rules @@ -5,7 +5,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info diff --git a/ubuntu/lucid_automake/applications/wlassistant/debian/rules b/ubuntu/lucid_automake/applications/wlassistant/debian/rules index 8c38dc51c..921c27cf2 100755 --- a/ubuntu/lucid_automake/applications/wlassistant/debian/rules +++ b/ubuntu/lucid_automake/applications/wlassistant/debian/rules @@ -7,7 +7,7 @@ URL = http://heanet.dl.sourceforge.net/$(DEB_SOURCE_PACKAGE)/$(UPFILENAME) include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info @@ -18,7 +18,7 @@ PATH := /opt/kde3/bin:${PATH} DEB_SCONS_PREFIX=/opt/kde3 -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/tde CONFIG_STATUS=$(DEB_BUILDDIR)/config.status SCONS_CMD=scons diff --git a/ubuntu/lucid_automake/applications/yakuake/debian/cdbs/kde.mk b/ubuntu/lucid_automake/applications/yakuake/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/lucid_automake/applications/yakuake/debian/cdbs/kde.mk +++ b/ubuntu/lucid_automake/applications/yakuake/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/lucid_automake/applications/yakuake/debian/rules b/ubuntu/lucid_automake/applications/yakuake/debian/rules index 095defb87..bc8076b0e 100755 --- a/ubuntu/lucid_automake/applications/yakuake/debian/rules +++ b/ubuntu/lucid_automake/applications/yakuake/debian/rules @@ -3,7 +3,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/kde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info diff --git a/ubuntu/lucid_automake/dependencies/arts/debian/libarts1-kde3-dev.install b/ubuntu/lucid_automake/dependencies/arts/debian/libarts1-kde3-dev.install index 2ba1c47dd..00ed82c53 100644 --- a/ubuntu/lucid_automake/dependencies/arts/debian/libarts1-kde3-dev.install +++ b/ubuntu/lucid_automake/dependencies/arts/debian/libarts1-kde3-dev.install @@ -1,85 +1,85 @@ debian/tmp/opt/kde3/bin/mcopidl -debian/tmp/opt/kde3/include/kde/arts/anyref.h -debian/tmp/opt/kde3/include/kde/arts/arts_export.h -debian/tmp/opt/kde3/include/kde/arts/artsflow.h -debian/tmp/opt/kde3/include/kde/arts/artsflow.idl -debian/tmp/opt/kde3/include/kde/arts/artsversion.h -debian/tmp/opt/kde3/include/kde/arts/asyncstream.h -debian/tmp/opt/kde3/include/kde/arts/audioio.h -debian/tmp/opt/kde3/include/kde/arts/audiosubsys.h -debian/tmp/opt/kde3/include/kde/arts/buffer.h -debian/tmp/opt/kde3/include/kde/arts/bufferqueue.h -debian/tmp/opt/kde3/include/kde/arts/cache.h -debian/tmp/opt/kde3/include/kde/arts/cachedwav.h -debian/tmp/opt/kde3/include/kde/arts/common.h -debian/tmp/opt/kde3/include/kde/arts/connect.h -debian/tmp/opt/kde3/include/kde/arts/connection.h -debian/tmp/opt/kde3/include/kde/arts/convert.h -debian/tmp/opt/kde3/include/kde/arts/core.h -debian/tmp/opt/kde3/include/kde/arts/core.idl -debian/tmp/opt/kde3/include/kde/arts/cpuinfo.h -debian/tmp/opt/kde3/include/kde/arts/datapacket.h -debian/tmp/opt/kde3/include/kde/arts/debug.h -debian/tmp/opt/kde3/include/kde/arts/delayedreturn.h -debian/tmp/opt/kde3/include/kde/arts/dispatcher.h -debian/tmp/opt/kde3/include/kde/arts/dynamicrequest.h -debian/tmp/opt/kde3/include/kde/arts/dynamicskeleton.h -debian/tmp/opt/kde3/include/kde/arts/extensionloader.h -debian/tmp/opt/kde3/include/kde/arts/factory.h -debian/tmp/opt/kde3/include/kde/arts/fft.h -debian/tmp/opt/kde3/include/kde/arts/flowsystem.h -debian/tmp/opt/kde3/include/kde/arts/giomanager.h -debian/tmp/opt/kde3/include/kde/arts/gsl/gslcommon.h -debian/tmp/opt/kde3/include/kde/arts/gsl/gslconfig.h -debian/tmp/opt/kde3/include/kde/arts/gsl/gslconvert.h -debian/tmp/opt/kde3/include/kde/arts/gsl/gsldatacache.h -debian/tmp/opt/kde3/include/kde/arts/gsl/gsldatahandle-mad.h -debian/tmp/opt/kde3/include/kde/arts/gsl/gsldatahandle-vorbis.h -debian/tmp/opt/kde3/include/kde/arts/gsl/gsldatahandle.h -debian/tmp/opt/kde3/include/kde/arts/gsl/gsldatautils.h -debian/tmp/opt/kde3/include/kde/arts/gsl/gsldefs.h -debian/tmp/opt/kde3/include/kde/arts/gsl/gslengine.h -debian/tmp/opt/kde3/include/kde/arts/gsl/gslfft.h -debian/tmp/opt/kde3/include/kde/arts/gsl/gslfilter.h -debian/tmp/opt/kde3/include/kde/arts/gsl/gslieee754.h -debian/tmp/opt/kde3/include/kde/arts/gsl/gslloader.h -debian/tmp/opt/kde3/include/kde/arts/gsl/gslmagic.h -debian/tmp/opt/kde3/include/kde/arts/gsl/gslmath.h -debian/tmp/opt/kde3/include/kde/arts/gsl/gsloscillator.h -debian/tmp/opt/kde3/include/kde/arts/gsl/gslosctable.h -debian/tmp/opt/kde3/include/kde/arts/gsl/gslsignal.h -debian/tmp/opt/kde3/include/kde/arts/gsl/gslwavechunk.h -debian/tmp/opt/kde3/include/kde/arts/gsl/gslwaveosc.h -debian/tmp/opt/kde3/include/kde/arts/gslschedule.h -debian/tmp/opt/kde3/include/kde/arts/idlfilereg.h -debian/tmp/opt/kde3/include/kde/arts/ifacerepo_impl.h -debian/tmp/opt/kde3/include/kde/arts/iomanager.h -debian/tmp/opt/kde3/include/kde/arts/kmedia2.h -debian/tmp/opt/kde3/include/kde/arts/kmedia2.idl -debian/tmp/opt/kde3/include/kde/arts/mcopconfig.h -debian/tmp/opt/kde3/include/kde/arts/mcoputils.h -debian/tmp/opt/kde3/include/kde/arts/notification.h -debian/tmp/opt/kde3/include/kde/arts/object.h -debian/tmp/opt/kde3/include/kde/arts/objectmanager.h -debian/tmp/opt/kde3/include/kde/arts/pipebuffer.h -debian/tmp/opt/kde3/include/kde/arts/pool.h -debian/tmp/opt/kde3/include/kde/arts/qiomanager.h -debian/tmp/opt/kde3/include/kde/arts/reference.h -debian/tmp/opt/kde3/include/kde/arts/referenceclean.h -debian/tmp/opt/kde3/include/kde/arts/resample.h -debian/tmp/opt/kde3/include/kde/arts/socketconnection.h -debian/tmp/opt/kde3/include/kde/arts/soundserver.h -debian/tmp/opt/kde3/include/kde/arts/soundserver.idl -debian/tmp/opt/kde3/include/kde/arts/startupmanager.h -debian/tmp/opt/kde3/include/kde/arts/stdsynthmodule.h -debian/tmp/opt/kde3/include/kde/arts/synthschedule.h -debian/tmp/opt/kde3/include/kde/arts/tcpconnection.h -debian/tmp/opt/kde3/include/kde/arts/tcpserver.h -debian/tmp/opt/kde3/include/kde/arts/thread.h -debian/tmp/opt/kde3/include/kde/arts/type.h -debian/tmp/opt/kde3/include/kde/arts/unixconnection.h -debian/tmp/opt/kde3/include/kde/arts/unixserver.h -debian/tmp/opt/kde3/include/kde/arts/weakreference.h +debian/tmp/opt/kde3/include/tde/arts/anyref.h +debian/tmp/opt/kde3/include/tde/arts/arts_export.h +debian/tmp/opt/kde3/include/tde/arts/artsflow.h +debian/tmp/opt/kde3/include/tde/arts/artsflow.idl +debian/tmp/opt/kde3/include/tde/arts/artsversion.h +debian/tmp/opt/kde3/include/tde/arts/asyncstream.h +debian/tmp/opt/kde3/include/tde/arts/audioio.h +debian/tmp/opt/kde3/include/tde/arts/audiosubsys.h +debian/tmp/opt/kde3/include/tde/arts/buffer.h +debian/tmp/opt/kde3/include/tde/arts/bufferqueue.h +debian/tmp/opt/kde3/include/tde/arts/cache.h +debian/tmp/opt/kde3/include/tde/arts/cachedwav.h +debian/tmp/opt/kde3/include/tde/arts/common.h +debian/tmp/opt/kde3/include/tde/arts/connect.h +debian/tmp/opt/kde3/include/tde/arts/connection.h +debian/tmp/opt/kde3/include/tde/arts/convert.h +debian/tmp/opt/kde3/include/tde/arts/core.h +debian/tmp/opt/kde3/include/tde/arts/core.idl +debian/tmp/opt/kde3/include/tde/arts/cpuinfo.h +debian/tmp/opt/kde3/include/tde/arts/datapacket.h +debian/tmp/opt/kde3/include/tde/arts/debug.h +debian/tmp/opt/kde3/include/tde/arts/delayedreturn.h +debian/tmp/opt/kde3/include/tde/arts/dispatcher.h +debian/tmp/opt/kde3/include/tde/arts/dynamicrequest.h +debian/tmp/opt/kde3/include/tde/arts/dynamicskeleton.h +debian/tmp/opt/kde3/include/tde/arts/extensionloader.h +debian/tmp/opt/kde3/include/tde/arts/factory.h +debian/tmp/opt/kde3/include/tde/arts/fft.h +debian/tmp/opt/kde3/include/tde/arts/flowsystem.h +debian/tmp/opt/kde3/include/tde/arts/giomanager.h +debian/tmp/opt/kde3/include/tde/arts/gsl/gslcommon.h +debian/tmp/opt/kde3/include/tde/arts/gsl/gslconfig.h +debian/tmp/opt/kde3/include/tde/arts/gsl/gslconvert.h +debian/tmp/opt/kde3/include/tde/arts/gsl/gsldatacache.h +debian/tmp/opt/kde3/include/tde/arts/gsl/gsldatahandle-mad.h +debian/tmp/opt/kde3/include/tde/arts/gsl/gsldatahandle-vorbis.h +debian/tmp/opt/kde3/include/tde/arts/gsl/gsldatahandle.h +debian/tmp/opt/kde3/include/tde/arts/gsl/gsldatautils.h +debian/tmp/opt/kde3/include/tde/arts/gsl/gsldefs.h +debian/tmp/opt/kde3/include/tde/arts/gsl/gslengine.h +debian/tmp/opt/kde3/include/tde/arts/gsl/gslfft.h +debian/tmp/opt/kde3/include/tde/arts/gsl/gslfilter.h +debian/tmp/opt/kde3/include/tde/arts/gsl/gslieee754.h +debian/tmp/opt/kde3/include/tde/arts/gsl/gslloader.h +debian/tmp/opt/kde3/include/tde/arts/gsl/gslmagic.h +debian/tmp/opt/kde3/include/tde/arts/gsl/gslmath.h +debian/tmp/opt/kde3/include/tde/arts/gsl/gsloscillator.h +debian/tmp/opt/kde3/include/tde/arts/gsl/gslosctable.h +debian/tmp/opt/kde3/include/tde/arts/gsl/gslsignal.h +debian/tmp/opt/kde3/include/tde/arts/gsl/gslwavechunk.h +debian/tmp/opt/kde3/include/tde/arts/gsl/gslwaveosc.h +debian/tmp/opt/kde3/include/tde/arts/gslschedule.h +debian/tmp/opt/kde3/include/tde/arts/idlfilereg.h +debian/tmp/opt/kde3/include/tde/arts/ifacerepo_impl.h +debian/tmp/opt/kde3/include/tde/arts/iomanager.h +debian/tmp/opt/kde3/include/tde/arts/kmedia2.h +debian/tmp/opt/kde3/include/tde/arts/kmedia2.idl +debian/tmp/opt/kde3/include/tde/arts/mcopconfig.h +debian/tmp/opt/kde3/include/tde/arts/mcoputils.h +debian/tmp/opt/kde3/include/tde/arts/notification.h +debian/tmp/opt/kde3/include/tde/arts/object.h +debian/tmp/opt/kde3/include/tde/arts/objectmanager.h +debian/tmp/opt/kde3/include/tde/arts/pipebuffer.h +debian/tmp/opt/kde3/include/tde/arts/pool.h +debian/tmp/opt/kde3/include/tde/arts/qiomanager.h +debian/tmp/opt/kde3/include/tde/arts/reference.h +debian/tmp/opt/kde3/include/tde/arts/referenceclean.h +debian/tmp/opt/kde3/include/tde/arts/resample.h +debian/tmp/opt/kde3/include/tde/arts/socketconnection.h +debian/tmp/opt/kde3/include/tde/arts/soundserver.h +debian/tmp/opt/kde3/include/tde/arts/soundserver.idl +debian/tmp/opt/kde3/include/tde/arts/startupmanager.h +debian/tmp/opt/kde3/include/tde/arts/stdsynthmodule.h +debian/tmp/opt/kde3/include/tde/arts/synthschedule.h +debian/tmp/opt/kde3/include/tde/arts/tcpconnection.h +debian/tmp/opt/kde3/include/tde/arts/tcpserver.h +debian/tmp/opt/kde3/include/tde/arts/thread.h +debian/tmp/opt/kde3/include/tde/arts/type.h +debian/tmp/opt/kde3/include/tde/arts/unixconnection.h +debian/tmp/opt/kde3/include/tde/arts/unixserver.h +debian/tmp/opt/kde3/include/tde/arts/weakreference.h debian/tmp/opt/kde3/lib/libartscbackend.a debian/tmp/opt/kde3/lib/libartscbackend.so debian/tmp/opt/kde3/lib/libartsdsp.a diff --git a/ubuntu/lucid_automake/dependencies/arts/debian/libartsc0-kde3-dev.install b/ubuntu/lucid_automake/dependencies/arts/debian/libartsc0-kde3-dev.install index b666dca4c..555afb521 100644 --- a/ubuntu/lucid_automake/dependencies/arts/debian/libartsc0-kde3-dev.install +++ b/ubuntu/lucid_automake/dependencies/arts/debian/libartsc0-kde3-dev.install @@ -1,6 +1,6 @@ debian/tmp/opt/kde3/bin/artsc-config -debian/tmp/opt/kde3/include/kde/artsc/artsc.h -debian/tmp/opt/kde3/include/kde/artsc/artsc_export.h +debian/tmp/opt/kde3/include/tde/artsc/artsc.h +debian/tmp/opt/kde3/include/tde/artsc/artsc_export.h debian/tmp/opt/kde3/lib/libartsc.a debian/tmp/opt/kde3/lib/libartsc.la debian/tmp/opt/kde3/lib/libartsc.so diff --git a/ubuntu/lucid_automake/dependencies/arts/debian/rules b/ubuntu/lucid_automake/dependencies/arts/debian/rules index 4bd2d699f..40b5818aa 100755 --- a/ubuntu/lucid_automake/dependencies/arts/debian/rules +++ b/ubuntu/lucid_automake/dependencies/arts/debian/rules @@ -6,14 +6,14 @@ include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk include debian/cdbs/debian-qt-kde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) -DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_SKIP_RPATH=OFF -DCMAKE_LIBRARY_PATH="/opt/kde3/lib" -DCMAKE_INCLUDE_PATH="/opt/kde3/include/kde" -DCMAKE_CXX_FLAGS="-I/opt/kde3/include/kde" -DCMAKE_LDFLAGS="-L/opt/kde3/lib" +DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_SKIP_RPATH=OFF -DCMAKE_LIBRARY_PATH="/opt/kde3/lib" -DCMAKE_INCLUDE_PATH="/opt/kde3/include/tde" -DCMAKE_CXX_FLAGS="-I/opt/kde3/include/tde" -DCMAKE_LDFLAGS="-L/opt/kde3/lib" DEB_DH_STRIP_ARGS := --dbg-package=arts-kde3-dbg PACKAGES_WITH_LIBS := libarts1c2a-kde3 libartsc0-kde3 diff --git a/ubuntu/lucid_automake/dependencies/tqtinterface/debian/rules b/ubuntu/lucid_automake/dependencies/tqtinterface/debian/rules index dadefb425..79f24ff9a 100755 --- a/ubuntu/lucid_automake/dependencies/tqtinterface/debian/rules +++ b/ubuntu/lucid_automake/dependencies/tqtinterface/debian/rules @@ -11,14 +11,14 @@ DEB_KDE_APIDOX := yes version=Debian Package $(DEB_VERSION) DEB_OPT_FLAG += -DDEBIAN_VERSION=$(DEB_VERSION) -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) -DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_LIBRARY_PATH="/opt/kde3/lib" -DCMAKE_INCLUDE_PATH="/opt/kde3/include/kde" -DCMAKE_CXX_FLAGS="-I/opt/kde3/include/kde" -DCMAKE_LDFLAGS="-L/opt/kde3/lib" +DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_LIBRARY_PATH="/opt/kde3/lib" -DCMAKE_INCLUDE_PATH="/opt/kde3/include/tde" -DCMAKE_CXX_FLAGS="-I/opt/kde3/include/tde" -DCMAKE_LDFLAGS="-L/opt/kde3/lib" DEB_CONFIGURE_EXTRA_FLAGS := \ --enable-mitshm --with-alsa --enable-dnotify --enable-inotify \ diff --git a/ubuntu/lucid_automake/kde-i18n/debian/debiandirs b/ubuntu/lucid_automake/kde-i18n/debian/debiandirs index 70e9003f9..fa8e96587 100644 --- a/ubuntu/lucid_automake/kde-i18n/debian/debiandirs +++ b/ubuntu/lucid_automake/kde-i18n/debian/debiandirs @@ -1,6 +1,6 @@ export kde_prefix=/opt/kde3 export sysconfdir=/etc -export kde_includedir=/opt/kde3/include/kde +export kde_includedir=/opt/kde3/include/tde export infodir=/opt/kde3/share/info export mandir=/opt/kde3/share/man export qtdir=/opt/kde3/share/qt3 diff --git a/ubuntu/lucid_automake/kde-i18n/debian/rules b/ubuntu/lucid_automake/kde-i18n/debian/rules index d1e9242e9..81e475b41 100755 --- a/ubuntu/lucid_automake/kde-i18n/debian/rules +++ b/ubuntu/lucid_automake/kde-i18n/debian/rules @@ -24,7 +24,7 @@ I18N_INSTALL := $(patsubst $(I18N_DIR_PAT),install__%,$(I18N_DIRS)) -include debian/debiandirs -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info diff --git a/ubuntu/lucid_automake/kdeaccessibility/debian/cdbs/kde.mk b/ubuntu/lucid_automake/kdeaccessibility/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/lucid_automake/kdeaccessibility/debian/cdbs/kde.mk +++ b/ubuntu/lucid_automake/kdeaccessibility/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/lucid_automake/kdeaccessibility/debian/ksayit-kde3.install b/ubuntu/lucid_automake/kdeaccessibility/debian/ksayit-kde3.install index 30c20144e..a1a76b5aa 100644 --- a/ubuntu/lucid_automake/kdeaccessibility/debian/ksayit-kde3.install +++ b/ubuntu/lucid_automake/kdeaccessibility/debian/ksayit-kde3.install @@ -1,5 +1,5 @@ debian/tmp/opt/kde3/bin/ksayit -debian/tmp/opt/kde3/include/kde/ksayit_fxplugin.h +debian/tmp/opt/kde3/include/tde/ksayit_fxplugin.h debian/tmp/opt/kde3/lib/kde3/libFreeverb_plugin.la debian/tmp/opt/kde3/lib/kde3/libFreeverb_plugin.so debian/tmp/opt/kde3/lib/libKTTSD_Lib.la diff --git a/ubuntu/lucid_automake/kdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/lucid_automake/kdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff index 3d5dc7628..e705cf83b 100644 --- a/ubuntu/lucid_automake/kdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/lucid_automake/kdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/opt/kde3/include/kde/kde.pot ++kdepotpath=/opt/kde3/include/tde/kde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/lucid_automake/kdeaccessibility/debian/rules b/ubuntu/lucid_automake/kdeaccessibility/debian/rules index 3b5ba7894..65a498129 100755 --- a/ubuntu/lucid_automake/kdeaccessibility/debian/rules +++ b/ubuntu/lucid_automake/kdeaccessibility/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info diff --git a/ubuntu/lucid_automake/kdeaddons/debian/cdbs/kde.mk b/ubuntu/lucid_automake/kdeaddons/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/lucid_automake/kdeaddons/debian/cdbs/kde.mk +++ b/ubuntu/lucid_automake/kdeaddons/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/lucid_automake/kdeaddons/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/lucid_automake/kdeaddons/debian/patches/common/kubuntu_01_kdepot.diff index 3d5dc7628..e705cf83b 100644 --- a/ubuntu/lucid_automake/kdeaddons/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/lucid_automake/kdeaddons/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/opt/kde3/include/kde/kde.pot ++kdepotpath=/opt/kde3/include/tde/kde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/lucid_automake/kdeaddons/debian/rules b/ubuntu/lucid_automake/kdeaddons/debian/rules index 63afd8206..2fa33b2fc 100755 --- a/ubuntu/lucid_automake/kdeaddons/debian/rules +++ b/ubuntu/lucid_automake/kdeaddons/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info diff --git a/ubuntu/lucid_automake/kdeadmin/debian/cdbs/kde.mk b/ubuntu/lucid_automake/kdeadmin/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/lucid_automake/kdeadmin/debian/cdbs/kde.mk +++ b/ubuntu/lucid_automake/kdeadmin/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/lucid_automake/kdeadmin/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/lucid_automake/kdeadmin/debian/patches/common/kubuntu_01_kdepot.diff index 3d5dc7628..e705cf83b 100644 --- a/ubuntu/lucid_automake/kdeadmin/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/lucid_automake/kdeadmin/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/opt/kde3/include/kde/kde.pot ++kdepotpath=/opt/kde3/include/tde/kde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/lucid_automake/kdeadmin/debian/rules b/ubuntu/lucid_automake/kdeadmin/debian/rules index 569175f46..079a2b2ed 100755 --- a/ubuntu/lucid_automake/kdeadmin/debian/rules +++ b/ubuntu/lucid_automake/kdeadmin/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info diff --git a/ubuntu/lucid_automake/kdeartwork/debian/cdbs/kde.mk b/ubuntu/lucid_automake/kdeartwork/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/lucid_automake/kdeartwork/debian/cdbs/kde.mk +++ b/ubuntu/lucid_automake/kdeartwork/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/lucid_automake/kdeartwork/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/lucid_automake/kdeartwork/debian/patches/common/kubuntu_01_kdepot.diff index 3d5dc7628..e705cf83b 100644 --- a/ubuntu/lucid_automake/kdeartwork/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/lucid_automake/kdeartwork/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/opt/kde3/include/kde/kde.pot ++kdepotpath=/opt/kde3/include/tde/kde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/lucid_automake/kdeartwork/debian/rules b/ubuntu/lucid_automake/kdeartwork/debian/rules index 26267a01d..b3e753c04 100755 --- a/ubuntu/lucid_automake/kdeartwork/debian/rules +++ b/ubuntu/lucid_automake/kdeartwork/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info diff --git a/ubuntu/lucid_automake/kdebase/debian/cdbs/kde.mk b/ubuntu/lucid_automake/kdebase/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/lucid_automake/kdebase/debian/cdbs/kde.mk +++ b/ubuntu/lucid_automake/kdebase/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/lucid_automake/kdebase/debian/kdebase-kde3-dev.install b/ubuntu/lucid_automake/kdebase/debian/kdebase-kde3-dev.install index b96074298..4b611029f 100644 --- a/ubuntu/lucid_automake/kdebase/debian/kdebase-kde3-dev.install +++ b/ubuntu/lucid_automake/kdebase/debian/kdebase-kde3-dev.install @@ -1,42 +1,42 @@ -debian/tmp/opt/kde3/include/kde/kate/application.h -debian/tmp/opt/kde3/include/kde/kate/documentmanager.h -debian/tmp/opt/kde3/include/kde/kate/mainwindow.h -debian/tmp/opt/kde3/include/kde/kate/pluginconfiginterfaceextension.h -debian/tmp/opt/kde3/include/kde/kate/pluginconfiginterface.h -debian/tmp/opt/kde3/include/kde/kate/plugin.h -debian/tmp/opt/kde3/include/kde/kate/pluginmanager.h -debian/tmp/opt/kde3/include/kde/kate/toolviewmanager.h -debian/tmp/opt/kde3/include/kde/kate/utils/dockviewbase.h -debian/tmp/opt/kde3/include/kde/kate/utils/listboxview.h -debian/tmp/opt/kde3/include/kde/kate/utils/messageview.h -debian/tmp/opt/kde3/include/kde/kate/viewmanager.h -debian/tmp/opt/kde3/include/kde/KBackgroundIface.h -debian/tmp/opt/kde3/include/kde/kcommondecoration.h -debian/tmp/opt/kde3/include/kde/kdecorationfactory.h -debian/tmp/opt/kde3/include/kde/kdecoration.h -debian/tmp/opt/kde3/include/kde/kdecoration_p.h -debian/tmp/opt/kde3/include/kde/kdecoration_plugins_p.h -debian/tmp/opt/kde3/include/kde/KDesktopIface.h -debian/tmp/opt/kde3/include/kde/kgreeterplugin.h -debian/tmp/opt/kde3/include/kde/konqsidebarplugin.h -debian/tmp/opt/kde3/include/kde/KonquerorIface.h -debian/tmp/opt/kde3/include/kde/KScreensaverIface.h -debian/tmp/opt/kde3/include/kde/ksgrd/HostConnector.h -debian/tmp/opt/kde3/include/kde/ksgrd/SensorAgent.h -debian/tmp/opt/kde3/include/kde/ksgrd/SensorClient.h -debian/tmp/opt/kde3/include/kde/ksgrd/SensorManager.h -debian/tmp/opt/kde3/include/kde/ksgrd/SensorShellAgent.h -debian/tmp/opt/kde3/include/kde/ksgrd/SensorSocketAgent.h -debian/tmp/opt/kde3/include/kde/ksgrd/StyleEngine.h -debian/tmp/opt/kde3/include/kde/ksgrd/StyleSettings.h -debian/tmp/opt/kde3/include/kde/ksgrd/TimerSettings.h -debian/tmp/opt/kde3/include/kde/ksplash/objkstheme.h -debian/tmp/opt/kde3/include/kde/ksplash/themeengine.h -debian/tmp/opt/kde3/include/kde/kwin/client.h -debian/tmp/opt/kde3/include/kde/KWinInterface.h -debian/tmp/opt/kde3/include/kde/kwin/kwinbutton.h -debian/tmp/opt/kde3/include/kde/kwin/options.h -debian/tmp/opt/kde3/include/kde/kwin/workspace.h +debian/tmp/opt/kde3/include/tde/kate/application.h +debian/tmp/opt/kde3/include/tde/kate/documentmanager.h +debian/tmp/opt/kde3/include/tde/kate/mainwindow.h +debian/tmp/opt/kde3/include/tde/kate/pluginconfiginterfaceextension.h +debian/tmp/opt/kde3/include/tde/kate/pluginconfiginterface.h +debian/tmp/opt/kde3/include/tde/kate/plugin.h +debian/tmp/opt/kde3/include/tde/kate/pluginmanager.h +debian/tmp/opt/kde3/include/tde/kate/toolviewmanager.h +debian/tmp/opt/kde3/include/tde/kate/utils/dockviewbase.h +debian/tmp/opt/kde3/include/tde/kate/utils/listboxview.h +debian/tmp/opt/kde3/include/tde/kate/utils/messageview.h +debian/tmp/opt/kde3/include/tde/kate/viewmanager.h +debian/tmp/opt/kde3/include/tde/KBackgroundIface.h +debian/tmp/opt/kde3/include/tde/kcommondecoration.h +debian/tmp/opt/kde3/include/tde/kdecorationfactory.h +debian/tmp/opt/kde3/include/tde/kdecoration.h +debian/tmp/opt/kde3/include/tde/kdecoration_p.h +debian/tmp/opt/kde3/include/tde/kdecoration_plugins_p.h +debian/tmp/opt/kde3/include/tde/KDesktopIface.h +debian/tmp/opt/kde3/include/tde/kgreeterplugin.h +debian/tmp/opt/kde3/include/tde/konqsidebarplugin.h +debian/tmp/opt/kde3/include/tde/KonquerorIface.h +debian/tmp/opt/kde3/include/tde/KScreensaverIface.h +debian/tmp/opt/kde3/include/tde/ksgrd/HostConnector.h +debian/tmp/opt/kde3/include/tde/ksgrd/SensorAgent.h +debian/tmp/opt/kde3/include/tde/ksgrd/SensorClient.h +debian/tmp/opt/kde3/include/tde/ksgrd/SensorManager.h +debian/tmp/opt/kde3/include/tde/ksgrd/SensorShellAgent.h +debian/tmp/opt/kde3/include/tde/ksgrd/SensorSocketAgent.h +debian/tmp/opt/kde3/include/tde/ksgrd/StyleEngine.h +debian/tmp/opt/kde3/include/tde/ksgrd/StyleSettings.h +debian/tmp/opt/kde3/include/tde/ksgrd/TimerSettings.h +debian/tmp/opt/kde3/include/tde/ksplash/objkstheme.h +debian/tmp/opt/kde3/include/tde/ksplash/themeengine.h +debian/tmp/opt/kde3/include/tde/kwin/client.h +debian/tmp/opt/kde3/include/tde/KWinInterface.h +debian/tmp/opt/kde3/include/tde/kwin/kwinbutton.h +debian/tmp/opt/kde3/include/tde/kwin/options.h +debian/tmp/opt/kde3/include/tde/kwin/workspace.h debian/tmp/opt/kde3/lib/libkasbar.la debian/tmp/opt/kde3/lib/libkasbar.so debian/tmp/opt/kde3/lib/libkateinterfaces.la diff --git a/ubuntu/lucid_automake/kdebase/debian/libkonq4-kde3-dev.install b/ubuntu/lucid_automake/kdebase/debian/libkonq4-kde3-dev.install index df661989e..0a992e7a3 100644 --- a/ubuntu/lucid_automake/kdebase/debian/libkonq4-kde3-dev.install +++ b/ubuntu/lucid_automake/kdebase/debian/libkonq4-kde3-dev.install @@ -1,23 +1,23 @@ -debian/tmp/opt/kde3/include/kde/kfileivi.h -debian/tmp/opt/kde3/include/kde/kivdirectoryoverlay.h -debian/tmp/opt/kde3/include/kde/knewmenu.h -debian/tmp/opt/kde3/include/kde/konqbookmarkmanager.h -debian/tmp/opt/kde3/include/kde/konq_defaults.h -debian/tmp/opt/kde3/include/kde/konq_dirpart.h -debian/tmp/opt/kde3/include/kde/konq_drag.h -debian/tmp/opt/kde3/include/kde/konq_events.h -debian/tmp/opt/kde3/include/kde/konq_faviconmgr.h -debian/tmp/opt/kde3/include/kde/konq_filetip.h -debian/tmp/opt/kde3/include/kde/konq_historycomm.h -debian/tmp/opt/kde3/include/kde/konq_historymgr.h -debian/tmp/opt/kde3/include/kde/konq_iconviewwidget.h -debian/tmp/opt/kde3/include/kde/konq_operations.h -debian/tmp/opt/kde3/include/kde/konq_pixmapprovider.h -debian/tmp/opt/kde3/include/kde/konq_popupmenu.h -debian/tmp/opt/kde3/include/kde/konq_propsview.h -debian/tmp/opt/kde3/include/kde/konq_settings.h -debian/tmp/opt/kde3/include/kde/konq_undo.h -debian/tmp/opt/kde3/include/kde/konq_xmlguiclient.h -debian/tmp/opt/kde3/include/kde/libkonq_export.h +debian/tmp/opt/kde3/include/tde/kfileivi.h +debian/tmp/opt/kde3/include/tde/kivdirectoryoverlay.h +debian/tmp/opt/kde3/include/tde/knewmenu.h +debian/tmp/opt/kde3/include/tde/konqbookmarkmanager.h +debian/tmp/opt/kde3/include/tde/konq_defaults.h +debian/tmp/opt/kde3/include/tde/konq_dirpart.h +debian/tmp/opt/kde3/include/tde/konq_drag.h +debian/tmp/opt/kde3/include/tde/konq_events.h +debian/tmp/opt/kde3/include/tde/konq_faviconmgr.h +debian/tmp/opt/kde3/include/tde/konq_filetip.h +debian/tmp/opt/kde3/include/tde/konq_historycomm.h +debian/tmp/opt/kde3/include/tde/konq_historymgr.h +debian/tmp/opt/kde3/include/tde/konq_iconviewwidget.h +debian/tmp/opt/kde3/include/tde/konq_operations.h +debian/tmp/opt/kde3/include/tde/konq_pixmapprovider.h +debian/tmp/opt/kde3/include/tde/konq_popupmenu.h +debian/tmp/opt/kde3/include/tde/konq_propsview.h +debian/tmp/opt/kde3/include/tde/konq_settings.h +debian/tmp/opt/kde3/include/tde/konq_undo.h +debian/tmp/opt/kde3/include/tde/konq_xmlguiclient.h +debian/tmp/opt/kde3/include/tde/libkonq_export.h debian/tmp/opt/kde3/lib/libkonq.la debian/tmp/opt/kde3/lib/libkonq.so diff --git a/ubuntu/lucid_automake/kdebase/debian/rules b/ubuntu/lucid_automake/kdebase/debian/rules index 5451ff821..6a3938cba 100755 --- a/ubuntu/lucid_automake/kdebase/debian/rules +++ b/ubuntu/lucid_automake/kdebase/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info diff --git a/ubuntu/lucid_automake/kdebindings/debian/cdbs/kde.mk b/ubuntu/lucid_automake/kdebindings/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/lucid_automake/kdebindings/debian/cdbs/kde.mk +++ b/ubuntu/lucid_automake/kdebindings/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/lucid_automake/kdebindings/debian/libkjsembed-kde3-dev.install b/ubuntu/lucid_automake/kdebindings/debian/libkjsembed-kde3-dev.install index 464862e4b..46e0e8860 100644 --- a/ubuntu/lucid_automake/kdebindings/debian/libkjsembed-kde3-dev.install +++ b/ubuntu/lucid_automake/kdebindings/debian/libkjsembed-kde3-dev.install @@ -1,4 +1,4 @@ -debian/tmp/opt/kde3/include/kde/kjsembed/* +debian/tmp/opt/kde3/include/tde/kjsembed/* debian/tmp/opt/kde3/lib/libkjsembed.so debian/tmp/opt/kde3/lib/libkjsembed.la diff --git a/ubuntu/lucid_automake/kdebindings/debian/libsmokeqt-kde3-dev.install b/ubuntu/lucid_automake/kdebindings/debian/libsmokeqt-kde3-dev.install index c577f4705..2816b0725 100644 --- a/ubuntu/lucid_automake/kdebindings/debian/libsmokeqt-kde3-dev.install +++ b/ubuntu/lucid_automake/kdebindings/debian/libsmokeqt-kde3-dev.install @@ -1,3 +1,3 @@ -debian/tmp/opt/kde3/include/kde/smoke.h +debian/tmp/opt/kde3/include/tde/smoke.h debian/tmp/opt/kde3/lib/libsmokeqt.so debian/tmp/opt/kde3/lib/libsmokeqt.la diff --git a/ubuntu/lucid_automake/kdebindings/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/lucid_automake/kdebindings/debian/patches/common/kubuntu_01_kdepot.diff index 3d5dc7628..e705cf83b 100644 --- a/ubuntu/lucid_automake/kdebindings/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/lucid_automake/kdebindings/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/opt/kde3/include/kde/kde.pot ++kdepotpath=/opt/kde3/include/tde/kde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/lucid_automake/kdebindings/debian/rules b/ubuntu/lucid_automake/kdebindings/debian/rules index ef053cb4f..2c8f64002 100755 --- a/ubuntu/lucid_automake/kdebindings/debian/rules +++ b/ubuntu/lucid_automake/kdebindings/debian/rules @@ -11,7 +11,7 @@ DEB_BUILDDIR := $(DEB_SRCDIR) include /usr/share/cdbs/1/rules/patchsys-quilt.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info diff --git a/ubuntu/lucid_automake/kdeedu/debian/cdbs/kde.mk b/ubuntu/lucid_automake/kdeedu/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/lucid_automake/kdeedu/debian/cdbs/kde.mk +++ b/ubuntu/lucid_automake/kdeedu/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/lucid_automake/kdeedu/debian/kstars-kde3.install b/ubuntu/lucid_automake/kdeedu/debian/kstars-kde3.install index 2fe8d7878..ce3c1d777 100644 --- a/ubuntu/lucid_automake/kdeedu/debian/kstars-kde3.install +++ b/ubuntu/lucid_automake/kdeedu/debian/kstars-kde3.install @@ -1,7 +1,7 @@ etc/kde3/kstarsrc opt/kde3/bin/kstars -/opt/kde3/include/kde/kstarsinterface.h -/opt/kde3/include/kde/simclockinterface.h +/opt/kde3/include/tde/kstarsinterface.h +/opt/kde3/include/tde/simclockinterface.h /opt/kde3/share/applications/kde/kstars.desktop /opt/kde3/share/config.kcfg/kstars.kcfg /opt/kde3/share/doc/kde/HTML/en/kstars/common diff --git a/ubuntu/lucid_automake/kdeedu/debian/libkdeedu-dev-kde3.install b/ubuntu/lucid_automake/kdeedu/debian/libkdeedu-dev-kde3.install index e4c27b132..2010f69d7 100644 --- a/ubuntu/lucid_automake/kdeedu/debian/libkdeedu-dev-kde3.install +++ b/ubuntu/lucid_automake/kdeedu/debian/libkdeedu-dev-kde3.install @@ -1,4 +1,4 @@ -/opt/kde3/include/kde/libkdeedu +/opt/kde3/include/tde/libkdeedu opt/kde3/lib/libextdate.la opt/kde3/lib/libextdate.so opt/kde3/lib/libkdeeducore.la diff --git a/ubuntu/lucid_automake/kdeedu/debian/libkiten-dev-kde3.install b/ubuntu/lucid_automake/kdeedu/debian/libkiten-dev-kde3.install index 172b79ec4..e5d3b77e2 100644 --- a/ubuntu/lucid_automake/kdeedu/debian/libkiten-dev-kde3.install +++ b/ubuntu/lucid_automake/kdeedu/debian/libkiten-dev-kde3.install @@ -1,3 +1,3 @@ -/opt/kde3/include/kde/libkiten +/opt/kde3/include/tde/libkiten opt/kde3/lib/libkiten.la opt/kde3/lib/libkiten.so diff --git a/ubuntu/lucid_automake/kdeedu/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/lucid_automake/kdeedu/debian/patches/common/kubuntu_01_kdepot.diff index 3d5dc7628..e705cf83b 100644 --- a/ubuntu/lucid_automake/kdeedu/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/lucid_automake/kdeedu/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/opt/kde3/include/kde/kde.pot ++kdepotpath=/opt/kde3/include/tde/kde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/lucid_automake/kdeedu/debian/rules b/ubuntu/lucid_automake/kdeedu/debian/rules index 42eadbc48..8d08807f7 100755 --- a/ubuntu/lucid_automake/kdeedu/debian/rules +++ b/ubuntu/lucid_automake/kdeedu/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info @@ -14,7 +14,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_DH_INSTALL_SOURCEDIR := $(DEB_DESTDIR) -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --includedir="/opt/kde3/include/kde" --mandir="/opt/kde3/share/man" --infodir="/opt/kde3/share/info" +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --includedir="/opt/kde3/include/tde" --mandir="/opt/kde3/share/man" --infodir="/opt/kde3/share/info" # Ensure that kig's python scripting built successfully. common-build-arch:: diff --git a/ubuntu/lucid_automake/kdegames/debian/atlantik-kde3-dev.install b/ubuntu/lucid_automake/kdegames/debian/atlantik-kde3-dev.install index 6800e895c..ae9e37c8d 100644 --- a/ubuntu/lucid_automake/kdegames/debian/atlantik-kde3-dev.install +++ b/ubuntu/lucid_automake/kdegames/debian/atlantik-kde3-dev.install @@ -1,5 +1,5 @@ -/opt/kde3/include/kde/atlantik -/opt/kde3/include/kde/atlantic +/opt/kde3/include/tde/atlantik +/opt/kde3/include/tde/atlantic /opt/kde3/lib/libatlantic.so /opt/kde3/lib/libatlantikclient.so /opt/kde3/lib/libatlantikui.so diff --git a/ubuntu/lucid_automake/kdegames/debian/cdbs/kde.mk b/ubuntu/lucid_automake/kdegames/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/lucid_automake/kdegames/debian/cdbs/kde.mk +++ b/ubuntu/lucid_automake/kdegames/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/lucid_automake/kdegames/debian/kolf-kde3-dev.install b/ubuntu/lucid_automake/kdegames/debian/kolf-kde3-dev.install index c161ea6c7..523af0de7 100644 --- a/ubuntu/lucid_automake/kdegames/debian/kolf-kde3-dev.install +++ b/ubuntu/lucid_automake/kdegames/debian/kolf-kde3-dev.install @@ -1,2 +1,2 @@ -/opt/kde3/include/kde/kolf +/opt/kde3/include/tde/kolf /opt/kde3/lib/libkolf.so diff --git a/ubuntu/lucid_automake/kdegames/debian/libkdegames-kde3-dev.install b/ubuntu/lucid_automake/kdegames/debian/libkdegames-kde3-dev.install index 79f0bb891..4847347f8 100644 --- a/ubuntu/lucid_automake/kdegames/debian/libkdegames-kde3-dev.install +++ b/ubuntu/lucid_automake/kdegames/debian/libkdegames-kde3-dev.install @@ -1,4 +1,4 @@ -/opt/kde3/include/kde/*.h -/opt/kde3/include/kde/kgame +/opt/kde3/include/tde/*.h +/opt/kde3/include/tde/kgame /opt/kde3/lib/libkdegames.so /opt/kde3/lib/libkdegames.la diff --git a/ubuntu/lucid_automake/kdegames/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/lucid_automake/kdegames/debian/patches/common/kubuntu_01_kdepot.diff index 3d5dc7628..e705cf83b 100644 --- a/ubuntu/lucid_automake/kdegames/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/lucid_automake/kdegames/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/opt/kde3/include/kde/kde.pot ++kdepotpath=/opt/kde3/include/tde/kde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/lucid_automake/kdegames/debian/rules b/ubuntu/lucid_automake/kdegames/debian/rules index 0e74a4bc4..f355f7883 100755 --- a/ubuntu/lucid_automake/kdegames/debian/rules +++ b/ubuntu/lucid_automake/kdegames/debian/rules @@ -7,7 +7,7 @@ include /usr/share/cdbs/1/rules/utils.mk export kde_bindir = /opt/kde3/games -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info diff --git a/ubuntu/lucid_automake/kdegraphics/debian/cdbs/kde.mk b/ubuntu/lucid_automake/kdegraphics/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/lucid_automake/kdegraphics/debian/cdbs/kde.mk +++ b/ubuntu/lucid_automake/kdegraphics/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/lucid_automake/kdegraphics/debian/kdegraphics-dev-kde3.install b/ubuntu/lucid_automake/kdegraphics/debian/kdegraphics-dev-kde3.install index 0af22b336..081a99fd4 100644 --- a/ubuntu/lucid_automake/kdegraphics/debian/kdegraphics-dev-kde3.install +++ b/ubuntu/lucid_automake/kdegraphics/debian/kdegraphics-dev-kde3.install @@ -1,184 +1,184 @@ -debian/tmp/opt/kde3/include/kde/dom/SVGAElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGAltGlyphDefElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGAltGlyphElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGAngle.h -debian/tmp/opt/kde3/include/kde/dom/SVGAnimateColorElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGAnimateElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGAnimateMotionElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGAnimateTransformElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGAnimatedAngle.h -debian/tmp/opt/kde3/include/kde/dom/SVGAnimatedBoolean.h -debian/tmp/opt/kde3/include/kde/dom/SVGAnimatedEnumeration.h -debian/tmp/opt/kde3/include/kde/dom/SVGAnimatedInteger.h -debian/tmp/opt/kde3/include/kde/dom/SVGAnimatedLength.h -debian/tmp/opt/kde3/include/kde/dom/SVGAnimatedLengthList.h -debian/tmp/opt/kde3/include/kde/dom/SVGAnimatedNumber.h -debian/tmp/opt/kde3/include/kde/dom/SVGAnimatedNumberList.h -debian/tmp/opt/kde3/include/kde/dom/SVGAnimatedPathData.h -debian/tmp/opt/kde3/include/kde/dom/SVGAnimatedPoints.h -debian/tmp/opt/kde3/include/kde/dom/SVGAnimatedPreserveAspectRatio.h -debian/tmp/opt/kde3/include/kde/dom/SVGAnimatedRect.h -debian/tmp/opt/kde3/include/kde/dom/SVGAnimatedString.h -debian/tmp/opt/kde3/include/kde/dom/SVGAnimatedTransformList.h -debian/tmp/opt/kde3/include/kde/dom/SVGAnimationElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGCSSRule.h -debian/tmp/opt/kde3/include/kde/dom/SVGCircleElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGClipPathElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGColor.h -debian/tmp/opt/kde3/include/kde/dom/SVGColorProfileElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGColorProfileRule.h -debian/tmp/opt/kde3/include/kde/dom/SVGComponentTransferFunctionElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGCursorElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGDefinitionSrcElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGDefsElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGDescElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGDocument.h -debian/tmp/opt/kde3/include/kde/dom/SVGElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGElementInstance.h -debian/tmp/opt/kde3/include/kde/dom/SVGElementInstanceList.h -debian/tmp/opt/kde3/include/kde/dom/SVGEllipseElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGEvent.h -debian/tmp/opt/kde3/include/kde/dom/SVGException.h -debian/tmp/opt/kde3/include/kde/dom/SVGExternalResourcesRequired.h -debian/tmp/opt/kde3/include/kde/dom/SVGFEBlendElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGFEColorMatrixElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGFEComponentTransferElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGFECompositeElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGFEConvolveMatrixElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGFEDiffuseLightingElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGFEDisplacementMapElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGFEDistantLightElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGFEFloodElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGFEFuncAElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGFEFuncBElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGFEFuncGElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGFEFuncRElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGFEGaussianBlurElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGFEImageElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGFEMergeElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGFEMergeNodeElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGFEMorphologyElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGFEOffsetElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGFEPointLightElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGFESpecularLightingElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGFESpotLightElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGFETileElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGFETurbulenceElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGFilterElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGFilterPrimitiveStandardAttributes.h -debian/tmp/opt/kde3/include/kde/dom/SVGFitToViewBox.h -debian/tmp/opt/kde3/include/kde/dom/SVGFontElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGFontFaceElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGFontFaceFormatElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGFontFaceNameElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGFontFaceSrcElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGFontFaceUriElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGForeignObjectElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGGElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGGlyphElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGGlyphRefElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGGradientElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGHKernElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGICCColor.h -debian/tmp/opt/kde3/include/kde/dom/SVGImageElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGLangSpace.h -debian/tmp/opt/kde3/include/kde/dom/SVGLength.h -debian/tmp/opt/kde3/include/kde/dom/SVGLengthList.h -debian/tmp/opt/kde3/include/kde/dom/SVGLineElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGLinearGradientElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGLocatable.h -debian/tmp/opt/kde3/include/kde/dom/SVGMPathElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGMarkerElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGMaskElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGMatrix.h -debian/tmp/opt/kde3/include/kde/dom/SVGMetadataElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGMissingGlyphElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGNumber.h -debian/tmp/opt/kde3/include/kde/dom/SVGNumberList.h -debian/tmp/opt/kde3/include/kde/dom/SVGPaint.h -debian/tmp/opt/kde3/include/kde/dom/SVGPathElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGPathSeg.h -debian/tmp/opt/kde3/include/kde/dom/SVGPathSegArc.h -debian/tmp/opt/kde3/include/kde/dom/SVGPathSegClosePath.h -debian/tmp/opt/kde3/include/kde/dom/SVGPathSegCurvetoCubic.h -debian/tmp/opt/kde3/include/kde/dom/SVGPathSegCurvetoCubicSmooth.h -debian/tmp/opt/kde3/include/kde/dom/SVGPathSegCurvetoQuadratic.h -debian/tmp/opt/kde3/include/kde/dom/SVGPathSegCurvetoQuadraticSmooth.h -debian/tmp/opt/kde3/include/kde/dom/SVGPathSegLineto.h -debian/tmp/opt/kde3/include/kde/dom/SVGPathSegLinetoHorizontal.h -debian/tmp/opt/kde3/include/kde/dom/SVGPathSegLinetoVertical.h -debian/tmp/opt/kde3/include/kde/dom/SVGPathSegList.h -debian/tmp/opt/kde3/include/kde/dom/SVGPathSegMoveto.h -debian/tmp/opt/kde3/include/kde/dom/SVGPatternElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGPoint.h -debian/tmp/opt/kde3/include/kde/dom/SVGPointList.h -debian/tmp/opt/kde3/include/kde/dom/SVGPolygonElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGPolylineElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGPreserveAspectRatio.h -debian/tmp/opt/kde3/include/kde/dom/SVGRadialGradientElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGRect.h -debian/tmp/opt/kde3/include/kde/dom/SVGRectElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGRenderingIntent.h -debian/tmp/opt/kde3/include/kde/dom/SVGSVGElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGScriptElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGSetElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGStopElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGStringList.h -debian/tmp/opt/kde3/include/kde/dom/SVGStylable.h -debian/tmp/opt/kde3/include/kde/dom/SVGStyleElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGSwitchElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGSymbolElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGTRefElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGTSpanElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGTests.h -debian/tmp/opt/kde3/include/kde/dom/SVGTextContentElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGTextElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGTextPathElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGTextPositioningElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGTitleElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGTransform.h -debian/tmp/opt/kde3/include/kde/dom/SVGTransformList.h -debian/tmp/opt/kde3/include/kde/dom/SVGTransformable.h -debian/tmp/opt/kde3/include/kde/dom/SVGURIReference.h -debian/tmp/opt/kde3/include/kde/dom/SVGUnitTypes.h -debian/tmp/opt/kde3/include/kde/dom/SVGUseElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGVKernElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGViewElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGViewSpec.h -debian/tmp/opt/kde3/include/kde/dom/SVGWindow.h -debian/tmp/opt/kde3/include/kde/dom/SVGZoomAndPan.h -debian/tmp/opt/kde3/include/kde/dom/SVGZoomEvent.h -debian/tmp/opt/kde3/include/kde/kfaximage.h -debian/tmp/opt/kde3/include/kde/kmultipageInterface.h -debian/tmp/opt/kde3/include/kde/ksvg/CanvasFactory.h -debian/tmp/opt/kde3/include/kde/ksvg/CanvasItem.h -debian/tmp/opt/kde3/include/kde/ksvg/CanvasItems.h -debian/tmp/opt/kde3/include/kde/ksvg/DocumentFactory.h -debian/tmp/opt/kde3/include/kde/ksvg/KSVGCanvas.h -debian/tmp/opt/kde3/include/kde/ksvg/ksvg_plugin.h -debian/tmp/opt/kde3/include/kde/kviewshell/anchor.h -debian/tmp/opt/kde3/include/kde/kviewshell/bookmark.h -debian/tmp/opt/kde3/include/kde/kviewshell/pageView.h -debian/tmp/opt/kde3/include/kde/kviewshell/documentPageCache.h -debian/tmp/opt/kde3/include/kde/kviewshell/documentRenderer.h -debian/tmp/opt/kde3/include/kde/kviewshell/documentWidget.h -debian/tmp/opt/kde3/include/kde/kviewshell/history.h -debian/tmp/opt/kde3/include/kde/kviewshell/hyperlink.h -debian/tmp/opt/kde3/include/kde/kviewshell/kmultipage.h -debian/tmp/opt/kde3/include/kde/kviewshell/length.h -debian/tmp/opt/kde3/include/kde/kviewshell/pageNumber.h -debian/tmp/opt/kde3/include/kde/kviewshell/pageSize.h -debian/tmp/opt/kde3/include/kde/kviewshell/renderedDocumentPage.h -debian/tmp/opt/kde3/include/kde/kviewshell/renderedDocumentPagePixmap.h -debian/tmp/opt/kde3/include/kde/kviewshell/renderedDocumentPagePrinter.h -debian/tmp/opt/kde3/include/kde/kviewshell/selection.h -debian/tmp/opt/kde3/include/kde/kviewshell/simplePageSize.h -debian/tmp/opt/kde3/include/kde/kviewshell/textBox.h -debian/tmp/opt/kde3/include/kde/kviewshell/zoom.h -debian/tmp/opt/kde3/include/kde/kviewshell/zoomlimits.h -debian/tmp/opt/kde3/include/kde/libtext2path-0.1/BezierPath.h -debian/tmp/opt/kde3/include/kde/libtext2path-0.1/Glyph.h -debian/tmp/opt/kde3/include/kde/libtext2path-0.1/GlyphTracer.h +debian/tmp/opt/kde3/include/tde/dom/SVGAElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGAltGlyphDefElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGAltGlyphElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGAngle.h +debian/tmp/opt/kde3/include/tde/dom/SVGAnimateColorElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGAnimateElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGAnimateMotionElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGAnimateTransformElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGAnimatedAngle.h +debian/tmp/opt/kde3/include/tde/dom/SVGAnimatedBoolean.h +debian/tmp/opt/kde3/include/tde/dom/SVGAnimatedEnumeration.h +debian/tmp/opt/kde3/include/tde/dom/SVGAnimatedInteger.h +debian/tmp/opt/kde3/include/tde/dom/SVGAnimatedLength.h +debian/tmp/opt/kde3/include/tde/dom/SVGAnimatedLengthList.h +debian/tmp/opt/kde3/include/tde/dom/SVGAnimatedNumber.h +debian/tmp/opt/kde3/include/tde/dom/SVGAnimatedNumberList.h +debian/tmp/opt/kde3/include/tde/dom/SVGAnimatedPathData.h +debian/tmp/opt/kde3/include/tde/dom/SVGAnimatedPoints.h +debian/tmp/opt/kde3/include/tde/dom/SVGAnimatedPreserveAspectRatio.h +debian/tmp/opt/kde3/include/tde/dom/SVGAnimatedRect.h +debian/tmp/opt/kde3/include/tde/dom/SVGAnimatedString.h +debian/tmp/opt/kde3/include/tde/dom/SVGAnimatedTransformList.h +debian/tmp/opt/kde3/include/tde/dom/SVGAnimationElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGCSSRule.h +debian/tmp/opt/kde3/include/tde/dom/SVGCircleElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGClipPathElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGColor.h +debian/tmp/opt/kde3/include/tde/dom/SVGColorProfileElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGColorProfileRule.h +debian/tmp/opt/kde3/include/tde/dom/SVGComponentTransferFunctionElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGCursorElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGDefinitionSrcElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGDefsElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGDescElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGDocument.h +debian/tmp/opt/kde3/include/tde/dom/SVGElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGElementInstance.h +debian/tmp/opt/kde3/include/tde/dom/SVGElementInstanceList.h +debian/tmp/opt/kde3/include/tde/dom/SVGEllipseElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGEvent.h +debian/tmp/opt/kde3/include/tde/dom/SVGException.h +debian/tmp/opt/kde3/include/tde/dom/SVGExternalResourcesRequired.h +debian/tmp/opt/kde3/include/tde/dom/SVGFEBlendElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGFEColorMatrixElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGFEComponentTransferElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGFECompositeElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGFEConvolveMatrixElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGFEDiffuseLightingElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGFEDisplacementMapElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGFEDistantLightElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGFEFloodElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGFEFuncAElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGFEFuncBElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGFEFuncGElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGFEFuncRElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGFEGaussianBlurElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGFEImageElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGFEMergeElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGFEMergeNodeElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGFEMorphologyElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGFEOffsetElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGFEPointLightElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGFESpecularLightingElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGFESpotLightElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGFETileElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGFETurbulenceElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGFilterElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGFilterPrimitiveStandardAttributes.h +debian/tmp/opt/kde3/include/tde/dom/SVGFitToViewBox.h +debian/tmp/opt/kde3/include/tde/dom/SVGFontElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGFontFaceElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGFontFaceFormatElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGFontFaceNameElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGFontFaceSrcElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGFontFaceUriElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGForeignObjectElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGGElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGGlyphElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGGlyphRefElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGGradientElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGHKernElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGICCColor.h +debian/tmp/opt/kde3/include/tde/dom/SVGImageElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGLangSpace.h +debian/tmp/opt/kde3/include/tde/dom/SVGLength.h +debian/tmp/opt/kde3/include/tde/dom/SVGLengthList.h +debian/tmp/opt/kde3/include/tde/dom/SVGLineElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGLinearGradientElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGLocatable.h +debian/tmp/opt/kde3/include/tde/dom/SVGMPathElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGMarkerElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGMaskElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGMatrix.h +debian/tmp/opt/kde3/include/tde/dom/SVGMetadataElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGMissingGlyphElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGNumber.h +debian/tmp/opt/kde3/include/tde/dom/SVGNumberList.h +debian/tmp/opt/kde3/include/tde/dom/SVGPaint.h +debian/tmp/opt/kde3/include/tde/dom/SVGPathElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGPathSeg.h +debian/tmp/opt/kde3/include/tde/dom/SVGPathSegArc.h +debian/tmp/opt/kde3/include/tde/dom/SVGPathSegClosePath.h +debian/tmp/opt/kde3/include/tde/dom/SVGPathSegCurvetoCubic.h +debian/tmp/opt/kde3/include/tde/dom/SVGPathSegCurvetoCubicSmooth.h +debian/tmp/opt/kde3/include/tde/dom/SVGPathSegCurvetoQuadratic.h +debian/tmp/opt/kde3/include/tde/dom/SVGPathSegCurvetoQuadraticSmooth.h +debian/tmp/opt/kde3/include/tde/dom/SVGPathSegLineto.h +debian/tmp/opt/kde3/include/tde/dom/SVGPathSegLinetoHorizontal.h +debian/tmp/opt/kde3/include/tde/dom/SVGPathSegLinetoVertical.h +debian/tmp/opt/kde3/include/tde/dom/SVGPathSegList.h +debian/tmp/opt/kde3/include/tde/dom/SVGPathSegMoveto.h +debian/tmp/opt/kde3/include/tde/dom/SVGPatternElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGPoint.h +debian/tmp/opt/kde3/include/tde/dom/SVGPointList.h +debian/tmp/opt/kde3/include/tde/dom/SVGPolygonElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGPolylineElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGPreserveAspectRatio.h +debian/tmp/opt/kde3/include/tde/dom/SVGRadialGradientElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGRect.h +debian/tmp/opt/kde3/include/tde/dom/SVGRectElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGRenderingIntent.h +debian/tmp/opt/kde3/include/tde/dom/SVGSVGElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGScriptElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGSetElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGStopElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGStringList.h +debian/tmp/opt/kde3/include/tde/dom/SVGStylable.h +debian/tmp/opt/kde3/include/tde/dom/SVGStyleElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGSwitchElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGSymbolElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGTRefElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGTSpanElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGTests.h +debian/tmp/opt/kde3/include/tde/dom/SVGTextContentElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGTextElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGTextPathElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGTextPositioningElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGTitleElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGTransform.h +debian/tmp/opt/kde3/include/tde/dom/SVGTransformList.h +debian/tmp/opt/kde3/include/tde/dom/SVGTransformable.h +debian/tmp/opt/kde3/include/tde/dom/SVGURIReference.h +debian/tmp/opt/kde3/include/tde/dom/SVGUnitTypes.h +debian/tmp/opt/kde3/include/tde/dom/SVGUseElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGVKernElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGViewElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGViewSpec.h +debian/tmp/opt/kde3/include/tde/dom/SVGWindow.h +debian/tmp/opt/kde3/include/tde/dom/SVGZoomAndPan.h +debian/tmp/opt/kde3/include/tde/dom/SVGZoomEvent.h +debian/tmp/opt/kde3/include/tde/kfaximage.h +debian/tmp/opt/kde3/include/tde/kmultipageInterface.h +debian/tmp/opt/kde3/include/tde/ksvg/CanvasFactory.h +debian/tmp/opt/kde3/include/tde/ksvg/CanvasItem.h +debian/tmp/opt/kde3/include/tde/ksvg/CanvasItems.h +debian/tmp/opt/kde3/include/tde/ksvg/DocumentFactory.h +debian/tmp/opt/kde3/include/tde/ksvg/KSVGCanvas.h +debian/tmp/opt/kde3/include/tde/ksvg/ksvg_plugin.h +debian/tmp/opt/kde3/include/tde/kviewshell/anchor.h +debian/tmp/opt/kde3/include/tde/kviewshell/bookmark.h +debian/tmp/opt/kde3/include/tde/kviewshell/pageView.h +debian/tmp/opt/kde3/include/tde/kviewshell/documentPageCache.h +debian/tmp/opt/kde3/include/tde/kviewshell/documentRenderer.h +debian/tmp/opt/kde3/include/tde/kviewshell/documentWidget.h +debian/tmp/opt/kde3/include/tde/kviewshell/history.h +debian/tmp/opt/kde3/include/tde/kviewshell/hyperlink.h +debian/tmp/opt/kde3/include/tde/kviewshell/kmultipage.h +debian/tmp/opt/kde3/include/tde/kviewshell/length.h +debian/tmp/opt/kde3/include/tde/kviewshell/pageNumber.h +debian/tmp/opt/kde3/include/tde/kviewshell/pageSize.h +debian/tmp/opt/kde3/include/tde/kviewshell/renderedDocumentPage.h +debian/tmp/opt/kde3/include/tde/kviewshell/renderedDocumentPagePixmap.h +debian/tmp/opt/kde3/include/tde/kviewshell/renderedDocumentPagePrinter.h +debian/tmp/opt/kde3/include/tde/kviewshell/selection.h +debian/tmp/opt/kde3/include/tde/kviewshell/simplePageSize.h +debian/tmp/opt/kde3/include/tde/kviewshell/textBox.h +debian/tmp/opt/kde3/include/tde/kviewshell/zoom.h +debian/tmp/opt/kde3/include/tde/kviewshell/zoomlimits.h +debian/tmp/opt/kde3/include/tde/libtext2path-0.1/BezierPath.h +debian/tmp/opt/kde3/include/tde/libtext2path-0.1/Glyph.h +debian/tmp/opt/kde3/include/tde/libtext2path-0.1/GlyphTracer.h debian/tmp/opt/kde3/lib/libkdeinit_kview.la debian/tmp/opt/kde3/lib/libkdeinit_mrmlsearch.la debian/tmp/opt/kde3/lib/libkghostviewlib.la diff --git a/ubuntu/lucid_automake/kdegraphics/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/lucid_automake/kdegraphics/debian/patches/common/kubuntu_01_kdepot.diff index 3d5dc7628..e705cf83b 100644 --- a/ubuntu/lucid_automake/kdegraphics/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/lucid_automake/kdegraphics/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/opt/kde3/include/kde/kde.pot ++kdepotpath=/opt/kde3/include/tde/kde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/lucid_automake/kdegraphics/debian/rules b/ubuntu/lucid_automake/kdegraphics/debian/rules index 6974a0ca2..d8c5070a6 100755 --- a/ubuntu/lucid_automake/kdegraphics/debian/rules +++ b/ubuntu/lucid_automake/kdegraphics/debian/rules @@ -5,14 +5,14 @@ include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --includedir="/opt/kde3/include/kde" --mandir="/opt/kde3/share/man" --infodir="/opt/kde3/share/info" --with-extra-libs="/usr/lib/mesa" +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --includedir="/opt/kde3/include/tde" --mandir="/opt/kde3/share/man" --infodir="/opt/kde3/share/info" --with-extra-libs="/usr/lib/mesa" DEB_DH_STRIP_ARGS := --dbg-package=kdegraphics-kde3-dbg diff --git a/ubuntu/lucid_automake/kdelibs/debian/cdbs/kde.mk b/ubuntu/lucid_automake/kdelibs/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/lucid_automake/kdelibs/debian/cdbs/kde.mk +++ b/ubuntu/lucid_automake/kdelibs/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/lucid_automake/kdelibs/debian/changelog b/ubuntu/lucid_automake/kdelibs/debian/changelog index 9e6d8143f..bc7c7eed5 100644 --- a/ubuntu/lucid_automake/kdelibs/debian/changelog +++ b/ubuntu/lucid_automake/kdelibs/debian/changelog @@ -2087,7 +2087,7 @@ kdelibs (4:3.4.0-0pre5) alioth; urgency=low output them expanded even when --expandvars is not used. (Closes: #287822) * Fixed the ability of the build system to find kde.pot, even when it is not - located at TDEDIR/include/kde.pot. This allows the use of targets such as + located at TDEDIR/include/tde.pot. This allows the use of targets such as "package-messages" without specifying includedir. (Closes: #283858) * Now that graphviz is in main, add it to Build-Depends-Indep together with @@ -2394,8 +2394,8 @@ kdelibs (4:3.3.2-0pre1) experimental; urgency=low - usr/share/apps/ksgmltools2/customization/cs/entities/underLGPL.docbook * New entries in debian/kdelibs4-dev.install: - - usr/include/kde/kiobuffer.h - - usr/include/kde/kwallettypes.h + - usr/include/tde/kiobuffer.h + - usr/include/tde/kwallettypes.h * debian/control: - removed unneeded build-dependency on automake1.9. [CM] diff --git a/ubuntu/lucid_automake/kdelibs/debian/kdelibs4-kde3-dev.install b/ubuntu/lucid_automake/kdelibs/debian/kdelibs4-kde3-dev.install index e2b5d076c..8477c382c 100644 --- a/ubuntu/lucid_automake/kdelibs/debian/kdelibs4-kde3-dev.install +++ b/ubuntu/lucid_automake/kdelibs/debian/kdelibs4-kde3-dev.install @@ -8,715 +8,715 @@ debian/tmp/opt/kde3/bin/kunittestmodrunner debian/tmp/opt/kde3/bin/makekdewidgets debian/tmp/opt/kde3/bin/preparetips -debian/tmp/opt/kde3/include/kde/arts/artskde.h -debian/tmp/opt/kde3/include/kde/arts/kartsdispatcher.h -debian/tmp/opt/kde3/include/kde/arts/kartsfloatwatch.h -debian/tmp/opt/kde3/include/kde/arts/kartsserver.h -debian/tmp/opt/kde3/include/kde/arts/kaudiomanagerplay.h -debian/tmp/opt/kde3/include/kde/arts/kaudioplaystream.h -debian/tmp/opt/kde3/include/kde/arts/kaudiorecordstream.h -debian/tmp/opt/kde3/include/kde/arts/kplayobjectfactory.h -debian/tmp/opt/kde3/include/kde/arts/kplayobject.h -debian/tmp/opt/kde3/include/kde/arts/kvideowidget.h -debian/tmp/opt/kde3/include/kde/dcopclient.h -debian/tmp/opt/kde3/include/kde/dcopobject.h -debian/tmp/opt/kde3/include/kde/dcopref.h -debian/tmp/opt/kde3/include/kde/dcopstub.h -debian/tmp/opt/kde3/include/kde/dcoptypes.h -debian/tmp/opt/kde3/include/kde/dnssd/domainbrowser.h -debian/tmp/opt/kde3/include/kde/dnssd/publicservice.h -debian/tmp/opt/kde3/include/kde/dnssd/query.h -debian/tmp/opt/kde3/include/kde/dnssd/remoteservice.h -debian/tmp/opt/kde3/include/kde/dnssd/servicebase.h -debian/tmp/opt/kde3/include/kde/dnssd/servicebrowser.h -debian/tmp/opt/kde3/include/kde/dnssd/settings.h -debian/tmp/opt/kde3/include/kde/dom/css_rule.h -debian/tmp/opt/kde3/include/kde/dom/css_stylesheet.h -debian/tmp/opt/kde3/include/kde/dom/css_value.h -debian/tmp/opt/kde3/include/kde/dom/dom2_events.h -debian/tmp/opt/kde3/include/kde/dom/dom2_range.h -debian/tmp/opt/kde3/include/kde/dom/dom2_traversal.h -debian/tmp/opt/kde3/include/kde/dom/dom2_views.h -debian/tmp/opt/kde3/include/kde/dom/dom_core.h -debian/tmp/opt/kde3/include/kde/dom/dom_doc.h -debian/tmp/opt/kde3/include/kde/dom/dom_element.h -debian/tmp/opt/kde3/include/kde/dom/dom_exception.h -debian/tmp/opt/kde3/include/kde/dom/dom_html.h -debian/tmp/opt/kde3/include/kde/dom/dom_misc.h -debian/tmp/opt/kde3/include/kde/dom/dom_node.h -debian/tmp/opt/kde3/include/kde/dom/dom_string.h -debian/tmp/opt/kde3/include/kde/dom/dom_text.h -debian/tmp/opt/kde3/include/kde/dom/dom_xml.h -debian/tmp/opt/kde3/include/kde/dom/html_base.h -debian/tmp/opt/kde3/include/kde/dom/html_block.h -debian/tmp/opt/kde3/include/kde/dom/html_document.h -debian/tmp/opt/kde3/include/kde/dom/html_element.h -debian/tmp/opt/kde3/include/kde/dom/html_form.h -debian/tmp/opt/kde3/include/kde/dom/html_head.h -debian/tmp/opt/kde3/include/kde/dom/html_image.h -debian/tmp/opt/kde3/include/kde/dom/html_inline.h -debian/tmp/opt/kde3/include/kde/dom/html_list.h -debian/tmp/opt/kde3/include/kde/dom/html_misc.h -debian/tmp/opt/kde3/include/kde/dom/html_object.h -debian/tmp/opt/kde3/include/kde/dom/html_table.h -debian/tmp/opt/kde3/include/kde/fixx11h.h -debian/tmp/opt/kde3/include/kde/kabc/addressbook.h -debian/tmp/opt/kde3/include/kde/kabc/addresseedialog.h -debian/tmp/opt/kde3/include/kde/kabc/addressee.h -debian/tmp/opt/kde3/include/kde/kabc/addresseelist.h -debian/tmp/opt/kde3/include/kde/kabc/address.h -debian/tmp/opt/kde3/include/kde/kabc/addresslineedit.h -debian/tmp/opt/kde3/include/kde/kabc/agent.h -debian/tmp/opt/kde3/include/kde/kabc/distributionlistdialog.h -debian/tmp/opt/kde3/include/kde/kabc/distributionlisteditor.h -debian/tmp/opt/kde3/include/kde/kabc/distributionlist.h -debian/tmp/opt/kde3/include/kde/kabc/errorhandler.h -debian/tmp/opt/kde3/include/kde/kabc/field.h -debian/tmp/opt/kde3/include/kde/kabc/formatfactory.h -debian/tmp/opt/kde3/include/kde/kabc/format.h -debian/tmp/opt/kde3/include/kde/kabc/formatplugin.h -debian/tmp/opt/kde3/include/kde/kabc/geo.h -debian/tmp/opt/kde3/include/kde/kabc/key.h -debian/tmp/opt/kde3/include/kde/kabc/ldapclient.h -debian/tmp/opt/kde3/include/kde/kabc/ldapconfigwidget.h -debian/tmp/opt/kde3/include/kde/kabc/ldapurl.h -debian/tmp/opt/kde3/include/kde/kabc/ldifconverter.h -debian/tmp/opt/kde3/include/kde/kabc/ldif.h -debian/tmp/opt/kde3/include/kde/kabc/lock.h -debian/tmp/opt/kde3/include/kde/kabc/locknull.h -debian/tmp/opt/kde3/include/kde/kabc/phonenumber.h -debian/tmp/opt/kde3/include/kde/kabc/picture.h -debian/tmp/opt/kde3/include/kde/kabc/plugin.h -debian/tmp/opt/kde3/include/kde/kabc/resourcedir.h -debian/tmp/opt/kde3/include/kde/kabc/resourcefile.h -debian/tmp/opt/kde3/include/kde/kabc/resource.h -debian/tmp/opt/kde3/include/kde/kabc/resourceldapkio.h +debian/tmp/opt/kde3/include/tde/arts/artskde.h +debian/tmp/opt/kde3/include/tde/arts/kartsdispatcher.h +debian/tmp/opt/kde3/include/tde/arts/kartsfloatwatch.h +debian/tmp/opt/kde3/include/tde/arts/kartsserver.h +debian/tmp/opt/kde3/include/tde/arts/kaudiomanagerplay.h +debian/tmp/opt/kde3/include/tde/arts/kaudioplaystream.h +debian/tmp/opt/kde3/include/tde/arts/kaudiorecordstream.h +debian/tmp/opt/kde3/include/tde/arts/kplayobjectfactory.h +debian/tmp/opt/kde3/include/tde/arts/kplayobject.h +debian/tmp/opt/kde3/include/tde/arts/kvideowidget.h +debian/tmp/opt/kde3/include/tde/dcopclient.h +debian/tmp/opt/kde3/include/tde/dcopobject.h +debian/tmp/opt/kde3/include/tde/dcopref.h +debian/tmp/opt/kde3/include/tde/dcopstub.h +debian/tmp/opt/kde3/include/tde/dcoptypes.h +debian/tmp/opt/kde3/include/tde/dnssd/domainbrowser.h +debian/tmp/opt/kde3/include/tde/dnssd/publicservice.h +debian/tmp/opt/kde3/include/tde/dnssd/query.h +debian/tmp/opt/kde3/include/tde/dnssd/remoteservice.h +debian/tmp/opt/kde3/include/tde/dnssd/servicebase.h +debian/tmp/opt/kde3/include/tde/dnssd/servicebrowser.h +debian/tmp/opt/kde3/include/tde/dnssd/settings.h +debian/tmp/opt/kde3/include/tde/dom/css_rule.h +debian/tmp/opt/kde3/include/tde/dom/css_stylesheet.h +debian/tmp/opt/kde3/include/tde/dom/css_value.h +debian/tmp/opt/kde3/include/tde/dom/dom2_events.h +debian/tmp/opt/kde3/include/tde/dom/dom2_range.h +debian/tmp/opt/kde3/include/tde/dom/dom2_traversal.h +debian/tmp/opt/kde3/include/tde/dom/dom2_views.h +debian/tmp/opt/kde3/include/tde/dom/dom_core.h +debian/tmp/opt/kde3/include/tde/dom/dom_doc.h +debian/tmp/opt/kde3/include/tde/dom/dom_element.h +debian/tmp/opt/kde3/include/tde/dom/dom_exception.h +debian/tmp/opt/kde3/include/tde/dom/dom_html.h +debian/tmp/opt/kde3/include/tde/dom/dom_misc.h +debian/tmp/opt/kde3/include/tde/dom/dom_node.h +debian/tmp/opt/kde3/include/tde/dom/dom_string.h +debian/tmp/opt/kde3/include/tde/dom/dom_text.h +debian/tmp/opt/kde3/include/tde/dom/dom_xml.h +debian/tmp/opt/kde3/include/tde/dom/html_base.h +debian/tmp/opt/kde3/include/tde/dom/html_block.h +debian/tmp/opt/kde3/include/tde/dom/html_document.h +debian/tmp/opt/kde3/include/tde/dom/html_element.h +debian/tmp/opt/kde3/include/tde/dom/html_form.h +debian/tmp/opt/kde3/include/tde/dom/html_head.h +debian/tmp/opt/kde3/include/tde/dom/html_image.h +debian/tmp/opt/kde3/include/tde/dom/html_inline.h +debian/tmp/opt/kde3/include/tde/dom/html_list.h +debian/tmp/opt/kde3/include/tde/dom/html_misc.h +debian/tmp/opt/kde3/include/tde/dom/html_object.h +debian/tmp/opt/kde3/include/tde/dom/html_table.h +debian/tmp/opt/kde3/include/tde/fixx11h.h +debian/tmp/opt/kde3/include/tde/kabc/addressbook.h +debian/tmp/opt/kde3/include/tde/kabc/addresseedialog.h +debian/tmp/opt/kde3/include/tde/kabc/addressee.h +debian/tmp/opt/kde3/include/tde/kabc/addresseelist.h +debian/tmp/opt/kde3/include/tde/kabc/address.h +debian/tmp/opt/kde3/include/tde/kabc/addresslineedit.h +debian/tmp/opt/kde3/include/tde/kabc/agent.h +debian/tmp/opt/kde3/include/tde/kabc/distributionlistdialog.h +debian/tmp/opt/kde3/include/tde/kabc/distributionlisteditor.h +debian/tmp/opt/kde3/include/tde/kabc/distributionlist.h +debian/tmp/opt/kde3/include/tde/kabc/errorhandler.h +debian/tmp/opt/kde3/include/tde/kabc/field.h +debian/tmp/opt/kde3/include/tde/kabc/formatfactory.h +debian/tmp/opt/kde3/include/tde/kabc/format.h +debian/tmp/opt/kde3/include/tde/kabc/formatplugin.h +debian/tmp/opt/kde3/include/tde/kabc/geo.h +debian/tmp/opt/kde3/include/tde/kabc/key.h +debian/tmp/opt/kde3/include/tde/kabc/ldapclient.h +debian/tmp/opt/kde3/include/tde/kabc/ldapconfigwidget.h +debian/tmp/opt/kde3/include/tde/kabc/ldapurl.h +debian/tmp/opt/kde3/include/tde/kabc/ldifconverter.h +debian/tmp/opt/kde3/include/tde/kabc/ldif.h +debian/tmp/opt/kde3/include/tde/kabc/lock.h +debian/tmp/opt/kde3/include/tde/kabc/locknull.h +debian/tmp/opt/kde3/include/tde/kabc/phonenumber.h +debian/tmp/opt/kde3/include/tde/kabc/picture.h +debian/tmp/opt/kde3/include/tde/kabc/plugin.h +debian/tmp/opt/kde3/include/tde/kabc/resourcedir.h +debian/tmp/opt/kde3/include/tde/kabc/resourcefile.h +debian/tmp/opt/kde3/include/tde/kabc/resource.h +debian/tmp/opt/kde3/include/tde/kabc/resourceldapkio.h -debian/tmp/opt/kde3/include/kde/kabc/resourceselectdialog.h -debian/tmp/opt/kde3/include/kde/kabc/secrecy.h -debian/tmp/opt/kde3/include/kde/kabc/sortmode.h -debian/tmp/opt/kde3/include/kde/kabc/sound.h -debian/tmp/opt/kde3/include/kde/kabc/stdaddressbook.h -debian/tmp/opt/kde3/include/kde/kabc/timezone.h -debian/tmp/opt/kde3/include/kde/kabc/vcardconverter.h -debian/tmp/opt/kde3/include/kde/kabc/vcardformat.h -debian/tmp/opt/kde3/include/kde/kabc/vcardformatplugin.h -debian/tmp/opt/kde3/include/kde/kabc/vcard.h -debian/tmp/opt/kde3/include/kde/kabc/vcardline.h -debian/tmp/opt/kde3/include/kde/kabc/vcardparser.h -debian/tmp/opt/kde3/include/kde/kaboutapplication.h -debian/tmp/opt/kde3/include/kde/kaboutdata.h -debian/tmp/opt/kde3/include/kde/kaboutdialog.h -debian/tmp/opt/kde3/include/kde/kaboutkde.h -debian/tmp/opt/kde3/include/kde/kaccelgen.h -debian/tmp/opt/kde3/include/kde/kaccel.h -debian/tmp/opt/kde3/include/kde/kaccelmanager.h -debian/tmp/opt/kde3/include/kde/kacl.h -debian/tmp/opt/kde3/include/kde/kactionclasses.h -debian/tmp/opt/kde3/include/kde/kactioncollection.h -debian/tmp/opt/kde3/include/kde/kaction.h -debian/tmp/opt/kde3/include/kde/kactionselector.h -debian/tmp/opt/kde3/include/kde/kactionshortcutlist.h -debian/tmp/opt/kde3/include/kde/kactivelabel.h -debian/tmp/opt/kde3/include/kde/kallocator.h -debian/tmp/opt/kde3/include/kde/kanimwidget.h -debian/tmp/opt/kde3/include/kde/kapp.h -debian/tmp/opt/kde3/include/kde/kapplication.h -debian/tmp/opt/kde3/include/kde/karchive.h -debian/tmp/opt/kde3/include/kde/kar.h -debian/tmp/opt/kde3/include/kde/karrowbutton.h -debian/tmp/opt/kde3/include/kde/kasyncio.h -debian/tmp/opt/kde3/include/kde/kate/document.h -debian/tmp/opt/kde3/include/kde/kate/view.h -debian/tmp/opt/kde3/include/kde/kaudioplayer.h -debian/tmp/opt/kde3/include/kde/kauthicon.h -debian/tmp/opt/kde3/include/kde/kautomount.h -debian/tmp/opt/kde3/include/kde/kbookmarkbar.h -debian/tmp/opt/kde3/include/kde/kbookmarkdombuilder.h -debian/tmp/opt/kde3/include/kde/kbookmarkdrag.h -debian/tmp/opt/kde3/include/kde/kbookmarkexporter.h -debian/tmp/opt/kde3/include/kde/kbookmark.h -debian/tmp/opt/kde3/include/kde/kbookmarkimporter_crash.h -debian/tmp/opt/kde3/include/kde/kbookmarkimporter.h -debian/tmp/opt/kde3/include/kde/kbookmarkimporter_ie.h -debian/tmp/opt/kde3/include/kde/kbookmarkimporter_kde1.h -debian/tmp/opt/kde3/include/kde/kbookmarkimporter_ns.h -debian/tmp/opt/kde3/include/kde/kbookmarkimporter_opera.h -debian/tmp/opt/kde3/include/kde/kbookmarkmanager.h -debian/tmp/opt/kde3/include/kde/kbookmarkmenu.h -debian/tmp/opt/kde3/include/kde/kbookmarknotifier.h -debian/tmp/opt/kde3/include/kde/kbufferedio.h -debian/tmp/opt/kde3/include/kde/kbufferedsocket.h -debian/tmp/opt/kde3/include/kde/kbugreport.h -debian/tmp/opt/kde3/include/kde/kbuttonbox.h -debian/tmp/opt/kde3/include/kde/kcalendarsystemfactory.h -debian/tmp/opt/kde3/include/kde/kcalendarsystem.h -debian/tmp/opt/kde3/include/kde/kcatalogue.h -debian/tmp/opt/kde3/include/kde/kcharselect.h -debian/tmp/opt/kde3/include/kde/kcharsets.h -debian/tmp/opt/kde3/include/kde/kclientsocketbase.h -debian/tmp/opt/kde3/include/kde/kclipboard.h -debian/tmp/opt/kde3/include/kde/kcmdlineargs.h -debian/tmp/opt/kde3/include/kde/kcmenumngr.h -debian/tmp/opt/kde3/include/kde/kcmodulecontainer.h -debian/tmp/opt/kde3/include/kde/kcmodule.h -debian/tmp/opt/kde3/include/kde/kcmoduleinfo.h -debian/tmp/opt/kde3/include/kde/kcmoduleloader.h -debian/tmp/opt/kde3/include/kde/kcmoduleproxy.h -debian/tmp/opt/kde3/include/kde/kcmultidialog.h -debian/tmp/opt/kde3/include/kde/kcolorbtn.h -debian/tmp/opt/kde3/include/kde/kcolorbutton.h -debian/tmp/opt/kde3/include/kde/kcolorcombo.h -debian/tmp/opt/kde3/include/kde/kcolordialog.h -debian/tmp/opt/kde3/include/kde/kcolordlg.h -debian/tmp/opt/kde3/include/kde/kcolordrag.h -debian/tmp/opt/kde3/include/kde/kcombiview.h -debian/tmp/opt/kde3/include/kde/kcombobox.h -debian/tmp/opt/kde3/include/kde/kcommand.h -debian/tmp/opt/kde3/include/kde/kcompletionbox.h -debian/tmp/opt/kde3/include/kde/kcompletion.h -debian/tmp/opt/kde3/include/kde/kconfigbackend.h -debian/tmp/opt/kde3/include/kde/kconfigbase.h -debian/tmp/opt/kde3/include/kde/kconfigdata.h -debian/tmp/opt/kde3/include/kde/kconfigdialog.h -debian/tmp/opt/kde3/include/kde/kconfigdialogmanager.h -debian/tmp/opt/kde3/include/kde/kconfig.h -debian/tmp/opt/kde3/include/kde/kconfigskeleton.h -debian/tmp/opt/kde3/include/kde/kcpuinfo.h -debian/tmp/opt/kde3/include/kde/kcrash.h -debian/tmp/opt/kde3/include/kde/kcursor.h -debian/tmp/opt/kde3/include/kde/kcustommenueditor.h -debian/tmp/opt/kde3/include/kde/kdatagramsocket.h -debian/tmp/opt/kde3/include/kde/kdatastream.h -debian/tmp/opt/kde3/include/kde/kdatatool.h -debian/tmp/opt/kde3/include/kde/kdatepicker.h -debian/tmp/opt/kde3/include/kde/kdatepik.h -debian/tmp/opt/kde3/include/kde/kdatetbl.h -debian/tmp/opt/kde3/include/kde/kdatetimewidget.h -debian/tmp/opt/kde3/include/kde/kdatewidget.h -debian/tmp/opt/kde3/include/kde/kdcopactionproxy.h -debian/tmp/opt/kde3/include/kde/kdcoppropertyproxy.h -debian/tmp/opt/kde3/include/kde/kdcopservicestarter.h -debian/tmp/opt/kde3/include/kde/kdebugclasses.h -debian/tmp/opt/kde3/include/kde/kdebug.h -debian/tmp/opt/kde3/include/kde/kdedmodule.h -debian/tmp/opt/kde3/include/kde/kde_file.h -debian/tmp/opt/kde3/include/kde/kdelibs_export.h -debian/tmp/opt/kde3/include/kde/kdemacros.h -debian/tmp/opt/kde3/include/kde/kde.pot -debian/tmp/opt/kde3/include/kde/kdeprint/driver.h -debian/tmp/opt/kde3/include/kde/kdeprint/kiconselectaction.h -debian/tmp/opt/kde3/include/kde/kdeprint/kmjob.h -debian/tmp/opt/kde3/include/kde/kdeprint/kmjobmanager.h -debian/tmp/opt/kde3/include/kde/kdeprint/kmjobviewer.h -debian/tmp/opt/kde3/include/kde/kdeprint/kmmainview.h -debian/tmp/opt/kde3/include/kde/kdeprint/kmmanager.h -debian/tmp/opt/kde3/include/kde/kdeprint/kmobject.h -debian/tmp/opt/kde3/include/kde/kdeprint/kmprinter.h -debian/tmp/opt/kde3/include/kde/kdeprint/kmprinterpage.h -debian/tmp/opt/kde3/include/kde/kdeprint/kmtimer.h -debian/tmp/opt/kde3/include/kde/kdeprint/kpreloadobject.h -debian/tmp/opt/kde3/include/kde/kdeprint/kprintdialog.h -debian/tmp/opt/kde3/include/kde/kdeprint/kprintdialogpage.h -debian/tmp/opt/kde3/include/kde/kdeprint/lpr/lprhandler.h -debian/tmp/opt/kde3/include/kde/kdeprint/lpr/lprsettings.h -debian/tmp/opt/kde3/include/kde/kdeprint/lpr/printcapentry.h -debian/tmp/opt/kde3/include/kde/kdesktopfile.h -debian/tmp/opt/kde3/include/kde/kdesu/client.h -debian/tmp/opt/kde3/include/kde/kdesu/defaults.h -debian/tmp/opt/kde3/include/kde/kdesu/kcookie.h -debian/tmp/opt/kde3/include/kde/kdesu/kdesu_pty.h -debian/tmp/opt/kde3/include/kde/kdesu/process.h -debian/tmp/opt/kde3/include/kde/kdesu/pty.h -debian/tmp/opt/kde3/include/kde/kdesu/ssh.h -debian/tmp/opt/kde3/include/kde/kdesu/stub.h -debian/tmp/opt/kde3/include/kde/kdesu/su.h -debian/tmp/opt/kde3/include/kde/kde_terminal_interface.h -debian/tmp/opt/kde3/include/kde/kdeversion.h -debian/tmp/opt/kde3/include/kde/kdialogbase.h -debian/tmp/opt/kde3/include/kde/kdialog.h -debian/tmp/opt/kde3/include/kde/kdirlister.h -debian/tmp/opt/kde3/include/kde/kdirnotify.h -debian/tmp/opt/kde3/include/kde/kdirnotify_stub.h -debian/tmp/opt/kde3/include/kde/kdiroperator.h -debian/tmp/opt/kde3/include/kde/kdirselectdialog.h -debian/tmp/opt/kde3/include/kde/kdirsize.h -debian/tmp/opt/kde3/include/kde/kdirwatch.h -debian/tmp/opt/kde3/include/kde/kdiskfreesp.h -debian/tmp/opt/kde3/include/kde/kdockwidget.h -debian/tmp/opt/kde3/include/kde/kdockwindow.h -debian/tmp/opt/kde3/include/kde/kdrawutil.h -debian/tmp/opt/kde3/include/kde/kdualcolorbtn.h -debian/tmp/opt/kde3/include/kde/kdualcolorbutton.h -debian/tmp/opt/kde3/include/kde/keditcl.h -debian/tmp/opt/kde3/include/kde/keditlistbox.h -debian/tmp/opt/kde3/include/kde/kedittoolbar.h -debian/tmp/opt/kde3/include/kde/kemailsettings.h -debian/tmp/opt/kde3/include/kde/kencodingfiledialog.h -debian/tmp/opt/kde3/include/kde/kextendedsocket.h -debian/tmp/opt/kde3/include/kde/kextsock.h -debian/tmp/opt/kde3/include/kde/kfiledetailview.h -debian/tmp/opt/kde3/include/kde/kfiledialog.h -debian/tmp/opt/kde3/include/kde/kfilefiltercombo.h -debian/tmp/opt/kde3/include/kde/kfilefilter.h -debian/tmp/opt/kde3/include/kde/kfile.h -debian/tmp/opt/kde3/include/kde/kfileiconview.h -debian/tmp/opt/kde3/include/kde/kfileitem.h -debian/tmp/opt/kde3/include/kde/kfilemetainfo.h -debian/tmp/opt/kde3/include/kde/kfilepreview.h -debian/tmp/opt/kde3/include/kde/kfilesharedlg.h -debian/tmp/opt/kde3/include/kde/kfileshare.h -debian/tmp/opt/kde3/include/kde/kfiletreebranch.h -debian/tmp/opt/kde3/include/kde/kfiletreeview.h -debian/tmp/opt/kde3/include/kde/kfiletreeviewitem.h -debian/tmp/opt/kde3/include/kde/kfileview.h -debian/tmp/opt/kde3/include/kde/kfilterbase.h -debian/tmp/opt/kde3/include/kde/kfilterdev.h -debian/tmp/opt/kde3/include/kde/kfinddialog.h -debian/tmp/opt/kde3/include/kde/kfind.h -debian/tmp/opt/kde3/include/kde/kfontcombo.h -debian/tmp/opt/kde3/include/kde/kfontdialog.h -debian/tmp/opt/kde3/include/kde/kfontrequester.h -debian/tmp/opt/kde3/include/kde/kgenericfactory.h -debian/tmp/opt/kde3/include/kde/kgenericfactory.tcc -debian/tmp/opt/kde3/include/kde/kglobalaccel.h -debian/tmp/opt/kde3/include/kde/kglobal.h -debian/tmp/opt/kde3/include/kde/kglobalsettings.h -debian/tmp/opt/kde3/include/kde/kguiitem.h -debian/tmp/opt/kde3/include/kde/khelpmenu.h -debian/tmp/opt/kde3/include/kde/khexedit/byteseditinterface.h -debian/tmp/opt/kde3/include/kde/khexedit/charcolumninterface.h -debian/tmp/opt/kde3/include/kde/khexedit/clipboardinterface.h -debian/tmp/opt/kde3/include/kde/khexedit/valuecolumninterface.h -debian/tmp/opt/kde3/include/kde/khexedit/zoominterface.h -debian/tmp/opt/kde3/include/kde/khtmldefaults.h -debian/tmp/opt/kde3/include/kde/khtml_events.h -debian/tmp/opt/kde3/include/kde/khtml_part.h -debian/tmp/opt/kde3/include/kde/khtml_settings.h -debian/tmp/opt/kde3/include/kde/khtmlview.h -debian/tmp/opt/kde3/include/kde/khttpproxysocketdevice.h -debian/tmp/opt/kde3/include/kde/kicondialog.h -debian/tmp/opt/kde3/include/kde/kiconeffect.h -debian/tmp/opt/kde3/include/kde/kiconloader.h -debian/tmp/opt/kde3/include/kde/kicontheme.h -debian/tmp/opt/kde3/include/kde/kiconview.h -debian/tmp/opt/kde3/include/kde/kiconviewsearchline.h -debian/tmp/opt/kde3/include/kde/kidna.h -debian/tmp/opt/kde3/include/kde/kimageeffect.h -debian/tmp/opt/kde3/include/kde/kimagefilepreview.h -debian/tmp/opt/kde3/include/kde/kimageio.h -debian/tmp/opt/kde3/include/kde/kimiface.h -debian/tmp/opt/kde3/include/kde/kimproxy.h -debian/tmp/opt/kde3/include/kde/kimproxyiface.h -debian/tmp/opt/kde3/include/kde/kinputdialog.h -debian/tmp/opt/kde3/include/kde/kinstance.h -debian/tmp/opt/kde3/include/kde/kio/authinfo.h -debian/tmp/opt/kde3/include/kde/kiobuffer.h -debian/tmp/opt/kde3/include/kde/kio/chmodjob.h -debian/tmp/opt/kde3/include/kde/kio/connection.h -debian/tmp/opt/kde3/include/kde/kio/davjob.h -debian/tmp/opt/kde3/include/kde/kio/defaultprogress.h -debian/tmp/opt/kde3/include/kde/kio/file.h -debian/tmp/opt/kde3/include/kde/kio/forwardingslavebase.h -debian/tmp/opt/kde3/include/kde/kio/global.h -debian/tmp/opt/kde3/include/kde/kio/http.h -debian/tmp/opt/kde3/include/kde/kio/http_slave_defaults.h -debian/tmp/opt/kde3/include/kde/kio/ioslave_defaults.h -debian/tmp/opt/kde3/include/kde/kio/jobclasses.h -debian/tmp/opt/kde3/include/kde/kio/job.h -debian/tmp/opt/kde3/include/kde/kio/kdesasl.h -debian/tmp/opt/kde3/include/kde/kio/kmdbase.h -debian/tmp/opt/kde3/include/kde/kio/kmdcodec.h -debian/tmp/opt/kde3/include/kde/kio/kntlm.h -debian/tmp/opt/kde3/include/kde/kio/metainfojob.h -debian/tmp/opt/kde3/include/kde/kio/netaccess.h -debian/tmp/opt/kde3/include/kde/kio/observer.h -debian/tmp/opt/kde3/include/kde/kio/passdlg.h -debian/tmp/opt/kde3/include/kde/kio/paste.h -debian/tmp/opt/kde3/include/kde/kio/previewjob.h -debian/tmp/opt/kde3/include/kde/kio/progressbase.h -debian/tmp/opt/kde3/include/kde/kio/renamedlg.h -debian/tmp/opt/kde3/include/kde/kio/scheduler.h -debian/tmp/opt/kde3/include/kde/kio/sessiondata.h -debian/tmp/opt/kde3/include/kde/kio/skipdlg.h -debian/tmp/opt/kde3/include/kde/kio/slavebase.h -debian/tmp/opt/kde3/include/kde/kio/slaveconfig.h -debian/tmp/opt/kde3/include/kde/kio/slave.h -debian/tmp/opt/kde3/include/kde/kio/slaveinterface.h -debian/tmp/opt/kde3/include/kde/kio/statusbarprogress.h -debian/tmp/opt/kde3/include/kde/kio/tcpslavebase.h -debian/tmp/opt/kde3/include/kde/kio/thumbcreator.h -debian/tmp/opt/kde3/include/kde/kio/uiserver.h -debian/tmp/opt/kde3/include/kde/kio/uiserver_stub.h -debian/tmp/opt/kde3/include/kde/kipc.h -debian/tmp/opt/kde3/include/kde/kjanuswidget.h -debian/tmp/opt/kde3/include/kde/kjs/completion.h -debian/tmp/opt/kde3/include/kde/kjs/function.h -debian/tmp/opt/kde3/include/kde/kjs/global.h -debian/tmp/opt/kde3/include/kde/kjs/identifier.h -debian/tmp/opt/kde3/include/kde/kjs/interpreter.h -debian/tmp/opt/kde3/include/kde/kjs/list.h -debian/tmp/opt/kde3/include/kde/kjs/lookup.h -debian/tmp/opt/kde3/include/kde/kjs/object.h -debian/tmp/opt/kde3/include/kde/kjs/operations.h -debian/tmp/opt/kde3/include/kde/kjs/property_map.h -debian/tmp/opt/kde3/include/kde/kjs/reference.h -debian/tmp/opt/kde3/include/kde/kjs/reference_list.h -debian/tmp/opt/kde3/include/kde/kjs/scope_chain.h -debian/tmp/opt/kde3/include/kde/kjs/simple_number.h -debian/tmp/opt/kde3/include/kde/kjs/types.h -debian/tmp/opt/kde3/include/kde/kjs/ustring.h -debian/tmp/opt/kde3/include/kde/kjs/value.h -debian/tmp/opt/kde3/include/kde/kkeybutton.h -debian/tmp/opt/kde3/include/kde/kkeydialog.h -debian/tmp/opt/kde3/include/kde/kkeynative.h -debian/tmp/opt/kde3/include/kde/klanguagebutton.h -debian/tmp/opt/kde3/include/kde/klargefile.h -debian/tmp/opt/kde3/include/kde/kled.h -debian/tmp/opt/kde3/include/kde/klibloader.h -debian/tmp/opt/kde3/include/kde/klineeditdlg.h -debian/tmp/opt/kde3/include/kde/klineedit.h -debian/tmp/opt/kde3/include/kde/klistbox.h -debian/tmp/opt/kde3/include/kde/klistview.h -debian/tmp/opt/kde3/include/kde/klistviewsearchline.h -debian/tmp/opt/kde3/include/kde/klocale.h -debian/tmp/opt/kde3/include/kde/klockfile.h -debian/tmp/opt/kde3/include/kde/kmacroexpander.h -debian/tmp/opt/kde3/include/kde/kmainwindow.h -debian/tmp/opt/kde3/include/kde/kmainwindowiface.h -debian/tmp/opt/kde3/include/kde/kmanagerselection.h -debian/tmp/opt/kde3/include/kde/kmdcodec.h -debian/tmp/opt/kde3/include/kde/kmdichildarea.h -debian/tmp/opt/kde3/include/kde/kmdichildfrmcaption.h -debian/tmp/opt/kde3/include/kde/kmdichildfrm.h -debian/tmp/opt/kde3/include/kde/kmdichildview.h -debian/tmp/opt/kde3/include/kde/kmdidefines.h -debian/tmp/opt/kde3/include/kde/kmdi/global.h -debian/tmp/opt/kde3/include/kde/kmdiiterator.h -debian/tmp/opt/kde3/include/kde/kmdilistiterator.h -debian/tmp/opt/kde3/include/kde/kmdimainfrm.h -debian/tmp/opt/kde3/include/kde/kmdi/mainwindow.h -debian/tmp/opt/kde3/include/kde/kmdinulliterator.h -debian/tmp/opt/kde3/include/kde/kmdi/tabwidget.h -debian/tmp/opt/kde3/include/kde/kmditaskbar.h -debian/tmp/opt/kde3/include/kde/kmdi/toolviewaccessor.h -debian/tmp/opt/kde3/include/kde/kmditoolviewaccessor.h -debian/tmp/opt/kde3/include/kde/kmediaplayer/playerdcopobject.h -debian/tmp/opt/kde3/include/kde/kmediaplayer/player.h -debian/tmp/opt/kde3/include/kde/kmediaplayer/view.h -debian/tmp/opt/kde3/include/kde/kmenubar.h -debian/tmp/opt/kde3/include/kde/kmessagebox.h -debian/tmp/opt/kde3/include/kde/kmimemagic.h -debian/tmp/opt/kde3/include/kde/kmimesourcefactory.h -debian/tmp/opt/kde3/include/kde/kmimetypechooser.h -debian/tmp/opt/kde3/include/kde/kmimetype.h -debian/tmp/opt/kde3/include/kde/kmimetyperesolver.h -debian/tmp/opt/kde3/include/kde/kmountpoint.h -debian/tmp/opt/kde3/include/kde/kmulticastsocketdevice.h -debian/tmp/opt/kde3/include/kde/kmulticastsocket.h -debian/tmp/opt/kde3/include/kde/kmultipledrag.h -debian/tmp/opt/kde3/include/kde/kmultitabbar.h -debian/tmp/opt/kde3/include/kde/knetworkinterface.h -debian/tmp/opt/kde3/include/kde/knewstuff/downloaddialog.h -debian/tmp/opt/kde3/include/kde/knewstuff/engine.h -debian/tmp/opt/kde3/include/kde/knewstuff/entry.h -debian/tmp/opt/kde3/include/kde/knewstuff/knewstuffbutton.h -debian/tmp/opt/kde3/include/kde/knewstuff/knewstuffgeneric.h -debian/tmp/opt/kde3/include/kde/knewstuff/knewstuff.h -debian/tmp/opt/kde3/include/kde/knewstuff/knewstuffsecure.h -debian/tmp/opt/kde3/include/kde/knewstuff/providerdialog.h -debian/tmp/opt/kde3/include/kde/knewstuff/provider.h -debian/tmp/opt/kde3/include/kde/knewstuff/uploaddialog.h -debian/tmp/opt/kde3/include/kde/knfsshare.h -debian/tmp/opt/kde3/include/kde/knotifyclient.h -debian/tmp/opt/kde3/include/kde/knotifydialog.h -debian/tmp/opt/kde3/include/kde/knotifywidgetbase.h -debian/tmp/opt/kde3/include/kde/knuminput.h -debian/tmp/opt/kde3/include/kde/knumvalidator.h -debian/tmp/opt/kde3/include/kde/kopenssl.h -debian/tmp/opt/kde3/include/kde/kopenwith.h -debian/tmp/opt/kde3/include/kde/kpalette.h -debian/tmp/opt/kde3/include/kde/kpanelapplet.h -debian/tmp/opt/kde3/include/kde/kpanelappmenu.h -debian/tmp/opt/kde3/include/kde/kpanelextension.h -debian/tmp/opt/kde3/include/kde/kpanelmenu.h -debian/tmp/opt/kde3/include/kde/kparts/browserextension.h -debian/tmp/opt/kde3/include/kde/kparts/browserinterface.h -debian/tmp/opt/kde3/include/kde/kparts/browserrun.h -debian/tmp/opt/kde3/include/kde/kparts/componentfactory.h -debian/tmp/opt/kde3/include/kde/kparts/dockmainwindow.h -debian/tmp/opt/kde3/include/kde/kparts/event.h -debian/tmp/opt/kde3/include/kde/kparts/factory.h -debian/tmp/opt/kde3/include/kde/kparts/genericfactory.h -debian/tmp/opt/kde3/include/kde/kparts/historyprovider.h -debian/tmp/opt/kde3/include/kde/kparts/mainwindow.h -debian/tmp/opt/kde3/include/kde/kparts/part.h -debian/tmp/opt/kde3/include/kde/kparts/partmanager.h -debian/tmp/opt/kde3/include/kde/kparts/plugin.h -debian/tmp/opt/kde3/include/kde/kparts/statusbarextension.h -debian/tmp/opt/kde3/include/kde/kpassdlg.h -debian/tmp/opt/kde3/include/kde/kpassivepopup.h -debian/tmp/opt/kde3/include/kde/kpixmapeffect.h -debian/tmp/opt/kde3/include/kde/kpixmap.h -debian/tmp/opt/kde3/include/kde/kpixmapio.h -debian/tmp/opt/kde3/include/kde/kpixmapprovider.h -debian/tmp/opt/kde3/include/kde/kpixmapregionselectordialog.h -debian/tmp/opt/kde3/include/kde/kpixmapregionselectorwidget.h -debian/tmp/opt/kde3/include/kde/kpixmapsplitter.h -debian/tmp/opt/kde3/include/kde/kplugininfo.h -debian/tmp/opt/kde3/include/kde/kpluginselector.h -debian/tmp/opt/kde3/include/kde/kpopupmenu.h -debian/tmp/opt/kde3/include/kde/kpreviewwidgetbase.h -debian/tmp/opt/kde3/include/kde/kprintaction.h -debian/tmp/opt/kde3/include/kde/kprinter.h -debian/tmp/opt/kde3/include/kde/kprocctrl.h -debian/tmp/opt/kde3/include/kde/kprocess.h -debian/tmp/opt/kde3/include/kde/kprocio.h -debian/tmp/opt/kde3/include/kde/kprogress.h -debian/tmp/opt/kde3/include/kde/kprogressbox.h -debian/tmp/opt/kde3/include/kde/kpropertiesdialog.h -debian/tmp/opt/kde3/include/kde/kpropsdlg.h -debian/tmp/opt/kde3/include/kde/kprotocolinfo.h -debian/tmp/opt/kde3/include/kde/kprotocolmanager.h -debian/tmp/opt/kde3/include/kde/kpty.h -debian/tmp/opt/kde3/include/kde/kpushbutton.h -debian/tmp/opt/kde3/include/kde/krandomsequence.h -debian/tmp/opt/kde3/include/kde/krecentdocument.h -debian/tmp/opt/kde3/include/kde/kregexpeditorinterface.h -debian/tmp/opt/kde3/include/kde/kregexp.h -debian/tmp/opt/kde3/include/kde/kremoteencoding.h -debian/tmp/opt/kde3/include/kde/kreplacedialog.h -debian/tmp/opt/kde3/include/kde/kreplace.h -debian/tmp/opt/kde3/include/kde/kresolver.h -debian/tmp/opt/kde3/include/kde/kresources/configdialog.h -debian/tmp/opt/kde3/include/kde/kresources/configpage.h -debian/tmp/opt/kde3/include/kde/kresources/configwidget.h -debian/tmp/opt/kde3/include/kde/kresources/factory.h -debian/tmp/opt/kde3/include/kde/kresources/manager.h -debian/tmp/opt/kde3/include/kde/kresources/manageriface.h -debian/tmp/opt/kde3/include/kde/kresources/managerimpl.h -debian/tmp/opt/kde3/include/kde/kresources/resource.h -debian/tmp/opt/kde3/include/kde/kresources/selectdialog.h -debian/tmp/opt/kde3/include/kde/krestrictedline.h -debian/tmp/opt/kde3/include/kde/kreverseresolver.h -debian/tmp/opt/kde3/include/kde/krfcdate.h -debian/tmp/opt/kde3/include/kde/krootpixmap.h -debian/tmp/opt/kde3/include/kde/krootprop.h -debian/tmp/opt/kde3/include/kde/kruler.h -debian/tmp/opt/kde3/include/kde/krun.h -debian/tmp/opt/kde3/include/kde/ksambashare.h -debian/tmp/opt/kde3/include/kde/ksavefile.h -debian/tmp/opt/kde3/include/kde/kscan.h -debian/tmp/opt/kde3/include/kde/ksconfig.h -debian/tmp/opt/kde3/include/kde/kscreensaver.h -debian/tmp/opt/kde3/include/kde/kscreensaver_vroot.h -debian/tmp/opt/kde3/include/kde/kscrollview.h -debian/tmp/opt/kde3/include/kde/kselect.h -debian/tmp/opt/kde3/include/kde/kseparator.h -debian/tmp/opt/kde3/include/kde/kserversocket.h -debian/tmp/opt/kde3/include/kde/kservicegroup.h -debian/tmp/opt/kde3/include/kde/kservice.h -debian/tmp/opt/kde3/include/kde/kservicetype.h -debian/tmp/opt/kde3/include/kde/ksettings/componentsdialog.h -debian/tmp/opt/kde3/include/kde/ksettings/dialog.h -debian/tmp/opt/kde3/include/kde/ksettings/dispatcher.h -debian/tmp/opt/kde3/include/kde/ksettings/pluginpage.h -debian/tmp/opt/kde3/include/kde/ksharedpixmap.h -debian/tmp/opt/kde3/include/kde/ksharedptr.h -debian/tmp/opt/kde3/include/kde/kshellcompletion.h -debian/tmp/opt/kde3/include/kde/kshell.h -debian/tmp/opt/kde3/include/kde/kshortcutdialog.h -debian/tmp/opt/kde3/include/kde/kshortcut.h -debian/tmp/opt/kde3/include/kde/kshortcutlist.h -debian/tmp/opt/kde3/include/kde/kshred.h -debian/tmp/opt/kde3/include/kde/ksimpleconfig.h -debian/tmp/opt/kde3/include/kde/ksmimecrypto.h -debian/tmp/opt/kde3/include/kde/ksockaddr.h -debian/tmp/opt/kde3/include/kde/tdesocketaddress.h -debian/tmp/opt/kde3/include/kde/tdesocketbase.h -debian/tmp/opt/kde3/include/kde/tdesocketdevice.h -debian/tmp/opt/kde3/include/kde/ksock.h -debian/tmp/opt/kde3/include/kde/ksocks.h -debian/tmp/opt/kde3/include/kde/ksockssocketdevice.h -debian/tmp/opt/kde3/include/kde/ksortablevaluelist.h -debian/tmp/opt/kde3/include/kde/kspeech.h -debian/tmp/opt/kde3/include/kde/kspeechsink.h -debian/tmp/opt/kde3/include/kde/kspell2/backgroundchecker.h -debian/tmp/opt/kde3/include/kde/kspell2/broker.h -debian/tmp/opt/kde3/include/kde/kspell2/configdialog.h -debian/tmp/opt/kde3/include/kde/kspell2/configwidget.h -debian/tmp/opt/kde3/include/kde/kspell2/defaultdictionary.h -debian/tmp/opt/kde3/include/kde/kspell2/dialog.h -debian/tmp/opt/kde3/include/kde/kspell2/dictionary.h -debian/tmp/opt/kde3/include/kde/kspell2/filter.h -debian/tmp/opt/kde3/include/kde/kspell2/highlighter.h -debian/tmp/opt/kde3/include/kde/kspell2/settings.h -debian/tmp/opt/kde3/include/kde/kspelldlg.h -debian/tmp/opt/kde3/include/kde/kspell.h -debian/tmp/opt/kde3/include/kde/ksplashscreen.h -debian/tmp/opt/kde3/include/kde/ksqueezedtextlabel.h -debian/tmp/opt/kde3/include/kde/ksslall.h -debian/tmp/opt/kde3/include/kde/ksslcertchain.h -debian/tmp/opt/kde3/include/kde/ksslcertdlg.h -debian/tmp/opt/kde3/include/kde/ksslcertificatecache.h -debian/tmp/opt/kde3/include/kde/ksslcertificatefactory.h -debian/tmp/opt/kde3/include/kde/ksslcertificate.h -debian/tmp/opt/kde3/include/kde/ksslcertificatehome.h -debian/tmp/opt/kde3/include/kde/ksslconfig.h -debian/tmp/opt/kde3/include/kde/ksslconnectioninfo.h -debian/tmp/opt/kde3/include/kde/kssl.h -debian/tmp/opt/kde3/include/kde/ksslinfodlg.h -debian/tmp/opt/kde3/include/kde/ksslkeygen.h -debian/tmp/opt/kde3/include/kde/ksslpeerinfo.h -debian/tmp/opt/kde3/include/kde/ksslpemcallback.h -debian/tmp/opt/kde3/include/kde/ksslpkcs12.h -debian/tmp/opt/kde3/include/kde/ksslpkcs7.h -debian/tmp/opt/kde3/include/kde/ksslsession.h -debian/tmp/opt/kde3/include/kde/ksslsettings.h -debian/tmp/opt/kde3/include/kde/ksslsigners.h -debian/tmp/opt/kde3/include/kde/ksslutils.h -debian/tmp/opt/kde3/include/kde/ksslx509map.h -debian/tmp/opt/kde3/include/kde/ksslx509v3.h -debian/tmp/opt/kde3/include/kde/kstandarddirs.h -debian/tmp/opt/kde3/include/kde/kstartupinfo.h -debian/tmp/opt/kde3/include/kde/kstaticdeleter.h -debian/tmp/opt/kde3/include/kde/kstatusbar.h -debian/tmp/opt/kde3/include/kde/kstdaccel.h -debian/tmp/opt/kde3/include/kde/kstdaction.h -debian/tmp/opt/kde3/include/kde/kstddirs.h -debian/tmp/opt/kde3/include/kde/kstdguiitem.h -debian/tmp/opt/kde3/include/kde/kstreamsocket.h -debian/tmp/opt/kde3/include/kde/kstringhandler.h -debian/tmp/opt/kde3/include/kde/kstringvalidator.h -debian/tmp/opt/kde3/include/kde/kstyle.h -debian/tmp/opt/kde3/include/kde/ksvgiconengine.h -debian/tmp/opt/kde3/include/kde/kswitchlanguagedialog.h -debian/tmp/opt/kde3/include/kde/ksycocaentry.h -debian/tmp/opt/kde3/include/kde/ksycoca.h -debian/tmp/opt/kde3/include/kde/ksycocatype.h -debian/tmp/opt/kde3/include/kde/ksyntaxhighlighter.h -debian/tmp/opt/kde3/include/kde/ksystemtray.h -debian/tmp/opt/kde3/include/kde/ktabbar.h -debian/tmp/opt/kde3/include/kde/ktabctl.h -debian/tmp/opt/kde3/include/kde/ktabwidget.h -debian/tmp/opt/kde3/include/kde/ktar.h -debian/tmp/opt/kde3/include/kde/ktempdir.h -debian/tmp/opt/kde3/include/kde/ktempfile.h -debian/tmp/opt/kde3/include/kde/ktextbrowser.h -debian/tmp/opt/kde3/include/kde/ktextedit.h -debian/tmp/opt/kde3/include/kde/ktexteditor/blockselectioninterface.h -debian/tmp/opt/kde3/include/kde/ktexteditor/clipboardinterface.h -debian/tmp/opt/kde3/include/kde/ktexteditor/codecompletioninterface.h -debian/tmp/opt/kde3/include/kde/ktexteditor/configinterfaceextension.h -debian/tmp/opt/kde3/include/kde/ktexteditor/configinterface.h -debian/tmp/opt/kde3/include/kde/ktexteditor/cursorinterface.h -debian/tmp/opt/kde3/include/kde/ktexteditor/document.h -debian/tmp/opt/kde3/include/kde/ktexteditor/documentinfo.h -debian/tmp/opt/kde3/include/kde/ktexteditor/dynwordwrapinterface.h -debian/tmp/opt/kde3/include/kde/ktexteditor/editinterfaceext.h -debian/tmp/opt/kde3/include/kde/ktexteditor/editinterface.h -debian/tmp/opt/kde3/include/kde/ktexteditor/editorchooser.h -debian/tmp/opt/kde3/include/kde/ktexteditor/editor.h -debian/tmp/opt/kde3/include/kde/ktexteditor/encodinginterface.h -debian/tmp/opt/kde3/include/kde/ktexteditor/highlightinginterface.h -debian/tmp/opt/kde3/include/kde/ktexteditor/markinterfaceextension.h -debian/tmp/opt/kde3/include/kde/ktexteditor/markinterface.h -debian/tmp/opt/kde3/include/kde/ktexteditor/plugin.h -debian/tmp/opt/kde3/include/kde/ktexteditor/popupmenuinterface.h -debian/tmp/opt/kde3/include/kde/ktexteditor/printinterface.h -debian/tmp/opt/kde3/include/kde/ktexteditor/searchinterface.h -debian/tmp/opt/kde3/include/kde/ktexteditor/selectionextdcopinterface.h -debian/tmp/opt/kde3/include/kde/ktexteditor/selectioninterfaceext.h -debian/tmp/opt/kde3/include/kde/ktexteditor/selectioninterface.h -debian/tmp/opt/kde3/include/kde/ktexteditor/sessionconfiginterface.h -debian/tmp/opt/kde3/include/kde/ktexteditor/templateinterface.h -debian/tmp/opt/kde3/include/kde/ktexteditor/texthintinterface.h -debian/tmp/opt/kde3/include/kde/ktexteditor/undointerface.h -debian/tmp/opt/kde3/include/kde/ktexteditor/variableinterface.h -debian/tmp/opt/kde3/include/kde/ktexteditor/viewcursorinterface.h -debian/tmp/opt/kde3/include/kde/ktexteditor/view.h -debian/tmp/opt/kde3/include/kde/ktexteditor/viewstatusmsginterface.h -debian/tmp/opt/kde3/include/kde/ktexteditor/wordwrapinterface.h -debian/tmp/opt/kde3/include/kde/ktimewidget.h -debian/tmp/opt/kde3/include/kde/ktimezones.h -debian/tmp/opt/kde3/include/kde/ktimezonewidget.h -debian/tmp/opt/kde3/include/kde/ktip.h -debian/tmp/opt/kde3/include/kde/ktoolbarbutton.h -debian/tmp/opt/kde3/include/kde/ktoolbar.h -debian/tmp/opt/kde3/include/kde/ktoolbarlabelaction.h -debian/tmp/opt/kde3/include/kde/ktoolbarradiogroup.h -debian/tmp/opt/kde3/include/kde/ktrader.h -debian/tmp/opt/kde3/include/kde/ktypelist.h -debian/tmp/opt/kde3/include/kde/kuniqueapp.h -debian/tmp/opt/kde3/include/kde/kuniqueapplication.h -debian/tmp/opt/kde3/include/kde/kunittest/module.h -debian/tmp/opt/kde3/include/kde/kunittest/runner.h -debian/tmp/opt/kde3/include/kde/kunittest/tester.h -debian/tmp/opt/kde3/include/kde/kunload.h -debian/tmp/opt/kde3/include/kde/kurifilter.h -debian/tmp/opt/kde3/include/kde/kurlbar.h -debian/tmp/opt/kde3/include/kde/kurlcombobox.h -debian/tmp/opt/kde3/include/kde/kurlcompletion.h -debian/tmp/opt/kde3/include/kde/kurldrag.h -debian/tmp/opt/kde3/include/kde/kurl.h -debian/tmp/opt/kde3/include/kde/kurllabel.h -debian/tmp/opt/kde3/include/kde/kurlpixmapprovider.h -debian/tmp/opt/kde3/include/kde/kurlrequesterdlg.h -debian/tmp/opt/kde3/include/kde/kurlrequester.h -debian/tmp/opt/kde3/include/kde/kuser.h -debian/tmp/opt/kde3/include/kde/kuserprofile.h -debian/tmp/opt/kde3/include/kde/kvmallocator.h -debian/tmp/opt/kde3/include/kde/kwallet.h -debian/tmp/opt/kde3/include/kde/kwallettypes.h -debian/tmp/opt/kde3/include/kde/kwindowinfo.h -debian/tmp/opt/kde3/include/kde/kwindowlistmenu.h -debian/tmp/opt/kde3/include/kde/kwin.h -debian/tmp/opt/kde3/include/kde/kwinmodule.h -debian/tmp/opt/kde3/include/kde/kwizard.h -debian/tmp/opt/kde3/include/kde/kwordwrap.h -debian/tmp/opt/kde3/include/kde/kxerrorhandler.h -debian/tmp/opt/kde3/include/kde/kxmessages.h -debian/tmp/opt/kde3/include/kde/kxmlguibuilder.h -debian/tmp/opt/kde3/include/kde/kxmlguiclient.h -debian/tmp/opt/kde3/include/kde/kxmlguifactory.h -debian/tmp/opt/kde3/include/kde/kxmlgui.h -debian/tmp/opt/kde3/include/kde/kzip.h -debian/tmp/opt/kde3/include/kde/libkrandr/ktimerdialog.h -debian/tmp/opt/kde3/include/kde/libkrandr/libkrandr.h -debian/tmp/opt/kde3/include/kde/libkrandr/lowlevel_randr.h -debian/tmp/opt/kde3/include/kde/libkrandr/randr.h -debian/tmp/opt/kde3/include/kde/libkmid/alsaout.h -debian/tmp/opt/kde3/include/kde/libkmid/dattypes.h -debian/tmp/opt/kde3/include/kde/libkmid/deviceman.h -debian/tmp/opt/kde3/include/kde/libkmid/fmout.h -debian/tmp/opt/kde3/include/kde/libkmid/gusout.h -debian/tmp/opt/kde3/include/kde/libkmid/libkmid.h -debian/tmp/opt/kde3/include/kde/libkmid/midfile.h -debian/tmp/opt/kde3/include/kde/libkmid/midimapper.h -debian/tmp/opt/kde3/include/kde/libkmid/midiout.h -debian/tmp/opt/kde3/include/kde/libkmid/midispec.h -debian/tmp/opt/kde3/include/kde/libkmid/midistat.h -debian/tmp/opt/kde3/include/kde/libkmid/mt32togm.h -debian/tmp/opt/kde3/include/kde/libkmid/notearray.h -debian/tmp/opt/kde3/include/kde/libkmid/player.h -debian/tmp/opt/kde3/include/kde/libkmid/synthout.h -debian/tmp/opt/kde3/include/kde/libkmid/track.h -debian/tmp/opt/kde3/include/kde/libkmid/voiceman.h -debian/tmp/opt/kde3/include/kde/netwm_def.h -debian/tmp/opt/kde3/include/kde/netwm.h -debian/tmp/opt/kde3/include/kde/qxembed.h -debian/tmp/opt/kde3/include/kde/renamedlgplugin.h -debian/tmp/opt/kde3/include/kde/scriptclientinterface.h -debian/tmp/opt/kde3/include/kde/scriptinterface.h -debian/tmp/opt/kde3/include/kde/scriptmanager.h +debian/tmp/opt/kde3/include/tde/kabc/resourceselectdialog.h +debian/tmp/opt/kde3/include/tde/kabc/secrecy.h +debian/tmp/opt/kde3/include/tde/kabc/sortmode.h +debian/tmp/opt/kde3/include/tde/kabc/sound.h +debian/tmp/opt/kde3/include/tde/kabc/stdaddressbook.h +debian/tmp/opt/kde3/include/tde/kabc/timezone.h +debian/tmp/opt/kde3/include/tde/kabc/vcardconverter.h +debian/tmp/opt/kde3/include/tde/kabc/vcardformat.h +debian/tmp/opt/kde3/include/tde/kabc/vcardformatplugin.h +debian/tmp/opt/kde3/include/tde/kabc/vcard.h +debian/tmp/opt/kde3/include/tde/kabc/vcardline.h +debian/tmp/opt/kde3/include/tde/kabc/vcardparser.h +debian/tmp/opt/kde3/include/tde/kaboutapplication.h +debian/tmp/opt/kde3/include/tde/kaboutdata.h +debian/tmp/opt/kde3/include/tde/kaboutdialog.h +debian/tmp/opt/kde3/include/tde/kaboutkde.h +debian/tmp/opt/kde3/include/tde/kaccelgen.h +debian/tmp/opt/kde3/include/tde/kaccel.h +debian/tmp/opt/kde3/include/tde/kaccelmanager.h +debian/tmp/opt/kde3/include/tde/kacl.h +debian/tmp/opt/kde3/include/tde/kactionclasses.h +debian/tmp/opt/kde3/include/tde/kactioncollection.h +debian/tmp/opt/kde3/include/tde/kaction.h +debian/tmp/opt/kde3/include/tde/kactionselector.h +debian/tmp/opt/kde3/include/tde/kactionshortcutlist.h +debian/tmp/opt/kde3/include/tde/kactivelabel.h +debian/tmp/opt/kde3/include/tde/kallocator.h +debian/tmp/opt/kde3/include/tde/kanimwidget.h +debian/tmp/opt/kde3/include/tde/kapp.h +debian/tmp/opt/kde3/include/tde/kapplication.h +debian/tmp/opt/kde3/include/tde/karchive.h +debian/tmp/opt/kde3/include/tde/kar.h +debian/tmp/opt/kde3/include/tde/karrowbutton.h +debian/tmp/opt/kde3/include/tde/kasyncio.h +debian/tmp/opt/kde3/include/tde/kate/document.h +debian/tmp/opt/kde3/include/tde/kate/view.h +debian/tmp/opt/kde3/include/tde/kaudioplayer.h +debian/tmp/opt/kde3/include/tde/kauthicon.h +debian/tmp/opt/kde3/include/tde/kautomount.h +debian/tmp/opt/kde3/include/tde/kbookmarkbar.h +debian/tmp/opt/kde3/include/tde/kbookmarkdombuilder.h +debian/tmp/opt/kde3/include/tde/kbookmarkdrag.h +debian/tmp/opt/kde3/include/tde/kbookmarkexporter.h +debian/tmp/opt/kde3/include/tde/kbookmark.h +debian/tmp/opt/kde3/include/tde/kbookmarkimporter_crash.h +debian/tmp/opt/kde3/include/tde/kbookmarkimporter.h +debian/tmp/opt/kde3/include/tde/kbookmarkimporter_ie.h +debian/tmp/opt/kde3/include/tde/kbookmarkimporter_kde1.h +debian/tmp/opt/kde3/include/tde/kbookmarkimporter_ns.h +debian/tmp/opt/kde3/include/tde/kbookmarkimporter_opera.h +debian/tmp/opt/kde3/include/tde/kbookmarkmanager.h +debian/tmp/opt/kde3/include/tde/kbookmarkmenu.h +debian/tmp/opt/kde3/include/tde/kbookmarknotifier.h +debian/tmp/opt/kde3/include/tde/kbufferedio.h +debian/tmp/opt/kde3/include/tde/kbufferedsocket.h +debian/tmp/opt/kde3/include/tde/kbugreport.h +debian/tmp/opt/kde3/include/tde/kbuttonbox.h +debian/tmp/opt/kde3/include/tde/kcalendarsystemfactory.h +debian/tmp/opt/kde3/include/tde/kcalendarsystem.h +debian/tmp/opt/kde3/include/tde/kcatalogue.h +debian/tmp/opt/kde3/include/tde/kcharselect.h +debian/tmp/opt/kde3/include/tde/kcharsets.h +debian/tmp/opt/kde3/include/tde/kclientsocketbase.h +debian/tmp/opt/kde3/include/tde/kclipboard.h +debian/tmp/opt/kde3/include/tde/kcmdlineargs.h +debian/tmp/opt/kde3/include/tde/kcmenumngr.h +debian/tmp/opt/kde3/include/tde/kcmodulecontainer.h +debian/tmp/opt/kde3/include/tde/kcmodule.h +debian/tmp/opt/kde3/include/tde/kcmoduleinfo.h +debian/tmp/opt/kde3/include/tde/kcmoduleloader.h +debian/tmp/opt/kde3/include/tde/kcmoduleproxy.h +debian/tmp/opt/kde3/include/tde/kcmultidialog.h +debian/tmp/opt/kde3/include/tde/kcolorbtn.h +debian/tmp/opt/kde3/include/tde/kcolorbutton.h +debian/tmp/opt/kde3/include/tde/kcolorcombo.h +debian/tmp/opt/kde3/include/tde/kcolordialog.h +debian/tmp/opt/kde3/include/tde/kcolordlg.h +debian/tmp/opt/kde3/include/tde/kcolordrag.h +debian/tmp/opt/kde3/include/tde/kcombiview.h +debian/tmp/opt/kde3/include/tde/kcombobox.h +debian/tmp/opt/kde3/include/tde/kcommand.h +debian/tmp/opt/kde3/include/tde/kcompletionbox.h +debian/tmp/opt/kde3/include/tde/kcompletion.h +debian/tmp/opt/kde3/include/tde/kconfigbackend.h +debian/tmp/opt/kde3/include/tde/kconfigbase.h +debian/tmp/opt/kde3/include/tde/kconfigdata.h +debian/tmp/opt/kde3/include/tde/kconfigdialog.h +debian/tmp/opt/kde3/include/tde/kconfigdialogmanager.h +debian/tmp/opt/kde3/include/tde/kconfig.h +debian/tmp/opt/kde3/include/tde/kconfigskeleton.h +debian/tmp/opt/kde3/include/tde/kcpuinfo.h +debian/tmp/opt/kde3/include/tde/kcrash.h +debian/tmp/opt/kde3/include/tde/kcursor.h +debian/tmp/opt/kde3/include/tde/kcustommenueditor.h +debian/tmp/opt/kde3/include/tde/kdatagramsocket.h +debian/tmp/opt/kde3/include/tde/kdatastream.h +debian/tmp/opt/kde3/include/tde/kdatatool.h +debian/tmp/opt/kde3/include/tde/kdatepicker.h +debian/tmp/opt/kde3/include/tde/kdatepik.h +debian/tmp/opt/kde3/include/tde/kdatetbl.h +debian/tmp/opt/kde3/include/tde/kdatetimewidget.h +debian/tmp/opt/kde3/include/tde/kdatewidget.h +debian/tmp/opt/kde3/include/tde/kdcopactionproxy.h +debian/tmp/opt/kde3/include/tde/kdcoppropertyproxy.h +debian/tmp/opt/kde3/include/tde/kdcopservicestarter.h +debian/tmp/opt/kde3/include/tde/kdebugclasses.h +debian/tmp/opt/kde3/include/tde/kdebug.h +debian/tmp/opt/kde3/include/tde/kdedmodule.h +debian/tmp/opt/kde3/include/tde/kde_file.h +debian/tmp/opt/kde3/include/tde/kdelibs_export.h +debian/tmp/opt/kde3/include/tde/kdemacros.h +debian/tmp/opt/kde3/include/tde/kde.pot +debian/tmp/opt/kde3/include/tde/kdeprint/driver.h +debian/tmp/opt/kde3/include/tde/kdeprint/kiconselectaction.h +debian/tmp/opt/kde3/include/tde/kdeprint/kmjob.h +debian/tmp/opt/kde3/include/tde/kdeprint/kmjobmanager.h +debian/tmp/opt/kde3/include/tde/kdeprint/kmjobviewer.h +debian/tmp/opt/kde3/include/tde/kdeprint/kmmainview.h +debian/tmp/opt/kde3/include/tde/kdeprint/kmmanager.h +debian/tmp/opt/kde3/include/tde/kdeprint/kmobject.h +debian/tmp/opt/kde3/include/tde/kdeprint/kmprinter.h +debian/tmp/opt/kde3/include/tde/kdeprint/kmprinterpage.h +debian/tmp/opt/kde3/include/tde/kdeprint/kmtimer.h +debian/tmp/opt/kde3/include/tde/kdeprint/kpreloadobject.h +debian/tmp/opt/kde3/include/tde/kdeprint/kprintdialog.h +debian/tmp/opt/kde3/include/tde/kdeprint/kprintdialogpage.h +debian/tmp/opt/kde3/include/tde/kdeprint/lpr/lprhandler.h +debian/tmp/opt/kde3/include/tde/kdeprint/lpr/lprsettings.h +debian/tmp/opt/kde3/include/tde/kdeprint/lpr/printcapentry.h +debian/tmp/opt/kde3/include/tde/kdesktopfile.h +debian/tmp/opt/kde3/include/tde/kdesu/client.h +debian/tmp/opt/kde3/include/tde/kdesu/defaults.h +debian/tmp/opt/kde3/include/tde/kdesu/kcookie.h +debian/tmp/opt/kde3/include/tde/kdesu/kdesu_pty.h +debian/tmp/opt/kde3/include/tde/kdesu/process.h +debian/tmp/opt/kde3/include/tde/kdesu/pty.h +debian/tmp/opt/kde3/include/tde/kdesu/ssh.h +debian/tmp/opt/kde3/include/tde/kdesu/stub.h +debian/tmp/opt/kde3/include/tde/kdesu/su.h +debian/tmp/opt/kde3/include/tde/kde_terminal_interface.h +debian/tmp/opt/kde3/include/tde/kdeversion.h +debian/tmp/opt/kde3/include/tde/kdialogbase.h +debian/tmp/opt/kde3/include/tde/kdialog.h +debian/tmp/opt/kde3/include/tde/kdirlister.h +debian/tmp/opt/kde3/include/tde/kdirnotify.h +debian/tmp/opt/kde3/include/tde/kdirnotify_stub.h +debian/tmp/opt/kde3/include/tde/kdiroperator.h +debian/tmp/opt/kde3/include/tde/kdirselectdialog.h +debian/tmp/opt/kde3/include/tde/kdirsize.h +debian/tmp/opt/kde3/include/tde/kdirwatch.h +debian/tmp/opt/kde3/include/tde/kdiskfreesp.h +debian/tmp/opt/kde3/include/tde/kdockwidget.h +debian/tmp/opt/kde3/include/tde/kdockwindow.h +debian/tmp/opt/kde3/include/tde/kdrawutil.h +debian/tmp/opt/kde3/include/tde/kdualcolorbtn.h +debian/tmp/opt/kde3/include/tde/kdualcolorbutton.h +debian/tmp/opt/kde3/include/tde/keditcl.h +debian/tmp/opt/kde3/include/tde/keditlistbox.h +debian/tmp/opt/kde3/include/tde/kedittoolbar.h +debian/tmp/opt/kde3/include/tde/kemailsettings.h +debian/tmp/opt/kde3/include/tde/kencodingfiledialog.h +debian/tmp/opt/kde3/include/tde/kextendedsocket.h +debian/tmp/opt/kde3/include/tde/kextsock.h +debian/tmp/opt/kde3/include/tde/kfiledetailview.h +debian/tmp/opt/kde3/include/tde/kfiledialog.h +debian/tmp/opt/kde3/include/tde/kfilefiltercombo.h +debian/tmp/opt/kde3/include/tde/kfilefilter.h +debian/tmp/opt/kde3/include/tde/kfile.h +debian/tmp/opt/kde3/include/tde/kfileiconview.h +debian/tmp/opt/kde3/include/tde/kfileitem.h +debian/tmp/opt/kde3/include/tde/kfilemetainfo.h +debian/tmp/opt/kde3/include/tde/kfilepreview.h +debian/tmp/opt/kde3/include/tde/kfilesharedlg.h +debian/tmp/opt/kde3/include/tde/kfileshare.h +debian/tmp/opt/kde3/include/tde/kfiletreebranch.h +debian/tmp/opt/kde3/include/tde/kfiletreeview.h +debian/tmp/opt/kde3/include/tde/kfiletreeviewitem.h +debian/tmp/opt/kde3/include/tde/kfileview.h +debian/tmp/opt/kde3/include/tde/kfilterbase.h +debian/tmp/opt/kde3/include/tde/kfilterdev.h +debian/tmp/opt/kde3/include/tde/kfinddialog.h +debian/tmp/opt/kde3/include/tde/kfind.h +debian/tmp/opt/kde3/include/tde/kfontcombo.h +debian/tmp/opt/kde3/include/tde/kfontdialog.h +debian/tmp/opt/kde3/include/tde/kfontrequester.h +debian/tmp/opt/kde3/include/tde/kgenericfactory.h +debian/tmp/opt/kde3/include/tde/kgenericfactory.tcc +debian/tmp/opt/kde3/include/tde/kglobalaccel.h +debian/tmp/opt/kde3/include/tde/kglobal.h +debian/tmp/opt/kde3/include/tde/kglobalsettings.h +debian/tmp/opt/kde3/include/tde/kguiitem.h +debian/tmp/opt/kde3/include/tde/khelpmenu.h +debian/tmp/opt/kde3/include/tde/khexedit/byteseditinterface.h +debian/tmp/opt/kde3/include/tde/khexedit/charcolumninterface.h +debian/tmp/opt/kde3/include/tde/khexedit/clipboardinterface.h +debian/tmp/opt/kde3/include/tde/khexedit/valuecolumninterface.h +debian/tmp/opt/kde3/include/tde/khexedit/zoominterface.h +debian/tmp/opt/kde3/include/tde/khtmldefaults.h +debian/tmp/opt/kde3/include/tde/khtml_events.h +debian/tmp/opt/kde3/include/tde/khtml_part.h +debian/tmp/opt/kde3/include/tde/khtml_settings.h +debian/tmp/opt/kde3/include/tde/khtmlview.h +debian/tmp/opt/kde3/include/tde/khttpproxysocketdevice.h +debian/tmp/opt/kde3/include/tde/kicondialog.h +debian/tmp/opt/kde3/include/tde/kiconeffect.h +debian/tmp/opt/kde3/include/tde/kiconloader.h +debian/tmp/opt/kde3/include/tde/kicontheme.h +debian/tmp/opt/kde3/include/tde/kiconview.h +debian/tmp/opt/kde3/include/tde/kiconviewsearchline.h +debian/tmp/opt/kde3/include/tde/kidna.h +debian/tmp/opt/kde3/include/tde/kimageeffect.h +debian/tmp/opt/kde3/include/tde/kimagefilepreview.h +debian/tmp/opt/kde3/include/tde/kimageio.h +debian/tmp/opt/kde3/include/tde/kimiface.h +debian/tmp/opt/kde3/include/tde/kimproxy.h +debian/tmp/opt/kde3/include/tde/kimproxyiface.h +debian/tmp/opt/kde3/include/tde/kinputdialog.h +debian/tmp/opt/kde3/include/tde/kinstance.h +debian/tmp/opt/kde3/include/tde/kio/authinfo.h +debian/tmp/opt/kde3/include/tde/kiobuffer.h +debian/tmp/opt/kde3/include/tde/kio/chmodjob.h +debian/tmp/opt/kde3/include/tde/kio/connection.h +debian/tmp/opt/kde3/include/tde/kio/davjob.h +debian/tmp/opt/kde3/include/tde/kio/defaultprogress.h +debian/tmp/opt/kde3/include/tde/kio/file.h +debian/tmp/opt/kde3/include/tde/kio/forwardingslavebase.h +debian/tmp/opt/kde3/include/tde/kio/global.h +debian/tmp/opt/kde3/include/tde/kio/http.h +debian/tmp/opt/kde3/include/tde/kio/http_slave_defaults.h +debian/tmp/opt/kde3/include/tde/kio/ioslave_defaults.h +debian/tmp/opt/kde3/include/tde/kio/jobclasses.h +debian/tmp/opt/kde3/include/tde/kio/job.h +debian/tmp/opt/kde3/include/tde/kio/kdesasl.h +debian/tmp/opt/kde3/include/tde/kio/kmdbase.h +debian/tmp/opt/kde3/include/tde/kio/kmdcodec.h +debian/tmp/opt/kde3/include/tde/kio/kntlm.h +debian/tmp/opt/kde3/include/tde/kio/metainfojob.h +debian/tmp/opt/kde3/include/tde/kio/netaccess.h +debian/tmp/opt/kde3/include/tde/kio/observer.h +debian/tmp/opt/kde3/include/tde/kio/passdlg.h +debian/tmp/opt/kde3/include/tde/kio/paste.h +debian/tmp/opt/kde3/include/tde/kio/previewjob.h +debian/tmp/opt/kde3/include/tde/kio/progressbase.h +debian/tmp/opt/kde3/include/tde/kio/renamedlg.h +debian/tmp/opt/kde3/include/tde/kio/scheduler.h +debian/tmp/opt/kde3/include/tde/kio/sessiondata.h +debian/tmp/opt/kde3/include/tde/kio/skipdlg.h +debian/tmp/opt/kde3/include/tde/kio/slavebase.h +debian/tmp/opt/kde3/include/tde/kio/slaveconfig.h +debian/tmp/opt/kde3/include/tde/kio/slave.h +debian/tmp/opt/kde3/include/tde/kio/slaveinterface.h +debian/tmp/opt/kde3/include/tde/kio/statusbarprogress.h +debian/tmp/opt/kde3/include/tde/kio/tcpslavebase.h +debian/tmp/opt/kde3/include/tde/kio/thumbcreator.h +debian/tmp/opt/kde3/include/tde/kio/uiserver.h +debian/tmp/opt/kde3/include/tde/kio/uiserver_stub.h +debian/tmp/opt/kde3/include/tde/kipc.h +debian/tmp/opt/kde3/include/tde/kjanuswidget.h +debian/tmp/opt/kde3/include/tde/kjs/completion.h +debian/tmp/opt/kde3/include/tde/kjs/function.h +debian/tmp/opt/kde3/include/tde/kjs/global.h +debian/tmp/opt/kde3/include/tde/kjs/identifier.h +debian/tmp/opt/kde3/include/tde/kjs/interpreter.h +debian/tmp/opt/kde3/include/tde/kjs/list.h +debian/tmp/opt/kde3/include/tde/kjs/lookup.h +debian/tmp/opt/kde3/include/tde/kjs/object.h +debian/tmp/opt/kde3/include/tde/kjs/operations.h +debian/tmp/opt/kde3/include/tde/kjs/property_map.h +debian/tmp/opt/kde3/include/tde/kjs/reference.h +debian/tmp/opt/kde3/include/tde/kjs/reference_list.h +debian/tmp/opt/kde3/include/tde/kjs/scope_chain.h +debian/tmp/opt/kde3/include/tde/kjs/simple_number.h +debian/tmp/opt/kde3/include/tde/kjs/types.h +debian/tmp/opt/kde3/include/tde/kjs/ustring.h +debian/tmp/opt/kde3/include/tde/kjs/value.h +debian/tmp/opt/kde3/include/tde/kkeybutton.h +debian/tmp/opt/kde3/include/tde/kkeydialog.h +debian/tmp/opt/kde3/include/tde/kkeynative.h +debian/tmp/opt/kde3/include/tde/klanguagebutton.h +debian/tmp/opt/kde3/include/tde/klargefile.h +debian/tmp/opt/kde3/include/tde/kled.h +debian/tmp/opt/kde3/include/tde/klibloader.h +debian/tmp/opt/kde3/include/tde/klineeditdlg.h +debian/tmp/opt/kde3/include/tde/klineedit.h +debian/tmp/opt/kde3/include/tde/klistbox.h +debian/tmp/opt/kde3/include/tde/klistview.h +debian/tmp/opt/kde3/include/tde/klistviewsearchline.h +debian/tmp/opt/kde3/include/tde/klocale.h +debian/tmp/opt/kde3/include/tde/klockfile.h +debian/tmp/opt/kde3/include/tde/kmacroexpander.h +debian/tmp/opt/kde3/include/tde/kmainwindow.h +debian/tmp/opt/kde3/include/tde/kmainwindowiface.h +debian/tmp/opt/kde3/include/tde/kmanagerselection.h +debian/tmp/opt/kde3/include/tde/kmdcodec.h +debian/tmp/opt/kde3/include/tde/kmdichildarea.h +debian/tmp/opt/kde3/include/tde/kmdichildfrmcaption.h +debian/tmp/opt/kde3/include/tde/kmdichildfrm.h +debian/tmp/opt/kde3/include/tde/kmdichildview.h +debian/tmp/opt/kde3/include/tde/kmdidefines.h +debian/tmp/opt/kde3/include/tde/kmdi/global.h +debian/tmp/opt/kde3/include/tde/kmdiiterator.h +debian/tmp/opt/kde3/include/tde/kmdilistiterator.h +debian/tmp/opt/kde3/include/tde/kmdimainfrm.h +debian/tmp/opt/kde3/include/tde/kmdi/mainwindow.h +debian/tmp/opt/kde3/include/tde/kmdinulliterator.h +debian/tmp/opt/kde3/include/tde/kmdi/tabwidget.h +debian/tmp/opt/kde3/include/tde/kmditaskbar.h +debian/tmp/opt/kde3/include/tde/kmdi/toolviewaccessor.h +debian/tmp/opt/kde3/include/tde/kmditoolviewaccessor.h +debian/tmp/opt/kde3/include/tde/kmediaplayer/playerdcopobject.h +debian/tmp/opt/kde3/include/tde/kmediaplayer/player.h +debian/tmp/opt/kde3/include/tde/kmediaplayer/view.h +debian/tmp/opt/kde3/include/tde/kmenubar.h +debian/tmp/opt/kde3/include/tde/kmessagebox.h +debian/tmp/opt/kde3/include/tde/kmimemagic.h +debian/tmp/opt/kde3/include/tde/kmimesourcefactory.h +debian/tmp/opt/kde3/include/tde/kmimetypechooser.h +debian/tmp/opt/kde3/include/tde/kmimetype.h +debian/tmp/opt/kde3/include/tde/kmimetyperesolver.h +debian/tmp/opt/kde3/include/tde/kmountpoint.h +debian/tmp/opt/kde3/include/tde/kmulticastsocketdevice.h +debian/tmp/opt/kde3/include/tde/kmulticastsocket.h +debian/tmp/opt/kde3/include/tde/kmultipledrag.h +debian/tmp/opt/kde3/include/tde/kmultitabbar.h +debian/tmp/opt/kde3/include/tde/knetworkinterface.h +debian/tmp/opt/kde3/include/tde/knewstuff/downloaddialog.h +debian/tmp/opt/kde3/include/tde/knewstuff/engine.h +debian/tmp/opt/kde3/include/tde/knewstuff/entry.h +debian/tmp/opt/kde3/include/tde/knewstuff/knewstuffbutton.h +debian/tmp/opt/kde3/include/tde/knewstuff/knewstuffgeneric.h +debian/tmp/opt/kde3/include/tde/knewstuff/knewstuff.h +debian/tmp/opt/kde3/include/tde/knewstuff/knewstuffsecure.h +debian/tmp/opt/kde3/include/tde/knewstuff/providerdialog.h +debian/tmp/opt/kde3/include/tde/knewstuff/provider.h +debian/tmp/opt/kde3/include/tde/knewstuff/uploaddialog.h +debian/tmp/opt/kde3/include/tde/knfsshare.h +debian/tmp/opt/kde3/include/tde/knotifyclient.h +debian/tmp/opt/kde3/include/tde/knotifydialog.h +debian/tmp/opt/kde3/include/tde/knotifywidgetbase.h +debian/tmp/opt/kde3/include/tde/knuminput.h +debian/tmp/opt/kde3/include/tde/knumvalidator.h +debian/tmp/opt/kde3/include/tde/kopenssl.h +debian/tmp/opt/kde3/include/tde/kopenwith.h +debian/tmp/opt/kde3/include/tde/kpalette.h +debian/tmp/opt/kde3/include/tde/kpanelapplet.h +debian/tmp/opt/kde3/include/tde/kpanelappmenu.h +debian/tmp/opt/kde3/include/tde/kpanelextension.h +debian/tmp/opt/kde3/include/tde/kpanelmenu.h +debian/tmp/opt/kde3/include/tde/kparts/browserextension.h +debian/tmp/opt/kde3/include/tde/kparts/browserinterface.h +debian/tmp/opt/kde3/include/tde/kparts/browserrun.h +debian/tmp/opt/kde3/include/tde/kparts/componentfactory.h +debian/tmp/opt/kde3/include/tde/kparts/dockmainwindow.h +debian/tmp/opt/kde3/include/tde/kparts/event.h +debian/tmp/opt/kde3/include/tde/kparts/factory.h +debian/tmp/opt/kde3/include/tde/kparts/genericfactory.h +debian/tmp/opt/kde3/include/tde/kparts/historyprovider.h +debian/tmp/opt/kde3/include/tde/kparts/mainwindow.h +debian/tmp/opt/kde3/include/tde/kparts/part.h +debian/tmp/opt/kde3/include/tde/kparts/partmanager.h +debian/tmp/opt/kde3/include/tde/kparts/plugin.h +debian/tmp/opt/kde3/include/tde/kparts/statusbarextension.h +debian/tmp/opt/kde3/include/tde/kpassdlg.h +debian/tmp/opt/kde3/include/tde/kpassivepopup.h +debian/tmp/opt/kde3/include/tde/kpixmapeffect.h +debian/tmp/opt/kde3/include/tde/kpixmap.h +debian/tmp/opt/kde3/include/tde/kpixmapio.h +debian/tmp/opt/kde3/include/tde/kpixmapprovider.h +debian/tmp/opt/kde3/include/tde/kpixmapregionselectordialog.h +debian/tmp/opt/kde3/include/tde/kpixmapregionselectorwidget.h +debian/tmp/opt/kde3/include/tde/kpixmapsplitter.h +debian/tmp/opt/kde3/include/tde/kplugininfo.h +debian/tmp/opt/kde3/include/tde/kpluginselector.h +debian/tmp/opt/kde3/include/tde/kpopupmenu.h +debian/tmp/opt/kde3/include/tde/kpreviewwidgetbase.h +debian/tmp/opt/kde3/include/tde/kprintaction.h +debian/tmp/opt/kde3/include/tde/kprinter.h +debian/tmp/opt/kde3/include/tde/kprocctrl.h +debian/tmp/opt/kde3/include/tde/kprocess.h +debian/tmp/opt/kde3/include/tde/kprocio.h +debian/tmp/opt/kde3/include/tde/kprogress.h +debian/tmp/opt/kde3/include/tde/kprogressbox.h +debian/tmp/opt/kde3/include/tde/kpropertiesdialog.h +debian/tmp/opt/kde3/include/tde/kpropsdlg.h +debian/tmp/opt/kde3/include/tde/kprotocolinfo.h +debian/tmp/opt/kde3/include/tde/kprotocolmanager.h +debian/tmp/opt/kde3/include/tde/kpty.h +debian/tmp/opt/kde3/include/tde/kpushbutton.h +debian/tmp/opt/kde3/include/tde/krandomsequence.h +debian/tmp/opt/kde3/include/tde/krecentdocument.h +debian/tmp/opt/kde3/include/tde/kregexpeditorinterface.h +debian/tmp/opt/kde3/include/tde/kregexp.h +debian/tmp/opt/kde3/include/tde/kremoteencoding.h +debian/tmp/opt/kde3/include/tde/kreplacedialog.h +debian/tmp/opt/kde3/include/tde/kreplace.h +debian/tmp/opt/kde3/include/tde/kresolver.h +debian/tmp/opt/kde3/include/tde/kresources/configdialog.h +debian/tmp/opt/kde3/include/tde/kresources/configpage.h +debian/tmp/opt/kde3/include/tde/kresources/configwidget.h +debian/tmp/opt/kde3/include/tde/kresources/factory.h +debian/tmp/opt/kde3/include/tde/kresources/manager.h +debian/tmp/opt/kde3/include/tde/kresources/manageriface.h +debian/tmp/opt/kde3/include/tde/kresources/managerimpl.h +debian/tmp/opt/kde3/include/tde/kresources/resource.h +debian/tmp/opt/kde3/include/tde/kresources/selectdialog.h +debian/tmp/opt/kde3/include/tde/krestrictedline.h +debian/tmp/opt/kde3/include/tde/kreverseresolver.h +debian/tmp/opt/kde3/include/tde/krfcdate.h +debian/tmp/opt/kde3/include/tde/krootpixmap.h +debian/tmp/opt/kde3/include/tde/krootprop.h +debian/tmp/opt/kde3/include/tde/kruler.h +debian/tmp/opt/kde3/include/tde/krun.h +debian/tmp/opt/kde3/include/tde/ksambashare.h +debian/tmp/opt/kde3/include/tde/ksavefile.h +debian/tmp/opt/kde3/include/tde/kscan.h +debian/tmp/opt/kde3/include/tde/ksconfig.h +debian/tmp/opt/kde3/include/tde/kscreensaver.h +debian/tmp/opt/kde3/include/tde/kscreensaver_vroot.h +debian/tmp/opt/kde3/include/tde/kscrollview.h +debian/tmp/opt/kde3/include/tde/kselect.h +debian/tmp/opt/kde3/include/tde/kseparator.h +debian/tmp/opt/kde3/include/tde/kserversocket.h +debian/tmp/opt/kde3/include/tde/kservicegroup.h +debian/tmp/opt/kde3/include/tde/kservice.h +debian/tmp/opt/kde3/include/tde/kservicetype.h +debian/tmp/opt/kde3/include/tde/ksettings/componentsdialog.h +debian/tmp/opt/kde3/include/tde/ksettings/dialog.h +debian/tmp/opt/kde3/include/tde/ksettings/dispatcher.h +debian/tmp/opt/kde3/include/tde/ksettings/pluginpage.h +debian/tmp/opt/kde3/include/tde/ksharedpixmap.h +debian/tmp/opt/kde3/include/tde/ksharedptr.h +debian/tmp/opt/kde3/include/tde/kshellcompletion.h +debian/tmp/opt/kde3/include/tde/kshell.h +debian/tmp/opt/kde3/include/tde/kshortcutdialog.h +debian/tmp/opt/kde3/include/tde/kshortcut.h +debian/tmp/opt/kde3/include/tde/kshortcutlist.h +debian/tmp/opt/kde3/include/tde/kshred.h +debian/tmp/opt/kde3/include/tde/ksimpleconfig.h +debian/tmp/opt/kde3/include/tde/ksmimecrypto.h +debian/tmp/opt/kde3/include/tde/ksockaddr.h +debian/tmp/opt/kde3/include/tde/tdesocketaddress.h +debian/tmp/opt/kde3/include/tde/tdesocketbase.h +debian/tmp/opt/kde3/include/tde/tdesocketdevice.h +debian/tmp/opt/kde3/include/tde/ksock.h +debian/tmp/opt/kde3/include/tde/ksocks.h +debian/tmp/opt/kde3/include/tde/ksockssocketdevice.h +debian/tmp/opt/kde3/include/tde/ksortablevaluelist.h +debian/tmp/opt/kde3/include/tde/kspeech.h +debian/tmp/opt/kde3/include/tde/kspeechsink.h +debian/tmp/opt/kde3/include/tde/kspell2/backgroundchecker.h +debian/tmp/opt/kde3/include/tde/kspell2/broker.h +debian/tmp/opt/kde3/include/tde/kspell2/configdialog.h +debian/tmp/opt/kde3/include/tde/kspell2/configwidget.h +debian/tmp/opt/kde3/include/tde/kspell2/defaultdictionary.h +debian/tmp/opt/kde3/include/tde/kspell2/dialog.h +debian/tmp/opt/kde3/include/tde/kspell2/dictionary.h +debian/tmp/opt/kde3/include/tde/kspell2/filter.h +debian/tmp/opt/kde3/include/tde/kspell2/highlighter.h +debian/tmp/opt/kde3/include/tde/kspell2/settings.h +debian/tmp/opt/kde3/include/tde/kspelldlg.h +debian/tmp/opt/kde3/include/tde/kspell.h +debian/tmp/opt/kde3/include/tde/ksplashscreen.h +debian/tmp/opt/kde3/include/tde/ksqueezedtextlabel.h +debian/tmp/opt/kde3/include/tde/ksslall.h +debian/tmp/opt/kde3/include/tde/ksslcertchain.h +debian/tmp/opt/kde3/include/tde/ksslcertdlg.h +debian/tmp/opt/kde3/include/tde/ksslcertificatecache.h +debian/tmp/opt/kde3/include/tde/ksslcertificatefactory.h +debian/tmp/opt/kde3/include/tde/ksslcertificate.h +debian/tmp/opt/kde3/include/tde/ksslcertificatehome.h +debian/tmp/opt/kde3/include/tde/ksslconfig.h +debian/tmp/opt/kde3/include/tde/ksslconnectioninfo.h +debian/tmp/opt/kde3/include/tde/kssl.h +debian/tmp/opt/kde3/include/tde/ksslinfodlg.h +debian/tmp/opt/kde3/include/tde/ksslkeygen.h +debian/tmp/opt/kde3/include/tde/ksslpeerinfo.h +debian/tmp/opt/kde3/include/tde/ksslpemcallback.h +debian/tmp/opt/kde3/include/tde/ksslpkcs12.h +debian/tmp/opt/kde3/include/tde/ksslpkcs7.h +debian/tmp/opt/kde3/include/tde/ksslsession.h +debian/tmp/opt/kde3/include/tde/ksslsettings.h +debian/tmp/opt/kde3/include/tde/ksslsigners.h +debian/tmp/opt/kde3/include/tde/ksslutils.h +debian/tmp/opt/kde3/include/tde/ksslx509map.h +debian/tmp/opt/kde3/include/tde/ksslx509v3.h +debian/tmp/opt/kde3/include/tde/kstandarddirs.h +debian/tmp/opt/kde3/include/tde/kstartupinfo.h +debian/tmp/opt/kde3/include/tde/kstaticdeleter.h +debian/tmp/opt/kde3/include/tde/kstatusbar.h +debian/tmp/opt/kde3/include/tde/kstdaccel.h +debian/tmp/opt/kde3/include/tde/kstdaction.h +debian/tmp/opt/kde3/include/tde/kstddirs.h +debian/tmp/opt/kde3/include/tde/kstdguiitem.h +debian/tmp/opt/kde3/include/tde/kstreamsocket.h +debian/tmp/opt/kde3/include/tde/kstringhandler.h +debian/tmp/opt/kde3/include/tde/kstringvalidator.h +debian/tmp/opt/kde3/include/tde/kstyle.h +debian/tmp/opt/kde3/include/tde/ksvgiconengine.h +debian/tmp/opt/kde3/include/tde/kswitchlanguagedialog.h +debian/tmp/opt/kde3/include/tde/ksycocaentry.h +debian/tmp/opt/kde3/include/tde/ksycoca.h +debian/tmp/opt/kde3/include/tde/ksycocatype.h +debian/tmp/opt/kde3/include/tde/ksyntaxhighlighter.h +debian/tmp/opt/kde3/include/tde/ksystemtray.h +debian/tmp/opt/kde3/include/tde/ktabbar.h +debian/tmp/opt/kde3/include/tde/ktabctl.h +debian/tmp/opt/kde3/include/tde/ktabwidget.h +debian/tmp/opt/kde3/include/tde/ktar.h +debian/tmp/opt/kde3/include/tde/ktempdir.h +debian/tmp/opt/kde3/include/tde/ktempfile.h +debian/tmp/opt/kde3/include/tde/ktextbrowser.h +debian/tmp/opt/kde3/include/tde/ktextedit.h +debian/tmp/opt/kde3/include/tde/ktexteditor/blockselectioninterface.h +debian/tmp/opt/kde3/include/tde/ktexteditor/clipboardinterface.h +debian/tmp/opt/kde3/include/tde/ktexteditor/codecompletioninterface.h +debian/tmp/opt/kde3/include/tde/ktexteditor/configinterfaceextension.h +debian/tmp/opt/kde3/include/tde/ktexteditor/configinterface.h +debian/tmp/opt/kde3/include/tde/ktexteditor/cursorinterface.h +debian/tmp/opt/kde3/include/tde/ktexteditor/document.h +debian/tmp/opt/kde3/include/tde/ktexteditor/documentinfo.h +debian/tmp/opt/kde3/include/tde/ktexteditor/dynwordwrapinterface.h +debian/tmp/opt/kde3/include/tde/ktexteditor/editinterfaceext.h +debian/tmp/opt/kde3/include/tde/ktexteditor/editinterface.h +debian/tmp/opt/kde3/include/tde/ktexteditor/editorchooser.h +debian/tmp/opt/kde3/include/tde/ktexteditor/editor.h +debian/tmp/opt/kde3/include/tde/ktexteditor/encodinginterface.h +debian/tmp/opt/kde3/include/tde/ktexteditor/highlightinginterface.h +debian/tmp/opt/kde3/include/tde/ktexteditor/markinterfaceextension.h +debian/tmp/opt/kde3/include/tde/ktexteditor/markinterface.h +debian/tmp/opt/kde3/include/tde/ktexteditor/plugin.h +debian/tmp/opt/kde3/include/tde/ktexteditor/popupmenuinterface.h +debian/tmp/opt/kde3/include/tde/ktexteditor/printinterface.h +debian/tmp/opt/kde3/include/tde/ktexteditor/searchinterface.h +debian/tmp/opt/kde3/include/tde/ktexteditor/selectionextdcopinterface.h +debian/tmp/opt/kde3/include/tde/ktexteditor/selectioninterfaceext.h +debian/tmp/opt/kde3/include/tde/ktexteditor/selectioninterface.h +debian/tmp/opt/kde3/include/tde/ktexteditor/sessionconfiginterface.h +debian/tmp/opt/kde3/include/tde/ktexteditor/templateinterface.h +debian/tmp/opt/kde3/include/tde/ktexteditor/texthintinterface.h +debian/tmp/opt/kde3/include/tde/ktexteditor/undointerface.h +debian/tmp/opt/kde3/include/tde/ktexteditor/variableinterface.h +debian/tmp/opt/kde3/include/tde/ktexteditor/viewcursorinterface.h +debian/tmp/opt/kde3/include/tde/ktexteditor/view.h +debian/tmp/opt/kde3/include/tde/ktexteditor/viewstatusmsginterface.h +debian/tmp/opt/kde3/include/tde/ktexteditor/wordwrapinterface.h +debian/tmp/opt/kde3/include/tde/ktimewidget.h +debian/tmp/opt/kde3/include/tde/ktimezones.h +debian/tmp/opt/kde3/include/tde/ktimezonewidget.h +debian/tmp/opt/kde3/include/tde/ktip.h +debian/tmp/opt/kde3/include/tde/ktoolbarbutton.h +debian/tmp/opt/kde3/include/tde/ktoolbar.h +debian/tmp/opt/kde3/include/tde/ktoolbarlabelaction.h +debian/tmp/opt/kde3/include/tde/ktoolbarradiogroup.h +debian/tmp/opt/kde3/include/tde/ktrader.h +debian/tmp/opt/kde3/include/tde/ktypelist.h +debian/tmp/opt/kde3/include/tde/kuniqueapp.h +debian/tmp/opt/kde3/include/tde/kuniqueapplication.h +debian/tmp/opt/kde3/include/tde/kunittest/module.h +debian/tmp/opt/kde3/include/tde/kunittest/runner.h +debian/tmp/opt/kde3/include/tde/kunittest/tester.h +debian/tmp/opt/kde3/include/tde/kunload.h +debian/tmp/opt/kde3/include/tde/kurifilter.h +debian/tmp/opt/kde3/include/tde/kurlbar.h +debian/tmp/opt/kde3/include/tde/kurlcombobox.h +debian/tmp/opt/kde3/include/tde/kurlcompletion.h +debian/tmp/opt/kde3/include/tde/kurldrag.h +debian/tmp/opt/kde3/include/tde/kurl.h +debian/tmp/opt/kde3/include/tde/kurllabel.h +debian/tmp/opt/kde3/include/tde/kurlpixmapprovider.h +debian/tmp/opt/kde3/include/tde/kurlrequesterdlg.h +debian/tmp/opt/kde3/include/tde/kurlrequester.h +debian/tmp/opt/kde3/include/tde/kuser.h +debian/tmp/opt/kde3/include/tde/kuserprofile.h +debian/tmp/opt/kde3/include/tde/kvmallocator.h +debian/tmp/opt/kde3/include/tde/kwallet.h +debian/tmp/opt/kde3/include/tde/kwallettypes.h +debian/tmp/opt/kde3/include/tde/kwindowinfo.h +debian/tmp/opt/kde3/include/tde/kwindowlistmenu.h +debian/tmp/opt/kde3/include/tde/kwin.h +debian/tmp/opt/kde3/include/tde/kwinmodule.h +debian/tmp/opt/kde3/include/tde/kwizard.h +debian/tmp/opt/kde3/include/tde/kwordwrap.h +debian/tmp/opt/kde3/include/tde/kxerrorhandler.h +debian/tmp/opt/kde3/include/tde/kxmessages.h +debian/tmp/opt/kde3/include/tde/kxmlguibuilder.h +debian/tmp/opt/kde3/include/tde/kxmlguiclient.h +debian/tmp/opt/kde3/include/tde/kxmlguifactory.h +debian/tmp/opt/kde3/include/tde/kxmlgui.h +debian/tmp/opt/kde3/include/tde/kzip.h +debian/tmp/opt/kde3/include/tde/libkrandr/ktimerdialog.h +debian/tmp/opt/kde3/include/tde/libkrandr/libkrandr.h +debian/tmp/opt/kde3/include/tde/libkrandr/lowlevel_randr.h +debian/tmp/opt/kde3/include/tde/libkrandr/randr.h +debian/tmp/opt/kde3/include/tde/libkmid/alsaout.h +debian/tmp/opt/kde3/include/tde/libkmid/dattypes.h +debian/tmp/opt/kde3/include/tde/libkmid/deviceman.h +debian/tmp/opt/kde3/include/tde/libkmid/fmout.h +debian/tmp/opt/kde3/include/tde/libkmid/gusout.h +debian/tmp/opt/kde3/include/tde/libkmid/libkmid.h +debian/tmp/opt/kde3/include/tde/libkmid/midfile.h +debian/tmp/opt/kde3/include/tde/libkmid/midimapper.h +debian/tmp/opt/kde3/include/tde/libkmid/midiout.h +debian/tmp/opt/kde3/include/tde/libkmid/midispec.h +debian/tmp/opt/kde3/include/tde/libkmid/midistat.h +debian/tmp/opt/kde3/include/tde/libkmid/mt32togm.h +debian/tmp/opt/kde3/include/tde/libkmid/notearray.h +debian/tmp/opt/kde3/include/tde/libkmid/player.h +debian/tmp/opt/kde3/include/tde/libkmid/synthout.h +debian/tmp/opt/kde3/include/tde/libkmid/track.h +debian/tmp/opt/kde3/include/tde/libkmid/voiceman.h +debian/tmp/opt/kde3/include/tde/netwm_def.h +debian/tmp/opt/kde3/include/tde/netwm.h +debian/tmp/opt/kde3/include/tde/qxembed.h +debian/tmp/opt/kde3/include/tde/renamedlgplugin.h +debian/tmp/opt/kde3/include/tde/scriptclientinterface.h +debian/tmp/opt/kde3/include/tde/scriptinterface.h +debian/tmp/opt/kde3/include/tde/scriptmanager.h -debian/tmp/opt/kde3/include/kde/networkstatuscommon.h -debian/tmp/opt/kde3/include/kde/networkstatusiface.h -debian/tmp/opt/kde3/include/kde/networkstatusindicator.h -debian/tmp/opt/kde3/include/kde/connectionmanager.h -debian/tmp/opt/kde3/include/kde/serviceiface.h -debian/tmp/opt/kde3/include/kde/provideriface.h -#debian/tmp/opt/kde3/include/kde/kdemm +debian/tmp/opt/kde3/include/tde/networkstatuscommon.h +debian/tmp/opt/kde3/include/tde/networkstatusiface.h +debian/tmp/opt/kde3/include/tde/networkstatusindicator.h +debian/tmp/opt/kde3/include/tde/connectionmanager.h +debian/tmp/opt/kde3/include/tde/serviceiface.h +debian/tmp/opt/kde3/include/tde/provideriface.h +#debian/tmp/opt/kde3/include/tde/kdemm debian/tmp/opt/kde3/lib/libnetworkstatus.la debian/tmp/opt/kde3/lib/libnetworkstatus.so diff --git a/ubuntu/lucid_automake/kdelibs/debian/rules b/ubuntu/lucid_automake/kdelibs/debian/rules index 184c61508..0d3d39814 100755 --- a/ubuntu/lucid_automake/kdelibs/debian/rules +++ b/ubuntu/lucid_automake/kdelibs/debian/rules @@ -12,14 +12,14 @@ DEB_KDE_APIDOX := yes version=Debian Package $(DEB_VERSION) DEB_OPT_FLAG += -DDEBIAN_VERSION=$(DEB_VERSION) -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) -DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_SKIP_RPATH=OFF -DCMAKE_LIBRARY_PATH="/opt/kde3/lib" -DCMAKE_INCLUDE_PATH="/opt/kde3/include/kde" -DCMAKE_CXX_FLAGS="-I/opt/kde3/include/kde" -DCMAKE_LDFLAGS="-L/opt/kde3/lib" +DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_SKIP_RPATH=OFF -DCMAKE_LIBRARY_PATH="/opt/kde3/lib" -DCMAKE_INCLUDE_PATH="/opt/kde3/include/tde" -DCMAKE_CXX_FLAGS="-I/opt/kde3/include/tde" -DCMAKE_LDFLAGS="-L/opt/kde3/lib" DEB_CONFIGURE_EXTRA_FLAGS := \ --enable-mitshm --with-alsa --enable-dnotify --enable-inotify \ diff --git a/ubuntu/lucid_automake/kdemultimedia/debian/cdbs/kde.mk b/ubuntu/lucid_automake/kdemultimedia/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/lucid_automake/kdemultimedia/debian/cdbs/kde.mk +++ b/ubuntu/lucid_automake/kdemultimedia/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/lucid_automake/kdemultimedia/debian/kdemultimedia-kde3-dev.install b/ubuntu/lucid_automake/kdemultimedia/debian/kdemultimedia-kde3-dev.install index 0d38ad1da..9c0473a9d 100644 --- a/ubuntu/lucid_automake/kdemultimedia/debian/kdemultimedia-kde3-dev.install +++ b/ubuntu/lucid_automake/kdemultimedia/debian/kdemultimedia-kde3-dev.install @@ -1,137 +1,137 @@ -debian/tmp/opt/kde3/include/kde/arts/artsbuilder.h -debian/tmp/opt/kde3/include/kde/arts/artsbuilder.idl -debian/tmp/opt/kde3/include/kde/arts/artsgui.h -debian/tmp/opt/kde3/include/kde/arts/artsgui.idl -debian/tmp/opt/kde3/include/kde/arts/artsmidi.h -debian/tmp/opt/kde3/include/kde/arts/artsmidi.idl -debian/tmp/opt/kde3/include/kde/arts/artsmodules.h -debian/tmp/opt/kde3/include/kde/arts/artsmodules.idl -debian/tmp/opt/kde3/include/kde/arts/artsmodulescommon.h -debian/tmp/opt/kde3/include/kde/arts/artsmodulescommon.idl -debian/tmp/opt/kde3/include/kde/arts/artsmoduleseffects.h -debian/tmp/opt/kde3/include/kde/arts/artsmoduleseffects.idl -debian/tmp/opt/kde3/include/kde/arts/artsmodulesmixers.h -debian/tmp/opt/kde3/include/kde/arts/artsmodulesmixers.idl -debian/tmp/opt/kde3/include/kde/arts/artsmodulessynth.h -debian/tmp/opt/kde3/include/kde/arts/artsmodulessynth.idl -debian/tmp/opt/kde3/include/kde/arts/kartswidget.h -debian/tmp/opt/kde3/include/kde/arts/kframe_impl.h -debian/tmp/opt/kde3/include/kde/arts/klayoutbox_impl.h -debian/tmp/opt/kde3/include/kde/arts/kwidget_impl.h -debian/tmp/opt/kde3/include/kde/arts/kwidgetrepo.h -debian/tmp/opt/kde3/include/kde/audiocdencoder.h -debian/tmp/opt/kde3/include/kde/cmodule.h -debian/tmp/opt/kde3/include/kde/effectview.h -debian/tmp/opt/kde3/include/kde/equalizerview.h -debian/tmp/opt/kde3/include/kde/ksaver.h -debian/tmp/opt/kde3/include/kde/libkcddb/cache.h -debian/tmp/opt/kde3/include/kde/libkcddb/cddb.h -debian/tmp/opt/kde3/include/kde/libkcddb/cdinfo.h -debian/tmp/opt/kde3/include/kde/libkcddb/client.h -debian/tmp/opt/kde3/include/kde/libkcddb/config.h -debian/tmp/opt/kde3/include/kde/libkcddb/configbase.h -debian/tmp/opt/kde3/include/kde/mimetypetree.h -debian/tmp/opt/kde3/include/kde/mpeglib/decoder/cddaPlugin.h -debian/tmp/opt/kde3/include/kde/mpeglib/decoder/command.h -debian/tmp/opt/kde3/include/kde/mpeglib/decoder/commandPipe.h -debian/tmp/opt/kde3/include/kde/mpeglib/decoder/decoderPlugin.h -debian/tmp/opt/kde3/include/kde/mpeglib/decoder/mpegPlugin.h -debian/tmp/opt/kde3/include/kde/mpeglib/decoder/mpgPlugin.h -debian/tmp/opt/kde3/include/kde/mpeglib/decoder/nukePlugin.h -debian/tmp/opt/kde3/include/kde/mpeglib/decoder/splayPlugin.h -debian/tmp/opt/kde3/include/kde/mpeglib/decoder/tplayPlugin.h -debian/tmp/opt/kde3/include/kde/mpeglib/decoder/vorbisPlugin.h -debian/tmp/opt/kde3/include/kde/mpeglib/decoder/yuvPlugin.h -debian/tmp/opt/kde3/include/kde/mpeglib/frame/IOFrameQueue.h -debian/tmp/opt/kde3/include/kde/mpeglib/frame/audioFrame.h -debian/tmp/opt/kde3/include/kde/mpeglib/frame/audioFrameQueue.h -debian/tmp/opt/kde3/include/kde/mpeglib/frame/floatFrame.h -debian/tmp/opt/kde3/include/kde/mpeglib/frame/frame.h -debian/tmp/opt/kde3/include/kde/mpeglib/frame/frameQueue.h -debian/tmp/opt/kde3/include/kde/mpeglib/frame/framer.h -debian/tmp/opt/kde3/include/kde/mpeglib/frame/pcmFrame.h -debian/tmp/opt/kde3/include/kde/mpeglib/frame/rawDataBuffer.h -debian/tmp/opt/kde3/include/kde/mpeglib/frame/rawFrame.h -debian/tmp/opt/kde3/include/kde/mpeglib/input/bufferInputStream.h -debian/tmp/opt/kde3/include/kde/mpeglib/input/cddaInputStream.h -debian/tmp/opt/kde3/include/kde/mpeglib/input/cdromInputStream.h -debian/tmp/opt/kde3/include/kde/mpeglib/input/fileInputStream.h -debian/tmp/opt/kde3/include/kde/mpeglib/input/httpInputStream.h -debian/tmp/opt/kde3/include/kde/mpeglib/input/inputDetector.h -debian/tmp/opt/kde3/include/kde/mpeglib/input/inputPlugin.h -debian/tmp/opt/kde3/include/kde/mpeglib/input/inputStream.h -debian/tmp/opt/kde3/include/kde/mpeglib/input/threadSafeInputStream.h -debian/tmp/opt/kde3/include/kde/mpeglib/mpegutil/mpegStreamPlayer.h -debian/tmp/opt/kde3/include/kde/mpeglib/mpegutil/mpegSystemHeader.h -debian/tmp/opt/kde3/include/kde/mpeglib/mpegutil/mpegSystemStream.h -debian/tmp/opt/kde3/include/kde/mpeglib/mpegutil/mpegVideoLength.h -debian/tmp/opt/kde3/include/kde/mpeglib/mpegutil/pesSystemStream.h -debian/tmp/opt/kde3/include/kde/mpeglib/mpegutil/psSystemStream.h -debian/tmp/opt/kde3/include/kde/mpeglib/mpegutil/tsSystemStream.h -debian/tmp/opt/kde3/include/kde/mpeglib/oggvorbis/oggFrame.h -debian/tmp/opt/kde3/include/kde/mpeglib/oggvorbis/ovFramer.h -debian/tmp/opt/kde3/include/kde/mpeglib/oggvorbis/vorbisDecoder.h -debian/tmp/opt/kde3/include/kde/mpeglib/oggvorbis/vorbisInfo.h -debian/tmp/opt/kde3/include/kde/mpeglib/output/artsOutputStream.h -debian/tmp/opt/kde3/include/kde/mpeglib/output/audioTime.h -debian/tmp/opt/kde3/include/kde/mpeglib/output/avSyncer.h -debian/tmp/opt/kde3/include/kde/mpeglib/output/dspX11OutputStream.h -debian/tmp/opt/kde3/include/kde/mpeglib/output/outPlugin.h -debian/tmp/opt/kde3/include/kde/mpeglib/output/outputStream.h -debian/tmp/opt/kde3/include/kde/mpeglib/output/pluginInfo.h -debian/tmp/opt/kde3/include/kde/mpeglib/output/threadSafeOutputStream.h -debian/tmp/opt/kde3/include/kde/mpeglib/splay/mpegAudioFrame.h -debian/tmp/opt/kde3/include/kde/mpeglib/splay/mpegAudioInfo.h -debian/tmp/opt/kde3/include/kde/mpeglib/splay/splayDecoder.h -debian/tmp/opt/kde3/include/kde/mpeglib/util/abstract/abs_thread.h -debian/tmp/opt/kde3/include/kde/mpeglib/util/abstract/threadQueue.h -debian/tmp/opt/kde3/include/kde/mpeglib/util/dynBuffer.h -debian/tmp/opt/kde3/include/kde/mpeglib/util/file/fileAccess.h -debian/tmp/opt/kde3/include/kde/mpeglib/util/mmx/mm_accel.h -debian/tmp/opt/kde3/include/kde/mpeglib/util/mmx/mmx.h -debian/tmp/opt/kde3/include/kde/mpeglib/util/mmx/mmx_asm.h -debian/tmp/opt/kde3/include/kde/mpeglib/util/render/pictureArray.h -debian/tmp/opt/kde3/include/kde/mpeglib/util/render/yuvPicture.h -debian/tmp/opt/kde3/include/kde/mpeglib/util/syncClock.h -debian/tmp/opt/kde3/include/kde/mpeglib/util/timeStamp.h -debian/tmp/opt/kde3/include/kde/mpeglib/util/timeStampArray.h -debian/tmp/opt/kde3/include/kde/mpeglib/util/timeWrapper.h -debian/tmp/opt/kde3/include/kde/mpeglib/util/yaf/yafcore/buffer.h -debian/tmp/opt/kde3/include/kde/mpeglib/util/yaf/yafcore/inputDecoder.h -debian/tmp/opt/kde3/include/kde/mpeglib/util/yaf/yafcore/inputInterface.h -debian/tmp/opt/kde3/include/kde/mpeglib/util/yaf/yafcore/outputInterface.h -debian/tmp/opt/kde3/include/kde/mpeglib/util/yaf/yafcore/yaf_control.h -debian/tmp/opt/kde3/include/kde/mpeglib/util/yaf/yafxplayer/inputDecoderXPlayer.h -debian/tmp/opt/kde3/include/kde/mpeglib/util/yaf/yafxplayer/inputDecoderYAF.h -debian/tmp/opt/kde3/include/kde/mpeglib/util/yaf/yafxplayer/yafOutputStream.h -debian/tmp/opt/kde3/include/kde/mpeglib_artsplug/decoderBaseObject.h -debian/tmp/opt/kde3/include/kde/mpeglib_artsplug/decoderBaseObject.idl -debian/tmp/opt/kde3/include/kde/mpeglib_artsplug/decoderBaseObject_impl.h -debian/tmp/opt/kde3/include/kde/mpeglib_artsplug/splayPlayObject.h -debian/tmp/opt/kde3/include/kde/mpeglib_artsplug/splayPlayObject.idl -debian/tmp/opt/kde3/include/kde/mpeglib_artsplug/splayPlayObject_impl.h -debian/tmp/opt/kde3/include/kde/noatun/app.h -debian/tmp/opt/kde3/include/kde/noatun/controls.h -debian/tmp/opt/kde3/include/kde/noatun/conversion.h -debian/tmp/opt/kde3/include/kde/noatun/downloader.h -debian/tmp/opt/kde3/include/kde/noatun/effects.h -debian/tmp/opt/kde3/include/kde/noatun/engine.h -debian/tmp/opt/kde3/include/kde/noatun/equalizer.h -debian/tmp/opt/kde3/include/kde/noatun/noatunarts.h -debian/tmp/opt/kde3/include/kde/noatun/player.h -debian/tmp/opt/kde3/include/kde/noatun/playlist.h -debian/tmp/opt/kde3/include/kde/noatun/playlistsaver.h -debian/tmp/opt/kde3/include/kde/noatun/plugin.h -debian/tmp/opt/kde3/include/kde/noatun/pluginloader.h -debian/tmp/opt/kde3/include/kde/noatun/pref.h -debian/tmp/opt/kde3/include/kde/noatun/scrollinglabel.h -debian/tmp/opt/kde3/include/kde/noatun/stdaction.h -debian/tmp/opt/kde3/include/kde/noatun/stereobuttonaction.h -debian/tmp/opt/kde3/include/kde/noatun/tags.h -debian/tmp/opt/kde3/include/kde/noatun/vequalizer.h -debian/tmp/opt/kde3/include/kde/noatun/video.h -debian/tmp/opt/kde3/include/kde/noatun/winskinvis.h -debian/tmp/opt/kde3/include/kde/plugin_deps.h +debian/tmp/opt/kde3/include/tde/arts/artsbuilder.h +debian/tmp/opt/kde3/include/tde/arts/artsbuilder.idl +debian/tmp/opt/kde3/include/tde/arts/artsgui.h +debian/tmp/opt/kde3/include/tde/arts/artsgui.idl +debian/tmp/opt/kde3/include/tde/arts/artsmidi.h +debian/tmp/opt/kde3/include/tde/arts/artsmidi.idl +debian/tmp/opt/kde3/include/tde/arts/artsmodules.h +debian/tmp/opt/kde3/include/tde/arts/artsmodules.idl +debian/tmp/opt/kde3/include/tde/arts/artsmodulescommon.h +debian/tmp/opt/kde3/include/tde/arts/artsmodulescommon.idl +debian/tmp/opt/kde3/include/tde/arts/artsmoduleseffects.h +debian/tmp/opt/kde3/include/tde/arts/artsmoduleseffects.idl +debian/tmp/opt/kde3/include/tde/arts/artsmodulesmixers.h +debian/tmp/opt/kde3/include/tde/arts/artsmodulesmixers.idl +debian/tmp/opt/kde3/include/tde/arts/artsmodulessynth.h +debian/tmp/opt/kde3/include/tde/arts/artsmodulessynth.idl +debian/tmp/opt/kde3/include/tde/arts/kartswidget.h +debian/tmp/opt/kde3/include/tde/arts/kframe_impl.h +debian/tmp/opt/kde3/include/tde/arts/klayoutbox_impl.h +debian/tmp/opt/kde3/include/tde/arts/kwidget_impl.h +debian/tmp/opt/kde3/include/tde/arts/kwidgetrepo.h +debian/tmp/opt/kde3/include/tde/audiocdencoder.h +debian/tmp/opt/kde3/include/tde/cmodule.h +debian/tmp/opt/kde3/include/tde/effectview.h +debian/tmp/opt/kde3/include/tde/equalizerview.h +debian/tmp/opt/kde3/include/tde/ksaver.h +debian/tmp/opt/kde3/include/tde/libkcddb/cache.h +debian/tmp/opt/kde3/include/tde/libkcddb/cddb.h +debian/tmp/opt/kde3/include/tde/libkcddb/cdinfo.h +debian/tmp/opt/kde3/include/tde/libkcddb/client.h +debian/tmp/opt/kde3/include/tde/libkcddb/config.h +debian/tmp/opt/kde3/include/tde/libkcddb/configbase.h +debian/tmp/opt/kde3/include/tde/mimetypetree.h +debian/tmp/opt/kde3/include/tde/mpeglib/decoder/cddaPlugin.h +debian/tmp/opt/kde3/include/tde/mpeglib/decoder/command.h +debian/tmp/opt/kde3/include/tde/mpeglib/decoder/commandPipe.h +debian/tmp/opt/kde3/include/tde/mpeglib/decoder/decoderPlugin.h +debian/tmp/opt/kde3/include/tde/mpeglib/decoder/mpegPlugin.h +debian/tmp/opt/kde3/include/tde/mpeglib/decoder/mpgPlugin.h +debian/tmp/opt/kde3/include/tde/mpeglib/decoder/nukePlugin.h +debian/tmp/opt/kde3/include/tde/mpeglib/decoder/splayPlugin.h +debian/tmp/opt/kde3/include/tde/mpeglib/decoder/tplayPlugin.h +debian/tmp/opt/kde3/include/tde/mpeglib/decoder/vorbisPlugin.h +debian/tmp/opt/kde3/include/tde/mpeglib/decoder/yuvPlugin.h +debian/tmp/opt/kde3/include/tde/mpeglib/frame/IOFrameQueue.h +debian/tmp/opt/kde3/include/tde/mpeglib/frame/audioFrame.h +debian/tmp/opt/kde3/include/tde/mpeglib/frame/audioFrameQueue.h +debian/tmp/opt/kde3/include/tde/mpeglib/frame/floatFrame.h +debian/tmp/opt/kde3/include/tde/mpeglib/frame/frame.h +debian/tmp/opt/kde3/include/tde/mpeglib/frame/frameQueue.h +debian/tmp/opt/kde3/include/tde/mpeglib/frame/framer.h +debian/tmp/opt/kde3/include/tde/mpeglib/frame/pcmFrame.h +debian/tmp/opt/kde3/include/tde/mpeglib/frame/rawDataBuffer.h +debian/tmp/opt/kde3/include/tde/mpeglib/frame/rawFrame.h +debian/tmp/opt/kde3/include/tde/mpeglib/input/bufferInputStream.h +debian/tmp/opt/kde3/include/tde/mpeglib/input/cddaInputStream.h +debian/tmp/opt/kde3/include/tde/mpeglib/input/cdromInputStream.h +debian/tmp/opt/kde3/include/tde/mpeglib/input/fileInputStream.h +debian/tmp/opt/kde3/include/tde/mpeglib/input/httpInputStream.h +debian/tmp/opt/kde3/include/tde/mpeglib/input/inputDetector.h +debian/tmp/opt/kde3/include/tde/mpeglib/input/inputPlugin.h +debian/tmp/opt/kde3/include/tde/mpeglib/input/inputStream.h +debian/tmp/opt/kde3/include/tde/mpeglib/input/threadSafeInputStream.h +debian/tmp/opt/kde3/include/tde/mpeglib/mpegutil/mpegStreamPlayer.h +debian/tmp/opt/kde3/include/tde/mpeglib/mpegutil/mpegSystemHeader.h +debian/tmp/opt/kde3/include/tde/mpeglib/mpegutil/mpegSystemStream.h +debian/tmp/opt/kde3/include/tde/mpeglib/mpegutil/mpegVideoLength.h +debian/tmp/opt/kde3/include/tde/mpeglib/mpegutil/pesSystemStream.h +debian/tmp/opt/kde3/include/tde/mpeglib/mpegutil/psSystemStream.h +debian/tmp/opt/kde3/include/tde/mpeglib/mpegutil/tsSystemStream.h +debian/tmp/opt/kde3/include/tde/mpeglib/oggvorbis/oggFrame.h +debian/tmp/opt/kde3/include/tde/mpeglib/oggvorbis/ovFramer.h +debian/tmp/opt/kde3/include/tde/mpeglib/oggvorbis/vorbisDecoder.h +debian/tmp/opt/kde3/include/tde/mpeglib/oggvorbis/vorbisInfo.h +debian/tmp/opt/kde3/include/tde/mpeglib/output/artsOutputStream.h +debian/tmp/opt/kde3/include/tde/mpeglib/output/audioTime.h +debian/tmp/opt/kde3/include/tde/mpeglib/output/avSyncer.h +debian/tmp/opt/kde3/include/tde/mpeglib/output/dspX11OutputStream.h +debian/tmp/opt/kde3/include/tde/mpeglib/output/outPlugin.h +debian/tmp/opt/kde3/include/tde/mpeglib/output/outputStream.h +debian/tmp/opt/kde3/include/tde/mpeglib/output/pluginInfo.h +debian/tmp/opt/kde3/include/tde/mpeglib/output/threadSafeOutputStream.h +debian/tmp/opt/kde3/include/tde/mpeglib/splay/mpegAudioFrame.h +debian/tmp/opt/kde3/include/tde/mpeglib/splay/mpegAudioInfo.h +debian/tmp/opt/kde3/include/tde/mpeglib/splay/splayDecoder.h +debian/tmp/opt/kde3/include/tde/mpeglib/util/abstract/abs_thread.h +debian/tmp/opt/kde3/include/tde/mpeglib/util/abstract/threadQueue.h +debian/tmp/opt/kde3/include/tde/mpeglib/util/dynBuffer.h +debian/tmp/opt/kde3/include/tde/mpeglib/util/file/fileAccess.h +debian/tmp/opt/kde3/include/tde/mpeglib/util/mmx/mm_accel.h +debian/tmp/opt/kde3/include/tde/mpeglib/util/mmx/mmx.h +debian/tmp/opt/kde3/include/tde/mpeglib/util/mmx/mmx_asm.h +debian/tmp/opt/kde3/include/tde/mpeglib/util/render/pictureArray.h +debian/tmp/opt/kde3/include/tde/mpeglib/util/render/yuvPicture.h +debian/tmp/opt/kde3/include/tde/mpeglib/util/syncClock.h +debian/tmp/opt/kde3/include/tde/mpeglib/util/timeStamp.h +debian/tmp/opt/kde3/include/tde/mpeglib/util/timeStampArray.h +debian/tmp/opt/kde3/include/tde/mpeglib/util/timeWrapper.h +debian/tmp/opt/kde3/include/tde/mpeglib/util/yaf/yafcore/buffer.h +debian/tmp/opt/kde3/include/tde/mpeglib/util/yaf/yafcore/inputDecoder.h +debian/tmp/opt/kde3/include/tde/mpeglib/util/yaf/yafcore/inputInterface.h +debian/tmp/opt/kde3/include/tde/mpeglib/util/yaf/yafcore/outputInterface.h +debian/tmp/opt/kde3/include/tde/mpeglib/util/yaf/yafcore/yaf_control.h +debian/tmp/opt/kde3/include/tde/mpeglib/util/yaf/yafxplayer/inputDecoderXPlayer.h +debian/tmp/opt/kde3/include/tde/mpeglib/util/yaf/yafxplayer/inputDecoderYAF.h +debian/tmp/opt/kde3/include/tde/mpeglib/util/yaf/yafxplayer/yafOutputStream.h +debian/tmp/opt/kde3/include/tde/mpeglib_artsplug/decoderBaseObject.h +debian/tmp/opt/kde3/include/tde/mpeglib_artsplug/decoderBaseObject.idl +debian/tmp/opt/kde3/include/tde/mpeglib_artsplug/decoderBaseObject_impl.h +debian/tmp/opt/kde3/include/tde/mpeglib_artsplug/splayPlayObject.h +debian/tmp/opt/kde3/include/tde/mpeglib_artsplug/splayPlayObject.idl +debian/tmp/opt/kde3/include/tde/mpeglib_artsplug/splayPlayObject_impl.h +debian/tmp/opt/kde3/include/tde/noatun/app.h +debian/tmp/opt/kde3/include/tde/noatun/controls.h +debian/tmp/opt/kde3/include/tde/noatun/conversion.h +debian/tmp/opt/kde3/include/tde/noatun/downloader.h +debian/tmp/opt/kde3/include/tde/noatun/effects.h +debian/tmp/opt/kde3/include/tde/noatun/engine.h +debian/tmp/opt/kde3/include/tde/noatun/equalizer.h +debian/tmp/opt/kde3/include/tde/noatun/noatunarts.h +debian/tmp/opt/kde3/include/tde/noatun/player.h +debian/tmp/opt/kde3/include/tde/noatun/playlist.h +debian/tmp/opt/kde3/include/tde/noatun/playlistsaver.h +debian/tmp/opt/kde3/include/tde/noatun/plugin.h +debian/tmp/opt/kde3/include/tde/noatun/pluginloader.h +debian/tmp/opt/kde3/include/tde/noatun/pref.h +debian/tmp/opt/kde3/include/tde/noatun/scrollinglabel.h +debian/tmp/opt/kde3/include/tde/noatun/stdaction.h +debian/tmp/opt/kde3/include/tde/noatun/stereobuttonaction.h +debian/tmp/opt/kde3/include/tde/noatun/tags.h +debian/tmp/opt/kde3/include/tde/noatun/vequalizer.h +debian/tmp/opt/kde3/include/tde/noatun/video.h +debian/tmp/opt/kde3/include/tde/noatun/winskinvis.h +debian/tmp/opt/kde3/include/tde/plugin_deps.h debian/tmp/opt/kde3/lib/libarts_mpeglib.so debian/tmp/opt/kde3/lib/libarts_splay.so debian/tmp/opt/kde3/lib/libartsbuilder.so diff --git a/ubuntu/lucid_automake/kdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/lucid_automake/kdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff index 3d5dc7628..e705cf83b 100644 --- a/ubuntu/lucid_automake/kdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/lucid_automake/kdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/opt/kde3/include/kde/kde.pot ++kdepotpath=/opt/kde3/include/tde/kde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/lucid_automake/kdemultimedia/debian/rules b/ubuntu/lucid_automake/kdemultimedia/debian/rules index 973deaeed..49741de4f 100755 --- a/ubuntu/lucid_automake/kdemultimedia/debian/rules +++ b/ubuntu/lucid_automake/kdemultimedia/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info @@ -14,9 +14,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_CONFIGURE_EXTRA_FLAGS := \ --with-alsa --with-arts-alsa \ - --with-extra-includes=/usr/include/speex:/opt/kde3/include/kde/arts \ + --with-extra-includes=/usr/include/speex:/opt/kde3/include/tde/arts \ --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib - # The include/kde/arts one should be temporary. See + # The include/tde/arts one should be temporary. See # "juk/Makefile.am: arts_includes vs ARTS_CFLAGS" in -talk. DOC_HTML_PRUNE := kcontrol-kde3 diff --git a/ubuntu/lucid_automake/kdenetwork/debian/cdbs/kde.mk b/ubuntu/lucid_automake/kdenetwork/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/lucid_automake/kdenetwork/debian/cdbs/kde.mk +++ b/ubuntu/lucid_automake/kdenetwork/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/lucid_automake/kdenetwork/debian/kdenetwork-kde3-dev.install b/ubuntu/lucid_automake/kdenetwork/debian/kdenetwork-kde3-dev.install index 4fe8b41d9..cefc34345 100644 --- a/ubuntu/lucid_automake/kdenetwork/debian/kdenetwork-kde3-dev.install +++ b/ubuntu/lucid_automake/kdenetwork/debian/kdenetwork-kde3-dev.install @@ -1,66 +1,66 @@ -debian/tmp/opt/kde3/include/kde/kopete/kabcpersistence.h -debian/tmp/opt/kde3/include/kde/kopete/kopete_export.h -debian/tmp/opt/kde3/include/kde/kopete/kopeteaccount.h -debian/tmp/opt/kde3/include/kde/kopete/kopeteaccountmanager.h -debian/tmp/opt/kde3/include/kde/kopete/kopeteaway.h -debian/tmp/opt/kde3/include/kde/kopete/kopeteawayaction.h -debian/tmp/opt/kde3/include/kde/kopete/kopeteawaydialog.h -debian/tmp/opt/kde3/include/kde/kopete/kopeteblacklister.h -debian/tmp/opt/kde3/include/kde/kopete/kopetechatsession.h -debian/tmp/opt/kde3/include/kde/kopete/kopetechatsessionmanager.h -debian/tmp/opt/kde3/include/kde/kopete/kopetecommandhandler.h -debian/tmp/opt/kde3/include/kde/kopete/kopetecontact.h -debian/tmp/opt/kde3/include/kde/kopete/kopetecontactlist.h -debian/tmp/opt/kde3/include/kde/kopete/kopetecontactlistelement.h -debian/tmp/opt/kde3/include/kde/kopete/kopetecontactproperty.h -debian/tmp/opt/kde3/include/kde/kopete/kopeteeventpresentation.h -debian/tmp/opt/kde3/include/kde/kopete/kopeteglobal.h -debian/tmp/opt/kde3/include/kde/kopete/kopetegroup.h -debian/tmp/opt/kde3/include/kde/kopete/kopetemessage.h -debian/tmp/opt/kde3/include/kde/kopete/kopetemessageevent.h -debian/tmp/opt/kde3/include/kde/kopete/kopetemessagehandler.h -debian/tmp/opt/kde3/include/kde/kopete/kopetemessagehandlerchain.h -debian/tmp/opt/kde3/include/kde/kopete/kopetemetacontact.h -debian/tmp/opt/kde3/include/kde/kopete/kopetemimetypehandler.h -debian/tmp/opt/kde3/include/kde/kopete/kopetenotifydataobject.h -debian/tmp/opt/kde3/include/kde/kopete/kopeteonlinestatus.h -debian/tmp/opt/kde3/include/kde/kopete/kopeteonlinestatusmanager.h -debian/tmp/opt/kde3/include/kde/kopete/kopetepassword.h -debian/tmp/opt/kde3/include/kde/kopete/kopetepasswordedaccount.h -debian/tmp/opt/kde3/include/kde/kopete/kopeteplugin.h -debian/tmp/opt/kde3/include/kde/kopete/kopeteprotocol.h -debian/tmp/opt/kde3/include/kde/kopete/kopetesimplemessagehandler.h -debian/tmp/opt/kde3/include/kde/kopete/kopetetask.h -debian/tmp/opt/kde3/include/kde/kopete/kopetetransfermanager.h -debian/tmp/opt/kde3/include/kde/kopete/kopeteuiglobal.h -debian/tmp/opt/kde3/include/kde/kopete/kopeteversion.h -debian/tmp/opt/kde3/include/kde/kopete/managedconnectionaccount.h -debian/tmp/opt/kde3/include/kde/kopete/ui/accountselector.h -debian/tmp/opt/kde3/include/kde/kopete/ui/addcontactpage.h -debian/tmp/opt/kde3/include/kde/kopete/ui/addressbookselectordialog.h -debian/tmp/opt/kde3/include/kde/kopete/ui/addressbookselectorwidget.h -debian/tmp/opt/kde3/include/kde/kopete/ui/editaccountwidget.h -debian/tmp/opt/kde3/include/kde/kopete/ui/fileconfirmbase.h -debian/tmp/opt/kde3/include/kde/kopete/ui/kopeteawaydialogbase.h -debian/tmp/opt/kde3/include/kde/kopete/ui/kopetecontactaction.h -debian/tmp/opt/kde3/include/kde/kopete/ui/kopetefileconfirmdialog.h -debian/tmp/opt/kde3/include/kde/kopete/ui/kopetelistview.h -debian/tmp/opt/kde3/include/kde/kopete/ui/kopetelistviewitem.h -debian/tmp/opt/kde3/include/kde/kopete/ui/kopetelistviewsearchline.h -debian/tmp/opt/kde3/include/kde/kopete/ui/kopetepassworddialog.h -debian/tmp/opt/kde3/include/kde/kopete/ui/kopetepasswordwidget.h -debian/tmp/opt/kde3/include/kde/kopete/ui/kopetepasswordwidgetbase.h -debian/tmp/opt/kde3/include/kde/kopete/ui/kopetestdaction.h -debian/tmp/opt/kde3/include/kde/kopete/ui/kopeteview.h -debian/tmp/opt/kde3/include/kde/kopete/ui/kopeteviewplugin.h -debian/tmp/opt/kde3/include/kde/kopete/ui/userinfodialog.h -debian/tmp/opt/kde3/include/kde/rss/article.h -debian/tmp/opt/kde3/include/kde/rss/document.h -debian/tmp/opt/kde3/include/kde/rss/global.h -debian/tmp/opt/kde3/include/kde/rss/image.h -debian/tmp/opt/kde3/include/kde/rss/librss.h -debian/tmp/opt/kde3/include/kde/rss/loader.h -debian/tmp/opt/kde3/include/kde/rss/textinput.h +debian/tmp/opt/kde3/include/tde/kopete/kabcpersistence.h +debian/tmp/opt/kde3/include/tde/kopete/kopete_export.h +debian/tmp/opt/kde3/include/tde/kopete/kopeteaccount.h +debian/tmp/opt/kde3/include/tde/kopete/kopeteaccountmanager.h +debian/tmp/opt/kde3/include/tde/kopete/kopeteaway.h +debian/tmp/opt/kde3/include/tde/kopete/kopeteawayaction.h +debian/tmp/opt/kde3/include/tde/kopete/kopeteawaydialog.h +debian/tmp/opt/kde3/include/tde/kopete/kopeteblacklister.h +debian/tmp/opt/kde3/include/tde/kopete/kopetechatsession.h +debian/tmp/opt/kde3/include/tde/kopete/kopetechatsessionmanager.h +debian/tmp/opt/kde3/include/tde/kopete/kopetecommandhandler.h +debian/tmp/opt/kde3/include/tde/kopete/kopetecontact.h +debian/tmp/opt/kde3/include/tde/kopete/kopetecontactlist.h +debian/tmp/opt/kde3/include/tde/kopete/kopetecontactlistelement.h +debian/tmp/opt/kde3/include/tde/kopete/kopetecontactproperty.h +debian/tmp/opt/kde3/include/tde/kopete/kopeteeventpresentation.h +debian/tmp/opt/kde3/include/tde/kopete/kopeteglobal.h +debian/tmp/opt/kde3/include/tde/kopete/kopetegroup.h +debian/tmp/opt/kde3/include/tde/kopete/kopetemessage.h +debian/tmp/opt/kde3/include/tde/kopete/kopetemessageevent.h +debian/tmp/opt/kde3/include/tde/kopete/kopetemessagehandler.h +debian/tmp/opt/kde3/include/tde/kopete/kopetemessagehandlerchain.h +debian/tmp/opt/kde3/include/tde/kopete/kopetemetacontact.h +debian/tmp/opt/kde3/include/tde/kopete/kopetemimetypehandler.h +debian/tmp/opt/kde3/include/tde/kopete/kopetenotifydataobject.h +debian/tmp/opt/kde3/include/tde/kopete/kopeteonlinestatus.h +debian/tmp/opt/kde3/include/tde/kopete/kopeteonlinestatusmanager.h +debian/tmp/opt/kde3/include/tde/kopete/kopetepassword.h +debian/tmp/opt/kde3/include/tde/kopete/kopetepasswordedaccount.h +debian/tmp/opt/kde3/include/tde/kopete/kopeteplugin.h +debian/tmp/opt/kde3/include/tde/kopete/kopeteprotocol.h +debian/tmp/opt/kde3/include/tde/kopete/kopetesimplemessagehandler.h +debian/tmp/opt/kde3/include/tde/kopete/kopetetask.h +debian/tmp/opt/kde3/include/tde/kopete/kopetetransfermanager.h +debian/tmp/opt/kde3/include/tde/kopete/kopeteuiglobal.h +debian/tmp/opt/kde3/include/tde/kopete/kopeteversion.h +debian/tmp/opt/kde3/include/tde/kopete/managedconnectionaccount.h +debian/tmp/opt/kde3/include/tde/kopete/ui/accountselector.h +debian/tmp/opt/kde3/include/tde/kopete/ui/addcontactpage.h +debian/tmp/opt/kde3/include/tde/kopete/ui/addressbookselectordialog.h +debian/tmp/opt/kde3/include/tde/kopete/ui/addressbookselectorwidget.h +debian/tmp/opt/kde3/include/tde/kopete/ui/editaccountwidget.h +debian/tmp/opt/kde3/include/tde/kopete/ui/fileconfirmbase.h +debian/tmp/opt/kde3/include/tde/kopete/ui/kopeteawaydialogbase.h +debian/tmp/opt/kde3/include/tde/kopete/ui/kopetecontactaction.h +debian/tmp/opt/kde3/include/tde/kopete/ui/kopetefileconfirmdialog.h +debian/tmp/opt/kde3/include/tde/kopete/ui/kopetelistview.h +debian/tmp/opt/kde3/include/tde/kopete/ui/kopetelistviewitem.h +debian/tmp/opt/kde3/include/tde/kopete/ui/kopetelistviewsearchline.h +debian/tmp/opt/kde3/include/tde/kopete/ui/kopetepassworddialog.h +debian/tmp/opt/kde3/include/tde/kopete/ui/kopetepasswordwidget.h +debian/tmp/opt/kde3/include/tde/kopete/ui/kopetepasswordwidgetbase.h +debian/tmp/opt/kde3/include/tde/kopete/ui/kopetestdaction.h +debian/tmp/opt/kde3/include/tde/kopete/ui/kopeteview.h +debian/tmp/opt/kde3/include/tde/kopete/ui/kopeteviewplugin.h +debian/tmp/opt/kde3/include/tde/kopete/ui/userinfodialog.h +debian/tmp/opt/kde3/include/tde/rss/article.h +debian/tmp/opt/kde3/include/tde/rss/document.h +debian/tmp/opt/kde3/include/tde/rss/global.h +debian/tmp/opt/kde3/include/tde/rss/image.h +debian/tmp/opt/kde3/include/tde/rss/librss.h +debian/tmp/opt/kde3/include/tde/rss/loader.h +debian/tmp/opt/kde3/include/tde/rss/textinput.h debian/tmp/opt/kde3/lib/libkdeinit_kdict.la debian/tmp/opt/kde3/lib/libkdeinit_ksirc.la debian/tmp/opt/kde3/lib/libkopete.la @@ -73,4 +73,4 @@ debian/tmp/opt/kde3/lib/libkopete_videodevice.la debian/tmp/opt/kde3/lib/libkopete_videodevice.so debian/tmp/opt/kde3/lib/librss.la debian/tmp/opt/kde3/lib/librss.so -debian/tmp/opt/kde3/include/kde/kopete/kopetepluginmanager.h +debian/tmp/opt/kde3/include/tde/kopete/kopetepluginmanager.h diff --git a/ubuntu/lucid_automake/kdenetwork/debian/kopete-kde3.install b/ubuntu/lucid_automake/kdenetwork/debian/kopete-kde3.install index 3d90f7d98..b3ed39ab3 100644 --- a/ubuntu/lucid_automake/kdenetwork/debian/kopete-kde3.install +++ b/ubuntu/lucid_automake/kdenetwork/debian/kopete-kde3.install @@ -1,9 +1,9 @@ debian/tmp/opt/kde3/bin/kopete debian/tmp/opt/kde3/bin/kopete_latexconvert.sh -debian/tmp/opt/kde3/include/kde/kopete/kopetepicture.h -debian/tmp/opt/kde3/include/kde/kopete/kopeteprefs.h -debian/tmp/opt/kde3/include/kde/kopete/ui/addressbooklinkwidget.h -debian/tmp/opt/kde3/include/kde/kopete/webcamwidget.h +debian/tmp/opt/kde3/include/tde/kopete/kopetepicture.h +debian/tmp/opt/kde3/include/tde/kopete/kopeteprefs.h +debian/tmp/opt/kde3/include/tde/kopete/ui/addressbooklinkwidget.h +debian/tmp/opt/kde3/include/tde/kopete/webcamwidget.h debian/tmp/opt/kde3/lib/kconf_update_bin/kopete-account-kconf_update debian/tmp/opt/kde3/lib/kconf_update_bin/kopete-nameTracking-kconf_update debian/tmp/opt/kde3/lib/kconf_update_bin/kopete-pluginloader2-kconf_update diff --git a/ubuntu/lucid_automake/kdenetwork/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/lucid_automake/kdenetwork/debian/patches/common/kubuntu_01_kdepot.diff index 3d5dc7628..e705cf83b 100644 --- a/ubuntu/lucid_automake/kdenetwork/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/lucid_automake/kdenetwork/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/opt/kde3/include/kde/kde.pot ++kdepotpath=/opt/kde3/include/tde/kde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/lucid_automake/kdenetwork/debian/rules b/ubuntu/lucid_automake/kdenetwork/debian/rules index f28dd880c..3f1d50b69 100755 --- a/ubuntu/lucid_automake/kdenetwork/debian/rules +++ b/ubuntu/lucid_automake/kdenetwork/debian/rules @@ -17,7 +17,7 @@ include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info diff --git a/ubuntu/lucid_automake/kdepim/debian/cdbs/kde.mk b/ubuntu/lucid_automake/kdepim/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/lucid_automake/kdepim/debian/cdbs/kde.mk +++ b/ubuntu/lucid_automake/kdepim/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/lucid_automake/kdepim/debian/changelog b/ubuntu/lucid_automake/kdepim/debian/changelog index 01141c0ae..026234536 100644 --- a/ubuntu/lucid_automake/kdepim/debian/changelog +++ b/ubuntu/lucid_automake/kdepim/debian/changelog @@ -706,7 +706,7 @@ kdepim (4:3.5.6-0ubuntu3) feisty; urgency=low - Activates networkstatus support for kmail (patch from SuSE) * debian/control: - New package networkstatus-dev - * ./libkdepim1-dev.install: added /usr/include/kde/kpimprefs.h + * ./libkdepim1-dev.install: added /usr/include/tde/kpimprefs.h -- Anthony Mercatante Fri, 02 Feb 2007 15:37:42 +0100 diff --git a/ubuntu/lucid_automake/kdepim/debian/kdepim-kde3-dev.install b/ubuntu/lucid_automake/kdepim/debian/kdepim-kde3-dev.install index daabf121f..a1511b996 100644 --- a/ubuntu/lucid_automake/kdepim/debian/kdepim-kde3-dev.install +++ b/ubuntu/lucid_automake/kdepim/debian/kdepim-kde3-dev.install @@ -1,16 +1,16 @@ -/opt/kde3/include/kde/KNotesAppIface.h -/opt/kde3/include/kde/KNotesIface.h -/opt/kde3/include/kde/akregator -/opt/kde3/include/kde/calendar -/opt/kde3/include/kde/kabc -/opt/kde3/include/kde/kaddressbook -/opt/kde3/include/kde/kmail -/opt/kde3/include/kde/kmailIface.h -/opt/kde3/include/kde/kmailicalIface.h -/opt/kde3/include/kde/kmailpartIface.h -/opt/kde3/include/kde/kontact -/opt/kde3/include/kde/korganizer -/opt/kde3/include/kde/kpilot +/opt/kde3/include/tde/KNotesAppIface.h +/opt/kde3/include/tde/KNotesIface.h +/opt/kde3/include/tde/akregator +/opt/kde3/include/tde/calendar +/opt/kde3/include/tde/kabc +/opt/kde3/include/tde/kaddressbook +/opt/kde3/include/tde/kmail +/opt/kde3/include/tde/kmailIface.h +/opt/kde3/include/tde/kmailicalIface.h +/opt/kde3/include/tde/kmailpartIface.h +/opt/kde3/include/tde/kontact +/opt/kde3/include/tde/korganizer +/opt/kde3/include/tde/kpilot /opt/kde3/lib/libkabckolab.la /opt/kde3/lib/libkabckolab.so /opt/kde3/lib/libkabcscalix.la @@ -84,4 +84,4 @@ /opt/kde3/lib/libgwsoap.la /opt/kde3/lib/libgwsoap.so -/opt/kde3/include/kde/kpimprefs.h +/opt/kde3/include/tde/kpimprefs.h diff --git a/ubuntu/lucid_automake/kdepim/debian/libindex0-kde3-dev.install b/ubuntu/lucid_automake/kdepim/debian/libindex0-kde3-dev.install index 7178aebcd..d12928992 100644 --- a/ubuntu/lucid_automake/kdepim/debian/libindex0-kde3-dev.install +++ b/ubuntu/lucid_automake/kdepim/debian/libindex0-kde3-dev.install @@ -1,4 +1,4 @@ /opt/kde3/bin/indexlib-config -/opt/kde3/include/kde/index +/opt/kde3/include/tde/index /opt/kde3/lib/libindex.la /opt/kde3/lib/libindex.so diff --git a/ubuntu/lucid_automake/kdepim/debian/libkcal2-kde3-dev.install b/ubuntu/lucid_automake/kdepim/debian/libkcal2-kde3-dev.install index ab75de0de..e31e5ec64 100644 --- a/ubuntu/lucid_automake/kdepim/debian/libkcal2-kde3-dev.install +++ b/ubuntu/lucid_automake/kdepim/debian/libkcal2-kde3-dev.install @@ -1,5 +1,5 @@ -/opt/kde3/include/kde/libemailfunctions/idmapper.h -/opt/kde3/include/kde/libkcal +/opt/kde3/include/tde/libemailfunctions/idmapper.h +/opt/kde3/include/tde/libkcal /opt/kde3/lib/libkcal.la /opt/kde3/lib/libkcal.so /opt/kde3/lib/libkcal_resourceremote.la diff --git a/ubuntu/lucid_automake/kdepim/debian/libkdepim1-kde3-dev.install b/ubuntu/lucid_automake/kdepim/debian/libkdepim1-kde3-dev.install index 59dcd3d31..b569474e6 100644 --- a/ubuntu/lucid_automake/kdepim/debian/libkdepim1-kde3-dev.install +++ b/ubuntu/lucid_automake/kdepim/debian/libkdepim1-kde3-dev.install @@ -1,3 +1,3 @@ -/opt/kde3/include/kde/kdepimmacros.h +/opt/kde3/include/tde/kdepimmacros.h /opt/kde3/lib/libkdepim.la /opt/kde3/lib/libkdepim.so diff --git a/ubuntu/lucid_automake/kdepim/debian/libkgantt0-kde3-dev.install b/ubuntu/lucid_automake/kdepim/debian/libkgantt0-kde3-dev.install index aa3f140b6..e48e946aa 100644 --- a/ubuntu/lucid_automake/kdepim/debian/libkgantt0-kde3-dev.install +++ b/ubuntu/lucid_automake/kdepim/debian/libkgantt0-kde3-dev.install @@ -1,3 +1,3 @@ -/opt/kde3/include/kde/kgantt +/opt/kde3/include/tde/kgantt /opt/kde3/lib/libkgantt.la /opt/kde3/lib/libkgantt.so diff --git a/ubuntu/lucid_automake/kdepim/debian/libkleopatra1-kde3-dev.install b/ubuntu/lucid_automake/kdepim/debian/libkleopatra1-kde3-dev.install index 9b59b31e8..879d897b9 100644 --- a/ubuntu/lucid_automake/kdepim/debian/libkleopatra1-kde3-dev.install +++ b/ubuntu/lucid_automake/kdepim/debian/libkleopatra1-kde3-dev.install @@ -1,6 +1,6 @@ -/opt/kde3/include/kde/gpgme++ -/opt/kde3/include/kde/kleo -/opt/kde3/include/kde/qgpgme +/opt/kde3/include/tde/gpgme++ +/opt/kde3/include/tde/kleo +/opt/kde3/include/tde/qgpgme /opt/kde3/lib/libgpgme++.la /opt/kde3/lib/libgpgme++.so /opt/kde3/lib/libkleopatra.la diff --git a/ubuntu/lucid_automake/kdepim/debian/libkpimexchange1-kde3-dev.install b/ubuntu/lucid_automake/kdepim/debian/libkpimexchange1-kde3-dev.install index cc80303d4..eb0e05ec0 100644 --- a/ubuntu/lucid_automake/kdepim/debian/libkpimexchange1-kde3-dev.install +++ b/ubuntu/lucid_automake/kdepim/debian/libkpimexchange1-kde3-dev.install @@ -1,4 +1,4 @@ -/opt/kde3/include/kde/kdepim/exchangeaccount.h -/opt/kde3/include/kde/kdepim/exchangeclient.h +/opt/kde3/include/tde/kdepim/exchangeaccount.h +/opt/kde3/include/tde/kdepim/exchangeclient.h /opt/kde3/lib/libkpimexchange.la /opt/kde3/lib/libkpimexchange.so diff --git a/ubuntu/lucid_automake/kdepim/debian/libksieve0-kde3-dev.install b/ubuntu/lucid_automake/kdepim/debian/libksieve0-kde3-dev.install index ee25b7de7..97ca5ac36 100644 --- a/ubuntu/lucid_automake/kdepim/debian/libksieve0-kde3-dev.install +++ b/ubuntu/lucid_automake/kdepim/debian/libksieve0-kde3-dev.install @@ -1,3 +1,3 @@ -/opt/kde3/include/kde/ksieve +/opt/kde3/include/tde/ksieve /opt/kde3/lib/libksieve.la /opt/kde3/lib/libksieve.so diff --git a/ubuntu/lucid_automake/kdepim/debian/libktnef1-kde3-dev.install b/ubuntu/lucid_automake/kdepim/debian/libktnef1-kde3-dev.install index b40b89af7..38eba15a5 100644 --- a/ubuntu/lucid_automake/kdepim/debian/libktnef1-kde3-dev.install +++ b/ubuntu/lucid_automake/kdepim/debian/libktnef1-kde3-dev.install @@ -1,3 +1,3 @@ -/opt/kde3/include/kde/ktnef +/opt/kde3/include/tde/ktnef /opt/kde3/lib/libktnef.la /opt/kde3/lib/libktnef.so diff --git a/ubuntu/lucid_automake/kdepim/debian/libmimelib1-kde3-dev.install b/ubuntu/lucid_automake/kdepim/debian/libmimelib1-kde3-dev.install index 648201a0a..7bf3b93d1 100644 --- a/ubuntu/lucid_automake/kdepim/debian/libmimelib1-kde3-dev.install +++ b/ubuntu/lucid_automake/kdepim/debian/libmimelib1-kde3-dev.install @@ -1,3 +1,3 @@ -/opt/kde3/include/kde/mimelib +/opt/kde3/include/tde/mimelib /opt/kde3/lib/libmimelib.la /opt/kde3/lib/libmimelib.so diff --git a/ubuntu/lucid_automake/kdepim/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/lucid_automake/kdepim/debian/patches/common/kubuntu_01_kdepot.diff index 3d5dc7628..e705cf83b 100644 --- a/ubuntu/lucid_automake/kdepim/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/lucid_automake/kdepim/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/opt/kde3/include/kde/kde.pot ++kdepotpath=/opt/kde3/include/tde/kde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/lucid_automake/kdepim/debian/rules b/ubuntu/lucid_automake/kdepim/debian/rules index 8fe5739ca..07e167879 100755 --- a/ubuntu/lucid_automake/kdepim/debian/rules +++ b/ubuntu/lucid_automake/kdepim/debian/rules @@ -8,7 +8,7 @@ include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info diff --git a/ubuntu/lucid_automake/kdesdk/debian/cdbs/kde.mk b/ubuntu/lucid_automake/kdesdk/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/lucid_automake/kdesdk/debian/cdbs/kde.mk +++ b/ubuntu/lucid_automake/kdesdk/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/lucid_automake/kdesdk/debian/changelog b/ubuntu/lucid_automake/kdesdk/debian/changelog index 6e4dc71dc..e089652fe 100644 --- a/ubuntu/lucid_automake/kdesdk/debian/changelog +++ b/ubuntu/lucid_automake/kdesdk/debian/changelog @@ -931,7 +931,7 @@ kdesdk (2.2.2-3) unstable; urgency=low kdesdk (2.2.2-2) unstable; urgency=low - * Moved kspy.h to /usr/include/kde (closes: Bug#122448, Bug#122449). + * Moved kspy.h to /usr/include/tde (closes: Bug#122448, Bug#122449). -- Ben Burton Thu, 6 Dec 2001 09:50:47 -0600 diff --git a/ubuntu/lucid_automake/kdesdk/debian/kbabel-kde3-dev.install b/ubuntu/lucid_automake/kdesdk/debian/kbabel-kde3-dev.install index 01b76ead6..030fdce15 100644 --- a/ubuntu/lucid_automake/kdesdk/debian/kbabel-kde3-dev.install +++ b/ubuntu/lucid_automake/kdesdk/debian/kbabel-kde3-dev.install @@ -1,24 +1,24 @@ -debian/tmp/opt/kde3/include/kde/kbabel/catalog.h -debian/tmp/opt/kde3/include/kde/kbabel/catalogfileplugin.h -debian/tmp/opt/kde3/include/kde/kbabel/catalogitem.h -debian/tmp/opt/kde3/include/kde/kbabel/catalogsettings.h -debian/tmp/opt/kde3/include/kde/kbabel/catalogview.h -debian/tmp/opt/kde3/include/kde/kbabel/dictchooser.h -debian/tmp/opt/kde3/include/kde/kbabel/dictionarymenu.h -debian/tmp/opt/kde3/include/kde/kbabel/editcmd.h -debian/tmp/opt/kde3/include/kde/kbabel/findoptions.h -debian/tmp/opt/kde3/include/kde/kbabel/itempart.h -debian/tmp/opt/kde3/include/kde/kbabel/kbabeldatatool.h -debian/tmp/opt/kde3/include/kde/kbabel/kbabeldictbox.h -debian/tmp/opt/kde3/include/kde/kbabel/kbabeldictiface.h -debian/tmp/opt/kde3/include/kde/kbabel/kbproject.h -debian/tmp/opt/kde3/include/kde/kbabel/kbprojectmanager.h -debian/tmp/opt/kde3/include/kde/kbabel/msgfmt.h -debian/tmp/opt/kde3/include/kde/kbabel/poinfo.h -debian/tmp/opt/kde3/include/kde/kbabel/projectsettings.h -debian/tmp/opt/kde3/include/kde/kbabel/regexpextractor.h -debian/tmp/opt/kde3/include/kde/kbabel/searchengine.h -debian/tmp/opt/kde3/include/kde/kbabel/tagextractor.h +debian/tmp/opt/kde3/include/tde/kbabel/catalog.h +debian/tmp/opt/kde3/include/tde/kbabel/catalogfileplugin.h +debian/tmp/opt/kde3/include/tde/kbabel/catalogitem.h +debian/tmp/opt/kde3/include/tde/kbabel/catalogsettings.h +debian/tmp/opt/kde3/include/tde/kbabel/catalogview.h +debian/tmp/opt/kde3/include/tde/kbabel/dictchooser.h +debian/tmp/opt/kde3/include/tde/kbabel/dictionarymenu.h +debian/tmp/opt/kde3/include/tde/kbabel/editcmd.h +debian/tmp/opt/kde3/include/tde/kbabel/findoptions.h +debian/tmp/opt/kde3/include/tde/kbabel/itempart.h +debian/tmp/opt/kde3/include/tde/kbabel/kbabeldatatool.h +debian/tmp/opt/kde3/include/tde/kbabel/kbabeldictbox.h +debian/tmp/opt/kde3/include/tde/kbabel/kbabeldictiface.h +debian/tmp/opt/kde3/include/tde/kbabel/kbproject.h +debian/tmp/opt/kde3/include/tde/kbabel/kbprojectmanager.h +debian/tmp/opt/kde3/include/tde/kbabel/msgfmt.h +debian/tmp/opt/kde3/include/tde/kbabel/poinfo.h +debian/tmp/opt/kde3/include/tde/kbabel/projectsettings.h +debian/tmp/opt/kde3/include/tde/kbabel/regexpextractor.h +debian/tmp/opt/kde3/include/tde/kbabel/searchengine.h +debian/tmp/opt/kde3/include/tde/kbabel/tagextractor.h debian/tmp/opt/kde3/lib/libkbabelcommon.la debian/tmp/opt/kde3/lib/libkbabelcommon.so debian/tmp/opt/kde3/lib/libkbabeldictplugin.la diff --git a/ubuntu/lucid_automake/kdesdk/debian/kdesdk-misc-kde3.install b/ubuntu/lucid_automake/kdesdk/debian/kdesdk-misc-kde3.install index 590f0fec5..39d07410e 100644 --- a/ubuntu/lucid_automake/kdesdk/debian/kdesdk-misc-kde3.install +++ b/ubuntu/lucid_automake/kdesdk/debian/kdesdk-misc-kde3.install @@ -1,4 +1,4 @@ -debian/tmp/opt/kde3/include/kde/kprofilemethod.h +debian/tmp/opt/kde3/include/tde/kprofilemethod.h debian/tmp/opt/kde3/lib/kde3/kabcformat_kdeaccounts.la debian/tmp/opt/kde3/lib/kde3/kabcformat_kdeaccounts.so debian/tmp/opt/kde3/lib/kde3/plugins/styles/scheck.so diff --git a/ubuntu/lucid_automake/kdesdk/debian/kmtrace-kde3.install b/ubuntu/lucid_automake/kdesdk/debian/kmtrace-kde3.install index 5b7bd4476..b3d168f86 100644 --- a/ubuntu/lucid_automake/kdesdk/debian/kmtrace-kde3.install +++ b/ubuntu/lucid_automake/kdesdk/debian/kmtrace-kde3.install @@ -2,7 +2,7 @@ debian/tmp/opt/kde3/bin/demangle debian/tmp/opt/kde3/bin/kminspector debian/tmp/opt/kde3/bin/kmmatch debian/tmp/opt/kde3/bin/kmtrace -debian/tmp/opt/kde3/include/kde/ktrace.h +debian/tmp/opt/kde3/include/tde/ktrace.h debian/tmp/opt/kde3/lib/kmtrace/libktrace.la debian/tmp/opt/kde3/lib/kmtrace/libktrace.so debian/tmp/opt/kde3/lib/kmtrace/libktrace_s.a diff --git a/ubuntu/lucid_automake/kdesdk/debian/kspy-kde3.install b/ubuntu/lucid_automake/kdesdk/debian/kspy-kde3.install index 08b701cce..ef88ab5a0 100644 --- a/ubuntu/lucid_automake/kdesdk/debian/kspy-kde3.install +++ b/ubuntu/lucid_automake/kdesdk/debian/kspy-kde3.install @@ -1,4 +1,4 @@ -debian/tmp/opt/kde3/include/kde/kspy.h +debian/tmp/opt/kde3/include/tde/kspy.h debian/tmp/opt/kde3/lib/libkspy.la debian/tmp/opt/kde3/lib/libkspy.so debian/tmp/opt/kde3/lib/libkspy.so.1 diff --git a/ubuntu/lucid_automake/kdesdk/debian/kunittest-kde3.install b/ubuntu/lucid_automake/kdesdk/debian/kunittest-kde3.install index 91dbea778..0be1336e4 100644 --- a/ubuntu/lucid_automake/kdesdk/debian/kunittest-kde3.install +++ b/ubuntu/lucid_automake/kdesdk/debian/kunittest-kde3.install @@ -4,4 +4,4 @@ debian/tmp/opt/kde3/lib/libkunittestgui.la debian/tmp/opt/kde3/lib/libkunittestgui.so debian/tmp/opt/kde3/lib/libkunittestgui.so.0 debian/tmp/opt/kde3/lib/libkunittestgui.so.0.0.0 -debian/tmp/opt/kde3/include/kde/kunittest/runnergui.h +debian/tmp/opt/kde3/include/tde/kunittest/runnergui.h diff --git a/ubuntu/lucid_automake/kdesdk/debian/libcvsservice-kde3-dev.install b/ubuntu/lucid_automake/kdesdk/debian/libcvsservice-kde3-dev.install index b541cf5c1..308a82cde 100644 --- a/ubuntu/lucid_automake/kdesdk/debian/libcvsservice-kde3-dev.install +++ b/ubuntu/lucid_automake/kdesdk/debian/libcvsservice-kde3-dev.install @@ -1,6 +1,6 @@ -debian/tmp/opt/kde3/include/kde/cvsjob_stub.h -debian/tmp/opt/kde3/include/kde/cvsservice_stub.h -debian/tmp/opt/kde3/include/kde/repository_stub.h +debian/tmp/opt/kde3/include/tde/cvsjob_stub.h +debian/tmp/opt/kde3/include/tde/cvsservice_stub.h +debian/tmp/opt/kde3/include/tde/repository_stub.h debian/tmp/opt/kde3/lib/libcvsservice.la debian/tmp/opt/kde3/lib/libcvsservice.so debian/tmp/opt/kde3/lib/libkdeinit_cvsaskpass.la diff --git a/ubuntu/lucid_automake/kdesdk/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/lucid_automake/kdesdk/debian/patches/common/kubuntu_01_kdepot.diff index 3d5dc7628..e705cf83b 100644 --- a/ubuntu/lucid_automake/kdesdk/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/lucid_automake/kdesdk/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/opt/kde3/include/kde/kde.pot ++kdepotpath=/opt/kde3/include/tde/kde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/lucid_automake/kdesdk/debian/rules b/ubuntu/lucid_automake/kdesdk/debian/rules index bab4e2b82..1a91a4065 100755 --- a/ubuntu/lucid_automake/kdesdk/debian/rules +++ b/ubuntu/lucid_automake/kdesdk/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info diff --git a/ubuntu/lucid_automake/kdetoys/debian/amor-kde3.install b/ubuntu/lucid_automake/kdetoys/debian/amor-kde3.install index dc961325b..ee7df97a4 100644 --- a/ubuntu/lucid_automake/kdetoys/debian/amor-kde3.install +++ b/ubuntu/lucid_automake/kdetoys/debian/amor-kde3.install @@ -1,5 +1,5 @@ debian/tmp/opt/kde3/bin/amor -debian/tmp/opt/kde3/include/kde/AmorIface.h +debian/tmp/opt/kde3/include/tde/AmorIface.h debian/tmp/opt/kde3/share/apps/amor debian/tmp/opt/kde3/share/applications/kde/amor.desktop debian/tmp/opt/kde3/share/doc/kde/HTML/en/amor/*.bz2 diff --git a/ubuntu/lucid_automake/kdetoys/debian/cdbs/kde.mk b/ubuntu/lucid_automake/kdetoys/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/lucid_automake/kdetoys/debian/cdbs/kde.mk +++ b/ubuntu/lucid_automake/kdetoys/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/lucid_automake/kdetoys/debian/changelog b/ubuntu/lucid_automake/kdetoys/debian/changelog index 26a0781c5..4c9c290ab 100644 --- a/ubuntu/lucid_automake/kdetoys/debian/changelog +++ b/ubuntu/lucid_automake/kdetoys/debian/changelog @@ -609,7 +609,7 @@ kdetoys (4:2.2.2-3) unstable; urgency=low kdetoys (4:2.2.2-2) unstable; urgency=low - * Moved AmorIface.h to /usr/include/kde (closes: Bug#122447). + * Moved AmorIface.h to /usr/include/tde (closes: Bug#122447). -- Ben Burton Sun, 9 Dec 2001 09:07:02 -0600 diff --git a/ubuntu/lucid_automake/kdetoys/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/lucid_automake/kdetoys/debian/patches/common/kubuntu_01_kdepot.diff index 3d5dc7628..e705cf83b 100644 --- a/ubuntu/lucid_automake/kdetoys/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/lucid_automake/kdetoys/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/opt/kde3/include/kde/kde.pot ++kdepotpath=/opt/kde3/include/tde/kde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/lucid_automake/kdetoys/debian/rules b/ubuntu/lucid_automake/kdetoys/debian/rules index 77c4dbffe..16a0537bc 100755 --- a/ubuntu/lucid_automake/kdetoys/debian/rules +++ b/ubuntu/lucid_automake/kdetoys/debian/rules @@ -5,14 +5,14 @@ include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --includedir="/opt/kde3/include/kde" --mandir="/opt/kde3/share/man" --infodir="/opt/kde3/share/info" +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --includedir="/opt/kde3/include/tde" --mandir="/opt/kde3/share/man" --infodir="/opt/kde3/share/info" DEB_DH_STRIP_ARGS := --dbg-package=kdetoys-kde3-dbg diff --git a/ubuntu/lucid_automake/kdeutils/debian/cdbs/kde.mk b/ubuntu/lucid_automake/kdeutils/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/lucid_automake/kdeutils/debian/cdbs/kde.mk +++ b/ubuntu/lucid_automake/kdeutils/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/lucid_automake/kdeutils/debian/kdeutils-kde3-dev.install b/ubuntu/lucid_automake/kdeutils/debian/kdeutils-kde3-dev.install index 6c561c622..f7092a5fd 100644 --- a/ubuntu/lucid_automake/kdeutils/debian/kdeutils-kde3-dev.install +++ b/ubuntu/lucid_automake/kdeutils/debian/kdeutils-kde3-dev.install @@ -1,18 +1,18 @@ -debian/tmp/opt/kde3/include/kde/kmultiformlistbox.h -debian/tmp/opt/kde3/include/kde/kmultiformlistboxentry.h -debian/tmp/opt/kde3/include/kde/kmultiformlistboxfactory.h -debian/tmp/opt/kde3/include/kde/ksim/chart.h -debian/tmp/opt/kde3/include/kde/ksim/common.h -debian/tmp/opt/kde3/include/kde/ksim/ksimconfig.h -debian/tmp/opt/kde3/include/kde/ksim/label.h -debian/tmp/opt/kde3/include/kde/ksim/led.h -debian/tmp/opt/kde3/include/kde/ksim/pluginglobal.h -debian/tmp/opt/kde3/include/kde/ksim/pluginloader.h -debian/tmp/opt/kde3/include/kde/ksim/pluginmodule.h -debian/tmp/opt/kde3/include/kde/ksim/progress.h -debian/tmp/opt/kde3/include/kde/ksim/themeloader.h -debian/tmp/opt/kde3/include/kde/ksim/themetypes.h -debian/tmp/opt/kde3/include/kde/kwidgetstreamer.h +debian/tmp/opt/kde3/include/tde/kmultiformlistbox.h +debian/tmp/opt/kde3/include/tde/kmultiformlistboxentry.h +debian/tmp/opt/kde3/include/tde/kmultiformlistboxfactory.h +debian/tmp/opt/kde3/include/tde/ksim/chart.h +debian/tmp/opt/kde3/include/tde/ksim/common.h +debian/tmp/opt/kde3/include/tde/ksim/ksimconfig.h +debian/tmp/opt/kde3/include/tde/ksim/label.h +debian/tmp/opt/kde3/include/tde/ksim/led.h +debian/tmp/opt/kde3/include/tde/ksim/pluginglobal.h +debian/tmp/opt/kde3/include/tde/ksim/pluginloader.h +debian/tmp/opt/kde3/include/tde/ksim/pluginmodule.h +debian/tmp/opt/kde3/include/tde/ksim/progress.h +debian/tmp/opt/kde3/include/tde/ksim/themeloader.h +debian/tmp/opt/kde3/include/tde/ksim/themetypes.h +debian/tmp/opt/kde3/include/tde/kwidgetstreamer.h debian/tmp/opt/kde3/lib/libkcmlaptop.la debian/tmp/opt/kde3/lib/libkcmlaptop.so debian/tmp/opt/kde3/lib/libkdeinit_ark.la diff --git a/ubuntu/lucid_automake/kdeutils/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/lucid_automake/kdeutils/debian/patches/common/kubuntu_01_kdepot.diff index 3d5dc7628..e705cf83b 100644 --- a/ubuntu/lucid_automake/kdeutils/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/lucid_automake/kdeutils/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/opt/kde3/include/kde/kde.pot ++kdepotpath=/opt/kde3/include/tde/kde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/lucid_automake/kdeutils/debian/rules b/ubuntu/lucid_automake/kdeutils/debian/rules index 658aea6bf..7cca0eada 100755 --- a/ubuntu/lucid_automake/kdeutils/debian/rules +++ b/ubuntu/lucid_automake/kdeutils/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info diff --git a/ubuntu/lucid_automake/kdevelop/debian/cdbs/kde.mk b/ubuntu/lucid_automake/kdevelop/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/lucid_automake/kdevelop/debian/cdbs/kde.mk +++ b/ubuntu/lucid_automake/kdevelop/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/lucid_automake/kdevelop/debian/kdevelop-kde3-dev.install b/ubuntu/lucid_automake/kdevelop/debian/kdevelop-kde3-dev.install index 4c33e7446..2c79f464a 100644 --- a/ubuntu/lucid_automake/kdevelop/debian/kdevelop-kde3-dev.install +++ b/ubuntu/lucid_automake/kdevelop/debian/kdevelop-kde3-dev.install @@ -1,3 +1,3 @@ -debian/tmp/opt/kde3/include/kde +debian/tmp/opt/kde3/include/tde debian/tmp/opt/kde3/lib/lib*.so debian/tmp/opt/kde3/lib/lib*.la diff --git a/ubuntu/lucid_automake/kdevelop/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/lucid_automake/kdevelop/debian/patches/common/kubuntu_01_kdepot.diff index 3d5dc7628..e705cf83b 100644 --- a/ubuntu/lucid_automake/kdevelop/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/lucid_automake/kdevelop/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/opt/kde3/include/kde/kde.pot ++kdepotpath=/opt/kde3/include/tde/kde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/lucid_automake/kdevelop/debian/rules b/ubuntu/lucid_automake/kdevelop/debian/rules index 1bdd8afd3..ddd9f331d 100755 --- a/ubuntu/lucid_automake/kdevelop/debian/rules +++ b/ubuntu/lucid_automake/kdevelop/debian/rules @@ -9,7 +9,7 @@ include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info diff --git a/ubuntu/lucid_automake/kdewebdev/debian/cdbs/kde.mk b/ubuntu/lucid_automake/kdewebdev/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/lucid_automake/kdewebdev/debian/cdbs/kde.mk +++ b/ubuntu/lucid_automake/kdewebdev/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/lucid_automake/kdewebdev/debian/kommander-kde3-dev.install b/ubuntu/lucid_automake/kdewebdev/debian/kommander-kde3-dev.install index 1bc0b39ff..63617fcbe 100644 --- a/ubuntu/lucid_automake/kdewebdev/debian/kommander-kde3-dev.install +++ b/ubuntu/lucid_automake/kdewebdev/debian/kommander-kde3-dev.install @@ -1,7 +1,7 @@ -debian/tmp/opt/kde3/include/kde/kommander* +debian/tmp/opt/kde3/include/tde/kommander* debian/tmp/opt/kde3/lib/libkommanderplugin.la debian/tmp/opt/kde3/lib/libkommanderplugin.so debian/tmp/opt/kde3/lib/libkommanderwidget.la debian/tmp/opt/kde3/lib/libkommanderwidget.so debian/tmp/opt/kde3/lib/libkommanderwidgets.so -debian/tmp/opt/kde3/include/kde/specials.h +debian/tmp/opt/kde3/include/tde/specials.h diff --git a/ubuntu/lucid_automake/kdewebdev/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/lucid_automake/kdewebdev/debian/patches/common/kubuntu_01_kdepot.diff index 1f825f642..698deb926 100644 --- a/ubuntu/lucid_automake/kdewebdev/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/lucid_automake/kdewebdev/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/usr/include/kde/kde.pot ++kdepotpath=/usr/include/tde/kde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/lucid_automake/kdewebdev/debian/rules b/ubuntu/lucid_automake/kdewebdev/debian/rules index eb13dfc75..b35ebb7ea 100755 --- a/ubuntu/lucid_automake/kdewebdev/debian/rules +++ b/ubuntu/lucid_automake/kdewebdev/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info diff --git a/ubuntu/lucid_automake/libraries/kipi-plugins/debian/cdbs/kde.mk b/ubuntu/lucid_automake/libraries/kipi-plugins/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/lucid_automake/libraries/kipi-plugins/debian/cdbs/kde.mk +++ b/ubuntu/lucid_automake/libraries/kipi-plugins/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/lucid_automake/libraries/kipi-plugins/debian/rules b/ubuntu/lucid_automake/libraries/kipi-plugins/debian/rules index 45d9a55b4..847bdb8ef 100755 --- a/ubuntu/lucid_automake/libraries/kipi-plugins/debian/rules +++ b/ubuntu/lucid_automake/libraries/kipi-plugins/debian/rules @@ -9,7 +9,7 @@ include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/patchsys-quilt.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info @@ -18,7 +18,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--as-needed" -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/tde clean :: rm -f po/*/*.gmo diff --git a/ubuntu/lucid_automake/libraries/libkdcraw/debian/cdbs/kde.mk b/ubuntu/lucid_automake/libraries/libkdcraw/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/lucid_automake/libraries/libkdcraw/debian/cdbs/kde.mk +++ b/ubuntu/lucid_automake/libraries/libkdcraw/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/lucid_automake/libraries/libkdcraw/debian/rules b/ubuntu/lucid_automake/libraries/libkdcraw/debian/rules index f2eb3f948..7e04f9653 100755 --- a/ubuntu/lucid_automake/libraries/libkdcraw/debian/rules +++ b/ubuntu/lucid_automake/libraries/libkdcraw/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/patchsys-quilt.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info diff --git a/ubuntu/lucid_automake/libraries/libkexiv2/debian/cdbs/kde.mk b/ubuntu/lucid_automake/libraries/libkexiv2/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/lucid_automake/libraries/libkexiv2/debian/cdbs/kde.mk +++ b/ubuntu/lucid_automake/libraries/libkexiv2/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/lucid_automake/libraries/libkexiv2/debian/rules b/ubuntu/lucid_automake/libraries/libkexiv2/debian/rules index 213669cac..f5721b2e3 100755 --- a/ubuntu/lucid_automake/libraries/libkexiv2/debian/rules +++ b/ubuntu/lucid_automake/libraries/libkexiv2/debian/rules @@ -8,7 +8,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info diff --git a/ubuntu/lucid_automake/libraries/libkipi/debian/cdbs/kde.mk b/ubuntu/lucid_automake/libraries/libkipi/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/lucid_automake/libraries/libkipi/debian/cdbs/kde.mk +++ b/ubuntu/lucid_automake/libraries/libkipi/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/lucid_automake/libraries/libkipi/debian/rules b/ubuntu/lucid_automake/libraries/libkipi/debian/rules index a2ce2c395..6d35aa5b2 100755 --- a/ubuntu/lucid_automake/libraries/libkipi/debian/rules +++ b/ubuntu/lucid_automake/libraries/libkipi/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info diff --git a/ubuntu/lucid_automake/libraries/libksquirrel/debian/rules b/ubuntu/lucid_automake/libraries/libksquirrel/debian/rules index 566a88117..eb2e91d1a 100755 --- a/ubuntu/lucid_automake/libraries/libksquirrel/debian/rules +++ b/ubuntu/lucid_automake/libraries/libksquirrel/debian/rules @@ -9,7 +9,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info diff --git a/ubuntu/lucid_automake/libraries/mlt++/debian/rules b/ubuntu/lucid_automake/libraries/mlt++/debian/rules index 7858faac4..f16e3b0e3 100755 --- a/ubuntu/lucid_automake/libraries/mlt++/debian/rules +++ b/ubuntu/lucid_automake/libraries/mlt++/debian/rules @@ -3,7 +3,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info diff --git a/ubuntu/lucid_automake/libraries/mlt/debian/rules b/ubuntu/lucid_automake/libraries/mlt/debian/rules index 70d23bb1b..9bb8d7a03 100755 --- a/ubuntu/lucid_automake/libraries/mlt/debian/rules +++ b/ubuntu/lucid_automake/libraries/mlt/debian/rules @@ -3,7 +3,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info @@ -47,10 +47,10 @@ configure-stamp: QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2 - CFLAGS="$(CFLAGS)" PATH=/opt/kde3/bin:$(PATH) LD_LIBRARY_PATH=/opt/kde3/lib:$(LD_LIBRARY_PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/kde ./configure --enable-gpl \ + CFLAGS="$(CFLAGS)" PATH=/opt/kde3/bin:$(PATH) LD_LIBRARY_PATH=/opt/kde3/lib:$(LD_LIBRARY_PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/tde ./configure --enable-gpl \ --luma-compress --disable-mmx $(CONFIGURE_OPTS) \ --avformat-shared=/usr --avformat-swscale \ - --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/kde + --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/tde touch configure-stamp @@ -58,7 +58,7 @@ build: configure-stamp build-stamp build-stamp: dh_testdir - env PATH=/opt/kde3/bin:$(PATH) LD_LIBRARY_PATH=/opt/kde3/lib:$(LD_LIBRARY_PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/kde $(MAKE) -j $(NCPUS) + env PATH=/opt/kde3/bin:$(PATH) LD_LIBRARY_PATH=/opt/kde3/lib:$(LD_LIBRARY_PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/tde $(MAKE) -j $(NCPUS) touch build-stamp @@ -81,7 +81,7 @@ install: build dh_clean -k dh_installdirs opt/kde3/lib/mlt0.2.5/modules opt/kde3/share/mlt0.2.5 - env PATH=/opt/kde3/bin:$(PATH) LD_LIBRARY_PATH=/opt/kde3/lib:$(LD_LIBRARY_PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/kde $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp + env PATH=/opt/kde3/bin:$(PATH) LD_LIBRARY_PATH=/opt/kde3/lib:$(LD_LIBRARY_PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/tde $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp # mkdir debian/tmp/opt/kde3 # mv debian/tmp/opt/kde3/lib debian/tmp/opt/kde3/ diff --git a/ubuntu/lucid_automake/libraries/pytdeextensions/debian/libpythonize0-kde3-dev.install b/ubuntu/lucid_automake/libraries/pytdeextensions/debian/libpythonize0-kde3-dev.install index fa6727d83..c1b3787e8 100644 --- a/ubuntu/lucid_automake/libraries/pytdeextensions/debian/libpythonize0-kde3-dev.install +++ b/ubuntu/lucid_automake/libraries/pytdeextensions/debian/libpythonize0-kde3-dev.install @@ -1,4 +1,4 @@ -opt/kde3/include/kde/pythonize.h +opt/kde3/include/tde/pythonize.h opt/kde3/lib/libpythonize.a opt/kde3/lib/libpythonize.la opt/kde3/lib/libpythonize.so diff --git a/ubuntu/lucid_automake/libraries/pytdeextensions/debian/rules b/ubuntu/lucid_automake/libraries/pytdeextensions/debian/rules index f6a1d85e6..96ccfd714 100755 --- a/ubuntu/lucid_automake/libraries/pytdeextensions/debian/rules +++ b/ubuntu/lucid_automake/libraries/pytdeextensions/debian/rules @@ -8,7 +8,7 @@ include debian/python-distutils-jaunty.mk include /usr/share/cdbs/1/rules/patchsys-quilt.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info @@ -16,7 +16,7 @@ DEB_CONFIGURE_INFODIR := /opt/kde3/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/tde install/pytdeextensions-kde3:: # We have no idea if the built product is site-packages or dist-packages @@ -45,8 +45,8 @@ install/libpythonize0-kde3:: # fix binary-or-shlib-defines-rpath chrpath -d debian/tmp/opt/kde3/lib/libpythonize.so.* # fix include directory location - mkdir -p debian/tmp/opt/kde3/include/kde - mv debian/tmp/opt/kde3/include/*.h debian/tmp/opt/kde3/include/kde + mkdir -p debian/tmp/opt/kde3/include/tde + mv debian/tmp/opt/kde3/include/*.h debian/tmp/opt/kde3/include/tde clean:: rm -rf build diff --git a/ubuntu/lucid_automake/libraries/python-kde3/debian/rules b/ubuntu/lucid_automake/libraries/python-kde3/debian/rules index 553c08f56..ed917cdc0 100755 --- a/ubuntu/lucid_automake/libraries/python-kde3/debian/rules +++ b/ubuntu/lucid_automake/libraries/python-kde3/debian/rules @@ -4,7 +4,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info @@ -43,7 +43,7 @@ build-%/configure-stamp: patch-stamp dh_testdir mkdir -p build-$* cd build-$* && python$* ../configure.py \ - -c -u -k /opt/kde3 -o /opt/kde3/include/kde -n /opt/kde3/lib \ + -c -u -k /opt/kde3 -o /opt/kde3/include/tde -n /opt/kde3/lib \ -v /opt/kde3/share/sip/kde3 -j $(SPLIT) touch $@ @@ -51,7 +51,7 @@ dbg-build-%/configure-stamp: patch-stamp dh_testdir mkdir -p dbg-build-$* cd dbg-build-$* && python$*-dbg ../configure.py \ - -c -u -k /opt/kde3 -o /opt/kde3/include/kde -n /opt/kde3/lib \ + -c -u -k /opt/kde3 -o /opt/kde3/include/tde -n /opt/kde3/lib \ -v /opt/kde3/share/sip/kde3 -j $(SPLIT) touch $@ diff --git a/ubuntu/maverick/applications/adept/debian/cdbs/kde.mk b/ubuntu/maverick/applications/adept/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/applications/adept/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/adept/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/applications/adept/debian/rules b/ubuntu/maverick/applications/adept/debian/rules index 9c80b51c7..ee86e8e4f 100755 --- a/ubuntu/maverick/applications/adept/debian/rules +++ b/ubuntu/maverick/applications/adept/debian/rules @@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/ubuntu/maverick/applications/amarok/debian/cdbs/kde.mk b/ubuntu/maverick/applications/amarok/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/applications/amarok/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/amarok/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/applications/amarok/debian/rules b/ubuntu/maverick/applications/amarok/debian/rules index 1e2caae64..deb43ebf7 100755 --- a/ubuntu/maverick/applications/amarok/debian/rules +++ b/ubuntu/maverick/applications/amarok/debian/rules @@ -5,7 +5,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/patchsys-quilt.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/ubuntu/maverick/applications/basket/debian/rules b/ubuntu/maverick/applications/basket/debian/rules index 5af81349e..0e699603a 100755 --- a/ubuntu/maverick/applications/basket/debian/rules +++ b/ubuntu/maverick/applications/basket/debian/rules @@ -3,7 +3,7 @@ #export DH_VERBOSE=1 -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/ubuntu/maverick/applications/bibletime/debian/cdbs/kde.mk b/ubuntu/maverick/applications/bibletime/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/applications/bibletime/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/bibletime/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/applications/bibletime/debian/rules b/ubuntu/maverick/applications/bibletime/debian/rules index 1ef64a83d..ea4b62326 100755 --- a/ubuntu/maverick/applications/bibletime/debian/rules +++ b/ubuntu/maverick/applications/bibletime/debian/rules @@ -9,7 +9,7 @@ DEB_DH_INSTALL_SOURCEDIR := debian DEB_BUILDDIR = $(DEB_SRCDIR) -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/cdbs/kde.mk b/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/rules b/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/rules index 820ba5a3b..c5dd59ccb 100755 --- a/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/rules +++ b/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/rules @@ -4,14 +4,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde post-patches:: debian/stamp-bootstrap diff --git a/ubuntu/maverick/applications/desktop-effects-tde/debian/rules b/ubuntu/maverick/applications/desktop-effects-tde/debian/rules index 7bdd258a5..7bf3e3306 100755 --- a/ubuntu/maverick/applications/desktop-effects-tde/debian/rules +++ b/ubuntu/maverick/applications/desktop-effects-tde/debian/rules @@ -2,7 +2,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/ubuntu/maverick/applications/digikam/debian/cdbs/kde.mk b/ubuntu/maverick/applications/digikam/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/applications/digikam/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/digikam/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/applications/digikam/debian/digikam-trinity.install b/ubuntu/maverick/applications/digikam/debian/digikam-trinity.install index 87c7fe33f..49fc16b82 100644 --- a/ubuntu/maverick/applications/digikam/debian/digikam-trinity.install +++ b/ubuntu/maverick/applications/digikam/debian/digikam-trinity.install @@ -1,5 +1,5 @@ opt/trinity/bin/digi* -/opt/trinity/include/kde +/opt/trinity/include/tde opt/trinity/lib /opt/trinity/share/apps/digikam /opt/trinity/share/apps/konqueror/servicemenus/digikam*.desktop diff --git a/ubuntu/maverick/applications/digikam/debian/rules b/ubuntu/maverick/applications/digikam/debian/rules index d4b31de95..18181fd83 100755 --- a/ubuntu/maverick/applications/digikam/debian/rules +++ b/ubuntu/maverick/applications/digikam/debian/rules @@ -6,7 +6,7 @@ include /usr/share/cdbs/1/rules/utils.mk include debian/cdbs/debian-qt-kde.mk -include /usr/share/gnome-pkg-tools/1/rules/sf-get-source.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/ubuntu/maverick/applications/filelight-l10n/debian/cdbs/kde.mk b/ubuntu/maverick/applications/filelight-l10n/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/applications/filelight-l10n/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/filelight-l10n/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/applications/filelight-l10n/debian/rules b/ubuntu/maverick/applications/filelight-l10n/debian/rules index 7eea2f6e2..9255102ce 100755 --- a/ubuntu/maverick/applications/filelight-l10n/debian/rules +++ b/ubuntu/maverick/applications/filelight-l10n/debian/rules @@ -7,7 +7,7 @@ include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 @@ -17,7 +17,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine #DEB_PATCHDIRS := debian/patches/common debian/patches #DEB_INSTALL_DOCS_ALL := -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/usr/trinity/lib --with-extra-includes=/opt/trinity/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/usr/trinity/lib --with-extra-includes=/opt/trinity/include/tde post-patches:: debian/stamp-bootstrap diff --git a/ubuntu/maverick/applications/filelight/debian/cdbs/kde.mk b/ubuntu/maverick/applications/filelight/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/applications/filelight/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/filelight/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/applications/filelight/debian/rules b/ubuntu/maverick/applications/filelight/debian/rules index a7c79577a..838448085 100755 --- a/ubuntu/maverick/applications/filelight/debian/rules +++ b/ubuntu/maverick/applications/filelight/debian/rules @@ -8,7 +8,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/patchsys-quilt.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/ubuntu/maverick/applications/gtk-qt-engine/debian/cdbs/kde.mk b/ubuntu/maverick/applications/gtk-qt-engine/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/applications/gtk-qt-engine/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/gtk-qt-engine/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/applications/gtk-qt-engine/debian/rules b/ubuntu/maverick/applications/gtk-qt-engine/debian/rules index f2ac92c96..0247f6ef3 100755 --- a/ubuntu/maverick/applications/gtk-qt-engine/debian/rules +++ b/ubuntu/maverick/applications/gtk-qt-engine/debian/rules @@ -15,7 +15,7 @@ include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk include debian/cdbs/debian-qt-kde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 @@ -24,7 +24,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib -DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/kde" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" +DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/tde" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" binary-install/gtk-qt-engine-trinity:: mkdir -p $(CURDIR)/debian/gtk-qt-engine-trinity/opt/trinity/share/kgtk/ diff --git a/ubuntu/maverick/applications/gwenview/debian/cdbs/kde.mk b/ubuntu/maverick/applications/gwenview/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/applications/gwenview/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/gwenview/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/applications/gwenview/debian/rules b/ubuntu/maverick/applications/gwenview/debian/rules index c231b336f..81fd87521 100755 --- a/ubuntu/maverick/applications/gwenview/debian/rules +++ b/ubuntu/maverick/applications/gwenview/debian/rules @@ -7,7 +7,7 @@ include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/ubuntu/maverick/applications/k3b/debian/cdbs/kde.mk b/ubuntu/maverick/applications/k3b/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/applications/k3b/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/k3b/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/applications/k3b/debian/rules b/ubuntu/maverick/applications/k3b/debian/rules index fa308829e..664df39cf 100755 --- a/ubuntu/maverick/applications/k3b/debian/rules +++ b/ubuntu/maverick/applications/k3b/debian/rules @@ -4,14 +4,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include debian/cdbs/kde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde5 +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde5 DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_PREFIX := /opt/trinity DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) -DEB_CONFIGURE_EXTRA_FLAGS = --with-k3bsetup=no --with-extra-libs=/opt/trinity/lib --includedir="/opt/trinity/include/kde" +DEB_CONFIGURE_EXTRA_FLAGS = --with-k3bsetup=no --with-extra-libs=/opt/trinity/lib --includedir="/opt/trinity/include/tde" DEB_INSTALL_MANPAGES_k3b = debian/k3b.1 diff --git a/ubuntu/maverick/applications/k3b/debian/trinity.mk b/ubuntu/maverick/applications/k3b/debian/trinity.mk index c48d5d5af..cd71193a1 100644 --- a/ubuntu/maverick/applications/k3b/debian/trinity.mk +++ b/ubuntu/maverick/applications/k3b/debian/trinity.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama --without-arts $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "/opt/trinity/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "/opt/trinity/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/applications/k9copy/debian/cdbs/kde.mk b/ubuntu/maverick/applications/k9copy/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/applications/k9copy/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/k9copy/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/applications/k9copy/debian/rules b/ubuntu/maverick/applications/k9copy/debian/rules index 860ee9e84..7f17e00f5 100755 --- a/ubuntu/maverick/applications/k9copy/debian/rules +++ b/ubuntu/maverick/applications/k9copy/debian/rules @@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/class/kde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 @@ -13,7 +13,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_INSTALL_MANPAGES_k9copy = k9copy-trinity.1 -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --includedir="/opt/trinity/include/kde" --mandir="/opt/trinity/share/man" --infodir="/opt/trinity/share/info" +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --includedir="/opt/trinity/include/tde" --mandir="/opt/trinity/share/man" --infodir="/opt/trinity/share/info" post-patches:: debian/stamp-bootstrap diff --git a/ubuntu/maverick/applications/kaffeine-mozilla/debian/rules b/ubuntu/maverick/applications/kaffeine-mozilla/debian/rules index 86b977b3f..80fe9807b 100755 --- a/ubuntu/maverick/applications/kaffeine-mozilla/debian/rules +++ b/ubuntu/maverick/applications/kaffeine-mozilla/debian/rules @@ -14,7 +14,7 @@ export DH_OPTIONS DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/ubuntu/maverick/applications/kaffeine/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kaffeine/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/applications/kaffeine/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/kaffeine/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/applications/kaffeine/debian/kaffeine-trinity.install b/ubuntu/maverick/applications/kaffeine/debian/kaffeine-trinity.install index 825837cba..4777ef63c 100644 --- a/ubuntu/maverick/applications/kaffeine/debian/kaffeine-trinity.install +++ b/ubuntu/maverick/applications/kaffeine/debian/kaffeine-trinity.install @@ -13,7 +13,7 @@ debian/tmp/opt/trinity/share/doc/ debian/tmp/opt/trinity/share/icons/ debian/tmp/opt/trinity/share/mimelnk/application/x-kaffeine.desktop debian/tmp/opt/trinity/share/locale/ -debian/tmp/opt/trinity/include/kde/kaffeine/*h +debian/tmp/opt/trinity/include/tde/kaffeine/*h debian/tmp/opt/trinity/share/services/kaffeineoggvorbis.desktop debian/tmp/opt/trinity/lib/trinity/libkaffeineoggvorbis.la debian/tmp/opt/trinity/lib/trinity/libkaffeineoggvorbis.so diff --git a/ubuntu/maverick/applications/kaffeine/debian/rules b/ubuntu/maverick/applications/kaffeine/debian/rules index efff35a86..43e1e0d24 100755 --- a/ubuntu/maverick/applications/kaffeine/debian/rules +++ b/ubuntu/maverick/applications/kaffeine/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/ubuntu/maverick/applications/katapult/debian/cdbs/kde.mk b/ubuntu/maverick/applications/katapult/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/applications/katapult/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/katapult/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/applications/katapult/debian/rules b/ubuntu/maverick/applications/katapult/debian/rules index f29a6a564..e48ac244a 100755 --- a/ubuntu/maverick/applications/katapult/debian/rules +++ b/ubuntu/maverick/applications/katapult/debian/rules @@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/ubuntu/maverick/applications/kbarcode/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kbarcode/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/applications/kbarcode/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/kbarcode/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/applications/kbarcode/debian/rules b/ubuntu/maverick/applications/kbarcode/debian/rules index bb554f410..35a033bc7 100755 --- a/ubuntu/maverick/applications/kbarcode/debian/rules +++ b/ubuntu/maverick/applications/kbarcode/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/patchsys-quilt.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/ubuntu/maverick/applications/kbfx/debian/rules b/ubuntu/maverick/applications/kbfx/debian/rules index 5ea2ffc62..9d710b00d 100755 --- a/ubuntu/maverick/applications/kbfx/debian/rules +++ b/ubuntu/maverick/applications/kbfx/debian/rules @@ -7,21 +7,21 @@ URL = http://www.$(DEB_SOURCE_PACKAGE).org/release/0.4.9/testing/$(UPFILENAME) DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib #CMAKE_LIBRARY_PATH := /opt/trinity/lib -#CMAKE_INCLUDE_PATH := /opt/trinity/include/kde +#CMAKE_INCLUDE_PATH := /opt/trinity/include/tde include debian/cmake.mk include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) -DEB_CMAKE_EXTRA_FLAGS = -DLIB_SUFFIX="" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/kde" -DCMAKE_INSTALL_PREFIX="/opt/trinity/" +DEB_CMAKE_EXTRA_FLAGS = -DLIB_SUFFIX="" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/tde" -DCMAKE_INSTALL_PREFIX="/opt/trinity/" get-orig-source: @@dh_testdir diff --git a/ubuntu/maverick/applications/kbookreader/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kbookreader/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/applications/kbookreader/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/kbookreader/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/applications/kbookreader/debian/rules b/ubuntu/maverick/applications/kbookreader/debian/rules index 4ceef7d99..b3b57fdb9 100755 --- a/ubuntu/maverick/applications/kbookreader/debian/rules +++ b/ubuntu/maverick/applications/kbookreader/debian/rules @@ -4,14 +4,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/class/kde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --includedir="/opt/trinity/include/kde" --mandir="/opt/trinity/share/man" --infodir="/opt/trinity/share/info" +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --includedir="/opt/trinity/include/tde" --mandir="/opt/trinity/share/man" --infodir="/opt/trinity/share/info" post-patches:: debian/stamp-bootstrap diff --git a/ubuntu/maverick/applications/kchmviewer/debian/debiandirs b/ubuntu/maverick/applications/kchmviewer/debian/debiandirs index cb33e0ee3..893052e08 100644 --- a/ubuntu/maverick/applications/kchmviewer/debian/debiandirs +++ b/ubuntu/maverick/applications/kchmviewer/debian/debiandirs @@ -1,6 +1,6 @@ export kde_prefix=/usr export sysconfdir=/etc -export kde_includedir=/usr/include/kde +export kde_includedir=/usr/include/tde export infodir=/usr/share/info export mandir=/usr/share/man export qtdir=/usr/share/qt3 diff --git a/ubuntu/maverick/applications/kchmviewer/debian/rules b/ubuntu/maverick/applications/kchmviewer/debian/rules index 0466e25ea..72c3fd5bb 100755 --- a/ubuntu/maverick/applications/kchmviewer/debian/rules +++ b/ubuntu/maverick/applications/kchmviewer/debian/rules @@ -9,7 +9,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 @@ -27,7 +27,7 @@ CFLAGS = -Wall -g CONFIGURE_OPTIONS_KDE = \ --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \ --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib \ - --includedir=/opt/trinity/include/kde --mandir=/opt/trinity/share/man \ + --includedir=/opt/trinity/include/tde --mandir=/opt/trinity/share/man \ --with-qt-dir=$(qtdir) \ --sysconfdir=$(sysconfdir) \ --infodir=/opt/trinity/share/info \ diff --git a/ubuntu/maverick/applications/kcpuload/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kcpuload/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/applications/kcpuload/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/kcpuload/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/applications/kcpuload/debian/rules b/ubuntu/maverick/applications/kcpuload/debian/rules index 2ab783f6d..fae495f36 100755 --- a/ubuntu/maverick/applications/kcpuload/debian/rules +++ b/ubuntu/maverick/applications/kcpuload/debian/rules @@ -5,7 +5,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 @@ -79,7 +79,7 @@ configure-stamp: # run configure with build tree $(objdir) cd $(objdir) && \ - ../configure --disable-debug --enable-final --libexecdir=/opt/trinity/bin --sysconfdir=/etc --libdir=/opt/trinity/lib --includedir=/opt/include/kde --with-qt-includes=/usr/include/qt3 --mandir=/opt/trinity/share/man --infodir=/opt/trinity/share/info --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib + ../configure --disable-debug --enable-final --libexecdir=/opt/trinity/bin --sysconfdir=/etc --libdir=/opt/trinity/lib --includedir=/opt/include/tde --with-qt-includes=/usr/include/qt3 --mandir=/opt/trinity/share/man --infodir=/opt/trinity/share/info --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib touch configure-stamp diff --git a/ubuntu/maverick/applications/kdbusnotification/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kdbusnotification/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/applications/kdbusnotification/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/kdbusnotification/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/applications/kdbusnotification/debian/rules b/ubuntu/maverick/applications/kdbusnotification/debian/rules index 3fbf27bb0..d47788b3a 100755 --- a/ubuntu/maverick/applications/kdbusnotification/debian/rules +++ b/ubuntu/maverick/applications/kdbusnotification/debian/rules @@ -5,7 +5,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 @@ -78,7 +78,7 @@ configure-stamp: # run configure with build tree $(objdir) cd $(objdir) && \ - ../configure --disable-debug --enable-final --libexecdir=/opt/trinity/bin --sysconfdir=/etc --libdir=/opt/trinity/lib --includedir=/opt/include/kde --with-qt-includes=/usr/include/qt3 --mandir=/opt/trinity/share/man --infodir=/opt/trinity/share/info --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib + ../configure --disable-debug --enable-final --libexecdir=/opt/trinity/bin --sysconfdir=/etc --libdir=/opt/trinity/lib --includedir=/opt/include/tde --with-qt-includes=/usr/include/qt3 --mandir=/opt/trinity/share/man --infodir=/opt/trinity/share/info --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib touch configure-stamp diff --git a/ubuntu/maverick/applications/kdiff3/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kdiff3/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/applications/kdiff3/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/kdiff3/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/applications/kdiff3/debian/rules b/ubuntu/maverick/applications/kdiff3/debian/rules index 90b33c108..e76778235 100755 --- a/ubuntu/maverick/applications/kdiff3/debian/rules +++ b/ubuntu/maverick/applications/kdiff3/debian/rules @@ -4,7 +4,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 @@ -37,7 +37,7 @@ config.status: cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in make -f admin/Makefile.common cvs - CFLAGS="$(CFLAGS)" ./configure --disable-rpath --prefix=/opt/trinity --with-qt-includes=/usr/include/qt3 --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --mandir=/opt/trinity/share/man --infodir=/opt/trinity/share/info --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde + CFLAGS="$(CFLAGS)" ./configure --disable-rpath --prefix=/opt/trinity --with-qt-includes=/usr/include/qt3 --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --mandir=/opt/trinity/share/man --infodir=/opt/trinity/share/info --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde build: build-stamp diff --git a/ubuntu/maverick/applications/kdirstat/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kdirstat/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/applications/kdirstat/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/kdirstat/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/applications/kdirstat/debian/rules b/ubuntu/maverick/applications/kdirstat/debian/rules index cf2a8db06..b15f5a9a5 100755 --- a/ubuntu/maverick/applications/kdirstat/debian/rules +++ b/ubuntu/maverick/applications/kdirstat/debian/rules @@ -4,14 +4,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde LDFLAGS += -Wl,--as-needed diff --git a/ubuntu/maverick/applications/kdpkg/debian/rules b/ubuntu/maverick/applications/kdpkg/debian/rules index 59fc3d5a5..b2822c5b3 100755 --- a/ubuntu/maverick/applications/kdpkg/debian/rules +++ b/ubuntu/maverick/applications/kdpkg/debian/rules @@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/autotools.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/ubuntu/maverick/applications/keep/debian/cdbs/kde.mk b/ubuntu/maverick/applications/keep/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/applications/keep/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/keep/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/applications/keep/debian/patches/kubuntu_01_kdepot.diff b/ubuntu/maverick/applications/keep/debian/patches/kubuntu_01_kdepot.diff index 55238c41a..782118729 100644 --- a/ubuntu/maverick/applications/keep/debian/patches/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick/applications/keep/debian/patches/kubuntu_01_kdepot.diff @@ -5,7 +5,7 @@ diff -Nur keep-0.4.0/admin/cvs.sh keep-0.4.0.new/admin/cvs.sh if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/usr/include/kde/kde.pot ++kdepotpath=/usr/include/tde/kde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -16,5 +16,5 @@ diff -Nur keep-0.4.0/admin/cvs.sh keep-0.4.0.new/admin/cvs.sh - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot if ! test -f $kdepotpath; then - kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot + kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot fi diff --git a/ubuntu/maverick/applications/keep/debian/rules b/ubuntu/maverick/applications/keep/debian/rules index 49dc42fae..b6eae04ee 100755 --- a/ubuntu/maverick/applications/keep/debian/rules +++ b/ubuntu/maverick/applications/keep/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 @@ -14,7 +14,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_INSTALL_MANPAGES_keep := keep.1 -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde post-patches:: debian/stamp-bootstrap diff --git a/ubuntu/maverick/applications/kerry/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kerry/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/applications/kerry/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/kerry/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/applications/kerry/debian/rules b/ubuntu/maverick/applications/kerry/debian/rules index 0d08e83f9..7dc0fbe23 100755 --- a/ubuntu/maverick/applications/kerry/debian/rules +++ b/ubuntu/maverick/applications/kerry/debian/rules @@ -5,7 +5,7 @@ include /usr/share/cdbs/1/rules/simple-patchsys.mk # include /usr/share/cdbs/1/class/kde.mk include debian/cdbs/debian-qt-kde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/ubuntu/maverick/applications/kile/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kile/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/applications/kile/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/kile/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/applications/kile/debian/rules b/ubuntu/maverick/applications/kile/debian/rules index 2d31b63e0..3e19a08ea 100755 --- a/ubuntu/maverick/applications/kile/debian/rules +++ b/ubuntu/maverick/applications/kile/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/patchsys-quilt.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 @@ -15,7 +15,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--as-needed" DEB_DH_INSTALL_ARGS := --sourcedir=debian/tmp DEB_INSTALL_MANPAGES_kile := debian/kile.1 -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde post-patches:: debian/stamp-bootstrap diff --git a/ubuntu/maverick/applications/kima/debian/rules b/ubuntu/maverick/applications/kima/debian/rules index a353777b4..519575104 100755 --- a/ubuntu/maverick/applications/kima/debian/rules +++ b/ubuntu/maverick/applications/kima/debian/rules @@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/autotools.mk DEB_CONFIGURE_EXTRA_FLAGS += --disable-rpath -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/ubuntu/maverick/applications/kio-apt/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kio-apt/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/applications/kio-apt/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/kio-apt/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/applications/kio-apt/debian/rules b/ubuntu/maverick/applications/kio-apt/debian/rules index a6d8c580a..9b82c21ad 100755 --- a/ubuntu/maverick/applications/kio-apt/debian/rules +++ b/ubuntu/maverick/applications/kio-apt/debian/rules @@ -5,14 +5,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include debian/cdbs/kde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde post-patches:: debian/stamp-bootstrap diff --git a/ubuntu/maverick/applications/kio-umountwrapper/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kio-umountwrapper/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/applications/kio-umountwrapper/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/kio-umountwrapper/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/applications/kio-umountwrapper/debian/rules b/ubuntu/maverick/applications/kio-umountwrapper/debian/rules index ce61aac65..ae8903f41 100755 --- a/ubuntu/maverick/applications/kio-umountwrapper/debian/rules +++ b/ubuntu/maverick/applications/kio-umountwrapper/debian/rules @@ -4,14 +4,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include debian/cdbs/kde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde post-patches:: debian/stamp-bootstrap diff --git a/ubuntu/maverick/applications/kmplayer/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kmplayer/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/applications/kmplayer/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/kmplayer/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/applications/kmplayer/debian/rules b/ubuntu/maverick/applications/kmplayer/debian/rules index b23d91457..63bf848d1 100755 --- a/ubuntu/maverick/applications/kmplayer/debian/rules +++ b/ubuntu/maverick/applications/kmplayer/debian/rules @@ -5,7 +5,7 @@ include /usr/share/cdbs/1/rules/simple-patchsys.mk include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 @@ -18,7 +18,7 @@ ifeq ($(GCC_VERSION),4.3) CXX = g++ -fpermissive endif -DEB_CONFIGURE_EXTRA_FLAGS := --enable-maintainer-mode --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --enable-maintainer-mode --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp DEB_INSTALL_MANPAGES_kmplayer = kmplayer.1 diff --git a/ubuntu/maverick/applications/kmyfirewall/debian/debiandirs b/ubuntu/maverick/applications/kmyfirewall/debian/debiandirs index 959f97f68..8b51d74fa 100644 --- a/ubuntu/maverick/applications/kmyfirewall/debian/debiandirs +++ b/ubuntu/maverick/applications/kmyfirewall/debian/debiandirs @@ -1,6 +1,6 @@ export kde_prefix=/usr export sysconfdir=/etc -export kde_includedir=/usr/include/kde +export kde_includedir=/usr/include/tde export infodir=/usr/share/info export mandir=/usr/share/man export qtdir=/usr/share/qt3 diff --git a/ubuntu/maverick/applications/kmyfirewall/debian/rules b/ubuntu/maverick/applications/kmyfirewall/debian/rules index 1993e3bfe..a8d1312d8 100755 --- a/ubuntu/maverick/applications/kmyfirewall/debian/rules +++ b/ubuntu/maverick/applications/kmyfirewall/debian/rules @@ -6,7 +6,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 @@ -56,7 +56,7 @@ endif ifneq "$(wildcard /usr/share/misc/config.guess)" "" cp -f /usr/share/misc/config.guess config.guess endif - CFLAGS="$(CFLAGS)" PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) $(configkde) --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde + CFLAGS="$(CFLAGS)" PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) $(configkde) --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde build: build-stamp @@ -65,7 +65,7 @@ build-stamp: config.status dh_testdir # Add here commands to compile the package. - env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde $(MAKE) + env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde $(MAKE) touch build-stamp @@ -94,7 +94,7 @@ install: build dh_clean -k # Add here commands to install the package into debian/kmyfirewall. - env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde $(MAKE) install DESTDIR=$(CURDIR)/debian/kmyfirewall-trinity + env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde $(MAKE) install DESTDIR=$(CURDIR)/debian/kmyfirewall-trinity rm -f debian/kmyfirewall-trinity/opt/trinity/lib/*.so chrpath -d debian/kmyfirewall-trinity/opt/trinity/bin/kmyfirewall debian/kmyfirewall-trinity/opt/trinity/lib/*.so.* debian/kmyfirewall-trinity/opt/trinity/lib/trinity/*.so diff --git a/ubuntu/maverick/applications/kmymoney/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kmymoney/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/applications/kmymoney/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/kmymoney/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/applications/kmymoney/debian/kmymoney2-trinity-dev.install b/ubuntu/maverick/applications/kmymoney/debian/kmymoney2-trinity-dev.install index 4c3b73990..f8c5dc4e3 100644 --- a/ubuntu/maverick/applications/kmymoney/debian/kmymoney2-trinity-dev.install +++ b/ubuntu/maverick/applications/kmymoney/debian/kmymoney2-trinity-dev.install @@ -1,3 +1,3 @@ -opt/trinity/include/kde/kmymoney/* +opt/trinity/include/tde/kmymoney/* opt/trinity/lib/lib*.la opt/trinity/lib/lib*.so diff --git a/ubuntu/maverick/applications/kmymoney/debian/rules b/ubuntu/maverick/applications/kmymoney/debian/rules index efb7a96ea..1bb4dc1bf 100755 --- a/ubuntu/maverick/applications/kmymoney/debian/rules +++ b/ubuntu/maverick/applications/kmymoney/debian/rules @@ -4,14 +4,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde --disable-sqlite3 +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde --disable-sqlite3 LDFLAGS += -Wl,--as-needed diff --git a/ubuntu/maverick/applications/knemo/debian/cdbs/kde.mk b/ubuntu/maverick/applications/knemo/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/applications/knemo/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/knemo/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/applications/knemo/debian/rules b/ubuntu/maverick/applications/knemo/debian/rules index 143b4cd5e..fd71fe17f 100755 --- a/ubuntu/maverick/applications/knemo/debian/rules +++ b/ubuntu/maverick/applications/knemo/debian/rules @@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include debian/cdbs/kde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 @@ -13,7 +13,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_INSTALL_DOCS_knemo = -XNEWS -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde post-patches:: debian/stamp-bootstrap diff --git a/ubuntu/maverick/applications/knetload/debian/rules b/ubuntu/maverick/applications/knetload/debian/rules index c0beba707..843a04ceb 100755 --- a/ubuntu/maverick/applications/knetload/debian/rules +++ b/ubuntu/maverick/applications/knetload/debian/rules @@ -2,7 +2,7 @@ # Sample debian/rules that uses debhelper. # GNU copyright 1997 to 1999 by Joey Hess. -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 @@ -74,7 +74,7 @@ configure-stamp: # run configure with build tree $(objdir) cd $(objdir) && \ - ../configure $(configkde) --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde + ../configure $(configkde) --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde touch configure-stamp diff --git a/ubuntu/maverick/applications/knetstats/debian/cdbs/kde.mk b/ubuntu/maverick/applications/knetstats/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/applications/knetstats/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/knetstats/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/applications/knetstats/debian/rules b/ubuntu/maverick/applications/knetstats/debian/rules index 9d3414239..62349e5af 100755 --- a/ubuntu/maverick/applications/knetstats/debian/rules +++ b/ubuntu/maverick/applications/knetstats/debian/rules @@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include debian/cdbs/kde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/ubuntu/maverick/applications/knetworkmanager8/debian/cdbs/kde.mk b/ubuntu/maverick/applications/knetworkmanager8/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/applications/knetworkmanager8/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/knetworkmanager8/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/applications/knetworkmanager8/debian/rules b/ubuntu/maverick/applications/knetworkmanager8/debian/rules index 97955e38b..e2e99d9d9 100755 --- a/ubuntu/maverick/applications/knetworkmanager8/debian/rules +++ b/ubuntu/maverick/applications/knetworkmanager8/debian/rules @@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/patchsys-quilt.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/ubuntu/maverick/applications/knights/debian/debiandirs b/ubuntu/maverick/applications/knights/debian/debiandirs index d341195a1..ba70ea3fb 100644 --- a/ubuntu/maverick/applications/knights/debian/debiandirs +++ b/ubuntu/maverick/applications/knights/debian/debiandirs @@ -1,6 +1,6 @@ export kde_prefix=/usr export sysconfdir=/etc -export kde_includedir=/usr/include/kde +export kde_includedir=/usr/include/tde export infodir=/usr/share/info export mandir=/usr/share/man export qtdir=/usr/share/qt3 diff --git a/ubuntu/maverick/applications/knights/debian/rules b/ubuntu/maverick/applications/knights/debian/rules index d7e8330c7..fc447c09a 100755 --- a/ubuntu/maverick/applications/knights/debian/rules +++ b/ubuntu/maverick/applications/knights/debian/rules @@ -6,7 +6,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 @@ -51,7 +51,7 @@ config.status: configure patch if [ -f doc/Makefile.in ]; then cp doc/Makefile.in doc/Makefile.in.backup; else mv doc/Makefile.in.backup doc/Makefile.in; fi CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \ - --disable-debug --disable-rpath --sysconfdir=/etc --includedir=/opt/trinity/include/kde --infodir=/opt/trinity/share/info --mandir=/opt/trinity/share/man --with-qt-dir=/usr/share/qt3 --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib + --disable-debug --disable-rpath --sysconfdir=/etc --includedir=/opt/trinity/include/tde --infodir=/opt/trinity/share/info --mandir=/opt/trinity/share/man --with-qt-dir=/usr/share/qt3 --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib build: build-stamp diff --git a/ubuntu/maverick/applications/knowit/debian/rules b/ubuntu/maverick/applications/knowit/debian/rules index bd6992a4a..5af8a0aa8 100755 --- a/ubuntu/maverick/applications/knowit/debian/rules +++ b/ubuntu/maverick/applications/knowit/debian/rules @@ -7,7 +7,7 @@ DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/ubuntu/maverick/applications/knutclient/debian/rules b/ubuntu/maverick/applications/knutclient/debian/rules index 7e8adfc25..a7655e11e 100755 --- a/ubuntu/maverick/applications/knutclient/debian/rules +++ b/ubuntu/maverick/applications/knutclient/debian/rules @@ -11,7 +11,7 @@ DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/ubuntu/maverick/applications/koffice/debian/cdbs/kde.mk b/ubuntu/maverick/applications/koffice/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/applications/koffice/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/koffice/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/applications/koffice/debian/koffice-dev-trinity.install b/ubuntu/maverick/applications/koffice/debian/koffice-dev-trinity.install index 936153c99..4b80b83ec 100644 --- a/ubuntu/maverick/applications/koffice/debian/koffice-dev-trinity.install +++ b/ubuntu/maverick/applications/koffice/debian/koffice-dev-trinity.install @@ -1,4 +1,4 @@ -debian/tmp/opt/trinity/include/kde +debian/tmp/opt/trinity/include/tde debian/tmp/opt/trinity/lib/libkarboncommon.la debian/tmp/opt/trinity/lib/libkarboncommon.so debian/tmp/opt/trinity/lib/libkchartcommon.la diff --git a/ubuntu/maverick/applications/koffice/debian/rules b/ubuntu/maverick/applications/koffice/debian/rules index 9bc0b9c76..0c94bbdc9 100755 --- a/ubuntu/maverick/applications/koffice/debian/rules +++ b/ubuntu/maverick/applications/koffice/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/ubuntu/maverick/applications/konversation/debian/cdbs/kde.mk b/ubuntu/maverick/applications/konversation/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/applications/konversation/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/konversation/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/applications/konversation/debian/rules b/ubuntu/maverick/applications/konversation/debian/rules index 67bc3bb74..359d5f809 100755 --- a/ubuntu/maverick/applications/konversation/debian/rules +++ b/ubuntu/maverick/applications/konversation/debian/rules @@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/patchsys-quilt.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 @@ -13,7 +13,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_DH_STRIP_ARGS := --dbg-package=konversation-trinity-dbg DEB_INSTALL_DOCS_ALL = -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde post-patches:: debian/stamp-bootstrap diff --git a/ubuntu/maverick/applications/kopete-otr/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kopete-otr/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/applications/kopete-otr/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/kopete-otr/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/applications/kopete-otr/debian/rules b/ubuntu/maverick/applications/kopete-otr/debian/rules index 8b49a1a4b..abfd36cfc 100755 --- a/ubuntu/maverick/applications/kopete-otr/debian/rules +++ b/ubuntu/maverick/applications/kopete-otr/debian/rules @@ -3,14 +3,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/kde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde post-patches:: debian/stamp-bootstrap diff --git a/ubuntu/maverick/applications/kpicosim/debian/rules b/ubuntu/maverick/applications/kpicosim/debian/rules index 3541dc742..8d66d9609 100755 --- a/ubuntu/maverick/applications/kpicosim/debian/rules +++ b/ubuntu/maverick/applications/kpicosim/debian/rules @@ -9,7 +9,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 @@ -52,7 +52,7 @@ build-stamp: config.status dh_testdir # Add here commands to compile the package. - env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde $(MAKE) + env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde $(MAKE) #docbook-to-man debian/kpicosim.sgml > kpicosim.1 touch build-stamp diff --git a/ubuntu/maverick/applications/kpilot/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kpilot/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/applications/kpilot/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/kpilot/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/applications/kpilot/debian/rules b/ubuntu/maverick/applications/kpilot/debian/rules index 8b49a1a4b..abfd36cfc 100755 --- a/ubuntu/maverick/applications/kpilot/debian/rules +++ b/ubuntu/maverick/applications/kpilot/debian/rules @@ -3,14 +3,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/kde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde post-patches:: debian/stamp-bootstrap diff --git a/ubuntu/maverick/applications/kpowersave/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kpowersave/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/applications/kpowersave/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/kpowersave/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/applications/kpowersave/debian/rules b/ubuntu/maverick/applications/kpowersave/debian/rules index 2c4fb87d0..49718160e 100755 --- a/ubuntu/maverick/applications/kpowersave/debian/rules +++ b/ubuntu/maverick/applications/kpowersave/debian/rules @@ -4,7 +4,7 @@ include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 @@ -12,7 +12,7 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_INSTALL_DOCS_ALL := AUTHORS NEWS -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde post-patches:: debian/stamp-bootstrap diff --git a/ubuntu/maverick/applications/kradio/debian/rules b/ubuntu/maverick/applications/kradio/debian/rules index a55c7fd87..4ec00e4dc 100755 --- a/ubuntu/maverick/applications/kradio/debian/rules +++ b/ubuntu/maverick/applications/kradio/debian/rules @@ -9,7 +9,7 @@ DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/ubuntu/maverick/applications/krename/debian/rules b/ubuntu/maverick/applications/krename/debian/rules index ece39aee4..86f185efb 100755 --- a/ubuntu/maverick/applications/krename/debian/rules +++ b/ubuntu/maverick/applications/krename/debian/rules @@ -6,14 +6,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde ### Libtool and Automake updates post-patches:: debian/stamp-autothings-update diff --git a/ubuntu/maverick/applications/krusader/debian/cdbs/kde.mk b/ubuntu/maverick/applications/krusader/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/applications/krusader/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/krusader/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/applications/krusader/debian/rules b/ubuntu/maverick/applications/krusader/debian/rules index 9ff5fba71..139132dbb 100755 --- a/ubuntu/maverick/applications/krusader/debian/rules +++ b/ubuntu/maverick/applications/krusader/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 @@ -16,7 +16,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_DESTDIR = $(CURDIR)/debian/krusader-trinity/ -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde post-patches:: debian/stamp-bootstrap diff --git a/ubuntu/maverick/applications/ksplash-engine-moodin/debian/debiandirs b/ubuntu/maverick/applications/ksplash-engine-moodin/debian/debiandirs index 304c32ae4..58237d430 100644 --- a/ubuntu/maverick/applications/ksplash-engine-moodin/debian/debiandirs +++ b/ubuntu/maverick/applications/ksplash-engine-moodin/debian/debiandirs @@ -1,6 +1,6 @@ export kde_prefix=/opt/trinity export sysconfdir=/etc -export kde_includedir=/opt/trinity/include/kde +export kde_includedir=/opt/trinity/include/tde export infodir=/opt/trinity/share/info export mandir=/opt/trinity/share/man export qtdir=/opt/trinity/share/qt3 diff --git a/ubuntu/maverick/applications/ksplash-engine-moodin/debian/rules b/ubuntu/maverick/applications/ksplash-engine-moodin/debian/rules index 2b5a4f326..047b8ca76 100755 --- a/ubuntu/maverick/applications/ksplash-engine-moodin/debian/rules +++ b/ubuntu/maverick/applications/ksplash-engine-moodin/debian/rules @@ -4,7 +4,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 @@ -49,7 +49,7 @@ patch: patch-stamp config.status: configure patch dh_testdir - CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) $(configkde) --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde + CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) $(configkde) --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde build: build-stamp diff --git a/ubuntu/maverick/applications/ksquirrel/debian/rules b/ubuntu/maverick/applications/ksquirrel/debian/rules index aeeceb417..8f8161523 100755 --- a/ubuntu/maverick/applications/ksquirrel/debian/rules +++ b/ubuntu/maverick/applications/ksquirrel/debian/rules @@ -9,7 +9,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/ubuntu/maverick/applications/kstreamripper/debian/rules b/ubuntu/maverick/applications/kstreamripper/debian/rules index 319fe9f4a..27cc7e874 100755 --- a/ubuntu/maverick/applications/kstreamripper/debian/rules +++ b/ubuntu/maverick/applications/kstreamripper/debian/rules @@ -3,10 +3,10 @@ include /usr/share/cdbs/1/rules/debhelper.mk DEB_INSTALL_MANPAGES_kstreamripper:=debian/kstreamripper.1 build/kstreamripper:: - env PATH=/opt/trinity/bin:$(PATH) QTDIR=/usr/share/qt3 CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde DESTDIR=$(DEB_DESTDIR)/opt/trinity $(MAKE) + env PATH=/opt/trinity/bin:$(PATH) QTDIR=/usr/share/qt3 CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde DESTDIR=$(DEB_DESTDIR)/opt/trinity $(MAKE) install/kstreamripper:: - env PATH=/opt/trinity/bin:$(PATH) QTDIR=/usr/share/qt3 CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde $(MAKE) install + env PATH=/opt/trinity/bin:$(PATH) QTDIR=/usr/share/qt3 CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde $(MAKE) install mkdir -p $(DEB_DESTDIR)/opt/trinity/share/pixmaps/ mkdir -p $(DEB_DESTDIR)/opt/trinity/share/doc/HTML/ install -m 644 ./src/hi32-app-kstreamripper.png \ diff --git a/ubuntu/maverick/applications/ksystemlog/debian/cdbs/kde.mk b/ubuntu/maverick/applications/ksystemlog/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/applications/ksystemlog/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/ksystemlog/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/applications/ksystemlog/debian/rules b/ubuntu/maverick/applications/ksystemlog/debian/rules index 115c9a97e..6571b56cb 100755 --- a/ubuntu/maverick/applications/ksystemlog/debian/rules +++ b/ubuntu/maverick/applications/ksystemlog/debian/rules @@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 @@ -13,7 +13,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_INSTALL_MANPAGES_ksystemlog-trinity := ksystemlog.1 -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde post-patches:: debian/stamp-bootstrap diff --git a/ubuntu/maverick/applications/ktechlab/debian/debiandirs b/ubuntu/maverick/applications/ktechlab/debian/debiandirs index d35ab77aa..dfe8aa8ab 100644 --- a/ubuntu/maverick/applications/ktechlab/debian/debiandirs +++ b/ubuntu/maverick/applications/ktechlab/debian/debiandirs @@ -1,7 +1,7 @@ export kde_confdir=/etc/trinity export kde_prefix=/opt/trinity export kde_bindir=/opt/trinity/bin -export kde_includedir=/opt/trinity/include/kde +export kde_includedir=/opt/trinity/include/tde export kde_libdir=/opt/trinity/lib export kde_cgidir=/opt/trinity/lib/cgi-bin export kde_moduledir=/opt/trinity/lib/trinity diff --git a/ubuntu/maverick/applications/ktechlab/debian/rules b/ubuntu/maverick/applications/ktechlab/debian/rules index cadc4e546..1e1e53c9c 100755 --- a/ubuntu/maverick/applications/ktechlab/debian/rules +++ b/ubuntu/maverick/applications/ktechlab/debian/rules @@ -5,7 +5,7 @@ -include debian/debiandirs -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 @@ -45,7 +45,7 @@ endif ifneq "$(wildcard /usr/share/misc/config.guess)" "" cp -f /usr/share/misc/config.guess config.guess endif - PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) $(configkde) --prefix=/opt/trinity + PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) $(configkde) --prefix=/opt/trinity build: build-stamp debian/ktechlab.xpm @@ -55,7 +55,7 @@ build-stamp: config.status make -f admin/Makefile.common cvs touch debian/stamp-bootstrap - env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde $(MAKE) + env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde $(MAKE) touch build-stamp clean: @@ -85,8 +85,8 @@ install: build dh_testroot dh_clean -k dh_installdirs - env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde $(MAKE) install DESTDIR=$(CURDIR)/debian/ktechlab-trinity - env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde $(MAKE) -C po install DESTDIR=$(CURDIR)/debian/ktechlab-trinity + env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde $(MAKE) install DESTDIR=$(CURDIR)/debian/ktechlab-trinity + env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde $(MAKE) -C po install DESTDIR=$(CURDIR)/debian/ktechlab-trinity install -D -m 644 debian/ktechlab.xpm debian/ktechlab-trinity/opt/trinity/share/pixmaps/ktechlab.xpm chrpath -d $(CURDIR)/debian/ktechlab-trinity/opt/trinity/bin/ktechlab chrpath -d $(CURDIR)/debian/ktechlab-trinity/opt/trinity/bin/microbe diff --git a/ubuntu/maverick/applications/ktorrent/debian/cdbs/kde.mk b/ubuntu/maverick/applications/ktorrent/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/applications/ktorrent/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/ktorrent/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/applications/ktorrent/debian/rules b/ubuntu/maverick/applications/ktorrent/debian/rules index 46a8b920a..5590816c2 100755 --- a/ubuntu/maverick/applications/ktorrent/debian/rules +++ b/ubuntu/maverick/applications/ktorrent/debian/rules @@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include debian/cdbs/debian-qt-kde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 @@ -13,7 +13,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_INSTALL_MANPAGES_ktorrent = ktorrent.1 -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde build/ktorrent-trinity:: docbook2x-man debian/ktorrent.1.docbook diff --git a/ubuntu/maverick/applications/kuickshow/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kuickshow/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/applications/kuickshow/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/kuickshow/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/applications/kuickshow/debian/rules b/ubuntu/maverick/applications/kuickshow/debian/rules index 6b1798055..191172fdc 100755 --- a/ubuntu/maverick/applications/kuickshow/debian/rules +++ b/ubuntu/maverick/applications/kuickshow/debian/rules @@ -5,14 +5,14 @@ include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde post-patches:: debian/stamp-bootstrap diff --git a/ubuntu/maverick/applications/kvirc/debian/rules b/ubuntu/maverick/applications/kvirc/debian/rules index a0130f2ac..bd103aecd 100755 --- a/ubuntu/maverick/applications/kvirc/debian/rules +++ b/ubuntu/maverick/applications/kvirc/debian/rules @@ -17,7 +17,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/autotools.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/ubuntu/maverick/applications/kvkbd/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kvkbd/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/applications/kvkbd/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/kvkbd/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/applications/kvkbd/debian/rules b/ubuntu/maverick/applications/kvkbd/debian/rules index 2aabc75db..305c1e4df 100755 --- a/ubuntu/maverick/applications/kvkbd/debian/rules +++ b/ubuntu/maverick/applications/kvkbd/debian/rules @@ -4,14 +4,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde makebuilddir/kvkbd-trinity:: make -f Makefile.cvs diff --git a/ubuntu/maverick/applications/kvpnc/debian/rules b/ubuntu/maverick/applications/kvpnc/debian/rules index 8e7f6fc6f..00d853fcc 100755 --- a/ubuntu/maverick/applications/kvpnc/debian/rules +++ b/ubuntu/maverick/applications/kvpnc/debian/rules @@ -8,14 +8,14 @@ include /usr/share/cdbs/1/rules/utils.mk DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--as-needed" DEB_INSTALL_MANPAGES_kvpnc-trinity := debian/kvpnc-trinity.1 -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde makebuilddir/kvpnc-trinity:: cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in diff --git a/ubuntu/maverick/applications/piklab/debian/rules b/ubuntu/maverick/applications/piklab/debian/rules index ba5677a64..e0a25dd7f 100755 --- a/ubuntu/maverick/applications/piklab/debian/rules +++ b/ubuntu/maverick/applications/piklab/debian/rules @@ -3,7 +3,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 @@ -48,7 +48,7 @@ endif ./configure CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs -Wl,--as-needed" \ --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \ --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib \ - --with-extra-includes=/opt/trinity/include/kde \ + --with-extra-includes=/opt/trinity/include/tde \ --mandir=/opt/trinity/share/man --infodir=/opt/trinity/share/info --enable-rpath touch $@ diff --git a/ubuntu/maverick/applications/potracegui/debian/rules b/ubuntu/maverick/applications/potracegui/debian/rules index 4eeace3c8..6be58cd48 100755 --- a/ubuntu/maverick/applications/potracegui/debian/rules +++ b/ubuntu/maverick/applications/potracegui/debian/rules @@ -11,7 +11,7 @@ DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/ubuntu/maverick/applications/smb4k/debian/cdbs/kde.mk b/ubuntu/maverick/applications/smb4k/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/applications/smb4k/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/smb4k/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/applications/smb4k/debian/rules b/ubuntu/maverick/applications/smb4k/debian/rules index a7f5808ef..db6aa90dd 100755 --- a/ubuntu/maverick/applications/smb4k/debian/rules +++ b/ubuntu/maverick/applications/smb4k/debian/rules @@ -7,7 +7,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/autotools.mk include debian/cdbs/kde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/ubuntu/maverick/applications/soundkonverter/debian/cdbs/kde.mk b/ubuntu/maverick/applications/soundkonverter/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/applications/soundkonverter/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/soundkonverter/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/applications/soundkonverter/debian/rules b/ubuntu/maverick/applications/soundkonverter/debian/rules index 16846b152..831240224 100755 --- a/ubuntu/maverick/applications/soundkonverter/debian/rules +++ b/ubuntu/maverick/applications/soundkonverter/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/patchsys-quilt.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 @@ -14,7 +14,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/ubuntu/maverick/applications/tde-guidance/debian/rules b/ubuntu/maverick/applications/tde-guidance/debian/rules index f3f46453f..e21db2b6b 100755 --- a/ubuntu/maverick/applications/tde-guidance/debian/rules +++ b/ubuntu/maverick/applications/tde-guidance/debian/rules @@ -12,7 +12,7 @@ DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp DEB_UPDATE_RCD_PARAMS := multiuser DEB_INSTALL_MANPAGES_tde-guidance-trinity := debian/displayconfig-trinity.1 debian/mountconfig-trinity.1 debian/serviceconfig-trinity.1 debian/userconfig-trinity.1 PYSUPPORT_PATH = $(DEB_DESTDIR)/opt/trinity/share/python-support -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde LDFLAGS_APPEND := -L/opt/trinity/lib install/tde-guidance-trinity:: diff --git a/ubuntu/maverick/applications/tde-style-lipstik/debian/rules b/ubuntu/maverick/applications/tde-style-lipstik/debian/rules index c25c8d5bd..b20ff9228 100755 --- a/ubuntu/maverick/applications/tde-style-lipstik/debian/rules +++ b/ubuntu/maverick/applications/tde-style-lipstik/debian/rules @@ -9,7 +9,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 @@ -37,7 +37,7 @@ config.status: patch configure CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \ --prefix=/opt/trinity --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info \ --disable-debug --enable-final \ - --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde + --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde # --with-qt-includes=/usr/include/qt3 --with-qt-libraries=/usr/lib/qt3/ build: build-stamp diff --git a/ubuntu/maverick/applications/tde-systemsettings/debian/cdbs/kde.mk b/ubuntu/maverick/applications/tde-systemsettings/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/applications/tde-systemsettings/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/tde-systemsettings/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/applications/tde-systemsettings/debian/rules b/ubuntu/maverick/applications/tde-systemsettings/debian/rules index 82d5c2429..588264407 100755 --- a/ubuntu/maverick/applications/tde-systemsettings/debian/rules +++ b/ubuntu/maverick/applications/tde-systemsettings/debian/rules @@ -6,7 +6,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include debian/cdbs/kde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/ubuntu/maverick/applications/tdesudo/debian/cdbs/kde.mk b/ubuntu/maverick/applications/tdesudo/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/applications/tdesudo/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/tdesudo/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/applications/tdesudo/debian/rules b/ubuntu/maverick/applications/tdesudo/debian/rules index f3b2afb13..5a63a69a9 100755 --- a/ubuntu/maverick/applications/tdesudo/debian/rules +++ b/ubuntu/maverick/applications/tdesudo/debian/rules @@ -4,14 +4,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include debian/cdbs/kde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde DEB_INSTALL_MANPAGES_tdesudo-trinity = tdesudo-trinity.1 diff --git a/ubuntu/maverick/applications/tdmtheme/debian/cdbs/kde.mk b/ubuntu/maverick/applications/tdmtheme/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/applications/tdmtheme/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/tdmtheme/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/applications/tdmtheme/debian/rules b/ubuntu/maverick/applications/tdmtheme/debian/rules index 0eb4fad95..8e74fc2cb 100755 --- a/ubuntu/maverick/applications/tdmtheme/debian/rules +++ b/ubuntu/maverick/applications/tdmtheme/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/patchsys-quilt.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 @@ -13,7 +13,7 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--as-needed" -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde post-patches:: debian/stamp-bootstrap diff --git a/ubuntu/maverick/applications/tellico/debian/rules b/ubuntu/maverick/applications/tellico/debian/rules index e22c0c6f2..b21fb6bd9 100755 --- a/ubuntu/maverick/applications/tellico/debian/rules +++ b/ubuntu/maverick/applications/tellico/debian/rules @@ -5,7 +5,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/ubuntu/maverick/applications/twin-style-crystal/debian/cdbs/kde.mk b/ubuntu/maverick/applications/twin-style-crystal/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/applications/twin-style-crystal/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/twin-style-crystal/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/applications/twin-style-crystal/debian/rules b/ubuntu/maverick/applications/twin-style-crystal/debian/rules index 5e522ca06..8cda3384a 100755 --- a/ubuntu/maverick/applications/twin-style-crystal/debian/rules +++ b/ubuntu/maverick/applications/twin-style-crystal/debian/rules @@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/ubuntu/maverick/applications/yakuake/debian/cdbs/kde.mk b/ubuntu/maverick/applications/yakuake/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/applications/yakuake/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/yakuake/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/applications/yakuake/debian/rules b/ubuntu/maverick/applications/yakuake/debian/rules index 176f45bc3..f5bd922f5 100755 --- a/ubuntu/maverick/applications/yakuake/debian/rules +++ b/ubuntu/maverick/applications/yakuake/debian/rules @@ -3,7 +3,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/kde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/ubuntu/maverick/dependencies/arts/debian/rules b/ubuntu/maverick/dependencies/arts/debian/rules index c6720ab40..95cd29258 100755 --- a/ubuntu/maverick/dependencies/arts/debian/rules +++ b/ubuntu/maverick/dependencies/arts/debian/rules @@ -14,7 +14,7 @@ include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk include debian/cdbs/debian-qt-kde.mk -DEB_CMAKE_EXTRA_FLAGS := -DPKGCONFIG_INSTALL_DIR="/usr/lib/pkgconfig" -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/kde" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" -DWITH_GCC_VISIBILITY="ON" +DEB_CMAKE_EXTRA_FLAGS := -DPKGCONFIG_INSTALL_DIR="/usr/lib/pkgconfig" -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/tde" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" -DWITH_GCC_VISIBILITY="ON" # Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to # never build in parallel, regardless of DEB_BUILD_OPTIONS. diff --git a/ubuntu/maverick/kdegraphics.automake/debian/cdbs/kde.mk b/ubuntu/maverick/kdegraphics.automake/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/kdegraphics.automake/debian/cdbs/kde.mk +++ b/ubuntu/maverick/kdegraphics.automake/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-dev-trinity.install b/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-dev-trinity.install index 608149acc..4d50b4fc5 100644 --- a/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-dev-trinity.install +++ b/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-dev-trinity.install @@ -1,184 +1,184 @@ -debian/tmp/opt/trinity/include/kde/dom/SVGAElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGAltGlyphDefElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGAltGlyphElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGAngle.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimateColorElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimateElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimateMotionElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimateTransformElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedAngle.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedBoolean.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedEnumeration.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedInteger.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedLength.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedLengthList.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedNumber.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedNumberList.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedPathData.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedPoints.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedPreserveAspectRatio.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedRect.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedString.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedTransformList.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimationElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGCSSRule.h -debian/tmp/opt/trinity/include/kde/dom/SVGCircleElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGClipPathElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGColor.h -debian/tmp/opt/trinity/include/kde/dom/SVGColorProfileElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGColorProfileRule.h -debian/tmp/opt/trinity/include/kde/dom/SVGComponentTransferFunctionElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGCursorElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGDefinitionSrcElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGDefsElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGDescElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGDocument.h -debian/tmp/opt/trinity/include/kde/dom/SVGElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGElementInstance.h -debian/tmp/opt/trinity/include/kde/dom/SVGElementInstanceList.h -debian/tmp/opt/trinity/include/kde/dom/SVGEllipseElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGEvent.h -debian/tmp/opt/trinity/include/kde/dom/SVGException.h -debian/tmp/opt/trinity/include/kde/dom/SVGExternalResourcesRequired.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEBlendElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEColorMatrixElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEComponentTransferElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFECompositeElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEConvolveMatrixElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEDiffuseLightingElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEDisplacementMapElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEDistantLightElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEFloodElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEFuncAElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEFuncBElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEFuncGElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEFuncRElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEGaussianBlurElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEImageElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEMergeElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEMergeNodeElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEMorphologyElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEOffsetElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEPointLightElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFESpecularLightingElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFESpotLightElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFETileElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFETurbulenceElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFilterElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFilterPrimitiveStandardAttributes.h -debian/tmp/opt/trinity/include/kde/dom/SVGFitToViewBox.h -debian/tmp/opt/trinity/include/kde/dom/SVGFontElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFontFaceElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFontFaceFormatElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFontFaceNameElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFontFaceSrcElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFontFaceUriElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGForeignObjectElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGGElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGGlyphElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGGlyphRefElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGGradientElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGHKernElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGICCColor.h -debian/tmp/opt/trinity/include/kde/dom/SVGImageElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGLangSpace.h -debian/tmp/opt/trinity/include/kde/dom/SVGLength.h -debian/tmp/opt/trinity/include/kde/dom/SVGLengthList.h -debian/tmp/opt/trinity/include/kde/dom/SVGLineElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGLinearGradientElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGLocatable.h -debian/tmp/opt/trinity/include/kde/dom/SVGMPathElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGMarkerElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGMaskElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGMatrix.h -debian/tmp/opt/trinity/include/kde/dom/SVGMetadataElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGMissingGlyphElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGNumber.h -debian/tmp/opt/trinity/include/kde/dom/SVGNumberList.h -debian/tmp/opt/trinity/include/kde/dom/SVGPaint.h -debian/tmp/opt/trinity/include/kde/dom/SVGPathElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGPathSeg.h -debian/tmp/opt/trinity/include/kde/dom/SVGPathSegArc.h -debian/tmp/opt/trinity/include/kde/dom/SVGPathSegClosePath.h -debian/tmp/opt/trinity/include/kde/dom/SVGPathSegCurvetoCubic.h -debian/tmp/opt/trinity/include/kde/dom/SVGPathSegCurvetoCubicSmooth.h -debian/tmp/opt/trinity/include/kde/dom/SVGPathSegCurvetoQuadratic.h -debian/tmp/opt/trinity/include/kde/dom/SVGPathSegCurvetoQuadraticSmooth.h -debian/tmp/opt/trinity/include/kde/dom/SVGPathSegLineto.h -debian/tmp/opt/trinity/include/kde/dom/SVGPathSegLinetoHorizontal.h -debian/tmp/opt/trinity/include/kde/dom/SVGPathSegLinetoVertical.h -debian/tmp/opt/trinity/include/kde/dom/SVGPathSegList.h -debian/tmp/opt/trinity/include/kde/dom/SVGPathSegMoveto.h -debian/tmp/opt/trinity/include/kde/dom/SVGPatternElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGPoint.h -debian/tmp/opt/trinity/include/kde/dom/SVGPointList.h -debian/tmp/opt/trinity/include/kde/dom/SVGPolygonElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGPolylineElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGPreserveAspectRatio.h -debian/tmp/opt/trinity/include/kde/dom/SVGRadialGradientElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGRect.h -debian/tmp/opt/trinity/include/kde/dom/SVGRectElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGRenderingIntent.h -debian/tmp/opt/trinity/include/kde/dom/SVGSVGElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGScriptElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGSetElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGStopElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGStringList.h -debian/tmp/opt/trinity/include/kde/dom/SVGStylable.h -debian/tmp/opt/trinity/include/kde/dom/SVGStyleElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGSwitchElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGSymbolElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGTRefElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGTSpanElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGTests.h -debian/tmp/opt/trinity/include/kde/dom/SVGTextContentElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGTextElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGTextPathElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGTextPositioningElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGTitleElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGTransform.h -debian/tmp/opt/trinity/include/kde/dom/SVGTransformList.h -debian/tmp/opt/trinity/include/kde/dom/SVGTransformable.h -debian/tmp/opt/trinity/include/kde/dom/SVGURIReference.h -debian/tmp/opt/trinity/include/kde/dom/SVGUnitTypes.h -debian/tmp/opt/trinity/include/kde/dom/SVGUseElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGVKernElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGViewElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGViewSpec.h -debian/tmp/opt/trinity/include/kde/dom/SVGWindow.h -debian/tmp/opt/trinity/include/kde/dom/SVGZoomAndPan.h -debian/tmp/opt/trinity/include/kde/dom/SVGZoomEvent.h -debian/tmp/opt/trinity/include/kde/kfaximage.h -debian/tmp/opt/trinity/include/kde/kmultipageInterface.h -debian/tmp/opt/trinity/include/kde/ksvg/CanvasFactory.h -debian/tmp/opt/trinity/include/kde/ksvg/CanvasItem.h -debian/tmp/opt/trinity/include/kde/ksvg/CanvasItems.h -debian/tmp/opt/trinity/include/kde/ksvg/DocumentFactory.h -debian/tmp/opt/trinity/include/kde/ksvg/KSVGCanvas.h -debian/tmp/opt/trinity/include/kde/ksvg/ksvg_plugin.h -debian/tmp/opt/trinity/include/kde/kviewshell/anchor.h -debian/tmp/opt/trinity/include/kde/kviewshell/bookmark.h -debian/tmp/opt/trinity/include/kde/kviewshell/pageView.h -debian/tmp/opt/trinity/include/kde/kviewshell/documentPageCache.h -debian/tmp/opt/trinity/include/kde/kviewshell/documentRenderer.h -debian/tmp/opt/trinity/include/kde/kviewshell/documentWidget.h -debian/tmp/opt/trinity/include/kde/kviewshell/history.h -debian/tmp/opt/trinity/include/kde/kviewshell/hyperlink.h -debian/tmp/opt/trinity/include/kde/kviewshell/kmultipage.h -debian/tmp/opt/trinity/include/kde/kviewshell/length.h -debian/tmp/opt/trinity/include/kde/kviewshell/pageNumber.h -debian/tmp/opt/trinity/include/kde/kviewshell/pageSize.h -debian/tmp/opt/trinity/include/kde/kviewshell/renderedDocumentPage.h -debian/tmp/opt/trinity/include/kde/kviewshell/renderedDocumentPagePixmap.h -debian/tmp/opt/trinity/include/kde/kviewshell/renderedDocumentPagePrinter.h -debian/tmp/opt/trinity/include/kde/kviewshell/selection.h -debian/tmp/opt/trinity/include/kde/kviewshell/simplePageSize.h -debian/tmp/opt/trinity/include/kde/kviewshell/textBox.h -debian/tmp/opt/trinity/include/kde/kviewshell/zoom.h -debian/tmp/opt/trinity/include/kde/kviewshell/zoomlimits.h -debian/tmp/opt/trinity/include/kde/libtext2path-0.1/BezierPath.h -debian/tmp/opt/trinity/include/kde/libtext2path-0.1/Glyph.h -debian/tmp/opt/trinity/include/kde/libtext2path-0.1/GlyphTracer.h +debian/tmp/opt/trinity/include/tde/dom/SVGAElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGAltGlyphDefElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGAltGlyphElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGAngle.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimateColorElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimateElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimateMotionElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimateTransformElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedAngle.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedBoolean.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedEnumeration.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedInteger.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedLength.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedLengthList.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedNumber.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedNumberList.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedPathData.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedPoints.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedPreserveAspectRatio.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedRect.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedString.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedTransformList.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimationElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGCSSRule.h +debian/tmp/opt/trinity/include/tde/dom/SVGCircleElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGClipPathElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGColor.h +debian/tmp/opt/trinity/include/tde/dom/SVGColorProfileElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGColorProfileRule.h +debian/tmp/opt/trinity/include/tde/dom/SVGComponentTransferFunctionElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGCursorElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGDefinitionSrcElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGDefsElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGDescElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGDocument.h +debian/tmp/opt/trinity/include/tde/dom/SVGElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGElementInstance.h +debian/tmp/opt/trinity/include/tde/dom/SVGElementInstanceList.h +debian/tmp/opt/trinity/include/tde/dom/SVGEllipseElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGEvent.h +debian/tmp/opt/trinity/include/tde/dom/SVGException.h +debian/tmp/opt/trinity/include/tde/dom/SVGExternalResourcesRequired.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEBlendElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEColorMatrixElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEComponentTransferElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFECompositeElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEConvolveMatrixElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEDiffuseLightingElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEDisplacementMapElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEDistantLightElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEFloodElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEFuncAElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEFuncBElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEFuncGElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEFuncRElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEGaussianBlurElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEImageElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEMergeElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEMergeNodeElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEMorphologyElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEOffsetElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEPointLightElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFESpecularLightingElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFESpotLightElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFETileElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFETurbulenceElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFilterElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFilterPrimitiveStandardAttributes.h +debian/tmp/opt/trinity/include/tde/dom/SVGFitToViewBox.h +debian/tmp/opt/trinity/include/tde/dom/SVGFontElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFontFaceElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFontFaceFormatElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFontFaceNameElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFontFaceSrcElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFontFaceUriElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGForeignObjectElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGGElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGGlyphElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGGlyphRefElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGGradientElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGHKernElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGICCColor.h +debian/tmp/opt/trinity/include/tde/dom/SVGImageElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGLangSpace.h +debian/tmp/opt/trinity/include/tde/dom/SVGLength.h +debian/tmp/opt/trinity/include/tde/dom/SVGLengthList.h +debian/tmp/opt/trinity/include/tde/dom/SVGLineElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGLinearGradientElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGLocatable.h +debian/tmp/opt/trinity/include/tde/dom/SVGMPathElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGMarkerElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGMaskElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGMatrix.h +debian/tmp/opt/trinity/include/tde/dom/SVGMetadataElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGMissingGlyphElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGNumber.h +debian/tmp/opt/trinity/include/tde/dom/SVGNumberList.h +debian/tmp/opt/trinity/include/tde/dom/SVGPaint.h +debian/tmp/opt/trinity/include/tde/dom/SVGPathElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGPathSeg.h +debian/tmp/opt/trinity/include/tde/dom/SVGPathSegArc.h +debian/tmp/opt/trinity/include/tde/dom/SVGPathSegClosePath.h +debian/tmp/opt/trinity/include/tde/dom/SVGPathSegCurvetoCubic.h +debian/tmp/opt/trinity/include/tde/dom/SVGPathSegCurvetoCubicSmooth.h +debian/tmp/opt/trinity/include/tde/dom/SVGPathSegCurvetoQuadratic.h +debian/tmp/opt/trinity/include/tde/dom/SVGPathSegCurvetoQuadraticSmooth.h +debian/tmp/opt/trinity/include/tde/dom/SVGPathSegLineto.h +debian/tmp/opt/trinity/include/tde/dom/SVGPathSegLinetoHorizontal.h +debian/tmp/opt/trinity/include/tde/dom/SVGPathSegLinetoVertical.h +debian/tmp/opt/trinity/include/tde/dom/SVGPathSegList.h +debian/tmp/opt/trinity/include/tde/dom/SVGPathSegMoveto.h +debian/tmp/opt/trinity/include/tde/dom/SVGPatternElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGPoint.h +debian/tmp/opt/trinity/include/tde/dom/SVGPointList.h +debian/tmp/opt/trinity/include/tde/dom/SVGPolygonElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGPolylineElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGPreserveAspectRatio.h +debian/tmp/opt/trinity/include/tde/dom/SVGRadialGradientElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGRect.h +debian/tmp/opt/trinity/include/tde/dom/SVGRectElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGRenderingIntent.h +debian/tmp/opt/trinity/include/tde/dom/SVGSVGElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGScriptElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGSetElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGStopElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGStringList.h +debian/tmp/opt/trinity/include/tde/dom/SVGStylable.h +debian/tmp/opt/trinity/include/tde/dom/SVGStyleElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGSwitchElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGSymbolElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGTRefElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGTSpanElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGTests.h +debian/tmp/opt/trinity/include/tde/dom/SVGTextContentElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGTextElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGTextPathElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGTextPositioningElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGTitleElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGTransform.h +debian/tmp/opt/trinity/include/tde/dom/SVGTransformList.h +debian/tmp/opt/trinity/include/tde/dom/SVGTransformable.h +debian/tmp/opt/trinity/include/tde/dom/SVGURIReference.h +debian/tmp/opt/trinity/include/tde/dom/SVGUnitTypes.h +debian/tmp/opt/trinity/include/tde/dom/SVGUseElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGVKernElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGViewElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGViewSpec.h +debian/tmp/opt/trinity/include/tde/dom/SVGWindow.h +debian/tmp/opt/trinity/include/tde/dom/SVGZoomAndPan.h +debian/tmp/opt/trinity/include/tde/dom/SVGZoomEvent.h +debian/tmp/opt/trinity/include/tde/kfaximage.h +debian/tmp/opt/trinity/include/tde/kmultipageInterface.h +debian/tmp/opt/trinity/include/tde/ksvg/CanvasFactory.h +debian/tmp/opt/trinity/include/tde/ksvg/CanvasItem.h +debian/tmp/opt/trinity/include/tde/ksvg/CanvasItems.h +debian/tmp/opt/trinity/include/tde/ksvg/DocumentFactory.h +debian/tmp/opt/trinity/include/tde/ksvg/KSVGCanvas.h +debian/tmp/opt/trinity/include/tde/ksvg/ksvg_plugin.h +debian/tmp/opt/trinity/include/tde/kviewshell/anchor.h +debian/tmp/opt/trinity/include/tde/kviewshell/bookmark.h +debian/tmp/opt/trinity/include/tde/kviewshell/pageView.h +debian/tmp/opt/trinity/include/tde/kviewshell/documentPageCache.h +debian/tmp/opt/trinity/include/tde/kviewshell/documentRenderer.h +debian/tmp/opt/trinity/include/tde/kviewshell/documentWidget.h +debian/tmp/opt/trinity/include/tde/kviewshell/history.h +debian/tmp/opt/trinity/include/tde/kviewshell/hyperlink.h +debian/tmp/opt/trinity/include/tde/kviewshell/kmultipage.h +debian/tmp/opt/trinity/include/tde/kviewshell/length.h +debian/tmp/opt/trinity/include/tde/kviewshell/pageNumber.h +debian/tmp/opt/trinity/include/tde/kviewshell/pageSize.h +debian/tmp/opt/trinity/include/tde/kviewshell/renderedDocumentPage.h +debian/tmp/opt/trinity/include/tde/kviewshell/renderedDocumentPagePixmap.h +debian/tmp/opt/trinity/include/tde/kviewshell/renderedDocumentPagePrinter.h +debian/tmp/opt/trinity/include/tde/kviewshell/selection.h +debian/tmp/opt/trinity/include/tde/kviewshell/simplePageSize.h +debian/tmp/opt/trinity/include/tde/kviewshell/textBox.h +debian/tmp/opt/trinity/include/tde/kviewshell/zoom.h +debian/tmp/opt/trinity/include/tde/kviewshell/zoomlimits.h +debian/tmp/opt/trinity/include/tde/libtext2path-0.1/BezierPath.h +debian/tmp/opt/trinity/include/tde/libtext2path-0.1/Glyph.h +debian/tmp/opt/trinity/include/tde/libtext2path-0.1/GlyphTracer.h debian/tmp/opt/trinity/lib/libtdeinit_kview.la debian/tmp/opt/trinity/lib/libtdeinit_mrmlsearch.la debian/tmp/opt/trinity/lib/libkghostviewlib.la diff --git a/ubuntu/maverick/kdegraphics.automake/debian/libpoppler-tqt-dev.install b/ubuntu/maverick/kdegraphics.automake/debian/libpoppler-tqt-dev.install index 57d9ec1d0..7e7ce35c8 100644 --- a/ubuntu/maverick/kdegraphics.automake/debian/libpoppler-tqt-dev.install +++ b/ubuntu/maverick/kdegraphics.automake/debian/libpoppler-tqt-dev.install @@ -1,3 +1,3 @@ -debian/tmp/opt/trinity/include/kde/poppler-link-qt3.h -debian/tmp/opt/trinity/include/kde/poppler-page-transition.h -debian/tmp/opt/trinity/include/kde/poppler-qt.h +debian/tmp/opt/trinity/include/tde/poppler-link-qt3.h +debian/tmp/opt/trinity/include/tde/poppler-page-transition.h +debian/tmp/opt/trinity/include/tde/poppler-qt.h diff --git a/ubuntu/maverick/kdegraphics.automake/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick/kdegraphics.automake/debian/patches/common/kubuntu_01_kdepot.diff index 0caf5361a..c02687784 100644 --- a/ubuntu/maverick/kdegraphics.automake/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick/kdegraphics.automake/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/opt/trinity/include/kde/kde.pot ++kdepotpath=/opt/trinity/include/tde/kde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick/kdegraphics.automake/debian/rules b/ubuntu/maverick/kdegraphics.automake/debian/rules index 75fb0ff6e..7a23d61e5 100755 --- a/ubuntu/maverick/kdegraphics.automake/debian/rules +++ b/ubuntu/maverick/kdegraphics.automake/debian/rules @@ -5,14 +5,14 @@ include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --includedir="/opt/trinity/include/kde" --mandir="/opt/trinity/share/man" --infodir="/opt/trinity/share/info" --with-extra-libs="/usr/lib/mesa" +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --includedir="/opt/trinity/include/tde" --mandir="/opt/trinity/share/man" --infodir="/opt/trinity/share/info" --with-extra-libs="/usr/lib/mesa" DEB_DH_STRIP_ARGS := --dbg-package=kdegraphics-trinity-dbg diff --git a/ubuntu/maverick/kdevelop.cmake/debian/cdbs/kde.mk b/ubuntu/maverick/kdevelop.cmake/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/kdevelop.cmake/debian/cdbs/kde.mk +++ b/ubuntu/maverick/kdevelop.cmake/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/kdevelop.cmake/debian/kdevelop-trinity-dev.install b/ubuntu/maverick/kdevelop.cmake/debian/kdevelop-trinity-dev.install index 5c24ba5bb..f9f8c82ab 100644 --- a/ubuntu/maverick/kdevelop.cmake/debian/kdevelop-trinity-dev.install +++ b/ubuntu/maverick/kdevelop.cmake/debian/kdevelop-trinity-dev.install @@ -1,3 +1,3 @@ -debian/tmp/opt/trinity/include/kde +debian/tmp/opt/trinity/include/tde debian/tmp/opt/trinity/lib/lib*.so debian/tmp/opt/trinity/lib/lib*.la diff --git a/ubuntu/maverick/libraries/kipi-plugins/debian/cdbs/kde.mk b/ubuntu/maverick/libraries/kipi-plugins/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/libraries/kipi-plugins/debian/cdbs/kde.mk +++ b/ubuntu/maverick/libraries/kipi-plugins/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/libraries/kipi-plugins/debian/rules b/ubuntu/maverick/libraries/kipi-plugins/debian/rules index ec3d9a4a3..e277fb614 100755 --- a/ubuntu/maverick/libraries/kipi-plugins/debian/rules +++ b/ubuntu/maverick/libraries/kipi-plugins/debian/rules @@ -9,7 +9,7 @@ include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/patchsys-quilt.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 @@ -18,7 +18,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--as-needed" -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde clean :: rm -f po/*/*.gmo diff --git a/ubuntu/maverick/libraries/libkdcraw/debian/cdbs/kde.mk b/ubuntu/maverick/libraries/libkdcraw/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/libraries/libkdcraw/debian/cdbs/kde.mk +++ b/ubuntu/maverick/libraries/libkdcraw/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/libraries/libkdcraw/debian/rules b/ubuntu/maverick/libraries/libkdcraw/debian/rules index 0606b98a9..7785e4bcc 100755 --- a/ubuntu/maverick/libraries/libkdcraw/debian/rules +++ b/ubuntu/maverick/libraries/libkdcraw/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/patchsys-quilt.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/ubuntu/maverick/libraries/libkexiv2/debian/cdbs/kde.mk b/ubuntu/maverick/libraries/libkexiv2/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/libraries/libkexiv2/debian/cdbs/kde.mk +++ b/ubuntu/maverick/libraries/libkexiv2/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/libraries/libkexiv2/debian/rules b/ubuntu/maverick/libraries/libkexiv2/debian/rules index dc80327f0..28a1c06e8 100755 --- a/ubuntu/maverick/libraries/libkexiv2/debian/rules +++ b/ubuntu/maverick/libraries/libkexiv2/debian/rules @@ -8,7 +8,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/ubuntu/maverick/libraries/libkipi/debian/cdbs/kde.mk b/ubuntu/maverick/libraries/libkipi/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/libraries/libkipi/debian/cdbs/kde.mk +++ b/ubuntu/maverick/libraries/libkipi/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/libraries/libkipi/debian/rules b/ubuntu/maverick/libraries/libkipi/debian/rules index 903f7c7b1..94eb41df3 100755 --- a/ubuntu/maverick/libraries/libkipi/debian/rules +++ b/ubuntu/maverick/libraries/libkipi/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/ubuntu/maverick/libraries/libksquirrel/debian/rules b/ubuntu/maverick/libraries/libksquirrel/debian/rules index fa3c9c335..fa07f7f8c 100755 --- a/ubuntu/maverick/libraries/libksquirrel/debian/rules +++ b/ubuntu/maverick/libraries/libksquirrel/debian/rules @@ -9,7 +9,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/ubuntu/maverick/libraries/mlt++/debian/rules b/ubuntu/maverick/libraries/mlt++/debian/rules index cf8cb1984..0232c83be 100755 --- a/ubuntu/maverick/libraries/mlt++/debian/rules +++ b/ubuntu/maverick/libraries/mlt++/debian/rules @@ -3,7 +3,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/ubuntu/maverick/libraries/mlt/debian/rules b/ubuntu/maverick/libraries/mlt/debian/rules index 771793fff..3889b6a3a 100755 --- a/ubuntu/maverick/libraries/mlt/debian/rules +++ b/ubuntu/maverick/libraries/mlt/debian/rules @@ -3,7 +3,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 @@ -47,10 +47,10 @@ configure-stamp: QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2 - CFLAGS="$(CFLAGS)" PATH=/opt/trinity/bin:$(PATH) LD_LIBRARY_PATH=/opt/trinity/lib:$(LD_LIBRARY_PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde ./configure --enable-gpl \ + CFLAGS="$(CFLAGS)" PATH=/opt/trinity/bin:$(PATH) LD_LIBRARY_PATH=/opt/trinity/lib:$(LD_LIBRARY_PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde ./configure --enable-gpl \ --luma-compress --disable-mmx $(CONFIGURE_OPTS) \ --avformat-shared=/usr --avformat-swscale \ - --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde + --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde touch configure-stamp @@ -58,7 +58,7 @@ build: configure-stamp build-stamp build-stamp: dh_testdir - env PATH=/opt/trinity/bin:$(PATH) LD_LIBRARY_PATH=/opt/trinity/lib:$(LD_LIBRARY_PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde $(MAKE) -j $(NCPUS) + env PATH=/opt/trinity/bin:$(PATH) LD_LIBRARY_PATH=/opt/trinity/lib:$(LD_LIBRARY_PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde $(MAKE) -j $(NCPUS) touch build-stamp @@ -81,7 +81,7 @@ install: build dh_clean -k dh_installdirs opt/trinity/lib/mlt0.2.5/modules opt/trinity/share/mlt0.2.5 - env PATH=/opt/trinity/bin:$(PATH) LD_LIBRARY_PATH=/opt/trinity/lib:$(LD_LIBRARY_PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp + env PATH=/opt/trinity/bin:$(PATH) LD_LIBRARY_PATH=/opt/trinity/lib:$(LD_LIBRARY_PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp # mkdir debian/tmp/opt/trinity # mv debian/tmp/opt/trinity/lib debian/tmp/opt/trinity/ diff --git a/ubuntu/maverick/libraries/pytdeextensions/debian/libpythonize0-trinity-dev.install b/ubuntu/maverick/libraries/pytdeextensions/debian/libpythonize0-trinity-dev.install index f50fc4e15..d7e5bd651 100644 --- a/ubuntu/maverick/libraries/pytdeextensions/debian/libpythonize0-trinity-dev.install +++ b/ubuntu/maverick/libraries/pytdeextensions/debian/libpythonize0-trinity-dev.install @@ -1,4 +1,4 @@ -opt/trinity/include/kde/pythonize.h +opt/trinity/include/tde/pythonize.h opt/trinity/lib/libpythonize.a opt/trinity/lib/libpythonize.la opt/trinity/lib/libpythonize.so diff --git a/ubuntu/maverick/libraries/pytdeextensions/debian/rules b/ubuntu/maverick/libraries/pytdeextensions/debian/rules index 1acb32f7d..4dcfaaae8 100755 --- a/ubuntu/maverick/libraries/pytdeextensions/debian/rules +++ b/ubuntu/maverick/libraries/pytdeextensions/debian/rules @@ -8,7 +8,7 @@ include debian/python-distutils-jaunty.mk include /usr/share/cdbs/1/rules/patchsys-quilt.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 @@ -16,7 +16,7 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde install/pytdeextensions-trinity:: # We have no idea if the built product is site-packages or dist-packages @@ -45,8 +45,8 @@ install/libpythonize0-trinity:: # fix binary-or-shlib-defines-rpath chrpath -d debian/tmp/opt/trinity/lib/libpythonize.so.* # fix include directory location - mkdir -p debian/tmp/opt/trinity/include/kde - mv debian/tmp/opt/trinity/include/*.h debian/tmp/opt/trinity/include/kde + mkdir -p debian/tmp/opt/trinity/include/tde + mv debian/tmp/opt/trinity/include/*.h debian/tmp/opt/trinity/include/tde clean:: rm -rf build diff --git a/ubuntu/maverick/tde-i18n/debian/debiandirs b/ubuntu/maverick/tde-i18n/debian/debiandirs index ba667b86e..2d0da0c80 100644 --- a/ubuntu/maverick/tde-i18n/debian/debiandirs +++ b/ubuntu/maverick/tde-i18n/debian/debiandirs @@ -1,6 +1,6 @@ export kde_prefix=/opt/trinity export sysconfdir=/etc -export kde_includedir=/opt/trinity/include/kde +export kde_includedir=/opt/trinity/include/tde export infodir=/opt/trinity/share/info export mandir=/opt/trinity/share/man export qtdir=/opt/trinity/share/qt3 diff --git a/ubuntu/maverick/tde-i18n/debian/rules b/ubuntu/maverick/tde-i18n/debian/rules index f49804687..e275e35df 100755 --- a/ubuntu/maverick/tde-i18n/debian/rules +++ b/ubuntu/maverick/tde-i18n/debian/rules @@ -24,7 +24,7 @@ I18N_INSTALL := $(patsubst $(I18N_DIR_PAT),install__%,$(I18N_DIRS)) -include debian/debiandirs -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/ubuntu/maverick/tdeaccessibility/debian/cdbs/kde.mk b/ubuntu/maverick/tdeaccessibility/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/tdeaccessibility/debian/cdbs/kde.mk +++ b/ubuntu/maverick/tdeaccessibility/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/tdeaccessibility/debian/ksayit-trinity.install b/ubuntu/maverick/tdeaccessibility/debian/ksayit-trinity.install index 2f5be2460..f4a7297c0 100644 --- a/ubuntu/maverick/tdeaccessibility/debian/ksayit-trinity.install +++ b/ubuntu/maverick/tdeaccessibility/debian/ksayit-trinity.install @@ -1,5 +1,5 @@ debian/tmp/opt/trinity/bin/ksayit -debian/tmp/opt/trinity/include/kde/ksayit_fxplugin.h +debian/tmp/opt/trinity/include/tde/ksayit_fxplugin.h debian/tmp/opt/trinity/lib/trinity/libFreeverb_plugin.la debian/tmp/opt/trinity/lib/trinity/libFreeverb_plugin.so debian/tmp/opt/trinity/lib/libKTTSD_Lib.la diff --git a/ubuntu/maverick/tdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick/tdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff index 0caf5361a..c02687784 100644 --- a/ubuntu/maverick/tdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick/tdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/opt/trinity/include/kde/kde.pot ++kdepotpath=/opt/trinity/include/tde/kde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick/tdeaccessibility/debian/rules b/ubuntu/maverick/tdeaccessibility/debian/rules index 0f40f42e0..ce879ebd4 100755 --- a/ubuntu/maverick/tdeaccessibility/debian/rules +++ b/ubuntu/maverick/tdeaccessibility/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/ubuntu/maverick/tdeaddons/debian/cdbs/kde.mk b/ubuntu/maverick/tdeaddons/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/tdeaddons/debian/cdbs/kde.mk +++ b/ubuntu/maverick/tdeaddons/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/tdeaddons/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick/tdeaddons/debian/patches/common/kubuntu_01_kdepot.diff index 0caf5361a..c02687784 100644 --- a/ubuntu/maverick/tdeaddons/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick/tdeaddons/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/opt/trinity/include/kde/kde.pot ++kdepotpath=/opt/trinity/include/tde/kde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick/tdeaddons/debian/rules b/ubuntu/maverick/tdeaddons/debian/rules index c872980f3..5d337bfab 100755 --- a/ubuntu/maverick/tdeaddons/debian/rules +++ b/ubuntu/maverick/tdeaddons/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/ubuntu/maverick/tdeadmin/debian/cdbs/kde.mk b/ubuntu/maverick/tdeadmin/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/tdeadmin/debian/cdbs/kde.mk +++ b/ubuntu/maverick/tdeadmin/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/tdeadmin/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick/tdeadmin/debian/patches/common/kubuntu_01_kdepot.diff index 0caf5361a..c02687784 100644 --- a/ubuntu/maverick/tdeadmin/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick/tdeadmin/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/opt/trinity/include/kde/kde.pot ++kdepotpath=/opt/trinity/include/tde/kde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick/tdeadmin/debian/rules b/ubuntu/maverick/tdeadmin/debian/rules index 19e9ac01b..9c9ccadda 100755 --- a/ubuntu/maverick/tdeadmin/debian/rules +++ b/ubuntu/maverick/tdeadmin/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/ubuntu/maverick/tdeartwork/debian/cdbs/kde.mk b/ubuntu/maverick/tdeartwork/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/tdeartwork/debian/cdbs/kde.mk +++ b/ubuntu/maverick/tdeartwork/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/tdeartwork/debian/rules b/ubuntu/maverick/tdeartwork/debian/rules index 3e16d1ff2..82a71627a 100755 --- a/ubuntu/maverick/tdeartwork/debian/rules +++ b/ubuntu/maverick/tdeartwork/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/ubuntu/maverick/tdebindings/debian/cdbs/kde.mk b/ubuntu/maverick/tdebindings/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/tdebindings/debian/cdbs/kde.mk +++ b/ubuntu/maverick/tdebindings/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/tdebindings/debian/libkjsembed-trinity-dev.install b/ubuntu/maverick/tdebindings/debian/libkjsembed-trinity-dev.install index 62a36de6e..540ad0ca2 100644 --- a/ubuntu/maverick/tdebindings/debian/libkjsembed-trinity-dev.install +++ b/ubuntu/maverick/tdebindings/debian/libkjsembed-trinity-dev.install @@ -1,4 +1,4 @@ -debian/tmp/opt/trinity/include/kde/kjsembed/* +debian/tmp/opt/trinity/include/tde/kjsembed/* debian/tmp/opt/trinity/lib/libkjsembed.so debian/tmp/opt/trinity/lib/libkjsembed.la diff --git a/ubuntu/maverick/tdebindings/debian/libsmokeqt-trinity-dev.install b/ubuntu/maverick/tdebindings/debian/libsmokeqt-trinity-dev.install index 2904a6815..99a21c1de 100644 --- a/ubuntu/maverick/tdebindings/debian/libsmokeqt-trinity-dev.install +++ b/ubuntu/maverick/tdebindings/debian/libsmokeqt-trinity-dev.install @@ -1,3 +1,3 @@ -debian/tmp/opt/trinity/include/kde/smoke.h +debian/tmp/opt/trinity/include/tde/smoke.h debian/tmp/opt/trinity/lib/libsmokeqt.so debian/tmp/opt/trinity/lib/libsmokeqt.la diff --git a/ubuntu/maverick/tdebindings/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick/tdebindings/debian/patches/common/kubuntu_01_kdepot.diff index 0caf5361a..c02687784 100644 --- a/ubuntu/maverick/tdebindings/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick/tdebindings/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/opt/trinity/include/kde/kde.pot ++kdepotpath=/opt/trinity/include/tde/kde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick/tdebindings/debian/rules b/ubuntu/maverick/tdebindings/debian/rules index 6c5a7ddad..6498e0a4d 100755 --- a/ubuntu/maverick/tdebindings/debian/rules +++ b/ubuntu/maverick/tdebindings/debian/rules @@ -11,7 +11,7 @@ DEB_BUILDDIR := $(DEB_SRCDIR) include /usr/share/cdbs/1/rules/patchsys-quilt.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/ubuntu/maverick/tdeedu/debian/cdbs/kde.mk b/ubuntu/maverick/tdeedu/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/tdeedu/debian/cdbs/kde.mk +++ b/ubuntu/maverick/tdeedu/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/tdeedu/debian/kstars-trinity.install b/ubuntu/maverick/tdeedu/debian/kstars-trinity.install index 4db6bf7e7..61544b793 100644 --- a/ubuntu/maverick/tdeedu/debian/kstars-trinity.install +++ b/ubuntu/maverick/tdeedu/debian/kstars-trinity.install @@ -1,7 +1,7 @@ etc/trinity/kstarsrc opt/trinity/bin/kstars -/opt/trinity/include/kde/kstarsinterface.h -/opt/trinity/include/kde/simclockinterface.h +/opt/trinity/include/tde/kstarsinterface.h +/opt/trinity/include/tde/simclockinterface.h /opt/trinity/share/applications/kde/kstars.desktop /opt/trinity/share/config.kcfg/kstars.kcfg /opt/trinity/share/doc/kde/HTML/en/kstars/common diff --git a/ubuntu/maverick/tdeedu/debian/libkiten-dev-trinity.install b/ubuntu/maverick/tdeedu/debian/libkiten-dev-trinity.install index ca0848fd9..e64535480 100644 --- a/ubuntu/maverick/tdeedu/debian/libkiten-dev-trinity.install +++ b/ubuntu/maverick/tdeedu/debian/libkiten-dev-trinity.install @@ -1,3 +1,3 @@ -/opt/trinity/include/kde/libkiten +/opt/trinity/include/tde/libkiten opt/trinity/lib/libkiten.la opt/trinity/lib/libkiten.so diff --git a/ubuntu/maverick/tdeedu/debian/libtdeedu-dev-trinity.install b/ubuntu/maverick/tdeedu/debian/libtdeedu-dev-trinity.install index be3af1e7b..1695e3cf1 100644 --- a/ubuntu/maverick/tdeedu/debian/libtdeedu-dev-trinity.install +++ b/ubuntu/maverick/tdeedu/debian/libtdeedu-dev-trinity.install @@ -1,4 +1,4 @@ -/opt/trinity/include/kde/libtdeedu +/opt/trinity/include/tde/libtdeedu opt/trinity/lib/libextdate.la opt/trinity/lib/libextdate.so opt/trinity/lib/libtdeeducore.la diff --git a/ubuntu/maverick/tdeedu/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick/tdeedu/debian/patches/common/kubuntu_01_kdepot.diff index 0caf5361a..c02687784 100644 --- a/ubuntu/maverick/tdeedu/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick/tdeedu/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/opt/trinity/include/kde/kde.pot ++kdepotpath=/opt/trinity/include/tde/kde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick/tdeedu/debian/rules b/ubuntu/maverick/tdeedu/debian/rules index b19d3d32f..059005f50 100755 --- a/ubuntu/maverick/tdeedu/debian/rules +++ b/ubuntu/maverick/tdeedu/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 @@ -14,7 +14,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_DH_INSTALL_SOURCEDIR := $(DEB_DESTDIR) -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --includedir="/opt/trinity/include/kde" --mandir="/opt/trinity/share/man" --infodir="/opt/trinity/share/info" +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --includedir="/opt/trinity/include/tde" --mandir="/opt/trinity/share/man" --infodir="/opt/trinity/share/info" # Ensure that kig's python scripting built successfully. common-build-arch:: diff --git a/ubuntu/maverick/tdegames/debian/atlantik-trinity-dev.install b/ubuntu/maverick/tdegames/debian/atlantik-trinity-dev.install index b9052ce9a..b7dea632a 100644 --- a/ubuntu/maverick/tdegames/debian/atlantik-trinity-dev.install +++ b/ubuntu/maverick/tdegames/debian/atlantik-trinity-dev.install @@ -1,5 +1,5 @@ -/opt/trinity/include/kde/atlantik -/opt/trinity/include/kde/atlantic +/opt/trinity/include/tde/atlantik +/opt/trinity/include/tde/atlantic /opt/trinity/lib/libatlantic.so /opt/trinity/lib/libatlantikclient.so /opt/trinity/lib/libatlantikui.so diff --git a/ubuntu/maverick/tdegames/debian/cdbs/kde.mk b/ubuntu/maverick/tdegames/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/tdegames/debian/cdbs/kde.mk +++ b/ubuntu/maverick/tdegames/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/tdegames/debian/kolf-trinity-dev.install b/ubuntu/maverick/tdegames/debian/kolf-trinity-dev.install index 4da86d1b2..ff0a2b177 100644 --- a/ubuntu/maverick/tdegames/debian/kolf-trinity-dev.install +++ b/ubuntu/maverick/tdegames/debian/kolf-trinity-dev.install @@ -1,2 +1,2 @@ -/opt/trinity/include/kde/kolf +/opt/trinity/include/tde/kolf /opt/trinity/lib/libkolf.so diff --git a/ubuntu/maverick/tdegames/debian/libtdegames-trinity-dev.install b/ubuntu/maverick/tdegames/debian/libtdegames-trinity-dev.install index 354fa3840..eca00d487 100644 --- a/ubuntu/maverick/tdegames/debian/libtdegames-trinity-dev.install +++ b/ubuntu/maverick/tdegames/debian/libtdegames-trinity-dev.install @@ -1,4 +1,4 @@ -/opt/trinity/include/kde/*.h -/opt/trinity/include/kde/kgame +/opt/trinity/include/tde/*.h +/opt/trinity/include/tde/kgame /opt/trinity/lib/libtdegames.so /opt/trinity/lib/libtdegames.la diff --git a/ubuntu/maverick/tdegames/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick/tdegames/debian/patches/common/kubuntu_01_kdepot.diff index 0caf5361a..c02687784 100644 --- a/ubuntu/maverick/tdegames/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick/tdegames/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/opt/trinity/include/kde/kde.pot ++kdepotpath=/opt/trinity/include/tde/kde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick/tdegames/debian/rules b/ubuntu/maverick/tdegames/debian/rules index 0ba5f21cb..5a24cd5ae 100755 --- a/ubuntu/maverick/tdegames/debian/rules +++ b/ubuntu/maverick/tdegames/debian/rules @@ -7,7 +7,7 @@ include /usr/share/cdbs/1/rules/utils.mk export kde_bindir = /opt/trinity/games -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/ubuntu/maverick/tdegraphics/debian/cdbs/kde.mk b/ubuntu/maverick/tdegraphics/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/tdegraphics/debian/cdbs/kde.mk +++ b/ubuntu/maverick/tdegraphics/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/tdegraphics/debian/libpoppler-tqt-dev.install b/ubuntu/maverick/tdegraphics/debian/libpoppler-tqt-dev.install index 57d9ec1d0..7e7ce35c8 100644 --- a/ubuntu/maverick/tdegraphics/debian/libpoppler-tqt-dev.install +++ b/ubuntu/maverick/tdegraphics/debian/libpoppler-tqt-dev.install @@ -1,3 +1,3 @@ -debian/tmp/opt/trinity/include/kde/poppler-link-qt3.h -debian/tmp/opt/trinity/include/kde/poppler-page-transition.h -debian/tmp/opt/trinity/include/kde/poppler-qt.h +debian/tmp/opt/trinity/include/tde/poppler-link-qt3.h +debian/tmp/opt/trinity/include/tde/poppler-page-transition.h +debian/tmp/opt/trinity/include/tde/poppler-qt.h diff --git a/ubuntu/maverick/tdegraphics/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick/tdegraphics/debian/patches/common/kubuntu_01_kdepot.diff index 0caf5361a..c02687784 100644 --- a/ubuntu/maverick/tdegraphics/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick/tdegraphics/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/opt/trinity/include/kde/kde.pot ++kdepotpath=/opt/trinity/include/tde/kde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick/tdegraphics/debian/tdegraphics-dev-trinity.install b/ubuntu/maverick/tdegraphics/debian/tdegraphics-dev-trinity.install index 608149acc..4d50b4fc5 100644 --- a/ubuntu/maverick/tdegraphics/debian/tdegraphics-dev-trinity.install +++ b/ubuntu/maverick/tdegraphics/debian/tdegraphics-dev-trinity.install @@ -1,184 +1,184 @@ -debian/tmp/opt/trinity/include/kde/dom/SVGAElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGAltGlyphDefElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGAltGlyphElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGAngle.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimateColorElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimateElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimateMotionElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimateTransformElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedAngle.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedBoolean.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedEnumeration.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedInteger.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedLength.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedLengthList.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedNumber.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedNumberList.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedPathData.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedPoints.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedPreserveAspectRatio.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedRect.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedString.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedTransformList.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimationElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGCSSRule.h -debian/tmp/opt/trinity/include/kde/dom/SVGCircleElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGClipPathElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGColor.h -debian/tmp/opt/trinity/include/kde/dom/SVGColorProfileElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGColorProfileRule.h -debian/tmp/opt/trinity/include/kde/dom/SVGComponentTransferFunctionElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGCursorElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGDefinitionSrcElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGDefsElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGDescElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGDocument.h -debian/tmp/opt/trinity/include/kde/dom/SVGElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGElementInstance.h -debian/tmp/opt/trinity/include/kde/dom/SVGElementInstanceList.h -debian/tmp/opt/trinity/include/kde/dom/SVGEllipseElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGEvent.h -debian/tmp/opt/trinity/include/kde/dom/SVGException.h -debian/tmp/opt/trinity/include/kde/dom/SVGExternalResourcesRequired.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEBlendElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEColorMatrixElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEComponentTransferElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFECompositeElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEConvolveMatrixElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEDiffuseLightingElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEDisplacementMapElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEDistantLightElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEFloodElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEFuncAElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEFuncBElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEFuncGElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEFuncRElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEGaussianBlurElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEImageElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEMergeElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEMergeNodeElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEMorphologyElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEOffsetElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEPointLightElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFESpecularLightingElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFESpotLightElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFETileElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFETurbulenceElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFilterElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFilterPrimitiveStandardAttributes.h -debian/tmp/opt/trinity/include/kde/dom/SVGFitToViewBox.h -debian/tmp/opt/trinity/include/kde/dom/SVGFontElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFontFaceElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFontFaceFormatElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFontFaceNameElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFontFaceSrcElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFontFaceUriElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGForeignObjectElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGGElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGGlyphElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGGlyphRefElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGGradientElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGHKernElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGICCColor.h -debian/tmp/opt/trinity/include/kde/dom/SVGImageElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGLangSpace.h -debian/tmp/opt/trinity/include/kde/dom/SVGLength.h -debian/tmp/opt/trinity/include/kde/dom/SVGLengthList.h -debian/tmp/opt/trinity/include/kde/dom/SVGLineElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGLinearGradientElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGLocatable.h -debian/tmp/opt/trinity/include/kde/dom/SVGMPathElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGMarkerElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGMaskElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGMatrix.h -debian/tmp/opt/trinity/include/kde/dom/SVGMetadataElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGMissingGlyphElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGNumber.h -debian/tmp/opt/trinity/include/kde/dom/SVGNumberList.h -debian/tmp/opt/trinity/include/kde/dom/SVGPaint.h -debian/tmp/opt/trinity/include/kde/dom/SVGPathElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGPathSeg.h -debian/tmp/opt/trinity/include/kde/dom/SVGPathSegArc.h -debian/tmp/opt/trinity/include/kde/dom/SVGPathSegClosePath.h -debian/tmp/opt/trinity/include/kde/dom/SVGPathSegCurvetoCubic.h -debian/tmp/opt/trinity/include/kde/dom/SVGPathSegCurvetoCubicSmooth.h -debian/tmp/opt/trinity/include/kde/dom/SVGPathSegCurvetoQuadratic.h -debian/tmp/opt/trinity/include/kde/dom/SVGPathSegCurvetoQuadraticSmooth.h -debian/tmp/opt/trinity/include/kde/dom/SVGPathSegLineto.h -debian/tmp/opt/trinity/include/kde/dom/SVGPathSegLinetoHorizontal.h -debian/tmp/opt/trinity/include/kde/dom/SVGPathSegLinetoVertical.h -debian/tmp/opt/trinity/include/kde/dom/SVGPathSegList.h -debian/tmp/opt/trinity/include/kde/dom/SVGPathSegMoveto.h -debian/tmp/opt/trinity/include/kde/dom/SVGPatternElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGPoint.h -debian/tmp/opt/trinity/include/kde/dom/SVGPointList.h -debian/tmp/opt/trinity/include/kde/dom/SVGPolygonElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGPolylineElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGPreserveAspectRatio.h -debian/tmp/opt/trinity/include/kde/dom/SVGRadialGradientElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGRect.h -debian/tmp/opt/trinity/include/kde/dom/SVGRectElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGRenderingIntent.h -debian/tmp/opt/trinity/include/kde/dom/SVGSVGElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGScriptElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGSetElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGStopElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGStringList.h -debian/tmp/opt/trinity/include/kde/dom/SVGStylable.h -debian/tmp/opt/trinity/include/kde/dom/SVGStyleElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGSwitchElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGSymbolElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGTRefElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGTSpanElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGTests.h -debian/tmp/opt/trinity/include/kde/dom/SVGTextContentElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGTextElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGTextPathElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGTextPositioningElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGTitleElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGTransform.h -debian/tmp/opt/trinity/include/kde/dom/SVGTransformList.h -debian/tmp/opt/trinity/include/kde/dom/SVGTransformable.h -debian/tmp/opt/trinity/include/kde/dom/SVGURIReference.h -debian/tmp/opt/trinity/include/kde/dom/SVGUnitTypes.h -debian/tmp/opt/trinity/include/kde/dom/SVGUseElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGVKernElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGViewElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGViewSpec.h -debian/tmp/opt/trinity/include/kde/dom/SVGWindow.h -debian/tmp/opt/trinity/include/kde/dom/SVGZoomAndPan.h -debian/tmp/opt/trinity/include/kde/dom/SVGZoomEvent.h -debian/tmp/opt/trinity/include/kde/kfaximage.h -debian/tmp/opt/trinity/include/kde/kmultipageInterface.h -debian/tmp/opt/trinity/include/kde/ksvg/CanvasFactory.h -debian/tmp/opt/trinity/include/kde/ksvg/CanvasItem.h -debian/tmp/opt/trinity/include/kde/ksvg/CanvasItems.h -debian/tmp/opt/trinity/include/kde/ksvg/DocumentFactory.h -debian/tmp/opt/trinity/include/kde/ksvg/KSVGCanvas.h -debian/tmp/opt/trinity/include/kde/ksvg/ksvg_plugin.h -debian/tmp/opt/trinity/include/kde/kviewshell/anchor.h -debian/tmp/opt/trinity/include/kde/kviewshell/bookmark.h -debian/tmp/opt/trinity/include/kde/kviewshell/pageView.h -debian/tmp/opt/trinity/include/kde/kviewshell/documentPageCache.h -debian/tmp/opt/trinity/include/kde/kviewshell/documentRenderer.h -debian/tmp/opt/trinity/include/kde/kviewshell/documentWidget.h -debian/tmp/opt/trinity/include/kde/kviewshell/history.h -debian/tmp/opt/trinity/include/kde/kviewshell/hyperlink.h -debian/tmp/opt/trinity/include/kde/kviewshell/kmultipage.h -debian/tmp/opt/trinity/include/kde/kviewshell/length.h -debian/tmp/opt/trinity/include/kde/kviewshell/pageNumber.h -debian/tmp/opt/trinity/include/kde/kviewshell/pageSize.h -debian/tmp/opt/trinity/include/kde/kviewshell/renderedDocumentPage.h -debian/tmp/opt/trinity/include/kde/kviewshell/renderedDocumentPagePixmap.h -debian/tmp/opt/trinity/include/kde/kviewshell/renderedDocumentPagePrinter.h -debian/tmp/opt/trinity/include/kde/kviewshell/selection.h -debian/tmp/opt/trinity/include/kde/kviewshell/simplePageSize.h -debian/tmp/opt/trinity/include/kde/kviewshell/textBox.h -debian/tmp/opt/trinity/include/kde/kviewshell/zoom.h -debian/tmp/opt/trinity/include/kde/kviewshell/zoomlimits.h -debian/tmp/opt/trinity/include/kde/libtext2path-0.1/BezierPath.h -debian/tmp/opt/trinity/include/kde/libtext2path-0.1/Glyph.h -debian/tmp/opt/trinity/include/kde/libtext2path-0.1/GlyphTracer.h +debian/tmp/opt/trinity/include/tde/dom/SVGAElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGAltGlyphDefElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGAltGlyphElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGAngle.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimateColorElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimateElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimateMotionElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimateTransformElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedAngle.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedBoolean.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedEnumeration.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedInteger.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedLength.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedLengthList.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedNumber.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedNumberList.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedPathData.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedPoints.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedPreserveAspectRatio.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedRect.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedString.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedTransformList.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimationElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGCSSRule.h +debian/tmp/opt/trinity/include/tde/dom/SVGCircleElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGClipPathElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGColor.h +debian/tmp/opt/trinity/include/tde/dom/SVGColorProfileElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGColorProfileRule.h +debian/tmp/opt/trinity/include/tde/dom/SVGComponentTransferFunctionElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGCursorElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGDefinitionSrcElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGDefsElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGDescElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGDocument.h +debian/tmp/opt/trinity/include/tde/dom/SVGElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGElementInstance.h +debian/tmp/opt/trinity/include/tde/dom/SVGElementInstanceList.h +debian/tmp/opt/trinity/include/tde/dom/SVGEllipseElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGEvent.h +debian/tmp/opt/trinity/include/tde/dom/SVGException.h +debian/tmp/opt/trinity/include/tde/dom/SVGExternalResourcesRequired.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEBlendElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEColorMatrixElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEComponentTransferElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFECompositeElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEConvolveMatrixElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEDiffuseLightingElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEDisplacementMapElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEDistantLightElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEFloodElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEFuncAElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEFuncBElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEFuncGElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEFuncRElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEGaussianBlurElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEImageElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEMergeElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEMergeNodeElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEMorphologyElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEOffsetElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEPointLightElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFESpecularLightingElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFESpotLightElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFETileElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFETurbulenceElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFilterElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFilterPrimitiveStandardAttributes.h +debian/tmp/opt/trinity/include/tde/dom/SVGFitToViewBox.h +debian/tmp/opt/trinity/include/tde/dom/SVGFontElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFontFaceElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFontFaceFormatElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFontFaceNameElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFontFaceSrcElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFontFaceUriElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGForeignObjectElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGGElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGGlyphElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGGlyphRefElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGGradientElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGHKernElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGICCColor.h +debian/tmp/opt/trinity/include/tde/dom/SVGImageElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGLangSpace.h +debian/tmp/opt/trinity/include/tde/dom/SVGLength.h +debian/tmp/opt/trinity/include/tde/dom/SVGLengthList.h +debian/tmp/opt/trinity/include/tde/dom/SVGLineElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGLinearGradientElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGLocatable.h +debian/tmp/opt/trinity/include/tde/dom/SVGMPathElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGMarkerElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGMaskElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGMatrix.h +debian/tmp/opt/trinity/include/tde/dom/SVGMetadataElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGMissingGlyphElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGNumber.h +debian/tmp/opt/trinity/include/tde/dom/SVGNumberList.h +debian/tmp/opt/trinity/include/tde/dom/SVGPaint.h +debian/tmp/opt/trinity/include/tde/dom/SVGPathElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGPathSeg.h +debian/tmp/opt/trinity/include/tde/dom/SVGPathSegArc.h +debian/tmp/opt/trinity/include/tde/dom/SVGPathSegClosePath.h +debian/tmp/opt/trinity/include/tde/dom/SVGPathSegCurvetoCubic.h +debian/tmp/opt/trinity/include/tde/dom/SVGPathSegCurvetoCubicSmooth.h +debian/tmp/opt/trinity/include/tde/dom/SVGPathSegCurvetoQuadratic.h +debian/tmp/opt/trinity/include/tde/dom/SVGPathSegCurvetoQuadraticSmooth.h +debian/tmp/opt/trinity/include/tde/dom/SVGPathSegLineto.h +debian/tmp/opt/trinity/include/tde/dom/SVGPathSegLinetoHorizontal.h +debian/tmp/opt/trinity/include/tde/dom/SVGPathSegLinetoVertical.h +debian/tmp/opt/trinity/include/tde/dom/SVGPathSegList.h +debian/tmp/opt/trinity/include/tde/dom/SVGPathSegMoveto.h +debian/tmp/opt/trinity/include/tde/dom/SVGPatternElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGPoint.h +debian/tmp/opt/trinity/include/tde/dom/SVGPointList.h +debian/tmp/opt/trinity/include/tde/dom/SVGPolygonElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGPolylineElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGPreserveAspectRatio.h +debian/tmp/opt/trinity/include/tde/dom/SVGRadialGradientElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGRect.h +debian/tmp/opt/trinity/include/tde/dom/SVGRectElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGRenderingIntent.h +debian/tmp/opt/trinity/include/tde/dom/SVGSVGElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGScriptElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGSetElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGStopElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGStringList.h +debian/tmp/opt/trinity/include/tde/dom/SVGStylable.h +debian/tmp/opt/trinity/include/tde/dom/SVGStyleElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGSwitchElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGSymbolElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGTRefElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGTSpanElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGTests.h +debian/tmp/opt/trinity/include/tde/dom/SVGTextContentElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGTextElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGTextPathElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGTextPositioningElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGTitleElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGTransform.h +debian/tmp/opt/trinity/include/tde/dom/SVGTransformList.h +debian/tmp/opt/trinity/include/tde/dom/SVGTransformable.h +debian/tmp/opt/trinity/include/tde/dom/SVGURIReference.h +debian/tmp/opt/trinity/include/tde/dom/SVGUnitTypes.h +debian/tmp/opt/trinity/include/tde/dom/SVGUseElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGVKernElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGViewElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGViewSpec.h +debian/tmp/opt/trinity/include/tde/dom/SVGWindow.h +debian/tmp/opt/trinity/include/tde/dom/SVGZoomAndPan.h +debian/tmp/opt/trinity/include/tde/dom/SVGZoomEvent.h +debian/tmp/opt/trinity/include/tde/kfaximage.h +debian/tmp/opt/trinity/include/tde/kmultipageInterface.h +debian/tmp/opt/trinity/include/tde/ksvg/CanvasFactory.h +debian/tmp/opt/trinity/include/tde/ksvg/CanvasItem.h +debian/tmp/opt/trinity/include/tde/ksvg/CanvasItems.h +debian/tmp/opt/trinity/include/tde/ksvg/DocumentFactory.h +debian/tmp/opt/trinity/include/tde/ksvg/KSVGCanvas.h +debian/tmp/opt/trinity/include/tde/ksvg/ksvg_plugin.h +debian/tmp/opt/trinity/include/tde/kviewshell/anchor.h +debian/tmp/opt/trinity/include/tde/kviewshell/bookmark.h +debian/tmp/opt/trinity/include/tde/kviewshell/pageView.h +debian/tmp/opt/trinity/include/tde/kviewshell/documentPageCache.h +debian/tmp/opt/trinity/include/tde/kviewshell/documentRenderer.h +debian/tmp/opt/trinity/include/tde/kviewshell/documentWidget.h +debian/tmp/opt/trinity/include/tde/kviewshell/history.h +debian/tmp/opt/trinity/include/tde/kviewshell/hyperlink.h +debian/tmp/opt/trinity/include/tde/kviewshell/kmultipage.h +debian/tmp/opt/trinity/include/tde/kviewshell/length.h +debian/tmp/opt/trinity/include/tde/kviewshell/pageNumber.h +debian/tmp/opt/trinity/include/tde/kviewshell/pageSize.h +debian/tmp/opt/trinity/include/tde/kviewshell/renderedDocumentPage.h +debian/tmp/opt/trinity/include/tde/kviewshell/renderedDocumentPagePixmap.h +debian/tmp/opt/trinity/include/tde/kviewshell/renderedDocumentPagePrinter.h +debian/tmp/opt/trinity/include/tde/kviewshell/selection.h +debian/tmp/opt/trinity/include/tde/kviewshell/simplePageSize.h +debian/tmp/opt/trinity/include/tde/kviewshell/textBox.h +debian/tmp/opt/trinity/include/tde/kviewshell/zoom.h +debian/tmp/opt/trinity/include/tde/kviewshell/zoomlimits.h +debian/tmp/opt/trinity/include/tde/libtext2path-0.1/BezierPath.h +debian/tmp/opt/trinity/include/tde/libtext2path-0.1/Glyph.h +debian/tmp/opt/trinity/include/tde/libtext2path-0.1/GlyphTracer.h debian/tmp/opt/trinity/lib/libtdeinit_kview.la debian/tmp/opt/trinity/lib/libtdeinit_mrmlsearch.la debian/tmp/opt/trinity/lib/libkghostviewlib.la diff --git a/ubuntu/maverick/tdelibs/debian/cdbs/kde.mk b/ubuntu/maverick/tdelibs/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/tdelibs/debian/cdbs/kde.mk +++ b/ubuntu/maverick/tdelibs/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/tdelibs/debian/changelog b/ubuntu/maverick/tdelibs/debian/changelog index dd416c496..8eda5d307 100644 --- a/ubuntu/maverick/tdelibs/debian/changelog +++ b/ubuntu/maverick/tdelibs/debian/changelog @@ -2087,7 +2087,7 @@ tdelibs (4:3.4.0-0pre5) alioth; urgency=low output them expanded even when --expandvars is not used. (Closes: #287822) * Fixed the ability of the build system to find kde.pot, even when it is not - located at TDEDIR/include/kde.pot. This allows the use of targets such as + located at TDEDIR/include/tde.pot. This allows the use of targets such as "package-messages" without specifying includedir. (Closes: #283858) * Now that graphviz is in main, add it to Build-Depends-Indep together with diff --git a/ubuntu/maverick/tdelibs/debian/rules b/ubuntu/maverick/tdelibs/debian/rules index 24b56bf2a..2e2bdf3ee 100755 --- a/ubuntu/maverick/tdelibs/debian/rules +++ b/ubuntu/maverick/tdelibs/debian/rules @@ -20,7 +20,7 @@ DEB_KDE_APIDOX := yes version=Debian Package $(DEB_VERSION) DEB_OPT_FLAG += -DDEBIAN_VERSION=$(DEB_VERSION) -DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/kde" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" -DWITH_GCC_VISIBILITY="ON" \ +DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/tde" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" -DWITH_GCC_VISIBILITY="ON" \ -DWITH_LIBART="ON" -DWITH_LIBIDN="ON" -DWITH_TIFF="ON" -DWITH_JASPER="ON" -DWITH_OPENEXR="ON" -DWITH_AVAHI="ON" -DWITH_ASPELL="ON" -DWITH_HSPELL="ON" -DWITH_ELFICON="ON" # Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to diff --git a/ubuntu/maverick/tdelibs/debian/tdelibs4-trinity-dev.install b/ubuntu/maverick/tdelibs/debian/tdelibs4-trinity-dev.install index 3d2e8e43b..a9044b322 100644 --- a/ubuntu/maverick/tdelibs/debian/tdelibs4-trinity-dev.install +++ b/ubuntu/maverick/tdelibs/debian/tdelibs4-trinity-dev.install @@ -197,13 +197,13 @@ debian/tmp/opt/trinity/include/kdatewidget.h debian/tmp/opt/trinity/include/kdcopactionproxy.h debian/tmp/opt/trinity/include/kdcoppropertyproxy.h debian/tmp/opt/trinity/include/kdcopservicestarter.h -debian/tmp/opt/trinity/include/kdebugclasses.h -debian/tmp/opt/trinity/include/kdebug.h -debian/tmp/opt/trinity/include/kdedmodule.h -debian/tmp/opt/trinity/include/kde_file.h +debian/tmp/opt/trinity/include/tdebugclasses.h +debian/tmp/opt/trinity/include/tdebug.h +debian/tmp/opt/trinity/include/tdedmodule.h +debian/tmp/opt/trinity/include/tde_file.h debian/tmp/opt/trinity/include/tdelibs_export.h -debian/tmp/opt/trinity/include/kdemacros.h -debian/tmp/opt/trinity/include/kde.pot +debian/tmp/opt/trinity/include/tdemacros.h +debian/tmp/opt/trinity/include/tde.pot debian/tmp/opt/trinity/include/tdeprint/driver.h debian/tmp/opt/trinity/include/tdeprint/kiconselectaction.h debian/tmp/opt/trinity/include/tdeprint/kmjob.h @@ -221,7 +221,7 @@ debian/tmp/opt/trinity/include/tdeprint/kprintdialogpage.h debian/tmp/opt/trinity/include/tdeprint/lpr/lprhandler.h debian/tmp/opt/trinity/include/tdeprint/lpr/lprsettings.h debian/tmp/opt/trinity/include/tdeprint/lpr/printcapentry.h -debian/tmp/opt/trinity/include/kdesktopfile.h +debian/tmp/opt/trinity/include/tdesktopfile.h debian/tmp/opt/trinity/include/tdesu/client.h debian/tmp/opt/trinity/include/tdesu/defaults.h debian/tmp/opt/trinity/include/tdesu/kcookie.h @@ -231,7 +231,7 @@ debian/tmp/opt/trinity/include/tdesu/pty.h debian/tmp/opt/trinity/include/tdesu/ssh.h debian/tmp/opt/trinity/include/tdesu/stub.h debian/tmp/opt/trinity/include/tdesu/su.h -debian/tmp/opt/trinity/include/kde_terminal_interface.h +debian/tmp/opt/trinity/include/tde_terminal_interface.h debian/tmp/opt/trinity/include/tdeversion.h debian/tmp/opt/trinity/include/kdialogbase.h debian/tmp/opt/trinity/include/kdialog.h @@ -717,7 +717,7 @@ debian/tmp/opt/trinity/include/networkstatusindicator.h debian/tmp/opt/trinity/include/connectionmanager.h debian/tmp/opt/trinity/include/serviceiface.h debian/tmp/opt/trinity/include/provideriface.h -#debian/tmp/opt/trinity/include/kdemm +#debian/tmp/opt/trinity/include/tdemm debian/tmp/opt/trinity/lib/libnetworkstatus.la debian/tmp/opt/trinity/lib/libnetworkstatus.so diff --git a/ubuntu/maverick/tdemultimedia/debian/cdbs/kde.mk b/ubuntu/maverick/tdemultimedia/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/tdemultimedia/debian/cdbs/kde.mk +++ b/ubuntu/maverick/tdemultimedia/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/tdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick/tdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff index 0caf5361a..c02687784 100644 --- a/ubuntu/maverick/tdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick/tdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/opt/trinity/include/kde/kde.pot ++kdepotpath=/opt/trinity/include/tde/kde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick/tdemultimedia/debian/rules b/ubuntu/maverick/tdemultimedia/debian/rules index abe114b59..aff6738b2 100755 --- a/ubuntu/maverick/tdemultimedia/debian/rules +++ b/ubuntu/maverick/tdemultimedia/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 @@ -14,9 +14,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_CONFIGURE_EXTRA_FLAGS := \ --with-alsa --with-arts-alsa \ - --with-extra-includes=/usr/include/speex:/opt/trinity/include/kde/arts \ + --with-extra-includes=/usr/include/speex:/opt/trinity/include/tde/arts \ --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib - # The include/kde/arts one should be temporary. See + # The include/tde/arts one should be temporary. See # "juk/Makefile.am: arts_includes vs ARTS_CFLAGS" in -talk. DOC_HTML_PRUNE := kcontrol-trinity diff --git a/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-trinity-dev.install b/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-trinity-dev.install index a6b4265bd..4edb170bf 100644 --- a/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-trinity-dev.install +++ b/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-trinity-dev.install @@ -1,137 +1,137 @@ -debian/tmp/opt/trinity/include/kde/arts/artsbuilder.h -debian/tmp/opt/trinity/include/kde/arts/artsbuilder.idl -debian/tmp/opt/trinity/include/kde/arts/artsgui.h -debian/tmp/opt/trinity/include/kde/arts/artsgui.idl -debian/tmp/opt/trinity/include/kde/arts/artsmidi.h -debian/tmp/opt/trinity/include/kde/arts/artsmidi.idl -debian/tmp/opt/trinity/include/kde/arts/artsmodules.h -debian/tmp/opt/trinity/include/kde/arts/artsmodules.idl -debian/tmp/opt/trinity/include/kde/arts/artsmodulescommon.h -debian/tmp/opt/trinity/include/kde/arts/artsmodulescommon.idl -debian/tmp/opt/trinity/include/kde/arts/artsmoduleseffects.h -debian/tmp/opt/trinity/include/kde/arts/artsmoduleseffects.idl -debian/tmp/opt/trinity/include/kde/arts/artsmodulesmixers.h -debian/tmp/opt/trinity/include/kde/arts/artsmodulesmixers.idl -debian/tmp/opt/trinity/include/kde/arts/artsmodulessynth.h -debian/tmp/opt/trinity/include/kde/arts/artsmodulessynth.idl -debian/tmp/opt/trinity/include/kde/arts/kartswidget.h -debian/tmp/opt/trinity/include/kde/arts/kframe_impl.h -debian/tmp/opt/trinity/include/kde/arts/klayoutbox_impl.h -debian/tmp/opt/trinity/include/kde/arts/kwidget_impl.h -debian/tmp/opt/trinity/include/kde/arts/kwidgetrepo.h -debian/tmp/opt/trinity/include/kde/audiocdencoder.h -debian/tmp/opt/trinity/include/kde/cmodule.h -debian/tmp/opt/trinity/include/kde/effectview.h -debian/tmp/opt/trinity/include/kde/equalizerview.h -debian/tmp/opt/trinity/include/kde/ksaver.h -debian/tmp/opt/trinity/include/kde/libkcddb/cache.h -debian/tmp/opt/trinity/include/kde/libkcddb/cddb.h -debian/tmp/opt/trinity/include/kde/libkcddb/cdinfo.h -debian/tmp/opt/trinity/include/kde/libkcddb/client.h -debian/tmp/opt/trinity/include/kde/libkcddb/config.h -debian/tmp/opt/trinity/include/kde/libkcddb/configbase.h -debian/tmp/opt/trinity/include/kde/mimetypetree.h -debian/tmp/opt/trinity/include/kde/mpeglib/decoder/cddaPlugin.h -debian/tmp/opt/trinity/include/kde/mpeglib/decoder/command.h -debian/tmp/opt/trinity/include/kde/mpeglib/decoder/commandPipe.h -debian/tmp/opt/trinity/include/kde/mpeglib/decoder/decoderPlugin.h -debian/tmp/opt/trinity/include/kde/mpeglib/decoder/mpegPlugin.h -debian/tmp/opt/trinity/include/kde/mpeglib/decoder/mpgPlugin.h -debian/tmp/opt/trinity/include/kde/mpeglib/decoder/nukePlugin.h -debian/tmp/opt/trinity/include/kde/mpeglib/decoder/splayPlugin.h -debian/tmp/opt/trinity/include/kde/mpeglib/decoder/tplayPlugin.h -debian/tmp/opt/trinity/include/kde/mpeglib/decoder/vorbisPlugin.h -debian/tmp/opt/trinity/include/kde/mpeglib/decoder/yuvPlugin.h -debian/tmp/opt/trinity/include/kde/mpeglib/frame/IOFrameQueue.h -debian/tmp/opt/trinity/include/kde/mpeglib/frame/audioFrame.h -debian/tmp/opt/trinity/include/kde/mpeglib/frame/audioFrameQueue.h -debian/tmp/opt/trinity/include/kde/mpeglib/frame/floatFrame.h -debian/tmp/opt/trinity/include/kde/mpeglib/frame/frame.h -debian/tmp/opt/trinity/include/kde/mpeglib/frame/frameQueue.h -debian/tmp/opt/trinity/include/kde/mpeglib/frame/framer.h -debian/tmp/opt/trinity/include/kde/mpeglib/frame/pcmFrame.h -debian/tmp/opt/trinity/include/kde/mpeglib/frame/rawDataBuffer.h -debian/tmp/opt/trinity/include/kde/mpeglib/frame/rawFrame.h -debian/tmp/opt/trinity/include/kde/mpeglib/input/bufferInputStream.h -debian/tmp/opt/trinity/include/kde/mpeglib/input/cddaInputStream.h -debian/tmp/opt/trinity/include/kde/mpeglib/input/cdromInputStream.h -debian/tmp/opt/trinity/include/kde/mpeglib/input/fileInputStream.h -debian/tmp/opt/trinity/include/kde/mpeglib/input/httpInputStream.h -debian/tmp/opt/trinity/include/kde/mpeglib/input/inputDetector.h -debian/tmp/opt/trinity/include/kde/mpeglib/input/inputPlugin.h -debian/tmp/opt/trinity/include/kde/mpeglib/input/inputStream.h -debian/tmp/opt/trinity/include/kde/mpeglib/input/threadSafeInputStream.h -debian/tmp/opt/trinity/include/kde/mpeglib/mpegutil/mpegStreamPlayer.h -debian/tmp/opt/trinity/include/kde/mpeglib/mpegutil/mpegSystemHeader.h -debian/tmp/opt/trinity/include/kde/mpeglib/mpegutil/mpegSystemStream.h -debian/tmp/opt/trinity/include/kde/mpeglib/mpegutil/mpegVideoLength.h -debian/tmp/opt/trinity/include/kde/mpeglib/mpegutil/pesSystemStream.h -debian/tmp/opt/trinity/include/kde/mpeglib/mpegutil/psSystemStream.h -debian/tmp/opt/trinity/include/kde/mpeglib/mpegutil/tsSystemStream.h -debian/tmp/opt/trinity/include/kde/mpeglib/oggvorbis/oggFrame.h -debian/tmp/opt/trinity/include/kde/mpeglib/oggvorbis/ovFramer.h -debian/tmp/opt/trinity/include/kde/mpeglib/oggvorbis/vorbisDecoder.h -debian/tmp/opt/trinity/include/kde/mpeglib/oggvorbis/vorbisInfo.h -debian/tmp/opt/trinity/include/kde/mpeglib/output/artsOutputStream.h -debian/tmp/opt/trinity/include/kde/mpeglib/output/audioTime.h -debian/tmp/opt/trinity/include/kde/mpeglib/output/avSyncer.h -debian/tmp/opt/trinity/include/kde/mpeglib/output/dspX11OutputStream.h -debian/tmp/opt/trinity/include/kde/mpeglib/output/outPlugin.h -debian/tmp/opt/trinity/include/kde/mpeglib/output/outputStream.h -debian/tmp/opt/trinity/include/kde/mpeglib/output/pluginInfo.h -debian/tmp/opt/trinity/include/kde/mpeglib/output/threadSafeOutputStream.h -debian/tmp/opt/trinity/include/kde/mpeglib/splay/mpegAudioFrame.h -debian/tmp/opt/trinity/include/kde/mpeglib/splay/mpegAudioInfo.h -debian/tmp/opt/trinity/include/kde/mpeglib/splay/splayDecoder.h -debian/tmp/opt/trinity/include/kde/mpeglib/util/abstract/abs_thread.h -debian/tmp/opt/trinity/include/kde/mpeglib/util/abstract/threadQueue.h -debian/tmp/opt/trinity/include/kde/mpeglib/util/dynBuffer.h -debian/tmp/opt/trinity/include/kde/mpeglib/util/file/fileAccess.h -debian/tmp/opt/trinity/include/kde/mpeglib/util/mmx/mm_accel.h -debian/tmp/opt/trinity/include/kde/mpeglib/util/mmx/mmx.h -debian/tmp/opt/trinity/include/kde/mpeglib/util/mmx/mmx_asm.h -debian/tmp/opt/trinity/include/kde/mpeglib/util/render/pictureArray.h -debian/tmp/opt/trinity/include/kde/mpeglib/util/render/yuvPicture.h -debian/tmp/opt/trinity/include/kde/mpeglib/util/syncClock.h -debian/tmp/opt/trinity/include/kde/mpeglib/util/timeStamp.h -debian/tmp/opt/trinity/include/kde/mpeglib/util/timeStampArray.h -debian/tmp/opt/trinity/include/kde/mpeglib/util/timeWrapper.h -debian/tmp/opt/trinity/include/kde/mpeglib/util/yaf/yafcore/buffer.h -debian/tmp/opt/trinity/include/kde/mpeglib/util/yaf/yafcore/inputDecoder.h -debian/tmp/opt/trinity/include/kde/mpeglib/util/yaf/yafcore/inputInterface.h -debian/tmp/opt/trinity/include/kde/mpeglib/util/yaf/yafcore/outputInterface.h -debian/tmp/opt/trinity/include/kde/mpeglib/util/yaf/yafcore/yaf_control.h -debian/tmp/opt/trinity/include/kde/mpeglib/util/yaf/yafxplayer/inputDecoderXPlayer.h -debian/tmp/opt/trinity/include/kde/mpeglib/util/yaf/yafxplayer/inputDecoderYAF.h -debian/tmp/opt/trinity/include/kde/mpeglib/util/yaf/yafxplayer/yafOutputStream.h -debian/tmp/opt/trinity/include/kde/mpeglib_artsplug/decoderBaseObject.h -debian/tmp/opt/trinity/include/kde/mpeglib_artsplug/decoderBaseObject.idl -debian/tmp/opt/trinity/include/kde/mpeglib_artsplug/decoderBaseObject_impl.h -debian/tmp/opt/trinity/include/kde/mpeglib_artsplug/splayPlayObject.h -debian/tmp/opt/trinity/include/kde/mpeglib_artsplug/splayPlayObject.idl -debian/tmp/opt/trinity/include/kde/mpeglib_artsplug/splayPlayObject_impl.h -debian/tmp/opt/trinity/include/kde/noatun/app.h -debian/tmp/opt/trinity/include/kde/noatun/controls.h -debian/tmp/opt/trinity/include/kde/noatun/conversion.h -debian/tmp/opt/trinity/include/kde/noatun/downloader.h -debian/tmp/opt/trinity/include/kde/noatun/effects.h -debian/tmp/opt/trinity/include/kde/noatun/engine.h -debian/tmp/opt/trinity/include/kde/noatun/equalizer.h -debian/tmp/opt/trinity/include/kde/noatun/noatunarts.h -debian/tmp/opt/trinity/include/kde/noatun/player.h -debian/tmp/opt/trinity/include/kde/noatun/playlist.h -debian/tmp/opt/trinity/include/kde/noatun/playlistsaver.h -debian/tmp/opt/trinity/include/kde/noatun/plugin.h -debian/tmp/opt/trinity/include/kde/noatun/pluginloader.h -debian/tmp/opt/trinity/include/kde/noatun/pref.h -debian/tmp/opt/trinity/include/kde/noatun/scrollinglabel.h -debian/tmp/opt/trinity/include/kde/noatun/stdaction.h -debian/tmp/opt/trinity/include/kde/noatun/stereobuttonaction.h -debian/tmp/opt/trinity/include/kde/noatun/tags.h -debian/tmp/opt/trinity/include/kde/noatun/vequalizer.h -debian/tmp/opt/trinity/include/kde/noatun/video.h -debian/tmp/opt/trinity/include/kde/noatun/winskinvis.h -debian/tmp/opt/trinity/include/kde/plugin_deps.h +debian/tmp/opt/trinity/include/tde/arts/artsbuilder.h +debian/tmp/opt/trinity/include/tde/arts/artsbuilder.idl +debian/tmp/opt/trinity/include/tde/arts/artsgui.h +debian/tmp/opt/trinity/include/tde/arts/artsgui.idl +debian/tmp/opt/trinity/include/tde/arts/artsmidi.h +debian/tmp/opt/trinity/include/tde/arts/artsmidi.idl +debian/tmp/opt/trinity/include/tde/arts/artsmodules.h +debian/tmp/opt/trinity/include/tde/arts/artsmodules.idl +debian/tmp/opt/trinity/include/tde/arts/artsmodulescommon.h +debian/tmp/opt/trinity/include/tde/arts/artsmodulescommon.idl +debian/tmp/opt/trinity/include/tde/arts/artsmoduleseffects.h +debian/tmp/opt/trinity/include/tde/arts/artsmoduleseffects.idl +debian/tmp/opt/trinity/include/tde/arts/artsmodulesmixers.h +debian/tmp/opt/trinity/include/tde/arts/artsmodulesmixers.idl +debian/tmp/opt/trinity/include/tde/arts/artsmodulessynth.h +debian/tmp/opt/trinity/include/tde/arts/artsmodulessynth.idl +debian/tmp/opt/trinity/include/tde/arts/kartswidget.h +debian/tmp/opt/trinity/include/tde/arts/kframe_impl.h +debian/tmp/opt/trinity/include/tde/arts/klayoutbox_impl.h +debian/tmp/opt/trinity/include/tde/arts/kwidget_impl.h +debian/tmp/opt/trinity/include/tde/arts/kwidgetrepo.h +debian/tmp/opt/trinity/include/tde/audiocdencoder.h +debian/tmp/opt/trinity/include/tde/cmodule.h +debian/tmp/opt/trinity/include/tde/effectview.h +debian/tmp/opt/trinity/include/tde/equalizerview.h +debian/tmp/opt/trinity/include/tde/ksaver.h +debian/tmp/opt/trinity/include/tde/libkcddb/cache.h +debian/tmp/opt/trinity/include/tde/libkcddb/cddb.h +debian/tmp/opt/trinity/include/tde/libkcddb/cdinfo.h +debian/tmp/opt/trinity/include/tde/libkcddb/client.h +debian/tmp/opt/trinity/include/tde/libkcddb/config.h +debian/tmp/opt/trinity/include/tde/libkcddb/configbase.h +debian/tmp/opt/trinity/include/tde/mimetypetree.h +debian/tmp/opt/trinity/include/tde/mpeglib/decoder/cddaPlugin.h +debian/tmp/opt/trinity/include/tde/mpeglib/decoder/command.h +debian/tmp/opt/trinity/include/tde/mpeglib/decoder/commandPipe.h +debian/tmp/opt/trinity/include/tde/mpeglib/decoder/decoderPlugin.h +debian/tmp/opt/trinity/include/tde/mpeglib/decoder/mpegPlugin.h +debian/tmp/opt/trinity/include/tde/mpeglib/decoder/mpgPlugin.h +debian/tmp/opt/trinity/include/tde/mpeglib/decoder/nukePlugin.h +debian/tmp/opt/trinity/include/tde/mpeglib/decoder/splayPlugin.h +debian/tmp/opt/trinity/include/tde/mpeglib/decoder/tplayPlugin.h +debian/tmp/opt/trinity/include/tde/mpeglib/decoder/vorbisPlugin.h +debian/tmp/opt/trinity/include/tde/mpeglib/decoder/yuvPlugin.h +debian/tmp/opt/trinity/include/tde/mpeglib/frame/IOFrameQueue.h +debian/tmp/opt/trinity/include/tde/mpeglib/frame/audioFrame.h +debian/tmp/opt/trinity/include/tde/mpeglib/frame/audioFrameQueue.h +debian/tmp/opt/trinity/include/tde/mpeglib/frame/floatFrame.h +debian/tmp/opt/trinity/include/tde/mpeglib/frame/frame.h +debian/tmp/opt/trinity/include/tde/mpeglib/frame/frameQueue.h +debian/tmp/opt/trinity/include/tde/mpeglib/frame/framer.h +debian/tmp/opt/trinity/include/tde/mpeglib/frame/pcmFrame.h +debian/tmp/opt/trinity/include/tde/mpeglib/frame/rawDataBuffer.h +debian/tmp/opt/trinity/include/tde/mpeglib/frame/rawFrame.h +debian/tmp/opt/trinity/include/tde/mpeglib/input/bufferInputStream.h +debian/tmp/opt/trinity/include/tde/mpeglib/input/cddaInputStream.h +debian/tmp/opt/trinity/include/tde/mpeglib/input/cdromInputStream.h +debian/tmp/opt/trinity/include/tde/mpeglib/input/fileInputStream.h +debian/tmp/opt/trinity/include/tde/mpeglib/input/httpInputStream.h +debian/tmp/opt/trinity/include/tde/mpeglib/input/inputDetector.h +debian/tmp/opt/trinity/include/tde/mpeglib/input/inputPlugin.h +debian/tmp/opt/trinity/include/tde/mpeglib/input/inputStream.h +debian/tmp/opt/trinity/include/tde/mpeglib/input/threadSafeInputStream.h +debian/tmp/opt/trinity/include/tde/mpeglib/mpegutil/mpegStreamPlayer.h +debian/tmp/opt/trinity/include/tde/mpeglib/mpegutil/mpegSystemHeader.h +debian/tmp/opt/trinity/include/tde/mpeglib/mpegutil/mpegSystemStream.h +debian/tmp/opt/trinity/include/tde/mpeglib/mpegutil/mpegVideoLength.h +debian/tmp/opt/trinity/include/tde/mpeglib/mpegutil/pesSystemStream.h +debian/tmp/opt/trinity/include/tde/mpeglib/mpegutil/psSystemStream.h +debian/tmp/opt/trinity/include/tde/mpeglib/mpegutil/tsSystemStream.h +debian/tmp/opt/trinity/include/tde/mpeglib/oggvorbis/oggFrame.h +debian/tmp/opt/trinity/include/tde/mpeglib/oggvorbis/ovFramer.h +debian/tmp/opt/trinity/include/tde/mpeglib/oggvorbis/vorbisDecoder.h +debian/tmp/opt/trinity/include/tde/mpeglib/oggvorbis/vorbisInfo.h +debian/tmp/opt/trinity/include/tde/mpeglib/output/artsOutputStream.h +debian/tmp/opt/trinity/include/tde/mpeglib/output/audioTime.h +debian/tmp/opt/trinity/include/tde/mpeglib/output/avSyncer.h +debian/tmp/opt/trinity/include/tde/mpeglib/output/dspX11OutputStream.h +debian/tmp/opt/trinity/include/tde/mpeglib/output/outPlugin.h +debian/tmp/opt/trinity/include/tde/mpeglib/output/outputStream.h +debian/tmp/opt/trinity/include/tde/mpeglib/output/pluginInfo.h +debian/tmp/opt/trinity/include/tde/mpeglib/output/threadSafeOutputStream.h +debian/tmp/opt/trinity/include/tde/mpeglib/splay/mpegAudioFrame.h +debian/tmp/opt/trinity/include/tde/mpeglib/splay/mpegAudioInfo.h +debian/tmp/opt/trinity/include/tde/mpeglib/splay/splayDecoder.h +debian/tmp/opt/trinity/include/tde/mpeglib/util/abstract/abs_thread.h +debian/tmp/opt/trinity/include/tde/mpeglib/util/abstract/threadQueue.h +debian/tmp/opt/trinity/include/tde/mpeglib/util/dynBuffer.h +debian/tmp/opt/trinity/include/tde/mpeglib/util/file/fileAccess.h +debian/tmp/opt/trinity/include/tde/mpeglib/util/mmx/mm_accel.h +debian/tmp/opt/trinity/include/tde/mpeglib/util/mmx/mmx.h +debian/tmp/opt/trinity/include/tde/mpeglib/util/mmx/mmx_asm.h +debian/tmp/opt/trinity/include/tde/mpeglib/util/render/pictureArray.h +debian/tmp/opt/trinity/include/tde/mpeglib/util/render/yuvPicture.h +debian/tmp/opt/trinity/include/tde/mpeglib/util/syncClock.h +debian/tmp/opt/trinity/include/tde/mpeglib/util/timeStamp.h +debian/tmp/opt/trinity/include/tde/mpeglib/util/timeStampArray.h +debian/tmp/opt/trinity/include/tde/mpeglib/util/timeWrapper.h +debian/tmp/opt/trinity/include/tde/mpeglib/util/yaf/yafcore/buffer.h +debian/tmp/opt/trinity/include/tde/mpeglib/util/yaf/yafcore/inputDecoder.h +debian/tmp/opt/trinity/include/tde/mpeglib/util/yaf/yafcore/inputInterface.h +debian/tmp/opt/trinity/include/tde/mpeglib/util/yaf/yafcore/outputInterface.h +debian/tmp/opt/trinity/include/tde/mpeglib/util/yaf/yafcore/yaf_control.h +debian/tmp/opt/trinity/include/tde/mpeglib/util/yaf/yafxplayer/inputDecoderXPlayer.h +debian/tmp/opt/trinity/include/tde/mpeglib/util/yaf/yafxplayer/inputDecoderYAF.h +debian/tmp/opt/trinity/include/tde/mpeglib/util/yaf/yafxplayer/yafOutputStream.h +debian/tmp/opt/trinity/include/tde/mpeglib_artsplug/decoderBaseObject.h +debian/tmp/opt/trinity/include/tde/mpeglib_artsplug/decoderBaseObject.idl +debian/tmp/opt/trinity/include/tde/mpeglib_artsplug/decoderBaseObject_impl.h +debian/tmp/opt/trinity/include/tde/mpeglib_artsplug/splayPlayObject.h +debian/tmp/opt/trinity/include/tde/mpeglib_artsplug/splayPlayObject.idl +debian/tmp/opt/trinity/include/tde/mpeglib_artsplug/splayPlayObject_impl.h +debian/tmp/opt/trinity/include/tde/noatun/app.h +debian/tmp/opt/trinity/include/tde/noatun/controls.h +debian/tmp/opt/trinity/include/tde/noatun/conversion.h +debian/tmp/opt/trinity/include/tde/noatun/downloader.h +debian/tmp/opt/trinity/include/tde/noatun/effects.h +debian/tmp/opt/trinity/include/tde/noatun/engine.h +debian/tmp/opt/trinity/include/tde/noatun/equalizer.h +debian/tmp/opt/trinity/include/tde/noatun/noatunarts.h +debian/tmp/opt/trinity/include/tde/noatun/player.h +debian/tmp/opt/trinity/include/tde/noatun/playlist.h +debian/tmp/opt/trinity/include/tde/noatun/playlistsaver.h +debian/tmp/opt/trinity/include/tde/noatun/plugin.h +debian/tmp/opt/trinity/include/tde/noatun/pluginloader.h +debian/tmp/opt/trinity/include/tde/noatun/pref.h +debian/tmp/opt/trinity/include/tde/noatun/scrollinglabel.h +debian/tmp/opt/trinity/include/tde/noatun/stdaction.h +debian/tmp/opt/trinity/include/tde/noatun/stereobuttonaction.h +debian/tmp/opt/trinity/include/tde/noatun/tags.h +debian/tmp/opt/trinity/include/tde/noatun/vequalizer.h +debian/tmp/opt/trinity/include/tde/noatun/video.h +debian/tmp/opt/trinity/include/tde/noatun/winskinvis.h +debian/tmp/opt/trinity/include/tde/plugin_deps.h debian/tmp/opt/trinity/lib/libarts_mpeglib.so debian/tmp/opt/trinity/lib/libarts_splay.so debian/tmp/opt/trinity/lib/libartsbuilder.so diff --git a/ubuntu/maverick/tdenetwork/debian/cdbs/kde.mk b/ubuntu/maverick/tdenetwork/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/tdenetwork/debian/cdbs/kde.mk +++ b/ubuntu/maverick/tdenetwork/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/tdenetwork/debian/kopete-trinity.install b/ubuntu/maverick/tdenetwork/debian/kopete-trinity.install index c4a342dc5..1901f005e 100644 --- a/ubuntu/maverick/tdenetwork/debian/kopete-trinity.install +++ b/ubuntu/maverick/tdenetwork/debian/kopete-trinity.install @@ -1,9 +1,9 @@ debian/tmp/opt/trinity/bin/kopete debian/tmp/opt/trinity/bin/kopete_latexconvert.sh -debian/tmp/opt/trinity/include/kde/kopete/kopetepicture.h -debian/tmp/opt/trinity/include/kde/kopete/kopeteprefs.h -debian/tmp/opt/trinity/include/kde/kopete/ui/addressbooklinkwidget.h -debian/tmp/opt/trinity/include/kde/kopete/webcamwidget.h +debian/tmp/opt/trinity/include/tde/kopete/kopetepicture.h +debian/tmp/opt/trinity/include/tde/kopete/kopeteprefs.h +debian/tmp/opt/trinity/include/tde/kopete/ui/addressbooklinkwidget.h +debian/tmp/opt/trinity/include/tde/kopete/webcamwidget.h debian/tmp/opt/trinity/lib/kconf_update_bin/kopete-account-kconf_update debian/tmp/opt/trinity/lib/kconf_update_bin/kopete-nameTracking-kconf_update debian/tmp/opt/trinity/lib/kconf_update_bin/kopete-pluginloader2-kconf_update diff --git a/ubuntu/maverick/tdenetwork/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick/tdenetwork/debian/patches/common/kubuntu_01_kdepot.diff index 0caf5361a..c02687784 100644 --- a/ubuntu/maverick/tdenetwork/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick/tdenetwork/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/opt/trinity/include/kde/kde.pot ++kdepotpath=/opt/trinity/include/tde/kde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick/tdenetwork/debian/rules b/ubuntu/maverick/tdenetwork/debian/rules index 90babf808..71afe376c 100755 --- a/ubuntu/maverick/tdenetwork/debian/rules +++ b/ubuntu/maverick/tdenetwork/debian/rules @@ -17,7 +17,7 @@ include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/ubuntu/maverick/tdenetwork/debian/tdenetwork-trinity-dev.install b/ubuntu/maverick/tdenetwork/debian/tdenetwork-trinity-dev.install index cc69d4cba..4915aaa12 100644 --- a/ubuntu/maverick/tdenetwork/debian/tdenetwork-trinity-dev.install +++ b/ubuntu/maverick/tdenetwork/debian/tdenetwork-trinity-dev.install @@ -1,66 +1,66 @@ -debian/tmp/opt/trinity/include/kde/kopete/kabcpersistence.h -debian/tmp/opt/trinity/include/kde/kopete/kopete_export.h -debian/tmp/opt/trinity/include/kde/kopete/kopeteaccount.h -debian/tmp/opt/trinity/include/kde/kopete/kopeteaccountmanager.h -debian/tmp/opt/trinity/include/kde/kopete/kopeteaway.h -debian/tmp/opt/trinity/include/kde/kopete/kopeteawayaction.h -debian/tmp/opt/trinity/include/kde/kopete/kopeteawaydialog.h -debian/tmp/opt/trinity/include/kde/kopete/kopeteblacklister.h -debian/tmp/opt/trinity/include/kde/kopete/kopetechatsession.h -debian/tmp/opt/trinity/include/kde/kopete/kopetechatsessionmanager.h -debian/tmp/opt/trinity/include/kde/kopete/kopetecommandhandler.h -debian/tmp/opt/trinity/include/kde/kopete/kopetecontact.h -debian/tmp/opt/trinity/include/kde/kopete/kopetecontactlist.h -debian/tmp/opt/trinity/include/kde/kopete/kopetecontactlistelement.h -debian/tmp/opt/trinity/include/kde/kopete/kopetecontactproperty.h -debian/tmp/opt/trinity/include/kde/kopete/kopeteeventpresentation.h -debian/tmp/opt/trinity/include/kde/kopete/kopeteglobal.h -debian/tmp/opt/trinity/include/kde/kopete/kopetegroup.h -debian/tmp/opt/trinity/include/kde/kopete/kopetemessage.h -debian/tmp/opt/trinity/include/kde/kopete/kopetemessageevent.h -debian/tmp/opt/trinity/include/kde/kopete/kopetemessagehandler.h -debian/tmp/opt/trinity/include/kde/kopete/kopetemessagehandlerchain.h -debian/tmp/opt/trinity/include/kde/kopete/kopetemetacontact.h -debian/tmp/opt/trinity/include/kde/kopete/kopetemimetypehandler.h -debian/tmp/opt/trinity/include/kde/kopete/kopetenotifydataobject.h -debian/tmp/opt/trinity/include/kde/kopete/kopeteonlinestatus.h -debian/tmp/opt/trinity/include/kde/kopete/kopeteonlinestatusmanager.h -debian/tmp/opt/trinity/include/kde/kopete/kopetepassword.h -debian/tmp/opt/trinity/include/kde/kopete/kopetepasswordedaccount.h -debian/tmp/opt/trinity/include/kde/kopete/kopeteplugin.h -debian/tmp/opt/trinity/include/kde/kopete/kopeteprotocol.h -debian/tmp/opt/trinity/include/kde/kopete/kopetesimplemessagehandler.h -debian/tmp/opt/trinity/include/kde/kopete/kopetetask.h -debian/tmp/opt/trinity/include/kde/kopete/kopetetransfermanager.h -debian/tmp/opt/trinity/include/kde/kopete/kopeteuiglobal.h -debian/tmp/opt/trinity/include/kde/kopete/kopeteversion.h -debian/tmp/opt/trinity/include/kde/kopete/managedconnectionaccount.h -debian/tmp/opt/trinity/include/kde/kopete/ui/accountselector.h -debian/tmp/opt/trinity/include/kde/kopete/ui/addcontactpage.h -debian/tmp/opt/trinity/include/kde/kopete/ui/addressbookselectordialog.h -debian/tmp/opt/trinity/include/kde/kopete/ui/addressbookselectorwidget.h -debian/tmp/opt/trinity/include/kde/kopete/ui/editaccountwidget.h -debian/tmp/opt/trinity/include/kde/kopete/ui/fileconfirmbase.h -debian/tmp/opt/trinity/include/kde/kopete/ui/kopeteawaydialogbase.h -debian/tmp/opt/trinity/include/kde/kopete/ui/kopetecontactaction.h -debian/tmp/opt/trinity/include/kde/kopete/ui/kopetefileconfirmdialog.h -debian/tmp/opt/trinity/include/kde/kopete/ui/kopetelistview.h -debian/tmp/opt/trinity/include/kde/kopete/ui/kopetelistviewitem.h -debian/tmp/opt/trinity/include/kde/kopete/ui/kopetelistviewsearchline.h -debian/tmp/opt/trinity/include/kde/kopete/ui/kopetepassworddialog.h -debian/tmp/opt/trinity/include/kde/kopete/ui/kopetepasswordwidget.h -debian/tmp/opt/trinity/include/kde/kopete/ui/kopetepasswordwidgetbase.h -debian/tmp/opt/trinity/include/kde/kopete/ui/kopetestdaction.h -debian/tmp/opt/trinity/include/kde/kopete/ui/kopeteview.h -debian/tmp/opt/trinity/include/kde/kopete/ui/kopeteviewplugin.h -debian/tmp/opt/trinity/include/kde/kopete/ui/userinfodialog.h -debian/tmp/opt/trinity/include/kde/rss/article.h -debian/tmp/opt/trinity/include/kde/rss/document.h -debian/tmp/opt/trinity/include/kde/rss/global.h -debian/tmp/opt/trinity/include/kde/rss/image.h -debian/tmp/opt/trinity/include/kde/rss/librss.h -debian/tmp/opt/trinity/include/kde/rss/loader.h -debian/tmp/opt/trinity/include/kde/rss/textinput.h +debian/tmp/opt/trinity/include/tde/kopete/kabcpersistence.h +debian/tmp/opt/trinity/include/tde/kopete/kopete_export.h +debian/tmp/opt/trinity/include/tde/kopete/kopeteaccount.h +debian/tmp/opt/trinity/include/tde/kopete/kopeteaccountmanager.h +debian/tmp/opt/trinity/include/tde/kopete/kopeteaway.h +debian/tmp/opt/trinity/include/tde/kopete/kopeteawayaction.h +debian/tmp/opt/trinity/include/tde/kopete/kopeteawaydialog.h +debian/tmp/opt/trinity/include/tde/kopete/kopeteblacklister.h +debian/tmp/opt/trinity/include/tde/kopete/kopetechatsession.h +debian/tmp/opt/trinity/include/tde/kopete/kopetechatsessionmanager.h +debian/tmp/opt/trinity/include/tde/kopete/kopetecommandhandler.h +debian/tmp/opt/trinity/include/tde/kopete/kopetecontact.h +debian/tmp/opt/trinity/include/tde/kopete/kopetecontactlist.h +debian/tmp/opt/trinity/include/tde/kopete/kopetecontactlistelement.h +debian/tmp/opt/trinity/include/tde/kopete/kopetecontactproperty.h +debian/tmp/opt/trinity/include/tde/kopete/kopeteeventpresentation.h +debian/tmp/opt/trinity/include/tde/kopete/kopeteglobal.h +debian/tmp/opt/trinity/include/tde/kopete/kopetegroup.h +debian/tmp/opt/trinity/include/tde/kopete/kopetemessage.h +debian/tmp/opt/trinity/include/tde/kopete/kopetemessageevent.h +debian/tmp/opt/trinity/include/tde/kopete/kopetemessagehandler.h +debian/tmp/opt/trinity/include/tde/kopete/kopetemessagehandlerchain.h +debian/tmp/opt/trinity/include/tde/kopete/kopetemetacontact.h +debian/tmp/opt/trinity/include/tde/kopete/kopetemimetypehandler.h +debian/tmp/opt/trinity/include/tde/kopete/kopetenotifydataobject.h +debian/tmp/opt/trinity/include/tde/kopete/kopeteonlinestatus.h +debian/tmp/opt/trinity/include/tde/kopete/kopeteonlinestatusmanager.h +debian/tmp/opt/trinity/include/tde/kopete/kopetepassword.h +debian/tmp/opt/trinity/include/tde/kopete/kopetepasswordedaccount.h +debian/tmp/opt/trinity/include/tde/kopete/kopeteplugin.h +debian/tmp/opt/trinity/include/tde/kopete/kopeteprotocol.h +debian/tmp/opt/trinity/include/tde/kopete/kopetesimplemessagehandler.h +debian/tmp/opt/trinity/include/tde/kopete/kopetetask.h +debian/tmp/opt/trinity/include/tde/kopete/kopetetransfermanager.h +debian/tmp/opt/trinity/include/tde/kopete/kopeteuiglobal.h +debian/tmp/opt/trinity/include/tde/kopete/kopeteversion.h +debian/tmp/opt/trinity/include/tde/kopete/managedconnectionaccount.h +debian/tmp/opt/trinity/include/tde/kopete/ui/accountselector.h +debian/tmp/opt/trinity/include/tde/kopete/ui/addcontactpage.h +debian/tmp/opt/trinity/include/tde/kopete/ui/addressbookselectordialog.h +debian/tmp/opt/trinity/include/tde/kopete/ui/addressbookselectorwidget.h +debian/tmp/opt/trinity/include/tde/kopete/ui/editaccountwidget.h +debian/tmp/opt/trinity/include/tde/kopete/ui/fileconfirmbase.h +debian/tmp/opt/trinity/include/tde/kopete/ui/kopeteawaydialogbase.h +debian/tmp/opt/trinity/include/tde/kopete/ui/kopetecontactaction.h +debian/tmp/opt/trinity/include/tde/kopete/ui/kopetefileconfirmdialog.h +debian/tmp/opt/trinity/include/tde/kopete/ui/kopetelistview.h +debian/tmp/opt/trinity/include/tde/kopete/ui/kopetelistviewitem.h +debian/tmp/opt/trinity/include/tde/kopete/ui/kopetelistviewsearchline.h +debian/tmp/opt/trinity/include/tde/kopete/ui/kopetepassworddialog.h +debian/tmp/opt/trinity/include/tde/kopete/ui/kopetepasswordwidget.h +debian/tmp/opt/trinity/include/tde/kopete/ui/kopetepasswordwidgetbase.h +debian/tmp/opt/trinity/include/tde/kopete/ui/kopetestdaction.h +debian/tmp/opt/trinity/include/tde/kopete/ui/kopeteview.h +debian/tmp/opt/trinity/include/tde/kopete/ui/kopeteviewplugin.h +debian/tmp/opt/trinity/include/tde/kopete/ui/userinfodialog.h +debian/tmp/opt/trinity/include/tde/rss/article.h +debian/tmp/opt/trinity/include/tde/rss/document.h +debian/tmp/opt/trinity/include/tde/rss/global.h +debian/tmp/opt/trinity/include/tde/rss/image.h +debian/tmp/opt/trinity/include/tde/rss/librss.h +debian/tmp/opt/trinity/include/tde/rss/loader.h +debian/tmp/opt/trinity/include/tde/rss/textinput.h debian/tmp/opt/trinity/lib/libtdeinit_kdict.la debian/tmp/opt/trinity/lib/libtdeinit_ksirc.la debian/tmp/opt/trinity/lib/libkopete.la @@ -73,4 +73,4 @@ debian/tmp/opt/trinity/lib/libkopete_videodevice.la debian/tmp/opt/trinity/lib/libkopete_videodevice.so debian/tmp/opt/trinity/lib/librss.la debian/tmp/opt/trinity/lib/librss.so -debian/tmp/opt/trinity/include/kde/kopete/kopetepluginmanager.h +debian/tmp/opt/trinity/include/tde/kopete/kopetepluginmanager.h diff --git a/ubuntu/maverick/tdepim/debian/changelog b/ubuntu/maverick/tdepim/debian/changelog index 24807570c..53b6c5851 100644 --- a/ubuntu/maverick/tdepim/debian/changelog +++ b/ubuntu/maverick/tdepim/debian/changelog @@ -706,7 +706,7 @@ tdepim (4:3.5.6-0ubuntu3) feisty; urgency=low - Activates networkstatus support for kmail (patch from SuSE) * debian/control: - New package networkstatus-dev - * ./libtdepim1-dev.install: added /usr/include/kde/kpimprefs.h + * ./libtdepim1-dev.install: added /usr/include/tde/kpimprefs.h -- Anthony Mercatante Fri, 02 Feb 2007 15:37:42 +0100 diff --git a/ubuntu/maverick/tdepim/debian/libindex0-trinity-dev.install b/ubuntu/maverick/tdepim/debian/libindex0-trinity-dev.install index acbb26191..8c2903ede 100644 --- a/ubuntu/maverick/tdepim/debian/libindex0-trinity-dev.install +++ b/ubuntu/maverick/tdepim/debian/libindex0-trinity-dev.install @@ -1,4 +1,4 @@ /opt/trinity/bin/indexlib-config -/opt/trinity/include/kde/index +/opt/trinity/include/tde/index /opt/trinity/lib/libindex.la /opt/trinity/lib/libindex.so diff --git a/ubuntu/maverick/tdepim/debian/libkcal2-trinity-dev.install b/ubuntu/maverick/tdepim/debian/libkcal2-trinity-dev.install index 7dcc98ca7..75a5523ca 100644 --- a/ubuntu/maverick/tdepim/debian/libkcal2-trinity-dev.install +++ b/ubuntu/maverick/tdepim/debian/libkcal2-trinity-dev.install @@ -1,5 +1,5 @@ -/opt/trinity/include/kde/libemailfunctions/idmapper.h -/opt/trinity/include/kde/libkcal +/opt/trinity/include/tde/libemailfunctions/idmapper.h +/opt/trinity/include/tde/libkcal /opt/trinity/lib/libkcal.la /opt/trinity/lib/libkcal.so /opt/trinity/lib/libkcal_resourceremote.la diff --git a/ubuntu/maverick/tdepim/debian/libkgantt0-trinity-dev.install b/ubuntu/maverick/tdepim/debian/libkgantt0-trinity-dev.install index c386be142..290f743b7 100644 --- a/ubuntu/maverick/tdepim/debian/libkgantt0-trinity-dev.install +++ b/ubuntu/maverick/tdepim/debian/libkgantt0-trinity-dev.install @@ -1,3 +1,3 @@ -/opt/trinity/include/kde/kgantt +/opt/trinity/include/tde/kgantt /opt/trinity/lib/libkgantt.la /opt/trinity/lib/libkgantt.so diff --git a/ubuntu/maverick/tdepim/debian/libkleopatra1-trinity-dev.install b/ubuntu/maverick/tdepim/debian/libkleopatra1-trinity-dev.install index cab0f039e..6015f5c08 100644 --- a/ubuntu/maverick/tdepim/debian/libkleopatra1-trinity-dev.install +++ b/ubuntu/maverick/tdepim/debian/libkleopatra1-trinity-dev.install @@ -1,6 +1,6 @@ -/opt/trinity/include/kde/gpgme++ -/opt/trinity/include/kde/kleo -/opt/trinity/include/kde/qgpgme +/opt/trinity/include/tde/gpgme++ +/opt/trinity/include/tde/kleo +/opt/trinity/include/tde/qgpgme /opt/trinity/lib/libgpgme++.la /opt/trinity/lib/libgpgme++.so /opt/trinity/lib/libkleopatra.la diff --git a/ubuntu/maverick/tdepim/debian/libkpimexchange1-trinity-dev.install b/ubuntu/maverick/tdepim/debian/libkpimexchange1-trinity-dev.install index 8bf3b312e..ed8bb8407 100644 --- a/ubuntu/maverick/tdepim/debian/libkpimexchange1-trinity-dev.install +++ b/ubuntu/maverick/tdepim/debian/libkpimexchange1-trinity-dev.install @@ -1,4 +1,4 @@ -/opt/trinity/include/kde/tdepim/exchangeaccount.h -/opt/trinity/include/kde/tdepim/exchangeclient.h +/opt/trinity/include/tde/tdepim/exchangeaccount.h +/opt/trinity/include/tde/tdepim/exchangeclient.h /opt/trinity/lib/libkpimexchange.la /opt/trinity/lib/libkpimexchange.so diff --git a/ubuntu/maverick/tdepim/debian/libksieve0-trinity-dev.install b/ubuntu/maverick/tdepim/debian/libksieve0-trinity-dev.install index 08cf59222..32aa3d12d 100644 --- a/ubuntu/maverick/tdepim/debian/libksieve0-trinity-dev.install +++ b/ubuntu/maverick/tdepim/debian/libksieve0-trinity-dev.install @@ -1,3 +1,3 @@ -/opt/trinity/include/kde/ksieve +/opt/trinity/include/tde/ksieve /opt/trinity/lib/libksieve.la /opt/trinity/lib/libksieve.so diff --git a/ubuntu/maverick/tdepim/debian/libktnef1-trinity-dev.install b/ubuntu/maverick/tdepim/debian/libktnef1-trinity-dev.install index 5c74d9348..1cea927e9 100644 --- a/ubuntu/maverick/tdepim/debian/libktnef1-trinity-dev.install +++ b/ubuntu/maverick/tdepim/debian/libktnef1-trinity-dev.install @@ -1,3 +1,3 @@ -/opt/trinity/include/kde/ktnef +/opt/trinity/include/tde/ktnef /opt/trinity/lib/libktnef.la /opt/trinity/lib/libktnef.so diff --git a/ubuntu/maverick/tdepim/debian/libmimelib1-trinity-dev.install b/ubuntu/maverick/tdepim/debian/libmimelib1-trinity-dev.install index c5092b6a9..3a5428f6e 100644 --- a/ubuntu/maverick/tdepim/debian/libmimelib1-trinity-dev.install +++ b/ubuntu/maverick/tdepim/debian/libmimelib1-trinity-dev.install @@ -1,3 +1,3 @@ -/opt/trinity/include/kde/mimelib +/opt/trinity/include/tde/mimelib /opt/trinity/lib/libmimelib.la /opt/trinity/lib/libmimelib.so diff --git a/ubuntu/maverick/tdepim/debian/libtdepim1-trinity-dev.install b/ubuntu/maverick/tdepim/debian/libtdepim1-trinity-dev.install index 4f6d52f46..56ca2ebc8 100644 --- a/ubuntu/maverick/tdepim/debian/libtdepim1-trinity-dev.install +++ b/ubuntu/maverick/tdepim/debian/libtdepim1-trinity-dev.install @@ -1,3 +1,3 @@ -/opt/trinity/include/kde/tdepimmacros.h +/opt/trinity/include/tde/tdepimmacros.h /opt/trinity/lib/libtdepim.la /opt/trinity/lib/libtdepim.so diff --git a/ubuntu/maverick/tdepim/debian/tdepim-trinity-dev.install b/ubuntu/maverick/tdepim/debian/tdepim-trinity-dev.install index 848758727..b94111037 100644 --- a/ubuntu/maverick/tdepim/debian/tdepim-trinity-dev.install +++ b/ubuntu/maverick/tdepim/debian/tdepim-trinity-dev.install @@ -1,15 +1,15 @@ -/opt/trinity/include/kde/KNotesAppIface.h -/opt/trinity/include/kde/KNotesIface.h -/opt/trinity/include/kde/akregator -/opt/trinity/include/kde/calendar -/opt/trinity/include/kde/kabc -/opt/trinity/include/kde/kaddressbook -/opt/trinity/include/kde/kmail -/opt/trinity/include/kde/kmailIface.h -/opt/trinity/include/kde/kmailicalIface.h -/opt/trinity/include/kde/kmailpartIface.h -/opt/trinity/include/kde/kontact -/opt/trinity/include/kde/korganizer +/opt/trinity/include/tde/KNotesAppIface.h +/opt/trinity/include/tde/KNotesIface.h +/opt/trinity/include/tde/akregator +/opt/trinity/include/tde/calendar +/opt/trinity/include/tde/kabc +/opt/trinity/include/tde/kaddressbook +/opt/trinity/include/tde/kmail +/opt/trinity/include/tde/kmailIface.h +/opt/trinity/include/tde/kmailicalIface.h +/opt/trinity/include/tde/kmailpartIface.h +/opt/trinity/include/tde/kontact +/opt/trinity/include/tde/korganizer /opt/trinity/lib/libkabckolab.la /opt/trinity/lib/libkabckolab.so /opt/trinity/lib/libkabcscalix.la @@ -81,4 +81,4 @@ /opt/trinity/lib/libgwsoap.la /opt/trinity/lib/libgwsoap.so -/opt/trinity/include/kde/kpimprefs.h +/opt/trinity/include/tde/kpimprefs.h diff --git a/ubuntu/maverick/tdesdk/debian/cdbs/kde.mk b/ubuntu/maverick/tdesdk/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/tdesdk/debian/cdbs/kde.mk +++ b/ubuntu/maverick/tdesdk/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/tdesdk/debian/changelog b/ubuntu/maverick/tdesdk/debian/changelog index 276fb1d78..1bbe6e2e4 100644 --- a/ubuntu/maverick/tdesdk/debian/changelog +++ b/ubuntu/maverick/tdesdk/debian/changelog @@ -931,7 +931,7 @@ tdesdk (2.2.2-3) unstable; urgency=low tdesdk (2.2.2-2) unstable; urgency=low - * Moved kspy.h to /usr/include/kde (closes: Bug#122448, Bug#122449). + * Moved kspy.h to /usr/include/tde (closes: Bug#122448, Bug#122449). -- Ben Burton Thu, 6 Dec 2001 09:50:47 -0600 diff --git a/ubuntu/maverick/tdesdk/debian/kbabel-trinity-dev.install b/ubuntu/maverick/tdesdk/debian/kbabel-trinity-dev.install index a792b2b6d..ace31ea6a 100644 --- a/ubuntu/maverick/tdesdk/debian/kbabel-trinity-dev.install +++ b/ubuntu/maverick/tdesdk/debian/kbabel-trinity-dev.install @@ -1,24 +1,24 @@ -debian/tmp/opt/trinity/include/kde/kbabel/catalog.h -debian/tmp/opt/trinity/include/kde/kbabel/catalogfileplugin.h -debian/tmp/opt/trinity/include/kde/kbabel/catalogitem.h -debian/tmp/opt/trinity/include/kde/kbabel/catalogsettings.h -debian/tmp/opt/trinity/include/kde/kbabel/catalogview.h -debian/tmp/opt/trinity/include/kde/kbabel/dictchooser.h -debian/tmp/opt/trinity/include/kde/kbabel/dictionarymenu.h -debian/tmp/opt/trinity/include/kde/kbabel/editcmd.h -debian/tmp/opt/trinity/include/kde/kbabel/findoptions.h -debian/tmp/opt/trinity/include/kde/kbabel/itempart.h -debian/tmp/opt/trinity/include/kde/kbabel/kbabeldatatool.h -debian/tmp/opt/trinity/include/kde/kbabel/kbabeldictbox.h -debian/tmp/opt/trinity/include/kde/kbabel/kbabeldictiface.h -debian/tmp/opt/trinity/include/kde/kbabel/kbproject.h -debian/tmp/opt/trinity/include/kde/kbabel/kbprojectmanager.h -debian/tmp/opt/trinity/include/kde/kbabel/msgfmt.h -debian/tmp/opt/trinity/include/kde/kbabel/poinfo.h -debian/tmp/opt/trinity/include/kde/kbabel/projectsettings.h -debian/tmp/opt/trinity/include/kde/kbabel/regexpextractor.h -debian/tmp/opt/trinity/include/kde/kbabel/searchengine.h -debian/tmp/opt/trinity/include/kde/kbabel/tagextractor.h +debian/tmp/opt/trinity/include/tde/kbabel/catalog.h +debian/tmp/opt/trinity/include/tde/kbabel/catalogfileplugin.h +debian/tmp/opt/trinity/include/tde/kbabel/catalogitem.h +debian/tmp/opt/trinity/include/tde/kbabel/catalogsettings.h +debian/tmp/opt/trinity/include/tde/kbabel/catalogview.h +debian/tmp/opt/trinity/include/tde/kbabel/dictchooser.h +debian/tmp/opt/trinity/include/tde/kbabel/dictionarymenu.h +debian/tmp/opt/trinity/include/tde/kbabel/editcmd.h +debian/tmp/opt/trinity/include/tde/kbabel/findoptions.h +debian/tmp/opt/trinity/include/tde/kbabel/itempart.h +debian/tmp/opt/trinity/include/tde/kbabel/kbabeldatatool.h +debian/tmp/opt/trinity/include/tde/kbabel/kbabeldictbox.h +debian/tmp/opt/trinity/include/tde/kbabel/kbabeldictiface.h +debian/tmp/opt/trinity/include/tde/kbabel/kbproject.h +debian/tmp/opt/trinity/include/tde/kbabel/kbprojectmanager.h +debian/tmp/opt/trinity/include/tde/kbabel/msgfmt.h +debian/tmp/opt/trinity/include/tde/kbabel/poinfo.h +debian/tmp/opt/trinity/include/tde/kbabel/projectsettings.h +debian/tmp/opt/trinity/include/tde/kbabel/regexpextractor.h +debian/tmp/opt/trinity/include/tde/kbabel/searchengine.h +debian/tmp/opt/trinity/include/tde/kbabel/tagextractor.h debian/tmp/opt/trinity/lib/libkbabelcommon.la debian/tmp/opt/trinity/lib/libkbabelcommon.so debian/tmp/opt/trinity/lib/libkbabeldictplugin.la diff --git a/ubuntu/maverick/tdesdk/debian/kmtrace-trinity.install b/ubuntu/maverick/tdesdk/debian/kmtrace-trinity.install index 119b5196d..35b5af1a5 100644 --- a/ubuntu/maverick/tdesdk/debian/kmtrace-trinity.install +++ b/ubuntu/maverick/tdesdk/debian/kmtrace-trinity.install @@ -2,7 +2,7 @@ debian/tmp/opt/trinity/bin/demangle debian/tmp/opt/trinity/bin/kminspector debian/tmp/opt/trinity/bin/kmmatch debian/tmp/opt/trinity/bin/kmtrace -debian/tmp/opt/trinity/include/kde/ktrace.h +debian/tmp/opt/trinity/include/tde/ktrace.h debian/tmp/opt/trinity/lib/kmtrace/libktrace.la debian/tmp/opt/trinity/lib/kmtrace/libktrace.so debian/tmp/opt/trinity/lib/kmtrace/libktrace_s.a diff --git a/ubuntu/maverick/tdesdk/debian/kspy-trinity.install b/ubuntu/maverick/tdesdk/debian/kspy-trinity.install index 3b7d6d778..fc17ede2c 100644 --- a/ubuntu/maverick/tdesdk/debian/kspy-trinity.install +++ b/ubuntu/maverick/tdesdk/debian/kspy-trinity.install @@ -1,4 +1,4 @@ -debian/tmp/opt/trinity/include/kde/kspy.h +debian/tmp/opt/trinity/include/tde/kspy.h debian/tmp/opt/trinity/lib/libkspy.la debian/tmp/opt/trinity/lib/libkspy.so debian/tmp/opt/trinity/lib/libkspy.so.1 diff --git a/ubuntu/maverick/tdesdk/debian/kunittest-trinity.install b/ubuntu/maverick/tdesdk/debian/kunittest-trinity.install index f002cd796..e183f0e74 100644 --- a/ubuntu/maverick/tdesdk/debian/kunittest-trinity.install +++ b/ubuntu/maverick/tdesdk/debian/kunittest-trinity.install @@ -4,4 +4,4 @@ debian/tmp/opt/trinity/lib/libkunittestgui.la debian/tmp/opt/trinity/lib/libkunittestgui.so debian/tmp/opt/trinity/lib/libkunittestgui.so.0 debian/tmp/opt/trinity/lib/libkunittestgui.so.0.0.0 -debian/tmp/opt/trinity/include/kde/kunittest/runnergui.h +debian/tmp/opt/trinity/include/tde/kunittest/runnergui.h diff --git a/ubuntu/maverick/tdesdk/debian/libcvsservice-trinity-dev.install b/ubuntu/maverick/tdesdk/debian/libcvsservice-trinity-dev.install index ac87e6efb..566e0b7a1 100644 --- a/ubuntu/maverick/tdesdk/debian/libcvsservice-trinity-dev.install +++ b/ubuntu/maverick/tdesdk/debian/libcvsservice-trinity-dev.install @@ -1,6 +1,6 @@ -debian/tmp/opt/trinity/include/kde/cvsjob_stub.h -debian/tmp/opt/trinity/include/kde/cvsservice_stub.h -debian/tmp/opt/trinity/include/kde/repository_stub.h +debian/tmp/opt/trinity/include/tde/cvsjob_stub.h +debian/tmp/opt/trinity/include/tde/cvsservice_stub.h +debian/tmp/opt/trinity/include/tde/repository_stub.h debian/tmp/opt/trinity/lib/libcvsservice.la debian/tmp/opt/trinity/lib/libcvsservice.so debian/tmp/opt/trinity/lib/libtdeinit_cvsaskpass.la diff --git a/ubuntu/maverick/tdesdk/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick/tdesdk/debian/patches/common/kubuntu_01_kdepot.diff index 0caf5361a..c02687784 100644 --- a/ubuntu/maverick/tdesdk/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick/tdesdk/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/opt/trinity/include/kde/kde.pot ++kdepotpath=/opt/trinity/include/tde/kde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick/tdesdk/debian/rules b/ubuntu/maverick/tdesdk/debian/rules index e7b228f2b..d63a59865 100755 --- a/ubuntu/maverick/tdesdk/debian/rules +++ b/ubuntu/maverick/tdesdk/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/ubuntu/maverick/tdesdk/debian/tdesdk-misc-trinity.install b/ubuntu/maverick/tdesdk/debian/tdesdk-misc-trinity.install index cc229ce19..4b2589f6c 100644 --- a/ubuntu/maverick/tdesdk/debian/tdesdk-misc-trinity.install +++ b/ubuntu/maverick/tdesdk/debian/tdesdk-misc-trinity.install @@ -1,4 +1,4 @@ -debian/tmp/opt/trinity/include/kde/kprofilemethod.h +debian/tmp/opt/trinity/include/tde/kprofilemethod.h debian/tmp/opt/trinity/lib/trinity/kabcformat_kdeaccounts.la debian/tmp/opt/trinity/lib/trinity/kabcformat_kdeaccounts.so debian/tmp/opt/trinity/lib/trinity/plugins/styles/scheck.so diff --git a/ubuntu/maverick/tdetoys/debian/amor-trinity.install b/ubuntu/maverick/tdetoys/debian/amor-trinity.install index b616db701..56a51c1b0 100644 --- a/ubuntu/maverick/tdetoys/debian/amor-trinity.install +++ b/ubuntu/maverick/tdetoys/debian/amor-trinity.install @@ -1,5 +1,5 @@ debian/tmp/opt/trinity/bin/amor -debian/tmp/opt/trinity/include/kde/AmorIface.h +debian/tmp/opt/trinity/include/tde/AmorIface.h debian/tmp/opt/trinity/share/apps/amor debian/tmp/opt/trinity/share/applications/kde/amor.desktop debian/tmp/opt/trinity/share/doc/kde/HTML/en/amor/*.bz2 diff --git a/ubuntu/maverick/tdetoys/debian/cdbs/kde.mk b/ubuntu/maverick/tdetoys/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/tdetoys/debian/cdbs/kde.mk +++ b/ubuntu/maverick/tdetoys/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/tdetoys/debian/changelog b/ubuntu/maverick/tdetoys/debian/changelog index 5406c86c9..232db2401 100644 --- a/ubuntu/maverick/tdetoys/debian/changelog +++ b/ubuntu/maverick/tdetoys/debian/changelog @@ -609,7 +609,7 @@ tdetoys (4:2.2.2-3) unstable; urgency=low tdetoys (4:2.2.2-2) unstable; urgency=low - * Moved AmorIface.h to /usr/include/kde (closes: Bug#122447). + * Moved AmorIface.h to /usr/include/tde (closes: Bug#122447). -- Ben Burton Sun, 9 Dec 2001 09:07:02 -0600 diff --git a/ubuntu/maverick/tdetoys/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick/tdetoys/debian/patches/common/kubuntu_01_kdepot.diff index 0caf5361a..c02687784 100644 --- a/ubuntu/maverick/tdetoys/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick/tdetoys/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/opt/trinity/include/kde/kde.pot ++kdepotpath=/opt/trinity/include/tde/kde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick/tdetoys/debian/rules b/ubuntu/maverick/tdetoys/debian/rules index 29a5978c3..57c3cf2c9 100755 --- a/ubuntu/maverick/tdetoys/debian/rules +++ b/ubuntu/maverick/tdetoys/debian/rules @@ -5,14 +5,14 @@ include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --includedir="/opt/trinity/include/kde" --mandir="/opt/trinity/share/man" --infodir="/opt/trinity/share/info" +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --includedir="/opt/trinity/include/tde" --mandir="/opt/trinity/share/man" --infodir="/opt/trinity/share/info" DEB_DH_STRIP_ARGS := --dbg-package=tdetoys-trinity-dbg diff --git a/ubuntu/maverick/tdeutils/debian/cdbs/kde.mk b/ubuntu/maverick/tdeutils/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/tdeutils/debian/cdbs/kde.mk +++ b/ubuntu/maverick/tdeutils/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/tdeutils/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick/tdeutils/debian/patches/common/kubuntu_01_kdepot.diff index 0caf5361a..c02687784 100644 --- a/ubuntu/maverick/tdeutils/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick/tdeutils/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/opt/trinity/include/kde/kde.pot ++kdepotpath=/opt/trinity/include/tde/kde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick/tdeutils/debian/rules b/ubuntu/maverick/tdeutils/debian/rules index f7cd135a4..a83c83fdf 100755 --- a/ubuntu/maverick/tdeutils/debian/rules +++ b/ubuntu/maverick/tdeutils/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/ubuntu/maverick/tdeutils/debian/tdeutils-trinity-dev.install b/ubuntu/maverick/tdeutils/debian/tdeutils-trinity-dev.install index a3c425a38..ca7081194 100644 --- a/ubuntu/maverick/tdeutils/debian/tdeutils-trinity-dev.install +++ b/ubuntu/maverick/tdeutils/debian/tdeutils-trinity-dev.install @@ -1,18 +1,18 @@ -debian/tmp/opt/trinity/include/kde/kmultiformlistbox.h -debian/tmp/opt/trinity/include/kde/kmultiformlistboxentry.h -debian/tmp/opt/trinity/include/kde/kmultiformlistboxfactory.h -debian/tmp/opt/trinity/include/kde/ksim/chart.h -debian/tmp/opt/trinity/include/kde/ksim/common.h -debian/tmp/opt/trinity/include/kde/ksim/ksimconfig.h -debian/tmp/opt/trinity/include/kde/ksim/label.h -debian/tmp/opt/trinity/include/kde/ksim/led.h -debian/tmp/opt/trinity/include/kde/ksim/pluginglobal.h -debian/tmp/opt/trinity/include/kde/ksim/pluginloader.h -debian/tmp/opt/trinity/include/kde/ksim/pluginmodule.h -debian/tmp/opt/trinity/include/kde/ksim/progress.h -debian/tmp/opt/trinity/include/kde/ksim/themeloader.h -debian/tmp/opt/trinity/include/kde/ksim/themetypes.h -debian/tmp/opt/trinity/include/kde/kwidgetstreamer.h +debian/tmp/opt/trinity/include/tde/kmultiformlistbox.h +debian/tmp/opt/trinity/include/tde/kmultiformlistboxentry.h +debian/tmp/opt/trinity/include/tde/kmultiformlistboxfactory.h +debian/tmp/opt/trinity/include/tde/ksim/chart.h +debian/tmp/opt/trinity/include/tde/ksim/common.h +debian/tmp/opt/trinity/include/tde/ksim/ksimconfig.h +debian/tmp/opt/trinity/include/tde/ksim/label.h +debian/tmp/opt/trinity/include/tde/ksim/led.h +debian/tmp/opt/trinity/include/tde/ksim/pluginglobal.h +debian/tmp/opt/trinity/include/tde/ksim/pluginloader.h +debian/tmp/opt/trinity/include/tde/ksim/pluginmodule.h +debian/tmp/opt/trinity/include/tde/ksim/progress.h +debian/tmp/opt/trinity/include/tde/ksim/themeloader.h +debian/tmp/opt/trinity/include/tde/ksim/themetypes.h +debian/tmp/opt/trinity/include/tde/kwidgetstreamer.h debian/tmp/opt/trinity/lib/libkcmlaptop.la debian/tmp/opt/trinity/lib/libkcmlaptop.so debian/tmp/opt/trinity/lib/libtdeinit_ark.la diff --git a/ubuntu/maverick/tdevelop/debian/cdbs/kde.mk b/ubuntu/maverick/tdevelop/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/tdevelop/debian/cdbs/kde.mk +++ b/ubuntu/maverick/tdevelop/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/tdevelop/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick/tdevelop/debian/patches/common/kubuntu_01_kdepot.diff index 0caf5361a..c02687784 100644 --- a/ubuntu/maverick/tdevelop/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick/tdevelop/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/opt/trinity/include/kde/kde.pot ++kdepotpath=/opt/trinity/include/tde/kde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick/tdevelop/debian/rules b/ubuntu/maverick/tdevelop/debian/rules index f5bce32b3..21f2c166a 100755 --- a/ubuntu/maverick/tdevelop/debian/rules +++ b/ubuntu/maverick/tdevelop/debian/rules @@ -9,7 +9,7 @@ include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/ubuntu/maverick/tdevelop/debian/tdevelop-trinity-dev.install b/ubuntu/maverick/tdevelop/debian/tdevelop-trinity-dev.install index 5c24ba5bb..f9f8c82ab 100644 --- a/ubuntu/maverick/tdevelop/debian/tdevelop-trinity-dev.install +++ b/ubuntu/maverick/tdevelop/debian/tdevelop-trinity-dev.install @@ -1,3 +1,3 @@ -debian/tmp/opt/trinity/include/kde +debian/tmp/opt/trinity/include/tde debian/tmp/opt/trinity/lib/lib*.so debian/tmp/opt/trinity/lib/lib*.la diff --git a/ubuntu/maverick/tdewebdev/debian/cdbs/kde.mk b/ubuntu/maverick/tdewebdev/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/tdewebdev/debian/cdbs/kde.mk +++ b/ubuntu/maverick/tdewebdev/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/tdewebdev/debian/kommander-trinity-dev.install b/ubuntu/maverick/tdewebdev/debian/kommander-trinity-dev.install index 54d904432..8d8db707b 100644 --- a/ubuntu/maverick/tdewebdev/debian/kommander-trinity-dev.install +++ b/ubuntu/maverick/tdewebdev/debian/kommander-trinity-dev.install @@ -1,7 +1,7 @@ -debian/tmp/opt/trinity/include/kde/kommander* +debian/tmp/opt/trinity/include/tde/kommander* debian/tmp/opt/trinity/lib/libkommanderplugin.la debian/tmp/opt/trinity/lib/libkommanderplugin.so debian/tmp/opt/trinity/lib/libkommanderwidget.la debian/tmp/opt/trinity/lib/libkommanderwidget.so debian/tmp/opt/trinity/lib/libkommanderwidgets.so -debian/tmp/opt/trinity/include/kde/specials.h +debian/tmp/opt/trinity/include/tde/specials.h diff --git a/ubuntu/maverick/tdewebdev/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick/tdewebdev/debian/patches/common/kubuntu_01_kdepot.diff index 1f825f642..698deb926 100644 --- a/ubuntu/maverick/tdewebdev/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick/tdewebdev/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/usr/include/kde/kde.pot ++kdepotpath=/usr/include/tde/kde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick/tdewebdev/debian/rules b/ubuntu/maverick/tdewebdev/debian/rules index 2dcf9658d..888f66bcf 100755 --- a/ubuntu/maverick/tdewebdev/debian/rules +++ b/ubuntu/maverick/tdewebdev/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/ubuntu/maverick_automake/applications/abakus/debian/rules b/ubuntu/maverick_automake/applications/abakus/debian/rules index b4b19e7d1..c5622a9ec 100755 --- a/ubuntu/maverick_automake/applications/abakus/debian/rules +++ b/ubuntu/maverick_automake/applications/abakus/debian/rules @@ -3,7 +3,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/langcore.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info @@ -19,18 +19,18 @@ debian/abakus.xpm: src/hi64-app-abakus.png common-build-arch:: build-stamp build-stamp: debian/abakus.xpm - env PATH=/opt/kde3/bin:$(PATH) QTDIR=/usr/share/qt3 CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/kde $(SCONS) configure prefix=$(DEB_DESTDIR)/opt/kde3 - env PATH=/opt/kde3/bin:$(PATH) QTDIR=/usr/share/qt3 CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/kde $(SCONS) + env PATH=/opt/kde3/bin:$(PATH) QTDIR=/usr/share/qt3 CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/tde $(SCONS) configure prefix=$(DEB_DESTDIR)/opt/kde3 + env PATH=/opt/kde3/bin:$(PATH) QTDIR=/usr/share/qt3 CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/tde $(SCONS) touch build-stamp common-install-arch:: - env PATH=/opt/kde3/bin:$(PATH) QTDIR=/usr/share/qt3 CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/kde $(SCONS) install + env PATH=/opt/kde3/bin:$(PATH) QTDIR=/usr/share/qt3 CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/tde $(SCONS) install install -D -m 644 debian/abakus.xpm debian/abakus-kde3/opt/kde3/share/pixmaps/abakus.xpm chrpath -d debian/abakus-kde3/opt/kde3/bin/abakus dh_icons -pabakus clean:: - #env PATH=/opt/kde3/bin:$(PATH) QTDIR=/usr/share/qt3 CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/kde $(SCONS) --clean + #env PATH=/opt/kde3/bin:$(PATH) QTDIR=/usr/share/qt3 CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/tde $(SCONS) --clean rm -f debian/abakus.xpm rm -rf cache rm -rf .sconf_temp diff --git a/ubuntu/maverick_automake/applications/adept/debian/cdbs/kde.mk b/ubuntu/maverick_automake/applications/adept/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/maverick_automake/applications/adept/debian/cdbs/kde.mk +++ b/ubuntu/maverick_automake/applications/adept/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick_automake/applications/adept/debian/rules b/ubuntu/maverick_automake/applications/adept/debian/rules index 13770997f..6b550c841 100755 --- a/ubuntu/maverick_automake/applications/adept/debian/rules +++ b/ubuntu/maverick_automake/applications/adept/debian/rules @@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info diff --git a/ubuntu/maverick_automake/applications/amarok/debian/cdbs/kde.mk b/ubuntu/maverick_automake/applications/amarok/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/maverick_automake/applications/amarok/debian/cdbs/kde.mk +++ b/ubuntu/maverick_automake/applications/amarok/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick_automake/applications/amarok/debian/rules b/ubuntu/maverick_automake/applications/amarok/debian/rules index 476020719..25c96653a 100755 --- a/ubuntu/maverick_automake/applications/amarok/debian/rules +++ b/ubuntu/maverick_automake/applications/amarok/debian/rules @@ -5,7 +5,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/patchsys-quilt.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info diff --git a/ubuntu/maverick_automake/applications/basket/debian/rules b/ubuntu/maverick_automake/applications/basket/debian/rules index 24b31b701..95af63da6 100755 --- a/ubuntu/maverick_automake/applications/basket/debian/rules +++ b/ubuntu/maverick_automake/applications/basket/debian/rules @@ -3,7 +3,7 @@ #export DH_VERBOSE=1 -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info diff --git a/ubuntu/maverick_automake/applications/bibletime/debian/cdbs/kde.mk b/ubuntu/maverick_automake/applications/bibletime/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/maverick_automake/applications/bibletime/debian/cdbs/kde.mk +++ b/ubuntu/maverick_automake/applications/bibletime/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick_automake/applications/bibletime/debian/rules b/ubuntu/maverick_automake/applications/bibletime/debian/rules index 2225129be..977f3da4a 100755 --- a/ubuntu/maverick_automake/applications/bibletime/debian/rules +++ b/ubuntu/maverick_automake/applications/bibletime/debian/rules @@ -9,7 +9,7 @@ DEB_DH_INSTALL_SOURCEDIR := debian DEB_BUILDDIR = $(DEB_SRCDIR) -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info diff --git a/ubuntu/maverick_automake/applications/compizconfig-backend-kconfig/debian/cdbs/kde.mk b/ubuntu/maverick_automake/applications/compizconfig-backend-kconfig/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/maverick_automake/applications/compizconfig-backend-kconfig/debian/cdbs/kde.mk +++ b/ubuntu/maverick_automake/applications/compizconfig-backend-kconfig/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick_automake/applications/compizconfig-backend-kconfig/debian/rules b/ubuntu/maverick_automake/applications/compizconfig-backend-kconfig/debian/rules index 0e85996b0..4aacc890d 100755 --- a/ubuntu/maverick_automake/applications/compizconfig-backend-kconfig/debian/rules +++ b/ubuntu/maverick_automake/applications/compizconfig-backend-kconfig/debian/rules @@ -4,14 +4,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/tde post-patches:: debian/stamp-bootstrap diff --git a/ubuntu/maverick_automake/applications/desktop-effects-kde/debian/rules b/ubuntu/maverick_automake/applications/desktop-effects-kde/debian/rules index cc2cc1242..630c17e4d 100755 --- a/ubuntu/maverick_automake/applications/desktop-effects-kde/debian/rules +++ b/ubuntu/maverick_automake/applications/desktop-effects-kde/debian/rules @@ -2,7 +2,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info diff --git a/ubuntu/maverick_automake/applications/digikam/debian/cdbs/kde.mk b/ubuntu/maverick_automake/applications/digikam/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/maverick_automake/applications/digikam/debian/cdbs/kde.mk +++ b/ubuntu/maverick_automake/applications/digikam/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick_automake/applications/digikam/debian/digikam-kde3.install b/ubuntu/maverick_automake/applications/digikam/debian/digikam-kde3.install index 299a95917..f0a354851 100644 --- a/ubuntu/maverick_automake/applications/digikam/debian/digikam-kde3.install +++ b/ubuntu/maverick_automake/applications/digikam/debian/digikam-kde3.install @@ -1,5 +1,5 @@ opt/kde3/bin/digi* -/opt/kde3/include/kde +/opt/kde3/include/tde opt/kde3/lib /opt/kde3/share/apps/digikam /opt/kde3/share/apps/konqueror/servicemenus/digikam*.desktop diff --git a/ubuntu/maverick_automake/applications/digikam/debian/rules b/ubuntu/maverick_automake/applications/digikam/debian/rules index 6d17f8853..4490608ea 100755 --- a/ubuntu/maverick_automake/applications/digikam/debian/rules +++ b/ubuntu/maverick_automake/applications/digikam/debian/rules @@ -6,7 +6,7 @@ include /usr/share/cdbs/1/rules/utils.mk include debian/cdbs/debian-qt-kde.mk -include /usr/share/gnome-pkg-tools/1/rules/sf-get-source.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info diff --git a/ubuntu/maverick_automake/applications/dolphin/debian/cdbs/kde.mk b/ubuntu/maverick_automake/applications/dolphin/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/maverick_automake/applications/dolphin/debian/cdbs/kde.mk +++ b/ubuntu/maverick_automake/applications/dolphin/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick_automake/applications/dolphin/debian/rules b/ubuntu/maverick_automake/applications/dolphin/debian/rules index 7eb2c2c66..ede258ac2 100755 --- a/ubuntu/maverick_automake/applications/dolphin/debian/rules +++ b/ubuntu/maverick_automake/applications/dolphin/debian/rules @@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info diff --git a/ubuntu/maverick_automake/applications/filelight-l10n/debian/cdbs/kde.mk b/ubuntu/maverick_automake/applications/filelight-l10n/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/maverick_automake/applications/filelight-l10n/debian/cdbs/kde.mk +++ b/ubuntu/maverick_automake/applications/filelight-l10n/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick_automake/applications/filelight-l10n/debian/rules b/ubuntu/maverick_automake/applications/filelight-l10n/debian/rules index 5fd4108c5..95a17eb35 100755 --- a/ubuntu/maverick_automake/applications/filelight-l10n/debian/rules +++ b/ubuntu/maverick_automake/applications/filelight-l10n/debian/rules @@ -7,7 +7,7 @@ include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info @@ -17,7 +17,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine #DEB_PATCHDIRS := debian/patches/common debian/patches #DEB_INSTALL_DOCS_ALL := -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/usr/kde3/lib --with-extra-includes=/opt/kde3/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/usr/kde3/lib --with-extra-includes=/opt/kde3/include/tde post-patches:: debian/stamp-bootstrap diff --git a/ubuntu/maverick_automake/applications/filelight/debian/cdbs/kde.mk b/ubuntu/maverick_automake/applications/filelight/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/maverick_automake/applications/filelight/debian/cdbs/kde.mk +++ b/ubuntu/maverick_automake/applications/filelight/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick_automake/applications/filelight/debian/rules b/ubuntu/maverick_automake/applications/filelight/debian/rules index 0d73ddc4d..4f3418cfc 100755 --- a/ubuntu/maverick_automake/applications/filelight/debian/rules +++ b/ubuntu/maverick_automake/applications/filelight/debian/rules @@ -8,7 +8,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/patchsys-quilt.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info diff --git a/ubuntu/maverick_automake/applications/gtk-qt-engine/debian/rules b/ubuntu/maverick_automake/applications/gtk-qt-engine/debian/rules index 56eb66129..a8e9a7f73 100755 --- a/ubuntu/maverick_automake/applications/gtk-qt-engine/debian/rules +++ b/ubuntu/maverick_automake/applications/gtk-qt-engine/debian/rules @@ -9,7 +9,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info @@ -19,13 +19,13 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib configure/gtk-qt-engine-kde3:: - env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/kde cmake -D CMAKE_INSTALL_PREFIX=/opt/kde3 . + env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/tde cmake -D CMAKE_INSTALL_PREFIX=/opt/kde3 . build/gtk-qt-engine-kde3:: - env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/kde $(MAKE) + env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/tde $(MAKE) install/gtk-qt-engine-kde3:: - env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/kde $(MAKE) install DESTDIR=$(CURDIR)/debian/gtk-qt-engine-kde3 + env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/tde $(MAKE) install DESTDIR=$(CURDIR)/debian/gtk-qt-engine-kde3 mkdir -p $(CURDIR)/debian/gtk-qt-engine-kde3/opt/kde3/share/kgtk/ cp -Rp $(CURDIR)/debian/.gtkrc-2.0-kde4 $(CURDIR)/debian/gtk-qt-engine-kde3/opt/kde3/share/kgtk/ cp -Rp $(CURDIR)/debian/.gtkrc-2.0-kde-kde4 $(CURDIR)/debian/gtk-qt-engine-kde3/opt/kde3/share/kgtk/ diff --git a/ubuntu/maverick_automake/applications/gwenview/debian/cdbs/kde.mk b/ubuntu/maverick_automake/applications/gwenview/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/maverick_automake/applications/gwenview/debian/cdbs/kde.mk +++ b/ubuntu/maverick_automake/applications/gwenview/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick_automake/applications/gwenview/debian/rules b/ubuntu/maverick_automake/applications/gwenview/debian/rules index 9abe0f2a9..68310c09f 100755 --- a/ubuntu/maverick_automake/applications/gwenview/debian/rules +++ b/ubuntu/maverick_automake/applications/gwenview/debian/rules @@ -7,7 +7,7 @@ include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info diff --git a/ubuntu/maverick_automake/applications/k3b/debian/cdbs/kde.mk b/ubuntu/maverick_automake/applications/k3b/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/maverick_automake/applications/k3b/debian/cdbs/kde.mk +++ b/ubuntu/maverick_automake/applications/k3b/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick_automake/applications/k3b/debian/kde3.mk b/ubuntu/maverick_automake/applications/k3b/debian/kde3.mk index e0bcb2308..0d41a4441 100644 --- a/ubuntu/maverick_automake/applications/k3b/debian/kde3.mk +++ b/ubuntu/maverick_automake/applications/k3b/debian/kde3.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama --without-arts $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "/opt/kde3/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "/opt/kde3/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick_automake/applications/k3b/debian/rules b/ubuntu/maverick_automake/applications/k3b/debian/rules index 4a0edb003..fe5e3c0ab 100755 --- a/ubuntu/maverick_automake/applications/k3b/debian/rules +++ b/ubuntu/maverick_automake/applications/k3b/debian/rules @@ -4,14 +4,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include debian/cdbs/kde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde5 +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde5 DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) -DEB_CONFIGURE_EXTRA_FLAGS = --with-k3bsetup=no --with-extra-libs=/opt/kde3/lib --includedir="/opt/kde3/include/kde" +DEB_CONFIGURE_EXTRA_FLAGS = --with-k3bsetup=no --with-extra-libs=/opt/kde3/lib --includedir="/opt/kde3/include/tde" DEB_INSTALL_MANPAGES_k3b = debian/k3b.1 diff --git a/ubuntu/maverick_automake/applications/k9copy/debian/cdbs/kde.mk b/ubuntu/maverick_automake/applications/k9copy/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/maverick_automake/applications/k9copy/debian/cdbs/kde.mk +++ b/ubuntu/maverick_automake/applications/k9copy/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick_automake/applications/k9copy/debian/rules b/ubuntu/maverick_automake/applications/k9copy/debian/rules index 4fbc09fd4..57fc8996d 100755 --- a/ubuntu/maverick_automake/applications/k9copy/debian/rules +++ b/ubuntu/maverick_automake/applications/k9copy/debian/rules @@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/class/kde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info @@ -13,7 +13,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_INSTALL_MANPAGES_k9copy = k9copy-kde3.1 -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --includedir="/opt/kde3/include/kde" --mandir="/opt/kde3/share/man" --infodir="/opt/kde3/share/info" +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --includedir="/opt/kde3/include/tde" --mandir="/opt/kde3/share/man" --infodir="/opt/kde3/share/info" post-patches:: debian/stamp-bootstrap diff --git a/ubuntu/maverick_automake/applications/kaffeine-mozilla/debian/rules b/ubuntu/maverick_automake/applications/kaffeine-mozilla/debian/rules index 3969b2d3a..5531403d1 100755 --- a/ubuntu/maverick_automake/applications/kaffeine-mozilla/debian/rules +++ b/ubuntu/maverick_automake/applications/kaffeine-mozilla/debian/rules @@ -14,7 +14,7 @@ export DH_OPTIONS DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info diff --git a/ubuntu/maverick_automake/applications/kaffeine/debian/cdbs/kde.mk b/ubuntu/maverick_automake/applications/kaffeine/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/maverick_automake/applications/kaffeine/debian/cdbs/kde.mk +++ b/ubuntu/maverick_automake/applications/kaffeine/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick_automake/applications/kaffeine/debian/kaffeine-kde3.install b/ubuntu/maverick_automake/applications/kaffeine/debian/kaffeine-kde3.install index c15880d49..a9bc9a8a7 100644 --- a/ubuntu/maverick_automake/applications/kaffeine/debian/kaffeine-kde3.install +++ b/ubuntu/maverick_automake/applications/kaffeine/debian/kaffeine-kde3.install @@ -13,7 +13,7 @@ debian/tmp/opt/kde3/share/doc/ debian/tmp/opt/kde3/share/icons/ debian/tmp/opt/kde3/share/mimelnk/application/x-kaffeine.desktop debian/tmp/opt/kde3/share/locale/ -debian/tmp/opt/kde3/include/kde/kaffeine/*h +debian/tmp/opt/kde3/include/tde/kaffeine/*h debian/tmp/opt/kde3/share/services/kaffeineoggvorbis.desktop debian/tmp/opt/kde3/lib/kde3/libkaffeineoggvorbis.la debian/tmp/opt/kde3/lib/kde3/libkaffeineoggvorbis.so diff --git a/ubuntu/maverick_automake/applications/kaffeine/debian/rules b/ubuntu/maverick_automake/applications/kaffeine/debian/rules index 8200dd0cd..df6abf852 100755 --- a/ubuntu/maverick_automake/applications/kaffeine/debian/rules +++ b/ubuntu/maverick_automake/applications/kaffeine/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info diff --git a/ubuntu/maverick_automake/applications/katapult/debian/cdbs/kde.mk b/ubuntu/maverick_automake/applications/katapult/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/maverick_automake/applications/katapult/debian/cdbs/kde.mk +++ b/ubuntu/maverick_automake/applications/katapult/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick_automake/applications/katapult/debian/rules b/ubuntu/maverick_automake/applications/katapult/debian/rules index 4b40fd262..0d819995a 100755 --- a/ubuntu/maverick_automake/applications/katapult/debian/rules +++ b/ubuntu/maverick_automake/applications/katapult/debian/rules @@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info diff --git a/ubuntu/maverick_automake/applications/kbarcode/debian/cdbs/kde.mk b/ubuntu/maverick_automake/applications/kbarcode/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/maverick_automake/applications/kbarcode/debian/cdbs/kde.mk +++ b/ubuntu/maverick_automake/applications/kbarcode/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick_automake/applications/kbarcode/debian/rules b/ubuntu/maverick_automake/applications/kbarcode/debian/rules index 75ea19eb3..fecd78311 100755 --- a/ubuntu/maverick_automake/applications/kbarcode/debian/rules +++ b/ubuntu/maverick_automake/applications/kbarcode/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/patchsys-quilt.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info diff --git a/ubuntu/maverick_automake/applications/kbfx/debian/rules b/ubuntu/maverick_automake/applications/kbfx/debian/rules index 4bdcaeca3..f7455fa2d 100755 --- a/ubuntu/maverick_automake/applications/kbfx/debian/rules +++ b/ubuntu/maverick_automake/applications/kbfx/debian/rules @@ -7,21 +7,21 @@ URL = http://www.$(DEB_SOURCE_PACKAGE).org/release/0.4.9/testing/$(UPFILENAME) DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib #CMAKE_LIBRARY_PATH := /opt/kde3/lib -#CMAKE_INCLUDE_PATH := /opt/kde3/include/kde +#CMAKE_INCLUDE_PATH := /opt/kde3/include/tde include debian/cmake.mk include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) -DEB_CMAKE_EXTRA_FLAGS = -DLIB_SUFFIX="" -DCMAKE_LIBRARY_PATH="/opt/kde3/lib" -DCMAKE_INCLUDE_PATH="/opt/kde3/include/kde" -DCMAKE_INSTALL_PREFIX="/opt/kde3/" +DEB_CMAKE_EXTRA_FLAGS = -DLIB_SUFFIX="" -DCMAKE_LIBRARY_PATH="/opt/kde3/lib" -DCMAKE_INCLUDE_PATH="/opt/kde3/include/tde" -DCMAKE_INSTALL_PREFIX="/opt/kde3/" get-orig-source: @@dh_testdir diff --git a/ubuntu/maverick_automake/applications/kchmviewer/debian/debiandirs b/ubuntu/maverick_automake/applications/kchmviewer/debian/debiandirs index a0aa0550c..1efd0b6bb 100644 --- a/ubuntu/maverick_automake/applications/kchmviewer/debian/debiandirs +++ b/ubuntu/maverick_automake/applications/kchmviewer/debian/debiandirs @@ -1,6 +1,6 @@ export kde_prefix=/usr export sysconfdir=/etc -export kde_includedir=/usr/include/kde +export kde_includedir=/usr/include/tde export infodir=/usr/share/info export mandir=/usr/share/man export qtdir=/usr/share/qt3 diff --git a/ubuntu/maverick_automake/applications/kchmviewer/debian/rules b/ubuntu/maverick_automake/applications/kchmviewer/debian/rules index 4adaf88da..b28da52db 100755 --- a/ubuntu/maverick_automake/applications/kchmviewer/debian/rules +++ b/ubuntu/maverick_automake/applications/kchmviewer/debian/rules @@ -9,7 +9,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info @@ -27,7 +27,7 @@ CFLAGS = -Wall -g CONFIGURE_OPTIONS_KDE = \ --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \ --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib \ - --includedir=/opt/kde3/include/kde --mandir=/opt/kde3/share/man \ + --includedir=/opt/kde3/include/tde --mandir=/opt/kde3/share/man \ --with-qt-dir=$(qtdir) \ --sysconfdir=$(sysconfdir) \ --infodir=/opt/kde3/share/info \ diff --git a/ubuntu/maverick_automake/applications/kcpuload/debian/cdbs/kde.mk b/ubuntu/maverick_automake/applications/kcpuload/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/maverick_automake/applications/kcpuload/debian/cdbs/kde.mk +++ b/ubuntu/maverick_automake/applications/kcpuload/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick_automake/applications/kcpuload/debian/rules b/ubuntu/maverick_automake/applications/kcpuload/debian/rules index abd1a1b0c..ecfe01330 100755 --- a/ubuntu/maverick_automake/applications/kcpuload/debian/rules +++ b/ubuntu/maverick_automake/applications/kcpuload/debian/rules @@ -5,7 +5,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info @@ -79,7 +79,7 @@ configure-stamp: # run configure with build tree $(objdir) cd $(objdir) && \ - ../configure --disable-debug --enable-final --libexecdir=/opt/kde3/bin --sysconfdir=/etc --libdir=/opt/kde3/lib --includedir=/opt/include/kde --with-qt-includes=/usr/include/qt3 --mandir=/opt/kde3/share/man --infodir=/opt/kde3/share/info --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib + ../configure --disable-debug --enable-final --libexecdir=/opt/kde3/bin --sysconfdir=/etc --libdir=/opt/kde3/lib --includedir=/opt/include/tde --with-qt-includes=/usr/include/qt3 --mandir=/opt/kde3/share/man --infodir=/opt/kde3/share/info --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib touch configure-stamp diff --git a/ubuntu/maverick_automake/applications/kde-guidance/debian/rules b/ubuntu/maverick_automake/applications/kde-guidance/debian/rules index 6de018978..aa04e3439 100755 --- a/ubuntu/maverick_automake/applications/kde-guidance/debian/rules +++ b/ubuntu/maverick_automake/applications/kde-guidance/debian/rules @@ -12,7 +12,7 @@ DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp DEB_UPDATE_RCD_PARAMS := multiuser DEB_INSTALL_MANPAGES_kde-guidance-kde3 := debian/displayconfig-kde3.1 debian/mountconfig-kde3.1 debian/serviceconfig-kde3.1 debian/userconfig-kde3.1 PYSUPPORT_PATH = $(DEB_DESTDIR)/opt/kde3/share/python-support -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/tde LDFLAGS_APPEND := -L/opt/kde3/lib install/kde-guidance-kde3:: diff --git a/ubuntu/maverick_automake/applications/kde-style-lipstik/debian/rules b/ubuntu/maverick_automake/applications/kde-style-lipstik/debian/rules index dd1616d51..7fca75e60 100755 --- a/ubuntu/maverick_automake/applications/kde-style-lipstik/debian/rules +++ b/ubuntu/maverick_automake/applications/kde-style-lipstik/debian/rules @@ -9,7 +9,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info @@ -37,7 +37,7 @@ config.status: patch configure CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \ --prefix=/opt/kde3 --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info \ --disable-debug --enable-final \ - --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/kde + --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/tde # --with-qt-includes=/usr/include/qt3 --with-qt-libraries=/usr/lib/qt3/ build: build-stamp diff --git a/ubuntu/maverick_automake/applications/kde-style-qtcurve/debian/rules b/ubuntu/maverick_automake/applications/kde-style-qtcurve/debian/rules index 66599ff61..4e41fdf0f 100755 --- a/ubuntu/maverick_automake/applications/kde-style-qtcurve/debian/rules +++ b/ubuntu/maverick_automake/applications/kde-style-qtcurve/debian/rules @@ -9,7 +9,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info @@ -41,7 +41,7 @@ ifneq "$(wildcard /usr/share/misc/config.guess)" "" cp -f /usr/share/misc/config.guess config.guess endif mkdir build - cd build; env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/kde cmake .. + cd build; env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/tde cmake .. touch config.status build: build-stamp @@ -50,7 +50,7 @@ build-stamp: config.status dh_testdir # Add here commands to compile the package. - cd build; env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/kde $(MAKE) + cd build; env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/tde $(MAKE) #docbook-to-man debian/kde-style-qtcurve.sgml > kde-style-qtcurve.1 touch $@ @@ -74,7 +74,7 @@ install: build dh_installdirs # Add here commands to install the package into debian/kde-style-qtcurve-kde3. - cd build; env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/kde $(MAKE) DESTDIR=$(CURDIR)/debian/kde-style-qtcurve-kde3 install + cd build; env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/tde $(MAKE) DESTDIR=$(CURDIR)/debian/kde-style-qtcurve-kde3 install # Build architecture-independent files here. diff --git a/ubuntu/maverick_automake/applications/kde-systemsettings/debian/cdbs/kde.mk b/ubuntu/maverick_automake/applications/kde-systemsettings/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/maverick_automake/applications/kde-systemsettings/debian/cdbs/kde.mk +++ b/ubuntu/maverick_automake/applications/kde-systemsettings/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick_automake/applications/kde-systemsettings/debian/rules b/ubuntu/maverick_automake/applications/kde-systemsettings/debian/rules index edce0b70e..edf857fe8 100755 --- a/ubuntu/maverick_automake/applications/kde-systemsettings/debian/rules +++ b/ubuntu/maverick_automake/applications/kde-systemsettings/debian/rules @@ -6,7 +6,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include debian/cdbs/kde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info diff --git a/ubuntu/maverick_automake/applications/kdesudo/debian/cdbs/kde.mk b/ubuntu/maverick_automake/applications/kdesudo/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/maverick_automake/applications/kdesudo/debian/cdbs/kde.mk +++ b/ubuntu/maverick_automake/applications/kdesudo/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick_automake/applications/kdesudo/debian/rules b/ubuntu/maverick_automake/applications/kdesudo/debian/rules index 7a35701f7..d103095b0 100755 --- a/ubuntu/maverick_automake/applications/kdesudo/debian/rules +++ b/ubuntu/maverick_automake/applications/kdesudo/debian/rules @@ -4,14 +4,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include debian/cdbs/kde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/tde DEB_INSTALL_MANPAGES_kdesudo-kde3 = kdesudo-kde3.1 diff --git a/ubuntu/maverick_automake/applications/kdesvn/debian/libsvnqt-kde3-dev.install b/ubuntu/maverick_automake/applications/kdesvn/debian/libsvnqt-kde3-dev.install index a0adce2e6..15c878d0f 100644 --- a/ubuntu/maverick_automake/applications/kdesvn/debian/libsvnqt-kde3-dev.install +++ b/ubuntu/maverick_automake/applications/kdesvn/debian/libsvnqt-kde3-dev.install @@ -1,2 +1,2 @@ debian/tmp/opt/kde3/lib*/*.so -debian/tmp/opt/kde3/include/kde/svnqt/ +debian/tmp/opt/kde3/include/tde/svnqt/ diff --git a/ubuntu/maverick_automake/applications/kdesvn/debian/rules b/ubuntu/maverick_automake/applications/kdesvn/debian/rules index f7ce7d21e..3ca36df63 100755 --- a/ubuntu/maverick_automake/applications/kdesvn/debian/rules +++ b/ubuntu/maverick_automake/applications/kdesvn/debian/rules @@ -7,14 +7,14 @@ include /usr/share/cdbs/1/class/cmake.mk include /usr/share/cdbs/1/rules/utils.mk include /usr/share/cdbs/1/rules/patchsys-quilt.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) -DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_LIBRARY_PATH="/opt/kde3/lib" -DCMAKE_INCLUDE_PATH="/opt/kde3/include/kde" -DCMAKE_CXX_FLAGS="-I/opt/kde3/include/kde" -DCMAKE_LDFLAGS="-L/opt/kde3/lib" +DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_LIBRARY_PATH="/opt/kde3/lib" -DCMAKE_INCLUDE_PATH="/opt/kde3/include/tde" -DCMAKE_CXX_FLAGS="-I/opt/kde3/include/tde" -DCMAKE_LDFLAGS="-L/opt/kde3/lib" DEB_COMPRESS_EXCLUDE := .dcl .docbook -license .tag .sty .el @@ -25,7 +25,7 @@ DEB_SHLIBDEPS_INCLUDE := debian/tmp/opt/kde3/lib common-install-impl:: mkdir -p debian/tmp/opt/kde3 - mkdir -p debian/tmp/opt/kde3/include/kde + mkdir -p debian/tmp/opt/kde3/include/tde mkdir -p debian/tmp/usr/lib mkdir -p debian/tmp/opt/kde3/lib mkdir -p debian/tmp/usr/lib/kde3 @@ -40,7 +40,7 @@ common-install-impl:: cp -Rp debian/tmp/usr/lib/* debian/tmp/opt/kde3/lib/ cp -Rp debian/tmp/usr/lib64/* debian/tmp/opt/kde3/lib/ cp -Rp debian/tmp/usr/share debian/tmp/opt/kde3/ - cp -Rp debian/tmp/usr/include/* debian/tmp/opt/kde3/include/kde/ + cp -Rp debian/tmp/usr/include/* debian/tmp/opt/kde3/include/tde/ rm -rf debian/tmp/usr/bin rm -rf debian/tmp/usr/lib/kde3 rm -rf debian/tmp/usr/lib64/kde3 diff --git a/ubuntu/maverick_automake/applications/kdiff3/debian/cdbs/kde.mk b/ubuntu/maverick_automake/applications/kdiff3/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/maverick_automake/applications/kdiff3/debian/cdbs/kde.mk +++ b/ubuntu/maverick_automake/applications/kdiff3/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick_automake/applications/kdiff3/debian/rules b/ubuntu/maverick_automake/applications/kdiff3/debian/rules index 47c04654d..9f888108b 100755 --- a/ubuntu/maverick_automake/applications/kdiff3/debian/rules +++ b/ubuntu/maverick_automake/applications/kdiff3/debian/rules @@ -4,7 +4,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info @@ -37,7 +37,7 @@ config.status: cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in make -f admin/Makefile.common cvs - CFLAGS="$(CFLAGS)" ./configure --disable-rpath --prefix=/opt/kde3 --with-qt-includes=/usr/include/qt3 --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --mandir=/opt/kde3/share/man --infodir=/opt/kde3/share/info --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/kde + CFLAGS="$(CFLAGS)" ./configure --disable-rpath --prefix=/opt/kde3 --with-qt-includes=/usr/include/qt3 --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --mandir=/opt/kde3/share/man --infodir=/opt/kde3/share/info --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/tde build: build-stamp diff --git a/ubuntu/maverick_automake/applications/kdirstat/debian/cdbs/kde.mk b/ubuntu/maverick_automake/applications/kdirstat/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/maverick_automake/applications/kdirstat/debian/cdbs/kde.mk +++ b/ubuntu/maverick_automake/applications/kdirstat/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick_automake/applications/kdirstat/debian/rules b/ubuntu/maverick_automake/applications/kdirstat/debian/rules index 0fc2239be..94480096a 100755 --- a/ubuntu/maverick_automake/applications/kdirstat/debian/rules +++ b/ubuntu/maverick_automake/applications/kdirstat/debian/rules @@ -4,14 +4,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/tde LDFLAGS += -Wl,--as-needed diff --git a/ubuntu/maverick_automake/applications/kdpkg/debian/rules b/ubuntu/maverick_automake/applications/kdpkg/debian/rules index a28235e24..523c190f9 100755 --- a/ubuntu/maverick_automake/applications/kdpkg/debian/rules +++ b/ubuntu/maverick_automake/applications/kdpkg/debian/rules @@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/autotools.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info diff --git a/ubuntu/maverick_automake/applications/keep/debian/cdbs/kde.mk b/ubuntu/maverick_automake/applications/keep/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/maverick_automake/applications/keep/debian/cdbs/kde.mk +++ b/ubuntu/maverick_automake/applications/keep/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick_automake/applications/keep/debian/patches/kubuntu_01_kdepot.diff b/ubuntu/maverick_automake/applications/keep/debian/patches/kubuntu_01_kdepot.diff index 55238c41a..782118729 100644 --- a/ubuntu/maverick_automake/applications/keep/debian/patches/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick_automake/applications/keep/debian/patches/kubuntu_01_kdepot.diff @@ -5,7 +5,7 @@ diff -Nur keep-0.4.0/admin/cvs.sh keep-0.4.0.new/admin/cvs.sh if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/usr/include/kde/kde.pot ++kdepotpath=/usr/include/tde/kde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -16,5 +16,5 @@ diff -Nur keep-0.4.0/admin/cvs.sh keep-0.4.0.new/admin/cvs.sh - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot if ! test -f $kdepotpath; then - kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot + kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot fi diff --git a/ubuntu/maverick_automake/applications/keep/debian/rules b/ubuntu/maverick_automake/applications/keep/debian/rules index 56e2ebe81..97c2a8db1 100755 --- a/ubuntu/maverick_automake/applications/keep/debian/rules +++ b/ubuntu/maverick_automake/applications/keep/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info @@ -14,7 +14,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_INSTALL_MANPAGES_keep := keep.1 -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/tde post-patches:: debian/stamp-bootstrap diff --git a/ubuntu/maverick_automake/applications/kerry/debian/cdbs/kde.mk b/ubuntu/maverick_automake/applications/kerry/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/maverick_automake/applications/kerry/debian/cdbs/kde.mk +++ b/ubuntu/maverick_automake/applications/kerry/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick_automake/applications/kerry/debian/rules b/ubuntu/maverick_automake/applications/kerry/debian/rules index da887ee76..2ea562d2d 100755 --- a/ubuntu/maverick_automake/applications/kerry/debian/rules +++ b/ubuntu/maverick_automake/applications/kerry/debian/rules @@ -5,7 +5,7 @@ include /usr/share/cdbs/1/rules/simple-patchsys.mk # include /usr/share/cdbs/1/class/kde.mk include debian/cdbs/debian-qt-kde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info diff --git a/ubuntu/maverick_automake/applications/kgtk-qt3/debian/cdbs/kde.mk b/ubuntu/maverick_automake/applications/kgtk-qt3/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/maverick_automake/applications/kgtk-qt3/debian/cdbs/kde.mk +++ b/ubuntu/maverick_automake/applications/kgtk-qt3/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick_automake/applications/kgtk-qt3/debian/rules b/ubuntu/maverick_automake/applications/kgtk-qt3/debian/rules index 8abf4e1bb..06af1d1f6 100755 --- a/ubuntu/maverick_automake/applications/kgtk-qt3/debian/rules +++ b/ubuntu/maverick_automake/applications/kgtk-qt3/debian/rules @@ -9,7 +9,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info @@ -20,12 +20,12 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib configure/kgtk-qt3-kde3:: - env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/kde cmake -D CMAKE_INSTALL_PREFIX=/opt/kde3 . + env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/tde cmake -D CMAKE_INSTALL_PREFIX=/opt/kde3 . build/kgtk-qt3-kde3:: - env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/kde $(MAKE) + env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/tde $(MAKE) install/kgtk-qt3-kde3:: - env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/kde $(MAKE) install DESTDIR=$(CURDIR)/debian/kgtk-qt3-kde3 + env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/tde $(MAKE) install DESTDIR=$(CURDIR)/debian/kgtk-qt3-kde3 mkdir -p $(CURDIR)/debian/kgtk-qt3-kde3/opt/kde3/share/kgtk/ cp -Rp $(CURDIR)/debian/preload $(CURDIR)/debian/kgtk-qt3-kde3/opt/kde3/share/kgtk/ diff --git a/ubuntu/maverick_automake/applications/kile/debian/cdbs/kde.mk b/ubuntu/maverick_automake/applications/kile/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/maverick_automake/applications/kile/debian/cdbs/kde.mk +++ b/ubuntu/maverick_automake/applications/kile/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick_automake/applications/kile/debian/rules b/ubuntu/maverick_automake/applications/kile/debian/rules index 6ec0fe0ce..812129d56 100755 --- a/ubuntu/maverick_automake/applications/kile/debian/rules +++ b/ubuntu/maverick_automake/applications/kile/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/patchsys-quilt.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info @@ -15,7 +15,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--as-needed" DEB_DH_INSTALL_ARGS := --sourcedir=debian/tmp DEB_INSTALL_MANPAGES_kile := debian/kile.1 -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/tde post-patches:: debian/stamp-bootstrap diff --git a/ubuntu/maverick_automake/applications/kima/debian/rules b/ubuntu/maverick_automake/applications/kima/debian/rules index 28d982425..8ca5c7a4b 100755 --- a/ubuntu/maverick_automake/applications/kima/debian/rules +++ b/ubuntu/maverick_automake/applications/kima/debian/rules @@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/autotools.mk DEB_CONFIGURE_EXTRA_FLAGS += --disable-rpath -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info diff --git a/ubuntu/maverick_automake/applications/kio-apt/debian/cdbs/kde.mk b/ubuntu/maverick_automake/applications/kio-apt/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/maverick_automake/applications/kio-apt/debian/cdbs/kde.mk +++ b/ubuntu/maverick_automake/applications/kio-apt/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick_automake/applications/kio-apt/debian/rules b/ubuntu/maverick_automake/applications/kio-apt/debian/rules index c0da898ed..4519af06b 100755 --- a/ubuntu/maverick_automake/applications/kio-apt/debian/rules +++ b/ubuntu/maverick_automake/applications/kio-apt/debian/rules @@ -5,14 +5,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include debian/cdbs/kde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/tde post-patches:: debian/stamp-bootstrap diff --git a/ubuntu/maverick_automake/applications/kio-locate/debian/rules b/ubuntu/maverick_automake/applications/kio-locate/debian/rules index b0cae30c5..feca774bb 100755 --- a/ubuntu/maverick_automake/applications/kio-locate/debian/rules +++ b/ubuntu/maverick_automake/applications/kio-locate/debian/rules @@ -2,7 +2,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info diff --git a/ubuntu/maverick_automake/applications/kio-umountwrapper/debian/cdbs/kde.mk b/ubuntu/maverick_automake/applications/kio-umountwrapper/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/maverick_automake/applications/kio-umountwrapper/debian/cdbs/kde.mk +++ b/ubuntu/maverick_automake/applications/kio-umountwrapper/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick_automake/applications/kio-umountwrapper/debian/rules b/ubuntu/maverick_automake/applications/kio-umountwrapper/debian/rules index c29c730f8..b1fb26a87 100755 --- a/ubuntu/maverick_automake/applications/kio-umountwrapper/debian/rules +++ b/ubuntu/maverick_automake/applications/kio-umountwrapper/debian/rules @@ -4,14 +4,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include debian/cdbs/kde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/tde post-patches:: debian/stamp-bootstrap diff --git a/ubuntu/maverick_automake/applications/kmplayer/debian/cdbs/kde.mk b/ubuntu/maverick_automake/applications/kmplayer/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/maverick_automake/applications/kmplayer/debian/cdbs/kde.mk +++ b/ubuntu/maverick_automake/applications/kmplayer/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick_automake/applications/kmplayer/debian/rules b/ubuntu/maverick_automake/applications/kmplayer/debian/rules index 7f45f88c3..627d1d6b3 100755 --- a/ubuntu/maverick_automake/applications/kmplayer/debian/rules +++ b/ubuntu/maverick_automake/applications/kmplayer/debian/rules @@ -5,7 +5,7 @@ include /usr/share/cdbs/1/rules/simple-patchsys.mk include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info @@ -18,7 +18,7 @@ ifeq ($(GCC_VERSION),4.3) CXX = g++ -fpermissive endif -DEB_CONFIGURE_EXTRA_FLAGS := --enable-maintainer-mode --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --enable-maintainer-mode --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/tde DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp DEB_INSTALL_MANPAGES_kmplayer = kmplayer.1 diff --git a/ubuntu/maverick_automake/applications/kmyfirewall/debian/debiandirs b/ubuntu/maverick_automake/applications/kmyfirewall/debian/debiandirs index 0fb38ea11..3f7ee894a 100644 --- a/ubuntu/maverick_automake/applications/kmyfirewall/debian/debiandirs +++ b/ubuntu/maverick_automake/applications/kmyfirewall/debian/debiandirs @@ -1,6 +1,6 @@ export kde_prefix=/usr export sysconfdir=/etc -export kde_includedir=/usr/include/kde +export kde_includedir=/usr/include/tde export infodir=/usr/share/info export mandir=/usr/share/man export qtdir=/usr/share/qt3 diff --git a/ubuntu/maverick_automake/applications/kmyfirewall/debian/rules b/ubuntu/maverick_automake/applications/kmyfirewall/debian/rules index e0333883c..61ad9e5cb 100755 --- a/ubuntu/maverick_automake/applications/kmyfirewall/debian/rules +++ b/ubuntu/maverick_automake/applications/kmyfirewall/debian/rules @@ -6,7 +6,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info @@ -56,7 +56,7 @@ endif ifneq "$(wildcard /usr/share/misc/config.guess)" "" cp -f /usr/share/misc/config.guess config.guess endif - CFLAGS="$(CFLAGS)" PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/kde ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) $(configkde) --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/kde + CFLAGS="$(CFLAGS)" PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/tde ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) $(configkde) --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/tde build: build-stamp @@ -65,7 +65,7 @@ build-stamp: config.status dh_testdir # Add here commands to compile the package. - env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/kde $(MAKE) + env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/tde $(MAKE) touch build-stamp @@ -94,7 +94,7 @@ install: build dh_clean -k # Add here commands to install the package into debian/kmyfirewall. - env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/kde $(MAKE) install DESTDIR=$(CURDIR)/debian/kmyfirewall-kde3 + env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/tde $(MAKE) install DESTDIR=$(CURDIR)/debian/kmyfirewall-kde3 rm -f debian/kmyfirewall-kde3/opt/kde3/lib/*.so chrpath -d debian/kmyfirewall-kde3/opt/kde3/bin/kmyfirewall debian/kmyfirewall-kde3/opt/kde3/lib/*.so.* debian/kmyfirewall-kde3/opt/kde3/lib/kde3/*.so diff --git a/ubuntu/maverick_automake/applications/knemo/debian/cdbs/kde.mk b/ubuntu/maverick_automake/applications/knemo/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/maverick_automake/applications/knemo/debian/cdbs/kde.mk +++ b/ubuntu/maverick_automake/applications/knemo/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick_automake/applications/knemo/debian/rules b/ubuntu/maverick_automake/applications/knemo/debian/rules index ebd1b1375..ad411b75e 100755 --- a/ubuntu/maverick_automake/applications/knemo/debian/rules +++ b/ubuntu/maverick_automake/applications/knemo/debian/rules @@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include debian/cdbs/kde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info @@ -13,7 +13,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_INSTALL_DOCS_knemo = -XNEWS -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/tde post-patches:: debian/stamp-bootstrap diff --git a/ubuntu/maverick_automake/applications/knetload/debian/rules b/ubuntu/maverick_automake/applications/knetload/debian/rules index 717d830b4..3f76befc1 100755 --- a/ubuntu/maverick_automake/applications/knetload/debian/rules +++ b/ubuntu/maverick_automake/applications/knetload/debian/rules @@ -2,7 +2,7 @@ # Sample debian/rules that uses debhelper. # GNU copyright 1997 to 1999 by Joey Hess. -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info @@ -74,7 +74,7 @@ configure-stamp: # run configure with build tree $(objdir) cd $(objdir) && \ - ../configure $(configkde) --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/kde + ../configure $(configkde) --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/tde touch configure-stamp diff --git a/ubuntu/maverick_automake/applications/knetstats/debian/cdbs/kde.mk b/ubuntu/maverick_automake/applications/knetstats/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/maverick_automake/applications/knetstats/debian/cdbs/kde.mk +++ b/ubuntu/maverick_automake/applications/knetstats/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick_automake/applications/knetstats/debian/rules b/ubuntu/maverick_automake/applications/knetstats/debian/rules index c2b268692..ebd2e2c1e 100755 --- a/ubuntu/maverick_automake/applications/knetstats/debian/rules +++ b/ubuntu/maverick_automake/applications/knetstats/debian/rules @@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include debian/cdbs/kde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info diff --git a/ubuntu/maverick_automake/applications/knetworkmanager/debian/cdbs/kde.mk b/ubuntu/maverick_automake/applications/knetworkmanager/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/maverick_automake/applications/knetworkmanager/debian/cdbs/kde.mk +++ b/ubuntu/maverick_automake/applications/knetworkmanager/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick_automake/applications/knetworkmanager/debian/rules b/ubuntu/maverick_automake/applications/knetworkmanager/debian/rules index 802c24008..95f9fb7ba 100755 --- a/ubuntu/maverick_automake/applications/knetworkmanager/debian/rules +++ b/ubuntu/maverick_automake/applications/knetworkmanager/debian/rules @@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/patchsys-quilt.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info diff --git a/ubuntu/maverick_automake/applications/knights/debian/debiandirs b/ubuntu/maverick_automake/applications/knights/debian/debiandirs index 62b4b368a..3310385b4 100644 --- a/ubuntu/maverick_automake/applications/knights/debian/debiandirs +++ b/ubuntu/maverick_automake/applications/knights/debian/debiandirs @@ -1,6 +1,6 @@ export kde_prefix=/usr export sysconfdir=/etc -export kde_includedir=/usr/include/kde +export kde_includedir=/usr/include/tde export infodir=/usr/share/info export mandir=/usr/share/man export qtdir=/usr/share/qt3 diff --git a/ubuntu/maverick_automake/applications/knights/debian/rules b/ubuntu/maverick_automake/applications/knights/debian/rules index 29ea724f0..78daf9b03 100755 --- a/ubuntu/maverick_automake/applications/knights/debian/rules +++ b/ubuntu/maverick_automake/applications/knights/debian/rules @@ -6,7 +6,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info @@ -51,7 +51,7 @@ config.status: configure patch if [ -f doc/Makefile.in ]; then cp doc/Makefile.in doc/Makefile.in.backup; else mv doc/Makefile.in.backup doc/Makefile.in; fi CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \ - --disable-debug --disable-rpath --sysconfdir=/etc --includedir=/opt/kde3/include/kde --infodir=/opt/kde3/share/info --mandir=/opt/kde3/share/man --with-qt-dir=/usr/share/qt3 --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib + --disable-debug --disable-rpath --sysconfdir=/etc --includedir=/opt/kde3/include/tde --infodir=/opt/kde3/share/info --mandir=/opt/kde3/share/man --with-qt-dir=/usr/share/qt3 --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib build: build-stamp diff --git a/ubuntu/maverick_automake/applications/knowit/debian/rules b/ubuntu/maverick_automake/applications/knowit/debian/rules index 14ca8b2c8..4df8d63e7 100755 --- a/ubuntu/maverick_automake/applications/knowit/debian/rules +++ b/ubuntu/maverick_automake/applications/knowit/debian/rules @@ -7,7 +7,7 @@ DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info diff --git a/ubuntu/maverick_automake/applications/knutclient/debian/rules b/ubuntu/maverick_automake/applications/knutclient/debian/rules index d6a7e77ec..f80dda84c 100755 --- a/ubuntu/maverick_automake/applications/knutclient/debian/rules +++ b/ubuntu/maverick_automake/applications/knutclient/debian/rules @@ -11,7 +11,7 @@ DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info diff --git a/ubuntu/maverick_automake/applications/koffice/debian/cdbs/kde.mk b/ubuntu/maverick_automake/applications/koffice/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/maverick_automake/applications/koffice/debian/cdbs/kde.mk +++ b/ubuntu/maverick_automake/applications/koffice/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick_automake/applications/koffice/debian/koffice-dev-kde3.install b/ubuntu/maverick_automake/applications/koffice/debian/koffice-dev-kde3.install index c16c93985..479cc82aa 100644 --- a/ubuntu/maverick_automake/applications/koffice/debian/koffice-dev-kde3.install +++ b/ubuntu/maverick_automake/applications/koffice/debian/koffice-dev-kde3.install @@ -1,4 +1,4 @@ -debian/tmp/opt/kde3/include/kde +debian/tmp/opt/kde3/include/tde debian/tmp/opt/kde3/lib/libkarboncommon.la debian/tmp/opt/kde3/lib/libkarboncommon.so debian/tmp/opt/kde3/lib/libkchartcommon.la diff --git a/ubuntu/maverick_automake/applications/koffice/debian/rules b/ubuntu/maverick_automake/applications/koffice/debian/rules index 4ac1792e5..e8e6bfd40 100755 --- a/ubuntu/maverick_automake/applications/koffice/debian/rules +++ b/ubuntu/maverick_automake/applications/koffice/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info diff --git a/ubuntu/maverick_automake/applications/konversation/debian/cdbs/kde.mk b/ubuntu/maverick_automake/applications/konversation/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/maverick_automake/applications/konversation/debian/cdbs/kde.mk +++ b/ubuntu/maverick_automake/applications/konversation/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick_automake/applications/konversation/debian/rules b/ubuntu/maverick_automake/applications/konversation/debian/rules index d6b5c064e..74c8823fc 100755 --- a/ubuntu/maverick_automake/applications/konversation/debian/rules +++ b/ubuntu/maverick_automake/applications/konversation/debian/rules @@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/patchsys-quilt.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info @@ -13,7 +13,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_DH_STRIP_ARGS := --dbg-package=konversation-kde3-dbg DEB_INSTALL_DOCS_ALL = -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/tde post-patches:: debian/stamp-bootstrap diff --git a/ubuntu/maverick_automake/applications/kopete-otr/debian/cdbs/kde.mk b/ubuntu/maverick_automake/applications/kopete-otr/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/maverick_automake/applications/kopete-otr/debian/cdbs/kde.mk +++ b/ubuntu/maverick_automake/applications/kopete-otr/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick_automake/applications/kopete-otr/debian/rules b/ubuntu/maverick_automake/applications/kopete-otr/debian/rules index 8df8fc911..0e26fd9c8 100755 --- a/ubuntu/maverick_automake/applications/kopete-otr/debian/rules +++ b/ubuntu/maverick_automake/applications/kopete-otr/debian/rules @@ -3,14 +3,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/kde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/tde post-patches:: debian/stamp-bootstrap diff --git a/ubuntu/maverick_automake/applications/kpicosim/debian/rules b/ubuntu/maverick_automake/applications/kpicosim/debian/rules index b210dc942..a1949f79e 100755 --- a/ubuntu/maverick_automake/applications/kpicosim/debian/rules +++ b/ubuntu/maverick_automake/applications/kpicosim/debian/rules @@ -9,7 +9,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info @@ -52,7 +52,7 @@ build-stamp: config.status dh_testdir # Add here commands to compile the package. - env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/kde $(MAKE) + env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/tde $(MAKE) #docbook-to-man debian/kpicosim.sgml > kpicosim.1 touch build-stamp diff --git a/ubuntu/maverick_automake/applications/kpilot/debian/cdbs/kde.mk b/ubuntu/maverick_automake/applications/kpilot/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick_automake/applications/kpilot/debian/cdbs/kde.mk +++ b/ubuntu/maverick_automake/applications/kpilot/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick_automake/applications/kpilot/debian/rules b/ubuntu/maverick_automake/applications/kpilot/debian/rules index 8b49a1a4b..abfd36cfc 100755 --- a/ubuntu/maverick_automake/applications/kpilot/debian/rules +++ b/ubuntu/maverick_automake/applications/kpilot/debian/rules @@ -3,14 +3,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/kde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde post-patches:: debian/stamp-bootstrap diff --git a/ubuntu/maverick_automake/applications/kpowersave/debian/cdbs/kde.mk b/ubuntu/maverick_automake/applications/kpowersave/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/maverick_automake/applications/kpowersave/debian/cdbs/kde.mk +++ b/ubuntu/maverick_automake/applications/kpowersave/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick_automake/applications/kpowersave/debian/rules b/ubuntu/maverick_automake/applications/kpowersave/debian/rules index 135ce2862..25f0708df 100755 --- a/ubuntu/maverick_automake/applications/kpowersave/debian/rules +++ b/ubuntu/maverick_automake/applications/kpowersave/debian/rules @@ -4,7 +4,7 @@ include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info @@ -12,7 +12,7 @@ DEB_CONFIGURE_INFODIR := /opt/kde3/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_INSTALL_DOCS_ALL := AUTHORS NEWS -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/tde post-patches:: debian/stamp-bootstrap diff --git a/ubuntu/maverick_automake/applications/kradio/debian/rules b/ubuntu/maverick_automake/applications/kradio/debian/rules index d9a2241b4..71ffdf9b0 100755 --- a/ubuntu/maverick_automake/applications/kradio/debian/rules +++ b/ubuntu/maverick_automake/applications/kradio/debian/rules @@ -9,7 +9,7 @@ DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info diff --git a/ubuntu/maverick_automake/applications/krename/debian/rules b/ubuntu/maverick_automake/applications/krename/debian/rules index f8aeeb92b..332f8a71f 100755 --- a/ubuntu/maverick_automake/applications/krename/debian/rules +++ b/ubuntu/maverick_automake/applications/krename/debian/rules @@ -6,14 +6,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/tde ### Libtool and Automake updates post-patches:: debian/stamp-autothings-update diff --git a/ubuntu/maverick_automake/applications/krusader/debian/cdbs/kde.mk b/ubuntu/maverick_automake/applications/krusader/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/maverick_automake/applications/krusader/debian/cdbs/kde.mk +++ b/ubuntu/maverick_automake/applications/krusader/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick_automake/applications/krusader/debian/rules b/ubuntu/maverick_automake/applications/krusader/debian/rules index fded0c074..5ddb5ac8b 100755 --- a/ubuntu/maverick_automake/applications/krusader/debian/rules +++ b/ubuntu/maverick_automake/applications/krusader/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info @@ -16,7 +16,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_DESTDIR = $(CURDIR)/debian/krusader-kde3/ -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/tde post-patches:: debian/stamp-bootstrap diff --git a/ubuntu/maverick_automake/applications/ksplash-engine-moodin/debian/debiandirs b/ubuntu/maverick_automake/applications/ksplash-engine-moodin/debian/debiandirs index fab210452..e760e0339 100644 --- a/ubuntu/maverick_automake/applications/ksplash-engine-moodin/debian/debiandirs +++ b/ubuntu/maverick_automake/applications/ksplash-engine-moodin/debian/debiandirs @@ -1,6 +1,6 @@ export kde_prefix=/opt/kde3 export sysconfdir=/etc -export kde_includedir=/opt/kde3/include/kde +export kde_includedir=/opt/kde3/include/tde export infodir=/opt/kde3/share/info export mandir=/opt/kde3/share/man export qtdir=/opt/kde3/share/qt3 diff --git a/ubuntu/maverick_automake/applications/ksplash-engine-moodin/debian/rules b/ubuntu/maverick_automake/applications/ksplash-engine-moodin/debian/rules index e99736549..bc9ab21dc 100755 --- a/ubuntu/maverick_automake/applications/ksplash-engine-moodin/debian/rules +++ b/ubuntu/maverick_automake/applications/ksplash-engine-moodin/debian/rules @@ -4,7 +4,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info @@ -49,7 +49,7 @@ patch: patch-stamp config.status: configure patch dh_testdir - CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) $(configkde) --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/kde + CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) $(configkde) --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/tde build: build-stamp diff --git a/ubuntu/maverick_automake/applications/ksquirrel/debian/rules b/ubuntu/maverick_automake/applications/ksquirrel/debian/rules index ab60b519d..9d05b71b2 100755 --- a/ubuntu/maverick_automake/applications/ksquirrel/debian/rules +++ b/ubuntu/maverick_automake/applications/ksquirrel/debian/rules @@ -9,7 +9,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info diff --git a/ubuntu/maverick_automake/applications/ksystemlog/debian/cdbs/kde.mk b/ubuntu/maverick_automake/applications/ksystemlog/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/maverick_automake/applications/ksystemlog/debian/cdbs/kde.mk +++ b/ubuntu/maverick_automake/applications/ksystemlog/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick_automake/applications/ksystemlog/debian/rules b/ubuntu/maverick_automake/applications/ksystemlog/debian/rules index 7d54a2353..52740d44f 100755 --- a/ubuntu/maverick_automake/applications/ksystemlog/debian/rules +++ b/ubuntu/maverick_automake/applications/ksystemlog/debian/rules @@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info @@ -13,7 +13,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_INSTALL_MANPAGES_ksystemlog-kde3 := ksystemlog.1 -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/tde post-patches:: debian/stamp-bootstrap diff --git a/ubuntu/maverick_automake/applications/ktechlab/debian/debiandirs b/ubuntu/maverick_automake/applications/ktechlab/debian/debiandirs index 22305506e..c43770893 100644 --- a/ubuntu/maverick_automake/applications/ktechlab/debian/debiandirs +++ b/ubuntu/maverick_automake/applications/ktechlab/debian/debiandirs @@ -1,7 +1,7 @@ export kde_confdir=/etc/kde3 export kde_prefix=/opt/kde3 export kde_bindir=/opt/kde3/bin -export kde_includedir=/opt/kde3/include/kde +export kde_includedir=/opt/kde3/include/tde export kde_libdir=/opt/kde3/lib export kde_cgidir=/opt/kde3/lib/cgi-bin export kde_moduledir=/opt/kde3/lib/kde3 diff --git a/ubuntu/maverick_automake/applications/ktechlab/debian/rules b/ubuntu/maverick_automake/applications/ktechlab/debian/rules index 6a006f9b9..148f5d807 100755 --- a/ubuntu/maverick_automake/applications/ktechlab/debian/rules +++ b/ubuntu/maverick_automake/applications/ktechlab/debian/rules @@ -5,7 +5,7 @@ -include debian/debiandirs -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info @@ -45,7 +45,7 @@ endif ifneq "$(wildcard /usr/share/misc/config.guess)" "" cp -f /usr/share/misc/config.guess config.guess endif - PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/kde CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) $(configkde) --prefix=/opt/kde3 + PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/tde CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) $(configkde) --prefix=/opt/kde3 build: build-stamp debian/ktechlab.xpm @@ -55,7 +55,7 @@ build-stamp: config.status make -f admin/Makefile.common cvs touch debian/stamp-bootstrap - env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/kde $(MAKE) + env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/tde $(MAKE) touch build-stamp clean: @@ -85,8 +85,8 @@ install: build dh_testroot dh_clean -k dh_installdirs - env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/kde $(MAKE) install DESTDIR=$(CURDIR)/debian/ktechlab-kde3 - env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/kde $(MAKE) -C po install DESTDIR=$(CURDIR)/debian/ktechlab-kde3 + env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/tde $(MAKE) install DESTDIR=$(CURDIR)/debian/ktechlab-kde3 + env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/tde $(MAKE) -C po install DESTDIR=$(CURDIR)/debian/ktechlab-kde3 install -D -m 644 debian/ktechlab.xpm debian/ktechlab-kde3/opt/kde3/share/pixmaps/ktechlab.xpm chrpath -d $(CURDIR)/debian/ktechlab-kde3/opt/kde3/bin/ktechlab chrpath -d $(CURDIR)/debian/ktechlab-kde3/opt/kde3/bin/microbe diff --git a/ubuntu/maverick_automake/applications/ktorrent/debian/cdbs/kde.mk b/ubuntu/maverick_automake/applications/ktorrent/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/maverick_automake/applications/ktorrent/debian/cdbs/kde.mk +++ b/ubuntu/maverick_automake/applications/ktorrent/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick_automake/applications/ktorrent/debian/rules b/ubuntu/maverick_automake/applications/ktorrent/debian/rules index dd1796ce0..901fd1ba9 100755 --- a/ubuntu/maverick_automake/applications/ktorrent/debian/rules +++ b/ubuntu/maverick_automake/applications/ktorrent/debian/rules @@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include debian/cdbs/debian-qt-kde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info @@ -13,7 +13,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_INSTALL_MANPAGES_ktorrent = ktorrent.1 -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/tde build/ktorrent-kde3:: docbook2x-man debian/ktorrent.1.docbook diff --git a/ubuntu/maverick_automake/applications/kuickshow/debian/cdbs/kde.mk b/ubuntu/maverick_automake/applications/kuickshow/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/maverick_automake/applications/kuickshow/debian/cdbs/kde.mk +++ b/ubuntu/maverick_automake/applications/kuickshow/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick_automake/applications/kuickshow/debian/rules b/ubuntu/maverick_automake/applications/kuickshow/debian/rules index b4456db14..e2ada6f11 100755 --- a/ubuntu/maverick_automake/applications/kuickshow/debian/rules +++ b/ubuntu/maverick_automake/applications/kuickshow/debian/rules @@ -5,14 +5,14 @@ include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/tde post-patches:: debian/stamp-bootstrap diff --git a/ubuntu/maverick_automake/applications/kvirc/debian/rules b/ubuntu/maverick_automake/applications/kvirc/debian/rules index 99cd63353..c4c197f5f 100755 --- a/ubuntu/maverick_automake/applications/kvirc/debian/rules +++ b/ubuntu/maverick_automake/applications/kvirc/debian/rules @@ -17,7 +17,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/autotools.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info diff --git a/ubuntu/maverick_automake/applications/kvkbd/debian/cdbs/kde.mk b/ubuntu/maverick_automake/applications/kvkbd/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/maverick_automake/applications/kvkbd/debian/cdbs/kde.mk +++ b/ubuntu/maverick_automake/applications/kvkbd/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick_automake/applications/kvkbd/debian/rules b/ubuntu/maverick_automake/applications/kvkbd/debian/rules index 4a7760310..00815e27a 100755 --- a/ubuntu/maverick_automake/applications/kvkbd/debian/rules +++ b/ubuntu/maverick_automake/applications/kvkbd/debian/rules @@ -4,14 +4,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/tde makebuilddir/kvkbd-kde3:: make -f Makefile.cvs diff --git a/ubuntu/maverick_automake/applications/kwin-style-crystal/debian/cdbs/kde.mk b/ubuntu/maverick_automake/applications/kwin-style-crystal/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/maverick_automake/applications/kwin-style-crystal/debian/cdbs/kde.mk +++ b/ubuntu/maverick_automake/applications/kwin-style-crystal/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick_automake/applications/kwin-style-crystal/debian/rules b/ubuntu/maverick_automake/applications/kwin-style-crystal/debian/rules index 78792cee1..2d8c7040b 100755 --- a/ubuntu/maverick_automake/applications/kwin-style-crystal/debian/rules +++ b/ubuntu/maverick_automake/applications/kwin-style-crystal/debian/rules @@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info diff --git a/ubuntu/maverick_automake/applications/piklab/debian/rules b/ubuntu/maverick_automake/applications/piklab/debian/rules index 1ded36029..374483481 100755 --- a/ubuntu/maverick_automake/applications/piklab/debian/rules +++ b/ubuntu/maverick_automake/applications/piklab/debian/rules @@ -3,7 +3,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info @@ -48,7 +48,7 @@ endif ./configure CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs -Wl,--as-needed" \ --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \ --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib \ - --with-extra-includes=/opt/kde3/include/kde \ + --with-extra-includes=/opt/kde3/include/tde \ --mandir=/opt/kde3/share/man --infodir=/opt/kde3/share/info --enable-rpath touch $@ diff --git a/ubuntu/maverick_automake/applications/potracegui/debian/rules b/ubuntu/maverick_automake/applications/potracegui/debian/rules index 9da36fbe6..1cf0e0262 100755 --- a/ubuntu/maverick_automake/applications/potracegui/debian/rules +++ b/ubuntu/maverick_automake/applications/potracegui/debian/rules @@ -11,7 +11,7 @@ DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info diff --git a/ubuntu/maverick_automake/applications/rosegarden/debian/rules b/ubuntu/maverick_automake/applications/rosegarden/debian/rules index a871ea6a6..538b8d2b7 100755 --- a/ubuntu/maverick_automake/applications/rosegarden/debian/rules +++ b/ubuntu/maverick_automake/applications/rosegarden/debian/rules @@ -7,7 +7,7 @@ include /usr/share/dpatch/dpatch.make -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info @@ -35,14 +35,14 @@ configure: configure-stamp configure-stamp: dh_testdir - env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/kde CMAKE_INSTALL_PREFIX=/usr cmake . + env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/tde CMAKE_INSTALL_PREFIX=/usr cmake . touch configure-stamp build: build-stamp build-stamp: configure-stamp patch-stamp dh_testdir - env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/kde make + env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/tde make touch build-stamp clean: unpatch @@ -64,7 +64,7 @@ install: build dh_clean -k dh_installdirs - env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/kde make install DESTDIR=`pwd`/debian/tmp + env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/tde make install DESTDIR=`pwd`/debian/tmp find debian/tmp/opt/kde3/share -type f -exec chmod 664 {} \; # Build architecture-independent files here. diff --git a/ubuntu/maverick_automake/applications/smb4k/debian/cdbs/kde.mk b/ubuntu/maverick_automake/applications/smb4k/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/maverick_automake/applications/smb4k/debian/cdbs/kde.mk +++ b/ubuntu/maverick_automake/applications/smb4k/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick_automake/applications/smb4k/debian/rules b/ubuntu/maverick_automake/applications/smb4k/debian/rules index a264124c9..14e052547 100755 --- a/ubuntu/maverick_automake/applications/smb4k/debian/rules +++ b/ubuntu/maverick_automake/applications/smb4k/debian/rules @@ -7,7 +7,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/autotools.mk include debian/cdbs/kde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info diff --git a/ubuntu/maverick_automake/applications/soundkonverter/debian/cdbs/kde.mk b/ubuntu/maverick_automake/applications/soundkonverter/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/maverick_automake/applications/soundkonverter/debian/cdbs/kde.mk +++ b/ubuntu/maverick_automake/applications/soundkonverter/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick_automake/applications/soundkonverter/debian/rules b/ubuntu/maverick_automake/applications/soundkonverter/debian/rules index a045cdcf5..0589244d1 100755 --- a/ubuntu/maverick_automake/applications/soundkonverter/debian/rules +++ b/ubuntu/maverick_automake/applications/soundkonverter/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/patchsys-quilt.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info @@ -14,7 +14,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info diff --git a/ubuntu/maverick_automake/applications/tdmtheme/debian/cdbs/kde.mk b/ubuntu/maverick_automake/applications/tdmtheme/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/maverick_automake/applications/tdmtheme/debian/cdbs/kde.mk +++ b/ubuntu/maverick_automake/applications/tdmtheme/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick_automake/applications/tdmtheme/debian/rules b/ubuntu/maverick_automake/applications/tdmtheme/debian/rules index bcd40a219..4dd552400 100755 --- a/ubuntu/maverick_automake/applications/tdmtheme/debian/rules +++ b/ubuntu/maverick_automake/applications/tdmtheme/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/patchsys-quilt.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info @@ -13,7 +13,7 @@ DEB_CONFIGURE_INFODIR := /opt/kde3/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--as-needed" -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/tde post-patches:: debian/stamp-bootstrap diff --git a/ubuntu/maverick_automake/applications/tellico/debian/rules b/ubuntu/maverick_automake/applications/tellico/debian/rules index e747c841f..c52d68960 100755 --- a/ubuntu/maverick_automake/applications/tellico/debian/rules +++ b/ubuntu/maverick_automake/applications/tellico/debian/rules @@ -5,7 +5,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info diff --git a/ubuntu/maverick_automake/applications/wlassistant/debian/rules b/ubuntu/maverick_automake/applications/wlassistant/debian/rules index 8c38dc51c..921c27cf2 100755 --- a/ubuntu/maverick_automake/applications/wlassistant/debian/rules +++ b/ubuntu/maverick_automake/applications/wlassistant/debian/rules @@ -7,7 +7,7 @@ URL = http://heanet.dl.sourceforge.net/$(DEB_SOURCE_PACKAGE)/$(UPFILENAME) include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info @@ -18,7 +18,7 @@ PATH := /opt/kde3/bin:${PATH} DEB_SCONS_PREFIX=/opt/kde3 -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/tde CONFIG_STATUS=$(DEB_BUILDDIR)/config.status SCONS_CMD=scons diff --git a/ubuntu/maverick_automake/applications/yakuake/debian/cdbs/kde.mk b/ubuntu/maverick_automake/applications/yakuake/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/maverick_automake/applications/yakuake/debian/cdbs/kde.mk +++ b/ubuntu/maverick_automake/applications/yakuake/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick_automake/applications/yakuake/debian/rules b/ubuntu/maverick_automake/applications/yakuake/debian/rules index 095defb87..bc8076b0e 100755 --- a/ubuntu/maverick_automake/applications/yakuake/debian/rules +++ b/ubuntu/maverick_automake/applications/yakuake/debian/rules @@ -3,7 +3,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/kde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info diff --git a/ubuntu/maverick_automake/dependencies/arts/debian/libarts1-kde3-dev.install b/ubuntu/maverick_automake/dependencies/arts/debian/libarts1-kde3-dev.install index 2ba1c47dd..00ed82c53 100644 --- a/ubuntu/maverick_automake/dependencies/arts/debian/libarts1-kde3-dev.install +++ b/ubuntu/maverick_automake/dependencies/arts/debian/libarts1-kde3-dev.install @@ -1,85 +1,85 @@ debian/tmp/opt/kde3/bin/mcopidl -debian/tmp/opt/kde3/include/kde/arts/anyref.h -debian/tmp/opt/kde3/include/kde/arts/arts_export.h -debian/tmp/opt/kde3/include/kde/arts/artsflow.h -debian/tmp/opt/kde3/include/kde/arts/artsflow.idl -debian/tmp/opt/kde3/include/kde/arts/artsversion.h -debian/tmp/opt/kde3/include/kde/arts/asyncstream.h -debian/tmp/opt/kde3/include/kde/arts/audioio.h -debian/tmp/opt/kde3/include/kde/arts/audiosubsys.h -debian/tmp/opt/kde3/include/kde/arts/buffer.h -debian/tmp/opt/kde3/include/kde/arts/bufferqueue.h -debian/tmp/opt/kde3/include/kde/arts/cache.h -debian/tmp/opt/kde3/include/kde/arts/cachedwav.h -debian/tmp/opt/kde3/include/kde/arts/common.h -debian/tmp/opt/kde3/include/kde/arts/connect.h -debian/tmp/opt/kde3/include/kde/arts/connection.h -debian/tmp/opt/kde3/include/kde/arts/convert.h -debian/tmp/opt/kde3/include/kde/arts/core.h -debian/tmp/opt/kde3/include/kde/arts/core.idl -debian/tmp/opt/kde3/include/kde/arts/cpuinfo.h -debian/tmp/opt/kde3/include/kde/arts/datapacket.h -debian/tmp/opt/kde3/include/kde/arts/debug.h -debian/tmp/opt/kde3/include/kde/arts/delayedreturn.h -debian/tmp/opt/kde3/include/kde/arts/dispatcher.h -debian/tmp/opt/kde3/include/kde/arts/dynamicrequest.h -debian/tmp/opt/kde3/include/kde/arts/dynamicskeleton.h -debian/tmp/opt/kde3/include/kde/arts/extensionloader.h -debian/tmp/opt/kde3/include/kde/arts/factory.h -debian/tmp/opt/kde3/include/kde/arts/fft.h -debian/tmp/opt/kde3/include/kde/arts/flowsystem.h -debian/tmp/opt/kde3/include/kde/arts/giomanager.h -debian/tmp/opt/kde3/include/kde/arts/gsl/gslcommon.h -debian/tmp/opt/kde3/include/kde/arts/gsl/gslconfig.h -debian/tmp/opt/kde3/include/kde/arts/gsl/gslconvert.h -debian/tmp/opt/kde3/include/kde/arts/gsl/gsldatacache.h -debian/tmp/opt/kde3/include/kde/arts/gsl/gsldatahandle-mad.h -debian/tmp/opt/kde3/include/kde/arts/gsl/gsldatahandle-vorbis.h -debian/tmp/opt/kde3/include/kde/arts/gsl/gsldatahandle.h -debian/tmp/opt/kde3/include/kde/arts/gsl/gsldatautils.h -debian/tmp/opt/kde3/include/kde/arts/gsl/gsldefs.h -debian/tmp/opt/kde3/include/kde/arts/gsl/gslengine.h -debian/tmp/opt/kde3/include/kde/arts/gsl/gslfft.h -debian/tmp/opt/kde3/include/kde/arts/gsl/gslfilter.h -debian/tmp/opt/kde3/include/kde/arts/gsl/gslieee754.h -debian/tmp/opt/kde3/include/kde/arts/gsl/gslloader.h -debian/tmp/opt/kde3/include/kde/arts/gsl/gslmagic.h -debian/tmp/opt/kde3/include/kde/arts/gsl/gslmath.h -debian/tmp/opt/kde3/include/kde/arts/gsl/gsloscillator.h -debian/tmp/opt/kde3/include/kde/arts/gsl/gslosctable.h -debian/tmp/opt/kde3/include/kde/arts/gsl/gslsignal.h -debian/tmp/opt/kde3/include/kde/arts/gsl/gslwavechunk.h -debian/tmp/opt/kde3/include/kde/arts/gsl/gslwaveosc.h -debian/tmp/opt/kde3/include/kde/arts/gslschedule.h -debian/tmp/opt/kde3/include/kde/arts/idlfilereg.h -debian/tmp/opt/kde3/include/kde/arts/ifacerepo_impl.h -debian/tmp/opt/kde3/include/kde/arts/iomanager.h -debian/tmp/opt/kde3/include/kde/arts/kmedia2.h -debian/tmp/opt/kde3/include/kde/arts/kmedia2.idl -debian/tmp/opt/kde3/include/kde/arts/mcopconfig.h -debian/tmp/opt/kde3/include/kde/arts/mcoputils.h -debian/tmp/opt/kde3/include/kde/arts/notification.h -debian/tmp/opt/kde3/include/kde/arts/object.h -debian/tmp/opt/kde3/include/kde/arts/objectmanager.h -debian/tmp/opt/kde3/include/kde/arts/pipebuffer.h -debian/tmp/opt/kde3/include/kde/arts/pool.h -debian/tmp/opt/kde3/include/kde/arts/qiomanager.h -debian/tmp/opt/kde3/include/kde/arts/reference.h -debian/tmp/opt/kde3/include/kde/arts/referenceclean.h -debian/tmp/opt/kde3/include/kde/arts/resample.h -debian/tmp/opt/kde3/include/kde/arts/socketconnection.h -debian/tmp/opt/kde3/include/kde/arts/soundserver.h -debian/tmp/opt/kde3/include/kde/arts/soundserver.idl -debian/tmp/opt/kde3/include/kde/arts/startupmanager.h -debian/tmp/opt/kde3/include/kde/arts/stdsynthmodule.h -debian/tmp/opt/kde3/include/kde/arts/synthschedule.h -debian/tmp/opt/kde3/include/kde/arts/tcpconnection.h -debian/tmp/opt/kde3/include/kde/arts/tcpserver.h -debian/tmp/opt/kde3/include/kde/arts/thread.h -debian/tmp/opt/kde3/include/kde/arts/type.h -debian/tmp/opt/kde3/include/kde/arts/unixconnection.h -debian/tmp/opt/kde3/include/kde/arts/unixserver.h -debian/tmp/opt/kde3/include/kde/arts/weakreference.h +debian/tmp/opt/kde3/include/tde/arts/anyref.h +debian/tmp/opt/kde3/include/tde/arts/arts_export.h +debian/tmp/opt/kde3/include/tde/arts/artsflow.h +debian/tmp/opt/kde3/include/tde/arts/artsflow.idl +debian/tmp/opt/kde3/include/tde/arts/artsversion.h +debian/tmp/opt/kde3/include/tde/arts/asyncstream.h +debian/tmp/opt/kde3/include/tde/arts/audioio.h +debian/tmp/opt/kde3/include/tde/arts/audiosubsys.h +debian/tmp/opt/kde3/include/tde/arts/buffer.h +debian/tmp/opt/kde3/include/tde/arts/bufferqueue.h +debian/tmp/opt/kde3/include/tde/arts/cache.h +debian/tmp/opt/kde3/include/tde/arts/cachedwav.h +debian/tmp/opt/kde3/include/tde/arts/common.h +debian/tmp/opt/kde3/include/tde/arts/connect.h +debian/tmp/opt/kde3/include/tde/arts/connection.h +debian/tmp/opt/kde3/include/tde/arts/convert.h +debian/tmp/opt/kde3/include/tde/arts/core.h +debian/tmp/opt/kde3/include/tde/arts/core.idl +debian/tmp/opt/kde3/include/tde/arts/cpuinfo.h +debian/tmp/opt/kde3/include/tde/arts/datapacket.h +debian/tmp/opt/kde3/include/tde/arts/debug.h +debian/tmp/opt/kde3/include/tde/arts/delayedreturn.h +debian/tmp/opt/kde3/include/tde/arts/dispatcher.h +debian/tmp/opt/kde3/include/tde/arts/dynamicrequest.h +debian/tmp/opt/kde3/include/tde/arts/dynamicskeleton.h +debian/tmp/opt/kde3/include/tde/arts/extensionloader.h +debian/tmp/opt/kde3/include/tde/arts/factory.h +debian/tmp/opt/kde3/include/tde/arts/fft.h +debian/tmp/opt/kde3/include/tde/arts/flowsystem.h +debian/tmp/opt/kde3/include/tde/arts/giomanager.h +debian/tmp/opt/kde3/include/tde/arts/gsl/gslcommon.h +debian/tmp/opt/kde3/include/tde/arts/gsl/gslconfig.h +debian/tmp/opt/kde3/include/tde/arts/gsl/gslconvert.h +debian/tmp/opt/kde3/include/tde/arts/gsl/gsldatacache.h +debian/tmp/opt/kde3/include/tde/arts/gsl/gsldatahandle-mad.h +debian/tmp/opt/kde3/include/tde/arts/gsl/gsldatahandle-vorbis.h +debian/tmp/opt/kde3/include/tde/arts/gsl/gsldatahandle.h +debian/tmp/opt/kde3/include/tde/arts/gsl/gsldatautils.h +debian/tmp/opt/kde3/include/tde/arts/gsl/gsldefs.h +debian/tmp/opt/kde3/include/tde/arts/gsl/gslengine.h +debian/tmp/opt/kde3/include/tde/arts/gsl/gslfft.h +debian/tmp/opt/kde3/include/tde/arts/gsl/gslfilter.h +debian/tmp/opt/kde3/include/tde/arts/gsl/gslieee754.h +debian/tmp/opt/kde3/include/tde/arts/gsl/gslloader.h +debian/tmp/opt/kde3/include/tde/arts/gsl/gslmagic.h +debian/tmp/opt/kde3/include/tde/arts/gsl/gslmath.h +debian/tmp/opt/kde3/include/tde/arts/gsl/gsloscillator.h +debian/tmp/opt/kde3/include/tde/arts/gsl/gslosctable.h +debian/tmp/opt/kde3/include/tde/arts/gsl/gslsignal.h +debian/tmp/opt/kde3/include/tde/arts/gsl/gslwavechunk.h +debian/tmp/opt/kde3/include/tde/arts/gsl/gslwaveosc.h +debian/tmp/opt/kde3/include/tde/arts/gslschedule.h +debian/tmp/opt/kde3/include/tde/arts/idlfilereg.h +debian/tmp/opt/kde3/include/tde/arts/ifacerepo_impl.h +debian/tmp/opt/kde3/include/tde/arts/iomanager.h +debian/tmp/opt/kde3/include/tde/arts/kmedia2.h +debian/tmp/opt/kde3/include/tde/arts/kmedia2.idl +debian/tmp/opt/kde3/include/tde/arts/mcopconfig.h +debian/tmp/opt/kde3/include/tde/arts/mcoputils.h +debian/tmp/opt/kde3/include/tde/arts/notification.h +debian/tmp/opt/kde3/include/tde/arts/object.h +debian/tmp/opt/kde3/include/tde/arts/objectmanager.h +debian/tmp/opt/kde3/include/tde/arts/pipebuffer.h +debian/tmp/opt/kde3/include/tde/arts/pool.h +debian/tmp/opt/kde3/include/tde/arts/qiomanager.h +debian/tmp/opt/kde3/include/tde/arts/reference.h +debian/tmp/opt/kde3/include/tde/arts/referenceclean.h +debian/tmp/opt/kde3/include/tde/arts/resample.h +debian/tmp/opt/kde3/include/tde/arts/socketconnection.h +debian/tmp/opt/kde3/include/tde/arts/soundserver.h +debian/tmp/opt/kde3/include/tde/arts/soundserver.idl +debian/tmp/opt/kde3/include/tde/arts/startupmanager.h +debian/tmp/opt/kde3/include/tde/arts/stdsynthmodule.h +debian/tmp/opt/kde3/include/tde/arts/synthschedule.h +debian/tmp/opt/kde3/include/tde/arts/tcpconnection.h +debian/tmp/opt/kde3/include/tde/arts/tcpserver.h +debian/tmp/opt/kde3/include/tde/arts/thread.h +debian/tmp/opt/kde3/include/tde/arts/type.h +debian/tmp/opt/kde3/include/tde/arts/unixconnection.h +debian/tmp/opt/kde3/include/tde/arts/unixserver.h +debian/tmp/opt/kde3/include/tde/arts/weakreference.h debian/tmp/opt/kde3/lib/libartscbackend.a debian/tmp/opt/kde3/lib/libartscbackend.so debian/tmp/opt/kde3/lib/libartsdsp.a diff --git a/ubuntu/maverick_automake/dependencies/arts/debian/libartsc0-kde3-dev.install b/ubuntu/maverick_automake/dependencies/arts/debian/libartsc0-kde3-dev.install index b666dca4c..555afb521 100644 --- a/ubuntu/maverick_automake/dependencies/arts/debian/libartsc0-kde3-dev.install +++ b/ubuntu/maverick_automake/dependencies/arts/debian/libartsc0-kde3-dev.install @@ -1,6 +1,6 @@ debian/tmp/opt/kde3/bin/artsc-config -debian/tmp/opt/kde3/include/kde/artsc/artsc.h -debian/tmp/opt/kde3/include/kde/artsc/artsc_export.h +debian/tmp/opt/kde3/include/tde/artsc/artsc.h +debian/tmp/opt/kde3/include/tde/artsc/artsc_export.h debian/tmp/opt/kde3/lib/libartsc.a debian/tmp/opt/kde3/lib/libartsc.la debian/tmp/opt/kde3/lib/libartsc.so diff --git a/ubuntu/maverick_automake/dependencies/arts/debian/rules b/ubuntu/maverick_automake/dependencies/arts/debian/rules index 4bd2d699f..40b5818aa 100755 --- a/ubuntu/maverick_automake/dependencies/arts/debian/rules +++ b/ubuntu/maverick_automake/dependencies/arts/debian/rules @@ -6,14 +6,14 @@ include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk include debian/cdbs/debian-qt-kde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) -DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_SKIP_RPATH=OFF -DCMAKE_LIBRARY_PATH="/opt/kde3/lib" -DCMAKE_INCLUDE_PATH="/opt/kde3/include/kde" -DCMAKE_CXX_FLAGS="-I/opt/kde3/include/kde" -DCMAKE_LDFLAGS="-L/opt/kde3/lib" +DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_SKIP_RPATH=OFF -DCMAKE_LIBRARY_PATH="/opt/kde3/lib" -DCMAKE_INCLUDE_PATH="/opt/kde3/include/tde" -DCMAKE_CXX_FLAGS="-I/opt/kde3/include/tde" -DCMAKE_LDFLAGS="-L/opt/kde3/lib" DEB_DH_STRIP_ARGS := --dbg-package=arts-kde3-dbg PACKAGES_WITH_LIBS := libarts1c2a-kde3 libartsc0-kde3 diff --git a/ubuntu/maverick_automake/dependencies/tqtinterface/debian/rules b/ubuntu/maverick_automake/dependencies/tqtinterface/debian/rules index dadefb425..79f24ff9a 100755 --- a/ubuntu/maverick_automake/dependencies/tqtinterface/debian/rules +++ b/ubuntu/maverick_automake/dependencies/tqtinterface/debian/rules @@ -11,14 +11,14 @@ DEB_KDE_APIDOX := yes version=Debian Package $(DEB_VERSION) DEB_OPT_FLAG += -DDEBIAN_VERSION=$(DEB_VERSION) -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) -DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_LIBRARY_PATH="/opt/kde3/lib" -DCMAKE_INCLUDE_PATH="/opt/kde3/include/kde" -DCMAKE_CXX_FLAGS="-I/opt/kde3/include/kde" -DCMAKE_LDFLAGS="-L/opt/kde3/lib" +DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_LIBRARY_PATH="/opt/kde3/lib" -DCMAKE_INCLUDE_PATH="/opt/kde3/include/tde" -DCMAKE_CXX_FLAGS="-I/opt/kde3/include/tde" -DCMAKE_LDFLAGS="-L/opt/kde3/lib" DEB_CONFIGURE_EXTRA_FLAGS := \ --enable-mitshm --with-alsa --enable-dnotify --enable-inotify \ diff --git a/ubuntu/maverick_automake/kde-i18n/debian/debiandirs b/ubuntu/maverick_automake/kde-i18n/debian/debiandirs index 70e9003f9..fa8e96587 100644 --- a/ubuntu/maverick_automake/kde-i18n/debian/debiandirs +++ b/ubuntu/maverick_automake/kde-i18n/debian/debiandirs @@ -1,6 +1,6 @@ export kde_prefix=/opt/kde3 export sysconfdir=/etc -export kde_includedir=/opt/kde3/include/kde +export kde_includedir=/opt/kde3/include/tde export infodir=/opt/kde3/share/info export mandir=/opt/kde3/share/man export qtdir=/opt/kde3/share/qt3 diff --git a/ubuntu/maverick_automake/kde-i18n/debian/rules b/ubuntu/maverick_automake/kde-i18n/debian/rules index d1e9242e9..81e475b41 100755 --- a/ubuntu/maverick_automake/kde-i18n/debian/rules +++ b/ubuntu/maverick_automake/kde-i18n/debian/rules @@ -24,7 +24,7 @@ I18N_INSTALL := $(patsubst $(I18N_DIR_PAT),install__%,$(I18N_DIRS)) -include debian/debiandirs -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info diff --git a/ubuntu/maverick_automake/kdeaccessibility/debian/cdbs/kde.mk b/ubuntu/maverick_automake/kdeaccessibility/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/maverick_automake/kdeaccessibility/debian/cdbs/kde.mk +++ b/ubuntu/maverick_automake/kdeaccessibility/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick_automake/kdeaccessibility/debian/ksayit-kde3.install b/ubuntu/maverick_automake/kdeaccessibility/debian/ksayit-kde3.install index 30c20144e..a1a76b5aa 100644 --- a/ubuntu/maverick_automake/kdeaccessibility/debian/ksayit-kde3.install +++ b/ubuntu/maverick_automake/kdeaccessibility/debian/ksayit-kde3.install @@ -1,5 +1,5 @@ debian/tmp/opt/kde3/bin/ksayit -debian/tmp/opt/kde3/include/kde/ksayit_fxplugin.h +debian/tmp/opt/kde3/include/tde/ksayit_fxplugin.h debian/tmp/opt/kde3/lib/kde3/libFreeverb_plugin.la debian/tmp/opt/kde3/lib/kde3/libFreeverb_plugin.so debian/tmp/opt/kde3/lib/libKTTSD_Lib.la diff --git a/ubuntu/maverick_automake/kdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick_automake/kdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff index 3d5dc7628..e705cf83b 100644 --- a/ubuntu/maverick_automake/kdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick_automake/kdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/opt/kde3/include/kde/kde.pot ++kdepotpath=/opt/kde3/include/tde/kde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick_automake/kdeaccessibility/debian/rules b/ubuntu/maverick_automake/kdeaccessibility/debian/rules index 3b5ba7894..65a498129 100755 --- a/ubuntu/maverick_automake/kdeaccessibility/debian/rules +++ b/ubuntu/maverick_automake/kdeaccessibility/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info diff --git a/ubuntu/maverick_automake/kdeaddons/debian/cdbs/kde.mk b/ubuntu/maverick_automake/kdeaddons/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/maverick_automake/kdeaddons/debian/cdbs/kde.mk +++ b/ubuntu/maverick_automake/kdeaddons/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick_automake/kdeaddons/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick_automake/kdeaddons/debian/patches/common/kubuntu_01_kdepot.diff index 3d5dc7628..e705cf83b 100644 --- a/ubuntu/maverick_automake/kdeaddons/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick_automake/kdeaddons/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/opt/kde3/include/kde/kde.pot ++kdepotpath=/opt/kde3/include/tde/kde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick_automake/kdeaddons/debian/rules b/ubuntu/maverick_automake/kdeaddons/debian/rules index 63afd8206..2fa33b2fc 100755 --- a/ubuntu/maverick_automake/kdeaddons/debian/rules +++ b/ubuntu/maverick_automake/kdeaddons/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info diff --git a/ubuntu/maverick_automake/kdeadmin/debian/cdbs/kde.mk b/ubuntu/maverick_automake/kdeadmin/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/maverick_automake/kdeadmin/debian/cdbs/kde.mk +++ b/ubuntu/maverick_automake/kdeadmin/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick_automake/kdeadmin/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick_automake/kdeadmin/debian/patches/common/kubuntu_01_kdepot.diff index 3d5dc7628..e705cf83b 100644 --- a/ubuntu/maverick_automake/kdeadmin/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick_automake/kdeadmin/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/opt/kde3/include/kde/kde.pot ++kdepotpath=/opt/kde3/include/tde/kde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick_automake/kdeadmin/debian/rules b/ubuntu/maverick_automake/kdeadmin/debian/rules index 569175f46..079a2b2ed 100755 --- a/ubuntu/maverick_automake/kdeadmin/debian/rules +++ b/ubuntu/maverick_automake/kdeadmin/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info diff --git a/ubuntu/maverick_automake/kdeartwork/debian/cdbs/kde.mk b/ubuntu/maverick_automake/kdeartwork/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/maverick_automake/kdeartwork/debian/cdbs/kde.mk +++ b/ubuntu/maverick_automake/kdeartwork/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick_automake/kdeartwork/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick_automake/kdeartwork/debian/patches/common/kubuntu_01_kdepot.diff index 3d5dc7628..e705cf83b 100644 --- a/ubuntu/maverick_automake/kdeartwork/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick_automake/kdeartwork/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/opt/kde3/include/kde/kde.pot ++kdepotpath=/opt/kde3/include/tde/kde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick_automake/kdeartwork/debian/rules b/ubuntu/maverick_automake/kdeartwork/debian/rules index 26267a01d..b3e753c04 100755 --- a/ubuntu/maverick_automake/kdeartwork/debian/rules +++ b/ubuntu/maverick_automake/kdeartwork/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info diff --git a/ubuntu/maverick_automake/kdebase/debian/cdbs/kde.mk b/ubuntu/maverick_automake/kdebase/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/maverick_automake/kdebase/debian/cdbs/kde.mk +++ b/ubuntu/maverick_automake/kdebase/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick_automake/kdebase/debian/kdebase-kde3-dev.install b/ubuntu/maverick_automake/kdebase/debian/kdebase-kde3-dev.install index b96074298..4b611029f 100644 --- a/ubuntu/maverick_automake/kdebase/debian/kdebase-kde3-dev.install +++ b/ubuntu/maverick_automake/kdebase/debian/kdebase-kde3-dev.install @@ -1,42 +1,42 @@ -debian/tmp/opt/kde3/include/kde/kate/application.h -debian/tmp/opt/kde3/include/kde/kate/documentmanager.h -debian/tmp/opt/kde3/include/kde/kate/mainwindow.h -debian/tmp/opt/kde3/include/kde/kate/pluginconfiginterfaceextension.h -debian/tmp/opt/kde3/include/kde/kate/pluginconfiginterface.h -debian/tmp/opt/kde3/include/kde/kate/plugin.h -debian/tmp/opt/kde3/include/kde/kate/pluginmanager.h -debian/tmp/opt/kde3/include/kde/kate/toolviewmanager.h -debian/tmp/opt/kde3/include/kde/kate/utils/dockviewbase.h -debian/tmp/opt/kde3/include/kde/kate/utils/listboxview.h -debian/tmp/opt/kde3/include/kde/kate/utils/messageview.h -debian/tmp/opt/kde3/include/kde/kate/viewmanager.h -debian/tmp/opt/kde3/include/kde/KBackgroundIface.h -debian/tmp/opt/kde3/include/kde/kcommondecoration.h -debian/tmp/opt/kde3/include/kde/kdecorationfactory.h -debian/tmp/opt/kde3/include/kde/kdecoration.h -debian/tmp/opt/kde3/include/kde/kdecoration_p.h -debian/tmp/opt/kde3/include/kde/kdecoration_plugins_p.h -debian/tmp/opt/kde3/include/kde/KDesktopIface.h -debian/tmp/opt/kde3/include/kde/kgreeterplugin.h -debian/tmp/opt/kde3/include/kde/konqsidebarplugin.h -debian/tmp/opt/kde3/include/kde/KonquerorIface.h -debian/tmp/opt/kde3/include/kde/KScreensaverIface.h -debian/tmp/opt/kde3/include/kde/ksgrd/HostConnector.h -debian/tmp/opt/kde3/include/kde/ksgrd/SensorAgent.h -debian/tmp/opt/kde3/include/kde/ksgrd/SensorClient.h -debian/tmp/opt/kde3/include/kde/ksgrd/SensorManager.h -debian/tmp/opt/kde3/include/kde/ksgrd/SensorShellAgent.h -debian/tmp/opt/kde3/include/kde/ksgrd/SensorSocketAgent.h -debian/tmp/opt/kde3/include/kde/ksgrd/StyleEngine.h -debian/tmp/opt/kde3/include/kde/ksgrd/StyleSettings.h -debian/tmp/opt/kde3/include/kde/ksgrd/TimerSettings.h -debian/tmp/opt/kde3/include/kde/ksplash/objkstheme.h -debian/tmp/opt/kde3/include/kde/ksplash/themeengine.h -debian/tmp/opt/kde3/include/kde/kwin/client.h -debian/tmp/opt/kde3/include/kde/KWinInterface.h -debian/tmp/opt/kde3/include/kde/kwin/kwinbutton.h -debian/tmp/opt/kde3/include/kde/kwin/options.h -debian/tmp/opt/kde3/include/kde/kwin/workspace.h +debian/tmp/opt/kde3/include/tde/kate/application.h +debian/tmp/opt/kde3/include/tde/kate/documentmanager.h +debian/tmp/opt/kde3/include/tde/kate/mainwindow.h +debian/tmp/opt/kde3/include/tde/kate/pluginconfiginterfaceextension.h +debian/tmp/opt/kde3/include/tde/kate/pluginconfiginterface.h +debian/tmp/opt/kde3/include/tde/kate/plugin.h +debian/tmp/opt/kde3/include/tde/kate/pluginmanager.h +debian/tmp/opt/kde3/include/tde/kate/toolviewmanager.h +debian/tmp/opt/kde3/include/tde/kate/utils/dockviewbase.h +debian/tmp/opt/kde3/include/tde/kate/utils/listboxview.h +debian/tmp/opt/kde3/include/tde/kate/utils/messageview.h +debian/tmp/opt/kde3/include/tde/kate/viewmanager.h +debian/tmp/opt/kde3/include/tde/KBackgroundIface.h +debian/tmp/opt/kde3/include/tde/kcommondecoration.h +debian/tmp/opt/kde3/include/tde/kdecorationfactory.h +debian/tmp/opt/kde3/include/tde/kdecoration.h +debian/tmp/opt/kde3/include/tde/kdecoration_p.h +debian/tmp/opt/kde3/include/tde/kdecoration_plugins_p.h +debian/tmp/opt/kde3/include/tde/KDesktopIface.h +debian/tmp/opt/kde3/include/tde/kgreeterplugin.h +debian/tmp/opt/kde3/include/tde/konqsidebarplugin.h +debian/tmp/opt/kde3/include/tde/KonquerorIface.h +debian/tmp/opt/kde3/include/tde/KScreensaverIface.h +debian/tmp/opt/kde3/include/tde/ksgrd/HostConnector.h +debian/tmp/opt/kde3/include/tde/ksgrd/SensorAgent.h +debian/tmp/opt/kde3/include/tde/ksgrd/SensorClient.h +debian/tmp/opt/kde3/include/tde/ksgrd/SensorManager.h +debian/tmp/opt/kde3/include/tde/ksgrd/SensorShellAgent.h +debian/tmp/opt/kde3/include/tde/ksgrd/SensorSocketAgent.h +debian/tmp/opt/kde3/include/tde/ksgrd/StyleEngine.h +debian/tmp/opt/kde3/include/tde/ksgrd/StyleSettings.h +debian/tmp/opt/kde3/include/tde/ksgrd/TimerSettings.h +debian/tmp/opt/kde3/include/tde/ksplash/objkstheme.h +debian/tmp/opt/kde3/include/tde/ksplash/themeengine.h +debian/tmp/opt/kde3/include/tde/kwin/client.h +debian/tmp/opt/kde3/include/tde/KWinInterface.h +debian/tmp/opt/kde3/include/tde/kwin/kwinbutton.h +debian/tmp/opt/kde3/include/tde/kwin/options.h +debian/tmp/opt/kde3/include/tde/kwin/workspace.h debian/tmp/opt/kde3/lib/libkasbar.la debian/tmp/opt/kde3/lib/libkasbar.so debian/tmp/opt/kde3/lib/libkateinterfaces.la diff --git a/ubuntu/maverick_automake/kdebase/debian/libkonq4-kde3-dev.install b/ubuntu/maverick_automake/kdebase/debian/libkonq4-kde3-dev.install index df661989e..0a992e7a3 100644 --- a/ubuntu/maverick_automake/kdebase/debian/libkonq4-kde3-dev.install +++ b/ubuntu/maverick_automake/kdebase/debian/libkonq4-kde3-dev.install @@ -1,23 +1,23 @@ -debian/tmp/opt/kde3/include/kde/kfileivi.h -debian/tmp/opt/kde3/include/kde/kivdirectoryoverlay.h -debian/tmp/opt/kde3/include/kde/knewmenu.h -debian/tmp/opt/kde3/include/kde/konqbookmarkmanager.h -debian/tmp/opt/kde3/include/kde/konq_defaults.h -debian/tmp/opt/kde3/include/kde/konq_dirpart.h -debian/tmp/opt/kde3/include/kde/konq_drag.h -debian/tmp/opt/kde3/include/kde/konq_events.h -debian/tmp/opt/kde3/include/kde/konq_faviconmgr.h -debian/tmp/opt/kde3/include/kde/konq_filetip.h -debian/tmp/opt/kde3/include/kde/konq_historycomm.h -debian/tmp/opt/kde3/include/kde/konq_historymgr.h -debian/tmp/opt/kde3/include/kde/konq_iconviewwidget.h -debian/tmp/opt/kde3/include/kde/konq_operations.h -debian/tmp/opt/kde3/include/kde/konq_pixmapprovider.h -debian/tmp/opt/kde3/include/kde/konq_popupmenu.h -debian/tmp/opt/kde3/include/kde/konq_propsview.h -debian/tmp/opt/kde3/include/kde/konq_settings.h -debian/tmp/opt/kde3/include/kde/konq_undo.h -debian/tmp/opt/kde3/include/kde/konq_xmlguiclient.h -debian/tmp/opt/kde3/include/kde/libkonq_export.h +debian/tmp/opt/kde3/include/tde/kfileivi.h +debian/tmp/opt/kde3/include/tde/kivdirectoryoverlay.h +debian/tmp/opt/kde3/include/tde/knewmenu.h +debian/tmp/opt/kde3/include/tde/konqbookmarkmanager.h +debian/tmp/opt/kde3/include/tde/konq_defaults.h +debian/tmp/opt/kde3/include/tde/konq_dirpart.h +debian/tmp/opt/kde3/include/tde/konq_drag.h +debian/tmp/opt/kde3/include/tde/konq_events.h +debian/tmp/opt/kde3/include/tde/konq_faviconmgr.h +debian/tmp/opt/kde3/include/tde/konq_filetip.h +debian/tmp/opt/kde3/include/tde/konq_historycomm.h +debian/tmp/opt/kde3/include/tde/konq_historymgr.h +debian/tmp/opt/kde3/include/tde/konq_iconviewwidget.h +debian/tmp/opt/kde3/include/tde/konq_operations.h +debian/tmp/opt/kde3/include/tde/konq_pixmapprovider.h +debian/tmp/opt/kde3/include/tde/konq_popupmenu.h +debian/tmp/opt/kde3/include/tde/konq_propsview.h +debian/tmp/opt/kde3/include/tde/konq_settings.h +debian/tmp/opt/kde3/include/tde/konq_undo.h +debian/tmp/opt/kde3/include/tde/konq_xmlguiclient.h +debian/tmp/opt/kde3/include/tde/libkonq_export.h debian/tmp/opt/kde3/lib/libkonq.la debian/tmp/opt/kde3/lib/libkonq.so diff --git a/ubuntu/maverick_automake/kdebase/debian/rules b/ubuntu/maverick_automake/kdebase/debian/rules index 5451ff821..6a3938cba 100755 --- a/ubuntu/maverick_automake/kdebase/debian/rules +++ b/ubuntu/maverick_automake/kdebase/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info diff --git a/ubuntu/maverick_automake/kdebindings/debian/cdbs/kde.mk b/ubuntu/maverick_automake/kdebindings/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/maverick_automake/kdebindings/debian/cdbs/kde.mk +++ b/ubuntu/maverick_automake/kdebindings/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick_automake/kdebindings/debian/libkjsembed-kde3-dev.install b/ubuntu/maverick_automake/kdebindings/debian/libkjsembed-kde3-dev.install index 464862e4b..46e0e8860 100644 --- a/ubuntu/maverick_automake/kdebindings/debian/libkjsembed-kde3-dev.install +++ b/ubuntu/maverick_automake/kdebindings/debian/libkjsembed-kde3-dev.install @@ -1,4 +1,4 @@ -debian/tmp/opt/kde3/include/kde/kjsembed/* +debian/tmp/opt/kde3/include/tde/kjsembed/* debian/tmp/opt/kde3/lib/libkjsembed.so debian/tmp/opt/kde3/lib/libkjsembed.la diff --git a/ubuntu/maverick_automake/kdebindings/debian/libsmokeqt-kde3-dev.install b/ubuntu/maverick_automake/kdebindings/debian/libsmokeqt-kde3-dev.install index c577f4705..2816b0725 100644 --- a/ubuntu/maverick_automake/kdebindings/debian/libsmokeqt-kde3-dev.install +++ b/ubuntu/maverick_automake/kdebindings/debian/libsmokeqt-kde3-dev.install @@ -1,3 +1,3 @@ -debian/tmp/opt/kde3/include/kde/smoke.h +debian/tmp/opt/kde3/include/tde/smoke.h debian/tmp/opt/kde3/lib/libsmokeqt.so debian/tmp/opt/kde3/lib/libsmokeqt.la diff --git a/ubuntu/maverick_automake/kdebindings/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick_automake/kdebindings/debian/patches/common/kubuntu_01_kdepot.diff index 3d5dc7628..e705cf83b 100644 --- a/ubuntu/maverick_automake/kdebindings/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick_automake/kdebindings/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/opt/kde3/include/kde/kde.pot ++kdepotpath=/opt/kde3/include/tde/kde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick_automake/kdebindings/debian/rules b/ubuntu/maverick_automake/kdebindings/debian/rules index ef053cb4f..2c8f64002 100755 --- a/ubuntu/maverick_automake/kdebindings/debian/rules +++ b/ubuntu/maverick_automake/kdebindings/debian/rules @@ -11,7 +11,7 @@ DEB_BUILDDIR := $(DEB_SRCDIR) include /usr/share/cdbs/1/rules/patchsys-quilt.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info diff --git a/ubuntu/maverick_automake/kdeedu/debian/cdbs/kde.mk b/ubuntu/maverick_automake/kdeedu/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/maverick_automake/kdeedu/debian/cdbs/kde.mk +++ b/ubuntu/maverick_automake/kdeedu/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick_automake/kdeedu/debian/kstars-kde3.install b/ubuntu/maverick_automake/kdeedu/debian/kstars-kde3.install index 2fe8d7878..ce3c1d777 100644 --- a/ubuntu/maverick_automake/kdeedu/debian/kstars-kde3.install +++ b/ubuntu/maverick_automake/kdeedu/debian/kstars-kde3.install @@ -1,7 +1,7 @@ etc/kde3/kstarsrc opt/kde3/bin/kstars -/opt/kde3/include/kde/kstarsinterface.h -/opt/kde3/include/kde/simclockinterface.h +/opt/kde3/include/tde/kstarsinterface.h +/opt/kde3/include/tde/simclockinterface.h /opt/kde3/share/applications/kde/kstars.desktop /opt/kde3/share/config.kcfg/kstars.kcfg /opt/kde3/share/doc/kde/HTML/en/kstars/common diff --git a/ubuntu/maverick_automake/kdeedu/debian/libkdeedu-dev-kde3.install b/ubuntu/maverick_automake/kdeedu/debian/libkdeedu-dev-kde3.install index e4c27b132..2010f69d7 100644 --- a/ubuntu/maverick_automake/kdeedu/debian/libkdeedu-dev-kde3.install +++ b/ubuntu/maverick_automake/kdeedu/debian/libkdeedu-dev-kde3.install @@ -1,4 +1,4 @@ -/opt/kde3/include/kde/libkdeedu +/opt/kde3/include/tde/libkdeedu opt/kde3/lib/libextdate.la opt/kde3/lib/libextdate.so opt/kde3/lib/libkdeeducore.la diff --git a/ubuntu/maverick_automake/kdeedu/debian/libkiten-dev-kde3.install b/ubuntu/maverick_automake/kdeedu/debian/libkiten-dev-kde3.install index 172b79ec4..e5d3b77e2 100644 --- a/ubuntu/maverick_automake/kdeedu/debian/libkiten-dev-kde3.install +++ b/ubuntu/maverick_automake/kdeedu/debian/libkiten-dev-kde3.install @@ -1,3 +1,3 @@ -/opt/kde3/include/kde/libkiten +/opt/kde3/include/tde/libkiten opt/kde3/lib/libkiten.la opt/kde3/lib/libkiten.so diff --git a/ubuntu/maverick_automake/kdeedu/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick_automake/kdeedu/debian/patches/common/kubuntu_01_kdepot.diff index 3d5dc7628..e705cf83b 100644 --- a/ubuntu/maverick_automake/kdeedu/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick_automake/kdeedu/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/opt/kde3/include/kde/kde.pot ++kdepotpath=/opt/kde3/include/tde/kde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick_automake/kdeedu/debian/rules b/ubuntu/maverick_automake/kdeedu/debian/rules index 42eadbc48..8d08807f7 100755 --- a/ubuntu/maverick_automake/kdeedu/debian/rules +++ b/ubuntu/maverick_automake/kdeedu/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info @@ -14,7 +14,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_DH_INSTALL_SOURCEDIR := $(DEB_DESTDIR) -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --includedir="/opt/kde3/include/kde" --mandir="/opt/kde3/share/man" --infodir="/opt/kde3/share/info" +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --includedir="/opt/kde3/include/tde" --mandir="/opt/kde3/share/man" --infodir="/opt/kde3/share/info" # Ensure that kig's python scripting built successfully. common-build-arch:: diff --git a/ubuntu/maverick_automake/kdegames/debian/atlantik-kde3-dev.install b/ubuntu/maverick_automake/kdegames/debian/atlantik-kde3-dev.install index 6800e895c..ae9e37c8d 100644 --- a/ubuntu/maverick_automake/kdegames/debian/atlantik-kde3-dev.install +++ b/ubuntu/maverick_automake/kdegames/debian/atlantik-kde3-dev.install @@ -1,5 +1,5 @@ -/opt/kde3/include/kde/atlantik -/opt/kde3/include/kde/atlantic +/opt/kde3/include/tde/atlantik +/opt/kde3/include/tde/atlantic /opt/kde3/lib/libatlantic.so /opt/kde3/lib/libatlantikclient.so /opt/kde3/lib/libatlantikui.so diff --git a/ubuntu/maverick_automake/kdegames/debian/cdbs/kde.mk b/ubuntu/maverick_automake/kdegames/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/maverick_automake/kdegames/debian/cdbs/kde.mk +++ b/ubuntu/maverick_automake/kdegames/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick_automake/kdegames/debian/kolf-kde3-dev.install b/ubuntu/maverick_automake/kdegames/debian/kolf-kde3-dev.install index c161ea6c7..523af0de7 100644 --- a/ubuntu/maverick_automake/kdegames/debian/kolf-kde3-dev.install +++ b/ubuntu/maverick_automake/kdegames/debian/kolf-kde3-dev.install @@ -1,2 +1,2 @@ -/opt/kde3/include/kde/kolf +/opt/kde3/include/tde/kolf /opt/kde3/lib/libkolf.so diff --git a/ubuntu/maverick_automake/kdegames/debian/libkdegames-kde3-dev.install b/ubuntu/maverick_automake/kdegames/debian/libkdegames-kde3-dev.install index 79f0bb891..4847347f8 100644 --- a/ubuntu/maverick_automake/kdegames/debian/libkdegames-kde3-dev.install +++ b/ubuntu/maverick_automake/kdegames/debian/libkdegames-kde3-dev.install @@ -1,4 +1,4 @@ -/opt/kde3/include/kde/*.h -/opt/kde3/include/kde/kgame +/opt/kde3/include/tde/*.h +/opt/kde3/include/tde/kgame /opt/kde3/lib/libkdegames.so /opt/kde3/lib/libkdegames.la diff --git a/ubuntu/maverick_automake/kdegames/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick_automake/kdegames/debian/patches/common/kubuntu_01_kdepot.diff index 3d5dc7628..e705cf83b 100644 --- a/ubuntu/maverick_automake/kdegames/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick_automake/kdegames/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/opt/kde3/include/kde/kde.pot ++kdepotpath=/opt/kde3/include/tde/kde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick_automake/kdegames/debian/rules b/ubuntu/maverick_automake/kdegames/debian/rules index 0e74a4bc4..f355f7883 100755 --- a/ubuntu/maverick_automake/kdegames/debian/rules +++ b/ubuntu/maverick_automake/kdegames/debian/rules @@ -7,7 +7,7 @@ include /usr/share/cdbs/1/rules/utils.mk export kde_bindir = /opt/kde3/games -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info diff --git a/ubuntu/maverick_automake/kdegraphics/debian/cdbs/kde.mk b/ubuntu/maverick_automake/kdegraphics/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/maverick_automake/kdegraphics/debian/cdbs/kde.mk +++ b/ubuntu/maverick_automake/kdegraphics/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick_automake/kdegraphics/debian/kdegraphics-dev-kde3.install b/ubuntu/maverick_automake/kdegraphics/debian/kdegraphics-dev-kde3.install index 0af22b336..081a99fd4 100644 --- a/ubuntu/maverick_automake/kdegraphics/debian/kdegraphics-dev-kde3.install +++ b/ubuntu/maverick_automake/kdegraphics/debian/kdegraphics-dev-kde3.install @@ -1,184 +1,184 @@ -debian/tmp/opt/kde3/include/kde/dom/SVGAElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGAltGlyphDefElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGAltGlyphElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGAngle.h -debian/tmp/opt/kde3/include/kde/dom/SVGAnimateColorElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGAnimateElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGAnimateMotionElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGAnimateTransformElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGAnimatedAngle.h -debian/tmp/opt/kde3/include/kde/dom/SVGAnimatedBoolean.h -debian/tmp/opt/kde3/include/kde/dom/SVGAnimatedEnumeration.h -debian/tmp/opt/kde3/include/kde/dom/SVGAnimatedInteger.h -debian/tmp/opt/kde3/include/kde/dom/SVGAnimatedLength.h -debian/tmp/opt/kde3/include/kde/dom/SVGAnimatedLengthList.h -debian/tmp/opt/kde3/include/kde/dom/SVGAnimatedNumber.h -debian/tmp/opt/kde3/include/kde/dom/SVGAnimatedNumberList.h -debian/tmp/opt/kde3/include/kde/dom/SVGAnimatedPathData.h -debian/tmp/opt/kde3/include/kde/dom/SVGAnimatedPoints.h -debian/tmp/opt/kde3/include/kde/dom/SVGAnimatedPreserveAspectRatio.h -debian/tmp/opt/kde3/include/kde/dom/SVGAnimatedRect.h -debian/tmp/opt/kde3/include/kde/dom/SVGAnimatedString.h -debian/tmp/opt/kde3/include/kde/dom/SVGAnimatedTransformList.h -debian/tmp/opt/kde3/include/kde/dom/SVGAnimationElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGCSSRule.h -debian/tmp/opt/kde3/include/kde/dom/SVGCircleElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGClipPathElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGColor.h -debian/tmp/opt/kde3/include/kde/dom/SVGColorProfileElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGColorProfileRule.h -debian/tmp/opt/kde3/include/kde/dom/SVGComponentTransferFunctionElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGCursorElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGDefinitionSrcElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGDefsElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGDescElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGDocument.h -debian/tmp/opt/kde3/include/kde/dom/SVGElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGElementInstance.h -debian/tmp/opt/kde3/include/kde/dom/SVGElementInstanceList.h -debian/tmp/opt/kde3/include/kde/dom/SVGEllipseElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGEvent.h -debian/tmp/opt/kde3/include/kde/dom/SVGException.h -debian/tmp/opt/kde3/include/kde/dom/SVGExternalResourcesRequired.h -debian/tmp/opt/kde3/include/kde/dom/SVGFEBlendElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGFEColorMatrixElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGFEComponentTransferElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGFECompositeElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGFEConvolveMatrixElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGFEDiffuseLightingElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGFEDisplacementMapElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGFEDistantLightElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGFEFloodElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGFEFuncAElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGFEFuncBElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGFEFuncGElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGFEFuncRElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGFEGaussianBlurElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGFEImageElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGFEMergeElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGFEMergeNodeElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGFEMorphologyElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGFEOffsetElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGFEPointLightElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGFESpecularLightingElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGFESpotLightElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGFETileElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGFETurbulenceElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGFilterElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGFilterPrimitiveStandardAttributes.h -debian/tmp/opt/kde3/include/kde/dom/SVGFitToViewBox.h -debian/tmp/opt/kde3/include/kde/dom/SVGFontElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGFontFaceElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGFontFaceFormatElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGFontFaceNameElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGFontFaceSrcElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGFontFaceUriElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGForeignObjectElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGGElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGGlyphElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGGlyphRefElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGGradientElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGHKernElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGICCColor.h -debian/tmp/opt/kde3/include/kde/dom/SVGImageElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGLangSpace.h -debian/tmp/opt/kde3/include/kde/dom/SVGLength.h -debian/tmp/opt/kde3/include/kde/dom/SVGLengthList.h -debian/tmp/opt/kde3/include/kde/dom/SVGLineElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGLinearGradientElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGLocatable.h -debian/tmp/opt/kde3/include/kde/dom/SVGMPathElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGMarkerElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGMaskElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGMatrix.h -debian/tmp/opt/kde3/include/kde/dom/SVGMetadataElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGMissingGlyphElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGNumber.h -debian/tmp/opt/kde3/include/kde/dom/SVGNumberList.h -debian/tmp/opt/kde3/include/kde/dom/SVGPaint.h -debian/tmp/opt/kde3/include/kde/dom/SVGPathElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGPathSeg.h -debian/tmp/opt/kde3/include/kde/dom/SVGPathSegArc.h -debian/tmp/opt/kde3/include/kde/dom/SVGPathSegClosePath.h -debian/tmp/opt/kde3/include/kde/dom/SVGPathSegCurvetoCubic.h -debian/tmp/opt/kde3/include/kde/dom/SVGPathSegCurvetoCubicSmooth.h -debian/tmp/opt/kde3/include/kde/dom/SVGPathSegCurvetoQuadratic.h -debian/tmp/opt/kde3/include/kde/dom/SVGPathSegCurvetoQuadraticSmooth.h -debian/tmp/opt/kde3/include/kde/dom/SVGPathSegLineto.h -debian/tmp/opt/kde3/include/kde/dom/SVGPathSegLinetoHorizontal.h -debian/tmp/opt/kde3/include/kde/dom/SVGPathSegLinetoVertical.h -debian/tmp/opt/kde3/include/kde/dom/SVGPathSegList.h -debian/tmp/opt/kde3/include/kde/dom/SVGPathSegMoveto.h -debian/tmp/opt/kde3/include/kde/dom/SVGPatternElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGPoint.h -debian/tmp/opt/kde3/include/kde/dom/SVGPointList.h -debian/tmp/opt/kde3/include/kde/dom/SVGPolygonElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGPolylineElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGPreserveAspectRatio.h -debian/tmp/opt/kde3/include/kde/dom/SVGRadialGradientElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGRect.h -debian/tmp/opt/kde3/include/kde/dom/SVGRectElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGRenderingIntent.h -debian/tmp/opt/kde3/include/kde/dom/SVGSVGElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGScriptElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGSetElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGStopElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGStringList.h -debian/tmp/opt/kde3/include/kde/dom/SVGStylable.h -debian/tmp/opt/kde3/include/kde/dom/SVGStyleElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGSwitchElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGSymbolElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGTRefElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGTSpanElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGTests.h -debian/tmp/opt/kde3/include/kde/dom/SVGTextContentElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGTextElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGTextPathElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGTextPositioningElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGTitleElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGTransform.h -debian/tmp/opt/kde3/include/kde/dom/SVGTransformList.h -debian/tmp/opt/kde3/include/kde/dom/SVGTransformable.h -debian/tmp/opt/kde3/include/kde/dom/SVGURIReference.h -debian/tmp/opt/kde3/include/kde/dom/SVGUnitTypes.h -debian/tmp/opt/kde3/include/kde/dom/SVGUseElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGVKernElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGViewElement.h -debian/tmp/opt/kde3/include/kde/dom/SVGViewSpec.h -debian/tmp/opt/kde3/include/kde/dom/SVGWindow.h -debian/tmp/opt/kde3/include/kde/dom/SVGZoomAndPan.h -debian/tmp/opt/kde3/include/kde/dom/SVGZoomEvent.h -debian/tmp/opt/kde3/include/kde/kfaximage.h -debian/tmp/opt/kde3/include/kde/kmultipageInterface.h -debian/tmp/opt/kde3/include/kde/ksvg/CanvasFactory.h -debian/tmp/opt/kde3/include/kde/ksvg/CanvasItem.h -debian/tmp/opt/kde3/include/kde/ksvg/CanvasItems.h -debian/tmp/opt/kde3/include/kde/ksvg/DocumentFactory.h -debian/tmp/opt/kde3/include/kde/ksvg/KSVGCanvas.h -debian/tmp/opt/kde3/include/kde/ksvg/ksvg_plugin.h -debian/tmp/opt/kde3/include/kde/kviewshell/anchor.h -debian/tmp/opt/kde3/include/kde/kviewshell/bookmark.h -debian/tmp/opt/kde3/include/kde/kviewshell/pageView.h -debian/tmp/opt/kde3/include/kde/kviewshell/documentPageCache.h -debian/tmp/opt/kde3/include/kde/kviewshell/documentRenderer.h -debian/tmp/opt/kde3/include/kde/kviewshell/documentWidget.h -debian/tmp/opt/kde3/include/kde/kviewshell/history.h -debian/tmp/opt/kde3/include/kde/kviewshell/hyperlink.h -debian/tmp/opt/kde3/include/kde/kviewshell/kmultipage.h -debian/tmp/opt/kde3/include/kde/kviewshell/length.h -debian/tmp/opt/kde3/include/kde/kviewshell/pageNumber.h -debian/tmp/opt/kde3/include/kde/kviewshell/pageSize.h -debian/tmp/opt/kde3/include/kde/kviewshell/renderedDocumentPage.h -debian/tmp/opt/kde3/include/kde/kviewshell/renderedDocumentPagePixmap.h -debian/tmp/opt/kde3/include/kde/kviewshell/renderedDocumentPagePrinter.h -debian/tmp/opt/kde3/include/kde/kviewshell/selection.h -debian/tmp/opt/kde3/include/kde/kviewshell/simplePageSize.h -debian/tmp/opt/kde3/include/kde/kviewshell/textBox.h -debian/tmp/opt/kde3/include/kde/kviewshell/zoom.h -debian/tmp/opt/kde3/include/kde/kviewshell/zoomlimits.h -debian/tmp/opt/kde3/include/kde/libtext2path-0.1/BezierPath.h -debian/tmp/opt/kde3/include/kde/libtext2path-0.1/Glyph.h -debian/tmp/opt/kde3/include/kde/libtext2path-0.1/GlyphTracer.h +debian/tmp/opt/kde3/include/tde/dom/SVGAElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGAltGlyphDefElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGAltGlyphElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGAngle.h +debian/tmp/opt/kde3/include/tde/dom/SVGAnimateColorElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGAnimateElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGAnimateMotionElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGAnimateTransformElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGAnimatedAngle.h +debian/tmp/opt/kde3/include/tde/dom/SVGAnimatedBoolean.h +debian/tmp/opt/kde3/include/tde/dom/SVGAnimatedEnumeration.h +debian/tmp/opt/kde3/include/tde/dom/SVGAnimatedInteger.h +debian/tmp/opt/kde3/include/tde/dom/SVGAnimatedLength.h +debian/tmp/opt/kde3/include/tde/dom/SVGAnimatedLengthList.h +debian/tmp/opt/kde3/include/tde/dom/SVGAnimatedNumber.h +debian/tmp/opt/kde3/include/tde/dom/SVGAnimatedNumberList.h +debian/tmp/opt/kde3/include/tde/dom/SVGAnimatedPathData.h +debian/tmp/opt/kde3/include/tde/dom/SVGAnimatedPoints.h +debian/tmp/opt/kde3/include/tde/dom/SVGAnimatedPreserveAspectRatio.h +debian/tmp/opt/kde3/include/tde/dom/SVGAnimatedRect.h +debian/tmp/opt/kde3/include/tde/dom/SVGAnimatedString.h +debian/tmp/opt/kde3/include/tde/dom/SVGAnimatedTransformList.h +debian/tmp/opt/kde3/include/tde/dom/SVGAnimationElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGCSSRule.h +debian/tmp/opt/kde3/include/tde/dom/SVGCircleElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGClipPathElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGColor.h +debian/tmp/opt/kde3/include/tde/dom/SVGColorProfileElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGColorProfileRule.h +debian/tmp/opt/kde3/include/tde/dom/SVGComponentTransferFunctionElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGCursorElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGDefinitionSrcElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGDefsElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGDescElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGDocument.h +debian/tmp/opt/kde3/include/tde/dom/SVGElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGElementInstance.h +debian/tmp/opt/kde3/include/tde/dom/SVGElementInstanceList.h +debian/tmp/opt/kde3/include/tde/dom/SVGEllipseElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGEvent.h +debian/tmp/opt/kde3/include/tde/dom/SVGException.h +debian/tmp/opt/kde3/include/tde/dom/SVGExternalResourcesRequired.h +debian/tmp/opt/kde3/include/tde/dom/SVGFEBlendElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGFEColorMatrixElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGFEComponentTransferElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGFECompositeElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGFEConvolveMatrixElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGFEDiffuseLightingElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGFEDisplacementMapElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGFEDistantLightElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGFEFloodElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGFEFuncAElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGFEFuncBElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGFEFuncGElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGFEFuncRElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGFEGaussianBlurElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGFEImageElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGFEMergeElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGFEMergeNodeElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGFEMorphologyElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGFEOffsetElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGFEPointLightElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGFESpecularLightingElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGFESpotLightElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGFETileElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGFETurbulenceElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGFilterElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGFilterPrimitiveStandardAttributes.h +debian/tmp/opt/kde3/include/tde/dom/SVGFitToViewBox.h +debian/tmp/opt/kde3/include/tde/dom/SVGFontElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGFontFaceElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGFontFaceFormatElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGFontFaceNameElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGFontFaceSrcElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGFontFaceUriElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGForeignObjectElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGGElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGGlyphElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGGlyphRefElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGGradientElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGHKernElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGICCColor.h +debian/tmp/opt/kde3/include/tde/dom/SVGImageElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGLangSpace.h +debian/tmp/opt/kde3/include/tde/dom/SVGLength.h +debian/tmp/opt/kde3/include/tde/dom/SVGLengthList.h +debian/tmp/opt/kde3/include/tde/dom/SVGLineElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGLinearGradientElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGLocatable.h +debian/tmp/opt/kde3/include/tde/dom/SVGMPathElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGMarkerElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGMaskElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGMatrix.h +debian/tmp/opt/kde3/include/tde/dom/SVGMetadataElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGMissingGlyphElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGNumber.h +debian/tmp/opt/kde3/include/tde/dom/SVGNumberList.h +debian/tmp/opt/kde3/include/tde/dom/SVGPaint.h +debian/tmp/opt/kde3/include/tde/dom/SVGPathElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGPathSeg.h +debian/tmp/opt/kde3/include/tde/dom/SVGPathSegArc.h +debian/tmp/opt/kde3/include/tde/dom/SVGPathSegClosePath.h +debian/tmp/opt/kde3/include/tde/dom/SVGPathSegCurvetoCubic.h +debian/tmp/opt/kde3/include/tde/dom/SVGPathSegCurvetoCubicSmooth.h +debian/tmp/opt/kde3/include/tde/dom/SVGPathSegCurvetoQuadratic.h +debian/tmp/opt/kde3/include/tde/dom/SVGPathSegCurvetoQuadraticSmooth.h +debian/tmp/opt/kde3/include/tde/dom/SVGPathSegLineto.h +debian/tmp/opt/kde3/include/tde/dom/SVGPathSegLinetoHorizontal.h +debian/tmp/opt/kde3/include/tde/dom/SVGPathSegLinetoVertical.h +debian/tmp/opt/kde3/include/tde/dom/SVGPathSegList.h +debian/tmp/opt/kde3/include/tde/dom/SVGPathSegMoveto.h +debian/tmp/opt/kde3/include/tde/dom/SVGPatternElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGPoint.h +debian/tmp/opt/kde3/include/tde/dom/SVGPointList.h +debian/tmp/opt/kde3/include/tde/dom/SVGPolygonElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGPolylineElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGPreserveAspectRatio.h +debian/tmp/opt/kde3/include/tde/dom/SVGRadialGradientElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGRect.h +debian/tmp/opt/kde3/include/tde/dom/SVGRectElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGRenderingIntent.h +debian/tmp/opt/kde3/include/tde/dom/SVGSVGElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGScriptElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGSetElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGStopElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGStringList.h +debian/tmp/opt/kde3/include/tde/dom/SVGStylable.h +debian/tmp/opt/kde3/include/tde/dom/SVGStyleElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGSwitchElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGSymbolElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGTRefElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGTSpanElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGTests.h +debian/tmp/opt/kde3/include/tde/dom/SVGTextContentElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGTextElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGTextPathElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGTextPositioningElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGTitleElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGTransform.h +debian/tmp/opt/kde3/include/tde/dom/SVGTransformList.h +debian/tmp/opt/kde3/include/tde/dom/SVGTransformable.h +debian/tmp/opt/kde3/include/tde/dom/SVGURIReference.h +debian/tmp/opt/kde3/include/tde/dom/SVGUnitTypes.h +debian/tmp/opt/kde3/include/tde/dom/SVGUseElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGVKernElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGViewElement.h +debian/tmp/opt/kde3/include/tde/dom/SVGViewSpec.h +debian/tmp/opt/kde3/include/tde/dom/SVGWindow.h +debian/tmp/opt/kde3/include/tde/dom/SVGZoomAndPan.h +debian/tmp/opt/kde3/include/tde/dom/SVGZoomEvent.h +debian/tmp/opt/kde3/include/tde/kfaximage.h +debian/tmp/opt/kde3/include/tde/kmultipageInterface.h +debian/tmp/opt/kde3/include/tde/ksvg/CanvasFactory.h +debian/tmp/opt/kde3/include/tde/ksvg/CanvasItem.h +debian/tmp/opt/kde3/include/tde/ksvg/CanvasItems.h +debian/tmp/opt/kde3/include/tde/ksvg/DocumentFactory.h +debian/tmp/opt/kde3/include/tde/ksvg/KSVGCanvas.h +debian/tmp/opt/kde3/include/tde/ksvg/ksvg_plugin.h +debian/tmp/opt/kde3/include/tde/kviewshell/anchor.h +debian/tmp/opt/kde3/include/tde/kviewshell/bookmark.h +debian/tmp/opt/kde3/include/tde/kviewshell/pageView.h +debian/tmp/opt/kde3/include/tde/kviewshell/documentPageCache.h +debian/tmp/opt/kde3/include/tde/kviewshell/documentRenderer.h +debian/tmp/opt/kde3/include/tde/kviewshell/documentWidget.h +debian/tmp/opt/kde3/include/tde/kviewshell/history.h +debian/tmp/opt/kde3/include/tde/kviewshell/hyperlink.h +debian/tmp/opt/kde3/include/tde/kviewshell/kmultipage.h +debian/tmp/opt/kde3/include/tde/kviewshell/length.h +debian/tmp/opt/kde3/include/tde/kviewshell/pageNumber.h +debian/tmp/opt/kde3/include/tde/kviewshell/pageSize.h +debian/tmp/opt/kde3/include/tde/kviewshell/renderedDocumentPage.h +debian/tmp/opt/kde3/include/tde/kviewshell/renderedDocumentPagePixmap.h +debian/tmp/opt/kde3/include/tde/kviewshell/renderedDocumentPagePrinter.h +debian/tmp/opt/kde3/include/tde/kviewshell/selection.h +debian/tmp/opt/kde3/include/tde/kviewshell/simplePageSize.h +debian/tmp/opt/kde3/include/tde/kviewshell/textBox.h +debian/tmp/opt/kde3/include/tde/kviewshell/zoom.h +debian/tmp/opt/kde3/include/tde/kviewshell/zoomlimits.h +debian/tmp/opt/kde3/include/tde/libtext2path-0.1/BezierPath.h +debian/tmp/opt/kde3/include/tde/libtext2path-0.1/Glyph.h +debian/tmp/opt/kde3/include/tde/libtext2path-0.1/GlyphTracer.h debian/tmp/opt/kde3/lib/libkdeinit_kview.la debian/tmp/opt/kde3/lib/libkdeinit_mrmlsearch.la debian/tmp/opt/kde3/lib/libkghostviewlib.la diff --git a/ubuntu/maverick_automake/kdegraphics/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick_automake/kdegraphics/debian/patches/common/kubuntu_01_kdepot.diff index 3d5dc7628..e705cf83b 100644 --- a/ubuntu/maverick_automake/kdegraphics/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick_automake/kdegraphics/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/opt/kde3/include/kde/kde.pot ++kdepotpath=/opt/kde3/include/tde/kde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick_automake/kdegraphics/debian/rules b/ubuntu/maverick_automake/kdegraphics/debian/rules index 6974a0ca2..d8c5070a6 100755 --- a/ubuntu/maverick_automake/kdegraphics/debian/rules +++ b/ubuntu/maverick_automake/kdegraphics/debian/rules @@ -5,14 +5,14 @@ include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --includedir="/opt/kde3/include/kde" --mandir="/opt/kde3/share/man" --infodir="/opt/kde3/share/info" --with-extra-libs="/usr/lib/mesa" +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --includedir="/opt/kde3/include/tde" --mandir="/opt/kde3/share/man" --infodir="/opt/kde3/share/info" --with-extra-libs="/usr/lib/mesa" DEB_DH_STRIP_ARGS := --dbg-package=kdegraphics-kde3-dbg diff --git a/ubuntu/maverick_automake/kdelibs/debian/cdbs/kde.mk b/ubuntu/maverick_automake/kdelibs/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/maverick_automake/kdelibs/debian/cdbs/kde.mk +++ b/ubuntu/maverick_automake/kdelibs/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick_automake/kdelibs/debian/changelog b/ubuntu/maverick_automake/kdelibs/debian/changelog index 9e6d8143f..bc7c7eed5 100644 --- a/ubuntu/maverick_automake/kdelibs/debian/changelog +++ b/ubuntu/maverick_automake/kdelibs/debian/changelog @@ -2087,7 +2087,7 @@ kdelibs (4:3.4.0-0pre5) alioth; urgency=low output them expanded even when --expandvars is not used. (Closes: #287822) * Fixed the ability of the build system to find kde.pot, even when it is not - located at TDEDIR/include/kde.pot. This allows the use of targets such as + located at TDEDIR/include/tde.pot. This allows the use of targets such as "package-messages" without specifying includedir. (Closes: #283858) * Now that graphviz is in main, add it to Build-Depends-Indep together with @@ -2394,8 +2394,8 @@ kdelibs (4:3.3.2-0pre1) experimental; urgency=low - usr/share/apps/ksgmltools2/customization/cs/entities/underLGPL.docbook * New entries in debian/kdelibs4-dev.install: - - usr/include/kde/kiobuffer.h - - usr/include/kde/kwallettypes.h + - usr/include/tde/kiobuffer.h + - usr/include/tde/kwallettypes.h * debian/control: - removed unneeded build-dependency on automake1.9. [CM] diff --git a/ubuntu/maverick_automake/kdelibs/debian/kdelibs4-kde3-dev.install b/ubuntu/maverick_automake/kdelibs/debian/kdelibs4-kde3-dev.install index e2b5d076c..8477c382c 100644 --- a/ubuntu/maverick_automake/kdelibs/debian/kdelibs4-kde3-dev.install +++ b/ubuntu/maverick_automake/kdelibs/debian/kdelibs4-kde3-dev.install @@ -8,715 +8,715 @@ debian/tmp/opt/kde3/bin/kunittestmodrunner debian/tmp/opt/kde3/bin/makekdewidgets debian/tmp/opt/kde3/bin/preparetips -debian/tmp/opt/kde3/include/kde/arts/artskde.h -debian/tmp/opt/kde3/include/kde/arts/kartsdispatcher.h -debian/tmp/opt/kde3/include/kde/arts/kartsfloatwatch.h -debian/tmp/opt/kde3/include/kde/arts/kartsserver.h -debian/tmp/opt/kde3/include/kde/arts/kaudiomanagerplay.h -debian/tmp/opt/kde3/include/kde/arts/kaudioplaystream.h -debian/tmp/opt/kde3/include/kde/arts/kaudiorecordstream.h -debian/tmp/opt/kde3/include/kde/arts/kplayobjectfactory.h -debian/tmp/opt/kde3/include/kde/arts/kplayobject.h -debian/tmp/opt/kde3/include/kde/arts/kvideowidget.h -debian/tmp/opt/kde3/include/kde/dcopclient.h -debian/tmp/opt/kde3/include/kde/dcopobject.h -debian/tmp/opt/kde3/include/kde/dcopref.h -debian/tmp/opt/kde3/include/kde/dcopstub.h -debian/tmp/opt/kde3/include/kde/dcoptypes.h -debian/tmp/opt/kde3/include/kde/dnssd/domainbrowser.h -debian/tmp/opt/kde3/include/kde/dnssd/publicservice.h -debian/tmp/opt/kde3/include/kde/dnssd/query.h -debian/tmp/opt/kde3/include/kde/dnssd/remoteservice.h -debian/tmp/opt/kde3/include/kde/dnssd/servicebase.h -debian/tmp/opt/kde3/include/kde/dnssd/servicebrowser.h -debian/tmp/opt/kde3/include/kde/dnssd/settings.h -debian/tmp/opt/kde3/include/kde/dom/css_rule.h -debian/tmp/opt/kde3/include/kde/dom/css_stylesheet.h -debian/tmp/opt/kde3/include/kde/dom/css_value.h -debian/tmp/opt/kde3/include/kde/dom/dom2_events.h -debian/tmp/opt/kde3/include/kde/dom/dom2_range.h -debian/tmp/opt/kde3/include/kde/dom/dom2_traversal.h -debian/tmp/opt/kde3/include/kde/dom/dom2_views.h -debian/tmp/opt/kde3/include/kde/dom/dom_core.h -debian/tmp/opt/kde3/include/kde/dom/dom_doc.h -debian/tmp/opt/kde3/include/kde/dom/dom_element.h -debian/tmp/opt/kde3/include/kde/dom/dom_exception.h -debian/tmp/opt/kde3/include/kde/dom/dom_html.h -debian/tmp/opt/kde3/include/kde/dom/dom_misc.h -debian/tmp/opt/kde3/include/kde/dom/dom_node.h -debian/tmp/opt/kde3/include/kde/dom/dom_string.h -debian/tmp/opt/kde3/include/kde/dom/dom_text.h -debian/tmp/opt/kde3/include/kde/dom/dom_xml.h -debian/tmp/opt/kde3/include/kde/dom/html_base.h -debian/tmp/opt/kde3/include/kde/dom/html_block.h -debian/tmp/opt/kde3/include/kde/dom/html_document.h -debian/tmp/opt/kde3/include/kde/dom/html_element.h -debian/tmp/opt/kde3/include/kde/dom/html_form.h -debian/tmp/opt/kde3/include/kde/dom/html_head.h -debian/tmp/opt/kde3/include/kde/dom/html_image.h -debian/tmp/opt/kde3/include/kde/dom/html_inline.h -debian/tmp/opt/kde3/include/kde/dom/html_list.h -debian/tmp/opt/kde3/include/kde/dom/html_misc.h -debian/tmp/opt/kde3/include/kde/dom/html_object.h -debian/tmp/opt/kde3/include/kde/dom/html_table.h -debian/tmp/opt/kde3/include/kde/fixx11h.h -debian/tmp/opt/kde3/include/kde/kabc/addressbook.h -debian/tmp/opt/kde3/include/kde/kabc/addresseedialog.h -debian/tmp/opt/kde3/include/kde/kabc/addressee.h -debian/tmp/opt/kde3/include/kde/kabc/addresseelist.h -debian/tmp/opt/kde3/include/kde/kabc/address.h -debian/tmp/opt/kde3/include/kde/kabc/addresslineedit.h -debian/tmp/opt/kde3/include/kde/kabc/agent.h -debian/tmp/opt/kde3/include/kde/kabc/distributionlistdialog.h -debian/tmp/opt/kde3/include/kde/kabc/distributionlisteditor.h -debian/tmp/opt/kde3/include/kde/kabc/distributionlist.h -debian/tmp/opt/kde3/include/kde/kabc/errorhandler.h -debian/tmp/opt/kde3/include/kde/kabc/field.h -debian/tmp/opt/kde3/include/kde/kabc/formatfactory.h -debian/tmp/opt/kde3/include/kde/kabc/format.h -debian/tmp/opt/kde3/include/kde/kabc/formatplugin.h -debian/tmp/opt/kde3/include/kde/kabc/geo.h -debian/tmp/opt/kde3/include/kde/kabc/key.h -debian/tmp/opt/kde3/include/kde/kabc/ldapclient.h -debian/tmp/opt/kde3/include/kde/kabc/ldapconfigwidget.h -debian/tmp/opt/kde3/include/kde/kabc/ldapurl.h -debian/tmp/opt/kde3/include/kde/kabc/ldifconverter.h -debian/tmp/opt/kde3/include/kde/kabc/ldif.h -debian/tmp/opt/kde3/include/kde/kabc/lock.h -debian/tmp/opt/kde3/include/kde/kabc/locknull.h -debian/tmp/opt/kde3/include/kde/kabc/phonenumber.h -debian/tmp/opt/kde3/include/kde/kabc/picture.h -debian/tmp/opt/kde3/include/kde/kabc/plugin.h -debian/tmp/opt/kde3/include/kde/kabc/resourcedir.h -debian/tmp/opt/kde3/include/kde/kabc/resourcefile.h -debian/tmp/opt/kde3/include/kde/kabc/resource.h -debian/tmp/opt/kde3/include/kde/kabc/resourceldapkio.h +debian/tmp/opt/kde3/include/tde/arts/artskde.h +debian/tmp/opt/kde3/include/tde/arts/kartsdispatcher.h +debian/tmp/opt/kde3/include/tde/arts/kartsfloatwatch.h +debian/tmp/opt/kde3/include/tde/arts/kartsserver.h +debian/tmp/opt/kde3/include/tde/arts/kaudiomanagerplay.h +debian/tmp/opt/kde3/include/tde/arts/kaudioplaystream.h +debian/tmp/opt/kde3/include/tde/arts/kaudiorecordstream.h +debian/tmp/opt/kde3/include/tde/arts/kplayobjectfactory.h +debian/tmp/opt/kde3/include/tde/arts/kplayobject.h +debian/tmp/opt/kde3/include/tde/arts/kvideowidget.h +debian/tmp/opt/kde3/include/tde/dcopclient.h +debian/tmp/opt/kde3/include/tde/dcopobject.h +debian/tmp/opt/kde3/include/tde/dcopref.h +debian/tmp/opt/kde3/include/tde/dcopstub.h +debian/tmp/opt/kde3/include/tde/dcoptypes.h +debian/tmp/opt/kde3/include/tde/dnssd/domainbrowser.h +debian/tmp/opt/kde3/include/tde/dnssd/publicservice.h +debian/tmp/opt/kde3/include/tde/dnssd/query.h +debian/tmp/opt/kde3/include/tde/dnssd/remoteservice.h +debian/tmp/opt/kde3/include/tde/dnssd/servicebase.h +debian/tmp/opt/kde3/include/tde/dnssd/servicebrowser.h +debian/tmp/opt/kde3/include/tde/dnssd/settings.h +debian/tmp/opt/kde3/include/tde/dom/css_rule.h +debian/tmp/opt/kde3/include/tde/dom/css_stylesheet.h +debian/tmp/opt/kde3/include/tde/dom/css_value.h +debian/tmp/opt/kde3/include/tde/dom/dom2_events.h +debian/tmp/opt/kde3/include/tde/dom/dom2_range.h +debian/tmp/opt/kde3/include/tde/dom/dom2_traversal.h +debian/tmp/opt/kde3/include/tde/dom/dom2_views.h +debian/tmp/opt/kde3/include/tde/dom/dom_core.h +debian/tmp/opt/kde3/include/tde/dom/dom_doc.h +debian/tmp/opt/kde3/include/tde/dom/dom_element.h +debian/tmp/opt/kde3/include/tde/dom/dom_exception.h +debian/tmp/opt/kde3/include/tde/dom/dom_html.h +debian/tmp/opt/kde3/include/tde/dom/dom_misc.h +debian/tmp/opt/kde3/include/tde/dom/dom_node.h +debian/tmp/opt/kde3/include/tde/dom/dom_string.h +debian/tmp/opt/kde3/include/tde/dom/dom_text.h +debian/tmp/opt/kde3/include/tde/dom/dom_xml.h +debian/tmp/opt/kde3/include/tde/dom/html_base.h +debian/tmp/opt/kde3/include/tde/dom/html_block.h +debian/tmp/opt/kde3/include/tde/dom/html_document.h +debian/tmp/opt/kde3/include/tde/dom/html_element.h +debian/tmp/opt/kde3/include/tde/dom/html_form.h +debian/tmp/opt/kde3/include/tde/dom/html_head.h +debian/tmp/opt/kde3/include/tde/dom/html_image.h +debian/tmp/opt/kde3/include/tde/dom/html_inline.h +debian/tmp/opt/kde3/include/tde/dom/html_list.h +debian/tmp/opt/kde3/include/tde/dom/html_misc.h +debian/tmp/opt/kde3/include/tde/dom/html_object.h +debian/tmp/opt/kde3/include/tde/dom/html_table.h +debian/tmp/opt/kde3/include/tde/fixx11h.h +debian/tmp/opt/kde3/include/tde/kabc/addressbook.h +debian/tmp/opt/kde3/include/tde/kabc/addresseedialog.h +debian/tmp/opt/kde3/include/tde/kabc/addressee.h +debian/tmp/opt/kde3/include/tde/kabc/addresseelist.h +debian/tmp/opt/kde3/include/tde/kabc/address.h +debian/tmp/opt/kde3/include/tde/kabc/addresslineedit.h +debian/tmp/opt/kde3/include/tde/kabc/agent.h +debian/tmp/opt/kde3/include/tde/kabc/distributionlistdialog.h +debian/tmp/opt/kde3/include/tde/kabc/distributionlisteditor.h +debian/tmp/opt/kde3/include/tde/kabc/distributionlist.h +debian/tmp/opt/kde3/include/tde/kabc/errorhandler.h +debian/tmp/opt/kde3/include/tde/kabc/field.h +debian/tmp/opt/kde3/include/tde/kabc/formatfactory.h +debian/tmp/opt/kde3/include/tde/kabc/format.h +debian/tmp/opt/kde3/include/tde/kabc/formatplugin.h +debian/tmp/opt/kde3/include/tde/kabc/geo.h +debian/tmp/opt/kde3/include/tde/kabc/key.h +debian/tmp/opt/kde3/include/tde/kabc/ldapclient.h +debian/tmp/opt/kde3/include/tde/kabc/ldapconfigwidget.h +debian/tmp/opt/kde3/include/tde/kabc/ldapurl.h +debian/tmp/opt/kde3/include/tde/kabc/ldifconverter.h +debian/tmp/opt/kde3/include/tde/kabc/ldif.h +debian/tmp/opt/kde3/include/tde/kabc/lock.h +debian/tmp/opt/kde3/include/tde/kabc/locknull.h +debian/tmp/opt/kde3/include/tde/kabc/phonenumber.h +debian/tmp/opt/kde3/include/tde/kabc/picture.h +debian/tmp/opt/kde3/include/tde/kabc/plugin.h +debian/tmp/opt/kde3/include/tde/kabc/resourcedir.h +debian/tmp/opt/kde3/include/tde/kabc/resourcefile.h +debian/tmp/opt/kde3/include/tde/kabc/resource.h +debian/tmp/opt/kde3/include/tde/kabc/resourceldapkio.h -debian/tmp/opt/kde3/include/kde/kabc/resourceselectdialog.h -debian/tmp/opt/kde3/include/kde/kabc/secrecy.h -debian/tmp/opt/kde3/include/kde/kabc/sortmode.h -debian/tmp/opt/kde3/include/kde/kabc/sound.h -debian/tmp/opt/kde3/include/kde/kabc/stdaddressbook.h -debian/tmp/opt/kde3/include/kde/kabc/timezone.h -debian/tmp/opt/kde3/include/kde/kabc/vcardconverter.h -debian/tmp/opt/kde3/include/kde/kabc/vcardformat.h -debian/tmp/opt/kde3/include/kde/kabc/vcardformatplugin.h -debian/tmp/opt/kde3/include/kde/kabc/vcard.h -debian/tmp/opt/kde3/include/kde/kabc/vcardline.h -debian/tmp/opt/kde3/include/kde/kabc/vcardparser.h -debian/tmp/opt/kde3/include/kde/kaboutapplication.h -debian/tmp/opt/kde3/include/kde/kaboutdata.h -debian/tmp/opt/kde3/include/kde/kaboutdialog.h -debian/tmp/opt/kde3/include/kde/kaboutkde.h -debian/tmp/opt/kde3/include/kde/kaccelgen.h -debian/tmp/opt/kde3/include/kde/kaccel.h -debian/tmp/opt/kde3/include/kde/kaccelmanager.h -debian/tmp/opt/kde3/include/kde/kacl.h -debian/tmp/opt/kde3/include/kde/kactionclasses.h -debian/tmp/opt/kde3/include/kde/kactioncollection.h -debian/tmp/opt/kde3/include/kde/kaction.h -debian/tmp/opt/kde3/include/kde/kactionselector.h -debian/tmp/opt/kde3/include/kde/kactionshortcutlist.h -debian/tmp/opt/kde3/include/kde/kactivelabel.h -debian/tmp/opt/kde3/include/kde/kallocator.h -debian/tmp/opt/kde3/include/kde/kanimwidget.h -debian/tmp/opt/kde3/include/kde/kapp.h -debian/tmp/opt/kde3/include/kde/kapplication.h -debian/tmp/opt/kde3/include/kde/karchive.h -debian/tmp/opt/kde3/include/kde/kar.h -debian/tmp/opt/kde3/include/kde/karrowbutton.h -debian/tmp/opt/kde3/include/kde/kasyncio.h -debian/tmp/opt/kde3/include/kde/kate/document.h -debian/tmp/opt/kde3/include/kde/kate/view.h -debian/tmp/opt/kde3/include/kde/kaudioplayer.h -debian/tmp/opt/kde3/include/kde/kauthicon.h -debian/tmp/opt/kde3/include/kde/kautomount.h -debian/tmp/opt/kde3/include/kde/kbookmarkbar.h -debian/tmp/opt/kde3/include/kde/kbookmarkdombuilder.h -debian/tmp/opt/kde3/include/kde/kbookmarkdrag.h -debian/tmp/opt/kde3/include/kde/kbookmarkexporter.h -debian/tmp/opt/kde3/include/kde/kbookmark.h -debian/tmp/opt/kde3/include/kde/kbookmarkimporter_crash.h -debian/tmp/opt/kde3/include/kde/kbookmarkimporter.h -debian/tmp/opt/kde3/include/kde/kbookmarkimporter_ie.h -debian/tmp/opt/kde3/include/kde/kbookmarkimporter_kde1.h -debian/tmp/opt/kde3/include/kde/kbookmarkimporter_ns.h -debian/tmp/opt/kde3/include/kde/kbookmarkimporter_opera.h -debian/tmp/opt/kde3/include/kde/kbookmarkmanager.h -debian/tmp/opt/kde3/include/kde/kbookmarkmenu.h -debian/tmp/opt/kde3/include/kde/kbookmarknotifier.h -debian/tmp/opt/kde3/include/kde/kbufferedio.h -debian/tmp/opt/kde3/include/kde/kbufferedsocket.h -debian/tmp/opt/kde3/include/kde/kbugreport.h -debian/tmp/opt/kde3/include/kde/kbuttonbox.h -debian/tmp/opt/kde3/include/kde/kcalendarsystemfactory.h -debian/tmp/opt/kde3/include/kde/kcalendarsystem.h -debian/tmp/opt/kde3/include/kde/kcatalogue.h -debian/tmp/opt/kde3/include/kde/kcharselect.h -debian/tmp/opt/kde3/include/kde/kcharsets.h -debian/tmp/opt/kde3/include/kde/kclientsocketbase.h -debian/tmp/opt/kde3/include/kde/kclipboard.h -debian/tmp/opt/kde3/include/kde/kcmdlineargs.h -debian/tmp/opt/kde3/include/kde/kcmenumngr.h -debian/tmp/opt/kde3/include/kde/kcmodulecontainer.h -debian/tmp/opt/kde3/include/kde/kcmodule.h -debian/tmp/opt/kde3/include/kde/kcmoduleinfo.h -debian/tmp/opt/kde3/include/kde/kcmoduleloader.h -debian/tmp/opt/kde3/include/kde/kcmoduleproxy.h -debian/tmp/opt/kde3/include/kde/kcmultidialog.h -debian/tmp/opt/kde3/include/kde/kcolorbtn.h -debian/tmp/opt/kde3/include/kde/kcolorbutton.h -debian/tmp/opt/kde3/include/kde/kcolorcombo.h -debian/tmp/opt/kde3/include/kde/kcolordialog.h -debian/tmp/opt/kde3/include/kde/kcolordlg.h -debian/tmp/opt/kde3/include/kde/kcolordrag.h -debian/tmp/opt/kde3/include/kde/kcombiview.h -debian/tmp/opt/kde3/include/kde/kcombobox.h -debian/tmp/opt/kde3/include/kde/kcommand.h -debian/tmp/opt/kde3/include/kde/kcompletionbox.h -debian/tmp/opt/kde3/include/kde/kcompletion.h -debian/tmp/opt/kde3/include/kde/kconfigbackend.h -debian/tmp/opt/kde3/include/kde/kconfigbase.h -debian/tmp/opt/kde3/include/kde/kconfigdata.h -debian/tmp/opt/kde3/include/kde/kconfigdialog.h -debian/tmp/opt/kde3/include/kde/kconfigdialogmanager.h -debian/tmp/opt/kde3/include/kde/kconfig.h -debian/tmp/opt/kde3/include/kde/kconfigskeleton.h -debian/tmp/opt/kde3/include/kde/kcpuinfo.h -debian/tmp/opt/kde3/include/kde/kcrash.h -debian/tmp/opt/kde3/include/kde/kcursor.h -debian/tmp/opt/kde3/include/kde/kcustommenueditor.h -debian/tmp/opt/kde3/include/kde/kdatagramsocket.h -debian/tmp/opt/kde3/include/kde/kdatastream.h -debian/tmp/opt/kde3/include/kde/kdatatool.h -debian/tmp/opt/kde3/include/kde/kdatepicker.h -debian/tmp/opt/kde3/include/kde/kdatepik.h -debian/tmp/opt/kde3/include/kde/kdatetbl.h -debian/tmp/opt/kde3/include/kde/kdatetimewidget.h -debian/tmp/opt/kde3/include/kde/kdatewidget.h -debian/tmp/opt/kde3/include/kde/kdcopactionproxy.h -debian/tmp/opt/kde3/include/kde/kdcoppropertyproxy.h -debian/tmp/opt/kde3/include/kde/kdcopservicestarter.h -debian/tmp/opt/kde3/include/kde/kdebugclasses.h -debian/tmp/opt/kde3/include/kde/kdebug.h -debian/tmp/opt/kde3/include/kde/kdedmodule.h -debian/tmp/opt/kde3/include/kde/kde_file.h -debian/tmp/opt/kde3/include/kde/kdelibs_export.h -debian/tmp/opt/kde3/include/kde/kdemacros.h -debian/tmp/opt/kde3/include/kde/kde.pot -debian/tmp/opt/kde3/include/kde/kdeprint/driver.h -debian/tmp/opt/kde3/include/kde/kdeprint/kiconselectaction.h -debian/tmp/opt/kde3/include/kde/kdeprint/kmjob.h -debian/tmp/opt/kde3/include/kde/kdeprint/kmjobmanager.h -debian/tmp/opt/kde3/include/kde/kdeprint/kmjobviewer.h -debian/tmp/opt/kde3/include/kde/kdeprint/kmmainview.h -debian/tmp/opt/kde3/include/kde/kdeprint/kmmanager.h -debian/tmp/opt/kde3/include/kde/kdeprint/kmobject.h -debian/tmp/opt/kde3/include/kde/kdeprint/kmprinter.h -debian/tmp/opt/kde3/include/kde/kdeprint/kmprinterpage.h -debian/tmp/opt/kde3/include/kde/kdeprint/kmtimer.h -debian/tmp/opt/kde3/include/kde/kdeprint/kpreloadobject.h -debian/tmp/opt/kde3/include/kde/kdeprint/kprintdialog.h -debian/tmp/opt/kde3/include/kde/kdeprint/kprintdialogpage.h -debian/tmp/opt/kde3/include/kde/kdeprint/lpr/lprhandler.h -debian/tmp/opt/kde3/include/kde/kdeprint/lpr/lprsettings.h -debian/tmp/opt/kde3/include/kde/kdeprint/lpr/printcapentry.h -debian/tmp/opt/kde3/include/kde/kdesktopfile.h -debian/tmp/opt/kde3/include/kde/kdesu/client.h -debian/tmp/opt/kde3/include/kde/kdesu/defaults.h -debian/tmp/opt/kde3/include/kde/kdesu/kcookie.h -debian/tmp/opt/kde3/include/kde/kdesu/kdesu_pty.h -debian/tmp/opt/kde3/include/kde/kdesu/process.h -debian/tmp/opt/kde3/include/kde/kdesu/pty.h -debian/tmp/opt/kde3/include/kde/kdesu/ssh.h -debian/tmp/opt/kde3/include/kde/kdesu/stub.h -debian/tmp/opt/kde3/include/kde/kdesu/su.h -debian/tmp/opt/kde3/include/kde/kde_terminal_interface.h -debian/tmp/opt/kde3/include/kde/kdeversion.h -debian/tmp/opt/kde3/include/kde/kdialogbase.h -debian/tmp/opt/kde3/include/kde/kdialog.h -debian/tmp/opt/kde3/include/kde/kdirlister.h -debian/tmp/opt/kde3/include/kde/kdirnotify.h -debian/tmp/opt/kde3/include/kde/kdirnotify_stub.h -debian/tmp/opt/kde3/include/kde/kdiroperator.h -debian/tmp/opt/kde3/include/kde/kdirselectdialog.h -debian/tmp/opt/kde3/include/kde/kdirsize.h -debian/tmp/opt/kde3/include/kde/kdirwatch.h -debian/tmp/opt/kde3/include/kde/kdiskfreesp.h -debian/tmp/opt/kde3/include/kde/kdockwidget.h -debian/tmp/opt/kde3/include/kde/kdockwindow.h -debian/tmp/opt/kde3/include/kde/kdrawutil.h -debian/tmp/opt/kde3/include/kde/kdualcolorbtn.h -debian/tmp/opt/kde3/include/kde/kdualcolorbutton.h -debian/tmp/opt/kde3/include/kde/keditcl.h -debian/tmp/opt/kde3/include/kde/keditlistbox.h -debian/tmp/opt/kde3/include/kde/kedittoolbar.h -debian/tmp/opt/kde3/include/kde/kemailsettings.h -debian/tmp/opt/kde3/include/kde/kencodingfiledialog.h -debian/tmp/opt/kde3/include/kde/kextendedsocket.h -debian/tmp/opt/kde3/include/kde/kextsock.h -debian/tmp/opt/kde3/include/kde/kfiledetailview.h -debian/tmp/opt/kde3/include/kde/kfiledialog.h -debian/tmp/opt/kde3/include/kde/kfilefiltercombo.h -debian/tmp/opt/kde3/include/kde/kfilefilter.h -debian/tmp/opt/kde3/include/kde/kfile.h -debian/tmp/opt/kde3/include/kde/kfileiconview.h -debian/tmp/opt/kde3/include/kde/kfileitem.h -debian/tmp/opt/kde3/include/kde/kfilemetainfo.h -debian/tmp/opt/kde3/include/kde/kfilepreview.h -debian/tmp/opt/kde3/include/kde/kfilesharedlg.h -debian/tmp/opt/kde3/include/kde/kfileshare.h -debian/tmp/opt/kde3/include/kde/kfiletreebranch.h -debian/tmp/opt/kde3/include/kde/kfiletreeview.h -debian/tmp/opt/kde3/include/kde/kfiletreeviewitem.h -debian/tmp/opt/kde3/include/kde/kfileview.h -debian/tmp/opt/kde3/include/kde/kfilterbase.h -debian/tmp/opt/kde3/include/kde/kfilterdev.h -debian/tmp/opt/kde3/include/kde/kfinddialog.h -debian/tmp/opt/kde3/include/kde/kfind.h -debian/tmp/opt/kde3/include/kde/kfontcombo.h -debian/tmp/opt/kde3/include/kde/kfontdialog.h -debian/tmp/opt/kde3/include/kde/kfontrequester.h -debian/tmp/opt/kde3/include/kde/kgenericfactory.h -debian/tmp/opt/kde3/include/kde/kgenericfactory.tcc -debian/tmp/opt/kde3/include/kde/kglobalaccel.h -debian/tmp/opt/kde3/include/kde/kglobal.h -debian/tmp/opt/kde3/include/kde/kglobalsettings.h -debian/tmp/opt/kde3/include/kde/kguiitem.h -debian/tmp/opt/kde3/include/kde/khelpmenu.h -debian/tmp/opt/kde3/include/kde/khexedit/byteseditinterface.h -debian/tmp/opt/kde3/include/kde/khexedit/charcolumninterface.h -debian/tmp/opt/kde3/include/kde/khexedit/clipboardinterface.h -debian/tmp/opt/kde3/include/kde/khexedit/valuecolumninterface.h -debian/tmp/opt/kde3/include/kde/khexedit/zoominterface.h -debian/tmp/opt/kde3/include/kde/khtmldefaults.h -debian/tmp/opt/kde3/include/kde/khtml_events.h -debian/tmp/opt/kde3/include/kde/khtml_part.h -debian/tmp/opt/kde3/include/kde/khtml_settings.h -debian/tmp/opt/kde3/include/kde/khtmlview.h -debian/tmp/opt/kde3/include/kde/khttpproxysocketdevice.h -debian/tmp/opt/kde3/include/kde/kicondialog.h -debian/tmp/opt/kde3/include/kde/kiconeffect.h -debian/tmp/opt/kde3/include/kde/kiconloader.h -debian/tmp/opt/kde3/include/kde/kicontheme.h -debian/tmp/opt/kde3/include/kde/kiconview.h -debian/tmp/opt/kde3/include/kde/kiconviewsearchline.h -debian/tmp/opt/kde3/include/kde/kidna.h -debian/tmp/opt/kde3/include/kde/kimageeffect.h -debian/tmp/opt/kde3/include/kde/kimagefilepreview.h -debian/tmp/opt/kde3/include/kde/kimageio.h -debian/tmp/opt/kde3/include/kde/kimiface.h -debian/tmp/opt/kde3/include/kde/kimproxy.h -debian/tmp/opt/kde3/include/kde/kimproxyiface.h -debian/tmp/opt/kde3/include/kde/kinputdialog.h -debian/tmp/opt/kde3/include/kde/kinstance.h -debian/tmp/opt/kde3/include/kde/kio/authinfo.h -debian/tmp/opt/kde3/include/kde/kiobuffer.h -debian/tmp/opt/kde3/include/kde/kio/chmodjob.h -debian/tmp/opt/kde3/include/kde/kio/connection.h -debian/tmp/opt/kde3/include/kde/kio/davjob.h -debian/tmp/opt/kde3/include/kde/kio/defaultprogress.h -debian/tmp/opt/kde3/include/kde/kio/file.h -debian/tmp/opt/kde3/include/kde/kio/forwardingslavebase.h -debian/tmp/opt/kde3/include/kde/kio/global.h -debian/tmp/opt/kde3/include/kde/kio/http.h -debian/tmp/opt/kde3/include/kde/kio/http_slave_defaults.h -debian/tmp/opt/kde3/include/kde/kio/ioslave_defaults.h -debian/tmp/opt/kde3/include/kde/kio/jobclasses.h -debian/tmp/opt/kde3/include/kde/kio/job.h -debian/tmp/opt/kde3/include/kde/kio/kdesasl.h -debian/tmp/opt/kde3/include/kde/kio/kmdbase.h -debian/tmp/opt/kde3/include/kde/kio/kmdcodec.h -debian/tmp/opt/kde3/include/kde/kio/kntlm.h -debian/tmp/opt/kde3/include/kde/kio/metainfojob.h -debian/tmp/opt/kde3/include/kde/kio/netaccess.h -debian/tmp/opt/kde3/include/kde/kio/observer.h -debian/tmp/opt/kde3/include/kde/kio/passdlg.h -debian/tmp/opt/kde3/include/kde/kio/paste.h -debian/tmp/opt/kde3/include/kde/kio/previewjob.h -debian/tmp/opt/kde3/include/kde/kio/progressbase.h -debian/tmp/opt/kde3/include/kde/kio/renamedlg.h -debian/tmp/opt/kde3/include/kde/kio/scheduler.h -debian/tmp/opt/kde3/include/kde/kio/sessiondata.h -debian/tmp/opt/kde3/include/kde/kio/skipdlg.h -debian/tmp/opt/kde3/include/kde/kio/slavebase.h -debian/tmp/opt/kde3/include/kde/kio/slaveconfig.h -debian/tmp/opt/kde3/include/kde/kio/slave.h -debian/tmp/opt/kde3/include/kde/kio/slaveinterface.h -debian/tmp/opt/kde3/include/kde/kio/statusbarprogress.h -debian/tmp/opt/kde3/include/kde/kio/tcpslavebase.h -debian/tmp/opt/kde3/include/kde/kio/thumbcreator.h -debian/tmp/opt/kde3/include/kde/kio/uiserver.h -debian/tmp/opt/kde3/include/kde/kio/uiserver_stub.h -debian/tmp/opt/kde3/include/kde/kipc.h -debian/tmp/opt/kde3/include/kde/kjanuswidget.h -debian/tmp/opt/kde3/include/kde/kjs/completion.h -debian/tmp/opt/kde3/include/kde/kjs/function.h -debian/tmp/opt/kde3/include/kde/kjs/global.h -debian/tmp/opt/kde3/include/kde/kjs/identifier.h -debian/tmp/opt/kde3/include/kde/kjs/interpreter.h -debian/tmp/opt/kde3/include/kde/kjs/list.h -debian/tmp/opt/kde3/include/kde/kjs/lookup.h -debian/tmp/opt/kde3/include/kde/kjs/object.h -debian/tmp/opt/kde3/include/kde/kjs/operations.h -debian/tmp/opt/kde3/include/kde/kjs/property_map.h -debian/tmp/opt/kde3/include/kde/kjs/reference.h -debian/tmp/opt/kde3/include/kde/kjs/reference_list.h -debian/tmp/opt/kde3/include/kde/kjs/scope_chain.h -debian/tmp/opt/kde3/include/kde/kjs/simple_number.h -debian/tmp/opt/kde3/include/kde/kjs/types.h -debian/tmp/opt/kde3/include/kde/kjs/ustring.h -debian/tmp/opt/kde3/include/kde/kjs/value.h -debian/tmp/opt/kde3/include/kde/kkeybutton.h -debian/tmp/opt/kde3/include/kde/kkeydialog.h -debian/tmp/opt/kde3/include/kde/kkeynative.h -debian/tmp/opt/kde3/include/kde/klanguagebutton.h -debian/tmp/opt/kde3/include/kde/klargefile.h -debian/tmp/opt/kde3/include/kde/kled.h -debian/tmp/opt/kde3/include/kde/klibloader.h -debian/tmp/opt/kde3/include/kde/klineeditdlg.h -debian/tmp/opt/kde3/include/kde/klineedit.h -debian/tmp/opt/kde3/include/kde/klistbox.h -debian/tmp/opt/kde3/include/kde/klistview.h -debian/tmp/opt/kde3/include/kde/klistviewsearchline.h -debian/tmp/opt/kde3/include/kde/klocale.h -debian/tmp/opt/kde3/include/kde/klockfile.h -debian/tmp/opt/kde3/include/kde/kmacroexpander.h -debian/tmp/opt/kde3/include/kde/kmainwindow.h -debian/tmp/opt/kde3/include/kde/kmainwindowiface.h -debian/tmp/opt/kde3/include/kde/kmanagerselection.h -debian/tmp/opt/kde3/include/kde/kmdcodec.h -debian/tmp/opt/kde3/include/kde/kmdichildarea.h -debian/tmp/opt/kde3/include/kde/kmdichildfrmcaption.h -debian/tmp/opt/kde3/include/kde/kmdichildfrm.h -debian/tmp/opt/kde3/include/kde/kmdichildview.h -debian/tmp/opt/kde3/include/kde/kmdidefines.h -debian/tmp/opt/kde3/include/kde/kmdi/global.h -debian/tmp/opt/kde3/include/kde/kmdiiterator.h -debian/tmp/opt/kde3/include/kde/kmdilistiterator.h -debian/tmp/opt/kde3/include/kde/kmdimainfrm.h -debian/tmp/opt/kde3/include/kde/kmdi/mainwindow.h -debian/tmp/opt/kde3/include/kde/kmdinulliterator.h -debian/tmp/opt/kde3/include/kde/kmdi/tabwidget.h -debian/tmp/opt/kde3/include/kde/kmditaskbar.h -debian/tmp/opt/kde3/include/kde/kmdi/toolviewaccessor.h -debian/tmp/opt/kde3/include/kde/kmditoolviewaccessor.h -debian/tmp/opt/kde3/include/kde/kmediaplayer/playerdcopobject.h -debian/tmp/opt/kde3/include/kde/kmediaplayer/player.h -debian/tmp/opt/kde3/include/kde/kmediaplayer/view.h -debian/tmp/opt/kde3/include/kde/kmenubar.h -debian/tmp/opt/kde3/include/kde/kmessagebox.h -debian/tmp/opt/kde3/include/kde/kmimemagic.h -debian/tmp/opt/kde3/include/kde/kmimesourcefactory.h -debian/tmp/opt/kde3/include/kde/kmimetypechooser.h -debian/tmp/opt/kde3/include/kde/kmimetype.h -debian/tmp/opt/kde3/include/kde/kmimetyperesolver.h -debian/tmp/opt/kde3/include/kde/kmountpoint.h -debian/tmp/opt/kde3/include/kde/kmulticastsocketdevice.h -debian/tmp/opt/kde3/include/kde/kmulticastsocket.h -debian/tmp/opt/kde3/include/kde/kmultipledrag.h -debian/tmp/opt/kde3/include/kde/kmultitabbar.h -debian/tmp/opt/kde3/include/kde/knetworkinterface.h -debian/tmp/opt/kde3/include/kde/knewstuff/downloaddialog.h -debian/tmp/opt/kde3/include/kde/knewstuff/engine.h -debian/tmp/opt/kde3/include/kde/knewstuff/entry.h -debian/tmp/opt/kde3/include/kde/knewstuff/knewstuffbutton.h -debian/tmp/opt/kde3/include/kde/knewstuff/knewstuffgeneric.h -debian/tmp/opt/kde3/include/kde/knewstuff/knewstuff.h -debian/tmp/opt/kde3/include/kde/knewstuff/knewstuffsecure.h -debian/tmp/opt/kde3/include/kde/knewstuff/providerdialog.h -debian/tmp/opt/kde3/include/kde/knewstuff/provider.h -debian/tmp/opt/kde3/include/kde/knewstuff/uploaddialog.h -debian/tmp/opt/kde3/include/kde/knfsshare.h -debian/tmp/opt/kde3/include/kde/knotifyclient.h -debian/tmp/opt/kde3/include/kde/knotifydialog.h -debian/tmp/opt/kde3/include/kde/knotifywidgetbase.h -debian/tmp/opt/kde3/include/kde/knuminput.h -debian/tmp/opt/kde3/include/kde/knumvalidator.h -debian/tmp/opt/kde3/include/kde/kopenssl.h -debian/tmp/opt/kde3/include/kde/kopenwith.h -debian/tmp/opt/kde3/include/kde/kpalette.h -debian/tmp/opt/kde3/include/kde/kpanelapplet.h -debian/tmp/opt/kde3/include/kde/kpanelappmenu.h -debian/tmp/opt/kde3/include/kde/kpanelextension.h -debian/tmp/opt/kde3/include/kde/kpanelmenu.h -debian/tmp/opt/kde3/include/kde/kparts/browserextension.h -debian/tmp/opt/kde3/include/kde/kparts/browserinterface.h -debian/tmp/opt/kde3/include/kde/kparts/browserrun.h -debian/tmp/opt/kde3/include/kde/kparts/componentfactory.h -debian/tmp/opt/kde3/include/kde/kparts/dockmainwindow.h -debian/tmp/opt/kde3/include/kde/kparts/event.h -debian/tmp/opt/kde3/include/kde/kparts/factory.h -debian/tmp/opt/kde3/include/kde/kparts/genericfactory.h -debian/tmp/opt/kde3/include/kde/kparts/historyprovider.h -debian/tmp/opt/kde3/include/kde/kparts/mainwindow.h -debian/tmp/opt/kde3/include/kde/kparts/part.h -debian/tmp/opt/kde3/include/kde/kparts/partmanager.h -debian/tmp/opt/kde3/include/kde/kparts/plugin.h -debian/tmp/opt/kde3/include/kde/kparts/statusbarextension.h -debian/tmp/opt/kde3/include/kde/kpassdlg.h -debian/tmp/opt/kde3/include/kde/kpassivepopup.h -debian/tmp/opt/kde3/include/kde/kpixmapeffect.h -debian/tmp/opt/kde3/include/kde/kpixmap.h -debian/tmp/opt/kde3/include/kde/kpixmapio.h -debian/tmp/opt/kde3/include/kde/kpixmapprovider.h -debian/tmp/opt/kde3/include/kde/kpixmapregionselectordialog.h -debian/tmp/opt/kde3/include/kde/kpixmapregionselectorwidget.h -debian/tmp/opt/kde3/include/kde/kpixmapsplitter.h -debian/tmp/opt/kde3/include/kde/kplugininfo.h -debian/tmp/opt/kde3/include/kde/kpluginselector.h -debian/tmp/opt/kde3/include/kde/kpopupmenu.h -debian/tmp/opt/kde3/include/kde/kpreviewwidgetbase.h -debian/tmp/opt/kde3/include/kde/kprintaction.h -debian/tmp/opt/kde3/include/kde/kprinter.h -debian/tmp/opt/kde3/include/kde/kprocctrl.h -debian/tmp/opt/kde3/include/kde/kprocess.h -debian/tmp/opt/kde3/include/kde/kprocio.h -debian/tmp/opt/kde3/include/kde/kprogress.h -debian/tmp/opt/kde3/include/kde/kprogressbox.h -debian/tmp/opt/kde3/include/kde/kpropertiesdialog.h -debian/tmp/opt/kde3/include/kde/kpropsdlg.h -debian/tmp/opt/kde3/include/kde/kprotocolinfo.h -debian/tmp/opt/kde3/include/kde/kprotocolmanager.h -debian/tmp/opt/kde3/include/kde/kpty.h -debian/tmp/opt/kde3/include/kde/kpushbutton.h -debian/tmp/opt/kde3/include/kde/krandomsequence.h -debian/tmp/opt/kde3/include/kde/krecentdocument.h -debian/tmp/opt/kde3/include/kde/kregexpeditorinterface.h -debian/tmp/opt/kde3/include/kde/kregexp.h -debian/tmp/opt/kde3/include/kde/kremoteencoding.h -debian/tmp/opt/kde3/include/kde/kreplacedialog.h -debian/tmp/opt/kde3/include/kde/kreplace.h -debian/tmp/opt/kde3/include/kde/kresolver.h -debian/tmp/opt/kde3/include/kde/kresources/configdialog.h -debian/tmp/opt/kde3/include/kde/kresources/configpage.h -debian/tmp/opt/kde3/include/kde/kresources/configwidget.h -debian/tmp/opt/kde3/include/kde/kresources/factory.h -debian/tmp/opt/kde3/include/kde/kresources/manager.h -debian/tmp/opt/kde3/include/kde/kresources/manageriface.h -debian/tmp/opt/kde3/include/kde/kresources/managerimpl.h -debian/tmp/opt/kde3/include/kde/kresources/resource.h -debian/tmp/opt/kde3/include/kde/kresources/selectdialog.h -debian/tmp/opt/kde3/include/kde/krestrictedline.h -debian/tmp/opt/kde3/include/kde/kreverseresolver.h -debian/tmp/opt/kde3/include/kde/krfcdate.h -debian/tmp/opt/kde3/include/kde/krootpixmap.h -debian/tmp/opt/kde3/include/kde/krootprop.h -debian/tmp/opt/kde3/include/kde/kruler.h -debian/tmp/opt/kde3/include/kde/krun.h -debian/tmp/opt/kde3/include/kde/ksambashare.h -debian/tmp/opt/kde3/include/kde/ksavefile.h -debian/tmp/opt/kde3/include/kde/kscan.h -debian/tmp/opt/kde3/include/kde/ksconfig.h -debian/tmp/opt/kde3/include/kde/kscreensaver.h -debian/tmp/opt/kde3/include/kde/kscreensaver_vroot.h -debian/tmp/opt/kde3/include/kde/kscrollview.h -debian/tmp/opt/kde3/include/kde/kselect.h -debian/tmp/opt/kde3/include/kde/kseparator.h -debian/tmp/opt/kde3/include/kde/kserversocket.h -debian/tmp/opt/kde3/include/kde/kservicegroup.h -debian/tmp/opt/kde3/include/kde/kservice.h -debian/tmp/opt/kde3/include/kde/kservicetype.h -debian/tmp/opt/kde3/include/kde/ksettings/componentsdialog.h -debian/tmp/opt/kde3/include/kde/ksettings/dialog.h -debian/tmp/opt/kde3/include/kde/ksettings/dispatcher.h -debian/tmp/opt/kde3/include/kde/ksettings/pluginpage.h -debian/tmp/opt/kde3/include/kde/ksharedpixmap.h -debian/tmp/opt/kde3/include/kde/ksharedptr.h -debian/tmp/opt/kde3/include/kde/kshellcompletion.h -debian/tmp/opt/kde3/include/kde/kshell.h -debian/tmp/opt/kde3/include/kde/kshortcutdialog.h -debian/tmp/opt/kde3/include/kde/kshortcut.h -debian/tmp/opt/kde3/include/kde/kshortcutlist.h -debian/tmp/opt/kde3/include/kde/kshred.h -debian/tmp/opt/kde3/include/kde/ksimpleconfig.h -debian/tmp/opt/kde3/include/kde/ksmimecrypto.h -debian/tmp/opt/kde3/include/kde/ksockaddr.h -debian/tmp/opt/kde3/include/kde/tdesocketaddress.h -debian/tmp/opt/kde3/include/kde/tdesocketbase.h -debian/tmp/opt/kde3/include/kde/tdesocketdevice.h -debian/tmp/opt/kde3/include/kde/ksock.h -debian/tmp/opt/kde3/include/kde/ksocks.h -debian/tmp/opt/kde3/include/kde/ksockssocketdevice.h -debian/tmp/opt/kde3/include/kde/ksortablevaluelist.h -debian/tmp/opt/kde3/include/kde/kspeech.h -debian/tmp/opt/kde3/include/kde/kspeechsink.h -debian/tmp/opt/kde3/include/kde/kspell2/backgroundchecker.h -debian/tmp/opt/kde3/include/kde/kspell2/broker.h -debian/tmp/opt/kde3/include/kde/kspell2/configdialog.h -debian/tmp/opt/kde3/include/kde/kspell2/configwidget.h -debian/tmp/opt/kde3/include/kde/kspell2/defaultdictionary.h -debian/tmp/opt/kde3/include/kde/kspell2/dialog.h -debian/tmp/opt/kde3/include/kde/kspell2/dictionary.h -debian/tmp/opt/kde3/include/kde/kspell2/filter.h -debian/tmp/opt/kde3/include/kde/kspell2/highlighter.h -debian/tmp/opt/kde3/include/kde/kspell2/settings.h -debian/tmp/opt/kde3/include/kde/kspelldlg.h -debian/tmp/opt/kde3/include/kde/kspell.h -debian/tmp/opt/kde3/include/kde/ksplashscreen.h -debian/tmp/opt/kde3/include/kde/ksqueezedtextlabel.h -debian/tmp/opt/kde3/include/kde/ksslall.h -debian/tmp/opt/kde3/include/kde/ksslcertchain.h -debian/tmp/opt/kde3/include/kde/ksslcertdlg.h -debian/tmp/opt/kde3/include/kde/ksslcertificatecache.h -debian/tmp/opt/kde3/include/kde/ksslcertificatefactory.h -debian/tmp/opt/kde3/include/kde/ksslcertificate.h -debian/tmp/opt/kde3/include/kde/ksslcertificatehome.h -debian/tmp/opt/kde3/include/kde/ksslconfig.h -debian/tmp/opt/kde3/include/kde/ksslconnectioninfo.h -debian/tmp/opt/kde3/include/kde/kssl.h -debian/tmp/opt/kde3/include/kde/ksslinfodlg.h -debian/tmp/opt/kde3/include/kde/ksslkeygen.h -debian/tmp/opt/kde3/include/kde/ksslpeerinfo.h -debian/tmp/opt/kde3/include/kde/ksslpemcallback.h -debian/tmp/opt/kde3/include/kde/ksslpkcs12.h -debian/tmp/opt/kde3/include/kde/ksslpkcs7.h -debian/tmp/opt/kde3/include/kde/ksslsession.h -debian/tmp/opt/kde3/include/kde/ksslsettings.h -debian/tmp/opt/kde3/include/kde/ksslsigners.h -debian/tmp/opt/kde3/include/kde/ksslutils.h -debian/tmp/opt/kde3/include/kde/ksslx509map.h -debian/tmp/opt/kde3/include/kde/ksslx509v3.h -debian/tmp/opt/kde3/include/kde/kstandarddirs.h -debian/tmp/opt/kde3/include/kde/kstartupinfo.h -debian/tmp/opt/kde3/include/kde/kstaticdeleter.h -debian/tmp/opt/kde3/include/kde/kstatusbar.h -debian/tmp/opt/kde3/include/kde/kstdaccel.h -debian/tmp/opt/kde3/include/kde/kstdaction.h -debian/tmp/opt/kde3/include/kde/kstddirs.h -debian/tmp/opt/kde3/include/kde/kstdguiitem.h -debian/tmp/opt/kde3/include/kde/kstreamsocket.h -debian/tmp/opt/kde3/include/kde/kstringhandler.h -debian/tmp/opt/kde3/include/kde/kstringvalidator.h -debian/tmp/opt/kde3/include/kde/kstyle.h -debian/tmp/opt/kde3/include/kde/ksvgiconengine.h -debian/tmp/opt/kde3/include/kde/kswitchlanguagedialog.h -debian/tmp/opt/kde3/include/kde/ksycocaentry.h -debian/tmp/opt/kde3/include/kde/ksycoca.h -debian/tmp/opt/kde3/include/kde/ksycocatype.h -debian/tmp/opt/kde3/include/kde/ksyntaxhighlighter.h -debian/tmp/opt/kde3/include/kde/ksystemtray.h -debian/tmp/opt/kde3/include/kde/ktabbar.h -debian/tmp/opt/kde3/include/kde/ktabctl.h -debian/tmp/opt/kde3/include/kde/ktabwidget.h -debian/tmp/opt/kde3/include/kde/ktar.h -debian/tmp/opt/kde3/include/kde/ktempdir.h -debian/tmp/opt/kde3/include/kde/ktempfile.h -debian/tmp/opt/kde3/include/kde/ktextbrowser.h -debian/tmp/opt/kde3/include/kde/ktextedit.h -debian/tmp/opt/kde3/include/kde/ktexteditor/blockselectioninterface.h -debian/tmp/opt/kde3/include/kde/ktexteditor/clipboardinterface.h -debian/tmp/opt/kde3/include/kde/ktexteditor/codecompletioninterface.h -debian/tmp/opt/kde3/include/kde/ktexteditor/configinterfaceextension.h -debian/tmp/opt/kde3/include/kde/ktexteditor/configinterface.h -debian/tmp/opt/kde3/include/kde/ktexteditor/cursorinterface.h -debian/tmp/opt/kde3/include/kde/ktexteditor/document.h -debian/tmp/opt/kde3/include/kde/ktexteditor/documentinfo.h -debian/tmp/opt/kde3/include/kde/ktexteditor/dynwordwrapinterface.h -debian/tmp/opt/kde3/include/kde/ktexteditor/editinterfaceext.h -debian/tmp/opt/kde3/include/kde/ktexteditor/editinterface.h -debian/tmp/opt/kde3/include/kde/ktexteditor/editorchooser.h -debian/tmp/opt/kde3/include/kde/ktexteditor/editor.h -debian/tmp/opt/kde3/include/kde/ktexteditor/encodinginterface.h -debian/tmp/opt/kde3/include/kde/ktexteditor/highlightinginterface.h -debian/tmp/opt/kde3/include/kde/ktexteditor/markinterfaceextension.h -debian/tmp/opt/kde3/include/kde/ktexteditor/markinterface.h -debian/tmp/opt/kde3/include/kde/ktexteditor/plugin.h -debian/tmp/opt/kde3/include/kde/ktexteditor/popupmenuinterface.h -debian/tmp/opt/kde3/include/kde/ktexteditor/printinterface.h -debian/tmp/opt/kde3/include/kde/ktexteditor/searchinterface.h -debian/tmp/opt/kde3/include/kde/ktexteditor/selectionextdcopinterface.h -debian/tmp/opt/kde3/include/kde/ktexteditor/selectioninterfaceext.h -debian/tmp/opt/kde3/include/kde/ktexteditor/selectioninterface.h -debian/tmp/opt/kde3/include/kde/ktexteditor/sessionconfiginterface.h -debian/tmp/opt/kde3/include/kde/ktexteditor/templateinterface.h -debian/tmp/opt/kde3/include/kde/ktexteditor/texthintinterface.h -debian/tmp/opt/kde3/include/kde/ktexteditor/undointerface.h -debian/tmp/opt/kde3/include/kde/ktexteditor/variableinterface.h -debian/tmp/opt/kde3/include/kde/ktexteditor/viewcursorinterface.h -debian/tmp/opt/kde3/include/kde/ktexteditor/view.h -debian/tmp/opt/kde3/include/kde/ktexteditor/viewstatusmsginterface.h -debian/tmp/opt/kde3/include/kde/ktexteditor/wordwrapinterface.h -debian/tmp/opt/kde3/include/kde/ktimewidget.h -debian/tmp/opt/kde3/include/kde/ktimezones.h -debian/tmp/opt/kde3/include/kde/ktimezonewidget.h -debian/tmp/opt/kde3/include/kde/ktip.h -debian/tmp/opt/kde3/include/kde/ktoolbarbutton.h -debian/tmp/opt/kde3/include/kde/ktoolbar.h -debian/tmp/opt/kde3/include/kde/ktoolbarlabelaction.h -debian/tmp/opt/kde3/include/kde/ktoolbarradiogroup.h -debian/tmp/opt/kde3/include/kde/ktrader.h -debian/tmp/opt/kde3/include/kde/ktypelist.h -debian/tmp/opt/kde3/include/kde/kuniqueapp.h -debian/tmp/opt/kde3/include/kde/kuniqueapplication.h -debian/tmp/opt/kde3/include/kde/kunittest/module.h -debian/tmp/opt/kde3/include/kde/kunittest/runner.h -debian/tmp/opt/kde3/include/kde/kunittest/tester.h -debian/tmp/opt/kde3/include/kde/kunload.h -debian/tmp/opt/kde3/include/kde/kurifilter.h -debian/tmp/opt/kde3/include/kde/kurlbar.h -debian/tmp/opt/kde3/include/kde/kurlcombobox.h -debian/tmp/opt/kde3/include/kde/kurlcompletion.h -debian/tmp/opt/kde3/include/kde/kurldrag.h -debian/tmp/opt/kde3/include/kde/kurl.h -debian/tmp/opt/kde3/include/kde/kurllabel.h -debian/tmp/opt/kde3/include/kde/kurlpixmapprovider.h -debian/tmp/opt/kde3/include/kde/kurlrequesterdlg.h -debian/tmp/opt/kde3/include/kde/kurlrequester.h -debian/tmp/opt/kde3/include/kde/kuser.h -debian/tmp/opt/kde3/include/kde/kuserprofile.h -debian/tmp/opt/kde3/include/kde/kvmallocator.h -debian/tmp/opt/kde3/include/kde/kwallet.h -debian/tmp/opt/kde3/include/kde/kwallettypes.h -debian/tmp/opt/kde3/include/kde/kwindowinfo.h -debian/tmp/opt/kde3/include/kde/kwindowlistmenu.h -debian/tmp/opt/kde3/include/kde/kwin.h -debian/tmp/opt/kde3/include/kde/kwinmodule.h -debian/tmp/opt/kde3/include/kde/kwizard.h -debian/tmp/opt/kde3/include/kde/kwordwrap.h -debian/tmp/opt/kde3/include/kde/kxerrorhandler.h -debian/tmp/opt/kde3/include/kde/kxmessages.h -debian/tmp/opt/kde3/include/kde/kxmlguibuilder.h -debian/tmp/opt/kde3/include/kde/kxmlguiclient.h -debian/tmp/opt/kde3/include/kde/kxmlguifactory.h -debian/tmp/opt/kde3/include/kde/kxmlgui.h -debian/tmp/opt/kde3/include/kde/kzip.h -debian/tmp/opt/kde3/include/kde/libkrandr/ktimerdialog.h -debian/tmp/opt/kde3/include/kde/libkrandr/libkrandr.h -debian/tmp/opt/kde3/include/kde/libkrandr/lowlevel_randr.h -debian/tmp/opt/kde3/include/kde/libkrandr/randr.h -debian/tmp/opt/kde3/include/kde/libkmid/alsaout.h -debian/tmp/opt/kde3/include/kde/libkmid/dattypes.h -debian/tmp/opt/kde3/include/kde/libkmid/deviceman.h -debian/tmp/opt/kde3/include/kde/libkmid/fmout.h -debian/tmp/opt/kde3/include/kde/libkmid/gusout.h -debian/tmp/opt/kde3/include/kde/libkmid/libkmid.h -debian/tmp/opt/kde3/include/kde/libkmid/midfile.h -debian/tmp/opt/kde3/include/kde/libkmid/midimapper.h -debian/tmp/opt/kde3/include/kde/libkmid/midiout.h -debian/tmp/opt/kde3/include/kde/libkmid/midispec.h -debian/tmp/opt/kde3/include/kde/libkmid/midistat.h -debian/tmp/opt/kde3/include/kde/libkmid/mt32togm.h -debian/tmp/opt/kde3/include/kde/libkmid/notearray.h -debian/tmp/opt/kde3/include/kde/libkmid/player.h -debian/tmp/opt/kde3/include/kde/libkmid/synthout.h -debian/tmp/opt/kde3/include/kde/libkmid/track.h -debian/tmp/opt/kde3/include/kde/libkmid/voiceman.h -debian/tmp/opt/kde3/include/kde/netwm_def.h -debian/tmp/opt/kde3/include/kde/netwm.h -debian/tmp/opt/kde3/include/kde/qxembed.h -debian/tmp/opt/kde3/include/kde/renamedlgplugin.h -debian/tmp/opt/kde3/include/kde/scriptclientinterface.h -debian/tmp/opt/kde3/include/kde/scriptinterface.h -debian/tmp/opt/kde3/include/kde/scriptmanager.h +debian/tmp/opt/kde3/include/tde/kabc/resourceselectdialog.h +debian/tmp/opt/kde3/include/tde/kabc/secrecy.h +debian/tmp/opt/kde3/include/tde/kabc/sortmode.h +debian/tmp/opt/kde3/include/tde/kabc/sound.h +debian/tmp/opt/kde3/include/tde/kabc/stdaddressbook.h +debian/tmp/opt/kde3/include/tde/kabc/timezone.h +debian/tmp/opt/kde3/include/tde/kabc/vcardconverter.h +debian/tmp/opt/kde3/include/tde/kabc/vcardformat.h +debian/tmp/opt/kde3/include/tde/kabc/vcardformatplugin.h +debian/tmp/opt/kde3/include/tde/kabc/vcard.h +debian/tmp/opt/kde3/include/tde/kabc/vcardline.h +debian/tmp/opt/kde3/include/tde/kabc/vcardparser.h +debian/tmp/opt/kde3/include/tde/kaboutapplication.h +debian/tmp/opt/kde3/include/tde/kaboutdata.h +debian/tmp/opt/kde3/include/tde/kaboutdialog.h +debian/tmp/opt/kde3/include/tde/kaboutkde.h +debian/tmp/opt/kde3/include/tde/kaccelgen.h +debian/tmp/opt/kde3/include/tde/kaccel.h +debian/tmp/opt/kde3/include/tde/kaccelmanager.h +debian/tmp/opt/kde3/include/tde/kacl.h +debian/tmp/opt/kde3/include/tde/kactionclasses.h +debian/tmp/opt/kde3/include/tde/kactioncollection.h +debian/tmp/opt/kde3/include/tde/kaction.h +debian/tmp/opt/kde3/include/tde/kactionselector.h +debian/tmp/opt/kde3/include/tde/kactionshortcutlist.h +debian/tmp/opt/kde3/include/tde/kactivelabel.h +debian/tmp/opt/kde3/include/tde/kallocator.h +debian/tmp/opt/kde3/include/tde/kanimwidget.h +debian/tmp/opt/kde3/include/tde/kapp.h +debian/tmp/opt/kde3/include/tde/kapplication.h +debian/tmp/opt/kde3/include/tde/karchive.h +debian/tmp/opt/kde3/include/tde/kar.h +debian/tmp/opt/kde3/include/tde/karrowbutton.h +debian/tmp/opt/kde3/include/tde/kasyncio.h +debian/tmp/opt/kde3/include/tde/kate/document.h +debian/tmp/opt/kde3/include/tde/kate/view.h +debian/tmp/opt/kde3/include/tde/kaudioplayer.h +debian/tmp/opt/kde3/include/tde/kauthicon.h +debian/tmp/opt/kde3/include/tde/kautomount.h +debian/tmp/opt/kde3/include/tde/kbookmarkbar.h +debian/tmp/opt/kde3/include/tde/kbookmarkdombuilder.h +debian/tmp/opt/kde3/include/tde/kbookmarkdrag.h +debian/tmp/opt/kde3/include/tde/kbookmarkexporter.h +debian/tmp/opt/kde3/include/tde/kbookmark.h +debian/tmp/opt/kde3/include/tde/kbookmarkimporter_crash.h +debian/tmp/opt/kde3/include/tde/kbookmarkimporter.h +debian/tmp/opt/kde3/include/tde/kbookmarkimporter_ie.h +debian/tmp/opt/kde3/include/tde/kbookmarkimporter_kde1.h +debian/tmp/opt/kde3/include/tde/kbookmarkimporter_ns.h +debian/tmp/opt/kde3/include/tde/kbookmarkimporter_opera.h +debian/tmp/opt/kde3/include/tde/kbookmarkmanager.h +debian/tmp/opt/kde3/include/tde/kbookmarkmenu.h +debian/tmp/opt/kde3/include/tde/kbookmarknotifier.h +debian/tmp/opt/kde3/include/tde/kbufferedio.h +debian/tmp/opt/kde3/include/tde/kbufferedsocket.h +debian/tmp/opt/kde3/include/tde/kbugreport.h +debian/tmp/opt/kde3/include/tde/kbuttonbox.h +debian/tmp/opt/kde3/include/tde/kcalendarsystemfactory.h +debian/tmp/opt/kde3/include/tde/kcalendarsystem.h +debian/tmp/opt/kde3/include/tde/kcatalogue.h +debian/tmp/opt/kde3/include/tde/kcharselect.h +debian/tmp/opt/kde3/include/tde/kcharsets.h +debian/tmp/opt/kde3/include/tde/kclientsocketbase.h +debian/tmp/opt/kde3/include/tde/kclipboard.h +debian/tmp/opt/kde3/include/tde/kcmdlineargs.h +debian/tmp/opt/kde3/include/tde/kcmenumngr.h +debian/tmp/opt/kde3/include/tde/kcmodulecontainer.h +debian/tmp/opt/kde3/include/tde/kcmodule.h +debian/tmp/opt/kde3/include/tde/kcmoduleinfo.h +debian/tmp/opt/kde3/include/tde/kcmoduleloader.h +debian/tmp/opt/kde3/include/tde/kcmoduleproxy.h +debian/tmp/opt/kde3/include/tde/kcmultidialog.h +debian/tmp/opt/kde3/include/tde/kcolorbtn.h +debian/tmp/opt/kde3/include/tde/kcolorbutton.h +debian/tmp/opt/kde3/include/tde/kcolorcombo.h +debian/tmp/opt/kde3/include/tde/kcolordialog.h +debian/tmp/opt/kde3/include/tde/kcolordlg.h +debian/tmp/opt/kde3/include/tde/kcolordrag.h +debian/tmp/opt/kde3/include/tde/kcombiview.h +debian/tmp/opt/kde3/include/tde/kcombobox.h +debian/tmp/opt/kde3/include/tde/kcommand.h +debian/tmp/opt/kde3/include/tde/kcompletionbox.h +debian/tmp/opt/kde3/include/tde/kcompletion.h +debian/tmp/opt/kde3/include/tde/kconfigbackend.h +debian/tmp/opt/kde3/include/tde/kconfigbase.h +debian/tmp/opt/kde3/include/tde/kconfigdata.h +debian/tmp/opt/kde3/include/tde/kconfigdialog.h +debian/tmp/opt/kde3/include/tde/kconfigdialogmanager.h +debian/tmp/opt/kde3/include/tde/kconfig.h +debian/tmp/opt/kde3/include/tde/kconfigskeleton.h +debian/tmp/opt/kde3/include/tde/kcpuinfo.h +debian/tmp/opt/kde3/include/tde/kcrash.h +debian/tmp/opt/kde3/include/tde/kcursor.h +debian/tmp/opt/kde3/include/tde/kcustommenueditor.h +debian/tmp/opt/kde3/include/tde/kdatagramsocket.h +debian/tmp/opt/kde3/include/tde/kdatastream.h +debian/tmp/opt/kde3/include/tde/kdatatool.h +debian/tmp/opt/kde3/include/tde/kdatepicker.h +debian/tmp/opt/kde3/include/tde/kdatepik.h +debian/tmp/opt/kde3/include/tde/kdatetbl.h +debian/tmp/opt/kde3/include/tde/kdatetimewidget.h +debian/tmp/opt/kde3/include/tde/kdatewidget.h +debian/tmp/opt/kde3/include/tde/kdcopactionproxy.h +debian/tmp/opt/kde3/include/tde/kdcoppropertyproxy.h +debian/tmp/opt/kde3/include/tde/kdcopservicestarter.h +debian/tmp/opt/kde3/include/tde/kdebugclasses.h +debian/tmp/opt/kde3/include/tde/kdebug.h +debian/tmp/opt/kde3/include/tde/kdedmodule.h +debian/tmp/opt/kde3/include/tde/kde_file.h +debian/tmp/opt/kde3/include/tde/kdelibs_export.h +debian/tmp/opt/kde3/include/tde/kdemacros.h +debian/tmp/opt/kde3/include/tde/kde.pot +debian/tmp/opt/kde3/include/tde/kdeprint/driver.h +debian/tmp/opt/kde3/include/tde/kdeprint/kiconselectaction.h +debian/tmp/opt/kde3/include/tde/kdeprint/kmjob.h +debian/tmp/opt/kde3/include/tde/kdeprint/kmjobmanager.h +debian/tmp/opt/kde3/include/tde/kdeprint/kmjobviewer.h +debian/tmp/opt/kde3/include/tde/kdeprint/kmmainview.h +debian/tmp/opt/kde3/include/tde/kdeprint/kmmanager.h +debian/tmp/opt/kde3/include/tde/kdeprint/kmobject.h +debian/tmp/opt/kde3/include/tde/kdeprint/kmprinter.h +debian/tmp/opt/kde3/include/tde/kdeprint/kmprinterpage.h +debian/tmp/opt/kde3/include/tde/kdeprint/kmtimer.h +debian/tmp/opt/kde3/include/tde/kdeprint/kpreloadobject.h +debian/tmp/opt/kde3/include/tde/kdeprint/kprintdialog.h +debian/tmp/opt/kde3/include/tde/kdeprint/kprintdialogpage.h +debian/tmp/opt/kde3/include/tde/kdeprint/lpr/lprhandler.h +debian/tmp/opt/kde3/include/tde/kdeprint/lpr/lprsettings.h +debian/tmp/opt/kde3/include/tde/kdeprint/lpr/printcapentry.h +debian/tmp/opt/kde3/include/tde/kdesktopfile.h +debian/tmp/opt/kde3/include/tde/kdesu/client.h +debian/tmp/opt/kde3/include/tde/kdesu/defaults.h +debian/tmp/opt/kde3/include/tde/kdesu/kcookie.h +debian/tmp/opt/kde3/include/tde/kdesu/kdesu_pty.h +debian/tmp/opt/kde3/include/tde/kdesu/process.h +debian/tmp/opt/kde3/include/tde/kdesu/pty.h +debian/tmp/opt/kde3/include/tde/kdesu/ssh.h +debian/tmp/opt/kde3/include/tde/kdesu/stub.h +debian/tmp/opt/kde3/include/tde/kdesu/su.h +debian/tmp/opt/kde3/include/tde/kde_terminal_interface.h +debian/tmp/opt/kde3/include/tde/kdeversion.h +debian/tmp/opt/kde3/include/tde/kdialogbase.h +debian/tmp/opt/kde3/include/tde/kdialog.h +debian/tmp/opt/kde3/include/tde/kdirlister.h +debian/tmp/opt/kde3/include/tde/kdirnotify.h +debian/tmp/opt/kde3/include/tde/kdirnotify_stub.h +debian/tmp/opt/kde3/include/tde/kdiroperator.h +debian/tmp/opt/kde3/include/tde/kdirselectdialog.h +debian/tmp/opt/kde3/include/tde/kdirsize.h +debian/tmp/opt/kde3/include/tde/kdirwatch.h +debian/tmp/opt/kde3/include/tde/kdiskfreesp.h +debian/tmp/opt/kde3/include/tde/kdockwidget.h +debian/tmp/opt/kde3/include/tde/kdockwindow.h +debian/tmp/opt/kde3/include/tde/kdrawutil.h +debian/tmp/opt/kde3/include/tde/kdualcolorbtn.h +debian/tmp/opt/kde3/include/tde/kdualcolorbutton.h +debian/tmp/opt/kde3/include/tde/keditcl.h +debian/tmp/opt/kde3/include/tde/keditlistbox.h +debian/tmp/opt/kde3/include/tde/kedittoolbar.h +debian/tmp/opt/kde3/include/tde/kemailsettings.h +debian/tmp/opt/kde3/include/tde/kencodingfiledialog.h +debian/tmp/opt/kde3/include/tde/kextendedsocket.h +debian/tmp/opt/kde3/include/tde/kextsock.h +debian/tmp/opt/kde3/include/tde/kfiledetailview.h +debian/tmp/opt/kde3/include/tde/kfiledialog.h +debian/tmp/opt/kde3/include/tde/kfilefiltercombo.h +debian/tmp/opt/kde3/include/tde/kfilefilter.h +debian/tmp/opt/kde3/include/tde/kfile.h +debian/tmp/opt/kde3/include/tde/kfileiconview.h +debian/tmp/opt/kde3/include/tde/kfileitem.h +debian/tmp/opt/kde3/include/tde/kfilemetainfo.h +debian/tmp/opt/kde3/include/tde/kfilepreview.h +debian/tmp/opt/kde3/include/tde/kfilesharedlg.h +debian/tmp/opt/kde3/include/tde/kfileshare.h +debian/tmp/opt/kde3/include/tde/kfiletreebranch.h +debian/tmp/opt/kde3/include/tde/kfiletreeview.h +debian/tmp/opt/kde3/include/tde/kfiletreeviewitem.h +debian/tmp/opt/kde3/include/tde/kfileview.h +debian/tmp/opt/kde3/include/tde/kfilterbase.h +debian/tmp/opt/kde3/include/tde/kfilterdev.h +debian/tmp/opt/kde3/include/tde/kfinddialog.h +debian/tmp/opt/kde3/include/tde/kfind.h +debian/tmp/opt/kde3/include/tde/kfontcombo.h +debian/tmp/opt/kde3/include/tde/kfontdialog.h +debian/tmp/opt/kde3/include/tde/kfontrequester.h +debian/tmp/opt/kde3/include/tde/kgenericfactory.h +debian/tmp/opt/kde3/include/tde/kgenericfactory.tcc +debian/tmp/opt/kde3/include/tde/kglobalaccel.h +debian/tmp/opt/kde3/include/tde/kglobal.h +debian/tmp/opt/kde3/include/tde/kglobalsettings.h +debian/tmp/opt/kde3/include/tde/kguiitem.h +debian/tmp/opt/kde3/include/tde/khelpmenu.h +debian/tmp/opt/kde3/include/tde/khexedit/byteseditinterface.h +debian/tmp/opt/kde3/include/tde/khexedit/charcolumninterface.h +debian/tmp/opt/kde3/include/tde/khexedit/clipboardinterface.h +debian/tmp/opt/kde3/include/tde/khexedit/valuecolumninterface.h +debian/tmp/opt/kde3/include/tde/khexedit/zoominterface.h +debian/tmp/opt/kde3/include/tde/khtmldefaults.h +debian/tmp/opt/kde3/include/tde/khtml_events.h +debian/tmp/opt/kde3/include/tde/khtml_part.h +debian/tmp/opt/kde3/include/tde/khtml_settings.h +debian/tmp/opt/kde3/include/tde/khtmlview.h +debian/tmp/opt/kde3/include/tde/khttpproxysocketdevice.h +debian/tmp/opt/kde3/include/tde/kicondialog.h +debian/tmp/opt/kde3/include/tde/kiconeffect.h +debian/tmp/opt/kde3/include/tde/kiconloader.h +debian/tmp/opt/kde3/include/tde/kicontheme.h +debian/tmp/opt/kde3/include/tde/kiconview.h +debian/tmp/opt/kde3/include/tde/kiconviewsearchline.h +debian/tmp/opt/kde3/include/tde/kidna.h +debian/tmp/opt/kde3/include/tde/kimageeffect.h +debian/tmp/opt/kde3/include/tde/kimagefilepreview.h +debian/tmp/opt/kde3/include/tde/kimageio.h +debian/tmp/opt/kde3/include/tde/kimiface.h +debian/tmp/opt/kde3/include/tde/kimproxy.h +debian/tmp/opt/kde3/include/tde/kimproxyiface.h +debian/tmp/opt/kde3/include/tde/kinputdialog.h +debian/tmp/opt/kde3/include/tde/kinstance.h +debian/tmp/opt/kde3/include/tde/kio/authinfo.h +debian/tmp/opt/kde3/include/tde/kiobuffer.h +debian/tmp/opt/kde3/include/tde/kio/chmodjob.h +debian/tmp/opt/kde3/include/tde/kio/connection.h +debian/tmp/opt/kde3/include/tde/kio/davjob.h +debian/tmp/opt/kde3/include/tde/kio/defaultprogress.h +debian/tmp/opt/kde3/include/tde/kio/file.h +debian/tmp/opt/kde3/include/tde/kio/forwardingslavebase.h +debian/tmp/opt/kde3/include/tde/kio/global.h +debian/tmp/opt/kde3/include/tde/kio/http.h +debian/tmp/opt/kde3/include/tde/kio/http_slave_defaults.h +debian/tmp/opt/kde3/include/tde/kio/ioslave_defaults.h +debian/tmp/opt/kde3/include/tde/kio/jobclasses.h +debian/tmp/opt/kde3/include/tde/kio/job.h +debian/tmp/opt/kde3/include/tde/kio/kdesasl.h +debian/tmp/opt/kde3/include/tde/kio/kmdbase.h +debian/tmp/opt/kde3/include/tde/kio/kmdcodec.h +debian/tmp/opt/kde3/include/tde/kio/kntlm.h +debian/tmp/opt/kde3/include/tde/kio/metainfojob.h +debian/tmp/opt/kde3/include/tde/kio/netaccess.h +debian/tmp/opt/kde3/include/tde/kio/observer.h +debian/tmp/opt/kde3/include/tde/kio/passdlg.h +debian/tmp/opt/kde3/include/tde/kio/paste.h +debian/tmp/opt/kde3/include/tde/kio/previewjob.h +debian/tmp/opt/kde3/include/tde/kio/progressbase.h +debian/tmp/opt/kde3/include/tde/kio/renamedlg.h +debian/tmp/opt/kde3/include/tde/kio/scheduler.h +debian/tmp/opt/kde3/include/tde/kio/sessiondata.h +debian/tmp/opt/kde3/include/tde/kio/skipdlg.h +debian/tmp/opt/kde3/include/tde/kio/slavebase.h +debian/tmp/opt/kde3/include/tde/kio/slaveconfig.h +debian/tmp/opt/kde3/include/tde/kio/slave.h +debian/tmp/opt/kde3/include/tde/kio/slaveinterface.h +debian/tmp/opt/kde3/include/tde/kio/statusbarprogress.h +debian/tmp/opt/kde3/include/tde/kio/tcpslavebase.h +debian/tmp/opt/kde3/include/tde/kio/thumbcreator.h +debian/tmp/opt/kde3/include/tde/kio/uiserver.h +debian/tmp/opt/kde3/include/tde/kio/uiserver_stub.h +debian/tmp/opt/kde3/include/tde/kipc.h +debian/tmp/opt/kde3/include/tde/kjanuswidget.h +debian/tmp/opt/kde3/include/tde/kjs/completion.h +debian/tmp/opt/kde3/include/tde/kjs/function.h +debian/tmp/opt/kde3/include/tde/kjs/global.h +debian/tmp/opt/kde3/include/tde/kjs/identifier.h +debian/tmp/opt/kde3/include/tde/kjs/interpreter.h +debian/tmp/opt/kde3/include/tde/kjs/list.h +debian/tmp/opt/kde3/include/tde/kjs/lookup.h +debian/tmp/opt/kde3/include/tde/kjs/object.h +debian/tmp/opt/kde3/include/tde/kjs/operations.h +debian/tmp/opt/kde3/include/tde/kjs/property_map.h +debian/tmp/opt/kde3/include/tde/kjs/reference.h +debian/tmp/opt/kde3/include/tde/kjs/reference_list.h +debian/tmp/opt/kde3/include/tde/kjs/scope_chain.h +debian/tmp/opt/kde3/include/tde/kjs/simple_number.h +debian/tmp/opt/kde3/include/tde/kjs/types.h +debian/tmp/opt/kde3/include/tde/kjs/ustring.h +debian/tmp/opt/kde3/include/tde/kjs/value.h +debian/tmp/opt/kde3/include/tde/kkeybutton.h +debian/tmp/opt/kde3/include/tde/kkeydialog.h +debian/tmp/opt/kde3/include/tde/kkeynative.h +debian/tmp/opt/kde3/include/tde/klanguagebutton.h +debian/tmp/opt/kde3/include/tde/klargefile.h +debian/tmp/opt/kde3/include/tde/kled.h +debian/tmp/opt/kde3/include/tde/klibloader.h +debian/tmp/opt/kde3/include/tde/klineeditdlg.h +debian/tmp/opt/kde3/include/tde/klineedit.h +debian/tmp/opt/kde3/include/tde/klistbox.h +debian/tmp/opt/kde3/include/tde/klistview.h +debian/tmp/opt/kde3/include/tde/klistviewsearchline.h +debian/tmp/opt/kde3/include/tde/klocale.h +debian/tmp/opt/kde3/include/tde/klockfile.h +debian/tmp/opt/kde3/include/tde/kmacroexpander.h +debian/tmp/opt/kde3/include/tde/kmainwindow.h +debian/tmp/opt/kde3/include/tde/kmainwindowiface.h +debian/tmp/opt/kde3/include/tde/kmanagerselection.h +debian/tmp/opt/kde3/include/tde/kmdcodec.h +debian/tmp/opt/kde3/include/tde/kmdichildarea.h +debian/tmp/opt/kde3/include/tde/kmdichildfrmcaption.h +debian/tmp/opt/kde3/include/tde/kmdichildfrm.h +debian/tmp/opt/kde3/include/tde/kmdichildview.h +debian/tmp/opt/kde3/include/tde/kmdidefines.h +debian/tmp/opt/kde3/include/tde/kmdi/global.h +debian/tmp/opt/kde3/include/tde/kmdiiterator.h +debian/tmp/opt/kde3/include/tde/kmdilistiterator.h +debian/tmp/opt/kde3/include/tde/kmdimainfrm.h +debian/tmp/opt/kde3/include/tde/kmdi/mainwindow.h +debian/tmp/opt/kde3/include/tde/kmdinulliterator.h +debian/tmp/opt/kde3/include/tde/kmdi/tabwidget.h +debian/tmp/opt/kde3/include/tde/kmditaskbar.h +debian/tmp/opt/kde3/include/tde/kmdi/toolviewaccessor.h +debian/tmp/opt/kde3/include/tde/kmditoolviewaccessor.h +debian/tmp/opt/kde3/include/tde/kmediaplayer/playerdcopobject.h +debian/tmp/opt/kde3/include/tde/kmediaplayer/player.h +debian/tmp/opt/kde3/include/tde/kmediaplayer/view.h +debian/tmp/opt/kde3/include/tde/kmenubar.h +debian/tmp/opt/kde3/include/tde/kmessagebox.h +debian/tmp/opt/kde3/include/tde/kmimemagic.h +debian/tmp/opt/kde3/include/tde/kmimesourcefactory.h +debian/tmp/opt/kde3/include/tde/kmimetypechooser.h +debian/tmp/opt/kde3/include/tde/kmimetype.h +debian/tmp/opt/kde3/include/tde/kmimetyperesolver.h +debian/tmp/opt/kde3/include/tde/kmountpoint.h +debian/tmp/opt/kde3/include/tde/kmulticastsocketdevice.h +debian/tmp/opt/kde3/include/tde/kmulticastsocket.h +debian/tmp/opt/kde3/include/tde/kmultipledrag.h +debian/tmp/opt/kde3/include/tde/kmultitabbar.h +debian/tmp/opt/kde3/include/tde/knetworkinterface.h +debian/tmp/opt/kde3/include/tde/knewstuff/downloaddialog.h +debian/tmp/opt/kde3/include/tde/knewstuff/engine.h +debian/tmp/opt/kde3/include/tde/knewstuff/entry.h +debian/tmp/opt/kde3/include/tde/knewstuff/knewstuffbutton.h +debian/tmp/opt/kde3/include/tde/knewstuff/knewstuffgeneric.h +debian/tmp/opt/kde3/include/tde/knewstuff/knewstuff.h +debian/tmp/opt/kde3/include/tde/knewstuff/knewstuffsecure.h +debian/tmp/opt/kde3/include/tde/knewstuff/providerdialog.h +debian/tmp/opt/kde3/include/tde/knewstuff/provider.h +debian/tmp/opt/kde3/include/tde/knewstuff/uploaddialog.h +debian/tmp/opt/kde3/include/tde/knfsshare.h +debian/tmp/opt/kde3/include/tde/knotifyclient.h +debian/tmp/opt/kde3/include/tde/knotifydialog.h +debian/tmp/opt/kde3/include/tde/knotifywidgetbase.h +debian/tmp/opt/kde3/include/tde/knuminput.h +debian/tmp/opt/kde3/include/tde/knumvalidator.h +debian/tmp/opt/kde3/include/tde/kopenssl.h +debian/tmp/opt/kde3/include/tde/kopenwith.h +debian/tmp/opt/kde3/include/tde/kpalette.h +debian/tmp/opt/kde3/include/tde/kpanelapplet.h +debian/tmp/opt/kde3/include/tde/kpanelappmenu.h +debian/tmp/opt/kde3/include/tde/kpanelextension.h +debian/tmp/opt/kde3/include/tde/kpanelmenu.h +debian/tmp/opt/kde3/include/tde/kparts/browserextension.h +debian/tmp/opt/kde3/include/tde/kparts/browserinterface.h +debian/tmp/opt/kde3/include/tde/kparts/browserrun.h +debian/tmp/opt/kde3/include/tde/kparts/componentfactory.h +debian/tmp/opt/kde3/include/tde/kparts/dockmainwindow.h +debian/tmp/opt/kde3/include/tde/kparts/event.h +debian/tmp/opt/kde3/include/tde/kparts/factory.h +debian/tmp/opt/kde3/include/tde/kparts/genericfactory.h +debian/tmp/opt/kde3/include/tde/kparts/historyprovider.h +debian/tmp/opt/kde3/include/tde/kparts/mainwindow.h +debian/tmp/opt/kde3/include/tde/kparts/part.h +debian/tmp/opt/kde3/include/tde/kparts/partmanager.h +debian/tmp/opt/kde3/include/tde/kparts/plugin.h +debian/tmp/opt/kde3/include/tde/kparts/statusbarextension.h +debian/tmp/opt/kde3/include/tde/kpassdlg.h +debian/tmp/opt/kde3/include/tde/kpassivepopup.h +debian/tmp/opt/kde3/include/tde/kpixmapeffect.h +debian/tmp/opt/kde3/include/tde/kpixmap.h +debian/tmp/opt/kde3/include/tde/kpixmapio.h +debian/tmp/opt/kde3/include/tde/kpixmapprovider.h +debian/tmp/opt/kde3/include/tde/kpixmapregionselectordialog.h +debian/tmp/opt/kde3/include/tde/kpixmapregionselectorwidget.h +debian/tmp/opt/kde3/include/tde/kpixmapsplitter.h +debian/tmp/opt/kde3/include/tde/kplugininfo.h +debian/tmp/opt/kde3/include/tde/kpluginselector.h +debian/tmp/opt/kde3/include/tde/kpopupmenu.h +debian/tmp/opt/kde3/include/tde/kpreviewwidgetbase.h +debian/tmp/opt/kde3/include/tde/kprintaction.h +debian/tmp/opt/kde3/include/tde/kprinter.h +debian/tmp/opt/kde3/include/tde/kprocctrl.h +debian/tmp/opt/kde3/include/tde/kprocess.h +debian/tmp/opt/kde3/include/tde/kprocio.h +debian/tmp/opt/kde3/include/tde/kprogress.h +debian/tmp/opt/kde3/include/tde/kprogressbox.h +debian/tmp/opt/kde3/include/tde/kpropertiesdialog.h +debian/tmp/opt/kde3/include/tde/kpropsdlg.h +debian/tmp/opt/kde3/include/tde/kprotocolinfo.h +debian/tmp/opt/kde3/include/tde/kprotocolmanager.h +debian/tmp/opt/kde3/include/tde/kpty.h +debian/tmp/opt/kde3/include/tde/kpushbutton.h +debian/tmp/opt/kde3/include/tde/krandomsequence.h +debian/tmp/opt/kde3/include/tde/krecentdocument.h +debian/tmp/opt/kde3/include/tde/kregexpeditorinterface.h +debian/tmp/opt/kde3/include/tde/kregexp.h +debian/tmp/opt/kde3/include/tde/kremoteencoding.h +debian/tmp/opt/kde3/include/tde/kreplacedialog.h +debian/tmp/opt/kde3/include/tde/kreplace.h +debian/tmp/opt/kde3/include/tde/kresolver.h +debian/tmp/opt/kde3/include/tde/kresources/configdialog.h +debian/tmp/opt/kde3/include/tde/kresources/configpage.h +debian/tmp/opt/kde3/include/tde/kresources/configwidget.h +debian/tmp/opt/kde3/include/tde/kresources/factory.h +debian/tmp/opt/kde3/include/tde/kresources/manager.h +debian/tmp/opt/kde3/include/tde/kresources/manageriface.h +debian/tmp/opt/kde3/include/tde/kresources/managerimpl.h +debian/tmp/opt/kde3/include/tde/kresources/resource.h +debian/tmp/opt/kde3/include/tde/kresources/selectdialog.h +debian/tmp/opt/kde3/include/tde/krestrictedline.h +debian/tmp/opt/kde3/include/tde/kreverseresolver.h +debian/tmp/opt/kde3/include/tde/krfcdate.h +debian/tmp/opt/kde3/include/tde/krootpixmap.h +debian/tmp/opt/kde3/include/tde/krootprop.h +debian/tmp/opt/kde3/include/tde/kruler.h +debian/tmp/opt/kde3/include/tde/krun.h +debian/tmp/opt/kde3/include/tde/ksambashare.h +debian/tmp/opt/kde3/include/tde/ksavefile.h +debian/tmp/opt/kde3/include/tde/kscan.h +debian/tmp/opt/kde3/include/tde/ksconfig.h +debian/tmp/opt/kde3/include/tde/kscreensaver.h +debian/tmp/opt/kde3/include/tde/kscreensaver_vroot.h +debian/tmp/opt/kde3/include/tde/kscrollview.h +debian/tmp/opt/kde3/include/tde/kselect.h +debian/tmp/opt/kde3/include/tde/kseparator.h +debian/tmp/opt/kde3/include/tde/kserversocket.h +debian/tmp/opt/kde3/include/tde/kservicegroup.h +debian/tmp/opt/kde3/include/tde/kservice.h +debian/tmp/opt/kde3/include/tde/kservicetype.h +debian/tmp/opt/kde3/include/tde/ksettings/componentsdialog.h +debian/tmp/opt/kde3/include/tde/ksettings/dialog.h +debian/tmp/opt/kde3/include/tde/ksettings/dispatcher.h +debian/tmp/opt/kde3/include/tde/ksettings/pluginpage.h +debian/tmp/opt/kde3/include/tde/ksharedpixmap.h +debian/tmp/opt/kde3/include/tde/ksharedptr.h +debian/tmp/opt/kde3/include/tde/kshellcompletion.h +debian/tmp/opt/kde3/include/tde/kshell.h +debian/tmp/opt/kde3/include/tde/kshortcutdialog.h +debian/tmp/opt/kde3/include/tde/kshortcut.h +debian/tmp/opt/kde3/include/tde/kshortcutlist.h +debian/tmp/opt/kde3/include/tde/kshred.h +debian/tmp/opt/kde3/include/tde/ksimpleconfig.h +debian/tmp/opt/kde3/include/tde/ksmimecrypto.h +debian/tmp/opt/kde3/include/tde/ksockaddr.h +debian/tmp/opt/kde3/include/tde/tdesocketaddress.h +debian/tmp/opt/kde3/include/tde/tdesocketbase.h +debian/tmp/opt/kde3/include/tde/tdesocketdevice.h +debian/tmp/opt/kde3/include/tde/ksock.h +debian/tmp/opt/kde3/include/tde/ksocks.h +debian/tmp/opt/kde3/include/tde/ksockssocketdevice.h +debian/tmp/opt/kde3/include/tde/ksortablevaluelist.h +debian/tmp/opt/kde3/include/tde/kspeech.h +debian/tmp/opt/kde3/include/tde/kspeechsink.h +debian/tmp/opt/kde3/include/tde/kspell2/backgroundchecker.h +debian/tmp/opt/kde3/include/tde/kspell2/broker.h +debian/tmp/opt/kde3/include/tde/kspell2/configdialog.h +debian/tmp/opt/kde3/include/tde/kspell2/configwidget.h +debian/tmp/opt/kde3/include/tde/kspell2/defaultdictionary.h +debian/tmp/opt/kde3/include/tde/kspell2/dialog.h +debian/tmp/opt/kde3/include/tde/kspell2/dictionary.h +debian/tmp/opt/kde3/include/tde/kspell2/filter.h +debian/tmp/opt/kde3/include/tde/kspell2/highlighter.h +debian/tmp/opt/kde3/include/tde/kspell2/settings.h +debian/tmp/opt/kde3/include/tde/kspelldlg.h +debian/tmp/opt/kde3/include/tde/kspell.h +debian/tmp/opt/kde3/include/tde/ksplashscreen.h +debian/tmp/opt/kde3/include/tde/ksqueezedtextlabel.h +debian/tmp/opt/kde3/include/tde/ksslall.h +debian/tmp/opt/kde3/include/tde/ksslcertchain.h +debian/tmp/opt/kde3/include/tde/ksslcertdlg.h +debian/tmp/opt/kde3/include/tde/ksslcertificatecache.h +debian/tmp/opt/kde3/include/tde/ksslcertificatefactory.h +debian/tmp/opt/kde3/include/tde/ksslcertificate.h +debian/tmp/opt/kde3/include/tde/ksslcertificatehome.h +debian/tmp/opt/kde3/include/tde/ksslconfig.h +debian/tmp/opt/kde3/include/tde/ksslconnectioninfo.h +debian/tmp/opt/kde3/include/tde/kssl.h +debian/tmp/opt/kde3/include/tde/ksslinfodlg.h +debian/tmp/opt/kde3/include/tde/ksslkeygen.h +debian/tmp/opt/kde3/include/tde/ksslpeerinfo.h +debian/tmp/opt/kde3/include/tde/ksslpemcallback.h +debian/tmp/opt/kde3/include/tde/ksslpkcs12.h +debian/tmp/opt/kde3/include/tde/ksslpkcs7.h +debian/tmp/opt/kde3/include/tde/ksslsession.h +debian/tmp/opt/kde3/include/tde/ksslsettings.h +debian/tmp/opt/kde3/include/tde/ksslsigners.h +debian/tmp/opt/kde3/include/tde/ksslutils.h +debian/tmp/opt/kde3/include/tde/ksslx509map.h +debian/tmp/opt/kde3/include/tde/ksslx509v3.h +debian/tmp/opt/kde3/include/tde/kstandarddirs.h +debian/tmp/opt/kde3/include/tde/kstartupinfo.h +debian/tmp/opt/kde3/include/tde/kstaticdeleter.h +debian/tmp/opt/kde3/include/tde/kstatusbar.h +debian/tmp/opt/kde3/include/tde/kstdaccel.h +debian/tmp/opt/kde3/include/tde/kstdaction.h +debian/tmp/opt/kde3/include/tde/kstddirs.h +debian/tmp/opt/kde3/include/tde/kstdguiitem.h +debian/tmp/opt/kde3/include/tde/kstreamsocket.h +debian/tmp/opt/kde3/include/tde/kstringhandler.h +debian/tmp/opt/kde3/include/tde/kstringvalidator.h +debian/tmp/opt/kde3/include/tde/kstyle.h +debian/tmp/opt/kde3/include/tde/ksvgiconengine.h +debian/tmp/opt/kde3/include/tde/kswitchlanguagedialog.h +debian/tmp/opt/kde3/include/tde/ksycocaentry.h +debian/tmp/opt/kde3/include/tde/ksycoca.h +debian/tmp/opt/kde3/include/tde/ksycocatype.h +debian/tmp/opt/kde3/include/tde/ksyntaxhighlighter.h +debian/tmp/opt/kde3/include/tde/ksystemtray.h +debian/tmp/opt/kde3/include/tde/ktabbar.h +debian/tmp/opt/kde3/include/tde/ktabctl.h +debian/tmp/opt/kde3/include/tde/ktabwidget.h +debian/tmp/opt/kde3/include/tde/ktar.h +debian/tmp/opt/kde3/include/tde/ktempdir.h +debian/tmp/opt/kde3/include/tde/ktempfile.h +debian/tmp/opt/kde3/include/tde/ktextbrowser.h +debian/tmp/opt/kde3/include/tde/ktextedit.h +debian/tmp/opt/kde3/include/tde/ktexteditor/blockselectioninterface.h +debian/tmp/opt/kde3/include/tde/ktexteditor/clipboardinterface.h +debian/tmp/opt/kde3/include/tde/ktexteditor/codecompletioninterface.h +debian/tmp/opt/kde3/include/tde/ktexteditor/configinterfaceextension.h +debian/tmp/opt/kde3/include/tde/ktexteditor/configinterface.h +debian/tmp/opt/kde3/include/tde/ktexteditor/cursorinterface.h +debian/tmp/opt/kde3/include/tde/ktexteditor/document.h +debian/tmp/opt/kde3/include/tde/ktexteditor/documentinfo.h +debian/tmp/opt/kde3/include/tde/ktexteditor/dynwordwrapinterface.h +debian/tmp/opt/kde3/include/tde/ktexteditor/editinterfaceext.h +debian/tmp/opt/kde3/include/tde/ktexteditor/editinterface.h +debian/tmp/opt/kde3/include/tde/ktexteditor/editorchooser.h +debian/tmp/opt/kde3/include/tde/ktexteditor/editor.h +debian/tmp/opt/kde3/include/tde/ktexteditor/encodinginterface.h +debian/tmp/opt/kde3/include/tde/ktexteditor/highlightinginterface.h +debian/tmp/opt/kde3/include/tde/ktexteditor/markinterfaceextension.h +debian/tmp/opt/kde3/include/tde/ktexteditor/markinterface.h +debian/tmp/opt/kde3/include/tde/ktexteditor/plugin.h +debian/tmp/opt/kde3/include/tde/ktexteditor/popupmenuinterface.h +debian/tmp/opt/kde3/include/tde/ktexteditor/printinterface.h +debian/tmp/opt/kde3/include/tde/ktexteditor/searchinterface.h +debian/tmp/opt/kde3/include/tde/ktexteditor/selectionextdcopinterface.h +debian/tmp/opt/kde3/include/tde/ktexteditor/selectioninterfaceext.h +debian/tmp/opt/kde3/include/tde/ktexteditor/selectioninterface.h +debian/tmp/opt/kde3/include/tde/ktexteditor/sessionconfiginterface.h +debian/tmp/opt/kde3/include/tde/ktexteditor/templateinterface.h +debian/tmp/opt/kde3/include/tde/ktexteditor/texthintinterface.h +debian/tmp/opt/kde3/include/tde/ktexteditor/undointerface.h +debian/tmp/opt/kde3/include/tde/ktexteditor/variableinterface.h +debian/tmp/opt/kde3/include/tde/ktexteditor/viewcursorinterface.h +debian/tmp/opt/kde3/include/tde/ktexteditor/view.h +debian/tmp/opt/kde3/include/tde/ktexteditor/viewstatusmsginterface.h +debian/tmp/opt/kde3/include/tde/ktexteditor/wordwrapinterface.h +debian/tmp/opt/kde3/include/tde/ktimewidget.h +debian/tmp/opt/kde3/include/tde/ktimezones.h +debian/tmp/opt/kde3/include/tde/ktimezonewidget.h +debian/tmp/opt/kde3/include/tde/ktip.h +debian/tmp/opt/kde3/include/tde/ktoolbarbutton.h +debian/tmp/opt/kde3/include/tde/ktoolbar.h +debian/tmp/opt/kde3/include/tde/ktoolbarlabelaction.h +debian/tmp/opt/kde3/include/tde/ktoolbarradiogroup.h +debian/tmp/opt/kde3/include/tde/ktrader.h +debian/tmp/opt/kde3/include/tde/ktypelist.h +debian/tmp/opt/kde3/include/tde/kuniqueapp.h +debian/tmp/opt/kde3/include/tde/kuniqueapplication.h +debian/tmp/opt/kde3/include/tde/kunittest/module.h +debian/tmp/opt/kde3/include/tde/kunittest/runner.h +debian/tmp/opt/kde3/include/tde/kunittest/tester.h +debian/tmp/opt/kde3/include/tde/kunload.h +debian/tmp/opt/kde3/include/tde/kurifilter.h +debian/tmp/opt/kde3/include/tde/kurlbar.h +debian/tmp/opt/kde3/include/tde/kurlcombobox.h +debian/tmp/opt/kde3/include/tde/kurlcompletion.h +debian/tmp/opt/kde3/include/tde/kurldrag.h +debian/tmp/opt/kde3/include/tde/kurl.h +debian/tmp/opt/kde3/include/tde/kurllabel.h +debian/tmp/opt/kde3/include/tde/kurlpixmapprovider.h +debian/tmp/opt/kde3/include/tde/kurlrequesterdlg.h +debian/tmp/opt/kde3/include/tde/kurlrequester.h +debian/tmp/opt/kde3/include/tde/kuser.h +debian/tmp/opt/kde3/include/tde/kuserprofile.h +debian/tmp/opt/kde3/include/tde/kvmallocator.h +debian/tmp/opt/kde3/include/tde/kwallet.h +debian/tmp/opt/kde3/include/tde/kwallettypes.h +debian/tmp/opt/kde3/include/tde/kwindowinfo.h +debian/tmp/opt/kde3/include/tde/kwindowlistmenu.h +debian/tmp/opt/kde3/include/tde/kwin.h +debian/tmp/opt/kde3/include/tde/kwinmodule.h +debian/tmp/opt/kde3/include/tde/kwizard.h +debian/tmp/opt/kde3/include/tde/kwordwrap.h +debian/tmp/opt/kde3/include/tde/kxerrorhandler.h +debian/tmp/opt/kde3/include/tde/kxmessages.h +debian/tmp/opt/kde3/include/tde/kxmlguibuilder.h +debian/tmp/opt/kde3/include/tde/kxmlguiclient.h +debian/tmp/opt/kde3/include/tde/kxmlguifactory.h +debian/tmp/opt/kde3/include/tde/kxmlgui.h +debian/tmp/opt/kde3/include/tde/kzip.h +debian/tmp/opt/kde3/include/tde/libkrandr/ktimerdialog.h +debian/tmp/opt/kde3/include/tde/libkrandr/libkrandr.h +debian/tmp/opt/kde3/include/tde/libkrandr/lowlevel_randr.h +debian/tmp/opt/kde3/include/tde/libkrandr/randr.h +debian/tmp/opt/kde3/include/tde/libkmid/alsaout.h +debian/tmp/opt/kde3/include/tde/libkmid/dattypes.h +debian/tmp/opt/kde3/include/tde/libkmid/deviceman.h +debian/tmp/opt/kde3/include/tde/libkmid/fmout.h +debian/tmp/opt/kde3/include/tde/libkmid/gusout.h +debian/tmp/opt/kde3/include/tde/libkmid/libkmid.h +debian/tmp/opt/kde3/include/tde/libkmid/midfile.h +debian/tmp/opt/kde3/include/tde/libkmid/midimapper.h +debian/tmp/opt/kde3/include/tde/libkmid/midiout.h +debian/tmp/opt/kde3/include/tde/libkmid/midispec.h +debian/tmp/opt/kde3/include/tde/libkmid/midistat.h +debian/tmp/opt/kde3/include/tde/libkmid/mt32togm.h +debian/tmp/opt/kde3/include/tde/libkmid/notearray.h +debian/tmp/opt/kde3/include/tde/libkmid/player.h +debian/tmp/opt/kde3/include/tde/libkmid/synthout.h +debian/tmp/opt/kde3/include/tde/libkmid/track.h +debian/tmp/opt/kde3/include/tde/libkmid/voiceman.h +debian/tmp/opt/kde3/include/tde/netwm_def.h +debian/tmp/opt/kde3/include/tde/netwm.h +debian/tmp/opt/kde3/include/tde/qxembed.h +debian/tmp/opt/kde3/include/tde/renamedlgplugin.h +debian/tmp/opt/kde3/include/tde/scriptclientinterface.h +debian/tmp/opt/kde3/include/tde/scriptinterface.h +debian/tmp/opt/kde3/include/tde/scriptmanager.h -debian/tmp/opt/kde3/include/kde/networkstatuscommon.h -debian/tmp/opt/kde3/include/kde/networkstatusiface.h -debian/tmp/opt/kde3/include/kde/networkstatusindicator.h -debian/tmp/opt/kde3/include/kde/connectionmanager.h -debian/tmp/opt/kde3/include/kde/serviceiface.h -debian/tmp/opt/kde3/include/kde/provideriface.h -#debian/tmp/opt/kde3/include/kde/kdemm +debian/tmp/opt/kde3/include/tde/networkstatuscommon.h +debian/tmp/opt/kde3/include/tde/networkstatusiface.h +debian/tmp/opt/kde3/include/tde/networkstatusindicator.h +debian/tmp/opt/kde3/include/tde/connectionmanager.h +debian/tmp/opt/kde3/include/tde/serviceiface.h +debian/tmp/opt/kde3/include/tde/provideriface.h +#debian/tmp/opt/kde3/include/tde/kdemm debian/tmp/opt/kde3/lib/libnetworkstatus.la debian/tmp/opt/kde3/lib/libnetworkstatus.so diff --git a/ubuntu/maverick_automake/kdelibs/debian/rules b/ubuntu/maverick_automake/kdelibs/debian/rules index 184c61508..0d3d39814 100755 --- a/ubuntu/maverick_automake/kdelibs/debian/rules +++ b/ubuntu/maverick_automake/kdelibs/debian/rules @@ -12,14 +12,14 @@ DEB_KDE_APIDOX := yes version=Debian Package $(DEB_VERSION) DEB_OPT_FLAG += -DDEBIAN_VERSION=$(DEB_VERSION) -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) -DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_SKIP_RPATH=OFF -DCMAKE_LIBRARY_PATH="/opt/kde3/lib" -DCMAKE_INCLUDE_PATH="/opt/kde3/include/kde" -DCMAKE_CXX_FLAGS="-I/opt/kde3/include/kde" -DCMAKE_LDFLAGS="-L/opt/kde3/lib" +DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_SKIP_RPATH=OFF -DCMAKE_LIBRARY_PATH="/opt/kde3/lib" -DCMAKE_INCLUDE_PATH="/opt/kde3/include/tde" -DCMAKE_CXX_FLAGS="-I/opt/kde3/include/tde" -DCMAKE_LDFLAGS="-L/opt/kde3/lib" DEB_CONFIGURE_EXTRA_FLAGS := \ --enable-mitshm --with-alsa --enable-dnotify --enable-inotify \ diff --git a/ubuntu/maverick_automake/kdemultimedia/debian/cdbs/kde.mk b/ubuntu/maverick_automake/kdemultimedia/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/maverick_automake/kdemultimedia/debian/cdbs/kde.mk +++ b/ubuntu/maverick_automake/kdemultimedia/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick_automake/kdemultimedia/debian/kdemultimedia-kde3-dev.install b/ubuntu/maverick_automake/kdemultimedia/debian/kdemultimedia-kde3-dev.install index 0d38ad1da..9c0473a9d 100644 --- a/ubuntu/maverick_automake/kdemultimedia/debian/kdemultimedia-kde3-dev.install +++ b/ubuntu/maverick_automake/kdemultimedia/debian/kdemultimedia-kde3-dev.install @@ -1,137 +1,137 @@ -debian/tmp/opt/kde3/include/kde/arts/artsbuilder.h -debian/tmp/opt/kde3/include/kde/arts/artsbuilder.idl -debian/tmp/opt/kde3/include/kde/arts/artsgui.h -debian/tmp/opt/kde3/include/kde/arts/artsgui.idl -debian/tmp/opt/kde3/include/kde/arts/artsmidi.h -debian/tmp/opt/kde3/include/kde/arts/artsmidi.idl -debian/tmp/opt/kde3/include/kde/arts/artsmodules.h -debian/tmp/opt/kde3/include/kde/arts/artsmodules.idl -debian/tmp/opt/kde3/include/kde/arts/artsmodulescommon.h -debian/tmp/opt/kde3/include/kde/arts/artsmodulescommon.idl -debian/tmp/opt/kde3/include/kde/arts/artsmoduleseffects.h -debian/tmp/opt/kde3/include/kde/arts/artsmoduleseffects.idl -debian/tmp/opt/kde3/include/kde/arts/artsmodulesmixers.h -debian/tmp/opt/kde3/include/kde/arts/artsmodulesmixers.idl -debian/tmp/opt/kde3/include/kde/arts/artsmodulessynth.h -debian/tmp/opt/kde3/include/kde/arts/artsmodulessynth.idl -debian/tmp/opt/kde3/include/kde/arts/kartswidget.h -debian/tmp/opt/kde3/include/kde/arts/kframe_impl.h -debian/tmp/opt/kde3/include/kde/arts/klayoutbox_impl.h -debian/tmp/opt/kde3/include/kde/arts/kwidget_impl.h -debian/tmp/opt/kde3/include/kde/arts/kwidgetrepo.h -debian/tmp/opt/kde3/include/kde/audiocdencoder.h -debian/tmp/opt/kde3/include/kde/cmodule.h -debian/tmp/opt/kde3/include/kde/effectview.h -debian/tmp/opt/kde3/include/kde/equalizerview.h -debian/tmp/opt/kde3/include/kde/ksaver.h -debian/tmp/opt/kde3/include/kde/libkcddb/cache.h -debian/tmp/opt/kde3/include/kde/libkcddb/cddb.h -debian/tmp/opt/kde3/include/kde/libkcddb/cdinfo.h -debian/tmp/opt/kde3/include/kde/libkcddb/client.h -debian/tmp/opt/kde3/include/kde/libkcddb/config.h -debian/tmp/opt/kde3/include/kde/libkcddb/configbase.h -debian/tmp/opt/kde3/include/kde/mimetypetree.h -debian/tmp/opt/kde3/include/kde/mpeglib/decoder/cddaPlugin.h -debian/tmp/opt/kde3/include/kde/mpeglib/decoder/command.h -debian/tmp/opt/kde3/include/kde/mpeglib/decoder/commandPipe.h -debian/tmp/opt/kde3/include/kde/mpeglib/decoder/decoderPlugin.h -debian/tmp/opt/kde3/include/kde/mpeglib/decoder/mpegPlugin.h -debian/tmp/opt/kde3/include/kde/mpeglib/decoder/mpgPlugin.h -debian/tmp/opt/kde3/include/kde/mpeglib/decoder/nukePlugin.h -debian/tmp/opt/kde3/include/kde/mpeglib/decoder/splayPlugin.h -debian/tmp/opt/kde3/include/kde/mpeglib/decoder/tplayPlugin.h -debian/tmp/opt/kde3/include/kde/mpeglib/decoder/vorbisPlugin.h -debian/tmp/opt/kde3/include/kde/mpeglib/decoder/yuvPlugin.h -debian/tmp/opt/kde3/include/kde/mpeglib/frame/IOFrameQueue.h -debian/tmp/opt/kde3/include/kde/mpeglib/frame/audioFrame.h -debian/tmp/opt/kde3/include/kde/mpeglib/frame/audioFrameQueue.h -debian/tmp/opt/kde3/include/kde/mpeglib/frame/floatFrame.h -debian/tmp/opt/kde3/include/kde/mpeglib/frame/frame.h -debian/tmp/opt/kde3/include/kde/mpeglib/frame/frameQueue.h -debian/tmp/opt/kde3/include/kde/mpeglib/frame/framer.h -debian/tmp/opt/kde3/include/kde/mpeglib/frame/pcmFrame.h -debian/tmp/opt/kde3/include/kde/mpeglib/frame/rawDataBuffer.h -debian/tmp/opt/kde3/include/kde/mpeglib/frame/rawFrame.h -debian/tmp/opt/kde3/include/kde/mpeglib/input/bufferInputStream.h -debian/tmp/opt/kde3/include/kde/mpeglib/input/cddaInputStream.h -debian/tmp/opt/kde3/include/kde/mpeglib/input/cdromInputStream.h -debian/tmp/opt/kde3/include/kde/mpeglib/input/fileInputStream.h -debian/tmp/opt/kde3/include/kde/mpeglib/input/httpInputStream.h -debian/tmp/opt/kde3/include/kde/mpeglib/input/inputDetector.h -debian/tmp/opt/kde3/include/kde/mpeglib/input/inputPlugin.h -debian/tmp/opt/kde3/include/kde/mpeglib/input/inputStream.h -debian/tmp/opt/kde3/include/kde/mpeglib/input/threadSafeInputStream.h -debian/tmp/opt/kde3/include/kde/mpeglib/mpegutil/mpegStreamPlayer.h -debian/tmp/opt/kde3/include/kde/mpeglib/mpegutil/mpegSystemHeader.h -debian/tmp/opt/kde3/include/kde/mpeglib/mpegutil/mpegSystemStream.h -debian/tmp/opt/kde3/include/kde/mpeglib/mpegutil/mpegVideoLength.h -debian/tmp/opt/kde3/include/kde/mpeglib/mpegutil/pesSystemStream.h -debian/tmp/opt/kde3/include/kde/mpeglib/mpegutil/psSystemStream.h -debian/tmp/opt/kde3/include/kde/mpeglib/mpegutil/tsSystemStream.h -debian/tmp/opt/kde3/include/kde/mpeglib/oggvorbis/oggFrame.h -debian/tmp/opt/kde3/include/kde/mpeglib/oggvorbis/ovFramer.h -debian/tmp/opt/kde3/include/kde/mpeglib/oggvorbis/vorbisDecoder.h -debian/tmp/opt/kde3/include/kde/mpeglib/oggvorbis/vorbisInfo.h -debian/tmp/opt/kde3/include/kde/mpeglib/output/artsOutputStream.h -debian/tmp/opt/kde3/include/kde/mpeglib/output/audioTime.h -debian/tmp/opt/kde3/include/kde/mpeglib/output/avSyncer.h -debian/tmp/opt/kde3/include/kde/mpeglib/output/dspX11OutputStream.h -debian/tmp/opt/kde3/include/kde/mpeglib/output/outPlugin.h -debian/tmp/opt/kde3/include/kde/mpeglib/output/outputStream.h -debian/tmp/opt/kde3/include/kde/mpeglib/output/pluginInfo.h -debian/tmp/opt/kde3/include/kde/mpeglib/output/threadSafeOutputStream.h -debian/tmp/opt/kde3/include/kde/mpeglib/splay/mpegAudioFrame.h -debian/tmp/opt/kde3/include/kde/mpeglib/splay/mpegAudioInfo.h -debian/tmp/opt/kde3/include/kde/mpeglib/splay/splayDecoder.h -debian/tmp/opt/kde3/include/kde/mpeglib/util/abstract/abs_thread.h -debian/tmp/opt/kde3/include/kde/mpeglib/util/abstract/threadQueue.h -debian/tmp/opt/kde3/include/kde/mpeglib/util/dynBuffer.h -debian/tmp/opt/kde3/include/kde/mpeglib/util/file/fileAccess.h -debian/tmp/opt/kde3/include/kde/mpeglib/util/mmx/mm_accel.h -debian/tmp/opt/kde3/include/kde/mpeglib/util/mmx/mmx.h -debian/tmp/opt/kde3/include/kde/mpeglib/util/mmx/mmx_asm.h -debian/tmp/opt/kde3/include/kde/mpeglib/util/render/pictureArray.h -debian/tmp/opt/kde3/include/kde/mpeglib/util/render/yuvPicture.h -debian/tmp/opt/kde3/include/kde/mpeglib/util/syncClock.h -debian/tmp/opt/kde3/include/kde/mpeglib/util/timeStamp.h -debian/tmp/opt/kde3/include/kde/mpeglib/util/timeStampArray.h -debian/tmp/opt/kde3/include/kde/mpeglib/util/timeWrapper.h -debian/tmp/opt/kde3/include/kde/mpeglib/util/yaf/yafcore/buffer.h -debian/tmp/opt/kde3/include/kde/mpeglib/util/yaf/yafcore/inputDecoder.h -debian/tmp/opt/kde3/include/kde/mpeglib/util/yaf/yafcore/inputInterface.h -debian/tmp/opt/kde3/include/kde/mpeglib/util/yaf/yafcore/outputInterface.h -debian/tmp/opt/kde3/include/kde/mpeglib/util/yaf/yafcore/yaf_control.h -debian/tmp/opt/kde3/include/kde/mpeglib/util/yaf/yafxplayer/inputDecoderXPlayer.h -debian/tmp/opt/kde3/include/kde/mpeglib/util/yaf/yafxplayer/inputDecoderYAF.h -debian/tmp/opt/kde3/include/kde/mpeglib/util/yaf/yafxplayer/yafOutputStream.h -debian/tmp/opt/kde3/include/kde/mpeglib_artsplug/decoderBaseObject.h -debian/tmp/opt/kde3/include/kde/mpeglib_artsplug/decoderBaseObject.idl -debian/tmp/opt/kde3/include/kde/mpeglib_artsplug/decoderBaseObject_impl.h -debian/tmp/opt/kde3/include/kde/mpeglib_artsplug/splayPlayObject.h -debian/tmp/opt/kde3/include/kde/mpeglib_artsplug/splayPlayObject.idl -debian/tmp/opt/kde3/include/kde/mpeglib_artsplug/splayPlayObject_impl.h -debian/tmp/opt/kde3/include/kde/noatun/app.h -debian/tmp/opt/kde3/include/kde/noatun/controls.h -debian/tmp/opt/kde3/include/kde/noatun/conversion.h -debian/tmp/opt/kde3/include/kde/noatun/downloader.h -debian/tmp/opt/kde3/include/kde/noatun/effects.h -debian/tmp/opt/kde3/include/kde/noatun/engine.h -debian/tmp/opt/kde3/include/kde/noatun/equalizer.h -debian/tmp/opt/kde3/include/kde/noatun/noatunarts.h -debian/tmp/opt/kde3/include/kde/noatun/player.h -debian/tmp/opt/kde3/include/kde/noatun/playlist.h -debian/tmp/opt/kde3/include/kde/noatun/playlistsaver.h -debian/tmp/opt/kde3/include/kde/noatun/plugin.h -debian/tmp/opt/kde3/include/kde/noatun/pluginloader.h -debian/tmp/opt/kde3/include/kde/noatun/pref.h -debian/tmp/opt/kde3/include/kde/noatun/scrollinglabel.h -debian/tmp/opt/kde3/include/kde/noatun/stdaction.h -debian/tmp/opt/kde3/include/kde/noatun/stereobuttonaction.h -debian/tmp/opt/kde3/include/kde/noatun/tags.h -debian/tmp/opt/kde3/include/kde/noatun/vequalizer.h -debian/tmp/opt/kde3/include/kde/noatun/video.h -debian/tmp/opt/kde3/include/kde/noatun/winskinvis.h -debian/tmp/opt/kde3/include/kde/plugin_deps.h +debian/tmp/opt/kde3/include/tde/arts/artsbuilder.h +debian/tmp/opt/kde3/include/tde/arts/artsbuilder.idl +debian/tmp/opt/kde3/include/tde/arts/artsgui.h +debian/tmp/opt/kde3/include/tde/arts/artsgui.idl +debian/tmp/opt/kde3/include/tde/arts/artsmidi.h +debian/tmp/opt/kde3/include/tde/arts/artsmidi.idl +debian/tmp/opt/kde3/include/tde/arts/artsmodules.h +debian/tmp/opt/kde3/include/tde/arts/artsmodules.idl +debian/tmp/opt/kde3/include/tde/arts/artsmodulescommon.h +debian/tmp/opt/kde3/include/tde/arts/artsmodulescommon.idl +debian/tmp/opt/kde3/include/tde/arts/artsmoduleseffects.h +debian/tmp/opt/kde3/include/tde/arts/artsmoduleseffects.idl +debian/tmp/opt/kde3/include/tde/arts/artsmodulesmixers.h +debian/tmp/opt/kde3/include/tde/arts/artsmodulesmixers.idl +debian/tmp/opt/kde3/include/tde/arts/artsmodulessynth.h +debian/tmp/opt/kde3/include/tde/arts/artsmodulessynth.idl +debian/tmp/opt/kde3/include/tde/arts/kartswidget.h +debian/tmp/opt/kde3/include/tde/arts/kframe_impl.h +debian/tmp/opt/kde3/include/tde/arts/klayoutbox_impl.h +debian/tmp/opt/kde3/include/tde/arts/kwidget_impl.h +debian/tmp/opt/kde3/include/tde/arts/kwidgetrepo.h +debian/tmp/opt/kde3/include/tde/audiocdencoder.h +debian/tmp/opt/kde3/include/tde/cmodule.h +debian/tmp/opt/kde3/include/tde/effectview.h +debian/tmp/opt/kde3/include/tde/equalizerview.h +debian/tmp/opt/kde3/include/tde/ksaver.h +debian/tmp/opt/kde3/include/tde/libkcddb/cache.h +debian/tmp/opt/kde3/include/tde/libkcddb/cddb.h +debian/tmp/opt/kde3/include/tde/libkcddb/cdinfo.h +debian/tmp/opt/kde3/include/tde/libkcddb/client.h +debian/tmp/opt/kde3/include/tde/libkcddb/config.h +debian/tmp/opt/kde3/include/tde/libkcddb/configbase.h +debian/tmp/opt/kde3/include/tde/mimetypetree.h +debian/tmp/opt/kde3/include/tde/mpeglib/decoder/cddaPlugin.h +debian/tmp/opt/kde3/include/tde/mpeglib/decoder/command.h +debian/tmp/opt/kde3/include/tde/mpeglib/decoder/commandPipe.h +debian/tmp/opt/kde3/include/tde/mpeglib/decoder/decoderPlugin.h +debian/tmp/opt/kde3/include/tde/mpeglib/decoder/mpegPlugin.h +debian/tmp/opt/kde3/include/tde/mpeglib/decoder/mpgPlugin.h +debian/tmp/opt/kde3/include/tde/mpeglib/decoder/nukePlugin.h +debian/tmp/opt/kde3/include/tde/mpeglib/decoder/splayPlugin.h +debian/tmp/opt/kde3/include/tde/mpeglib/decoder/tplayPlugin.h +debian/tmp/opt/kde3/include/tde/mpeglib/decoder/vorbisPlugin.h +debian/tmp/opt/kde3/include/tde/mpeglib/decoder/yuvPlugin.h +debian/tmp/opt/kde3/include/tde/mpeglib/frame/IOFrameQueue.h +debian/tmp/opt/kde3/include/tde/mpeglib/frame/audioFrame.h +debian/tmp/opt/kde3/include/tde/mpeglib/frame/audioFrameQueue.h +debian/tmp/opt/kde3/include/tde/mpeglib/frame/floatFrame.h +debian/tmp/opt/kde3/include/tde/mpeglib/frame/frame.h +debian/tmp/opt/kde3/include/tde/mpeglib/frame/frameQueue.h +debian/tmp/opt/kde3/include/tde/mpeglib/frame/framer.h +debian/tmp/opt/kde3/include/tde/mpeglib/frame/pcmFrame.h +debian/tmp/opt/kde3/include/tde/mpeglib/frame/rawDataBuffer.h +debian/tmp/opt/kde3/include/tde/mpeglib/frame/rawFrame.h +debian/tmp/opt/kde3/include/tde/mpeglib/input/bufferInputStream.h +debian/tmp/opt/kde3/include/tde/mpeglib/input/cddaInputStream.h +debian/tmp/opt/kde3/include/tde/mpeglib/input/cdromInputStream.h +debian/tmp/opt/kde3/include/tde/mpeglib/input/fileInputStream.h +debian/tmp/opt/kde3/include/tde/mpeglib/input/httpInputStream.h +debian/tmp/opt/kde3/include/tde/mpeglib/input/inputDetector.h +debian/tmp/opt/kde3/include/tde/mpeglib/input/inputPlugin.h +debian/tmp/opt/kde3/include/tde/mpeglib/input/inputStream.h +debian/tmp/opt/kde3/include/tde/mpeglib/input/threadSafeInputStream.h +debian/tmp/opt/kde3/include/tde/mpeglib/mpegutil/mpegStreamPlayer.h +debian/tmp/opt/kde3/include/tde/mpeglib/mpegutil/mpegSystemHeader.h +debian/tmp/opt/kde3/include/tde/mpeglib/mpegutil/mpegSystemStream.h +debian/tmp/opt/kde3/include/tde/mpeglib/mpegutil/mpegVideoLength.h +debian/tmp/opt/kde3/include/tde/mpeglib/mpegutil/pesSystemStream.h +debian/tmp/opt/kde3/include/tde/mpeglib/mpegutil/psSystemStream.h +debian/tmp/opt/kde3/include/tde/mpeglib/mpegutil/tsSystemStream.h +debian/tmp/opt/kde3/include/tde/mpeglib/oggvorbis/oggFrame.h +debian/tmp/opt/kde3/include/tde/mpeglib/oggvorbis/ovFramer.h +debian/tmp/opt/kde3/include/tde/mpeglib/oggvorbis/vorbisDecoder.h +debian/tmp/opt/kde3/include/tde/mpeglib/oggvorbis/vorbisInfo.h +debian/tmp/opt/kde3/include/tde/mpeglib/output/artsOutputStream.h +debian/tmp/opt/kde3/include/tde/mpeglib/output/audioTime.h +debian/tmp/opt/kde3/include/tde/mpeglib/output/avSyncer.h +debian/tmp/opt/kde3/include/tde/mpeglib/output/dspX11OutputStream.h +debian/tmp/opt/kde3/include/tde/mpeglib/output/outPlugin.h +debian/tmp/opt/kde3/include/tde/mpeglib/output/outputStream.h +debian/tmp/opt/kde3/include/tde/mpeglib/output/pluginInfo.h +debian/tmp/opt/kde3/include/tde/mpeglib/output/threadSafeOutputStream.h +debian/tmp/opt/kde3/include/tde/mpeglib/splay/mpegAudioFrame.h +debian/tmp/opt/kde3/include/tde/mpeglib/splay/mpegAudioInfo.h +debian/tmp/opt/kde3/include/tde/mpeglib/splay/splayDecoder.h +debian/tmp/opt/kde3/include/tde/mpeglib/util/abstract/abs_thread.h +debian/tmp/opt/kde3/include/tde/mpeglib/util/abstract/threadQueue.h +debian/tmp/opt/kde3/include/tde/mpeglib/util/dynBuffer.h +debian/tmp/opt/kde3/include/tde/mpeglib/util/file/fileAccess.h +debian/tmp/opt/kde3/include/tde/mpeglib/util/mmx/mm_accel.h +debian/tmp/opt/kde3/include/tde/mpeglib/util/mmx/mmx.h +debian/tmp/opt/kde3/include/tde/mpeglib/util/mmx/mmx_asm.h +debian/tmp/opt/kde3/include/tde/mpeglib/util/render/pictureArray.h +debian/tmp/opt/kde3/include/tde/mpeglib/util/render/yuvPicture.h +debian/tmp/opt/kde3/include/tde/mpeglib/util/syncClock.h +debian/tmp/opt/kde3/include/tde/mpeglib/util/timeStamp.h +debian/tmp/opt/kde3/include/tde/mpeglib/util/timeStampArray.h +debian/tmp/opt/kde3/include/tde/mpeglib/util/timeWrapper.h +debian/tmp/opt/kde3/include/tde/mpeglib/util/yaf/yafcore/buffer.h +debian/tmp/opt/kde3/include/tde/mpeglib/util/yaf/yafcore/inputDecoder.h +debian/tmp/opt/kde3/include/tde/mpeglib/util/yaf/yafcore/inputInterface.h +debian/tmp/opt/kde3/include/tde/mpeglib/util/yaf/yafcore/outputInterface.h +debian/tmp/opt/kde3/include/tde/mpeglib/util/yaf/yafcore/yaf_control.h +debian/tmp/opt/kde3/include/tde/mpeglib/util/yaf/yafxplayer/inputDecoderXPlayer.h +debian/tmp/opt/kde3/include/tde/mpeglib/util/yaf/yafxplayer/inputDecoderYAF.h +debian/tmp/opt/kde3/include/tde/mpeglib/util/yaf/yafxplayer/yafOutputStream.h +debian/tmp/opt/kde3/include/tde/mpeglib_artsplug/decoderBaseObject.h +debian/tmp/opt/kde3/include/tde/mpeglib_artsplug/decoderBaseObject.idl +debian/tmp/opt/kde3/include/tde/mpeglib_artsplug/decoderBaseObject_impl.h +debian/tmp/opt/kde3/include/tde/mpeglib_artsplug/splayPlayObject.h +debian/tmp/opt/kde3/include/tde/mpeglib_artsplug/splayPlayObject.idl +debian/tmp/opt/kde3/include/tde/mpeglib_artsplug/splayPlayObject_impl.h +debian/tmp/opt/kde3/include/tde/noatun/app.h +debian/tmp/opt/kde3/include/tde/noatun/controls.h +debian/tmp/opt/kde3/include/tde/noatun/conversion.h +debian/tmp/opt/kde3/include/tde/noatun/downloader.h +debian/tmp/opt/kde3/include/tde/noatun/effects.h +debian/tmp/opt/kde3/include/tde/noatun/engine.h +debian/tmp/opt/kde3/include/tde/noatun/equalizer.h +debian/tmp/opt/kde3/include/tde/noatun/noatunarts.h +debian/tmp/opt/kde3/include/tde/noatun/player.h +debian/tmp/opt/kde3/include/tde/noatun/playlist.h +debian/tmp/opt/kde3/include/tde/noatun/playlistsaver.h +debian/tmp/opt/kde3/include/tde/noatun/plugin.h +debian/tmp/opt/kde3/include/tde/noatun/pluginloader.h +debian/tmp/opt/kde3/include/tde/noatun/pref.h +debian/tmp/opt/kde3/include/tde/noatun/scrollinglabel.h +debian/tmp/opt/kde3/include/tde/noatun/stdaction.h +debian/tmp/opt/kde3/include/tde/noatun/stereobuttonaction.h +debian/tmp/opt/kde3/include/tde/noatun/tags.h +debian/tmp/opt/kde3/include/tde/noatun/vequalizer.h +debian/tmp/opt/kde3/include/tde/noatun/video.h +debian/tmp/opt/kde3/include/tde/noatun/winskinvis.h +debian/tmp/opt/kde3/include/tde/plugin_deps.h debian/tmp/opt/kde3/lib/libarts_mpeglib.so debian/tmp/opt/kde3/lib/libarts_splay.so debian/tmp/opt/kde3/lib/libartsbuilder.so diff --git a/ubuntu/maverick_automake/kdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick_automake/kdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff index 3d5dc7628..e705cf83b 100644 --- a/ubuntu/maverick_automake/kdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick_automake/kdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/opt/kde3/include/kde/kde.pot ++kdepotpath=/opt/kde3/include/tde/kde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick_automake/kdemultimedia/debian/rules b/ubuntu/maverick_automake/kdemultimedia/debian/rules index 973deaeed..49741de4f 100755 --- a/ubuntu/maverick_automake/kdemultimedia/debian/rules +++ b/ubuntu/maverick_automake/kdemultimedia/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info @@ -14,9 +14,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_CONFIGURE_EXTRA_FLAGS := \ --with-alsa --with-arts-alsa \ - --with-extra-includes=/usr/include/speex:/opt/kde3/include/kde/arts \ + --with-extra-includes=/usr/include/speex:/opt/kde3/include/tde/arts \ --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib - # The include/kde/arts one should be temporary. See + # The include/tde/arts one should be temporary. See # "juk/Makefile.am: arts_includes vs ARTS_CFLAGS" in -talk. DOC_HTML_PRUNE := kcontrol-kde3 diff --git a/ubuntu/maverick_automake/kdenetwork/debian/cdbs/kde.mk b/ubuntu/maverick_automake/kdenetwork/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/maverick_automake/kdenetwork/debian/cdbs/kde.mk +++ b/ubuntu/maverick_automake/kdenetwork/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick_automake/kdenetwork/debian/kdenetwork-kde3-dev.install b/ubuntu/maverick_automake/kdenetwork/debian/kdenetwork-kde3-dev.install index 4fe8b41d9..cefc34345 100644 --- a/ubuntu/maverick_automake/kdenetwork/debian/kdenetwork-kde3-dev.install +++ b/ubuntu/maverick_automake/kdenetwork/debian/kdenetwork-kde3-dev.install @@ -1,66 +1,66 @@ -debian/tmp/opt/kde3/include/kde/kopete/kabcpersistence.h -debian/tmp/opt/kde3/include/kde/kopete/kopete_export.h -debian/tmp/opt/kde3/include/kde/kopete/kopeteaccount.h -debian/tmp/opt/kde3/include/kde/kopete/kopeteaccountmanager.h -debian/tmp/opt/kde3/include/kde/kopete/kopeteaway.h -debian/tmp/opt/kde3/include/kde/kopete/kopeteawayaction.h -debian/tmp/opt/kde3/include/kde/kopete/kopeteawaydialog.h -debian/tmp/opt/kde3/include/kde/kopete/kopeteblacklister.h -debian/tmp/opt/kde3/include/kde/kopete/kopetechatsession.h -debian/tmp/opt/kde3/include/kde/kopete/kopetechatsessionmanager.h -debian/tmp/opt/kde3/include/kde/kopete/kopetecommandhandler.h -debian/tmp/opt/kde3/include/kde/kopete/kopetecontact.h -debian/tmp/opt/kde3/include/kde/kopete/kopetecontactlist.h -debian/tmp/opt/kde3/include/kde/kopete/kopetecontactlistelement.h -debian/tmp/opt/kde3/include/kde/kopete/kopetecontactproperty.h -debian/tmp/opt/kde3/include/kde/kopete/kopeteeventpresentation.h -debian/tmp/opt/kde3/include/kde/kopete/kopeteglobal.h -debian/tmp/opt/kde3/include/kde/kopete/kopetegroup.h -debian/tmp/opt/kde3/include/kde/kopete/kopetemessage.h -debian/tmp/opt/kde3/include/kde/kopete/kopetemessageevent.h -debian/tmp/opt/kde3/include/kde/kopete/kopetemessagehandler.h -debian/tmp/opt/kde3/include/kde/kopete/kopetemessagehandlerchain.h -debian/tmp/opt/kde3/include/kde/kopete/kopetemetacontact.h -debian/tmp/opt/kde3/include/kde/kopete/kopetemimetypehandler.h -debian/tmp/opt/kde3/include/kde/kopete/kopetenotifydataobject.h -debian/tmp/opt/kde3/include/kde/kopete/kopeteonlinestatus.h -debian/tmp/opt/kde3/include/kde/kopete/kopeteonlinestatusmanager.h -debian/tmp/opt/kde3/include/kde/kopete/kopetepassword.h -debian/tmp/opt/kde3/include/kde/kopete/kopetepasswordedaccount.h -debian/tmp/opt/kde3/include/kde/kopete/kopeteplugin.h -debian/tmp/opt/kde3/include/kde/kopete/kopeteprotocol.h -debian/tmp/opt/kde3/include/kde/kopete/kopetesimplemessagehandler.h -debian/tmp/opt/kde3/include/kde/kopete/kopetetask.h -debian/tmp/opt/kde3/include/kde/kopete/kopetetransfermanager.h -debian/tmp/opt/kde3/include/kde/kopete/kopeteuiglobal.h -debian/tmp/opt/kde3/include/kde/kopete/kopeteversion.h -debian/tmp/opt/kde3/include/kde/kopete/managedconnectionaccount.h -debian/tmp/opt/kde3/include/kde/kopete/ui/accountselector.h -debian/tmp/opt/kde3/include/kde/kopete/ui/addcontactpage.h -debian/tmp/opt/kde3/include/kde/kopete/ui/addressbookselectordialog.h -debian/tmp/opt/kde3/include/kde/kopete/ui/addressbookselectorwidget.h -debian/tmp/opt/kde3/include/kde/kopete/ui/editaccountwidget.h -debian/tmp/opt/kde3/include/kde/kopete/ui/fileconfirmbase.h -debian/tmp/opt/kde3/include/kde/kopete/ui/kopeteawaydialogbase.h -debian/tmp/opt/kde3/include/kde/kopete/ui/kopetecontactaction.h -debian/tmp/opt/kde3/include/kde/kopete/ui/kopetefileconfirmdialog.h -debian/tmp/opt/kde3/include/kde/kopete/ui/kopetelistview.h -debian/tmp/opt/kde3/include/kde/kopete/ui/kopetelistviewitem.h -debian/tmp/opt/kde3/include/kde/kopete/ui/kopetelistviewsearchline.h -debian/tmp/opt/kde3/include/kde/kopete/ui/kopetepassworddialog.h -debian/tmp/opt/kde3/include/kde/kopete/ui/kopetepasswordwidget.h -debian/tmp/opt/kde3/include/kde/kopete/ui/kopetepasswordwidgetbase.h -debian/tmp/opt/kde3/include/kde/kopete/ui/kopetestdaction.h -debian/tmp/opt/kde3/include/kde/kopete/ui/kopeteview.h -debian/tmp/opt/kde3/include/kde/kopete/ui/kopeteviewplugin.h -debian/tmp/opt/kde3/include/kde/kopete/ui/userinfodialog.h -debian/tmp/opt/kde3/include/kde/rss/article.h -debian/tmp/opt/kde3/include/kde/rss/document.h -debian/tmp/opt/kde3/include/kde/rss/global.h -debian/tmp/opt/kde3/include/kde/rss/image.h -debian/tmp/opt/kde3/include/kde/rss/librss.h -debian/tmp/opt/kde3/include/kde/rss/loader.h -debian/tmp/opt/kde3/include/kde/rss/textinput.h +debian/tmp/opt/kde3/include/tde/kopete/kabcpersistence.h +debian/tmp/opt/kde3/include/tde/kopete/kopete_export.h +debian/tmp/opt/kde3/include/tde/kopete/kopeteaccount.h +debian/tmp/opt/kde3/include/tde/kopete/kopeteaccountmanager.h +debian/tmp/opt/kde3/include/tde/kopete/kopeteaway.h +debian/tmp/opt/kde3/include/tde/kopete/kopeteawayaction.h +debian/tmp/opt/kde3/include/tde/kopete/kopeteawaydialog.h +debian/tmp/opt/kde3/include/tde/kopete/kopeteblacklister.h +debian/tmp/opt/kde3/include/tde/kopete/kopetechatsession.h +debian/tmp/opt/kde3/include/tde/kopete/kopetechatsessionmanager.h +debian/tmp/opt/kde3/include/tde/kopete/kopetecommandhandler.h +debian/tmp/opt/kde3/include/tde/kopete/kopetecontact.h +debian/tmp/opt/kde3/include/tde/kopete/kopetecontactlist.h +debian/tmp/opt/kde3/include/tde/kopete/kopetecontactlistelement.h +debian/tmp/opt/kde3/include/tde/kopete/kopetecontactproperty.h +debian/tmp/opt/kde3/include/tde/kopete/kopeteeventpresentation.h +debian/tmp/opt/kde3/include/tde/kopete/kopeteglobal.h +debian/tmp/opt/kde3/include/tde/kopete/kopetegroup.h +debian/tmp/opt/kde3/include/tde/kopete/kopetemessage.h +debian/tmp/opt/kde3/include/tde/kopete/kopetemessageevent.h +debian/tmp/opt/kde3/include/tde/kopete/kopetemessagehandler.h +debian/tmp/opt/kde3/include/tde/kopete/kopetemessagehandlerchain.h +debian/tmp/opt/kde3/include/tde/kopete/kopetemetacontact.h +debian/tmp/opt/kde3/include/tde/kopete/kopetemimetypehandler.h +debian/tmp/opt/kde3/include/tde/kopete/kopetenotifydataobject.h +debian/tmp/opt/kde3/include/tde/kopete/kopeteonlinestatus.h +debian/tmp/opt/kde3/include/tde/kopete/kopeteonlinestatusmanager.h +debian/tmp/opt/kde3/include/tde/kopete/kopetepassword.h +debian/tmp/opt/kde3/include/tde/kopete/kopetepasswordedaccount.h +debian/tmp/opt/kde3/include/tde/kopete/kopeteplugin.h +debian/tmp/opt/kde3/include/tde/kopete/kopeteprotocol.h +debian/tmp/opt/kde3/include/tde/kopete/kopetesimplemessagehandler.h +debian/tmp/opt/kde3/include/tde/kopete/kopetetask.h +debian/tmp/opt/kde3/include/tde/kopete/kopetetransfermanager.h +debian/tmp/opt/kde3/include/tde/kopete/kopeteuiglobal.h +debian/tmp/opt/kde3/include/tde/kopete/kopeteversion.h +debian/tmp/opt/kde3/include/tde/kopete/managedconnectionaccount.h +debian/tmp/opt/kde3/include/tde/kopete/ui/accountselector.h +debian/tmp/opt/kde3/include/tde/kopete/ui/addcontactpage.h +debian/tmp/opt/kde3/include/tde/kopete/ui/addressbookselectordialog.h +debian/tmp/opt/kde3/include/tde/kopete/ui/addressbookselectorwidget.h +debian/tmp/opt/kde3/include/tde/kopete/ui/editaccountwidget.h +debian/tmp/opt/kde3/include/tde/kopete/ui/fileconfirmbase.h +debian/tmp/opt/kde3/include/tde/kopete/ui/kopeteawaydialogbase.h +debian/tmp/opt/kde3/include/tde/kopete/ui/kopetecontactaction.h +debian/tmp/opt/kde3/include/tde/kopete/ui/kopetefileconfirmdialog.h +debian/tmp/opt/kde3/include/tde/kopete/ui/kopetelistview.h +debian/tmp/opt/kde3/include/tde/kopete/ui/kopetelistviewitem.h +debian/tmp/opt/kde3/include/tde/kopete/ui/kopetelistviewsearchline.h +debian/tmp/opt/kde3/include/tde/kopete/ui/kopetepassworddialog.h +debian/tmp/opt/kde3/include/tde/kopete/ui/kopetepasswordwidget.h +debian/tmp/opt/kde3/include/tde/kopete/ui/kopetepasswordwidgetbase.h +debian/tmp/opt/kde3/include/tde/kopete/ui/kopetestdaction.h +debian/tmp/opt/kde3/include/tde/kopete/ui/kopeteview.h +debian/tmp/opt/kde3/include/tde/kopete/ui/kopeteviewplugin.h +debian/tmp/opt/kde3/include/tde/kopete/ui/userinfodialog.h +debian/tmp/opt/kde3/include/tde/rss/article.h +debian/tmp/opt/kde3/include/tde/rss/document.h +debian/tmp/opt/kde3/include/tde/rss/global.h +debian/tmp/opt/kde3/include/tde/rss/image.h +debian/tmp/opt/kde3/include/tde/rss/librss.h +debian/tmp/opt/kde3/include/tde/rss/loader.h +debian/tmp/opt/kde3/include/tde/rss/textinput.h debian/tmp/opt/kde3/lib/libkdeinit_kdict.la debian/tmp/opt/kde3/lib/libkdeinit_ksirc.la debian/tmp/opt/kde3/lib/libkopete.la @@ -73,4 +73,4 @@ debian/tmp/opt/kde3/lib/libkopete_videodevice.la debian/tmp/opt/kde3/lib/libkopete_videodevice.so debian/tmp/opt/kde3/lib/librss.la debian/tmp/opt/kde3/lib/librss.so -debian/tmp/opt/kde3/include/kde/kopete/kopetepluginmanager.h +debian/tmp/opt/kde3/include/tde/kopete/kopetepluginmanager.h diff --git a/ubuntu/maverick_automake/kdenetwork/debian/kopete-kde3.install b/ubuntu/maverick_automake/kdenetwork/debian/kopete-kde3.install index 3d90f7d98..b3ed39ab3 100644 --- a/ubuntu/maverick_automake/kdenetwork/debian/kopete-kde3.install +++ b/ubuntu/maverick_automake/kdenetwork/debian/kopete-kde3.install @@ -1,9 +1,9 @@ debian/tmp/opt/kde3/bin/kopete debian/tmp/opt/kde3/bin/kopete_latexconvert.sh -debian/tmp/opt/kde3/include/kde/kopete/kopetepicture.h -debian/tmp/opt/kde3/include/kde/kopete/kopeteprefs.h -debian/tmp/opt/kde3/include/kde/kopete/ui/addressbooklinkwidget.h -debian/tmp/opt/kde3/include/kde/kopete/webcamwidget.h +debian/tmp/opt/kde3/include/tde/kopete/kopetepicture.h +debian/tmp/opt/kde3/include/tde/kopete/kopeteprefs.h +debian/tmp/opt/kde3/include/tde/kopete/ui/addressbooklinkwidget.h +debian/tmp/opt/kde3/include/tde/kopete/webcamwidget.h debian/tmp/opt/kde3/lib/kconf_update_bin/kopete-account-kconf_update debian/tmp/opt/kde3/lib/kconf_update_bin/kopete-nameTracking-kconf_update debian/tmp/opt/kde3/lib/kconf_update_bin/kopete-pluginloader2-kconf_update diff --git a/ubuntu/maverick_automake/kdenetwork/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick_automake/kdenetwork/debian/patches/common/kubuntu_01_kdepot.diff index 3d5dc7628..e705cf83b 100644 --- a/ubuntu/maverick_automake/kdenetwork/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick_automake/kdenetwork/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/opt/kde3/include/kde/kde.pot ++kdepotpath=/opt/kde3/include/tde/kde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick_automake/kdenetwork/debian/rules b/ubuntu/maverick_automake/kdenetwork/debian/rules index f28dd880c..3f1d50b69 100755 --- a/ubuntu/maverick_automake/kdenetwork/debian/rules +++ b/ubuntu/maverick_automake/kdenetwork/debian/rules @@ -17,7 +17,7 @@ include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info diff --git a/ubuntu/maverick_automake/kdepim/debian/cdbs/kde.mk b/ubuntu/maverick_automake/kdepim/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/maverick_automake/kdepim/debian/cdbs/kde.mk +++ b/ubuntu/maverick_automake/kdepim/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick_automake/kdepim/debian/changelog b/ubuntu/maverick_automake/kdepim/debian/changelog index 01141c0ae..026234536 100644 --- a/ubuntu/maverick_automake/kdepim/debian/changelog +++ b/ubuntu/maverick_automake/kdepim/debian/changelog @@ -706,7 +706,7 @@ kdepim (4:3.5.6-0ubuntu3) feisty; urgency=low - Activates networkstatus support for kmail (patch from SuSE) * debian/control: - New package networkstatus-dev - * ./libkdepim1-dev.install: added /usr/include/kde/kpimprefs.h + * ./libkdepim1-dev.install: added /usr/include/tde/kpimprefs.h -- Anthony Mercatante Fri, 02 Feb 2007 15:37:42 +0100 diff --git a/ubuntu/maverick_automake/kdepim/debian/kdepim-kde3-dev.install b/ubuntu/maverick_automake/kdepim/debian/kdepim-kde3-dev.install index daabf121f..a1511b996 100644 --- a/ubuntu/maverick_automake/kdepim/debian/kdepim-kde3-dev.install +++ b/ubuntu/maverick_automake/kdepim/debian/kdepim-kde3-dev.install @@ -1,16 +1,16 @@ -/opt/kde3/include/kde/KNotesAppIface.h -/opt/kde3/include/kde/KNotesIface.h -/opt/kde3/include/kde/akregator -/opt/kde3/include/kde/calendar -/opt/kde3/include/kde/kabc -/opt/kde3/include/kde/kaddressbook -/opt/kde3/include/kde/kmail -/opt/kde3/include/kde/kmailIface.h -/opt/kde3/include/kde/kmailicalIface.h -/opt/kde3/include/kde/kmailpartIface.h -/opt/kde3/include/kde/kontact -/opt/kde3/include/kde/korganizer -/opt/kde3/include/kde/kpilot +/opt/kde3/include/tde/KNotesAppIface.h +/opt/kde3/include/tde/KNotesIface.h +/opt/kde3/include/tde/akregator +/opt/kde3/include/tde/calendar +/opt/kde3/include/tde/kabc +/opt/kde3/include/tde/kaddressbook +/opt/kde3/include/tde/kmail +/opt/kde3/include/tde/kmailIface.h +/opt/kde3/include/tde/kmailicalIface.h +/opt/kde3/include/tde/kmailpartIface.h +/opt/kde3/include/tde/kontact +/opt/kde3/include/tde/korganizer +/opt/kde3/include/tde/kpilot /opt/kde3/lib/libkabckolab.la /opt/kde3/lib/libkabckolab.so /opt/kde3/lib/libkabcscalix.la @@ -84,4 +84,4 @@ /opt/kde3/lib/libgwsoap.la /opt/kde3/lib/libgwsoap.so -/opt/kde3/include/kde/kpimprefs.h +/opt/kde3/include/tde/kpimprefs.h diff --git a/ubuntu/maverick_automake/kdepim/debian/libindex0-kde3-dev.install b/ubuntu/maverick_automake/kdepim/debian/libindex0-kde3-dev.install index 7178aebcd..d12928992 100644 --- a/ubuntu/maverick_automake/kdepim/debian/libindex0-kde3-dev.install +++ b/ubuntu/maverick_automake/kdepim/debian/libindex0-kde3-dev.install @@ -1,4 +1,4 @@ /opt/kde3/bin/indexlib-config -/opt/kde3/include/kde/index +/opt/kde3/include/tde/index /opt/kde3/lib/libindex.la /opt/kde3/lib/libindex.so diff --git a/ubuntu/maverick_automake/kdepim/debian/libkcal2-kde3-dev.install b/ubuntu/maverick_automake/kdepim/debian/libkcal2-kde3-dev.install index ab75de0de..e31e5ec64 100644 --- a/ubuntu/maverick_automake/kdepim/debian/libkcal2-kde3-dev.install +++ b/ubuntu/maverick_automake/kdepim/debian/libkcal2-kde3-dev.install @@ -1,5 +1,5 @@ -/opt/kde3/include/kde/libemailfunctions/idmapper.h -/opt/kde3/include/kde/libkcal +/opt/kde3/include/tde/libemailfunctions/idmapper.h +/opt/kde3/include/tde/libkcal /opt/kde3/lib/libkcal.la /opt/kde3/lib/libkcal.so /opt/kde3/lib/libkcal_resourceremote.la diff --git a/ubuntu/maverick_automake/kdepim/debian/libkdepim1-kde3-dev.install b/ubuntu/maverick_automake/kdepim/debian/libkdepim1-kde3-dev.install index 59dcd3d31..b569474e6 100644 --- a/ubuntu/maverick_automake/kdepim/debian/libkdepim1-kde3-dev.install +++ b/ubuntu/maverick_automake/kdepim/debian/libkdepim1-kde3-dev.install @@ -1,3 +1,3 @@ -/opt/kde3/include/kde/kdepimmacros.h +/opt/kde3/include/tde/kdepimmacros.h /opt/kde3/lib/libkdepim.la /opt/kde3/lib/libkdepim.so diff --git a/ubuntu/maverick_automake/kdepim/debian/libkgantt0-kde3-dev.install b/ubuntu/maverick_automake/kdepim/debian/libkgantt0-kde3-dev.install index aa3f140b6..e48e946aa 100644 --- a/ubuntu/maverick_automake/kdepim/debian/libkgantt0-kde3-dev.install +++ b/ubuntu/maverick_automake/kdepim/debian/libkgantt0-kde3-dev.install @@ -1,3 +1,3 @@ -/opt/kde3/include/kde/kgantt +/opt/kde3/include/tde/kgantt /opt/kde3/lib/libkgantt.la /opt/kde3/lib/libkgantt.so diff --git a/ubuntu/maverick_automake/kdepim/debian/libkleopatra1-kde3-dev.install b/ubuntu/maverick_automake/kdepim/debian/libkleopatra1-kde3-dev.install index 9b59b31e8..879d897b9 100644 --- a/ubuntu/maverick_automake/kdepim/debian/libkleopatra1-kde3-dev.install +++ b/ubuntu/maverick_automake/kdepim/debian/libkleopatra1-kde3-dev.install @@ -1,6 +1,6 @@ -/opt/kde3/include/kde/gpgme++ -/opt/kde3/include/kde/kleo -/opt/kde3/include/kde/qgpgme +/opt/kde3/include/tde/gpgme++ +/opt/kde3/include/tde/kleo +/opt/kde3/include/tde/qgpgme /opt/kde3/lib/libgpgme++.la /opt/kde3/lib/libgpgme++.so /opt/kde3/lib/libkleopatra.la diff --git a/ubuntu/maverick_automake/kdepim/debian/libkpimexchange1-kde3-dev.install b/ubuntu/maverick_automake/kdepim/debian/libkpimexchange1-kde3-dev.install index cc80303d4..eb0e05ec0 100644 --- a/ubuntu/maverick_automake/kdepim/debian/libkpimexchange1-kde3-dev.install +++ b/ubuntu/maverick_automake/kdepim/debian/libkpimexchange1-kde3-dev.install @@ -1,4 +1,4 @@ -/opt/kde3/include/kde/kdepim/exchangeaccount.h -/opt/kde3/include/kde/kdepim/exchangeclient.h +/opt/kde3/include/tde/kdepim/exchangeaccount.h +/opt/kde3/include/tde/kdepim/exchangeclient.h /opt/kde3/lib/libkpimexchange.la /opt/kde3/lib/libkpimexchange.so diff --git a/ubuntu/maverick_automake/kdepim/debian/libksieve0-kde3-dev.install b/ubuntu/maverick_automake/kdepim/debian/libksieve0-kde3-dev.install index ee25b7de7..97ca5ac36 100644 --- a/ubuntu/maverick_automake/kdepim/debian/libksieve0-kde3-dev.install +++ b/ubuntu/maverick_automake/kdepim/debian/libksieve0-kde3-dev.install @@ -1,3 +1,3 @@ -/opt/kde3/include/kde/ksieve +/opt/kde3/include/tde/ksieve /opt/kde3/lib/libksieve.la /opt/kde3/lib/libksieve.so diff --git a/ubuntu/maverick_automake/kdepim/debian/libktnef1-kde3-dev.install b/ubuntu/maverick_automake/kdepim/debian/libktnef1-kde3-dev.install index b40b89af7..38eba15a5 100644 --- a/ubuntu/maverick_automake/kdepim/debian/libktnef1-kde3-dev.install +++ b/ubuntu/maverick_automake/kdepim/debian/libktnef1-kde3-dev.install @@ -1,3 +1,3 @@ -/opt/kde3/include/kde/ktnef +/opt/kde3/include/tde/ktnef /opt/kde3/lib/libktnef.la /opt/kde3/lib/libktnef.so diff --git a/ubuntu/maverick_automake/kdepim/debian/libmimelib1-kde3-dev.install b/ubuntu/maverick_automake/kdepim/debian/libmimelib1-kde3-dev.install index 648201a0a..7bf3b93d1 100644 --- a/ubuntu/maverick_automake/kdepim/debian/libmimelib1-kde3-dev.install +++ b/ubuntu/maverick_automake/kdepim/debian/libmimelib1-kde3-dev.install @@ -1,3 +1,3 @@ -/opt/kde3/include/kde/mimelib +/opt/kde3/include/tde/mimelib /opt/kde3/lib/libmimelib.la /opt/kde3/lib/libmimelib.so diff --git a/ubuntu/maverick_automake/kdepim/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick_automake/kdepim/debian/patches/common/kubuntu_01_kdepot.diff index 3d5dc7628..e705cf83b 100644 --- a/ubuntu/maverick_automake/kdepim/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick_automake/kdepim/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/opt/kde3/include/kde/kde.pot ++kdepotpath=/opt/kde3/include/tde/kde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick_automake/kdepim/debian/rules b/ubuntu/maverick_automake/kdepim/debian/rules index 8fe5739ca..07e167879 100755 --- a/ubuntu/maverick_automake/kdepim/debian/rules +++ b/ubuntu/maverick_automake/kdepim/debian/rules @@ -8,7 +8,7 @@ include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info diff --git a/ubuntu/maverick_automake/kdesdk/debian/cdbs/kde.mk b/ubuntu/maverick_automake/kdesdk/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/maverick_automake/kdesdk/debian/cdbs/kde.mk +++ b/ubuntu/maverick_automake/kdesdk/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick_automake/kdesdk/debian/changelog b/ubuntu/maverick_automake/kdesdk/debian/changelog index 6e4dc71dc..e089652fe 100644 --- a/ubuntu/maverick_automake/kdesdk/debian/changelog +++ b/ubuntu/maverick_automake/kdesdk/debian/changelog @@ -931,7 +931,7 @@ kdesdk (2.2.2-3) unstable; urgency=low kdesdk (2.2.2-2) unstable; urgency=low - * Moved kspy.h to /usr/include/kde (closes: Bug#122448, Bug#122449). + * Moved kspy.h to /usr/include/tde (closes: Bug#122448, Bug#122449). -- Ben Burton Thu, 6 Dec 2001 09:50:47 -0600 diff --git a/ubuntu/maverick_automake/kdesdk/debian/kbabel-kde3-dev.install b/ubuntu/maverick_automake/kdesdk/debian/kbabel-kde3-dev.install index 01b76ead6..030fdce15 100644 --- a/ubuntu/maverick_automake/kdesdk/debian/kbabel-kde3-dev.install +++ b/ubuntu/maverick_automake/kdesdk/debian/kbabel-kde3-dev.install @@ -1,24 +1,24 @@ -debian/tmp/opt/kde3/include/kde/kbabel/catalog.h -debian/tmp/opt/kde3/include/kde/kbabel/catalogfileplugin.h -debian/tmp/opt/kde3/include/kde/kbabel/catalogitem.h -debian/tmp/opt/kde3/include/kde/kbabel/catalogsettings.h -debian/tmp/opt/kde3/include/kde/kbabel/catalogview.h -debian/tmp/opt/kde3/include/kde/kbabel/dictchooser.h -debian/tmp/opt/kde3/include/kde/kbabel/dictionarymenu.h -debian/tmp/opt/kde3/include/kde/kbabel/editcmd.h -debian/tmp/opt/kde3/include/kde/kbabel/findoptions.h -debian/tmp/opt/kde3/include/kde/kbabel/itempart.h -debian/tmp/opt/kde3/include/kde/kbabel/kbabeldatatool.h -debian/tmp/opt/kde3/include/kde/kbabel/kbabeldictbox.h -debian/tmp/opt/kde3/include/kde/kbabel/kbabeldictiface.h -debian/tmp/opt/kde3/include/kde/kbabel/kbproject.h -debian/tmp/opt/kde3/include/kde/kbabel/kbprojectmanager.h -debian/tmp/opt/kde3/include/kde/kbabel/msgfmt.h -debian/tmp/opt/kde3/include/kde/kbabel/poinfo.h -debian/tmp/opt/kde3/include/kde/kbabel/projectsettings.h -debian/tmp/opt/kde3/include/kde/kbabel/regexpextractor.h -debian/tmp/opt/kde3/include/kde/kbabel/searchengine.h -debian/tmp/opt/kde3/include/kde/kbabel/tagextractor.h +debian/tmp/opt/kde3/include/tde/kbabel/catalog.h +debian/tmp/opt/kde3/include/tde/kbabel/catalogfileplugin.h +debian/tmp/opt/kde3/include/tde/kbabel/catalogitem.h +debian/tmp/opt/kde3/include/tde/kbabel/catalogsettings.h +debian/tmp/opt/kde3/include/tde/kbabel/catalogview.h +debian/tmp/opt/kde3/include/tde/kbabel/dictchooser.h +debian/tmp/opt/kde3/include/tde/kbabel/dictionarymenu.h +debian/tmp/opt/kde3/include/tde/kbabel/editcmd.h +debian/tmp/opt/kde3/include/tde/kbabel/findoptions.h +debian/tmp/opt/kde3/include/tde/kbabel/itempart.h +debian/tmp/opt/kde3/include/tde/kbabel/kbabeldatatool.h +debian/tmp/opt/kde3/include/tde/kbabel/kbabeldictbox.h +debian/tmp/opt/kde3/include/tde/kbabel/kbabeldictiface.h +debian/tmp/opt/kde3/include/tde/kbabel/kbproject.h +debian/tmp/opt/kde3/include/tde/kbabel/kbprojectmanager.h +debian/tmp/opt/kde3/include/tde/kbabel/msgfmt.h +debian/tmp/opt/kde3/include/tde/kbabel/poinfo.h +debian/tmp/opt/kde3/include/tde/kbabel/projectsettings.h +debian/tmp/opt/kde3/include/tde/kbabel/regexpextractor.h +debian/tmp/opt/kde3/include/tde/kbabel/searchengine.h +debian/tmp/opt/kde3/include/tde/kbabel/tagextractor.h debian/tmp/opt/kde3/lib/libkbabelcommon.la debian/tmp/opt/kde3/lib/libkbabelcommon.so debian/tmp/opt/kde3/lib/libkbabeldictplugin.la diff --git a/ubuntu/maverick_automake/kdesdk/debian/kdesdk-misc-kde3.install b/ubuntu/maverick_automake/kdesdk/debian/kdesdk-misc-kde3.install index 590f0fec5..39d07410e 100644 --- a/ubuntu/maverick_automake/kdesdk/debian/kdesdk-misc-kde3.install +++ b/ubuntu/maverick_automake/kdesdk/debian/kdesdk-misc-kde3.install @@ -1,4 +1,4 @@ -debian/tmp/opt/kde3/include/kde/kprofilemethod.h +debian/tmp/opt/kde3/include/tde/kprofilemethod.h debian/tmp/opt/kde3/lib/kde3/kabcformat_kdeaccounts.la debian/tmp/opt/kde3/lib/kde3/kabcformat_kdeaccounts.so debian/tmp/opt/kde3/lib/kde3/plugins/styles/scheck.so diff --git a/ubuntu/maverick_automake/kdesdk/debian/kmtrace-kde3.install b/ubuntu/maverick_automake/kdesdk/debian/kmtrace-kde3.install index 5b7bd4476..b3d168f86 100644 --- a/ubuntu/maverick_automake/kdesdk/debian/kmtrace-kde3.install +++ b/ubuntu/maverick_automake/kdesdk/debian/kmtrace-kde3.install @@ -2,7 +2,7 @@ debian/tmp/opt/kde3/bin/demangle debian/tmp/opt/kde3/bin/kminspector debian/tmp/opt/kde3/bin/kmmatch debian/tmp/opt/kde3/bin/kmtrace -debian/tmp/opt/kde3/include/kde/ktrace.h +debian/tmp/opt/kde3/include/tde/ktrace.h debian/tmp/opt/kde3/lib/kmtrace/libktrace.la debian/tmp/opt/kde3/lib/kmtrace/libktrace.so debian/tmp/opt/kde3/lib/kmtrace/libktrace_s.a diff --git a/ubuntu/maverick_automake/kdesdk/debian/kspy-kde3.install b/ubuntu/maverick_automake/kdesdk/debian/kspy-kde3.install index 08b701cce..ef88ab5a0 100644 --- a/ubuntu/maverick_automake/kdesdk/debian/kspy-kde3.install +++ b/ubuntu/maverick_automake/kdesdk/debian/kspy-kde3.install @@ -1,4 +1,4 @@ -debian/tmp/opt/kde3/include/kde/kspy.h +debian/tmp/opt/kde3/include/tde/kspy.h debian/tmp/opt/kde3/lib/libkspy.la debian/tmp/opt/kde3/lib/libkspy.so debian/tmp/opt/kde3/lib/libkspy.so.1 diff --git a/ubuntu/maverick_automake/kdesdk/debian/kunittest-kde3.install b/ubuntu/maverick_automake/kdesdk/debian/kunittest-kde3.install index 91dbea778..0be1336e4 100644 --- a/ubuntu/maverick_automake/kdesdk/debian/kunittest-kde3.install +++ b/ubuntu/maverick_automake/kdesdk/debian/kunittest-kde3.install @@ -4,4 +4,4 @@ debian/tmp/opt/kde3/lib/libkunittestgui.la debian/tmp/opt/kde3/lib/libkunittestgui.so debian/tmp/opt/kde3/lib/libkunittestgui.so.0 debian/tmp/opt/kde3/lib/libkunittestgui.so.0.0.0 -debian/tmp/opt/kde3/include/kde/kunittest/runnergui.h +debian/tmp/opt/kde3/include/tde/kunittest/runnergui.h diff --git a/ubuntu/maverick_automake/kdesdk/debian/libcvsservice-kde3-dev.install b/ubuntu/maverick_automake/kdesdk/debian/libcvsservice-kde3-dev.install index b541cf5c1..308a82cde 100644 --- a/ubuntu/maverick_automake/kdesdk/debian/libcvsservice-kde3-dev.install +++ b/ubuntu/maverick_automake/kdesdk/debian/libcvsservice-kde3-dev.install @@ -1,6 +1,6 @@ -debian/tmp/opt/kde3/include/kde/cvsjob_stub.h -debian/tmp/opt/kde3/include/kde/cvsservice_stub.h -debian/tmp/opt/kde3/include/kde/repository_stub.h +debian/tmp/opt/kde3/include/tde/cvsjob_stub.h +debian/tmp/opt/kde3/include/tde/cvsservice_stub.h +debian/tmp/opt/kde3/include/tde/repository_stub.h debian/tmp/opt/kde3/lib/libcvsservice.la debian/tmp/opt/kde3/lib/libcvsservice.so debian/tmp/opt/kde3/lib/libkdeinit_cvsaskpass.la diff --git a/ubuntu/maverick_automake/kdesdk/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick_automake/kdesdk/debian/patches/common/kubuntu_01_kdepot.diff index 3d5dc7628..e705cf83b 100644 --- a/ubuntu/maverick_automake/kdesdk/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick_automake/kdesdk/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/opt/kde3/include/kde/kde.pot ++kdepotpath=/opt/kde3/include/tde/kde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick_automake/kdesdk/debian/rules b/ubuntu/maverick_automake/kdesdk/debian/rules index bab4e2b82..1a91a4065 100755 --- a/ubuntu/maverick_automake/kdesdk/debian/rules +++ b/ubuntu/maverick_automake/kdesdk/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info diff --git a/ubuntu/maverick_automake/kdetoys/debian/amor-kde3.install b/ubuntu/maverick_automake/kdetoys/debian/amor-kde3.install index dc961325b..ee7df97a4 100644 --- a/ubuntu/maverick_automake/kdetoys/debian/amor-kde3.install +++ b/ubuntu/maverick_automake/kdetoys/debian/amor-kde3.install @@ -1,5 +1,5 @@ debian/tmp/opt/kde3/bin/amor -debian/tmp/opt/kde3/include/kde/AmorIface.h +debian/tmp/opt/kde3/include/tde/AmorIface.h debian/tmp/opt/kde3/share/apps/amor debian/tmp/opt/kde3/share/applications/kde/amor.desktop debian/tmp/opt/kde3/share/doc/kde/HTML/en/amor/*.bz2 diff --git a/ubuntu/maverick_automake/kdetoys/debian/cdbs/kde.mk b/ubuntu/maverick_automake/kdetoys/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/maverick_automake/kdetoys/debian/cdbs/kde.mk +++ b/ubuntu/maverick_automake/kdetoys/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick_automake/kdetoys/debian/changelog b/ubuntu/maverick_automake/kdetoys/debian/changelog index 26a0781c5..4c9c290ab 100644 --- a/ubuntu/maverick_automake/kdetoys/debian/changelog +++ b/ubuntu/maverick_automake/kdetoys/debian/changelog @@ -609,7 +609,7 @@ kdetoys (4:2.2.2-3) unstable; urgency=low kdetoys (4:2.2.2-2) unstable; urgency=low - * Moved AmorIface.h to /usr/include/kde (closes: Bug#122447). + * Moved AmorIface.h to /usr/include/tde (closes: Bug#122447). -- Ben Burton Sun, 9 Dec 2001 09:07:02 -0600 diff --git a/ubuntu/maverick_automake/kdetoys/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick_automake/kdetoys/debian/patches/common/kubuntu_01_kdepot.diff index 3d5dc7628..e705cf83b 100644 --- a/ubuntu/maverick_automake/kdetoys/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick_automake/kdetoys/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/opt/kde3/include/kde/kde.pot ++kdepotpath=/opt/kde3/include/tde/kde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick_automake/kdetoys/debian/rules b/ubuntu/maverick_automake/kdetoys/debian/rules index 77c4dbffe..16a0537bc 100755 --- a/ubuntu/maverick_automake/kdetoys/debian/rules +++ b/ubuntu/maverick_automake/kdetoys/debian/rules @@ -5,14 +5,14 @@ include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --includedir="/opt/kde3/include/kde" --mandir="/opt/kde3/share/man" --infodir="/opt/kde3/share/info" +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --includedir="/opt/kde3/include/tde" --mandir="/opt/kde3/share/man" --infodir="/opt/kde3/share/info" DEB_DH_STRIP_ARGS := --dbg-package=kdetoys-kde3-dbg diff --git a/ubuntu/maverick_automake/kdeutils/debian/cdbs/kde.mk b/ubuntu/maverick_automake/kdeutils/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/maverick_automake/kdeutils/debian/cdbs/kde.mk +++ b/ubuntu/maverick_automake/kdeutils/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick_automake/kdeutils/debian/kdeutils-kde3-dev.install b/ubuntu/maverick_automake/kdeutils/debian/kdeutils-kde3-dev.install index 6c561c622..f7092a5fd 100644 --- a/ubuntu/maverick_automake/kdeutils/debian/kdeutils-kde3-dev.install +++ b/ubuntu/maverick_automake/kdeutils/debian/kdeutils-kde3-dev.install @@ -1,18 +1,18 @@ -debian/tmp/opt/kde3/include/kde/kmultiformlistbox.h -debian/tmp/opt/kde3/include/kde/kmultiformlistboxentry.h -debian/tmp/opt/kde3/include/kde/kmultiformlistboxfactory.h -debian/tmp/opt/kde3/include/kde/ksim/chart.h -debian/tmp/opt/kde3/include/kde/ksim/common.h -debian/tmp/opt/kde3/include/kde/ksim/ksimconfig.h -debian/tmp/opt/kde3/include/kde/ksim/label.h -debian/tmp/opt/kde3/include/kde/ksim/led.h -debian/tmp/opt/kde3/include/kde/ksim/pluginglobal.h -debian/tmp/opt/kde3/include/kde/ksim/pluginloader.h -debian/tmp/opt/kde3/include/kde/ksim/pluginmodule.h -debian/tmp/opt/kde3/include/kde/ksim/progress.h -debian/tmp/opt/kde3/include/kde/ksim/themeloader.h -debian/tmp/opt/kde3/include/kde/ksim/themetypes.h -debian/tmp/opt/kde3/include/kde/kwidgetstreamer.h +debian/tmp/opt/kde3/include/tde/kmultiformlistbox.h +debian/tmp/opt/kde3/include/tde/kmultiformlistboxentry.h +debian/tmp/opt/kde3/include/tde/kmultiformlistboxfactory.h +debian/tmp/opt/kde3/include/tde/ksim/chart.h +debian/tmp/opt/kde3/include/tde/ksim/common.h +debian/tmp/opt/kde3/include/tde/ksim/ksimconfig.h +debian/tmp/opt/kde3/include/tde/ksim/label.h +debian/tmp/opt/kde3/include/tde/ksim/led.h +debian/tmp/opt/kde3/include/tde/ksim/pluginglobal.h +debian/tmp/opt/kde3/include/tde/ksim/pluginloader.h +debian/tmp/opt/kde3/include/tde/ksim/pluginmodule.h +debian/tmp/opt/kde3/include/tde/ksim/progress.h +debian/tmp/opt/kde3/include/tde/ksim/themeloader.h +debian/tmp/opt/kde3/include/tde/ksim/themetypes.h +debian/tmp/opt/kde3/include/tde/kwidgetstreamer.h debian/tmp/opt/kde3/lib/libkcmlaptop.la debian/tmp/opt/kde3/lib/libkcmlaptop.so debian/tmp/opt/kde3/lib/libkdeinit_ark.la diff --git a/ubuntu/maverick_automake/kdeutils/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick_automake/kdeutils/debian/patches/common/kubuntu_01_kdepot.diff index 3d5dc7628..e705cf83b 100644 --- a/ubuntu/maverick_automake/kdeutils/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick_automake/kdeutils/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/opt/kde3/include/kde/kde.pot ++kdepotpath=/opt/kde3/include/tde/kde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick_automake/kdeutils/debian/rules b/ubuntu/maverick_automake/kdeutils/debian/rules index 658aea6bf..7cca0eada 100755 --- a/ubuntu/maverick_automake/kdeutils/debian/rules +++ b/ubuntu/maverick_automake/kdeutils/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info diff --git a/ubuntu/maverick_automake/kdevelop/debian/cdbs/kde.mk b/ubuntu/maverick_automake/kdevelop/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/maverick_automake/kdevelop/debian/cdbs/kde.mk +++ b/ubuntu/maverick_automake/kdevelop/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick_automake/kdevelop/debian/kdevelop-kde3-dev.install b/ubuntu/maverick_automake/kdevelop/debian/kdevelop-kde3-dev.install index 4c33e7446..2c79f464a 100644 --- a/ubuntu/maverick_automake/kdevelop/debian/kdevelop-kde3-dev.install +++ b/ubuntu/maverick_automake/kdevelop/debian/kdevelop-kde3-dev.install @@ -1,3 +1,3 @@ -debian/tmp/opt/kde3/include/kde +debian/tmp/opt/kde3/include/tde debian/tmp/opt/kde3/lib/lib*.so debian/tmp/opt/kde3/lib/lib*.la diff --git a/ubuntu/maverick_automake/kdevelop/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick_automake/kdevelop/debian/patches/common/kubuntu_01_kdepot.diff index 3d5dc7628..e705cf83b 100644 --- a/ubuntu/maverick_automake/kdevelop/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick_automake/kdevelop/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/opt/kde3/include/kde/kde.pot ++kdepotpath=/opt/kde3/include/tde/kde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick_automake/kdevelop/debian/rules b/ubuntu/maverick_automake/kdevelop/debian/rules index 1bdd8afd3..ddd9f331d 100755 --- a/ubuntu/maverick_automake/kdevelop/debian/rules +++ b/ubuntu/maverick_automake/kdevelop/debian/rules @@ -9,7 +9,7 @@ include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info diff --git a/ubuntu/maverick_automake/kdewebdev/debian/cdbs/kde.mk b/ubuntu/maverick_automake/kdewebdev/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/maverick_automake/kdewebdev/debian/cdbs/kde.mk +++ b/ubuntu/maverick_automake/kdewebdev/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick_automake/kdewebdev/debian/kommander-kde3-dev.install b/ubuntu/maverick_automake/kdewebdev/debian/kommander-kde3-dev.install index 1bc0b39ff..63617fcbe 100644 --- a/ubuntu/maverick_automake/kdewebdev/debian/kommander-kde3-dev.install +++ b/ubuntu/maverick_automake/kdewebdev/debian/kommander-kde3-dev.install @@ -1,7 +1,7 @@ -debian/tmp/opt/kde3/include/kde/kommander* +debian/tmp/opt/kde3/include/tde/kommander* debian/tmp/opt/kde3/lib/libkommanderplugin.la debian/tmp/opt/kde3/lib/libkommanderplugin.so debian/tmp/opt/kde3/lib/libkommanderwidget.la debian/tmp/opt/kde3/lib/libkommanderwidget.so debian/tmp/opt/kde3/lib/libkommanderwidgets.so -debian/tmp/opt/kde3/include/kde/specials.h +debian/tmp/opt/kde3/include/tde/specials.h diff --git a/ubuntu/maverick_automake/kdewebdev/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick_automake/kdewebdev/debian/patches/common/kubuntu_01_kdepot.diff index 1f825f642..698deb926 100644 --- a/ubuntu/maverick_automake/kdewebdev/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick_automake/kdewebdev/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/usr/include/kde/kde.pot ++kdepotpath=/usr/include/tde/kde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick_automake/kdewebdev/debian/rules b/ubuntu/maverick_automake/kdewebdev/debian/rules index eb13dfc75..b35ebb7ea 100755 --- a/ubuntu/maverick_automake/kdewebdev/debian/rules +++ b/ubuntu/maverick_automake/kdewebdev/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info diff --git a/ubuntu/maverick_automake/libraries/kipi-plugins/debian/cdbs/kde.mk b/ubuntu/maverick_automake/libraries/kipi-plugins/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/maverick_automake/libraries/kipi-plugins/debian/cdbs/kde.mk +++ b/ubuntu/maverick_automake/libraries/kipi-plugins/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick_automake/libraries/kipi-plugins/debian/rules b/ubuntu/maverick_automake/libraries/kipi-plugins/debian/rules index 45d9a55b4..847bdb8ef 100755 --- a/ubuntu/maverick_automake/libraries/kipi-plugins/debian/rules +++ b/ubuntu/maverick_automake/libraries/kipi-plugins/debian/rules @@ -9,7 +9,7 @@ include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/patchsys-quilt.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info @@ -18,7 +18,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--as-needed" -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/tde clean :: rm -f po/*/*.gmo diff --git a/ubuntu/maverick_automake/libraries/libkdcraw/debian/cdbs/kde.mk b/ubuntu/maverick_automake/libraries/libkdcraw/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/maverick_automake/libraries/libkdcraw/debian/cdbs/kde.mk +++ b/ubuntu/maverick_automake/libraries/libkdcraw/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick_automake/libraries/libkdcraw/debian/rules b/ubuntu/maverick_automake/libraries/libkdcraw/debian/rules index f2eb3f948..7e04f9653 100755 --- a/ubuntu/maverick_automake/libraries/libkdcraw/debian/rules +++ b/ubuntu/maverick_automake/libraries/libkdcraw/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/patchsys-quilt.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info diff --git a/ubuntu/maverick_automake/libraries/libkexiv2/debian/cdbs/kde.mk b/ubuntu/maverick_automake/libraries/libkexiv2/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/maverick_automake/libraries/libkexiv2/debian/cdbs/kde.mk +++ b/ubuntu/maverick_automake/libraries/libkexiv2/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick_automake/libraries/libkexiv2/debian/rules b/ubuntu/maverick_automake/libraries/libkexiv2/debian/rules index 213669cac..f5721b2e3 100755 --- a/ubuntu/maverick_automake/libraries/libkexiv2/debian/rules +++ b/ubuntu/maverick_automake/libraries/libkexiv2/debian/rules @@ -8,7 +8,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info diff --git a/ubuntu/maverick_automake/libraries/libkipi/debian/cdbs/kde.mk b/ubuntu/maverick_automake/libraries/libkipi/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/maverick_automake/libraries/libkipi/debian/cdbs/kde.mk +++ b/ubuntu/maverick_automake/libraries/libkipi/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick_automake/libraries/libkipi/debian/rules b/ubuntu/maverick_automake/libraries/libkipi/debian/rules index a2ce2c395..6d35aa5b2 100755 --- a/ubuntu/maverick_automake/libraries/libkipi/debian/rules +++ b/ubuntu/maverick_automake/libraries/libkipi/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info diff --git a/ubuntu/maverick_automake/libraries/libksquirrel/debian/rules b/ubuntu/maverick_automake/libraries/libksquirrel/debian/rules index 566a88117..eb2e91d1a 100755 --- a/ubuntu/maverick_automake/libraries/libksquirrel/debian/rules +++ b/ubuntu/maverick_automake/libraries/libksquirrel/debian/rules @@ -9,7 +9,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info diff --git a/ubuntu/maverick_automake/libraries/mlt++/debian/rules b/ubuntu/maverick_automake/libraries/mlt++/debian/rules index 7858faac4..f16e3b0e3 100755 --- a/ubuntu/maverick_automake/libraries/mlt++/debian/rules +++ b/ubuntu/maverick_automake/libraries/mlt++/debian/rules @@ -3,7 +3,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info diff --git a/ubuntu/maverick_automake/libraries/mlt/debian/rules b/ubuntu/maverick_automake/libraries/mlt/debian/rules index 70d23bb1b..9bb8d7a03 100755 --- a/ubuntu/maverick_automake/libraries/mlt/debian/rules +++ b/ubuntu/maverick_automake/libraries/mlt/debian/rules @@ -3,7 +3,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info @@ -47,10 +47,10 @@ configure-stamp: QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2 - CFLAGS="$(CFLAGS)" PATH=/opt/kde3/bin:$(PATH) LD_LIBRARY_PATH=/opt/kde3/lib:$(LD_LIBRARY_PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/kde ./configure --enable-gpl \ + CFLAGS="$(CFLAGS)" PATH=/opt/kde3/bin:$(PATH) LD_LIBRARY_PATH=/opt/kde3/lib:$(LD_LIBRARY_PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/tde ./configure --enable-gpl \ --luma-compress --disable-mmx $(CONFIGURE_OPTS) \ --avformat-shared=/usr --avformat-swscale \ - --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/kde + --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/tde touch configure-stamp @@ -58,7 +58,7 @@ build: configure-stamp build-stamp build-stamp: dh_testdir - env PATH=/opt/kde3/bin:$(PATH) LD_LIBRARY_PATH=/opt/kde3/lib:$(LD_LIBRARY_PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/kde $(MAKE) -j $(NCPUS) + env PATH=/opt/kde3/bin:$(PATH) LD_LIBRARY_PATH=/opt/kde3/lib:$(LD_LIBRARY_PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/tde $(MAKE) -j $(NCPUS) touch build-stamp @@ -81,7 +81,7 @@ install: build dh_clean -k dh_installdirs opt/kde3/lib/mlt0.2.5/modules opt/kde3/share/mlt0.2.5 - env PATH=/opt/kde3/bin:$(PATH) LD_LIBRARY_PATH=/opt/kde3/lib:$(LD_LIBRARY_PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/kde $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp + env PATH=/opt/kde3/bin:$(PATH) LD_LIBRARY_PATH=/opt/kde3/lib:$(LD_LIBRARY_PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/tde $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp # mkdir debian/tmp/opt/kde3 # mv debian/tmp/opt/kde3/lib debian/tmp/opt/kde3/ diff --git a/ubuntu/maverick_automake/libraries/pytdeextensions/debian/libpythonize0-kde3-dev.install b/ubuntu/maverick_automake/libraries/pytdeextensions/debian/libpythonize0-kde3-dev.install index fa6727d83..c1b3787e8 100644 --- a/ubuntu/maverick_automake/libraries/pytdeextensions/debian/libpythonize0-kde3-dev.install +++ b/ubuntu/maverick_automake/libraries/pytdeextensions/debian/libpythonize0-kde3-dev.install @@ -1,4 +1,4 @@ -opt/kde3/include/kde/pythonize.h +opt/kde3/include/tde/pythonize.h opt/kde3/lib/libpythonize.a opt/kde3/lib/libpythonize.la opt/kde3/lib/libpythonize.so diff --git a/ubuntu/maverick_automake/libraries/pytdeextensions/debian/rules b/ubuntu/maverick_automake/libraries/pytdeextensions/debian/rules index f6a1d85e6..96ccfd714 100755 --- a/ubuntu/maverick_automake/libraries/pytdeextensions/debian/rules +++ b/ubuntu/maverick_automake/libraries/pytdeextensions/debian/rules @@ -8,7 +8,7 @@ include debian/python-distutils-jaunty.mk include /usr/share/cdbs/1/rules/patchsys-quilt.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info @@ -16,7 +16,7 @@ DEB_CONFIGURE_INFODIR := /opt/kde3/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/tde install/pytdeextensions-kde3:: # We have no idea if the built product is site-packages or dist-packages @@ -45,8 +45,8 @@ install/libpythonize0-kde3:: # fix binary-or-shlib-defines-rpath chrpath -d debian/tmp/opt/kde3/lib/libpythonize.so.* # fix include directory location - mkdir -p debian/tmp/opt/kde3/include/kde - mv debian/tmp/opt/kde3/include/*.h debian/tmp/opt/kde3/include/kde + mkdir -p debian/tmp/opt/kde3/include/tde + mv debian/tmp/opt/kde3/include/*.h debian/tmp/opt/kde3/include/tde clean:: rm -rf build diff --git a/ubuntu/maverick_automake/libraries/python-kde3/debian/rules b/ubuntu/maverick_automake/libraries/python-kde3/debian/rules index 553c08f56..ed917cdc0 100755 --- a/ubuntu/maverick_automake/libraries/python-kde3/debian/rules +++ b/ubuntu/maverick_automake/libraries/python-kde3/debian/rules @@ -4,7 +4,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info @@ -43,7 +43,7 @@ build-%/configure-stamp: patch-stamp dh_testdir mkdir -p build-$* cd build-$* && python$* ../configure.py \ - -c -u -k /opt/kde3 -o /opt/kde3/include/kde -n /opt/kde3/lib \ + -c -u -k /opt/kde3 -o /opt/kde3/include/tde -n /opt/kde3/lib \ -v /opt/kde3/share/sip/kde3 -j $(SPLIT) touch $@ @@ -51,7 +51,7 @@ dbg-build-%/configure-stamp: patch-stamp dh_testdir mkdir -p dbg-build-$* cd dbg-build-$* && python$*-dbg ../configure.py \ - -c -u -k /opt/kde3 -o /opt/kde3/include/kde -n /opt/kde3/lib \ + -c -u -k /opt/kde3 -o /opt/kde3/include/tde -n /opt/kde3/lib \ -v /opt/kde3/share/sip/kde3 -j $(SPLIT) touch $@ -- cgit v1.2.1 From 1ed259cc1e98e318b32089f5342d5c8fb8ead30c Mon Sep 17 00:00:00 2001 From: "Pawel \"l0ner\" Soltys" Date: Tue, 7 Feb 2012 20:36:39 +0100 Subject: tqtinterface: corrected error in /etc/ld.so.conf.d/trinity creation --- arch/3.5.13/trinity-base/trinity-tqtinterface/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/3.5.13/trinity-base/trinity-tqtinterface/PKGBUILD b/arch/3.5.13/trinity-base/trinity-tqtinterface/PKGBUILD index 2a12c76d5..d960bb18e 100644 --- a/arch/3.5.13/trinity-base/trinity-tqtinterface/PKGBUILD +++ b/arch/3.5.13/trinity-base/trinity-tqtinterface/PKGBUILD @@ -65,8 +65,8 @@ package() { # Create and install ld.so.conf.d file install -d -m755 $pkgdir/etc/ld.so.conf.d/ - echo $TDEDIR/lib > $pkgdir/etc/ld.so.conf.d/trinity.conf - echo $TDEDIR/lib/trinity >> $pkgdir/etc/ld.so.conf.d/trinity.conf + echo /opt/trinity/lib > $pkgdir/etc/ld.so.conf.d/trinity.conf + echo /opt/trinity/lib/trinity >> $pkgdir/etc/ld.so.conf.d/trinity.conf # Install profiles install -D -m755 $srcdir/trinity.profile.sh $pkgdir/etc/profile.d/trinity.sh -- cgit v1.2.1 From 79b18e9f0f943ca0c3a60e5c6a24a3a0d0afad5d Mon Sep 17 00:00:00 2001 From: "Pawel \"l0ner\" Soltys" Date: Tue, 7 Feb 2012 20:37:17 +0100 Subject: kdelibs: reverted prev. commit --- arch/3.5.13/trinity-base/trinity-kdelibs/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/3.5.13/trinity-base/trinity-kdelibs/PKGBUILD b/arch/3.5.13/trinity-base/trinity-kdelibs/PKGBUILD index 83e3d7af2..65bea9f78 100644 --- a/arch/3.5.13/trinity-base/trinity-kdelibs/PKGBUILD +++ b/arch/3.5.13/trinity-base/trinity-kdelibs/PKGBUILD @@ -36,7 +36,7 @@ build() { #export CMAKE_PREFIX_PATH=${QTDIR}:${TDEDIR} #export PATH=$PATH:${TDEDIR}/bin #export CMAKE_INCLUDE_PATH=/usr/include/dbus-1.0 - export LD_LIBRARY_PATH=${TDEDIR}/lib:${QTDIR}/lib:${TDEDIR}/lib/trinity:$LD_LIBRARY_PATH + #export LD_LIBRARY_PATH=${TDEDIR}/lib:${QTDIR}/lib:${TDEDIR}/lib/trinity:$LD_LIBRARY_PATH msg "Patching..." patch -N -d ${srcdir} -p0 < ${srcdir}/docpath.patch -- cgit v1.2.1 From db492eb63c802187323c1febcec142daf2f4d74c Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 7 Feb 2012 13:58:40 -0600 Subject: Undo prior accidental rename of translation files on Debian and Ubuntu --- debian/lenny/applications/keep/debian/patches/kubuntu_01_kdepot.diff | 2 +- .../tdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff | 4 ++-- debian/lenny/tdeaddons/debian/patches/common/kubuntu_01_kdepot.diff | 4 ++-- debian/lenny/tdeadmin/debian/patches/common/kubuntu_01_kdepot.diff | 4 ++-- debian/lenny/tdebindings/debian/patches/common/kubuntu_01_kdepot.diff | 4 ++-- debian/lenny/tdeedu/debian/patches/common/kubuntu_01_kdepot.diff | 4 ++-- debian/lenny/tdegames/debian/patches/common/kubuntu_01_kdepot.diff | 4 ++-- debian/lenny/tdegraphics/debian/patches/common/kubuntu_01_kdepot.diff | 4 ++-- debian/lenny/tdelibs/debian/changelog | 2 +- debian/lenny/tdelibs/debian/tdelibs4-trinity-dev.install | 2 +- .../lenny/tdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff | 4 ++-- debian/lenny/tdenetwork/debian/patches/common/kubuntu_01_kdepot.diff | 4 ++-- debian/lenny/tdesdk/debian/patches/common/kubuntu_01_kdepot.diff | 4 ++-- debian/lenny/tdetoys/debian/patches/common/kubuntu_01_kdepot.diff | 4 ++-- debian/lenny/tdeutils/debian/patches/common/kubuntu_01_kdepot.diff | 4 ++-- debian/lenny/tdevelop/debian/patches/common/kubuntu_01_kdepot.diff | 4 ++-- debian/lenny/tdewebdev/debian/patches/common/kubuntu_01_kdepot.diff | 4 ++-- .../squeeze/applications/keep/debian/patches/kubuntu_01_kdepot.diff | 2 +- .../tdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff | 4 ++-- debian/squeeze/tdeaddons/debian/patches/common/kubuntu_01_kdepot.diff | 4 ++-- debian/squeeze/tdeadmin/debian/patches/common/kubuntu_01_kdepot.diff | 4 ++-- .../squeeze/tdebindings/debian/patches/common/kubuntu_01_kdepot.diff | 4 ++-- debian/squeeze/tdeedu/debian/patches/common/kubuntu_01_kdepot.diff | 4 ++-- debian/squeeze/tdegames/debian/patches/common/kubuntu_01_kdepot.diff | 4 ++-- .../squeeze/tdegraphics/debian/patches/common/kubuntu_01_kdepot.diff | 4 ++-- debian/squeeze/tdelibs/debian/changelog | 2 +- debian/squeeze/tdelibs/debian/tdelibs4-trinity-dev.install | 2 +- .../tdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff | 4 ++-- .../squeeze/tdenetwork/debian/patches/common/kubuntu_01_kdepot.diff | 4 ++-- debian/squeeze/tdesdk/debian/patches/common/kubuntu_01_kdepot.diff | 4 ++-- debian/squeeze/tdetoys/debian/patches/common/kubuntu_01_kdepot.diff | 4 ++-- debian/squeeze/tdeutils/debian/patches/common/kubuntu_01_kdepot.diff | 4 ++-- debian/squeeze/tdevelop/debian/patches/common/kubuntu_01_kdepot.diff | 4 ++-- debian/squeeze/tdewebdev/debian/patches/common/kubuntu_01_kdepot.diff | 4 ++-- .../applications/keep/debian/patches/kubuntu_01_kdepot.diff | 2 +- .../kdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff | 4 ++-- .../kdeaddons/debian/patches/common/kubuntu_01_kdepot.diff | 4 ++-- .../kdeadmin/debian/patches/common/kubuntu_01_kdepot.diff | 4 ++-- .../kdeartwork/debian/patches/common/kubuntu_01_kdepot.diff | 4 ++-- .../kdebindings/debian/patches/common/kubuntu_01_kdepot.diff | 4 ++-- .../kdeedu/debian/patches/common/kubuntu_01_kdepot.diff | 4 ++-- .../kdegames/debian/patches/common/kubuntu_01_kdepot.diff | 4 ++-- .../kdegraphics/debian/patches/common/kubuntu_01_kdepot.diff | 4 ++-- ubuntu/lucid_automake/kdelibs/debian/changelog | 2 +- .../kdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff | 4 ++-- .../kdenetwork/debian/patches/common/kubuntu_01_kdepot.diff | 4 ++-- .../kdepim/debian/patches/common/kubuntu_01_kdepot.diff | 4 ++-- .../kdesdk/debian/patches/common/kubuntu_01_kdepot.diff | 4 ++-- .../kdetoys/debian/patches/common/kubuntu_01_kdepot.diff | 4 ++-- .../kdeutils/debian/patches/common/kubuntu_01_kdepot.diff | 4 ++-- .../kdevelop/debian/patches/common/kubuntu_01_kdepot.diff | 4 ++-- .../kdewebdev/debian/patches/common/kubuntu_01_kdepot.diff | 4 ++-- .../maverick/applications/keep/debian/patches/kubuntu_01_kdepot.diff | 2 +- .../kdegraphics.automake/debian/patches/common/kubuntu_01_kdepot.diff | 4 ++-- .../tdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff | 4 ++-- .../maverick/tdeaddons/debian/patches/common/kubuntu_01_kdepot.diff | 4 ++-- ubuntu/maverick/tdeadmin/debian/patches/common/kubuntu_01_kdepot.diff | 4 ++-- .../maverick/tdebindings/debian/patches/common/kubuntu_01_kdepot.diff | 4 ++-- ubuntu/maverick/tdeedu/debian/patches/common/kubuntu_01_kdepot.diff | 4 ++-- ubuntu/maverick/tdegames/debian/patches/common/kubuntu_01_kdepot.diff | 4 ++-- .../maverick/tdegraphics/debian/patches/common/kubuntu_01_kdepot.diff | 4 ++-- ubuntu/maverick/tdelibs/debian/changelog | 2 +- ubuntu/maverick/tdelibs/debian/tdelibs4-trinity-dev.install | 2 +- .../tdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff | 4 ++-- .../maverick/tdenetwork/debian/patches/common/kubuntu_01_kdepot.diff | 4 ++-- ubuntu/maverick/tdesdk/debian/patches/common/kubuntu_01_kdepot.diff | 4 ++-- ubuntu/maverick/tdetoys/debian/patches/common/kubuntu_01_kdepot.diff | 4 ++-- ubuntu/maverick/tdeutils/debian/patches/common/kubuntu_01_kdepot.diff | 4 ++-- ubuntu/maverick/tdevelop/debian/patches/common/kubuntu_01_kdepot.diff | 4 ++-- .../maverick/tdewebdev/debian/patches/common/kubuntu_01_kdepot.diff | 4 ++-- .../applications/keep/debian/patches/kubuntu_01_kdepot.diff | 2 +- .../kdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff | 4 ++-- .../kdeaddons/debian/patches/common/kubuntu_01_kdepot.diff | 4 ++-- .../kdeadmin/debian/patches/common/kubuntu_01_kdepot.diff | 4 ++-- .../kdeartwork/debian/patches/common/kubuntu_01_kdepot.diff | 4 ++-- .../kdebindings/debian/patches/common/kubuntu_01_kdepot.diff | 4 ++-- .../kdeedu/debian/patches/common/kubuntu_01_kdepot.diff | 4 ++-- .../kdegames/debian/patches/common/kubuntu_01_kdepot.diff | 4 ++-- .../kdegraphics/debian/patches/common/kubuntu_01_kdepot.diff | 4 ++-- ubuntu/maverick_automake/kdelibs/debian/changelog | 2 +- .../kdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff | 4 ++-- .../kdenetwork/debian/patches/common/kubuntu_01_kdepot.diff | 4 ++-- .../kdepim/debian/patches/common/kubuntu_01_kdepot.diff | 4 ++-- .../kdesdk/debian/patches/common/kubuntu_01_kdepot.diff | 4 ++-- .../kdetoys/debian/patches/common/kubuntu_01_kdepot.diff | 4 ++-- .../kdeutils/debian/patches/common/kubuntu_01_kdepot.diff | 4 ++-- .../kdevelop/debian/patches/common/kubuntu_01_kdepot.diff | 4 ++-- .../kdewebdev/debian/patches/common/kubuntu_01_kdepot.diff | 4 ++-- 88 files changed, 163 insertions(+), 163 deletions(-) diff --git a/debian/lenny/applications/keep/debian/patches/kubuntu_01_kdepot.diff b/debian/lenny/applications/keep/debian/patches/kubuntu_01_kdepot.diff index 782118729..de663438c 100644 --- a/debian/lenny/applications/keep/debian/patches/kubuntu_01_kdepot.diff +++ b/debian/lenny/applications/keep/debian/patches/kubuntu_01_kdepot.diff @@ -16,5 +16,5 @@ diff -Nur keep-0.4.0/admin/cvs.sh keep-0.4.0.new/admin/cvs.sh - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot if ! test -f $kdepotpath; then - kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot + kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot fi diff --git a/debian/lenny/tdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff b/debian/lenny/tdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff index c02687784..e154eb334 100644 --- a/debian/lenny/tdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/lenny/tdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/debian/lenny/tdeaddons/debian/patches/common/kubuntu_01_kdepot.diff b/debian/lenny/tdeaddons/debian/patches/common/kubuntu_01_kdepot.diff index c02687784..e154eb334 100644 --- a/debian/lenny/tdeaddons/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/lenny/tdeaddons/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/debian/lenny/tdeadmin/debian/patches/common/kubuntu_01_kdepot.diff b/debian/lenny/tdeadmin/debian/patches/common/kubuntu_01_kdepot.diff index c02687784..e154eb334 100644 --- a/debian/lenny/tdeadmin/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/lenny/tdeadmin/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/debian/lenny/tdebindings/debian/patches/common/kubuntu_01_kdepot.diff b/debian/lenny/tdebindings/debian/patches/common/kubuntu_01_kdepot.diff index c02687784..e154eb334 100644 --- a/debian/lenny/tdebindings/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/lenny/tdebindings/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/debian/lenny/tdeedu/debian/patches/common/kubuntu_01_kdepot.diff b/debian/lenny/tdeedu/debian/patches/common/kubuntu_01_kdepot.diff index c02687784..e154eb334 100644 --- a/debian/lenny/tdeedu/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/lenny/tdeedu/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/debian/lenny/tdegames/debian/patches/common/kubuntu_01_kdepot.diff b/debian/lenny/tdegames/debian/patches/common/kubuntu_01_kdepot.diff index c02687784..e154eb334 100644 --- a/debian/lenny/tdegames/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/lenny/tdegames/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/debian/lenny/tdegraphics/debian/patches/common/kubuntu_01_kdepot.diff b/debian/lenny/tdegraphics/debian/patches/common/kubuntu_01_kdepot.diff index c02687784..e154eb334 100644 --- a/debian/lenny/tdegraphics/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/lenny/tdegraphics/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/debian/lenny/tdelibs/debian/changelog b/debian/lenny/tdelibs/debian/changelog index 8eda5d307..dd416c496 100644 --- a/debian/lenny/tdelibs/debian/changelog +++ b/debian/lenny/tdelibs/debian/changelog @@ -2087,7 +2087,7 @@ tdelibs (4:3.4.0-0pre5) alioth; urgency=low output them expanded even when --expandvars is not used. (Closes: #287822) * Fixed the ability of the build system to find kde.pot, even when it is not - located at TDEDIR/include/tde.pot. This allows the use of targets such as + located at TDEDIR/include/kde.pot. This allows the use of targets such as "package-messages" without specifying includedir. (Closes: #283858) * Now that graphviz is in main, add it to Build-Depends-Indep together with diff --git a/debian/lenny/tdelibs/debian/tdelibs4-trinity-dev.install b/debian/lenny/tdelibs/debian/tdelibs4-trinity-dev.install index a9044b322..637e5ff60 100644 --- a/debian/lenny/tdelibs/debian/tdelibs4-trinity-dev.install +++ b/debian/lenny/tdelibs/debian/tdelibs4-trinity-dev.install @@ -203,7 +203,7 @@ debian/tmp/opt/trinity/include/tdedmodule.h debian/tmp/opt/trinity/include/tde_file.h debian/tmp/opt/trinity/include/tdelibs_export.h debian/tmp/opt/trinity/include/tdemacros.h -debian/tmp/opt/trinity/include/tde.pot +debian/tmp/opt/trinity/include/kde.pot debian/tmp/opt/trinity/include/tdeprint/driver.h debian/tmp/opt/trinity/include/tdeprint/kiconselectaction.h debian/tmp/opt/trinity/include/tdeprint/kmjob.h diff --git a/debian/lenny/tdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff b/debian/lenny/tdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff index c02687784..e154eb334 100644 --- a/debian/lenny/tdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/lenny/tdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/debian/lenny/tdenetwork/debian/patches/common/kubuntu_01_kdepot.diff b/debian/lenny/tdenetwork/debian/patches/common/kubuntu_01_kdepot.diff index c02687784..e154eb334 100644 --- a/debian/lenny/tdenetwork/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/lenny/tdenetwork/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/debian/lenny/tdesdk/debian/patches/common/kubuntu_01_kdepot.diff b/debian/lenny/tdesdk/debian/patches/common/kubuntu_01_kdepot.diff index c02687784..e154eb334 100644 --- a/debian/lenny/tdesdk/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/lenny/tdesdk/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/debian/lenny/tdetoys/debian/patches/common/kubuntu_01_kdepot.diff b/debian/lenny/tdetoys/debian/patches/common/kubuntu_01_kdepot.diff index c02687784..e154eb334 100644 --- a/debian/lenny/tdetoys/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/lenny/tdetoys/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/debian/lenny/tdeutils/debian/patches/common/kubuntu_01_kdepot.diff b/debian/lenny/tdeutils/debian/patches/common/kubuntu_01_kdepot.diff index c02687784..e154eb334 100644 --- a/debian/lenny/tdeutils/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/lenny/tdeutils/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/debian/lenny/tdevelop/debian/patches/common/kubuntu_01_kdepot.diff b/debian/lenny/tdevelop/debian/patches/common/kubuntu_01_kdepot.diff index c02687784..e154eb334 100644 --- a/debian/lenny/tdevelop/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/lenny/tdevelop/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/debian/lenny/tdewebdev/debian/patches/common/kubuntu_01_kdepot.diff b/debian/lenny/tdewebdev/debian/patches/common/kubuntu_01_kdepot.diff index 698deb926..aca9df12a 100644 --- a/debian/lenny/tdewebdev/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/lenny/tdewebdev/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/debian/squeeze/applications/keep/debian/patches/kubuntu_01_kdepot.diff b/debian/squeeze/applications/keep/debian/patches/kubuntu_01_kdepot.diff index 782118729..de663438c 100644 --- a/debian/squeeze/applications/keep/debian/patches/kubuntu_01_kdepot.diff +++ b/debian/squeeze/applications/keep/debian/patches/kubuntu_01_kdepot.diff @@ -16,5 +16,5 @@ diff -Nur keep-0.4.0/admin/cvs.sh keep-0.4.0.new/admin/cvs.sh - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot if ! test -f $kdepotpath; then - kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot + kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot fi diff --git a/debian/squeeze/tdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff b/debian/squeeze/tdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff index c02687784..e154eb334 100644 --- a/debian/squeeze/tdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/squeeze/tdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/debian/squeeze/tdeaddons/debian/patches/common/kubuntu_01_kdepot.diff b/debian/squeeze/tdeaddons/debian/patches/common/kubuntu_01_kdepot.diff index c02687784..e154eb334 100644 --- a/debian/squeeze/tdeaddons/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/squeeze/tdeaddons/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/debian/squeeze/tdeadmin/debian/patches/common/kubuntu_01_kdepot.diff b/debian/squeeze/tdeadmin/debian/patches/common/kubuntu_01_kdepot.diff index c02687784..e154eb334 100644 --- a/debian/squeeze/tdeadmin/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/squeeze/tdeadmin/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/debian/squeeze/tdebindings/debian/patches/common/kubuntu_01_kdepot.diff b/debian/squeeze/tdebindings/debian/patches/common/kubuntu_01_kdepot.diff index c02687784..e154eb334 100644 --- a/debian/squeeze/tdebindings/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/squeeze/tdebindings/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/debian/squeeze/tdeedu/debian/patches/common/kubuntu_01_kdepot.diff b/debian/squeeze/tdeedu/debian/patches/common/kubuntu_01_kdepot.diff index c02687784..e154eb334 100644 --- a/debian/squeeze/tdeedu/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/squeeze/tdeedu/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/debian/squeeze/tdegames/debian/patches/common/kubuntu_01_kdepot.diff b/debian/squeeze/tdegames/debian/patches/common/kubuntu_01_kdepot.diff index c02687784..e154eb334 100644 --- a/debian/squeeze/tdegames/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/squeeze/tdegames/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/debian/squeeze/tdegraphics/debian/patches/common/kubuntu_01_kdepot.diff b/debian/squeeze/tdegraphics/debian/patches/common/kubuntu_01_kdepot.diff index c02687784..e154eb334 100644 --- a/debian/squeeze/tdegraphics/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/squeeze/tdegraphics/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/debian/squeeze/tdelibs/debian/changelog b/debian/squeeze/tdelibs/debian/changelog index 8eda5d307..dd416c496 100644 --- a/debian/squeeze/tdelibs/debian/changelog +++ b/debian/squeeze/tdelibs/debian/changelog @@ -2087,7 +2087,7 @@ tdelibs (4:3.4.0-0pre5) alioth; urgency=low output them expanded even when --expandvars is not used. (Closes: #287822) * Fixed the ability of the build system to find kde.pot, even when it is not - located at TDEDIR/include/tde.pot. This allows the use of targets such as + located at TDEDIR/include/kde.pot. This allows the use of targets such as "package-messages" without specifying includedir. (Closes: #283858) * Now that graphviz is in main, add it to Build-Depends-Indep together with diff --git a/debian/squeeze/tdelibs/debian/tdelibs4-trinity-dev.install b/debian/squeeze/tdelibs/debian/tdelibs4-trinity-dev.install index a9044b322..637e5ff60 100644 --- a/debian/squeeze/tdelibs/debian/tdelibs4-trinity-dev.install +++ b/debian/squeeze/tdelibs/debian/tdelibs4-trinity-dev.install @@ -203,7 +203,7 @@ debian/tmp/opt/trinity/include/tdedmodule.h debian/tmp/opt/trinity/include/tde_file.h debian/tmp/opt/trinity/include/tdelibs_export.h debian/tmp/opt/trinity/include/tdemacros.h -debian/tmp/opt/trinity/include/tde.pot +debian/tmp/opt/trinity/include/kde.pot debian/tmp/opt/trinity/include/tdeprint/driver.h debian/tmp/opt/trinity/include/tdeprint/kiconselectaction.h debian/tmp/opt/trinity/include/tdeprint/kmjob.h diff --git a/debian/squeeze/tdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff b/debian/squeeze/tdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff index c02687784..e154eb334 100644 --- a/debian/squeeze/tdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/squeeze/tdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/debian/squeeze/tdenetwork/debian/patches/common/kubuntu_01_kdepot.diff b/debian/squeeze/tdenetwork/debian/patches/common/kubuntu_01_kdepot.diff index c02687784..e154eb334 100644 --- a/debian/squeeze/tdenetwork/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/squeeze/tdenetwork/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/debian/squeeze/tdesdk/debian/patches/common/kubuntu_01_kdepot.diff b/debian/squeeze/tdesdk/debian/patches/common/kubuntu_01_kdepot.diff index c02687784..e154eb334 100644 --- a/debian/squeeze/tdesdk/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/squeeze/tdesdk/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/debian/squeeze/tdetoys/debian/patches/common/kubuntu_01_kdepot.diff b/debian/squeeze/tdetoys/debian/patches/common/kubuntu_01_kdepot.diff index c02687784..e154eb334 100644 --- a/debian/squeeze/tdetoys/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/squeeze/tdetoys/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/debian/squeeze/tdeutils/debian/patches/common/kubuntu_01_kdepot.diff b/debian/squeeze/tdeutils/debian/patches/common/kubuntu_01_kdepot.diff index c02687784..e154eb334 100644 --- a/debian/squeeze/tdeutils/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/squeeze/tdeutils/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/debian/squeeze/tdevelop/debian/patches/common/kubuntu_01_kdepot.diff b/debian/squeeze/tdevelop/debian/patches/common/kubuntu_01_kdepot.diff index c02687784..e154eb334 100644 --- a/debian/squeeze/tdevelop/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/squeeze/tdevelop/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/debian/squeeze/tdewebdev/debian/patches/common/kubuntu_01_kdepot.diff b/debian/squeeze/tdewebdev/debian/patches/common/kubuntu_01_kdepot.diff index 698deb926..aca9df12a 100644 --- a/debian/squeeze/tdewebdev/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/squeeze/tdewebdev/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/lucid_automake/applications/keep/debian/patches/kubuntu_01_kdepot.diff b/ubuntu/lucid_automake/applications/keep/debian/patches/kubuntu_01_kdepot.diff index 782118729..de663438c 100644 --- a/ubuntu/lucid_automake/applications/keep/debian/patches/kubuntu_01_kdepot.diff +++ b/ubuntu/lucid_automake/applications/keep/debian/patches/kubuntu_01_kdepot.diff @@ -16,5 +16,5 @@ diff -Nur keep-0.4.0/admin/cvs.sh keep-0.4.0.new/admin/cvs.sh - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot if ! test -f $kdepotpath; then - kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot + kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot fi diff --git a/ubuntu/lucid_automake/kdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/lucid_automake/kdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff index e705cf83b..b26f84af1 100644 --- a/ubuntu/lucid_automake/kdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/lucid_automake/kdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/lucid_automake/kdeaddons/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/lucid_automake/kdeaddons/debian/patches/common/kubuntu_01_kdepot.diff index e705cf83b..b26f84af1 100644 --- a/ubuntu/lucid_automake/kdeaddons/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/lucid_automake/kdeaddons/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/lucid_automake/kdeadmin/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/lucid_automake/kdeadmin/debian/patches/common/kubuntu_01_kdepot.diff index e705cf83b..b26f84af1 100644 --- a/ubuntu/lucid_automake/kdeadmin/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/lucid_automake/kdeadmin/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/lucid_automake/kdeartwork/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/lucid_automake/kdeartwork/debian/patches/common/kubuntu_01_kdepot.diff index e705cf83b..b26f84af1 100644 --- a/ubuntu/lucid_automake/kdeartwork/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/lucid_automake/kdeartwork/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/lucid_automake/kdebindings/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/lucid_automake/kdebindings/debian/patches/common/kubuntu_01_kdepot.diff index e705cf83b..b26f84af1 100644 --- a/ubuntu/lucid_automake/kdebindings/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/lucid_automake/kdebindings/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/lucid_automake/kdeedu/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/lucid_automake/kdeedu/debian/patches/common/kubuntu_01_kdepot.diff index e705cf83b..b26f84af1 100644 --- a/ubuntu/lucid_automake/kdeedu/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/lucid_automake/kdeedu/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/lucid_automake/kdegames/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/lucid_automake/kdegames/debian/patches/common/kubuntu_01_kdepot.diff index e705cf83b..b26f84af1 100644 --- a/ubuntu/lucid_automake/kdegames/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/lucid_automake/kdegames/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/lucid_automake/kdegraphics/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/lucid_automake/kdegraphics/debian/patches/common/kubuntu_01_kdepot.diff index e705cf83b..b26f84af1 100644 --- a/ubuntu/lucid_automake/kdegraphics/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/lucid_automake/kdegraphics/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/lucid_automake/kdelibs/debian/changelog b/ubuntu/lucid_automake/kdelibs/debian/changelog index bc7c7eed5..6a65281c1 100644 --- a/ubuntu/lucid_automake/kdelibs/debian/changelog +++ b/ubuntu/lucid_automake/kdelibs/debian/changelog @@ -2087,7 +2087,7 @@ kdelibs (4:3.4.0-0pre5) alioth; urgency=low output them expanded even when --expandvars is not used. (Closes: #287822) * Fixed the ability of the build system to find kde.pot, even when it is not - located at TDEDIR/include/tde.pot. This allows the use of targets such as + located at TDEDIR/include/kde.pot. This allows the use of targets such as "package-messages" without specifying includedir. (Closes: #283858) * Now that graphviz is in main, add it to Build-Depends-Indep together with diff --git a/ubuntu/lucid_automake/kdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/lucid_automake/kdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff index e705cf83b..b26f84af1 100644 --- a/ubuntu/lucid_automake/kdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/lucid_automake/kdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/lucid_automake/kdenetwork/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/lucid_automake/kdenetwork/debian/patches/common/kubuntu_01_kdepot.diff index e705cf83b..b26f84af1 100644 --- a/ubuntu/lucid_automake/kdenetwork/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/lucid_automake/kdenetwork/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/lucid_automake/kdepim/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/lucid_automake/kdepim/debian/patches/common/kubuntu_01_kdepot.diff index e705cf83b..b26f84af1 100644 --- a/ubuntu/lucid_automake/kdepim/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/lucid_automake/kdepim/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/lucid_automake/kdesdk/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/lucid_automake/kdesdk/debian/patches/common/kubuntu_01_kdepot.diff index e705cf83b..b26f84af1 100644 --- a/ubuntu/lucid_automake/kdesdk/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/lucid_automake/kdesdk/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/lucid_automake/kdetoys/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/lucid_automake/kdetoys/debian/patches/common/kubuntu_01_kdepot.diff index e705cf83b..b26f84af1 100644 --- a/ubuntu/lucid_automake/kdetoys/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/lucid_automake/kdetoys/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/lucid_automake/kdeutils/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/lucid_automake/kdeutils/debian/patches/common/kubuntu_01_kdepot.diff index e705cf83b..b26f84af1 100644 --- a/ubuntu/lucid_automake/kdeutils/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/lucid_automake/kdeutils/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/lucid_automake/kdevelop/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/lucid_automake/kdevelop/debian/patches/common/kubuntu_01_kdepot.diff index e705cf83b..b26f84af1 100644 --- a/ubuntu/lucid_automake/kdevelop/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/lucid_automake/kdevelop/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/lucid_automake/kdewebdev/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/lucid_automake/kdewebdev/debian/patches/common/kubuntu_01_kdepot.diff index 698deb926..aca9df12a 100644 --- a/ubuntu/lucid_automake/kdewebdev/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/lucid_automake/kdewebdev/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick/applications/keep/debian/patches/kubuntu_01_kdepot.diff b/ubuntu/maverick/applications/keep/debian/patches/kubuntu_01_kdepot.diff index 782118729..de663438c 100644 --- a/ubuntu/maverick/applications/keep/debian/patches/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick/applications/keep/debian/patches/kubuntu_01_kdepot.diff @@ -16,5 +16,5 @@ diff -Nur keep-0.4.0/admin/cvs.sh keep-0.4.0.new/admin/cvs.sh - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot if ! test -f $kdepotpath; then - kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot + kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot fi diff --git a/ubuntu/maverick/kdegraphics.automake/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick/kdegraphics.automake/debian/patches/common/kubuntu_01_kdepot.diff index c02687784..e154eb334 100644 --- a/ubuntu/maverick/kdegraphics.automake/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick/kdegraphics.automake/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick/tdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick/tdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff index c02687784..e154eb334 100644 --- a/ubuntu/maverick/tdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick/tdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick/tdeaddons/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick/tdeaddons/debian/patches/common/kubuntu_01_kdepot.diff index c02687784..e154eb334 100644 --- a/ubuntu/maverick/tdeaddons/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick/tdeaddons/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick/tdeadmin/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick/tdeadmin/debian/patches/common/kubuntu_01_kdepot.diff index c02687784..e154eb334 100644 --- a/ubuntu/maverick/tdeadmin/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick/tdeadmin/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick/tdebindings/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick/tdebindings/debian/patches/common/kubuntu_01_kdepot.diff index c02687784..e154eb334 100644 --- a/ubuntu/maverick/tdebindings/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick/tdebindings/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick/tdeedu/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick/tdeedu/debian/patches/common/kubuntu_01_kdepot.diff index c02687784..e154eb334 100644 --- a/ubuntu/maverick/tdeedu/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick/tdeedu/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick/tdegames/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick/tdegames/debian/patches/common/kubuntu_01_kdepot.diff index c02687784..e154eb334 100644 --- a/ubuntu/maverick/tdegames/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick/tdegames/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick/tdegraphics/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick/tdegraphics/debian/patches/common/kubuntu_01_kdepot.diff index c02687784..e154eb334 100644 --- a/ubuntu/maverick/tdegraphics/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick/tdegraphics/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick/tdelibs/debian/changelog b/ubuntu/maverick/tdelibs/debian/changelog index 8eda5d307..dd416c496 100644 --- a/ubuntu/maverick/tdelibs/debian/changelog +++ b/ubuntu/maverick/tdelibs/debian/changelog @@ -2087,7 +2087,7 @@ tdelibs (4:3.4.0-0pre5) alioth; urgency=low output them expanded even when --expandvars is not used. (Closes: #287822) * Fixed the ability of the build system to find kde.pot, even when it is not - located at TDEDIR/include/tde.pot. This allows the use of targets such as + located at TDEDIR/include/kde.pot. This allows the use of targets such as "package-messages" without specifying includedir. (Closes: #283858) * Now that graphviz is in main, add it to Build-Depends-Indep together with diff --git a/ubuntu/maverick/tdelibs/debian/tdelibs4-trinity-dev.install b/ubuntu/maverick/tdelibs/debian/tdelibs4-trinity-dev.install index a9044b322..637e5ff60 100644 --- a/ubuntu/maverick/tdelibs/debian/tdelibs4-trinity-dev.install +++ b/ubuntu/maverick/tdelibs/debian/tdelibs4-trinity-dev.install @@ -203,7 +203,7 @@ debian/tmp/opt/trinity/include/tdedmodule.h debian/tmp/opt/trinity/include/tde_file.h debian/tmp/opt/trinity/include/tdelibs_export.h debian/tmp/opt/trinity/include/tdemacros.h -debian/tmp/opt/trinity/include/tde.pot +debian/tmp/opt/trinity/include/kde.pot debian/tmp/opt/trinity/include/tdeprint/driver.h debian/tmp/opt/trinity/include/tdeprint/kiconselectaction.h debian/tmp/opt/trinity/include/tdeprint/kmjob.h diff --git a/ubuntu/maverick/tdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick/tdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff index c02687784..e154eb334 100644 --- a/ubuntu/maverick/tdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick/tdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick/tdenetwork/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick/tdenetwork/debian/patches/common/kubuntu_01_kdepot.diff index c02687784..e154eb334 100644 --- a/ubuntu/maverick/tdenetwork/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick/tdenetwork/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick/tdesdk/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick/tdesdk/debian/patches/common/kubuntu_01_kdepot.diff index c02687784..e154eb334 100644 --- a/ubuntu/maverick/tdesdk/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick/tdesdk/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick/tdetoys/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick/tdetoys/debian/patches/common/kubuntu_01_kdepot.diff index c02687784..e154eb334 100644 --- a/ubuntu/maverick/tdetoys/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick/tdetoys/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick/tdeutils/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick/tdeutils/debian/patches/common/kubuntu_01_kdepot.diff index c02687784..e154eb334 100644 --- a/ubuntu/maverick/tdeutils/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick/tdeutils/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick/tdevelop/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick/tdevelop/debian/patches/common/kubuntu_01_kdepot.diff index c02687784..e154eb334 100644 --- a/ubuntu/maverick/tdevelop/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick/tdevelop/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick/tdewebdev/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick/tdewebdev/debian/patches/common/kubuntu_01_kdepot.diff index 698deb926..aca9df12a 100644 --- a/ubuntu/maverick/tdewebdev/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick/tdewebdev/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick_automake/applications/keep/debian/patches/kubuntu_01_kdepot.diff b/ubuntu/maverick_automake/applications/keep/debian/patches/kubuntu_01_kdepot.diff index 782118729..de663438c 100644 --- a/ubuntu/maverick_automake/applications/keep/debian/patches/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick_automake/applications/keep/debian/patches/kubuntu_01_kdepot.diff @@ -16,5 +16,5 @@ diff -Nur keep-0.4.0/admin/cvs.sh keep-0.4.0.new/admin/cvs.sh - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot if ! test -f $kdepotpath; then - kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot + kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot fi diff --git a/ubuntu/maverick_automake/kdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick_automake/kdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff index e705cf83b..b26f84af1 100644 --- a/ubuntu/maverick_automake/kdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick_automake/kdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick_automake/kdeaddons/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick_automake/kdeaddons/debian/patches/common/kubuntu_01_kdepot.diff index e705cf83b..b26f84af1 100644 --- a/ubuntu/maverick_automake/kdeaddons/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick_automake/kdeaddons/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick_automake/kdeadmin/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick_automake/kdeadmin/debian/patches/common/kubuntu_01_kdepot.diff index e705cf83b..b26f84af1 100644 --- a/ubuntu/maverick_automake/kdeadmin/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick_automake/kdeadmin/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick_automake/kdeartwork/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick_automake/kdeartwork/debian/patches/common/kubuntu_01_kdepot.diff index e705cf83b..b26f84af1 100644 --- a/ubuntu/maverick_automake/kdeartwork/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick_automake/kdeartwork/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick_automake/kdebindings/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick_automake/kdebindings/debian/patches/common/kubuntu_01_kdepot.diff index e705cf83b..b26f84af1 100644 --- a/ubuntu/maverick_automake/kdebindings/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick_automake/kdebindings/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick_automake/kdeedu/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick_automake/kdeedu/debian/patches/common/kubuntu_01_kdepot.diff index e705cf83b..b26f84af1 100644 --- a/ubuntu/maverick_automake/kdeedu/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick_automake/kdeedu/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick_automake/kdegames/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick_automake/kdegames/debian/patches/common/kubuntu_01_kdepot.diff index e705cf83b..b26f84af1 100644 --- a/ubuntu/maverick_automake/kdegames/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick_automake/kdegames/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick_automake/kdegraphics/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick_automake/kdegraphics/debian/patches/common/kubuntu_01_kdepot.diff index e705cf83b..b26f84af1 100644 --- a/ubuntu/maverick_automake/kdegraphics/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick_automake/kdegraphics/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick_automake/kdelibs/debian/changelog b/ubuntu/maverick_automake/kdelibs/debian/changelog index bc7c7eed5..6a65281c1 100644 --- a/ubuntu/maverick_automake/kdelibs/debian/changelog +++ b/ubuntu/maverick_automake/kdelibs/debian/changelog @@ -2087,7 +2087,7 @@ kdelibs (4:3.4.0-0pre5) alioth; urgency=low output them expanded even when --expandvars is not used. (Closes: #287822) * Fixed the ability of the build system to find kde.pot, even when it is not - located at TDEDIR/include/tde.pot. This allows the use of targets such as + located at TDEDIR/include/kde.pot. This allows the use of targets such as "package-messages" without specifying includedir. (Closes: #283858) * Now that graphviz is in main, add it to Build-Depends-Indep together with diff --git a/ubuntu/maverick_automake/kdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick_automake/kdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff index e705cf83b..b26f84af1 100644 --- a/ubuntu/maverick_automake/kdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick_automake/kdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick_automake/kdenetwork/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick_automake/kdenetwork/debian/patches/common/kubuntu_01_kdepot.diff index e705cf83b..b26f84af1 100644 --- a/ubuntu/maverick_automake/kdenetwork/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick_automake/kdenetwork/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick_automake/kdepim/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick_automake/kdepim/debian/patches/common/kubuntu_01_kdepot.diff index e705cf83b..b26f84af1 100644 --- a/ubuntu/maverick_automake/kdepim/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick_automake/kdepim/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick_automake/kdesdk/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick_automake/kdesdk/debian/patches/common/kubuntu_01_kdepot.diff index e705cf83b..b26f84af1 100644 --- a/ubuntu/maverick_automake/kdesdk/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick_automake/kdesdk/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick_automake/kdetoys/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick_automake/kdetoys/debian/patches/common/kubuntu_01_kdepot.diff index e705cf83b..b26f84af1 100644 --- a/ubuntu/maverick_automake/kdetoys/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick_automake/kdetoys/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick_automake/kdeutils/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick_automake/kdeutils/debian/patches/common/kubuntu_01_kdepot.diff index e705cf83b..b26f84af1 100644 --- a/ubuntu/maverick_automake/kdeutils/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick_automake/kdeutils/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick_automake/kdevelop/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick_automake/kdevelop/debian/patches/common/kubuntu_01_kdepot.diff index e705cf83b..b26f84af1 100644 --- a/ubuntu/maverick_automake/kdevelop/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick_automake/kdevelop/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick_automake/kdewebdev/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick_automake/kdewebdev/debian/patches/common/kubuntu_01_kdepot.diff index 698deb926..aca9df12a 100644 --- a/ubuntu/maverick_automake/kdewebdev/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick_automake/kdewebdev/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ -- cgit v1.2.1 From 432a0eb411de4efe2d6b3b4cb7a8fab3108a10ef Mon Sep 17 00:00:00 2001 From: "Pawel \"l0ner\" Soltys" Date: Tue, 7 Feb 2012 22:47:38 +0100 Subject: kdebase: split pkgs dependency fixes --- arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD b/arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD index 9b17c67d2..8413bac60 100644 --- a/arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD +++ b/arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD @@ -12,7 +12,8 @@ pkgdesc="Trinity Desktop Enviroment base components" depends=('trinity-kdelibs' 'hal' 'postgresql-libs') -makedepends=('pkgconfig' 'cmake' 'autoconf' 'imake' 'xorg-bdftopcf' 'smbclient') +makedepends=('pkgconfig' 'cmake' 'autoconf' 'imake' 'xorg-bdftopcf' 'smbclient' + 'libraw1394' 'libxtst' 'libxkbfile') confilicts=('kdemod3-kdebase') options=('libtool') source=('http://mirror.ets.kth.se/trinity/releases/3.5.13/kdebase-3.5.13.tar.gz' @@ -44,7 +45,7 @@ build() { #export CMAKE_PREFIX_PATH=${QTDIR}:${TDEDIR} #export CMAKE_INCLUDE_PATH=${TDEDIR}/include/dbus-1-tqt/:${TDEDIR}/include/dbus-1.0/:${TDEDIR}/include:${TDEDIR}/include/libkrandr - #export LD_LIBRARY_PATH=${TDEDIR}/lib:${TDEDIR}/lib/kde3:${QTDIR}/lib:$LD_LIBRARY_PATH + #export LD_LIBRARY_PATH=${TDEDIR}/lib:${TDEDIR}/lib/trinity:${QTDIR}/lib:$LD_LIBRARY_PATH #export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${QTDIR}/lib/pkgconfig:$PKG_CONFIG_PATH msg "Patching..." -- cgit v1.2.1 From 3e800b870e41876b5e90e3df6dd46ad56353066f Mon Sep 17 00:00:00 2001 From: "Pawel \"l0ner\" Soltys" Date: Tue, 7 Feb 2012 23:51:12 +0100 Subject: kdeaccessibility: added optdepends, minor fixups --- arch/3.5.13/trinity-extras/trinity-kdeaccessibility/PKGBUILD | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/arch/3.5.13/trinity-extras/trinity-kdeaccessibility/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-kdeaccessibility/PKGBUILD index 0b24cbf04..e6b0c46ae 100644 --- a/arch/3.5.13/trinity-extras/trinity-kdeaccessibility/PKGBUILD +++ b/arch/3.5.13/trinity-extras/trinity-kdeaccessibility/PKGBUILD @@ -11,6 +11,11 @@ groups=('trinity-extras') pkgdesc="Trinity accessibility tools" depends=('trinity-kdebase') makedepends=('pkgconfig' 'autoconf' 'automake') +optdeps=('festival: speech synthesis' + 'epos: text to speech synthesis' + 'flite: lighweght version of festival' + 'mbrola: speech synthesis' + 'txt2pho: frontend for mbrola') options=('libtool' '!strip') source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/kdeaccessibility-3.5.13.tar.gz) md5sums=('ce31b01c1831046fb28aab172f2423bf') @@ -32,8 +37,8 @@ build() { --prefix=${TDEDIR} \ --enable-closure \ --with-alsa \ - #--with-extra-includes=${_prefix}/include:/usr/include/dbus-1.0:${_prefix}/include/libkrandr \ - #--with-extra-libs=${_prefix}/lib:${_prefix}/lib/trinity:${_prefix}/pkgconfig + --with-extra-includes=${_prefix}/include \ + --with-extra-libs=${_prefix}/lib:${_prefix}/lib/trinity:${_prefix}/pkgconfig msg "Building ${pkgname}..." make -- cgit v1.2.1 From 7f8325c4460975a6b13dd9beedb85ca5720ac20c Mon Sep 17 00:00:00 2001 From: "Pawel \"l0ner\" Soltys" Date: Tue, 7 Feb 2012 23:51:53 +0100 Subject: kdeaccessibility: fixed typo --- arch/3.5.13/trinity-extras/trinity-kdeaccessibility/PKGBUILD | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/3.5.13/trinity-extras/trinity-kdeaccessibility/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-kdeaccessibility/PKGBUILD index e6b0c46ae..8f6dea25a 100644 --- a/arch/3.5.13/trinity-extras/trinity-kdeaccessibility/PKGBUILD +++ b/arch/3.5.13/trinity-extras/trinity-kdeaccessibility/PKGBUILD @@ -11,11 +11,11 @@ groups=('trinity-extras') pkgdesc="Trinity accessibility tools" depends=('trinity-kdebase') makedepends=('pkgconfig' 'autoconf' 'automake') -optdeps=('festival: speech synthesis' - 'epos: text to speech synthesis' - 'flite: lighweght version of festival' - 'mbrola: speech synthesis' - 'txt2pho: frontend for mbrola') +optdepends=('festival: speech synthesis' + 'epos: text to speech synthesis' + 'flite: lighweght version of festival' + 'mbrola: speech synthesis' + 'txt2pho: frontend for mbrola') options=('libtool' '!strip') source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/kdeaccessibility-3.5.13.tar.gz) md5sums=('ce31b01c1831046fb28aab172f2423bf') -- cgit v1.2.1 From eeb27a55a3762e55bfacb4daed6b2a83f35d68fa Mon Sep 17 00:00:00 2001 From: "Pawel \"l0ner\" Soltys" Date: Wed, 8 Feb 2012 11:15:58 +0100 Subject: trinity-extras: added script for easy package generation --- arch/3.5.13/trinity-extras/mkpkg | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100755 arch/3.5.13/trinity-extras/mkpkg diff --git a/arch/3.5.13/trinity-extras/mkpkg b/arch/3.5.13/trinity-extras/mkpkg new file mode 100755 index 000000000..5b3fe3c10 --- /dev/null +++ b/arch/3.5.13/trinity-extras/mkpkg @@ -0,0 +1,18 @@ +#!/bin/bash + +pkgarray="kdeaccessibility kdeaddons kdeadmin kdeartwork kdeedu + kdegames kdegraphics kdemultimedia kdenetwork kdepim + kdesdk kdetoys kdeutils kdevelop kdewebdev libcaldav + libcarddav libkdcraw libkexiv2 libkipi i18n" +arch=`uname -m` + +for i in $pkgarray; do + cd trinity-${i} + makepkg -s -c -i --noconfirm + cd .. +done + +[ -d binaries-$arch ] || mkdir binaires-$arch + +mv `find . -name *.tar.xz` binaries-$arch/ + -- cgit v1.2.1 From 4c315dfbff02027addd4eac583fdbaf4a65096a5 Mon Sep 17 00:00:00 2001 From: "Pawel \"l0ner\" Soltys" Date: Wed, 8 Feb 2012 17:19:58 +0100 Subject: base/mkpkg: changes in package generation --- arch/3.5.13/trinity-base/mkpkg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/3.5.13/trinity-base/mkpkg b/arch/3.5.13/trinity-base/mkpkg index 14681745c..d3403b927 100755 --- a/arch/3.5.13/trinity-base/mkpkg +++ b/arch/3.5.13/trinity-base/mkpkg @@ -6,7 +6,7 @@ arch=`uname -m` for i in $pkgarray; do cd trinity-${i} - makepkg -s -c -i --noconfirm + makepkg -sicf --noconfirm cd .. done -- cgit v1.2.1 From e2765ea0613c2cf7fbda03e7df709f7cb021e0f9 Mon Sep 17 00:00:00 2001 From: "Pawel \"l0ner\" Soltys" Date: Wed, 8 Feb 2012 17:22:20 +0100 Subject: kdelibs: added xorg-iceauth runtime dep needed by dcopserv --- arch/3.5.13/trinity-base/trinity-kdelibs/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/3.5.13/trinity-base/trinity-kdelibs/PKGBUILD b/arch/3.5.13/trinity-base/trinity-kdelibs/PKGBUILD index 65bea9f78..5bbdd9b92 100644 --- a/arch/3.5.13/trinity-base/trinity-kdelibs/PKGBUILD +++ b/arch/3.5.13/trinity-base/trinity-kdelibs/PKGBUILD @@ -9,7 +9,7 @@ url='http://www.trinitydesktop.org' license=('GPL') groups=('trinity-base') pkgdesc="Trinity DE core libraries" -depends=('trinity-arts' +depends=('trinity-arts' 'xorg-iceauth' 'libxslt' 'libidn' 'libart-lgpl' 'jasper' 'libxcomposite' 'libcups' 'libutempter' 'openexr' 'aspell' 'hspell') -- cgit v1.2.1 From 8b3be13c90209048af4d46ff6e8580fbf4e9d543 Mon Sep 17 00:00:00 2001 From: "Pawel \"l0ner\" Soltys" Date: Wed, 8 Feb 2012 17:25:53 +0100 Subject: kdebase: moved hal dep from global to kdebase pkg, removed xorg-iceaut dep which is kdelibs dep, removed xorg deps --- arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD b/arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD index 8413bac60..6c360661a 100644 --- a/arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD +++ b/arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD @@ -9,11 +9,9 @@ url='http://www.trinitydesktop.org' license=('GPL') groups=('trinity-base') pkgdesc="Trinity Desktop Enviroment base components" -depends=('trinity-kdelibs' 'hal' - 'postgresql-libs') - +depends=('trinity-kdelibs') makedepends=('pkgconfig' 'cmake' 'autoconf' 'imake' 'xorg-bdftopcf' 'smbclient' - 'libraw1394' 'libxtst' 'libxkbfile') + 'libraw1394' 'libxtst' 'libxkbfile' 'hal') confilicts=('kdemod3-kdebase') options=('libtool') source=('http://mirror.ets.kth.se/trinity/releases/3.5.13/kdebase-3.5.13.tar.gz' @@ -93,9 +91,9 @@ build() { package_trinity-kdebase() { pkgdesc='Trinity Desktop Enviroment' - depends=('trinity-dbus-tqt' - 'xorg-server' 'xorg-xset' 'xorg-xsetroot' 'xorg-xprop' 'xorg-xmessage' 'xorg-xinit' 'xorg-iceauth' + depends=('trinity-dbus-tqt' 'hal' 'libxtst' 'libraw1394') + #'xorg-server' 'xorg-xset' 'xorg-xsetroot' 'xorg-xprop' 'xorg-xmessage' 'xorg-xinit' optdepends=('desktop-file-utils: Command line utilities for working with desktop entries' 'pciutils: PCI bus configuration space access library and tools' 'xscreensaver: Screen saver and locker for the X Window System' -- cgit v1.2.1 From 353ed6782330078f4b45f68fb5e6d0123c327822 Mon Sep 17 00:00:00 2001 From: "Pawel \"l0ner\" Soltys" Date: Wed, 8 Feb 2012 17:29:07 +0100 Subject: qt3: moved postgresql-lib, libmysqlclient from makedeps to runtime deps --- arch/3.5.13/trinity-base/trinity-qt3/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/3.5.13/trinity-base/trinity-qt3/PKGBUILD b/arch/3.5.13/trinity-base/trinity-qt3/PKGBUILD index 030a9990a..3d98aa5ee 100644 --- a/arch/3.5.13/trinity-base/trinity-qt3/PKGBUILD +++ b/arch/3.5.13/trinity-base/trinity-qt3/PKGBUILD @@ -10,9 +10,9 @@ url="http://trinitydesktop.org" license=('GPL') groups=('trinity-base') depends=('libpng' 'libjpeg' 'libxmu' 'libmng' 'postgresql-libs' - 'libxcursor' 'libxinerama' 'mesa' 'libxft' 'libxrandr') -makedepends=('libxi' - 'libmysqlclient' 'postgresql' 'unixodbc' 'libcups') + 'libxcursor' 'libxinerama' 'mesa' 'libxft' 'libxrandr' + 'libmysqlclient') +makedepends=('libxi' 'postgresql' 'unixodbc' 'libcups') #'mysql' 'postgresql' 'sqlite3' 'unixodbc' 'libxi' 'cups') # cups - add for cups support # cups is enabled by default in ./configure -- cgit v1.2.1 From 932ef04a6f611f94fe752d2afa47c2aefd5e9921 Mon Sep 17 00:00:00 2001 From: "Pawel \"l0ner\" Soltys" Date: Wed, 8 Feb 2012 17:40:39 +0100 Subject: kdebase: remoced uppercase letters in patch names --- arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD | 6 ++--- .../trinity-base/trinity-kdebase/xsession.patch | 28 ++++++++++++++++++++++ 2 files changed, 31 insertions(+), 3 deletions(-) create mode 100644 arch/3.5.13/trinity-base/trinity-kdebase/xsession.patch diff --git a/arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD b/arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD index 6c360661a..963119597 100644 --- a/arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD +++ b/arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD @@ -16,7 +16,7 @@ confilicts=('kdemod3-kdebase') options=('libtool') source=('http://mirror.ets.kth.se/trinity/releases/3.5.13/kdebase-3.5.13.tar.gz' 'patches.tar.bz2' - 'Xsession.patch' + 'xsession.patch' 'arch-kdeshutdown.png' 'kdm-default-face.png' 'agent-shutdown.sh' @@ -166,7 +166,7 @@ package_trinity-kdm() { # update the Xsession file, this resolves problem with kdm dropping back # to the login screen - patch -N ${pkgdir}${TDEDIR}/share/config/kdm/Xsession < ${srcdir}/Xsession.patch + patch -N ${pkgdir}${TDEDIR}/share/config/kdm/Xsession < ${srcdir}/xsession.patch # install kdm rc.d script. We need this to start kdm from rc.d install -D -m755 ${srcdir}/kdm-trinity "${pkgdir}"/etc/rc.d/kdm-trinity @@ -200,7 +200,7 @@ package_trinity-kate() { } package_trinity-konqueror() { - pkgdesc="Trinity Swiss Army application, file and web browser." + pkgdesc="Trinity Swiss Army file and web browser." msg "Packaging - $pkgname-$pkgver" _splitfolders="konqueror libkonq doc/konqueror" diff --git a/arch/3.5.13/trinity-base/trinity-kdebase/xsession.patch b/arch/3.5.13/trinity-base/trinity-kdebase/xsession.patch new file mode 100644 index 000000000..164d6c811 --- /dev/null +++ b/arch/3.5.13/trinity-base/trinity-kdebase/xsession.patch @@ -0,0 +1,28 @@ +--- /mnt/archlinux/opt/trinity/share/config/kdm/Xsession 2011-12-08 13:08:43.000000000 +0100 ++++ /opt/kde3/share/config/kdm/Xsession 2011-09-24 14:52:28.000000000 +0200 +@@ -43,4 +43,24 @@ + ;; + esac + # invoke global X session script +-. /etc/X11/Xsession ++ ++ ++ case $session in ++ "") ++ exec xmessage -center -buttons OK:0 -default OK "Sorry, $DESKTOP_SESSION is no valid session." ++ ;; ++ failsafe) ++ exec ck-launch-session xterm -geometry 80x24-0-0 ++ ;; ++ custom) ++ exec ck-launch-session $HOME/.xsession ++ ;; ++ default) ++ exec ck-launch-session /opt/trinity/bin/startkde ++ ;; ++ *) ++ eval exec ck-launch-session "$session" ++ ;; ++ esac ++ exec xmessage -center -buttons OK:0 -default OK "Sorry, cannot execute $session. Check $DESKTOP_SESSION.desktop." ++ -- cgit v1.2.1 From f08fcfacea3b0cf3229ce3dc4003f31030f96279 Mon Sep 17 00:00:00 2001 From: "Pawel \"l0ner\" Soltys" Date: Wed, 8 Feb 2012 17:47:05 +0100 Subject: arch: cleanups --- .../trinity-base/trinity-kdebase/Xsession.patch | 28 ---------------------- 1 file changed, 28 deletions(-) delete mode 100644 arch/3.5.13/trinity-base/trinity-kdebase/Xsession.patch diff --git a/arch/3.5.13/trinity-base/trinity-kdebase/Xsession.patch b/arch/3.5.13/trinity-base/trinity-kdebase/Xsession.patch deleted file mode 100644 index 164d6c811..000000000 --- a/arch/3.5.13/trinity-base/trinity-kdebase/Xsession.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- /mnt/archlinux/opt/trinity/share/config/kdm/Xsession 2011-12-08 13:08:43.000000000 +0100 -+++ /opt/kde3/share/config/kdm/Xsession 2011-09-24 14:52:28.000000000 +0200 -@@ -43,4 +43,24 @@ - ;; - esac - # invoke global X session script --. /etc/X11/Xsession -+ -+ -+ case $session in -+ "") -+ exec xmessage -center -buttons OK:0 -default OK "Sorry, $DESKTOP_SESSION is no valid session." -+ ;; -+ failsafe) -+ exec ck-launch-session xterm -geometry 80x24-0-0 -+ ;; -+ custom) -+ exec ck-launch-session $HOME/.xsession -+ ;; -+ default) -+ exec ck-launch-session /opt/trinity/bin/startkde -+ ;; -+ *) -+ eval exec ck-launch-session "$session" -+ ;; -+ esac -+ exec xmessage -center -buttons OK:0 -default OK "Sorry, cannot execute $session. Check $DESKTOP_SESSION.desktop." -+ -- cgit v1.2.1 From c011c01df1de3795984d6836d2a30c298529d881 Mon Sep 17 00:00:00 2001 From: "Pawel \"l0ner\" Soltys" Date: Wed, 8 Feb 2012 18:38:42 +0100 Subject: kdebase: reverted to monolothic PKGBUILD --- arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD | 108 +++++----------------- 1 file changed, 24 insertions(+), 84 deletions(-) diff --git a/arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD b/arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD index 963119597..42cc76347 100644 --- a/arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD +++ b/arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Pawel 'l0ner' Soltys # Contributor: Calvin Morrison -pkgname=('trinity-kdebase' 'trinity-kdm' 'trinity-konsole' 'trinity-kate' 'trinity-konqueror') +pkgname='trinity-kdebase' pkgver=3513 pkgrel=5 arch=('i686' 'x86_64') @@ -9,11 +9,19 @@ url='http://www.trinitydesktop.org' license=('GPL') groups=('trinity-base') pkgdesc="Trinity Desktop Enviroment base components" -depends=('trinity-kdelibs') +depends=('trinity-kdelibs' 'trinity-dbus-tqt' 'hal' + 'libxtst' 'libraw1394') + #'xorg-server' 'xorg-xset' 'xorg-xsetroot' 'xorg-xprop' 'xorg-xmessage' 'xorg-xinit' makedepends=('pkgconfig' 'cmake' 'autoconf' 'imake' 'xorg-bdftopcf' 'smbclient' - 'libraw1394' 'libxtst' 'libxkbfile' 'hal') + 'libxkbfile') confilicts=('kdemod3-kdebase') options=('libtool') +optdepends=('desktop-file-utils: Command line utilities for working with desktop entries' + 'pciutils: PCI bus configuration space access library and tools' + 'xscreensaver: Screen saver and locker for the X Window System' + 'xorg-fonts-75dpi: X.org 75dpi fonts collection' + 'samba: file sharing over SMB') +install='trinity-kdebase.install' source=('http://mirror.ets.kth.se/trinity/releases/3.5.13/kdebase-3.5.13.tar.gz' 'patches.tar.bz2' 'xsession.patch' @@ -90,38 +98,25 @@ build() { } package_trinity-kdebase() { - pkgdesc='Trinity Desktop Enviroment' - depends=('trinity-dbus-tqt' 'hal' - 'libxtst' 'libraw1394') - #'xorg-server' 'xorg-xset' 'xorg-xsetroot' 'xorg-xprop' 'xorg-xmessage' 'xorg-xinit' - optdepends=('desktop-file-utils: Command line utilities for working with desktop entries' - 'pciutils: PCI bus configuration space access library and tools' - 'xscreensaver: Screen saver and locker for the X Window System' - 'xorg-fonts-75dpi: X.org 75dpi fonts collection' - 'samba: file sharing over SMB') - install='trinity-kdebase.install' msg "Packaging - $pkgname-$pkgver" - _splitfolders="applnk drkonqi kappfinder kcheckpass kcminit kcontrol - kdcop kdebugdialog kdeeject kdepasswd kdeprint kdesktop - kdesu kdialog kfind khelpcenter khotkeys kicker kioslave - klipper kmenuedit knetattach kpager kpersonalizer kreadconfig - krootbacking kscreensaver ksmserver ksplashml kstart ksysguard - ksystraycmd ktip kwin l10n kxkb nsplugins pics tqt3integration - tsak doc/faq doc/glossary doc/kcontrol doc/kdcop - doc/kdebugdialog doc/kdeprint doc/kdesu doc/kfind - doc/khelpcenter doc/kicker doc/kinfocenter doc/kioslave - doc/klipper doc/kmenuedit doc/knetattach doc/kompmgr doc/kpager - doc/ksplashml doc/ksysguard doc/kxkb doc/quickstart - doc/userguide doc/visualdict" - for _dir in $_splitfolders; do - cd ${srcdir}/build/$_dir - make DESTDIR="$pkgdir" install - done + make DESTDIR="$pkgdir" install # install X11 session file install -d -m755 ${pkgdir}/etc/X11/sessions install -m755 ${srcdir}/trinity.desktop ${pkgdir}/etc/X11/sessions/trinity.desktop + + # update the Xsession file, this resolves problem with kdm dropping back + # to the login screen + patch -N ${pkgdir}${TDEDIR}/share/config/kdm/Xsession < ${srcdir}/xsession.patch + + # install kdm rc.d script. We need this to start kdm from rc.d + install -D -m755 ${srcdir}/kdm-trinity "${pkgdir}"/etc/rc.d/kdm-trinity + + # Add image for default user avatar. This removes kdm complains about missing + # default avatar from kdm.log + install -D -m 644 $srcdir/kdm-default-face.png ${pkgdir}$TDEDIR/share/apps/kdm/faces/.default.face.icon + install -D -m 644 $srcdir/kdm-default-face.png ${pkgdir}$TDEDIR/share/apps/kdm/pics/users/arch-kdm.png # create the starttrinity link # do we need this? wouldn't be better to rename startkde script @@ -152,60 +147,5 @@ package_trinity-kdebase() { cd .. done -} - -package_trinity-kdm() { - pkgdesc="Trinity Display Manager" - - msg "Packaging - $pkgname-$pkgver" - _splitfolders="kdm kdmlib doc/kdm" - for _dir in $_splitfolders; do - cd ${srcdir}/build/$_dir - make DESTDIR="$pkgdir" install - done - - # update the Xsession file, this resolves problem with kdm dropping back - # to the login screen - patch -N ${pkgdir}${TDEDIR}/share/config/kdm/Xsession < ${srcdir}/xsession.patch - - # install kdm rc.d script. We need this to start kdm from rc.d - install -D -m755 ${srcdir}/kdm-trinity "${pkgdir}"/etc/rc.d/kdm-trinity - - # Add image for default user avatar. This removes kdm complains about missing - # default avatar from kdm.log - install -D -m 644 $srcdir/kdm-default-face.png ${pkgdir}$TDEDIR/share/apps/kdm/faces/.default.face.icon - install -D -m 644 $srcdir/kdm-default-face.png ${pkgdir}$TDEDIR/share/apps/kdm/pics/users/arch-kdm.png -} - -package_trinity-konsole() { - pkgdesc="Trinity - an X termnal emulator" - - msg "Packaging - $pkgname-$pkgver" - _splitfolders="konsole doc/konsole" - for _dir in $_splitfolders; do - cd ${srcdir}/build/$_dir - make DESTDIR="$pkgdir" install - done -} - -package_trinity-kate() { - pkgdesc="Trinity - A fast texteditor with an Emacs-style document interface" - msg "Packaging - $pkgname-$pkgver" - _splitfolders="kate doc/kate doc/kwrite" - for _dir in $_splitfolders; do - cd ${srcdir}/build/$_dir - make DESTDIR="$pkgdir" install - done -} - -package_trinity-konqueror() { - pkgdesc="Trinity Swiss Army file and web browser." - - msg "Packaging - $pkgname-$pkgver" - _splitfolders="konqueror libkonq doc/konqueror" - for _dir in $_splitfolders; do - cd ${srcdir}/build/$_dir - make DESTDIR="$pkgdir" install - done } -- cgit v1.2.1 From eb9765cac300e24339a1e480ea3bde2707ba6118 Mon Sep 17 00:00:00 2001 From: "Pawel \"l0ner\" Soltys" Date: Wed, 8 Feb 2012 18:41:20 +0100 Subject: kdebase-split: added split pkgbuild --- .../trinity-base/trinity-kdebase-split/PKGBUILD | 216 +++++++++++++++++++++ .../trinity-kdebase-split/agent-shutdown.sh | 13 ++ .../trinity-kdebase-split/agent-startup.sh | 19 ++ .../trinity-kdebase-split/arch-kdeshutdown.png | Bin 0 -> 5483 bytes .../trinity-kdebase-split/kdebase-3.5.13.tar.gz | Bin 0 -> 29723824 bytes .../trinity-kdebase-split/kdm-default-face.png | Bin 0 -> 4325 bytes .../trinity-base/trinity-kdebase-split/kdm-trinity | 40 ++++ .../trinity-kdebase-split/patches.tar.bz2 | Bin 0 -> 3671 bytes .../trinity-kdebase-3513-5.src.tar.gz | Bin 0 -> 18979 bytes .../trinity-kdebase-split/trinity-kdebase.install | 19 ++ .../trinity-kdebase-split/trinity.desktop | 8 + .../trinity-kdebase-split/xsession.patch | 28 +++ 12 files changed, 343 insertions(+) create mode 100644 arch/3.5.13/trinity-base/trinity-kdebase-split/PKGBUILD create mode 100644 arch/3.5.13/trinity-base/trinity-kdebase-split/agent-shutdown.sh create mode 100644 arch/3.5.13/trinity-base/trinity-kdebase-split/agent-startup.sh create mode 100644 arch/3.5.13/trinity-base/trinity-kdebase-split/arch-kdeshutdown.png create mode 100644 arch/3.5.13/trinity-base/trinity-kdebase-split/kdebase-3.5.13.tar.gz create mode 100644 arch/3.5.13/trinity-base/trinity-kdebase-split/kdm-default-face.png create mode 100644 arch/3.5.13/trinity-base/trinity-kdebase-split/kdm-trinity create mode 100644 arch/3.5.13/trinity-base/trinity-kdebase-split/patches.tar.bz2 create mode 100644 arch/3.5.13/trinity-base/trinity-kdebase-split/trinity-kdebase-3513-5.src.tar.gz create mode 100644 arch/3.5.13/trinity-base/trinity-kdebase-split/trinity-kdebase.install create mode 100644 arch/3.5.13/trinity-base/trinity-kdebase-split/trinity.desktop create mode 100644 arch/3.5.13/trinity-base/trinity-kdebase-split/xsession.patch diff --git a/arch/3.5.13/trinity-base/trinity-kdebase-split/PKGBUILD b/arch/3.5.13/trinity-base/trinity-kdebase-split/PKGBUILD new file mode 100644 index 000000000..a9c0047ce --- /dev/null +++ b/arch/3.5.13/trinity-base/trinity-kdebase-split/PKGBUILD @@ -0,0 +1,216 @@ +# Maintainer: Pawel 'l0ner' Soltys +# Contributor: Calvin Morrison + +pkgname=('trinity-kdebase' 'trinity-kdm' 'trinity-konsole' 'trinity-kate' 'trinity-konqueror') +pkgver=3513 +pkgrel=5 +arch=('i686' 'x86_64') +url='http://www.trinitydesktop.org' +license=('GPL') +groups=('trinity-base') +pkgdesc="Trinity Desktop Enviroment base components" +depends=('trinity-kdelibs') +makedepends=('pkgconfig' 'cmake' 'autoconf' 'imake' 'xorg-bdftopcf' 'smbclient' + 'libraw1394' 'libxtst' 'libxkbfile' 'hal') +confilicts=('kdemod3-kdebase') +options=('libtool') +source=('http://mirror.ets.kth.se/trinity/releases/3.5.13/kdebase-3.5.13.tar.gz' + 'patches.tar.bz2' + 'xsession.patch' + 'arch-kdeshutdown.png' + 'kdm-default-face.png' + 'agent-shutdown.sh' + 'agent-startup.sh' + 'kdm-trinity' + 'trinity.desktop') +md5sums=('d1f7e1f94eeb46b981fe1ba144179840' + '327e4d68bd1fc4d29bdb273e81f90415' + '895f5d7351aa73ba1f57b0ad27081d69' + 'bb3004513d703d6b72ce70aa240af3a3' + 'e6afdd7ca60c4c59b851135785347e75' + '18e8d01124b19f7df2937c06e177bf7f' + 'c963ef6e37c9051119972a58c67f05fb' + '376d85d213cf3c04cb0912e5cccd68bd' + '1418e45fea5a9738544cbd264c36373b') + +build() { + cd $srcdir/kdebase + + msg "Setting PATH, CMAKE and Trinity Environment variables" + # Source the QT and TDE profile + [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh + [ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh + + #export CMAKE_PREFIX_PATH=${QTDIR}:${TDEDIR} + #export CMAKE_INCLUDE_PATH=${TDEDIR}/include/dbus-1-tqt/:${TDEDIR}/include/dbus-1.0/:${TDEDIR}/include:${TDEDIR}/include/libkrandr + #export LD_LIBRARY_PATH=${TDEDIR}/lib:${TDEDIR}/lib/trinity:${QTDIR}/lib:$LD_LIBRARY_PATH + #export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${QTDIR}/lib/pkgconfig:$PKG_CONFIG_PATH + + msg "Patching..." + for patch in $srcdir/patches/*.patch; do + _p=`basename $patch` + msg "Applying patch $_p.." + patch -Np0 -i $patch + done + + #Compatibility with kde3 and kde4 + #sed -ie 's/applications-merged/tde-applications-merged/g' applnk/CMakeLists.txt + + msg "Creating out-of-source build directory: ${srcdir}/build" + mkdir -p ../build + cd ../build + + msg "Starting cmake..." + cmake ${srcdir}/kdebase \ + -DCMAKE_INSTALL_PREFIX=${TDEDIR} \ + -DSYSCONF_INSTALL_DIR=/etc \ + -DWITH_XFIXES=ON \ + -DWITH_XCOMPOSITE=ON \ + -DWITH_XCURSOR=ON \ + -DWITH_XRANDR=ON \ + -DWITH_XRENDER=ON \ + -DWITH_XDAMAGE=ON \ + -DWITH_SHADOW=ON \ + -DWITH_XDMCP=ON \ + -DWITH_XINERAMA=ON \ + -DWITH_XEXT=ON \ + -DWITH_PAM=ON \ + -DWITH_HAL=ON \ + -DWITH_ARTS=ON \ + -DWITH_SASL=ON \ + -DWITH_OPENEXR=ON \ + -DWITH_SAMBA=ON \ + -DWITH_LIBUSB=ON \ + -DWITH_LDAP=ON \ + -DWITH_LIBRAW1394=ON \ + -DWITH_I8K=ON \ + -DBUILD_ALL=ON + make + +} + +package_trinity-kdebase() { + pkgname='trinity-kdebase' + pkgdesc='Trinity Desktop Enviroment' + depends=('trinity-dbus-tqt' 'hal' + 'libxtst' 'libraw1394') + #'xorg-server' 'xorg-xset' 'xorg-xsetroot' 'xorg-xprop' 'xorg-xmessage' 'xorg-xinit' + optdepends=('desktop-file-utils: Command line utilities for working with desktop entries' + 'pciutils: PCI bus configuration space access library and tools' + 'xscreensaver: Screen saver and locker for the X Window System' + 'xorg-fonts-75dpi: X.org 75dpi fonts collection' + 'samba: file sharing over SMB') + install='trinity-kdebase.install' + + msg "Packaging - $pkgname-$pkgver" + _splitfolders="applnk drkonqi kappfinder kcheckpass kcminit kcontrol + kdcop kdebugdialog kdeeject kdepasswd kdeprint kdesktop + kdesu kdialog kfind khelpcenter khotkeys kicker kioslave + klipper kmenuedit knetattach kpager kpersonalizer kreadconfig + krootbacking kscreensaver ksmserver ksplashml kstart ksysguard + ksystraycmd ktip kwin l10n kxkb nsplugins pics tqt3integration + tsak doc/faq doc/glossary doc/kcontrol doc/kdcop + doc/kdebugdialog doc/kdeprint doc/kdesu doc/kfind + doc/khelpcenter doc/kicker doc/kinfocenter doc/kioslave + doc/klipper doc/kmenuedit doc/knetattach doc/kompmgr doc/kpager + doc/ksplashml doc/ksysguard doc/kxkb doc/quickstart + doc/userguide doc/visualdict" + for _dir in $_splitfolders; do + cd ${srcdir}/build/$_dir + make DESTDIR="$pkgdir" install + done + + # install X11 session file + install -d -m755 ${pkgdir}/etc/X11/sessions + install -m755 ${srcdir}/trinity.desktop ${pkgdir}/etc/X11/sessions/trinity.desktop + + # create the starttrinity link + # do we need this? wouldn't be better to rename startkde script + # to starttrinity? Well, whathever. + ln -sf ${pkgdir}$TDEDIR/bin/startkde ${pkgdir}$TDEDIR/bin/starttrinity + + # install mkpamserv script, so we can auto-generate pam.d configs in post_install() + install -D -m755 ${srcdir}/kdebase/mkpamserv ${pkgdir}${TDEDIR}/bin/mkpamserv + + # dbus config file. I don't know if we need this, since directory listed + # in the config file doens't exist. Maybe this should be provided by dbus bindings? + # No, after riconsidering I'm not gonna provide it unless it's required. + + # Install nice arch logo to use in the shutdown dialog + install -D -m 644 $srcdir/arch-kdeshutdown.png ${pkgdir}$TDEDIR/share/apps/ksmserver/pics/shutdownkonq.png + + # add startup/shutdown agents for ssh and gpg-agent + install -m644 -D $srcdir/agent-startup.sh ${pkgdir}$TDEDIR/env/agent-startup.sh + install -m755 -D $srcdir/agent-shutdown.sh ${pkgdir}$TDEDIR/shutdown/agent-shutdown.sh + + # fix kde icons for gnome by creating symlinks + mkdir -p ${pkgdir}$TDEDIR/share/icons/gnome/{128x128,64x64,32x32,16x16,48x48,22x22,scalable} + mkdir -p ${pkgdir}$TDEDIR/share/icons/crystalsvg/{128x128/apps,64x64/apps,32x32/apps,16x16/apps,48x48/apps,22x22/apps,scalable/apps} + cd ${pkgdir}$TDEDIR/share/icons/gnome/ + for i in *; do + cd $i + ln -sf ../../crystalsvg/$i/apps/ apps + cd .. + done + +} + +package_trinity-kdm() { + pkgname='trinity-kdm' + pkgdesc="Trinity Display Manager" + + msg "Packaging - $pkgname-$pkgver" + _splitfolders="kdm kdmlib doc/kdm" + for _dir in $_splitfolders; do + cd ${srcdir}/build/$_dir + make DESTDIR="$pkgdir" install + done + + # update the Xsession file, this resolves problem with kdm dropping back + # to the login screen + patch -N ${pkgdir}${TDEDIR}/share/config/kdm/Xsession < ${srcdir}/xsession.patch + + # install kdm rc.d script. We need this to start kdm from rc.d + install -D -m755 ${srcdir}/kdm-trinity "${pkgdir}"/etc/rc.d/kdm-trinity + + # Add image for default user avatar. This removes kdm complains about missing + # default avatar from kdm.log + install -D -m 644 $srcdir/kdm-default-face.png ${pkgdir}$TDEDIR/share/apps/kdm/faces/.default.face.icon + install -D -m 644 $srcdir/kdm-default-face.png ${pkgdir}$TDEDIR/share/apps/kdm/pics/users/arch-kdm.png +} + +package_trinity-konsole() { + pkgname='trinity-konsole' + pkgdesc="Trinity - an X termnal emulator" + + msg "Packaging - $pkgname-$pkgver" + _splitfolders="konsole doc/konsole" + for _dir in $_splitfolders; do + cd ${srcdir}/build/$_dir + make DESTDIR="$pkgdir" install + done +} + +package_trinity-kate() { + pkgnmae='trinity-kate' + pkgdesc="Trinity - A fast texteditor with an Emacs-style document interface" + + msg "Packaging - $pkgname-$pkgver" + _splitfolders="kate doc/kate doc/kwrite" + for _dir in $_splitfolders; do + cd ${srcdir}/build/$_dir + make DESTDIR="$pkgdir" install + done +} + +package_trinity-konqueror() { + pkgname='trinity-kate' + pkgdesc="Trinity Swiss Army file and web browser." + + msg "Packaging - $pkgname-$pkgver" + _splitfolders="konqueror libkonq doc/konqueror" + for _dir in $_splitfolders; do + cd ${srcdir}/build/$_dir + make DESTDIR="$pkgdir" install + done +} diff --git a/arch/3.5.13/trinity-base/trinity-kdebase-split/agent-shutdown.sh b/arch/3.5.13/trinity-base/trinity-kdebase-split/agent-shutdown.sh new file mode 100644 index 000000000..71b056af3 --- /dev/null +++ b/arch/3.5.13/trinity-base/trinity-kdebase-split/agent-shutdown.sh @@ -0,0 +1,13 @@ +#!/bin/sh +# +# This file is executed at kde shutdown. +# Uncomment the following lines to kill the agents +# that were started at session startup. + +if [ "${GPG_AGENT_INFO}" ]; then + kill $(echo ${GPG_AGENT_INFO} | cut -d':' -f 2) >/dev/null 2>&1 +fi +# +if [ "${SSH_AGENT_PID}" ]; then + ssh-agent -k +fi diff --git a/arch/3.5.13/trinity-base/trinity-kdebase-split/agent-startup.sh b/arch/3.5.13/trinity-base/trinity-kdebase-split/agent-startup.sh new file mode 100644 index 000000000..88d1373a1 --- /dev/null +++ b/arch/3.5.13/trinity-base/trinity-kdebase-split/agent-startup.sh @@ -0,0 +1,19 @@ +# Agents startup file +# +# This file is sourced at kde startup, so that +# the environment variables set here are available +# throughout the session. + +# Uncomment the following lines to start gpg-agent +# and/or ssh-agent at kde startup. +# If you do so, do not forget to uncomment the respective +# lines in KDEDIR/shutdown/agent-shutdown.sh to +# properly kill the agents when the session ends. + +if [ -x /usr/bin/gpg-agent ]; then + eval "$(/usr/bin/gpg-agent --daemon)" +fi +# +if [ -x /usr/bin/ssh-agent ]; then + eval "$(/usr/bin/ssh-agent -s)" +fi diff --git a/arch/3.5.13/trinity-base/trinity-kdebase-split/arch-kdeshutdown.png b/arch/3.5.13/trinity-base/trinity-kdebase-split/arch-kdeshutdown.png new file mode 100644 index 000000000..30bc5ab77 Binary files /dev/null and b/arch/3.5.13/trinity-base/trinity-kdebase-split/arch-kdeshutdown.png differ diff --git a/arch/3.5.13/trinity-base/trinity-kdebase-split/kdebase-3.5.13.tar.gz b/arch/3.5.13/trinity-base/trinity-kdebase-split/kdebase-3.5.13.tar.gz new file mode 100644 index 000000000..cdb38cc56 Binary files /dev/null and b/arch/3.5.13/trinity-base/trinity-kdebase-split/kdebase-3.5.13.tar.gz differ diff --git a/arch/3.5.13/trinity-base/trinity-kdebase-split/kdm-default-face.png b/arch/3.5.13/trinity-base/trinity-kdebase-split/kdm-default-face.png new file mode 100644 index 000000000..233e69475 Binary files /dev/null and b/arch/3.5.13/trinity-base/trinity-kdebase-split/kdm-default-face.png differ diff --git a/arch/3.5.13/trinity-base/trinity-kdebase-split/kdm-trinity b/arch/3.5.13/trinity-base/trinity-kdebase-split/kdm-trinity new file mode 100644 index 000000000..03209b456 --- /dev/null +++ b/arch/3.5.13/trinity-base/trinity-kdebase-split/kdm-trinity @@ -0,0 +1,40 @@ +#!/bin/bash + +# general config +. /etc/rc.conf +. /etc/rc.d/functions + +PID=`pidof -o %PPID /opt/trinity/bin/kdm` +case "$1" in + start) + #Check for running kdm, start when not running + stat_busy "Starting TDM Desktop Manager" + [ -z "$PID" ] && /opt/trinity/bin/kdm &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + echo $PID > /var/run/kdm.pid + add_daemon kdm-trinity + stat_done + fi + ;; + stop) + stat_busy "Stopping TDM Desktop Manager" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon kdm-trinity + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" + ;; +esac +exit 0 diff --git a/arch/3.5.13/trinity-base/trinity-kdebase-split/patches.tar.bz2 b/arch/3.5.13/trinity-base/trinity-kdebase-split/patches.tar.bz2 new file mode 100644 index 000000000..0a0b90c54 Binary files /dev/null and b/arch/3.5.13/trinity-base/trinity-kdebase-split/patches.tar.bz2 differ diff --git a/arch/3.5.13/trinity-base/trinity-kdebase-split/trinity-kdebase-3513-5.src.tar.gz b/arch/3.5.13/trinity-base/trinity-kdebase-split/trinity-kdebase-3513-5.src.tar.gz new file mode 100644 index 000000000..c1c6e79a0 Binary files /dev/null and b/arch/3.5.13/trinity-base/trinity-kdebase-split/trinity-kdebase-3513-5.src.tar.gz differ diff --git a/arch/3.5.13/trinity-base/trinity-kdebase-split/trinity-kdebase.install b/arch/3.5.13/trinity-base/trinity-kdebase-split/trinity-kdebase.install new file mode 100644 index 000000000..82f34a0b0 --- /dev/null +++ b/arch/3.5.13/trinity-base/trinity-kdebase-split/trinity-kdebase.install @@ -0,0 +1,19 @@ +post_install() { + ldconfig &> /dev/null + mkpamserv trinity + echo "Please remember that you can change your kdesu backend from su to sudo" + echo "by adding following lines to your ~/.trinity/share/kdesurc or to the" + echo "$TDEDIR/share/config/kdesurc:" + echo "[super-user-command]" + echo "super-user-command=sudo" +} + +post_upgrade() { + post_install +} + +post_remove() { + ldconfig &> /dev/null + rm /etc/pam.d/trinity +} + diff --git a/arch/3.5.13/trinity-base/trinity-kdebase-split/trinity.desktop b/arch/3.5.13/trinity-base/trinity-kdebase-split/trinity.desktop new file mode 100644 index 000000000..30c209f5d --- /dev/null +++ b/arch/3.5.13/trinity-base/trinity-kdebase-split/trinity.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Encoding=UTF-8 +Type=XSession +Exec=/opt/trinity/bin/startkde +TryExec=/opt/trinity/bin/startkde +Name=Trinity +Comment=The Trinity Desktop Environment. A powerful Open Source graphical desktop environment + diff --git a/arch/3.5.13/trinity-base/trinity-kdebase-split/xsession.patch b/arch/3.5.13/trinity-base/trinity-kdebase-split/xsession.patch new file mode 100644 index 000000000..164d6c811 --- /dev/null +++ b/arch/3.5.13/trinity-base/trinity-kdebase-split/xsession.patch @@ -0,0 +1,28 @@ +--- /mnt/archlinux/opt/trinity/share/config/kdm/Xsession 2011-12-08 13:08:43.000000000 +0100 ++++ /opt/kde3/share/config/kdm/Xsession 2011-09-24 14:52:28.000000000 +0200 +@@ -43,4 +43,24 @@ + ;; + esac + # invoke global X session script +-. /etc/X11/Xsession ++ ++ ++ case $session in ++ "") ++ exec xmessage -center -buttons OK:0 -default OK "Sorry, $DESKTOP_SESSION is no valid session." ++ ;; ++ failsafe) ++ exec ck-launch-session xterm -geometry 80x24-0-0 ++ ;; ++ custom) ++ exec ck-launch-session $HOME/.xsession ++ ;; ++ default) ++ exec ck-launch-session /opt/trinity/bin/startkde ++ ;; ++ *) ++ eval exec ck-launch-session "$session" ++ ;; ++ esac ++ exec xmessage -center -buttons OK:0 -default OK "Sorry, cannot execute $session. Check $DESKTOP_SESSION.desktop." ++ -- cgit v1.2.1 From 9bffb7853cac8704542b6fc68e6b7bf259617e89 Mon Sep 17 00:00:00 2001 From: "Pawel \"l0ner\" Soltys" Date: Wed, 8 Feb 2012 18:53:33 +0100 Subject: tqtinterface: updated pkgrel --- arch/3.5.13/trinity-base/trinity-tqtinterface/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/3.5.13/trinity-base/trinity-tqtinterface/PKGBUILD b/arch/3.5.13/trinity-base/trinity-tqtinterface/PKGBUILD index d960bb18e..a1f14f9a3 100644 --- a/arch/3.5.13/trinity-base/trinity-tqtinterface/PKGBUILD +++ b/arch/3.5.13/trinity-base/trinity-tqtinterface/PKGBUILD @@ -3,7 +3,7 @@ pkgname=trinity-tqtinterface pkgver=3513 -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64') url="http://trinity.pearsoncomputing.net" license=('GPL2') -- cgit v1.2.1 From 8de6855e3c5f46b5bc0cf3886a2b4b759d51e09d Mon Sep 17 00:00:00 2001 From: "Pawel \"l0ner\" Soltys" Date: Wed, 8 Feb 2012 19:00:02 +0100 Subject: kdelibs: updated pkgrel --- arch/3.5.13/trinity-base/trinity-kdelibs/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/3.5.13/trinity-base/trinity-kdelibs/PKGBUILD b/arch/3.5.13/trinity-base/trinity-kdelibs/PKGBUILD index 5bbdd9b92..be5a03bfc 100644 --- a/arch/3.5.13/trinity-base/trinity-kdelibs/PKGBUILD +++ b/arch/3.5.13/trinity-base/trinity-kdelibs/PKGBUILD @@ -3,7 +3,7 @@ pkgname=trinity-kdelibs pkgver=3513 -pkgrel=5 +pkgrel=6 arch=('i686' 'x86_64') url='http://www.trinitydesktop.org' license=('GPL') -- cgit v1.2.1 From 3f2f3dd91b459d9ff89f32b94bf1b1fb1bc61719 Mon Sep 17 00:00:00 2001 From: "Pawel \"l0ner\" Soltys" Date: Wed, 8 Feb 2012 20:26:19 +0100 Subject: kdebase: removed what was left of the split pkgbuild --- arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD b/arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD index 42cc76347..fa012a743 100644 --- a/arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD +++ b/arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD @@ -97,9 +97,9 @@ build() { } -package_trinity-kdebase() { - +package() { msg "Packaging - $pkgname-$pkgver" + cd $srcdir/build make DESTDIR="$pkgdir" install # install X11 session file -- cgit v1.2.1 From ff9a8eada96251dffad1c313849e89cdaf7584da Mon Sep 17 00:00:00 2001 From: "Pawel \"l0ner\" Soltys" Date: Wed, 8 Feb 2012 20:54:01 +0100 Subject: kdebase: fixed starttrinity link --- arch/3.5.13/trinity-base/trinity-kdebase-split/PKGBUILD | 4 ++-- arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/3.5.13/trinity-base/trinity-kdebase-split/PKGBUILD b/arch/3.5.13/trinity-base/trinity-kdebase-split/PKGBUILD index a9c0047ce..bab5805d7 100644 --- a/arch/3.5.13/trinity-base/trinity-kdebase-split/PKGBUILD +++ b/arch/3.5.13/trinity-base/trinity-kdebase-split/PKGBUILD @@ -3,7 +3,7 @@ pkgname=('trinity-kdebase' 'trinity-kdm' 'trinity-konsole' 'trinity-kate' 'trinity-konqueror') pkgver=3513 -pkgrel=5 +pkgrel=6 arch=('i686' 'x86_64') url='http://www.trinitydesktop.org' license=('GPL') @@ -127,7 +127,7 @@ package_trinity-kdebase() { # create the starttrinity link # do we need this? wouldn't be better to rename startkde script # to starttrinity? Well, whathever. - ln -sf ${pkgdir}$TDEDIR/bin/startkde ${pkgdir}$TDEDIR/bin/starttrinity + ln -sf $TDEDIR/bin/startkde ${pkgdir}$TDEDIR/bin/starttrinity # install mkpamserv script, so we can auto-generate pam.d configs in post_install() install -D -m755 ${srcdir}/kdebase/mkpamserv ${pkgdir}${TDEDIR}/bin/mkpamserv diff --git a/arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD b/arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD index fa012a743..10fd8260f 100644 --- a/arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD +++ b/arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD @@ -3,7 +3,7 @@ pkgname='trinity-kdebase' pkgver=3513 -pkgrel=5 +pkgrel=7 arch=('i686' 'x86_64') url='http://www.trinitydesktop.org' license=('GPL') @@ -121,7 +121,7 @@ package() { # create the starttrinity link # do we need this? wouldn't be better to rename startkde script # to starttrinity? Well, whathever. - ln -sf ${pkgdir}$TDEDIR/bin/startkde ${pkgdir}$TDEDIR/bin/starttrinity + ln -sf $TDEDIR/bin/startkde ${pkgdir}$TDEDIR/bin/starttrinity # install mkpamserv script, so we can auto-generate pam.d configs in post_install() install -D -m755 ${srcdir}/kdebase/mkpamserv ${pkgdir}${TDEDIR}/bin/mkpamserv -- cgit v1.2.1 From d3bbe1a1e2187f463c106ad1baf82b68b3c87852 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 9 Feb 2012 09:30:10 -0600 Subject: Fix tdelibs FTBFS on Debian and Ubuntu --- debian/lenny/applications/k3b/debian/rules | 2 +- debian/lenny/tdelibs/debian/tdelibs4-trinity-dev.install | 16 ++++++++-------- debian/squeeze/applications/k3b/debian/rules | 2 +- .../squeeze/tdelibs/debian/tdelibs4-trinity-dev.install | 16 ++++++++-------- ubuntu/maverick/applications/k3b/debian/rules | 2 +- .../maverick/tdelibs/debian/tdelibs4-trinity-dev.install | 16 ++++++++-------- 6 files changed, 27 insertions(+), 27 deletions(-) diff --git a/debian/lenny/applications/k3b/debian/rules b/debian/lenny/applications/k3b/debian/rules index 664df39cf..3a19a0ec8 100755 --- a/debian/lenny/applications/k3b/debian/rules +++ b/debian/lenny/applications/k3b/debian/rules @@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include debian/cdbs/kde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde5 +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde5 DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_PREFIX := /opt/trinity DEB_CONFIGURE_INFODIR := /opt/trinity/share/info diff --git a/debian/lenny/tdelibs/debian/tdelibs4-trinity-dev.install b/debian/lenny/tdelibs/debian/tdelibs4-trinity-dev.install index 637e5ff60..3d2e8e43b 100644 --- a/debian/lenny/tdelibs/debian/tdelibs4-trinity-dev.install +++ b/debian/lenny/tdelibs/debian/tdelibs4-trinity-dev.install @@ -197,12 +197,12 @@ debian/tmp/opt/trinity/include/kdatewidget.h debian/tmp/opt/trinity/include/kdcopactionproxy.h debian/tmp/opt/trinity/include/kdcoppropertyproxy.h debian/tmp/opt/trinity/include/kdcopservicestarter.h -debian/tmp/opt/trinity/include/tdebugclasses.h -debian/tmp/opt/trinity/include/tdebug.h -debian/tmp/opt/trinity/include/tdedmodule.h -debian/tmp/opt/trinity/include/tde_file.h +debian/tmp/opt/trinity/include/kdebugclasses.h +debian/tmp/opt/trinity/include/kdebug.h +debian/tmp/opt/trinity/include/kdedmodule.h +debian/tmp/opt/trinity/include/kde_file.h debian/tmp/opt/trinity/include/tdelibs_export.h -debian/tmp/opt/trinity/include/tdemacros.h +debian/tmp/opt/trinity/include/kdemacros.h debian/tmp/opt/trinity/include/kde.pot debian/tmp/opt/trinity/include/tdeprint/driver.h debian/tmp/opt/trinity/include/tdeprint/kiconselectaction.h @@ -221,7 +221,7 @@ debian/tmp/opt/trinity/include/tdeprint/kprintdialogpage.h debian/tmp/opt/trinity/include/tdeprint/lpr/lprhandler.h debian/tmp/opt/trinity/include/tdeprint/lpr/lprsettings.h debian/tmp/opt/trinity/include/tdeprint/lpr/printcapentry.h -debian/tmp/opt/trinity/include/tdesktopfile.h +debian/tmp/opt/trinity/include/kdesktopfile.h debian/tmp/opt/trinity/include/tdesu/client.h debian/tmp/opt/trinity/include/tdesu/defaults.h debian/tmp/opt/trinity/include/tdesu/kcookie.h @@ -231,7 +231,7 @@ debian/tmp/opt/trinity/include/tdesu/pty.h debian/tmp/opt/trinity/include/tdesu/ssh.h debian/tmp/opt/trinity/include/tdesu/stub.h debian/tmp/opt/trinity/include/tdesu/su.h -debian/tmp/opt/trinity/include/tde_terminal_interface.h +debian/tmp/opt/trinity/include/kde_terminal_interface.h debian/tmp/opt/trinity/include/tdeversion.h debian/tmp/opt/trinity/include/kdialogbase.h debian/tmp/opt/trinity/include/kdialog.h @@ -717,7 +717,7 @@ debian/tmp/opt/trinity/include/networkstatusindicator.h debian/tmp/opt/trinity/include/connectionmanager.h debian/tmp/opt/trinity/include/serviceiface.h debian/tmp/opt/trinity/include/provideriface.h -#debian/tmp/opt/trinity/include/tdemm +#debian/tmp/opt/trinity/include/kdemm debian/tmp/opt/trinity/lib/libnetworkstatus.la debian/tmp/opt/trinity/lib/libnetworkstatus.so diff --git a/debian/squeeze/applications/k3b/debian/rules b/debian/squeeze/applications/k3b/debian/rules index 664df39cf..3a19a0ec8 100755 --- a/debian/squeeze/applications/k3b/debian/rules +++ b/debian/squeeze/applications/k3b/debian/rules @@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include debian/cdbs/kde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde5 +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde5 DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_PREFIX := /opt/trinity DEB_CONFIGURE_INFODIR := /opt/trinity/share/info diff --git a/debian/squeeze/tdelibs/debian/tdelibs4-trinity-dev.install b/debian/squeeze/tdelibs/debian/tdelibs4-trinity-dev.install index 637e5ff60..3d2e8e43b 100644 --- a/debian/squeeze/tdelibs/debian/tdelibs4-trinity-dev.install +++ b/debian/squeeze/tdelibs/debian/tdelibs4-trinity-dev.install @@ -197,12 +197,12 @@ debian/tmp/opt/trinity/include/kdatewidget.h debian/tmp/opt/trinity/include/kdcopactionproxy.h debian/tmp/opt/trinity/include/kdcoppropertyproxy.h debian/tmp/opt/trinity/include/kdcopservicestarter.h -debian/tmp/opt/trinity/include/tdebugclasses.h -debian/tmp/opt/trinity/include/tdebug.h -debian/tmp/opt/trinity/include/tdedmodule.h -debian/tmp/opt/trinity/include/tde_file.h +debian/tmp/opt/trinity/include/kdebugclasses.h +debian/tmp/opt/trinity/include/kdebug.h +debian/tmp/opt/trinity/include/kdedmodule.h +debian/tmp/opt/trinity/include/kde_file.h debian/tmp/opt/trinity/include/tdelibs_export.h -debian/tmp/opt/trinity/include/tdemacros.h +debian/tmp/opt/trinity/include/kdemacros.h debian/tmp/opt/trinity/include/kde.pot debian/tmp/opt/trinity/include/tdeprint/driver.h debian/tmp/opt/trinity/include/tdeprint/kiconselectaction.h @@ -221,7 +221,7 @@ debian/tmp/opt/trinity/include/tdeprint/kprintdialogpage.h debian/tmp/opt/trinity/include/tdeprint/lpr/lprhandler.h debian/tmp/opt/trinity/include/tdeprint/lpr/lprsettings.h debian/tmp/opt/trinity/include/tdeprint/lpr/printcapentry.h -debian/tmp/opt/trinity/include/tdesktopfile.h +debian/tmp/opt/trinity/include/kdesktopfile.h debian/tmp/opt/trinity/include/tdesu/client.h debian/tmp/opt/trinity/include/tdesu/defaults.h debian/tmp/opt/trinity/include/tdesu/kcookie.h @@ -231,7 +231,7 @@ debian/tmp/opt/trinity/include/tdesu/pty.h debian/tmp/opt/trinity/include/tdesu/ssh.h debian/tmp/opt/trinity/include/tdesu/stub.h debian/tmp/opt/trinity/include/tdesu/su.h -debian/tmp/opt/trinity/include/tde_terminal_interface.h +debian/tmp/opt/trinity/include/kde_terminal_interface.h debian/tmp/opt/trinity/include/tdeversion.h debian/tmp/opt/trinity/include/kdialogbase.h debian/tmp/opt/trinity/include/kdialog.h @@ -717,7 +717,7 @@ debian/tmp/opt/trinity/include/networkstatusindicator.h debian/tmp/opt/trinity/include/connectionmanager.h debian/tmp/opt/trinity/include/serviceiface.h debian/tmp/opt/trinity/include/provideriface.h -#debian/tmp/opt/trinity/include/tdemm +#debian/tmp/opt/trinity/include/kdemm debian/tmp/opt/trinity/lib/libnetworkstatus.la debian/tmp/opt/trinity/lib/libnetworkstatus.so diff --git a/ubuntu/maverick/applications/k3b/debian/rules b/ubuntu/maverick/applications/k3b/debian/rules index 664df39cf..3a19a0ec8 100755 --- a/ubuntu/maverick/applications/k3b/debian/rules +++ b/ubuntu/maverick/applications/k3b/debian/rules @@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include debian/cdbs/kde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde5 +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde5 DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_PREFIX := /opt/trinity DEB_CONFIGURE_INFODIR := /opt/trinity/share/info diff --git a/ubuntu/maverick/tdelibs/debian/tdelibs4-trinity-dev.install b/ubuntu/maverick/tdelibs/debian/tdelibs4-trinity-dev.install index 637e5ff60..3d2e8e43b 100644 --- a/ubuntu/maverick/tdelibs/debian/tdelibs4-trinity-dev.install +++ b/ubuntu/maverick/tdelibs/debian/tdelibs4-trinity-dev.install @@ -197,12 +197,12 @@ debian/tmp/opt/trinity/include/kdatewidget.h debian/tmp/opt/trinity/include/kdcopactionproxy.h debian/tmp/opt/trinity/include/kdcoppropertyproxy.h debian/tmp/opt/trinity/include/kdcopservicestarter.h -debian/tmp/opt/trinity/include/tdebugclasses.h -debian/tmp/opt/trinity/include/tdebug.h -debian/tmp/opt/trinity/include/tdedmodule.h -debian/tmp/opt/trinity/include/tde_file.h +debian/tmp/opt/trinity/include/kdebugclasses.h +debian/tmp/opt/trinity/include/kdebug.h +debian/tmp/opt/trinity/include/kdedmodule.h +debian/tmp/opt/trinity/include/kde_file.h debian/tmp/opt/trinity/include/tdelibs_export.h -debian/tmp/opt/trinity/include/tdemacros.h +debian/tmp/opt/trinity/include/kdemacros.h debian/tmp/opt/trinity/include/kde.pot debian/tmp/opt/trinity/include/tdeprint/driver.h debian/tmp/opt/trinity/include/tdeprint/kiconselectaction.h @@ -221,7 +221,7 @@ debian/tmp/opt/trinity/include/tdeprint/kprintdialogpage.h debian/tmp/opt/trinity/include/tdeprint/lpr/lprhandler.h debian/tmp/opt/trinity/include/tdeprint/lpr/lprsettings.h debian/tmp/opt/trinity/include/tdeprint/lpr/printcapentry.h -debian/tmp/opt/trinity/include/tdesktopfile.h +debian/tmp/opt/trinity/include/kdesktopfile.h debian/tmp/opt/trinity/include/tdesu/client.h debian/tmp/opt/trinity/include/tdesu/defaults.h debian/tmp/opt/trinity/include/tdesu/kcookie.h @@ -231,7 +231,7 @@ debian/tmp/opt/trinity/include/tdesu/pty.h debian/tmp/opt/trinity/include/tdesu/ssh.h debian/tmp/opt/trinity/include/tdesu/stub.h debian/tmp/opt/trinity/include/tdesu/su.h -debian/tmp/opt/trinity/include/tde_terminal_interface.h +debian/tmp/opt/trinity/include/kde_terminal_interface.h debian/tmp/opt/trinity/include/tdeversion.h debian/tmp/opt/trinity/include/kdialogbase.h debian/tmp/opt/trinity/include/kdialog.h @@ -717,7 +717,7 @@ debian/tmp/opt/trinity/include/networkstatusindicator.h debian/tmp/opt/trinity/include/connectionmanager.h debian/tmp/opt/trinity/include/serviceiface.h debian/tmp/opt/trinity/include/provideriface.h -#debian/tmp/opt/trinity/include/tdemm +#debian/tmp/opt/trinity/include/kdemm debian/tmp/opt/trinity/lib/libnetworkstatus.la debian/tmp/opt/trinity/lib/libnetworkstatus.so -- cgit v1.2.1 From 5af55a23e907b973ec89c7a95411eb15e2e461db Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 10 Feb 2012 14:22:27 -0600 Subject: Fix tdebase FTBFS on Debian and Ubuntu --- debian/lenny/tdebase/debian/patches/disable_starttde_wallpaper.diff | 6 +++--- .../squeeze/tdebase/debian/patches/disable_starttde_wallpaper.diff | 6 +++--- .../maverick/tdebase/debian/patches/disable_starttde_wallpaper.diff | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/debian/lenny/tdebase/debian/patches/disable_starttde_wallpaper.diff b/debian/lenny/tdebase/debian/patches/disable_starttde_wallpaper.diff index 21011fbd5..00cc8ca37 100644 --- a/debian/lenny/tdebase/debian/patches/disable_starttde_wallpaper.diff +++ b/debian/lenny/tdebase/debian/patches/disable_starttde_wallpaper.diff @@ -1,12 +1,12 @@ --- starttde +++ starttde -@@ -184,17 +184,17 @@ +@@ -228,17 +228,17 @@ . $tdehome/share/config/startupconfig fi -# Make sure a default wallpaper is set. -if [ ! -e $tdehome/share/config/kdesktoprc ]; then -- # With Trinity KDE this file should exist, but test first. +- # With Trinity this file should exist, but test first. - if [ -r /usr/share/wallpapers/isadora.png.desktop ]; then -cat >$tdehome/share/config/kdesktoprc <$tdehome/share/config/kdesktoprc <$tdehome/share/config/kdesktoprc <$tdehome/share/config/kdesktoprc <$tdehome/share/config/kdesktoprc <$tdehome/share/config/kdesktoprc < Date: Sun, 12 Feb 2012 18:02:45 +0100 Subject: [RHEL/Fedora] Adds kdebluetooth --- redhat/components.txt | 1 + .../kdebluetooth-1.0_beta8-gcc43.patch | 110 +++++++ .../extras/kdebluetooth/kdebluetooth-trinity.patch | 131 ++++++++ ...kdebluetooth_1.0~beta9~r769275-0ubuntu1.diff.gz | Bin 0 -> 29602 bytes .../kdebluetooth_1.0~beta9~r769275.orig.tar.gz | Bin 0 -> 2045030 bytes .../extras/kdebluetooth/trinity-kdebluetooth.spec | 365 +++++++++++++++++++++ 6 files changed, 607 insertions(+) create mode 100644 redhat/extras/kdebluetooth/kdebluetooth-1.0_beta8-gcc43.patch create mode 100644 redhat/extras/kdebluetooth/kdebluetooth-trinity.patch create mode 100644 redhat/extras/kdebluetooth/kdebluetooth_1.0~beta9~r769275-0ubuntu1.diff.gz create mode 100644 redhat/extras/kdebluetooth/kdebluetooth_1.0~beta9~r769275.orig.tar.gz create mode 100644 redhat/extras/kdebluetooth/trinity-kdebluetooth.spec diff --git a/redhat/components.txt b/redhat/components.txt index 3bb77eea2..f8b06c9aa 100644 --- a/redhat/components.txt +++ b/redhat/components.txt @@ -36,6 +36,7 @@ extras/kasablanca extras/ksensors extras/libkarma #extras/libkexif +extras/kdebluetooth extras/trinity-desktop extras/trinity-live applications/k3b diff --git a/redhat/extras/kdebluetooth/kdebluetooth-1.0_beta8-gcc43.patch b/redhat/extras/kdebluetooth/kdebluetooth-1.0_beta8-gcc43.patch new file mode 100644 index 000000000..abe24f805 --- /dev/null +++ b/redhat/extras/kdebluetooth/kdebluetooth-1.0_beta8-gcc43.patch @@ -0,0 +1,110 @@ +diff -up kdebluetooth-1.0_beta8/kdebluetooth/kcm_btpaired/pairedtab.h~ kdebluetooth-1.0_beta8/kdebluetooth/kcm_btpaired/pairedtab.h +--- kdebluetooth-1.0_beta8/kdebluetooth/kcm_btpaired/pairedtab.h~ 2007-09-17 19:52:30.000000000 +0300 ++++ kdebluetooth-1.0_beta8/kdebluetooth/kcm_btpaired/pairedtab.h 2008-01-06 15:45:56.000000000 +0200 +@@ -29,6 +29,7 @@ + #define PAIREDTAB_H + + #include "pairedtabbase.h" ++#include + #include + #include + #include +diff -up kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexserverops.cpp~ kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexserverops.cpp +--- kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexserverops.cpp~ 2007-09-17 19:52:31.000000000 +0300 ++++ kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexserverops.cpp 2008-01-06 15:58:29.000000000 +0200 +@@ -28,6 +28,7 @@ + #include "qobexserverops.h" + #include "qobexauth.h" + ++#undef myDebug + #undef DEBUG + // #define DEBUG + #ifdef DEBUG +diff -up kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexserverconnection.cpp~ kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexserverconnection.cpp +--- kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexserverconnection.cpp~ 2007-09-17 19:52:31.000000000 +0300 ++++ kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexserverconnection.cpp 2008-01-06 15:57:54.000000000 +0200 +@@ -42,6 +42,7 @@ + #include "qobexnullserverops.h" + #include "qobexserverops.h" + ++#undef myDebug + #undef DEBUG + #define DEBUG + #ifdef DEBUG +diff -up kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexclient.cpp~ kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexclient.cpp +--- kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexclient.cpp~ 2007-09-17 19:52:31.000000000 +0300 ++++ kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexclient.cpp 2008-01-06 15:56:55.000000000 +0200 +@@ -31,6 +31,7 @@ + + #include "qobexclient.h" + ++#undef myDebug + //#undef DEBUG + #define DEBUG + #ifdef DEBUG +diff -up kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexserialtransport.cpp~ kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexserialtransport.cpp +--- kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexserialtransport.cpp~ 2007-09-17 19:52:31.000000000 +0300 ++++ kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexserialtransport.cpp 2008-01-06 15:59:12.000000000 +0200 +@@ -31,6 +31,7 @@ + + #include "qobexserialtransport.h" + ++#undef myDebug + #undef DEBUG + // #define DEBUG + #ifdef DEBUG +diff -up kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobextransport.cpp~ kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobextransport.cpp +--- kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobextransport.cpp~ 2007-09-17 19:52:31.000000000 +0300 ++++ kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobextransport.cpp 2008-01-06 15:57:32.000000000 +0200 +@@ -46,6 +46,7 @@ + + #include "qobextransport.h" + ++#undef myDebug + //#undef DEBUG + #define DEBUG + #ifdef DEBUG +diff -up kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qserialdevice.cpp~ kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qserialdevice.cpp +--- kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qserialdevice.cpp~ 2007-09-17 19:52:31.000000000 +0300 ++++ kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qserialdevice.cpp 2008-01-06 15:58:59.000000000 +0200 +@@ -43,6 +43,7 @@ + #include "qttylock.h" + #include "qserialdevice.h" + ++#undef myDebug + #undef DEBUG + // #define DEBUG + #ifdef DEBUG +diff -up kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexbase.cpp~ kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexbase.cpp +--- kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexbase.cpp~ 2007-09-17 19:52:31.000000000 +0300 ++++ kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexbase.cpp 2008-01-06 15:58:05.000000000 +0200 +@@ -23,6 +23,7 @@ + + #include "qobexbase.h" + ++#undef myDebug + #undef DEBUG + // #define DEBUG + #ifdef DEBUG +diff -up kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexserver.cpp~ kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexserver.cpp +--- kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexserver.cpp~ 2007-09-17 19:52:31.000000000 +0300 ++++ kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexserver.cpp 2008-01-06 15:57:13.000000000 +0200 +@@ -31,6 +31,7 @@ + + #include "qobexserver.h" + ++#undef myDebug + #undef DEBUG + // #define DEBUG + #ifdef DEBUG +diff -up kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexericssontransport.cpp~ kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexericssontransport.cpp +--- kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexericssontransport.cpp~ 2007-09-17 19:52:31.000000000 +0300 ++++ kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexericssontransport.cpp 2008-01-06 15:58:44.000000000 +0200 +@@ -31,6 +31,7 @@ + + #include "qobexericssontransport.h" + ++#undef myDebug + #undef DEBUG + #define DEBUG + #ifdef DEBUG diff --git a/redhat/extras/kdebluetooth/kdebluetooth-trinity.patch b/redhat/extras/kdebluetooth/kdebluetooth-trinity.patch new file mode 100644 index 000000000..db62a3b8c --- /dev/null +++ b/redhat/extras/kdebluetooth/kdebluetooth-trinity.patch @@ -0,0 +1,131 @@ +diff -Nuar kdebluetooth.ORI/admin/acinclude.m4.in kdebluetooth.P/admin/acinclude.m4.in +--- kdebluetooth.ORI/admin/acinclude.m4.in 2012-02-12 14:10:33.093808915 +0100 ++++ kdebluetooth.P/admin/acinclude.m4.in 2012-02-12 14:13:57.437558226 +0100 +@@ -483,10 +483,10 @@ + fi + fi + if test -z "$kde_styledir"; then +- kde_styledir='\${libdir}/kde3/plugins/styles' ++ kde_styledir='\${libdir}/trinity/plugins/styles' + fi + if test -z "$kde_widgetdir"; then +- kde_widgetdir='\${libdir}/kde3/plugins/designer' ++ kde_widgetdir='\${libdir}/trinity/plugins/designer' + fi + if test -z "$xdg_appsdir"; then + xdg_appsdir='\${datadir}/applications/kde' +@@ -1813,7 +1813,7 @@ + + kde_widgetdir=NO + dnl this might be somewhere else +-AC_FIND_FILE("kde3/plugins/designer/kdewidgets.la", $kde_libdirs, kde_widgetdir) ++AC_FIND_FILE("trinity/plugins/designer/kdewidgets.la", $kde_libdirs, kde_widgetdir) + + if test -n "$ac_kde_libraries" && test ! -r "$ac_kde_libraries/$kde_check_lib"; then + AC_MSG_ERROR([ +@@ -1821,14 +1821,14 @@ + So, check this please and use another prefix!]) + fi + +-if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/kdewidgets.la"; then ++if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/trinity/plugins/designer/kdewidgets.la"; then + AC_MSG_ERROR([ + I can't find the designer plugins. These are required and should have been installed + by kdelibs]) + fi + + if test -n "$kde_widgetdir"; then +- kde_widgetdir="$kde_widgetdir/kde3/plugins/designer" ++ kde_widgetdir="$kde_widgetdir/trinity/plugins/designer" + fi + + +diff -Nuar kdebluetooth.ORI/admin/cvs.sh kdebluetooth.P/admin/cvs.sh +--- kdebluetooth.ORI/admin/cvs.sh 2012-02-12 14:10:33.093808915 +0100 ++++ kdebluetooth.P/admin/cvs.sh 2012-02-12 14:11:27.951558154 +0100 +@@ -68,7 +68,7 @@ + echo "*** KDE requires automake $required_automake_version" + exit 1 + ;; +- automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10*) ++ automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.1[0-9]*) + echo "*** $AUTOMAKE_STRING found." + UNSERMAKE=no + ;; +--- kdebluetooth-1.0~beta9~r769275/kdebluetooth/libkbluetooth/Makefile.am.ORI 2012-02-12 14:40:37.124683567 +0100 ++++ kdebluetooth-1.0~beta9~r769275/kdebluetooth/libkbluetooth/Makefile.am 2012-02-12 14:41:13.572933231 +0100 +@@ -12,7 +12,7 @@ + libkbluetooth_la_LIBADD = $(LIB_KDECORE) $(DBUS_LIBS) $(LIB_KIO) $(BLUETOOTH_LIBS) -ldbus-qt-1 + + libkbluetoothincludedir = $(includedir)/libkbluetooth +-libkbluetoothinclude_HEADERS = adapter.h dbusinit.h dbussignal.h dbussignal.h manager.h inputdevice.h inputmanager.h \ ++libkbluetoothinclude_HEADERS = adapter.h dbusinit.h dbussignal.h manager.h inputdevice.h inputmanager.h \ + security.h dbusfilter.h service.h passkeyagent.h servicerecord.h devicemimeconverter.h \ + deviceaddress.h rfcommsocket.h servicediscovery.h sdpservice.h namerequest.h adapter_old.h \ + sdpdevice.h sdpattribute.h serviceselectionwidget.h inquiry.h hcisocket.h hcidefault.h \ +--- kdebluetooth-1.0~beta9~r769275/kdebluetooth/kbluetooth/Makefile.am.ORI 2012-02-12 15:23:53.713273076 +0100 ++++ kdebluetooth-1.0~beta9~r769275/kdebluetooth/kbluetooth/Makefile.am 2012-02-12 15:24:04.547424194 +0100 +@@ -4,7 +4,7 @@ + bin_PROGRAMS = kbluetooth + + kbluetooth_SOURCES = adapterconfig.cpp adapterdialog.ui authorize.cpp authdialog.ui deviceconfig.cpp trayicon.cpp main.cpp application.cpp pindefdialog.ui pindialog.cpp confirmationdlgbase.ui confirmation.cpp rfcommportlistener.cpp procinheritsock.cpp portlistener.cpp sdprecord.cpp +-kbluetooth_LDFLAGS = $(KDE_RPATH) $(DBUS_LIBS) -ldbus-qt-1 $(all_libraries) ++kbluetooth_LDFLAGS = $(KDE_RPATH) $(DBUS_LIBS) -ldbus-qt-1 $(all_libraries) -lDCOP -lkdefx + kbluetooth_LDADD = ../libkbluetooth/libkbluetooth.la $(LIB_KIO) $(LIB_KDEUI) + + # this is where the desktop file will go +--- kdebluetooth-1.0~beta9~r769275/kdebluetooth/kbluemon/Makefile.am.ORI 2012-02-12 15:27:57.544671388 +0100 ++++ kdebluetooth-1.0~beta9~r769275/kdebluetooth/kbluemon/Makefile.am 2012-02-12 15:28:03.821758799 +0100 +@@ -4,7 +4,7 @@ + bin_PROGRAMS = kbluemon + + kbluemon_SOURCES = main.cpp monitor.cpp mondialog.ui +-kbluemon_LDFLAGS = $(KDE_RPATH) $(DBUS_LIBS) -ldbus-qt-1 $(all_libraries) ++kbluemon_LDFLAGS = $(KDE_RPATH) $(DBUS_LIBS) -ldbus-qt-1 $(all_libraries) -lkdefx + kbluemon_LDADD = ../libkbluetooth/libkbluetooth.la $(LIB_KIO) $(LIB_KDEUI) + + # this is where the desktop file will go +--- kdebluetooth-1.0~beta9~r769275/kdebluetooth/kbluelock/Makefile.am.ORI 2012-02-12 15:29:34.900026701 +0100 ++++ kdebluetooth-1.0~beta9~r769275/kdebluetooth/kbluelock/Makefile.am 2012-02-12 15:29:40.774108449 +0100 +@@ -4,7 +4,7 @@ + bin_PROGRAMS = kbluelock + + kbluelock_SOURCES = main.cpp kbluelock.cpp lockdialog.ui +-kbluelock_LDFLAGS = $(KDE_RPATH) $(DBUS_LIBS) -ldbus-qt-1 $(all_libraries) ++kbluelock_LDFLAGS = $(KDE_RPATH) $(DBUS_LIBS) -ldbus-qt-1 $(all_libraries) -lDCOP -lkdefx + kbluelock_LDADD = ../libkbluetooth/libkbluetooth.la $(LIB_KIO) $(LIB_KDEUI) + + # this is where the desktop file will go +--- kdebluetooth-1.0~beta9~r769275/kdebluetooth/kinputwizard/Makefile.am.ORI 2012-02-12 15:31:54.069962658 +0100 ++++ kdebluetooth-1.0~beta9~r769275/kdebluetooth/kinputwizard/Makefile.am 2012-02-12 15:32:00.579053161 +0100 +@@ -4,7 +4,7 @@ + bin_PROGRAMS = kinputwizard + + kinputwizard_SOURCES = main.cpp inputwizard.cpp inputdialog.ui inputdialog_ext.ui +-kinputwizard_LDFLAGS = $(KDE_RPATH) $(DBUS_LIBS) -ldbus-qt-1 $(all_libraries) ++kinputwizard_LDFLAGS = $(KDE_RPATH) $(DBUS_LIBS) -ldbus-qt-1 $(all_libraries) -lkdefx + kinputwizard_LDADD = ../libkbluetooth/libkbluetooth.la $(LIB_KIO) $(LIB_KDEUI) + + +--- kdebluetooth-1.0~beta9~r769275/kdebluetooth/kbtobexsrv/Makefile.am.ORI 2012-02-12 15:33:26.869242631 +0100 ++++ kdebluetooth-1.0~beta9~r769275/kdebluetooth/kbtobexsrv/Makefile.am 2012-02-12 15:33:44.826485520 +0100 +@@ -19,7 +19,7 @@ + + # the application source, library search path, and link libraries + kbtobexsrv_SOURCES = main.cpp maindlg.cpp maindlgbase.ui myfileiconview.cpp +-kbtobexsrv_LDFLAGS = $(KDE_RPATH) $(all_libraries) ++kbtobexsrv_LDFLAGS = $(KDE_RPATH) $(all_libraries) -lkdefx + kbtobexsrv_LDADD = ../libkbluetooth/libkbluetooth.la ../libkobex/libkobex.la $(LIB_KIO) $(OPENOBEX_LIBS) -lkio $(LIB_KDEUI) $(BLUETOOTH_LIBS) + + # this is where the desktop file will go +--- kdebluetooth-1.0~beta9~r769275/kdebluetooth/kbtobexclient/Makefile.am.ORI 2012-02-12 15:35:17.239735523 +0100 ++++ kdebluetooth-1.0~beta9~r769275/kdebluetooth/kbtobexclient/Makefile.am 2012-02-12 15:35:25.381845659 +0100 +@@ -17,7 +17,7 @@ + + # the application source, library search path, and link libraries + +-kbtobexclient_LDFLAGS = $(KDE_RPATH) $(all_libraries) ++kbtobexclient_LDFLAGS = $(KDE_RPATH) $(all_libraries) -lkdefx + kbtobexclient_LDADD = ../libkbluetooth/libkbluetooth.la ../libkobex/libkobex.la $(LIB_KIO) $(OPENOBEX_LIBS) -lkio $(LIB_KDEUI) $(BLUETOOTH_LIBS) $(DBUS_LIBS) -ldbus-qt-1 + + # this is where the desktop file will go diff --git a/redhat/extras/kdebluetooth/kdebluetooth_1.0~beta9~r769275-0ubuntu1.diff.gz b/redhat/extras/kdebluetooth/kdebluetooth_1.0~beta9~r769275-0ubuntu1.diff.gz new file mode 100644 index 000000000..ba1d19308 Binary files /dev/null and b/redhat/extras/kdebluetooth/kdebluetooth_1.0~beta9~r769275-0ubuntu1.diff.gz differ diff --git a/redhat/extras/kdebluetooth/kdebluetooth_1.0~beta9~r769275.orig.tar.gz b/redhat/extras/kdebluetooth/kdebluetooth_1.0~beta9~r769275.orig.tar.gz new file mode 100644 index 000000000..e9b080342 Binary files /dev/null and b/redhat/extras/kdebluetooth/kdebluetooth_1.0~beta9~r769275.orig.tar.gz differ diff --git a/redhat/extras/kdebluetooth/trinity-kdebluetooth.spec b/redhat/extras/kdebluetooth/trinity-kdebluetooth.spec new file mode 100644 index 000000000..b9d3aa2b2 --- /dev/null +++ b/redhat/extras/kdebluetooth/trinity-kdebluetooth.spec @@ -0,0 +1,365 @@ +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?_prefix}" != "/usr" +%define _variant .opt +%define _docdir %{_prefix}/share/doc +%endif + +Name: trinity-kdebluetooth +Version: 1.0_beta9_r769275 +Release: 1%{?dist}%{?_variant} + +Summary: The TDE Bluetooth Framework + +License: GPLv2+ +Group: Applications/Communications +URL: http://bluetooth.kmobiletools.org/ + +Source0: kdebluetooth_1.0~beta9~r769275.orig.tar.gz +Patch0: kdebluetooth-1.0_beta8-gcc43.patch +Patch1: kdebluetooth_1.0~beta9~r769275-0ubuntu1.diff.gz +Patch2: kdebluetooth-trinity.patch + +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: gettext +BuildRequires: desktop-file-utils +BuildRequires: lockdev-devel +BuildRequires: xmms-devel +BuildRequires: bluez-libs-devel +BuildRequires: trinity-kdelibs-devel +BuildRequires: trinity-kdepim-devel +BuildRequires: openobex-devel >= 1.1 +BuildRequires: libusb-devel +BuildRequires: pkgconfig +Buildrequires: libidn-devel +Buildrequires: dbus-qt-devel +BuildRequires: obexftp-devel +BuildRequires: automake >= 1.6.1 +BuildRequires: autoconf >= 2.52 +Requires: %{name}-libs = %{version}-%{release} +Requires: %{_bindir}/kdesu + + + +%description +The KDE Bluetooth Framework is a set of tools built on top of Linux' +Bluetooth (Bluez) stack. The goal is to provide easy access to the most +common Bluetooth profiles and to make data exchange with Bluetooth +enabled devices as straightforward as possible. + + +%package libs +Summary: Base libraries for %{name} +Group: System Environment/Libraries +Obsoletes: %{name} < %{version}-%{release} + +%if 0%{?fedora} >= 8 +Provides: dbus-bluez-pin-helper +%endif + + +%description libs +KDE Bluetooth framework libraries. + + +%package devel +Summary: Development files for %{name} +Group: Development/Libraries +Requires: trinity-kdelibs-devel +Requires: bluez-libs-devel +Requires: %{name}-libs = %{version}-%{release} + + +%description devel +KDE Bluetooth framework development libraries and headers. + + +%prep +%setup -q -n kdebluetooth-1.0~beta9~r769275 +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 + +%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +if [ -r "/usr/share/libtool/config/ltmain.sh" ]; then + %__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +else + %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +fi +%__make -f "admin/Makefile.common" + + +%build +export PATH="%{_bindir}:${PATH}" +export LDFLAGS="-L%{_libdir} -I%{_includedir}" +export CXXFLAGS="-fpermissive" + +unset QTDIR || : ; . /etc/profile.d/qt.sh +%configure \ + --with-bluetooth-libraries=%{_libdir} \ + --disable-rpath \ + --enable-new-ldflags \ + --disable-debug \ + --disable-dependency-tracking \ + --enable-final \ + --enable-closure \ + --with-extra-includes=%{_includedir}/tqt + +make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool + + +%install +export PATH="%{_bindir}:${PATH}" +rm -rf $RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT + +for DESK_PATH in applications/kde applnk/Utilities ; do + desktop-file-install \ + --mode=644 \ + --vendor="" \ + --dir=$RPM_BUILD_ROOT%{_datadir}/applications/kde \ + --remove-category="Network" \ + --add-category="System" \ + --delete-original \ + $RPM_BUILD_ROOT%{_datadir}/$DESK_PATH/*.desktop ||: +done + +touch %{name}.lang +PROG_LIST="kbluelock kbluemon kbluetooth kinputwizard + kcm_btpaired kio_bluetooth kio_obex2 kio_sdp + libkbluetooth kdebluetooth" +for PROG in $PROG_LIST ; do + %find_lang $PROG && cat $PROG.lang >> %{name}.lang ||: +done + +rm -f $RPM_BUILD_ROOT/%{_datadir}/applnk/Settings/Network/Bluetooth/.directory + +rm -f ${RPM_BUILD_ROOT}%{_libdir}/*.a +rm -f ${RPM_BUILD_ROOT}%{_libdir}/kde3/*.a + +%clean +rm -rf $RPM_BUILD_ROOT + + +%post +/sbin/ldconfig +touch --no-create %{_datadir}/icons/hicolor ||: +gtk-update-icon-cache -qf %{_datadir}/icons/hicolor 2> /dev/null ||: + + +%postun +/sbin/ldconfig +touch --no-create %{_datadir}/icons/hicolor ||: +gtk-update-icon-cache -qf %{_datadir}/icons/hicolor 2> /dev/null ||: + + +%files -f %{name}.lang +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog COPYING INSTALL README +%{_bindir}/kblue* +%{_bindir}/kbtobexclient +%{_bindir}/kioobex_start +%{_bindir}/kinputwizard +%{_datadir}/applications/kde/*.desktop +%{_datadir}/applnk/.hidden/*.desktop +%{_datadir}/apps/konqsidebartng/virtual_folders/services/*.desktop +%{_datadir}/apps/*/* +%{_datadir}/autostart/* +%{_datadir}/desktop-directories/* +%{_datadir}/icons/hicolor/*/*/* +%{_datadir}/mimelnk/bluetooth/ +%{_datadir}/service*/* +%lang(ca) %{_docdir}/HTML/ca/kdebluetooth/ +%lang(da) %{_docdir}/HTML/da/kdebluetooth/ +%lang(en) %{_docdir}/HTML/en/kdebluetooth/ +%lang(es) %{_docdir}/HTML/es/kdebluetooth/ +%lang(et) %{_docdir}/HTML/et/kdebluetooth/ +%lang(fr) %{_docdir}/HTML/fr/kdebluetooth/ +%lang(it) %{_docdir}/HTML/it/kdebluetooth/ +%lang(nl) %{_docdir}/HTML/nl/kdebluetooth/ +%lang(pt) %{_docdir}/HTML/pt/kdebluetooth/ +%lang(ru) %{_docdir}/HTML/ru/kdebluetooth/ +%lang(sv) %{_docdir}/HTML/sv/kdebluetooth/ + + +%files libs +%defattr(-,root,root,-) +%{_libdir}/*.la +%{_libdir}/*.so.* +%{_libdir}/kde3/*.so +%{_libdir}/kde3/*.la +%{_libdir}/kdebluetooth/ + + +%files devel +%defattr(-,root,root,-) +%{_includedir}/* +%{_libdir}/*.so + + +%changelog +* Sun Feb 12 2012 Francois Andriot - 1.0_beta9_r769275-1 +- Initial version for TDE 3.5.13 +- Updates base version to 1.0_beta9_r769275 (taken from Ubuntu Hardy) +- Fix autotools detection + +* Tue Apr 1 2008 Rex Dieter - 1.0-0.41.beta8 +- -devel: Requires: kdelibs3-devel + +* Sun Jan 6 2008 Ville Skyttä - 1.0-0.40.beta8 +- Fix build with gcc 4.3. + +* Sun Dec 9 2007 Ville Skyttä - 1.0-0.39.beta8 +- Require kdesu in main package. + +* Sun Dec 08 2007 Rex Dieter 1.0-0.38.beta8 +- BR: kdelibs3-devel kdepim3-devel +- drop Requires: kdebase (?) + +* Wed Nov 08 2007 Gilboa Davara 1.0-0.37.beta8 +- Missing BR: automake, autoconf. + +* Wed Nov 08 2007 Gilboa Davara 1-0.0-36.beta8 +- Move BRs to main package to fix mock breakage. + +* Wed Nov 07 2007 Gilboa Davara 1-0.0-35.beta8 +- Fix multi-lib conflicts (#341731). + +* Sat Oct 06 2007 Gilboa Davara 1-0.0-34.beta8 +- Beta8. (First official release since beta3) +- Remove redundant beta3 patches. +- LANG support by Ville Skytta. +- Virtual provides: dbus-bluez-pin-helper. + +* Sun Aug 26 2007 Gilboa Davara 1-0.0-33.beta3 +- Re-Fix the license tag. + +* Sun Aug 26 2007 Gilboa Davara 1-0.0-32.beta3 +- Fixed license tag. +- Re-enable PPC64. + +* Tue Jul 31 2007 Gilboa Davara 1-0.0-31.beta3 +- Fix error in ExcludeArch. + +* Tue Jul 31 2007 Gilboa Davara 1-0.0-30.beta3 +- ExcludeArch ppc64 (obexftp, again) + +* Mon Jul 30 2007 Gilboa Davara 1-0.0-29.beta3 +- ExcludeArch ppc/ppc64 (obexftp missing.) + +* Sun Jul 15 2007 Gilboa Davara 1-0.0-28.beta3 +- Fix %%dist... again... + +* Thu Jul 12 2007 Gilboa Davara 1-0.0-27.beta3 +- Add missing touch /icon/hicolor. +- Menu items: Remove only-in-KDE. +- BR: Remove libutempter-devel. +- Fix project URL and source URL. +- Add missing %%dist. + +* Sun Jul 08 2007 Gilboa Davara 1-0.0-26.beta3 +- Remove the Nokia N70 patch. (Doesn't seem to work.) +- OBEX Object push fix. + +* Sun Jul 08 2007 Gilboa Davara 1-0.0-25.beta3 +- Adopted Ville Skyttä b2 patch to b3. (Hopefully) re-enable Nokia N7x obex support. +- Patch out "Configure services". (Disabled in B3) + +* Mon Jun 25 2007 Gilboa Davara 1-0.0-24.beta3 +- Added hex encoding patch by Thomas Davis. +- Removed --enable-irmcsynckonnector (deprecated in b3) +- Add missing docs. (Removed by mistake in b23) +- Known issue - services menu doesn't seem to work. (Requires debugging / upstream ) + +* Tue Jun 12 2007 Gilboa Davara 1-0.0-23.beta3 +- Beta3. +- Remove pin-helper. (No longer needed - beta3 has dbus support.) +- Added BR dbus-qt. +- Added BR obexftp-devel. +- Remove b2 patches. + +* Sat May 26 2007 Gilboa Davara 1-0-0.22.beta2 +- Use the bluez_pinhelper wrapper instead of modified bluez-utils. +- Remove %%dist. +- *rc should not be marked as config. +- Prevent RPM from owning Network/Peripherals. + +* Mon Apr 23 2007 Gilboa Davara 1-0-0.21.beta2 +- Patch list clean-up. +- Add Nokia obex detection patch. +- Fix 64bit compile due to bad default in configure. (with_bluetooth_dir) +- Missing BR: libtempter-devel. +- Missing BT: libidn-devel. +- Added: kbluepin wrapper - configure kbluepin as the old-style pin helper. + +* Wed Apr 04 2007 Gilboa Davara 1-0-0.20.beta2 +- Re-merge Ville Skytta's latest .spec. (Got dropped by mistake) +- Summery, description clean-up. + +* Thu Mar 29 2007 Gilboa Davara 1.0-0.19.beta2 +- Spec file clean-up. + +* Fri Oct 20 2006 Rex Dieter 1.0-0.18.beta2 +- BR: gettext +- include locales + +* Tue Oct 17 2006 Rex Dieter 1.0-0.17.beta2 +- kdebluetooth-1.0_beta2 + +* Fri Sep 08 2006 Rex Dieter 1.0-0.16.20060908svn +- kdebluetoooth-20060908svn + +* Thu Jul 13 2006 Rex Dieter 1.0-0.15.20060621svn +- put svn at end of Release tag (per packaging guidelines) + +* Wed Jun 21 2006 Rex Dieter 1.0-0.14.svn20060621 +- kdebluetooth-20060621svn, fixes + compile error kdebluetooth libkobex obex.h not found (kde bug #94572) + +* Tue Jun 20 2006 Rex Dieter 1.0-0.13.svn20060620 +- kdebluetooth-svn20060620, (re)fixes + konqueror bluetooth:/ returns error "Bad URL" (kde bug #123607) +- --disable-dependency-tracking +- own %%_datadir/applnk/Settings/Network + +* Mon Jun 19 2006 Rex Dieter 1.0-0.12.svn20060619 +- document svn tarball creation +- Requires: kdebase (for kcm bits, applnk dir ownership) +- desktop-file-install --add-only-show-in=KDE + +* Mon Jun 19 2006 Rex Dieter 1.0-0.11.svn20060619 +- kdebluetooth-svn20060619, making most patches obsolete + +* Fri Apr 28 2006 Rex Dieter 1.0-0.10.beta1 +- -devel: Requires: qt-devel bluez-libs-devel +- include libirmcsynckonnector.so in main pkg +- .desktop: --remove-category=Network --add-category=System +- remove zero length files +- fix default hcid start/top command + +* Mon Apr 17 2006 Rex Dieter 1.0-0.9.beta1 +- konqueror bluetooth:/ returns error "Bad URL" (kde bug #123607) + +* Tue Mar 28 2006 Rex Dieter 1.0-0.8.beta1 +- BR: kdepim-devel (for kitchensync) +- kdebluetooth-1.0_beta1-gcc41.patch + +* Thu Mar 23 2006 Rex Dieter 1.0-0.7.beta1 +- cleanup openobex patch +- fixup .desktop file(s) + +* Wed Mar 22 2006 Rex Dieter 1.0-0.6.beta1 +- cleanup for Extras +- %%post: ldconfig, fdo icon spec + +* Mon Mar 06 2006 Rex Dieter 1.0-0.5.beta1 +- respin + +* Mon Mar 21 2005 Rex Dieter 1.0-0.3.beta1 +- --enable-irmcsynckonnector + +* Mon Mar 21 2005 Rex Dieter 1.0-0.1.beta1 +- 1.0_beta1 + +* Wed Dec 29 2004 Rex Dieter 0.0-0.1.cvs20050110 +- first try + -- cgit v1.2.1 From e52e723d608adb3227f17cc07ca39e0a84002f89 Mon Sep 17 00:00:00 2001 From: Francois Andriot Date: Sun, 12 Feb 2012 18:04:26 +0100 Subject: [RHEL/Fedora] some fixes to kdelibs, kdebase, kdemultimedia --- redhat/dependencies/arts/trinity-arts-3.5.13.spec | 1 + .../kdebase/kdebase-3.5.13-fix_kdm_cpu_usage.patch | 47 ++ ...-replicate_led_status_on_virtual_keyboard.patch | 95 +++ .../kdebase-3.5.13-tsak_keyboard_hotplug.patch | 641 +++++++++++++++++++++ redhat/kdebase/trinity-kdebase-3.5.13.spec | 26 +- ...-fix_UTF8_encoding_for_WebDAV_directories.patch | 45 ++ .../kdelibs/kdelibs-3.5.13-fix_add_printer.patch | 20 + redhat/kdelibs/trinity-kdelibs-3.5.13.spec | 13 +- .../kdemultimedia-3.5.13-fix_mmx_detection.patch | 12 + .../trinity-kdemultimedia-3.5.13.spec | 5 + redhat/kdenetwork/trinity-kdenetwork-3.5.13.spec | 2 +- 11 files changed, 900 insertions(+), 7 deletions(-) create mode 100644 redhat/kdebase/kdebase-3.5.13-fix_kdm_cpu_usage.patch create mode 100644 redhat/kdebase/kdebase-3.5.13-replicate_led_status_on_virtual_keyboard.patch create mode 100644 redhat/kdebase/kdebase-3.5.13-tsak_keyboard_hotplug.patch create mode 100644 redhat/kdelibs/kdelibs-3.5.13-fix_UTF8_encoding_for_WebDAV_directories.patch create mode 100644 redhat/kdelibs/kdelibs-3.5.13-fix_add_printer.patch create mode 100644 redhat/kdemultimedia/kdemultimedia-3.5.13-fix_mmx_detection.patch diff --git a/redhat/dependencies/arts/trinity-arts-3.5.13.spec b/redhat/dependencies/arts/trinity-arts-3.5.13.spec index 7e032efef..8b639a8f0 100755 --- a/redhat/dependencies/arts/trinity-arts-3.5.13.spec +++ b/redhat/dependencies/arts/trinity-arts-3.5.13.spec @@ -42,6 +42,7 @@ BuildRequires: glib2-devel BuildRequires: libtool-ltdl-devel BuildRequires: gsl-devel BuildRequires: libvorbis-devel +BuildRequires: esound-devel BuildRequires: jack-audio-connection-kit-devel Requires: tqtinterface diff --git a/redhat/kdebase/kdebase-3.5.13-fix_kdm_cpu_usage.patch b/redhat/kdebase/kdebase-3.5.13-fix_kdm_cpu_usage.patch new file mode 100644 index 000000000..1a80c00f1 --- /dev/null +++ b/redhat/kdebase/kdebase-3.5.13-fix_kdm_cpu_usage.patch @@ -0,0 +1,47 @@ +commit 1e2983ad0107fb1d26e3e9931528701f30632c6d +Author: Timothy Pearson +Date: 1326856834 -0600 + + Fix kdm_greet high CPU usage + Clean up a few build warnings + +diff --git a/kdm/kfrontend/kgreeter.cpp b/kdm/kfrontend/kgreeter.cpp +index 9b974cc..5877cb6 100644 +--- a/kdm/kfrontend/kgreeter.cpp ++++ b/kdm/kfrontend/kgreeter.cpp +@@ -273,6 +273,9 @@ void KGreeter::handleInputPipe(void) { + readbuf[numread] = 0; + readbuf[2047] = 0; + inputcommand += readbuf; ++ if (!tqApp->hasPendingEvents()) { ++ usleep(500); ++ } + tqApp->processEvents(); + } + if (closingDown) { +@@ -508,11 +511,11 @@ KGreeter::insertUsers(int limit_users) + int count = 0; + for (setpwent(); (ps = getpwent()) != 0;) { + if (*ps->pw_dir && *ps->pw_shell && +- (ps->pw_uid >= (unsigned)_lowUserId || +- !ps->pw_uid && _showRoot) && +- ps->pw_uid <= (unsigned)_highUserId && +- !noUsers.hasUser( ps->pw_name ) && +- !noUsers.hasGroup( ps->pw_gid )) ++ ((ps->pw_uid >= (unsigned)_lowUserId) || ++ ((!ps->pw_uid) && _showRoot)) && ++ (ps->pw_uid <= (unsigned)_highUserId) && ++ (!noUsers.hasUser( ps->pw_name )) && ++ (!noUsers.hasGroup( ps->pw_gid ))) + { + TQString username( TQFile::decodeName( ps->pw_name ) ); + if (!dupes.find( username )) { +@@ -574,7 +577,7 @@ KGreeter::insertUsers(int limit_users) + for (setpwent(); (ps = getpwent()) != 0;) { + if (*ps->pw_dir && *ps->pw_shell && + (ps->pw_uid >= (unsigned)_lowUserId || +- !ps->pw_uid && _showRoot) && ++ ((!ps->pw_uid) && _showRoot)) && + ps->pw_uid <= (unsigned)_highUserId && + (users.hasUser( ps->pw_name ) || + users.hasGroup( ps->pw_gid ))) diff --git a/redhat/kdebase/kdebase-3.5.13-replicate_led_status_on_virtual_keyboard.patch b/redhat/kdebase/kdebase-3.5.13-replicate_led_status_on_virtual_keyboard.patch new file mode 100644 index 000000000..1d3f73ceb --- /dev/null +++ b/redhat/kdebase/kdebase-3.5.13-replicate_led_status_on_virtual_keyboard.patch @@ -0,0 +1,95 @@ +commit 8468d9bd5c66fe402acbc06f728b12ea996848de +Author: Timothy Pearson +Date: 1327049889 -0600 + + Replicate LED status from virtual keyboards to physical keyboards + Fix keyboard attribute cloning + This commit closes Bug 561 + +diff --git a/tsak/main.cpp b/tsak/main.cpp +index df485a0..26aad00 100644 +--- a/tsak/main.cpp ++++ b/tsak/main.cpp +@@ -126,22 +126,23 @@ static void copy_features(int devin, int devout) + for(i=0;i= 0) { ++ for(code=0;code= size) { ++ if (revev.type == EV_LED) { ++ write(keyboard_fds[current_keyboard], &revev, sizeof(revev)); ++ } ++ } + + value = ev[0].value; + +@@ -506,7 +516,7 @@ int main (int argc, char *argv[]) + } + } + +- if (hide_event == false) { ++ if ((hide_event == false) && (ev[0].type != EV_LED) && (ev[1].type != EV_LED)) { + // Pass the event on... + event = ev[0]; + write(devout[current_keyboard], &event, sizeof event); diff --git a/redhat/kdebase/kdebase-3.5.13-tsak_keyboard_hotplug.patch b/redhat/kdebase/kdebase-3.5.13-tsak_keyboard_hotplug.patch new file mode 100644 index 000000000..8c8ab415f --- /dev/null +++ b/redhat/kdebase/kdebase-3.5.13-tsak_keyboard_hotplug.patch @@ -0,0 +1,641 @@ +commit 5f413b26ebaab8a6478427e4125bda628058ff85 +Author: Timothy Pearson +Date: 1327015159 -0600 + + Add keyboard hotplug (add/remove) support to tsak + This closes Bug 587 + Fix warning in kompmgr + +diff --git a/tsak/CMakeLists.txt b/tsak/CMakeLists.txt +index 6aa5b49..4490636 100644 +--- a/tsak/CMakeLists.txt ++++ b/tsak/CMakeLists.txt +@@ -23,5 +23,6 @@ link_directories( + + tde_add_executable( tsak + SOURCES main.cpp ++ LINK udev + DESTINATION ${BIN_INSTALL_DIR} + ) +diff --git a/tsak/main.cpp b/tsak/main.cpp +index 050d6c0..df485a0 100644 +--- a/tsak/main.cpp ++++ b/tsak/main.cpp +@@ -1,8 +1,8 @@ + /* + Copyright 2010 Adam Marchetti +-Copyright 2011 Timothy Pearson ++Copyright 2011-2012 Timothy Pearson + +-This file is part of tsak. ++This file is part of tsak, the TDE Secure Attention Key daemon + + tsak is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as +@@ -35,9 +35,15 @@ License along with tsak. If not, see http://www.gnu.org/licenses/. + #include + #include + #include ++#include ++#include + + #define FIFO_DIR "/tmp/ksocket-global" + #define FIFO_FILE_OUT "/tmp/ksocket-global/tsak" ++#define FIFO_LOCKFILE_OUT "/tmp/ksocket-global/tsak.lock" ++ ++#define MAX_KEYBOARDS 64 ++#define MAX_INPUT_NODE 128 + + #define TestBit(bit, array) (array[(bit) / 8] & (1 << ((bit) % 8))) + +@@ -46,9 +52,18 @@ typedef unsigned char byte; + bool mPipeOpen_out = false; + int mPipe_fd_out = -1; + ++int mPipe_lockfd_out = -1; ++ ++char filename[32]; ++char key_bitmask[(KEY_MAX + 7) / 8]; ++ + struct sigaction usr_action; + sigset_t block_mask; + ++int keyboard_fd_num; ++int keyboard_fds[MAX_KEYBOARDS]; ++int child_pids[MAX_KEYBOARDS]; ++ + const char *keycode[256] = + { + "", "", "1", "2", "3", "4", "5", "6", "7", "8", +@@ -79,6 +94,26 @@ int bit_set(size_t i, const byte* a) + return a[i/CHAR_BIT] & (1 << i%CHAR_BIT); + } + ++// -------------------------------------------------------------------------------------- ++// Useful function from Stack Overflow ++// http://stackoverflow.com/questions/874134/find-if-string-endswith-another-string-in-c ++// -------------------------------------------------------------------------------------- ++/* returns 1 iff str ends with suffix */ ++int str_ends_with(const char * str, const char * suffix) { ++ ++ if( str == NULL || suffix == NULL ) ++ return 0; ++ ++ size_t str_len = strlen(str); ++ size_t suffix_len = strlen(suffix); ++ ++ if(suffix_len > str_len) ++ return 0; ++ ++ return 0 == strncmp( str + str_len - suffix_len, suffix, suffix_len ); ++} ++// -------------------------------------------------------------------------------------- ++ + /* Assign features (supported axes and keys) of the physical input device (devin) + * to the virtual input device (devout) */ + static void copy_features(int devin, int devout) +@@ -111,26 +146,40 @@ static void copy_features(int devin, int devout) + } + } + +-int find_keyboard() { ++int find_keyboards() { + int i, j; + int fd; +- char filename[32]; +- char key_bitmask[(KEY_MAX + 7) / 8]; ++ char name[256] = "Unknown"; ++ ++ keyboard_fd_num = 0; ++ for (i=0; i -1) { +@@ -202,6 +257,71 @@ bool setupPipe() + return setFileLock(mPipe_fd_out, true); + } + ++bool setupLockingPipe() ++{ ++ /* Create the FIFOs if they do not exist */ ++ umask(0); ++ mkdir(FIFO_DIR,0644); ++ ++ mknod(FIFO_LOCKFILE_OUT, S_IFIFO|0600, 0); ++ chmod(FIFO_LOCKFILE_OUT, 0600); ++ ++ mPipe_lockfd_out = open(FIFO_LOCKFILE_OUT, O_RDWR | O_NONBLOCK); ++ if (mPipe_lockfd_out > -1) { ++ // Set the exclusive file lock ++ return setFileLock(mPipe_lockfd_out, true); ++ } ++ ++ return false; ++} ++ ++void broadcast_sak() ++{ ++ // Let anyone listening to our interface know that an SAK keypress was received ++ // I highly doubt there are more than 255 VTs active at once... ++ int i; ++ for (i=0;i<255;i++) { ++ write(mPipe_fd_out, "SAK\n\r", 6); ++ } ++} ++ ++void restart_tsak() ++{ ++ int i; ++ ++ fprintf(stderr, "Forcibly terminating...\n"); ++ ++ // Close down all child processes ++ for (i=0; i0) { ++ return 4; ++ } ++ sleep(1); ++ restart_tsak(); ++ } + } + else { +- // Print Device Name +- ioctl (fd, EVIOCGNAME (sizeof (name)), name); +- fprintf(stderr, "Reading From : (%s)\n", name); +- +- // Create filtered virtual output device +- devout=open("/dev/misc/uinput",O_WRONLY|O_NONBLOCK); +- if (devout<0) { +- perror("open(\"/dev/misc/uinput\")"); +- devout=open("/dev/uinput",O_WRONLY|O_NONBLOCK); +- } +- if (devout<0) { +- fprintf(stderr,"Unable to open /dev/uinput or /dev/misc/uinput (char device 10:223).\nPossible causes:\n 1) Device node does not exist\n 2) Kernel not compiled with evdev [INPUT_EVDEV] and uinput [INPUT_UINPUT] user level driver support\n 3) Permission denied.\n"); +- perror("open(\"/dev/uinput\")"); +- if (established) +- sleep(1); +- else +- return 3; +- } +- else { +- if(ioctl(fd, EVIOCGRAB, 2) < 0) { +- close(fd); +- fprintf(stderr, "Failed to grab exclusive input device lock"); ++ fprintf(stderr, "Found %d keyboard(s)\n", keyboard_fd_num); ++ ++ can_proceed = true; ++ for (current_keyboard=0;current_keyboard0) { +- // close parent process +- close(mPipe_fd_out); +- return 0; +- } +- setupPipe(); ++ ioctl(keyboard_fds[current_keyboard], EVIOCGNAME(UINPUT_MAX_NAME_SIZE), devinfo.name); ++ strncat(devinfo.name, "+tsak", UINPUT_MAX_NAME_SIZE-1); ++ fprintf(stderr, "%s\n", devinfo.name); ++ ioctl(keyboard_fds[current_keyboard], EVIOCGID, &devinfo.id); ++ ++ copy_features(keyboard_fds[current_keyboard], devout[current_keyboard]); ++ write(devout[current_keyboard],&devinfo,sizeof(devinfo)); ++ if (ioctl(devout[current_keyboard],UI_DEV_CREATE)<0) { ++ fprintf(stderr, "Unable to create input device with UI_DEV_CREATE\n"); ++ if (established) ++ sleep(1); ++ else ++ return 2; + } +- +- established = true; +- +- if (testrun == true) { +- return 0; +- } +- +- while (1) { +- if ((rd = read (fd, ev, size * 2)) < size) { +- fprintf(stderr,"Read failed.\n"); +- break; +- } +- +- value = ev[0].value; +- +- if (value != ' ' && ev[1].value == 0 && ev[1].type == 1){ // Read the key release event +- if (keycode[(ev[1].code)]) { +- if (strcmp(keycode[(ev[1].code)], "") == 0) ctrl_down = false; +- if (strcmp(keycode[(ev[1].code)], "") == 0) alt_down = false; ++ else { ++ fprintf(stderr, "Device created.\n"); ++ ++ if (established == false) { ++ int i=fork(); ++ if (i<0) return 9; // fork failed ++ if (i>0) { ++ child_pids[current_keyboard] = i; ++ continue; + } ++ setupLockingPipe(); + } +- if (value != ' ' && ev[1].value == 1 && ev[1].type == 1){ // Read the key press event +- if (keycode[(ev[1].code)]) { +- if (strcmp(keycode[(ev[1].code)], "") == 0) ctrl_down = true; +- if (strcmp(keycode[(ev[1].code)], "") == 0) alt_down = true; +- } ++ ++ established = true; ++ ++ if (testrun == true) { ++ return 0; + } + +- hide_event = false; +- if (keycode[(ev[1].code)]) { +- if (alt_down && ctrl_down && (strcmp(keycode[(ev[1].code)], "") == 0)) { +- hide_event = true; ++ while (1) { ++ if ((rd = read (keyboard_fds[current_keyboard], ev, size * 2)) < size) { ++ fprintf(stderr, "Read failed.\n"); ++ break; ++ } ++ ++ value = ev[0].value; ++ ++ if (value != ' ' && ev[1].value == 0 && ev[1].type == 1){ // Read the key release event ++ if (keycode[(ev[1].code)]) { ++ if (strcmp(keycode[(ev[1].code)], "") == 0) ctrl_down = false; ++ if (strcmp(keycode[(ev[1].code)], "") == 0) alt_down = false; ++ } ++ } ++ if (value != ' ' && ev[1].value == 1 && ev[1].type == 1){ // Read the key press event ++ if (keycode[(ev[1].code)]) { ++ if (strcmp(keycode[(ev[1].code)], "") == 0) ctrl_down = true; ++ if (strcmp(keycode[(ev[1].code)], "") == 0) alt_down = true; ++ } ++ } ++ ++ hide_event = false; ++ if (keycode[(ev[1].code)]) { ++ if (alt_down && ctrl_down && (strcmp(keycode[(ev[1].code)], "") == 0)) { ++ hide_event = true; ++ } ++ } ++ ++ if (hide_event == false) { ++ // Pass the event on... ++ event = ev[0]; ++ write(devout[current_keyboard], &event, sizeof event); ++ event = ev[1]; ++ write(devout[current_keyboard], &event, sizeof event); ++ } ++ if (hide_event == true) { ++ // Let anyone listening to our interface know that an SAK keypress was received ++ broadcast_sak(); + } + } ++ } ++ } ++ } ++ ++ // fork udev monitor process ++ int i=fork(); ++ if (i<0) return 10; // fork failed ++ if (i>0) { ++ // Terminate parent ++ return 0; ++ } ++ ++ // Prevent multiple process instances from starting ++ setupLockingPipe(); ++ ++ // Wait a little bit so that udev hotplug can stabilize before we start monitoring ++ sleep(1); ++ ++ fprintf(stderr, "Hotplug monitoring process started\n"); ++ ++ // Monitor for hotplugged keyboards ++ int j; ++ int hotplug_fd; ++ bool is_new_keyboard; ++ struct udev *udev; ++ struct udev_device *dev; ++ struct udev_monitor *mon; ++ ++ // Create the udev object ++ udev = udev_new(); ++ if (!udev) { ++ fprintf(stderr, "Cannot connect to udev interface\n"); ++ return 11; ++ } ++ ++ // Set up a udev monitor to monitor input devices ++ mon = udev_monitor_new_from_netlink(udev, "udev"); ++ udev_monitor_filter_add_match_subsystem_devtype(mon, "input", NULL); ++ udev_monitor_enable_receiving(mon); ++ ++ while (1) { ++ // Watch for input from the monitoring process ++ dev = udev_monitor_receive_device(mon); ++ if (dev) { ++ // If a keyboard was removed we need to restart... ++ if (strcmp(udev_device_get_action(dev), "remove") == 0) { ++ udev_device_unref(dev); ++ udev_unref(udev); ++ restart_tsak(); ++ } ++ ++ is_new_keyboard = false; ++ snprintf(filename,sizeof(filename), "%s", udev_device_get_devnode(dev)); ++ udev_device_unref(dev); ++ ++ // Print name of keyboard ++ hotplug_fd = open(filename, O_RDWR|O_SYNC); ++ ioctl(hotplug_fd, EVIOCGBIT(EV_KEY, sizeof(key_bitmask)), key_bitmask); + +- if (hide_event == false) { +- // Pass the event on... +- event = ev[0]; +- write(devout, &event, sizeof event); +- event = ev[1]; +- write(devout, &event, sizeof event); +- } +- if (hide_event == true) { +- // Let anyone listening to our interface know that an SAK keypress was received +- // I highly doubt there are more than 255 VTs active at once... +- int i; +- for (i=0;i<255;i++) { +- write(mPipe_fd_out, "SAK\n\r", 6); +- } ++ /* We assume that anything that has an alphabetic key in the ++ QWERTYUIOP range in it is the main keyboard. */ ++ for (j = KEY_Q; j <= KEY_P; j++) { ++ if (TestBit(j, key_bitmask)) { ++ is_new_keyboard = true; + } + } ++ ioctl (hotplug_fd, EVIOCGNAME (sizeof (name)), name); ++ close(hotplug_fd); ++ ++ // Ensure that we do not detect our own tsak faked keyboards ++ if (str_ends_with(name, "+tsak") == 1) { ++ is_new_keyboard = false; ++ } ++ ++ // If a keyboard was added we need to restart... ++ if (is_new_keyboard == true) { ++ fprintf(stderr, "Hotplugged new keyboard: (%s)\n", name); ++ udev_unref(udev); ++ restart_tsak(); ++ } ++ } ++ else { ++ fprintf(stderr, "No Device from receive_device(). An error occured.\n"); + } + } ++ ++ udev_unref(udev); ++ ++ fprintf(stderr, "Hotplug monitoring process terminated\n"); + } + } + } +diff --git a/twin/kompmgr/kompmgr.c b/twin/kompmgr/kompmgr.c +index 5daf8c2..8216676 100644 +--- a/kwin/kompmgr/kompmgr.c ++++ b/kwin/kompmgr/kompmgr.c +@@ -60,6 +60,7 @@ check baghira.sf.net for more infos + #include + #include + #include ++#include + #include + #include + #include +@@ -397,7 +398,7 @@ void delete_pid_file() + int chars = readlink("/proc/self/exe", me, sizeof(me)); + me[chars] = 0; + me[2047] = 0; +- execl(me, NULL); ++ execl(me, basename(me), (char*)NULL); + } + #endif + } diff --git a/redhat/kdebase/trinity-kdebase-3.5.13.spec b/redhat/kdebase/trinity-kdebase-3.5.13.spec index bc99f494d..7496f1ec9 100644 --- a/redhat/kdebase/trinity-kdebase-3.5.13.spec +++ b/redhat/kdebase/trinity-kdebase-3.5.13.spec @@ -2,7 +2,7 @@ %if "%{?version}" == "" %define version 3.5.13 %endif -%define release 15 +%define release 16 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -99,6 +99,12 @@ Patch29: kdebase-3.5.13-fix_multihead_desktop_lock.patch Patch30: kdebase-3.5.12-kdm_hide_menu_button.patch ## [kdebase/kxkb] Enables xtest support Patch31: kdebase-3.5.13-enable_xtest_support.patch +## [kdebase/kdm/kfrontend] fix KDM high CPU usage when inactive [Bug #690] +Patch32: kdebase-3.5.13-fix_kdm_cpu_usage.patch +## [kdebase/tsak] Add keyboard hotplug (add/remove) support to tsak [Bug #587] +Patch33: kdebase-3.5.13-tsak_keyboard_hotplug.patch +## [kdebase/tsak] Replicate LED status from virtual keyboards to physical keyboards [Bug #561] +Patch34: kdebase-3.5.13-replicate_led_status_on_virtual_keyboard.patch # Fedora 15 Theme: "Lovelock" %if 0%{?fedora} == 15 @@ -169,11 +175,11 @@ BuildRequires: libXcomposite-devel BuildRequires: libXtst-devel BuildRequires: libXdamage-devel BuildRequires: xorg-x11-font-utils - -# These dependancies are not met in RHEL -%if 0%{?fedora} BuildRequires: jack-audio-connection-kit-devel BuildRequires: nas-devel + +%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 +BuildRequires: libudev-devel %endif Requires: tqtinterface @@ -306,6 +312,11 @@ Protocol handlers (KIOslaves) for personal information management, including: %patch29 -p0 %patch30 -p1 %patch31 -p1 +%patch32 -p1 +%if 0%{?fedora} >= 15 +%patch33 -p1 +%patch34 -p1 +%endif # Applies an optional distro-specific graphical theme %if "%{?tde_bg}" != "" @@ -354,7 +365,7 @@ cd build -DWITH_XCOMPOSITE=ON \ -DWITH_XCURSOR=ON \ -DWITH_XFIXES=ON \ -%if 0%{?fedora} || 0%{?rhel} > 5 +%if 0%{?fedora} || 0%{?rhel} >= 6 -DWITH_XRANDR=ON \ %else -DWITH_XRANDR=OFF \ @@ -692,6 +703,11 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %{_datadir}/cmake/*.cmake %changelog +* Sat Jan 21 2012 Francois Andriot - 3.5.13-16 +- Fix KDM high CPU usage when inactive [Bug #690] +- Add keyboard hotplug (add/remove) support to tsak [Bug #587] +- Replicate LED status from virtual keyboards to physical keyboards [Bug #561] + * Thu Jan 05 2012 Francois Andriot - 3.5.13-15 - Add a KDM option to hide 'Menu' button on login prompt - Fix corrupted PNG tiles [Bug #298] diff --git a/redhat/kdelibs/kdelibs-3.5.13-fix_UTF8_encoding_for_WebDAV_directories.patch b/redhat/kdelibs/kdelibs-3.5.13-fix_UTF8_encoding_for_WebDAV_directories.patch new file mode 100644 index 000000000..6fa9a085a --- /dev/null +++ b/redhat/kdelibs/kdelibs-3.5.13-fix_UTF8_encoding_for_WebDAV_directories.patch @@ -0,0 +1,45 @@ +From 1f37c9cdb9bb47f8453cf26af8006c7c8d4ca3b3 Mon Sep 17 00:00:00 2001 +From: Thorsten Glaser +Date: Tue, 27 Dec 2011 14:28:27 +0100 +Subject: [PATCH] fix UTF-8 encoding for WebDAV directories + +idea derived from KIO slave http.cpp from KDE 4; reimplemented +on top of Qt3/KDE3 APIs + +Bug: http://bugs.kde.org/show_bug.cgi?id=127251 + +Signed-off-by: Thorsten Glaser +--- + kioslave/http/http.cc | 6 ++++++ + 1 files changed, 6 insertions(+), 0 deletions(-) + +diff --git a/kioslave/http/http.cc b/kioslave/http/http.cc +index a1495d7..16b785d 100644 +--- a/kioslave/http/http.cc ++++ b/kioslave/http/http.cc +@@ -45,6 +45,7 @@ + #include + #include + #include ++#include + + #include + #include +@@ -750,9 +751,14 @@ void HTTPProtocol::davStatList( const KURL& url, bool stat ) + entry.clear(); + + TQString urlStr = href.text(); ++#if 0 + int encoding = remoteEncoding()->encodingMib(); + if ((encoding == 106) && (!KStringHandler::isUtf8(KURL::decode_string(urlStr, 4).latin1()))) + encoding = 4; // Use latin1 if the file is not actually utf-8 ++#else ++ TQUrl::decode(urlStr); ++ int encoding = 106; ++#endif + + KURL thisURL ( urlStr, encoding ); + +-- +1.7.2.3 + diff --git a/redhat/kdelibs/kdelibs-3.5.13-fix_add_printer.patch b/redhat/kdelibs/kdelibs-3.5.13-fix_add_printer.patch new file mode 100644 index 000000000..5fb5aa576 --- /dev/null +++ b/redhat/kdelibs/kdelibs-3.5.13-fix_add_printer.patch @@ -0,0 +1,20 @@ +commit 87201a3741bd9d4b4638be7b3d8c44a737115b0f +Author: Timothy Pearson +Date: 1325899796 -0600 + + Fix make_driver_db_cups path + This closes Bug 383 + +diff --git a/kdeprint/cups/kmcupsmanager.cpp b/tdeprint/cups/kmcupsmanager.cpp +index 635cfd5..4a64248 100644 +--- a/kdeprint/cups/kmcupsmanager.cpp ++++ b/kdeprint/cups/kmcupsmanager.cpp +@@ -95,7 +95,7 @@ KMCupsManager::~KMCupsManager() + + TQString KMCupsManager::driverDbCreationProgram() + { +- return TQString::tqfromLatin1("/opt/trinity/bin/make_driver_db_cups"); ++ return TQString(__KDE_BINDIR).append(TQString::fromLatin1("/make_driver_db_cups")); + } + + TQString KMCupsManager::driverDirectory() diff --git a/redhat/kdelibs/trinity-kdelibs-3.5.13.spec b/redhat/kdelibs/trinity-kdelibs-3.5.13.spec index 21e80ffd8..c6a44125f 100755 --- a/redhat/kdelibs/trinity-kdelibs-3.5.13.spec +++ b/redhat/kdelibs/trinity-kdelibs-3.5.13.spec @@ -2,7 +2,7 @@ %if "%{?version}" == "" %define version 3.5.13 %endif -%define release 6 +%define release 7 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -48,6 +48,10 @@ Patch12: kdelibs-3.5.13-kate_syntax.patch.gz Patch13: kdelibs-3.5.13-add_inotify_support.patch ## [kdelibs] Add fam/gamin support to tdelibs CMake (backport commit 2b035349c31fe64c31d2c050892b117a3a807179) Patch14: kdelibs-3.5.13-enable_fam_gamin.patch +## [kdelibs/kioslave/http] Fix UTF8 Encoding for WebDAV directories +Patch15: kdelibs-3.5.13-fix_UTF8_encoding_for_WebDAV_directories.patch +## [kdelibs/kdeprint] Fix add printer [Bug #383] +Patch16: kdelibs-3.5.13-fix_add_printer.patch BuildRequires: libtool BuildRequires: tqtinterface-devel @@ -69,6 +73,7 @@ BuildRequires: OpenEXR-devel BuildRequires: libtool-ltdl-devel BuildRequires: glib2-devel BuildRequires: gamin-devel +BuildRequires: xorg-x11-proto-devel Requires: tqtinterface Requires: trinity-arts @@ -124,6 +129,8 @@ format for easy browsing %patch12 -p1 %patch13 -p1 %patch14 -p1 +%patch15 -p1 +%patch16 -p1 %build @@ -324,6 +331,10 @@ EOF %changelog +* Sat Jan 21 2012 Francois Andriot - 3.5.13-7 +- Fix UTF8 Encoding for WebDAV directories +- Fix hardcoded path in 'add printer' [Bug #383] + * Mon Jan 16 2012 Francois Andriot - 3.5.13-6 - Adds 'fam' and 'gamin' support diff --git a/redhat/kdemultimedia/kdemultimedia-3.5.13-fix_mmx_detection.patch b/redhat/kdemultimedia/kdemultimedia-3.5.13-fix_mmx_detection.patch new file mode 100644 index 000000000..785b9d150 --- /dev/null +++ b/redhat/kdemultimedia/kdemultimedia-3.5.13-fix_mmx_detection.patch @@ -0,0 +1,12 @@ +diff -urN tdemultimedia/configure.in.in tdemultimedia.new/configure.in.in +--- tdemultimedia/configure.in.in 2010-08-11 22:36:30.000000000 -0500 ++++ tdemultimedia.new/configure.in.in 2012-01-12 22:54:04.000000000 -0600 +@@ -35,7 +35,7 @@ + then + MMX_SUPPORT="no" + else +- as_ver=`echo $as_ver |sed -e "s/.*version //;s/ .*//"` ++ as_ver=`echo|as -v 2>&1 | grep ".*version.*" | awk '{print $NF}'` + as_major=`echo $as_ver |cut -d. -f1` + if test $as_major -gt 2 + then diff --git a/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec b/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec index 24dcdb176..d896d0a06 100644 --- a/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec +++ b/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec @@ -54,6 +54,9 @@ Provides: kdemultimedia3 = %{version}-%{release} Patch3: kdemultimedia-3.4.0-xdg.patch Patch5: kdemultimedia-3.5.7-pthread.patch +# [kdemultimedia] Fix MMX detection [Bug #800] +Patch10: kdemultimedia-3.5.13-fix_mmx_detection.patch + Requires: %{name}-libs = %{version}-%{release} BuildRequires: trinity-arts-devel @@ -132,6 +135,7 @@ Requires: %{name} = %{version}-%{release} %setup -q -n kdemultimedia %patch3 -p1 -b .xdg %patch5 -p1 -b .pthread +%patch10 -p1 # Ugly hack to modify TQT include directory inside autoconf files. # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! @@ -413,6 +417,7 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %changelog * Mon Jan 16 2012 Francois Andriot - 3.5.13-5 - Enables 'akode' support +- Fix MMX support [Bug #800] * Fri Nov 25 2011 Francois Andriot - 3.5.13-4 - Fix HTML directory location diff --git a/redhat/kdenetwork/trinity-kdenetwork-3.5.13.spec b/redhat/kdenetwork/trinity-kdenetwork-3.5.13.spec index a9171f867..82f176b5e 100644 --- a/redhat/kdenetwork/trinity-kdenetwork-3.5.13.spec +++ b/redhat/kdenetwork/trinity-kdenetwork-3.5.13.spec @@ -185,7 +185,7 @@ Requires: %{name} = %{version}-%{release} %patch11 -p1 %patch12 -p1 %patch13 -p1 -%patch14 -p1 +%patch14 -p4 # TDE 3.5.13: missing 'dummy.cpp' in MSN protocol -- cgit v1.2.1 From 14dfc7ec02c0f331342d8becac217b781b5feadf Mon Sep 17 00:00:00 2001 From: Francois Andriot Date: Mon, 13 Feb 2012 22:56:37 +0100 Subject: [RHEL/Fedora] add TQT3 for future R14 --- redhat/tqt3/0084-compositing-properties.patch | 80 +++ redhat/tqt3/assistant3.desktop | 9 + redhat/tqt3/designer3.desktop | 11 + redhat/tqt3/linguist3.desktop | 10 + redhat/tqt3/qt-3.1.0-makefile.patch | 1 + redhat/tqt3/qt-3.3.4-print-CJK.patch | 1 + redhat/tqt3/qt-3.3.6-fontrendering-gu-228452.patch | 1 + .../tqt3/qt-3.3.6-fontrendering-ml_IN-209974.patch | 1 + .../tqt3/qt-3.3.6-fontrendering-te_IN-211259.patch | 1 + .../tqt3/qt-3.3.8-fontrendering-as_IN-209972.patch | 1 + redhat/tqt3/qt-x11-free-3.3.4-fullscreen.patch | 1 + .../tqt3/qt-x11-free-3.3.6-qfontdatabase_x11.patch | 1 + redhat/tqt3/qt-x11-free-3.3.6-strip.patch | 1 + redhat/tqt3/qt-x11-free-3.3.7-arm.patch | 1 + redhat/tqt3/qt-x11-free-3.3.8b-typo.patch | 1 + ...1-immodule-unified-qt3.3.5-20051012-quiet.patch | 134 ++++ ...-x11-immodule-unified-qt3.3.8-20071116.diff.bz2 | Bin 0 -> 99943 bytes redhat/tqt3/qt.csh | 34 ++ redhat/tqt3/qt.sh | 32 + .../qt3-3.3.8.d-updates_zh-tw_translations.patch | 1 + redhat/tqt3/qtconfig3.desktop | 9 + redhat/tqt3/tqt3-3.4.0-embed.patch | 10 + redhat/tqt3/tqt3-3.4.0-fontrendering-#214570.patch | 23 + redhat/tqt3/tqt3-3.4.0-fontrendering-214371.patch | 15 + .../tqt3-3.4.0-fontrendering-ml_IN-209097.patch | 60 ++ .../tqt3-3.4.0-fontrendering-ml_IN-217657.patch | 11 + redhat/tqt3/tqt3-3.4.0-nodebug.patch | 15 + redhat/tqt3/tqt3-3.4.0-odbc.patch | 18 + ...nified-qt3.3.5-20060318-resetinputcontext.patch | 92 +++ redhat/tqt3/tqt3-3.4.0-quiet.patch | 13 + redhat/tqt3/tqt3-3.4.0-uic-nostdlib.patch | 12 + redhat/tqt3/tqt3-3.4.0-umask.patch | 14 + redhat/tqt3/tqt3-3.4.0.spec | 678 +++++++++++++++++++++ 33 files changed, 1292 insertions(+) create mode 100644 redhat/tqt3/0084-compositing-properties.patch create mode 100644 redhat/tqt3/assistant3.desktop create mode 100644 redhat/tqt3/designer3.desktop create mode 100644 redhat/tqt3/linguist3.desktop create mode 120000 redhat/tqt3/qt-3.1.0-makefile.patch create mode 120000 redhat/tqt3/qt-3.3.4-print-CJK.patch create mode 120000 redhat/tqt3/qt-3.3.6-fontrendering-gu-228452.patch create mode 120000 redhat/tqt3/qt-3.3.6-fontrendering-ml_IN-209974.patch create mode 120000 redhat/tqt3/qt-3.3.6-fontrendering-te_IN-211259.patch create mode 120000 redhat/tqt3/qt-3.3.8-fontrendering-as_IN-209972.patch create mode 120000 redhat/tqt3/qt-x11-free-3.3.4-fullscreen.patch create mode 120000 redhat/tqt3/qt-x11-free-3.3.6-qfontdatabase_x11.patch create mode 120000 redhat/tqt3/qt-x11-free-3.3.6-strip.patch create mode 120000 redhat/tqt3/qt-x11-free-3.3.7-arm.patch create mode 120000 redhat/tqt3/qt-x11-free-3.3.8b-typo.patch create mode 100644 redhat/tqt3/qt-x11-immodule-unified-qt3.3.5-20051012-quiet.patch create mode 100644 redhat/tqt3/qt-x11-immodule-unified-qt3.3.8-20071116.diff.bz2 create mode 100755 redhat/tqt3/qt.csh create mode 100755 redhat/tqt3/qt.sh create mode 120000 redhat/tqt3/qt3-3.3.8.d-updates_zh-tw_translations.patch create mode 100644 redhat/tqt3/qtconfig3.desktop create mode 100644 redhat/tqt3/tqt3-3.4.0-embed.patch create mode 100644 redhat/tqt3/tqt3-3.4.0-fontrendering-#214570.patch create mode 100644 redhat/tqt3/tqt3-3.4.0-fontrendering-214371.patch create mode 100644 redhat/tqt3/tqt3-3.4.0-fontrendering-ml_IN-209097.patch create mode 100644 redhat/tqt3/tqt3-3.4.0-fontrendering-ml_IN-217657.patch create mode 100644 redhat/tqt3/tqt3-3.4.0-nodebug.patch create mode 100644 redhat/tqt3/tqt3-3.4.0-odbc.patch create mode 100644 redhat/tqt3/tqt3-3.4.0-qt-x11-immodule-unified-qt3.3.5-20060318-resetinputcontext.patch create mode 100644 redhat/tqt3/tqt3-3.4.0-quiet.patch create mode 100644 redhat/tqt3/tqt3-3.4.0-uic-nostdlib.patch create mode 100644 redhat/tqt3/tqt3-3.4.0-umask.patch create mode 100644 redhat/tqt3/tqt3-3.4.0.spec diff --git a/redhat/tqt3/0084-compositing-properties.patch b/redhat/tqt3/0084-compositing-properties.patch new file mode 100644 index 000000000..368b6c267 --- /dev/null +++ b/redhat/tqt3/0084-compositing-properties.patch @@ -0,0 +1,80 @@ +qt-bugs@ issue : none +bugs.kde.org number : none +applied: no +author: Lubos Lunak + +This patch makes override-redirect windows (popup menu, dropdown menu, +tooltip, combobox, etc.) also have more window properties like WM_CLASS, +so they can be used when compositing. + +--- src/kernel/qwidget_x11.cpp.sav 2007-06-25 10:36:42.000000000 +0200 ++++ src/kernel/qwidget_x11.cpp 2007-10-02 15:30:13.000000000 +0200 +@@ -557,7 +557,10 @@ void QWidget::create( WId window, bool i + wsa.save_under = True; + XChangeWindowAttributes( dpy, id, CWOverrideRedirect | CWSaveUnder, + &wsa ); +- x11SetWindowType(); ++ XClassHint class_hint; ++ class_hint.res_name = (char *) qAppName(); // application name ++ class_hint.res_class = (char *) qAppClass(); // application class ++ XSetClassHint( dpy, id, &class_hint ); + } else if ( topLevel && !desktop ) { // top-level widget + QWidget *p = parentWidget(); // real parent + if (p) +@@ -620,8 +623,6 @@ void QWidget::create( WId window, bool i + else + XDeleteProperty(dpy, id, qt_xa_motif_wm_hints); + +- x11SetWindowType(); +- + // set _NET_WM_WINDOW_STATE + if (curr_winstate > 0) + XChangeProperty(dpy, id, qt_net_wm_state, XA_ATOM, 32, PropModeReplace, +@@ -629,11 +630,6 @@ void QWidget::create( WId window, bool i + else + XDeleteProperty(dpy, id, qt_net_wm_state); + +- // set _NET_WM_PID +- long curr_pid = getpid(); +- XChangeProperty(dpy, id, qt_net_wm_pid, XA_CARDINAL, 32, PropModeReplace, +- (unsigned char *) &curr_pid, 1); +- + #ifndef QT_NO_XSYNC + // set _NET_WM_SYNC_COUNTER + createSyncCounter(); +@@ -645,19 +641,31 @@ void QWidget::create( WId window, bool i + // when we create a toplevel widget, the frame strut should be dirty + fstrut_dirty = 1; + ++ } else { ++ // non-toplevel widgets don't have a frame, so no need to ++ // update the strut ++ fstrut_dirty = 0; ++ } ++ ++ if (initializeWindow && (popup || (topLevel && !desktop))) { // properties set on all toplevel windows ++ x11SetWindowType(); ++ ++ // set _NET_WM_PID ++ long curr_pid = getpid(); ++ XChangeProperty(dpy, id, qt_net_wm_pid, XA_CARDINAL, 32, PropModeReplace, ++ (unsigned char *) &curr_pid, 1); ++ + // declare the widget's object name as window role + XChangeProperty( dpy, id, + qt_window_role, XA_STRING, 8, PropModeReplace, + (unsigned char *)name(), qstrlen( name() ) ); + + // set client leader property ++ if ( !qt_x11_wm_client_leader ) ++ qt_x11_create_wm_client_leader(); + XChangeProperty( dpy, id, qt_wm_client_leader, + XA_WINDOW, 32, PropModeReplace, + (unsigned char *)&qt_x11_wm_client_leader, 1 ); +- } else { +- // non-toplevel widgets don't have a frame, so no need to +- // update the strut +- fstrut_dirty = 0; + } + + if ( initializeWindow ) { diff --git a/redhat/tqt3/assistant3.desktop b/redhat/tqt3/assistant3.desktop new file mode 100644 index 000000000..49e718c5d --- /dev/null +++ b/redhat/tqt3/assistant3.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=Qt3 Assistant +Comment=Add translations to Qt3 applications +Exec=assistant +Icon=assistant3 +Terminal=false +Encoding=UTF-8 +Type=Application +Categories=Qt;Development; diff --git a/redhat/tqt3/designer3.desktop b/redhat/tqt3/designer3.desktop new file mode 100644 index 000000000..23f1f549a --- /dev/null +++ b/redhat/tqt3/designer3.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Name=Qt3 Designer +GenericName=Interface Designer +Comment=Design GUIs for Qt3 applications +Exec=designer +Icon=designer3 +MimeType=application/x-designer; +Terminal=false +Encoding=UTF-8 +Type=Application +Categories=Qt;Development; diff --git a/redhat/tqt3/linguist3.desktop b/redhat/tqt3/linguist3.desktop new file mode 100644 index 000000000..c6fce02c8 --- /dev/null +++ b/redhat/tqt3/linguist3.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Name=Qt3 Linguist +Comment=Add translations to Qt3 applications +Exec=linguist +Icon=linguist3 +MimeType=application/x-linguist; +Terminal=false +Encoding=UTF-8 +Type=Application +Categories=Qt;Development; diff --git a/redhat/tqt3/qt-3.1.0-makefile.patch b/redhat/tqt3/qt-3.1.0-makefile.patch new file mode 120000 index 000000000..7d8ae65a2 --- /dev/null +++ b/redhat/tqt3/qt-3.1.0-makefile.patch @@ -0,0 +1 @@ +../qt3/qt-3.1.0-makefile.patch \ No newline at end of file diff --git a/redhat/tqt3/qt-3.3.4-print-CJK.patch b/redhat/tqt3/qt-3.3.4-print-CJK.patch new file mode 120000 index 000000000..99cdc6e1d --- /dev/null +++ b/redhat/tqt3/qt-3.3.4-print-CJK.patch @@ -0,0 +1 @@ +../qt3/qt-3.3.4-print-CJK.patch \ No newline at end of file diff --git a/redhat/tqt3/qt-3.3.6-fontrendering-gu-228452.patch b/redhat/tqt3/qt-3.3.6-fontrendering-gu-228452.patch new file mode 120000 index 000000000..b015af122 --- /dev/null +++ b/redhat/tqt3/qt-3.3.6-fontrendering-gu-228452.patch @@ -0,0 +1 @@ +../qt3/qt-3.3.6-fontrendering-gu-228452.patch \ No newline at end of file diff --git a/redhat/tqt3/qt-3.3.6-fontrendering-ml_IN-209974.patch b/redhat/tqt3/qt-3.3.6-fontrendering-ml_IN-209974.patch new file mode 120000 index 000000000..388a5cbe5 --- /dev/null +++ b/redhat/tqt3/qt-3.3.6-fontrendering-ml_IN-209974.patch @@ -0,0 +1 @@ +../qt3/qt-3.3.6-fontrendering-ml_IN-209974.patch \ No newline at end of file diff --git a/redhat/tqt3/qt-3.3.6-fontrendering-te_IN-211259.patch b/redhat/tqt3/qt-3.3.6-fontrendering-te_IN-211259.patch new file mode 120000 index 000000000..93c6ba3d8 --- /dev/null +++ b/redhat/tqt3/qt-3.3.6-fontrendering-te_IN-211259.patch @@ -0,0 +1 @@ +../qt3/qt-3.3.6-fontrendering-te_IN-211259.patch \ No newline at end of file diff --git a/redhat/tqt3/qt-3.3.8-fontrendering-as_IN-209972.patch b/redhat/tqt3/qt-3.3.8-fontrendering-as_IN-209972.patch new file mode 120000 index 000000000..4ded8f792 --- /dev/null +++ b/redhat/tqt3/qt-3.3.8-fontrendering-as_IN-209972.patch @@ -0,0 +1 @@ +../qt3/qt-3.3.8-fontrendering-as_IN-209972.patch \ No newline at end of file diff --git a/redhat/tqt3/qt-x11-free-3.3.4-fullscreen.patch b/redhat/tqt3/qt-x11-free-3.3.4-fullscreen.patch new file mode 120000 index 000000000..09d41d4b3 --- /dev/null +++ b/redhat/tqt3/qt-x11-free-3.3.4-fullscreen.patch @@ -0,0 +1 @@ +../qt3/qt-x11-free-3.3.4-fullscreen.patch \ No newline at end of file diff --git a/redhat/tqt3/qt-x11-free-3.3.6-qfontdatabase_x11.patch b/redhat/tqt3/qt-x11-free-3.3.6-qfontdatabase_x11.patch new file mode 120000 index 000000000..f8342f9f9 --- /dev/null +++ b/redhat/tqt3/qt-x11-free-3.3.6-qfontdatabase_x11.patch @@ -0,0 +1 @@ +../qt3/qt-x11-free-3.3.6-qfontdatabase_x11.patch \ No newline at end of file diff --git a/redhat/tqt3/qt-x11-free-3.3.6-strip.patch b/redhat/tqt3/qt-x11-free-3.3.6-strip.patch new file mode 120000 index 000000000..7121216bc --- /dev/null +++ b/redhat/tqt3/qt-x11-free-3.3.6-strip.patch @@ -0,0 +1 @@ +../qt3/qt-x11-free-3.3.6-strip.patch \ No newline at end of file diff --git a/redhat/tqt3/qt-x11-free-3.3.7-arm.patch b/redhat/tqt3/qt-x11-free-3.3.7-arm.patch new file mode 120000 index 000000000..b7682272a --- /dev/null +++ b/redhat/tqt3/qt-x11-free-3.3.7-arm.patch @@ -0,0 +1 @@ +../qt3/qt-x11-free-3.3.7-arm.patch \ No newline at end of file diff --git a/redhat/tqt3/qt-x11-free-3.3.8b-typo.patch b/redhat/tqt3/qt-x11-free-3.3.8b-typo.patch new file mode 120000 index 000000000..4e2537345 --- /dev/null +++ b/redhat/tqt3/qt-x11-free-3.3.8b-typo.patch @@ -0,0 +1 @@ +../qt3/qt-x11-free-3.3.8b-typo.patch \ No newline at end of file diff --git a/redhat/tqt3/qt-x11-immodule-unified-qt3.3.5-20051012-quiet.patch b/redhat/tqt3/qt-x11-immodule-unified-qt3.3.5-20051012-quiet.patch new file mode 100644 index 000000000..5e5d9773a --- /dev/null +++ b/redhat/tqt3/qt-x11-immodule-unified-qt3.3.5-20051012-quiet.patch @@ -0,0 +1,134 @@ +diff -Nur qt-x11-free-3.3.5.orig/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.cpp qt-x11-free-3.3.5/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.cpp +--- qt-x11-free-3.3.5.orig/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.cpp 2005-10-13 16:09:36.000000000 +0200 ++++ qt-x11-free-3.3.5/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.cpp 2005-10-13 16:09:31.000000000 +0200 +@@ -306,8 +306,8 @@ + + currentIMKey = key; + +- qDebug( "QMultiInputContext::changeInputMethod(): index=%d, slave=%s", +- imIndex, (const char *)_slave->identifierName() ); ++ /* qDebug( "QMultiInputContext::changeInputMethod(): index=%d, slave=%s", ++ imIndex, (const char *)_slave->identifierName() ); */ + } + } + +diff -Nur qt-x11-free-3.3.5.orig/plugins/src/inputmethods/simple/qsimpleinputcontext.cpp qt-x11-free-3.3.5/plugins/src/inputmethods/simple/qsimpleinputcontext.cpp +--- qt-x11-free-3.3.5.orig/plugins/src/inputmethods/simple/qsimpleinputcontext.cpp 2005-10-13 16:09:36.000000000 +0200 ++++ qt-x11-free-3.3.5/plugins/src/inputmethods/simple/qsimpleinputcontext.cpp 2005-10-13 16:09:31.000000000 +0200 +@@ -140,7 +140,7 @@ + // only one character. See description of + // QInputContext::filterEvent() about key compression. + val = text[0].unicode(); +- qDebug( "str = %s", (const char*)keyevent->text().local8Bit() ); ++ // qDebug( "str = %s", (const char*)keyevent->text().local8Bit() ); + } + + // Store value +@@ -164,14 +164,14 @@ + + void QSimpleInputContext::setFocus() + { +- qDebug( "QSimpleInputContext: %p->setFocus(), focusWidget()=%p", +- this, focusWidget() ); ++ /* qDebug( "QSimpleInputContext: %p->setFocus(), focusWidget()=%p", ++ this, focusWidget() ); */ + } + + void QSimpleInputContext::unsetFocus() + { +- qDebug( "QSimpleInputContext: %p->unsetFocus(), focusWidget()=%p", +- this, focusWidget() ); ++ /* qDebug( "QSimpleInputContext: %p->unsetFocus(), focusWidget()=%p", ++ this, focusWidget() ); */ + reset(); + } + +@@ -188,8 +188,8 @@ + case QEvent::MouseButtonRelease: + case QEvent::MouseButtonDblClick: + case QEvent::MouseMove: +- qDebug( "QSimpleInputContext::mouseHandler: " +- "x=%d, type=%d, button=%d, state=%d", x, type, button, state ); ++ /* qDebug( "QSimpleInputContext::mouseHandler: " ++ "x=%d, type=%d, button=%d, state=%d", x, type, button, state ); */ + break; + default: + break; +@@ -240,7 +240,7 @@ + + // no entries were found + if ( p == composeTable->data + composeTable->size ) { +- qDebug( "no match" ); ++ // qDebug( "no match" ); + clearComposeBuffer(); + return FALSE; + } +@@ -250,18 +250,18 @@ + + // check if partial match + if ( composeBuffer[i] == 0 && p->keys[i] ) { +- qDebug("partial match"); ++ // qDebug("partial match"); + return TRUE; + } + + if ( composeBuffer[i] != p->keys[i] ) { +- qDebug("different entry"); ++ // qDebug("different entry"); + clearComposeBuffer(); + return i!=0; + } + } + +- qDebug("match exactly"); ++ // qDebug("match exactly"); + + // match exactly + commitChar( p->value ); +diff -Nur qt-x11-free-3.3.5.orig/src/kernel/qinputcontext.cpp qt-x11-free-3.3.5/src/kernel/qinputcontext.cpp +--- qt-x11-free-3.3.5.orig/src/kernel/qinputcontext.cpp 2005-10-13 16:09:37.000000000 +0200 ++++ qt-x11-free-3.3.5/src/kernel/qinputcontext.cpp 2005-10-13 16:09:31.000000000 +0200 +@@ -526,17 +526,17 @@ + return; + + if ( type == QEvent::IMStart ) { +- qDebug( "sending IMStart with %d chars to %p", +- text.length(), receiver ); ++ /* qDebug( "sending IMStart with %d chars to %p", ++ text.length(), receiver ); */ + event = new QIMEvent( type, text, cursorPosition ); + } else if ( type == QEvent::IMEnd ) { +- qDebug( "sending IMEnd with %d chars to %p, text=%s", +- text.length(), receiver, (const char*)text.local8Bit() ); ++ /* qDebug( "sending IMEnd with %d chars to %p, text=%s", ++ text.length(), receiver, (const char*)text.local8Bit() ); */ + event = new QIMEvent( type, text, cursorPosition ); + } else if ( type == QEvent::IMCompose ) { +- qDebug( "sending IMCompose to %p with %d chars, cpos=%d, sellen=%d, text=%s", ++ /* qDebug( "sending IMCompose to %p with %d chars, cpos=%d, sellen=%d, text=%s", + receiver, text.length(), cursorPosition, selLength, +- (const char*)text.local8Bit() ); ++ (const char*)text.local8Bit() ); */ + event = new QIMComposeEvent( type, text, cursorPosition, selLength ); + } + +--- qt-x11-free-3.3.5/plugins/src/inputmethods/xim/qximinputcontext_x11.cpp.quiet 2005-10-13 19:00:56.000000000 +0200 ++++ qt-x11-free-3.3.5/plugins/src/inputmethods/xim/qximinputcontext_x11.cpp 2005-10-25 15:36:43.000000000 +0200 +@@ -356,7 +356,7 @@ + #if !defined(QT_NO_XIM) + fontsetRefCount++; + if (! qt_xim) { +- qWarning("QInputContext: no input method context available"); ++ // qWarning("QInputContext: no input method context available"); + return; + } + +@@ -742,7 +742,7 @@ + + void QXIMInputContext::close( const QString &errMsg ) + { +- qDebug( errMsg ); ++ // qDebug( errMsg ); + emit deletionRequested(); + } + diff --git a/redhat/tqt3/qt-x11-immodule-unified-qt3.3.8-20071116.diff.bz2 b/redhat/tqt3/qt-x11-immodule-unified-qt3.3.8-20071116.diff.bz2 new file mode 100644 index 000000000..7c122a375 Binary files /dev/null and b/redhat/tqt3/qt-x11-immodule-unified-qt3.3.8-20071116.diff.bz2 differ diff --git a/redhat/tqt3/qt.csh b/redhat/tqt3/qt.csh new file mode 100755 index 000000000..7efcd89c5 --- /dev/null +++ b/redhat/tqt3/qt.csh @@ -0,0 +1,34 @@ +# Qt initialization script (csh) + +# In multilib environments there is a preferred architecture, 64 bit over 32 bit in x86_64, +# When a conflict is found between two packages corresponding with different arches, +# the installed file is the one from the preferred arch. This is very common for executables +# in /usr/bin, for example. If the file /usr/bin/foo is found in an x86_64 package and in an +# i386 package, the executable from x86_64 will be installe + +if ( $?QTDIR ) then + exit +endif + +switch (`uname -m`) + case x86_64: + case ia64: + case s390x: + case ppc64: + set QTPREFIXES = "/usr/lib64/qt-3.3 /usr/lib/qt-3.3" + breaksw + case *: + set QTPREFIXES = "/usr/lib/qt-3.3 /usr/lib64/qt-3.3" +endsw + +foreach QTPREFIX ( $QTPREFIXES ) + test -d "$QTPREFIX" && setenv QTDIR $QTPREFIX && break +end +unset QTPREFIX QTPREFIXES + +if ( "${path}" !~ *$QTDIR/bin* ) then + set path = ( $QTDIR/bin $path ) +endif + +setenv QTINC $QTDIR/include +setenv QTLIB $QTDIR/lib diff --git a/redhat/tqt3/qt.sh b/redhat/tqt3/qt.sh new file mode 100755 index 000000000..88b3e0cea --- /dev/null +++ b/redhat/tqt3/qt.sh @@ -0,0 +1,32 @@ +# Qt initialization script (sh) + +# In multilib environments there is a preferred architecture, 64 bit over 32 bit in x86_64, +# When a conflict is found between two packages corresponding with different arches, +# the installed file is the one from the preferred arch. This is very common for executables +# in /usr/bin, for example. If the file /usr/bin/foo is found in an x86_64 package and in an +# i386 package, the executable from x86_64 will be installe + +if [ -z "${QTDIR}" ]; then + +case `uname -m` in + x86_64 | ia64 | s390x | ppc64 ) + QT_PREFIXES="/usr/lib64/qt-3.3 /usr/lib/qt-3.3" ;; + * ) + QT_PREFIXES="/usr/lib/qt-3.3 /usr/lib64/qt-3.3" ;; +esac + +for QTDIR in ${QT_PREFIXES} ; do + test -d "${QTDIR}" && break +done +unset QT_PREFIXES + +if ! echo ${PATH} | /bin/grep -q $QTDIR/bin ; then + PATH=$QTDIR/bin:${PATH} +fi + +QTINC="$QTDIR/include" +QTLIB="$QTDIR/lib" + +export QTDIR QTINC QTLIB PATH + +fi diff --git a/redhat/tqt3/qt3-3.3.8.d-updates_zh-tw_translations.patch b/redhat/tqt3/qt3-3.3.8.d-updates_zh-tw_translations.patch new file mode 120000 index 000000000..06a4852dc --- /dev/null +++ b/redhat/tqt3/qt3-3.3.8.d-updates_zh-tw_translations.patch @@ -0,0 +1 @@ +../qt3/qt3-3.3.8.d-updates_zh-tw_translations.patch \ No newline at end of file diff --git a/redhat/tqt3/qtconfig3.desktop b/redhat/tqt3/qtconfig3.desktop new file mode 100644 index 000000000..11df0abab --- /dev/null +++ b/redhat/tqt3/qtconfig3.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=Qt3 Config +Comment=Configure Qt3 behavior, styles, fonts +Exec=qtconfig +Icon=qtconfig3 +Terminal=false +Encoding=UTF-8 +Type=Application +Categories=Qt;Settings; diff --git a/redhat/tqt3/tqt3-3.4.0-embed.patch b/redhat/tqt3/tqt3-3.4.0-embed.patch new file mode 100644 index 000000000..10d7704ae --- /dev/null +++ b/redhat/tqt3/tqt3-3.4.0-embed.patch @@ -0,0 +1,10 @@ +--- tqt3/tools/qembed/qembed.pro.qembed 2012-02-13 19:10:01.000000000 +0100 ++++ tqt3/tools/qembed/qembed.pro 2012-02-13 21:26:57.417973392 +0100 +@@ -3,5 +3,7 @@ + TARGET = qembed + REQUIRES=full-config nocrosscompiler + ++DESTDIR = ../../bin + target.path = $$bins.path + INSTALLS += target ++ diff --git a/redhat/tqt3/tqt3-3.4.0-fontrendering-#214570.patch b/redhat/tqt3/tqt3-3.4.0-fontrendering-#214570.patch new file mode 100644 index 000000000..77ca43101 --- /dev/null +++ b/redhat/tqt3/tqt3-3.4.0-fontrendering-#214570.patch @@ -0,0 +1,23 @@ +--- tqt3/src/kernel/qscriptengine_x11.cpp.fontrendering-#214570 2012-02-13 21:41:17.792005290 +0100 ++++ tqt3/src/kernel/qscriptengine_x11.cpp 2012-02-13 21:42:38.785202528 +0100 +@@ -1243,7 +1243,7 @@ + int script = item->script; + Q_ASSERT(script >= TQFont::Devanagari && script <= TQFont::Sinhala); + const unsigned short script_base = 0x0900 + 0x80*(script-TQFont::Devanagari); +- const unsigned short ra = script_base + 0x30; ++ unsigned short ra = script_base + 0x30; //it was const unsigned short ra before modification + const unsigned short halant = script_base + 0x4d; + const unsigned short nukta = script_base + 0x3c; + +@@ -1291,6 +1291,11 @@ + } + #endif + ++ unsigned short *chkAssamese=reordered.data(); ++ if((script == TQFont::Bengali) && (*chkAssamese==0x09F0)) //if it is assamese ra ++ { ++ ra = script_base + 0x70; ++ } + if (len != 1) { + unsigned short *uc = reordered.data(); + bool beginsWithRa = FALSE; diff --git a/redhat/tqt3/tqt3-3.4.0-fontrendering-214371.patch b/redhat/tqt3/tqt3-3.4.0-fontrendering-214371.patch new file mode 100644 index 000000000..9dca7998d --- /dev/null +++ b/redhat/tqt3/tqt3-3.4.0-fontrendering-214371.patch @@ -0,0 +1,15 @@ +diff -pruN qt-x11-free-3.3.6.org/src/kernel/qscriptengine_x11.cpp qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp +--- qt-x11-free-3.3.6.org/src/kernel/qscriptengine_x11.cpp 2006-12-04 18:47:11.000000000 +0530 ++++ qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp 2006-12-05 12:05:10.000000000 +0530 +@@ -1412,7 +1412,10 @@ static bool indic_shape_syllable(QOpenTy + toPos += 2; + if (script == QFont::Devanagari || script == QFont::Gujarati || script == QFont::Bengali) { + if (matra_position == Post || matra_position == Split) { +- toPos = matra+1; ++ if (matra_position == Post ) ++ toPos = matra; ++ else ++ toPos = matra+1; + matra -= 2; + } + } else if (script == QFont::Kannada) { diff --git a/redhat/tqt3/tqt3-3.4.0-fontrendering-ml_IN-209097.patch b/redhat/tqt3/tqt3-3.4.0-fontrendering-ml_IN-209097.patch new file mode 100644 index 000000000..cdb543b25 --- /dev/null +++ b/redhat/tqt3/tqt3-3.4.0-fontrendering-ml_IN-209097.patch @@ -0,0 +1,60 @@ +--- tqt3/src/kernel/qscriptengine_x11.cpp.fontrendering-ml_IN-bz#209097 2012-02-13 19:10:01.000000000 +0100 ++++ tqt3/src/kernel/qscriptengine_x11.cpp 2012-02-13 21:36:07.227917886 +0100 +@@ -871,7 +871,7 @@ + None, None, None, None, + None, None, None, Post, + +- Post, None, Below, None, ++ None, None, None, None, + None, Post, None, None, + None, None, None, None, + None, None, Post, Post, +@@ -1274,6 +1274,16 @@ + int base = 0; + int reph = -1; + ++ //for the special conjuctions about Cons+0d4d+0d30 and Cons+0d40+0d31 of Malayalam ++ bool is_special_conjuction_malayalam = false; ++ ++ if ((len == 3) && ++ ((reordered[2] == 0x0d30) || (reordered[2] == 0x0d31)) && ++ (reordered[1] == 0x0d4d) && ++ ((reordered[0] >= 0x0d15) && (reordered[0] <= 0x0d39))) { ++ is_special_conjuction_malayalam = true; ++ } ++ + #ifdef INDIC_DEBUG + IDEBUG("original:"); + for (i = 0; i < len; i++) { +@@ -1550,6 +1560,15 @@ + reph = i; + } + ++ //for the special conjuctions about Cons+0d4d+0d30 and Cons+0d40+0d31 of Malayalam ++ if (is_special_conjuction_malayalam) { ++ unsigned short temp; ++ ++ temp = reordered[0]; ++ reordered[0] = reordered[2]; ++ reordered[2] = temp; ++ } ++ + if (item->font->stringToCMap((const TQChar *)reordered.data(), len, item->glyphs, item->advances, + &item->num_glyphs, item->flags & TQTextEngine::RightToLeft) != TQFontEngine::NoError) + return FALSE; +@@ -1661,6 +1680,15 @@ + + // halant always applies + ++ //for the special conjuctions about Cons+0d4d+0d30 and Cons+0d40+0d31 of Malayalam ++ if (is_special_conjuction_malayalam) { ++ unsigned int temp; ++ ++ temp = properties[0]; ++ properties[0] = ~PreSubstProperty; ++ properties[2] = temp; ++ } ++ + #ifdef INDIC_DEBUG + { + IDEBUG("OT properties:"); diff --git a/redhat/tqt3/tqt3-3.4.0-fontrendering-ml_IN-217657.patch b/redhat/tqt3/tqt3-3.4.0-fontrendering-ml_IN-217657.patch new file mode 100644 index 000000000..276441c22 --- /dev/null +++ b/redhat/tqt3/tqt3-3.4.0-fontrendering-ml_IN-217657.patch @@ -0,0 +1,11 @@ +--- tqt3/src/kernel/qfont_x11.cpp.fontrendering-ml_IN-217657 2012-02-13 19:10:01.000000000 +0100 ++++ tqt3/src/kernel/qfont_x11.cpp 2012-02-13 21:45:39.903520249 +0100 +@@ -712,7 +712,7 @@ + if ( script >= TQFont::Arabic && script <= TQFont::Khmer ) { + // complex script shaping. Have to do some hard work + int from = TQMAX( 0, pos - 8 ); +- int to = TQMIN( (int)str.length(), pos + 8 ); ++ int to = str.length(); + TQConstString cstr( str.unicode()+from, to-from); + TQTextEngine layout( cstr.string(), d ); + layout.itemize( TQTextEngine::WidthOnly ); diff --git a/redhat/tqt3/tqt3-3.4.0-nodebug.patch b/redhat/tqt3/tqt3-3.4.0-nodebug.patch new file mode 100644 index 000000000..ccfd411ff --- /dev/null +++ b/redhat/tqt3/tqt3-3.4.0-nodebug.patch @@ -0,0 +1,15 @@ +--- tqt3/src/tools/qgpluginmanager.cpp.ndebug 2012-02-13 19:10:01.000000000 +0100 ++++ tqt3/src/tools/qgpluginmanager.cpp 2012-02-13 19:25:05.653477747 +0100 +@@ -506,10 +506,12 @@ + (*f).latin1(), + (const char*) TQFile::encodeName( old->library() ) ); + } else { ++/* + qWarning("%s: Feature %s already defined in %s!", + (const char*) TQFile::encodeName( old->library() ), + (*f).latin1(), + (const char*) TQFile::encodeName( plugin->library() ) ); ++*/ + } + } + } diff --git a/redhat/tqt3/tqt3-3.4.0-odbc.patch b/redhat/tqt3/tqt3-3.4.0-odbc.patch new file mode 100644 index 000000000..3a5aea885 --- /dev/null +++ b/redhat/tqt3/tqt3-3.4.0-odbc.patch @@ -0,0 +1,18 @@ +--- tqt3/src/sql/drivers/odbc/qsql_odbc.cpp.odbc 2012-02-13 19:10:01.000000000 +0100 ++++ tqt3/src/sql/drivers/odbc/qsql_odbc.cpp 2012-02-13 21:47:25.232367854 +0100 +@@ -61,13 +61,13 @@ + #endif + + // newer platform SDKs use SQLLEN instead of SQLINTEGER +-#ifdef SQLLEN ++#if defined(SQLLEN) || defined(Q_OS_WIN64) || defined(Q_OS_UNIX) + # define TQSQLLEN SQLLEN + #else + # define TQSQLLEN SQLINTEGER + #endif + +-#ifdef SQLULEN ++#if defined(SQLULEN) || defined(Q_OS_WIN64) || defined(Q_OS_UNIX) + # define TQSQLULEN SQLULEN + #else + # define TQSQLULEN SQLUINTEGER diff --git a/redhat/tqt3/tqt3-3.4.0-qt-x11-immodule-unified-qt3.3.5-20060318-resetinputcontext.patch b/redhat/tqt3/tqt3-3.4.0-qt-x11-immodule-unified-qt3.3.5-20060318-resetinputcontext.patch new file mode 100644 index 000000000..88e066aa9 --- /dev/null +++ b/redhat/tqt3/tqt3-3.4.0-qt-x11-immodule-unified-qt3.3.5-20060318-resetinputcontext.patch @@ -0,0 +1,92 @@ +--- qt-x11-free-3.3.6/src/widgets/qtextedit.cpp.preedit 2006-06-28 17:18:08.000000000 +0200 ++++ qt-x11-free-3.3.6/src/widgets/qtextedit.cpp 2006-06-28 17:20:09.000000000 +0200 +@@ -1906,9 +1906,6 @@ + + void TQTextEdit::removeSelectedText( int selNum ) + { +- if(selNum != 0) +- resetInputContext(); +- + TQTextCursor c1 = doc->selectionStartCursor( selNum ); + c1.restoreState(); + TQTextCursor c2 = doc->selectionEndCursor( selNum ); +@@ -3171,7 +3168,6 @@ + return; + } + #endif +- resetInputContext(); + TQTextParagraph *p = doc->paragAt( para ); + if ( !p ) + return; +@@ -3198,7 +3194,6 @@ + return; + } + #endif +- resetInputContext(); + for ( int i = 0; i < (int)doc->numSelections(); ++i ) + doc->removeSelection( i ); + +@@ -3240,7 +3235,6 @@ + if ( d->optimMode ) + return; + #endif +- resetInputContext(); + TQTextParagraph *p = doc->paragAt( para ); + if ( !p ) + return; +@@ -3285,7 +3279,6 @@ + if ( isReadOnly() || !doc->commands()->isUndoAvailable() || !undoEnabled ) + return; + +- resetInputContext(); + for ( int i = 0; i < (int)doc->numSelections(); ++i ) + doc->removeSelection( i ); + +@@ -3336,7 +3329,6 @@ + if ( isReadOnly() || !doc->commands()->isRedoAvailable() || !undoEnabled ) + return; + +- resetInputContext(); + for ( int i = 0; i < (int)doc->numSelections(); ++i ) + doc->removeSelection( i ); + +@@ -3450,7 +3442,6 @@ + { + if ( isReadOnly() ) + return; +- resetInputContext(); + normalCopy(); + removeSelectedText(); + updateMicroFocusHint(); +@@ -3938,7 +3929,6 @@ + return; + } + #endif +- resetInputContext(); + if ( !isModified() && isReadOnly() && + this->context() == context && this->text() == text ) + return; +@@ -4112,7 +4102,6 @@ + if ( !p ) + return; + +- resetInputContext(); + if ( index > p->length() - 1 ) + index = p->length() - 1; + +@@ -4169,7 +4158,6 @@ + return; + } + #endif +- resetInputContext(); + if ( doc->hasSelection( selNum ) ) { + doc->removeSelection( selNum ); + repaintChanged(); +@@ -5072,7 +5060,6 @@ + { + if ( dc == doc ) + return; +- resetInputContext(); + doc = dc; + delete cursor; + cursor = new QTextCursor( doc ); diff --git a/redhat/tqt3/tqt3-3.4.0-quiet.patch b/redhat/tqt3/tqt3-3.4.0-quiet.patch new file mode 100644 index 000000000..cb6080ab5 --- /dev/null +++ b/redhat/tqt3/tqt3-3.4.0-quiet.patch @@ -0,0 +1,13 @@ +--- tqt3/src/kernel/qpixmap_x11.cpp.quiet 2012-02-13 19:10:01.000000000 +0100 ++++ tqt3/src/kernel/qpixmap_x11.cpp 2012-02-13 21:24:08.190653338 +0100 +@@ -394,8 +394,8 @@ + { + #if defined(QT_CHECK_STATE) + if ( qApp->type() == TQApplication::Tty ) { +- qWarning( "TQPixmap: Cannot create a TQPixmap when no GUI " +- "is being used" ); ++// qWarning( "TQPixmap: Cannot create a TQPixmap when no GUI " ++// "is being used" ); + } + #endif + diff --git a/redhat/tqt3/tqt3-3.4.0-uic-nostdlib.patch b/redhat/tqt3/tqt3-3.4.0-uic-nostdlib.patch new file mode 100644 index 000000000..39a42e6f5 --- /dev/null +++ b/redhat/tqt3/tqt3-3.4.0-uic-nostdlib.patch @@ -0,0 +1,12 @@ +--- qt-x11-free-3.3.2/tools/designer/uic/main.cpp.sopwith 2004-06-16 17:14:17.000000000 -0400 ++++ qt-x11-free-3.3.2/tools/designer/uic/main.cpp 2004-06-16 17:21:43.000000000 -0400 +@@ -149,6 +149,9 @@ + } else { + trmacro = &opt[1]; + } ++ } else if ( opt == "nostdlib") { ++ TQStringList x; ++ TQApplication::setLibraryPaths(x); + } else if ( opt == "L" ) { + if ( !(n < argc-1) ) { + error = "Missing plugin path."; diff --git a/redhat/tqt3/tqt3-3.4.0-umask.patch b/redhat/tqt3/tqt3-3.4.0-umask.patch new file mode 100644 index 000000000..9c24f9903 --- /dev/null +++ b/redhat/tqt3/tqt3-3.4.0-umask.patch @@ -0,0 +1,14 @@ +--- tqt3/src/tools/qsettings.cpp.umask 2012-02-13 19:10:01.000000000 +0100 ++++ tqt3/src/tools/qsettings.cpp 2012-02-13 19:28:00.802555882 +0100 +@@ -997,7 +997,10 @@ + #endif + + TQFile file( filename + ".tmp" ); +- if (! file.open(IO_WriteOnly)) { ++ mode_t old_umask = umask(0022); ++ bool f = file.open(IO_WriteOnly); ++ umask(old_umask); ++ if (! f) { + + #ifdef QT_CHECK_STATE + qWarning("TQSettings::sync: failed to open '%s' for writing", diff --git a/redhat/tqt3/tqt3-3.4.0.spec b/redhat/tqt3/tqt3-3.4.0.spec new file mode 100644 index 000000000..87d7d2bd4 --- /dev/null +++ b/redhat/tqt3/tqt3-3.4.0.spec @@ -0,0 +1,678 @@ +# Always install under standard prefix +%define _prefix /usr + +# This allows the legacy RHEL/Fedora patches to apply in TDE version. +%define _default_patch_fuzz 2 + +# The following QT4 packages should NOT be installed to +# allow QT3 compilation (please uninstall them prior to compile) +# qt +# qt-sqlite +# qt-mysql +# qt-x11 +# qt-devel +# ...maybe others !!!! + +%define _default_patch_fuzz 2 + +Summary: The shared library for the Qt 3 GUI toolkit +Version: 3.4.0 +Release: 1%{?dist} +Name: tqt3 + +Obsoletes: qt < 1:%{version}-%{release} +Provides: qt = 1:%{version}-%{release} +Obsoletes: qt3 < 1:%{version}-%{release} +Provides: qt3 = 1:%{version}-%{release} + +License: QPL or GPLv2 or GPLv3 +Group: System Environment/Libraries +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Url: http://www.troll.no +Source0: %{name}-%{version}.tar.gz +Source2: qt.sh +Source3: qt.csh +Source4: designer3.desktop +Source5: assistant3.desktop +Source6: linguist3.desktop +Source7: qtconfig3.desktop + +Patch1: qt-3.3.4-print-CJK.patch +Patch2: tqt3-3.4.0-nodebug.patch +Patch3: qt-3.1.0-makefile.patch +Patch4: tqt3-3.4.0-umask.patch +Patch5: qt-x11-free-3.3.6-strip.patch +Patch7: tqt3-3.4.0-quiet.patch +Patch8: tqt3-3.4.0-embed.patch +Patch12: tqt3-3.4.0-uic-nostdlib.patch +Patch13: qt-x11-free-3.3.6-qfontdatabase_x11.patch +Patch27: tqt3-3.4.0-fontrendering-ml_IN-209097.patch +Patch29: qt-3.3.8-fontrendering-as_IN-209972.patch +Patch31: qt-3.3.6-fontrendering-te_IN-211259.patch +Patch32: tqt3-3.4.0-fontrendering-214371.patch +Patch33: tqt3-3.4.0-fontrendering-#214570.patch +Patch34: qt-3.3.6-fontrendering-ml_IN-209974.patch +Patch35: tqt3-3.4.0-fontrendering-ml_IN-217657.patch +Patch37: qt-3.3.6-fontrendering-gu-228452.patch +Patch38: tqt3-3.4.0-odbc.patch +Patch39: qt-x11-free-3.3.7-arm.patch +Patch40: qt-x11-free-3.3.8b-typo.patch + +# immodule patches +Patch53: tqt3-3.4.0-qt-x11-immodule-unified-qt3.3.5-20060318-resetinputcontext.patch + +# qt-copy patches +Patch110: 0084-compositing-properties.patch + +# upstream patches +Patch200: qt-x11-free-3.3.4-fullscreen.patch + +# TDE 3.5.13 patches +Patch300: qt3-3.3.8.d-updates_zh-tw_translations.patch + +%define qt_dirname qt-3.3 +%define qtdir %{_libdir}/%{qt_dirname} +%define qt_docdir %{_docdir}/qt-devel-%{version} + +%define smp 1 +%define immodule 1 +%define debug 0 + +# MySQL plugins +%define plugin_mysql -plugin-sql-mysql +%define mysql_include_dir %{_includedir}/mysql +%define mysql_lib_dir %{_libdir}/mysql + +# Postgres plugins +%define plugin_psql -plugin-sql-psql + +# ODBC plugins +%define plugin_odbc -plugin-sql-odbc + +# sqlite plugins +%define plugin_sqlite -plugin-sql-sqlite + +%define plugins_style -qt-style-cde -qt-style-motifplus -qt-style-platinum -qt-style-sgi -qt-style-windows -qt-style-compact -qt-imgfmt-png -qt-imgfmt-jpeg -qt-imgfmt-mng +%define plugins %{plugin_mysql} %{plugin_psql} %{plugin_odbc} %{plugin_sqlite} %{plugins_style} + +Requires(post): /sbin/ldconfig +Requires(postun): /sbin/ldconfig +Requires: coreutils +Requires: fontconfig >= 2.0 +Requires: /etc/ld.so.conf.d + +BuildRequires: desktop-file-utils +BuildRequires: libmng-devel +BuildRequires: glibc-devel +BuildRequires: libjpeg-devel +BuildRequires: libpng-devel +BuildRequires: zlib-devel +BuildRequires: giflib-devel +BuildRequires: perl +BuildRequires: sed +BuildRequires: findutils +BuildRequires: cups-devel +BuildRequires: tar +BuildRequires: freetype-devel +BuildRequires: fontconfig-devel +BuildRequires: libXrender-devel +BuildRequires: libXrandr-devel +BuildRequires: libXcursor-devel +BuildRequires: libXinerama-devel +BuildRequires: libXft-devel +BuildRequires: libXext-devel +BuildRequires: libX11-devel +BuildRequires: libSM-devel +BuildRequires: libICE-devel +BuildRequires: libXt-devel +BuildRequires: libXmu-devel +BuildRequires: libXi-devel +BuildRequires: xorg-x11-proto-devel +BuildRequires: mesa-libGL-devel +BuildRequires: mesa-libGLU-devel +BuildRequires: desktop-file-utils +BuildRequires: mysql-devel +BuildRequires: postgresql-devel +BuildRequires: unixODBC-devel +BuildRequires: sqlite-devel + + +%package config +Summary: Graphical configuration tool for programs using Qt 3 +Group: User Interface/Desktops +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: qt-config < 1:%{version}-%{release} +Provides: qt-config = 1:%{version}-%{release} +Obsoletes: qt3-config < 1:%{version}-%{release} +Provides: qt3-config = 1:%{version}-%{release} + + +%package devel +Summary: Development files for the Qt 3 GUI toolkit +Group: Development/Libraries +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: freetype-devel +Requires: fontconfig-devel +Requires: libXrender-devel +Requires: libXrandr-devel +Requires: libXcursor-devel +Requires: libXinerama-devel +Requires: libXft-devel +Requires: libXext-devel +Requires: libX11-devel +Requires: libSM-devel +Requires: libICE-devel +Requires: libXt-devel +Requires: xorg-x11-proto-devel +Requires: libpng-devel +Requires: libjpeg-devel +Requires: libmng-devel +Requires: mesa-libGL-devel +Requires: mesa-libGLU-devel + +Obsoletes: qt-devel < 1:%{version}-%{release} +Provides: qt-devel = 1:%{version}-%{release} +Obsoletes: qt3-devel < 1:%{version}-%{release} +Provides: qt3-devel = 1:%{version}-%{release} + + +%package devel-docs +Summary: Documentation for the Qt 3 GUI toolkit +Group: Development/Libraries +Requires: %{name}-devel = %{?epoch:%{epoch}:}%{version}-%{release} + +Obsoletes: qt-devel-docs < 1:%{version}-%{release} +Provides: qt-devel-docs = 1:%{version}-%{release} +Obsoletes: qt3-devel-docs < 1:%{version}-%{release} +Provides: qt3-devel-docs = 1:%{version}-%{release} + + +%package ODBC +Summary: ODBC drivers for Qt 3's SQL classes +Group: System Environment/Libraries +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} + +Obsoletes: qt-ODBC < 1:%{version}-%{release} +Provides: qt-ODBC = 1:%{version}-%{release} +Obsoletes: qt3-ODBC < 1:%{version}-%{release} +Provides: qt3-ODBC = 1:%{version}-%{release} + + +%package MySQL +Summary: MySQL drivers for Qt 3's SQL classes +Group: System Environment/Libraries +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} + +Obsoletes: qt-MySQL < 1:%{version}-%{release} +Provides: qt-MySQL = 1:%{version}-%{release} +Obsoletes: qt3-MySQL < 1:%{version}-%{release} +Provides: qt3-MySQL = 1:%{version}-%{release} + + +%package PostgreSQL +Summary: PostgreSQL drivers for Qt 3's SQL classes +Group: System Environment/Libraries +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} + +Obsoletes: qt-PostgreSQL < 1:%{version}-%{release} +Provides: qt-PostgreSQL = 1:%{version}-%{release} +Obsoletes: qt3-PostgreSQL < 1:%{version}-%{release} +Provides: qt3-PostgreSQL = 1:%{version}-%{release} + + +%package sqlite +Summary: sqlite drivers for Qt 3's SQL classes +Group: System Environment/Libraries +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} + +Obsoletes: qt-sqlite < 1:%{version}-%{release} +Provides: qt-sqlite = 1:%{version}-%{release} +Obsoletes: qt3-sqlite < 1:%{version}-%{release} +Provides: qt3-sqlite = 1:%{version}-%{release} + + +%package designer +Summary: In3erface designer (IDE) for the Qt 3 toolkit +Group: Development/Tools +Requires: %{name}-devel = %{?epoch:%{epoch}:}%{version}-%{release} + +Obsoletes: qt-designer < 1:%{version}-%{release} +Provides: qt-designer = 1:%{version}-%{release} +Obsoletes: qt3-designer < 1:%{version}-%{release} +Provides: qt3-designer = 1:%{version}-%{release} + + +%description +Qt is a GUI software toolkit which simplifies the task of writing and +maintaining GUI (Graphical User Interface) applications +for the X Window System. + +Qt is written in C++ and is fully object-oriented. + +This package contains the shared library needed to run Qt 3 +applications, as well as the README files for Qt 3. + + +%description config +Qt is a GUI software toolkit which simplifies the task of writing and +maintaining GUI (Graphical User Interface) applications +for the X Window System. + +Qt is written in C++ and is fully object-oriented. + +This package contains a graphical configuration tool for programs using Qt 3. + + +%description devel +The %{name}-devel package contains the files necessary to develop +applications using the Qt GUI toolkit: the header files, the Qt meta +object compiler. + +Install %{name}-devel if you want to develop GUI applications using the Qt 3 +toolkit. + + +%description devel-docs +The %{name}-devel-docs package contains the man pages, the HTML documentation and +example programs for Qt 3. + + +%description ODBC +ODBC driver for Qt 3's SQL classes (QSQL) + + +%description MySQL +MySQL driver for Qt 3's SQL classes (QSQL) + + +%description PostgreSQL +PostgreSQL driver for Qt 3's SQL classes (QSQL) + + +%description sqlite +sqlite driver for Qt 3's SQL classes (QSQL) + + +%description designer +The %{name}-designer package contains an User Interface designer tool +for the Qt 3 toolkit. + + +%prep +%setup -q -n %{name} +%patch1 -p1 -b .cjk +%patch2 -p1 -b .ndebug +%patch3 -p1 -b .makefile +%patch4 -p1 -b .umask +%patch5 -p1 +%patch7 -p1 -b .quiet +%patch8 -p1 -b .qembed +%patch12 -p1 -b .nostdlib +%patch13 -p1 -b .fonts +%patch27 -p1 -b .fontrendering-ml_IN-bz#209097 +%patch29 -p1 -b .fontrendering-as_IN-bz#209972 +%patch31 -p1 -b .fontrendering-te_IN-bz#211259 +%patch32 -p1 -b .fontrendering-bz#214371 +%patch33 -p1 -b .fontrendering-#214570 +%patch34 -p1 -b .fontrendering-#209974 +%patch35 -p1 -b .fontrendering-ml_IN-217657 +%patch37 -p1 -b .fontrendering-gu-228452 +%patch38 -p1 -b .odbc +# it's not 100% clear to me if this is safe for all archs -- Rex +%ifarch armv5tel +%patch39 -p1 -b .arm +%endif +%patch40 -p1 + +# immodule patches +%if %{immodule} +%patch53 -p1 -b .resetinputcontext +%endif + +# qt-copy patches +%patch110 -p0 -b .0084-compositing-properties + +# upstream patches +%patch200 -p1 -b .fullscreen + +# TDE 3.5.13 patches +%patch300 -p1 + +# convert to UTF-8 +iconv -f iso-8859-1 -t utf-8 < doc/man/man3/qdial.3qt > doc/man/man3/qdial.3qt_ +mv doc/man/man3/qdial.3qt_ doc/man/man3/qdial.3qt + +%build +export QTDIR=`/bin/pwd` +export LD_LIBRARY_PATH="$QTDIR/lib:$LD_LIBRARY_PATH" +export PATH="$QTDIR/bin:$PATH" +export QTDEST=%{qtdir} + +%if %{smp} + export SMP_MFLAGS="%{?_smp_mflags}" +%endif + +%if %{immodule} + sh ./make-symlinks.sh +%endif + +# set correct X11 prefix +perl -pi -e "s,QMAKE_LIBDIR_X11.*,QMAKE_LIBDIR_X11\t=," mkspecs/*/qmake.conf +perl -pi -e "s,QMAKE_INCDIR_X11.*,QMAKE_INCDIR_X11\t=," mkspecs/*/qmake.conf +perl -pi -e "s,QMAKE_INCDIR_OPENGL.*,QMAKE_INCDIR_OPENGL\t=," mkspecs/*/qmake.conf +perl -pi -e "s,QMAKE_LIBDIR_OPENGL.*,QMAKE_LIBDIR_OPENGL\t=," mkspecs/*/qmake.conf + +# don't use rpath +perl -pi -e "s|-Wl,-rpath,| |" mkspecs/*/qmake.conf + +perl -pi -e "s|-O2|$INCLUDES %{optflags} -fno-strict-aliasing|g" mkspecs/*/qmake.conf + +# set correct lib path +if [ "%{_lib}" == "lib64" ] ; then + perl -pi -e "s,/usr/lib /lib,/usr/%{_lib} /%{_lib},g" config.tests/{unix,x11}/*.test + perl -pi -e "s,/lib /usr/lib,/%{_lib} /usr/%{_lib},g" config.tests/{unix,x11}/*.test +fi + +# build shared, threaded (default) libraries +echo yes | ./configure \ + -prefix $QTDEST \ + -docdir %{qt_docdir} \ +%if %{_lib} == lib64 + -platform linux-g++-64 \ +%else + -platform linux-g++ \ +%endif +%if %{debug} + -debug \ +%else + -release \ +%endif + -shared \ + -largefile \ + -qt-gif \ + -system-zlib \ + -system-libpng \ + -system-libmng \ + -system-libjpeg \ + -no-exceptions \ + -enable-styles \ + -enable-tools \ + -enable-kernel \ + -enable-widgets \ + -enable-dialogs \ + -enable-iconview \ + -enable-workspace \ + -enable-network \ + -enable-canvas \ + -enable-table \ + -enable-xml \ + -enable-opengl \ + -enable-sql \ + -qt-style-motif \ + %{plugins} \ + -stl \ + -thread \ + -cups \ + -sm \ + -xinerama \ + -xrender \ + -xkb \ + -ipv6 \ + -dlopen-opengl \ + -xft \ + -tablet + +make $SMP_MFLAGS src-qmake + +# build sqlite plugin +pushd plugins/src/sqldrivers/sqlite +qmake -o Makefile sqlite.pro +popd + +# build psql plugin +pushd plugins/src/sqldrivers/psql +qmake -o Makefile "INCLUDEPATH+=%{_includedir}/pgsql %{_includedir}/pgsql/server %{_includedir}/pgsql/internal" "LIBS+=-lpq" psql.pro +popd + +# build mysql plugin +pushd plugins/src/sqldrivers/mysql +qmake -o Makefile "INCLUDEPATH+=%{mysql_include_dir}" "LIBS+=-L%{mysql_lib_dir} -lmysqlclient" mysql.pro +popd + +# build odbc plugin +pushd plugins/src/sqldrivers/odbc +qmake -o Makefile "LIBS+=-lodbc" odbc.pro +popd + +make $SMP_MFLAGS src-moc +make $SMP_MFLAGS sub-src +make $SMP_MFLAGS sub-tools UIC="$QTDIR/bin/uic -nostdlib -L $QTDIR/plugins" + +%install +rm -rf %{buildroot} + +export QTDIR=`/bin/pwd` +export LD_LIBRARY_PATH="$QTDIR/lib:$LD_LIBRARY_PATH" +export PATH="$QTDIR/bin:$PATH" +export QTDEST=%{qtdir} + +make install INSTALL_ROOT=%{buildroot} + +for i in findtr qt20fix qtrename140 lrelease lupdate ; do + install bin/$i %{buildroot}%{qtdir}/bin/ +done + +mkdir -p %{buildroot}%{_libdir}/pkgconfig/ +mv %{buildroot}%{qtdir}/lib/pkgconfig/*.pc %{buildroot}%{_libdir}/pkgconfig/ + +# install man pages +mkdir -p %{buildroot}%{_mandir} +cp -fR doc/man/* %{buildroot}%{_mandir}/ + +# clean up +make -C tutorial clean +make -C examples clean + +# Make sure the examples can be built outside the source tree. +# Our binaries fulfill all requirements, so... +perl -pi -e "s,^DEPENDPATH.*,,g;s,^REQUIRES.*,,g" `find examples -name "*.pro"` + +# don't include Makefiles of qt examples/tutorials +find examples -name "Makefile" | xargs rm -f +find examples -name "*.obj" | xargs rm -rf +find examples -name "*.moc" | xargs rm -rf +find tutorial -name "Makefile" | xargs rm -f + +for a in */*/Makefile ; do + sed 's|^SYSCONF_MOC.*|SYSCONF_MOC = %{qtdir}/bin/moc|' < $a > ${a}.2 + mv -v ${a}.2 $a +done + +mkdir -p %{buildroot}/etc/profile.d +install -m 644 %{SOURCE2} %{SOURCE3} %{buildroot}/etc/profile.d/ + +# Add desktop files +mkdir -p %{buildroot}%{_datadir}/applications +desktop-file-install \ + --dir %{buildroot}%{_datadir}/applications \ + --vendor="qt" \ + %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} + +# Patch qmake to use qt-mt unconditionally +perl -pi -e "s,-lqt ,-lqt-mt ,g;s,-lqt$,-lqt-mt,g" %{buildroot}%{qtdir}/mkspecs/*/qmake.conf + +# remove broken links +rm -f %{buildroot}%{qtdir}/mkspecs/default/linux-g++* +rm -f %{buildroot}%{qtdir}/lib/*.la + +mkdir -p %{buildroot}/etc/ld.so.conf.d +echo "%{qtdir}/lib" > %{buildroot}/etc/ld.so.conf.d/qt-%{_arch}.conf + +# install icons +mkdir %{buildroot}%{_datadir}/pixmaps +install -m 644 tools/assistant/images/qt.png %{buildroot}%{_datadir}/pixmaps/qtconfig3.png +install -m 644 tools/assistant/images/designer.png %{buildroot}%{_datadir}/pixmaps/designer3.png +install -m 644 tools/assistant/images/assistant.png %{buildroot}%{_datadir}/pixmaps/assistant3.png +install -m 644 tools/assistant/images/linguist.png %{buildroot}%{_datadir}/pixmaps/linguist3.png + +# own style directory +mkdir -p %{buildroot}%{qtdir}/plugins/styles + +%clean +rm -rf %{buildroot} + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + +%files +%defattr(-,root,root,-) +%doc FAQ LICENSE* README* changes* +%dir %{qtdir} +%dir %{qtdir}/bin +%dir %{qtdir}/lib +%dir %{qtdir}/plugins +%dir %{qtdir}/plugins/sqldrivers +%dir %{qtdir}/plugins/styles +%{qtdir}/translations +%{qtdir}/plugins/designer/ +%if %{immodule} +%{qtdir}/plugins/inputmethods +%endif +%config /etc/profile.d/* +/etc/ld.so.conf.d/* +%{qtdir}/lib/libtqui.so.* +%{qtdir}/lib/libtqt*.so.* + +# TQT 3.4.0: WTF is this file ?? +%exclude %{_mandir}/README + +%files config +%defattr(-,root,root,-) +%{qtdir}/bin/qtconfig +%{_datadir}/applications/*qtconfig*.desktop +%{_datadir}/pixmaps/qtconfig3.png + +%files devel +%defattr(-,root,root,-) +%{qt_docdir}/ +%{qtdir}/bin/moc +%{qtdir}/bin/uic +%{qtdir}/bin/findtr +%{qtdir}/bin/qt20fix +%{qtdir}/bin/qtrename140 +%{qtdir}/bin/assistant +%{qtdir}/bin/qm2ts +%{qtdir}/bin/qmake +%{qtdir}/bin/qembed +%{qtdir}/bin/linguist +%{qtdir}/bin/lupdate +%{qtdir}/bin/lrelease +%{qtdir}/include +%{qtdir}/mkspecs +%{qtdir}/lib/libtqt*.so +%{qtdir}/lib/libtqui.so +%{qtdir}/lib/libeditor.a +%{qtdir}/lib/libdesigner*.a +%{qtdir}/lib/libqassistantclient.a +%{qtdir}/lib/*.prl +%{qtdir}/phrasebooks +%{_libdir}/pkgconfig/* +%{_datadir}/applications/*linguist*.desktop +%{_datadir}/applications/*assistant*.desktop +%{_datadir}/pixmaps/linguist3.png +%{_datadir}/pixmaps/assistant3.png + +# QT 3.3.8.D (TDE): 4 binaries have appeared +%{qtdir}/bin/createcw +%{qtdir}/bin/makeqpf +%{qtdir}/bin/mergetr +%{qtdir}/bin/msg2qm + +# QT 3.3.8.D (TDE): removes lots of unnecessary include files +# (where do they come from ??? They were not in 3.3.8b !) +%exclude %{qtdir}/include/btree.h +%exclude %{qtdir}/include/crc32.h +%exclude %{qtdir}/include/debian_qsql_odbc.h +%exclude %{qtdir}/include/deflate.h +%exclude %{qtdir}/include/ftglue.h +%exclude %{qtdir}/include/ftxgdef.h +%exclude %{qtdir}/include/ftxgpos.h +%exclude %{qtdir}/include/ftxgsub.h +%exclude %{qtdir}/include/ftxopen.h +%exclude %{qtdir}/include/ftxopenf.h +%exclude %{qtdir}/include/hash.h +%exclude %{qtdir}/include/inffast.h +%exclude %{qtdir}/include/inffixed.h +%exclude %{qtdir}/include/inflate.h +%exclude %{qtdir}/include/inftrees.h +%exclude %{qtdir}/include/jchuff.h +%exclude %{qtdir}/include/jconfig.h +%exclude %{qtdir}/include/jdct.h +%exclude %{qtdir}/include/jdhuff.h +%exclude %{qtdir}/include/jerror.h +%exclude %{qtdir}/include/jinclude.h +%exclude %{qtdir}/include/jmemsys.h +%exclude %{qtdir}/include/jmorecfg.h +%exclude %{qtdir}/include/jversion.h +%exclude %{qtdir}/include/moc_yacc.h +%exclude %{qtdir}/include/opcodes.h +%exclude %{qtdir}/include/os.h +%exclude %{qtdir}/include/otlbuffer.h +%exclude %{qtdir}/include/pager.h +%exclude %{qtdir}/include/parse.h +%exclude %{qtdir}/include/pngasmrd.h +%exclude %{qtdir}/include/pngconf.h +%exclude %{qtdir}/include/sqlite.h +%exclude %{qtdir}/include/sqliteInt.h +%exclude %{qtdir}/include/trees.h +%exclude %{qtdir}/include/vdbe.h +%exclude %{qtdir}/include/vdbeInt.h +%exclude %{qtdir}/mkspecs/linux-g++-sparc + +%files devel-docs +%defattr(-,root,root,-) +%doc examples +%doc tutorial +%{_mandir}/*/* + +%files sqlite +%defattr(-,root,root,-) +%{qtdir}/plugins/sqldrivers/libqsqlite.so + +%files ODBC +%defattr(-,root,root,-) +%{qtdir}/plugins/sqldrivers/libqsqlodbc.so + +%files PostgreSQL +%defattr(-,root,root,-) +%{qtdir}/plugins/sqldrivers/libqsqlpsql.so + +%files MySQL +%defattr(-,root,root,-) +%{qtdir}/plugins/sqldrivers/libqsqlmysql.so + +%files designer +%defattr(-,root,root,-) +%{qtdir}/templates +%{qtdir}/bin/designer +%{_datadir}/applications/*designer*.desktop +%{_datadir}/pixmaps/designer3.png + + +%changelog +* Mon Feb 13 2012 Francois Andriot - 3.4.0-1 +- Initial build for TDE R14 +- Renames 'qt3' to 'tqt3' +- Spec file based on 'qt3-3.3.8b-30' from RHEL 6 + +* Sun Dec 18 2011 Francois Andriot - 3.3.8.d-3 +- Updates zh_TW translations, thanks to Wei-Lun Chao . + +* Thu Nov 03 2011 Francois Andriot - 3.3.8.d-2 +- Add missing BuildRequires + +* Fri Sep 02 2011 Francois Andriot - 3.3.8.d-1 +- Initial build for RHEL 6, RHEL 5, and Fedora 15 +- Switch to Trinity Version +- Spec file based on RHEL 6 'qt3-3.3.8b-29' -- cgit v1.2.1 From 9eaa7eb86bd627d3636f0d1988c7e867e2f7eebf Mon Sep 17 00:00:00 2001 From: "Pawel \"l0ner\" Soltys" Date: Wed, 15 Feb 2012 02:00:38 +0100 Subject: hal: fixed hangup on hal start due to move of udev binaries from /sbin to /usr/bin in the latest udev update. --- arch/3.5.13/trinity-base/hal/PKGBUILD | 8 +++++--- arch/3.5.13/trinity-base/hal/udev-update.patch | 26 ++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 3 deletions(-) create mode 100644 arch/3.5.13/trinity-base/hal/udev-update.patch diff --git a/arch/3.5.13/trinity-base/hal/PKGBUILD b/arch/3.5.13/trinity-base/hal/PKGBUILD index f4a30f075..03ad188d7 100644 --- a/arch/3.5.13/trinity-base/hal/PKGBUILD +++ b/arch/3.5.13/trinity-base/hal/PKGBUILD @@ -16,7 +16,8 @@ options=('!libtool' '!makeflags') install=hal.install source=(http://hal.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz hald - hal.patch) + hal.patch + udev-update.patch) # patches/hal-0.5.9-hide-diagnostic.patch # patches/hal-remove-dell-killswitch.patch # patches/hal-KVM-evdev.patch @@ -32,7 +33,8 @@ source=(http://hal.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz md5sums=('e9163df591a6f38f59fdbfe33e73bf20' '4cdfc673ad65ddb51919f5a757f62145' - '185dd5d6ffc703ec8395b4eb3a1ae498') + '185dd5d6ffc703ec8395b4eb3a1ae498' + 'cad3564de1708603c7a1e0facf6b1921') # '4d4b6801a1cedca22b8bdd9db73b16fb' # '6d87c3e63184ae3a69caafc846f538a3' # '6507e5091ee2d11a87ae738a8e2caecb' @@ -50,7 +52,7 @@ build() { cd $srcdir patch -Np1 -d ${srcdir} < hal.patch cd "${srcdir}/${pkgname}-${pkgver}" -# patch -Np1 -i "${srcdir}/hal-0.5.9-hide-diagnostic.patch" + patch -Np1 -i "${srcdir}/udev-update.patch" # patch -Np1 -i "${srcdir}/hal-remove-dell-killswitch.patch" # patch -Np1 -i "${srcdir}/hal-KVM-evdev.patch" # patch -Np1 -i "${srcdir}/hal-HDAPS-blacklist.patch" diff --git a/arch/3.5.13/trinity-base/hal/udev-update.patch b/arch/3.5.13/trinity-base/hal/udev-update.patch new file mode 100644 index 000000000..a5be64bc6 --- /dev/null +++ b/arch/3.5.13/trinity-base/hal/udev-update.patch @@ -0,0 +1,26 @@ +diff -ur hal-0.5.14_origin/hald/linux/blockdev.c hal-0.5.14/hald/linux/blockdev.c +--- hal-0.5.14_origin/hald/linux/blockdev.c 2012-02-15 01:44:51.000000000 +0100 ++++ hal-0.5.14/hald/linux/blockdev.c 2012-02-15 01:45:12.000000000 +0100 +@@ -1864,7 +1864,7 @@ + char *ret; + char *u_stdout; + int u_exit_status; +- const char *argv[] = {"/sbin/udevadm", "info", "--root", "--query", "name", "--path", NULL, NULL}; ++ const char *argv[] = {"/usr/bin/udevadm", "info", "--root", "--query", "name", "--path", NULL, NULL}; + GError *g_error; + + ret = NULL; +diff -ur hal-0.5.14_origin/hald/linux/coldplug.c hal-0.5.14/hald/linux/coldplug.c +--- hal-0.5.14_origin/hald/linux/coldplug.c 2012-02-15 01:44:51.000000000 +0100 ++++ hal-0.5.14/hald/linux/coldplug.c 2012-02-15 01:45:08.000000000 +0100 +@@ -154,8 +154,8 @@ + static gboolean + hal_util_init_sysfs_to_udev_map (void) + { +- char *udevdb_export_argv[] = { "/sbin/udevadm", "info", "-e", NULL }; +- char *udevroot_argv[] = { "/sbin/udevadm", "info", "-r", NULL }; ++ char *udevdb_export_argv[] = { "/usr/bin/udevadm", "info", "-e", NULL }; ++ char *udevroot_argv[] = { "/usr/bin/udevadm", "info", "-r", NULL }; + int udevinfo_exitcode; + UdevInfo *info = NULL; + char *p; -- cgit v1.2.1 From 4a3f0ef6b92d4a30e310be5912896ca9bfd0f3c5 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 15 Feb 2012 16:21:15 -0600 Subject: Update tdebase on Debian and Ubuntu to support upower --- debian/lenny/tdebase/debian/control | 2 +- debian/lenny/tdebase/debian/rules | 2 +- debian/squeeze/tdebase/debian/control | 2 +- debian/squeeze/tdebase/debian/rules | 2 +- ubuntu/maverick/tdebase/debian/control | 2 +- ubuntu/maverick/tdebase/debian/rules | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/debian/lenny/tdebase/debian/control b/debian/lenny/tdebase/debian/control index 6664c5d52..ff1f7475a 100644 --- a/debian/lenny/tdebase/debian/control +++ b/debian/lenny/tdebase/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Timothy Pearson XSBC-Original-Maintainer: Debian Qt/KDE Maintainers Uploaders: Ana Beatriz Guerrero Lopez , Fathi Boudra , Modestas Vainius , Sune Vuorela -Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-trinity-dev (>= 4:3.5.10), libldap2-dev, libhal-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libhal-storage-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsensors-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, libxss-dev, libxxf86misc-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xutils, sharutils, texinfo, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, xmkmf | xutils-dev, tdelibs4c2a-trinity, libogg-dev, libogg-dev-la, libdbus-tqt-1-dev, libavahi-tqt-dev, libudev-dev, libtool, libltdl-dev, cmake +Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-trinity-dev (>= 4:3.5.10), libldap2-dev, libhal-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libhal-storage-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsensors-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, libxss-dev, libxxf86misc-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xutils, sharutils, texinfo, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, xmkmf | xutils-dev, tdelibs4c2a-trinity, libogg-dev, libogg-dev-la, libdbus-tqt-1-dev, libavahi-tqt-dev, libudev-dev, libdbus-1-tqt-dev, libtool, libltdl-dev, cmake Build-Depends-Indep: doxygen, libtqtinterface-doc, graphviz, gsfonts-x11, tdelibs4-trinity-doc Build-Conflicts: nvidia-glx (<< 1.0.8774-6) Standards-Version: 3.8.4 diff --git a/debian/lenny/tdebase/debian/rules b/debian/lenny/tdebase/debian/rules index 145594f4e..aee72896e 100755 --- a/debian/lenny/tdebase/debian/rules +++ b/debian/lenny/tdebase/debian/rules @@ -21,7 +21,7 @@ CXXFLAGS := -DSMB_CTX_FLAG_USE_KERBEROS -DSMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS - DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" -DWITH_GCC_VISIBILITY="ON" \ -DKCHECKPASS_PAM_SERVICE="kcheckpass-trinity" -DTDM_PAM_SERVICE="tdm-trinity" -DKSCREENSAVER_PAM_SERVICE="kscreensaver-trinity" -DWITH_USBIDS="/usr/share/misc/usb.ids" \ --DWITH_ARTS="ON" -DWITH_SHADOW="ON" -DWITH_PAM="ON" -DWITH_SASL="ON" -DWITH_SUDO_TDESU_BACKEND="ON" -DWITH_LDAP="ON" -DWITH_SAMBA="ON" -DWITH_LIBRAW1394="ON" -DWITH_OPENEXR="ON" -DWITH_XCOMPOSITE="ON" -DWITH_XCURSOR="ON" -DWITH_XFIXES="ON" -DWITH_XRANDR="ON" -DWITH_XINERAMA="ON" -DWITH_HAL="ON" -DWITH_XDMCP="ON" -DWITH_XRENDER="ON" -DWITH_XDAMAGE="ON" -DWITH_XEXT="ON" -DWITH_XTEST="ON" +-DWITH_ARTS="ON" -DWITH_SHADOW="ON" -DWITH_PAM="ON" -DWITH_SASL="ON" -DWITH_SUDO_TDESU_BACKEND="ON" -DWITH_LDAP="ON" -DWITH_SAMBA="ON" -DWITH_LIBRAW1394="ON" -DWITH_OPENEXR="ON" -DWITH_XCOMPOSITE="ON" -DWITH_XCURSOR="ON" -DWITH_XFIXES="ON" -DWITH_XRANDR="ON" -DWITH_XINERAMA="ON" -DWITH_HAL="ON" -DWITH_XDMCP="ON" -DWITH_XRENDER="ON" -DWITH_XDAMAGE="ON" -DWITH_XEXT="ON" -DWITH_XTEST="ON" -DWITH_UPOWER="ON" # Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to # never build in parallel, regardless of DEB_BUILD_OPTIONS. diff --git a/debian/squeeze/tdebase/debian/control b/debian/squeeze/tdebase/debian/control index 929a5df8b..0e55ce1cf 100644 --- a/debian/squeeze/tdebase/debian/control +++ b/debian/squeeze/tdebase/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Timothy Pearson XSBC-Original-Maintainer: Debian Qt/KDE Maintainers Uploaders: Ana Beatriz Guerrero Lopez , Fathi Boudra , Modestas Vainius , Sune Vuorela -Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-trinity-dev (>= 4:3.5.10), libldap2-dev, libhal-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libhal-storage-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsensors4-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, libxss-dev, libxxf86misc-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xutils, sharutils, texinfo, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, xmkmf | xutils-dev, tdelibs4c2a-trinity, libogg-dev, libogg-dev-la, libdbus-tqt-1-dev, libavahi-tqt-dev, libudev-dev, libtool, libltdl-dev, cmake +Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-trinity-dev (>= 4:3.5.10), libldap2-dev, libhal-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libhal-storage-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsensors4-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, libxss-dev, libxxf86misc-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xutils, sharutils, texinfo, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, xmkmf | xutils-dev, tdelibs4c2a-trinity, libogg-dev, libogg-dev-la, libdbus-tqt-1-dev, libavahi-tqt-dev, libudev-dev, libdbus-1-tqt-dev, libtool, libltdl-dev, cmake Build-Depends-Indep: doxygen, libtqtinterface-doc, graphviz, gsfonts-x11, tdelibs4-trinity-doc Build-Conflicts: nvidia-glx (<< 1.0.8774-6) Standards-Version: 3.8.4 diff --git a/debian/squeeze/tdebase/debian/rules b/debian/squeeze/tdebase/debian/rules index 145594f4e..aee72896e 100755 --- a/debian/squeeze/tdebase/debian/rules +++ b/debian/squeeze/tdebase/debian/rules @@ -21,7 +21,7 @@ CXXFLAGS := -DSMB_CTX_FLAG_USE_KERBEROS -DSMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS - DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" -DWITH_GCC_VISIBILITY="ON" \ -DKCHECKPASS_PAM_SERVICE="kcheckpass-trinity" -DTDM_PAM_SERVICE="tdm-trinity" -DKSCREENSAVER_PAM_SERVICE="kscreensaver-trinity" -DWITH_USBIDS="/usr/share/misc/usb.ids" \ --DWITH_ARTS="ON" -DWITH_SHADOW="ON" -DWITH_PAM="ON" -DWITH_SASL="ON" -DWITH_SUDO_TDESU_BACKEND="ON" -DWITH_LDAP="ON" -DWITH_SAMBA="ON" -DWITH_LIBRAW1394="ON" -DWITH_OPENEXR="ON" -DWITH_XCOMPOSITE="ON" -DWITH_XCURSOR="ON" -DWITH_XFIXES="ON" -DWITH_XRANDR="ON" -DWITH_XINERAMA="ON" -DWITH_HAL="ON" -DWITH_XDMCP="ON" -DWITH_XRENDER="ON" -DWITH_XDAMAGE="ON" -DWITH_XEXT="ON" -DWITH_XTEST="ON" +-DWITH_ARTS="ON" -DWITH_SHADOW="ON" -DWITH_PAM="ON" -DWITH_SASL="ON" -DWITH_SUDO_TDESU_BACKEND="ON" -DWITH_LDAP="ON" -DWITH_SAMBA="ON" -DWITH_LIBRAW1394="ON" -DWITH_OPENEXR="ON" -DWITH_XCOMPOSITE="ON" -DWITH_XCURSOR="ON" -DWITH_XFIXES="ON" -DWITH_XRANDR="ON" -DWITH_XINERAMA="ON" -DWITH_HAL="ON" -DWITH_XDMCP="ON" -DWITH_XRENDER="ON" -DWITH_XDAMAGE="ON" -DWITH_XEXT="ON" -DWITH_XTEST="ON" -DWITH_UPOWER="ON" # Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to # never build in parallel, regardless of DEB_BUILD_OPTIONS. diff --git a/ubuntu/maverick/tdebase/debian/control b/ubuntu/maverick/tdebase/debian/control index 119889e8b..10ab6632f 100644 --- a/ubuntu/maverick/tdebase/debian/control +++ b/ubuntu/maverick/tdebase/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Timothy Pearson XSBC-Original-Maintainer: Debian Qt/KDE Maintainers Uploaders: Ana Beatriz Guerrero Lopez , Fathi Boudra , Modestas Vainius , Sune Vuorela -Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-trinity-dev (>= 4:3.5.10), libldap2-dev, libhal-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libhal-storage-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsensors4-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, libxss-dev, libxxf86misc-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xutils, sharutils, texinfo, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, xmkmf | xutils-dev, tdelibs4c2a-trinity, libogg-dev, libogg-dev-la, libdbus-tqt-1-dev, libavahi-tqt-dev, libudev-dev, libtool, libltdl-dev, cmake +Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-trinity-dev (>= 4:3.5.10), libldap2-dev, libhal-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libhal-storage-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsensors4-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, libxss-dev, libxxf86misc-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xutils, sharutils, texinfo, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, xmkmf | xutils-dev, tdelibs4c2a-trinity, libogg-dev, libogg-dev-la, libdbus-tqt-1-dev, libavahi-tqt-dev, libudev-dev, libdbus-1-tqt-dev, libtool, libltdl-dev, cmake Build-Depends-Indep: doxygen, libtqtinterface-doc, graphviz, gsfonts-x11, tdelibs4-trinity-doc Build-Conflicts: nvidia-glx (<< 1.0.8774-6) Standards-Version: 3.8.4 diff --git a/ubuntu/maverick/tdebase/debian/rules b/ubuntu/maverick/tdebase/debian/rules index 282910347..78c8e1988 100755 --- a/ubuntu/maverick/tdebase/debian/rules +++ b/ubuntu/maverick/tdebase/debian/rules @@ -21,7 +21,7 @@ CXXFLAGS := -DSMB_CTX_FLAG_USE_KERBEROS -DSMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS - DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" -DWITH_GCC_VISIBILITY="ON" \ -DKCHECKPASS_PAM_SERVICE="kcheckpass-trinity" -DTDM_PAM_SERVICE="tdm-trinity" -DKSCREENSAVER_PAM_SERVICE="kscreensaver-trinity" -DWITH_USBIDS="/usr/share/misc/usb.ids" \ --DWITH_ARTS="ON" -DWITH_SHADOW="ON" -DWITH_PAM="ON" -DWITH_SASL="ON" -DWITH_SUDO_TDESU_BACKEND="ON" -DWITH_LDAP="ON" -DWITH_SAMBA="ON" -DWITH_LIBRAW1394="ON" -DWITH_OPENEXR="ON" -DWITH_XCOMPOSITE="ON" -DWITH_XCURSOR="ON" -DWITH_XFIXES="ON" -DWITH_XRANDR="ON" -DWITH_XINERAMA="ON" -DWITH_HAL="ON" -DWITH_XDMCP="ON" -DWITH_XRENDER="ON" -DWITH_XDAMAGE="ON" -DWITH_XEXT="ON" -DWITH_XTEST="ON" +-DWITH_ARTS="ON" -DWITH_SHADOW="ON" -DWITH_PAM="ON" -DWITH_SASL="ON" -DWITH_SUDO_TDESU_BACKEND="ON" -DWITH_LDAP="ON" -DWITH_SAMBA="ON" -DWITH_LIBRAW1394="ON" -DWITH_OPENEXR="ON" -DWITH_XCOMPOSITE="ON" -DWITH_XCURSOR="ON" -DWITH_XFIXES="ON" -DWITH_XRANDR="ON" -DWITH_XINERAMA="ON" -DWITH_HAL="ON" -DWITH_XDMCP="ON" -DWITH_XRENDER="ON" -DWITH_XDAMAGE="ON" -DWITH_XEXT="ON" -DWITH_XTEST="ON" -DWITH_UPOWER="ON" # Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to # never build in parallel, regardless of DEB_BUILD_OPTIONS. -- cgit v1.2.1 From 5c0bbe731541c633c114f2f31fb38a68b370e18f Mon Sep 17 00:00:00 2001 From: Francois Andriot Date: Thu, 16 Feb 2012 19:43:47 +0100 Subject: [RHEL/Fedora] Moves qt3 and tqt3 to the correct location --- redhat/components.txt | 4 +- .../qt3/0084-compositing-properties.patch | 80 +++ redhat/dependencies/qt3/assistant3.desktop | 9 + redhat/dependencies/qt3/designer3.desktop | 11 + redhat/dependencies/qt3/linguist3.desktop | 10 + redhat/dependencies/qt3/qt-3.0.5-nodebug.patch | 15 + redhat/dependencies/qt3/qt-3.1.0-makefile.patch | 11 + redhat/dependencies/qt3/qt-3.3.4-print-CJK.patch | 18 + .../qt3/qt-3.3.6-fontrendering-214371.patch | 15 + .../qt3/qt-3.3.6-fontrendering-gu-228452.patch | 12 + .../qt3/qt-3.3.6-fontrendering-ml_IN-209097.patch | 60 ++ .../qt3/qt-3.3.6-fontrendering-ml_IN-209974.patch | 11 + .../qt3/qt-3.3.6-fontrendering-ml_IN-217657.patch | 12 + .../qt3/qt-3.3.6-fontrendering-te_IN-211259.patch | 11 + .../qt3/qt-3.3.8-fontrendering-#214570.patch | 23 + .../qt3/qt-3.3.8-fontrendering-as_IN-209972.patch | 11 + redhat/dependencies/qt3/qt-uic-nostdlib.patch | 12 + .../dependencies/qt3/qt-x11-free-3.3.2-quiet.patch | 14 + .../qt3/qt-x11-free-3.3.4-fullscreen.patch | 11 + .../qt3/qt-x11-free-3.3.6-qfontdatabase_x11.patch | 11 + ...nified-qt3.3.5-20060318-resetinputcontext.patch | 92 +++ .../dependencies/qt3/qt-x11-free-3.3.6-strip.patch | 36 + .../dependencies/qt3/qt-x11-free-3.3.7-arm.patch | 25 + .../dependencies/qt3/qt-x11-free-3.3.7-umask.patch | 14 + .../dependencies/qt3/qt-x11-free-3.3.8-odbc.patch | 19 + .../dependencies/qt3/qt-x11-free-3.3.8b-typo.patch | 11 + .../qt3/qt-x11-free-3.3.8b-uic-multilib.patch | 24 + redhat/dependencies/qt3/qt.csh | 33 + redhat/dependencies/qt3/qt.sh | 32 + .../qt3-3.3.8.d-updates_zh-tw_translations.patch | 251 +++++++ redhat/dependencies/qt3/qt3.spec | 721 +++++++++++++++++++++ redhat/dependencies/qt3/qtconfig3.desktop | 9 + .../tqt3/0084-compositing-properties.patch | 80 +++ redhat/dependencies/tqt3/assistant3.desktop | 9 + redhat/dependencies/tqt3/designer3.desktop | 11 + redhat/dependencies/tqt3/linguist3.desktop | 10 + redhat/dependencies/tqt3/qt-3.1.0-makefile.patch | 1 + redhat/dependencies/tqt3/qt-3.3.4-print-CJK.patch | 1 + .../tqt3/qt-3.3.6-fontrendering-gu-228452.patch | 1 + .../tqt3/qt-3.3.6-fontrendering-ml_IN-209974.patch | 1 + .../tqt3/qt-3.3.6-fontrendering-te_IN-211259.patch | 1 + .../tqt3/qt-3.3.8-fontrendering-as_IN-209972.patch | 1 + .../tqt3/qt-x11-free-3.3.4-fullscreen.patch | 1 + .../tqt3/qt-x11-free-3.3.6-qfontdatabase_x11.patch | 1 + .../tqt3/qt-x11-free-3.3.6-strip.patch | 1 + .../dependencies/tqt3/qt-x11-free-3.3.7-arm.patch | 1 + .../tqt3/qt-x11-free-3.3.8b-typo.patch | 1 + ...1-immodule-unified-qt3.3.5-20051012-quiet.patch | 134 ++++ ...-x11-immodule-unified-qt3.3.8-20071116.diff.bz2 | Bin 0 -> 99943 bytes redhat/dependencies/tqt3/qt.csh | 34 + redhat/dependencies/tqt3/qt.sh | 32 + .../qt3-3.3.8.d-updates_zh-tw_translations.patch | 1 + redhat/dependencies/tqt3/qtconfig3.desktop | 9 + redhat/dependencies/tqt3/tqt3-3.4.0-embed.patch | 10 + .../tqt3/tqt3-3.4.0-fontrendering-#214570.patch | 23 + .../tqt3/tqt3-3.4.0-fontrendering-214371.patch | 15 + .../tqt3-3.4.0-fontrendering-ml_IN-209097.patch | 60 ++ .../tqt3-3.4.0-fontrendering-ml_IN-217657.patch | 11 + redhat/dependencies/tqt3/tqt3-3.4.0-nodebug.patch | 15 + redhat/dependencies/tqt3/tqt3-3.4.0-odbc.patch | 18 + ...nified-qt3.3.5-20060318-resetinputcontext.patch | 92 +++ redhat/dependencies/tqt3/tqt3-3.4.0-quiet.patch | 13 + .../tqt3/tqt3-3.4.0-uic-nostdlib.patch | 12 + redhat/dependencies/tqt3/tqt3-3.4.0-umask.patch | 14 + redhat/dependencies/tqt3/tqt3-3.4.0.spec | 678 +++++++++++++++++++ redhat/genrpm.sh | 2 - redhat/qt3/0084-compositing-properties.patch | 80 --- redhat/qt3/assistant3.desktop | 9 - redhat/qt3/designer3.desktop | 11 - redhat/qt3/linguist3.desktop | 10 - redhat/qt3/qt-3.0.5-nodebug.patch | 15 - redhat/qt3/qt-3.1.0-makefile.patch | 11 - redhat/qt3/qt-3.3.4-print-CJK.patch | 18 - redhat/qt3/qt-3.3.6-fontrendering-214371.patch | 15 - redhat/qt3/qt-3.3.6-fontrendering-gu-228452.patch | 12 - .../qt3/qt-3.3.6-fontrendering-ml_IN-209097.patch | 60 -- .../qt3/qt-3.3.6-fontrendering-ml_IN-209974.patch | 11 - .../qt3/qt-3.3.6-fontrendering-ml_IN-217657.patch | 12 - .../qt3/qt-3.3.6-fontrendering-te_IN-211259.patch | 11 - redhat/qt3/qt-3.3.8-fontrendering-#214570.patch | 23 - .../qt3/qt-3.3.8-fontrendering-as_IN-209972.patch | 11 - redhat/qt3/qt-uic-nostdlib.patch | 12 - redhat/qt3/qt-x11-free-3.3.2-quiet.patch | 14 - redhat/qt3/qt-x11-free-3.3.4-fullscreen.patch | 11 - .../qt3/qt-x11-free-3.3.6-qfontdatabase_x11.patch | 11 - ...nified-qt3.3.5-20060318-resetinputcontext.patch | 92 --- redhat/qt3/qt-x11-free-3.3.6-strip.patch | 36 - redhat/qt3/qt-x11-free-3.3.7-arm.patch | 25 - redhat/qt3/qt-x11-free-3.3.7-umask.patch | 14 - redhat/qt3/qt-x11-free-3.3.8-odbc.patch | 19 - redhat/qt3/qt-x11-free-3.3.8b-typo.patch | 11 - redhat/qt3/qt-x11-free-3.3.8b-uic-multilib.patch | 24 - redhat/qt3/qt.csh | 33 - redhat/qt3/qt.sh | 32 - .../qt3-3.3.8.d-updates_zh-tw_translations.patch | 251 ------- redhat/qt3/qt3.spec | 721 --------------------- redhat/qt3/qtconfig3.desktop | 9 - redhat/tqt3/0084-compositing-properties.patch | 80 --- redhat/tqt3/assistant3.desktop | 9 - redhat/tqt3/designer3.desktop | 11 - redhat/tqt3/linguist3.desktop | 10 - redhat/tqt3/qt-3.1.0-makefile.patch | 1 - redhat/tqt3/qt-3.3.4-print-CJK.patch | 1 - redhat/tqt3/qt-3.3.6-fontrendering-gu-228452.patch | 1 - .../tqt3/qt-3.3.6-fontrendering-ml_IN-209974.patch | 1 - .../tqt3/qt-3.3.6-fontrendering-te_IN-211259.patch | 1 - .../tqt3/qt-3.3.8-fontrendering-as_IN-209972.patch | 1 - redhat/tqt3/qt-x11-free-3.3.4-fullscreen.patch | 1 - .../tqt3/qt-x11-free-3.3.6-qfontdatabase_x11.patch | 1 - redhat/tqt3/qt-x11-free-3.3.6-strip.patch | 1 - redhat/tqt3/qt-x11-free-3.3.7-arm.patch | 1 - redhat/tqt3/qt-x11-free-3.3.8b-typo.patch | 1 - ...1-immodule-unified-qt3.3.5-20051012-quiet.patch | 134 ---- ...-x11-immodule-unified-qt3.3.8-20071116.diff.bz2 | Bin 99943 -> 0 bytes redhat/tqt3/qt.csh | 34 - redhat/tqt3/qt.sh | 32 - .../qt3-3.3.8.d-updates_zh-tw_translations.patch | 1 - redhat/tqt3/qtconfig3.desktop | 9 - redhat/tqt3/tqt3-3.4.0-embed.patch | 10 - redhat/tqt3/tqt3-3.4.0-fontrendering-#214570.patch | 23 - redhat/tqt3/tqt3-3.4.0-fontrendering-214371.patch | 15 - .../tqt3-3.4.0-fontrendering-ml_IN-209097.patch | 60 -- .../tqt3-3.4.0-fontrendering-ml_IN-217657.patch | 11 - redhat/tqt3/tqt3-3.4.0-nodebug.patch | 15 - redhat/tqt3/tqt3-3.4.0-odbc.patch | 18 - ...nified-qt3.3.5-20060318-resetinputcontext.patch | 92 --- redhat/tqt3/tqt3-3.4.0-quiet.patch | 13 - redhat/tqt3/tqt3-3.4.0-uic-nostdlib.patch | 12 - redhat/tqt3/tqt3-3.4.0-umask.patch | 14 - redhat/tqt3/tqt3-3.4.0.spec | 678 ------------------- 130 files changed, 2919 insertions(+), 2919 deletions(-) create mode 100644 redhat/dependencies/qt3/0084-compositing-properties.patch create mode 100644 redhat/dependencies/qt3/assistant3.desktop create mode 100644 redhat/dependencies/qt3/designer3.desktop create mode 100644 redhat/dependencies/qt3/linguist3.desktop create mode 100644 redhat/dependencies/qt3/qt-3.0.5-nodebug.patch create mode 100644 redhat/dependencies/qt3/qt-3.1.0-makefile.patch create mode 100644 redhat/dependencies/qt3/qt-3.3.4-print-CJK.patch create mode 100644 redhat/dependencies/qt3/qt-3.3.6-fontrendering-214371.patch create mode 100644 redhat/dependencies/qt3/qt-3.3.6-fontrendering-gu-228452.patch create mode 100644 redhat/dependencies/qt3/qt-3.3.6-fontrendering-ml_IN-209097.patch create mode 100644 redhat/dependencies/qt3/qt-3.3.6-fontrendering-ml_IN-209974.patch create mode 100644 redhat/dependencies/qt3/qt-3.3.6-fontrendering-ml_IN-217657.patch create mode 100644 redhat/dependencies/qt3/qt-3.3.6-fontrendering-te_IN-211259.patch create mode 100644 redhat/dependencies/qt3/qt-3.3.8-fontrendering-#214570.patch create mode 100644 redhat/dependencies/qt3/qt-3.3.8-fontrendering-as_IN-209972.patch create mode 100644 redhat/dependencies/qt3/qt-uic-nostdlib.patch create mode 100644 redhat/dependencies/qt3/qt-x11-free-3.3.2-quiet.patch create mode 100644 redhat/dependencies/qt3/qt-x11-free-3.3.4-fullscreen.patch create mode 100644 redhat/dependencies/qt3/qt-x11-free-3.3.6-qfontdatabase_x11.patch create mode 100644 redhat/dependencies/qt3/qt-x11-free-3.3.6-qt-x11-immodule-unified-qt3.3.5-20060318-resetinputcontext.patch create mode 100644 redhat/dependencies/qt3/qt-x11-free-3.3.6-strip.patch create mode 100644 redhat/dependencies/qt3/qt-x11-free-3.3.7-arm.patch create mode 100644 redhat/dependencies/qt3/qt-x11-free-3.3.7-umask.patch create mode 100644 redhat/dependencies/qt3/qt-x11-free-3.3.8-odbc.patch create mode 100644 redhat/dependencies/qt3/qt-x11-free-3.3.8b-typo.patch create mode 100644 redhat/dependencies/qt3/qt-x11-free-3.3.8b-uic-multilib.patch create mode 100755 redhat/dependencies/qt3/qt.csh create mode 100755 redhat/dependencies/qt3/qt.sh create mode 100644 redhat/dependencies/qt3/qt3-3.3.8.d-updates_zh-tw_translations.patch create mode 100644 redhat/dependencies/qt3/qt3.spec create mode 100644 redhat/dependencies/qt3/qtconfig3.desktop create mode 100644 redhat/dependencies/tqt3/0084-compositing-properties.patch create mode 100644 redhat/dependencies/tqt3/assistant3.desktop create mode 100644 redhat/dependencies/tqt3/designer3.desktop create mode 100644 redhat/dependencies/tqt3/linguist3.desktop create mode 120000 redhat/dependencies/tqt3/qt-3.1.0-makefile.patch create mode 120000 redhat/dependencies/tqt3/qt-3.3.4-print-CJK.patch create mode 120000 redhat/dependencies/tqt3/qt-3.3.6-fontrendering-gu-228452.patch create mode 120000 redhat/dependencies/tqt3/qt-3.3.6-fontrendering-ml_IN-209974.patch create mode 120000 redhat/dependencies/tqt3/qt-3.3.6-fontrendering-te_IN-211259.patch create mode 120000 redhat/dependencies/tqt3/qt-3.3.8-fontrendering-as_IN-209972.patch create mode 120000 redhat/dependencies/tqt3/qt-x11-free-3.3.4-fullscreen.patch create mode 120000 redhat/dependencies/tqt3/qt-x11-free-3.3.6-qfontdatabase_x11.patch create mode 120000 redhat/dependencies/tqt3/qt-x11-free-3.3.6-strip.patch create mode 120000 redhat/dependencies/tqt3/qt-x11-free-3.3.7-arm.patch create mode 120000 redhat/dependencies/tqt3/qt-x11-free-3.3.8b-typo.patch create mode 100644 redhat/dependencies/tqt3/qt-x11-immodule-unified-qt3.3.5-20051012-quiet.patch create mode 100644 redhat/dependencies/tqt3/qt-x11-immodule-unified-qt3.3.8-20071116.diff.bz2 create mode 100755 redhat/dependencies/tqt3/qt.csh create mode 100755 redhat/dependencies/tqt3/qt.sh create mode 120000 redhat/dependencies/tqt3/qt3-3.3.8.d-updates_zh-tw_translations.patch create mode 100644 redhat/dependencies/tqt3/qtconfig3.desktop create mode 100644 redhat/dependencies/tqt3/tqt3-3.4.0-embed.patch create mode 100644 redhat/dependencies/tqt3/tqt3-3.4.0-fontrendering-#214570.patch create mode 100644 redhat/dependencies/tqt3/tqt3-3.4.0-fontrendering-214371.patch create mode 100644 redhat/dependencies/tqt3/tqt3-3.4.0-fontrendering-ml_IN-209097.patch create mode 100644 redhat/dependencies/tqt3/tqt3-3.4.0-fontrendering-ml_IN-217657.patch create mode 100644 redhat/dependencies/tqt3/tqt3-3.4.0-nodebug.patch create mode 100644 redhat/dependencies/tqt3/tqt3-3.4.0-odbc.patch create mode 100644 redhat/dependencies/tqt3/tqt3-3.4.0-qt-x11-immodule-unified-qt3.3.5-20060318-resetinputcontext.patch create mode 100644 redhat/dependencies/tqt3/tqt3-3.4.0-quiet.patch create mode 100644 redhat/dependencies/tqt3/tqt3-3.4.0-uic-nostdlib.patch create mode 100644 redhat/dependencies/tqt3/tqt3-3.4.0-umask.patch create mode 100644 redhat/dependencies/tqt3/tqt3-3.4.0.spec delete mode 100644 redhat/qt3/0084-compositing-properties.patch delete mode 100644 redhat/qt3/assistant3.desktop delete mode 100644 redhat/qt3/designer3.desktop delete mode 100644 redhat/qt3/linguist3.desktop delete mode 100644 redhat/qt3/qt-3.0.5-nodebug.patch delete mode 100644 redhat/qt3/qt-3.1.0-makefile.patch delete mode 100644 redhat/qt3/qt-3.3.4-print-CJK.patch delete mode 100644 redhat/qt3/qt-3.3.6-fontrendering-214371.patch delete mode 100644 redhat/qt3/qt-3.3.6-fontrendering-gu-228452.patch delete mode 100644 redhat/qt3/qt-3.3.6-fontrendering-ml_IN-209097.patch delete mode 100644 redhat/qt3/qt-3.3.6-fontrendering-ml_IN-209974.patch delete mode 100644 redhat/qt3/qt-3.3.6-fontrendering-ml_IN-217657.patch delete mode 100644 redhat/qt3/qt-3.3.6-fontrendering-te_IN-211259.patch delete mode 100644 redhat/qt3/qt-3.3.8-fontrendering-#214570.patch delete mode 100644 redhat/qt3/qt-3.3.8-fontrendering-as_IN-209972.patch delete mode 100644 redhat/qt3/qt-uic-nostdlib.patch delete mode 100644 redhat/qt3/qt-x11-free-3.3.2-quiet.patch delete mode 100644 redhat/qt3/qt-x11-free-3.3.4-fullscreen.patch delete mode 100644 redhat/qt3/qt-x11-free-3.3.6-qfontdatabase_x11.patch delete mode 100644 redhat/qt3/qt-x11-free-3.3.6-qt-x11-immodule-unified-qt3.3.5-20060318-resetinputcontext.patch delete mode 100644 redhat/qt3/qt-x11-free-3.3.6-strip.patch delete mode 100644 redhat/qt3/qt-x11-free-3.3.7-arm.patch delete mode 100644 redhat/qt3/qt-x11-free-3.3.7-umask.patch delete mode 100644 redhat/qt3/qt-x11-free-3.3.8-odbc.patch delete mode 100644 redhat/qt3/qt-x11-free-3.3.8b-typo.patch delete mode 100644 redhat/qt3/qt-x11-free-3.3.8b-uic-multilib.patch delete mode 100755 redhat/qt3/qt.csh delete mode 100755 redhat/qt3/qt.sh delete mode 100644 redhat/qt3/qt3-3.3.8.d-updates_zh-tw_translations.patch delete mode 100644 redhat/qt3/qt3.spec delete mode 100644 redhat/qt3/qtconfig3.desktop delete mode 100644 redhat/tqt3/0084-compositing-properties.patch delete mode 100644 redhat/tqt3/assistant3.desktop delete mode 100644 redhat/tqt3/designer3.desktop delete mode 100644 redhat/tqt3/linguist3.desktop delete mode 120000 redhat/tqt3/qt-3.1.0-makefile.patch delete mode 120000 redhat/tqt3/qt-3.3.4-print-CJK.patch delete mode 120000 redhat/tqt3/qt-3.3.6-fontrendering-gu-228452.patch delete mode 120000 redhat/tqt3/qt-3.3.6-fontrendering-ml_IN-209974.patch delete mode 120000 redhat/tqt3/qt-3.3.6-fontrendering-te_IN-211259.patch delete mode 120000 redhat/tqt3/qt-3.3.8-fontrendering-as_IN-209972.patch delete mode 120000 redhat/tqt3/qt-x11-free-3.3.4-fullscreen.patch delete mode 120000 redhat/tqt3/qt-x11-free-3.3.6-qfontdatabase_x11.patch delete mode 120000 redhat/tqt3/qt-x11-free-3.3.6-strip.patch delete mode 120000 redhat/tqt3/qt-x11-free-3.3.7-arm.patch delete mode 120000 redhat/tqt3/qt-x11-free-3.3.8b-typo.patch delete mode 100644 redhat/tqt3/qt-x11-immodule-unified-qt3.3.5-20051012-quiet.patch delete mode 100644 redhat/tqt3/qt-x11-immodule-unified-qt3.3.8-20071116.diff.bz2 delete mode 100755 redhat/tqt3/qt.csh delete mode 100755 redhat/tqt3/qt.sh delete mode 120000 redhat/tqt3/qt3-3.3.8.d-updates_zh-tw_translations.patch delete mode 100644 redhat/tqt3/qtconfig3.desktop delete mode 100644 redhat/tqt3/tqt3-3.4.0-embed.patch delete mode 100644 redhat/tqt3/tqt3-3.4.0-fontrendering-#214570.patch delete mode 100644 redhat/tqt3/tqt3-3.4.0-fontrendering-214371.patch delete mode 100644 redhat/tqt3/tqt3-3.4.0-fontrendering-ml_IN-209097.patch delete mode 100644 redhat/tqt3/tqt3-3.4.0-fontrendering-ml_IN-217657.patch delete mode 100644 redhat/tqt3/tqt3-3.4.0-nodebug.patch delete mode 100644 redhat/tqt3/tqt3-3.4.0-odbc.patch delete mode 100644 redhat/tqt3/tqt3-3.4.0-qt-x11-immodule-unified-qt3.3.5-20060318-resetinputcontext.patch delete mode 100644 redhat/tqt3/tqt3-3.4.0-quiet.patch delete mode 100644 redhat/tqt3/tqt3-3.4.0-uic-nostdlib.patch delete mode 100644 redhat/tqt3/tqt3-3.4.0-umask.patch delete mode 100644 redhat/tqt3/tqt3-3.4.0.spec diff --git a/redhat/components.txt b/redhat/components.txt index f8b06c9aa..c7b7a1b39 100644 --- a/redhat/components.txt +++ b/redhat/components.txt @@ -4,7 +4,8 @@ libraries/libkipi libraries/libksquirrel libraries/python-trinity libraries/pykdeextensions -qt3 +dependencies/qt3 +dependencies/tqt3 dependencies/libcaldav dependencies/libcarddav dependencies/tqtinterface @@ -119,3 +120,4 @@ applications/kmplayer applications/kvkbd applications/potracegui applications/soundkonverter + diff --git a/redhat/dependencies/qt3/0084-compositing-properties.patch b/redhat/dependencies/qt3/0084-compositing-properties.patch new file mode 100644 index 000000000..368b6c267 --- /dev/null +++ b/redhat/dependencies/qt3/0084-compositing-properties.patch @@ -0,0 +1,80 @@ +qt-bugs@ issue : none +bugs.kde.org number : none +applied: no +author: Lubos Lunak + +This patch makes override-redirect windows (popup menu, dropdown menu, +tooltip, combobox, etc.) also have more window properties like WM_CLASS, +so they can be used when compositing. + +--- src/kernel/qwidget_x11.cpp.sav 2007-06-25 10:36:42.000000000 +0200 ++++ src/kernel/qwidget_x11.cpp 2007-10-02 15:30:13.000000000 +0200 +@@ -557,7 +557,10 @@ void QWidget::create( WId window, bool i + wsa.save_under = True; + XChangeWindowAttributes( dpy, id, CWOverrideRedirect | CWSaveUnder, + &wsa ); +- x11SetWindowType(); ++ XClassHint class_hint; ++ class_hint.res_name = (char *) qAppName(); // application name ++ class_hint.res_class = (char *) qAppClass(); // application class ++ XSetClassHint( dpy, id, &class_hint ); + } else if ( topLevel && !desktop ) { // top-level widget + QWidget *p = parentWidget(); // real parent + if (p) +@@ -620,8 +623,6 @@ void QWidget::create( WId window, bool i + else + XDeleteProperty(dpy, id, qt_xa_motif_wm_hints); + +- x11SetWindowType(); +- + // set _NET_WM_WINDOW_STATE + if (curr_winstate > 0) + XChangeProperty(dpy, id, qt_net_wm_state, XA_ATOM, 32, PropModeReplace, +@@ -629,11 +630,6 @@ void QWidget::create( WId window, bool i + else + XDeleteProperty(dpy, id, qt_net_wm_state); + +- // set _NET_WM_PID +- long curr_pid = getpid(); +- XChangeProperty(dpy, id, qt_net_wm_pid, XA_CARDINAL, 32, PropModeReplace, +- (unsigned char *) &curr_pid, 1); +- + #ifndef QT_NO_XSYNC + // set _NET_WM_SYNC_COUNTER + createSyncCounter(); +@@ -645,19 +641,31 @@ void QWidget::create( WId window, bool i + // when we create a toplevel widget, the frame strut should be dirty + fstrut_dirty = 1; + ++ } else { ++ // non-toplevel widgets don't have a frame, so no need to ++ // update the strut ++ fstrut_dirty = 0; ++ } ++ ++ if (initializeWindow && (popup || (topLevel && !desktop))) { // properties set on all toplevel windows ++ x11SetWindowType(); ++ ++ // set _NET_WM_PID ++ long curr_pid = getpid(); ++ XChangeProperty(dpy, id, qt_net_wm_pid, XA_CARDINAL, 32, PropModeReplace, ++ (unsigned char *) &curr_pid, 1); ++ + // declare the widget's object name as window role + XChangeProperty( dpy, id, + qt_window_role, XA_STRING, 8, PropModeReplace, + (unsigned char *)name(), qstrlen( name() ) ); + + // set client leader property ++ if ( !qt_x11_wm_client_leader ) ++ qt_x11_create_wm_client_leader(); + XChangeProperty( dpy, id, qt_wm_client_leader, + XA_WINDOW, 32, PropModeReplace, + (unsigned char *)&qt_x11_wm_client_leader, 1 ); +- } else { +- // non-toplevel widgets don't have a frame, so no need to +- // update the strut +- fstrut_dirty = 0; + } + + if ( initializeWindow ) { diff --git a/redhat/dependencies/qt3/assistant3.desktop b/redhat/dependencies/qt3/assistant3.desktop new file mode 100644 index 000000000..49e718c5d --- /dev/null +++ b/redhat/dependencies/qt3/assistant3.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=Qt3 Assistant +Comment=Add translations to Qt3 applications +Exec=assistant +Icon=assistant3 +Terminal=false +Encoding=UTF-8 +Type=Application +Categories=Qt;Development; diff --git a/redhat/dependencies/qt3/designer3.desktop b/redhat/dependencies/qt3/designer3.desktop new file mode 100644 index 000000000..23f1f549a --- /dev/null +++ b/redhat/dependencies/qt3/designer3.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Name=Qt3 Designer +GenericName=Interface Designer +Comment=Design GUIs for Qt3 applications +Exec=designer +Icon=designer3 +MimeType=application/x-designer; +Terminal=false +Encoding=UTF-8 +Type=Application +Categories=Qt;Development; diff --git a/redhat/dependencies/qt3/linguist3.desktop b/redhat/dependencies/qt3/linguist3.desktop new file mode 100644 index 000000000..c6fce02c8 --- /dev/null +++ b/redhat/dependencies/qt3/linguist3.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Name=Qt3 Linguist +Comment=Add translations to Qt3 applications +Exec=linguist +Icon=linguist3 +MimeType=application/x-linguist; +Terminal=false +Encoding=UTF-8 +Type=Application +Categories=Qt;Development; diff --git a/redhat/dependencies/qt3/qt-3.0.5-nodebug.patch b/redhat/dependencies/qt3/qt-3.0.5-nodebug.patch new file mode 100644 index 000000000..09d697fb4 --- /dev/null +++ b/redhat/dependencies/qt3/qt-3.0.5-nodebug.patch @@ -0,0 +1,15 @@ +--- qt-x11-free-3.0.5/src/tools/qgpluginmanager.cpp.bero 2002-08-21 15:16:19.000000000 +0200 ++++ qt-x11-free-3.0.5/src/tools/qgpluginmanager.cpp 2002-08-21 15:16:41.000000000 +0200 +@@ -501,10 +501,10 @@ + (*f).latin1(), + (const char*) QFile::encodeName( old->library() ) ); + } else { +- qWarning("%s: Feature %s already defined in %s!", ++/* qWarning("%s: Feature %s already defined in %s!", + (const char*) QFile::encodeName( old->library() ), + (*f).latin1(), +- (const char*) QFile::encodeName( plugin->library() ) ); ++ (const char*) QFile::encodeName( plugin->library() ) ); */ + } + } + } diff --git a/redhat/dependencies/qt3/qt-3.1.0-makefile.patch b/redhat/dependencies/qt3/qt-3.1.0-makefile.patch new file mode 100644 index 000000000..009ab81fb --- /dev/null +++ b/redhat/dependencies/qt3/qt-3.1.0-makefile.patch @@ -0,0 +1,11 @@ +--- qt-x11-free-3.1.0/Makefile.orig 2002-11-14 15:44:17.000000000 +0100 ++++ qt-x11-free-3.1.0/Makefile 2002-11-14 15:49:33.000000000 +0100 +@@ -11,7 +11,7 @@ + install: FORCE + @$(MAKE) qt.install + +-all: symlinks src-qmake src-moc sub-src sub-tools sub-tutorial sub-examples ++all: symlinks src-qmake src-moc sub-src sub-tools + @echo + @echo "The Qt library is now built in ./lib" + @echo "The Qt examples are built in the directories in ./examples" diff --git a/redhat/dependencies/qt3/qt-3.3.4-print-CJK.patch b/redhat/dependencies/qt3/qt-3.3.4-print-CJK.patch new file mode 100644 index 000000000..5bd5e9e0a --- /dev/null +++ b/redhat/dependencies/qt3/qt-3.3.4-print-CJK.patch @@ -0,0 +1,18 @@ +--- qt-x11-free-3.3.4/src/kernel/qpsprinter.cpp.cjk 2005-01-21 18:16:11.000000000 +0100 ++++ qt-x11-free-3.3.4/src/kernel/qpsprinter.cpp 2005-01-26 15:09:20.911239907 +0100 +@@ -4748,10 +4748,11 @@ + + // GB18030 fonts on Turbolinux + static const psfont SongGBK2K [] = { +- { "MSung-Light-GBK2K-H", 0, 100. }, +- { "MSung-Italic-GBK2K-H", 0, 100. }, +- { "MSung-Bold-GBK2K-H", 0, 100. }, +- { "MSung-BoldItalic-GBK2K-H", 0, 100. }, ++ { "MSungGBK-Light-GBK2K-H", 0, 100. }, ++ { "MSungGBK-Light-GBK2K-H", 0, 100. }, ++ { "MSungGBK-Light-GBK2K-H", 0, 100. }, ++ { "MSungGBK-Light-GBK2K-H", 0, 100. }, ++ + }; + static const psfont KaiGBK2K [] = { + { "MKai-Medium-GBK2K-H", 0, 100. }, diff --git a/redhat/dependencies/qt3/qt-3.3.6-fontrendering-214371.patch b/redhat/dependencies/qt3/qt-3.3.6-fontrendering-214371.patch new file mode 100644 index 000000000..9dca7998d --- /dev/null +++ b/redhat/dependencies/qt3/qt-3.3.6-fontrendering-214371.patch @@ -0,0 +1,15 @@ +diff -pruN qt-x11-free-3.3.6.org/src/kernel/qscriptengine_x11.cpp qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp +--- qt-x11-free-3.3.6.org/src/kernel/qscriptengine_x11.cpp 2006-12-04 18:47:11.000000000 +0530 ++++ qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp 2006-12-05 12:05:10.000000000 +0530 +@@ -1412,7 +1412,10 @@ static bool indic_shape_syllable(QOpenTy + toPos += 2; + if (script == QFont::Devanagari || script == QFont::Gujarati || script == QFont::Bengali) { + if (matra_position == Post || matra_position == Split) { +- toPos = matra+1; ++ if (matra_position == Post ) ++ toPos = matra; ++ else ++ toPos = matra+1; + matra -= 2; + } + } else if (script == QFont::Kannada) { diff --git a/redhat/dependencies/qt3/qt-3.3.6-fontrendering-gu-228452.patch b/redhat/dependencies/qt3/qt-3.3.6-fontrendering-gu-228452.patch new file mode 100644 index 000000000..21081d1a6 --- /dev/null +++ b/redhat/dependencies/qt3/qt-3.3.6-fontrendering-gu-228452.patch @@ -0,0 +1,12 @@ +diff -pruN qt-x11-free-3.3.6.org/src/kernel/qscriptengine_x11.cpp qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp +--- qt-x11-free-3.3.6.org/src/kernel/qscriptengine_x11.cpp 2007-02-13 14:41:25.000000000 +0530 ++++ qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp 2007-02-13 14:40:02.000000000 +0530 +@@ -253,7 +253,7 @@ static const unsigned char indicForms[0x + Unknown, Unknown, Unknown, Unknown, + Unknown, Unknown, Unknown, Unknown, + +- Other, Other, Other, Other, ++ Other, Other, VowelMark, VowelMark, + Other, Other, Other, Other, + Other, Other, Other, Other, + Other, Other, Other, Other, diff --git a/redhat/dependencies/qt3/qt-3.3.6-fontrendering-ml_IN-209097.patch b/redhat/dependencies/qt3/qt-3.3.6-fontrendering-ml_IN-209097.patch new file mode 100644 index 000000000..01f3824c1 --- /dev/null +++ b/redhat/dependencies/qt3/qt-3.3.6-fontrendering-ml_IN-209097.patch @@ -0,0 +1,60 @@ +--- qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp.bak 2006-10-13 13:21:37.000000000 +0800 ++++ qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp 2006-10-13 13:57:36.000000000 +0800 +@@ -868,7 +868,7 @@ + None, None, None, None, + None, None, None, Post, + +- Post, None, Below, None, ++ None, None, None, None, + None, Post, None, None, + None, None, None, None, + None, None, Post, Post, +@@ -1271,6 +1271,16 @@ + int base = 0; + int reph = -1; + ++ //for the special conjuctions about Cons+0d4d+0d30 and Cons+0d40+0d31 of Malayalam ++ bool is_special_conjuction_malayalam = false; ++ ++ if ((len == 3) && ++ ((reordered[2] == 0x0d30) || (reordered[2] == 0x0d31)) && ++ (reordered[1] == 0x0d4d) && ++ ((reordered[0] >= 0x0d15) && (reordered[0] <= 0x0d39))) { ++ is_special_conjuction_malayalam = true; ++ } ++ + #ifdef INDIC_DEBUG + IDEBUG("original:"); + for (i = 0; i < len; i++) { +@@ -1547,6 +1557,15 @@ + reph = i; + } + ++ //for the special conjuctions about Cons+0d4d+0d30 and Cons+0d40+0d31 of Malayalam ++ if (is_special_conjuction_malayalam) { ++ unsigned short temp; ++ ++ temp = reordered[0]; ++ reordered[0] = reordered[2]; ++ reordered[2] = temp; ++ } ++ + if (item->font->stringToCMap((const QChar *)reordered.data(), len, item->glyphs, item->advances, + &item->num_glyphs, item->flags & QTextEngine::RightToLeft) != QFontEngine::NoError) + return FALSE; +@@ -1658,6 +1677,15 @@ + + // halant always applies + ++ //for the special conjuctions about Cons+0d4d+0d30 and Cons+0d40+0d31 of Malayalam ++ if (is_special_conjuction_malayalam) { ++ unsigned int temp; ++ ++ temp = properties[0]; ++ properties[0] = ~PreSubstProperty; ++ properties[2] = temp; ++ } ++ + #ifdef INDIC_DEBUG + { + IDEBUG("OT properties:"); diff --git a/redhat/dependencies/qt3/qt-3.3.6-fontrendering-ml_IN-209974.patch b/redhat/dependencies/qt3/qt-3.3.6-fontrendering-ml_IN-209974.patch new file mode 100644 index 000000000..8dbb2ae98 --- /dev/null +++ b/redhat/dependencies/qt3/qt-3.3.6-fontrendering-ml_IN-209974.patch @@ -0,0 +1,11 @@ +--- qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp.orig 2006-11-29 17:17:26.000000000 +0100 ++++ qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp 2006-11-29 17:22:34.000000000 +0100 +@@ -864,7 +864,7 @@ + None, None, None, Post, + + None, None, None, None, +- None, Post, None, None, ++ None, None, None, None, + None, None, None, None, + None, None, Post, Post, + diff --git a/redhat/dependencies/qt3/qt-3.3.6-fontrendering-ml_IN-217657.patch b/redhat/dependencies/qt3/qt-3.3.6-fontrendering-ml_IN-217657.patch new file mode 100644 index 000000000..eb880b1cc --- /dev/null +++ b/redhat/dependencies/qt3/qt-3.3.6-fontrendering-ml_IN-217657.patch @@ -0,0 +1,12 @@ +diff -pruN qt-x11-free-3.3.6.org/src/kernel/qfont_x11.cpp qt-x11-free-3.3.6/src/kernel/qfont_x11.cpp +--- qt-x11-free-3.3.6.org/src/kernel/qfont_x11.cpp 2006-03-08 00:00:00.000000000 +0530 ++++ qt-x11-free-3.3.6/src/kernel/qfont_x11.cpp 2006-12-04 18:49:09.000000000 +0530 +@@ -709,7 +709,7 @@ int QFontMetrics::charWidth( const QStri + if ( script >= QFont::Arabic && script <= QFont::Khmer ) { + // complex script shaping. Have to do some hard work + int from = QMAX( 0, pos - 8 ); +- int to = QMIN( (int)str.length(), pos + 8 ); ++ int to = str.length(); + QConstString cstr( str.unicode()+from, to-from); + QTextEngine layout( cstr.string(), d ); + layout.itemize( QTextEngine::WidthOnly ); diff --git a/redhat/dependencies/qt3/qt-3.3.6-fontrendering-te_IN-211259.patch b/redhat/dependencies/qt3/qt-3.3.6-fontrendering-te_IN-211259.patch new file mode 100644 index 000000000..eb3868c96 --- /dev/null +++ b/redhat/dependencies/qt3/qt-3.3.6-fontrendering-te_IN-211259.patch @@ -0,0 +1,11 @@ +--- qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp.bak 2006-10-18 17:55:23.000000000 +0800 ++++ qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp 2006-10-19 16:42:31.641160984 +0800 +@@ -786,7 +786,7 @@ + Below, None, Below, Below, + Below, Below, Below, Below, + +- Below, None, Below, Below, ++ Below, Below, Below, Below, + None, Below, Below, Below, + Below, Below, None, None, + None, None, Post, Above, diff --git a/redhat/dependencies/qt3/qt-3.3.8-fontrendering-#214570.patch b/redhat/dependencies/qt3/qt-3.3.8-fontrendering-#214570.patch new file mode 100644 index 000000000..41a74fba7 --- /dev/null +++ b/redhat/dependencies/qt3/qt-3.3.8-fontrendering-#214570.patch @@ -0,0 +1,23 @@ +--- qt-x11-free-3.3.8/src/kernel/qscriptengine_x11.cpp.orig 2007-04-11 15:05:34.000000000 +0200 ++++ qt-x11-free-3.3.8/src/kernel/qscriptengine_x11.cpp 2007-04-11 15:22:19.000000000 +0200 +@@ -1240,7 +1240,7 @@ + int script = item->script; + Q_ASSERT(script >= QFont::Devanagari && script <= QFont::Sinhala); + const unsigned short script_base = 0x0900 + 0x80*(script-QFont::Devanagari); +- const unsigned short ra = script_base + 0x30; ++ unsigned short ra = script_base + 0x30; //it was const unsigned short ra before modification + const unsigned short halant = script_base + 0x4d; + const unsigned short nukta = script_base + 0x3c; + +@@ -1278,6 +1278,11 @@ + } + #endif + ++ unsigned short *chkAssamese=reordered.data(); ++ if((script == QFont::Bengali) && (*chkAssamese==0x09F0)) //if it is assamese ra ++ { ++ ra = script_base + 0x70; ++ } + if (len != 1) { + unsigned short *uc = reordered.data(); + bool beginsWithRa = FALSE; diff --git a/redhat/dependencies/qt3/qt-3.3.8-fontrendering-as_IN-209972.patch b/redhat/dependencies/qt3/qt-3.3.8-fontrendering-as_IN-209972.patch new file mode 100644 index 000000000..7583239cc --- /dev/null +++ b/redhat/dependencies/qt3/qt-3.3.8-fontrendering-as_IN-209972.patch @@ -0,0 +1,11 @@ +--- qt-x11-free-3.3.8/src/kernel/qscriptengine_x11.cpp.orig 2007-04-11 15:05:34.000000000 +0200 ++++ qt-x11-free-3.3.8/src/kernel/qscriptengine_x11.cpp 2007-04-11 15:22:19.000000000 +0200 +@@ -601,7 +601,7 @@ + None, None, None, None, + None, None, None, None, + +- None, None, None, None, ++ Below, None, None, None, + None, None, None, None, + None, None, None, None, + None, None, None, None, diff --git a/redhat/dependencies/qt3/qt-uic-nostdlib.patch b/redhat/dependencies/qt3/qt-uic-nostdlib.patch new file mode 100644 index 000000000..02a40b225 --- /dev/null +++ b/redhat/dependencies/qt3/qt-uic-nostdlib.patch @@ -0,0 +1,12 @@ +--- qt-x11-free-3.3.2/tools/designer/uic/main.cpp.sopwith 2004-06-16 17:14:17.000000000 -0400 ++++ qt-x11-free-3.3.2/tools/designer/uic/main.cpp 2004-06-16 17:21:43.000000000 -0400 +@@ -149,6 +149,9 @@ + } else { + trmacro = &opt[1]; + } ++ } else if ( opt == "nostdlib") { ++ QStringList x; ++ QApplication::setLibraryPaths(x); + } else if ( opt == "L" ) { + if ( !(n < argc-1) ) { + error = "Missing plugin path."; diff --git a/redhat/dependencies/qt3/qt-x11-free-3.3.2-quiet.patch b/redhat/dependencies/qt3/qt-x11-free-3.3.2-quiet.patch new file mode 100644 index 000000000..6dce7aa80 --- /dev/null +++ b/redhat/dependencies/qt3/qt-x11-free-3.3.2-quiet.patch @@ -0,0 +1,14 @@ +--- qt-x11-free-3.3.2/src/kernel/qpixmap_x11.cpp.orig 2004-05-10 13:54:03.592289052 +0200 ++++ qt-x11-free-3.3.2/src/kernel/qpixmap_x11.cpp 2004-05-10 13:56:10.165560473 +0200 +@@ -288,8 +288,9 @@ + { + #if defined(QT_CHECK_STATE) + if ( qApp->type() == QApplication::Tty ) { +- qWarning( "QPixmap: Cannot create a QPixmap when no GUI " +- "is being used" ); ++// qWarning( "QPixmap: Cannot create a QPixmap when no GUI " ++// "is being used" ); ++ ; + } + #endif + diff --git a/redhat/dependencies/qt3/qt-x11-free-3.3.4-fullscreen.patch b/redhat/dependencies/qt3/qt-x11-free-3.3.4-fullscreen.patch new file mode 100644 index 000000000..0d03f0809 --- /dev/null +++ b/redhat/dependencies/qt3/qt-x11-free-3.3.4-fullscreen.patch @@ -0,0 +1,11 @@ +--- qt-x11-free-3.3.3/src/kernel/qapplication_x11.cpp.orig 2004-11-09 18:57:15.012843629 +0100 ++++ qt-x11-free-3.3.3/src/kernel/qapplication_x11.cpp 2004-11-09 19:02:31.351637807 +0100 +@@ -1412,7 +1412,7 @@ + False, XA_ATOM, &type, &format, &nitems, &after, &data); + + if (type == XA_ATOM && format == 32) { +- ts.writeBlock((const char *) data, nitems * 4); ++ ts.writeBlock((const char *) data, nitems * sizeof(long)); + offset += nitems; + } else + after = 0; diff --git a/redhat/dependencies/qt3/qt-x11-free-3.3.6-qfontdatabase_x11.patch b/redhat/dependencies/qt3/qt-x11-free-3.3.6-qfontdatabase_x11.patch new file mode 100644 index 000000000..a9cfaf4c3 --- /dev/null +++ b/redhat/dependencies/qt3/qt-x11-free-3.3.6-qfontdatabase_x11.patch @@ -0,0 +1,11 @@ +--- qt-x11-free-3.3.6/src/kernel/qfontdatabase_x11.cpp.fonts 2004-08-05 16:42:06.000000000 +0200 ++++ qt-x11-free-3.3.6/src/kernel/qfontdatabase_x11.cpp 2004-09-28 16:11:54.955374161 +0200 +@@ -975,7 +981,7 @@ + }; + const XftDefaultFont defaults[] = { + { "Serif", "serif", FALSE }, +- { "Sans Serif", "sans-serif", FALSE }, ++ { "Sans", "sans-serif", FALSE }, + { "Monospace", "monospace", TRUE }, + { 0, 0, FALSE } + }; diff --git a/redhat/dependencies/qt3/qt-x11-free-3.3.6-qt-x11-immodule-unified-qt3.3.5-20060318-resetinputcontext.patch b/redhat/dependencies/qt3/qt-x11-free-3.3.6-qt-x11-immodule-unified-qt3.3.5-20060318-resetinputcontext.patch new file mode 100644 index 000000000..24982206d --- /dev/null +++ b/redhat/dependencies/qt3/qt-x11-free-3.3.6-qt-x11-immodule-unified-qt3.3.5-20060318-resetinputcontext.patch @@ -0,0 +1,92 @@ +--- qt-x11-free-3.3.6/src/widgets/qtextedit.cpp.preedit 2006-06-28 17:18:08.000000000 +0200 ++++ qt-x11-free-3.3.6/src/widgets/qtextedit.cpp 2006-06-28 17:20:09.000000000 +0200 +@@ -1906,9 +1906,6 @@ + + void QTextEdit::removeSelectedText( int selNum ) + { +- if(selNum != 0) +- resetInputContext(); +- + QTextCursor c1 = doc->selectionStartCursor( selNum ); + c1.restoreState(); + QTextCursor c2 = doc->selectionEndCursor( selNum ); +@@ -3171,7 +3168,6 @@ + return; + } + #endif +- resetInputContext(); + QTextParagraph *p = doc->paragAt( para ); + if ( !p ) + return; +@@ -3198,7 +3194,6 @@ + return; + } + #endif +- resetInputContext(); + for ( int i = 0; i < (int)doc->numSelections(); ++i ) + doc->removeSelection( i ); + +@@ -3240,7 +3235,6 @@ + if ( d->optimMode ) + return; + #endif +- resetInputContext(); + QTextParagraph *p = doc->paragAt( para ); + if ( !p ) + return; +@@ -3285,7 +3279,6 @@ + if ( isReadOnly() || !doc->commands()->isUndoAvailable() || !undoEnabled ) + return; + +- resetInputContext(); + for ( int i = 0; i < (int)doc->numSelections(); ++i ) + doc->removeSelection( i ); + +@@ -3336,7 +3329,6 @@ + if ( isReadOnly() || !doc->commands()->isRedoAvailable() || !undoEnabled ) + return; + +- resetInputContext(); + for ( int i = 0; i < (int)doc->numSelections(); ++i ) + doc->removeSelection( i ); + +@@ -3450,7 +3442,6 @@ + { + if ( isReadOnly() ) + return; +- resetInputContext(); + normalCopy(); + removeSelectedText(); + updateMicroFocusHint(); +@@ -3938,7 +3929,6 @@ + return; + } + #endif +- resetInputContext(); + if ( !isModified() && isReadOnly() && + this->context() == context && this->text() == text ) + return; +@@ -4112,7 +4102,6 @@ + if ( !p ) + return; + +- resetInputContext(); + if ( index > p->length() - 1 ) + index = p->length() - 1; + +@@ -4169,7 +4158,6 @@ + return; + } + #endif +- resetInputContext(); + if ( doc->hasSelection( selNum ) ) { + doc->removeSelection( selNum ); + repaintChanged(); +@@ -5072,7 +5060,6 @@ + { + if ( dc == doc ) + return; +- resetInputContext(); + doc = dc; + delete cursor; + cursor = new QTextCursor( doc ); diff --git a/redhat/dependencies/qt3/qt-x11-free-3.3.6-strip.patch b/redhat/dependencies/qt3/qt-x11-free-3.3.6-strip.patch new file mode 100644 index 000000000..efc24c8a1 --- /dev/null +++ b/redhat/dependencies/qt3/qt-x11-free-3.3.6-strip.patch @@ -0,0 +1,36 @@ +--- qt-x11-free-3.3.6/mkspecs/linux-g++/qmake.conf.orig 2006-06-21 15:37:53.000000000 +0200 ++++ qt-x11-free-3.3.6/mkspecs/linux-g++/qmake.conf 2006-06-21 15:38:02.000000000 +0200 +@@ -84,7 +84,7 @@ + QMAKE_MOVE = mv -f + QMAKE_DEL_FILE = rm -f + QMAKE_DEL_DIR = rmdir +-QMAKE_STRIP = +-QMAKE_STRIPFLAGS_LIB += --strip-unneeded ++QMAKE_STRIP = ++QMAKE_STRIPFLAGS_LIB += + QMAKE_CHK_DIR_EXISTS = test -d + QMAKE_MKDIR = mkdir -p +--- qt-x11-free-3.3.6/mkspecs/linux-g++-32/qmake.conf.orig 2006-06-21 15:37:09.000000000 +0200 ++++ qt-x11-free-3.3.6/mkspecs/linux-g++-32/qmake.conf 2006-06-21 15:37:19.000000000 +0200 +@@ -84,7 +84,7 @@ + QMAKE_MOVE = mv -f + QMAKE_DEL_FILE = rm -f + QMAKE_DEL_DIR = rmdir +-QMAKE_STRIP = strip +-QMAKE_STRIPFLAGS_LIB += --strip-unneeded ++QMAKE_STRIP = ++QMAKE_STRIPFLAGS_LIB += + QMAKE_CHK_DIR_EXISTS = test -d + QMAKE_MKDIR = mkdir -p +--- qt-x11-free-3.3.6/mkspecs/linux-g++-64/qmake.conf.orig 2006-06-21 15:36:23.000000000 +0200 ++++ qt-x11-free-3.3.6/mkspecs/linux-g++-64/qmake.conf 2006-06-21 15:36:56.000000000 +0200 +@@ -87,7 +87,7 @@ + QMAKE_MOVE = mv -f + QMAKE_DEL_FILE = rm -f + QMAKE_DEL_DIR = rmdir +-QMAKE_STRIP = strip +-QMAKE_STRIPFLAGS_LIB += --strip-unneeded ++QMAKE_STRIP = ++QMAKE_STRIPFLAGS_LIB += + QMAKE_CHK_DIR_EXISTS = test -d + QMAKE_MKDIR = mkdir -p diff --git a/redhat/dependencies/qt3/qt-x11-free-3.3.7-arm.patch b/redhat/dependencies/qt3/qt-x11-free-3.3.7-arm.patch new file mode 100644 index 000000000..0c93c416a --- /dev/null +++ b/redhat/dependencies/qt3/qt-x11-free-3.3.7-arm.patch @@ -0,0 +1,25 @@ +--- qt-x11-free-3.3.7/src/tools/qglobal.h.orig 2007-04-24 09:02:36.000000000 -0400 ++++ qt-x11-free-3.3.7/src/tools/qglobal.h 2007-04-24 09:03:02.000000000 -0400 +@@ -315,9 +315,9 @@ + QString bloat. However, gcc 3.4 doesn't allow us to create references to + members of a packed struct. (Pointers are OK, because then you + supposedly know what you are doing.) */ +-# if (defined(__arm__) || defined(__ARMEL__)) && !defined(QT_MOC_CPP) ++# if (defined(__arm__) || defined(__ARMEL__)) && !defined(QT_MOC_CPP) && !defined(__ARM_EABI__) + # define Q_PACKED __attribute__ ((packed)) +-# if __GNUC__ == 3 && __GNUC_MINOR__ >= 4 ++# if __GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) + # define Q_NO_PACKED_REFERENCE + # endif + # endif +--- qt-x11-free-3.3.7/src/tools/qstring.h.orig 2007-04-24 09:03:11.000000000 -0400 ++++ qt-x11-free-3.3.7/src/tools/qstring.h 2007-04-24 09:03:27.000000000 -0400 +@@ -194,7 +194,7 @@ + char latin1() const { return ucs > 0xff ? 0 : (char) ucs; } + ushort unicode() const { return ucs; } + #ifdef Q_NO_PACKED_REFERENCE +- ushort &unicode() { return *(&ucs); } ++ ushort &unicode() { return *((ushort *)&ucs); } + #else + ushort &unicode() { return ucs; } + #endif diff --git a/redhat/dependencies/qt3/qt-x11-free-3.3.7-umask.patch b/redhat/dependencies/qt3/qt-x11-free-3.3.7-umask.patch new file mode 100644 index 000000000..f2351909f --- /dev/null +++ b/redhat/dependencies/qt3/qt-x11-free-3.3.7-umask.patch @@ -0,0 +1,14 @@ +--- qt-x11-free-3.3.7/src/tools/qsettings.cpp.tn 2006-11-09 20:53:25.000000000 +0100 ++++ qt-x11-free-3.3.7/src/tools/qsettings.cpp 2006-11-09 20:59:53.000000000 +0100 +@@ -994,7 +994,10 @@ + #endif + + QFile file( filename + ".tmp" ); +- if (! file.open(IO_WriteOnly)) { ++ mode_t old_umask = umask(0022); ++ bool f = file.open(IO_WriteOnly); ++ umask(old_umask); ++ if (! f) { + + #ifdef QT_CHECK_STATE + qWarning("QSettings::sync: failed to open '%s' for writing", diff --git a/redhat/dependencies/qt3/qt-x11-free-3.3.8-odbc.patch b/redhat/dependencies/qt3/qt-x11-free-3.3.8-odbc.patch new file mode 100644 index 000000000..6f21e3cf1 --- /dev/null +++ b/redhat/dependencies/qt3/qt-x11-free-3.3.8-odbc.patch @@ -0,0 +1,19 @@ +diff -up qt-x11-free-3.3.8/src/sql/drivers/odbc/qsql_odbc.cpp.orig qt-x11-free-3.3.8/src/sql/drivers/odbc/qsql_odbc.cpp +--- qt-x11-free-3.3.8/src/sql/drivers/odbc/qsql_odbc.cpp.orig 2009-02-24 11:32:27.000000000 +0100 ++++ qt-x11-free-3.3.8/src/sql/drivers/odbc/qsql_odbc.cpp 2009-02-24 11:33:43.000000000 +0100 +@@ -57,13 +57,13 @@ + #endif + + // newer platform SDKs use SQLLEN instead of SQLINTEGER +-#ifdef SQLLEN ++#if defined(SQLLEN) || defined(Q_OS_WIN64) || defined(Q_OS_UNIX) + # define QSQLLEN SQLLEN + #else + # define QSQLLEN SQLINTEGER + #endif + +-#ifdef SQLULEN ++#if defined(SQLULEN) || defined(Q_OS_WIN64) || defined(Q_OS_UNIX) + # define QSQLULEN SQLULEN + #else + # define QSQLULEN SQLUINTEGER diff --git a/redhat/dependencies/qt3/qt-x11-free-3.3.8b-typo.patch b/redhat/dependencies/qt3/qt-x11-free-3.3.8b-typo.patch new file mode 100644 index 000000000..c1ff66c2c --- /dev/null +++ b/redhat/dependencies/qt3/qt-x11-free-3.3.8b-typo.patch @@ -0,0 +1,11 @@ +--- qt-x11-free-3.3.8b/mkspecs/macx-mwerks/mwerkstmpl.xml.orig 2010-06-30 01:00:36.000000000 +0200 ++++ qt-x11-free-3.3.8b/mkspecs/macx-mwerks/mwerkstmpl.xml 2010-06-30 01:00:56.000000000 +0200 +@@ -817,7 +817,7 @@ + MacOS + + +- QtGenerated ++ QtGenerated + $$CODEWARRIOR_QPREPROCESS_GROUP + $$CODEWARRIOR_QPREPROCESSOUT_GROUP + diff --git a/redhat/dependencies/qt3/qt-x11-free-3.3.8b-uic-multilib.patch b/redhat/dependencies/qt3/qt-x11-free-3.3.8b-uic-multilib.patch new file mode 100644 index 000000000..341cab7e1 --- /dev/null +++ b/redhat/dependencies/qt3/qt-x11-free-3.3.8b-uic-multilib.patch @@ -0,0 +1,24 @@ +diff -up qt-x11-free-3.3.8b/tools/designer/uic/main.cpp.orig qt-x11-free-3.3.8b/tools/designer/uic/main.cpp +--- qt-x11-free-3.3.8b/tools/designer/uic/main.cpp.orig 2008-01-24 13:25:29.000000000 +0100 ++++ qt-x11-free-3.3.8b/tools/designer/uic/main.cpp 2008-01-24 13:28:17.000000000 +0100 +@@ -320,7 +320,7 @@ int main( int argc, char * argv[] ) + out << "/****************************************************************************" << endl; + out << "** Form "<< (impl? "implementation" : "interface") << " generated from reading ui file '" << fileName << "'" << endl; + out << "**" << endl; +- out << "** Created: " << QDateTime::currentDateTime().toString() << endl; ++ out << "** Created by User Interface Compiler" << endl; + out << "**" << endl; + out << "** WARNING! All changes made in this file will be lost!" << endl; + out << "****************************************************************************/" << endl << endl; +diff -up qt-x11-free-3.3.8b/tools/designer/uic/embed.cpp.orig qt-x11-free-3.3.8b/tools/designer/uic/embed.cpp +--- qt-x11-free-3.3.8b/tools/designer/uic/embed.cpp.orig 2008-01-24 13:28:30.000000000 +0100 ++++ qt-x11-free-3.3.8b/tools/designer/uic/embed.cpp 2008-01-24 13:29:10.000000000 +0100 +@@ -137,7 +137,7 @@ void Uic::embed( QTextStream& out, const + for ( it = images.begin(); it != images.end(); ++it ) + out << "** " << *it << "\n"; + out << "**\n"; +- out << "** Created: " << QDateTime::currentDateTime().toString() << "\n"; ++ out << "** Created by The User Interface Compiler" << "\n"; + out << "**\n"; + out << "** WARNING! All changes made in this file will be lost!\n"; + out << "****************************************************************************/\n"; diff --git a/redhat/dependencies/qt3/qt.csh b/redhat/dependencies/qt3/qt.csh new file mode 100755 index 000000000..93fd941ed --- /dev/null +++ b/redhat/dependencies/qt3/qt.csh @@ -0,0 +1,33 @@ +# Qt initialization script (csh) + +# In multilib environments there is a preferred architecture, 64 bit over 32 bit in x86_64, +# 32 bit over 64 bit in ppc64. When a conflict is found between two packages corresponding +# with different arches, the installed file is the one from the preferred arch. This is +# very common for executables in /usr/bin, for example. If the file /usr/bin/foo is found +# in an x86_64 package and in an i386 package, the executable from x86_64 will be installe + +if ( $?QTDIR ) then + exit +endif + +switch (`uname -m`) + case x86_64: + case ia64: + case s390x: + set QTPREFIXES = "/usr/lib64/qt-3.3 /usr/lib/qt-3.3" + breaksw + case *: + set QTPREFIXES = "/usr/lib/qt-3.3 /usr/lib64/qt-3.3" +endsw + +foreach QTPREFIX ( $QTPREFIXES ) + test -d "$QTPREFIX" && setenv QTDIR $QTPREFIX && break +end +unset QTPREFIX QTPREFIXES + +if ( "${path}" !~ *$QTDIR/bin* ) then + set path = ( $QTDIR/bin $path ) +endif + +setenv QTINC $QTDIR/include +setenv QTLIB $QTDIR/lib diff --git a/redhat/dependencies/qt3/qt.sh b/redhat/dependencies/qt3/qt.sh new file mode 100755 index 000000000..f9ca654c1 --- /dev/null +++ b/redhat/dependencies/qt3/qt.sh @@ -0,0 +1,32 @@ +# Qt initialization script (sh) + +# In multilib environments there is a preferred architecture, 64 bit over 32 bit in x86_64, +# 32 bit over 64 bit in ppc64. When a conflict is found between two packages corresponding +# with different arches, the installed file is the one from the preferred arch. This is +# very common for executables in /usr/bin, for example. If the file /usr/bin/foo is found +# in an x86_64 package and in an i386 package, the executable from x86_64 will be installe + +if [ -z "${QTDIR}" ]; then + +case `uname -m` in + x86_64 | ia64 | s390x ) + QT_PREFIXES="/usr/lib64/qt-3.3 /usr/lib/qt-3.3" ;; + * ) + QT_PREFIXES="/usr/lib/qt-3.3 /usr/lib64/qt-3.3" ;; +esac + +for QTDIR in ${QT_PREFIXES} ; do + test -d "${QTDIR}" && break +done +unset QT_PREFIXES + +if ! echo ${PATH} | /bin/grep -q $QTDIR/bin ; then + PATH=$QTDIR/bin:${PATH} +fi + +QTINC="$QTDIR/include" +QTLIB="$QTDIR/lib" + +export QTDIR QTINC QTLIB PATH + +fi diff --git a/redhat/dependencies/qt3/qt3-3.3.8.d-updates_zh-tw_translations.patch b/redhat/dependencies/qt3/qt3-3.3.8.d-updates_zh-tw_translations.patch new file mode 100644 index 000000000..c5da1ad4c --- /dev/null +++ b/redhat/dependencies/qt3/qt3-3.3.8.d-updates_zh-tw_translations.patch @@ -0,0 +1,251 @@ +--- qt3/translations/qt_zh-tw.ts.ORI 2011-10-30 09:42:26.000000000 +0100 ++++ qt3/translations/qt_zh-tw.ts 2011-12-18 22:06:58.432615802 +0100 +@@ -115,7 +115,7 @@ + + + Menu +- Menu ++ 選單 + + + Help +@@ -337,7 +337,7 @@ + + + A&lpha channel: +- Alpha 色頻(&L)： ++ 透明色頻(&L)： + + + &Basic colors +@@ -429,11 +429,11 @@ + + + Read: %1 +- 讀取： %1 ++ 讀取：%1 + + + Write: %1 +- 寫入： %1 ++ 寫入：%1 + + + Cancel +@@ -1194,7 +1194,7 @@ + + + Customize... +- 自訂... ++ 自訂… + + + +@@ -1264,7 +1264,7 @@ + + + <h3>About Qt</h3><p>This program uses Qt version %1.</p><p>Qt is a C++ toolkit for multiplatform GUI &amp; application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants.<br>Qt is also available for embedded devices.</p><p>Qt is a Trolltech product. See <tt>http://www.trolltech.com/qt/</tt> for more information.</p> +- <h3>關於 Qt</h3><p>本程式使用 Qt 版本 %1。</p><p>Qt 是用於多平台 GUI 和應用程式開發的 C++ 工具套件。</p><p>Qt 為 MS&nbsp;Windows、Mac&nbsp;OS&nbsp;X、Linux 和所有主要的商用 Unix 變異版本，提供跨平台的單一原始碼可攜性。<br>Qt 也可用於內嵌裝置。</p><p>Qt 是 Trolltech 的產品。如需詳細資訊，請參閱 <tt>http://www.trolltech.com/qt/</tt>。</p> ++ <h3>關於 Qt</h3><p>本程式使用 Qt 版本 %1。</p><p>Qt 是用於多平臺 GUI 和應用程式開發的 C++ 工具套件。</p><p>Qt 為 MS&nbsp;Windows、Mac&nbsp;OS&nbsp;X、Linux 和所有主要的商用 Unix 變異版本，提供跨平臺的單一原始碼可攜性。<br>Qt 也可用於內嵌裝置。</p><p>Qt 是 Trolltech 的產品。如需詳細資訊，請參閱 <tt>http://www.trolltech.com/qt/</tt>。</p> + + + +@@ -1282,7 +1282,7 @@ + + + Aliases: %1 +- 別名： %1 ++ 別名：%1 + + + unknown +@@ -1338,7 +1338,7 @@ + + + Browse... +- 瀏覽... ++ 瀏覽… + + + Options +@@ -1386,123 +1386,123 @@ + + + A0 (841 x 1189 mm) +- A0 (841 x 1189 mm) ++ A0 (841 x 1189 公釐) + + + A1 (594 x 841 mm) +- A1 (594 x 841 mm) ++ A1 (594 x 841 公釐) + + + A2 (420 x 594 mm) +- A2 (420 x 594 mm) ++ A2 (420 x 594 公釐) + + + A3 (297 x 420 mm) +- A3 (297 x 420 mm) ++ A3 (297 x 420 公釐) + + + A4 (210x297 mm, 8.26x11.7 inches) +- A4 (210x297 mm，8.26x11.7 英吋) ++ A4 (210x297 公釐，8.26x11.7 英吋) + + + A5 (148 x 210 mm) +- A5 (148 x 210 mm) ++ A5 (148 x 210 公釐) + + + A6 (105 x 148 mm) +- A6 (105 x 148 mm) ++ A6 (105 x 148 公釐) + + + A7 (74 x 105 mm) +- A7 (74 x 105 mm) ++ A7 (74 x 105 公釐) + + + A8 (52 x 74 mm) +- A8 (52 x 74 mm) ++ A8 (52 x 74 公釐) + + + A9 (37 x 52 mm) +- A9 (37 x 52 mm) ++ A9 (37 x 52 公釐) + + + B0 (1000 x 1414 mm) +- B0 (1000 x 1414 mm) ++ B0 (1000 x 1414 公釐) + + + B1 (707 x 1000 mm) +- B1 (707 x 1000 mm) ++ B1 (707 x 1000 公釐) + + + B2 (500 x 707 mm) +- B2 (500 x 707 mm) ++ B2 (500 x 707 公釐) + + + B3 (353 x 500 mm) +- B3 (353 x 500 mm) ++ B3 (353 x 500 公釐) + + + B4 (250 x 353 mm) +- B4 (250 x 353 mm) ++ B4 (250 x 353 公釐) + + + B5 (176 x 250 mm, 6.93x9.84 inches) +- B5 (176 x 250 mm，6.93x9.84 英吋) ++ B5 (176 x 250 公釐，6.93x9.84 英吋) + + + B6 (125 x 176 mm) +- B6 (125 x 176 mm) ++ B6 (125 x 176 公釐) + + + B7 (88 x 125 mm) +- B7 (88 x 125 mm) ++ B7 (88 x 125 公釐) + + + B8 (62 x 88 mm) +- B8 (62 x 88 mm) ++ B8 (62 x 88 公釐) + + + B9 (44 x 62 mm) +- B9 (44 x 62 mm) ++ B9 (44 x 62 公釐) + + + B10 (31 x 44 mm) +- B10 (31 x 44 mm) ++ B10 (31 x 44 公釐) + + + C5E (163 x 229 mm) +- C5E (163 x 229 mm) ++ C5E (163 x 229 公釐) + + + DLE (110 x 220 mm) +- DLE (110 x 220 mm) ++ DLE (110 x 220 公釐) + + + Executive (7.5x10 inches, 191x254 mm) +- Executive (7.5x10 英吋，191x254 mm) ++ Executive (7.5x10 英吋，191x254 公釐) + + + Folio (210 x 330 mm) +- Folio (210 x 330 mm) ++ Folio (210 x 330 公釐) + + + Ledger (432 x 279 mm) +- Ledger (432 x 279 mm) ++ Ledger (432 x 279 公釐) + + + Legal (8.5x14 inches, 216x356 mm) +- Legal (8.5x14 英吋，216x356 mm) ++ Legal (8.5x14 英吋，216x356 公釐) + + + Letter (8.5x11 inches, 216x279 mm) +- Letter (8.5x11 英吋，216x279 mm) ++ Letter (8.5x11 英吋，216x279 公釐) + + + Tabloid (279 x 432 mm) +- Tabloid (279 x 432 mm) ++ Tabloid (279 x 432 公釐) + + + US Common #10 Envelope (105 x 241 mm) +- 美國一般 10 號信封 (105 x 241 mm) ++ 美國一般 10 號信封 (105 x 241 公釐) + + + Setup Printer +@@ -1691,7 +1691,7 @@ + QToolBar + + More... +- 其他... ++ 其他… + + + +@@ -1811,7 +1811,7 @@ + + + &Help +- 說明(&H) ++ 求助(&H) + + + +@@ -1988,7 +1988,7 @@ + + + Paste special... +- 選擇性貼上... ++ 選擇性貼上… + + + Clear diff --git a/redhat/dependencies/qt3/qt3.spec b/redhat/dependencies/qt3/qt3.spec new file mode 100644 index 000000000..fcadb5b6d --- /dev/null +++ b/redhat/dependencies/qt3/qt3.spec @@ -0,0 +1,721 @@ +# Default version for this component +%if "%{?version}" == "" +%define version 3.3.8.d +%endif + +# Always install under standard prefix +%define _prefix /usr + +# This allows the legacy RHEL/Fedora patches to apply in TDE version. +%define _default_patch_fuzz 2 + +# The following QT4 packages should NOT be installed to +# allow QT3 compilation (please uninstall them prior to compile) +# qt +# qt-sqlite +# qt-mysql +# qt-x11 +# qt-devel +# ...maybe others !!!! + +Name: qt3 +Version: %{?version} +Release: 3%{?dist} +Summary: The shared library for the Qt 3 GUI toolkit + +License: QPL or GPLv2 or GPLv3 +Group: System Environment/Libraries +URL: http://www.trinitydesktop.org/ + +Obsoletes: qt < 1:%{version}-%{release} +Provides: qt = 1:%{version}-%{release} + +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: qt3-3.3.8.d.tar.gz +Source2: qt.sh +Source3: qt.csh +Source4: designer3.desktop +Source5: assistant3.desktop +Source6: linguist3.desktop +Source7: qtconfig3.desktop + +Patch1: qt-3.3.4-print-CJK.patch +Patch2: qt-3.0.5-nodebug.patch +Patch3: qt-3.1.0-makefile.patch +Patch4: qt-x11-free-3.3.7-umask.patch +Patch5: qt-x11-free-3.3.6-strip.patch +Patch7: qt-x11-free-3.3.2-quiet.patch +#Patch8: qt-x11-free-3.3.3-qembed.patch +Patch12: qt-uic-nostdlib.patch +Patch13: qt-x11-free-3.3.6-qfontdatabase_x11.patch +#Patch14: qt-x11-free-3.3.3-gl.patch +#Patch19: qt-3.3.3-gtkstyle.patch +#Patch20: qt-x11-free-3.3.8b-gcc4-buildkey.patch +#Patch24: qt-x11-free-3.3.5-uic.patch +Patch25: qt-x11-free-3.3.8b-uic-multilib.patch +Patch27: qt-3.3.6-fontrendering-ml_IN-209097.patch +Patch29: qt-3.3.8-fontrendering-as_IN-209972.patch +Patch31: qt-3.3.6-fontrendering-te_IN-211259.patch +Patch32: qt-3.3.6-fontrendering-214371.patch +Patch33: qt-3.3.8-fontrendering-#214570.patch +Patch34: qt-3.3.6-fontrendering-ml_IN-209974.patch +Patch35: qt-3.3.6-fontrendering-ml_IN-217657.patch +Patch37: qt-3.3.6-fontrendering-gu-228452.patch +Patch38: qt-x11-free-3.3.8-odbc.patch +Patch39: qt-x11-free-3.3.7-arm.patch +Patch40: qt-x11-free-3.3.8b-typo.patch + +# immodule patches +#Patch50: qt-x11-immodule-unified-qt3.3.8-20071116.diff.bz2 +#Patch51: qt-x11-immodule-unified-qt3.3.5-20051012-quiet.patch +#Patch52: qt-x11-free-3.3.8b-fix-key-release-event-with-imm.diff +Patch53: qt-x11-free-3.3.6-qt-x11-immodule-unified-qt3.3.5-20060318-resetinputcontext.patch + +# qt-copy patches +#Patch100: 0038-dragobject-dont-prefer-unknown.patch +#Patch101: 0047-fix-kmenu-width.diff +#Patch102: 0048-qclipboard_hack_80072.patch +#Patch103: 0056-khotkeys_input_84434.patch +#patch105: 0073-xinerama-aware-qpopup.patch +#Patch107: 0079-compositing-types.patch +#Patch108: 0080-net-wm-sync-request-2.patch +Patch110: 0084-compositing-properties.patch + +# upstream patches +Patch200: qt-x11-free-3.3.4-fullscreen.patch +#Patch201: qt-x11-free-3.3.8b-gcc43.patch + +# TDE 3.5.13 patches +Patch300: qt3-3.3.8.d-updates_zh-tw_translations.patch + +%define qt_dirname qt-3.3 +%define qtdir %{_libdir}/%{qt_dirname} +%define qt_docdir %{_docdir}/qt-devel-%{version} + +%define smp 1 +%define immodule 1 +%define debug 0 + +# MySQL plugins +%define plugin_mysql -plugin-sql-mysql +%define mysql_include_dir %{_includedir}/mysql +%define mysql_lib_dir %{_libdir}/mysql + +# Postgres plugins +%define plugin_psql -plugin-sql-psql + +# ODBC plugins +%define plugin_odbc -plugin-sql-odbc + +# sqlite plugins +%define plugin_sqlite -plugin-sql-sqlite + +%define plugins_style -qt-style-cde -qt-style-motifplus -qt-style-platinum -qt-style-sgi -qt-style-windows -qt-style-compact -qt-imgfmt-png -qt-imgfmt-jpeg -qt-imgfmt-mng +%define plugins %{plugin_mysql} %{plugin_psql} %{plugin_odbc} %{plugin_sqlite} %{plugins_style} + +Requires(post): /sbin/ldconfig +Requires(postun): /sbin/ldconfig +Requires: coreutils +Requires: fontconfig >= 2.0 +Requires: /etc/ld.so.conf.d + +BuildRequires: desktop-file-utils +BuildRequires: libmng-devel +BuildRequires: glibc-devel +BuildRequires: libjpeg-devel +BuildRequires: libpng-devel +BuildRequires: zlib-devel +BuildRequires: giflib-devel +BuildRequires: perl +BuildRequires: sed +BuildRequires: findutils +BuildRequires: cups-devel +BuildRequires: tar +BuildRequires: freetype-devel +BuildRequires: fontconfig-devel +BuildRequires: libXrender-devel +BuildRequires: libXrandr-devel +BuildRequires: libXcursor-devel +BuildRequires: libXinerama-devel +BuildRequires: libXft-devel +BuildRequires: libXext-devel +BuildRequires: libX11-devel +BuildRequires: libSM-devel +BuildRequires: libICE-devel +BuildRequires: libXt-devel +BuildRequires: libXmu-devel +BuildRequires: libXi-devel +BuildRequires: xorg-x11-proto-devel +BuildRequires: mesa-libGL-devel +BuildRequires: mesa-libGLU-devel +BuildRequires: desktop-file-utils +BuildRequires: mysql-devel +BuildRequires: postgresql-devel +BuildRequires: unixODBC-devel +BuildRequires: sqlite-devel +BuildRequires: gcc-c++ + + +%package config +Summary: Graphical configuration tool for programs using Qt 3 +Group: User Interface/Desktops +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: qt-config < 1:%{version}-%{release} +Provides: qt-config = 1:%{version}-%{release} + + +%package devel +Summary: Development files for the Qt 3 GUI toolkit +Group: Development/Libraries +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: freetype-devel +Requires: fontconfig-devel +Requires: libXrender-devel +Requires: libXrandr-devel +Requires: libXcursor-devel +Requires: libXinerama-devel +Requires: libXft-devel +Requires: libXext-devel +Requires: libX11-devel +Requires: libSM-devel +Requires: libICE-devel +Requires: libXt-devel +Requires: xorg-x11-proto-devel +Requires: libpng-devel +Requires: libjpeg-devel +Requires: libmng-devel +Requires: mesa-libGL-devel +Requires: mesa-libGLU-devel + +Obsoletes: qt-devel < 1:%{version}-%{release} +Provides: qt-devel = 1:%{version}-%{release} + + +%package devel-docs +Summary: Documentation for the Qt 3 GUI toolkit +Group: Development/Libraries +Requires: %{name}-devel = %{?epoch:%{epoch}:}%{version}-%{release} + +Obsoletes: qt-devel-docs < 1:%{version}-%{release} +Provides: qt-devel-docs = 1:%{version}-%{release} + + +%package ODBC +Summary: ODBC drivers for Qt 3's SQL classes +Group: System Environment/Libraries +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} + +Obsoletes: qt-ODBC < 1:%{version}-%{release} +Provides: qt-ODBC = 1:%{version}-%{release} + + +%package MySQL +Summary: MySQL drivers for Qt 3's SQL classes +Group: System Environment/Libraries +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} + +Obsoletes: qt-MySQL < 1:%{version}-%{release} +Provides: qt-MySQL = 1:%{version}-%{release} + + +%package PostgreSQL +Summary: PostgreSQL drivers for Qt 3's SQL classes +Group: System Environment/Libraries +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} + +Obsoletes: qt-PostgreSQL < 1:%{version}-%{release} +Provides: qt-PostgreSQL = 1:%{version}-%{release} + + +%package sqlite +Summary: sqlite drivers for Qt 3's SQL classes +Group: System Environment/Libraries +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} + +Obsoletes: qt-sqlite < 1:%{version}-%{release} +Provides: qt-sqlite = 1:%{version}-%{release} + + +%package designer +Summary: Interface designer (IDE) for the Qt 3 toolkit +Group: Development/Tools +Requires: %{name}-devel = %{?epoch:%{epoch}:}%{version}-%{release} + +Obsoletes: qt-designer < 1:%{version}-%{release} +Provides: qt-designer = 1:%{version}-%{release} + + +%description +Qt is a GUI software toolkit which simplifies the task of writing and +maintaining GUI (Graphical User Interface) applications +for the X Window System. + +Qt is written in C++ and is fully object-oriented. + +This package contains the shared library needed to run Qt 3 +applications, as well as the README files for Qt 3. + + +%description config +Qt is a GUI software toolkit which simplifies the task of writing and +maintaining GUI (Graphical User Interface) applications +for the X Window System. + +Qt is written in C++ and is fully object-oriented. + +This package contains a graphical configuration tool for programs using Qt 3. + + +%description devel +The %{name}-devel package contains the files necessary to develop +applications using the Qt GUI toolkit: the header files, the Qt meta +object compiler. + +Install %{name}-devel if you want to develop GUI applications using the Qt 3 +toolkit. + + +%description devel-docs +The %{name}-devel-docs package contains the man pages, the HTML documentation and +example programs for Qt 3. + + +%description ODBC +ODBC driver for Qt 3's SQL classes (QSQL) + + +%description MySQL +MySQL driver for Qt 3's SQL classes (QSQL) + + +%description PostgreSQL +PostgreSQL driver for Qt 3's SQL classes (QSQL) + + +%description sqlite +sqlite driver for Qt 3's SQL classes (QSQL) + + +%description designer +The %{name}-designer package contains an User Interface designer tool +for the Qt 3 toolkit. + + +%prep +%setup -q -n qt3 +%patch1 -p1 -b .cjk +%patch2 -p1 -b .ndebug +%patch3 -p1 -b .makefile +%patch4 -p1 -b .umask +%patch5 -p1 +%patch7 -p1 -b .quiet +#patch8 -p1 -b .qembed +%patch12 -p1 -b .nostdlib +%patch13 -p1 -b .fonts +#patch14 -p1 -b .gl +#patch19 -p1 -b .gtk +#patch20 -p1 -b .gcc4-buildkey +#patch24 -p1 -b .uic +%patch25 -p1 -b .uic-multilib +%patch27 -p1 -b .fontrendering-ml_IN-bz#209097 +%patch29 -p1 -b .fontrendering-as_IN-bz#209972 +%patch31 -p1 -b .fontrendering-te_IN-bz#211259 +%patch32 -p1 -b .fontrendering-bz#214371 +%patch33 -p1 -b .fontrendering-#214570 +%patch34 -p1 -b .fontrendering-#209974 +%patch35 -p1 -b .fontrendering-ml_IN-217657 +%patch37 -p1 -b .fontrendering-gu-228452 +%patch38 -p1 -b .odbc +# it's not 100% clear to me if this is safe for all archs -- Rex +%ifarch armv5tel +%patch39 -p1 -b .arm +%endif +%patch40 -p1 + +# immodule patches +%if %{immodule} +#patch50 -p1 +#patch51 -p1 -b .quiet +#patch52 -p1 -b .fix-key-release-event-with-imm +%patch53 -p1 -b .resetinputcontext +%endif + +# qt-copy patches +#patch100 -p0 -b .0038-dragobject-dont-prefer-unknown +#patch101 -p0 -b .0047-fix-kmenu-width +#patch102 -p0 -b .0048-qclipboard_hack_80072 +#patch103 -p0 -b .0056-khotkeys_input_84434 +#patch105 -p0 -b .0073-xinerama-aware-qpopup +#patch107 -p0 -b .0079-compositing-types +#patch108 -p0 -b .0080-net-wm-sync-request +%patch110 -p0 -b .0084-compositing-properties + +# upstream patches +%patch200 -p1 -b .fullscreen +#patch201 -p1 -b .gcc34 + +# TDE 3.5.13 patches +%patch300 -p1 + +# convert to UTF-8 +iconv -f iso-8859-1 -t utf-8 < doc/man/man3/qdial.3qt > doc/man/man3/qdial.3qt_ +mv doc/man/man3/qdial.3qt_ doc/man/man3/qdial.3qt + +%build +export QTDIR=`/bin/pwd` +export LD_LIBRARY_PATH="$QTDIR/lib:$LD_LIBRARY_PATH" +export PATH="$QTDIR/bin:$PATH" +export QTDEST=%{qtdir} + +%if %{smp} + export SMP_MFLAGS="%{?_smp_mflags}" +%endif + +%if %{immodule} + sh ./make-symlinks.sh +%endif + +# set correct X11 prefix +perl -pi -e "s,QMAKE_LIBDIR_X11.*,QMAKE_LIBDIR_X11\t=," mkspecs/*/qmake.conf +perl -pi -e "s,QMAKE_INCDIR_X11.*,QMAKE_INCDIR_X11\t=," mkspecs/*/qmake.conf +perl -pi -e "s,QMAKE_INCDIR_OPENGL.*,QMAKE_INCDIR_OPENGL\t=," mkspecs/*/qmake.conf +perl -pi -e "s,QMAKE_LIBDIR_OPENGL.*,QMAKE_LIBDIR_OPENGL\t=," mkspecs/*/qmake.conf + +# don't use rpath +perl -pi -e "s|-Wl,-rpath,| |" mkspecs/*/qmake.conf + +perl -pi -e "s|-O2|$INCLUDES %{optflags} -fno-strict-aliasing|g" mkspecs/*/qmake.conf + +# set correct lib path +if [ "%{_lib}" == "lib64" ] ; then + perl -pi -e "s,/usr/lib /lib,/usr/%{_lib} /%{_lib},g" config.tests/{unix,x11}/*.test + perl -pi -e "s,/lib /usr/lib,/%{_lib} /usr/%{_lib},g" config.tests/{unix,x11}/*.test +fi + +# build shared, threaded (default) libraries +echo yes | ./configure \ + -prefix $QTDEST \ + -docdir %{qt_docdir} \ +%if %{_lib} == lib64 + -platform linux-g++-64 \ +%else + -platform linux-g++ \ +%endif +%if %{debug} + -debug \ +%else + -release \ +%endif + -shared \ + -largefile \ + -qt-gif \ + -system-zlib \ + -system-libpng \ + -system-libmng \ + -system-libjpeg \ + -no-exceptions \ + -enable-styles \ + -enable-tools \ + -enable-kernel \ + -enable-widgets \ + -enable-dialogs \ + -enable-iconview \ + -enable-workspace \ + -enable-network \ + -enable-canvas \ + -enable-table \ + -enable-xml \ + -enable-opengl \ + -enable-sql \ + -qt-style-motif \ + %{plugins} \ + -stl \ + -thread \ + -cups \ + -sm \ + -xinerama \ + -xrender \ + -xkb \ + -ipv6 \ + -dlopen-opengl \ + -xft \ + -tablet + +make $SMP_MFLAGS src-qmake + +# build sqlite plugin +pushd plugins/src/sqldrivers/sqlite +qmake -o Makefile sqlite.pro +popd + +# build psql plugin +pushd plugins/src/sqldrivers/psql +qmake -o Makefile "INCLUDEPATH+=%{_includedir}/pgsql %{_includedir}/pgsql/server %{_includedir}/pgsql/internal" "LIBS+=-lpq" psql.pro +popd + +# build mysql plugin +pushd plugins/src/sqldrivers/mysql +qmake -o Makefile "INCLUDEPATH+=%{mysql_include_dir}" "LIBS+=-L%{mysql_lib_dir} -lmysqlclient" mysql.pro +popd + +# build odbc plugin +pushd plugins/src/sqldrivers/odbc +qmake -o Makefile "LIBS+=-lodbc" odbc.pro +popd + +make $SMP_MFLAGS src-moc +make $SMP_MFLAGS sub-src +make $SMP_MFLAGS sub-tools UIC="$QTDIR/bin/uic -nostdlib -L $QTDIR/plugins" + +%install +rm -rf %{buildroot} + +export QTDIR=`/bin/pwd` +export LD_LIBRARY_PATH="$QTDIR/lib:$LD_LIBRARY_PATH" +export PATH="$QTDIR/bin:$PATH" +export QTDEST=%{qtdir} + +make install INSTALL_ROOT=%{buildroot} + +for i in findtr qt20fix qtrename140 lrelease lupdate ; do + install bin/$i %{buildroot}%{qtdir}/bin/ +done + +mkdir -p %{buildroot}%{_libdir}/pkgconfig/ +mv %{buildroot}%{qtdir}/lib/pkgconfig/*.pc %{buildroot}%{_libdir}/pkgconfig/ + +# install man pages +mkdir -p %{buildroot}%{_mandir} +cp -fR doc/man/* %{buildroot}%{_mandir}/ + +# clean up +make -C tutorial clean +make -C examples clean + +# Make sure the examples can be built outside the source tree. +# Our binaries fulfill all requirements, so... +perl -pi -e "s,^DEPENDPATH.*,,g;s,^REQUIRES.*,,g" `find examples -name "*.pro"` + +# don't include Makefiles of qt examples/tutorials +find examples -name "Makefile" | xargs rm -f +find examples -name "*.obj" | xargs rm -rf +find examples -name "*.moc" | xargs rm -rf +find tutorial -name "Makefile" | xargs rm -f + +for a in */*/Makefile ; do + sed 's|^SYSCONF_MOC.*|SYSCONF_MOC = %{qtdir}/bin/moc|' < $a > ${a}.2 + mv -v ${a}.2 $a +done + +mkdir -p %{buildroot}/etc/profile.d +install -m 644 %{SOURCE2} %{SOURCE3} %{buildroot}/etc/profile.d/ + +# Add desktop files +mkdir -p %{buildroot}%{_datadir}/applications +desktop-file-install \ + --dir %{buildroot}%{_datadir}/applications \ + --vendor="qt" \ + %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} + +# Patch qmake to use qt-mt unconditionally +perl -pi -e "s,-lqt ,-lqt-mt ,g;s,-lqt$,-lqt-mt,g" %{buildroot}%{qtdir}/mkspecs/*/qmake.conf + +# remove broken links +rm -f %{buildroot}%{qtdir}/mkspecs/default/linux-g++* +rm -f %{buildroot}%{qtdir}/lib/*.la + +mkdir -p %{buildroot}/etc/ld.so.conf.d +echo "%{qtdir}/lib" > %{buildroot}/etc/ld.so.conf.d/qt-%{_arch}.conf + +# install icons +mkdir %{buildroot}%{_datadir}/pixmaps +install -m 644 tools/assistant/images/qt.png %{buildroot}%{_datadir}/pixmaps/qtconfig3.png +install -m 644 tools/assistant/images/designer.png %{buildroot}%{_datadir}/pixmaps/designer3.png +install -m 644 tools/assistant/images/assistant.png %{buildroot}%{_datadir}/pixmaps/assistant3.png +install -m 644 tools/assistant/images/linguist.png %{buildroot}%{_datadir}/pixmaps/linguist3.png + +# own style directory +mkdir -p %{buildroot}%{qtdir}/plugins/styles + +%clean +rm -rf %{buildroot} + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + +%files +%defattr(-,root,root,-) +%doc FAQ LICENSE* README* changes* +%dir %{qtdir} +%dir %{qtdir}/bin +%dir %{qtdir}/lib +%dir %{qtdir}/plugins +%dir %{qtdir}/plugins/sqldrivers +%dir %{qtdir}/plugins/styles +%{qtdir}/translations +%{qtdir}/plugins/designer/ +%if %{immodule} +%{qtdir}/plugins/inputmethods +%endif +%config /etc/profile.d/* +/etc/ld.so.conf.d/* +%{qtdir}/lib/libqui.so.* +%{qtdir}/lib/libqt*.so.* + +%files config +%defattr(-,root,root,-) +%{qtdir}/bin/qtconfig +%{_datadir}/applications/*qtconfig*.desktop +%{_datadir}/pixmaps/qtconfig3.png + +%files devel +%defattr(-,root,root,-) +%{qt_docdir}/ +%{qtdir}/bin/moc +%{qtdir}/bin/uic +%{qtdir}/bin/findtr +%{qtdir}/bin/qt20fix +%{qtdir}/bin/qtrename140 +%{qtdir}/bin/assistant +%{qtdir}/bin/qm2ts +%{qtdir}/bin/qmake +%{qtdir}/bin/qembed +%{qtdir}/bin/linguist +%{qtdir}/bin/lupdate +%{qtdir}/bin/lrelease +%{qtdir}/include +%{qtdir}/mkspecs +%{qtdir}/lib/libqt*.so +%{qtdir}/lib/libqui.so +%{qtdir}/lib/libeditor.a +%{qtdir}/lib/libdesigner*.a +%{qtdir}/lib/libqassistantclient.a +%{qtdir}/lib/*.prl +%{qtdir}/phrasebooks +%{_libdir}/pkgconfig/* +%{_datadir}/applications/*linguist*.desktop +%{_datadir}/applications/*assistant*.desktop +%{_datadir}/pixmaps/linguist3.png +%{_datadir}/pixmaps/assistant3.png + +# QT 3.3.8.D (TDE): 4 binaries have appeared +%{qtdir}/bin/createcw +%{qtdir}/bin/makeqpf +%{qtdir}/bin/mergetr +%{qtdir}/bin/msg2qm + +# QT 3.3.8.D (TDE): removes lots of unnecessary include files +# (where do they come from ??? They were not in 3.3.8b !) +%exclude %{qtdir}/include/btree.h +#%exclude %{qtdir}/include/config.h +%exclude %{qtdir}/include/crc32.h +%exclude %{qtdir}/include/debian_qsql_odbc.h +%exclude %{qtdir}/include/deflate.h +%exclude %{qtdir}/include/ftglue.h +%exclude %{qtdir}/include/ftxgdef.h +%exclude %{qtdir}/include/ftxgpos.h +%exclude %{qtdir}/include/ftxgsub.h +%exclude %{qtdir}/include/ftxopen.h +%exclude %{qtdir}/include/ftxopenf.h +%exclude %{qtdir}/include/hash.h +%exclude %{qtdir}/include/inffast.h +%exclude %{qtdir}/include/inffixed.h +%exclude %{qtdir}/include/inflate.h +%exclude %{qtdir}/include/inftrees.h +%exclude %{qtdir}/include/jchuff.h +%exclude %{qtdir}/include/jconfig.h +%exclude %{qtdir}/include/jdct.h +%exclude %{qtdir}/include/jdhuff.h +%exclude %{qtdir}/include/jerror.h +%exclude %{qtdir}/include/jinclude.h +%exclude %{qtdir}/include/jmemsys.h +%exclude %{qtdir}/include/jmorecfg.h +#%exclude %{qtdir}/include/jpegint.h +#%exclude %{qtdir}/include/jpeglib.h +%exclude %{qtdir}/include/jversion.h +#%exclude %{qtdir}/include/libmng.h +#%exclude %{qtdir}/include/libmng_chunk_io.h +#%exclude %{qtdir}/include/libmng_chunk_prc.h +#%exclude %{qtdir}/include/libmng_chunks.h +#%exclude %{qtdir}/include/libmng_cms.h +#%exclude %{qtdir}/include/libmng_conf.h +#%exclude %{qtdir}/include/libmng_data.h +#%exclude %{qtdir}/include/libmng_display.h +#%exclude %{qtdir}/include/libmng_dither.h +#%exclude %{qtdir}/include/libmng_error.h +#%exclude %{qtdir}/include/libmng_filter.h +#%exclude %{qtdir}/include/libmng_jpeg.h +#%exclude %{qtdir}/include/libmng_memory.h +#%exclude %{qtdir}/include/libmng_object_prc.h +#%exclude %{qtdir}/include/libmng_objects.h +#%exclude %{qtdir}/include/libmng_pixels.h +#%exclude %{qtdir}/include/libmng_read.h +#%exclude %{qtdir}/include/libmng_trace.h +#%exclude %{qtdir}/include/libmng_types.h +#%exclude %{qtdir}/include/libmng_write.h +#%exclude %{qtdir}/include/libmng_zlib.h +%exclude %{qtdir}/include/moc_yacc.h +%exclude %{qtdir}/include/opcodes.h +%exclude %{qtdir}/include/os.h +%exclude %{qtdir}/include/otlbuffer.h +%exclude %{qtdir}/include/pager.h +%exclude %{qtdir}/include/parse.h +#%exclude %{qtdir}/include/png.h +%exclude %{qtdir}/include/pngasmrd.h +%exclude %{qtdir}/include/pngconf.h +%exclude %{qtdir}/include/sqlite.h +%exclude %{qtdir}/include/sqliteInt.h +%exclude %{qtdir}/include/trees.h +%exclude %{qtdir}/include/vdbe.h +%exclude %{qtdir}/include/vdbeInt.h +#%exclude %{qtdir}/include/zconf.h +#%exclude %{qtdir}/include/zconf.in.h +#%exclude %{qtdir}/include/zlib.h +#%exclude %{qtdir}/include/zutil.h +%exclude %{qtdir}/mkspecs/linux-g++-sparc + + + +%files devel-docs +%defattr(-,root,root,-) +%doc examples +%doc tutorial +%{_mandir}/*/* + +%files sqlite +%defattr(-,root,root,-) +%{qtdir}/plugins/sqldrivers/libqsqlite.so + +%files ODBC +%defattr(-,root,root,-) +%{qtdir}/plugins/sqldrivers/libqsqlodbc.so + +%files PostgreSQL +%defattr(-,root,root,-) +%{qtdir}/plugins/sqldrivers/libqsqlpsql.so + +%files MySQL +%defattr(-,root,root,-) +%{qtdir}/plugins/sqldrivers/libqsqlmysql.so + +%files designer +%defattr(-,root,root,-) +%{qtdir}/templates +%{qtdir}/bin/designer +%{_datadir}/applications/*designer*.desktop +%{_datadir}/pixmaps/designer3.png + + +%changelog +* Sun Dec 18 2011 Francois Andriot - 3.3.8.d-3 +- Updates zh_TW translations, thanks to Wei-Lun Chao . + +* Thu Nov 03 2011 Francois Andriot - 3.3.8.d-2 +- Add missing BuildRequires + +* Fri Sep 02 2011 Francois Andriot - 3.3.8.d-1 +- Initial build for RHEL 6, RHEL 5, and Fedora 15 +- Switch to Trinity Version +- Spec file based on RHEL 6 'qt3-3.3.8b-29' diff --git a/redhat/dependencies/qt3/qtconfig3.desktop b/redhat/dependencies/qt3/qtconfig3.desktop new file mode 100644 index 000000000..11df0abab --- /dev/null +++ b/redhat/dependencies/qt3/qtconfig3.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=Qt3 Config +Comment=Configure Qt3 behavior, styles, fonts +Exec=qtconfig +Icon=qtconfig3 +Terminal=false +Encoding=UTF-8 +Type=Application +Categories=Qt;Settings; diff --git a/redhat/dependencies/tqt3/0084-compositing-properties.patch b/redhat/dependencies/tqt3/0084-compositing-properties.patch new file mode 100644 index 000000000..368b6c267 --- /dev/null +++ b/redhat/dependencies/tqt3/0084-compositing-properties.patch @@ -0,0 +1,80 @@ +qt-bugs@ issue : none +bugs.kde.org number : none +applied: no +author: Lubos Lunak + +This patch makes override-redirect windows (popup menu, dropdown menu, +tooltip, combobox, etc.) also have more window properties like WM_CLASS, +so they can be used when compositing. + +--- src/kernel/qwidget_x11.cpp.sav 2007-06-25 10:36:42.000000000 +0200 ++++ src/kernel/qwidget_x11.cpp 2007-10-02 15:30:13.000000000 +0200 +@@ -557,7 +557,10 @@ void QWidget::create( WId window, bool i + wsa.save_under = True; + XChangeWindowAttributes( dpy, id, CWOverrideRedirect | CWSaveUnder, + &wsa ); +- x11SetWindowType(); ++ XClassHint class_hint; ++ class_hint.res_name = (char *) qAppName(); // application name ++ class_hint.res_class = (char *) qAppClass(); // application class ++ XSetClassHint( dpy, id, &class_hint ); + } else if ( topLevel && !desktop ) { // top-level widget + QWidget *p = parentWidget(); // real parent + if (p) +@@ -620,8 +623,6 @@ void QWidget::create( WId window, bool i + else + XDeleteProperty(dpy, id, qt_xa_motif_wm_hints); + +- x11SetWindowType(); +- + // set _NET_WM_WINDOW_STATE + if (curr_winstate > 0) + XChangeProperty(dpy, id, qt_net_wm_state, XA_ATOM, 32, PropModeReplace, +@@ -629,11 +630,6 @@ void QWidget::create( WId window, bool i + else + XDeleteProperty(dpy, id, qt_net_wm_state); + +- // set _NET_WM_PID +- long curr_pid = getpid(); +- XChangeProperty(dpy, id, qt_net_wm_pid, XA_CARDINAL, 32, PropModeReplace, +- (unsigned char *) &curr_pid, 1); +- + #ifndef QT_NO_XSYNC + // set _NET_WM_SYNC_COUNTER + createSyncCounter(); +@@ -645,19 +641,31 @@ void QWidget::create( WId window, bool i + // when we create a toplevel widget, the frame strut should be dirty + fstrut_dirty = 1; + ++ } else { ++ // non-toplevel widgets don't have a frame, so no need to ++ // update the strut ++ fstrut_dirty = 0; ++ } ++ ++ if (initializeWindow && (popup || (topLevel && !desktop))) { // properties set on all toplevel windows ++ x11SetWindowType(); ++ ++ // set _NET_WM_PID ++ long curr_pid = getpid(); ++ XChangeProperty(dpy, id, qt_net_wm_pid, XA_CARDINAL, 32, PropModeReplace, ++ (unsigned char *) &curr_pid, 1); ++ + // declare the widget's object name as window role + XChangeProperty( dpy, id, + qt_window_role, XA_STRING, 8, PropModeReplace, + (unsigned char *)name(), qstrlen( name() ) ); + + // set client leader property ++ if ( !qt_x11_wm_client_leader ) ++ qt_x11_create_wm_client_leader(); + XChangeProperty( dpy, id, qt_wm_client_leader, + XA_WINDOW, 32, PropModeReplace, + (unsigned char *)&qt_x11_wm_client_leader, 1 ); +- } else { +- // non-toplevel widgets don't have a frame, so no need to +- // update the strut +- fstrut_dirty = 0; + } + + if ( initializeWindow ) { diff --git a/redhat/dependencies/tqt3/assistant3.desktop b/redhat/dependencies/tqt3/assistant3.desktop new file mode 100644 index 000000000..49e718c5d --- /dev/null +++ b/redhat/dependencies/tqt3/assistant3.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=Qt3 Assistant +Comment=Add translations to Qt3 applications +Exec=assistant +Icon=assistant3 +Terminal=false +Encoding=UTF-8 +Type=Application +Categories=Qt;Development; diff --git a/redhat/dependencies/tqt3/designer3.desktop b/redhat/dependencies/tqt3/designer3.desktop new file mode 100644 index 000000000..23f1f549a --- /dev/null +++ b/redhat/dependencies/tqt3/designer3.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Name=Qt3 Designer +GenericName=Interface Designer +Comment=Design GUIs for Qt3 applications +Exec=designer +Icon=designer3 +MimeType=application/x-designer; +Terminal=false +Encoding=UTF-8 +Type=Application +Categories=Qt;Development; diff --git a/redhat/dependencies/tqt3/linguist3.desktop b/redhat/dependencies/tqt3/linguist3.desktop new file mode 100644 index 000000000..c6fce02c8 --- /dev/null +++ b/redhat/dependencies/tqt3/linguist3.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Name=Qt3 Linguist +Comment=Add translations to Qt3 applications +Exec=linguist +Icon=linguist3 +MimeType=application/x-linguist; +Terminal=false +Encoding=UTF-8 +Type=Application +Categories=Qt;Development; diff --git a/redhat/dependencies/tqt3/qt-3.1.0-makefile.patch b/redhat/dependencies/tqt3/qt-3.1.0-makefile.patch new file mode 120000 index 000000000..7d8ae65a2 --- /dev/null +++ b/redhat/dependencies/tqt3/qt-3.1.0-makefile.patch @@ -0,0 +1 @@ +../qt3/qt-3.1.0-makefile.patch \ No newline at end of file diff --git a/redhat/dependencies/tqt3/qt-3.3.4-print-CJK.patch b/redhat/dependencies/tqt3/qt-3.3.4-print-CJK.patch new file mode 120000 index 000000000..99cdc6e1d --- /dev/null +++ b/redhat/dependencies/tqt3/qt-3.3.4-print-CJK.patch @@ -0,0 +1 @@ +../qt3/qt-3.3.4-print-CJK.patch \ No newline at end of file diff --git a/redhat/dependencies/tqt3/qt-3.3.6-fontrendering-gu-228452.patch b/redhat/dependencies/tqt3/qt-3.3.6-fontrendering-gu-228452.patch new file mode 120000 index 000000000..b015af122 --- /dev/null +++ b/redhat/dependencies/tqt3/qt-3.3.6-fontrendering-gu-228452.patch @@ -0,0 +1 @@ +../qt3/qt-3.3.6-fontrendering-gu-228452.patch \ No newline at end of file diff --git a/redhat/dependencies/tqt3/qt-3.3.6-fontrendering-ml_IN-209974.patch b/redhat/dependencies/tqt3/qt-3.3.6-fontrendering-ml_IN-209974.patch new file mode 120000 index 000000000..388a5cbe5 --- /dev/null +++ b/redhat/dependencies/tqt3/qt-3.3.6-fontrendering-ml_IN-209974.patch @@ -0,0 +1 @@ +../qt3/qt-3.3.6-fontrendering-ml_IN-209974.patch \ No newline at end of file diff --git a/redhat/dependencies/tqt3/qt-3.3.6-fontrendering-te_IN-211259.patch b/redhat/dependencies/tqt3/qt-3.3.6-fontrendering-te_IN-211259.patch new file mode 120000 index 000000000..93c6ba3d8 --- /dev/null +++ b/redhat/dependencies/tqt3/qt-3.3.6-fontrendering-te_IN-211259.patch @@ -0,0 +1 @@ +../qt3/qt-3.3.6-fontrendering-te_IN-211259.patch \ No newline at end of file diff --git a/redhat/dependencies/tqt3/qt-3.3.8-fontrendering-as_IN-209972.patch b/redhat/dependencies/tqt3/qt-3.3.8-fontrendering-as_IN-209972.patch new file mode 120000 index 000000000..4ded8f792 --- /dev/null +++ b/redhat/dependencies/tqt3/qt-3.3.8-fontrendering-as_IN-209972.patch @@ -0,0 +1 @@ +../qt3/qt-3.3.8-fontrendering-as_IN-209972.patch \ No newline at end of file diff --git a/redhat/dependencies/tqt3/qt-x11-free-3.3.4-fullscreen.patch b/redhat/dependencies/tqt3/qt-x11-free-3.3.4-fullscreen.patch new file mode 120000 index 000000000..09d41d4b3 --- /dev/null +++ b/redhat/dependencies/tqt3/qt-x11-free-3.3.4-fullscreen.patch @@ -0,0 +1 @@ +../qt3/qt-x11-free-3.3.4-fullscreen.patch \ No newline at end of file diff --git a/redhat/dependencies/tqt3/qt-x11-free-3.3.6-qfontdatabase_x11.patch b/redhat/dependencies/tqt3/qt-x11-free-3.3.6-qfontdatabase_x11.patch new file mode 120000 index 000000000..f8342f9f9 --- /dev/null +++ b/redhat/dependencies/tqt3/qt-x11-free-3.3.6-qfontdatabase_x11.patch @@ -0,0 +1 @@ +../qt3/qt-x11-free-3.3.6-qfontdatabase_x11.patch \ No newline at end of file diff --git a/redhat/dependencies/tqt3/qt-x11-free-3.3.6-strip.patch b/redhat/dependencies/tqt3/qt-x11-free-3.3.6-strip.patch new file mode 120000 index 000000000..7121216bc --- /dev/null +++ b/redhat/dependencies/tqt3/qt-x11-free-3.3.6-strip.patch @@ -0,0 +1 @@ +../qt3/qt-x11-free-3.3.6-strip.patch \ No newline at end of file diff --git a/redhat/dependencies/tqt3/qt-x11-free-3.3.7-arm.patch b/redhat/dependencies/tqt3/qt-x11-free-3.3.7-arm.patch new file mode 120000 index 000000000..b7682272a --- /dev/null +++ b/redhat/dependencies/tqt3/qt-x11-free-3.3.7-arm.patch @@ -0,0 +1 @@ +../qt3/qt-x11-free-3.3.7-arm.patch \ No newline at end of file diff --git a/redhat/dependencies/tqt3/qt-x11-free-3.3.8b-typo.patch b/redhat/dependencies/tqt3/qt-x11-free-3.3.8b-typo.patch new file mode 120000 index 000000000..4e2537345 --- /dev/null +++ b/redhat/dependencies/tqt3/qt-x11-free-3.3.8b-typo.patch @@ -0,0 +1 @@ +../qt3/qt-x11-free-3.3.8b-typo.patch \ No newline at end of file diff --git a/redhat/dependencies/tqt3/qt-x11-immodule-unified-qt3.3.5-20051012-quiet.patch b/redhat/dependencies/tqt3/qt-x11-immodule-unified-qt3.3.5-20051012-quiet.patch new file mode 100644 index 000000000..5e5d9773a --- /dev/null +++ b/redhat/dependencies/tqt3/qt-x11-immodule-unified-qt3.3.5-20051012-quiet.patch @@ -0,0 +1,134 @@ +diff -Nur qt-x11-free-3.3.5.orig/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.cpp qt-x11-free-3.3.5/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.cpp +--- qt-x11-free-3.3.5.orig/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.cpp 2005-10-13 16:09:36.000000000 +0200 ++++ qt-x11-free-3.3.5/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.cpp 2005-10-13 16:09:31.000000000 +0200 +@@ -306,8 +306,8 @@ + + currentIMKey = key; + +- qDebug( "QMultiInputContext::changeInputMethod(): index=%d, slave=%s", +- imIndex, (const char *)_slave->identifierName() ); ++ /* qDebug( "QMultiInputContext::changeInputMethod(): index=%d, slave=%s", ++ imIndex, (const char *)_slave->identifierName() ); */ + } + } + +diff -Nur qt-x11-free-3.3.5.orig/plugins/src/inputmethods/simple/qsimpleinputcontext.cpp qt-x11-free-3.3.5/plugins/src/inputmethods/simple/qsimpleinputcontext.cpp +--- qt-x11-free-3.3.5.orig/plugins/src/inputmethods/simple/qsimpleinputcontext.cpp 2005-10-13 16:09:36.000000000 +0200 ++++ qt-x11-free-3.3.5/plugins/src/inputmethods/simple/qsimpleinputcontext.cpp 2005-10-13 16:09:31.000000000 +0200 +@@ -140,7 +140,7 @@ + // only one character. See description of + // QInputContext::filterEvent() about key compression. + val = text[0].unicode(); +- qDebug( "str = %s", (const char*)keyevent->text().local8Bit() ); ++ // qDebug( "str = %s", (const char*)keyevent->text().local8Bit() ); + } + + // Store value +@@ -164,14 +164,14 @@ + + void QSimpleInputContext::setFocus() + { +- qDebug( "QSimpleInputContext: %p->setFocus(), focusWidget()=%p", +- this, focusWidget() ); ++ /* qDebug( "QSimpleInputContext: %p->setFocus(), focusWidget()=%p", ++ this, focusWidget() ); */ + } + + void QSimpleInputContext::unsetFocus() + { +- qDebug( "QSimpleInputContext: %p->unsetFocus(), focusWidget()=%p", +- this, focusWidget() ); ++ /* qDebug( "QSimpleInputContext: %p->unsetFocus(), focusWidget()=%p", ++ this, focusWidget() ); */ + reset(); + } + +@@ -188,8 +188,8 @@ + case QEvent::MouseButtonRelease: + case QEvent::MouseButtonDblClick: + case QEvent::MouseMove: +- qDebug( "QSimpleInputContext::mouseHandler: " +- "x=%d, type=%d, button=%d, state=%d", x, type, button, state ); ++ /* qDebug( "QSimpleInputContext::mouseHandler: " ++ "x=%d, type=%d, button=%d, state=%d", x, type, button, state ); */ + break; + default: + break; +@@ -240,7 +240,7 @@ + + // no entries were found + if ( p == composeTable->data + composeTable->size ) { +- qDebug( "no match" ); ++ // qDebug( "no match" ); + clearComposeBuffer(); + return FALSE; + } +@@ -250,18 +250,18 @@ + + // check if partial match + if ( composeBuffer[i] == 0 && p->keys[i] ) { +- qDebug("partial match"); ++ // qDebug("partial match"); + return TRUE; + } + + if ( composeBuffer[i] != p->keys[i] ) { +- qDebug("different entry"); ++ // qDebug("different entry"); + clearComposeBuffer(); + return i!=0; + } + } + +- qDebug("match exactly"); ++ // qDebug("match exactly"); + + // match exactly + commitChar( p->value ); +diff -Nur qt-x11-free-3.3.5.orig/src/kernel/qinputcontext.cpp qt-x11-free-3.3.5/src/kernel/qinputcontext.cpp +--- qt-x11-free-3.3.5.orig/src/kernel/qinputcontext.cpp 2005-10-13 16:09:37.000000000 +0200 ++++ qt-x11-free-3.3.5/src/kernel/qinputcontext.cpp 2005-10-13 16:09:31.000000000 +0200 +@@ -526,17 +526,17 @@ + return; + + if ( type == QEvent::IMStart ) { +- qDebug( "sending IMStart with %d chars to %p", +- text.length(), receiver ); ++ /* qDebug( "sending IMStart with %d chars to %p", ++ text.length(), receiver ); */ + event = new QIMEvent( type, text, cursorPosition ); + } else if ( type == QEvent::IMEnd ) { +- qDebug( "sending IMEnd with %d chars to %p, text=%s", +- text.length(), receiver, (const char*)text.local8Bit() ); ++ /* qDebug( "sending IMEnd with %d chars to %p, text=%s", ++ text.length(), receiver, (const char*)text.local8Bit() ); */ + event = new QIMEvent( type, text, cursorPosition ); + } else if ( type == QEvent::IMCompose ) { +- qDebug( "sending IMCompose to %p with %d chars, cpos=%d, sellen=%d, text=%s", ++ /* qDebug( "sending IMCompose to %p with %d chars, cpos=%d, sellen=%d, text=%s", + receiver, text.length(), cursorPosition, selLength, +- (const char*)text.local8Bit() ); ++ (const char*)text.local8Bit() ); */ + event = new QIMComposeEvent( type, text, cursorPosition, selLength ); + } + +--- qt-x11-free-3.3.5/plugins/src/inputmethods/xim/qximinputcontext_x11.cpp.quiet 2005-10-13 19:00:56.000000000 +0200 ++++ qt-x11-free-3.3.5/plugins/src/inputmethods/xim/qximinputcontext_x11.cpp 2005-10-25 15:36:43.000000000 +0200 +@@ -356,7 +356,7 @@ + #if !defined(QT_NO_XIM) + fontsetRefCount++; + if (! qt_xim) { +- qWarning("QInputContext: no input method context available"); ++ // qWarning("QInputContext: no input method context available"); + return; + } + +@@ -742,7 +742,7 @@ + + void QXIMInputContext::close( const QString &errMsg ) + { +- qDebug( errMsg ); ++ // qDebug( errMsg ); + emit deletionRequested(); + } + diff --git a/redhat/dependencies/tqt3/qt-x11-immodule-unified-qt3.3.8-20071116.diff.bz2 b/redhat/dependencies/tqt3/qt-x11-immodule-unified-qt3.3.8-20071116.diff.bz2 new file mode 100644 index 000000000..7c122a375 Binary files /dev/null and b/redhat/dependencies/tqt3/qt-x11-immodule-unified-qt3.3.8-20071116.diff.bz2 differ diff --git a/redhat/dependencies/tqt3/qt.csh b/redhat/dependencies/tqt3/qt.csh new file mode 100755 index 000000000..7efcd89c5 --- /dev/null +++ b/redhat/dependencies/tqt3/qt.csh @@ -0,0 +1,34 @@ +# Qt initialization script (csh) + +# In multilib environments there is a preferred architecture, 64 bit over 32 bit in x86_64, +# When a conflict is found between two packages corresponding with different arches, +# the installed file is the one from the preferred arch. This is very common for executables +# in /usr/bin, for example. If the file /usr/bin/foo is found in an x86_64 package and in an +# i386 package, the executable from x86_64 will be installe + +if ( $?QTDIR ) then + exit +endif + +switch (`uname -m`) + case x86_64: + case ia64: + case s390x: + case ppc64: + set QTPREFIXES = "/usr/lib64/qt-3.3 /usr/lib/qt-3.3" + breaksw + case *: + set QTPREFIXES = "/usr/lib/qt-3.3 /usr/lib64/qt-3.3" +endsw + +foreach QTPREFIX ( $QTPREFIXES ) + test -d "$QTPREFIX" && setenv QTDIR $QTPREFIX && break +end +unset QTPREFIX QTPREFIXES + +if ( "${path}" !~ *$QTDIR/bin* ) then + set path = ( $QTDIR/bin $path ) +endif + +setenv QTINC $QTDIR/include +setenv QTLIB $QTDIR/lib diff --git a/redhat/dependencies/tqt3/qt.sh b/redhat/dependencies/tqt3/qt.sh new file mode 100755 index 000000000..88b3e0cea --- /dev/null +++ b/redhat/dependencies/tqt3/qt.sh @@ -0,0 +1,32 @@ +# Qt initialization script (sh) + +# In multilib environments there is a preferred architecture, 64 bit over 32 bit in x86_64, +# When a conflict is found between two packages corresponding with different arches, +# the installed file is the one from the preferred arch. This is very common for executables +# in /usr/bin, for example. If the file /usr/bin/foo is found in an x86_64 package and in an +# i386 package, the executable from x86_64 will be installe + +if [ -z "${QTDIR}" ]; then + +case `uname -m` in + x86_64 | ia64 | s390x | ppc64 ) + QT_PREFIXES="/usr/lib64/qt-3.3 /usr/lib/qt-3.3" ;; + * ) + QT_PREFIXES="/usr/lib/qt-3.3 /usr/lib64/qt-3.3" ;; +esac + +for QTDIR in ${QT_PREFIXES} ; do + test -d "${QTDIR}" && break +done +unset QT_PREFIXES + +if ! echo ${PATH} | /bin/grep -q $QTDIR/bin ; then + PATH=$QTDIR/bin:${PATH} +fi + +QTINC="$QTDIR/include" +QTLIB="$QTDIR/lib" + +export QTDIR QTINC QTLIB PATH + +fi diff --git a/redhat/dependencies/tqt3/qt3-3.3.8.d-updates_zh-tw_translations.patch b/redhat/dependencies/tqt3/qt3-3.3.8.d-updates_zh-tw_translations.patch new file mode 120000 index 000000000..06a4852dc --- /dev/null +++ b/redhat/dependencies/tqt3/qt3-3.3.8.d-updates_zh-tw_translations.patch @@ -0,0 +1 @@ +../qt3/qt3-3.3.8.d-updates_zh-tw_translations.patch \ No newline at end of file diff --git a/redhat/dependencies/tqt3/qtconfig3.desktop b/redhat/dependencies/tqt3/qtconfig3.desktop new file mode 100644 index 000000000..11df0abab --- /dev/null +++ b/redhat/dependencies/tqt3/qtconfig3.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=Qt3 Config +Comment=Configure Qt3 behavior, styles, fonts +Exec=qtconfig +Icon=qtconfig3 +Terminal=false +Encoding=UTF-8 +Type=Application +Categories=Qt;Settings; diff --git a/redhat/dependencies/tqt3/tqt3-3.4.0-embed.patch b/redhat/dependencies/tqt3/tqt3-3.4.0-embed.patch new file mode 100644 index 000000000..10d7704ae --- /dev/null +++ b/redhat/dependencies/tqt3/tqt3-3.4.0-embed.patch @@ -0,0 +1,10 @@ +--- tqt3/tools/qembed/qembed.pro.qembed 2012-02-13 19:10:01.000000000 +0100 ++++ tqt3/tools/qembed/qembed.pro 2012-02-13 21:26:57.417973392 +0100 +@@ -3,5 +3,7 @@ + TARGET = qembed + REQUIRES=full-config nocrosscompiler + ++DESTDIR = ../../bin + target.path = $$bins.path + INSTALLS += target ++ diff --git a/redhat/dependencies/tqt3/tqt3-3.4.0-fontrendering-#214570.patch b/redhat/dependencies/tqt3/tqt3-3.4.0-fontrendering-#214570.patch new file mode 100644 index 000000000..77ca43101 --- /dev/null +++ b/redhat/dependencies/tqt3/tqt3-3.4.0-fontrendering-#214570.patch @@ -0,0 +1,23 @@ +--- tqt3/src/kernel/qscriptengine_x11.cpp.fontrendering-#214570 2012-02-13 21:41:17.792005290 +0100 ++++ tqt3/src/kernel/qscriptengine_x11.cpp 2012-02-13 21:42:38.785202528 +0100 +@@ -1243,7 +1243,7 @@ + int script = item->script; + Q_ASSERT(script >= TQFont::Devanagari && script <= TQFont::Sinhala); + const unsigned short script_base = 0x0900 + 0x80*(script-TQFont::Devanagari); +- const unsigned short ra = script_base + 0x30; ++ unsigned short ra = script_base + 0x30; //it was const unsigned short ra before modification + const unsigned short halant = script_base + 0x4d; + const unsigned short nukta = script_base + 0x3c; + +@@ -1291,6 +1291,11 @@ + } + #endif + ++ unsigned short *chkAssamese=reordered.data(); ++ if((script == TQFont::Bengali) && (*chkAssamese==0x09F0)) //if it is assamese ra ++ { ++ ra = script_base + 0x70; ++ } + if (len != 1) { + unsigned short *uc = reordered.data(); + bool beginsWithRa = FALSE; diff --git a/redhat/dependencies/tqt3/tqt3-3.4.0-fontrendering-214371.patch b/redhat/dependencies/tqt3/tqt3-3.4.0-fontrendering-214371.patch new file mode 100644 index 000000000..9dca7998d --- /dev/null +++ b/redhat/dependencies/tqt3/tqt3-3.4.0-fontrendering-214371.patch @@ -0,0 +1,15 @@ +diff -pruN qt-x11-free-3.3.6.org/src/kernel/qscriptengine_x11.cpp qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp +--- qt-x11-free-3.3.6.org/src/kernel/qscriptengine_x11.cpp 2006-12-04 18:47:11.000000000 +0530 ++++ qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp 2006-12-05 12:05:10.000000000 +0530 +@@ -1412,7 +1412,10 @@ static bool indic_shape_syllable(QOpenTy + toPos += 2; + if (script == QFont::Devanagari || script == QFont::Gujarati || script == QFont::Bengali) { + if (matra_position == Post || matra_position == Split) { +- toPos = matra+1; ++ if (matra_position == Post ) ++ toPos = matra; ++ else ++ toPos = matra+1; + matra -= 2; + } + } else if (script == QFont::Kannada) { diff --git a/redhat/dependencies/tqt3/tqt3-3.4.0-fontrendering-ml_IN-209097.patch b/redhat/dependencies/tqt3/tqt3-3.4.0-fontrendering-ml_IN-209097.patch new file mode 100644 index 000000000..cdb543b25 --- /dev/null +++ b/redhat/dependencies/tqt3/tqt3-3.4.0-fontrendering-ml_IN-209097.patch @@ -0,0 +1,60 @@ +--- tqt3/src/kernel/qscriptengine_x11.cpp.fontrendering-ml_IN-bz#209097 2012-02-13 19:10:01.000000000 +0100 ++++ tqt3/src/kernel/qscriptengine_x11.cpp 2012-02-13 21:36:07.227917886 +0100 +@@ -871,7 +871,7 @@ + None, None, None, None, + None, None, None, Post, + +- Post, None, Below, None, ++ None, None, None, None, + None, Post, None, None, + None, None, None, None, + None, None, Post, Post, +@@ -1274,6 +1274,16 @@ + int base = 0; + int reph = -1; + ++ //for the special conjuctions about Cons+0d4d+0d30 and Cons+0d40+0d31 of Malayalam ++ bool is_special_conjuction_malayalam = false; ++ ++ if ((len == 3) && ++ ((reordered[2] == 0x0d30) || (reordered[2] == 0x0d31)) && ++ (reordered[1] == 0x0d4d) && ++ ((reordered[0] >= 0x0d15) && (reordered[0] <= 0x0d39))) { ++ is_special_conjuction_malayalam = true; ++ } ++ + #ifdef INDIC_DEBUG + IDEBUG("original:"); + for (i = 0; i < len; i++) { +@@ -1550,6 +1560,15 @@ + reph = i; + } + ++ //for the special conjuctions about Cons+0d4d+0d30 and Cons+0d40+0d31 of Malayalam ++ if (is_special_conjuction_malayalam) { ++ unsigned short temp; ++ ++ temp = reordered[0]; ++ reordered[0] = reordered[2]; ++ reordered[2] = temp; ++ } ++ + if (item->font->stringToCMap((const TQChar *)reordered.data(), len, item->glyphs, item->advances, + &item->num_glyphs, item->flags & TQTextEngine::RightToLeft) != TQFontEngine::NoError) + return FALSE; +@@ -1661,6 +1680,15 @@ + + // halant always applies + ++ //for the special conjuctions about Cons+0d4d+0d30 and Cons+0d40+0d31 of Malayalam ++ if (is_special_conjuction_malayalam) { ++ unsigned int temp; ++ ++ temp = properties[0]; ++ properties[0] = ~PreSubstProperty; ++ properties[2] = temp; ++ } ++ + #ifdef INDIC_DEBUG + { + IDEBUG("OT properties:"); diff --git a/redhat/dependencies/tqt3/tqt3-3.4.0-fontrendering-ml_IN-217657.patch b/redhat/dependencies/tqt3/tqt3-3.4.0-fontrendering-ml_IN-217657.patch new file mode 100644 index 000000000..276441c22 --- /dev/null +++ b/redhat/dependencies/tqt3/tqt3-3.4.0-fontrendering-ml_IN-217657.patch @@ -0,0 +1,11 @@ +--- tqt3/src/kernel/qfont_x11.cpp.fontrendering-ml_IN-217657 2012-02-13 19:10:01.000000000 +0100 ++++ tqt3/src/kernel/qfont_x11.cpp 2012-02-13 21:45:39.903520249 +0100 +@@ -712,7 +712,7 @@ + if ( script >= TQFont::Arabic && script <= TQFont::Khmer ) { + // complex script shaping. Have to do some hard work + int from = TQMAX( 0, pos - 8 ); +- int to = TQMIN( (int)str.length(), pos + 8 ); ++ int to = str.length(); + TQConstString cstr( str.unicode()+from, to-from); + TQTextEngine layout( cstr.string(), d ); + layout.itemize( TQTextEngine::WidthOnly ); diff --git a/redhat/dependencies/tqt3/tqt3-3.4.0-nodebug.patch b/redhat/dependencies/tqt3/tqt3-3.4.0-nodebug.patch new file mode 100644 index 000000000..ccfd411ff --- /dev/null +++ b/redhat/dependencies/tqt3/tqt3-3.4.0-nodebug.patch @@ -0,0 +1,15 @@ +--- tqt3/src/tools/qgpluginmanager.cpp.ndebug 2012-02-13 19:10:01.000000000 +0100 ++++ tqt3/src/tools/qgpluginmanager.cpp 2012-02-13 19:25:05.653477747 +0100 +@@ -506,10 +506,12 @@ + (*f).latin1(), + (const char*) TQFile::encodeName( old->library() ) ); + } else { ++/* + qWarning("%s: Feature %s already defined in %s!", + (const char*) TQFile::encodeName( old->library() ), + (*f).latin1(), + (const char*) TQFile::encodeName( plugin->library() ) ); ++*/ + } + } + } diff --git a/redhat/dependencies/tqt3/tqt3-3.4.0-odbc.patch b/redhat/dependencies/tqt3/tqt3-3.4.0-odbc.patch new file mode 100644 index 000000000..3a5aea885 --- /dev/null +++ b/redhat/dependencies/tqt3/tqt3-3.4.0-odbc.patch @@ -0,0 +1,18 @@ +--- tqt3/src/sql/drivers/odbc/qsql_odbc.cpp.odbc 2012-02-13 19:10:01.000000000 +0100 ++++ tqt3/src/sql/drivers/odbc/qsql_odbc.cpp 2012-02-13 21:47:25.232367854 +0100 +@@ -61,13 +61,13 @@ + #endif + + // newer platform SDKs use SQLLEN instead of SQLINTEGER +-#ifdef SQLLEN ++#if defined(SQLLEN) || defined(Q_OS_WIN64) || defined(Q_OS_UNIX) + # define TQSQLLEN SQLLEN + #else + # define TQSQLLEN SQLINTEGER + #endif + +-#ifdef SQLULEN ++#if defined(SQLULEN) || defined(Q_OS_WIN64) || defined(Q_OS_UNIX) + # define TQSQLULEN SQLULEN + #else + # define TQSQLULEN SQLUINTEGER diff --git a/redhat/dependencies/tqt3/tqt3-3.4.0-qt-x11-immodule-unified-qt3.3.5-20060318-resetinputcontext.patch b/redhat/dependencies/tqt3/tqt3-3.4.0-qt-x11-immodule-unified-qt3.3.5-20060318-resetinputcontext.patch new file mode 100644 index 000000000..88e066aa9 --- /dev/null +++ b/redhat/dependencies/tqt3/tqt3-3.4.0-qt-x11-immodule-unified-qt3.3.5-20060318-resetinputcontext.patch @@ -0,0 +1,92 @@ +--- qt-x11-free-3.3.6/src/widgets/qtextedit.cpp.preedit 2006-06-28 17:18:08.000000000 +0200 ++++ qt-x11-free-3.3.6/src/widgets/qtextedit.cpp 2006-06-28 17:20:09.000000000 +0200 +@@ -1906,9 +1906,6 @@ + + void TQTextEdit::removeSelectedText( int selNum ) + { +- if(selNum != 0) +- resetInputContext(); +- + TQTextCursor c1 = doc->selectionStartCursor( selNum ); + c1.restoreState(); + TQTextCursor c2 = doc->selectionEndCursor( selNum ); +@@ -3171,7 +3168,6 @@ + return; + } + #endif +- resetInputContext(); + TQTextParagraph *p = doc->paragAt( para ); + if ( !p ) + return; +@@ -3198,7 +3194,6 @@ + return; + } + #endif +- resetInputContext(); + for ( int i = 0; i < (int)doc->numSelections(); ++i ) + doc->removeSelection( i ); + +@@ -3240,7 +3235,6 @@ + if ( d->optimMode ) + return; + #endif +- resetInputContext(); + TQTextParagraph *p = doc->paragAt( para ); + if ( !p ) + return; +@@ -3285,7 +3279,6 @@ + if ( isReadOnly() || !doc->commands()->isUndoAvailable() || !undoEnabled ) + return; + +- resetInputContext(); + for ( int i = 0; i < (int)doc->numSelections(); ++i ) + doc->removeSelection( i ); + +@@ -3336,7 +3329,6 @@ + if ( isReadOnly() || !doc->commands()->isRedoAvailable() || !undoEnabled ) + return; + +- resetInputContext(); + for ( int i = 0; i < (int)doc->numSelections(); ++i ) + doc->removeSelection( i ); + +@@ -3450,7 +3442,6 @@ + { + if ( isReadOnly() ) + return; +- resetInputContext(); + normalCopy(); + removeSelectedText(); + updateMicroFocusHint(); +@@ -3938,7 +3929,6 @@ + return; + } + #endif +- resetInputContext(); + if ( !isModified() && isReadOnly() && + this->context() == context && this->text() == text ) + return; +@@ -4112,7 +4102,6 @@ + if ( !p ) + return; + +- resetInputContext(); + if ( index > p->length() - 1 ) + index = p->length() - 1; + +@@ -4169,7 +4158,6 @@ + return; + } + #endif +- resetInputContext(); + if ( doc->hasSelection( selNum ) ) { + doc->removeSelection( selNum ); + repaintChanged(); +@@ -5072,7 +5060,6 @@ + { + if ( dc == doc ) + return; +- resetInputContext(); + doc = dc; + delete cursor; + cursor = new QTextCursor( doc ); diff --git a/redhat/dependencies/tqt3/tqt3-3.4.0-quiet.patch b/redhat/dependencies/tqt3/tqt3-3.4.0-quiet.patch new file mode 100644 index 000000000..cb6080ab5 --- /dev/null +++ b/redhat/dependencies/tqt3/tqt3-3.4.0-quiet.patch @@ -0,0 +1,13 @@ +--- tqt3/src/kernel/qpixmap_x11.cpp.quiet 2012-02-13 19:10:01.000000000 +0100 ++++ tqt3/src/kernel/qpixmap_x11.cpp 2012-02-13 21:24:08.190653338 +0100 +@@ -394,8 +394,8 @@ + { + #if defined(QT_CHECK_STATE) + if ( qApp->type() == TQApplication::Tty ) { +- qWarning( "TQPixmap: Cannot create a TQPixmap when no GUI " +- "is being used" ); ++// qWarning( "TQPixmap: Cannot create a TQPixmap when no GUI " ++// "is being used" ); + } + #endif + diff --git a/redhat/dependencies/tqt3/tqt3-3.4.0-uic-nostdlib.patch b/redhat/dependencies/tqt3/tqt3-3.4.0-uic-nostdlib.patch new file mode 100644 index 000000000..39a42e6f5 --- /dev/null +++ b/redhat/dependencies/tqt3/tqt3-3.4.0-uic-nostdlib.patch @@ -0,0 +1,12 @@ +--- qt-x11-free-3.3.2/tools/designer/uic/main.cpp.sopwith 2004-06-16 17:14:17.000000000 -0400 ++++ qt-x11-free-3.3.2/tools/designer/uic/main.cpp 2004-06-16 17:21:43.000000000 -0400 +@@ -149,6 +149,9 @@ + } else { + trmacro = &opt[1]; + } ++ } else if ( opt == "nostdlib") { ++ TQStringList x; ++ TQApplication::setLibraryPaths(x); + } else if ( opt == "L" ) { + if ( !(n < argc-1) ) { + error = "Missing plugin path."; diff --git a/redhat/dependencies/tqt3/tqt3-3.4.0-umask.patch b/redhat/dependencies/tqt3/tqt3-3.4.0-umask.patch new file mode 100644 index 000000000..9c24f9903 --- /dev/null +++ b/redhat/dependencies/tqt3/tqt3-3.4.0-umask.patch @@ -0,0 +1,14 @@ +--- tqt3/src/tools/qsettings.cpp.umask 2012-02-13 19:10:01.000000000 +0100 ++++ tqt3/src/tools/qsettings.cpp 2012-02-13 19:28:00.802555882 +0100 +@@ -997,7 +997,10 @@ + #endif + + TQFile file( filename + ".tmp" ); +- if (! file.open(IO_WriteOnly)) { ++ mode_t old_umask = umask(0022); ++ bool f = file.open(IO_WriteOnly); ++ umask(old_umask); ++ if (! f) { + + #ifdef QT_CHECK_STATE + qWarning("TQSettings::sync: failed to open '%s' for writing", diff --git a/redhat/dependencies/tqt3/tqt3-3.4.0.spec b/redhat/dependencies/tqt3/tqt3-3.4.0.spec new file mode 100644 index 000000000..87d7d2bd4 --- /dev/null +++ b/redhat/dependencies/tqt3/tqt3-3.4.0.spec @@ -0,0 +1,678 @@ +# Always install under standard prefix +%define _prefix /usr + +# This allows the legacy RHEL/Fedora patches to apply in TDE version. +%define _default_patch_fuzz 2 + +# The following QT4 packages should NOT be installed to +# allow QT3 compilation (please uninstall them prior to compile) +# qt +# qt-sqlite +# qt-mysql +# qt-x11 +# qt-devel +# ...maybe others !!!! + +%define _default_patch_fuzz 2 + +Summary: The shared library for the Qt 3 GUI toolkit +Version: 3.4.0 +Release: 1%{?dist} +Name: tqt3 + +Obsoletes: qt < 1:%{version}-%{release} +Provides: qt = 1:%{version}-%{release} +Obsoletes: qt3 < 1:%{version}-%{release} +Provides: qt3 = 1:%{version}-%{release} + +License: QPL or GPLv2 or GPLv3 +Group: System Environment/Libraries +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Url: http://www.troll.no +Source0: %{name}-%{version}.tar.gz +Source2: qt.sh +Source3: qt.csh +Source4: designer3.desktop +Source5: assistant3.desktop +Source6: linguist3.desktop +Source7: qtconfig3.desktop + +Patch1: qt-3.3.4-print-CJK.patch +Patch2: tqt3-3.4.0-nodebug.patch +Patch3: qt-3.1.0-makefile.patch +Patch4: tqt3-3.4.0-umask.patch +Patch5: qt-x11-free-3.3.6-strip.patch +Patch7: tqt3-3.4.0-quiet.patch +Patch8: tqt3-3.4.0-embed.patch +Patch12: tqt3-3.4.0-uic-nostdlib.patch +Patch13: qt-x11-free-3.3.6-qfontdatabase_x11.patch +Patch27: tqt3-3.4.0-fontrendering-ml_IN-209097.patch +Patch29: qt-3.3.8-fontrendering-as_IN-209972.patch +Patch31: qt-3.3.6-fontrendering-te_IN-211259.patch +Patch32: tqt3-3.4.0-fontrendering-214371.patch +Patch33: tqt3-3.4.0-fontrendering-#214570.patch +Patch34: qt-3.3.6-fontrendering-ml_IN-209974.patch +Patch35: tqt3-3.4.0-fontrendering-ml_IN-217657.patch +Patch37: qt-3.3.6-fontrendering-gu-228452.patch +Patch38: tqt3-3.4.0-odbc.patch +Patch39: qt-x11-free-3.3.7-arm.patch +Patch40: qt-x11-free-3.3.8b-typo.patch + +# immodule patches +Patch53: tqt3-3.4.0-qt-x11-immodule-unified-qt3.3.5-20060318-resetinputcontext.patch + +# qt-copy patches +Patch110: 0084-compositing-properties.patch + +# upstream patches +Patch200: qt-x11-free-3.3.4-fullscreen.patch + +# TDE 3.5.13 patches +Patch300: qt3-3.3.8.d-updates_zh-tw_translations.patch + +%define qt_dirname qt-3.3 +%define qtdir %{_libdir}/%{qt_dirname} +%define qt_docdir %{_docdir}/qt-devel-%{version} + +%define smp 1 +%define immodule 1 +%define debug 0 + +# MySQL plugins +%define plugin_mysql -plugin-sql-mysql +%define mysql_include_dir %{_includedir}/mysql +%define mysql_lib_dir %{_libdir}/mysql + +# Postgres plugins +%define plugin_psql -plugin-sql-psql + +# ODBC plugins +%define plugin_odbc -plugin-sql-odbc + +# sqlite plugins +%define plugin_sqlite -plugin-sql-sqlite + +%define plugins_style -qt-style-cde -qt-style-motifplus -qt-style-platinum -qt-style-sgi -qt-style-windows -qt-style-compact -qt-imgfmt-png -qt-imgfmt-jpeg -qt-imgfmt-mng +%define plugins %{plugin_mysql} %{plugin_psql} %{plugin_odbc} %{plugin_sqlite} %{plugins_style} + +Requires(post): /sbin/ldconfig +Requires(postun): /sbin/ldconfig +Requires: coreutils +Requires: fontconfig >= 2.0 +Requires: /etc/ld.so.conf.d + +BuildRequires: desktop-file-utils +BuildRequires: libmng-devel +BuildRequires: glibc-devel +BuildRequires: libjpeg-devel +BuildRequires: libpng-devel +BuildRequires: zlib-devel +BuildRequires: giflib-devel +BuildRequires: perl +BuildRequires: sed +BuildRequires: findutils +BuildRequires: cups-devel +BuildRequires: tar +BuildRequires: freetype-devel +BuildRequires: fontconfig-devel +BuildRequires: libXrender-devel +BuildRequires: libXrandr-devel +BuildRequires: libXcursor-devel +BuildRequires: libXinerama-devel +BuildRequires: libXft-devel +BuildRequires: libXext-devel +BuildRequires: libX11-devel +BuildRequires: libSM-devel +BuildRequires: libICE-devel +BuildRequires: libXt-devel +BuildRequires: libXmu-devel +BuildRequires: libXi-devel +BuildRequires: xorg-x11-proto-devel +BuildRequires: mesa-libGL-devel +BuildRequires: mesa-libGLU-devel +BuildRequires: desktop-file-utils +BuildRequires: mysql-devel +BuildRequires: postgresql-devel +BuildRequires: unixODBC-devel +BuildRequires: sqlite-devel + + +%package config +Summary: Graphical configuration tool for programs using Qt 3 +Group: User Interface/Desktops +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: qt-config < 1:%{version}-%{release} +Provides: qt-config = 1:%{version}-%{release} +Obsoletes: qt3-config < 1:%{version}-%{release} +Provides: qt3-config = 1:%{version}-%{release} + + +%package devel +Summary: Development files for the Qt 3 GUI toolkit +Group: Development/Libraries +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: freetype-devel +Requires: fontconfig-devel +Requires: libXrender-devel +Requires: libXrandr-devel +Requires: libXcursor-devel +Requires: libXinerama-devel +Requires: libXft-devel +Requires: libXext-devel +Requires: libX11-devel +Requires: libSM-devel +Requires: libICE-devel +Requires: libXt-devel +Requires: xorg-x11-proto-devel +Requires: libpng-devel +Requires: libjpeg-devel +Requires: libmng-devel +Requires: mesa-libGL-devel +Requires: mesa-libGLU-devel + +Obsoletes: qt-devel < 1:%{version}-%{release} +Provides: qt-devel = 1:%{version}-%{release} +Obsoletes: qt3-devel < 1:%{version}-%{release} +Provides: qt3-devel = 1:%{version}-%{release} + + +%package devel-docs +Summary: Documentation for the Qt 3 GUI toolkit +Group: Development/Libraries +Requires: %{name}-devel = %{?epoch:%{epoch}:}%{version}-%{release} + +Obsoletes: qt-devel-docs < 1:%{version}-%{release} +Provides: qt-devel-docs = 1:%{version}-%{release} +Obsoletes: qt3-devel-docs < 1:%{version}-%{release} +Provides: qt3-devel-docs = 1:%{version}-%{release} + + +%package ODBC +Summary: ODBC drivers for Qt 3's SQL classes +Group: System Environment/Libraries +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} + +Obsoletes: qt-ODBC < 1:%{version}-%{release} +Provides: qt-ODBC = 1:%{version}-%{release} +Obsoletes: qt3-ODBC < 1:%{version}-%{release} +Provides: qt3-ODBC = 1:%{version}-%{release} + + +%package MySQL +Summary: MySQL drivers for Qt 3's SQL classes +Group: System Environment/Libraries +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} + +Obsoletes: qt-MySQL < 1:%{version}-%{release} +Provides: qt-MySQL = 1:%{version}-%{release} +Obsoletes: qt3-MySQL < 1:%{version}-%{release} +Provides: qt3-MySQL = 1:%{version}-%{release} + + +%package PostgreSQL +Summary: PostgreSQL drivers for Qt 3's SQL classes +Group: System Environment/Libraries +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} + +Obsoletes: qt-PostgreSQL < 1:%{version}-%{release} +Provides: qt-PostgreSQL = 1:%{version}-%{release} +Obsoletes: qt3-PostgreSQL < 1:%{version}-%{release} +Provides: qt3-PostgreSQL = 1:%{version}-%{release} + + +%package sqlite +Summary: sqlite drivers for Qt 3's SQL classes +Group: System Environment/Libraries +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} + +Obsoletes: qt-sqlite < 1:%{version}-%{release} +Provides: qt-sqlite = 1:%{version}-%{release} +Obsoletes: qt3-sqlite < 1:%{version}-%{release} +Provides: qt3-sqlite = 1:%{version}-%{release} + + +%package designer +Summary: In3erface designer (IDE) for the Qt 3 toolkit +Group: Development/Tools +Requires: %{name}-devel = %{?epoch:%{epoch}:}%{version}-%{release} + +Obsoletes: qt-designer < 1:%{version}-%{release} +Provides: qt-designer = 1:%{version}-%{release} +Obsoletes: qt3-designer < 1:%{version}-%{release} +Provides: qt3-designer = 1:%{version}-%{release} + + +%description +Qt is a GUI software toolkit which simplifies the task of writing and +maintaining GUI (Graphical User Interface) applications +for the X Window System. + +Qt is written in C++ and is fully object-oriented. + +This package contains the shared library needed to run Qt 3 +applications, as well as the README files for Qt 3. + + +%description config +Qt is a GUI software toolkit which simplifies the task of writing and +maintaining GUI (Graphical User Interface) applications +for the X Window System. + +Qt is written in C++ and is fully object-oriented. + +This package contains a graphical configuration tool for programs using Qt 3. + + +%description devel +The %{name}-devel package contains the files necessary to develop +applications using the Qt GUI toolkit: the header files, the Qt meta +object compiler. + +Install %{name}-devel if you want to develop GUI applications using the Qt 3 +toolkit. + + +%description devel-docs +The %{name}-devel-docs package contains the man pages, the HTML documentation and +example programs for Qt 3. + + +%description ODBC +ODBC driver for Qt 3's SQL classes (QSQL) + + +%description MySQL +MySQL driver for Qt 3's SQL classes (QSQL) + + +%description PostgreSQL +PostgreSQL driver for Qt 3's SQL classes (QSQL) + + +%description sqlite +sqlite driver for Qt 3's SQL classes (QSQL) + + +%description designer +The %{name}-designer package contains an User Interface designer tool +for the Qt 3 toolkit. + + +%prep +%setup -q -n %{name} +%patch1 -p1 -b .cjk +%patch2 -p1 -b .ndebug +%patch3 -p1 -b .makefile +%patch4 -p1 -b .umask +%patch5 -p1 +%patch7 -p1 -b .quiet +%patch8 -p1 -b .qembed +%patch12 -p1 -b .nostdlib +%patch13 -p1 -b .fonts +%patch27 -p1 -b .fontrendering-ml_IN-bz#209097 +%patch29 -p1 -b .fontrendering-as_IN-bz#209972 +%patch31 -p1 -b .fontrendering-te_IN-bz#211259 +%patch32 -p1 -b .fontrendering-bz#214371 +%patch33 -p1 -b .fontrendering-#214570 +%patch34 -p1 -b .fontrendering-#209974 +%patch35 -p1 -b .fontrendering-ml_IN-217657 +%patch37 -p1 -b .fontrendering-gu-228452 +%patch38 -p1 -b .odbc +# it's not 100% clear to me if this is safe for all archs -- Rex +%ifarch armv5tel +%patch39 -p1 -b .arm +%endif +%patch40 -p1 + +# immodule patches +%if %{immodule} +%patch53 -p1 -b .resetinputcontext +%endif + +# qt-copy patches +%patch110 -p0 -b .0084-compositing-properties + +# upstream patches +%patch200 -p1 -b .fullscreen + +# TDE 3.5.13 patches +%patch300 -p1 + +# convert to UTF-8 +iconv -f iso-8859-1 -t utf-8 < doc/man/man3/qdial.3qt > doc/man/man3/qdial.3qt_ +mv doc/man/man3/qdial.3qt_ doc/man/man3/qdial.3qt + +%build +export QTDIR=`/bin/pwd` +export LD_LIBRARY_PATH="$QTDIR/lib:$LD_LIBRARY_PATH" +export PATH="$QTDIR/bin:$PATH" +export QTDEST=%{qtdir} + +%if %{smp} + export SMP_MFLAGS="%{?_smp_mflags}" +%endif + +%if %{immodule} + sh ./make-symlinks.sh +%endif + +# set correct X11 prefix +perl -pi -e "s,QMAKE_LIBDIR_X11.*,QMAKE_LIBDIR_X11\t=," mkspecs/*/qmake.conf +perl -pi -e "s,QMAKE_INCDIR_X11.*,QMAKE_INCDIR_X11\t=," mkspecs/*/qmake.conf +perl -pi -e "s,QMAKE_INCDIR_OPENGL.*,QMAKE_INCDIR_OPENGL\t=," mkspecs/*/qmake.conf +perl -pi -e "s,QMAKE_LIBDIR_OPENGL.*,QMAKE_LIBDIR_OPENGL\t=," mkspecs/*/qmake.conf + +# don't use rpath +perl -pi -e "s|-Wl,-rpath,| |" mkspecs/*/qmake.conf + +perl -pi -e "s|-O2|$INCLUDES %{optflags} -fno-strict-aliasing|g" mkspecs/*/qmake.conf + +# set correct lib path +if [ "%{_lib}" == "lib64" ] ; then + perl -pi -e "s,/usr/lib /lib,/usr/%{_lib} /%{_lib},g" config.tests/{unix,x11}/*.test + perl -pi -e "s,/lib /usr/lib,/%{_lib} /usr/%{_lib},g" config.tests/{unix,x11}/*.test +fi + +# build shared, threaded (default) libraries +echo yes | ./configure \ + -prefix $QTDEST \ + -docdir %{qt_docdir} \ +%if %{_lib} == lib64 + -platform linux-g++-64 \ +%else + -platform linux-g++ \ +%endif +%if %{debug} + -debug \ +%else + -release \ +%endif + -shared \ + -largefile \ + -qt-gif \ + -system-zlib \ + -system-libpng \ + -system-libmng \ + -system-libjpeg \ + -no-exceptions \ + -enable-styles \ + -enable-tools \ + -enable-kernel \ + -enable-widgets \ + -enable-dialogs \ + -enable-iconview \ + -enable-workspace \ + -enable-network \ + -enable-canvas \ + -enable-table \ + -enable-xml \ + -enable-opengl \ + -enable-sql \ + -qt-style-motif \ + %{plugins} \ + -stl \ + -thread \ + -cups \ + -sm \ + -xinerama \ + -xrender \ + -xkb \ + -ipv6 \ + -dlopen-opengl \ + -xft \ + -tablet + +make $SMP_MFLAGS src-qmake + +# build sqlite plugin +pushd plugins/src/sqldrivers/sqlite +qmake -o Makefile sqlite.pro +popd + +# build psql plugin +pushd plugins/src/sqldrivers/psql +qmake -o Makefile "INCLUDEPATH+=%{_includedir}/pgsql %{_includedir}/pgsql/server %{_includedir}/pgsql/internal" "LIBS+=-lpq" psql.pro +popd + +# build mysql plugin +pushd plugins/src/sqldrivers/mysql +qmake -o Makefile "INCLUDEPATH+=%{mysql_include_dir}" "LIBS+=-L%{mysql_lib_dir} -lmysqlclient" mysql.pro +popd + +# build odbc plugin +pushd plugins/src/sqldrivers/odbc +qmake -o Makefile "LIBS+=-lodbc" odbc.pro +popd + +make $SMP_MFLAGS src-moc +make $SMP_MFLAGS sub-src +make $SMP_MFLAGS sub-tools UIC="$QTDIR/bin/uic -nostdlib -L $QTDIR/plugins" + +%install +rm -rf %{buildroot} + +export QTDIR=`/bin/pwd` +export LD_LIBRARY_PATH="$QTDIR/lib:$LD_LIBRARY_PATH" +export PATH="$QTDIR/bin:$PATH" +export QTDEST=%{qtdir} + +make install INSTALL_ROOT=%{buildroot} + +for i in findtr qt20fix qtrename140 lrelease lupdate ; do + install bin/$i %{buildroot}%{qtdir}/bin/ +done + +mkdir -p %{buildroot}%{_libdir}/pkgconfig/ +mv %{buildroot}%{qtdir}/lib/pkgconfig/*.pc %{buildroot}%{_libdir}/pkgconfig/ + +# install man pages +mkdir -p %{buildroot}%{_mandir} +cp -fR doc/man/* %{buildroot}%{_mandir}/ + +# clean up +make -C tutorial clean +make -C examples clean + +# Make sure the examples can be built outside the source tree. +# Our binaries fulfill all requirements, so... +perl -pi -e "s,^DEPENDPATH.*,,g;s,^REQUIRES.*,,g" `find examples -name "*.pro"` + +# don't include Makefiles of qt examples/tutorials +find examples -name "Makefile" | xargs rm -f +find examples -name "*.obj" | xargs rm -rf +find examples -name "*.moc" | xargs rm -rf +find tutorial -name "Makefile" | xargs rm -f + +for a in */*/Makefile ; do + sed 's|^SYSCONF_MOC.*|SYSCONF_MOC = %{qtdir}/bin/moc|' < $a > ${a}.2 + mv -v ${a}.2 $a +done + +mkdir -p %{buildroot}/etc/profile.d +install -m 644 %{SOURCE2} %{SOURCE3} %{buildroot}/etc/profile.d/ + +# Add desktop files +mkdir -p %{buildroot}%{_datadir}/applications +desktop-file-install \ + --dir %{buildroot}%{_datadir}/applications \ + --vendor="qt" \ + %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} + +# Patch qmake to use qt-mt unconditionally +perl -pi -e "s,-lqt ,-lqt-mt ,g;s,-lqt$,-lqt-mt,g" %{buildroot}%{qtdir}/mkspecs/*/qmake.conf + +# remove broken links +rm -f %{buildroot}%{qtdir}/mkspecs/default/linux-g++* +rm -f %{buildroot}%{qtdir}/lib/*.la + +mkdir -p %{buildroot}/etc/ld.so.conf.d +echo "%{qtdir}/lib" > %{buildroot}/etc/ld.so.conf.d/qt-%{_arch}.conf + +# install icons +mkdir %{buildroot}%{_datadir}/pixmaps +install -m 644 tools/assistant/images/qt.png %{buildroot}%{_datadir}/pixmaps/qtconfig3.png +install -m 644 tools/assistant/images/designer.png %{buildroot}%{_datadir}/pixmaps/designer3.png +install -m 644 tools/assistant/images/assistant.png %{buildroot}%{_datadir}/pixmaps/assistant3.png +install -m 644 tools/assistant/images/linguist.png %{buildroot}%{_datadir}/pixmaps/linguist3.png + +# own style directory +mkdir -p %{buildroot}%{qtdir}/plugins/styles + +%clean +rm -rf %{buildroot} + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + +%files +%defattr(-,root,root,-) +%doc FAQ LICENSE* README* changes* +%dir %{qtdir} +%dir %{qtdir}/bin +%dir %{qtdir}/lib +%dir %{qtdir}/plugins +%dir %{qtdir}/plugins/sqldrivers +%dir %{qtdir}/plugins/styles +%{qtdir}/translations +%{qtdir}/plugins/designer/ +%if %{immodule} +%{qtdir}/plugins/inputmethods +%endif +%config /etc/profile.d/* +/etc/ld.so.conf.d/* +%{qtdir}/lib/libtqui.so.* +%{qtdir}/lib/libtqt*.so.* + +# TQT 3.4.0: WTF is this file ?? +%exclude %{_mandir}/README + +%files config +%defattr(-,root,root,-) +%{qtdir}/bin/qtconfig +%{_datadir}/applications/*qtconfig*.desktop +%{_datadir}/pixmaps/qtconfig3.png + +%files devel +%defattr(-,root,root,-) +%{qt_docdir}/ +%{qtdir}/bin/moc +%{qtdir}/bin/uic +%{qtdir}/bin/findtr +%{qtdir}/bin/qt20fix +%{qtdir}/bin/qtrename140 +%{qtdir}/bin/assistant +%{qtdir}/bin/qm2ts +%{qtdir}/bin/qmake +%{qtdir}/bin/qembed +%{qtdir}/bin/linguist +%{qtdir}/bin/lupdate +%{qtdir}/bin/lrelease +%{qtdir}/include +%{qtdir}/mkspecs +%{qtdir}/lib/libtqt*.so +%{qtdir}/lib/libtqui.so +%{qtdir}/lib/libeditor.a +%{qtdir}/lib/libdesigner*.a +%{qtdir}/lib/libqassistantclient.a +%{qtdir}/lib/*.prl +%{qtdir}/phrasebooks +%{_libdir}/pkgconfig/* +%{_datadir}/applications/*linguist*.desktop +%{_datadir}/applications/*assistant*.desktop +%{_datadir}/pixmaps/linguist3.png +%{_datadir}/pixmaps/assistant3.png + +# QT 3.3.8.D (TDE): 4 binaries have appeared +%{qtdir}/bin/createcw +%{qtdir}/bin/makeqpf +%{qtdir}/bin/mergetr +%{qtdir}/bin/msg2qm + +# QT 3.3.8.D (TDE): removes lots of unnecessary include files +# (where do they come from ??? They were not in 3.3.8b !) +%exclude %{qtdir}/include/btree.h +%exclude %{qtdir}/include/crc32.h +%exclude %{qtdir}/include/debian_qsql_odbc.h +%exclude %{qtdir}/include/deflate.h +%exclude %{qtdir}/include/ftglue.h +%exclude %{qtdir}/include/ftxgdef.h +%exclude %{qtdir}/include/ftxgpos.h +%exclude %{qtdir}/include/ftxgsub.h +%exclude %{qtdir}/include/ftxopen.h +%exclude %{qtdir}/include/ftxopenf.h +%exclude %{qtdir}/include/hash.h +%exclude %{qtdir}/include/inffast.h +%exclude %{qtdir}/include/inffixed.h +%exclude %{qtdir}/include/inflate.h +%exclude %{qtdir}/include/inftrees.h +%exclude %{qtdir}/include/jchuff.h +%exclude %{qtdir}/include/jconfig.h +%exclude %{qtdir}/include/jdct.h +%exclude %{qtdir}/include/jdhuff.h +%exclude %{qtdir}/include/jerror.h +%exclude %{qtdir}/include/jinclude.h +%exclude %{qtdir}/include/jmemsys.h +%exclude %{qtdir}/include/jmorecfg.h +%exclude %{qtdir}/include/jversion.h +%exclude %{qtdir}/include/moc_yacc.h +%exclude %{qtdir}/include/opcodes.h +%exclude %{qtdir}/include/os.h +%exclude %{qtdir}/include/otlbuffer.h +%exclude %{qtdir}/include/pager.h +%exclude %{qtdir}/include/parse.h +%exclude %{qtdir}/include/pngasmrd.h +%exclude %{qtdir}/include/pngconf.h +%exclude %{qtdir}/include/sqlite.h +%exclude %{qtdir}/include/sqliteInt.h +%exclude %{qtdir}/include/trees.h +%exclude %{qtdir}/include/vdbe.h +%exclude %{qtdir}/include/vdbeInt.h +%exclude %{qtdir}/mkspecs/linux-g++-sparc + +%files devel-docs +%defattr(-,root,root,-) +%doc examples +%doc tutorial +%{_mandir}/*/* + +%files sqlite +%defattr(-,root,root,-) +%{qtdir}/plugins/sqldrivers/libqsqlite.so + +%files ODBC +%defattr(-,root,root,-) +%{qtdir}/plugins/sqldrivers/libqsqlodbc.so + +%files PostgreSQL +%defattr(-,root,root,-) +%{qtdir}/plugins/sqldrivers/libqsqlpsql.so + +%files MySQL +%defattr(-,root,root,-) +%{qtdir}/plugins/sqldrivers/libqsqlmysql.so + +%files designer +%defattr(-,root,root,-) +%{qtdir}/templates +%{qtdir}/bin/designer +%{_datadir}/applications/*designer*.desktop +%{_datadir}/pixmaps/designer3.png + + +%changelog +* Mon Feb 13 2012 Francois Andriot - 3.4.0-1 +- Initial build for TDE R14 +- Renames 'qt3' to 'tqt3' +- Spec file based on 'qt3-3.3.8b-30' from RHEL 6 + +* Sun Dec 18 2011 Francois Andriot - 3.3.8.d-3 +- Updates zh_TW translations, thanks to Wei-Lun Chao . + +* Thu Nov 03 2011 Francois Andriot - 3.3.8.d-2 +- Add missing BuildRequires + +* Fri Sep 02 2011 Francois Andriot - 3.3.8.d-1 +- Initial build for RHEL 6, RHEL 5, and Fedora 15 +- Switch to Trinity Version +- Spec file based on RHEL 6 'qt3-3.3.8b-29' diff --git a/redhat/genrpm.sh b/redhat/genrpm.sh index 68a82b470..20f8d45ce 100755 --- a/redhat/genrpm.sh +++ b/redhat/genrpm.sh @@ -121,5 +121,3 @@ if grep -q "error: Failed build dependencies:" ${LOGFILE}; then set $( grep " is needed by " ${LOGFILE} | cut -d " " -f1 ) exit 2 fi - - diff --git a/redhat/qt3/0084-compositing-properties.patch b/redhat/qt3/0084-compositing-properties.patch deleted file mode 100644 index 368b6c267..000000000 --- a/redhat/qt3/0084-compositing-properties.patch +++ /dev/null @@ -1,80 +0,0 @@ -qt-bugs@ issue : none -bugs.kde.org number : none -applied: no -author: Lubos Lunak - -This patch makes override-redirect windows (popup menu, dropdown menu, -tooltip, combobox, etc.) also have more window properties like WM_CLASS, -so they can be used when compositing. - ---- src/kernel/qwidget_x11.cpp.sav 2007-06-25 10:36:42.000000000 +0200 -+++ src/kernel/qwidget_x11.cpp 2007-10-02 15:30:13.000000000 +0200 -@@ -557,7 +557,10 @@ void QWidget::create( WId window, bool i - wsa.save_under = True; - XChangeWindowAttributes( dpy, id, CWOverrideRedirect | CWSaveUnder, - &wsa ); -- x11SetWindowType(); -+ XClassHint class_hint; -+ class_hint.res_name = (char *) qAppName(); // application name -+ class_hint.res_class = (char *) qAppClass(); // application class -+ XSetClassHint( dpy, id, &class_hint ); - } else if ( topLevel && !desktop ) { // top-level widget - QWidget *p = parentWidget(); // real parent - if (p) -@@ -620,8 +623,6 @@ void QWidget::create( WId window, bool i - else - XDeleteProperty(dpy, id, qt_xa_motif_wm_hints); - -- x11SetWindowType(); -- - // set _NET_WM_WINDOW_STATE - if (curr_winstate > 0) - XChangeProperty(dpy, id, qt_net_wm_state, XA_ATOM, 32, PropModeReplace, -@@ -629,11 +630,6 @@ void QWidget::create( WId window, bool i - else - XDeleteProperty(dpy, id, qt_net_wm_state); - -- // set _NET_WM_PID -- long curr_pid = getpid(); -- XChangeProperty(dpy, id, qt_net_wm_pid, XA_CARDINAL, 32, PropModeReplace, -- (unsigned char *) &curr_pid, 1); -- - #ifndef QT_NO_XSYNC - // set _NET_WM_SYNC_COUNTER - createSyncCounter(); -@@ -645,19 +641,31 @@ void QWidget::create( WId window, bool i - // when we create a toplevel widget, the frame strut should be dirty - fstrut_dirty = 1; - -+ } else { -+ // non-toplevel widgets don't have a frame, so no need to -+ // update the strut -+ fstrut_dirty = 0; -+ } -+ -+ if (initializeWindow && (popup || (topLevel && !desktop))) { // properties set on all toplevel windows -+ x11SetWindowType(); -+ -+ // set _NET_WM_PID -+ long curr_pid = getpid(); -+ XChangeProperty(dpy, id, qt_net_wm_pid, XA_CARDINAL, 32, PropModeReplace, -+ (unsigned char *) &curr_pid, 1); -+ - // declare the widget's object name as window role - XChangeProperty( dpy, id, - qt_window_role, XA_STRING, 8, PropModeReplace, - (unsigned char *)name(), qstrlen( name() ) ); - - // set client leader property -+ if ( !qt_x11_wm_client_leader ) -+ qt_x11_create_wm_client_leader(); - XChangeProperty( dpy, id, qt_wm_client_leader, - XA_WINDOW, 32, PropModeReplace, - (unsigned char *)&qt_x11_wm_client_leader, 1 ); -- } else { -- // non-toplevel widgets don't have a frame, so no need to -- // update the strut -- fstrut_dirty = 0; - } - - if ( initializeWindow ) { diff --git a/redhat/qt3/assistant3.desktop b/redhat/qt3/assistant3.desktop deleted file mode 100644 index 49e718c5d..000000000 --- a/redhat/qt3/assistant3.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Name=Qt3 Assistant -Comment=Add translations to Qt3 applications -Exec=assistant -Icon=assistant3 -Terminal=false -Encoding=UTF-8 -Type=Application -Categories=Qt;Development; diff --git a/redhat/qt3/designer3.desktop b/redhat/qt3/designer3.desktop deleted file mode 100644 index 23f1f549a..000000000 --- a/redhat/qt3/designer3.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Name=Qt3 Designer -GenericName=Interface Designer -Comment=Design GUIs for Qt3 applications -Exec=designer -Icon=designer3 -MimeType=application/x-designer; -Terminal=false -Encoding=UTF-8 -Type=Application -Categories=Qt;Development; diff --git a/redhat/qt3/linguist3.desktop b/redhat/qt3/linguist3.desktop deleted file mode 100644 index c6fce02c8..000000000 --- a/redhat/qt3/linguist3.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Name=Qt3 Linguist -Comment=Add translations to Qt3 applications -Exec=linguist -Icon=linguist3 -MimeType=application/x-linguist; -Terminal=false -Encoding=UTF-8 -Type=Application -Categories=Qt;Development; diff --git a/redhat/qt3/qt-3.0.5-nodebug.patch b/redhat/qt3/qt-3.0.5-nodebug.patch deleted file mode 100644 index 09d697fb4..000000000 --- a/redhat/qt3/qt-3.0.5-nodebug.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- qt-x11-free-3.0.5/src/tools/qgpluginmanager.cpp.bero 2002-08-21 15:16:19.000000000 +0200 -+++ qt-x11-free-3.0.5/src/tools/qgpluginmanager.cpp 2002-08-21 15:16:41.000000000 +0200 -@@ -501,10 +501,10 @@ - (*f).latin1(), - (const char*) QFile::encodeName( old->library() ) ); - } else { -- qWarning("%s: Feature %s already defined in %s!", -+/* qWarning("%s: Feature %s already defined in %s!", - (const char*) QFile::encodeName( old->library() ), - (*f).latin1(), -- (const char*) QFile::encodeName( plugin->library() ) ); -+ (const char*) QFile::encodeName( plugin->library() ) ); */ - } - } - } diff --git a/redhat/qt3/qt-3.1.0-makefile.patch b/redhat/qt3/qt-3.1.0-makefile.patch deleted file mode 100644 index 009ab81fb..000000000 --- a/redhat/qt3/qt-3.1.0-makefile.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- qt-x11-free-3.1.0/Makefile.orig 2002-11-14 15:44:17.000000000 +0100 -+++ qt-x11-free-3.1.0/Makefile 2002-11-14 15:49:33.000000000 +0100 -@@ -11,7 +11,7 @@ - install: FORCE - @$(MAKE) qt.install - --all: symlinks src-qmake src-moc sub-src sub-tools sub-tutorial sub-examples -+all: symlinks src-qmake src-moc sub-src sub-tools - @echo - @echo "The Qt library is now built in ./lib" - @echo "The Qt examples are built in the directories in ./examples" diff --git a/redhat/qt3/qt-3.3.4-print-CJK.patch b/redhat/qt3/qt-3.3.4-print-CJK.patch deleted file mode 100644 index 5bd5e9e0a..000000000 --- a/redhat/qt3/qt-3.3.4-print-CJK.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- qt-x11-free-3.3.4/src/kernel/qpsprinter.cpp.cjk 2005-01-21 18:16:11.000000000 +0100 -+++ qt-x11-free-3.3.4/src/kernel/qpsprinter.cpp 2005-01-26 15:09:20.911239907 +0100 -@@ -4748,10 +4748,11 @@ - - // GB18030 fonts on Turbolinux - static const psfont SongGBK2K [] = { -- { "MSung-Light-GBK2K-H", 0, 100. }, -- { "MSung-Italic-GBK2K-H", 0, 100. }, -- { "MSung-Bold-GBK2K-H", 0, 100. }, -- { "MSung-BoldItalic-GBK2K-H", 0, 100. }, -+ { "MSungGBK-Light-GBK2K-H", 0, 100. }, -+ { "MSungGBK-Light-GBK2K-H", 0, 100. }, -+ { "MSungGBK-Light-GBK2K-H", 0, 100. }, -+ { "MSungGBK-Light-GBK2K-H", 0, 100. }, -+ - }; - static const psfont KaiGBK2K [] = { - { "MKai-Medium-GBK2K-H", 0, 100. }, diff --git a/redhat/qt3/qt-3.3.6-fontrendering-214371.patch b/redhat/qt3/qt-3.3.6-fontrendering-214371.patch deleted file mode 100644 index 9dca7998d..000000000 --- a/redhat/qt3/qt-3.3.6-fontrendering-214371.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -pruN qt-x11-free-3.3.6.org/src/kernel/qscriptengine_x11.cpp qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp ---- qt-x11-free-3.3.6.org/src/kernel/qscriptengine_x11.cpp 2006-12-04 18:47:11.000000000 +0530 -+++ qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp 2006-12-05 12:05:10.000000000 +0530 -@@ -1412,7 +1412,10 @@ static bool indic_shape_syllable(QOpenTy - toPos += 2; - if (script == QFont::Devanagari || script == QFont::Gujarati || script == QFont::Bengali) { - if (matra_position == Post || matra_position == Split) { -- toPos = matra+1; -+ if (matra_position == Post ) -+ toPos = matra; -+ else -+ toPos = matra+1; - matra -= 2; - } - } else if (script == QFont::Kannada) { diff --git a/redhat/qt3/qt-3.3.6-fontrendering-gu-228452.patch b/redhat/qt3/qt-3.3.6-fontrendering-gu-228452.patch deleted file mode 100644 index 21081d1a6..000000000 --- a/redhat/qt3/qt-3.3.6-fontrendering-gu-228452.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -pruN qt-x11-free-3.3.6.org/src/kernel/qscriptengine_x11.cpp qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp ---- qt-x11-free-3.3.6.org/src/kernel/qscriptengine_x11.cpp 2007-02-13 14:41:25.000000000 +0530 -+++ qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp 2007-02-13 14:40:02.000000000 +0530 -@@ -253,7 +253,7 @@ static const unsigned char indicForms[0x - Unknown, Unknown, Unknown, Unknown, - Unknown, Unknown, Unknown, Unknown, - -- Other, Other, Other, Other, -+ Other, Other, VowelMark, VowelMark, - Other, Other, Other, Other, - Other, Other, Other, Other, - Other, Other, Other, Other, diff --git a/redhat/qt3/qt-3.3.6-fontrendering-ml_IN-209097.patch b/redhat/qt3/qt-3.3.6-fontrendering-ml_IN-209097.patch deleted file mode 100644 index 01f3824c1..000000000 --- a/redhat/qt3/qt-3.3.6-fontrendering-ml_IN-209097.patch +++ /dev/null @@ -1,60 +0,0 @@ ---- qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp.bak 2006-10-13 13:21:37.000000000 +0800 -+++ qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp 2006-10-13 13:57:36.000000000 +0800 -@@ -868,7 +868,7 @@ - None, None, None, None, - None, None, None, Post, - -- Post, None, Below, None, -+ None, None, None, None, - None, Post, None, None, - None, None, None, None, - None, None, Post, Post, -@@ -1271,6 +1271,16 @@ - int base = 0; - int reph = -1; - -+ //for the special conjuctions about Cons+0d4d+0d30 and Cons+0d40+0d31 of Malayalam -+ bool is_special_conjuction_malayalam = false; -+ -+ if ((len == 3) && -+ ((reordered[2] == 0x0d30) || (reordered[2] == 0x0d31)) && -+ (reordered[1] == 0x0d4d) && -+ ((reordered[0] >= 0x0d15) && (reordered[0] <= 0x0d39))) { -+ is_special_conjuction_malayalam = true; -+ } -+ - #ifdef INDIC_DEBUG - IDEBUG("original:"); - for (i = 0; i < len; i++) { -@@ -1547,6 +1557,15 @@ - reph = i; - } - -+ //for the special conjuctions about Cons+0d4d+0d30 and Cons+0d40+0d31 of Malayalam -+ if (is_special_conjuction_malayalam) { -+ unsigned short temp; -+ -+ temp = reordered[0]; -+ reordered[0] = reordered[2]; -+ reordered[2] = temp; -+ } -+ - if (item->font->stringToCMap((const QChar *)reordered.data(), len, item->glyphs, item->advances, - &item->num_glyphs, item->flags & QTextEngine::RightToLeft) != QFontEngine::NoError) - return FALSE; -@@ -1658,6 +1677,15 @@ - - // halant always applies - -+ //for the special conjuctions about Cons+0d4d+0d30 and Cons+0d40+0d31 of Malayalam -+ if (is_special_conjuction_malayalam) { -+ unsigned int temp; -+ -+ temp = properties[0]; -+ properties[0] = ~PreSubstProperty; -+ properties[2] = temp; -+ } -+ - #ifdef INDIC_DEBUG - { - IDEBUG("OT properties:"); diff --git a/redhat/qt3/qt-3.3.6-fontrendering-ml_IN-209974.patch b/redhat/qt3/qt-3.3.6-fontrendering-ml_IN-209974.patch deleted file mode 100644 index 8dbb2ae98..000000000 --- a/redhat/qt3/qt-3.3.6-fontrendering-ml_IN-209974.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp.orig 2006-11-29 17:17:26.000000000 +0100 -+++ qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp 2006-11-29 17:22:34.000000000 +0100 -@@ -864,7 +864,7 @@ - None, None, None, Post, - - None, None, None, None, -- None, Post, None, None, -+ None, None, None, None, - None, None, None, None, - None, None, Post, Post, - diff --git a/redhat/qt3/qt-3.3.6-fontrendering-ml_IN-217657.patch b/redhat/qt3/qt-3.3.6-fontrendering-ml_IN-217657.patch deleted file mode 100644 index eb880b1cc..000000000 --- a/redhat/qt3/qt-3.3.6-fontrendering-ml_IN-217657.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -pruN qt-x11-free-3.3.6.org/src/kernel/qfont_x11.cpp qt-x11-free-3.3.6/src/kernel/qfont_x11.cpp ---- qt-x11-free-3.3.6.org/src/kernel/qfont_x11.cpp 2006-03-08 00:00:00.000000000 +0530 -+++ qt-x11-free-3.3.6/src/kernel/qfont_x11.cpp 2006-12-04 18:49:09.000000000 +0530 -@@ -709,7 +709,7 @@ int QFontMetrics::charWidth( const QStri - if ( script >= QFont::Arabic && script <= QFont::Khmer ) { - // complex script shaping. Have to do some hard work - int from = QMAX( 0, pos - 8 ); -- int to = QMIN( (int)str.length(), pos + 8 ); -+ int to = str.length(); - QConstString cstr( str.unicode()+from, to-from); - QTextEngine layout( cstr.string(), d ); - layout.itemize( QTextEngine::WidthOnly ); diff --git a/redhat/qt3/qt-3.3.6-fontrendering-te_IN-211259.patch b/redhat/qt3/qt-3.3.6-fontrendering-te_IN-211259.patch deleted file mode 100644 index eb3868c96..000000000 --- a/redhat/qt3/qt-3.3.6-fontrendering-te_IN-211259.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp.bak 2006-10-18 17:55:23.000000000 +0800 -+++ qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp 2006-10-19 16:42:31.641160984 +0800 -@@ -786,7 +786,7 @@ - Below, None, Below, Below, - Below, Below, Below, Below, - -- Below, None, Below, Below, -+ Below, Below, Below, Below, - None, Below, Below, Below, - Below, Below, None, None, - None, None, Post, Above, diff --git a/redhat/qt3/qt-3.3.8-fontrendering-#214570.patch b/redhat/qt3/qt-3.3.8-fontrendering-#214570.patch deleted file mode 100644 index 41a74fba7..000000000 --- a/redhat/qt3/qt-3.3.8-fontrendering-#214570.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- qt-x11-free-3.3.8/src/kernel/qscriptengine_x11.cpp.orig 2007-04-11 15:05:34.000000000 +0200 -+++ qt-x11-free-3.3.8/src/kernel/qscriptengine_x11.cpp 2007-04-11 15:22:19.000000000 +0200 -@@ -1240,7 +1240,7 @@ - int script = item->script; - Q_ASSERT(script >= QFont::Devanagari && script <= QFont::Sinhala); - const unsigned short script_base = 0x0900 + 0x80*(script-QFont::Devanagari); -- const unsigned short ra = script_base + 0x30; -+ unsigned short ra = script_base + 0x30; //it was const unsigned short ra before modification - const unsigned short halant = script_base + 0x4d; - const unsigned short nukta = script_base + 0x3c; - -@@ -1278,6 +1278,11 @@ - } - #endif - -+ unsigned short *chkAssamese=reordered.data(); -+ if((script == QFont::Bengali) && (*chkAssamese==0x09F0)) //if it is assamese ra -+ { -+ ra = script_base + 0x70; -+ } - if (len != 1) { - unsigned short *uc = reordered.data(); - bool beginsWithRa = FALSE; diff --git a/redhat/qt3/qt-3.3.8-fontrendering-as_IN-209972.patch b/redhat/qt3/qt-3.3.8-fontrendering-as_IN-209972.patch deleted file mode 100644 index 7583239cc..000000000 --- a/redhat/qt3/qt-3.3.8-fontrendering-as_IN-209972.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- qt-x11-free-3.3.8/src/kernel/qscriptengine_x11.cpp.orig 2007-04-11 15:05:34.000000000 +0200 -+++ qt-x11-free-3.3.8/src/kernel/qscriptengine_x11.cpp 2007-04-11 15:22:19.000000000 +0200 -@@ -601,7 +601,7 @@ - None, None, None, None, - None, None, None, None, - -- None, None, None, None, -+ Below, None, None, None, - None, None, None, None, - None, None, None, None, - None, None, None, None, diff --git a/redhat/qt3/qt-uic-nostdlib.patch b/redhat/qt3/qt-uic-nostdlib.patch deleted file mode 100644 index 02a40b225..000000000 --- a/redhat/qt3/qt-uic-nostdlib.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- qt-x11-free-3.3.2/tools/designer/uic/main.cpp.sopwith 2004-06-16 17:14:17.000000000 -0400 -+++ qt-x11-free-3.3.2/tools/designer/uic/main.cpp 2004-06-16 17:21:43.000000000 -0400 -@@ -149,6 +149,9 @@ - } else { - trmacro = &opt[1]; - } -+ } else if ( opt == "nostdlib") { -+ QStringList x; -+ QApplication::setLibraryPaths(x); - } else if ( opt == "L" ) { - if ( !(n < argc-1) ) { - error = "Missing plugin path."; diff --git a/redhat/qt3/qt-x11-free-3.3.2-quiet.patch b/redhat/qt3/qt-x11-free-3.3.2-quiet.patch deleted file mode 100644 index 6dce7aa80..000000000 --- a/redhat/qt3/qt-x11-free-3.3.2-quiet.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- qt-x11-free-3.3.2/src/kernel/qpixmap_x11.cpp.orig 2004-05-10 13:54:03.592289052 +0200 -+++ qt-x11-free-3.3.2/src/kernel/qpixmap_x11.cpp 2004-05-10 13:56:10.165560473 +0200 -@@ -288,8 +288,9 @@ - { - #if defined(QT_CHECK_STATE) - if ( qApp->type() == QApplication::Tty ) { -- qWarning( "QPixmap: Cannot create a QPixmap when no GUI " -- "is being used" ); -+// qWarning( "QPixmap: Cannot create a QPixmap when no GUI " -+// "is being used" ); -+ ; - } - #endif - diff --git a/redhat/qt3/qt-x11-free-3.3.4-fullscreen.patch b/redhat/qt3/qt-x11-free-3.3.4-fullscreen.patch deleted file mode 100644 index 0d03f0809..000000000 --- a/redhat/qt3/qt-x11-free-3.3.4-fullscreen.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- qt-x11-free-3.3.3/src/kernel/qapplication_x11.cpp.orig 2004-11-09 18:57:15.012843629 +0100 -+++ qt-x11-free-3.3.3/src/kernel/qapplication_x11.cpp 2004-11-09 19:02:31.351637807 +0100 -@@ -1412,7 +1412,7 @@ - False, XA_ATOM, &type, &format, &nitems, &after, &data); - - if (type == XA_ATOM && format == 32) { -- ts.writeBlock((const char *) data, nitems * 4); -+ ts.writeBlock((const char *) data, nitems * sizeof(long)); - offset += nitems; - } else - after = 0; diff --git a/redhat/qt3/qt-x11-free-3.3.6-qfontdatabase_x11.patch b/redhat/qt3/qt-x11-free-3.3.6-qfontdatabase_x11.patch deleted file mode 100644 index a9cfaf4c3..000000000 --- a/redhat/qt3/qt-x11-free-3.3.6-qfontdatabase_x11.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- qt-x11-free-3.3.6/src/kernel/qfontdatabase_x11.cpp.fonts 2004-08-05 16:42:06.000000000 +0200 -+++ qt-x11-free-3.3.6/src/kernel/qfontdatabase_x11.cpp 2004-09-28 16:11:54.955374161 +0200 -@@ -975,7 +981,7 @@ - }; - const XftDefaultFont defaults[] = { - { "Serif", "serif", FALSE }, -- { "Sans Serif", "sans-serif", FALSE }, -+ { "Sans", "sans-serif", FALSE }, - { "Monospace", "monospace", TRUE }, - { 0, 0, FALSE } - }; diff --git a/redhat/qt3/qt-x11-free-3.3.6-qt-x11-immodule-unified-qt3.3.5-20060318-resetinputcontext.patch b/redhat/qt3/qt-x11-free-3.3.6-qt-x11-immodule-unified-qt3.3.5-20060318-resetinputcontext.patch deleted file mode 100644 index 24982206d..000000000 --- a/redhat/qt3/qt-x11-free-3.3.6-qt-x11-immodule-unified-qt3.3.5-20060318-resetinputcontext.patch +++ /dev/null @@ -1,92 +0,0 @@ ---- qt-x11-free-3.3.6/src/widgets/qtextedit.cpp.preedit 2006-06-28 17:18:08.000000000 +0200 -+++ qt-x11-free-3.3.6/src/widgets/qtextedit.cpp 2006-06-28 17:20:09.000000000 +0200 -@@ -1906,9 +1906,6 @@ - - void QTextEdit::removeSelectedText( int selNum ) - { -- if(selNum != 0) -- resetInputContext(); -- - QTextCursor c1 = doc->selectionStartCursor( selNum ); - c1.restoreState(); - QTextCursor c2 = doc->selectionEndCursor( selNum ); -@@ -3171,7 +3168,6 @@ - return; - } - #endif -- resetInputContext(); - QTextParagraph *p = doc->paragAt( para ); - if ( !p ) - return; -@@ -3198,7 +3194,6 @@ - return; - } - #endif -- resetInputContext(); - for ( int i = 0; i < (int)doc->numSelections(); ++i ) - doc->removeSelection( i ); - -@@ -3240,7 +3235,6 @@ - if ( d->optimMode ) - return; - #endif -- resetInputContext(); - QTextParagraph *p = doc->paragAt( para ); - if ( !p ) - return; -@@ -3285,7 +3279,6 @@ - if ( isReadOnly() || !doc->commands()->isUndoAvailable() || !undoEnabled ) - return; - -- resetInputContext(); - for ( int i = 0; i < (int)doc->numSelections(); ++i ) - doc->removeSelection( i ); - -@@ -3336,7 +3329,6 @@ - if ( isReadOnly() || !doc->commands()->isRedoAvailable() || !undoEnabled ) - return; - -- resetInputContext(); - for ( int i = 0; i < (int)doc->numSelections(); ++i ) - doc->removeSelection( i ); - -@@ -3450,7 +3442,6 @@ - { - if ( isReadOnly() ) - return; -- resetInputContext(); - normalCopy(); - removeSelectedText(); - updateMicroFocusHint(); -@@ -3938,7 +3929,6 @@ - return; - } - #endif -- resetInputContext(); - if ( !isModified() && isReadOnly() && - this->context() == context && this->text() == text ) - return; -@@ -4112,7 +4102,6 @@ - if ( !p ) - return; - -- resetInputContext(); - if ( index > p->length() - 1 ) - index = p->length() - 1; - -@@ -4169,7 +4158,6 @@ - return; - } - #endif -- resetInputContext(); - if ( doc->hasSelection( selNum ) ) { - doc->removeSelection( selNum ); - repaintChanged(); -@@ -5072,7 +5060,6 @@ - { - if ( dc == doc ) - return; -- resetInputContext(); - doc = dc; - delete cursor; - cursor = new QTextCursor( doc ); diff --git a/redhat/qt3/qt-x11-free-3.3.6-strip.patch b/redhat/qt3/qt-x11-free-3.3.6-strip.patch deleted file mode 100644 index efc24c8a1..000000000 --- a/redhat/qt3/qt-x11-free-3.3.6-strip.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- qt-x11-free-3.3.6/mkspecs/linux-g++/qmake.conf.orig 2006-06-21 15:37:53.000000000 +0200 -+++ qt-x11-free-3.3.6/mkspecs/linux-g++/qmake.conf 2006-06-21 15:38:02.000000000 +0200 -@@ -84,7 +84,7 @@ - QMAKE_MOVE = mv -f - QMAKE_DEL_FILE = rm -f - QMAKE_DEL_DIR = rmdir --QMAKE_STRIP = --QMAKE_STRIPFLAGS_LIB += --strip-unneeded -+QMAKE_STRIP = -+QMAKE_STRIPFLAGS_LIB += - QMAKE_CHK_DIR_EXISTS = test -d - QMAKE_MKDIR = mkdir -p ---- qt-x11-free-3.3.6/mkspecs/linux-g++-32/qmake.conf.orig 2006-06-21 15:37:09.000000000 +0200 -+++ qt-x11-free-3.3.6/mkspecs/linux-g++-32/qmake.conf 2006-06-21 15:37:19.000000000 +0200 -@@ -84,7 +84,7 @@ - QMAKE_MOVE = mv -f - QMAKE_DEL_FILE = rm -f - QMAKE_DEL_DIR = rmdir --QMAKE_STRIP = strip --QMAKE_STRIPFLAGS_LIB += --strip-unneeded -+QMAKE_STRIP = -+QMAKE_STRIPFLAGS_LIB += - QMAKE_CHK_DIR_EXISTS = test -d - QMAKE_MKDIR = mkdir -p ---- qt-x11-free-3.3.6/mkspecs/linux-g++-64/qmake.conf.orig 2006-06-21 15:36:23.000000000 +0200 -+++ qt-x11-free-3.3.6/mkspecs/linux-g++-64/qmake.conf 2006-06-21 15:36:56.000000000 +0200 -@@ -87,7 +87,7 @@ - QMAKE_MOVE = mv -f - QMAKE_DEL_FILE = rm -f - QMAKE_DEL_DIR = rmdir --QMAKE_STRIP = strip --QMAKE_STRIPFLAGS_LIB += --strip-unneeded -+QMAKE_STRIP = -+QMAKE_STRIPFLAGS_LIB += - QMAKE_CHK_DIR_EXISTS = test -d - QMAKE_MKDIR = mkdir -p diff --git a/redhat/qt3/qt-x11-free-3.3.7-arm.patch b/redhat/qt3/qt-x11-free-3.3.7-arm.patch deleted file mode 100644 index 0c93c416a..000000000 --- a/redhat/qt3/qt-x11-free-3.3.7-arm.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- qt-x11-free-3.3.7/src/tools/qglobal.h.orig 2007-04-24 09:02:36.000000000 -0400 -+++ qt-x11-free-3.3.7/src/tools/qglobal.h 2007-04-24 09:03:02.000000000 -0400 -@@ -315,9 +315,9 @@ - QString bloat. However, gcc 3.4 doesn't allow us to create references to - members of a packed struct. (Pointers are OK, because then you - supposedly know what you are doing.) */ --# if (defined(__arm__) || defined(__ARMEL__)) && !defined(QT_MOC_CPP) -+# if (defined(__arm__) || defined(__ARMEL__)) && !defined(QT_MOC_CPP) && !defined(__ARM_EABI__) - # define Q_PACKED __attribute__ ((packed)) --# if __GNUC__ == 3 && __GNUC_MINOR__ >= 4 -+# if __GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) - # define Q_NO_PACKED_REFERENCE - # endif - # endif ---- qt-x11-free-3.3.7/src/tools/qstring.h.orig 2007-04-24 09:03:11.000000000 -0400 -+++ qt-x11-free-3.3.7/src/tools/qstring.h 2007-04-24 09:03:27.000000000 -0400 -@@ -194,7 +194,7 @@ - char latin1() const { return ucs > 0xff ? 0 : (char) ucs; } - ushort unicode() const { return ucs; } - #ifdef Q_NO_PACKED_REFERENCE -- ushort &unicode() { return *(&ucs); } -+ ushort &unicode() { return *((ushort *)&ucs); } - #else - ushort &unicode() { return ucs; } - #endif diff --git a/redhat/qt3/qt-x11-free-3.3.7-umask.patch b/redhat/qt3/qt-x11-free-3.3.7-umask.patch deleted file mode 100644 index f2351909f..000000000 --- a/redhat/qt3/qt-x11-free-3.3.7-umask.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- qt-x11-free-3.3.7/src/tools/qsettings.cpp.tn 2006-11-09 20:53:25.000000000 +0100 -+++ qt-x11-free-3.3.7/src/tools/qsettings.cpp 2006-11-09 20:59:53.000000000 +0100 -@@ -994,7 +994,10 @@ - #endif - - QFile file( filename + ".tmp" ); -- if (! file.open(IO_WriteOnly)) { -+ mode_t old_umask = umask(0022); -+ bool f = file.open(IO_WriteOnly); -+ umask(old_umask); -+ if (! f) { - - #ifdef QT_CHECK_STATE - qWarning("QSettings::sync: failed to open '%s' for writing", diff --git a/redhat/qt3/qt-x11-free-3.3.8-odbc.patch b/redhat/qt3/qt-x11-free-3.3.8-odbc.patch deleted file mode 100644 index 6f21e3cf1..000000000 --- a/redhat/qt3/qt-x11-free-3.3.8-odbc.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -up qt-x11-free-3.3.8/src/sql/drivers/odbc/qsql_odbc.cpp.orig qt-x11-free-3.3.8/src/sql/drivers/odbc/qsql_odbc.cpp ---- qt-x11-free-3.3.8/src/sql/drivers/odbc/qsql_odbc.cpp.orig 2009-02-24 11:32:27.000000000 +0100 -+++ qt-x11-free-3.3.8/src/sql/drivers/odbc/qsql_odbc.cpp 2009-02-24 11:33:43.000000000 +0100 -@@ -57,13 +57,13 @@ - #endif - - // newer platform SDKs use SQLLEN instead of SQLINTEGER --#ifdef SQLLEN -+#if defined(SQLLEN) || defined(Q_OS_WIN64) || defined(Q_OS_UNIX) - # define QSQLLEN SQLLEN - #else - # define QSQLLEN SQLINTEGER - #endif - --#ifdef SQLULEN -+#if defined(SQLULEN) || defined(Q_OS_WIN64) || defined(Q_OS_UNIX) - # define QSQLULEN SQLULEN - #else - # define QSQLULEN SQLUINTEGER diff --git a/redhat/qt3/qt-x11-free-3.3.8b-typo.patch b/redhat/qt3/qt-x11-free-3.3.8b-typo.patch deleted file mode 100644 index c1ff66c2c..000000000 --- a/redhat/qt3/qt-x11-free-3.3.8b-typo.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- qt-x11-free-3.3.8b/mkspecs/macx-mwerks/mwerkstmpl.xml.orig 2010-06-30 01:00:36.000000000 +0200 -+++ qt-x11-free-3.3.8b/mkspecs/macx-mwerks/mwerkstmpl.xml 2010-06-30 01:00:56.000000000 +0200 -@@ -817,7 +817,7 @@ - MacOS - - -- QtGenerated -+ QtGenerated - $$CODEWARRIOR_QPREPROCESS_GROUP - $$CODEWARRIOR_QPREPROCESSOUT_GROUP - diff --git a/redhat/qt3/qt-x11-free-3.3.8b-uic-multilib.patch b/redhat/qt3/qt-x11-free-3.3.8b-uic-multilib.patch deleted file mode 100644 index 341cab7e1..000000000 --- a/redhat/qt3/qt-x11-free-3.3.8b-uic-multilib.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -up qt-x11-free-3.3.8b/tools/designer/uic/main.cpp.orig qt-x11-free-3.3.8b/tools/designer/uic/main.cpp ---- qt-x11-free-3.3.8b/tools/designer/uic/main.cpp.orig 2008-01-24 13:25:29.000000000 +0100 -+++ qt-x11-free-3.3.8b/tools/designer/uic/main.cpp 2008-01-24 13:28:17.000000000 +0100 -@@ -320,7 +320,7 @@ int main( int argc, char * argv[] ) - out << "/****************************************************************************" << endl; - out << "** Form "<< (impl? "implementation" : "interface") << " generated from reading ui file '" << fileName << "'" << endl; - out << "**" << endl; -- out << "** Created: " << QDateTime::currentDateTime().toString() << endl; -+ out << "** Created by User Interface Compiler" << endl; - out << "**" << endl; - out << "** WARNING! All changes made in this file will be lost!" << endl; - out << "****************************************************************************/" << endl << endl; -diff -up qt-x11-free-3.3.8b/tools/designer/uic/embed.cpp.orig qt-x11-free-3.3.8b/tools/designer/uic/embed.cpp ---- qt-x11-free-3.3.8b/tools/designer/uic/embed.cpp.orig 2008-01-24 13:28:30.000000000 +0100 -+++ qt-x11-free-3.3.8b/tools/designer/uic/embed.cpp 2008-01-24 13:29:10.000000000 +0100 -@@ -137,7 +137,7 @@ void Uic::embed( QTextStream& out, const - for ( it = images.begin(); it != images.end(); ++it ) - out << "** " << *it << "\n"; - out << "**\n"; -- out << "** Created: " << QDateTime::currentDateTime().toString() << "\n"; -+ out << "** Created by The User Interface Compiler" << "\n"; - out << "**\n"; - out << "** WARNING! All changes made in this file will be lost!\n"; - out << "****************************************************************************/\n"; diff --git a/redhat/qt3/qt.csh b/redhat/qt3/qt.csh deleted file mode 100755 index 93fd941ed..000000000 --- a/redhat/qt3/qt.csh +++ /dev/null @@ -1,33 +0,0 @@ -# Qt initialization script (csh) - -# In multilib environments there is a preferred architecture, 64 bit over 32 bit in x86_64, -# 32 bit over 64 bit in ppc64. When a conflict is found between two packages corresponding -# with different arches, the installed file is the one from the preferred arch. This is -# very common for executables in /usr/bin, for example. If the file /usr/bin/foo is found -# in an x86_64 package and in an i386 package, the executable from x86_64 will be installe - -if ( $?QTDIR ) then - exit -endif - -switch (`uname -m`) - case x86_64: - case ia64: - case s390x: - set QTPREFIXES = "/usr/lib64/qt-3.3 /usr/lib/qt-3.3" - breaksw - case *: - set QTPREFIXES = "/usr/lib/qt-3.3 /usr/lib64/qt-3.3" -endsw - -foreach QTPREFIX ( $QTPREFIXES ) - test -d "$QTPREFIX" && setenv QTDIR $QTPREFIX && break -end -unset QTPREFIX QTPREFIXES - -if ( "${path}" !~ *$QTDIR/bin* ) then - set path = ( $QTDIR/bin $path ) -endif - -setenv QTINC $QTDIR/include -setenv QTLIB $QTDIR/lib diff --git a/redhat/qt3/qt.sh b/redhat/qt3/qt.sh deleted file mode 100755 index f9ca654c1..000000000 --- a/redhat/qt3/qt.sh +++ /dev/null @@ -1,32 +0,0 @@ -# Qt initialization script (sh) - -# In multilib environments there is a preferred architecture, 64 bit over 32 bit in x86_64, -# 32 bit over 64 bit in ppc64. When a conflict is found between two packages corresponding -# with different arches, the installed file is the one from the preferred arch. This is -# very common for executables in /usr/bin, for example. If the file /usr/bin/foo is found -# in an x86_64 package and in an i386 package, the executable from x86_64 will be installe - -if [ -z "${QTDIR}" ]; then - -case `uname -m` in - x86_64 | ia64 | s390x ) - QT_PREFIXES="/usr/lib64/qt-3.3 /usr/lib/qt-3.3" ;; - * ) - QT_PREFIXES="/usr/lib/qt-3.3 /usr/lib64/qt-3.3" ;; -esac - -for QTDIR in ${QT_PREFIXES} ; do - test -d "${QTDIR}" && break -done -unset QT_PREFIXES - -if ! echo ${PATH} | /bin/grep -q $QTDIR/bin ; then - PATH=$QTDIR/bin:${PATH} -fi - -QTINC="$QTDIR/include" -QTLIB="$QTDIR/lib" - -export QTDIR QTINC QTLIB PATH - -fi diff --git a/redhat/qt3/qt3-3.3.8.d-updates_zh-tw_translations.patch b/redhat/qt3/qt3-3.3.8.d-updates_zh-tw_translations.patch deleted file mode 100644 index c5da1ad4c..000000000 --- a/redhat/qt3/qt3-3.3.8.d-updates_zh-tw_translations.patch +++ /dev/null @@ -1,251 +0,0 @@ ---- qt3/translations/qt_zh-tw.ts.ORI 2011-10-30 09:42:26.000000000 +0100 -+++ qt3/translations/qt_zh-tw.ts 2011-12-18 22:06:58.432615802 +0100 -@@ -115,7 +115,7 @@ - - - Menu -- Menu -+ 選單 - - - Help -@@ -337,7 +337,7 @@ - - - A&lpha channel: -- Alpha 色頻(&L)： -+ 透明色頻(&L)： - - - &Basic colors -@@ -429,11 +429,11 @@ - - - Read: %1 -- 讀取： %1 -+ 讀取：%1 - - - Write: %1 -- 寫入： %1 -+ 寫入：%1 - - - Cancel -@@ -1194,7 +1194,7 @@ - - - Customize... -- 自訂... -+ 自訂… - - - -@@ -1264,7 +1264,7 @@ - - - <h3>About Qt</h3><p>This program uses Qt version %1.</p><p>Qt is a C++ toolkit for multiplatform GUI &amp; application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants.<br>Qt is also available for embedded devices.</p><p>Qt is a Trolltech product. See <tt>http://www.trolltech.com/qt/</tt> for more information.</p> -- <h3>關於 Qt</h3><p>本程式使用 Qt 版本 %1。</p><p>Qt 是用於多平台 GUI 和應用程式開發的 C++ 工具套件。</p><p>Qt 為 MS&nbsp;Windows、Mac&nbsp;OS&nbsp;X、Linux 和所有主要的商用 Unix 變異版本，提供跨平台的單一原始碼可攜性。<br>Qt 也可用於內嵌裝置。</p><p>Qt 是 Trolltech 的產品。如需詳細資訊，請參閱 <tt>http://www.trolltech.com/qt/</tt>。</p> -+ <h3>關於 Qt</h3><p>本程式使用 Qt 版本 %1。</p><p>Qt 是用於多平臺 GUI 和應用程式開發的 C++ 工具套件。</p><p>Qt 為 MS&nbsp;Windows、Mac&nbsp;OS&nbsp;X、Linux 和所有主要的商用 Unix 變異版本，提供跨平臺的單一原始碼可攜性。<br>Qt 也可用於內嵌裝置。</p><p>Qt 是 Trolltech 的產品。如需詳細資訊，請參閱 <tt>http://www.trolltech.com/qt/</tt>。</p> - - - -@@ -1282,7 +1282,7 @@ - - - Aliases: %1 -- 別名： %1 -+ 別名：%1 - - - unknown -@@ -1338,7 +1338,7 @@ - - - Browse... -- 瀏覽... -+ 瀏覽… - - - Options -@@ -1386,123 +1386,123 @@ - - - A0 (841 x 1189 mm) -- A0 (841 x 1189 mm) -+ A0 (841 x 1189 公釐) - - - A1 (594 x 841 mm) -- A1 (594 x 841 mm) -+ A1 (594 x 841 公釐) - - - A2 (420 x 594 mm) -- A2 (420 x 594 mm) -+ A2 (420 x 594 公釐) - - - A3 (297 x 420 mm) -- A3 (297 x 420 mm) -+ A3 (297 x 420 公釐) - - - A4 (210x297 mm, 8.26x11.7 inches) -- A4 (210x297 mm，8.26x11.7 英吋) -+ A4 (210x297 公釐，8.26x11.7 英吋) - - - A5 (148 x 210 mm) -- A5 (148 x 210 mm) -+ A5 (148 x 210 公釐) - - - A6 (105 x 148 mm) -- A6 (105 x 148 mm) -+ A6 (105 x 148 公釐) - - - A7 (74 x 105 mm) -- A7 (74 x 105 mm) -+ A7 (74 x 105 公釐) - - - A8 (52 x 74 mm) -- A8 (52 x 74 mm) -+ A8 (52 x 74 公釐) - - - A9 (37 x 52 mm) -- A9 (37 x 52 mm) -+ A9 (37 x 52 公釐) - - - B0 (1000 x 1414 mm) -- B0 (1000 x 1414 mm) -+ B0 (1000 x 1414 公釐) - - - B1 (707 x 1000 mm) -- B1 (707 x 1000 mm) -+ B1 (707 x 1000 公釐) - - - B2 (500 x 707 mm) -- B2 (500 x 707 mm) -+ B2 (500 x 707 公釐) - - - B3 (353 x 500 mm) -- B3 (353 x 500 mm) -+ B3 (353 x 500 公釐) - - - B4 (250 x 353 mm) -- B4 (250 x 353 mm) -+ B4 (250 x 353 公釐) - - - B5 (176 x 250 mm, 6.93x9.84 inches) -- B5 (176 x 250 mm，6.93x9.84 英吋) -+ B5 (176 x 250 公釐，6.93x9.84 英吋) - - - B6 (125 x 176 mm) -- B6 (125 x 176 mm) -+ B6 (125 x 176 公釐) - - - B7 (88 x 125 mm) -- B7 (88 x 125 mm) -+ B7 (88 x 125 公釐) - - - B8 (62 x 88 mm) -- B8 (62 x 88 mm) -+ B8 (62 x 88 公釐) - - - B9 (44 x 62 mm) -- B9 (44 x 62 mm) -+ B9 (44 x 62 公釐) - - - B10 (31 x 44 mm) -- B10 (31 x 44 mm) -+ B10 (31 x 44 公釐) - - - C5E (163 x 229 mm) -- C5E (163 x 229 mm) -+ C5E (163 x 229 公釐) - - - DLE (110 x 220 mm) -- DLE (110 x 220 mm) -+ DLE (110 x 220 公釐) - - - Executive (7.5x10 inches, 191x254 mm) -- Executive (7.5x10 英吋，191x254 mm) -+ Executive (7.5x10 英吋，191x254 公釐) - - - Folio (210 x 330 mm) -- Folio (210 x 330 mm) -+ Folio (210 x 330 公釐) - - - Ledger (432 x 279 mm) -- Ledger (432 x 279 mm) -+ Ledger (432 x 279 公釐) - - - Legal (8.5x14 inches, 216x356 mm) -- Legal (8.5x14 英吋，216x356 mm) -+ Legal (8.5x14 英吋，216x356 公釐) - - - Letter (8.5x11 inches, 216x279 mm) -- Letter (8.5x11 英吋，216x279 mm) -+ Letter (8.5x11 英吋，216x279 公釐) - - - Tabloid (279 x 432 mm) -- Tabloid (279 x 432 mm) -+ Tabloid (279 x 432 公釐) - - - US Common #10 Envelope (105 x 241 mm) -- 美國一般 10 號信封 (105 x 241 mm) -+ 美國一般 10 號信封 (105 x 241 公釐) - - - Setup Printer -@@ -1691,7 +1691,7 @@ - QToolBar - - More... -- 其他... -+ 其他… - - - -@@ -1811,7 +1811,7 @@ - - - &Help -- 說明(&H) -+ 求助(&H) - - - -@@ -1988,7 +1988,7 @@ - - - Paste special... -- 選擇性貼上... -+ 選擇性貼上… - - - Clear diff --git a/redhat/qt3/qt3.spec b/redhat/qt3/qt3.spec deleted file mode 100644 index fcadb5b6d..000000000 --- a/redhat/qt3/qt3.spec +++ /dev/null @@ -1,721 +0,0 @@ -# Default version for this component -%if "%{?version}" == "" -%define version 3.3.8.d -%endif - -# Always install under standard prefix -%define _prefix /usr - -# This allows the legacy RHEL/Fedora patches to apply in TDE version. -%define _default_patch_fuzz 2 - -# The following QT4 packages should NOT be installed to -# allow QT3 compilation (please uninstall them prior to compile) -# qt -# qt-sqlite -# qt-mysql -# qt-x11 -# qt-devel -# ...maybe others !!!! - -Name: qt3 -Version: %{?version} -Release: 3%{?dist} -Summary: The shared library for the Qt 3 GUI toolkit - -License: QPL or GPLv2 or GPLv3 -Group: System Environment/Libraries -URL: http://www.trinitydesktop.org/ - -Obsoletes: qt < 1:%{version}-%{release} -Provides: qt = 1:%{version}-%{release} - -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: qt3-3.3.8.d.tar.gz -Source2: qt.sh -Source3: qt.csh -Source4: designer3.desktop -Source5: assistant3.desktop -Source6: linguist3.desktop -Source7: qtconfig3.desktop - -Patch1: qt-3.3.4-print-CJK.patch -Patch2: qt-3.0.5-nodebug.patch -Patch3: qt-3.1.0-makefile.patch -Patch4: qt-x11-free-3.3.7-umask.patch -Patch5: qt-x11-free-3.3.6-strip.patch -Patch7: qt-x11-free-3.3.2-quiet.patch -#Patch8: qt-x11-free-3.3.3-qembed.patch -Patch12: qt-uic-nostdlib.patch -Patch13: qt-x11-free-3.3.6-qfontdatabase_x11.patch -#Patch14: qt-x11-free-3.3.3-gl.patch -#Patch19: qt-3.3.3-gtkstyle.patch -#Patch20: qt-x11-free-3.3.8b-gcc4-buildkey.patch -#Patch24: qt-x11-free-3.3.5-uic.patch -Patch25: qt-x11-free-3.3.8b-uic-multilib.patch -Patch27: qt-3.3.6-fontrendering-ml_IN-209097.patch -Patch29: qt-3.3.8-fontrendering-as_IN-209972.patch -Patch31: qt-3.3.6-fontrendering-te_IN-211259.patch -Patch32: qt-3.3.6-fontrendering-214371.patch -Patch33: qt-3.3.8-fontrendering-#214570.patch -Patch34: qt-3.3.6-fontrendering-ml_IN-209974.patch -Patch35: qt-3.3.6-fontrendering-ml_IN-217657.patch -Patch37: qt-3.3.6-fontrendering-gu-228452.patch -Patch38: qt-x11-free-3.3.8-odbc.patch -Patch39: qt-x11-free-3.3.7-arm.patch -Patch40: qt-x11-free-3.3.8b-typo.patch - -# immodule patches -#Patch50: qt-x11-immodule-unified-qt3.3.8-20071116.diff.bz2 -#Patch51: qt-x11-immodule-unified-qt3.3.5-20051012-quiet.patch -#Patch52: qt-x11-free-3.3.8b-fix-key-release-event-with-imm.diff -Patch53: qt-x11-free-3.3.6-qt-x11-immodule-unified-qt3.3.5-20060318-resetinputcontext.patch - -# qt-copy patches -#Patch100: 0038-dragobject-dont-prefer-unknown.patch -#Patch101: 0047-fix-kmenu-width.diff -#Patch102: 0048-qclipboard_hack_80072.patch -#Patch103: 0056-khotkeys_input_84434.patch -#patch105: 0073-xinerama-aware-qpopup.patch -#Patch107: 0079-compositing-types.patch -#Patch108: 0080-net-wm-sync-request-2.patch -Patch110: 0084-compositing-properties.patch - -# upstream patches -Patch200: qt-x11-free-3.3.4-fullscreen.patch -#Patch201: qt-x11-free-3.3.8b-gcc43.patch - -# TDE 3.5.13 patches -Patch300: qt3-3.3.8.d-updates_zh-tw_translations.patch - -%define qt_dirname qt-3.3 -%define qtdir %{_libdir}/%{qt_dirname} -%define qt_docdir %{_docdir}/qt-devel-%{version} - -%define smp 1 -%define immodule 1 -%define debug 0 - -# MySQL plugins -%define plugin_mysql -plugin-sql-mysql -%define mysql_include_dir %{_includedir}/mysql -%define mysql_lib_dir %{_libdir}/mysql - -# Postgres plugins -%define plugin_psql -plugin-sql-psql - -# ODBC plugins -%define plugin_odbc -plugin-sql-odbc - -# sqlite plugins -%define plugin_sqlite -plugin-sql-sqlite - -%define plugins_style -qt-style-cde -qt-style-motifplus -qt-style-platinum -qt-style-sgi -qt-style-windows -qt-style-compact -qt-imgfmt-png -qt-imgfmt-jpeg -qt-imgfmt-mng -%define plugins %{plugin_mysql} %{plugin_psql} %{plugin_odbc} %{plugin_sqlite} %{plugins_style} - -Requires(post): /sbin/ldconfig -Requires(postun): /sbin/ldconfig -Requires: coreutils -Requires: fontconfig >= 2.0 -Requires: /etc/ld.so.conf.d - -BuildRequires: desktop-file-utils -BuildRequires: libmng-devel -BuildRequires: glibc-devel -BuildRequires: libjpeg-devel -BuildRequires: libpng-devel -BuildRequires: zlib-devel -BuildRequires: giflib-devel -BuildRequires: perl -BuildRequires: sed -BuildRequires: findutils -BuildRequires: cups-devel -BuildRequires: tar -BuildRequires: freetype-devel -BuildRequires: fontconfig-devel -BuildRequires: libXrender-devel -BuildRequires: libXrandr-devel -BuildRequires: libXcursor-devel -BuildRequires: libXinerama-devel -BuildRequires: libXft-devel -BuildRequires: libXext-devel -BuildRequires: libX11-devel -BuildRequires: libSM-devel -BuildRequires: libICE-devel -BuildRequires: libXt-devel -BuildRequires: libXmu-devel -BuildRequires: libXi-devel -BuildRequires: xorg-x11-proto-devel -BuildRequires: mesa-libGL-devel -BuildRequires: mesa-libGLU-devel -BuildRequires: desktop-file-utils -BuildRequires: mysql-devel -BuildRequires: postgresql-devel -BuildRequires: unixODBC-devel -BuildRequires: sqlite-devel -BuildRequires: gcc-c++ - - -%package config -Summary: Graphical configuration tool for programs using Qt 3 -Group: User Interface/Desktops -Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} -Obsoletes: qt-config < 1:%{version}-%{release} -Provides: qt-config = 1:%{version}-%{release} - - -%package devel -Summary: Development files for the Qt 3 GUI toolkit -Group: Development/Libraries -Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} -Requires: freetype-devel -Requires: fontconfig-devel -Requires: libXrender-devel -Requires: libXrandr-devel -Requires: libXcursor-devel -Requires: libXinerama-devel -Requires: libXft-devel -Requires: libXext-devel -Requires: libX11-devel -Requires: libSM-devel -Requires: libICE-devel -Requires: libXt-devel -Requires: xorg-x11-proto-devel -Requires: libpng-devel -Requires: libjpeg-devel -Requires: libmng-devel -Requires: mesa-libGL-devel -Requires: mesa-libGLU-devel - -Obsoletes: qt-devel < 1:%{version}-%{release} -Provides: qt-devel = 1:%{version}-%{release} - - -%package devel-docs -Summary: Documentation for the Qt 3 GUI toolkit -Group: Development/Libraries -Requires: %{name}-devel = %{?epoch:%{epoch}:}%{version}-%{release} - -Obsoletes: qt-devel-docs < 1:%{version}-%{release} -Provides: qt-devel-docs = 1:%{version}-%{release} - - -%package ODBC -Summary: ODBC drivers for Qt 3's SQL classes -Group: System Environment/Libraries -Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} - -Obsoletes: qt-ODBC < 1:%{version}-%{release} -Provides: qt-ODBC = 1:%{version}-%{release} - - -%package MySQL -Summary: MySQL drivers for Qt 3's SQL classes -Group: System Environment/Libraries -Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} - -Obsoletes: qt-MySQL < 1:%{version}-%{release} -Provides: qt-MySQL = 1:%{version}-%{release} - - -%package PostgreSQL -Summary: PostgreSQL drivers for Qt 3's SQL classes -Group: System Environment/Libraries -Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} - -Obsoletes: qt-PostgreSQL < 1:%{version}-%{release} -Provides: qt-PostgreSQL = 1:%{version}-%{release} - - -%package sqlite -Summary: sqlite drivers for Qt 3's SQL classes -Group: System Environment/Libraries -Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} - -Obsoletes: qt-sqlite < 1:%{version}-%{release} -Provides: qt-sqlite = 1:%{version}-%{release} - - -%package designer -Summary: Interface designer (IDE) for the Qt 3 toolkit -Group: Development/Tools -Requires: %{name}-devel = %{?epoch:%{epoch}:}%{version}-%{release} - -Obsoletes: qt-designer < 1:%{version}-%{release} -Provides: qt-designer = 1:%{version}-%{release} - - -%description -Qt is a GUI software toolkit which simplifies the task of writing and -maintaining GUI (Graphical User Interface) applications -for the X Window System. - -Qt is written in C++ and is fully object-oriented. - -This package contains the shared library needed to run Qt 3 -applications, as well as the README files for Qt 3. - - -%description config -Qt is a GUI software toolkit which simplifies the task of writing and -maintaining GUI (Graphical User Interface) applications -for the X Window System. - -Qt is written in C++ and is fully object-oriented. - -This package contains a graphical configuration tool for programs using Qt 3. - - -%description devel -The %{name}-devel package contains the files necessary to develop -applications using the Qt GUI toolkit: the header files, the Qt meta -object compiler. - -Install %{name}-devel if you want to develop GUI applications using the Qt 3 -toolkit. - - -%description devel-docs -The %{name}-devel-docs package contains the man pages, the HTML documentation and -example programs for Qt 3. - - -%description ODBC -ODBC driver for Qt 3's SQL classes (QSQL) - - -%description MySQL -MySQL driver for Qt 3's SQL classes (QSQL) - - -%description PostgreSQL -PostgreSQL driver for Qt 3's SQL classes (QSQL) - - -%description sqlite -sqlite driver for Qt 3's SQL classes (QSQL) - - -%description designer -The %{name}-designer package contains an User Interface designer tool -for the Qt 3 toolkit. - - -%prep -%setup -q -n qt3 -%patch1 -p1 -b .cjk -%patch2 -p1 -b .ndebug -%patch3 -p1 -b .makefile -%patch4 -p1 -b .umask -%patch5 -p1 -%patch7 -p1 -b .quiet -#patch8 -p1 -b .qembed -%patch12 -p1 -b .nostdlib -%patch13 -p1 -b .fonts -#patch14 -p1 -b .gl -#patch19 -p1 -b .gtk -#patch20 -p1 -b .gcc4-buildkey -#patch24 -p1 -b .uic -%patch25 -p1 -b .uic-multilib -%patch27 -p1 -b .fontrendering-ml_IN-bz#209097 -%patch29 -p1 -b .fontrendering-as_IN-bz#209972 -%patch31 -p1 -b .fontrendering-te_IN-bz#211259 -%patch32 -p1 -b .fontrendering-bz#214371 -%patch33 -p1 -b .fontrendering-#214570 -%patch34 -p1 -b .fontrendering-#209974 -%patch35 -p1 -b .fontrendering-ml_IN-217657 -%patch37 -p1 -b .fontrendering-gu-228452 -%patch38 -p1 -b .odbc -# it's not 100% clear to me if this is safe for all archs -- Rex -%ifarch armv5tel -%patch39 -p1 -b .arm -%endif -%patch40 -p1 - -# immodule patches -%if %{immodule} -#patch50 -p1 -#patch51 -p1 -b .quiet -#patch52 -p1 -b .fix-key-release-event-with-imm -%patch53 -p1 -b .resetinputcontext -%endif - -# qt-copy patches -#patch100 -p0 -b .0038-dragobject-dont-prefer-unknown -#patch101 -p0 -b .0047-fix-kmenu-width -#patch102 -p0 -b .0048-qclipboard_hack_80072 -#patch103 -p0 -b .0056-khotkeys_input_84434 -#patch105 -p0 -b .0073-xinerama-aware-qpopup -#patch107 -p0 -b .0079-compositing-types -#patch108 -p0 -b .0080-net-wm-sync-request -%patch110 -p0 -b .0084-compositing-properties - -# upstream patches -%patch200 -p1 -b .fullscreen -#patch201 -p1 -b .gcc34 - -# TDE 3.5.13 patches -%patch300 -p1 - -# convert to UTF-8 -iconv -f iso-8859-1 -t utf-8 < doc/man/man3/qdial.3qt > doc/man/man3/qdial.3qt_ -mv doc/man/man3/qdial.3qt_ doc/man/man3/qdial.3qt - -%build -export QTDIR=`/bin/pwd` -export LD_LIBRARY_PATH="$QTDIR/lib:$LD_LIBRARY_PATH" -export PATH="$QTDIR/bin:$PATH" -export QTDEST=%{qtdir} - -%if %{smp} - export SMP_MFLAGS="%{?_smp_mflags}" -%endif - -%if %{immodule} - sh ./make-symlinks.sh -%endif - -# set correct X11 prefix -perl -pi -e "s,QMAKE_LIBDIR_X11.*,QMAKE_LIBDIR_X11\t=," mkspecs/*/qmake.conf -perl -pi -e "s,QMAKE_INCDIR_X11.*,QMAKE_INCDIR_X11\t=," mkspecs/*/qmake.conf -perl -pi -e "s,QMAKE_INCDIR_OPENGL.*,QMAKE_INCDIR_OPENGL\t=," mkspecs/*/qmake.conf -perl -pi -e "s,QMAKE_LIBDIR_OPENGL.*,QMAKE_LIBDIR_OPENGL\t=," mkspecs/*/qmake.conf - -# don't use rpath -perl -pi -e "s|-Wl,-rpath,| |" mkspecs/*/qmake.conf - -perl -pi -e "s|-O2|$INCLUDES %{optflags} -fno-strict-aliasing|g" mkspecs/*/qmake.conf - -# set correct lib path -if [ "%{_lib}" == "lib64" ] ; then - perl -pi -e "s,/usr/lib /lib,/usr/%{_lib} /%{_lib},g" config.tests/{unix,x11}/*.test - perl -pi -e "s,/lib /usr/lib,/%{_lib} /usr/%{_lib},g" config.tests/{unix,x11}/*.test -fi - -# build shared, threaded (default) libraries -echo yes | ./configure \ - -prefix $QTDEST \ - -docdir %{qt_docdir} \ -%if %{_lib} == lib64 - -platform linux-g++-64 \ -%else - -platform linux-g++ \ -%endif -%if %{debug} - -debug \ -%else - -release \ -%endif - -shared \ - -largefile \ - -qt-gif \ - -system-zlib \ - -system-libpng \ - -system-libmng \ - -system-libjpeg \ - -no-exceptions \ - -enable-styles \ - -enable-tools \ - -enable-kernel \ - -enable-widgets \ - -enable-dialogs \ - -enable-iconview \ - -enable-workspace \ - -enable-network \ - -enable-canvas \ - -enable-table \ - -enable-xml \ - -enable-opengl \ - -enable-sql \ - -qt-style-motif \ - %{plugins} \ - -stl \ - -thread \ - -cups \ - -sm \ - -xinerama \ - -xrender \ - -xkb \ - -ipv6 \ - -dlopen-opengl \ - -xft \ - -tablet - -make $SMP_MFLAGS src-qmake - -# build sqlite plugin -pushd plugins/src/sqldrivers/sqlite -qmake -o Makefile sqlite.pro -popd - -# build psql plugin -pushd plugins/src/sqldrivers/psql -qmake -o Makefile "INCLUDEPATH+=%{_includedir}/pgsql %{_includedir}/pgsql/server %{_includedir}/pgsql/internal" "LIBS+=-lpq" psql.pro -popd - -# build mysql plugin -pushd plugins/src/sqldrivers/mysql -qmake -o Makefile "INCLUDEPATH+=%{mysql_include_dir}" "LIBS+=-L%{mysql_lib_dir} -lmysqlclient" mysql.pro -popd - -# build odbc plugin -pushd plugins/src/sqldrivers/odbc -qmake -o Makefile "LIBS+=-lodbc" odbc.pro -popd - -make $SMP_MFLAGS src-moc -make $SMP_MFLAGS sub-src -make $SMP_MFLAGS sub-tools UIC="$QTDIR/bin/uic -nostdlib -L $QTDIR/plugins" - -%install -rm -rf %{buildroot} - -export QTDIR=`/bin/pwd` -export LD_LIBRARY_PATH="$QTDIR/lib:$LD_LIBRARY_PATH" -export PATH="$QTDIR/bin:$PATH" -export QTDEST=%{qtdir} - -make install INSTALL_ROOT=%{buildroot} - -for i in findtr qt20fix qtrename140 lrelease lupdate ; do - install bin/$i %{buildroot}%{qtdir}/bin/ -done - -mkdir -p %{buildroot}%{_libdir}/pkgconfig/ -mv %{buildroot}%{qtdir}/lib/pkgconfig/*.pc %{buildroot}%{_libdir}/pkgconfig/ - -# install man pages -mkdir -p %{buildroot}%{_mandir} -cp -fR doc/man/* %{buildroot}%{_mandir}/ - -# clean up -make -C tutorial clean -make -C examples clean - -# Make sure the examples can be built outside the source tree. -# Our binaries fulfill all requirements, so... -perl -pi -e "s,^DEPENDPATH.*,,g;s,^REQUIRES.*,,g" `find examples -name "*.pro"` - -# don't include Makefiles of qt examples/tutorials -find examples -name "Makefile" | xargs rm -f -find examples -name "*.obj" | xargs rm -rf -find examples -name "*.moc" | xargs rm -rf -find tutorial -name "Makefile" | xargs rm -f - -for a in */*/Makefile ; do - sed 's|^SYSCONF_MOC.*|SYSCONF_MOC = %{qtdir}/bin/moc|' < $a > ${a}.2 - mv -v ${a}.2 $a -done - -mkdir -p %{buildroot}/etc/profile.d -install -m 644 %{SOURCE2} %{SOURCE3} %{buildroot}/etc/profile.d/ - -# Add desktop files -mkdir -p %{buildroot}%{_datadir}/applications -desktop-file-install \ - --dir %{buildroot}%{_datadir}/applications \ - --vendor="qt" \ - %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} - -# Patch qmake to use qt-mt unconditionally -perl -pi -e "s,-lqt ,-lqt-mt ,g;s,-lqt$,-lqt-mt,g" %{buildroot}%{qtdir}/mkspecs/*/qmake.conf - -# remove broken links -rm -f %{buildroot}%{qtdir}/mkspecs/default/linux-g++* -rm -f %{buildroot}%{qtdir}/lib/*.la - -mkdir -p %{buildroot}/etc/ld.so.conf.d -echo "%{qtdir}/lib" > %{buildroot}/etc/ld.so.conf.d/qt-%{_arch}.conf - -# install icons -mkdir %{buildroot}%{_datadir}/pixmaps -install -m 644 tools/assistant/images/qt.png %{buildroot}%{_datadir}/pixmaps/qtconfig3.png -install -m 644 tools/assistant/images/designer.png %{buildroot}%{_datadir}/pixmaps/designer3.png -install -m 644 tools/assistant/images/assistant.png %{buildroot}%{_datadir}/pixmaps/assistant3.png -install -m 644 tools/assistant/images/linguist.png %{buildroot}%{_datadir}/pixmaps/linguist3.png - -# own style directory -mkdir -p %{buildroot}%{qtdir}/plugins/styles - -%clean -rm -rf %{buildroot} - -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig - -%files -%defattr(-,root,root,-) -%doc FAQ LICENSE* README* changes* -%dir %{qtdir} -%dir %{qtdir}/bin -%dir %{qtdir}/lib -%dir %{qtdir}/plugins -%dir %{qtdir}/plugins/sqldrivers -%dir %{qtdir}/plugins/styles -%{qtdir}/translations -%{qtdir}/plugins/designer/ -%if %{immodule} -%{qtdir}/plugins/inputmethods -%endif -%config /etc/profile.d/* -/etc/ld.so.conf.d/* -%{qtdir}/lib/libqui.so.* -%{qtdir}/lib/libqt*.so.* - -%files config -%defattr(-,root,root,-) -%{qtdir}/bin/qtconfig -%{_datadir}/applications/*qtconfig*.desktop -%{_datadir}/pixmaps/qtconfig3.png - -%files devel -%defattr(-,root,root,-) -%{qt_docdir}/ -%{qtdir}/bin/moc -%{qtdir}/bin/uic -%{qtdir}/bin/findtr -%{qtdir}/bin/qt20fix -%{qtdir}/bin/qtrename140 -%{qtdir}/bin/assistant -%{qtdir}/bin/qm2ts -%{qtdir}/bin/qmake -%{qtdir}/bin/qembed -%{qtdir}/bin/linguist -%{qtdir}/bin/lupdate -%{qtdir}/bin/lrelease -%{qtdir}/include -%{qtdir}/mkspecs -%{qtdir}/lib/libqt*.so -%{qtdir}/lib/libqui.so -%{qtdir}/lib/libeditor.a -%{qtdir}/lib/libdesigner*.a -%{qtdir}/lib/libqassistantclient.a -%{qtdir}/lib/*.prl -%{qtdir}/phrasebooks -%{_libdir}/pkgconfig/* -%{_datadir}/applications/*linguist*.desktop -%{_datadir}/applications/*assistant*.desktop -%{_datadir}/pixmaps/linguist3.png -%{_datadir}/pixmaps/assistant3.png - -# QT 3.3.8.D (TDE): 4 binaries have appeared -%{qtdir}/bin/createcw -%{qtdir}/bin/makeqpf -%{qtdir}/bin/mergetr -%{qtdir}/bin/msg2qm - -# QT 3.3.8.D (TDE): removes lots of unnecessary include files -# (where do they come from ??? They were not in 3.3.8b !) -%exclude %{qtdir}/include/btree.h -#%exclude %{qtdir}/include/config.h -%exclude %{qtdir}/include/crc32.h -%exclude %{qtdir}/include/debian_qsql_odbc.h -%exclude %{qtdir}/include/deflate.h -%exclude %{qtdir}/include/ftglue.h -%exclude %{qtdir}/include/ftxgdef.h -%exclude %{qtdir}/include/ftxgpos.h -%exclude %{qtdir}/include/ftxgsub.h -%exclude %{qtdir}/include/ftxopen.h -%exclude %{qtdir}/include/ftxopenf.h -%exclude %{qtdir}/include/hash.h -%exclude %{qtdir}/include/inffast.h -%exclude %{qtdir}/include/inffixed.h -%exclude %{qtdir}/include/inflate.h -%exclude %{qtdir}/include/inftrees.h -%exclude %{qtdir}/include/jchuff.h -%exclude %{qtdir}/include/jconfig.h -%exclude %{qtdir}/include/jdct.h -%exclude %{qtdir}/include/jdhuff.h -%exclude %{qtdir}/include/jerror.h -%exclude %{qtdir}/include/jinclude.h -%exclude %{qtdir}/include/jmemsys.h -%exclude %{qtdir}/include/jmorecfg.h -#%exclude %{qtdir}/include/jpegint.h -#%exclude %{qtdir}/include/jpeglib.h -%exclude %{qtdir}/include/jversion.h -#%exclude %{qtdir}/include/libmng.h -#%exclude %{qtdir}/include/libmng_chunk_io.h -#%exclude %{qtdir}/include/libmng_chunk_prc.h -#%exclude %{qtdir}/include/libmng_chunks.h -#%exclude %{qtdir}/include/libmng_cms.h -#%exclude %{qtdir}/include/libmng_conf.h -#%exclude %{qtdir}/include/libmng_data.h -#%exclude %{qtdir}/include/libmng_display.h -#%exclude %{qtdir}/include/libmng_dither.h -#%exclude %{qtdir}/include/libmng_error.h -#%exclude %{qtdir}/include/libmng_filter.h -#%exclude %{qtdir}/include/libmng_jpeg.h -#%exclude %{qtdir}/include/libmng_memory.h -#%exclude %{qtdir}/include/libmng_object_prc.h -#%exclude %{qtdir}/include/libmng_objects.h -#%exclude %{qtdir}/include/libmng_pixels.h -#%exclude %{qtdir}/include/libmng_read.h -#%exclude %{qtdir}/include/libmng_trace.h -#%exclude %{qtdir}/include/libmng_types.h -#%exclude %{qtdir}/include/libmng_write.h -#%exclude %{qtdir}/include/libmng_zlib.h -%exclude %{qtdir}/include/moc_yacc.h -%exclude %{qtdir}/include/opcodes.h -%exclude %{qtdir}/include/os.h -%exclude %{qtdir}/include/otlbuffer.h -%exclude %{qtdir}/include/pager.h -%exclude %{qtdir}/include/parse.h -#%exclude %{qtdir}/include/png.h -%exclude %{qtdir}/include/pngasmrd.h -%exclude %{qtdir}/include/pngconf.h -%exclude %{qtdir}/include/sqlite.h -%exclude %{qtdir}/include/sqliteInt.h -%exclude %{qtdir}/include/trees.h -%exclude %{qtdir}/include/vdbe.h -%exclude %{qtdir}/include/vdbeInt.h -#%exclude %{qtdir}/include/zconf.h -#%exclude %{qtdir}/include/zconf.in.h -#%exclude %{qtdir}/include/zlib.h -#%exclude %{qtdir}/include/zutil.h -%exclude %{qtdir}/mkspecs/linux-g++-sparc - - - -%files devel-docs -%defattr(-,root,root,-) -%doc examples -%doc tutorial -%{_mandir}/*/* - -%files sqlite -%defattr(-,root,root,-) -%{qtdir}/plugins/sqldrivers/libqsqlite.so - -%files ODBC -%defattr(-,root,root,-) -%{qtdir}/plugins/sqldrivers/libqsqlodbc.so - -%files PostgreSQL -%defattr(-,root,root,-) -%{qtdir}/plugins/sqldrivers/libqsqlpsql.so - -%files MySQL -%defattr(-,root,root,-) -%{qtdir}/plugins/sqldrivers/libqsqlmysql.so - -%files designer -%defattr(-,root,root,-) -%{qtdir}/templates -%{qtdir}/bin/designer -%{_datadir}/applications/*designer*.desktop -%{_datadir}/pixmaps/designer3.png - - -%changelog -* Sun Dec 18 2011 Francois Andriot - 3.3.8.d-3 -- Updates zh_TW translations, thanks to Wei-Lun Chao . - -* Thu Nov 03 2011 Francois Andriot - 3.3.8.d-2 -- Add missing BuildRequires - -* Fri Sep 02 2011 Francois Andriot - 3.3.8.d-1 -- Initial build for RHEL 6, RHEL 5, and Fedora 15 -- Switch to Trinity Version -- Spec file based on RHEL 6 'qt3-3.3.8b-29' diff --git a/redhat/qt3/qtconfig3.desktop b/redhat/qt3/qtconfig3.desktop deleted file mode 100644 index 11df0abab..000000000 --- a/redhat/qt3/qtconfig3.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Name=Qt3 Config -Comment=Configure Qt3 behavior, styles, fonts -Exec=qtconfig -Icon=qtconfig3 -Terminal=false -Encoding=UTF-8 -Type=Application -Categories=Qt;Settings; diff --git a/redhat/tqt3/0084-compositing-properties.patch b/redhat/tqt3/0084-compositing-properties.patch deleted file mode 100644 index 368b6c267..000000000 --- a/redhat/tqt3/0084-compositing-properties.patch +++ /dev/null @@ -1,80 +0,0 @@ -qt-bugs@ issue : none -bugs.kde.org number : none -applied: no -author: Lubos Lunak - -This patch makes override-redirect windows (popup menu, dropdown menu, -tooltip, combobox, etc.) also have more window properties like WM_CLASS, -so they can be used when compositing. - ---- src/kernel/qwidget_x11.cpp.sav 2007-06-25 10:36:42.000000000 +0200 -+++ src/kernel/qwidget_x11.cpp 2007-10-02 15:30:13.000000000 +0200 -@@ -557,7 +557,10 @@ void QWidget::create( WId window, bool i - wsa.save_under = True; - XChangeWindowAttributes( dpy, id, CWOverrideRedirect | CWSaveUnder, - &wsa ); -- x11SetWindowType(); -+ XClassHint class_hint; -+ class_hint.res_name = (char *) qAppName(); // application name -+ class_hint.res_class = (char *) qAppClass(); // application class -+ XSetClassHint( dpy, id, &class_hint ); - } else if ( topLevel && !desktop ) { // top-level widget - QWidget *p = parentWidget(); // real parent - if (p) -@@ -620,8 +623,6 @@ void QWidget::create( WId window, bool i - else - XDeleteProperty(dpy, id, qt_xa_motif_wm_hints); - -- x11SetWindowType(); -- - // set _NET_WM_WINDOW_STATE - if (curr_winstate > 0) - XChangeProperty(dpy, id, qt_net_wm_state, XA_ATOM, 32, PropModeReplace, -@@ -629,11 +630,6 @@ void QWidget::create( WId window, bool i - else - XDeleteProperty(dpy, id, qt_net_wm_state); - -- // set _NET_WM_PID -- long curr_pid = getpid(); -- XChangeProperty(dpy, id, qt_net_wm_pid, XA_CARDINAL, 32, PropModeReplace, -- (unsigned char *) &curr_pid, 1); -- - #ifndef QT_NO_XSYNC - // set _NET_WM_SYNC_COUNTER - createSyncCounter(); -@@ -645,19 +641,31 @@ void QWidget::create( WId window, bool i - // when we create a toplevel widget, the frame strut should be dirty - fstrut_dirty = 1; - -+ } else { -+ // non-toplevel widgets don't have a frame, so no need to -+ // update the strut -+ fstrut_dirty = 0; -+ } -+ -+ if (initializeWindow && (popup || (topLevel && !desktop))) { // properties set on all toplevel windows -+ x11SetWindowType(); -+ -+ // set _NET_WM_PID -+ long curr_pid = getpid(); -+ XChangeProperty(dpy, id, qt_net_wm_pid, XA_CARDINAL, 32, PropModeReplace, -+ (unsigned char *) &curr_pid, 1); -+ - // declare the widget's object name as window role - XChangeProperty( dpy, id, - qt_window_role, XA_STRING, 8, PropModeReplace, - (unsigned char *)name(), qstrlen( name() ) ); - - // set client leader property -+ if ( !qt_x11_wm_client_leader ) -+ qt_x11_create_wm_client_leader(); - XChangeProperty( dpy, id, qt_wm_client_leader, - XA_WINDOW, 32, PropModeReplace, - (unsigned char *)&qt_x11_wm_client_leader, 1 ); -- } else { -- // non-toplevel widgets don't have a frame, so no need to -- // update the strut -- fstrut_dirty = 0; - } - - if ( initializeWindow ) { diff --git a/redhat/tqt3/assistant3.desktop b/redhat/tqt3/assistant3.desktop deleted file mode 100644 index 49e718c5d..000000000 --- a/redhat/tqt3/assistant3.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Name=Qt3 Assistant -Comment=Add translations to Qt3 applications -Exec=assistant -Icon=assistant3 -Terminal=false -Encoding=UTF-8 -Type=Application -Categories=Qt;Development; diff --git a/redhat/tqt3/designer3.desktop b/redhat/tqt3/designer3.desktop deleted file mode 100644 index 23f1f549a..000000000 --- a/redhat/tqt3/designer3.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Name=Qt3 Designer -GenericName=Interface Designer -Comment=Design GUIs for Qt3 applications -Exec=designer -Icon=designer3 -MimeType=application/x-designer; -Terminal=false -Encoding=UTF-8 -Type=Application -Categories=Qt;Development; diff --git a/redhat/tqt3/linguist3.desktop b/redhat/tqt3/linguist3.desktop deleted file mode 100644 index c6fce02c8..000000000 --- a/redhat/tqt3/linguist3.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Name=Qt3 Linguist -Comment=Add translations to Qt3 applications -Exec=linguist -Icon=linguist3 -MimeType=application/x-linguist; -Terminal=false -Encoding=UTF-8 -Type=Application -Categories=Qt;Development; diff --git a/redhat/tqt3/qt-3.1.0-makefile.patch b/redhat/tqt3/qt-3.1.0-makefile.patch deleted file mode 120000 index 7d8ae65a2..000000000 --- a/redhat/tqt3/qt-3.1.0-makefile.patch +++ /dev/null @@ -1 +0,0 @@ -../qt3/qt-3.1.0-makefile.patch \ No newline at end of file diff --git a/redhat/tqt3/qt-3.3.4-print-CJK.patch b/redhat/tqt3/qt-3.3.4-print-CJK.patch deleted file mode 120000 index 99cdc6e1d..000000000 --- a/redhat/tqt3/qt-3.3.4-print-CJK.patch +++ /dev/null @@ -1 +0,0 @@ -../qt3/qt-3.3.4-print-CJK.patch \ No newline at end of file diff --git a/redhat/tqt3/qt-3.3.6-fontrendering-gu-228452.patch b/redhat/tqt3/qt-3.3.6-fontrendering-gu-228452.patch deleted file mode 120000 index b015af122..000000000 --- a/redhat/tqt3/qt-3.3.6-fontrendering-gu-228452.patch +++ /dev/null @@ -1 +0,0 @@ -../qt3/qt-3.3.6-fontrendering-gu-228452.patch \ No newline at end of file diff --git a/redhat/tqt3/qt-3.3.6-fontrendering-ml_IN-209974.patch b/redhat/tqt3/qt-3.3.6-fontrendering-ml_IN-209974.patch deleted file mode 120000 index 388a5cbe5..000000000 --- a/redhat/tqt3/qt-3.3.6-fontrendering-ml_IN-209974.patch +++ /dev/null @@ -1 +0,0 @@ -../qt3/qt-3.3.6-fontrendering-ml_IN-209974.patch \ No newline at end of file diff --git a/redhat/tqt3/qt-3.3.6-fontrendering-te_IN-211259.patch b/redhat/tqt3/qt-3.3.6-fontrendering-te_IN-211259.patch deleted file mode 120000 index 93c6ba3d8..000000000 --- a/redhat/tqt3/qt-3.3.6-fontrendering-te_IN-211259.patch +++ /dev/null @@ -1 +0,0 @@ -../qt3/qt-3.3.6-fontrendering-te_IN-211259.patch \ No newline at end of file diff --git a/redhat/tqt3/qt-3.3.8-fontrendering-as_IN-209972.patch b/redhat/tqt3/qt-3.3.8-fontrendering-as_IN-209972.patch deleted file mode 120000 index 4ded8f792..000000000 --- a/redhat/tqt3/qt-3.3.8-fontrendering-as_IN-209972.patch +++ /dev/null @@ -1 +0,0 @@ -../qt3/qt-3.3.8-fontrendering-as_IN-209972.patch \ No newline at end of file diff --git a/redhat/tqt3/qt-x11-free-3.3.4-fullscreen.patch b/redhat/tqt3/qt-x11-free-3.3.4-fullscreen.patch deleted file mode 120000 index 09d41d4b3..000000000 --- a/redhat/tqt3/qt-x11-free-3.3.4-fullscreen.patch +++ /dev/null @@ -1 +0,0 @@ -../qt3/qt-x11-free-3.3.4-fullscreen.patch \ No newline at end of file diff --git a/redhat/tqt3/qt-x11-free-3.3.6-qfontdatabase_x11.patch b/redhat/tqt3/qt-x11-free-3.3.6-qfontdatabase_x11.patch deleted file mode 120000 index f8342f9f9..000000000 --- a/redhat/tqt3/qt-x11-free-3.3.6-qfontdatabase_x11.patch +++ /dev/null @@ -1 +0,0 @@ -../qt3/qt-x11-free-3.3.6-qfontdatabase_x11.patch \ No newline at end of file diff --git a/redhat/tqt3/qt-x11-free-3.3.6-strip.patch b/redhat/tqt3/qt-x11-free-3.3.6-strip.patch deleted file mode 120000 index 7121216bc..000000000 --- a/redhat/tqt3/qt-x11-free-3.3.6-strip.patch +++ /dev/null @@ -1 +0,0 @@ -../qt3/qt-x11-free-3.3.6-strip.patch \ No newline at end of file diff --git a/redhat/tqt3/qt-x11-free-3.3.7-arm.patch b/redhat/tqt3/qt-x11-free-3.3.7-arm.patch deleted file mode 120000 index b7682272a..000000000 --- a/redhat/tqt3/qt-x11-free-3.3.7-arm.patch +++ /dev/null @@ -1 +0,0 @@ -../qt3/qt-x11-free-3.3.7-arm.patch \ No newline at end of file diff --git a/redhat/tqt3/qt-x11-free-3.3.8b-typo.patch b/redhat/tqt3/qt-x11-free-3.3.8b-typo.patch deleted file mode 120000 index 4e2537345..000000000 --- a/redhat/tqt3/qt-x11-free-3.3.8b-typo.patch +++ /dev/null @@ -1 +0,0 @@ -../qt3/qt-x11-free-3.3.8b-typo.patch \ No newline at end of file diff --git a/redhat/tqt3/qt-x11-immodule-unified-qt3.3.5-20051012-quiet.patch b/redhat/tqt3/qt-x11-immodule-unified-qt3.3.5-20051012-quiet.patch deleted file mode 100644 index 5e5d9773a..000000000 --- a/redhat/tqt3/qt-x11-immodule-unified-qt3.3.5-20051012-quiet.patch +++ /dev/null @@ -1,134 +0,0 @@ -diff -Nur qt-x11-free-3.3.5.orig/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.cpp qt-x11-free-3.3.5/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.cpp ---- qt-x11-free-3.3.5.orig/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.cpp 2005-10-13 16:09:36.000000000 +0200 -+++ qt-x11-free-3.3.5/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.cpp 2005-10-13 16:09:31.000000000 +0200 -@@ -306,8 +306,8 @@ - - currentIMKey = key; - -- qDebug( "QMultiInputContext::changeInputMethod(): index=%d, slave=%s", -- imIndex, (const char *)_slave->identifierName() ); -+ /* qDebug( "QMultiInputContext::changeInputMethod(): index=%d, slave=%s", -+ imIndex, (const char *)_slave->identifierName() ); */ - } - } - -diff -Nur qt-x11-free-3.3.5.orig/plugins/src/inputmethods/simple/qsimpleinputcontext.cpp qt-x11-free-3.3.5/plugins/src/inputmethods/simple/qsimpleinputcontext.cpp ---- qt-x11-free-3.3.5.orig/plugins/src/inputmethods/simple/qsimpleinputcontext.cpp 2005-10-13 16:09:36.000000000 +0200 -+++ qt-x11-free-3.3.5/plugins/src/inputmethods/simple/qsimpleinputcontext.cpp 2005-10-13 16:09:31.000000000 +0200 -@@ -140,7 +140,7 @@ - // only one character. See description of - // QInputContext::filterEvent() about key compression. - val = text[0].unicode(); -- qDebug( "str = %s", (const char*)keyevent->text().local8Bit() ); -+ // qDebug( "str = %s", (const char*)keyevent->text().local8Bit() ); - } - - // Store value -@@ -164,14 +164,14 @@ - - void QSimpleInputContext::setFocus() - { -- qDebug( "QSimpleInputContext: %p->setFocus(), focusWidget()=%p", -- this, focusWidget() ); -+ /* qDebug( "QSimpleInputContext: %p->setFocus(), focusWidget()=%p", -+ this, focusWidget() ); */ - } - - void QSimpleInputContext::unsetFocus() - { -- qDebug( "QSimpleInputContext: %p->unsetFocus(), focusWidget()=%p", -- this, focusWidget() ); -+ /* qDebug( "QSimpleInputContext: %p->unsetFocus(), focusWidget()=%p", -+ this, focusWidget() ); */ - reset(); - } - -@@ -188,8 +188,8 @@ - case QEvent::MouseButtonRelease: - case QEvent::MouseButtonDblClick: - case QEvent::MouseMove: -- qDebug( "QSimpleInputContext::mouseHandler: " -- "x=%d, type=%d, button=%d, state=%d", x, type, button, state ); -+ /* qDebug( "QSimpleInputContext::mouseHandler: " -+ "x=%d, type=%d, button=%d, state=%d", x, type, button, state ); */ - break; - default: - break; -@@ -240,7 +240,7 @@ - - // no entries were found - if ( p == composeTable->data + composeTable->size ) { -- qDebug( "no match" ); -+ // qDebug( "no match" ); - clearComposeBuffer(); - return FALSE; - } -@@ -250,18 +250,18 @@ - - // check if partial match - if ( composeBuffer[i] == 0 && p->keys[i] ) { -- qDebug("partial match"); -+ // qDebug("partial match"); - return TRUE; - } - - if ( composeBuffer[i] != p->keys[i] ) { -- qDebug("different entry"); -+ // qDebug("different entry"); - clearComposeBuffer(); - return i!=0; - } - } - -- qDebug("match exactly"); -+ // qDebug("match exactly"); - - // match exactly - commitChar( p->value ); -diff -Nur qt-x11-free-3.3.5.orig/src/kernel/qinputcontext.cpp qt-x11-free-3.3.5/src/kernel/qinputcontext.cpp ---- qt-x11-free-3.3.5.orig/src/kernel/qinputcontext.cpp 2005-10-13 16:09:37.000000000 +0200 -+++ qt-x11-free-3.3.5/src/kernel/qinputcontext.cpp 2005-10-13 16:09:31.000000000 +0200 -@@ -526,17 +526,17 @@ - return; - - if ( type == QEvent::IMStart ) { -- qDebug( "sending IMStart with %d chars to %p", -- text.length(), receiver ); -+ /* qDebug( "sending IMStart with %d chars to %p", -+ text.length(), receiver ); */ - event = new QIMEvent( type, text, cursorPosition ); - } else if ( type == QEvent::IMEnd ) { -- qDebug( "sending IMEnd with %d chars to %p, text=%s", -- text.length(), receiver, (const char*)text.local8Bit() ); -+ /* qDebug( "sending IMEnd with %d chars to %p, text=%s", -+ text.length(), receiver, (const char*)text.local8Bit() ); */ - event = new QIMEvent( type, text, cursorPosition ); - } else if ( type == QEvent::IMCompose ) { -- qDebug( "sending IMCompose to %p with %d chars, cpos=%d, sellen=%d, text=%s", -+ /* qDebug( "sending IMCompose to %p with %d chars, cpos=%d, sellen=%d, text=%s", - receiver, text.length(), cursorPosition, selLength, -- (const char*)text.local8Bit() ); -+ (const char*)text.local8Bit() ); */ - event = new QIMComposeEvent( type, text, cursorPosition, selLength ); - } - ---- qt-x11-free-3.3.5/plugins/src/inputmethods/xim/qximinputcontext_x11.cpp.quiet 2005-10-13 19:00:56.000000000 +0200 -+++ qt-x11-free-3.3.5/plugins/src/inputmethods/xim/qximinputcontext_x11.cpp 2005-10-25 15:36:43.000000000 +0200 -@@ -356,7 +356,7 @@ - #if !defined(QT_NO_XIM) - fontsetRefCount++; - if (! qt_xim) { -- qWarning("QInputContext: no input method context available"); -+ // qWarning("QInputContext: no input method context available"); - return; - } - -@@ -742,7 +742,7 @@ - - void QXIMInputContext::close( const QString &errMsg ) - { -- qDebug( errMsg ); -+ // qDebug( errMsg ); - emit deletionRequested(); - } - diff --git a/redhat/tqt3/qt-x11-immodule-unified-qt3.3.8-20071116.diff.bz2 b/redhat/tqt3/qt-x11-immodule-unified-qt3.3.8-20071116.diff.bz2 deleted file mode 100644 index 7c122a375..000000000 Binary files a/redhat/tqt3/qt-x11-immodule-unified-qt3.3.8-20071116.diff.bz2 and /dev/null differ diff --git a/redhat/tqt3/qt.csh b/redhat/tqt3/qt.csh deleted file mode 100755 index 7efcd89c5..000000000 --- a/redhat/tqt3/qt.csh +++ /dev/null @@ -1,34 +0,0 @@ -# Qt initialization script (csh) - -# In multilib environments there is a preferred architecture, 64 bit over 32 bit in x86_64, -# When a conflict is found between two packages corresponding with different arches, -# the installed file is the one from the preferred arch. This is very common for executables -# in /usr/bin, for example. If the file /usr/bin/foo is found in an x86_64 package and in an -# i386 package, the executable from x86_64 will be installe - -if ( $?QTDIR ) then - exit -endif - -switch (`uname -m`) - case x86_64: - case ia64: - case s390x: - case ppc64: - set QTPREFIXES = "/usr/lib64/qt-3.3 /usr/lib/qt-3.3" - breaksw - case *: - set QTPREFIXES = "/usr/lib/qt-3.3 /usr/lib64/qt-3.3" -endsw - -foreach QTPREFIX ( $QTPREFIXES ) - test -d "$QTPREFIX" && setenv QTDIR $QTPREFIX && break -end -unset QTPREFIX QTPREFIXES - -if ( "${path}" !~ *$QTDIR/bin* ) then - set path = ( $QTDIR/bin $path ) -endif - -setenv QTINC $QTDIR/include -setenv QTLIB $QTDIR/lib diff --git a/redhat/tqt3/qt.sh b/redhat/tqt3/qt.sh deleted file mode 100755 index 88b3e0cea..000000000 --- a/redhat/tqt3/qt.sh +++ /dev/null @@ -1,32 +0,0 @@ -# Qt initialization script (sh) - -# In multilib environments there is a preferred architecture, 64 bit over 32 bit in x86_64, -# When a conflict is found between two packages corresponding with different arches, -# the installed file is the one from the preferred arch. This is very common for executables -# in /usr/bin, for example. If the file /usr/bin/foo is found in an x86_64 package and in an -# i386 package, the executable from x86_64 will be installe - -if [ -z "${QTDIR}" ]; then - -case `uname -m` in - x86_64 | ia64 | s390x | ppc64 ) - QT_PREFIXES="/usr/lib64/qt-3.3 /usr/lib/qt-3.3" ;; - * ) - QT_PREFIXES="/usr/lib/qt-3.3 /usr/lib64/qt-3.3" ;; -esac - -for QTDIR in ${QT_PREFIXES} ; do - test -d "${QTDIR}" && break -done -unset QT_PREFIXES - -if ! echo ${PATH} | /bin/grep -q $QTDIR/bin ; then - PATH=$QTDIR/bin:${PATH} -fi - -QTINC="$QTDIR/include" -QTLIB="$QTDIR/lib" - -export QTDIR QTINC QTLIB PATH - -fi diff --git a/redhat/tqt3/qt3-3.3.8.d-updates_zh-tw_translations.patch b/redhat/tqt3/qt3-3.3.8.d-updates_zh-tw_translations.patch deleted file mode 120000 index 06a4852dc..000000000 --- a/redhat/tqt3/qt3-3.3.8.d-updates_zh-tw_translations.patch +++ /dev/null @@ -1 +0,0 @@ -../qt3/qt3-3.3.8.d-updates_zh-tw_translations.patch \ No newline at end of file diff --git a/redhat/tqt3/qtconfig3.desktop b/redhat/tqt3/qtconfig3.desktop deleted file mode 100644 index 11df0abab..000000000 --- a/redhat/tqt3/qtconfig3.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Name=Qt3 Config -Comment=Configure Qt3 behavior, styles, fonts -Exec=qtconfig -Icon=qtconfig3 -Terminal=false -Encoding=UTF-8 -Type=Application -Categories=Qt;Settings; diff --git a/redhat/tqt3/tqt3-3.4.0-embed.patch b/redhat/tqt3/tqt3-3.4.0-embed.patch deleted file mode 100644 index 10d7704ae..000000000 --- a/redhat/tqt3/tqt3-3.4.0-embed.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- tqt3/tools/qembed/qembed.pro.qembed 2012-02-13 19:10:01.000000000 +0100 -+++ tqt3/tools/qembed/qembed.pro 2012-02-13 21:26:57.417973392 +0100 -@@ -3,5 +3,7 @@ - TARGET = qembed - REQUIRES=full-config nocrosscompiler - -+DESTDIR = ../../bin - target.path = $$bins.path - INSTALLS += target -+ diff --git a/redhat/tqt3/tqt3-3.4.0-fontrendering-#214570.patch b/redhat/tqt3/tqt3-3.4.0-fontrendering-#214570.patch deleted file mode 100644 index 77ca43101..000000000 --- a/redhat/tqt3/tqt3-3.4.0-fontrendering-#214570.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- tqt3/src/kernel/qscriptengine_x11.cpp.fontrendering-#214570 2012-02-13 21:41:17.792005290 +0100 -+++ tqt3/src/kernel/qscriptengine_x11.cpp 2012-02-13 21:42:38.785202528 +0100 -@@ -1243,7 +1243,7 @@ - int script = item->script; - Q_ASSERT(script >= TQFont::Devanagari && script <= TQFont::Sinhala); - const unsigned short script_base = 0x0900 + 0x80*(script-TQFont::Devanagari); -- const unsigned short ra = script_base + 0x30; -+ unsigned short ra = script_base + 0x30; //it was const unsigned short ra before modification - const unsigned short halant = script_base + 0x4d; - const unsigned short nukta = script_base + 0x3c; - -@@ -1291,6 +1291,11 @@ - } - #endif - -+ unsigned short *chkAssamese=reordered.data(); -+ if((script == TQFont::Bengali) && (*chkAssamese==0x09F0)) //if it is assamese ra -+ { -+ ra = script_base + 0x70; -+ } - if (len != 1) { - unsigned short *uc = reordered.data(); - bool beginsWithRa = FALSE; diff --git a/redhat/tqt3/tqt3-3.4.0-fontrendering-214371.patch b/redhat/tqt3/tqt3-3.4.0-fontrendering-214371.patch deleted file mode 100644 index 9dca7998d..000000000 --- a/redhat/tqt3/tqt3-3.4.0-fontrendering-214371.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -pruN qt-x11-free-3.3.6.org/src/kernel/qscriptengine_x11.cpp qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp ---- qt-x11-free-3.3.6.org/src/kernel/qscriptengine_x11.cpp 2006-12-04 18:47:11.000000000 +0530 -+++ qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp 2006-12-05 12:05:10.000000000 +0530 -@@ -1412,7 +1412,10 @@ static bool indic_shape_syllable(QOpenTy - toPos += 2; - if (script == QFont::Devanagari || script == QFont::Gujarati || script == QFont::Bengali) { - if (matra_position == Post || matra_position == Split) { -- toPos = matra+1; -+ if (matra_position == Post ) -+ toPos = matra; -+ else -+ toPos = matra+1; - matra -= 2; - } - } else if (script == QFont::Kannada) { diff --git a/redhat/tqt3/tqt3-3.4.0-fontrendering-ml_IN-209097.patch b/redhat/tqt3/tqt3-3.4.0-fontrendering-ml_IN-209097.patch deleted file mode 100644 index cdb543b25..000000000 --- a/redhat/tqt3/tqt3-3.4.0-fontrendering-ml_IN-209097.patch +++ /dev/null @@ -1,60 +0,0 @@ ---- tqt3/src/kernel/qscriptengine_x11.cpp.fontrendering-ml_IN-bz#209097 2012-02-13 19:10:01.000000000 +0100 -+++ tqt3/src/kernel/qscriptengine_x11.cpp 2012-02-13 21:36:07.227917886 +0100 -@@ -871,7 +871,7 @@ - None, None, None, None, - None, None, None, Post, - -- Post, None, Below, None, -+ None, None, None, None, - None, Post, None, None, - None, None, None, None, - None, None, Post, Post, -@@ -1274,6 +1274,16 @@ - int base = 0; - int reph = -1; - -+ //for the special conjuctions about Cons+0d4d+0d30 and Cons+0d40+0d31 of Malayalam -+ bool is_special_conjuction_malayalam = false; -+ -+ if ((len == 3) && -+ ((reordered[2] == 0x0d30) || (reordered[2] == 0x0d31)) && -+ (reordered[1] == 0x0d4d) && -+ ((reordered[0] >= 0x0d15) && (reordered[0] <= 0x0d39))) { -+ is_special_conjuction_malayalam = true; -+ } -+ - #ifdef INDIC_DEBUG - IDEBUG("original:"); - for (i = 0; i < len; i++) { -@@ -1550,6 +1560,15 @@ - reph = i; - } - -+ //for the special conjuctions about Cons+0d4d+0d30 and Cons+0d40+0d31 of Malayalam -+ if (is_special_conjuction_malayalam) { -+ unsigned short temp; -+ -+ temp = reordered[0]; -+ reordered[0] = reordered[2]; -+ reordered[2] = temp; -+ } -+ - if (item->font->stringToCMap((const TQChar *)reordered.data(), len, item->glyphs, item->advances, - &item->num_glyphs, item->flags & TQTextEngine::RightToLeft) != TQFontEngine::NoError) - return FALSE; -@@ -1661,6 +1680,15 @@ - - // halant always applies - -+ //for the special conjuctions about Cons+0d4d+0d30 and Cons+0d40+0d31 of Malayalam -+ if (is_special_conjuction_malayalam) { -+ unsigned int temp; -+ -+ temp = properties[0]; -+ properties[0] = ~PreSubstProperty; -+ properties[2] = temp; -+ } -+ - #ifdef INDIC_DEBUG - { - IDEBUG("OT properties:"); diff --git a/redhat/tqt3/tqt3-3.4.0-fontrendering-ml_IN-217657.patch b/redhat/tqt3/tqt3-3.4.0-fontrendering-ml_IN-217657.patch deleted file mode 100644 index 276441c22..000000000 --- a/redhat/tqt3/tqt3-3.4.0-fontrendering-ml_IN-217657.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- tqt3/src/kernel/qfont_x11.cpp.fontrendering-ml_IN-217657 2012-02-13 19:10:01.000000000 +0100 -+++ tqt3/src/kernel/qfont_x11.cpp 2012-02-13 21:45:39.903520249 +0100 -@@ -712,7 +712,7 @@ - if ( script >= TQFont::Arabic && script <= TQFont::Khmer ) { - // complex script shaping. Have to do some hard work - int from = TQMAX( 0, pos - 8 ); -- int to = TQMIN( (int)str.length(), pos + 8 ); -+ int to = str.length(); - TQConstString cstr( str.unicode()+from, to-from); - TQTextEngine layout( cstr.string(), d ); - layout.itemize( TQTextEngine::WidthOnly ); diff --git a/redhat/tqt3/tqt3-3.4.0-nodebug.patch b/redhat/tqt3/tqt3-3.4.0-nodebug.patch deleted file mode 100644 index ccfd411ff..000000000 --- a/redhat/tqt3/tqt3-3.4.0-nodebug.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- tqt3/src/tools/qgpluginmanager.cpp.ndebug 2012-02-13 19:10:01.000000000 +0100 -+++ tqt3/src/tools/qgpluginmanager.cpp 2012-02-13 19:25:05.653477747 +0100 -@@ -506,10 +506,12 @@ - (*f).latin1(), - (const char*) TQFile::encodeName( old->library() ) ); - } else { -+/* - qWarning("%s: Feature %s already defined in %s!", - (const char*) TQFile::encodeName( old->library() ), - (*f).latin1(), - (const char*) TQFile::encodeName( plugin->library() ) ); -+*/ - } - } - } diff --git a/redhat/tqt3/tqt3-3.4.0-odbc.patch b/redhat/tqt3/tqt3-3.4.0-odbc.patch deleted file mode 100644 index 3a5aea885..000000000 --- a/redhat/tqt3/tqt3-3.4.0-odbc.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- tqt3/src/sql/drivers/odbc/qsql_odbc.cpp.odbc 2012-02-13 19:10:01.000000000 +0100 -+++ tqt3/src/sql/drivers/odbc/qsql_odbc.cpp 2012-02-13 21:47:25.232367854 +0100 -@@ -61,13 +61,13 @@ - #endif - - // newer platform SDKs use SQLLEN instead of SQLINTEGER --#ifdef SQLLEN -+#if defined(SQLLEN) || defined(Q_OS_WIN64) || defined(Q_OS_UNIX) - # define TQSQLLEN SQLLEN - #else - # define TQSQLLEN SQLINTEGER - #endif - --#ifdef SQLULEN -+#if defined(SQLULEN) || defined(Q_OS_WIN64) || defined(Q_OS_UNIX) - # define TQSQLULEN SQLULEN - #else - # define TQSQLULEN SQLUINTEGER diff --git a/redhat/tqt3/tqt3-3.4.0-qt-x11-immodule-unified-qt3.3.5-20060318-resetinputcontext.patch b/redhat/tqt3/tqt3-3.4.0-qt-x11-immodule-unified-qt3.3.5-20060318-resetinputcontext.patch deleted file mode 100644 index 88e066aa9..000000000 --- a/redhat/tqt3/tqt3-3.4.0-qt-x11-immodule-unified-qt3.3.5-20060318-resetinputcontext.patch +++ /dev/null @@ -1,92 +0,0 @@ ---- qt-x11-free-3.3.6/src/widgets/qtextedit.cpp.preedit 2006-06-28 17:18:08.000000000 +0200 -+++ qt-x11-free-3.3.6/src/widgets/qtextedit.cpp 2006-06-28 17:20:09.000000000 +0200 -@@ -1906,9 +1906,6 @@ - - void TQTextEdit::removeSelectedText( int selNum ) - { -- if(selNum != 0) -- resetInputContext(); -- - TQTextCursor c1 = doc->selectionStartCursor( selNum ); - c1.restoreState(); - TQTextCursor c2 = doc->selectionEndCursor( selNum ); -@@ -3171,7 +3168,6 @@ - return; - } - #endif -- resetInputContext(); - TQTextParagraph *p = doc->paragAt( para ); - if ( !p ) - return; -@@ -3198,7 +3194,6 @@ - return; - } - #endif -- resetInputContext(); - for ( int i = 0; i < (int)doc->numSelections(); ++i ) - doc->removeSelection( i ); - -@@ -3240,7 +3235,6 @@ - if ( d->optimMode ) - return; - #endif -- resetInputContext(); - TQTextParagraph *p = doc->paragAt( para ); - if ( !p ) - return; -@@ -3285,7 +3279,6 @@ - if ( isReadOnly() || !doc->commands()->isUndoAvailable() || !undoEnabled ) - return; - -- resetInputContext(); - for ( int i = 0; i < (int)doc->numSelections(); ++i ) - doc->removeSelection( i ); - -@@ -3336,7 +3329,6 @@ - if ( isReadOnly() || !doc->commands()->isRedoAvailable() || !undoEnabled ) - return; - -- resetInputContext(); - for ( int i = 0; i < (int)doc->numSelections(); ++i ) - doc->removeSelection( i ); - -@@ -3450,7 +3442,6 @@ - { - if ( isReadOnly() ) - return; -- resetInputContext(); - normalCopy(); - removeSelectedText(); - updateMicroFocusHint(); -@@ -3938,7 +3929,6 @@ - return; - } - #endif -- resetInputContext(); - if ( !isModified() && isReadOnly() && - this->context() == context && this->text() == text ) - return; -@@ -4112,7 +4102,6 @@ - if ( !p ) - return; - -- resetInputContext(); - if ( index > p->length() - 1 ) - index = p->length() - 1; - -@@ -4169,7 +4158,6 @@ - return; - } - #endif -- resetInputContext(); - if ( doc->hasSelection( selNum ) ) { - doc->removeSelection( selNum ); - repaintChanged(); -@@ -5072,7 +5060,6 @@ - { - if ( dc == doc ) - return; -- resetInputContext(); - doc = dc; - delete cursor; - cursor = new QTextCursor( doc ); diff --git a/redhat/tqt3/tqt3-3.4.0-quiet.patch b/redhat/tqt3/tqt3-3.4.0-quiet.patch deleted file mode 100644 index cb6080ab5..000000000 --- a/redhat/tqt3/tqt3-3.4.0-quiet.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- tqt3/src/kernel/qpixmap_x11.cpp.quiet 2012-02-13 19:10:01.000000000 +0100 -+++ tqt3/src/kernel/qpixmap_x11.cpp 2012-02-13 21:24:08.190653338 +0100 -@@ -394,8 +394,8 @@ - { - #if defined(QT_CHECK_STATE) - if ( qApp->type() == TQApplication::Tty ) { -- qWarning( "TQPixmap: Cannot create a TQPixmap when no GUI " -- "is being used" ); -+// qWarning( "TQPixmap: Cannot create a TQPixmap when no GUI " -+// "is being used" ); - } - #endif - diff --git a/redhat/tqt3/tqt3-3.4.0-uic-nostdlib.patch b/redhat/tqt3/tqt3-3.4.0-uic-nostdlib.patch deleted file mode 100644 index 39a42e6f5..000000000 --- a/redhat/tqt3/tqt3-3.4.0-uic-nostdlib.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- qt-x11-free-3.3.2/tools/designer/uic/main.cpp.sopwith 2004-06-16 17:14:17.000000000 -0400 -+++ qt-x11-free-3.3.2/tools/designer/uic/main.cpp 2004-06-16 17:21:43.000000000 -0400 -@@ -149,6 +149,9 @@ - } else { - trmacro = &opt[1]; - } -+ } else if ( opt == "nostdlib") { -+ TQStringList x; -+ TQApplication::setLibraryPaths(x); - } else if ( opt == "L" ) { - if ( !(n < argc-1) ) { - error = "Missing plugin path."; diff --git a/redhat/tqt3/tqt3-3.4.0-umask.patch b/redhat/tqt3/tqt3-3.4.0-umask.patch deleted file mode 100644 index 9c24f9903..000000000 --- a/redhat/tqt3/tqt3-3.4.0-umask.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- tqt3/src/tools/qsettings.cpp.umask 2012-02-13 19:10:01.000000000 +0100 -+++ tqt3/src/tools/qsettings.cpp 2012-02-13 19:28:00.802555882 +0100 -@@ -997,7 +997,10 @@ - #endif - - TQFile file( filename + ".tmp" ); -- if (! file.open(IO_WriteOnly)) { -+ mode_t old_umask = umask(0022); -+ bool f = file.open(IO_WriteOnly); -+ umask(old_umask); -+ if (! f) { - - #ifdef QT_CHECK_STATE - qWarning("TQSettings::sync: failed to open '%s' for writing", diff --git a/redhat/tqt3/tqt3-3.4.0.spec b/redhat/tqt3/tqt3-3.4.0.spec deleted file mode 100644 index 87d7d2bd4..000000000 --- a/redhat/tqt3/tqt3-3.4.0.spec +++ /dev/null @@ -1,678 +0,0 @@ -# Always install under standard prefix -%define _prefix /usr - -# This allows the legacy RHEL/Fedora patches to apply in TDE version. -%define _default_patch_fuzz 2 - -# The following QT4 packages should NOT be installed to -# allow QT3 compilation (please uninstall them prior to compile) -# qt -# qt-sqlite -# qt-mysql -# qt-x11 -# qt-devel -# ...maybe others !!!! - -%define _default_patch_fuzz 2 - -Summary: The shared library for the Qt 3 GUI toolkit -Version: 3.4.0 -Release: 1%{?dist} -Name: tqt3 - -Obsoletes: qt < 1:%{version}-%{release} -Provides: qt = 1:%{version}-%{release} -Obsoletes: qt3 < 1:%{version}-%{release} -Provides: qt3 = 1:%{version}-%{release} - -License: QPL or GPLv2 or GPLv3 -Group: System Environment/Libraries -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Url: http://www.troll.no -Source0: %{name}-%{version}.tar.gz -Source2: qt.sh -Source3: qt.csh -Source4: designer3.desktop -Source5: assistant3.desktop -Source6: linguist3.desktop -Source7: qtconfig3.desktop - -Patch1: qt-3.3.4-print-CJK.patch -Patch2: tqt3-3.4.0-nodebug.patch -Patch3: qt-3.1.0-makefile.patch -Patch4: tqt3-3.4.0-umask.patch -Patch5: qt-x11-free-3.3.6-strip.patch -Patch7: tqt3-3.4.0-quiet.patch -Patch8: tqt3-3.4.0-embed.patch -Patch12: tqt3-3.4.0-uic-nostdlib.patch -Patch13: qt-x11-free-3.3.6-qfontdatabase_x11.patch -Patch27: tqt3-3.4.0-fontrendering-ml_IN-209097.patch -Patch29: qt-3.3.8-fontrendering-as_IN-209972.patch -Patch31: qt-3.3.6-fontrendering-te_IN-211259.patch -Patch32: tqt3-3.4.0-fontrendering-214371.patch -Patch33: tqt3-3.4.0-fontrendering-#214570.patch -Patch34: qt-3.3.6-fontrendering-ml_IN-209974.patch -Patch35: tqt3-3.4.0-fontrendering-ml_IN-217657.patch -Patch37: qt-3.3.6-fontrendering-gu-228452.patch -Patch38: tqt3-3.4.0-odbc.patch -Patch39: qt-x11-free-3.3.7-arm.patch -Patch40: qt-x11-free-3.3.8b-typo.patch - -# immodule patches -Patch53: tqt3-3.4.0-qt-x11-immodule-unified-qt3.3.5-20060318-resetinputcontext.patch - -# qt-copy patches -Patch110: 0084-compositing-properties.patch - -# upstream patches -Patch200: qt-x11-free-3.3.4-fullscreen.patch - -# TDE 3.5.13 patches -Patch300: qt3-3.3.8.d-updates_zh-tw_translations.patch - -%define qt_dirname qt-3.3 -%define qtdir %{_libdir}/%{qt_dirname} -%define qt_docdir %{_docdir}/qt-devel-%{version} - -%define smp 1 -%define immodule 1 -%define debug 0 - -# MySQL plugins -%define plugin_mysql -plugin-sql-mysql -%define mysql_include_dir %{_includedir}/mysql -%define mysql_lib_dir %{_libdir}/mysql - -# Postgres plugins -%define plugin_psql -plugin-sql-psql - -# ODBC plugins -%define plugin_odbc -plugin-sql-odbc - -# sqlite plugins -%define plugin_sqlite -plugin-sql-sqlite - -%define plugins_style -qt-style-cde -qt-style-motifplus -qt-style-platinum -qt-style-sgi -qt-style-windows -qt-style-compact -qt-imgfmt-png -qt-imgfmt-jpeg -qt-imgfmt-mng -%define plugins %{plugin_mysql} %{plugin_psql} %{plugin_odbc} %{plugin_sqlite} %{plugins_style} - -Requires(post): /sbin/ldconfig -Requires(postun): /sbin/ldconfig -Requires: coreutils -Requires: fontconfig >= 2.0 -Requires: /etc/ld.so.conf.d - -BuildRequires: desktop-file-utils -BuildRequires: libmng-devel -BuildRequires: glibc-devel -BuildRequires: libjpeg-devel -BuildRequires: libpng-devel -BuildRequires: zlib-devel -BuildRequires: giflib-devel -BuildRequires: perl -BuildRequires: sed -BuildRequires: findutils -BuildRequires: cups-devel -BuildRequires: tar -BuildRequires: freetype-devel -BuildRequires: fontconfig-devel -BuildRequires: libXrender-devel -BuildRequires: libXrandr-devel -BuildRequires: libXcursor-devel -BuildRequires: libXinerama-devel -BuildRequires: libXft-devel -BuildRequires: libXext-devel -BuildRequires: libX11-devel -BuildRequires: libSM-devel -BuildRequires: libICE-devel -BuildRequires: libXt-devel -BuildRequires: libXmu-devel -BuildRequires: libXi-devel -BuildRequires: xorg-x11-proto-devel -BuildRequires: mesa-libGL-devel -BuildRequires: mesa-libGLU-devel -BuildRequires: desktop-file-utils -BuildRequires: mysql-devel -BuildRequires: postgresql-devel -BuildRequires: unixODBC-devel -BuildRequires: sqlite-devel - - -%package config -Summary: Graphical configuration tool for programs using Qt 3 -Group: User Interface/Desktops -Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} -Obsoletes: qt-config < 1:%{version}-%{release} -Provides: qt-config = 1:%{version}-%{release} -Obsoletes: qt3-config < 1:%{version}-%{release} -Provides: qt3-config = 1:%{version}-%{release} - - -%package devel -Summary: Development files for the Qt 3 GUI toolkit -Group: Development/Libraries -Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} -Requires: freetype-devel -Requires: fontconfig-devel -Requires: libXrender-devel -Requires: libXrandr-devel -Requires: libXcursor-devel -Requires: libXinerama-devel -Requires: libXft-devel -Requires: libXext-devel -Requires: libX11-devel -Requires: libSM-devel -Requires: libICE-devel -Requires: libXt-devel -Requires: xorg-x11-proto-devel -Requires: libpng-devel -Requires: libjpeg-devel -Requires: libmng-devel -Requires: mesa-libGL-devel -Requires: mesa-libGLU-devel - -Obsoletes: qt-devel < 1:%{version}-%{release} -Provides: qt-devel = 1:%{version}-%{release} -Obsoletes: qt3-devel < 1:%{version}-%{release} -Provides: qt3-devel = 1:%{version}-%{release} - - -%package devel-docs -Summary: Documentation for the Qt 3 GUI toolkit -Group: Development/Libraries -Requires: %{name}-devel = %{?epoch:%{epoch}:}%{version}-%{release} - -Obsoletes: qt-devel-docs < 1:%{version}-%{release} -Provides: qt-devel-docs = 1:%{version}-%{release} -Obsoletes: qt3-devel-docs < 1:%{version}-%{release} -Provides: qt3-devel-docs = 1:%{version}-%{release} - - -%package ODBC -Summary: ODBC drivers for Qt 3's SQL classes -Group: System Environment/Libraries -Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} - -Obsoletes: qt-ODBC < 1:%{version}-%{release} -Provides: qt-ODBC = 1:%{version}-%{release} -Obsoletes: qt3-ODBC < 1:%{version}-%{release} -Provides: qt3-ODBC = 1:%{version}-%{release} - - -%package MySQL -Summary: MySQL drivers for Qt 3's SQL classes -Group: System Environment/Libraries -Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} - -Obsoletes: qt-MySQL < 1:%{version}-%{release} -Provides: qt-MySQL = 1:%{version}-%{release} -Obsoletes: qt3-MySQL < 1:%{version}-%{release} -Provides: qt3-MySQL = 1:%{version}-%{release} - - -%package PostgreSQL -Summary: PostgreSQL drivers for Qt 3's SQL classes -Group: System Environment/Libraries -Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} - -Obsoletes: qt-PostgreSQL < 1:%{version}-%{release} -Provides: qt-PostgreSQL = 1:%{version}-%{release} -Obsoletes: qt3-PostgreSQL < 1:%{version}-%{release} -Provides: qt3-PostgreSQL = 1:%{version}-%{release} - - -%package sqlite -Summary: sqlite drivers for Qt 3's SQL classes -Group: System Environment/Libraries -Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} - -Obsoletes: qt-sqlite < 1:%{version}-%{release} -Provides: qt-sqlite = 1:%{version}-%{release} -Obsoletes: qt3-sqlite < 1:%{version}-%{release} -Provides: qt3-sqlite = 1:%{version}-%{release} - - -%package designer -Summary: In3erface designer (IDE) for the Qt 3 toolkit -Group: Development/Tools -Requires: %{name}-devel = %{?epoch:%{epoch}:}%{version}-%{release} - -Obsoletes: qt-designer < 1:%{version}-%{release} -Provides: qt-designer = 1:%{version}-%{release} -Obsoletes: qt3-designer < 1:%{version}-%{release} -Provides: qt3-designer = 1:%{version}-%{release} - - -%description -Qt is a GUI software toolkit which simplifies the task of writing and -maintaining GUI (Graphical User Interface) applications -for the X Window System. - -Qt is written in C++ and is fully object-oriented. - -This package contains the shared library needed to run Qt 3 -applications, as well as the README files for Qt 3. - - -%description config -Qt is a GUI software toolkit which simplifies the task of writing and -maintaining GUI (Graphical User Interface) applications -for the X Window System. - -Qt is written in C++ and is fully object-oriented. - -This package contains a graphical configuration tool for programs using Qt 3. - - -%description devel -The %{name}-devel package contains the files necessary to develop -applications using the Qt GUI toolkit: the header files, the Qt meta -object compiler. - -Install %{name}-devel if you want to develop GUI applications using the Qt 3 -toolkit. - - -%description devel-docs -The %{name}-devel-docs package contains the man pages, the HTML documentation and -example programs for Qt 3. - - -%description ODBC -ODBC driver for Qt 3's SQL classes (QSQL) - - -%description MySQL -MySQL driver for Qt 3's SQL classes (QSQL) - - -%description PostgreSQL -PostgreSQL driver for Qt 3's SQL classes (QSQL) - - -%description sqlite -sqlite driver for Qt 3's SQL classes (QSQL) - - -%description designer -The %{name}-designer package contains an User Interface designer tool -for the Qt 3 toolkit. - - -%prep -%setup -q -n %{name} -%patch1 -p1 -b .cjk -%patch2 -p1 -b .ndebug -%patch3 -p1 -b .makefile -%patch4 -p1 -b .umask -%patch5 -p1 -%patch7 -p1 -b .quiet -%patch8 -p1 -b .qembed -%patch12 -p1 -b .nostdlib -%patch13 -p1 -b .fonts -%patch27 -p1 -b .fontrendering-ml_IN-bz#209097 -%patch29 -p1 -b .fontrendering-as_IN-bz#209972 -%patch31 -p1 -b .fontrendering-te_IN-bz#211259 -%patch32 -p1 -b .fontrendering-bz#214371 -%patch33 -p1 -b .fontrendering-#214570 -%patch34 -p1 -b .fontrendering-#209974 -%patch35 -p1 -b .fontrendering-ml_IN-217657 -%patch37 -p1 -b .fontrendering-gu-228452 -%patch38 -p1 -b .odbc -# it's not 100% clear to me if this is safe for all archs -- Rex -%ifarch armv5tel -%patch39 -p1 -b .arm -%endif -%patch40 -p1 - -# immodule patches -%if %{immodule} -%patch53 -p1 -b .resetinputcontext -%endif - -# qt-copy patches -%patch110 -p0 -b .0084-compositing-properties - -# upstream patches -%patch200 -p1 -b .fullscreen - -# TDE 3.5.13 patches -%patch300 -p1 - -# convert to UTF-8 -iconv -f iso-8859-1 -t utf-8 < doc/man/man3/qdial.3qt > doc/man/man3/qdial.3qt_ -mv doc/man/man3/qdial.3qt_ doc/man/man3/qdial.3qt - -%build -export QTDIR=`/bin/pwd` -export LD_LIBRARY_PATH="$QTDIR/lib:$LD_LIBRARY_PATH" -export PATH="$QTDIR/bin:$PATH" -export QTDEST=%{qtdir} - -%if %{smp} - export SMP_MFLAGS="%{?_smp_mflags}" -%endif - -%if %{immodule} - sh ./make-symlinks.sh -%endif - -# set correct X11 prefix -perl -pi -e "s,QMAKE_LIBDIR_X11.*,QMAKE_LIBDIR_X11\t=," mkspecs/*/qmake.conf -perl -pi -e "s,QMAKE_INCDIR_X11.*,QMAKE_INCDIR_X11\t=," mkspecs/*/qmake.conf -perl -pi -e "s,QMAKE_INCDIR_OPENGL.*,QMAKE_INCDIR_OPENGL\t=," mkspecs/*/qmake.conf -perl -pi -e "s,QMAKE_LIBDIR_OPENGL.*,QMAKE_LIBDIR_OPENGL\t=," mkspecs/*/qmake.conf - -# don't use rpath -perl -pi -e "s|-Wl,-rpath,| |" mkspecs/*/qmake.conf - -perl -pi -e "s|-O2|$INCLUDES %{optflags} -fno-strict-aliasing|g" mkspecs/*/qmake.conf - -# set correct lib path -if [ "%{_lib}" == "lib64" ] ; then - perl -pi -e "s,/usr/lib /lib,/usr/%{_lib} /%{_lib},g" config.tests/{unix,x11}/*.test - perl -pi -e "s,/lib /usr/lib,/%{_lib} /usr/%{_lib},g" config.tests/{unix,x11}/*.test -fi - -# build shared, threaded (default) libraries -echo yes | ./configure \ - -prefix $QTDEST \ - -docdir %{qt_docdir} \ -%if %{_lib} == lib64 - -platform linux-g++-64 \ -%else - -platform linux-g++ \ -%endif -%if %{debug} - -debug \ -%else - -release \ -%endif - -shared \ - -largefile \ - -qt-gif \ - -system-zlib \ - -system-libpng \ - -system-libmng \ - -system-libjpeg \ - -no-exceptions \ - -enable-styles \ - -enable-tools \ - -enable-kernel \ - -enable-widgets \ - -enable-dialogs \ - -enable-iconview \ - -enable-workspace \ - -enable-network \ - -enable-canvas \ - -enable-table \ - -enable-xml \ - -enable-opengl \ - -enable-sql \ - -qt-style-motif \ - %{plugins} \ - -stl \ - -thread \ - -cups \ - -sm \ - -xinerama \ - -xrender \ - -xkb \ - -ipv6 \ - -dlopen-opengl \ - -xft \ - -tablet - -make $SMP_MFLAGS src-qmake - -# build sqlite plugin -pushd plugins/src/sqldrivers/sqlite -qmake -o Makefile sqlite.pro -popd - -# build psql plugin -pushd plugins/src/sqldrivers/psql -qmake -o Makefile "INCLUDEPATH+=%{_includedir}/pgsql %{_includedir}/pgsql/server %{_includedir}/pgsql/internal" "LIBS+=-lpq" psql.pro -popd - -# build mysql plugin -pushd plugins/src/sqldrivers/mysql -qmake -o Makefile "INCLUDEPATH+=%{mysql_include_dir}" "LIBS+=-L%{mysql_lib_dir} -lmysqlclient" mysql.pro -popd - -# build odbc plugin -pushd plugins/src/sqldrivers/odbc -qmake -o Makefile "LIBS+=-lodbc" odbc.pro -popd - -make $SMP_MFLAGS src-moc -make $SMP_MFLAGS sub-src -make $SMP_MFLAGS sub-tools UIC="$QTDIR/bin/uic -nostdlib -L $QTDIR/plugins" - -%install -rm -rf %{buildroot} - -export QTDIR=`/bin/pwd` -export LD_LIBRARY_PATH="$QTDIR/lib:$LD_LIBRARY_PATH" -export PATH="$QTDIR/bin:$PATH" -export QTDEST=%{qtdir} - -make install INSTALL_ROOT=%{buildroot} - -for i in findtr qt20fix qtrename140 lrelease lupdate ; do - install bin/$i %{buildroot}%{qtdir}/bin/ -done - -mkdir -p %{buildroot}%{_libdir}/pkgconfig/ -mv %{buildroot}%{qtdir}/lib/pkgconfig/*.pc %{buildroot}%{_libdir}/pkgconfig/ - -# install man pages -mkdir -p %{buildroot}%{_mandir} -cp -fR doc/man/* %{buildroot}%{_mandir}/ - -# clean up -make -C tutorial clean -make -C examples clean - -# Make sure the examples can be built outside the source tree. -# Our binaries fulfill all requirements, so... -perl -pi -e "s,^DEPENDPATH.*,,g;s,^REQUIRES.*,,g" `find examples -name "*.pro"` - -# don't include Makefiles of qt examples/tutorials -find examples -name "Makefile" | xargs rm -f -find examples -name "*.obj" | xargs rm -rf -find examples -name "*.moc" | xargs rm -rf -find tutorial -name "Makefile" | xargs rm -f - -for a in */*/Makefile ; do - sed 's|^SYSCONF_MOC.*|SYSCONF_MOC = %{qtdir}/bin/moc|' < $a > ${a}.2 - mv -v ${a}.2 $a -done - -mkdir -p %{buildroot}/etc/profile.d -install -m 644 %{SOURCE2} %{SOURCE3} %{buildroot}/etc/profile.d/ - -# Add desktop files -mkdir -p %{buildroot}%{_datadir}/applications -desktop-file-install \ - --dir %{buildroot}%{_datadir}/applications \ - --vendor="qt" \ - %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} - -# Patch qmake to use qt-mt unconditionally -perl -pi -e "s,-lqt ,-lqt-mt ,g;s,-lqt$,-lqt-mt,g" %{buildroot}%{qtdir}/mkspecs/*/qmake.conf - -# remove broken links -rm -f %{buildroot}%{qtdir}/mkspecs/default/linux-g++* -rm -f %{buildroot}%{qtdir}/lib/*.la - -mkdir -p %{buildroot}/etc/ld.so.conf.d -echo "%{qtdir}/lib" > %{buildroot}/etc/ld.so.conf.d/qt-%{_arch}.conf - -# install icons -mkdir %{buildroot}%{_datadir}/pixmaps -install -m 644 tools/assistant/images/qt.png %{buildroot}%{_datadir}/pixmaps/qtconfig3.png -install -m 644 tools/assistant/images/designer.png %{buildroot}%{_datadir}/pixmaps/designer3.png -install -m 644 tools/assistant/images/assistant.png %{buildroot}%{_datadir}/pixmaps/assistant3.png -install -m 644 tools/assistant/images/linguist.png %{buildroot}%{_datadir}/pixmaps/linguist3.png - -# own style directory -mkdir -p %{buildroot}%{qtdir}/plugins/styles - -%clean -rm -rf %{buildroot} - -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig - -%files -%defattr(-,root,root,-) -%doc FAQ LICENSE* README* changes* -%dir %{qtdir} -%dir %{qtdir}/bin -%dir %{qtdir}/lib -%dir %{qtdir}/plugins -%dir %{qtdir}/plugins/sqldrivers -%dir %{qtdir}/plugins/styles -%{qtdir}/translations -%{qtdir}/plugins/designer/ -%if %{immodule} -%{qtdir}/plugins/inputmethods -%endif -%config /etc/profile.d/* -/etc/ld.so.conf.d/* -%{qtdir}/lib/libtqui.so.* -%{qtdir}/lib/libtqt*.so.* - -# TQT 3.4.0: WTF is this file ?? -%exclude %{_mandir}/README - -%files config -%defattr(-,root,root,-) -%{qtdir}/bin/qtconfig -%{_datadir}/applications/*qtconfig*.desktop -%{_datadir}/pixmaps/qtconfig3.png - -%files devel -%defattr(-,root,root,-) -%{qt_docdir}/ -%{qtdir}/bin/moc -%{qtdir}/bin/uic -%{qtdir}/bin/findtr -%{qtdir}/bin/qt20fix -%{qtdir}/bin/qtrename140 -%{qtdir}/bin/assistant -%{qtdir}/bin/qm2ts -%{qtdir}/bin/qmake -%{qtdir}/bin/qembed -%{qtdir}/bin/linguist -%{qtdir}/bin/lupdate -%{qtdir}/bin/lrelease -%{qtdir}/include -%{qtdir}/mkspecs -%{qtdir}/lib/libtqt*.so -%{qtdir}/lib/libtqui.so -%{qtdir}/lib/libeditor.a -%{qtdir}/lib/libdesigner*.a -%{qtdir}/lib/libqassistantclient.a -%{qtdir}/lib/*.prl -%{qtdir}/phrasebooks -%{_libdir}/pkgconfig/* -%{_datadir}/applications/*linguist*.desktop -%{_datadir}/applications/*assistant*.desktop -%{_datadir}/pixmaps/linguist3.png -%{_datadir}/pixmaps/assistant3.png - -# QT 3.3.8.D (TDE): 4 binaries have appeared -%{qtdir}/bin/createcw -%{qtdir}/bin/makeqpf -%{qtdir}/bin/mergetr -%{qtdir}/bin/msg2qm - -# QT 3.3.8.D (TDE): removes lots of unnecessary include files -# (where do they come from ??? They were not in 3.3.8b !) -%exclude %{qtdir}/include/btree.h -%exclude %{qtdir}/include/crc32.h -%exclude %{qtdir}/include/debian_qsql_odbc.h -%exclude %{qtdir}/include/deflate.h -%exclude %{qtdir}/include/ftglue.h -%exclude %{qtdir}/include/ftxgdef.h -%exclude %{qtdir}/include/ftxgpos.h -%exclude %{qtdir}/include/ftxgsub.h -%exclude %{qtdir}/include/ftxopen.h -%exclude %{qtdir}/include/ftxopenf.h -%exclude %{qtdir}/include/hash.h -%exclude %{qtdir}/include/inffast.h -%exclude %{qtdir}/include/inffixed.h -%exclude %{qtdir}/include/inflate.h -%exclude %{qtdir}/include/inftrees.h -%exclude %{qtdir}/include/jchuff.h -%exclude %{qtdir}/include/jconfig.h -%exclude %{qtdir}/include/jdct.h -%exclude %{qtdir}/include/jdhuff.h -%exclude %{qtdir}/include/jerror.h -%exclude %{qtdir}/include/jinclude.h -%exclude %{qtdir}/include/jmemsys.h -%exclude %{qtdir}/include/jmorecfg.h -%exclude %{qtdir}/include/jversion.h -%exclude %{qtdir}/include/moc_yacc.h -%exclude %{qtdir}/include/opcodes.h -%exclude %{qtdir}/include/os.h -%exclude %{qtdir}/include/otlbuffer.h -%exclude %{qtdir}/include/pager.h -%exclude %{qtdir}/include/parse.h -%exclude %{qtdir}/include/pngasmrd.h -%exclude %{qtdir}/include/pngconf.h -%exclude %{qtdir}/include/sqlite.h -%exclude %{qtdir}/include/sqliteInt.h -%exclude %{qtdir}/include/trees.h -%exclude %{qtdir}/include/vdbe.h -%exclude %{qtdir}/include/vdbeInt.h -%exclude %{qtdir}/mkspecs/linux-g++-sparc - -%files devel-docs -%defattr(-,root,root,-) -%doc examples -%doc tutorial -%{_mandir}/*/* - -%files sqlite -%defattr(-,root,root,-) -%{qtdir}/plugins/sqldrivers/libqsqlite.so - -%files ODBC -%defattr(-,root,root,-) -%{qtdir}/plugins/sqldrivers/libqsqlodbc.so - -%files PostgreSQL -%defattr(-,root,root,-) -%{qtdir}/plugins/sqldrivers/libqsqlpsql.so - -%files MySQL -%defattr(-,root,root,-) -%{qtdir}/plugins/sqldrivers/libqsqlmysql.so - -%files designer -%defattr(-,root,root,-) -%{qtdir}/templates -%{qtdir}/bin/designer -%{_datadir}/applications/*designer*.desktop -%{_datadir}/pixmaps/designer3.png - - -%changelog -* Mon Feb 13 2012 Francois Andriot - 3.4.0-1 -- Initial build for TDE R14 -- Renames 'qt3' to 'tqt3' -- Spec file based on 'qt3-3.3.8b-30' from RHEL 6 - -* Sun Dec 18 2011 Francois Andriot - 3.3.8.d-3 -- Updates zh_TW translations, thanks to Wei-Lun Chao . - -* Thu Nov 03 2011 Francois Andriot - 3.3.8.d-2 -- Add missing BuildRequires - -* Fri Sep 02 2011 Francois Andriot - 3.3.8.d-1 -- Initial build for RHEL 6, RHEL 5, and Fedora 15 -- Switch to Trinity Version -- Spec file based on RHEL 6 'qt3-3.3.8b-29' -- cgit v1.2.1 From 39c223339c063a6060b64c2e03b10b8578517dd8 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 16 Feb 2012 16:11:00 -0600 Subject: Add libcaldav and libcarddav packaging files to Ubuntu and Debian --- .../dependencies/libcaldav/debian/README.Debian | 45 +++++++++ .../dependencies/libcaldav/debian/README.fallback | 23 +++++ .../lenny/dependencies/libcaldav/debian/changelog | 29 ++++++ debian/lenny/dependencies/libcaldav/debian/compat | 1 + debian/lenny/dependencies/libcaldav/debian/control | 23 +++++ .../lenny/dependencies/libcaldav/debian/copyright | 13 +++ debian/lenny/dependencies/libcaldav/debian/rules | 105 +++++++++++++++++++++ debian/lenny/dependencies/libcaldav/debian/watch | 2 + .../dependencies/libcarddav/debian/README.Debian | 45 +++++++++ .../dependencies/libcarddav/debian/README.fallback | 23 +++++ .../lenny/dependencies/libcarddav/debian/changelog | 17 ++++ debian/lenny/dependencies/libcarddav/debian/compat | 1 + .../lenny/dependencies/libcarddav/debian/control | 23 +++++ .../lenny/dependencies/libcarddav/debian/copyright | 14 +++ debian/lenny/dependencies/libcarddav/debian/rules | 105 +++++++++++++++++++++ debian/lenny/dependencies/libcarddav/debian/watch | 2 + .../dependencies/libcaldav/debian/README.Debian | 45 +++++++++ .../dependencies/libcaldav/debian/README.fallback | 23 +++++ .../dependencies/libcaldav/debian/changelog | 29 ++++++ .../squeeze/dependencies/libcaldav/debian/compat | 1 + .../squeeze/dependencies/libcaldav/debian/control | 23 +++++ .../dependencies/libcaldav/debian/copyright | 13 +++ debian/squeeze/dependencies/libcaldav/debian/rules | 105 +++++++++++++++++++++ debian/squeeze/dependencies/libcaldav/debian/watch | 2 + .../dependencies/libcarddav/debian/README.Debian | 45 +++++++++ .../dependencies/libcarddav/debian/README.fallback | 23 +++++ .../dependencies/libcarddav/debian/changelog | 17 ++++ .../squeeze/dependencies/libcarddav/debian/compat | 1 + .../squeeze/dependencies/libcarddav/debian/control | 23 +++++ .../dependencies/libcarddav/debian/copyright | 14 +++ .../squeeze/dependencies/libcarddav/debian/rules | 105 +++++++++++++++++++++ .../squeeze/dependencies/libcarddav/debian/watch | 2 + .../dependencies/libcaldav/debian/README.Debian | 45 +++++++++ .../dependencies/libcaldav/debian/README.fallback | 23 +++++ .../dependencies/libcaldav/debian/changelog | 29 ++++++ .../maverick/dependencies/libcaldav/debian/compat | 1 + .../maverick/dependencies/libcaldav/debian/control | 23 +++++ .../dependencies/libcaldav/debian/copyright | 13 +++ .../maverick/dependencies/libcaldav/debian/rules | 105 +++++++++++++++++++++ .../maverick/dependencies/libcaldav/debian/watch | 2 + .../dependencies/libcarddav/debian/README.Debian | 45 +++++++++ .../dependencies/libcarddav/debian/README.fallback | 23 +++++ .../dependencies/libcarddav/debian/changelog | 17 ++++ .../maverick/dependencies/libcarddav/debian/compat | 1 + .../dependencies/libcarddav/debian/control | 23 +++++ .../dependencies/libcarddav/debian/copyright | 14 +++ .../maverick/dependencies/libcarddav/debian/rules | 105 +++++++++++++++++++++ .../maverick/dependencies/libcarddav/debian/watch | 2 + 48 files changed, 1413 insertions(+) create mode 100644 debian/lenny/dependencies/libcaldav/debian/README.Debian create mode 100644 debian/lenny/dependencies/libcaldav/debian/README.fallback create mode 100644 debian/lenny/dependencies/libcaldav/debian/changelog create mode 100644 debian/lenny/dependencies/libcaldav/debian/compat create mode 100644 debian/lenny/dependencies/libcaldav/debian/control create mode 100644 debian/lenny/dependencies/libcaldav/debian/copyright create mode 100755 debian/lenny/dependencies/libcaldav/debian/rules create mode 100644 debian/lenny/dependencies/libcaldav/debian/watch create mode 100644 debian/lenny/dependencies/libcarddav/debian/README.Debian create mode 100644 debian/lenny/dependencies/libcarddav/debian/README.fallback create mode 100644 debian/lenny/dependencies/libcarddav/debian/changelog create mode 100644 debian/lenny/dependencies/libcarddav/debian/compat create mode 100644 debian/lenny/dependencies/libcarddav/debian/control create mode 100644 debian/lenny/dependencies/libcarddav/debian/copyright create mode 100755 debian/lenny/dependencies/libcarddav/debian/rules create mode 100644 debian/lenny/dependencies/libcarddav/debian/watch create mode 100644 debian/squeeze/dependencies/libcaldav/debian/README.Debian create mode 100644 debian/squeeze/dependencies/libcaldav/debian/README.fallback create mode 100644 debian/squeeze/dependencies/libcaldav/debian/changelog create mode 100644 debian/squeeze/dependencies/libcaldav/debian/compat create mode 100644 debian/squeeze/dependencies/libcaldav/debian/control create mode 100644 debian/squeeze/dependencies/libcaldav/debian/copyright create mode 100755 debian/squeeze/dependencies/libcaldav/debian/rules create mode 100644 debian/squeeze/dependencies/libcaldav/debian/watch create mode 100644 debian/squeeze/dependencies/libcarddav/debian/README.Debian create mode 100644 debian/squeeze/dependencies/libcarddav/debian/README.fallback create mode 100644 debian/squeeze/dependencies/libcarddav/debian/changelog create mode 100644 debian/squeeze/dependencies/libcarddav/debian/compat create mode 100644 debian/squeeze/dependencies/libcarddav/debian/control create mode 100644 debian/squeeze/dependencies/libcarddav/debian/copyright create mode 100755 debian/squeeze/dependencies/libcarddav/debian/rules create mode 100644 debian/squeeze/dependencies/libcarddav/debian/watch create mode 100644 ubuntu/maverick/dependencies/libcaldav/debian/README.Debian create mode 100644 ubuntu/maverick/dependencies/libcaldav/debian/README.fallback create mode 100644 ubuntu/maverick/dependencies/libcaldav/debian/changelog create mode 100644 ubuntu/maverick/dependencies/libcaldav/debian/compat create mode 100644 ubuntu/maverick/dependencies/libcaldav/debian/control create mode 100644 ubuntu/maverick/dependencies/libcaldav/debian/copyright create mode 100755 ubuntu/maverick/dependencies/libcaldav/debian/rules create mode 100644 ubuntu/maverick/dependencies/libcaldav/debian/watch create mode 100644 ubuntu/maverick/dependencies/libcarddav/debian/README.Debian create mode 100644 ubuntu/maverick/dependencies/libcarddav/debian/README.fallback create mode 100644 ubuntu/maverick/dependencies/libcarddav/debian/changelog create mode 100644 ubuntu/maverick/dependencies/libcarddav/debian/compat create mode 100644 ubuntu/maverick/dependencies/libcarddav/debian/control create mode 100644 ubuntu/maverick/dependencies/libcarddav/debian/copyright create mode 100755 ubuntu/maverick/dependencies/libcarddav/debian/rules create mode 100644 ubuntu/maverick/dependencies/libcarddav/debian/watch diff --git a/debian/lenny/dependencies/libcaldav/debian/README.Debian b/debian/lenny/dependencies/libcaldav/debian/README.Debian new file mode 100644 index 000000000..9adebeacc --- /dev/null +++ b/debian/lenny/dependencies/libcaldav/debian/README.Debian @@ -0,0 +1,45 @@ + Imlib Version 11 + ---------------- + +Imlib11 is linked with libpng12, which began life as libpng3. This is +in accordance with the practice of Redhat. The GDK version of imlib, +being part of GNOME 1, has remained linked with libpng2. + +No library that links with this version of Imlib may also link with +libpng2. + +No application that links with this version of Imlib may link with +libpng2, neither directly nor through a third library. + +If you accidentally link an application with imlib and libpng2, the +application may behave in unpredictible ways, possibly crashing, +possibly emitting warnings similar to the following: + + libpng warning: Application was compiled with png.h from libpng-1.2.1 + libpng warning: Application is running with png.c from libpng-1.0.12 + libpng error: Incompatible libpng version in application and library + + + + Imlib Version 1 + --------------- + +Imlib1 and gdk-imlib1 are compiled against libpng2. If you need to +build with libpng2, install the package imlib1-dev or gdk-imlib1-dev +as appropriate. + + + The Palette File + ---------------- + +The system Imlib/Gdk-Imlib palette file was moved from the directory +`/etc/im' to `/etc/imlib'. This move may cause problems for users who +have a `.imrc' file in their home directory since that file may +contain a reference to the old location of the palette file. To +correct this problem, the "PaletteFile" entry should look like: + + PaletteFile /etc/imlib/im_palette.pal + +I believe this changed happened in late 1999. + + -- Steve M. Robbins , Sun Oct 19 15:11:42 2003 diff --git a/debian/lenny/dependencies/libcaldav/debian/README.fallback b/debian/lenny/dependencies/libcaldav/debian/README.fallback new file mode 100644 index 000000000..1b41c225f --- /dev/null +++ b/debian/lenny/dependencies/libcaldav/debian/README.fallback @@ -0,0 +1,23 @@ + Imlib Image Conversion + ---------------------- + +The imlib and gdk-imlib libraries have a number of built-in image +conversion routines, and are capable of loading or saving in *at +least* the following formats: GIF, JPEG, PNG, TIFF, PS, BMP, XPM, and +PPM. + +Prior to version 1.9.13, imlib and gdk-imlib could use an external +program, such as Imagemagick's "convert", to load or save images +in formats not handled internally to Imlib. + + + + "All fallbacks failed." + ----------------------- + +This message indicates that the file you wished to load is not handled +by Imlib. + +The remedy is to convert the image file by hand using, for example, +Imagemagick's "convert" command: "convert foo.rgb foo.png". Then +you'll have to fix up the application to use the new filename instead. diff --git a/debian/lenny/dependencies/libcaldav/debian/changelog b/debian/lenny/dependencies/libcaldav/debian/changelog new file mode 100644 index 000000000..13d81ef1d --- /dev/null +++ b/debian/lenny/dependencies/libcaldav/debian/changelog @@ -0,0 +1,29 @@ +libcaldav (0.6.5-2debian2) maverick; urgency=low + + * Fixed RECURRENCE-ID modification with Zimbra CalDAV resources + + -- Timothy Pearson Sat, 28 Aug 2010 16:34:00 -0600 + +libcaldav (0.6.4-0debian0) lenny; urgency=low + + * Added VTODO support + + -- Timothy Pearson Fri, 27 Aug 2010 18:53:00 -0600 + +libcaldav (0.6.3-0debian1) lenny; urgency=low + + * Multiple VEVENT blocks in a single CardDAV response are now returned correctly + + -- Timothy Pearson Thu, 26 Aug 2010 15:40:00 -0600 + +libcaldav (0.6.2-0debian0) lenny; urgency=low + + * Added "Connection: close" to the list of headers sent, so that server keep-alive (which causes long delays) is disabled. + + -- Timothy Pearson Sun, 18 Jul 2010 15:29:00 -0600 + +libcaldav (0.6.1-1debian0) lenny; urgency=low + + * Initial Lenny build + + -- Timothy Pearson Mon, 31 May 2010 01:55:00 -0600 diff --git a/debian/lenny/dependencies/libcaldav/debian/compat b/debian/lenny/dependencies/libcaldav/debian/compat new file mode 100644 index 000000000..7ed6ff82d --- /dev/null +++ b/debian/lenny/dependencies/libcaldav/debian/compat @@ -0,0 +1 @@ +5 diff --git a/debian/lenny/dependencies/libcaldav/debian/control b/debian/lenny/dependencies/libcaldav/debian/control new file mode 100644 index 000000000..6051e6de1 --- /dev/null +++ b/debian/lenny/dependencies/libcaldav/debian/control @@ -0,0 +1,23 @@ +Source: libcaldav +Build-Depends: debhelper (>= 5), quilt, libcurl4-gnutls-dev (>= 7.19), libglib2.0-dev, automake, autoconf, libtool, libltdl-dev +Section: graphics +Priority: optional +Maintainer: Timothy Pearson +Standards-Version: 3.8.3 + +Package: libcaldav +Architecture: any +Section: libs +Depends: ${shlibs:Depends} +Description: + libcaldav provides a C interface for caldav PIM clients + +Package: libcaldav-dev +Architecture: any +Section: libdevel +Depends: libcaldav (= ${binary:Version}) +Description: + libcaldav provides a C interface for caldav PIM clients + . + This is the development package containing header files and link + libraries for libcaldav. diff --git a/debian/lenny/dependencies/libcaldav/debian/copyright b/debian/lenny/dependencies/libcaldav/debian/copyright new file mode 100644 index 000000000..a0ce37b8b --- /dev/null +++ b/debian/lenny/dependencies/libcaldav/debian/copyright @@ -0,0 +1,13 @@ +This package was debianized by Timothy Pearson (kb9vqf@pearsoncomputing.net) + +It was downloaded from http://sourceforge.net/projects/libcaldav/ + +Copyright: + +Copyright 2008 by Michael Rasmussen (mir@datanom.net) + +License: + +All libraries in this package are released under the GPL +(/usr/share/common-licenses/GPL-3). The programs and examples are +under the GPL (/usr/share/common-licenses/GPL). diff --git a/debian/lenny/dependencies/libcaldav/debian/rules b/debian/lenny/dependencies/libcaldav/debian/rules new file mode 100755 index 000000000..e9afd40a5 --- /dev/null +++ b/debian/lenny/dependencies/libcaldav/debian/rules @@ -0,0 +1,105 @@ +#!/usr/bin/make -f + +include /usr/share/quilt/quilt.make + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +# This has to be exported to make some magic below work. +export DH_OPTIONS + +export CFLAGS = -g + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) +CFLAGS += -O0 +else +CFLAGS += -O3 +endif + +# Suppress accidental execution of the auto-* tools, c.f. +# http://lists.debian.org/debian-devel/2001/debian-devel-200111/msg01416.html +no_auto_tools = ACLOCAL="`pwd`/missing aclocal" \ + AUTOCONF="`pwd`/missing autoconf" \ + AUTOMAKE="`pwd`/missing automake" \ + AUTOHEADER="`pwd`/missing autoheader" + +make_flags = moduledir=/usr/lib/gdk-imlib2 $(no_auto_tools) + +build: $(QUILT_STAMPFN) build-stamp +build-stamp: + dh_testdir + ./autogen.sh + ./configure --prefix=/usr \ + --mandir=/usr/share/man + $(MAKE) $(make_flags) + + touch build-stamp + +clean: unpatch + dh_testdir + dh_testroot + rm -f build-stamp + + [ ! -f Makefile ] || $(MAKE) clean + [ ! -f Makefile ] || $(MAKE) distclean + + dh_clean + +install: DH_OPTIONS= +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + $(MAKE) $(make_flags) DESTDIR=`pwd`/debian/tmp install + + dh_movefiles + + # Library package + dh_install -plibcaldav --autodest debian/tmp/usr/lib/libcaldav.so* + + # Developer package + mv debian/tmp/usr/include/libcaldav* debian/tmp/usr/include/libcaldav + dh_install -plibcaldav-dev --autodest debian/tmp/usr/lib/libcaldav.la + dh_install -plibcaldav-dev --autodest debian/tmp/usr/include/libcaldav/* + dh_install -plibcaldav-dev --autodest debian/tmp/usr/lib/pkgconfig/* + +# This single target is used to build all the packages, all at once, or +# one at a time. So keep in mind: any options passed to commands here will +# affect _all_ packages. Anything you want to only affect one package +# should be put in another target, such as the install target. +binary-common: + dh_testdir + dh_testroot + dh_installdocs -A debian/README.Debian + dh_installexamples + dh_installmenu + dh_installcron + dh_installinfo + dh_installchangelogs ChangeLog + dh_link + dh_compress + dh_fixperms + dh_strip + dh_makeshlibs + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +# Build architecture independent packages using the common target. +binary-indep: build install + $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common + +# Build architecture dependent packages using the common target. +binary-arch: build install + $(MAKE) -f debian/rules DH_OPTIONS=-a binary-common + +# Any other binary targets build just one binary package at a time. +binary-%: build install + make -f debian/rules binary-common DH_OPTIONS=-p$* + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install diff --git a/debian/lenny/dependencies/libcaldav/debian/watch b/debian/lenny/dependencies/libcaldav/debian/watch new file mode 100644 index 000000000..8cea7d35f --- /dev/null +++ b/debian/lenny/dependencies/libcaldav/debian/watch @@ -0,0 +1,2 @@ +version=3 +ftp://ftp.gnome.org/pub/GNOME/sources/imlib/1.9/imlib-(.*)\.tar\.gz diff --git a/debian/lenny/dependencies/libcarddav/debian/README.Debian b/debian/lenny/dependencies/libcarddav/debian/README.Debian new file mode 100644 index 000000000..9adebeacc --- /dev/null +++ b/debian/lenny/dependencies/libcarddav/debian/README.Debian @@ -0,0 +1,45 @@ + Imlib Version 11 + ---------------- + +Imlib11 is linked with libpng12, which began life as libpng3. This is +in accordance with the practice of Redhat. The GDK version of imlib, +being part of GNOME 1, has remained linked with libpng2. + +No library that links with this version of Imlib may also link with +libpng2. + +No application that links with this version of Imlib may link with +libpng2, neither directly nor through a third library. + +If you accidentally link an application with imlib and libpng2, the +application may behave in unpredictible ways, possibly crashing, +possibly emitting warnings similar to the following: + + libpng warning: Application was compiled with png.h from libpng-1.2.1 + libpng warning: Application is running with png.c from libpng-1.0.12 + libpng error: Incompatible libpng version in application and library + + + + Imlib Version 1 + --------------- + +Imlib1 and gdk-imlib1 are compiled against libpng2. If you need to +build with libpng2, install the package imlib1-dev or gdk-imlib1-dev +as appropriate. + + + The Palette File + ---------------- + +The system Imlib/Gdk-Imlib palette file was moved from the directory +`/etc/im' to `/etc/imlib'. This move may cause problems for users who +have a `.imrc' file in their home directory since that file may +contain a reference to the old location of the palette file. To +correct this problem, the "PaletteFile" entry should look like: + + PaletteFile /etc/imlib/im_palette.pal + +I believe this changed happened in late 1999. + + -- Steve M. Robbins , Sun Oct 19 15:11:42 2003 diff --git a/debian/lenny/dependencies/libcarddav/debian/README.fallback b/debian/lenny/dependencies/libcarddav/debian/README.fallback new file mode 100644 index 000000000..1b41c225f --- /dev/null +++ b/debian/lenny/dependencies/libcarddav/debian/README.fallback @@ -0,0 +1,23 @@ + Imlib Image Conversion + ---------------------- + +The imlib and gdk-imlib libraries have a number of built-in image +conversion routines, and are capable of loading or saving in *at +least* the following formats: GIF, JPEG, PNG, TIFF, PS, BMP, XPM, and +PPM. + +Prior to version 1.9.13, imlib and gdk-imlib could use an external +program, such as Imagemagick's "convert", to load or save images +in formats not handled internally to Imlib. + + + + "All fallbacks failed." + ----------------------- + +This message indicates that the file you wished to load is not handled +by Imlib. + +The remedy is to convert the image file by hand using, for example, +Imagemagick's "convert" command: "convert foo.rgb foo.png". Then +you'll have to fix up the application to use the new filename instead. diff --git a/debian/lenny/dependencies/libcarddav/debian/changelog b/debian/lenny/dependencies/libcarddav/debian/changelog new file mode 100644 index 000000000..4dfba942d --- /dev/null +++ b/debian/lenny/dependencies/libcarddav/debian/changelog @@ -0,0 +1,17 @@ +libcarddav (0.6.2-2debian2) maverick; urgency=low + + * Modified contact list grabber to first execute a WebDAV directory list, then use the results to get only the contact files in that directory. + + -- Timothy Pearson Wed, 21 Jul 2010 02:55:00 -0600 + +libcarddav (0.6.2-0debian1) lenny; urgency=low + + * Added "Connection: close" to the list of headers sent, so that server keep-alive (which causes long delays) is disabled. + + -- Timothy Pearson Sun, 18 Jul 2010 15:29:00 -0600 + +libcarddav (0.6.2-0debian0) lenny; urgency=low + + * Initial Lenny build + + -- Timothy Pearson Mon, 31 May 2010 01:55:00 -0600 diff --git a/debian/lenny/dependencies/libcarddav/debian/compat b/debian/lenny/dependencies/libcarddav/debian/compat new file mode 100644 index 000000000..7ed6ff82d --- /dev/null +++ b/debian/lenny/dependencies/libcarddav/debian/compat @@ -0,0 +1 @@ +5 diff --git a/debian/lenny/dependencies/libcarddav/debian/control b/debian/lenny/dependencies/libcarddav/debian/control new file mode 100644 index 000000000..7bf8ff1dc --- /dev/null +++ b/debian/lenny/dependencies/libcarddav/debian/control @@ -0,0 +1,23 @@ +Source: libcarddav +Build-Depends: debhelper (>= 5), libcurl4-gnutls-dev, libglib2.0-dev, quilt, automake, autoconf, libtool, libltdl-dev +Section: graphics +Priority: optional +Maintainer: Timothy Pearson +Standards-Version: 3.8.4 + +Package: libcarddav +Architecture: any +Section: libs +Depends: ${shlibs:Depends} +Description: + libcarddav provides a C interface for carddav PIM clients + +Package: libcarddav-dev +Architecture: any +Section: libdevel +Depends: libcarddav (= ${binary:Version}) +Description: + libcarddav provides a C interface for carddav PIM clients + . + This is the development package containing header files and link + libraries for libcarddav. diff --git a/debian/lenny/dependencies/libcarddav/debian/copyright b/debian/lenny/dependencies/libcarddav/debian/copyright new file mode 100644 index 000000000..916e3fd34 --- /dev/null +++ b/debian/lenny/dependencies/libcarddav/debian/copyright @@ -0,0 +1,14 @@ +This package was debianized by Timothy Pearson (kb9vqf@pearsoncomputing.net) + +It was created from unreleased sources derived from libcaldav + +Copyright: + +Copyright 2010 by Timothy Pearson (kb9vqf@pearsoncomputing.net) +Copyright 2008 by Michael Rasmussen (mir@datanom.net) + +License: + +All libraries in this package are released under the GPL +(/usr/share/common-licenses/GPL-3). The programs and examples are +under the GPL (/usr/share/common-licenses/GPL). diff --git a/debian/lenny/dependencies/libcarddav/debian/rules b/debian/lenny/dependencies/libcarddav/debian/rules new file mode 100755 index 000000000..69c8a53d7 --- /dev/null +++ b/debian/lenny/dependencies/libcarddav/debian/rules @@ -0,0 +1,105 @@ +#!/usr/bin/make -f + +include /usr/share/quilt/quilt.make + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +# This has to be exported to make some magic below work. +export DH_OPTIONS + +export CFLAGS = -g + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) +CFLAGS += -O0 +else +CFLAGS += -O3 +endif + +# Suppress accidental execution of the auto-* tools, c.f. +# http://lists.debian.org/debian-devel/2001/debian-devel-200111/msg01416.html +no_auto_tools = ACLOCAL="`pwd`/missing aclocal" \ + AUTOCONF="`pwd`/missing autoconf" \ + AUTOMAKE="`pwd`/missing automake" \ + AUTOHEADER="`pwd`/missing autoheader" + +make_flags = moduledir=/usr/lib/gdk-imlib2 $(no_auto_tools) + +build: $(QUILT_STAMPFN) build-stamp +build-stamp: + dh_testdir + ./autogen.sh + ./configure --prefix=/usr \ + --mandir=/usr/share/man + $(MAKE) $(make_flags) + + touch build-stamp + +clean: unpatch + dh_testdir + dh_testroot + rm -f build-stamp + + [ ! -f Makefile ] || $(MAKE) clean + [ ! -f Makefile ] || $(MAKE) distclean + + dh_clean + +install: DH_OPTIONS= +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + $(MAKE) $(make_flags) DESTDIR=`pwd`/debian/tmp install + + dh_movefiles + + # Library package + dh_install -plibcarddav --autodest debian/tmp/usr/lib/libcarddav.so* + + # Developer package + mv debian/tmp/usr/include/libcarddav* debian/tmp/usr/include/libcarddav + dh_install -plibcarddav-dev --autodest debian/tmp/usr/lib/libcarddav.la + dh_install -plibcarddav-dev --autodest debian/tmp/usr/include/libcarddav/* + dh_install -plibcarddav-dev --autodest debian/tmp/usr/lib/pkgconfig/* + +# This single target is used to build all the packages, all at once, or +# one at a time. So keep in mind: any options passed to commands here will +# affect _all_ packages. Anything you want to only affect one package +# should be put in another target, such as the install target. +binary-common: + dh_testdir + dh_testroot + dh_installdocs -A debian/README.Debian + dh_installexamples + dh_installmenu + dh_installcron + dh_installinfo + dh_installchangelogs ChangeLog + dh_link + dh_compress + dh_fixperms + dh_strip + dh_makeshlibs + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +# Build architecture independent packages using the common target. +binary-indep: build install + $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common + +# Build architecture dependent packages using the common target. +binary-arch: build install + $(MAKE) -f debian/rules DH_OPTIONS=-a binary-common + +# Any other binary targets build just one binary package at a time. +binary-%: build install + make -f debian/rules binary-common DH_OPTIONS=-p$* + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install diff --git a/debian/lenny/dependencies/libcarddav/debian/watch b/debian/lenny/dependencies/libcarddav/debian/watch new file mode 100644 index 000000000..8cea7d35f --- /dev/null +++ b/debian/lenny/dependencies/libcarddav/debian/watch @@ -0,0 +1,2 @@ +version=3 +ftp://ftp.gnome.org/pub/GNOME/sources/imlib/1.9/imlib-(.*)\.tar\.gz diff --git a/debian/squeeze/dependencies/libcaldav/debian/README.Debian b/debian/squeeze/dependencies/libcaldav/debian/README.Debian new file mode 100644 index 000000000..9adebeacc --- /dev/null +++ b/debian/squeeze/dependencies/libcaldav/debian/README.Debian @@ -0,0 +1,45 @@ + Imlib Version 11 + ---------------- + +Imlib11 is linked with libpng12, which began life as libpng3. This is +in accordance with the practice of Redhat. The GDK version of imlib, +being part of GNOME 1, has remained linked with libpng2. + +No library that links with this version of Imlib may also link with +libpng2. + +No application that links with this version of Imlib may link with +libpng2, neither directly nor through a third library. + +If you accidentally link an application with imlib and libpng2, the +application may behave in unpredictible ways, possibly crashing, +possibly emitting warnings similar to the following: + + libpng warning: Application was compiled with png.h from libpng-1.2.1 + libpng warning: Application is running with png.c from libpng-1.0.12 + libpng error: Incompatible libpng version in application and library + + + + Imlib Version 1 + --------------- + +Imlib1 and gdk-imlib1 are compiled against libpng2. If you need to +build with libpng2, install the package imlib1-dev or gdk-imlib1-dev +as appropriate. + + + The Palette File + ---------------- + +The system Imlib/Gdk-Imlib palette file was moved from the directory +`/etc/im' to `/etc/imlib'. This move may cause problems for users who +have a `.imrc' file in their home directory since that file may +contain a reference to the old location of the palette file. To +correct this problem, the "PaletteFile" entry should look like: + + PaletteFile /etc/imlib/im_palette.pal + +I believe this changed happened in late 1999. + + -- Steve M. Robbins , Sun Oct 19 15:11:42 2003 diff --git a/debian/squeeze/dependencies/libcaldav/debian/README.fallback b/debian/squeeze/dependencies/libcaldav/debian/README.fallback new file mode 100644 index 000000000..1b41c225f --- /dev/null +++ b/debian/squeeze/dependencies/libcaldav/debian/README.fallback @@ -0,0 +1,23 @@ + Imlib Image Conversion + ---------------------- + +The imlib and gdk-imlib libraries have a number of built-in image +conversion routines, and are capable of loading or saving in *at +least* the following formats: GIF, JPEG, PNG, TIFF, PS, BMP, XPM, and +PPM. + +Prior to version 1.9.13, imlib and gdk-imlib could use an external +program, such as Imagemagick's "convert", to load or save images +in formats not handled internally to Imlib. + + + + "All fallbacks failed." + ----------------------- + +This message indicates that the file you wished to load is not handled +by Imlib. + +The remedy is to convert the image file by hand using, for example, +Imagemagick's "convert" command: "convert foo.rgb foo.png". Then +you'll have to fix up the application to use the new filename instead. diff --git a/debian/squeeze/dependencies/libcaldav/debian/changelog b/debian/squeeze/dependencies/libcaldav/debian/changelog new file mode 100644 index 000000000..13d81ef1d --- /dev/null +++ b/debian/squeeze/dependencies/libcaldav/debian/changelog @@ -0,0 +1,29 @@ +libcaldav (0.6.5-2debian2) maverick; urgency=low + + * Fixed RECURRENCE-ID modification with Zimbra CalDAV resources + + -- Timothy Pearson Sat, 28 Aug 2010 16:34:00 -0600 + +libcaldav (0.6.4-0debian0) lenny; urgency=low + + * Added VTODO support + + -- Timothy Pearson Fri, 27 Aug 2010 18:53:00 -0600 + +libcaldav (0.6.3-0debian1) lenny; urgency=low + + * Multiple VEVENT blocks in a single CardDAV response are now returned correctly + + -- Timothy Pearson Thu, 26 Aug 2010 15:40:00 -0600 + +libcaldav (0.6.2-0debian0) lenny; urgency=low + + * Added "Connection: close" to the list of headers sent, so that server keep-alive (which causes long delays) is disabled. + + -- Timothy Pearson Sun, 18 Jul 2010 15:29:00 -0600 + +libcaldav (0.6.1-1debian0) lenny; urgency=low + + * Initial Lenny build + + -- Timothy Pearson Mon, 31 May 2010 01:55:00 -0600 diff --git a/debian/squeeze/dependencies/libcaldav/debian/compat b/debian/squeeze/dependencies/libcaldav/debian/compat new file mode 100644 index 000000000..7ed6ff82d --- /dev/null +++ b/debian/squeeze/dependencies/libcaldav/debian/compat @@ -0,0 +1 @@ +5 diff --git a/debian/squeeze/dependencies/libcaldav/debian/control b/debian/squeeze/dependencies/libcaldav/debian/control new file mode 100644 index 000000000..6051e6de1 --- /dev/null +++ b/debian/squeeze/dependencies/libcaldav/debian/control @@ -0,0 +1,23 @@ +Source: libcaldav +Build-Depends: debhelper (>= 5), quilt, libcurl4-gnutls-dev (>= 7.19), libglib2.0-dev, automake, autoconf, libtool, libltdl-dev +Section: graphics +Priority: optional +Maintainer: Timothy Pearson +Standards-Version: 3.8.3 + +Package: libcaldav +Architecture: any +Section: libs +Depends: ${shlibs:Depends} +Description: + libcaldav provides a C interface for caldav PIM clients + +Package: libcaldav-dev +Architecture: any +Section: libdevel +Depends: libcaldav (= ${binary:Version}) +Description: + libcaldav provides a C interface for caldav PIM clients + . + This is the development package containing header files and link + libraries for libcaldav. diff --git a/debian/squeeze/dependencies/libcaldav/debian/copyright b/debian/squeeze/dependencies/libcaldav/debian/copyright new file mode 100644 index 000000000..a0ce37b8b --- /dev/null +++ b/debian/squeeze/dependencies/libcaldav/debian/copyright @@ -0,0 +1,13 @@ +This package was debianized by Timothy Pearson (kb9vqf@pearsoncomputing.net) + +It was downloaded from http://sourceforge.net/projects/libcaldav/ + +Copyright: + +Copyright 2008 by Michael Rasmussen (mir@datanom.net) + +License: + +All libraries in this package are released under the GPL +(/usr/share/common-licenses/GPL-3). The programs and examples are +under the GPL (/usr/share/common-licenses/GPL). diff --git a/debian/squeeze/dependencies/libcaldav/debian/rules b/debian/squeeze/dependencies/libcaldav/debian/rules new file mode 100755 index 000000000..e9afd40a5 --- /dev/null +++ b/debian/squeeze/dependencies/libcaldav/debian/rules @@ -0,0 +1,105 @@ +#!/usr/bin/make -f + +include /usr/share/quilt/quilt.make + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +# This has to be exported to make some magic below work. +export DH_OPTIONS + +export CFLAGS = -g + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) +CFLAGS += -O0 +else +CFLAGS += -O3 +endif + +# Suppress accidental execution of the auto-* tools, c.f. +# http://lists.debian.org/debian-devel/2001/debian-devel-200111/msg01416.html +no_auto_tools = ACLOCAL="`pwd`/missing aclocal" \ + AUTOCONF="`pwd`/missing autoconf" \ + AUTOMAKE="`pwd`/missing automake" \ + AUTOHEADER="`pwd`/missing autoheader" + +make_flags = moduledir=/usr/lib/gdk-imlib2 $(no_auto_tools) + +build: $(QUILT_STAMPFN) build-stamp +build-stamp: + dh_testdir + ./autogen.sh + ./configure --prefix=/usr \ + --mandir=/usr/share/man + $(MAKE) $(make_flags) + + touch build-stamp + +clean: unpatch + dh_testdir + dh_testroot + rm -f build-stamp + + [ ! -f Makefile ] || $(MAKE) clean + [ ! -f Makefile ] || $(MAKE) distclean + + dh_clean + +install: DH_OPTIONS= +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + $(MAKE) $(make_flags) DESTDIR=`pwd`/debian/tmp install + + dh_movefiles + + # Library package + dh_install -plibcaldav --autodest debian/tmp/usr/lib/libcaldav.so* + + # Developer package + mv debian/tmp/usr/include/libcaldav* debian/tmp/usr/include/libcaldav + dh_install -plibcaldav-dev --autodest debian/tmp/usr/lib/libcaldav.la + dh_install -plibcaldav-dev --autodest debian/tmp/usr/include/libcaldav/* + dh_install -plibcaldav-dev --autodest debian/tmp/usr/lib/pkgconfig/* + +# This single target is used to build all the packages, all at once, or +# one at a time. So keep in mind: any options passed to commands here will +# affect _all_ packages. Anything you want to only affect one package +# should be put in another target, such as the install target. +binary-common: + dh_testdir + dh_testroot + dh_installdocs -A debian/README.Debian + dh_installexamples + dh_installmenu + dh_installcron + dh_installinfo + dh_installchangelogs ChangeLog + dh_link + dh_compress + dh_fixperms + dh_strip + dh_makeshlibs + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +# Build architecture independent packages using the common target. +binary-indep: build install + $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common + +# Build architecture dependent packages using the common target. +binary-arch: build install + $(MAKE) -f debian/rules DH_OPTIONS=-a binary-common + +# Any other binary targets build just one binary package at a time. +binary-%: build install + make -f debian/rules binary-common DH_OPTIONS=-p$* + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install diff --git a/debian/squeeze/dependencies/libcaldav/debian/watch b/debian/squeeze/dependencies/libcaldav/debian/watch new file mode 100644 index 000000000..8cea7d35f --- /dev/null +++ b/debian/squeeze/dependencies/libcaldav/debian/watch @@ -0,0 +1,2 @@ +version=3 +ftp://ftp.gnome.org/pub/GNOME/sources/imlib/1.9/imlib-(.*)\.tar\.gz diff --git a/debian/squeeze/dependencies/libcarddav/debian/README.Debian b/debian/squeeze/dependencies/libcarddav/debian/README.Debian new file mode 100644 index 000000000..9adebeacc --- /dev/null +++ b/debian/squeeze/dependencies/libcarddav/debian/README.Debian @@ -0,0 +1,45 @@ + Imlib Version 11 + ---------------- + +Imlib11 is linked with libpng12, which began life as libpng3. This is +in accordance with the practice of Redhat. The GDK version of imlib, +being part of GNOME 1, has remained linked with libpng2. + +No library that links with this version of Imlib may also link with +libpng2. + +No application that links with this version of Imlib may link with +libpng2, neither directly nor through a third library. + +If you accidentally link an application with imlib and libpng2, the +application may behave in unpredictible ways, possibly crashing, +possibly emitting warnings similar to the following: + + libpng warning: Application was compiled with png.h from libpng-1.2.1 + libpng warning: Application is running with png.c from libpng-1.0.12 + libpng error: Incompatible libpng version in application and library + + + + Imlib Version 1 + --------------- + +Imlib1 and gdk-imlib1 are compiled against libpng2. If you need to +build with libpng2, install the package imlib1-dev or gdk-imlib1-dev +as appropriate. + + + The Palette File + ---------------- + +The system Imlib/Gdk-Imlib palette file was moved from the directory +`/etc/im' to `/etc/imlib'. This move may cause problems for users who +have a `.imrc' file in their home directory since that file may +contain a reference to the old location of the palette file. To +correct this problem, the "PaletteFile" entry should look like: + + PaletteFile /etc/imlib/im_palette.pal + +I believe this changed happened in late 1999. + + -- Steve M. Robbins , Sun Oct 19 15:11:42 2003 diff --git a/debian/squeeze/dependencies/libcarddav/debian/README.fallback b/debian/squeeze/dependencies/libcarddav/debian/README.fallback new file mode 100644 index 000000000..1b41c225f --- /dev/null +++ b/debian/squeeze/dependencies/libcarddav/debian/README.fallback @@ -0,0 +1,23 @@ + Imlib Image Conversion + ---------------------- + +The imlib and gdk-imlib libraries have a number of built-in image +conversion routines, and are capable of loading or saving in *at +least* the following formats: GIF, JPEG, PNG, TIFF, PS, BMP, XPM, and +PPM. + +Prior to version 1.9.13, imlib and gdk-imlib could use an external +program, such as Imagemagick's "convert", to load or save images +in formats not handled internally to Imlib. + + + + "All fallbacks failed." + ----------------------- + +This message indicates that the file you wished to load is not handled +by Imlib. + +The remedy is to convert the image file by hand using, for example, +Imagemagick's "convert" command: "convert foo.rgb foo.png". Then +you'll have to fix up the application to use the new filename instead. diff --git a/debian/squeeze/dependencies/libcarddav/debian/changelog b/debian/squeeze/dependencies/libcarddav/debian/changelog new file mode 100644 index 000000000..4dfba942d --- /dev/null +++ b/debian/squeeze/dependencies/libcarddav/debian/changelog @@ -0,0 +1,17 @@ +libcarddav (0.6.2-2debian2) maverick; urgency=low + + * Modified contact list grabber to first execute a WebDAV directory list, then use the results to get only the contact files in that directory. + + -- Timothy Pearson Wed, 21 Jul 2010 02:55:00 -0600 + +libcarddav (0.6.2-0debian1) lenny; urgency=low + + * Added "Connection: close" to the list of headers sent, so that server keep-alive (which causes long delays) is disabled. + + -- Timothy Pearson Sun, 18 Jul 2010 15:29:00 -0600 + +libcarddav (0.6.2-0debian0) lenny; urgency=low + + * Initial Lenny build + + -- Timothy Pearson Mon, 31 May 2010 01:55:00 -0600 diff --git a/debian/squeeze/dependencies/libcarddav/debian/compat b/debian/squeeze/dependencies/libcarddav/debian/compat new file mode 100644 index 000000000..7ed6ff82d --- /dev/null +++ b/debian/squeeze/dependencies/libcarddav/debian/compat @@ -0,0 +1 @@ +5 diff --git a/debian/squeeze/dependencies/libcarddav/debian/control b/debian/squeeze/dependencies/libcarddav/debian/control new file mode 100644 index 000000000..7bf8ff1dc --- /dev/null +++ b/debian/squeeze/dependencies/libcarddav/debian/control @@ -0,0 +1,23 @@ +Source: libcarddav +Build-Depends: debhelper (>= 5), libcurl4-gnutls-dev, libglib2.0-dev, quilt, automake, autoconf, libtool, libltdl-dev +Section: graphics +Priority: optional +Maintainer: Timothy Pearson +Standards-Version: 3.8.4 + +Package: libcarddav +Architecture: any +Section: libs +Depends: ${shlibs:Depends} +Description: + libcarddav provides a C interface for carddav PIM clients + +Package: libcarddav-dev +Architecture: any +Section: libdevel +Depends: libcarddav (= ${binary:Version}) +Description: + libcarddav provides a C interface for carddav PIM clients + . + This is the development package containing header files and link + libraries for libcarddav. diff --git a/debian/squeeze/dependencies/libcarddav/debian/copyright b/debian/squeeze/dependencies/libcarddav/debian/copyright new file mode 100644 index 000000000..916e3fd34 --- /dev/null +++ b/debian/squeeze/dependencies/libcarddav/debian/copyright @@ -0,0 +1,14 @@ +This package was debianized by Timothy Pearson (kb9vqf@pearsoncomputing.net) + +It was created from unreleased sources derived from libcaldav + +Copyright: + +Copyright 2010 by Timothy Pearson (kb9vqf@pearsoncomputing.net) +Copyright 2008 by Michael Rasmussen (mir@datanom.net) + +License: + +All libraries in this package are released under the GPL +(/usr/share/common-licenses/GPL-3). The programs and examples are +under the GPL (/usr/share/common-licenses/GPL). diff --git a/debian/squeeze/dependencies/libcarddav/debian/rules b/debian/squeeze/dependencies/libcarddav/debian/rules new file mode 100755 index 000000000..69c8a53d7 --- /dev/null +++ b/debian/squeeze/dependencies/libcarddav/debian/rules @@ -0,0 +1,105 @@ +#!/usr/bin/make -f + +include /usr/share/quilt/quilt.make + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +# This has to be exported to make some magic below work. +export DH_OPTIONS + +export CFLAGS = -g + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) +CFLAGS += -O0 +else +CFLAGS += -O3 +endif + +# Suppress accidental execution of the auto-* tools, c.f. +# http://lists.debian.org/debian-devel/2001/debian-devel-200111/msg01416.html +no_auto_tools = ACLOCAL="`pwd`/missing aclocal" \ + AUTOCONF="`pwd`/missing autoconf" \ + AUTOMAKE="`pwd`/missing automake" \ + AUTOHEADER="`pwd`/missing autoheader" + +make_flags = moduledir=/usr/lib/gdk-imlib2 $(no_auto_tools) + +build: $(QUILT_STAMPFN) build-stamp +build-stamp: + dh_testdir + ./autogen.sh + ./configure --prefix=/usr \ + --mandir=/usr/share/man + $(MAKE) $(make_flags) + + touch build-stamp + +clean: unpatch + dh_testdir + dh_testroot + rm -f build-stamp + + [ ! -f Makefile ] || $(MAKE) clean + [ ! -f Makefile ] || $(MAKE) distclean + + dh_clean + +install: DH_OPTIONS= +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + $(MAKE) $(make_flags) DESTDIR=`pwd`/debian/tmp install + + dh_movefiles + + # Library package + dh_install -plibcarddav --autodest debian/tmp/usr/lib/libcarddav.so* + + # Developer package + mv debian/tmp/usr/include/libcarddav* debian/tmp/usr/include/libcarddav + dh_install -plibcarddav-dev --autodest debian/tmp/usr/lib/libcarddav.la + dh_install -plibcarddav-dev --autodest debian/tmp/usr/include/libcarddav/* + dh_install -plibcarddav-dev --autodest debian/tmp/usr/lib/pkgconfig/* + +# This single target is used to build all the packages, all at once, or +# one at a time. So keep in mind: any options passed to commands here will +# affect _all_ packages. Anything you want to only affect one package +# should be put in another target, such as the install target. +binary-common: + dh_testdir + dh_testroot + dh_installdocs -A debian/README.Debian + dh_installexamples + dh_installmenu + dh_installcron + dh_installinfo + dh_installchangelogs ChangeLog + dh_link + dh_compress + dh_fixperms + dh_strip + dh_makeshlibs + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +# Build architecture independent packages using the common target. +binary-indep: build install + $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common + +# Build architecture dependent packages using the common target. +binary-arch: build install + $(MAKE) -f debian/rules DH_OPTIONS=-a binary-common + +# Any other binary targets build just one binary package at a time. +binary-%: build install + make -f debian/rules binary-common DH_OPTIONS=-p$* + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install diff --git a/debian/squeeze/dependencies/libcarddav/debian/watch b/debian/squeeze/dependencies/libcarddav/debian/watch new file mode 100644 index 000000000..8cea7d35f --- /dev/null +++ b/debian/squeeze/dependencies/libcarddav/debian/watch @@ -0,0 +1,2 @@ +version=3 +ftp://ftp.gnome.org/pub/GNOME/sources/imlib/1.9/imlib-(.*)\.tar\.gz diff --git a/ubuntu/maverick/dependencies/libcaldav/debian/README.Debian b/ubuntu/maverick/dependencies/libcaldav/debian/README.Debian new file mode 100644 index 000000000..9adebeacc --- /dev/null +++ b/ubuntu/maverick/dependencies/libcaldav/debian/README.Debian @@ -0,0 +1,45 @@ + Imlib Version 11 + ---------------- + +Imlib11 is linked with libpng12, which began life as libpng3. This is +in accordance with the practice of Redhat. The GDK version of imlib, +being part of GNOME 1, has remained linked with libpng2. + +No library that links with this version of Imlib may also link with +libpng2. + +No application that links with this version of Imlib may link with +libpng2, neither directly nor through a third library. + +If you accidentally link an application with imlib and libpng2, the +application may behave in unpredictible ways, possibly crashing, +possibly emitting warnings similar to the following: + + libpng warning: Application was compiled with png.h from libpng-1.2.1 + libpng warning: Application is running with png.c from libpng-1.0.12 + libpng error: Incompatible libpng version in application and library + + + + Imlib Version 1 + --------------- + +Imlib1 and gdk-imlib1 are compiled against libpng2. If you need to +build with libpng2, install the package imlib1-dev or gdk-imlib1-dev +as appropriate. + + + The Palette File + ---------------- + +The system Imlib/Gdk-Imlib palette file was moved from the directory +`/etc/im' to `/etc/imlib'. This move may cause problems for users who +have a `.imrc' file in their home directory since that file may +contain a reference to the old location of the palette file. To +correct this problem, the "PaletteFile" entry should look like: + + PaletteFile /etc/imlib/im_palette.pal + +I believe this changed happened in late 1999. + + -- Steve M. Robbins , Sun Oct 19 15:11:42 2003 diff --git a/ubuntu/maverick/dependencies/libcaldav/debian/README.fallback b/ubuntu/maverick/dependencies/libcaldav/debian/README.fallback new file mode 100644 index 000000000..1b41c225f --- /dev/null +++ b/ubuntu/maverick/dependencies/libcaldav/debian/README.fallback @@ -0,0 +1,23 @@ + Imlib Image Conversion + ---------------------- + +The imlib and gdk-imlib libraries have a number of built-in image +conversion routines, and are capable of loading or saving in *at +least* the following formats: GIF, JPEG, PNG, TIFF, PS, BMP, XPM, and +PPM. + +Prior to version 1.9.13, imlib and gdk-imlib could use an external +program, such as Imagemagick's "convert", to load or save images +in formats not handled internally to Imlib. + + + + "All fallbacks failed." + ----------------------- + +This message indicates that the file you wished to load is not handled +by Imlib. + +The remedy is to convert the image file by hand using, for example, +Imagemagick's "convert" command: "convert foo.rgb foo.png". Then +you'll have to fix up the application to use the new filename instead. diff --git a/ubuntu/maverick/dependencies/libcaldav/debian/changelog b/ubuntu/maverick/dependencies/libcaldav/debian/changelog new file mode 100644 index 000000000..13d81ef1d --- /dev/null +++ b/ubuntu/maverick/dependencies/libcaldav/debian/changelog @@ -0,0 +1,29 @@ +libcaldav (0.6.5-2debian2) maverick; urgency=low + + * Fixed RECURRENCE-ID modification with Zimbra CalDAV resources + + -- Timothy Pearson Sat, 28 Aug 2010 16:34:00 -0600 + +libcaldav (0.6.4-0debian0) lenny; urgency=low + + * Added VTODO support + + -- Timothy Pearson Fri, 27 Aug 2010 18:53:00 -0600 + +libcaldav (0.6.3-0debian1) lenny; urgency=low + + * Multiple VEVENT blocks in a single CardDAV response are now returned correctly + + -- Timothy Pearson Thu, 26 Aug 2010 15:40:00 -0600 + +libcaldav (0.6.2-0debian0) lenny; urgency=low + + * Added "Connection: close" to the list of headers sent, so that server keep-alive (which causes long delays) is disabled. + + -- Timothy Pearson Sun, 18 Jul 2010 15:29:00 -0600 + +libcaldav (0.6.1-1debian0) lenny; urgency=low + + * Initial Lenny build + + -- Timothy Pearson Mon, 31 May 2010 01:55:00 -0600 diff --git a/ubuntu/maverick/dependencies/libcaldav/debian/compat b/ubuntu/maverick/dependencies/libcaldav/debian/compat new file mode 100644 index 000000000..7ed6ff82d --- /dev/null +++ b/ubuntu/maverick/dependencies/libcaldav/debian/compat @@ -0,0 +1 @@ +5 diff --git a/ubuntu/maverick/dependencies/libcaldav/debian/control b/ubuntu/maverick/dependencies/libcaldav/debian/control new file mode 100644 index 000000000..6051e6de1 --- /dev/null +++ b/ubuntu/maverick/dependencies/libcaldav/debian/control @@ -0,0 +1,23 @@ +Source: libcaldav +Build-Depends: debhelper (>= 5), quilt, libcurl4-gnutls-dev (>= 7.19), libglib2.0-dev, automake, autoconf, libtool, libltdl-dev +Section: graphics +Priority: optional +Maintainer: Timothy Pearson +Standards-Version: 3.8.3 + +Package: libcaldav +Architecture: any +Section: libs +Depends: ${shlibs:Depends} +Description: + libcaldav provides a C interface for caldav PIM clients + +Package: libcaldav-dev +Architecture: any +Section: libdevel +Depends: libcaldav (= ${binary:Version}) +Description: + libcaldav provides a C interface for caldav PIM clients + . + This is the development package containing header files and link + libraries for libcaldav. diff --git a/ubuntu/maverick/dependencies/libcaldav/debian/copyright b/ubuntu/maverick/dependencies/libcaldav/debian/copyright new file mode 100644 index 000000000..a0ce37b8b --- /dev/null +++ b/ubuntu/maverick/dependencies/libcaldav/debian/copyright @@ -0,0 +1,13 @@ +This package was debianized by Timothy Pearson (kb9vqf@pearsoncomputing.net) + +It was downloaded from http://sourceforge.net/projects/libcaldav/ + +Copyright: + +Copyright 2008 by Michael Rasmussen (mir@datanom.net) + +License: + +All libraries in this package are released under the GPL +(/usr/share/common-licenses/GPL-3). The programs and examples are +under the GPL (/usr/share/common-licenses/GPL). diff --git a/ubuntu/maverick/dependencies/libcaldav/debian/rules b/ubuntu/maverick/dependencies/libcaldav/debian/rules new file mode 100755 index 000000000..e9afd40a5 --- /dev/null +++ b/ubuntu/maverick/dependencies/libcaldav/debian/rules @@ -0,0 +1,105 @@ +#!/usr/bin/make -f + +include /usr/share/quilt/quilt.make + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +# This has to be exported to make some magic below work. +export DH_OPTIONS + +export CFLAGS = -g + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) +CFLAGS += -O0 +else +CFLAGS += -O3 +endif + +# Suppress accidental execution of the auto-* tools, c.f. +# http://lists.debian.org/debian-devel/2001/debian-devel-200111/msg01416.html +no_auto_tools = ACLOCAL="`pwd`/missing aclocal" \ + AUTOCONF="`pwd`/missing autoconf" \ + AUTOMAKE="`pwd`/missing automake" \ + AUTOHEADER="`pwd`/missing autoheader" + +make_flags = moduledir=/usr/lib/gdk-imlib2 $(no_auto_tools) + +build: $(QUILT_STAMPFN) build-stamp +build-stamp: + dh_testdir + ./autogen.sh + ./configure --prefix=/usr \ + --mandir=/usr/share/man + $(MAKE) $(make_flags) + + touch build-stamp + +clean: unpatch + dh_testdir + dh_testroot + rm -f build-stamp + + [ ! -f Makefile ] || $(MAKE) clean + [ ! -f Makefile ] || $(MAKE) distclean + + dh_clean + +install: DH_OPTIONS= +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + $(MAKE) $(make_flags) DESTDIR=`pwd`/debian/tmp install + + dh_movefiles + + # Library package + dh_install -plibcaldav --autodest debian/tmp/usr/lib/libcaldav.so* + + # Developer package + mv debian/tmp/usr/include/libcaldav* debian/tmp/usr/include/libcaldav + dh_install -plibcaldav-dev --autodest debian/tmp/usr/lib/libcaldav.la + dh_install -plibcaldav-dev --autodest debian/tmp/usr/include/libcaldav/* + dh_install -plibcaldav-dev --autodest debian/tmp/usr/lib/pkgconfig/* + +# This single target is used to build all the packages, all at once, or +# one at a time. So keep in mind: any options passed to commands here will +# affect _all_ packages. Anything you want to only affect one package +# should be put in another target, such as the install target. +binary-common: + dh_testdir + dh_testroot + dh_installdocs -A debian/README.Debian + dh_installexamples + dh_installmenu + dh_installcron + dh_installinfo + dh_installchangelogs ChangeLog + dh_link + dh_compress + dh_fixperms + dh_strip + dh_makeshlibs + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +# Build architecture independent packages using the common target. +binary-indep: build install + $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common + +# Build architecture dependent packages using the common target. +binary-arch: build install + $(MAKE) -f debian/rules DH_OPTIONS=-a binary-common + +# Any other binary targets build just one binary package at a time. +binary-%: build install + make -f debian/rules binary-common DH_OPTIONS=-p$* + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install diff --git a/ubuntu/maverick/dependencies/libcaldav/debian/watch b/ubuntu/maverick/dependencies/libcaldav/debian/watch new file mode 100644 index 000000000..8cea7d35f --- /dev/null +++ b/ubuntu/maverick/dependencies/libcaldav/debian/watch @@ -0,0 +1,2 @@ +version=3 +ftp://ftp.gnome.org/pub/GNOME/sources/imlib/1.9/imlib-(.*)\.tar\.gz diff --git a/ubuntu/maverick/dependencies/libcarddav/debian/README.Debian b/ubuntu/maverick/dependencies/libcarddav/debian/README.Debian new file mode 100644 index 000000000..9adebeacc --- /dev/null +++ b/ubuntu/maverick/dependencies/libcarddav/debian/README.Debian @@ -0,0 +1,45 @@ + Imlib Version 11 + ---------------- + +Imlib11 is linked with libpng12, which began life as libpng3. This is +in accordance with the practice of Redhat. The GDK version of imlib, +being part of GNOME 1, has remained linked with libpng2. + +No library that links with this version of Imlib may also link with +libpng2. + +No application that links with this version of Imlib may link with +libpng2, neither directly nor through a third library. + +If you accidentally link an application with imlib and libpng2, the +application may behave in unpredictible ways, possibly crashing, +possibly emitting warnings similar to the following: + + libpng warning: Application was compiled with png.h from libpng-1.2.1 + libpng warning: Application is running with png.c from libpng-1.0.12 + libpng error: Incompatible libpng version in application and library + + + + Imlib Version 1 + --------------- + +Imlib1 and gdk-imlib1 are compiled against libpng2. If you need to +build with libpng2, install the package imlib1-dev or gdk-imlib1-dev +as appropriate. + + + The Palette File + ---------------- + +The system Imlib/Gdk-Imlib palette file was moved from the directory +`/etc/im' to `/etc/imlib'. This move may cause problems for users who +have a `.imrc' file in their home directory since that file may +contain a reference to the old location of the palette file. To +correct this problem, the "PaletteFile" entry should look like: + + PaletteFile /etc/imlib/im_palette.pal + +I believe this changed happened in late 1999. + + -- Steve M. Robbins , Sun Oct 19 15:11:42 2003 diff --git a/ubuntu/maverick/dependencies/libcarddav/debian/README.fallback b/ubuntu/maverick/dependencies/libcarddav/debian/README.fallback new file mode 100644 index 000000000..1b41c225f --- /dev/null +++ b/ubuntu/maverick/dependencies/libcarddav/debian/README.fallback @@ -0,0 +1,23 @@ + Imlib Image Conversion + ---------------------- + +The imlib and gdk-imlib libraries have a number of built-in image +conversion routines, and are capable of loading or saving in *at +least* the following formats: GIF, JPEG, PNG, TIFF, PS, BMP, XPM, and +PPM. + +Prior to version 1.9.13, imlib and gdk-imlib could use an external +program, such as Imagemagick's "convert", to load or save images +in formats not handled internally to Imlib. + + + + "All fallbacks failed." + ----------------------- + +This message indicates that the file you wished to load is not handled +by Imlib. + +The remedy is to convert the image file by hand using, for example, +Imagemagick's "convert" command: "convert foo.rgb foo.png". Then +you'll have to fix up the application to use the new filename instead. diff --git a/ubuntu/maverick/dependencies/libcarddav/debian/changelog b/ubuntu/maverick/dependencies/libcarddav/debian/changelog new file mode 100644 index 000000000..4dfba942d --- /dev/null +++ b/ubuntu/maverick/dependencies/libcarddav/debian/changelog @@ -0,0 +1,17 @@ +libcarddav (0.6.2-2debian2) maverick; urgency=low + + * Modified contact list grabber to first execute a WebDAV directory list, then use the results to get only the contact files in that directory. + + -- Timothy Pearson Wed, 21 Jul 2010 02:55:00 -0600 + +libcarddav (0.6.2-0debian1) lenny; urgency=low + + * Added "Connection: close" to the list of headers sent, so that server keep-alive (which causes long delays) is disabled. + + -- Timothy Pearson Sun, 18 Jul 2010 15:29:00 -0600 + +libcarddav (0.6.2-0debian0) lenny; urgency=low + + * Initial Lenny build + + -- Timothy Pearson Mon, 31 May 2010 01:55:00 -0600 diff --git a/ubuntu/maverick/dependencies/libcarddav/debian/compat b/ubuntu/maverick/dependencies/libcarddav/debian/compat new file mode 100644 index 000000000..7ed6ff82d --- /dev/null +++ b/ubuntu/maverick/dependencies/libcarddav/debian/compat @@ -0,0 +1 @@ +5 diff --git a/ubuntu/maverick/dependencies/libcarddav/debian/control b/ubuntu/maverick/dependencies/libcarddav/debian/control new file mode 100644 index 000000000..7bf8ff1dc --- /dev/null +++ b/ubuntu/maverick/dependencies/libcarddav/debian/control @@ -0,0 +1,23 @@ +Source: libcarddav +Build-Depends: debhelper (>= 5), libcurl4-gnutls-dev, libglib2.0-dev, quilt, automake, autoconf, libtool, libltdl-dev +Section: graphics +Priority: optional +Maintainer: Timothy Pearson +Standards-Version: 3.8.4 + +Package: libcarddav +Architecture: any +Section: libs +Depends: ${shlibs:Depends} +Description: + libcarddav provides a C interface for carddav PIM clients + +Package: libcarddav-dev +Architecture: any +Section: libdevel +Depends: libcarddav (= ${binary:Version}) +Description: + libcarddav provides a C interface for carddav PIM clients + . + This is the development package containing header files and link + libraries for libcarddav. diff --git a/ubuntu/maverick/dependencies/libcarddav/debian/copyright b/ubuntu/maverick/dependencies/libcarddav/debian/copyright new file mode 100644 index 000000000..916e3fd34 --- /dev/null +++ b/ubuntu/maverick/dependencies/libcarddav/debian/copyright @@ -0,0 +1,14 @@ +This package was debianized by Timothy Pearson (kb9vqf@pearsoncomputing.net) + +It was created from unreleased sources derived from libcaldav + +Copyright: + +Copyright 2010 by Timothy Pearson (kb9vqf@pearsoncomputing.net) +Copyright 2008 by Michael Rasmussen (mir@datanom.net) + +License: + +All libraries in this package are released under the GPL +(/usr/share/common-licenses/GPL-3). The programs and examples are +under the GPL (/usr/share/common-licenses/GPL). diff --git a/ubuntu/maverick/dependencies/libcarddav/debian/rules b/ubuntu/maverick/dependencies/libcarddav/debian/rules new file mode 100755 index 000000000..69c8a53d7 --- /dev/null +++ b/ubuntu/maverick/dependencies/libcarddav/debian/rules @@ -0,0 +1,105 @@ +#!/usr/bin/make -f + +include /usr/share/quilt/quilt.make + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +# This has to be exported to make some magic below work. +export DH_OPTIONS + +export CFLAGS = -g + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) +CFLAGS += -O0 +else +CFLAGS += -O3 +endif + +# Suppress accidental execution of the auto-* tools, c.f. +# http://lists.debian.org/debian-devel/2001/debian-devel-200111/msg01416.html +no_auto_tools = ACLOCAL="`pwd`/missing aclocal" \ + AUTOCONF="`pwd`/missing autoconf" \ + AUTOMAKE="`pwd`/missing automake" \ + AUTOHEADER="`pwd`/missing autoheader" + +make_flags = moduledir=/usr/lib/gdk-imlib2 $(no_auto_tools) + +build: $(QUILT_STAMPFN) build-stamp +build-stamp: + dh_testdir + ./autogen.sh + ./configure --prefix=/usr \ + --mandir=/usr/share/man + $(MAKE) $(make_flags) + + touch build-stamp + +clean: unpatch + dh_testdir + dh_testroot + rm -f build-stamp + + [ ! -f Makefile ] || $(MAKE) clean + [ ! -f Makefile ] || $(MAKE) distclean + + dh_clean + +install: DH_OPTIONS= +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + $(MAKE) $(make_flags) DESTDIR=`pwd`/debian/tmp install + + dh_movefiles + + # Library package + dh_install -plibcarddav --autodest debian/tmp/usr/lib/libcarddav.so* + + # Developer package + mv debian/tmp/usr/include/libcarddav* debian/tmp/usr/include/libcarddav + dh_install -plibcarddav-dev --autodest debian/tmp/usr/lib/libcarddav.la + dh_install -plibcarddav-dev --autodest debian/tmp/usr/include/libcarddav/* + dh_install -plibcarddav-dev --autodest debian/tmp/usr/lib/pkgconfig/* + +# This single target is used to build all the packages, all at once, or +# one at a time. So keep in mind: any options passed to commands here will +# affect _all_ packages. Anything you want to only affect one package +# should be put in another target, such as the install target. +binary-common: + dh_testdir + dh_testroot + dh_installdocs -A debian/README.Debian + dh_installexamples + dh_installmenu + dh_installcron + dh_installinfo + dh_installchangelogs ChangeLog + dh_link + dh_compress + dh_fixperms + dh_strip + dh_makeshlibs + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +# Build architecture independent packages using the common target. +binary-indep: build install + $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common + +# Build architecture dependent packages using the common target. +binary-arch: build install + $(MAKE) -f debian/rules DH_OPTIONS=-a binary-common + +# Any other binary targets build just one binary package at a time. +binary-%: build install + make -f debian/rules binary-common DH_OPTIONS=-p$* + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install diff --git a/ubuntu/maverick/dependencies/libcarddav/debian/watch b/ubuntu/maverick/dependencies/libcarddav/debian/watch new file mode 100644 index 000000000..8cea7d35f --- /dev/null +++ b/ubuntu/maverick/dependencies/libcarddav/debian/watch @@ -0,0 +1,2 @@ +version=3 +ftp://ftp.gnome.org/pub/GNOME/sources/imlib/1.9/imlib-(.*)\.tar\.gz -- cgit v1.2.1 From f0cb853470e2a1d5bda88589a3cba80b3dd0ace6 Mon Sep 17 00:00:00 2001 From: Francois Andriot Date: Sat, 18 Feb 2012 11:41:45 +0100 Subject: [RHEL/Fedora] Updates tqt3 packaging --- redhat/dependencies/tqt3/tqt3-3.4.0.spec | 330 +++++++++++++++---------------- 1 file changed, 154 insertions(+), 176 deletions(-) diff --git a/redhat/dependencies/tqt3/tqt3-3.4.0.spec b/redhat/dependencies/tqt3/tqt3-3.4.0.spec index 87d7d2bd4..f2530f3b4 100644 --- a/redhat/dependencies/tqt3/tqt3-3.4.0.spec +++ b/redhat/dependencies/tqt3/tqt3-3.4.0.spec @@ -20,18 +20,18 @@ Version: 3.4.0 Release: 1%{?dist} Name: tqt3 -Obsoletes: qt < 1:%{version}-%{release} -Provides: qt = 1:%{version}-%{release} -Obsoletes: qt3 < 1:%{version}-%{release} -Provides: qt3 = 1:%{version}-%{release} +#Obsoletes: qt < 1:%{version}-%{release} +#Provides: qt = 1:%{version}-%{release} +#Obsoletes: qt3 < 1:%{version}-%{release} +#Provides: qt3 = 1:%{version}-%{release} License: QPL or GPLv2 or GPLv3 Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Url: http://www.troll.no Source0: %{name}-%{version}.tar.gz -Source2: qt.sh -Source3: qt.csh +#Source2: qt.sh +#Source3: qt.csh Source4: designer3.desktop Source5: assistant3.desktop Source6: linguist3.desktop @@ -70,11 +70,6 @@ Patch200: qt-x11-free-3.3.4-fullscreen.patch # TDE 3.5.13 patches Patch300: qt3-3.3.8.d-updates_zh-tw_translations.patch -%define qt_dirname qt-3.3 -%define qtdir %{_libdir}/%{qt_dirname} -%define qt_docdir %{_docdir}/qt-devel-%{version} - -%define smp 1 %define immodule 1 %define debug 0 @@ -141,10 +136,10 @@ BuildRequires: sqlite-devel Summary: Graphical configuration tool for programs using Qt 3 Group: User Interface/Desktops Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} -Obsoletes: qt-config < 1:%{version}-%{release} -Provides: qt-config = 1:%{version}-%{release} -Obsoletes: qt3-config < 1:%{version}-%{release} -Provides: qt3-config = 1:%{version}-%{release} +#Obsoletes: qt-config < 1:%{version}-%{release} +#Provides: qt-config = 1:%{version}-%{release} +#Obsoletes: qt3-config < 1:%{version}-%{release} +#Provides: qt3-config = 1:%{version}-%{release} %package devel @@ -170,10 +165,10 @@ Requires: libmng-devel Requires: mesa-libGL-devel Requires: mesa-libGLU-devel -Obsoletes: qt-devel < 1:%{version}-%{release} -Provides: qt-devel = 1:%{version}-%{release} -Obsoletes: qt3-devel < 1:%{version}-%{release} -Provides: qt3-devel = 1:%{version}-%{release} +#Obsoletes: qt-devel < 1:%{version}-%{release} +#Provides: qt-devel = 1:%{version}-%{release} +#Obsoletes: qt3-devel < 1:%{version}-%{release} +#Provides: qt3-devel = 1:%{version}-%{release} %package devel-docs @@ -181,10 +176,10 @@ Summary: Documentation for the Qt 3 GUI toolkit Group: Development/Libraries Requires: %{name}-devel = %{?epoch:%{epoch}:}%{version}-%{release} -Obsoletes: qt-devel-docs < 1:%{version}-%{release} -Provides: qt-devel-docs = 1:%{version}-%{release} -Obsoletes: qt3-devel-docs < 1:%{version}-%{release} -Provides: qt3-devel-docs = 1:%{version}-%{release} +#Obsoletes: qt-devel-docs < 1:%{version}-%{release} +#Provides: qt-devel-docs = 1:%{version}-%{release} +#Obsoletes: qt3-devel-docs < 1:%{version}-%{release} +#Provides: qt3-devel-docs = 1:%{version}-%{release} %package ODBC @@ -192,10 +187,10 @@ Summary: ODBC drivers for Qt 3's SQL classes Group: System Environment/Libraries Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} -Obsoletes: qt-ODBC < 1:%{version}-%{release} -Provides: qt-ODBC = 1:%{version}-%{release} -Obsoletes: qt3-ODBC < 1:%{version}-%{release} -Provides: qt3-ODBC = 1:%{version}-%{release} +#Obsoletes: qt-ODBC < 1:%{version}-%{release} +#Provides: qt-ODBC = 1:%{version}-%{release} +#Obsoletes: qt3-ODBC < 1:%{version}-%{release} +#Provides: qt3-ODBC = 1:%{version}-%{release} %package MySQL @@ -203,10 +198,10 @@ Summary: MySQL drivers for Qt 3's SQL classes Group: System Environment/Libraries Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} -Obsoletes: qt-MySQL < 1:%{version}-%{release} -Provides: qt-MySQL = 1:%{version}-%{release} -Obsoletes: qt3-MySQL < 1:%{version}-%{release} -Provides: qt3-MySQL = 1:%{version}-%{release} +#Obsoletes: qt-MySQL < 1:%{version}-%{release} +#Provides: qt-MySQL = 1:%{version}-%{release} +#Obsoletes: qt3-MySQL < 1:%{version}-%{release} +#Provides: qt3-MySQL = 1:%{version}-%{release} %package PostgreSQL @@ -214,10 +209,10 @@ Summary: PostgreSQL drivers for Qt 3's SQL classes Group: System Environment/Libraries Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} -Obsoletes: qt-PostgreSQL < 1:%{version}-%{release} -Provides: qt-PostgreSQL = 1:%{version}-%{release} -Obsoletes: qt3-PostgreSQL < 1:%{version}-%{release} -Provides: qt3-PostgreSQL = 1:%{version}-%{release} +#Obsoletes: qt-PostgreSQL < 1:%{version}-%{release} +#Provides: qt-PostgreSQL = 1:%{version}-%{release} +#Obsoletes: qt3-PostgreSQL < 1:%{version}-%{release} +#Provides: qt3-PostgreSQL = 1:%{version}-%{release} %package sqlite @@ -225,10 +220,10 @@ Summary: sqlite drivers for Qt 3's SQL classes Group: System Environment/Libraries Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} -Obsoletes: qt-sqlite < 1:%{version}-%{release} -Provides: qt-sqlite = 1:%{version}-%{release} -Obsoletes: qt3-sqlite < 1:%{version}-%{release} -Provides: qt3-sqlite = 1:%{version}-%{release} +#Obsoletes: qt-sqlite < 1:%{version}-%{release} +#Provides: qt-sqlite = 1:%{version}-%{release} +#Obsoletes: qt3-sqlite < 1:%{version}-%{release} +#Provides: qt3-sqlite = 1:%{version}-%{release} %package designer @@ -236,10 +231,10 @@ Summary: In3erface designer (IDE) for the Qt 3 toolkit Group: Development/Tools Requires: %{name}-devel = %{?epoch:%{epoch}:}%{version}-%{release} -Obsoletes: qt-designer < 1:%{version}-%{release} -Provides: qt-designer = 1:%{version}-%{release} -Obsoletes: qt3-designer < 1:%{version}-%{release} -Provides: qt3-designer = 1:%{version}-%{release} +#Obsoletes: qt-designer < 1:%{version}-%{release} +#Provides: qt-designer = 1:%{version}-%{release} +#Obsoletes: qt3-designer < 1:%{version}-%{release} +#Provides: qt3-designer = 1:%{version}-%{release} %description @@ -343,15 +338,6 @@ iconv -f iso-8859-1 -t utf-8 < doc/man/man3/qdial.3qt > doc/man/man3/qdial.3qt_ mv doc/man/man3/qdial.3qt_ doc/man/man3/qdial.3qt %build -export QTDIR=`/bin/pwd` -export LD_LIBRARY_PATH="$QTDIR/lib:$LD_LIBRARY_PATH" -export PATH="$QTDIR/bin:$PATH" -export QTDEST=%{qtdir} - -%if %{smp} - export SMP_MFLAGS="%{?_smp_mflags}" -%endif - %if %{immodule} sh ./make-symlinks.sh %endif @@ -375,8 +361,14 @@ fi # build shared, threaded (default) libraries echo yes | ./configure \ - -prefix $QTDEST \ - -docdir %{qt_docdir} \ + -prefix "%{_prefix}" \ + -libdir "%{_libdir}" \ + -docdir "%{_docdir}/%{name}-%{version}" \ + -sysconfdir "%{_sysconfdir}/%{name}" \ + -datadir "%{_datadir}/%{name}" \ + -headerdir "%{_includedir}/%{name}" \ + -plugindir "%{_libdir}/%{name}/plugins" \ + -translationdir "%{_datadir}/%{name}/translations" \ %if %{_lib} == lib64 -platform linux-g++-64 \ %else @@ -422,7 +414,8 @@ echo yes | ./configure \ -xft \ -tablet -make $SMP_MFLAGS src-qmake +%__make %{?_smp_mflags} src-qmake + # build sqlite plugin pushd plugins/src/sqldrivers/sqlite @@ -444,34 +437,25 @@ pushd plugins/src/sqldrivers/odbc qmake -o Makefile "LIBS+=-lodbc" odbc.pro popd -make $SMP_MFLAGS src-moc -make $SMP_MFLAGS sub-src -make $SMP_MFLAGS sub-tools UIC="$QTDIR/bin/uic -nostdlib -L $QTDIR/plugins" +%__make %{?_smp_mflags} src-moc +%__make %{?_smp_mflags} sub-src +%__make %{?_smp_mflags} sub-tools %install -rm -rf %{buildroot} - -export QTDIR=`/bin/pwd` -export LD_LIBRARY_PATH="$QTDIR/lib:$LD_LIBRARY_PATH" -export PATH="$QTDIR/bin:$PATH" -export QTDEST=%{qtdir} - -make install INSTALL_ROOT=%{buildroot} +%__rm -rf %{buildroot} +%__make install INSTALL_ROOT=%{buildroot} for i in findtr qt20fix qtrename140 lrelease lupdate ; do - install bin/$i %{buildroot}%{qtdir}/bin/ + %__install bin/$i %{buildroot}%{_bindir} done -mkdir -p %{buildroot}%{_libdir}/pkgconfig/ -mv %{buildroot}%{qtdir}/lib/pkgconfig/*.pc %{buildroot}%{_libdir}/pkgconfig/ - # install man pages -mkdir -p %{buildroot}%{_mandir} -cp -fR doc/man/* %{buildroot}%{_mandir}/ +%__mkdir_p %{buildroot}%{_mandir} +%__cp -fR doc/man/* %{buildroot}%{_mandir}/ # clean up -make -C tutorial clean -make -C examples clean +%__make -C tutorial clean +%__make -C examples clean # Make sure the examples can be built outside the source tree. # Our binaries fulfill all requirements, so... @@ -484,42 +468,41 @@ find examples -name "*.moc" | xargs rm -rf find tutorial -name "Makefile" | xargs rm -f for a in */*/Makefile ; do - sed 's|^SYSCONF_MOC.*|SYSCONF_MOC = %{qtdir}/bin/moc|' < $a > ${a}.2 + sed 's|^SYSCONF_MOC.*|SYSCONF_MOC = %{_bindir}/moc|' < $a > ${a}.2 mv -v ${a}.2 $a done -mkdir -p %{buildroot}/etc/profile.d -install -m 644 %{SOURCE2} %{SOURCE3} %{buildroot}/etc/profile.d/ - # Add desktop files -mkdir -p %{buildroot}%{_datadir}/applications +%__mkdir_p %{buildroot}%{_datadir}/applications desktop-file-install \ --dir %{buildroot}%{_datadir}/applications \ --vendor="qt" \ %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} # Patch qmake to use qt-mt unconditionally -perl -pi -e "s,-lqt ,-lqt-mt ,g;s,-lqt$,-lqt-mt,g" %{buildroot}%{qtdir}/mkspecs/*/qmake.conf +perl -pi -e "s,-lqt ,-lqt-mt ,g;s,-lqt$,-lqt-mt,g" %{buildroot}%{_datadir}/%{name}/mkspecs/*/qmake.conf # remove broken links -rm -f %{buildroot}%{qtdir}/mkspecs/default/linux-g++* -rm -f %{buildroot}%{qtdir}/lib/*.la - -mkdir -p %{buildroot}/etc/ld.so.conf.d -echo "%{qtdir}/lib" > %{buildroot}/etc/ld.so.conf.d/qt-%{_arch}.conf +%__rm -f %{buildroot}%{_datadir}/%{name}/mkspecs/default/linux-g++* +%__rm -f %{buildroot}%{_libdir}/*.la # install icons -mkdir %{buildroot}%{_datadir}/pixmaps -install -m 644 tools/assistant/images/qt.png %{buildroot}%{_datadir}/pixmaps/qtconfig3.png -install -m 644 tools/assistant/images/designer.png %{buildroot}%{_datadir}/pixmaps/designer3.png -install -m 644 tools/assistant/images/assistant.png %{buildroot}%{_datadir}/pixmaps/assistant3.png -install -m 644 tools/assistant/images/linguist.png %{buildroot}%{_datadir}/pixmaps/linguist3.png +%__mkdir_p %{buildroot}%{_datadir}/pixmaps +%__install -m 644 tools/assistant/images/qt.png %{buildroot}%{_datadir}/pixmaps/qtconfig3.png +%__install -m 644 tools/assistant/images/designer.png %{buildroot}%{_datadir}/pixmaps/designer3.png +%__install -m 644 tools/assistant/images/assistant.png %{buildroot}%{_datadir}/pixmaps/assistant3.png +%__install -m 644 tools/assistant/images/linguist.png %{buildroot}%{_datadir}/pixmaps/linguist3.png # own style directory -mkdir -p %{buildroot}%{qtdir}/plugins/styles +%__mkdir_p %{buildroot}%{_libdir}/%{name}/plugins/styles + +# rename some binaries to make tqt3/4 installations possible +for b in designer uic moc lupdate lrelease qmake qtconfig assistant linguist; do + %__mv -f %{buildroot}%{_bindir}/${b} %{buildroot}%{_bindir}/${b}-%{name} +done %clean -rm -rf %{buildroot} +%__rm -rf %{buildroot} %post -p /sbin/ldconfig @@ -528,55 +511,50 @@ rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc FAQ LICENSE* README* changes* -%dir %{qtdir} -%dir %{qtdir}/bin -%dir %{qtdir}/lib -%dir %{qtdir}/plugins -%dir %{qtdir}/plugins/sqldrivers -%dir %{qtdir}/plugins/styles -%{qtdir}/translations -%{qtdir}/plugins/designer/ +%dir %{_libdir}/%{name}/plugins +%dir %{_libdir}/%{name}/plugins/sqldrivers +%dir %{_libdir}/%{name}/plugins/styles +%{_datadir}/%{name}/translations +%{_libdir}/%{name}/plugins/designer/ %if %{immodule} -%{qtdir}/plugins/inputmethods +%{_libdir}/%{name}/plugins/inputmethods %endif -%config /etc/profile.d/* -/etc/ld.so.conf.d/* -%{qtdir}/lib/libtqui.so.* -%{qtdir}/lib/libtqt*.so.* +%{_libdir}/libtqui.so.* +%{_libdir}/libtqt*.so.* # TQT 3.4.0: WTF is this file ?? %exclude %{_mandir}/README %files config %defattr(-,root,root,-) -%{qtdir}/bin/qtconfig +%{_bindir}/qtconfig-%{name} %{_datadir}/applications/*qtconfig*.desktop %{_datadir}/pixmaps/qtconfig3.png %files devel %defattr(-,root,root,-) -%{qt_docdir}/ -%{qtdir}/bin/moc -%{qtdir}/bin/uic -%{qtdir}/bin/findtr -%{qtdir}/bin/qt20fix -%{qtdir}/bin/qtrename140 -%{qtdir}/bin/assistant -%{qtdir}/bin/qm2ts -%{qtdir}/bin/qmake -%{qtdir}/bin/qembed -%{qtdir}/bin/linguist -%{qtdir}/bin/lupdate -%{qtdir}/bin/lrelease -%{qtdir}/include -%{qtdir}/mkspecs -%{qtdir}/lib/libtqt*.so -%{qtdir}/lib/libtqui.so -%{qtdir}/lib/libeditor.a -%{qtdir}/lib/libdesigner*.a -%{qtdir}/lib/libqassistantclient.a -%{qtdir}/lib/*.prl -%{qtdir}/phrasebooks +%{_docdir}/%{name}-%{version} +%{_bindir}/moc-%{name} +%{_bindir}/uic-%{name} +%{_bindir}/findtr +%{_bindir}/qt20fix +%{_bindir}/qtrename140 +%{_bindir}/assistant-%{name} +%{_bindir}/qm2ts +%{_bindir}/qmake-%{name} +%{_bindir}/qembed +%{_bindir}/linguist-%{name} +%{_bindir}/lupdate-%{name} +%{_bindir}/lrelease-%{name} +%{_includedir}/%{name} +%{_datadir}/%{name}/mkspecs +%{_libdir}/libtqt*.so +%{_libdir}/libtqui.so +%{_libdir}/libeditor.a +%{_libdir}/libdesigner*.a +%{_libdir}/libqassistantclient.a +%{_libdir}/*.prl +%{_datadir}/%{name}/phrasebooks %{_libdir}/pkgconfig/* %{_datadir}/applications/*linguist*.desktop %{_datadir}/applications/*assistant*.desktop @@ -584,51 +562,51 @@ rm -rf %{buildroot} %{_datadir}/pixmaps/assistant3.png # QT 3.3.8.D (TDE): 4 binaries have appeared -%{qtdir}/bin/createcw -%{qtdir}/bin/makeqpf -%{qtdir}/bin/mergetr -%{qtdir}/bin/msg2qm +%{_bindir}/createcw +%{_bindir}/makeqpf +%{_bindir}/mergetr +%{_bindir}/msg2qm # QT 3.3.8.D (TDE): removes lots of unnecessary include files # (where do they come from ??? They were not in 3.3.8b !) -%exclude %{qtdir}/include/btree.h -%exclude %{qtdir}/include/crc32.h -%exclude %{qtdir}/include/debian_qsql_odbc.h -%exclude %{qtdir}/include/deflate.h -%exclude %{qtdir}/include/ftglue.h -%exclude %{qtdir}/include/ftxgdef.h -%exclude %{qtdir}/include/ftxgpos.h -%exclude %{qtdir}/include/ftxgsub.h -%exclude %{qtdir}/include/ftxopen.h -%exclude %{qtdir}/include/ftxopenf.h -%exclude %{qtdir}/include/hash.h -%exclude %{qtdir}/include/inffast.h -%exclude %{qtdir}/include/inffixed.h -%exclude %{qtdir}/include/inflate.h -%exclude %{qtdir}/include/inftrees.h -%exclude %{qtdir}/include/jchuff.h -%exclude %{qtdir}/include/jconfig.h -%exclude %{qtdir}/include/jdct.h -%exclude %{qtdir}/include/jdhuff.h -%exclude %{qtdir}/include/jerror.h -%exclude %{qtdir}/include/jinclude.h -%exclude %{qtdir}/include/jmemsys.h -%exclude %{qtdir}/include/jmorecfg.h -%exclude %{qtdir}/include/jversion.h -%exclude %{qtdir}/include/moc_yacc.h -%exclude %{qtdir}/include/opcodes.h -%exclude %{qtdir}/include/os.h -%exclude %{qtdir}/include/otlbuffer.h -%exclude %{qtdir}/include/pager.h -%exclude %{qtdir}/include/parse.h -%exclude %{qtdir}/include/pngasmrd.h -%exclude %{qtdir}/include/pngconf.h -%exclude %{qtdir}/include/sqlite.h -%exclude %{qtdir}/include/sqliteInt.h -%exclude %{qtdir}/include/trees.h -%exclude %{qtdir}/include/vdbe.h -%exclude %{qtdir}/include/vdbeInt.h -%exclude %{qtdir}/mkspecs/linux-g++-sparc +%exclude %{_includedir}/%{name}/btree.h +%exclude %{_includedir}/%{name}/crc32.h +%exclude %{_includedir}/%{name}/debian_qsql_odbc.h +%exclude %{_includedir}/%{name}/deflate.h +%exclude %{_includedir}/%{name}/ftglue.h +%exclude %{_includedir}/%{name}/ftxgdef.h +%exclude %{_includedir}/%{name}/ftxgpos.h +%exclude %{_includedir}/%{name}/ftxgsub.h +%exclude %{_includedir}/%{name}/ftxopen.h +%exclude %{_includedir}/%{name}/ftxopenf.h +%exclude %{_includedir}/%{name}/hash.h +%exclude %{_includedir}/%{name}/inffast.h +%exclude %{_includedir}/%{name}/inffixed.h +%exclude %{_includedir}/%{name}/inflate.h +%exclude %{_includedir}/%{name}/inftrees.h +%exclude %{_includedir}/%{name}/jchuff.h +%exclude %{_includedir}/%{name}/jconfig.h +%exclude %{_includedir}/%{name}/jdct.h +%exclude %{_includedir}/%{name}/jdhuff.h +%exclude %{_includedir}/%{name}/jerror.h +%exclude %{_includedir}/%{name}/jinclude.h +%exclude %{_includedir}/%{name}/jmemsys.h +%exclude %{_includedir}/%{name}/jmorecfg.h +%exclude %{_includedir}/%{name}/jversion.h +%exclude %{_includedir}/%{name}/moc_yacc.h +%exclude %{_includedir}/%{name}/opcodes.h +%exclude %{_includedir}/%{name}/os.h +%exclude %{_includedir}/%{name}/otlbuffer.h +%exclude %{_includedir}/%{name}/pager.h +%exclude %{_includedir}/%{name}/parse.h +%exclude %{_includedir}/%{name}/pngasmrd.h +%exclude %{_includedir}/%{name}/pngconf.h +%exclude %{_includedir}/%{name}/sqlite.h +%exclude %{_includedir}/%{name}/sqliteInt.h +%exclude %{_includedir}/%{name}/trees.h +%exclude %{_includedir}/%{name}/vdbe.h +%exclude %{_includedir}/%{name}/vdbeInt.h +%exclude %{_datadir}/%{name}/mkspecs/linux-g++-sparc %files devel-docs %defattr(-,root,root,-) @@ -638,24 +616,24 @@ rm -rf %{buildroot} %files sqlite %defattr(-,root,root,-) -%{qtdir}/plugins/sqldrivers/libqsqlite.so +%{_libdir}/%{name}/plugins/sqldrivers/libqsqlite.so %files ODBC %defattr(-,root,root,-) -%{qtdir}/plugins/sqldrivers/libqsqlodbc.so +%{_libdir}/%{name}/plugins/sqldrivers/libqsqlodbc.so %files PostgreSQL %defattr(-,root,root,-) -%{qtdir}/plugins/sqldrivers/libqsqlpsql.so +%{_libdir}/%{name}/plugins/sqldrivers/libqsqlpsql.so %files MySQL %defattr(-,root,root,-) -%{qtdir}/plugins/sqldrivers/libqsqlmysql.so +%{_libdir}/%{name}/plugins/sqldrivers/libqsqlmysql.so %files designer %defattr(-,root,root,-) -%{qtdir}/templates -%{qtdir}/bin/designer +%{_datadir}/%{name}/templates +%{_bindir}/designer-%{name} %{_datadir}/applications/*designer*.desktop %{_datadir}/pixmaps/designer3.png -- cgit v1.2.1 From df8d8a4f6f02e357ad6bc9bb5d3fbbb35378cd8a Mon Sep 17 00:00:00 2001 From: Francois Andriot Date: Sat, 18 Feb 2012 11:42:54 +0100 Subject: [RHEL/Fedora] Adds 'tqca-tls' package --- redhat/components.txt | 2 + .../dependencies/tqca-tls/qca-tls-1.0-mach.patch | 10 +++ .../dependencies/tqca-tls/qca-tls-1.0-ossl10.patch | 15 +++++ .../tqca-tls/tqca-tls-qmake-tqt3.patch | 74 ++++++++++++++++++++++ redhat/dependencies/tqca-tls/tqca-tls.spec | 69 ++++++++++++++++++++ 5 files changed, 170 insertions(+) create mode 100644 redhat/dependencies/tqca-tls/qca-tls-1.0-mach.patch create mode 100644 redhat/dependencies/tqca-tls/qca-tls-1.0-ossl10.patch create mode 100644 redhat/dependencies/tqca-tls/tqca-tls-qmake-tqt3.patch create mode 100644 redhat/dependencies/tqca-tls/tqca-tls.spec diff --git a/redhat/components.txt b/redhat/components.txt index c7b7a1b39..b2f84234b 100644 --- a/redhat/components.txt +++ b/redhat/components.txt @@ -6,11 +6,13 @@ libraries/python-trinity libraries/pykdeextensions dependencies/qt3 dependencies/tqt3 +dependencies/tqca-tls dependencies/libcaldav dependencies/libcarddav dependencies/tqtinterface dependencies/dbus-tqt dependencies/dbus-1-tqt +dependencies/avahi-tqt dependencies/arts dependencies/tqscintilla kdelibs diff --git a/redhat/dependencies/tqca-tls/qca-tls-1.0-mach.patch b/redhat/dependencies/tqca-tls/qca-tls-1.0-mach.patch new file mode 100644 index 000000000..9bac68b83 --- /dev/null +++ b/redhat/dependencies/tqca-tls/qca-tls-1.0-mach.patch @@ -0,0 +1,10 @@ +--- ./qca-tls.pro.mach 2004-06-10 11:55:22.411187448 +0200 ++++ ./qca-tls.pro 2004-06-10 11:55:43.460987392 +0200 +@@ -2,6 +2,7 @@ + + TEMPLATE = lib + CONFIG += qt thread release plugin ++CONFIG += no_fixpath + TARGET = qca-tls + + !exists(qcaprovider.h) { diff --git a/redhat/dependencies/tqca-tls/qca-tls-1.0-ossl10.patch b/redhat/dependencies/tqca-tls/qca-tls-1.0-ossl10.patch new file mode 100644 index 000000000..7b2406f61 --- /dev/null +++ b/redhat/dependencies/tqca-tls/qca-tls-1.0-ossl10.patch @@ -0,0 +1,15 @@ +diff -up qca-tls-1.0/qca-tls.cpp.ossl10 qca-tls-1.0/qca-tls.cpp +--- qca-tls-1.0/qca-tls.cpp.ossl10 2009-08-26 10:08:36.000000000 +0200 ++++ qca-tls-1.0/qca-tls.cpp 2009-08-26 10:11:57.000000000 +0200 +@@ -953,7 +953,11 @@ public: + RSAKeyContext *key; + + SSL *ssl; ++#if OPENSSL_VERSION_NUMBER >= 0x10000000L ++ const SSL_METHOD *method; ++#else + SSL_METHOD *method; ++#endif + SSL_CTX *context; + BIO *rbio, *wbio; + CertContext cc; diff --git a/redhat/dependencies/tqca-tls/tqca-tls-qmake-tqt3.patch b/redhat/dependencies/tqca-tls/tqca-tls-qmake-tqt3.patch new file mode 100644 index 000000000..5dd7c5a47 --- /dev/null +++ b/redhat/dependencies/tqca-tls/tqca-tls-qmake-tqt3.patch @@ -0,0 +1,74 @@ +diff -Nuar tqca-tls.ORI//configure tqca-tls.P//configure +--- tqca-tls.ORI//configure 2012-02-18 11:09:57.695893820 +0100 ++++ tqca-tls.P//configure 2012-02-18 11:28:09.442846406 +0100 +@@ -60,7 +60,7 @@ + if [ "$QC_DEBUG" = "Y" ]; then + echo \$QTDIR not set... trying to find Qt manually + fi +- for p in /usr/lib/tqt /usr/share/tqt /usr/share/tqt3 /usr/local/lib/tqt /usr/local/share/tqt /usr/lib/tqt3 /usr/local/lib/tqt3 /usr/lib/qt /usr/share/qt /usr/share/qt3 /usr/local/lib/qt /usr/local/share/qt /usr/lib/qt3 /usr/local/lib/qt3 /usr/X11R6/share/qt /usr/qt/3 ; do ++ for p in /usr/lib64/tqt /usr/lib/tqt /usr/share/tqt /usr/share/tqt3 /usr/local/lib64/tqt /usr/local/lib/tqt /usr/local/share/tqt /usr/lib64/tqt3 /usr/lib/tqt3 /usr/local/lib64/tqt3 /usr/local/lib/tqt3 /usr/lib64/qt /usr/lib/qt /usr/share/qt /usr/share/qt3 /usr/local/lib64/qt /usr/local/lib/qt /usr/local/share/qt /usr/lib64/qt3 /usr/lib/qt3 /usr/local/lib64/qt3 /usr/local/lib/qt3 /usr/X11R6/share/qt /usr/qt/3 ; do + if [ -d "$p/mkspecs" ]; then + QTDIR=$p + break; +@@ -79,15 +79,15 @@ + fi + fi + +-if [ ! -x "$QTDIR/bin/qmake" ]; then ++if [ ! -x "$QTDIR/bin/qmake-tqt3" ]; then + if [ "$QC_DEBUG" = "Y" ]; then +- echo Warning: qmake not in \$QTDIR/bin/qmake ++ echo Warning: qmake-tqt3 not in \$QTDIR/bin/qmake-tqt3 + echo trying to find it in \$PATH + fi +- qm=`type -p qmake` ++ qm=`type -p qmake-tqt3` + if [ -x "$qm" ]; then + if [ "$QC_DEBUG" = "Y" ]; then +- echo qmake found in $qm ++ echo qmake-tqt3 found in $qm + fi + else + echo fail +@@ -96,12 +96,12 @@ + echo or I missdetected \$QTDIR=$QTDIR + echo + echo Please set \$QTDIR manually and make sure that +- echo \$QTDIR/bin/qmake exists. ++ echo \$QTDIR/bin/qmake-tqt3 exists. + echo + exit 1; + fi + else +- qm=$QTDIR/bin/qmake ++ qm=$QTDIR/bin/qmake-tqt3 + fi + + gen_files() { +@@ -185,6 +185,8 @@ + + // Make sure tqtinterface can be found + conf->addIncludePath("/usr/include/tqt"); ++ // Make sure tqt3 can be found ++ conf->addIncludePath("/usr/include/tqt3"); + + return true; + } +@@ -507,7 +509,7 @@ + TEMPLATE = app + CONFIG += qt x11 thread console + TARGET = conf +-INCLUDEPATH += '/usr/include/tqt' ++INCLUDEPATH += '/usr/include/tqt' '/usr/include/tqt3' + + DEFINES += X11_INC='"\$\$QMAKE_INCDIR_X11"' + DEFINES += X11_LIBDIR='"\$\$QMAKE_LIBDIR_X11"' +@@ -533,7 +535,7 @@ + ) + + if [ "$?" != "0" ]; then +- rm -rf .qconftemp ++# rm -rf .qconftemp + echo fail + echo + echo "There was an error compiling 'conf'. Be sure you have a proper" diff --git a/redhat/dependencies/tqca-tls/tqca-tls.spec b/redhat/dependencies/tqca-tls/tqca-tls.spec new file mode 100644 index 000000000..4f1cb6fa4 --- /dev/null +++ b/redhat/dependencies/tqca-tls/tqca-tls.spec @@ -0,0 +1,69 @@ +%define _prefix /usr + +Name: tqca-tls +Version: r14 +Release: 1%{?dist} + +Summary: TLS plugin for the Qt Cryptographic Architecture +License: LGPLv2+ +Group: Applications/Internet + +URL: http://delta.affinix.com/qca/ +Vendor: Trinity Project +Packager: Francois Andriot + +Source0: %{name}-%{version}.tar.gz + +# Fix build in mach for QT apps +Patch0: qca-tls-1.0-mach.patch +# Missing ifdefs for openssl 0.9.8 +Patch1: qca-tls-1.0-ossl098.patch +# Build with openssl 1.0.0 +Patch2: qca-tls-1.0-ossl10.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Patch10: tqca-tls-qmake-tqt3.patch + +BuildRequires: tqt3-devel >= 3.4.0 +# To build with openssl 0.9.7, disable patch1 +BuildRequires: openssl-devel >= 0.9.8 + + +%description +This is a plugin to provide SSL/TLS capability to programs that use the TQt +Cryptographic Architecture (TQCA). TQCA is a library providing an easy API +for several cryptographic algorithms to TQt programs. This package only +contains the TLS plugin. + +%prep +%setup -q -n dependencies/%{name} +%patch0 -p0 -b .mach +#patch1 -p0 -b .ossl098 +%patch2 -p1 -b .ossl10 +%patch10 -p1 + +%build +./configure \ + --qtdir=/usr +%__make %{?_smp_mflags} + + +%install +%__rm -rf %{?buildroot} +%__mkdir -p %{?buildroot}%{_libdir}/tqt3/plugins/crypto +%__make install INSTALL_ROOT=%{?buildroot} + + +%clean +%__rm -rf $RPM_BUILD_ROOT + +%files +%defattr(0644,root,root,0755) +%doc README COPYING +%attr(755,root,root) %{_libdir}/tqt3/plugins/crypto + + +%changelog +* Sat Feb 18 2012 Francois Andriot - r14-1 +- Initial build for TDE R14 +- Spec file based on Fedora 12 'qca-tls-1.0-18' -- cgit v1.2.1 From 8f318b4997fb748b7c42928b246f973544fb13ea Mon Sep 17 00:00:00 2001 From: Francois Andriot Date: Sat, 18 Feb 2012 11:44:49 +0100 Subject: [RHEL/Fedora] adds arts, avahi-tqt, dbus-1-tqt, dbus-tqt, tqtinterface packaging for TDE R14 --- redhat/dependencies/arts/trinity-arts-r14.spec | 123 +++++++++++++++++++++ redhat/dependencies/avahi-tqt/avahi-tqt-r14.spec | 76 +++++++++++++ redhat/dependencies/dbus-1-tqt/dbus-1-tqt-r14.spec | 73 ++++++++++++ redhat/dependencies/dbus-tqt/dbus-tqt-r14.spec | 71 ++++++++++++ .../tqtinterface/tqtinterface-r14.spec | 91 +++++++++++++++ 5 files changed, 434 insertions(+) create mode 100755 redhat/dependencies/arts/trinity-arts-r14.spec create mode 100644 redhat/dependencies/avahi-tqt/avahi-tqt-r14.spec create mode 100644 redhat/dependencies/dbus-1-tqt/dbus-1-tqt-r14.spec create mode 100644 redhat/dependencies/dbus-tqt/dbus-tqt-r14.spec create mode 100755 redhat/dependencies/tqtinterface/tqtinterface-r14.spec diff --git a/redhat/dependencies/arts/trinity-arts-r14.spec b/redhat/dependencies/arts/trinity-arts-r14.spec new file mode 100755 index 000000000..4e9c33264 --- /dev/null +++ b/redhat/dependencies/arts/trinity-arts-r14.spec @@ -0,0 +1,123 @@ +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?_prefix}" != "/usr" +%define _variant .opt +%endif + + +Name: trinity-arts +Version: r14 +Release: 1%{?dist}%{?_variant} +License: GPL +Summary: aRts (analog realtime synthesizer) - the TDE sound system +Group: System Environment/Daemons + +Vendor: Trinity Project +URL: http://www.trinitydesktop.org/ +Packager: Francois Andriot + +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: arts-%{version}.tar.gz + +BuildRequires: cmake >= 2.8 +BuildRequires: tqtinterface-devel +BuildRequires: audiofile-devel +BuildRequires: alsa-lib-devel +BuildRequires: glib2-devel +BuildRequires: libtool-ltdl-devel +BuildRequires: gsl-devel +BuildRequires: libvorbis-devel +BuildRequires: esound-devel +BuildRequires: jack-audio-connection-kit-devel + +Requires: tqtinterface == %{version} +Requires: audiofile + +%if "%{?_prefix}" == "/usr" +Obsoletes: arts +%endif + +%description +arts (analog real-time synthesizer) is the sound system of KDE 3. + +The principle of arts is to create/process sound using small modules which do +certain tasks. These may be create a waveform (oscillators), play samples, +filter data, add signals, perform effects like delay/flanger/chorus, or +output the data to the soundcard. + +By connecting all those small modules together, you can perform complex +tasks like simulating a mixer, generating an instrument or things like +playing a wave file with some effects. + + +%package devel +Group: Development/Libraries +Summary: %{name} - Development files +Requires: %{name} = %{version}-%{release} +%if "%{?_prefix}" == "/usr" +Obsoletes: arts-devel +%endif + +%description devel +Development files for %{name} + +%prep +%setup -q -n dependencies/arts + +%build +%__mkdir build +cd build +%cmake \ + -DINCLUDE_INSTALL_DIR=%{_includedir}/arts \ + -DPKGCONFIG_INSTALL_DIR=%{_libdir}/pkgconfig \ + -DWITH_ALSA=ON \ + -DWITH_AUDIOFILE=ON \ + -DWITH_VORBIS=ON \ + -DWITH_MAD=OFF \ + -DWITH_ESOUND=ON \ + -DWITH_JACK=ON \ + .. + + +%__make %{?_smp_mflags} + +%install +%__rm -rf %{?buildroot} +%__make install -C build DESTDIR=%{?buildroot} + +%clean +%__rm -rf %{?buildroot} + +%files +%defattr(-,root,root,-) +%doc COPYING.LIB +%dir %{_libdir}/mcop +%dir %{_libdir}/mcop/Arts +%{_libdir}/mcop/Arts/* +%{_libdir}/mcop/*.mcopclass +%{_libdir}/mcop/*.mcoptype +%{_libdir}/lib*.so.* +%{_libdir}/lib*.la +%{_bindir}/artscat +%{_bindir}/artsd +%{_bindir}/artsdsp +%{_bindir}/artsplay +%{_bindir}/artsrec +%{_bindir}/artsshell +%{_bindir}/artswrapper + +%files devel +%defattr(-,root,root,-) +%{_bindir}/mcopidl +%dir %{_includedir} +%{_includedir}/*/ +%{_bindir}/artsc-config +%{_libdir}/lib*.so +%{_libdir}/pkgconfig/*.pc +%{_libdir}/*.a + + +%changelog +* Thu Feb 16 2012 Francois Andriot - r14-1 +- Initial build for TDE R14, using 'tqt3' instead of 'qt3' diff --git a/redhat/dependencies/avahi-tqt/avahi-tqt-r14.spec b/redhat/dependencies/avahi-tqt/avahi-tqt-r14.spec new file mode 100644 index 000000000..faa71a064 --- /dev/null +++ b/redhat/dependencies/avahi-tqt/avahi-tqt-r14.spec @@ -0,0 +1,76 @@ +# Always build under "/usr" +%define _prefix /usr + + +Name: avahi-tqt +Version: r14 +Release: 1%{?dist} +License: GPL +Summary: Avahi TQT Interface +Group: System Environment/Libraries + +Vendor: Trinity Project +Packager: Francois Andriot + +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{name}-%{version}.tar.gz +Patch0: git.patch + +BuildRequires: gcc-c++ +BuildRequires: avahi-devel +BuildRequires: cmake >= 2.8 +BuildRequires: tqt3-devel >= 3.4.0 +BuildRequires: tqtinterface-devel +Requires: tqt3 >= 3.4.0 +Requires: tqtinterface + +%description +Avahi TQT Interface + + +%package devel +Requires: %{name} +Summary: %{name} - Development files +Group: Development/Libraries + + +%description devel +Development files for %{name} + + +%prep +%setup -q -n dependencies/%{name} +%patch0 -p1 + +%build +./autogen.sh +%configure \ + --enable-compat-libdns_sd \ + --disable-mono --disable-monodoc \ + --disable-gtk3 \ + --with-systemdsystemunitdir=/lib/systemd/system + + + +%install +%__rm -rf %{?buildroot} +%__make install DESTDIR=%{?buildroot} + +%clean +%__rm -rf %{?buildroot} + +%files +%{_libdir}/*.so.* + +%files devel +%{_includedir}/%{name} +%{_libdir}/*.so +%{_libdir}/*.la +%{_libdir}/pkgconfig/*.pc +%exclude %{_libdir}/libavahi-tqt.a + +%changelog +* Thu Feb 16 2012 Francois Andriot - r14-1 +- Initial build for TDE R14, using 'tqt3' instead of 'qt3' diff --git a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-r14.spec b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-r14.spec new file mode 100644 index 000000000..112520c32 --- /dev/null +++ b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-r14.spec @@ -0,0 +1,73 @@ +# Always build under "/usr" +%define _prefix /usr + + +Name: dbus-1-tqt +Version: r14 +Release: 1%{?dist} +License: GPL +Summary: Dbus TQT Interface +Group: System Environment/Libraries + +Vendor: Trinity Project +Packager: Francois Andriot + +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{name}-%{version}.tar.gz + +BuildRequires: gcc-c++ +BuildRequires: dbus-devel +BuildRequires: tqtinterface-devel +BuildRequires: cmake >= 2.8 +BuildRequires: tqt3-devel >= 3.4.0 +BuildRequires: dbus-tqt-devel == %{version} +Requires: tqt3 >= 3.4.0 +Requires: dbus-tqt == %{version} + +%description +Dbus TQT Interface + + +%package devel +Requires: %{name} +Summary: %{name} - Development files +Group: Development/Libraries + +%description devel +Development files for %{name} + + +%prep +%setup -q -n dependencies/%{name} + +%build +%__mkdir build +cd build +%cmake .. +%__make %{?_smp_mflags} + + +%install +%__rm -rf %{?buildroot} +%__mkdir_p %{?buildroot}%{_includedir} +%__make install DESTDIR=%{?buildroot} -C build + +%clean +%__rm -rf %{?buildroot} + +%files +%{_bindir}/dbusxml2qt3 +%{_libdir}/*.so.* + +%files devel +%{_includedir}/*.h +%{_libdir}/*.so +%{_libdir}/*.la +%{_libdir}/pkgconfig/*.pc + +%changelog +* Thu Feb 16 2012 Francois Andriot - r14-1 +- Initial build for TDE R14, using 'tqt3' instead of 'qt3' + diff --git a/redhat/dependencies/dbus-tqt/dbus-tqt-r14.spec b/redhat/dependencies/dbus-tqt/dbus-tqt-r14.spec new file mode 100644 index 000000000..aaf57264a --- /dev/null +++ b/redhat/dependencies/dbus-tqt/dbus-tqt-r14.spec @@ -0,0 +1,71 @@ +# Always build under "/usr" +%define _prefix /usr + + +Name: dbus-tqt +Version: r14 +Release: 1%{?dist} +License: GPL +Summary: Dbus TQT Interface +Group: System Environment/Libraries + +Vendor: Trinity Project +Packager: Francois Andriot + +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{name}-%{version}.tar.gz + +BuildRequires: gcc-c++ +BuildRequires: dbus-devel +BuildRequires: cmake >= 2.8 +BuildRequires: tqt3-devel >= 3.4.0 +BuildRequires: tqtinterface-devel +Requires: tqt3 >= 3.4.0 +Requires: tqtinterface + +%description +Dbus TQT Interface + + +%package devel +Requires: %{name} +Summary: %{name} - Development files +Group: Development/Libraries + + +%description devel +Development files for %{name} + + +%prep +%setup -q -n dependencies/%{name} + +%build +%__mkdir build +cd build +%cmake .. + +%__make %{?_smp_mflags} + + +%install +%__rm -rf %{?buildroot} +%__make install DESTDIR=%{?buildroot} -C build + +%clean +%__rm -rf %{?buildroot} + +%files +%{_libdir}/*.so.* + +%files devel +%{_includedir}/dbus-1.0/* +%{_libdir}/*.so +%{_libdir}/*.la +%{_libdir}/pkgconfig/*.pc + +%changelog +* Thu Feb 16 2012 Francois Andriot - r14-1 +- Initial build for TDE R14, using 'tqt3' instead of 'qt3' diff --git a/redhat/dependencies/tqtinterface/tqtinterface-r14.spec b/redhat/dependencies/tqtinterface/tqtinterface-r14.spec new file mode 100755 index 000000000..97cfa834c --- /dev/null +++ b/redhat/dependencies/tqtinterface/tqtinterface-r14.spec @@ -0,0 +1,91 @@ +# Always build under "/usr" +%define _prefix /usr +%define cmake_modules_dir %{_datadir}/cmake/Modules + +Name: tqtinterface +Version: r14 +Release: 1%{?dist} +License: GPL +Summary: Trinity QT Interface +Group: System Environment/Libraries + +Vendor: Trinity Project +URL: http://www.trinitydesktop.org/ +Packager: Francois Andriot + +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Source0: %{name}-%{version}.tar.gz + + +BuildRequires: cmake >= 2.8 +BuildRequires: tqt3-devel >= 3.4.0 +BuildRequires: gcc-c++ +BuildRequires: libXi-devel +BuildRequires: pth-devel + +Requires: tqt3 >= 3.4.0 + +%description +Trinity QT Interface + +%package devel +Group: Development/Libraries +Summary: %{name} - Development files +Requires: %{name} = %{version}-%{release} +Requires: tqt3-devel >= 3.4.0 + +%description devel +Development files for %{name} + +%prep +%setup -q -n dependencies/%{name} + +%build +%__mkdir build +cd build +%cmake \ + -DQT_VERSION=3 \ + -DINCLUDE_INSTALL_DIR=%{_includedir}/tqt \ + -DMOC_EXECUTABLE=/usr/bin/moc-tqt3 \ + -DUIC_EXECUTABLE=/usr/bin/uic-tqt3 \ + .. + +%__make %{?_smp_mflags} + + +%install +%__rm -rf %{?buildroot} +%__make install DESTDIR=%{?buildroot} -C build + +# RHEL 5: add newline at end of include files to avoid warnings +%if 0%{?rhel} && 0%{?rhel} <= 5 +for i in %{?buildroot}%{_includedir}/*.h; do + echo "" >>${i} +done +%endif + +# Install 'cmake' modules for development use +%__mkdir_p %{?buildroot}%{cmake_modules_dir} +for i in cmake/modules/*.cmake; do + %__install -m 644 $i %{?buildroot}%{cmake_modules_dir} +done + +%clean +%__rm -rf %{?buildroot} + +%files +%{_bindir}/* +%{_libdir}/*.so.* + +%files devel +%{_includedir}/tqt/ +%{_libdir}/*.so +%{_libdir}/*.la +%{_libdir}/pkgconfig/*.pc +%{cmake_modules_dir}/*.cmake + + +%changelog +* Tue Feb 14 2012 Francois Andriot - r14-1 +- Initial build for TDE R14, using 'tqt3' instead of 'qt3' -- cgit v1.2.1 From 279af91bd102f7416c1b74f16c715b3bc0f65b2b Mon Sep 17 00:00:00 2001 From: Francois Andriot Date: Sat, 18 Feb 2012 11:45:10 +0100 Subject: [RHEL/Fedora] Updates TDE LiveCD --- redhat/extras/trinity-live/fedora-live-tde-base.ks | 10 +++++++++- redhat/extras/trinity-live/fedora-livecd-tde.ks | 4 ++-- redhat/extras/trinity-live/trinity-live.spec | 6 +++++- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/redhat/extras/trinity-live/fedora-live-tde-base.ks b/redhat/extras/trinity-live/fedora-live-tde-base.ks index 827a0b2bf..593b44ca1 100644 --- a/redhat/extras/trinity-live/fedora-live-tde-base.ks +++ b/redhat/extras/trinity-live/fedora-live-tde-base.ks @@ -86,6 +86,14 @@ touch /usr/share/icons/hicolor/ mkdir -p /home/liveuser/Desktop mkdir -p /home/liveuser/Documents +# Kmix (from TDE) should be started automatically +#mkdir -p /home/liveuser/.trinity/Autostart +#ln -sf /opt/trinity/share/applications/kde/kmix.desktop /home/liveuser/.trinity/Autostart/kmix.desktop +cat </home/liveuser/.trinity/share/config/kmixrc +Autostart=true +Visible=false +EOF + # make sure to set the right permissions and selinux contexts chown -R liveuser:liveuser /home/liveuser/ restorecon -R /home/liveuser/ @@ -97,7 +105,7 @@ EOF ### TDE LIVECD specific features ### -# Sets 'nm-applet' to run automatically +# Sets 'nm-applet' to run automatically (system-wide) ln -sf /usr/share/applications/nm-applet.desktop /opt/trinity/share/autostart/nm-applet.desktop %end diff --git a/redhat/extras/trinity-live/fedora-livecd-tde.ks b/redhat/extras/trinity-live/fedora-livecd-tde.ks index efc379f6a..b9e0f78f1 100644 --- a/redhat/extras/trinity-live/fedora-livecd-tde.ks +++ b/redhat/extras/trinity-live/fedora-livecd-tde.ks @@ -25,6 +25,7 @@ trinity-k3b trinity-kaffeine trinity-kasablanca trinity-kbookreader +trinity-kdebluetooth trinity-kde-style-lipstik trinity-kgtk-qt3 trinity-kio-umountwrapper @@ -43,11 +44,10 @@ trinity-kde-i18n-French #trinity-kde-i18n-Spanish trinity-kde-i18n-Chinese-Big5 - # Fedora stuff fuse liveusb-creator - +yumex ### more desktop stuff fedora-icon-theme diff --git a/redhat/extras/trinity-live/trinity-live.spec b/redhat/extras/trinity-live/trinity-live.spec index 89f09e7f9..52c7612ad 100644 --- a/redhat/extras/trinity-live/trinity-live.spec +++ b/redhat/extras/trinity-live/trinity-live.spec @@ -2,7 +2,7 @@ %if "%{?version}" == "" %define version 3.5.13 %endif -%define release 2 +%define release 3 %define _datadir %{_usr}/share @@ -79,6 +79,10 @@ EOF %changelog +* Sat Jan 07 2012 Francois Andriot - 3.5.13-3 +- Start kmix automatically in LiveCD +- Add 'yumex' package manager + * Mon Dec 02 2011 Francois Andriot - 3.5.13-2 - More TDE 3.5.13 specific visual settings - Updates all packages to fix TDE bugs -- cgit v1.2.1 From 66efa7d249b00e776618b2e649ab0c47ef66d4e3 Mon Sep 17 00:00:00 2001 From: Francois Andriot Date: Sat, 18 Feb 2012 11:53:38 +0100 Subject: [RHEL/Fedora] Updates tdelibs for R14 --- redhat/kdelibs/tdelibs-r14.spec | 315 ++++++++++++++++++++++++++++++++++++++++ redhat/tdelibs | 1 + 2 files changed, 316 insertions(+) create mode 100755 redhat/kdelibs/tdelibs-r14.spec create mode 120000 redhat/tdelibs diff --git a/redhat/kdelibs/tdelibs-r14.spec b/redhat/kdelibs/tdelibs-r14.spec new file mode 100755 index 000000000..bbbcf60da --- /dev/null +++ b/redhat/kdelibs/tdelibs-r14.spec @@ -0,0 +1,315 @@ +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?_prefix}" != "/usr" +%define _variant .opt +%define _docdir %{_prefix}/share/doc +%endif + +# TDE specific variables +BuildRequires: cmake >= 2.8 +%define tde_docdir %{_docdir}/trinity +%define tde_libdir %{_libdir}/trinity + +# Older RHEL/Fedora versions use packages named "qt", "qt-devel", .. +# whereas newer versions use "qt3", "qt3-devel" ... +%if 0%{?rhel} >= 6 || 0%{?fedora} >= 8 +%define _qt_suffix 3 +%endif + + +Name: tdelibs +Version: r14 +Release: 1%{?dist}%{?_variant} +License: GPL +Summary: TDE Libraries +Group: System Environment/Libraries + +Vendor: Trinity Project +Packager: Francois Andriot +URL: http://www.trinitydesktop.org/ + +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: tdelibs-%{version}.tar.gz +Patch0: git.patch + +## [kdelibs/kio] Disable 'max line length' detection [Bug #656] +Patch10: kdelibs-3.5.13-maxlinelength.patch + +BuildRequires: libtool +BuildRequires: tqtinterface-devel +BuildRequires: trinity-arts-devel +BuildRequires: avahi-devel +BuildRequires: lua-devel +BuildRequires: krb5-devel libxslt-devel cups-devel libart_lgpl-devel pcre-devel +BuildRequires: libutempter-devel +BuildRequires: bzip2-devel +BuildRequires: openssl-devel +BuildRequires: gcc-c++ +BuildRequires: alsa-lib-devel +BuildRequires: libidn-devel +BuildRequires: tqt3-devel >= 3.4.0 +BuildRequires: avahi-tqt-devel +BuildRequires: jasper-devel +BuildRequires: libtiff-devel +BuildRequires: OpenEXR-devel +BuildRequires: libtool-ltdl-devel +BuildRequires: glib2-devel +BuildRequires: gamin-devel +BuildRequires: xorg-x11-proto-devel + +Requires: tqtinterface +Requires: trinity-arts +Requires: avahi +Requires: tqt3 >= 3.4.0 +Requires: avahi-tqt + +Obsoletes: trinity-kdelibs <= 3.5.13 + +%if "%{?_prefix}" == "/usr" +Provides: kdelibs%{?_qt_suffix} = %{version} +Obsoletes: kdelibs%{?_qt_suffix} <= 3.5.10 +%endif + +%description +Libraries for the Trinity Desktop Environment: +KDE Libraries included: kdecore (KDE core library), kdeui (user interface), +kfm (file manager), khtmlw (HTML widget), kio (Input/Output, networking), +kspell (spelling checker), jscript (javascript), kab (addressbook), +kimgio (image manipulation). + + +%package devel +Summary: %{name} - Development files +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Obsoletes: trinity-kdelibs-devel <= 3.5.13 +%if "%{?_prefix}" == "/usr" +Provides: kdelibs%{?_qt_suffix}-devel = %{version} +Obsoletes: kdelibs%{?_qt_suffix}-devel <= 3.5.10 +%endif + +%description devel +This package includes the header files you will need to compile +applications for TDE. + +%package apidocs +Group: Development/Libraries +Summary: %{name} - API documentation +Requires: %{name} = %{version}-%{release} +Obsoletes: trinity-kdelibs-apidocs <= 3.5.13 +%if "%{?_prefix}" == "/usr" +Provides: kdelibs%{?_qt_suffix}-apidocs = %{version} +Obsoletes: kdelibs%{?_qt_suffix}-apidocs <= 3.5.10 +%endif + +%description apidocs +This package includes the TDE API documentation in HTML +format for easy browsing + + +%prep +%setup -q -n tdelibs +#patch0 -p1 +%patch10 -p1 + + +%build +export PATH="%{_bindir}:${PATH}" +export LD_LIBRARY_PATH="%{_libdir}" +export PKG_CONFIG_PATH="%{_libdir}/pkgconfig" +export CMAKE_INCLUDE_PATH="%{_includedir}:%{_includedir}/tqt" + +%__mkdir build +cd build +%cmake \ + -DHAVE_REAL_TQT=ON \ + -DWITH_ARTS=ON \ + -DWITH_ALSA=ON \ + -DWITH_LIBART=ON \ + -DWITH_LIBIDN=OFF \ + -DWITH_SSL=ON \ + -DWITH_CUPS=ON \ + -DWITH_LUA=OFF \ + -DWITH_TIFF=ON \ + -DWITH_JASPER=ON \ + -DWITH_OPENEXR=ON \ + -DWITH_UTEMPTER=ON \ + -DWITH_AVAHI=ON \ + -DWITH_ASPELL=OFF \ + -DWITH_HSPELL=OFF \ + -DWITH_PCRE=ON \ + -DWITH_INOTIFY=ON \ + -DWITH_GAMIN=ON \ + .. + +%__make %{?_smp_mflags} + + +%install +%__rm -rf %{?buildroot} +%__make install DESTDIR=%{?buildroot} -C build + +%__mkdir_p %{?buildroot}%{_sysconfdir}/ld.so.conf.d +cat <%{?buildroot}%{_sysconfdir}/ld.so.conf.d/trinity.conf +%if "%{?_prefix}" != "/usr" +%{_libdir} +%endif +%{tde_libdir} +EOF + +# Moves the XDG configuration files to TDE directory +%if "%{_prefix}" != "/usr" + %__install -p -D -m644 \ + "%{?buildroot}%{_sysconfdir}/xdg/menus/applications.menu" \ + "%{?buildroot}%{_prefix}/etc/xdg/menus/kde-applications.menu" + %__rm -rf "%{?buildroot}%{_sysconfdir}/xdg" +%else + %__mv -f "%{?buildroot}%{_sysconfdir}/xdg/menus/applications.menu" "%{?buildroot}%{_sysconfdir}/xdg/menus/kde-applications.menu" +%endif + + +%clean +%__rm -rf %{?buildroot} + + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + + +%files +%defattr(-,root,root,-) +%doc README +%doc COPYING.LIB +%{_bindir}/artsmessage +%{_bindir}/cupsdconf +%{_bindir}/cupsdoprint +%{_bindir}/dcop +%{_bindir}/dcopclient +%{_bindir}/dcopfind +%{_bindir}/dcopobject +%{_bindir}/dcopquit +%{_bindir}/dcopref +%{_bindir}/dcopserver +%{_bindir}/dcopserver_shutdown +%{_bindir}/dcopstart +%{_bindir}/filesharelist +%{_bindir}/fileshareset +%{_bindir}/imagetops +%{_bindir}/kab2kabc +%{_bindir}/kaddprinterwizard +%{_bindir}/kbuildsycoca +%{_bindir}/kcmshell +%{_bindir}/kconf_update +%{_bindir}/kcookiejar +%{_bindir}/kde-config +%{_bindir}/kde-menu +%{_bindir}/kded +%{_bindir}/kdeinit +%{_bindir}/kdeinit_shutdown +%{_bindir}/kdeinit_wrapper +%{_bindir}/kdesu_stub +%{_bindir}/kdontchangethehostname +%{_bindir}/kdostartupconfig +%{_bindir}/kfile +%{_bindir}/kfmexec +%{_bindir}/khotnewstuff +%{_bindir}/kinstalltheme +%{_bindir}/kio_http_cache_cleaner +%{_bindir}/kio_uiserver +%{_bindir}/kioexec +%{_bindir}/kioslave +%{_bindir}/klauncher +%{_bindir}/kmailservice +%{_bindir}/kmimelist +%attr(4755,root,root) %{_bindir}/kpac_dhcp_helper +%{_bindir}/ksendbugmail +%{_bindir}/kshell +%{_bindir}/kstartupconfig +%{_bindir}/ktelnetservice +%{_bindir}/ktradertest +%{_bindir}/kwrapper +%{_bindir}/lnusertemp +%{_bindir}/make_driver_db_cups +%{_bindir}/make_driver_db_lpr +%{_bindir}/meinproc +%{_bindir}/networkstatustestservice +%{_bindir}/start_kdeinit +%{_bindir}/start_kdeinit_wrapper +%attr(4755,root,root) %{_bindir}/kgrantpty +%{_libdir}/lib*.so.* +%{_libdir}/libkdeinit_*.so +%{_libdir}/lib*.la +%{tde_libdir}/ +%{_datadir}/applications/kde/*.desktop +%{_datadir}/autostart/kab2kabc.desktop +%{_datadir}/applnk/kio_iso.desktop +%{_datadir}/apps/* +%exclude %{_datadir}/apps/ksgmltools2/ +%config(noreplace) %{_datadir}/config/* +%{_datadir}/emoticons/* +%{_datadir}/icons/default.kde +%{_datadir}/mimelnk/magic +%{_datadir}/mimelnk/*/*.desktop +%{_datadir}/services/* +%{_datadir}/servicetypes/* +%{_datadir}/icons/crystalsvg/ +%{tde_docdir}/HTML/en/kspell +# remove conflicts with kdelibs-4 +%if "%{?_prefix}" != "/usr" +%{_bindir}/checkXML +%{_bindir}/ksvgtopng +%{_bindir}/kunittestmodrunner +%{_bindir}/preparetips +%{_datadir}/icons/hicolor/index.theme +%{_datadir}/locale/all_languages +%{tde_docdir}/HTML/en/common/* +%else +%exclude %{_bindir}/checkXML +%exclude %{_bindir}/ksvgtopng +%exclude %{_bindir}/kunittestmodrunner +%exclude %{_bindir}/preparetips +%exclude %{_datadir}/config/colors +%exclude %{_datadir}/config/kdebug.areas +%exclude %{_datadir}/config/kdebugrc +%exclude %{_datadir}/config/ksslcalist +%exclude %{_datadir}/config/ui/ui_standards.rc +%exclude %{_datadir}/icons/hicolor/index.theme +%exclude %{_datadir}/locale/all_languages +%exclude %{tde_docdir}/HTML/en/common/* +%endif +%{_sysconfdir}/ld.so.conf.d/trinity.conf + +# Avoid conflict with 'redhat-menus' package +%if "%{_prefix}" == "/usr" +%{_sysconfdir}/xdg/menus/kde-applications.menu +%else +%{_prefix}/etc/xdg/menus/kde-applications.menu +%endif + +# New in TDE 3.5.13 +%{_bindir}/kdetcompmgr + +%files devel +%defattr(-,root,root,-) +%{_bindir}/dcopidl* +%{_bindir}/kconfig_compiler +%{_bindir}/makekdewidgets +%{_datadir}/apps/ksgmltools2/ +%{_includedir}/ +%{_libdir}/lib*.so +%{_libdir}/lib*.a +%exclude %{_libdir}/libkdeinit_*.so + +# New in TDE 3.5.13 +%{_datadir}/cmake/kdelibs.cmake + +%files apidocs +%defattr(-,root,root,-) +%{_docdir}/%{name}-%{version}/ + + +%changelog +* Thu Feb 16 2012 Francois Andriot - r14-1 +- Initial build for TDE R14, using 'tqt3' instead of 'qt3' diff --git a/redhat/tdelibs b/redhat/tdelibs new file mode 120000 index 000000000..028555378 --- /dev/null +++ b/redhat/tdelibs @@ -0,0 +1 @@ +kdelibs \ No newline at end of file -- cgit v1.2.1 From 62d5ce450ef33cc3e73f9382e5bfad5989ba7783 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 18 Feb 2012 15:18:46 -0600 Subject: Fix tdebase FTBFS on Ubuntu --- .../tdebase/debian/patches/kubuntu_89_new_logout_ui.diff | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ubuntu/maverick/tdebase/debian/patches/kubuntu_89_new_logout_ui.diff b/ubuntu/maverick/tdebase/debian/patches/kubuntu_89_new_logout_ui.diff index 2c106549e..63c0c8add 100644 --- a/ubuntu/maverick/tdebase/debian/patches/kubuntu_89_new_logout_ui.diff +++ b/ubuntu/maverick/tdebase/debian/patches/kubuntu_89_new_logout_ui.diff @@ -12,12 +12,12 @@ --- ksmserver/shutdowndlg.cpp +++ ksmserver/shutdowndlg.cpp -@@ -278,7 +278,7 @@ - 2 * KDialog::spacingHint() ); +@@ -668,7 +668,7 @@ + 2 * KDialog::spacingHint() ); // default factor -- bool doUbuntuLogout = KConfigGroup(KGlobal::config(), "Logout").readBoolEntry("doUbuntuLogout", false); -+ bool doUbuntuLogout = KConfigGroup(KGlobal::config(), "Logout").readBoolEntry("doUbuntuLogout", true); +- bool doUbuntuLogout = KConfigGroup(KGlobal::config(), "Logout").readBoolEntry("doUbuntuLogout", false); ++ bool doUbuntuLogout = KConfigGroup(KGlobal::config(), "Logout").readBoolEntry("doUbuntuLogout", true); - // slighty more space for the new logout - int factor = 2; \ No newline at end of file + // slighty more space for the new logout + int factor = 2; -- cgit v1.2.1 From a14ac9de2f5843036c9f452f1188979fef17ae6d Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 20 Feb 2012 14:45:20 -0600 Subject: Add twin_resumer_helper to twin package on Debian and Ubuntu --- debian/lenny/tdebase/debian/twin-trinity.install | 1 + debian/squeeze/tdebase/debian/twin-trinity.install | 1 + ubuntu/maverick/tdebase/debian/twin-trinity.install | 1 + 3 files changed, 3 insertions(+) diff --git a/debian/lenny/tdebase/debian/twin-trinity.install b/debian/lenny/tdebase/debian/twin-trinity.install index 62d42f166..242592b17 100644 --- a/debian/lenny/tdebase/debian/twin-trinity.install +++ b/debian/lenny/tdebase/debian/twin-trinity.install @@ -1,6 +1,7 @@ debian/tmp/opt/trinity/bin/kompmgr debian/tmp/opt/trinity/bin/twin debian/tmp/opt/trinity/bin/twin_killer_helper +debian/tmp/opt/trinity/bin/twin_resumer_helper debian/tmp/opt/trinity/bin/twin_rules_dialog debian/tmp/opt/trinity/lib/kconf_update_bin/twin_update_default_rules debian/tmp/opt/trinity/lib/kconf_update_bin/twin_update_window_settings diff --git a/debian/squeeze/tdebase/debian/twin-trinity.install b/debian/squeeze/tdebase/debian/twin-trinity.install index 62d42f166..242592b17 100644 --- a/debian/squeeze/tdebase/debian/twin-trinity.install +++ b/debian/squeeze/tdebase/debian/twin-trinity.install @@ -1,6 +1,7 @@ debian/tmp/opt/trinity/bin/kompmgr debian/tmp/opt/trinity/bin/twin debian/tmp/opt/trinity/bin/twin_killer_helper +debian/tmp/opt/trinity/bin/twin_resumer_helper debian/tmp/opt/trinity/bin/twin_rules_dialog debian/tmp/opt/trinity/lib/kconf_update_bin/twin_update_default_rules debian/tmp/opt/trinity/lib/kconf_update_bin/twin_update_window_settings diff --git a/ubuntu/maverick/tdebase/debian/twin-trinity.install b/ubuntu/maverick/tdebase/debian/twin-trinity.install index 62d42f166..242592b17 100644 --- a/ubuntu/maverick/tdebase/debian/twin-trinity.install +++ b/ubuntu/maverick/tdebase/debian/twin-trinity.install @@ -1,6 +1,7 @@ debian/tmp/opt/trinity/bin/kompmgr debian/tmp/opt/trinity/bin/twin debian/tmp/opt/trinity/bin/twin_killer_helper +debian/tmp/opt/trinity/bin/twin_resumer_helper debian/tmp/opt/trinity/bin/twin_rules_dialog debian/tmp/opt/trinity/lib/kconf_update_bin/twin_update_default_rules debian/tmp/opt/trinity/lib/kconf_update_bin/twin_update_window_settings -- cgit v1.2.1