diff options
| author | Robert Xu <robxu9@gmail.com> | 2012-03-31 14:28:30 -0400 |
|---|---|---|
| committer | Robert Xu <robxu9@gmail.com> | 2012-03-31 14:28:30 -0400 |
| commit | 8334f62eb4c103256204708eef6ea1077744ae67 (patch) | |
| tree | c54a5afd119b408df8dff0e38f284710ac97b755 /debian/squeeze | |
| parent | 59dd46ef985a719579132efa6a9aa49bfeeae112 (diff) | |
| parent | de0c80d8630d52a67dc316b36e3e7b3af29ecb01 (diff) | |
| download | tde-packaging-8334f62eb4c103256204708eef6ea1077744ae67.tar.gz tde-packaging-8334f62eb4c103256204708eef6ea1077744ae67.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'debian/squeeze')
44 files changed, 332 insertions, 336 deletions
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 de663438c..ebdf4630a 100644 --- a/debian/squeeze/applications/keep/debian/patches/kubuntu_01_kdepot.diff +++ b/debian/squeeze/applications/keep/debian/patches/kubuntu_01_kdepot.diff @@ -14,7 +14,7 @@ diff -Nur keep-0.4.0/admin/cvs.sh keep-0.4.0.new/admin/cvs.sh fi perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile -- kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot if ! test -f $kdepotpath; then - kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot + kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot fi diff --git a/debian/squeeze/dependencies/libcaldav/debian/rules b/debian/squeeze/dependencies/libcaldav/debian/rules index e9afd40a5..0dda6ea24 100755 --- a/debian/squeeze/dependencies/libcaldav/debian/rules +++ b/debian/squeeze/dependencies/libcaldav/debian/rules @@ -60,7 +60,6 @@ install: build 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/* diff --git a/debian/squeeze/dependencies/libcarddav/debian/rules b/debian/squeeze/dependencies/libcarddav/debian/rules index 69c8a53d7..124929739 100755 --- a/debian/squeeze/dependencies/libcarddav/debian/rules +++ b/debian/squeeze/dependencies/libcarddav/debian/rules @@ -60,7 +60,6 @@ install: build 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/* diff --git a/debian/squeeze/libraries/pytdeextensions/debian/changelog b/debian/squeeze/libraries/pytdeextensions/debian/changelog index 4f1eb90be..119a3e420 100644 --- a/debian/squeeze/libraries/pytdeextensions/debian/changelog +++ b/debian/squeeze/libraries/pytdeextensions/debian/changelog @@ -100,7 +100,7 @@ pytdeextensions (0.4.0-3) unstable; urgency=low * Added pycompat and pyversions * Force to use python2.4 (Closes: #375618) * Added to Build-Depends: python-support, python-all-dev, - tdelibs4c2a (for kde-config) + tdelibs4c2a (for tde-config) * Updated libpythonize0-dev, libpythonize0, and pytdextensions install files * Cleaned up rules * Added 12_force_python2.4_script.diff to force python2.4 in scripts 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 e154eb334..20ad1b0b7 100644 --- a/debian/squeeze/tdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/squeeze/tdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff @@ -13,13 +13,13 @@ fi perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile -- kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot - fi -+# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot ++# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`tde-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 e154eb334..20ad1b0b7 100644 --- a/debian/squeeze/tdeaddons/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/squeeze/tdeaddons/debian/patches/common/kubuntu_01_kdepot.diff @@ -13,13 +13,13 @@ fi perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile -- kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot - fi -+# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot ++# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`tde-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 e154eb334..20ad1b0b7 100644 --- a/debian/squeeze/tdeadmin/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/squeeze/tdeadmin/debian/patches/common/kubuntu_01_kdepot.diff @@ -13,13 +13,13 @@ fi perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile -- kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot - fi -+# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot ++# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/debian/squeeze/tdebase/debian/kdesktop-trinity.install b/debian/squeeze/tdebase/debian/kdesktop-trinity.install index 8ee3c9256..d34eea39d 100644 --- a/debian/squeeze/tdebase/debian/kdesktop-trinity.install +++ b/debian/squeeze/tdebase/debian/kdesktop-trinity.install @@ -28,9 +28,7 @@ debian/tmp/opt/trinity/share/apps/kdesktop/patterns/stonewall2.desktop debian/tmp/opt/trinity/share/apps/kdesktop/patterns/stonewall2.png debian/tmp/opt/trinity/share/apps/kdesktop/patterns/triangles.desktop debian/tmp/opt/trinity/share/apps/kdesktop/patterns/triangles.png -debian/tmp/opt/trinity/share/apps/kdesktop/pics/kde2.xbm debian/tmp/opt/trinity/share/apps/kdesktop/pics/ksslogo.png -debian/tmp/opt/trinity/share/apps/kdesktop/pics/splash2.png debian/tmp/opt/trinity/share/apps/kdesktop/pics/splash.png debian/tmp/opt/trinity/share/apps/kdesktop/programs/kwebdesktop.desktop debian/tmp/opt/trinity/share/apps/kdesktop/programs/xearth.desktop diff --git a/debian/squeeze/tdebase/debian/khelpcenter-trinity.install b/debian/squeeze/tdebase/debian/khelpcenter-trinity.install index f2fe725b2..5cf82b23e 100644 --- a/debian/squeeze/tdebase/debian/khelpcenter-trinity.install +++ b/debian/squeeze/tdebase/debian/khelpcenter-trinity.install @@ -19,7 +19,6 @@ debian/tmp/opt/trinity/share/apps/khelpcenter/plugins/contact.desktop debian/tmp/opt/trinity/share/apps/khelpcenter/plugins/faq.desktop debian/tmp/opt/trinity/share/apps/khelpcenter/plugins/info.desktop debian/tmp/opt/trinity/share/apps/khelpcenter/plugins/kcontrolmodules.desktop -debian/tmp/opt/trinity/share/apps/khelpcenter/plugins/kicmodules.desktop debian/tmp/opt/trinity/share/apps/khelpcenter/plugins/kioslaves.desktop debian/tmp/opt/trinity/share/apps/khelpcenter/plugins/konqplugins.desktop debian/tmp/opt/trinity/share/apps/khelpcenter/plugins/links.desktop diff --git a/debian/squeeze/tdebase/debian/rules b/debian/squeeze/tdebase/debian/rules index aee72896e..823a90869 100755 --- a/debian/squeeze/tdebase/debian/rules +++ b/debian/squeeze/tdebase/debian/rules @@ -226,10 +226,10 @@ binary-install/tdebase-data-trinity:: # hack the oui.db install, as under kfreebsd it does not get installed and then breaks at dh_install time # it's in fact a linux specific file... install -p -D -m644 kcontrol/view1394/oui.db debian/tdebase-data-trinity/opt/trinity/share/apps/kcmview1394/oui.db - install -p -D -m644 debian/tmp/etc/xdg/menus/applications-merged/kde-essential.menu debian/tdebase-data-trinity/opt/trinity/etc/xdg/menus/applications-merged/kde-essential.menu - install -p -D -m644 debian/tmp/etc/xdg/menus/kde-information.menu debian/tdebase-data-trinity/opt/trinity/etc/xdg/menus/kde-information.menu - install -p -D -m644 debian/tmp/etc/xdg/menus/kde-screensavers.menu debian/tdebase-data-trinity/opt/trinity/etc/xdg/menus/kde-screensavers.menu - install -p -D -m644 debian/tmp/etc/xdg/menus/kde-settings.menu debian/tdebase-data-trinity/opt/trinity/etc/xdg/menus/kde-settings.menu + install -p -D -m644 debian/tmp/etc/xdg/menus/applications-merged/tde-essential.menu debian/tdebase-data-trinity/opt/trinity/etc/xdg/menus/applications-merged/tde-essential.menu + install -p -D -m644 debian/tmp/etc/xdg/menus/tde-information.menu debian/tdebase-data-trinity/opt/trinity/etc/xdg/menus/tde-information.menu + install -p -D -m644 debian/tmp/etc/xdg/menus/tde-screensavers.menu debian/tdebase-data-trinity/opt/trinity/etc/xdg/menus/tde-screensavers.menu + install -p -D -m644 debian/tmp/etc/xdg/menus/tde-settings.menu debian/tdebase-data-trinity/opt/trinity/etc/xdg/menus/tde-settings.menu rm -rf debian/tmp/etc/xdg/* rm -rf debian/tdebase-data-trinity/etc/xdg/* diff --git a/debian/squeeze/tdebase/debian/tdebase-data-trinity.preinst b/debian/squeeze/tdebase/debian/tdebase-data-trinity.preinst index 87dc6edc8..9c62c3209 100644 --- a/debian/squeeze/tdebase/debian/tdebase-data-trinity.preinst +++ b/debian/squeeze/tdebase/debian/tdebase-data-trinity.preinst @@ -1,6 +1,6 @@ #! /bin/sh -e -FILE="/etc/xdg/menus/kde-applications-merged/kde-essential.menu" +FILE="/etc/xdg/menus/kde-applications-merged/tde-essential.menu" SUBDIR="/etc/xdg/menus/kde-applications-merged" case "$1" in diff --git a/debian/squeeze/tdebase/debian/tdebase-runtime-data-common-trinity.install b/debian/squeeze/tdebase/debian/tdebase-runtime-data-common-trinity.install index e906f3a3f..4521c6f2d 100644 --- a/debian/squeeze/tdebase/debian/tdebase-runtime-data-common-trinity.install +++ b/debian/squeeze/tdebase/debian/tdebase-runtime-data-common-trinity.install @@ -1,50 +1,50 @@ -debian/tmp/opt/trinity/share/desktop-directories/kde-development.directory -debian/tmp/opt/trinity/share/desktop-directories/kde-development-translation.directory -debian/tmp/opt/trinity/share/desktop-directories/kde-development-webdevelopment.directory -debian/tmp/opt/trinity/share/desktop-directories/kde-editors.directory -debian/tmp/opt/trinity/share/desktop-directories/kde-edutainment.directory -debian/tmp/opt/trinity/share/desktop-directories/kde-games-arcade.directory -debian/tmp/opt/trinity/share/desktop-directories/kde-games-board.directory -debian/tmp/opt/trinity/share/desktop-directories/kde-games-card.directory -debian/tmp/opt/trinity/share/desktop-directories/kde-games.directory -debian/tmp/opt/trinity/share/desktop-directories/kde-games-kids.directory -debian/tmp/opt/trinity/share/desktop-directories/kde-games-roguelikes.directory -debian/tmp/opt/trinity/share/desktop-directories/kde-games-strategy.directory -debian/tmp/opt/trinity/share/desktop-directories/kde-graphics.directory -debian/tmp/opt/trinity/share/desktop-directories/kde-information.directory -debian/tmp/opt/trinity/share/desktop-directories/kde-internet.directory -debian/tmp/opt/trinity/share/desktop-directories/kde-internet-terminal.directory -debian/tmp/opt/trinity/share/desktop-directories/kde-main.directory -debian/tmp/opt/trinity/share/desktop-directories/kde-more.directory -debian/tmp/opt/trinity/share/desktop-directories/kde-multimedia.directory -debian/tmp/opt/trinity/share/desktop-directories/kde-office.directory -debian/tmp/opt/trinity/share/desktop-directories/kde-science.directory -debian/tmp/opt/trinity/share/desktop-directories/kde-settings-accessibility.directory -debian/tmp/opt/trinity/share/desktop-directories/kde-settings-components.directory -debian/tmp/opt/trinity/share/desktop-directories/kde-settings-desktop.directory -debian/tmp/opt/trinity/share/desktop-directories/kde-settings.directory -debian/tmp/opt/trinity/share/desktop-directories/kde-settings-hardware.directory -debian/tmp/opt/trinity/share/desktop-directories/kde-settings-looknfeel.directory -debian/tmp/opt/trinity/share/desktop-directories/kde-settingsmenu.directory -debian/tmp/opt/trinity/share/desktop-directories/kde-settings-network.directory -debian/tmp/opt/trinity/share/desktop-directories/kde-settings-peripherals.directory -debian/tmp/opt/trinity/share/desktop-directories/kde-settings-power.directory -debian/tmp/opt/trinity/share/desktop-directories/kde-settings-security.directory -debian/tmp/opt/trinity/share/desktop-directories/kde-settings-sound.directory -debian/tmp/opt/trinity/share/desktop-directories/kde-settings-system.directory -debian/tmp/opt/trinity/share/desktop-directories/kde-settings-webbrowsing.directory -debian/tmp/opt/trinity/share/desktop-directories/kde-system.directory -debian/tmp/opt/trinity/share/desktop-directories/kde-system-screensavers.directory -debian/tmp/opt/trinity/share/desktop-directories/kde-system-terminal.directory -debian/tmp/opt/trinity/share/desktop-directories/kde-toys.directory -debian/tmp/opt/trinity/share/desktop-directories/kde-unknown.directory -debian/tmp/opt/trinity/share/desktop-directories/kde-utilities-accessibility.directory -debian/tmp/opt/trinity/share/desktop-directories/kde-utilities-desktop.directory -debian/tmp/opt/trinity/share/desktop-directories/kde-utilities.directory -debian/tmp/opt/trinity/share/desktop-directories/kde-utilities-file.directory -debian/tmp/opt/trinity/share/desktop-directories/kde-utilities-peripherals.directory -debian/tmp/opt/trinity/share/desktop-directories/kde-utilities-pim.directory -debian/tmp/opt/trinity/share/desktop-directories/kde-utilities-xutils.directory +debian/tmp/opt/trinity/share/desktop-directories/tde-development.directory +debian/tmp/opt/trinity/share/desktop-directories/tde-development-translation.directory +debian/tmp/opt/trinity/share/desktop-directories/tde-development-webdevelopment.directory +debian/tmp/opt/trinity/share/desktop-directories/tde-editors.directory +debian/tmp/opt/trinity/share/desktop-directories/tde-edutainment.directory +debian/tmp/opt/trinity/share/desktop-directories/tde-games-arcade.directory +debian/tmp/opt/trinity/share/desktop-directories/tde-games-board.directory +debian/tmp/opt/trinity/share/desktop-directories/tde-games-card.directory +debian/tmp/opt/trinity/share/desktop-directories/tde-games.directory +debian/tmp/opt/trinity/share/desktop-directories/tde-games-kids.directory +debian/tmp/opt/trinity/share/desktop-directories/tde-games-roguelikes.directory +debian/tmp/opt/trinity/share/desktop-directories/tde-games-strategy.directory +debian/tmp/opt/trinity/share/desktop-directories/tde-graphics.directory +debian/tmp/opt/trinity/share/desktop-directories/tde-information.directory +debian/tmp/opt/trinity/share/desktop-directories/tde-internet.directory +debian/tmp/opt/trinity/share/desktop-directories/tde-internet-terminal.directory +debian/tmp/opt/trinity/share/desktop-directories/tde-main.directory +debian/tmp/opt/trinity/share/desktop-directories/tde-more.directory +debian/tmp/opt/trinity/share/desktop-directories/tde-multimedia.directory +debian/tmp/opt/trinity/share/desktop-directories/tde-office.directory +debian/tmp/opt/trinity/share/desktop-directories/tde-science.directory +debian/tmp/opt/trinity/share/desktop-directories/tde-settings-accessibility.directory +debian/tmp/opt/trinity/share/desktop-directories/tde-settings-components.directory +debian/tmp/opt/trinity/share/desktop-directories/tde-settings-desktop.directory +debian/tmp/opt/trinity/share/desktop-directories/tde-settings.directory +debian/tmp/opt/trinity/share/desktop-directories/tde-settings-hardware.directory +debian/tmp/opt/trinity/share/desktop-directories/tde-settings-looknfeel.directory +debian/tmp/opt/trinity/share/desktop-directories/tde-settingsmenu.directory +debian/tmp/opt/trinity/share/desktop-directories/tde-settings-network.directory +debian/tmp/opt/trinity/share/desktop-directories/tde-settings-peripherals.directory +debian/tmp/opt/trinity/share/desktop-directories/tde-settings-power.directory +debian/tmp/opt/trinity/share/desktop-directories/tde-settings-security.directory +debian/tmp/opt/trinity/share/desktop-directories/tde-settings-sound.directory +debian/tmp/opt/trinity/share/desktop-directories/tde-settings-system.directory +debian/tmp/opt/trinity/share/desktop-directories/tde-settings-webbrowsing.directory +debian/tmp/opt/trinity/share/desktop-directories/tde-system.directory +debian/tmp/opt/trinity/share/desktop-directories/tde-system-screensavers.directory +debian/tmp/opt/trinity/share/desktop-directories/tde-system-terminal.directory +debian/tmp/opt/trinity/share/desktop-directories/tde-toys.directory +debian/tmp/opt/trinity/share/desktop-directories/tde-unknown.directory +debian/tmp/opt/trinity/share/desktop-directories/tde-utilities-accessibility.directory +debian/tmp/opt/trinity/share/desktop-directories/tde-utilities-desktop.directory +debian/tmp/opt/trinity/share/desktop-directories/tde-utilities.directory +debian/tmp/opt/trinity/share/desktop-directories/tde-utilities-file.directory +debian/tmp/opt/trinity/share/desktop-directories/tde-utilities-peripherals.directory +debian/tmp/opt/trinity/share/desktop-directories/tde-utilities-pim.directory +debian/tmp/opt/trinity/share/desktop-directories/tde-utilities-xutils.directory debian/tmp/opt/trinity/share/locale/l10n/ad/entry.desktop debian/tmp/opt/trinity/share/locale/l10n/ad/flag.png debian/tmp/opt/trinity/share/locale/l10n/ae/entry.desktop @@ -574,4 +574,4 @@ debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/ksplash.png debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/ksplash.png debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/ksplash.png debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/ksplash.png -debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/ksplash.png
\ No newline at end of file +debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/ksplash.png diff --git a/debian/squeeze/tdebase/debian/tdm-trinity.install b/debian/squeeze/tdebase/debian/tdm-trinity.install index 289fa03af..fd1aff663 100644 --- a/debian/squeeze/tdebase/debian/tdm-trinity.install +++ b/debian/squeeze/tdebase/debian/tdm-trinity.install @@ -12,7 +12,6 @@ debian/tmp/opt/trinity/bin/tdm_config debian/tmp/opt/trinity/bin/tdmctl debian/tmp/opt/trinity/bin/tdm_greet debian/tmp/opt/trinity/bin/krootimage -debian/tmp/opt/trinity/share/apps/tdm/pics/kdelogo-crystal.png debian/tmp/opt/trinity/share/apps/tdm/pics/kdelogo.png debian/tmp/opt/trinity/share/apps/tdm/pics/shutdown.jpg debian/tmp/opt/trinity/share/apps/tdm/pics/users/default1.png 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 e154eb334..20ad1b0b7 100644 --- a/debian/squeeze/tdebindings/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/squeeze/tdebindings/debian/patches/common/kubuntu_01_kdepot.diff @@ -13,13 +13,13 @@ fi perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile -- kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot - fi -+# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot ++# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`tde-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 e154eb334..20ad1b0b7 100644 --- a/debian/squeeze/tdeedu/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/squeeze/tdeedu/debian/patches/common/kubuntu_01_kdepot.diff @@ -13,13 +13,13 @@ fi perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile -- kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot - fi -+# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot ++# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`tde-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 e154eb334..20ad1b0b7 100644 --- a/debian/squeeze/tdegames/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/squeeze/tdegames/debian/patches/common/kubuntu_01_kdepot.diff @@ -13,13 +13,13 @@ fi perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile -- kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot - fi -+# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot ++# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`tde-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/libpoppler-tqt-dev.install b/debian/squeeze/tdegraphics/debian/libpoppler-tqt-dev.install index 7e7ce35c8..44011f759 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/tde/poppler-link-qt3.h -debian/tmp/opt/trinity/include/tde/poppler-page-transition.h -debian/tmp/opt/trinity/include/tde/poppler-qt.h +debian/tmp/opt/trinity/include/poppler-link-qt3.h +debian/tmp/opt/trinity/include/poppler-page-transition.h +debian/tmp/opt/trinity/include/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 e154eb334..20ad1b0b7 100644 --- a/debian/squeeze/tdegraphics/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/squeeze/tdegraphics/debian/patches/common/kubuntu_01_kdepot.diff @@ -13,13 +13,13 @@ fi perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile -- kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot - fi -+# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot ++# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`tde-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/tdegraphics-dev-trinity.install b/debian/squeeze/tdegraphics/debian/tdegraphics-dev-trinity.install index 4d50b4fc5..80d007db5 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/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/include/dom/SVGAElement.h +debian/tmp/opt/trinity/include/dom/SVGAltGlyphDefElement.h +debian/tmp/opt/trinity/include/dom/SVGAltGlyphElement.h +debian/tmp/opt/trinity/include/dom/SVGAngle.h +debian/tmp/opt/trinity/include/dom/SVGAnimateColorElement.h +debian/tmp/opt/trinity/include/dom/SVGAnimateElement.h +debian/tmp/opt/trinity/include/dom/SVGAnimateMotionElement.h +debian/tmp/opt/trinity/include/dom/SVGAnimateTransformElement.h +debian/tmp/opt/trinity/include/dom/SVGAnimatedAngle.h +debian/tmp/opt/trinity/include/dom/SVGAnimatedBoolean.h +debian/tmp/opt/trinity/include/dom/SVGAnimatedEnumeration.h +debian/tmp/opt/trinity/include/dom/SVGAnimatedInteger.h +debian/tmp/opt/trinity/include/dom/SVGAnimatedLength.h +debian/tmp/opt/trinity/include/dom/SVGAnimatedLengthList.h +debian/tmp/opt/trinity/include/dom/SVGAnimatedNumber.h +debian/tmp/opt/trinity/include/dom/SVGAnimatedNumberList.h +debian/tmp/opt/trinity/include/dom/SVGAnimatedPathData.h +debian/tmp/opt/trinity/include/dom/SVGAnimatedPoints.h +debian/tmp/opt/trinity/include/dom/SVGAnimatedPreserveAspectRatio.h +debian/tmp/opt/trinity/include/dom/SVGAnimatedRect.h +debian/tmp/opt/trinity/include/dom/SVGAnimatedString.h +debian/tmp/opt/trinity/include/dom/SVGAnimatedTransformList.h +debian/tmp/opt/trinity/include/dom/SVGAnimationElement.h +debian/tmp/opt/trinity/include/dom/SVGCSSRule.h +debian/tmp/opt/trinity/include/dom/SVGCircleElement.h +debian/tmp/opt/trinity/include/dom/SVGClipPathElement.h +debian/tmp/opt/trinity/include/dom/SVGColor.h +debian/tmp/opt/trinity/include/dom/SVGColorProfileElement.h +debian/tmp/opt/trinity/include/dom/SVGColorProfileRule.h +debian/tmp/opt/trinity/include/dom/SVGComponentTransferFunctionElement.h +debian/tmp/opt/trinity/include/dom/SVGCursorElement.h +debian/tmp/opt/trinity/include/dom/SVGDefinitionSrcElement.h +debian/tmp/opt/trinity/include/dom/SVGDefsElement.h +debian/tmp/opt/trinity/include/dom/SVGDescElement.h +debian/tmp/opt/trinity/include/dom/SVGDocument.h +debian/tmp/opt/trinity/include/dom/SVGElement.h +debian/tmp/opt/trinity/include/dom/SVGElementInstance.h +debian/tmp/opt/trinity/include/dom/SVGElementInstanceList.h +debian/tmp/opt/trinity/include/dom/SVGEllipseElement.h +debian/tmp/opt/trinity/include/dom/SVGEvent.h +debian/tmp/opt/trinity/include/dom/SVGException.h +debian/tmp/opt/trinity/include/dom/SVGExternalResourcesRequired.h +debian/tmp/opt/trinity/include/dom/SVGFEBlendElement.h +debian/tmp/opt/trinity/include/dom/SVGFEColorMatrixElement.h +debian/tmp/opt/trinity/include/dom/SVGFEComponentTransferElement.h +debian/tmp/opt/trinity/include/dom/SVGFECompositeElement.h +debian/tmp/opt/trinity/include/dom/SVGFEConvolveMatrixElement.h +debian/tmp/opt/trinity/include/dom/SVGFEDiffuseLightingElement.h +debian/tmp/opt/trinity/include/dom/SVGFEDisplacementMapElement.h +debian/tmp/opt/trinity/include/dom/SVGFEDistantLightElement.h +debian/tmp/opt/trinity/include/dom/SVGFEFloodElement.h +debian/tmp/opt/trinity/include/dom/SVGFEFuncAElement.h +debian/tmp/opt/trinity/include/dom/SVGFEFuncBElement.h +debian/tmp/opt/trinity/include/dom/SVGFEFuncGElement.h +debian/tmp/opt/trinity/include/dom/SVGFEFuncRElement.h +debian/tmp/opt/trinity/include/dom/SVGFEGaussianBlurElement.h +debian/tmp/opt/trinity/include/dom/SVGFEImageElement.h +debian/tmp/opt/trinity/include/dom/SVGFEMergeElement.h +debian/tmp/opt/trinity/include/dom/SVGFEMergeNodeElement.h +debian/tmp/opt/trinity/include/dom/SVGFEMorphologyElement.h +debian/tmp/opt/trinity/include/dom/SVGFEOffsetElement.h +debian/tmp/opt/trinity/include/dom/SVGFEPointLightElement.h +debian/tmp/opt/trinity/include/dom/SVGFESpecularLightingElement.h +debian/tmp/opt/trinity/include/dom/SVGFESpotLightElement.h +debian/tmp/opt/trinity/include/dom/SVGFETileElement.h +debian/tmp/opt/trinity/include/dom/SVGFETurbulenceElement.h +debian/tmp/opt/trinity/include/dom/SVGFilterElement.h +debian/tmp/opt/trinity/include/dom/SVGFilterPrimitiveStandardAttributes.h +debian/tmp/opt/trinity/include/dom/SVGFitToViewBox.h +debian/tmp/opt/trinity/include/dom/SVGFontElement.h +debian/tmp/opt/trinity/include/dom/SVGFontFaceElement.h +debian/tmp/opt/trinity/include/dom/SVGFontFaceFormatElement.h +debian/tmp/opt/trinity/include/dom/SVGFontFaceNameElement.h +debian/tmp/opt/trinity/include/dom/SVGFontFaceSrcElement.h +debian/tmp/opt/trinity/include/dom/SVGFontFaceUriElement.h +debian/tmp/opt/trinity/include/dom/SVGForeignObjectElement.h +debian/tmp/opt/trinity/include/dom/SVGGElement.h +debian/tmp/opt/trinity/include/dom/SVGGlyphElement.h +debian/tmp/opt/trinity/include/dom/SVGGlyphRefElement.h +debian/tmp/opt/trinity/include/dom/SVGGradientElement.h +debian/tmp/opt/trinity/include/dom/SVGHKernElement.h +debian/tmp/opt/trinity/include/dom/SVGICCColor.h +debian/tmp/opt/trinity/include/dom/SVGImageElement.h +debian/tmp/opt/trinity/include/dom/SVGLangSpace.h +debian/tmp/opt/trinity/include/dom/SVGLength.h +debian/tmp/opt/trinity/include/dom/SVGLengthList.h +debian/tmp/opt/trinity/include/dom/SVGLineElement.h +debian/tmp/opt/trinity/include/dom/SVGLinearGradientElement.h +debian/tmp/opt/trinity/include/dom/SVGLocatable.h +debian/tmp/opt/trinity/include/dom/SVGMPathElement.h +debian/tmp/opt/trinity/include/dom/SVGMarkerElement.h +debian/tmp/opt/trinity/include/dom/SVGMaskElement.h +debian/tmp/opt/trinity/include/dom/SVGMatrix.h +debian/tmp/opt/trinity/include/dom/SVGMetadataElement.h +debian/tmp/opt/trinity/include/dom/SVGMissingGlyphElement.h +debian/tmp/opt/trinity/include/dom/SVGNumber.h +debian/tmp/opt/trinity/include/dom/SVGNumberList.h +debian/tmp/opt/trinity/include/dom/SVGPaint.h +debian/tmp/opt/trinity/include/dom/SVGPathElement.h +debian/tmp/opt/trinity/include/dom/SVGPathSeg.h +debian/tmp/opt/trinity/include/dom/SVGPathSegArc.h +debian/tmp/opt/trinity/include/dom/SVGPathSegClosePath.h +debian/tmp/opt/trinity/include/dom/SVGPathSegCurvetoCubic.h +debian/tmp/opt/trinity/include/dom/SVGPathSegCurvetoCubicSmooth.h +debian/tmp/opt/trinity/include/dom/SVGPathSegCurvetoQuadratic.h +debian/tmp/opt/trinity/include/dom/SVGPathSegCurvetoQuadraticSmooth.h +debian/tmp/opt/trinity/include/dom/SVGPathSegLineto.h +debian/tmp/opt/trinity/include/dom/SVGPathSegLinetoHorizontal.h +debian/tmp/opt/trinity/include/dom/SVGPathSegLinetoVertical.h +debian/tmp/opt/trinity/include/dom/SVGPathSegList.h +debian/tmp/opt/trinity/include/dom/SVGPathSegMoveto.h +debian/tmp/opt/trinity/include/dom/SVGPatternElement.h +debian/tmp/opt/trinity/include/dom/SVGPoint.h +debian/tmp/opt/trinity/include/dom/SVGPointList.h +debian/tmp/opt/trinity/include/dom/SVGPolygonElement.h +debian/tmp/opt/trinity/include/dom/SVGPolylineElement.h +debian/tmp/opt/trinity/include/dom/SVGPreserveAspectRatio.h +debian/tmp/opt/trinity/include/dom/SVGRadialGradientElement.h +debian/tmp/opt/trinity/include/dom/SVGRect.h +debian/tmp/opt/trinity/include/dom/SVGRectElement.h +debian/tmp/opt/trinity/include/dom/SVGRenderingIntent.h +debian/tmp/opt/trinity/include/dom/SVGSVGElement.h +debian/tmp/opt/trinity/include/dom/SVGScriptElement.h +debian/tmp/opt/trinity/include/dom/SVGSetElement.h +debian/tmp/opt/trinity/include/dom/SVGStopElement.h +debian/tmp/opt/trinity/include/dom/SVGStringList.h +debian/tmp/opt/trinity/include/dom/SVGStylable.h +debian/tmp/opt/trinity/include/dom/SVGStyleElement.h +debian/tmp/opt/trinity/include/dom/SVGSwitchElement.h +debian/tmp/opt/trinity/include/dom/SVGSymbolElement.h +debian/tmp/opt/trinity/include/dom/SVGTRefElement.h +debian/tmp/opt/trinity/include/dom/SVGTSpanElement.h +debian/tmp/opt/trinity/include/dom/SVGTests.h +debian/tmp/opt/trinity/include/dom/SVGTextContentElement.h +debian/tmp/opt/trinity/include/dom/SVGTextElement.h +debian/tmp/opt/trinity/include/dom/SVGTextPathElement.h +debian/tmp/opt/trinity/include/dom/SVGTextPositioningElement.h +debian/tmp/opt/trinity/include/dom/SVGTitleElement.h +debian/tmp/opt/trinity/include/dom/SVGTransform.h +debian/tmp/opt/trinity/include/dom/SVGTransformList.h +debian/tmp/opt/trinity/include/dom/SVGTransformable.h +debian/tmp/opt/trinity/include/dom/SVGURIReference.h +debian/tmp/opt/trinity/include/dom/SVGUnitTypes.h +debian/tmp/opt/trinity/include/dom/SVGUseElement.h +debian/tmp/opt/trinity/include/dom/SVGVKernElement.h +debian/tmp/opt/trinity/include/dom/SVGViewElement.h +debian/tmp/opt/trinity/include/dom/SVGViewSpec.h +debian/tmp/opt/trinity/include/dom/SVGWindow.h +debian/tmp/opt/trinity/include/dom/SVGZoomAndPan.h +debian/tmp/opt/trinity/include/dom/SVGZoomEvent.h +debian/tmp/opt/trinity/include/kfaximage.h +debian/tmp/opt/trinity/include/kmultipageInterface.h +debian/tmp/opt/trinity/include/ksvg/CanvasFactory.h +debian/tmp/opt/trinity/include/ksvg/CanvasItem.h +debian/tmp/opt/trinity/include/ksvg/CanvasItems.h +debian/tmp/opt/trinity/include/ksvg/DocumentFactory.h +debian/tmp/opt/trinity/include/ksvg/KSVGCanvas.h +debian/tmp/opt/trinity/include/ksvg/ksvg_plugin.h +debian/tmp/opt/trinity/include/kviewshell/anchor.h +debian/tmp/opt/trinity/include/kviewshell/bookmark.h +debian/tmp/opt/trinity/include/kviewshell/pageView.h +debian/tmp/opt/trinity/include/kviewshell/documentPageCache.h +debian/tmp/opt/trinity/include/kviewshell/documentRenderer.h +debian/tmp/opt/trinity/include/kviewshell/documentWidget.h +debian/tmp/opt/trinity/include/kviewshell/history.h +debian/tmp/opt/trinity/include/kviewshell/hyperlink.h +debian/tmp/opt/trinity/include/kviewshell/kmultipage.h +debian/tmp/opt/trinity/include/kviewshell/length.h +debian/tmp/opt/trinity/include/kviewshell/pageNumber.h +debian/tmp/opt/trinity/include/kviewshell/pageSize.h +debian/tmp/opt/trinity/include/kviewshell/renderedDocumentPage.h +debian/tmp/opt/trinity/include/kviewshell/renderedDocumentPagePixmap.h +debian/tmp/opt/trinity/include/kviewshell/renderedDocumentPagePrinter.h +debian/tmp/opt/trinity/include/kviewshell/selection.h +debian/tmp/opt/trinity/include/kviewshell/simplePageSize.h +debian/tmp/opt/trinity/include/kviewshell/textBox.h +debian/tmp/opt/trinity/include/kviewshell/zoom.h +debian/tmp/opt/trinity/include/kviewshell/zoomlimits.h +debian/tmp/opt/trinity/include/libtext2path-0.1/BezierPath.h +debian/tmp/opt/trinity/include/libtext2path-0.1/Glyph.h +debian/tmp/opt/trinity/include/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/changelog b/debian/squeeze/tdelibs/debian/changelog index dd416c496..d75004323 100644 --- a/debian/squeeze/tdelibs/debian/changelog +++ b/debian/squeeze/tdelibs/debian/changelog @@ -2083,7 +2083,7 @@ tdelibs (4:3.4.0-0pre5) alioth; urgency=low page. (Closes: #257588). * [cdbs/kde.mk] Use escaped variables in the definitions of kde_htmldir and - the like instead of absolute paths, so that /usr/bin/kde-config doesn't + the like instead of absolute paths, so that /usr/bin/tde-config doesn't 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 diff --git a/debian/squeeze/tdelibs/debian/control b/debian/squeeze/tdelibs/debian/control index e99c81dc2..6e306e4bf 100644 --- a/debian/squeeze/tdelibs/debian/control +++ b/debian/squeeze/tdelibs/debian/control @@ -16,7 +16,7 @@ Build-Depends: cdbs (>= 0.4.41ubuntu2), debhelper (>= 5.0.31), autotools-dev, libxml2-dev, libxml2-utils, libxslt1-dev, libavahi-tqt-dev, sharutils, texinfo, libogg-dev-la, libtqtinterface-dev, gettext-kde, lsb-release, base-files, sudo, libr-dev, - cmake, libltdl-dev + libudev-dev, cmake, libltdl-dev Build-Depends-Indep: doxygen, libtqtinterface-doc, graphviz, gsfonts-x11 Standards-Version: 3.8.3 @@ -88,7 +88,7 @@ Depends: tdelibs4c2a-trinity (= ${Source-Version}), libart-2.0-dev (>= 2.3.17), libsasl2-dev, libssl-dev, libxcomposite-dev, libtiff4-dev (>= 3.7.3-1), libxml2-dev, libxml2-utils, libxslt1-dev, libavahi-client-dev (>= 0.4), libtqtinterface-dev, - gettext-kde, libr-dev + gettext-kde, libr-dev, libudev-dev Provides: tdelibs-trinity-dev Description: development files for the TDE core libraries This package contains all the headers and other related files needed diff --git a/debian/squeeze/tdelibs/debian/man/kde-config-trinity.sgml b/debian/squeeze/tdelibs/debian/man/tde-config-trinity.sgml index 7be0ec30c..9e1fa9b3d 100644 --- a/debian/squeeze/tdelibs/debian/man/kde-config-trinity.sgml +++ b/debian/squeeze/tdelibs/debian/man/tde-config-trinity.sgml @@ -27,7 +27,7 @@ manpage.1: manpage.sgml <!ENTITY dhemail "<email>ccheney@debian.org</email>"> <!ENTITY dhusername "Chris Cheney"> <!ENTITY dhucpackage "<refentrytitle>KDE-CONFIG</refentrytitle>"> - <!ENTITY dhpackage "kde-config"> + <!ENTITY dhpackage "tde-config"> <!ENTITY debian "<productname>Debian</productname>"> <!ENTITY gnu "<acronym>GNU</acronym>"> diff --git a/debian/squeeze/tdelibs/debian/tdelibs4-trinity-dev.install b/debian/squeeze/tdelibs/debian/tdelibs4-trinity-dev.install index 3d2e8e43b..95be99174 100644 --- a/debian/squeeze/tdelibs/debian/tdelibs4-trinity-dev.install +++ b/debian/squeeze/tdelibs/debian/tdelibs4-trinity-dev.install @@ -826,3 +826,5 @@ debian/tmp/opt/trinity/lib/libvcard.la debian/tmp/opt/trinity/lib/libvcard.so debian/tmp/opt/trinity/share/cmake + +debian/tmp/opt/trinity/lib/pkgconfig/tdelibs.pc diff --git a/debian/squeeze/tdelibs/debian/tdelibs4c2a-trinity.install b/debian/squeeze/tdelibs/debian/tdelibs4c2a-trinity.install index 3887f606d..46340c78b 100644 --- a/debian/squeeze/tdelibs/debian/tdelibs4c2a-trinity.install +++ b/debian/squeeze/tdelibs/debian/tdelibs4c2a-trinity.install @@ -18,7 +18,7 @@ debian/tmp/opt/trinity/bin/kaddprinterwizard debian/tmp/opt/trinity/bin/kbuildsycoca debian/tmp/opt/trinity/bin/kconf_update debian/tmp/opt/trinity/bin/kcookiejar -debian/tmp/opt/trinity/bin/kde-config +debian/tmp/opt/trinity/bin/tde-config debian/tmp/opt/trinity/bin/kded debian/tmp/opt/trinity/bin/tdeinit debian/tmp/opt/trinity/bin/tdeinit_shutdown diff --git a/debian/squeeze/tdelibs/debian/tdelibs4c2a-trinity.manpages b/debian/squeeze/tdelibs/debian/tdelibs4c2a-trinity.manpages index 00ed3a04e..ef5a28c2f 100644 --- a/debian/squeeze/tdelibs/debian/tdelibs4c2a-trinity.manpages +++ b/debian/squeeze/tdelibs/debian/tdelibs4c2a-trinity.manpages @@ -8,7 +8,7 @@ debian/man/out/kaddprinterwizard-trinity.1 debian/man/out/kbuildsycoca-trinity.1 debian/man/out/kconf_update-trinity.1 debian/man/out/kcookiejar-trinity.1 -debian/man/out/kde-config-trinity.1 +debian/man/out/tde-config-trinity.1 debian/man/out/kded-trinity.1 debian/man/out/kdontchangethehostname-trinity.1 debian/man/out/kfile-trinity.1 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 e154eb334..20ad1b0b7 100644 --- a/debian/squeeze/tdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/squeeze/tdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff @@ -13,13 +13,13 @@ fi perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile -- kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot - fi -+# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot ++# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`tde-config --expandvars --prefix`/include/kde.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 aff6738b2..1696038de 100755 --- a/debian/squeeze/tdemultimedia/debian/rules +++ b/debian/squeeze/tdemultimedia/debian/rules @@ -39,4 +39,4 @@ DEB_DH_MAKESHLIBS_ARGS_tdemultimedia-kio-plugins-trinity := -V'tdemultimedia-ki #$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))')) install/tdemultimedia-kappfinder-data-trinity:: - install -p -D -m644 debian/tmp/etc/xdg/menus/applications-merged/kde-multimedia-music.menu debian/tdemultimedia-kappfinder-data-trinity/etc/xdg/menus/applications-merged/trinity-multimedia-music.menu + install -p -D -m644 debian/tmp/etc/xdg/menus/applications-merged/tde-multimedia-music.menu debian/tdemultimedia-kappfinder-data-trinity/etc/xdg/menus/applications-merged/trinity-multimedia-music.menu diff --git a/debian/squeeze/tdemultimedia/debian/tdemultimedia-kappfinder-data-trinity.install b/debian/squeeze/tdemultimedia/debian/tdemultimedia-kappfinder-data-trinity.install index 26d0fa3c8..9ca50ed2e 100644 --- a/debian/squeeze/tdemultimedia/debian/tdemultimedia-kappfinder-data-trinity.install +++ b/debian/squeeze/tdemultimedia/debian/tdemultimedia-kappfinder-data-trinity.install @@ -16,4 +16,4 @@ debian/tmp/opt/trinity/share/apps/kappfinder/apps/Multimedia/qjackctl.desktop debian/tmp/opt/trinity/share/apps/kappfinder/apps/Multimedia/qsynth.desktop debian/tmp/opt/trinity/share/apps/kappfinder/apps/Multimedia/vkeybd.desktop debian/tmp/opt/trinity/share/apps/kappfinder/apps/Multimedia/zynaddsubfx.desktop -debian/tmp/opt/trinity/share/desktop-directories/kde-multimedia-music.directory +debian/tmp/opt/trinity/share/desktop-directories/tde-multimedia-music.directory 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 e154eb334..20ad1b0b7 100644 --- a/debian/squeeze/tdenetwork/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/squeeze/tdenetwork/debian/patches/common/kubuntu_01_kdepot.diff @@ -13,13 +13,13 @@ fi perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile -- kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot - fi -+# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot ++# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/debian/squeeze/tdepim/debian/libindex0-trinity-dev.install b/debian/squeeze/tdepim/debian/libindex0-trinity-dev.install index 8c2903ede..6e84a12b1 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/tde/index +/opt/trinity/include/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 75a5523ca..a36a88caa 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/tde/libemailfunctions/idmapper.h -/opt/trinity/include/tde/libkcal +/opt/trinity/include/libemailfunctions/idmapper.h +/opt/trinity/include/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 290f743b7..e042469fa 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/tde/kgantt +/opt/trinity/include/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 6015f5c08..6ac5db793 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/tde/gpgme++ -/opt/trinity/include/tde/kleo -/opt/trinity/include/tde/qgpgme +/opt/trinity/include/gpgme++ +/opt/trinity/include/kleo +/opt/trinity/include/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 ed8bb8407..416036a0d 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/tde/tdepim/exchangeaccount.h -/opt/trinity/include/tde/tdepim/exchangeclient.h +/opt/trinity/include/tdepim/exchangeaccount.h +/opt/trinity/include/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 32aa3d12d..2f74cc12f 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/tde/ksieve +/opt/trinity/include/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 1cea927e9..03b67df5b 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/tde/ktnef +/opt/trinity/include/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 3a5428f6e..d843ad5b8 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/tde/mimelib +/opt/trinity/include/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 56ca2ebc8..c60c55a41 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/tde/tdepimmacros.h +/opt/trinity/include/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 b94111037..bec38f84a 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/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/include/KNotesAppIface.h +/opt/trinity/include/KNotesIface.h +/opt/trinity/include/akregator +/opt/trinity/include/calendar +/opt/trinity/include/kabc +/opt/trinity/include/kaddressbook +/opt/trinity/include/kmail +/opt/trinity/include/kmailIface.h +/opt/trinity/include/kmailicalIface.h +/opt/trinity/include/kmailpartIface.h +/opt/trinity/include/kontact +/opt/trinity/include/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/tde/kpimprefs.h +/opt/trinity/include/kpimprefs.h 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 e154eb334..20ad1b0b7 100644 --- a/debian/squeeze/tdesdk/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/squeeze/tdesdk/debian/patches/common/kubuntu_01_kdepot.diff @@ -13,13 +13,13 @@ fi perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile -- kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot - fi -+# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot ++# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`tde-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 e154eb334..20ad1b0b7 100644 --- a/debian/squeeze/tdetoys/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/squeeze/tdetoys/debian/patches/common/kubuntu_01_kdepot.diff @@ -13,13 +13,13 @@ fi perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile -- kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot - fi -+# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot ++# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`tde-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 e154eb334..20ad1b0b7 100644 --- a/debian/squeeze/tdeutils/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/squeeze/tdeutils/debian/patches/common/kubuntu_01_kdepot.diff @@ -13,13 +13,13 @@ fi perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile -- kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot - fi -+# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot ++# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`tde-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 e154eb334..20ad1b0b7 100644 --- a/debian/squeeze/tdevelop/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/squeeze/tdevelop/debian/patches/common/kubuntu_01_kdepot.diff @@ -13,13 +13,13 @@ fi perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile -- kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot - fi -+# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot ++# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`tde-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 aca9df12a..47aee4140 100644 --- a/debian/squeeze/tdewebdev/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/squeeze/tdewebdev/debian/patches/common/kubuntu_01_kdepot.diff @@ -13,13 +13,13 @@ fi perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile -- kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot - fi -+# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot ++# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ |