pull/3/head
François Andriot 10 years ago
commit cd98745855

@ -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 if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
export EXTRACTRC PREPARETIPS export EXTRACTRC PREPARETIPS
+kdepotpath=/usr/include/tde/kde.pot +kdepotpath=/usr/include/tde/tde.pot
+ +
for subdir in $dirs; do for subdir in $dirs; do
test -z "$VERBOSE" || echo "Making messages in $subdir" test -z "$VERBOSE" || echo "Making messages in $subdir"
@ -14,7 +14,7 @@ diff -Nur keep-0.4.0/admin/cvs.sh keep-0.4.0.new/admin/cvs.sh
fi 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 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:-`tde-config --expandvars --install include`}/kde.pot - kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
if ! test -f $kdepotpath; then if ! test -f $kdepotpath; then
kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
fi fi

@ -4,7 +4,7 @@
if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
export EXTRACTRC PREPARETIPS export EXTRACTRC PREPARETIPS
+kdepotpath=/opt/trinity/include/tde/kde.pot +kdepotpath=/opt/trinity/include/tde/tde.pot
+ +
for subdir in $dirs; do for subdir in $dirs; do
test -z "$VERBOSE" || echo "Making messages in $subdir" test -z "$VERBOSE" || echo "Making messages in $subdir"
@ -13,13 +13,13 @@
fi 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 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:-`tde-config --expandvars --install include`}/kde.pot - kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
- if ! test -f $kdepotpath; then - if ! test -f $kdepotpath; then
- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot - kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
- fi - fi
+# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
+# if ! test -f $kdepotpath; then +# if ! test -f $kdepotpath; then
+# kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot +# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
+# fi +# fi
$MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \

@ -4,7 +4,7 @@
if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
export EXTRACTRC PREPARETIPS export EXTRACTRC PREPARETIPS
+kdepotpath=/opt/trinity/include/tde/kde.pot +kdepotpath=/opt/trinity/include/tde/tde.pot
+ +
for subdir in $dirs; do for subdir in $dirs; do
test -z "$VERBOSE" || echo "Making messages in $subdir" test -z "$VERBOSE" || echo "Making messages in $subdir"
@ -13,13 +13,13 @@
fi 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 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:-`tde-config --expandvars --install include`}/kde.pot - kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
- if ! test -f $kdepotpath; then - if ! test -f $kdepotpath; then
- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot - kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
- fi - fi
+# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
+# if ! test -f $kdepotpath; then +# if ! test -f $kdepotpath; then
+# kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot +# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
+# fi +# fi
$MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \

@ -4,7 +4,7 @@
if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
export EXTRACTRC PREPARETIPS export EXTRACTRC PREPARETIPS
+kdepotpath=/opt/trinity/include/tde/kde.pot +kdepotpath=/opt/trinity/include/tde/tde.pot
+ +
for subdir in $dirs; do for subdir in $dirs; do
test -z "$VERBOSE" || echo "Making messages in $subdir" test -z "$VERBOSE" || echo "Making messages in $subdir"
@ -13,13 +13,13 @@
fi 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 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:-`tde-config --expandvars --install include`}/kde.pot - kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
- if ! test -f $kdepotpath; then - if ! test -f $kdepotpath; then
- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot - kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
- fi - fi
+# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
+# if ! test -f $kdepotpath; then +# if ! test -f $kdepotpath; then
+# kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot +# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
+# fi +# fi
$MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \

@ -4,7 +4,7 @@
if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
export EXTRACTRC PREPARETIPS export EXTRACTRC PREPARETIPS
+kdepotpath=/opt/trinity/include/tde/kde.pot +kdepotpath=/opt/trinity/include/tde/tde.pot
+ +
for subdir in $dirs; do for subdir in $dirs; do
test -z "$VERBOSE" || echo "Making messages in $subdir" test -z "$VERBOSE" || echo "Making messages in $subdir"
@ -13,13 +13,13 @@
fi 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 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:-`tde-config --expandvars --install include`}/kde.pot - kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
- if ! test -f $kdepotpath; then - if ! test -f $kdepotpath; then
- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot - kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
- fi - fi
+# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
+# if ! test -f $kdepotpath; then +# if ! test -f $kdepotpath; then
+# kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot +# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
+# fi +# fi
$MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \

@ -4,7 +4,7 @@
if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
export EXTRACTRC PREPARETIPS export EXTRACTRC PREPARETIPS
+kdepotpath=/opt/trinity/include/tde/kde.pot +kdepotpath=/opt/trinity/include/tde/tde.pot
+ +
for subdir in $dirs; do for subdir in $dirs; do
test -z "$VERBOSE" || echo "Making messages in $subdir" test -z "$VERBOSE" || echo "Making messages in $subdir"
@ -13,13 +13,13 @@
fi 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 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:-`tde-config --expandvars --install include`}/kde.pot - kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
- if ! test -f $kdepotpath; then - if ! test -f $kdepotpath; then
- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot - kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
- fi - fi
+# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
+# if ! test -f $kdepotpath; then +# if ! test -f $kdepotpath; then
+# kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot +# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
+# fi +# fi
$MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \

@ -4,7 +4,7 @@
if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
export EXTRACTRC PREPARETIPS export EXTRACTRC PREPARETIPS
+kdepotpath=/opt/trinity/include/tde/kde.pot +kdepotpath=/opt/trinity/include/tde/tde.pot
+ +
for subdir in $dirs; do for subdir in $dirs; do
test -z "$VERBOSE" || echo "Making messages in $subdir" test -z "$VERBOSE" || echo "Making messages in $subdir"
@ -13,13 +13,13 @@
fi 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 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:-`tde-config --expandvars --install include`}/kde.pot - kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
- if ! test -f $kdepotpath; then - if ! test -f $kdepotpath; then
- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot - kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
- fi - fi
+# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
+# if ! test -f $kdepotpath; then +# if ! test -f $kdepotpath; then
+# kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot +# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
+# fi +# fi
$MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \

@ -4,7 +4,7 @@
if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
export EXTRACTRC PREPARETIPS export EXTRACTRC PREPARETIPS
+kdepotpath=/opt/trinity/include/tde/kde.pot +kdepotpath=/opt/trinity/include/tde/tde.pot
+ +
for subdir in $dirs; do for subdir in $dirs; do
test -z "$VERBOSE" || echo "Making messages in $subdir" test -z "$VERBOSE" || echo "Making messages in $subdir"
@ -13,13 +13,13 @@
fi 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 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:-`tde-config --expandvars --install include`}/kde.pot - kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
- if ! test -f $kdepotpath; then - if ! test -f $kdepotpath; then
- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot - kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
- fi - fi
+# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
+# if ! test -f $kdepotpath; then +# if ! test -f $kdepotpath; then
+# kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot +# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
+# fi +# fi
$MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \

@ -105,9 +105,9 @@ common-install-prehook-impl::
# sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \ # sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
# done # done
# msgcat --use-first kde.pot po/tdelibs.pot > tdelibs.pot-merged # msgcat --use-first tde.pot po/tdelibs.pot > tdelibs.pot-merged
# mv -f tdelibs.pot-merged po/tdelibs.pot # mv -f tdelibs.pot-merged po/tdelibs.pot
cp -Rp kde.pot po/tdelibs.pot cp -Rp tde.pot po/tdelibs.pot
# generate .po files for .desktop etc files # generate .po files for .desktop etc files
if [ -f debian/kubuntu-desktop-i18n/createdesktop.pl ]; then \ if [ -f debian/kubuntu-desktop-i18n/createdesktop.pl ]; then \

@ -218,7 +218,7 @@ debian/tmp/opt/trinity/include/tdesensordevice.h
debian/tmp/opt/trinity/include/tdestoragedevice.h debian/tmp/opt/trinity/include/tdestoragedevice.h
debian/tmp/opt/trinity/include/tdelibs_export.h debian/tmp/opt/trinity/include/tdelibs_export.h
debian/tmp/opt/trinity/include/kdemacros.h debian/tmp/opt/trinity/include/kdemacros.h
debian/tmp/opt/trinity/include/kde.pot debian/tmp/opt/trinity/include/tde.pot
debian/tmp/opt/trinity/include/tdeprint/driver.h debian/tmp/opt/trinity/include/tdeprint/driver.h
debian/tmp/opt/trinity/include/tdeprint/kiconselectaction.h debian/tmp/opt/trinity/include/tdeprint/kiconselectaction.h
debian/tmp/opt/trinity/include/tdeprint/kmjob.h debian/tmp/opt/trinity/include/tdeprint/kmjob.h

@ -4,7 +4,7 @@
if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
export EXTRACTRC PREPARETIPS export EXTRACTRC PREPARETIPS
+kdepotpath=/opt/trinity/include/tde/kde.pot +kdepotpath=/opt/trinity/include/tde/tde.pot
+ +
for subdir in $dirs; do for subdir in $dirs; do
test -z "$VERBOSE" || echo "Making messages in $subdir" test -z "$VERBOSE" || echo "Making messages in $subdir"
@ -13,13 +13,13 @@
fi 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 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:-`tde-config --expandvars --install include`}/kde.pot - kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
- if ! test -f $kdepotpath; then - if ! test -f $kdepotpath; then
- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot - kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
- fi - fi
+# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
+# if ! test -f $kdepotpath; then +# if ! test -f $kdepotpath; then
+# kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot +# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
+# fi +# fi
$MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \

@ -4,7 +4,7 @@
if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
export EXTRACTRC PREPARETIPS export EXTRACTRC PREPARETIPS
+kdepotpath=/opt/trinity/include/tde/kde.pot +kdepotpath=/opt/trinity/include/tde/tde.pot
+ +
for subdir in $dirs; do for subdir in $dirs; do
test -z "$VERBOSE" || echo "Making messages in $subdir" test -z "$VERBOSE" || echo "Making messages in $subdir"
@ -13,13 +13,13 @@
fi 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 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:-`tde-config --expandvars --install include`}/kde.pot - kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
- if ! test -f $kdepotpath; then - if ! test -f $kdepotpath; then
- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot - kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
- fi - fi
+# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
+# if ! test -f $kdepotpath; then +# if ! test -f $kdepotpath; then
+# kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot +# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
+# fi +# fi
$MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \

@ -4,7 +4,7 @@
if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
export EXTRACTRC PREPARETIPS export EXTRACTRC PREPARETIPS
+kdepotpath=/opt/trinity/include/tde/kde.pot +kdepotpath=/opt/trinity/include/tde/tde.pot
+ +
for subdir in $dirs; do for subdir in $dirs; do
test -z "$VERBOSE" || echo "Making messages in $subdir" test -z "$VERBOSE" || echo "Making messages in $subdir"
@ -13,13 +13,13 @@
fi 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 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:-`tde-config --expandvars --install include`}/kde.pot - kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
- if ! test -f $kdepotpath; then - if ! test -f $kdepotpath; then
- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot - kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
- fi - fi
+# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
+# if ! test -f $kdepotpath; then +# if ! test -f $kdepotpath; then
+# kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot +# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
+# fi +# fi
$MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \

@ -4,7 +4,7 @@
if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
export EXTRACTRC PREPARETIPS export EXTRACTRC PREPARETIPS
+kdepotpath=/opt/trinity/include/tde/kde.pot +kdepotpath=/opt/trinity/include/tde/tde.pot
+ +
for subdir in $dirs; do for subdir in $dirs; do
test -z "$VERBOSE" || echo "Making messages in $subdir" test -z "$VERBOSE" || echo "Making messages in $subdir"
@ -13,13 +13,13 @@
fi 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 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:-`tde-config --expandvars --install include`}/kde.pot - kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
- if ! test -f $kdepotpath; then - if ! test -f $kdepotpath; then
- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot - kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
- fi - fi
+# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
+# if ! test -f $kdepotpath; then +# if ! test -f $kdepotpath; then
+# kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot +# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
+# fi +# fi
$MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \

@ -4,7 +4,7 @@
if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
export EXTRACTRC PREPARETIPS export EXTRACTRC PREPARETIPS
+kdepotpath=/opt/trinity/include/tde/kde.pot +kdepotpath=/opt/trinity/include/tde/tde.pot
+ +
for subdir in $dirs; do for subdir in $dirs; do
test -z "$VERBOSE" || echo "Making messages in $subdir" test -z "$VERBOSE" || echo "Making messages in $subdir"
@ -13,13 +13,13 @@
fi 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 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:-`tde-config --expandvars --install include`}/kde.pot - kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
- if ! test -f $kdepotpath; then - if ! test -f $kdepotpath; then
- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot - kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
- fi - fi
+# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
+# if ! test -f $kdepotpath; then +# if ! test -f $kdepotpath; then
+# kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot +# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
+# fi +# fi
$MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \

@ -34,7 +34,7 @@ DEB_CMAKE_EXTRA_FLAGS := \
-DWITH_SNMP="ON" \ -DWITH_SNMP="ON" \
-DWITH_SENSORS="ON" \ -DWITH_SENSORS="ON" \
-DWITH_XMMS="ON" \ -DWITH_XMMS="ON" \
-DWITH_KNEWSTUFF="ON" -DWITH_TDENEWSTUFF="ON"
DOC_HTML_PRUNE := kcontrol-trinity ktimer-trinity kcharselect-trinity ksim-trinity DOC_HTML_PRUNE := kcontrol-trinity ktimer-trinity kcharselect-trinity ksim-trinity

@ -4,7 +4,7 @@
if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
export EXTRACTRC PREPARETIPS export EXTRACTRC PREPARETIPS
+kdepotpath=/opt/trinity/include/tde/kde.pot +kdepotpath=/opt/trinity/include/tde/tde.pot
+ +
for subdir in $dirs; do for subdir in $dirs; do
test -z "$VERBOSE" || echo "Making messages in $subdir" test -z "$VERBOSE" || echo "Making messages in $subdir"
@ -13,13 +13,13 @@
fi 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 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:-`tde-config --expandvars --install include`}/kde.pot - kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
- if ! test -f $kdepotpath; then - if ! test -f $kdepotpath; then
- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot - kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
- fi - fi
+# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
+# if ! test -f $kdepotpath; then +# if ! test -f $kdepotpath; then
+# kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot +# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
+# fi +# fi
$MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \

@ -4,7 +4,7 @@
if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
export EXTRACTRC PREPARETIPS export EXTRACTRC PREPARETIPS
+kdepotpath=/usr/include/tde/kde.pot +kdepotpath=/usr/include/tde/tde.pot
+ +
for subdir in $dirs; do for subdir in $dirs; do
test -z "$VERBOSE" || echo "Making messages in $subdir" test -z "$VERBOSE" || echo "Making messages in $subdir"
@ -13,13 +13,13 @@
fi 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 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:-`tde-config --expandvars --install include`}/kde.pot - kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
- if ! test -f $kdepotpath; then - if ! test -f $kdepotpath; then
- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot - kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
- fi - fi
+# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
+# if ! test -f $kdepotpath; then +# if ! test -f $kdepotpath; then
+# kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot +# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
+# fi +# fi
$MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \

@ -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 if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
export EXTRACTRC PREPARETIPS export EXTRACTRC PREPARETIPS
+kdepotpath=/usr/include/tde/kde.pot +kdepotpath=/usr/include/tde/tde.pot
+ +
for subdir in $dirs; do for subdir in $dirs; do
test -z "$VERBOSE" || echo "Making messages in $subdir" test -z "$VERBOSE" || echo "Making messages in $subdir"
@ -14,7 +14,7 @@ diff -Nur keep-0.4.0/admin/cvs.sh keep-0.4.0.new/admin/cvs.sh
fi 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 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:-`tde-config --expandvars --install include`}/kde.pot - kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
if ! test -f $kdepotpath; then if ! test -f $kdepotpath; then
kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
fi fi

@ -3,9 +3,8 @@ Section: tde
Priority: optional Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Harald Sitter <apachelogger@ubuntu.com> XSBC-Original-Maintainer: Harald Sitter <apachelogger@ubuntu.com>
Build-Depends: cdbs, debhelper (>= 5), tdenetwork-trinity-dev, libotr2-dev (>= 3.0.0), automake, autoconf, libtool, libltdl-dev Build-Depends: cdbs, debhelper (>= 5), tdenetwork-trinity-dev, libotr5-dev | libotr2-dev (>= 3.0.0), automake, autoconf, libtool, libltdl-dev
Standards-Version: 3.8.4 Standards-Version: 3.8.4
Homepage: http://kopete-otr.follefuder.org/
Package: kopete-otr-trinity Package: kopete-otr-trinity
Architecture: any Architecture: any

@ -1,6 +1,9 @@
#!/usr/bin/make -f #!/usr/bin/make -f
DEB_PYTHON_SYSTEM = pysupport DEB_PYTHON_SYSTEM = pysupport
PYSUPPORT_INST_PATH = /opt/trinity/share/python-support
GUIDANCE_INST_PATH = $(PYSUPPORT_INST_PATH)/tde-guidance-trinity
export EXTRA_MODULE_DIR=$(GUIDANCE_INST_PATH)
include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/debhelper.mk
#include /usr/share/cdbs/1/class/python-distutils.mk #include /usr/share/cdbs/1/class/python-distutils.mk
@ -11,7 +14,7 @@ include /usr/share/cdbs/1/rules/utils.mk
DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp
DEB_UPDATE_RCD_PARAMS := multiuser DEB_UPDATE_RCD_PARAMS := multiuser
DEB_INSTALL_MANPAGES_tde-guidance-trinity := debian/mountconfig-trinity.1 debian/serviceconfig-trinity.1 debian/userconfig-trinity.1 DEB_INSTALL_MANPAGES_tde-guidance-trinity := debian/mountconfig-trinity.1 debian/serviceconfig-trinity.1 debian/userconfig-trinity.1
PYSUPPORT_PATH = $(DEB_DESTDIR)/opt/trinity/share/python-support PYSUPPORT_PATH = $(DEB_DESTDIR)$(PYSUPPORT_INST_PATH)
DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde 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 LDFLAGS_APPEND := -L/opt/trinity/lib
@ -43,11 +46,11 @@ install/tde-guidance-trinity::
# fix the link properly # fix the link properly
mkdir -p debian/tde-guidance-trinity/opt/trinity/bin mkdir -p debian/tde-guidance-trinity/opt/trinity/bin
(cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /opt/trinity/share/python-support/tde-guidance-trinity/mountconfig.py mountconfig) (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf $(GUIDANCE_INST_PATH)/mountconfig.py mountconfig)
(cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /opt/trinity/share/python-support/tde-guidance-trinity/serviceconfig.py serviceconfig) (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf $(GUIDANCE_INST_PATH)/serviceconfig.py serviceconfig)
(cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /opt/trinity/share/python-support/tde-guidance-trinity/userconfig.py userconfig) (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf $(GUIDANCE_INST_PATH)/userconfig.py userconfig)
(cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /opt/trinity/share/python-support/tde-guidance-trinity/wineconfig.py wineconfig) (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf $(GUIDANCE_INST_PATH)/wineconfig.py wineconfig)
# (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /opt/trinity/share/python-support/tde-guidance-trinity/grubconfig.py grubconfig) # (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf $(GUIDANCE_INST_PATH)/grubconfig.py grubconfig)
# move python modules in PYSUPPORT_PATH # move python modules in PYSUPPORT_PATH
mkdir -p $(PYSUPPORT_PATH)/tde-guidance-trinity mkdir -p $(PYSUPPORT_PATH)/tde-guidance-trinity
@ -87,51 +90,6 @@ install/guidance-backends-trinity::
cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/wineread.py $(PYSUPPORT_PATH)/guidance-backends-trinity cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/wineread.py $(PYSUPPORT_PATH)/guidance-backends-trinity
cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/winewrite.py $(PYSUPPORT_PATH)/guidance-backends-trinity cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/winewrite.py $(PYSUPPORT_PATH)/guidance-backends-trinity
install/tde-guidance-powermanager-trinity::
# install icon to right place
install -D -p -m0644 kde/powermanager/pics/battery-charging-100.png \
$(DEB_DESTDIR)/opt/trinity/share/icons/hicolor/22x22/apps/power-manager.png
install -D -p -m0644 kde/powermanager/pics/*.png \
$(DEB_DESTDIR)/opt/trinity/share/apps/guidance/pics/
# install desktop file
install -D -p -m0644 powermanager/guidance-power-manager.desktop \
$(DEB_DESTDIR)/opt/trinity/share/autostart/guidance-power-manager.desktop
# copy python modules in PYSUPPORT_PATH
mkdir -p $(PYSUPPORT_PATH)/tde-guidance-powermanager-trinity
cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/MicroHAL.py $(PYSUPPORT_PATH)/guidance-backends-trinity
cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/guidance-power-manager.py $(PYSUPPORT_PATH)/tde-guidance-powermanager-trinity
cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/powermanage.py $(PYSUPPORT_PATH)/tde-guidance-powermanager-trinity
cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/gpmhelper.py $(PYSUPPORT_PATH)/tde-guidance-powermanager-trinity
cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/powermanager_ui.py $(PYSUPPORT_PATH)/tde-guidance-powermanager-trinity
cp powermanager/guidance_power_manager_ui.py $(PYSUPPORT_PATH)/tde-guidance-powermanager-trinity
cp powermanager/notify.py $(PYSUPPORT_PATH)/tde-guidance-powermanager-trinity
cp powermanager/tooltip.py $(PYSUPPORT_PATH)/tde-guidance-powermanager-trinity
# generate guidance-power-manager script
echo "#!/bin/sh" > $(DEB_DESTDIR)/opt/trinity/bin/guidance-power-manager
echo "/opt/trinity/share/python-support/tde-guidance-powermanager-trinity/guidance-power-manager.py &" >> $(DEB_DESTDIR)/opt/trinity/bin/guidance-power-manager
chmod +x $(DEB_DESTDIR)/opt/trinity/bin/guidance-power-manager
# fix script-not-executable
chmod 0755 $(PYSUPPORT_PATH)/tde-guidance-powermanager-trinity/powermanage.py
chmod 0755 $(PYSUPPORT_PATH)/tde-guidance-powermanager-trinity/gpmhelper.py
: # Replace all '#!' calls to python with /usr/bin/python
: # and make them executable
for i in `find debian/tde-guidance-powermanager-trinity -type f`; do \
sed '1s,#!.*python[^ ]*\(.*\),#! /usr/bin/python\1,' \
$$i > $$i.temp; \
if cmp --quiet $$i $$i.temp; then \
rm -f $$i.temp; \
else \
mv -f $$i.temp $$i; \
chmod 755 $$i; \
echo "fixed interpreter: $$i"; \
fi; \
done
clean:: clean::
rm -rf build rm -rf build
@ -155,9 +113,6 @@ clean::
common-install-prehook-impl:: common-install-prehook-impl::
# generate form implementation using pytde user interface compiler # generate form implementation using pytde user interface compiler
(cd powermanager; /opt/trinity/bin/tdepyuic --usetdei18n guidance_power_manager_ui.ui)
(cd powermanager; /opt/trinity/bin/tdepyuic --usetdei18n tooltip.ui)
(cd powermanager; /opt/trinity/bin/tdepyuic --usetdei18n notify.ui)
mkdir -p po mkdir -p po
touch list touch list
@ -190,4 +145,3 @@ common-install-prehook-impl::
fi fi
rm -f tde-guidance-trinity/usr/share/python-support/tde-guidance-trinity/.version rm -f tde-guidance-trinity/usr/share/python-support/tde-guidance-trinity/.version
rm -f tde-guidance-trinity/usr/share/python-support/tde-guidance-powermanager-trinity/.version

@ -1,7 +1,7 @@
opt/trinity/lib/trinity/kcm_serviceconfig.la opt/trinity/lib/ opt/trinity/lib/trinity/kcm_serviceconfig.la
opt/trinity/lib/trinity/kcm_userconfig.la opt/trinity/lib/ opt/trinity/lib/trinity/kcm_userconfig.la
opt/trinity/lib/trinity/kcm_mountconfig.la opt/trinity/lib/ opt/trinity/lib/trinity/kcm_mountconfig.la
opt/trinity/lib/trinity/kcm_wineconfig.la opt/trinity/lib/ opt/trinity/lib/trinity/kcm_wineconfig.la
opt/trinity/share/icons/crystalsvg/32x32/apps/daemons.png opt/trinity/share/icons/crystalsvg/32x32/apps/daemons.png
opt/trinity/share/icons/crystalsvg/32x32/apps/disksfilesystems.png opt/trinity/share/icons/crystalsvg/32x32/apps/disksfilesystems.png
opt/trinity/share/icons/crystalsvg/32x32/apps/userconfig.png opt/trinity/share/icons/crystalsvg/32x32/apps/userconfig.png
@ -57,8 +57,8 @@ opt/trinity/share/python-support/tde-guidance-trinity/sizeview.py
opt/trinity/share/python-support/tde-guidance-trinity/unixauthdb.py opt/trinity/share/python-support/tde-guidance-trinity/unixauthdb.py
opt/trinity/share/python-support/tde-guidance-trinity/userconfig.py opt/trinity/share/python-support/tde-guidance-trinity/userconfig.py
opt/trinity/share/python-support/tde-guidance-trinity/wineconfig.py opt/trinity/share/python-support/tde-guidance-trinity/wineconfig.py
opt/trinity/lib/trinity/kcm_serviceconfig.so opt/trinity/lib/ opt/trinity/lib/trinity/kcm_serviceconfig.so
opt/trinity/lib/trinity/kcm_userconfig.so opt/trinity/lib/ opt/trinity/lib/trinity/kcm_userconfig.so
opt/trinity/lib/trinity/kcm_mountconfig.so opt/trinity/lib/ opt/trinity/lib/trinity/kcm_mountconfig.so
opt/trinity/lib/trinity/kcm_wineconfig.so opt/trinity/lib/ opt/trinity/lib/trinity/kcm_wineconfig.so
usr/share/lintian/overrides/tde-guidance-trinity usr/share/lintian/overrides/tde-guidance-trinity

@ -52,6 +52,7 @@ build-%/configure-stamp:
cd build-$* && echo yes \ cd build-$* && echo yes \
| python$* ../configure.py \ | python$* ../configure.py \
-c -n /usr/include/tqscintilla \ -c -n /usr/include/tqscintilla \
-e python$* \
-o /usr/lib -u -j $(SPLIT) \ -o /usr/lib -u -j $(SPLIT) \
-d /usr/lib/python$*/$(call py_sitename,$*)/python_tqt \ -d /usr/lib/python$*/$(call py_sitename,$*)/python_tqt \
-l /usr/include/python$* \ -l /usr/include/python$* \
@ -66,6 +67,7 @@ dbg-build-%/configure-stamp:
cd dbg-build-$* && echo yes \ cd dbg-build-$* && echo yes \
| python$*-dbg ../configure.py \ | python$*-dbg ../configure.py \
-c -n /usr/include/tqscintilla \ -c -n /usr/include/tqscintilla \
-e python$* \
-o /usr/lib -u -j $(SPLIT) \ -o /usr/lib -u -j $(SPLIT) \
-d /usr/lib/python$*/$(call py_sitename,$*)/python_tqt \ -d /usr/lib/python$*/$(call py_sitename,$*)/python_tqt \
-l /usr/include/python$*_d \ -l /usr/include/python$*_d \

@ -41,6 +41,7 @@ build-%/configure-stamp:
cd build-$* \ cd build-$* \
&& python$* ../configure.py \ && python$* ../configure.py \
-d /usr/lib/python$*/$(call py_sitename,$*)/sip4_tqt \ -d /usr/lib/python$*/$(call py_sitename,$*)/sip4_tqt \
-g python$* \
-u STRIP="" CFLAGS="${CFLAGS} -I/usr/include/tqt -I/usr/include/tqt3 -I/usr/include/qt3" CFLAGS_RELEASE="" CXXFLAGS="${CFLAGS} -I/usr/include/tqt -I/usr/include/tqt3 -I/usr/include/qt3" CXXFLAGS_RELEASE="" -u STRIP="" CFLAGS="${CFLAGS} -I/usr/include/tqt -I/usr/include/tqt3 -I/usr/include/qt3" CFLAGS_RELEASE="" CXXFLAGS="${CFLAGS} -I/usr/include/tqt -I/usr/include/tqt3 -I/usr/include/qt3" CXXFLAGS_RELEASE=""
touch $@ touch $@
@ -50,6 +51,7 @@ dbg-build-%/configure-stamp:
cd dbg-build-$* \ cd dbg-build-$* \
&& python$*-dbg ../configure.py \ && python$*-dbg ../configure.py \
-d /usr/lib/python$*/$(call py_sitename,$*)/sip4_tqt \ -d /usr/lib/python$*/$(call py_sitename,$*)/sip4_tqt \
-g python$* \
-e /usr/include/python$*_d \ -e /usr/include/python$*_d \
-u CFLAGS="-O0 -g -I/usr/include/tqt -I/usr/include/tqt3 -I/usr/include/qt3" CFLAGS_RELEASE="" CXXFLAGS="-O0 -g -I/usr/include/tqt -I/usr/include/tqt3 -I/usr/include/qt3" CXXFLAGS_RELEASE="" STRIP="" -u CFLAGS="-O0 -g -I/usr/include/tqt -I/usr/include/tqt3 -I/usr/include/qt3" CFLAGS_RELEASE="" CXXFLAGS="-O0 -g -I/usr/include/tqt -I/usr/include/tqt3 -I/usr/include/qt3" CXXFLAGS_RELEASE="" STRIP=""
touch $@ touch $@

@ -48,6 +48,7 @@ build-%/configure-stamp:
mkdir -p build-$* mkdir -p build-$*
cd build-$* && python$* ../configure.py \ cd build-$* && python$* ../configure.py \
-c -u -k /opt/trinity -o /opt/trinity/include -n /opt/trinity/lib \ -c -u -k /opt/trinity -o /opt/trinity/include -n /opt/trinity/lib \
-e python$* \
-v /opt/trinity/share/sip/trinity -j $(SPLIT) -v /opt/trinity/share/sip/trinity -j $(SPLIT)
touch $@ touch $@
@ -56,6 +57,7 @@ dbg-build-%/configure-stamp:
mkdir -p dbg-build-$* mkdir -p dbg-build-$*
cd dbg-build-$* && python$*-dbg ../configure.py \ cd dbg-build-$* && python$*-dbg ../configure.py \
-c -u -k /opt/trinity -o /opt/trinity/include -n /opt/trinity/lib \ -c -u -k /opt/trinity -o /opt/trinity/include -n /opt/trinity/lib \
-e python$* \
-v /opt/trinity/share/sip/trinity -j $(SPLIT) -v /opt/trinity/share/sip/trinity -j $(SPLIT)
touch $@ touch $@

@ -4,7 +4,7 @@
if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
export EXTRACTRC PREPARETIPS export EXTRACTRC PREPARETIPS
+kdepotpath=/opt/trinity/include/tde/kde.pot +kdepotpath=/opt/trinity/include/tde/tde.pot
+ +
for subdir in $dirs; do for subdir in $dirs; do
test -z "$VERBOSE" || echo "Making messages in $subdir" test -z "$VERBOSE" || echo "Making messages in $subdir"
@ -13,13 +13,13 @@
fi 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 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:-`tde-config --expandvars --install include`}/kde.pot - kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
- if ! test -f $kdepotpath; then - if ! test -f $kdepotpath; then
- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot - kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
- fi - fi
+# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
+# if ! test -f $kdepotpath; then +# if ! test -f $kdepotpath; then
+# kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot +# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
+# fi +# fi
$MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \

@ -4,7 +4,7 @@
if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
export EXTRACTRC PREPARETIPS export EXTRACTRC PREPARETIPS
+kdepotpath=/opt/trinity/include/tde/kde.pot +kdepotpath=/opt/trinity/include/tde/tde.pot
+ +
for subdir in $dirs; do for subdir in $dirs; do
test -z "$VERBOSE" || echo "Making messages in $subdir" test -z "$VERBOSE" || echo "Making messages in $subdir"
@ -13,13 +13,13 @@
fi 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 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:-`tde-config --expandvars --install include`}/kde.pot - kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
- if ! test -f $kdepotpath; then - if ! test -f $kdepotpath; then
- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot - kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
- fi - fi
+# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
+# if ! test -f $kdepotpath; then +# if ! test -f $kdepotpath; then
+# kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot +# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
+# fi +# fi
$MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \

@ -4,7 +4,7 @@
if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
export EXTRACTRC PREPARETIPS export EXTRACTRC PREPARETIPS
+kdepotpath=/opt/trinity/include/tde/kde.pot +kdepotpath=/opt/trinity/include/tde/tde.pot
+ +
for subdir in $dirs; do for subdir in $dirs; do
test -z "$VERBOSE" || echo "Making messages in $subdir" test -z "$VERBOSE" || echo "Making messages in $subdir"
@ -13,13 +13,13 @@
fi 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 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:-`tde-config --expandvars --install include`}/kde.pot - kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
- if ! test -f $kdepotpath; then - if ! test -f $kdepotpath; then
- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot - kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
- fi - fi
+# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
+# if ! test -f $kdepotpath; then +# if ! test -f $kdepotpath; then
+# kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot +# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
+# fi +# fi
$MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \

@ -4,7 +4,7 @@
if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
export EXTRACTRC PREPARETIPS export EXTRACTRC PREPARETIPS
+kdepotpath=/opt/trinity/include/tde/kde.pot +kdepotpath=/opt/trinity/include/tde/tde.pot
+ +
for subdir in $dirs; do for subdir in $dirs; do
test -z "$VERBOSE" || echo "Making messages in $subdir" test -z "$VERBOSE" || echo "Making messages in $subdir"
@ -13,13 +13,13 @@
fi 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 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:-`tde-config --expandvars --install include`}/kde.pot - kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
- if ! test -f $kdepotpath; then - if ! test -f $kdepotpath; then
- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot - kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
- fi - fi
+# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
+# if ! test -f $kdepotpath; then +# if ! test -f $kdepotpath; then
+# kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot +# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
+# fi +# fi
$MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \

@ -4,7 +4,7 @@
if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
export EXTRACTRC PREPARETIPS export EXTRACTRC PREPARETIPS
+kdepotpath=/opt/trinity/include/tde/kde.pot +kdepotpath=/opt/trinity/include/tde/tde.pot
+ +
for subdir in $dirs; do for subdir in $dirs; do
test -z "$VERBOSE" || echo "Making messages in $subdir" test -z "$VERBOSE" || echo "Making messages in $subdir"
@ -13,13 +13,13 @@
fi 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 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:-`tde-config --expandvars --install include`}/kde.pot - kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
- if ! test -f $kdepotpath; then - if ! test -f $kdepotpath; then
- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot - kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
- fi - fi
+# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
+# if ! test -f $kdepotpath; then +# if ! test -f $kdepotpath; then
+# kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot +# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
+# fi +# fi
$MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \

@ -4,7 +4,7 @@
if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
export EXTRACTRC PREPARETIPS export EXTRACTRC PREPARETIPS
+kdepotpath=/opt/trinity/include/tde/kde.pot +kdepotpath=/opt/trinity/include/tde/tde.pot
+ +
for subdir in $dirs; do for subdir in $dirs; do
test -z "$VERBOSE" || echo "Making messages in $subdir" test -z "$VERBOSE" || echo "Making messages in $subdir"
@ -13,13 +13,13 @@
fi 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 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:-`tde-config --expandvars --install include`}/kde.pot - kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
- if ! test -f $kdepotpath; then - if ! test -f $kdepotpath; then
- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot - kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
- fi - fi
+# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
+# if ! test -f $kdepotpath; then +# if ! test -f $kdepotpath; then
+# kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot +# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
+# fi +# fi
$MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \

@ -4,7 +4,7 @@
if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
export EXTRACTRC PREPARETIPS export EXTRACTRC PREPARETIPS
+kdepotpath=/opt/trinity/include/tde/kde.pot +kdepotpath=/opt/trinity/include/tde/tde.pot
+ +
for subdir in $dirs; do for subdir in $dirs; do
test -z "$VERBOSE" || echo "Making messages in $subdir" test -z "$VERBOSE" || echo "Making messages in $subdir"
@ -13,13 +13,13 @@
fi 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 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:-`tde-config --expandvars --install include`}/kde.pot - kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
- if ! test -f $kdepotpath; then - if ! test -f $kdepotpath; then
- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot - kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
- fi - fi
+# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
+# if ! test -f $kdepotpath; then +# if ! test -f $kdepotpath; then
+# kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot +# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
+# fi +# fi
$MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \

@ -105,9 +105,9 @@ common-install-prehook-impl::
# sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \ # sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
# done # done
# msgcat --use-first kde.pot po/tdelibs.pot > tdelibs.pot-merged # msgcat --use-first tde.pot po/tdelibs.pot > tdelibs.pot-merged
# mv -f tdelibs.pot-merged po/tdelibs.pot # mv -f tdelibs.pot-merged po/tdelibs.pot
cp -Rp kde.pot po/tdelibs.pot cp -Rp tde.pot po/tdelibs.pot
# generate .po files for .desktop etc files # generate .po files for .desktop etc files
if [ -f debian/kubuntu-desktop-i18n/createdesktop.pl ]; then \ if [ -f debian/kubuntu-desktop-i18n/createdesktop.pl ]; then \

@ -241,7 +241,7 @@ debian/tmp/opt/trinity/share/apps/kjava/icons/crystalsvg/16x16/actions/java.png
debian/tmp/opt/trinity/share/apps/kjava/kjava.jar debian/tmp/opt/trinity/share/apps/kjava/kjava.jar
debian/tmp/opt/trinity/share/apps/kjava/kjava.policy debian/tmp/opt/trinity/share/apps/kjava/kjava.policy
debian/tmp/opt/trinity/share/apps/kjava/pluginsinfo debian/tmp/opt/trinity/share/apps/kjava/pluginsinfo
debian/tmp/opt/trinity/share/apps/knewstuff/types debian/tmp/opt/trinity/share/apps/tdenewstuff/types
debian/tmp/opt/trinity/share/apps/knotify/eventsrc debian/tmp/opt/trinity/share/apps/knotify/eventsrc
debian/tmp/opt/trinity/share/apps/ksgmltools2/customization/af/catalog debian/tmp/opt/trinity/share/apps/ksgmltools2/customization/af/catalog
debian/tmp/opt/trinity/share/apps/ksgmltools2/customization/af/catalog.xml debian/tmp/opt/trinity/share/apps/ksgmltools2/customization/af/catalog.xml

@ -218,7 +218,7 @@ debian/tmp/opt/trinity/include/tdesensordevice.h
debian/tmp/opt/trinity/include/tdestoragedevice.h debian/tmp/opt/trinity/include/tdestoragedevice.h
debian/tmp/opt/trinity/include/tdelibs_export.h debian/tmp/opt/trinity/include/tdelibs_export.h
debian/tmp/opt/trinity/include/kdemacros.h debian/tmp/opt/trinity/include/kdemacros.h
debian/tmp/opt/trinity/include/kde.pot debian/tmp/opt/trinity/include/tde.pot
debian/tmp/opt/trinity/include/tdeprint/driver.h debian/tmp/opt/trinity/include/tdeprint/driver.h
debian/tmp/opt/trinity/include/tdeprint/kiconselectaction.h debian/tmp/opt/trinity/include/tdeprint/kiconselectaction.h
debian/tmp/opt/trinity/include/tdeprint/kmjob.h debian/tmp/opt/trinity/include/tdeprint/kmjob.h
@ -433,16 +433,16 @@ debian/tmp/opt/trinity/include/tdemulticastsocket.h
debian/tmp/opt/trinity/include/tdemultipledrag.h debian/tmp/opt/trinity/include/tdemultipledrag.h
debian/tmp/opt/trinity/include/tdemultitabbar.h debian/tmp/opt/trinity/include/tdemultitabbar.h
debian/tmp/opt/trinity/include/knetworkinterface.h debian/tmp/opt/trinity/include/knetworkinterface.h
debian/tmp/opt/trinity/include/knewstuff/downloaddialog.h debian/tmp/opt/trinity/include/tdenewstuff/downloaddialog.h
debian/tmp/opt/trinity/include/knewstuff/engine.h debian/tmp/opt/trinity/include/tdenewstuff/engine.h
debian/tmp/opt/trinity/include/knewstuff/entry.h debian/tmp/opt/trinity/include/tdenewstuff/entry.h
debian/tmp/opt/trinity/include/knewstuff/knewstuffbutton.h debian/tmp/opt/trinity/include/tdenewstuff/knewstuffbutton.h
debian/tmp/opt/trinity/include/knewstuff/knewstuffgeneric.h debian/tmp/opt/trinity/include/tdenewstuff/knewstuffgeneric.h
debian/tmp/opt/trinity/include/knewstuff/knewstuff.h debian/tmp/opt/trinity/include/tdenewstuff/knewstuff.h
debian/tmp/opt/trinity/include/knewstuff/knewstuffsecure.h debian/tmp/opt/trinity/include/tdenewstuff/knewstuffsecure.h
debian/tmp/opt/trinity/include/knewstuff/providerdialog.h debian/tmp/opt/trinity/include/tdenewstuff/providerdialog.h
debian/tmp/opt/trinity/include/knewstuff/provider.h debian/tmp/opt/trinity/include/tdenewstuff/provider.h
debian/tmp/opt/trinity/include/knewstuff/uploaddialog.h debian/tmp/opt/trinity/include/tdenewstuff/uploaddialog.h
debian/tmp/opt/trinity/include/knfsshare.h debian/tmp/opt/trinity/include/knfsshare.h
debian/tmp/opt/trinity/include/knotifyclient.h debian/tmp/opt/trinity/include/knotifyclient.h
debian/tmp/opt/trinity/include/knotifydialog.h debian/tmp/opt/trinity/include/knotifydialog.h
@ -808,8 +808,8 @@ debian/tmp/opt/trinity/lib/libtdemediaplayer.la
debian/tmp/opt/trinity/lib/libtdemediaplayer.so debian/tmp/opt/trinity/lib/libtdemediaplayer.so
debian/tmp/opt/trinity/lib/libtdemid.la debian/tmp/opt/trinity/lib/libtdemid.la
debian/tmp/opt/trinity/lib/libtdemid.so debian/tmp/opt/trinity/lib/libtdemid.so
debian/tmp/opt/trinity/lib/libknewstuff.la debian/tmp/opt/trinity/lib/libtdenewstuff.la
debian/tmp/opt/trinity/lib/libknewstuff.so debian/tmp/opt/trinity/lib/libtdenewstuff.so
debian/tmp/opt/trinity/lib/libtdentlm.la debian/tmp/opt/trinity/lib/libtdentlm.la
debian/tmp/opt/trinity/lib/libtdentlm.so debian/tmp/opt/trinity/lib/libtdentlm.so
debian/tmp/opt/trinity/lib/libtdeparts.la debian/tmp/opt/trinity/lib/libtdeparts.la

@ -287,8 +287,8 @@ debian/tmp/opt/trinity/lib/libtdemediaplayer.so.0
debian/tmp/opt/trinity/lib/libtdemediaplayer.so.0.0.0 debian/tmp/opt/trinity/lib/libtdemediaplayer.so.0.0.0
debian/tmp/opt/trinity/lib/libtdemid.so.0 debian/tmp/opt/trinity/lib/libtdemid.so.0
debian/tmp/opt/trinity/lib/libtdemid.so.0.0.95 debian/tmp/opt/trinity/lib/libtdemid.so.0.0.95
debian/tmp/opt/trinity/lib/libknewstuff.so.1 debian/tmp/opt/trinity/lib/libtdenewstuff.so.1
debian/tmp/opt/trinity/lib/libknewstuff.so.1.0.0 debian/tmp/opt/trinity/lib/libtdenewstuff.so.1.0.0
debian/tmp/opt/trinity/lib/libtdentlm.so.0 debian/tmp/opt/trinity/lib/libtdentlm.so.0
debian/tmp/opt/trinity/lib/libtdentlm.so.0.0.0 debian/tmp/opt/trinity/lib/libtdentlm.so.0.0.0
debian/tmp/opt/trinity/lib/libtdeparts.so.2 debian/tmp/opt/trinity/lib/libtdeparts.so.2

@ -4,7 +4,7 @@
if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
export EXTRACTRC PREPARETIPS export EXTRACTRC PREPARETIPS
+kdepotpath=/opt/trinity/include/tde/kde.pot +kdepotpath=/opt/trinity/include/tde/tde.pot
+ +
for subdir in $dirs; do for subdir in $dirs; do
test -z "$VERBOSE" || echo "Making messages in $subdir" test -z "$VERBOSE" || echo "Making messages in $subdir"
@ -13,13 +13,13 @@
fi 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 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:-`tde-config --expandvars --install include`}/kde.pot - kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
- if ! test -f $kdepotpath; then - if ! test -f $kdepotpath; then
- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot - kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
- fi - fi
+# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
+# if ! test -f $kdepotpath; then +# if ! test -f $kdepotpath; then
+# kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot +# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
+# fi +# fi
$MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \

@ -4,7 +4,7 @@
if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
export EXTRACTRC PREPARETIPS export EXTRACTRC PREPARETIPS
+kdepotpath=/opt/trinity/include/tde/kde.pot +kdepotpath=/opt/trinity/include/tde/tde.pot
+ +
for subdir in $dirs; do for subdir in $dirs; do
test -z "$VERBOSE" || echo "Making messages in $subdir" test -z "$VERBOSE" || echo "Making messages in $subdir"
@ -13,13 +13,13 @@
fi 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 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:-`tde-config --expandvars --install include`}/kde.pot - kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
- if ! test -f $kdepotpath; then - if ! test -f $kdepotpath; then
- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot - kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
- fi - fi
+# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
+# if ! test -f $kdepotpath; then +# if ! test -f $kdepotpath; then
+# kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot +# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
+# fi +# fi
$MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \

@ -4,7 +4,7 @@
if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
export EXTRACTRC PREPARETIPS export EXTRACTRC PREPARETIPS
+kdepotpath=/opt/trinity/include/tde/kde.pot +kdepotpath=/opt/trinity/include/tde/tde.pot
+ +
for subdir in $dirs; do for subdir in $dirs; do
test -z "$VERBOSE" || echo "Making messages in $subdir" test -z "$VERBOSE" || echo "Making messages in $subdir"
@ -13,13 +13,13 @@
fi 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 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:-`tde-config --expandvars --install include`}/kde.pot - kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
- if ! test -f $kdepotpath; then - if ! test -f $kdepotpath; then
- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot - kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
- fi - fi
+# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
+# if ! test -f $kdepotpath; then +# if ! test -f $kdepotpath; then
+# kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot +# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
+# fi +# fi
$MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \

@ -4,7 +4,7 @@
if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
export EXTRACTRC PREPARETIPS export EXTRACTRC PREPARETIPS
+kdepotpath=/opt/trinity/include/tde/kde.pot +kdepotpath=/opt/trinity/include/tde/tde.pot
+ +
for subdir in $dirs; do for subdir in $dirs; do
test -z "$VERBOSE" || echo "Making messages in $subdir" test -z "$VERBOSE" || echo "Making messages in $subdir"
@ -13,13 +13,13 @@
fi 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 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:-`tde-config --expandvars --install include`}/kde.pot - kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
- if ! test -f $kdepotpath; then - if ! test -f $kdepotpath; then
- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot - kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
- fi - fi
+# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
+# if ! test -f $kdepotpath; then +# if ! test -f $kdepotpath; then
+# kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot +# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
+# fi +# fi
$MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \

@ -4,7 +4,7 @@
if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
export EXTRACTRC PREPARETIPS export EXTRACTRC PREPARETIPS
+kdepotpath=/opt/trinity/include/tde/kde.pot +kdepotpath=/opt/trinity/include/tde/tde.pot
+ +
for subdir in $dirs; do for subdir in $dirs; do
test -z "$VERBOSE" || echo "Making messages in $subdir" test -z "$VERBOSE" || echo "Making messages in $subdir"
@ -13,13 +13,13 @@
fi 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 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:-`tde-config --expandvars --install include`}/kde.pot - kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
- if ! test -f $kdepotpath; then - if ! test -f $kdepotpath; then
- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot - kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
- fi - fi
+# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
+# if ! test -f $kdepotpath; then +# if ! test -f $kdepotpath; then
+# kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot +# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
+# fi +# fi
$MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \

@ -34,7 +34,7 @@ DEB_CMAKE_EXTRA_FLAGS := \
-DWITH_SNMP="ON" \ -DWITH_SNMP="ON" \
-DWITH_SENSORS="ON" \ -DWITH_SENSORS="ON" \
-DWITH_XMMS="ON" \ -DWITH_XMMS="ON" \
-DWITH_KNEWSTUFF="ON" -DWITH_TDENEWSTUFF="ON"
DOC_HTML_PRUNE := kcontrol-trinity ktimer-trinity kcharselect-trinity ksim-trinity DOC_HTML_PRUNE := kcontrol-trinity ktimer-trinity kcharselect-trinity ksim-trinity

@ -4,7 +4,7 @@
if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
export EXTRACTRC PREPARETIPS export EXTRACTRC PREPARETIPS
+kdepotpath=/opt/trinity/include/tde/kde.pot +kdepotpath=/opt/trinity/include/tde/tde.pot
+ +
for subdir in $dirs; do for subdir in $dirs; do
test -z "$VERBOSE" || echo "Making messages in $subdir" test -z "$VERBOSE" || echo "Making messages in $subdir"
@ -13,13 +13,13 @@
fi 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 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:-`tde-config --expandvars --install include`}/kde.pot - kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
- if ! test -f $kdepotpath; then - if ! test -f $kdepotpath; then
- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot - kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
- fi - fi
+# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
+# if ! test -f $kdepotpath; then +# if ! test -f $kdepotpath; then
+# kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot +# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
+# fi +# fi
$MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \

@ -4,7 +4,7 @@
if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
export EXTRACTRC PREPARETIPS export EXTRACTRC PREPARETIPS
+kdepotpath=/usr/include/tde/kde.pot +kdepotpath=/usr/include/tde/tde.pot
+ +
for subdir in $dirs; do for subdir in $dirs; do
test -z "$VERBOSE" || echo "Making messages in $subdir" test -z "$VERBOSE" || echo "Making messages in $subdir"
@ -13,13 +13,13 @@
fi 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 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:-`tde-config --expandvars --install include`}/kde.pot - kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
- if ! test -f $kdepotpath; then - if ! test -f $kdepotpath; then
- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot - kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
- fi - fi
+# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
+# if ! test -f $kdepotpath; then +# if ! test -f $kdepotpath; then
+# kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot +# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
+# fi +# fi
$MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \

@ -100,7 +100,7 @@ tdegames: tdebase tdemultimedia
tdegraphics: tdebase poppler cmake tdegraphics: tdebase poppler cmake
$(call buildpkg,tdegraphics) $(call buildpkg,tdegraphics)
tdelibs: tqt3 tqtinterface arts dbus-tqt dbus-1-tqt cmake tdelibs: tqt3 tqtinterface arts dbus-tqt dbus-1-tqt cmake avahi-tqt
$(call buildpkg,tdelibs) $(call buildpkg,tdelibs)
tdemultimedia: tdebase akode tdemultimedia: tdebase akode
@ -143,7 +143,7 @@ endif
cmake: cmake:
# Build on CentOS only # Build on CentOS only
ifneq ($(wildcard /boot/vmlinuz*.el5* /boot/vmlinuz*.el6*),) ifneq ($(wildcard /boot/vmlinuz*.el5* /boot/vmlinuz*.el6*),)
$(call buildpkg,3rdparty/cmake) # $(call buildpkg,3rdparty/cmake)
endif endif
esound: esound:
@ -250,6 +250,11 @@ endif
akode: tqtinterface akode: tqtinterface
$(call buildpkg,extras/akode) $(call buildpkg,extras/akode)
cmake-macros: cmake
ifneq ($(wildcard /etc/SuSE-release),)
$(call buildpkg,extras/trinity-cmake-macros)
endif
### Trinity Libraries ### Trinity Libraries
kipi-plugins: tqtinterface libkipi kipi-plugins: tqtinterface libkipi
$(call buildpkg,libraries/kipi-plugins) $(call buildpkg,libraries/kipi-plugins)

@ -38,6 +38,7 @@ rpmbuild -ba \
--define "_buildrootdir ${BUILDROOTDIR}" \ --define "_buildrootdir ${BUILDROOTDIR}" \
--define "_rpmdir ${RPMDIR}" \ --define "_rpmdir ${RPMDIR}" \
--define "_srcrpmdir ${SRPMDIR}" \ --define "_srcrpmdir ${SRPMDIR}" \
--define '_build_create_debug 1' \
--define "tde_version ${TDE_VERSION}" \ --define "tde_version ${TDE_VERSION}" \
--define "tde_prefix /opt/trinity" \ --define "tde_prefix /opt/trinity" \
--define "preversion ${PREVERSION}" \ --define "preversion ${PREVERSION}" \

@ -6,14 +6,7 @@ PKGNAME="${1##*/}"
[ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1 [ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1
# Language package: install only French language package # Language package: install only French language package
case ${PKGNAME} in PKGNAME="$(get_rpm_package_name.sh ${PKGNAME})"
"k3b-i18n"|"koffice-i18n"|"tde-i18n") PKGNAME="trinity-${PKGNAME}-French";;
"koffice") PKGNAME="${PKGNAME}-suite";;
"trinity-"*) PKGNAME="${PKGNAME#trinity-}";;
"qt3") [ -r /etc/mandriva-release ] && PKGNAME="qt3-common";;
"curl") PKGNAME="trinity-libcurl";;
"esound") PKGNAME="esound-libs";;
esac
VERSION=$(LC_ALL=C rpm -q --qf "%{version}-%{release}" trinity-${PKGNAME} 2>/dev/null) VERSION=$(LC_ALL=C rpm -q --qf "%{version}-%{release}" trinity-${PKGNAME} 2>/dev/null)
if [ -z "${VERSION}" ] || [[ "${VERSION}" =~ "not installed" ]]; then if [ -z "${VERSION}" ] || [[ "${VERSION}" =~ "not installed" ]]; then

@ -14,6 +14,8 @@ RPMDIR_NOARCH=${RPMDIR}/noarch
RPMDIRS="${RPMDIR_ARCH} ${RPMDIR_NOARCH}" RPMDIRS="${RPMDIR_ARCH} ${RPMDIR_NOARCH}"
case "${PKGNAME##*/}" in case "${PKGNAME##*/}" in
"tqt3") PKGNAME="libtqt3-mt";;
"tqtinterface") PKGNAME="libtqt4";;
"koffice") PKGNAME="koffice-suite";; "koffice") PKGNAME="koffice-suite";;
"tde-i18n") PKGNAME="tde-i18n-French";; "tde-i18n") PKGNAME="tde-i18n-French";;
esac esac

@ -13,15 +13,21 @@ PKGCATEGORY="${1%%/*}"
PKGNAME="${1##*/}" PKGNAME="${1##*/}"
DEVEL="$2" DEVEL="$2"
# Some RPM packages have different name than the source tarball.
# Language package: install only French language package # Language package: install only French language package
case "${PKGNAME}" in case "${PKGNAME}" in
"k3b-i18n"|"koffice-i18n"|"tde-i18n") PKGNAME="${PKGNAME}-French";; "k3b-i18n"|"koffice-i18n"|"tde-i18n") PKGNAME="${PKGNAME}-French";;
"koffice") PKGNAME="${PKGNAME}-suite";; "koffice") PKGNAME="${PKGNAME}-suite";;
"tqt3") PKGNAME="libtqt3-mt";;
"tqtinterface") PKGNAME="libtqt4";;
"avahi-tqt") PKGNAME="libavahi-tqt";;
"dbus-tqt") PKGNAME="libdbus-tqt-1";;
"dbus-1-tqt") PKGNAME="libdbus-1-tqt";;
esac esac
# Use the Trinity Prefix, or not. # Use the Trinity Prefix, or not.
case "${PKGNAME}" in case "${PKGNAME}" in
"trinity-"*|"qt3"|"python-qt3"|"esound") PREFIX="";; "trinity-"*|"qt3"|"python-qt3"|"esound"|"lib"*) PREFIX="";;
"autoconf"|"automake"|"cmake"|"gnuchess"|"htdig"|"imlib1"|"libotr3"|"libtool"|"lilypond"|"m4"|"mftrace"|"pcsc-perl"|"torsocks"|"wv2") PREFIX="";; "autoconf"|"automake"|"cmake"|"gnuchess"|"htdig"|"imlib1"|"libotr3"|"libtool"|"lilypond"|"m4"|"mftrace"|"pcsc-perl"|"torsocks"|"wv2") PREFIX="";;
"curl") PREFIX="trinity-lib";; "curl") PREFIX="trinity-lib";;
*) PREFIX="trinity-";; *) PREFIX="trinity-";;

@ -1,10 +1,28 @@
#
# spec file for package arts
#
# Copyright (c) 2014 François Andriot <francois.andriot@free.fr>
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
#
# Please submit bugfixes or comments via http:/www.trinitydesktop.org/
#
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?tde_prefix}" != "/usr" %if "%{?tde_prefix}" != "/usr"
%define _variant .opt %define _variant .opt
%endif %endif
# TDE specific variables
%define tde_version 14.0.0 %define tde_version 14.0.0
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin %define tde_bindir %{tde_prefix}/bin
%define tde_includedir %{tde_prefix}/include %define tde_includedir %{tde_prefix}/include
%define tde_libdir %{tde_prefix}/%{_lib} %define tde_libdir %{tde_prefix}/%{_lib}
@ -18,13 +36,18 @@ Name: trinity-arts
Epoch: 1 Epoch: 1
Version: 1.5.10 Version: 1.5.10
Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant} Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant}
License: GPL
Summary: aRts (analog realtime synthesizer) - the TDE sound system Summary: aRts (analog realtime synthesizer) - the TDE sound system
Group: System Environment/Daemons Group: System Environment/Daemons
Vendor: Trinity Project
URL: http://www.trinitydesktop.org/ URL: http://www.trinitydesktop.org/
Packager: Francois Andriot <francois.andriot@free.fr>
%if 0%{?suse_version}
License: GPL-2.0+
%else
License: GPLv2+
%endif
#Vendor: Trinity Project
#Packager: Francois Andriot <francois.andriot@free.fr>
Prefix: %{tde_prefix} Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -32,8 +55,12 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
Source1: kcmartsrc-pulseaudio Source1: kcmartsrc-pulseaudio
BuildRequires: libtqt4-devel >= 1:4.2.0
BuildRequires: cmake >= 2.8 BuildRequires: cmake >= 2.8
BuildRequires: trinity-tqtinterface-devel >= %{tde_version} BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: audiofile-devel BuildRequires: audiofile-devel
BuildRequires: alsa-lib-devel BuildRequires: alsa-lib-devel
BuildRequires: glib2-devel BuildRequires: glib2-devel
@ -45,8 +72,7 @@ BuildRequires: libvorbis-devel
BuildRequires: esound-devel BuildRequires: esound-devel
# JACK support # JACK support
# Not on RHEL4 ! %if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?suse_version}
%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version}
%define with_jack 1 %define with_jack 1
%if 0%{?mgaversion} || 0%{?mdkversion} %if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: %{_lib}jack-devel BuildRequires: %{_lib}jack-devel
@ -75,6 +101,7 @@ BuildRequires: libtool
%endif %endif
# MAD support # MAD support
%ifarch i386 i486 i586 i686 x86_64
%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel}
%define with_libmad 1 %define with_libmad 1
%if 0%{?mdkversion} || 0%{?mgaversion} %if 0%{?mdkversion} || 0%{?mgaversion}
@ -84,13 +111,14 @@ BuildRequires: %{_lib}mad-devel
BuildRequires: libmad-devel BuildRequires: libmad-devel
%endif %endif
%endif %endif
%endif
# Pulseaudio config file # Pulseaudio config file
%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?suse_version} %if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?suse_version}
%define with_pulseaudio 1 %define with_pulseaudio 1
%endif %endif
Requires: trinity-tqtinterface >= %{tde_version} Requires: libtqt4 >= 1:4.2.0
Requires: audiofile Requires: audiofile
%if "%{?tde_prefix}" == "/usr" %if "%{?tde_prefix}" == "/usr"
@ -112,8 +140,17 @@ playing a wave file with some effects.
%files %files
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc COPYING.LIB %doc COPYING.LIB
%dir %{tde_prefix}
%dir %{tde_bindir}
%dir %{tde_datadir}
%dir %{tde_datadir}/config
%dir %{tde_datadir}/doc
%dir %{tde_libdir}
%dir %{tde_libdir}/mcop %dir %{tde_libdir}/mcop
%dir %{tde_libdir}/mcop/Arts %dir %{tde_libdir}/mcop/Arts
%dir %{tde_libdir}/pkgconfig
%dir %{tde_includedir}
%dir %{tde_tdeincludedir}
%{tde_libdir}/mcop/Arts/* %{tde_libdir}/mcop/Arts/*
%{tde_libdir}/mcop/*.mcopclass %{tde_libdir}/mcop/*.mcopclass
%{tde_libdir}/mcop/*.mcoptype %{tde_libdir}/mcop/*.mcoptype
@ -138,14 +175,23 @@ playing a wave file with some effects.
%package devel %package devel
Group: Development/Libraries Group: Development/Libraries
Summary: %{name} - Development files Summary: aRts (analog realtime synthesizer) - the TDE sound system (Development files)
Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
%if "%{?tde_prefix}" == "/usr" %if "%{?tde_prefix}" == "/usr"
Obsoletes: arts-devel Obsoletes: arts-devel
%endif %endif
%description devel %description devel
Development files for %{name} arts (analog real-time synthesizer) is the sound system of TDE.
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.
%files devel %files devel
%defattr(-,root,root,-) %defattr(-,root,root,-)
@ -212,6 +258,7 @@ fi
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_SKIP_RPATH=OFF \ -DCMAKE_SKIP_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_NO_BUILTIN_CHRPATH=ON \
-DCMAKE_VERBOSE_MAKEFILE=ON \ -DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=ON \ -DWITH_GCC_VISIBILITY=ON \
\ \
@ -236,12 +283,16 @@ fi
%__rm -rf %{?buildroot} %__rm -rf %{?buildroot}
%__make install -C build DESTDIR=%{?buildroot} %__make install -C build DESTDIR=%{?buildroot}
%__install -d -m 755 %{?buildroot}%{tde_datadir}/config
%__install -d -m 755 %{?buildroot}%{tde_datadir}/doc
# Installs the Pulseaudio configuration file # Installs the Pulseaudio configuration file
%if 0%{?with_pulseaudio} %if 0%{?with_pulseaudio}
%__install -D -m 644 %{SOURCE1} %{?buildroot}%{tde_datadir}/config/kcmartsrc %__install -D -m 644 %{SOURCE1} %{?buildroot}%{tde_datadir}/config/kcmartsrc
%endif %endif
%clean %clean
%__rm -rf %{?buildroot} %__rm -rf %{?buildroot}

@ -1,30 +1,52 @@
#
# spec file for package avahi-tqt
#
# Copyright (c) 2014 François Andriot <francois.andriot@free.fr>
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
#
# Please submit bugfixes or comments via http:/www.trinitydesktop.org/
#
# TDE specific building variables # TDE specific building variables
%define tde_version 14.0.0 %define tde_version 14.0.0
%define tde_prefix /usr %define tde_prefix /opt/trinity
%define tde_includedir %{tde_prefix}/include %define tde_includedir %{tde_prefix}/include
%define tde_libdir %{tde_prefix}/%{_lib} %define tde_libdir %{tde_prefix}/%{_lib}
Name: trinity-avahi-tqt Name: trinity-avahi-tqt
Epoch: 2 Epoch: 2
Version: 0.6.30 Version: 0.6.30
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
License: GPL Summary: Avahi TQt integration library
Summary: Avahi TQT Interface Group: System/Libraries
Group: System Environment/Libraries
Vendor: Trinity Project
Packager: Francois Andriot <francois.andriot@free.fr>
URL: http://www.trinitydesktop.org/ URL: http://www.trinitydesktop.org/
Prefix: %{tde_prefix} %if 0%{?suse_version}
License: LGPL-2.0+
%else
License: LGPLv2+
%endif
#Vendor: Trinity Project
#Packager: Francois Andriot <francois.andriot@free.fr>
Prefix: /usr
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: libtqt3-mt-devel >= 3.5.0
BuildRequires: libtqt4-devel >= 1:4.2.0
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: trinity-tqt3-devel >= 3.5.0
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
BuildRequires: gettext-devel BuildRequires: gettext-devel
BuildRequires: libtool BuildRequires: libtool
@ -39,7 +61,6 @@ BuildRequires: dbus-devel
# AVAHI support # AVAHI support
%if 0%{?mgaversion} || 0%{?mdkversion} %if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: %{_lib}avahi-client-devel BuildRequires: %{_lib}avahi-client-devel
Provides: %{_lib}avahi-qt3
%endif %endif
%if 0%{?suse_version} || 0%{?rhel} || 0%{?fedora} %if 0%{?suse_version} || 0%{?rhel} || 0%{?fedora}
BuildRequires: avahi-devel BuildRequires: avahi-devel
@ -53,37 +74,94 @@ BuildRequires: expat-devel
BuildRequires: libexpat-devel BuildRequires: libexpat-devel
%endif %endif
Requires: trinity-tqt3 >= 3.5.0 %description
Requires: trinity-tqtinterface >= %{tde_version} Avahi is a fully LGPL framework for Multicast DNS Service Discovery.
It allows programs to publish and discover services and hosts
running on a local network with no specific configuration. For
example you can plug into a network and instantly find printers to
print to, files to look at and people to talk to.
.
This library contains the interface to integrate the Avahi libraries
into a TQt main loop application.
##########
Obsoletes: avahi-tqt < %{?epoch:%{epoch}:}%{version}-%{release} %package -n libavahi-tqt
Provides: avahi-tqt = %{?epoch:%{epoch}:}%{version}-%{release} Summary: Avahi TQt integration library
Group: System/Libraries
%if 0%{?mgaversion} || 0%{?mdkversion}
Provides: %{_lib}avahi-qt3
%endif
%description Obsoletes: trinity-avahi-tqt < %{?epoch:%{epoch}:}%{version}-%{release}
Avahi TQT Interface Provides: trinity-avahi-tqt = %{?epoch:%{epoch}:}%{version}-%{release}
%description -n libavahi-tqt
Avahi is a fully LGPL framework for Multicast DNS Service Discovery.
It allows programs to publish and discover services and hosts
running on a local network with no specific configuration. For
example you can plug into a network and instantly find printers to
print to, files to look at and people to talk to.
.
This library contains the interface to integrate the Avahi libraries
into a TQt main loop application.
%package devel %post -n libavahi-tqt
Summary: %{name} - Development files /sbin/ldconfig || :
%postun -n libavahi-tqt
/sbin/ldconfig || :
%files -n libavahi-tqt
%defattr(-,root,root,-)
%{_libdir}/libavahi-tqt.so.1
%{_libdir}/libavahi-tqt.so.1.0.0
##########
%package -n libavahi-tqt-devel
Summary: Avahi TQt integration library (Development Files)
Group: Development/Libraries Group: Development/Libraries
Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} Requires: libavahi-tqt = %{?epoch:%{epoch}:}%{version}-%{release}
%if 0%{?mgaversion} || 0%{?mdkversion} %if 0%{?mgaversion} || 0%{?mdkversion}
Provides: %{_lib}avahi-qt3-devel Provides: %{_lib}avahi-qt3-devel
%endif %endif
Obsoletes: avahi-tqt-devel < %{?epoch:%{epoch}:}%{version}-%{release} Obsoletes: trinity-avahi-tqt-devel < %{?epoch:%{epoch}:}%{version}-%{release}
Provides: avahi-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release} Provides: trinity-avahi-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release}
%description -n libavahi-tqt-devel
Avahi is a fully LGPL framework for Multicast DNS Service Discovery.
It allows programs to publish and discover services and hosts
running on a local network with no specific configuration. For
example you can plug into a network and instantly find printers to
print to, files to look at and people to talk to.
.
This library contains the interface to integrate the Avahi libraries
into a TQt main loop application.
%post -n libavahi-tqt-devel
/sbin/ldconfig || :
%postun -n libavahi-tqt-devel
/sbin/ldconfig || :
%description devel %files -n libavahi-tqt-devel
Development files for %{name} %defattr(-,root,root,-)
%{_includedir}/avahi-tqt/
%{_libdir}/libavahi-tqt.so
%{_libdir}/libavahi-tqt.la
%{_libdir}/pkgconfig/avahi-tqt.pc
##########
%if 0%{?suse_version} || 0%{?pclinuxos} %if 0%{?pclinuxos}
%debug_package %debug_package
%endif %endif
##########
%prep %prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
@ -95,9 +173,9 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
%configure \ %configure \
--exec-prefix=%{tde_prefix} \ --exec-prefix=%{_prefix} \
--includedir=%{tde_includedir} \ --includedir=%{_includedir} \
--libdir=%{tde_libdir} \ --libdir=%{_libdir} \
\ \
--disable-static \ --disable-static \
--disable-dependency-tracking \ --disable-dependency-tracking \
@ -116,30 +194,7 @@ export PATH="%{tde_bindir}:${PATH}"
%clean %clean
%__rm -rf %{?buildroot} %__rm -rf %{?buildroot}
%post
/sbin/ldconfig || :
%postun
/sbin/ldconfig || :
%post devel
/sbin/ldconfig || :
%postun devel
/sbin/ldconfig || :
%files
%defattr(-,root,root,-)
%{tde_libdir}/libavahi-tqt.so.1
%{tde_libdir}/libavahi-tqt.so.1.0.0
%files devel
%defattr(-,root,root,-)
%{tde_includedir}/avahi-tqt/
%{tde_libdir}/libavahi-tqt.so
%{tde_libdir}/libavahi-tqt.la
%{tde_libdir}/pkgconfig/avahi-tqt.pc
%changelog %changelog
* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.6.30-1 * Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2:0.6.30-1
- Initial release for TDE 14.0.0 - Initial release for TDE 14.0.0

@ -1,89 +1,129 @@
#
# spec file for package dbus-1-tqt
#
# Copyright (c) 2014 François Andriot <francois.andriot@free.fr>
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
#
# Please submit bugfixes or comments via http:/www.trinitydesktop.org/
#
# TDE specific building variables # TDE specific building variables
%define tde_version 14.0.0 %define tde_version 14.0.0
%define tde_prefix /usr
%define tde_bindir %{tde_prefix}/bin
%define tde_includedir %{tde_prefix}/include
%define tde_libdir %{tde_prefix}/%{_lib}
Name: trinity-dbus-1-tqt Name: trinity-dbus-1-tqt
Epoch: 2 Epoch: 2
Version: 0.9 Version: 0.9
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
License: GPL Summary: dbus bindings for the Trinity Qt [TQt] interface
Summary: Dbus TQT Interface Group: System/Libraries
Group: System Environment/Libraries
Obsoletes: dbus-1-tqt < %{?epoch:%{epoch}:}%{version}-%{release} %if 0%{?suse_version}
Provides: dbus-1-tqt = %{?epoch:%{epoch}:}%{version}-%{release} License: GPL-2.0+
%else
License: GPLv2+
%endif
Vendor: Trinity Project #Vendor: Trinity Project
Packager: Francois Andriot <francois.andriot@free.fr> #Packager: Francois Andriot <francois.andriot@free.fr>
Prefix: %{tde_prefix} Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: libtqt3-mt-devel >= 3.5.0
BuildRequires: libtqt4-devel >= 1:4.2.0
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: cmake >= 2.8
# DBUS support
%if 0%{?suse_version} %if 0%{?suse_version}
BuildRequires: dbus-1-devel BuildRequires: dbus-1-devel
%else %else
BuildRequires: dbus-devel BuildRequires: dbus-devel
%endif %endif
BuildRequires: cmake >= 2.8 %description
BuildRequires: trinity-tqt3-devel >= 3.5.0
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
Requires: trinity-tqt3 >= 3.5.0
###########
%description %package -n libdbus-1-tqt
Dbus TQT Interface Summary: dbus bindings for the Trinity Qt [TQt] interface
Group: System/Libraries
Obsoletes: trinity-dbus-1-tqt < %{?epoch:%{epoch}:}%{version}-%{release}
Provides: trinity-dbus-1-tqt = %{?epoch:%{epoch}:}%{version}-%{release}
%description -n libdbus-1-tqt
D-BUS is a message bus, used for sending messages between applications.
Conceptually, it fits somewhere in between raw sockets and CORBA in
terms of complexity.
This package provides bindings for the Trinity Qt TQt interface.
%post See the dbus description for more information about D-BUS in general.
%post -n libdbus-1-tqt
/sbin/ldconfig || : /sbin/ldconfig || :
%postun %postun -n libdbus-1-tqt
/sbin/ldconfig || : /sbin/ldconfig || :
%files %files -n libdbus-1-tqt
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{tde_bindir}/dbusxml2qt3 %{_libdir}/libdbus-1-tqt.so.0
%{tde_libdir}/libdbus-1-tqt.so.0 %{_libdir}/libdbus-1-tqt.so.0.0.0
%{tde_libdir}/libdbus-1-tqt.so.0.0.0
########## ##########
%package devel %package -n libdbus-1-tqt-devel
Requires: %{name} Summary: dbus bindings for the Trinity Qt [TQt] interface (Development Files)
Summary: %{name} - Development files Group: Development/Libraries
Group: Development/Libraries Requires: libdbus-1-tqt = %{?epoch:%{epoch}:}%{version}-%{release}
Obsoletes: trinity-dbus-1-tqt-devel < %{?epoch:%{epoch}:}%{version}-%{release}
Provides: trinity-dbus-1-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release}
Obsoletes: dbus-1-tqt-devel < %{?epoch:%{epoch}:}%{version}-%{release} %description -n libdbus-1-tqt-devel
Provides: dbus-1-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release} D-BUS is a message bus, used for sending messages between applications.
Conceptually, it fits somewhere in between raw sockets and CORBA in
terms of complexity.
%description devel This package provides bindings for the Trinity Qt TQt interface.
Development files for %{name}
%post devel See the dbus description for more information about D-BUS in general.
%post -n libdbus-1-tqt-devel
/sbin/ldconfig || : /sbin/ldconfig || :
%postun devel %postun -n libdbus-1-tqt-devel
/sbin/ldconfig || : /sbin/ldconfig || :
%files devel %files -n libdbus-1-tqt-devel
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{tde_includedir}/*.h %{_bindir}/dbusxml2qt3
%{tde_libdir}/libdbus-1-tqt.so %{_includedir}/*.h
%{tde_libdir}/libdbus-1-tqt.la %{_libdir}/libdbus-1-tqt.so
%{tde_libdir}/pkgconfig/*.pc %{_libdir}/libdbus-1-tqt.la
%{_libdir}/pkgconfig/*.pc
########## ##########
%if 0%{?suse_version} || 0%{?pclinuxos} %if 0%{?pclinuxos}
%debug_package %debug_package
%endif %endif
##########
%prep %prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
@ -91,7 +131,7 @@ Development files for %{name}
%build %build
unset QTDIR QTINC QTLIB unset QTDIR QTINC QTLIB
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" export PKG_CONFIG_PATH="%{_libdir}/pkgconfig"
if ! rpm -E %%cmake|grep -q "cd build"; then if ! rpm -E %%cmake|grep -q "cd build"; then
%__mkdir_p build %__mkdir_p build
@ -106,9 +146,9 @@ fi
-DCMAKE_VERBOSE_MAKEFILE=ON \ -DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \ -DWITH_GCC_VISIBILITY=OFF \
\ \
-DBIN_INSTALL_DIR=%{tde_bindir} \ -DBIN_INSTALL_DIR=%{_bindir} \
-DINCLUDE_INSTALL_DIR=%{tde_includedir} \ -DINCLUDE_INSTALL_DIR=%{_includedir} \
-DLIB_INSTALL_DIR=%{tde_libdir} \ -DLIB_INSTALL_DIR=%{_libdir} \
.. ..
%__make %{?_smp_mflags} %__make %{?_smp_mflags}

@ -1,98 +1,128 @@
#
# spec file for package dbus-tqt
#
# Copyright (c) 2014 François Andriot <francois.andriot@free.fr>
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
#
# Please submit bugfixes or comments via http:/www.trinitydesktop.org/
#
# TDE specific building variables # TDE specific building variables
%define tde_version 14.0.0 %define tde_version 14.0.0
%define tde_prefix /usr
%define tde_includedir %{tde_prefix}/include
%define tde_libdir %{tde_prefix}/%{_lib}
Name: trinity-dbus-tqt Name: trinity-dbus-tqt
Epoch: 2 Epoch: 2
Version: 0.63 Version: 0.63
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
License: GPL Summary: Simple inter-process messaging system
Summary: Dbus TQT Interface Group: System/Libraries
Group: System Environment/Libraries URL: http://www.trinitydesktop.org/
%if 0%{?suse_version}
License: GPL-2.0+
%else
License: GPLv2+
%endif
Vendor: Trinity Project #Vendor: Trinity Project
Packager: Francois Andriot <francois.andriot@free.fr> #Packager: Francois Andriot <francois.andriot@free.fr>
Prefix: %{tde_prefix} Prefix: /usr
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
# [dbus-tqt] Fix build on RHEL 4 BuildRequires: libtqt3-mt-devel >= 3.5.0
Patch1: dbus-tqt-3.5.13-fix_old_dbus_types.patch BuildRequires: libtqt4-devel >= 1:4.2.0
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: cmake >= 2.8
# DBUS support
%if 0%{?suse_version} %if 0%{?suse_version}
BuildRequires: dbus-1-devel BuildRequires: dbus-1-devel
%else %else
BuildRequires: dbus-devel BuildRequires: dbus-devel
%endif %endif
BuildRequires: trinity-tqtinterface-devel >= %{version}
BuildRequires: cmake >= 2.8 %description
BuildRequires: trinity-tqt3-devel >= 3.5.0
Requires: trinity-tqt3 >= 3.5.0
Obsoletes: dbus-tqt < %{?epoch:%{epoch}:}%{version}-%{release} ##########
Provides: dbus-tqt = %{?epoch:%{epoch}:}%{version}-%{release}
%package -n libdbus-tqt-1
Summary: Simple inter-process messaging system (TQt-based shared library)
Group: System/Libraries
%description Obsoletes: trinity-dbus-tqt < %{?epoch:%{epoch}:}%{version}-%{release}
Dbus TQT Interface Provides: trinity-dbus-tqt = %{?epoch:%{epoch}:}%{version}-%{release}
%description -n libdbus-tqt-1
D-BUS is a message bus, used for sending messages between applications.
Conceptually, it fits somewhere in between raw sockets and CORBA in
terms of complexity.
This package provides the TQt-based shared library for applications using the
Qt interface to D-BUS.
See the dbus description for more information about D-BUS in general.
%post %post -n libdbus-tqt-1
/sbin/ldconfig || : /sbin/ldconfig || :
%postun %postun -n libdbus-tqt-1
/sbin/ldconfig || : /sbin/ldconfig || :
%files %files -n libdbus-tqt-1
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{tde_libdir}/libdbus-tqt-1.so.0 %{_libdir}/libdbus-tqt-1.so.0
%{tde_libdir}/libdbus-tqt-1.so.0.0.0 %{_libdir}/libdbus-tqt-1.so.0.0.0
########## ##########
%package devel %package -n libdbus-tqt-1-devel
Requires: %{name} Summary: Simple inter-process messaging system (TQt interface)
Summary: %{name} - Development files
Group: Development/Libraries Group: Development/Libraries
Requires: libdbus-tqt-1 = %{?epoch:%{epoch}:}%{version}-%{release}
Obsoletes: dbus-tqt-devel < %{?epoch:%{epoch}:}%{version}-%{release} Obsoletes: trinity-dbus-tqt-devel < %{?epoch:%{epoch}:}%{version}-%{release}
Provides: dbus-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release} Provides: trinity-dbus-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release}
%description devel %description -n libdbus-tqt-1-devel
Development files for %{name} Development files for %{name}
%post devel %post -n libdbus-tqt-1-devel
/sbin/ldconfig || : /sbin/ldconfig || :
%postun devel %postun -n libdbus-tqt-1-devel
/sbin/ldconfig || : /sbin/ldconfig || :
%files devel %files -n libdbus-tqt-1-devel
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{tde_includedir}/dbus-1.0/* %{_includedir}/dbus-1.0/*
%{tde_libdir}/libdbus-tqt-1.so %{_libdir}/libdbus-tqt-1.so
%{tde_libdir}/libdbus-tqt-1.la %{_libdir}/libdbus-tqt-1.la
%{tde_libdir}/pkgconfig/dbus-tqt.pc %{_libdir}/pkgconfig/dbus-tqt.pc
########## ##########
%if 0%{?suse_version} || 0%{?pclinuxos} %if 0%{?pclinuxos}
%debug_package %debug_package
%endif %endif
##########
%prep %prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%if 0%{?rhel} == 4
%patch1 -p1 -b .dbustypes
%endif
%build %build
unset QTDIR QTINC QTLIB unset QTDIR QTINC QTLIB
@ -115,8 +145,8 @@ fi
-DCMAKE_VERBOSE_MAKEFILE=ON \ -DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \ -DWITH_GCC_VISIBILITY=OFF \
\ \
-DINCLUDE_INSTALL_DIR=%{tde_includedir} \ -DINCLUDE_INSTALL_DIR=%{_includedir} \
-DLIB_INSTALL_DIR=%{tde_libdir} \ -DLIB_INSTALL_DIR=%{_libdir} \
.. ..
%__make %{?_smp_mflags} %__make %{?_smp_mflags}

@ -1,32 +1,51 @@
#
# spec file for package libart-lgpl
#
# Copyright (c) 2014 François Andriot <francois.andriot@free.fr>
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
#
# Please submit bugfixes or comments via http:/www.trinitydesktop.org/
#
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?tde_prefix}" != "/usr" %if "%{?tde_prefix}" != "/usr"
%define _variant .opt %define _variant .opt
%endif %endif
# TDE variables
%define tde_version 14.0.0 %define tde_version 14.0.0
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin %define tde_bindir %{tde_prefix}/bin
%define tde_includedir %{tde_prefix}/include %define tde_includedir %{tde_prefix}/include
%define tde_libdir %{tde_prefix}/%{_lib} %define tde_libdir %{tde_prefix}/%{_lib}
%define tde_datadir %{tde_prefix}/share %define tde_datadir %{tde_prefix}/share
%define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdeincludedir %{tde_includedir}/tde
%define _docdir %{tde_datadir}/doc %define _docdir %{tde_datadir}/doc
Name: trinity-libart-lgpl Name: trinity-libart-lgpl
Version: 2.3.22 Version: 2.3.22
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
Summary: Library of functions for 2D graphics - runtime files Summary: Library of functions for 2D graphics - runtime files
Group: System Environment/Libraries Group: System Environment/Libraries
License: LGPLv2+
Vendor: Trinity Project
URL: http://www.trinitydesktop.org/ URL: http://www.trinitydesktop.org/
Packager: Francois Andriot <francois.andriot@free.fr>
%if 0%{?suse_version}
License: LGPL-2.0+
%else
License: LGPLv2+
%endif
#Vendor: Trinity Project
#Packager: Francois Andriot <francois.andriot@free.fr>
Prefix: %{tde_prefix} Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -36,6 +55,8 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tqt3-devel >= 3.5.0 BuildRequires: trinity-tqt3-devel >= 3.5.0
BuildRequires: trinity-tqtinterface-devel >= %{tde_version} BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
BuildRequires: gcc-c++
%description %description
A library of functions for 2D graphics supporting a superset of the A library of functions for 2D graphics supporting a superset of the
PostScript imaging model, designed to be integrated with graphics, artwork, PostScript imaging model, designed to be integrated with graphics, artwork,
@ -45,10 +66,10 @@ especially suitable for embedded applications.
%post %post
/sbin/ldconfig /sbin/ldconfig || :
%postun %postun
/sbin/ldconfig /sbin/ldconfig || :
%files %files
%defattr(-,root,root,-) %defattr(-,root,root,-)
@ -70,10 +91,10 @@ compatible with C++. With a small footprint of 10,000 lines of code, it is
especially suitable for embedded applications. especially suitable for embedded applications.
%post devel %post devel
/sbin/ldconfig /sbin/ldconfig || :
%postun devel %postun devel
/sbin/ldconfig /sbin/ldconfig || :
%files devel %files devel
%defattr(-,root,root,-) %defattr(-,root,root,-)
@ -129,7 +150,7 @@ especially suitable for embedded applications.
########## ##########
%if 0%{?suse_version} || 0%{?pclinuxos} %if 0%{?pclinuxos}
%debug_package %debug_package
%endif %endif

@ -0,0 +1 @@
../../../ubuntu/trusty/dependencies/tqt3/debian/maintain/assistant-tqt3.desktop

@ -0,0 +1 @@
../../../ubuntu/trusty/dependencies/tqt3/debian/maintain/build-examples.sh

@ -0,0 +1 @@
../../../ubuntu/trusty/dependencies/tqt3/debian/maintain/designer-tqt3.desktop

@ -0,0 +1 @@
../../../ubuntu/trusty/dependencies/tqt3/debian/maintain/linguist-tqt3.desktop

@ -1,35 +0,0 @@
--- trinity-tqt3-14.0.0~pre193+a9ec6a15/src/kernel/ntqstyle.h.ORI 2014-05-04 12:49:48.579786273 -0400
+++ trinity-tqt3-14.0.0~pre193+a9ec6a15/src/kernel/ntqstyle.h 2014-05-04 12:50:00.948216121 -0400
@@ -287,6 +287,7 @@
TQ_UINT32 topLevelWidgetFlags;
TQPixmap paletteBgPixmap;
+/*
#ifdef ENABLE_TQSTYLECONTROLELEMENTDATA_SLOW_COPY
public:
TQStyleControlElementData(const TQStyleControlElementData&);
@@ -295,6 +296,7 @@
// Disable copy constructor
TQStyleControlElementData(const TQStyleControlElementData&);
#endif // ENABLE_TQSTYLECONTROLELEMENTDATA_SLOW_COPY
+*/
};
--- trinity-tqt3-14.0.0~pre193+a9ec6a15/src/kernel/qstyle.cpp.ORI 2014-05-04 12:50:38.499448860 -0400
+++ trinity-tqt3-14.0.0~pre193+a9ec6a15/src/kernel/qstyle.cpp 2014-05-04 12:50:49.766018474 -0400
@@ -2836,6 +2836,7 @@
//
}
+/*
TQStyleControlElementData::TQStyleControlElementData(const TQStyleControlElementData& orig) {
isNull = orig.isNull;
widgetObjectTypes = orig.widgetObjectTypes;
@@ -2898,5 +2899,6 @@
topLevelWidgetFlags = orig.topLevelWidgetFlags;
paletteBgPixmap = orig.paletteBgPixmap;
}
+*/
#endif // QT_NO_STYLE

File diff suppressed because it is too large Load Diff

@ -0,0 +1 @@
../../../ubuntu/trusty/dependencies/tqt3/debian/maintain/tqt3config.desktop

@ -1,31 +1,60 @@
# TDE specific building variables #
# spec file for package tqtinterface
#
# Copyright (c) 2014 François Andriot <francois.andriot@free.fr>
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
#
# Please submit bugfixes or comments via http:/www.trinitydesktop.org/
#
# TDE variables
%define tde_version 14.0.0 %define tde_version 14.0.0
%define tde_prefix /usr %define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin %define tde_bindir %{tde_prefix}/bin
%define tde_includedir %{tde_prefix}/include %define tde_includedir %{tde_prefix}/include
%define tde_libdir %{tde_prefix}/%{_lib} %define tde_libdir %{tde_prefix}/%{_lib}
%define cmake_modules_dir %{_datadir}/cmake/Modules %define cmake_modules_dir %{_datadir}/cmake/Modules
Name: trinity-tqtinterface Name: trinity-tqtinterface
Version: %{tde_version} Epoch: 1
Version: 4.2.0
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
License: GPL Summary: The Trinity Qt Interface Libraries
Summary: Trinity QT Interface Group: System/GUI/Other
Group: System Environment/Libraries
Vendor: Trinity Project
URL: http://www.trinitydesktop.org/ URL: http://www.trinitydesktop.org/
Packager: Francois Andriot <francois.andriot@free.fr>
Prefix: %{tde_prefix} %if 0%{?suse_version}
License: GPL-2.0+
%else
License: GPLv2+
%endif
#Vendor: Trinity Project
#Packager: Francois Andriot <francois.andriot@free.fr>
Prefix: /usr
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: cmake >= 2.8 Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tqt3-devel >= 3.5.0
Requires: trinity-tqt3 >= 3.5.0 BuildRequires: libtqt3-mt-devel >= 3.5.0
BuildRequires: tqt3-dev-tools >= 3.5.0
%if 0%{?suse_version} && 0%{?suse_version} < 1300
BuildRequires: trinity-cmake-macros
%endif
BuildRequires: cmake >= 2.8
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: pkgconfig
# PTHREAD support # PTHREAD support
%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} %if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
@ -46,76 +75,118 @@ BuildRequires: libXi-devel
BuildRequires: libXi6-devel BuildRequires: libXi6-devel
%endif %endif
Obsoletes: tqtinterface < %{version}-%{release} # MESA support
Provides: tqtinterface = %{version}-%{release} %if 0%{?rhel} || 0%{?fedora}
BuildRequires: mesa-libGL-devel
BuildRequires: mesa-libGLU-devel
%endif
%if 0%{?mdkversion} || 0%{?mgaversion}
BuildRequires: mesaglu-devel
%endif
%if 0%{?suse_version}
BuildRequires: Mesa-libGL-devel
BuildRequires: Mesa-libGLU-devel
%endif
%description %description
Trinity QT Interface The Trinity Qt Interface is a library that abstracts Qt from Trinity.
This allows the Trinity code to rapidly port from one version of Qt to another.
This is primarily accomplished by defining old functions in terms of new functions,
although some code has been added for useful functions that are no longer part of Qt.
%post ##########
/sbin/ldconfig || :
%postun %package -n libtqt4
/sbin/ldconfig || : Group: System/GUI/Other
Summary: The Trinity Qt Interface Libraries
Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: libtqt3-mt >= 3.5.0
%if 0%{?suse_version} && 0%{?suse_version} < 1300
Requires: trinity-cmake-macros
%endif
Obsoletes: trinity-tqtinterface < %{?epoch:%{epoch}:}%{version}-%{release}
Provides: trinity-tqtinterface = %{?epoch:%{epoch}:}%{version}-%{release}
%description -n libtqt4
The Trinity Qt Interface is a library that abstracts Qt from Trinity.
This allows the Trinity code to rapidly port from one version of Qt to another.
This is primarily accomplished by defining old functions in terms of new functions,
although some code has been added for useful functions that are no longer part of Qt.
%files %files -n libtqt4
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{tde_bindir}/convert_qt_tqt1 %{_libdir}/libtqt.so.4
%{tde_bindir}/convert_qt_tqt2 %{_libdir}/libtqt.so.4.2.0
%{tde_bindir}/convert_qt_tqt3
%{tde_bindir}/dcopidl-tqt %post -n libtqt4
%{tde_bindir}/dcopidl2cpp-tqt /sbin/ldconfig || :
%{tde_bindir}/dcopidlng-tqt
%{tde_bindir}/mcopidl-tqt %postun -n libtqt4
%{tde_bindir}/moc-tqt /sbin/ldconfig || :
%{tde_bindir}/tmoc
%{tde_bindir}/tqt-replace
%{tde_bindir}/tqt-replace-stream
%{tde_bindir}/uic-tqt
%{tde_libdir}/libtqt.so.4
%{tde_libdir}/libtqt.so.4.2.0
########## ##########
%package devel %package -n libtqt4-devel
Group: Development/Libraries Group: Development/Libraries
Summary: %{name} - Development files Summary: The Trinity Qt Interface Libraries (Development Files)
Requires: %{name} = %{version}-%{release} Requires: libtqt4 = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: trinity-tqt3-devel >= 3.5.0 Requires: libtqt3-mt-devel >= 3.5.0
Requires: tqt3-dev-tools >= 3.5.0
%if 0%{?suse_version} && 0%{?suse_version} < 1300
Requires: trinity-cmake-macros
%endif
Obsoletes: tqtinterface-devel < %{version}-%{release} Obsoletes: trinity-tqtinterface-devel < %{?epoch:%{epoch}:}%{version}-%{release}
Provides: tqtinterface-devel = %{version}-%{release} Provides: trinity-tqtinterface-devel = %{?epoch:%{epoch}:}%{version}-%{release}
%description devel %description -n libtqt4-devel
Development files for %{name} The Trinity Qt Interface is a library that abstracts Qt from Trinity.
This allows the Trinity code to rapidly port from one version of Qt to another.
This is primarily accomplished by defining old functions in terms of new functions,
although some code has been added for useful functions that are no longer part of Qt.
%post devel %post -n libtqt4-devel
/sbin/ldconfig || : /sbin/ldconfig || :
%postun devel %postun -n libtqt4-devel
/sbin/ldconfig || : /sbin/ldconfig || :
%files devel %files -n libtqt4-devel
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{tde_includedir}/tqt/ %{_bindir}/convert_qt_tqt1
%{tde_libdir}/libtqt.la %{_bindir}/convert_qt_tqt2
%{tde_libdir}/libtqt.so %{_bindir}/convert_qt_tqt3
%{tde_libdir}/pkgconfig/tqt.pc %{_bindir}/dcopidl-tqt
%{tde_libdir}/pkgconfig/tqtqui.pc %{_bindir}/dcopidl2cpp-tqt
%{_bindir}/dcopidlng-tqt
%{_bindir}/mcopidl-tqt
%{_bindir}/moc-tqt
%{_bindir}/tmoc
%{_bindir}/tqt-replace
%{_bindir}/tqt-replace-stream
%{_bindir}/uic-tqt
%{_includedir}/tqt/
%{_libdir}/libtqt.la
%{_libdir}/libtqt.so
%{_libdir}/pkgconfig/tqt.pc
%{_libdir}/pkgconfig/tqtqui.pc
%{cmake_modules_dir}/*.cmake %{cmake_modules_dir}/*.cmake
########## ##########
%if 0%{?suse_version} || 0%{?pclinuxos} %if 0%{?pclinuxos}
%debug_package %debug_package
%endif %endif
########## ##########
%prep %prep
%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%build %build
@ -135,17 +206,17 @@ fi
-DWITH_GCC_VISIBILITY=OFF \ -DWITH_GCC_VISIBILITY=OFF \
\ \
-DQTDIR="%{tde_datadir}/tqt3" \ -DQTDIR="%{tde_datadir}/tqt3" \
-DQT_INCLUDE_DIR="%{tde_includedir}/tqt3" \ -DQT_INCLUDE_DIR="%{_includedir}/tqt3" \
-DQT_LIBRARY_DIR="%{tde_libdir}" \ -DQT_LIBRARY_DIR="%{_libdir}" \
\ \
-DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \ -DCMAKE_INSTALL_PREFIX="%{_prefix}" \
-DPKGCONFIG_INSTALL_DIR="%{tde_libdir}/pkgconfig" \ -DPKGCONFIG_INSTALL_DIR="%{_libdir}/pkgconfig" \
-DINCLUDE_INSTALL_DIR=%{tde_includedir}/tqt \ -DINCLUDE_INSTALL_DIR=%{_includedir}/tqt \
-DLIB_INSTALL_DIR=%{tde_libdir} \ -DLIB_INSTALL_DIR=%{_libdir} \
-DBIN_INSTALL_DIR=%{tde_bindir} \ -DBIN_INSTALL_DIR=%{_bindir} \
\ \
-DCMAKE_LIBRARY_PATH="%{tde_libdir}" \ -DCMAKE_LIBRARY_PATH="%{_libdir}" \
-DCMAKE_INCLUDE_PATH="%{tde_includedir}" \ -DCMAKE_INCLUDE_PATH="%{_includedir}" \
\ \
-DWITH_QT3="ON" \ -DWITH_QT3="ON" \
-DBUILD_ALL="ON" \ -DBUILD_ALL="ON" \
@ -171,5 +242,5 @@ done
%changelog %changelog
* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1 * Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 1:4.2.0-1
- Initial release for TDE 14.0.0 - Initial release for TDE 14.0.0

@ -0,0 +1,40 @@
Name: trinity-cmake-macros
Version: 1.0
Release: 1%{?dist}
Summary: Rpmbuild macros for cmake utility
Group: Development/Utilities
License: GPL
URL: http://www.trinitydesktop.org/
Source0: macros.cmake
Requires: cmake
%description
This is the cmake macros for rpmbuild.
It was originally written for Fedora, but can be used on openSUSE too.
%prep
%build
%install
rm -rf $RPM_BUILD_ROOT
%__install -D -m 644 "%{SOURCE0}" %{?buildroot}%{_sysconfdir}/rpm/macros.cmake
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%{_sysconfdir}/rpm/macros.cmake
%changelog
* Mon Sep 29 2014 François Andriot <francois.andriot@free.fr> - 1.0-1
- Initial build for openSUSE

@ -80,6 +80,7 @@ libXaw-devel
libXcomposite-devel libXcomposite-devel
libXdamage-devel libXdamage-devel
libXdmcp-devel libXdmcp-devel
libXScrnSaver-devel
libXtst-devel libXtst-devel
libXv-devel libXv-devel
libXxf86dga-devel libXxf86dga-devel

@ -1,13 +1,32 @@
# Remove qt-devel and qt3-devel and any kde*-devel that may interfere !!! #
# spec file for package tdelibs
#
# Copyright (c) 2014 François Andriot <francois.andriot@free.fr>
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
#
# Please submit bugfixes or comments via http:/www.trinitydesktop.org/
#
# BUILD WARNING:
# Remove qt-devel and qt3-devel and any kde*-devel on your system !
# Having KDE libraries may cause FTBFS here !
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?tde_prefix}" != "/usr" %if "%{?tde_prefix}" != "/usr"
%define _variant .opt %define _variant .opt
%endif %endif
# TDE variables
%define tde_version 14.0.0 %define tde_version 14.0.0
%define tde_prefix /opt/trinity
# TDE specific variables
%define tde_bindir %{tde_prefix}/bin %define tde_bindir %{tde_prefix}/bin
%define tde_datadir %{tde_prefix}/share %define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc %define tde_docdir %{tde_datadir}/doc
@ -23,14 +42,19 @@
Name: trinity-tdelibs Name: trinity-tdelibs
Version: %{tde_version} Version: %{tde_version}
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
License: GPL
Summary: TDE Libraries Summary: TDE Libraries
Group: Environment/Libraries Group: System/GUI/Other
Vendor: Trinity Project
Packager: Francois Andriot <francois.andriot@free.fr>
URL: http://www.trinitydesktop.org/ URL: http://www.trinitydesktop.org/
%if 0%{?suse_version}
License: GPL-2.0+
%else
License: GPLv2+
%endif
#Vendor: Trinity Project
#Packager: Francois Andriot <francois.andriot@free.fr>
Prefix: %{tde_prefix} Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

@ -83,7 +83,7 @@ Requires: trinity-kxsldbg = %{version}-%{release}
########## ##########
%package -n trinity-quanta %package -n trinity-quanta
Summary: web development environment for KDE [Trinity] Summary: web development environment for TDE [Trinity]
Group: Applications/Development Group: Applications/Development
Requires: trinity-kfilereplace = %{version}-%{release} Requires: trinity-kfilereplace = %{version}-%{release}
Requires: trinity-klinkstatus = %{version}-%{release} Requires: trinity-klinkstatus = %{version}-%{release}
@ -100,7 +100,7 @@ to all markup languages, while supporting popular web-based scripting
languages, CSS and other emerging W3C recommendations. languages, CSS and other emerging W3C recommendations.
Quanta Plus supports many external components, debuggers and other tools Quanta Plus supports many external components, debuggers and other tools
for web development, several of which are shipped with the KDE web for web development, several of which are shipped with the TDE web
development module. development module.
Quanta Plus is not in any way affiliated with any commercial versions Quanta Plus is not in any way affiliated with any commercial versions
@ -163,11 +163,11 @@ This package is part of TDE, as a component of the TDE web development module.
########## ##########
%package -n trinity-kfilereplace %package -n trinity-kfilereplace
Summary: batch search-and-replace component for KDE [Trinity] Summary: batch search-and-replace component for TDE [Trinity]
Group: Applications/Development Group: Applications/Development
%description -n trinity-kfilereplace %description -n trinity-kfilereplace
KFileReplace is an embedded component for KDE that acts as a batch KFileReplace is an embedded component for TDE that acts as a batch
search-and-replace tool. It allows you to replace one expression with search-and-replace tool. It allows you to replace one expression with
another in many files at once. another in many files at once.
@ -206,7 +206,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
########## ##########
%package -n trinity-kimagemapeditor %package -n trinity-kimagemapeditor
Summary: HTML image map editor for KDE [Trinity] Summary: HTML image map editor for TDE [Trinity]
Group: Applications/Development Group: Applications/Development
%description -n trinity-kimagemapeditor %description -n trinity-kimagemapeditor
@ -244,11 +244,11 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
########## ##########
%package -n trinity-klinkstatus %package -n trinity-klinkstatus
Summary: web link validity checker for KDE [Trinity] Summary: web link validity checker for TDE [Trinity]
Group: Applications/Development Group: Applications/Development
%description -n trinity-klinkstatus %description -n trinity-klinkstatus
KLinkStatus is KDE's web link validity checker. It allows you to KLinkStatus is TDE's web link validity checker. It allows you to
search internal and external links throughout your web site. Simply search internal and external links throughout your web site. Simply
point it to a single page and choose the depth to search. point it to a single page and choose the depth to search.
@ -396,13 +396,13 @@ This package is part of TDE, as a component of the TDE web development module.
########## ##########
%package -n trinity-kxsldbg %package -n trinity-kxsldbg
Summary: graphical XSLT debugger for KDE [Trinity] Summary: graphical XSLT debugger for TDE [Trinity]
Group: Applications/Development Group: Applications/Development
%description -n trinity-kxsldbg %description -n trinity-kxsldbg
KXSLDbg is a debugger for XSLT scripts. It includes a graphical user KXSLDbg is a debugger for XSLT scripts. It includes a graphical user
interface as well as a text-based debugger. KXSLDbg can be run as a interface as well as a text-based debugger. KXSLDbg can be run as a
standalone application or as an embedded KDE part. standalone application or as an embedded TDE part.
XSLT is an XML language for defining transformations of XML files from XSLT is an XML language for defining transformations of XML files from
XML to some other arbitrary format, such as XML, HTML, plain text, etc., XML to some other arbitrary format, such as XML, HTML, plain text, etc.,
@ -496,8 +496,8 @@ unset QTDIR || : ; source /etc/profile.d/qt3.sh
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
# Do not build against any "/usr" installed KDE # Do not build against any "/usr" installed TDE
export KDEDIR=%{tde_prefix} export TDEDIR=%{tde_prefix}
# Specific path for RHEL4 # Specific path for RHEL4
if [ -d /usr/X11R6 ]; then if [ -d /usr/X11R6 ]; then

@ -85,7 +85,7 @@ Requires: trinity-kxsldbg = %{version}-%{release}
########## ##########
%package -n trinity-quanta %package -n trinity-quanta
Summary: web development environment for KDE [Trinity] Summary: web development environment for TDE [Trinity]
Group: Applications/Development Group: Applications/Development
Requires: trinity-kfilereplace = %{version}-%{release} Requires: trinity-kfilereplace = %{version}-%{release}
Requires: trinity-klinkstatus = %{version}-%{release} Requires: trinity-klinkstatus = %{version}-%{release}
@ -102,7 +102,7 @@ to all markup languages, while supporting popular web-based scripting
languages, CSS and other emerging W3C recommendations. languages, CSS and other emerging W3C recommendations.
Quanta Plus supports many external components, debuggers and other tools Quanta Plus supports many external components, debuggers and other tools
for web development, several of which are shipped with the KDE web for web development, several of which are shipped with the TDE web
development module. development module.
Quanta Plus is not in any way affiliated with any commercial versions Quanta Plus is not in any way affiliated with any commercial versions
@ -165,11 +165,11 @@ This package is part of TDE, as a component of the TDE web development module.
########## ##########
%package -n trinity-kfilereplace %package -n trinity-kfilereplace
Summary: batch search-and-replace component for KDE [Trinity] Summary: batch search-and-replace component for TDE [Trinity]
Group: Applications/Development Group: Applications/Development
%description -n trinity-kfilereplace %description -n trinity-kfilereplace
KFileReplace is an embedded component for KDE that acts as a batch KFileReplace is an embedded component for TDE that acts as a batch
search-and-replace tool. It allows you to replace one expression with search-and-replace tool. It allows you to replace one expression with
another in many files at once. another in many files at once.
@ -208,7 +208,7 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
########## ##########
%package -n trinity-kimagemapeditor %package -n trinity-kimagemapeditor
Summary: HTML image map editor for KDE [Trinity] Summary: HTML image map editor for TDE [Trinity]
Group: Applications/Development Group: Applications/Development
%description -n trinity-kimagemapeditor %description -n trinity-kimagemapeditor
@ -246,11 +246,11 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
########## ##########
%package -n trinity-klinkstatus %package -n trinity-klinkstatus
Summary: web link validity checker for KDE [Trinity] Summary: web link validity checker for TDE [Trinity]
Group: Applications/Development Group: Applications/Development
%description -n trinity-klinkstatus %description -n trinity-klinkstatus
KLinkStatus is KDE's web link validity checker. It allows you to KLinkStatus is TDE's web link validity checker. It allows you to
search internal and external links throughout your web site. Simply search internal and external links throughout your web site. Simply
point it to a single page and choose the depth to search. point it to a single page and choose the depth to search.
@ -398,13 +398,13 @@ This package is part of TDE, as a component of the TDE web development module.
########## ##########
%package -n trinity-kxsldbg %package -n trinity-kxsldbg
Summary: graphical XSLT debugger for KDE [Trinity] Summary: graphical XSLT debugger for TDE [Trinity]
Group: Applications/Development Group: Applications/Development
%description -n trinity-kxsldbg %description -n trinity-kxsldbg
KXSLDbg is a debugger for XSLT scripts. It includes a graphical user KXSLDbg is a debugger for XSLT scripts. It includes a graphical user
interface as well as a text-based debugger. KXSLDbg can be run as a interface as well as a text-based debugger. KXSLDbg can be run as a
standalone application or as an embedded KDE part. standalone application or as an embedded TDE part.
XSLT is an XML language for defining transformations of XML files from XSLT is an XML language for defining transformations of XML files from
XML to some other arbitrary format, such as XML, HTML, plain text, etc., XML to some other arbitrary format, such as XML, HTML, plain text, etc.,

@ -90,7 +90,7 @@ Requires: trinity-kommander = %{version}-%{release}
########## ##########
%package -n trinity-quanta %package -n trinity-quanta
Summary: web development environment for KDE [Trinity] Summary: web development environment for TDE [Trinity]
Group: Applications/Development Group: Applications/Development
Requires: trinity-tdefilereplace = %{version}-%{release} Requires: trinity-tdefilereplace = %{version}-%{release}
Requires: trinity-klinkstatus = %{version}-%{release} Requires: trinity-klinkstatus = %{version}-%{release}
@ -107,7 +107,7 @@ to all markup languages, while supporting popular web-based scripting
languages, CSS and other emerging W3C recommendations. languages, CSS and other emerging W3C recommendations.
Quanta Plus supports many external components, debuggers and other tools Quanta Plus supports many external components, debuggers and other tools
for web development, several of which are shipped with the KDE web for web development, several of which are shipped with the TDE web
development module. development module.
Quanta Plus is not in any way affiliated with any commercial versions Quanta Plus is not in any way affiliated with any commercial versions
@ -170,14 +170,14 @@ This package is part of TDE, as a component of the TDE web development module.
########## ##########
%package -n trinity-tdefilereplace %package -n trinity-tdefilereplace
Summary: batch search-and-replace component for KDE [Trinity] Summary: batch search-and-replace component for TDE [Trinity]
Group: Applications/Development Group: Applications/Development
Obsoletes: trinity-kfilereplace < %{version}-%{release} Obsoletes: trinity-kfilereplace < %{version}-%{release}
Provides: trinity-kfilereplace = %{version}-%{release} Provides: trinity-kfilereplace = %{version}-%{release}
%description -n trinity-tdefilereplace %description -n trinity-tdefilereplace
tdefileReplace is an embedded component for KDE that acts as a batch tdefileReplace is an embedded component for TDE that acts as a batch
search-and-replace tool. It allows you to replace one expression with search-and-replace tool. It allows you to replace one expression with
another in many files at once. another in many files at once.
@ -259,7 +259,7 @@ Summary: web link validity checker for TDE
Group: Applications/Development Group: Applications/Development
%description -n trinity-klinkstatus %description -n trinity-klinkstatus
KLinkStatus is KDE's web link validity checker. It allows you to KLinkStatus is TDE's web link validity checker. It allows you to
search internal and external links throughout your web site. Simply search internal and external links throughout your web site. Simply
point it to a single page and choose the depth to search. point it to a single page and choose the depth to search.
@ -408,13 +408,13 @@ This package is part of TDE, as a component of the TDE web development module.
%if 0%{?build_kxsldbg} %if 0%{?build_kxsldbg}
%package -n trinity-kxsldbg %package -n trinity-kxsldbg
Summary: graphical XSLT debugger for KDE [Trinity] Summary: graphical XSLT debugger for TDE [Trinity]
Group: Applications/Development Group: Applications/Development
%description -n trinity-kxsldbg %description -n trinity-kxsldbg
KXSLDbg is a debugger for XSLT scripts. It includes a graphical user KXSLDbg is a debugger for XSLT scripts. It includes a graphical user
interface as well as a text-based debugger. KXSLDbg can be run as a interface as well as a text-based debugger. KXSLDbg can be run as a
standalone application or as an embedded KDE part. standalone application or as an embedded TDE part.
XSLT is an XML language for defining transformations of XML files from XSLT is an XML language for defining transformations of XML files from
XML to some other arbitrary format, such as XML, HTML, plain text, etc., XML to some other arbitrary format, such as XML, HTML, plain text, etc.,

@ -88,7 +88,7 @@ Requires: trinity-kommander = %{version}-%{release}
########## ##########
%package -n trinity-quanta %package -n trinity-quanta
Summary: web development environment for KDE [Trinity] Summary: web development environment for TDE [Trinity]
Group: Applications/Development Group: Applications/Development
Requires: trinity-kfilereplace = %{version}-%{release} Requires: trinity-kfilereplace = %{version}-%{release}
Requires: trinity-klinkstatus = %{version}-%{release} Requires: trinity-klinkstatus = %{version}-%{release}
@ -105,7 +105,7 @@ to all markup languages, while supporting popular web-based scripting
languages, CSS and other emerging W3C recommendations. languages, CSS and other emerging W3C recommendations.
Quanta Plus supports many external components, debuggers and other tools Quanta Plus supports many external components, debuggers and other tools
for web development, several of which are shipped with the KDE web for web development, several of which are shipped with the TDE web
development module. development module.
Quanta Plus is not in any way affiliated with any commercial versions Quanta Plus is not in any way affiliated with any commercial versions
@ -168,11 +168,11 @@ This package is part of TDE, as a component of the TDE web development module.
########## ##########
%package -n trinity-kfilereplace %package -n trinity-kfilereplace
Summary: batch search-and-replace component for KDE [Trinity] Summary: batch search-and-replace component for TDE [Trinity]
Group: Applications/Development Group: Applications/Development
%description -n trinity-kfilereplace %description -n trinity-kfilereplace
KFileReplace is an embedded component for KDE that acts as a batch KFileReplace is an embedded component for TDE that acts as a batch
search-and-replace tool. It allows you to replace one expression with search-and-replace tool. It allows you to replace one expression with
another in many files at once. another in many files at once.
@ -211,7 +211,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
########## ##########
%package -n trinity-kimagemapeditor %package -n trinity-kimagemapeditor
Summary: HTML image map editor for KDE [Trinity] Summary: HTML image map editor for TDE [Trinity]
Group: Applications/Development Group: Applications/Development
%description -n trinity-kimagemapeditor %description -n trinity-kimagemapeditor
@ -249,11 +249,11 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
########## ##########
%package -n trinity-klinkstatus %package -n trinity-klinkstatus
Summary: web link validity checker for KDE [Trinity] Summary: web link validity checker for TDE [Trinity]
Group: Applications/Development Group: Applications/Development
%description -n trinity-klinkstatus %description -n trinity-klinkstatus
KLinkStatus is KDE's web link validity checker. It allows you to KLinkStatus is TDE's web link validity checker. It allows you to
search internal and external links throughout your web site. Simply search internal and external links throughout your web site. Simply
point it to a single page and choose the depth to search. point it to a single page and choose the depth to search.
@ -402,13 +402,13 @@ This package is part of TDE, as a component of the TDE web development module.
%if 0%{?build_kxsldbg} %if 0%{?build_kxsldbg}
%package -n trinity-kxsldbg %package -n trinity-kxsldbg
Summary: graphical XSLT debugger for KDE [Trinity] Summary: graphical XSLT debugger for TDE [Trinity]
Group: Applications/Development Group: Applications/Development
%description -n trinity-kxsldbg %description -n trinity-kxsldbg
KXSLDbg is a debugger for XSLT scripts. It includes a graphical user KXSLDbg is a debugger for XSLT scripts. It includes a graphical user
interface as well as a text-based debugger. KXSLDbg can be run as a interface as well as a text-based debugger. KXSLDbg can be run as a
standalone application or as an embedded KDE part. standalone application or as an embedded TDE part.
XSLT is an XML language for defining transformations of XML files from XSLT is an XML language for defining transformations of XML files from
XML to some other arbitrary format, such as XML, HTML, plain text, etc., XML to some other arbitrary format, such as XML, HTML, plain text, etc.,
@ -501,8 +501,8 @@ unset QTDIR || : ; source /etc/profile.d/qt3.sh
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
# Do not build against any "/usr" installed KDE # Do not build against any "/usr" installed TDE
export KDEDIR="%{tde_prefix}" export TDEDIR="%{tde_prefix}"
# Specific path for RHEL4 # Specific path for RHEL4
if [ -d "/usr/X11R6" ]; then if [ -d "/usr/X11R6" ]; then

@ -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 if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
export EXTRACTRC PREPARETIPS export EXTRACTRC PREPARETIPS
+kdepotpath=/usr/include/tde/kde.pot +kdepotpath=/usr/include/tde/tde.pot
+ +
for subdir in $dirs; do for subdir in $dirs; do
test -z "$VERBOSE" || echo "Making messages in $subdir" test -z "$VERBOSE" || echo "Making messages in $subdir"
@ -14,7 +14,7 @@ diff -Nur keep-0.4.0/admin/cvs.sh keep-0.4.0.new/admin/cvs.sh
fi 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 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:-`tde-config --expandvars --install include`}/kde.pot - kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
if ! test -f $kdepotpath; then if ! test -f $kdepotpath; then
kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
fi fi

@ -3,9 +3,8 @@ Section: tde
Priority: optional Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Harald Sitter <apachelogger@ubuntu.com> XSBC-Original-Maintainer: Harald Sitter <apachelogger@ubuntu.com>
Build-Depends: cdbs, debhelper (>= 5), tdenetwork-trinity-dev, libotr2-dev (>= 3.0.0), automake, autoconf, libtool, libltdl-dev Build-Depends: cdbs, debhelper (>= 5), tdenetwork-trinity-dev, libotr5-dev | libotr2-dev (>= 3.0.0), automake, autoconf, libtool, libltdl-dev
Standards-Version: 3.8.4 Standards-Version: 3.8.4
Homepage: http://kopete-otr.follefuder.org/
Package: kopete-otr-trinity Package: kopete-otr-trinity
Architecture: any Architecture: any

@ -1,6 +1,9 @@
#!/usr/bin/make -f #!/usr/bin/make -f
DEB_PYTHON_SYSTEM = pysupport DEB_PYTHON_SYSTEM = pysupport
PYSUPPORT_INST_PATH = /opt/trinity/share/python-support
GUIDANCE_INST_PATH = $(PYSUPPORT_INST_PATH)/tde-guidance-trinity
export EXTRA_MODULE_DIR=$(GUIDANCE_INST_PATH)
include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/debhelper.mk
#include /usr/share/cdbs/1/class/python-distutils.mk #include /usr/share/cdbs/1/class/python-distutils.mk
@ -11,7 +14,7 @@ include /usr/share/cdbs/1/rules/utils.mk
DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp
DEB_UPDATE_RCD_PARAMS := multiuser DEB_UPDATE_RCD_PARAMS := multiuser
DEB_INSTALL_MANPAGES_tde-guidance-trinity := debian/mountconfig-trinity.1 debian/serviceconfig-trinity.1 debian/userconfig-trinity.1 DEB_INSTALL_MANPAGES_tde-guidance-trinity := debian/mountconfig-trinity.1 debian/serviceconfig-trinity.1 debian/userconfig-trinity.1
PYSUPPORT_PATH = $(DEB_DESTDIR)/opt/trinity/share/python-support PYSUPPORT_PATH = $(DEB_DESTDIR)$(PYSUPPORT_INST_PATH)
DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde 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 LDFLAGS_APPEND := -L/opt/trinity/lib
@ -43,11 +46,11 @@ install/tde-guidance-trinity::
# fix the link properly # fix the link properly
mkdir -p debian/tde-guidance-trinity/opt/trinity/bin mkdir -p debian/tde-guidance-trinity/opt/trinity/bin
(cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /opt/trinity/share/python-support/tde-guidance-trinity/mountconfig.py mountconfig) (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf $(GUIDANCE_INST_PATH)/mountconfig.py mountconfig)
(cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /opt/trinity/share/python-support/tde-guidance-trinity/serviceconfig.py serviceconfig) (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf $(GUIDANCE_INST_PATH)/serviceconfig.py serviceconfig)
(cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /opt/trinity/share/python-support/tde-guidance-trinity/userconfig.py userconfig) (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf $(GUIDANCE_INST_PATH)/userconfig.py userconfig)
(cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /opt/trinity/share/python-support/tde-guidance-trinity/wineconfig.py wineconfig) (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf $(GUIDANCE_INST_PATH)/wineconfig.py wineconfig)
# (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /opt/trinity/share/python-support/tde-guidance-trinity/grubconfig.py grubconfig) # (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf $(GUIDANCE_INST_PATH)/grubconfig.py grubconfig)
# move python modules in PYSUPPORT_PATH # move python modules in PYSUPPORT_PATH
mkdir -p $(PYSUPPORT_PATH)/tde-guidance-trinity mkdir -p $(PYSUPPORT_PATH)/tde-guidance-trinity
@ -87,51 +90,6 @@ install/guidance-backends-trinity::
cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/wineread.py $(PYSUPPORT_PATH)/guidance-backends-trinity cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/wineread.py $(PYSUPPORT_PATH)/guidance-backends-trinity
cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/winewrite.py $(PYSUPPORT_PATH)/guidance-backends-trinity cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/winewrite.py $(PYSUPPORT_PATH)/guidance-backends-trinity
install/tde-guidance-powermanager-trinity::
# install icon to right place
install -D -p -m0644 kde/powermanager/pics/battery-charging-100.png \
$(DEB_DESTDIR)/opt/trinity/share/icons/hicolor/22x22/apps/power-manager.png
install -D -p -m0644 kde/powermanager/pics/*.png \
$(DEB_DESTDIR)/opt/trinity/share/apps/guidance/pics/
# install desktop file
install -D -p -m0644 powermanager/guidance-power-manager.desktop \
$(DEB_DESTDIR)/opt/trinity/share/autostart/guidance-power-manager.desktop
# copy python modules in PYSUPPORT_PATH
mkdir -p $(PYSUPPORT_PATH)/tde-guidance-powermanager-trinity
cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/MicroHAL.py $(PYSUPPORT_PATH)/guidance-backends-trinity
cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/guidance-power-manager.py $(PYSUPPORT_PATH)/tde-guidance-powermanager-trinity
cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/powermanage.py $(PYSUPPORT_PATH)/tde-guidance-powermanager-trinity
cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/gpmhelper.py $(PYSUPPORT_PATH)/tde-guidance-powermanager-trinity
cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/powermanager_ui.py $(PYSUPPORT_PATH)/tde-guidance-powermanager-trinity
cp powermanager/guidance_power_manager_ui.py $(PYSUPPORT_PATH)/tde-guidance-powermanager-trinity
cp powermanager/notify.py $(PYSUPPORT_PATH)/tde-guidance-powermanager-trinity
cp powermanager/tooltip.py $(PYSUPPORT_PATH)/tde-guidance-powermanager-trinity
# generate guidance-power-manager script
echo "#!/bin/sh" > $(DEB_DESTDIR)/opt/trinity/bin/guidance-power-manager
echo "/opt/trinity/share/python-support/tde-guidance-powermanager-trinity/guidance-power-manager.py &" >> $(DEB_DESTDIR)/opt/trinity/bin/guidance-power-manager
chmod +x $(DEB_DESTDIR)/opt/trinity/bin/guidance-power-manager
# fix script-not-executable
chmod 0755 $(PYSUPPORT_PATH)/tde-guidance-powermanager-trinity/powermanage.py
chmod 0755 $(PYSUPPORT_PATH)/tde-guidance-powermanager-trinity/gpmhelper.py
: # Replace all '#!' calls to python with /usr/bin/python
: # and make them executable
for i in `find debian/tde-guidance-powermanager-trinity -type f`; do \
sed '1s,#!.*python[^ ]*\(.*\),#! /usr/bin/python\1,' \
$$i > $$i.temp; \
if cmp --quiet $$i $$i.temp; then \
rm -f $$i.temp; \
else \
mv -f $$i.temp $$i; \
chmod 755 $$i; \
echo "fixed interpreter: $$i"; \
fi; \
done
clean:: clean::
rm -rf build rm -rf build
@ -155,9 +113,6 @@ clean::
common-install-prehook-impl:: common-install-prehook-impl::
# generate form implementation using pytde user interface compiler # generate form implementation using pytde user interface compiler
(cd powermanager; /opt/trinity/bin/tdepyuic --usetdei18n guidance_power_manager_ui.ui)
(cd powermanager; /opt/trinity/bin/tdepyuic --usetdei18n tooltip.ui)
(cd powermanager; /opt/trinity/bin/tdepyuic --usetdei18n notify.ui)
mkdir -p po mkdir -p po
touch list touch list
@ -190,4 +145,3 @@ common-install-prehook-impl::
fi fi
rm -f tde-guidance-trinity/usr/share/python-support/tde-guidance-trinity/.version rm -f tde-guidance-trinity/usr/share/python-support/tde-guidance-trinity/.version
rm -f tde-guidance-trinity/usr/share/python-support/tde-guidance-powermanager-trinity/.version

@ -1,7 +1,7 @@
opt/trinity/lib/trinity/kcm_serviceconfig.la opt/trinity/lib/ opt/trinity/lib/trinity/kcm_serviceconfig.la
opt/trinity/lib/trinity/kcm_userconfig.la opt/trinity/lib/ opt/trinity/lib/trinity/kcm_userconfig.la
opt/trinity/lib/trinity/kcm_mountconfig.la opt/trinity/lib/ opt/trinity/lib/trinity/kcm_mountconfig.la
opt/trinity/lib/trinity/kcm_wineconfig.la opt/trinity/lib/ opt/trinity/lib/trinity/kcm_wineconfig.la
opt/trinity/share/icons/crystalsvg/32x32/apps/daemons.png opt/trinity/share/icons/crystalsvg/32x32/apps/daemons.png
opt/trinity/share/icons/crystalsvg/32x32/apps/disksfilesystems.png opt/trinity/share/icons/crystalsvg/32x32/apps/disksfilesystems.png
opt/trinity/share/icons/crystalsvg/32x32/apps/userconfig.png opt/trinity/share/icons/crystalsvg/32x32/apps/userconfig.png
@ -57,8 +57,8 @@ opt/trinity/share/python-support/tde-guidance-trinity/sizeview.py
opt/trinity/share/python-support/tde-guidance-trinity/unixauthdb.py opt/trinity/share/python-support/tde-guidance-trinity/unixauthdb.py
opt/trinity/share/python-support/tde-guidance-trinity/userconfig.py opt/trinity/share/python-support/tde-guidance-trinity/userconfig.py
opt/trinity/share/python-support/tde-guidance-trinity/wineconfig.py opt/trinity/share/python-support/tde-guidance-trinity/wineconfig.py
opt/trinity/lib/trinity/kcm_serviceconfig.so opt/trinity/lib/ opt/trinity/lib/trinity/kcm_serviceconfig.so
opt/trinity/lib/trinity/kcm_userconfig.so opt/trinity/lib/ opt/trinity/lib/trinity/kcm_userconfig.so
opt/trinity/lib/trinity/kcm_mountconfig.so opt/trinity/lib/ opt/trinity/lib/trinity/kcm_mountconfig.so
opt/trinity/lib/trinity/kcm_wineconfig.so opt/trinity/lib/ opt/trinity/lib/trinity/kcm_wineconfig.so
usr/share/lintian/overrides/tde-guidance-trinity usr/share/lintian/overrides/tde-guidance-trinity

@ -52,6 +52,7 @@ build-%/configure-stamp:
cd build-$* && echo yes \ cd build-$* && echo yes \
| python$* ../configure.py \ | python$* ../configure.py \
-c -n /usr/include/tqscintilla \ -c -n /usr/include/tqscintilla \
-e python$* \
-o /usr/lib -u -j $(SPLIT) \ -o /usr/lib -u -j $(SPLIT) \
-d /usr/lib/python$*/$(call py_sitename,$*)/python_tqt \ -d /usr/lib/python$*/$(call py_sitename,$*)/python_tqt \
-l /usr/include/python$* \ -l /usr/include/python$* \
@ -66,6 +67,7 @@ dbg-build-%/configure-stamp:
cd dbg-build-$* && echo yes \ cd dbg-build-$* && echo yes \
| python$*-dbg ../configure.py \ | python$*-dbg ../configure.py \
-c -n /usr/include/tqscintilla \ -c -n /usr/include/tqscintilla \
-e python$* \
-o /usr/lib -u -j $(SPLIT) \ -o /usr/lib -u -j $(SPLIT) \
-d /usr/lib/python$*/$(call py_sitename,$*)/python_tqt \ -d /usr/lib/python$*/$(call py_sitename,$*)/python_tqt \
-l /usr/include/python$*_d \ -l /usr/include/python$*_d \

@ -41,6 +41,7 @@ build-%/configure-stamp:
cd build-$* \ cd build-$* \
&& python$* ../configure.py \ && python$* ../configure.py \
-d /usr/lib/python$*/$(call py_sitename,$*)/sip4_tqt \ -d /usr/lib/python$*/$(call py_sitename,$*)/sip4_tqt \
-g python$* \
-u STRIP="" CFLAGS="${CFLAGS} -I/usr/include/tqt -I/usr/include/tqt3 -I/usr/include/qt3" CFLAGS_RELEASE="" CXXFLAGS="${CFLAGS} -I/usr/include/tqt -I/usr/include/tqt3 -I/usr/include/qt3" CXXFLAGS_RELEASE="" -u STRIP="" CFLAGS="${CFLAGS} -I/usr/include/tqt -I/usr/include/tqt3 -I/usr/include/qt3" CFLAGS_RELEASE="" CXXFLAGS="${CFLAGS} -I/usr/include/tqt -I/usr/include/tqt3 -I/usr/include/qt3" CXXFLAGS_RELEASE=""
touch $@ touch $@
@ -50,6 +51,7 @@ dbg-build-%/configure-stamp:
cd dbg-build-$* \ cd dbg-build-$* \
&& python$*-dbg ../configure.py \ && python$*-dbg ../configure.py \
-d /usr/lib/python$*/$(call py_sitename,$*)/sip4_tqt \ -d /usr/lib/python$*/$(call py_sitename,$*)/sip4_tqt \
-g python$* \
-e /usr/include/python$*_d \ -e /usr/include/python$*_d \
-u CFLAGS="-O0 -g -I/usr/include/tqt -I/usr/include/tqt3 -I/usr/include/qt3" CFLAGS_RELEASE="" CXXFLAGS="-O0 -g -I/usr/include/tqt -I/usr/include/tqt3 -I/usr/include/qt3" CXXFLAGS_RELEASE="" STRIP="" -u CFLAGS="-O0 -g -I/usr/include/tqt -I/usr/include/tqt3 -I/usr/include/qt3" CFLAGS_RELEASE="" CXXFLAGS="-O0 -g -I/usr/include/tqt -I/usr/include/tqt3 -I/usr/include/qt3" CXXFLAGS_RELEASE="" STRIP=""
touch $@ touch $@

@ -48,6 +48,7 @@ build-%/configure-stamp:
mkdir -p build-$* mkdir -p build-$*
cd build-$* && python$* ../configure.py \ cd build-$* && python$* ../configure.py \
-c -u -k /opt/trinity -o /opt/trinity/include -n /opt/trinity/lib \ -c -u -k /opt/trinity -o /opt/trinity/include -n /opt/trinity/lib \
-e python$* \
-v /opt/trinity/share/sip/trinity -j $(SPLIT) -v /opt/trinity/share/sip/trinity -j $(SPLIT)
touch $@ touch $@
@ -56,6 +57,7 @@ dbg-build-%/configure-stamp:
mkdir -p dbg-build-$* mkdir -p dbg-build-$*
cd dbg-build-$* && python$*-dbg ../configure.py \ cd dbg-build-$* && python$*-dbg ../configure.py \
-c -u -k /opt/trinity -o /opt/trinity/include -n /opt/trinity/lib \ -c -u -k /opt/trinity -o /opt/trinity/include -n /opt/trinity/lib \
-e python$* \
-v /opt/trinity/share/sip/trinity -j $(SPLIT) -v /opt/trinity/share/sip/trinity -j $(SPLIT)
touch $@ touch $@

@ -4,7 +4,7 @@
if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
export EXTRACTRC PREPARETIPS export EXTRACTRC PREPARETIPS
+kdepotpath=/opt/trinity/include/tde/kde.pot +kdepotpath=/opt/trinity/include/tde/tde.pot
+ +
for subdir in $dirs; do for subdir in $dirs; do
test -z "$VERBOSE" || echo "Making messages in $subdir" test -z "$VERBOSE" || echo "Making messages in $subdir"
@ -13,13 +13,13 @@
fi 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 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:-`tde-config --expandvars --install include`}/kde.pot - kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
- if ! test -f $kdepotpath; then - if ! test -f $kdepotpath; then
- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot - kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
- fi - fi
+# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
+# if ! test -f $kdepotpath; then +# if ! test -f $kdepotpath; then
+# kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot +# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
+# fi +# fi
$MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \

@ -4,7 +4,7 @@
if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
export EXTRACTRC PREPARETIPS export EXTRACTRC PREPARETIPS
+kdepotpath=/opt/trinity/include/tde/kde.pot +kdepotpath=/opt/trinity/include/tde/tde.pot
+ +
for subdir in $dirs; do for subdir in $dirs; do
test -z "$VERBOSE" || echo "Making messages in $subdir" test -z "$VERBOSE" || echo "Making messages in $subdir"
@ -13,13 +13,13 @@
fi 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 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:-`tde-config --expandvars --install include`}/kde.pot - kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
- if ! test -f $kdepotpath; then - if ! test -f $kdepotpath; then
- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot - kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
- fi - fi
+# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
+# if ! test -f $kdepotpath; then +# if ! test -f $kdepotpath; then
+# kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot +# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
+# fi +# fi
$MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \

@ -4,7 +4,7 @@
if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
export EXTRACTRC PREPARETIPS export EXTRACTRC PREPARETIPS
+kdepotpath=/opt/trinity/include/tde/kde.pot +kdepotpath=/opt/trinity/include/tde/tde.pot
+ +
for subdir in $dirs; do for subdir in $dirs; do
test -z "$VERBOSE" || echo "Making messages in $subdir" test -z "$VERBOSE" || echo "Making messages in $subdir"
@ -13,13 +13,13 @@
fi 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 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:-`tde-config --expandvars --install include`}/kde.pot - kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
- if ! test -f $kdepotpath; then - if ! test -f $kdepotpath; then
- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot - kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
- fi - fi
+# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
+# if ! test -f $kdepotpath; then +# if ! test -f $kdepotpath; then
+# kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot +# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
+# fi +# fi
$MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \

@ -4,7 +4,7 @@
if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
export EXTRACTRC PREPARETIPS export EXTRACTRC PREPARETIPS
+kdepotpath=/opt/trinity/include/tde/kde.pot +kdepotpath=/opt/trinity/include/tde/tde.pot
+ +
for subdir in $dirs; do for subdir in $dirs; do
test -z "$VERBOSE" || echo "Making messages in $subdir" test -z "$VERBOSE" || echo "Making messages in $subdir"
@ -13,13 +13,13 @@
fi 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 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:-`tde-config --expandvars --install include`}/kde.pot - kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
- if ! test -f $kdepotpath; then - if ! test -f $kdepotpath; then
- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot - kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
- fi - fi
+# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
+# if ! test -f $kdepotpath; then +# if ! test -f $kdepotpath; then
+# kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot +# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
+# fi +# fi
$MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \

@ -4,7 +4,7 @@
if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
export EXTRACTRC PREPARETIPS export EXTRACTRC PREPARETIPS
+kdepotpath=/opt/trinity/include/tde/kde.pot +kdepotpath=/opt/trinity/include/tde/tde.pot
+ +
for subdir in $dirs; do for subdir in $dirs; do
test -z "$VERBOSE" || echo "Making messages in $subdir" test -z "$VERBOSE" || echo "Making messages in $subdir"
@ -13,13 +13,13 @@
fi 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 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:-`tde-config --expandvars --install include`}/kde.pot - kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
- if ! test -f $kdepotpath; then - if ! test -f $kdepotpath; then
- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot - kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
- fi - fi
+# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
+# if ! test -f $kdepotpath; then +# if ! test -f $kdepotpath; then
+# kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot +# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
+# fi +# fi
$MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \

@ -4,7 +4,7 @@
if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
export EXTRACTRC PREPARETIPS export EXTRACTRC PREPARETIPS
+kdepotpath=/opt/trinity/include/tde/kde.pot +kdepotpath=/opt/trinity/include/tde/tde.pot
+ +
for subdir in $dirs; do for subdir in $dirs; do
test -z "$VERBOSE" || echo "Making messages in $subdir" test -z "$VERBOSE" || echo "Making messages in $subdir"
@ -13,13 +13,13 @@
fi 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 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:-`tde-config --expandvars --install include`}/kde.pot - kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
- if ! test -f $kdepotpath; then - if ! test -f $kdepotpath; then
- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot - kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
- fi - fi
+# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
+# if ! test -f $kdepotpath; then +# if ! test -f $kdepotpath; then
+# kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot +# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
+# fi +# fi
$MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \

@ -4,7 +4,7 @@
if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
export EXTRACTRC PREPARETIPS export EXTRACTRC PREPARETIPS
+kdepotpath=/opt/trinity/include/tde/kde.pot +kdepotpath=/opt/trinity/include/tde/tde.pot
+ +
for subdir in $dirs; do for subdir in $dirs; do
test -z "$VERBOSE" || echo "Making messages in $subdir" test -z "$VERBOSE" || echo "Making messages in $subdir"
@ -13,13 +13,13 @@
fi 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 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:-`tde-config --expandvars --install include`}/kde.pot - kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
- if ! test -f $kdepotpath; then - if ! test -f $kdepotpath; then
- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot - kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
- fi - fi
+# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
+# if ! test -f $kdepotpath; then +# if ! test -f $kdepotpath; then
+# kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot +# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
+# fi +# fi
$MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \

@ -105,9 +105,9 @@ common-install-prehook-impl::
# sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \ # sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
# done # done
# msgcat --use-first kde.pot po/tdelibs.pot > tdelibs.pot-merged # msgcat --use-first tde.pot po/tdelibs.pot > tdelibs.pot-merged
# mv -f tdelibs.pot-merged po/tdelibs.pot # mv -f tdelibs.pot-merged po/tdelibs.pot
cp -Rp kde.pot po/tdelibs.pot cp -Rp tde.pot po/tdelibs.pot
# generate .po files for .desktop etc files # generate .po files for .desktop etc files
if [ -f debian/kubuntu-desktop-i18n/createdesktop.pl ]; then \ if [ -f debian/kubuntu-desktop-i18n/createdesktop.pl ]; then \

@ -241,7 +241,7 @@ debian/tmp/opt/trinity/share/apps/kjava/icons/crystalsvg/16x16/actions/java.png
debian/tmp/opt/trinity/share/apps/kjava/kjava.jar debian/tmp/opt/trinity/share/apps/kjava/kjava.jar
debian/tmp/opt/trinity/share/apps/kjava/kjava.policy debian/tmp/opt/trinity/share/apps/kjava/kjava.policy
debian/tmp/opt/trinity/share/apps/kjava/pluginsinfo debian/tmp/opt/trinity/share/apps/kjava/pluginsinfo
debian/tmp/opt/trinity/share/apps/knewstuff/types debian/tmp/opt/trinity/share/apps/tdenewstuff/types
debian/tmp/opt/trinity/share/apps/knotify/eventsrc debian/tmp/opt/trinity/share/apps/knotify/eventsrc
debian/tmp/opt/trinity/share/apps/ksgmltools2/customization/af/catalog debian/tmp/opt/trinity/share/apps/ksgmltools2/customization/af/catalog
debian/tmp/opt/trinity/share/apps/ksgmltools2/customization/af/catalog.xml debian/tmp/opt/trinity/share/apps/ksgmltools2/customization/af/catalog.xml

@ -218,7 +218,7 @@ debian/tmp/opt/trinity/include/tdesensordevice.h
debian/tmp/opt/trinity/include/tdestoragedevice.h debian/tmp/opt/trinity/include/tdestoragedevice.h
debian/tmp/opt/trinity/include/tdelibs_export.h debian/tmp/opt/trinity/include/tdelibs_export.h
debian/tmp/opt/trinity/include/kdemacros.h debian/tmp/opt/trinity/include/kdemacros.h
debian/tmp/opt/trinity/include/kde.pot debian/tmp/opt/trinity/include/tde.pot
debian/tmp/opt/trinity/include/tdeprint/driver.h debian/tmp/opt/trinity/include/tdeprint/driver.h
debian/tmp/opt/trinity/include/tdeprint/kiconselectaction.h debian/tmp/opt/trinity/include/tdeprint/kiconselectaction.h
debian/tmp/opt/trinity/include/tdeprint/kmjob.h debian/tmp/opt/trinity/include/tdeprint/kmjob.h
@ -433,16 +433,16 @@ debian/tmp/opt/trinity/include/tdemulticastsocket.h
debian/tmp/opt/trinity/include/tdemultipledrag.h debian/tmp/opt/trinity/include/tdemultipledrag.h
debian/tmp/opt/trinity/include/tdemultitabbar.h debian/tmp/opt/trinity/include/tdemultitabbar.h
debian/tmp/opt/trinity/include/knetworkinterface.h debian/tmp/opt/trinity/include/knetworkinterface.h
debian/tmp/opt/trinity/include/knewstuff/downloaddialog.h debian/tmp/opt/trinity/include/tdenewstuff/downloaddialog.h
debian/tmp/opt/trinity/include/knewstuff/engine.h debian/tmp/opt/trinity/include/tdenewstuff/engine.h
debian/tmp/opt/trinity/include/knewstuff/entry.h debian/tmp/opt/trinity/include/tdenewstuff/entry.h
debian/tmp/opt/trinity/include/knewstuff/knewstuffbutton.h debian/tmp/opt/trinity/include/tdenewstuff/knewstuffbutton.h
debian/tmp/opt/trinity/include/knewstuff/knewstuffgeneric.h debian/tmp/opt/trinity/include/tdenewstuff/knewstuffgeneric.h
debian/tmp/opt/trinity/include/knewstuff/knewstuff.h debian/tmp/opt/trinity/include/tdenewstuff/knewstuff.h
debian/tmp/opt/trinity/include/knewstuff/knewstuffsecure.h debian/tmp/opt/trinity/include/tdenewstuff/knewstuffsecure.h
debian/tmp/opt/trinity/include/knewstuff/providerdialog.h debian/tmp/opt/trinity/include/tdenewstuff/providerdialog.h
debian/tmp/opt/trinity/include/knewstuff/provider.h debian/tmp/opt/trinity/include/tdenewstuff/provider.h
debian/tmp/opt/trinity/include/knewstuff/uploaddialog.h debian/tmp/opt/trinity/include/tdenewstuff/uploaddialog.h
debian/tmp/opt/trinity/include/knfsshare.h debian/tmp/opt/trinity/include/knfsshare.h
debian/tmp/opt/trinity/include/knotifyclient.h debian/tmp/opt/trinity/include/knotifyclient.h
debian/tmp/opt/trinity/include/knotifydialog.h debian/tmp/opt/trinity/include/knotifydialog.h
@ -808,8 +808,8 @@ debian/tmp/opt/trinity/lib/libtdemediaplayer.la
debian/tmp/opt/trinity/lib/libtdemediaplayer.so debian/tmp/opt/trinity/lib/libtdemediaplayer.so
debian/tmp/opt/trinity/lib/libtdemid.la debian/tmp/opt/trinity/lib/libtdemid.la
debian/tmp/opt/trinity/lib/libtdemid.so debian/tmp/opt/trinity/lib/libtdemid.so
debian/tmp/opt/trinity/lib/libknewstuff.la debian/tmp/opt/trinity/lib/libtdenewstuff.la
debian/tmp/opt/trinity/lib/libknewstuff.so debian/tmp/opt/trinity/lib/libtdenewstuff.so
debian/tmp/opt/trinity/lib/libtdentlm.la debian/tmp/opt/trinity/lib/libtdentlm.la
debian/tmp/opt/trinity/lib/libtdentlm.so debian/tmp/opt/trinity/lib/libtdentlm.so
debian/tmp/opt/trinity/lib/libtdeparts.la debian/tmp/opt/trinity/lib/libtdeparts.la

@ -287,8 +287,8 @@ debian/tmp/opt/trinity/lib/libtdemediaplayer.so.0
debian/tmp/opt/trinity/lib/libtdemediaplayer.so.0.0.0 debian/tmp/opt/trinity/lib/libtdemediaplayer.so.0.0.0
debian/tmp/opt/trinity/lib/libtdemid.so.0 debian/tmp/opt/trinity/lib/libtdemid.so.0
debian/tmp/opt/trinity/lib/libtdemid.so.0.0.95 debian/tmp/opt/trinity/lib/libtdemid.so.0.0.95
debian/tmp/opt/trinity/lib/libknewstuff.so.1 debian/tmp/opt/trinity/lib/libtdenewstuff.so.1
debian/tmp/opt/trinity/lib/libknewstuff.so.1.0.0 debian/tmp/opt/trinity/lib/libtdenewstuff.so.1.0.0
debian/tmp/opt/trinity/lib/libtdentlm.so.0 debian/tmp/opt/trinity/lib/libtdentlm.so.0
debian/tmp/opt/trinity/lib/libtdentlm.so.0.0.0 debian/tmp/opt/trinity/lib/libtdentlm.so.0.0.0
debian/tmp/opt/trinity/lib/libtdeparts.so.2 debian/tmp/opt/trinity/lib/libtdeparts.so.2

@ -4,7 +4,7 @@
if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
export EXTRACTRC PREPARETIPS export EXTRACTRC PREPARETIPS
+kdepotpath=/opt/trinity/include/tde/kde.pot +kdepotpath=/opt/trinity/include/tde/tde.pot
+ +
for subdir in $dirs; do for subdir in $dirs; do
test -z "$VERBOSE" || echo "Making messages in $subdir" test -z "$VERBOSE" || echo "Making messages in $subdir"
@ -13,13 +13,13 @@
fi 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 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:-`tde-config --expandvars --install include`}/kde.pot - kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
- if ! test -f $kdepotpath; then - if ! test -f $kdepotpath; then
- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot - kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
- fi - fi
+# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
+# if ! test -f $kdepotpath; then +# if ! test -f $kdepotpath; then
+# kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot +# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
+# fi +# fi
$MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \

@ -4,7 +4,7 @@
if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
export EXTRACTRC PREPARETIPS export EXTRACTRC PREPARETIPS
+kdepotpath=/opt/trinity/include/tde/kde.pot +kdepotpath=/opt/trinity/include/tde/tde.pot
+ +
for subdir in $dirs; do for subdir in $dirs; do
test -z "$VERBOSE" || echo "Making messages in $subdir" test -z "$VERBOSE" || echo "Making messages in $subdir"
@ -13,13 +13,13 @@
fi 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 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:-`tde-config --expandvars --install include`}/kde.pot - kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
- if ! test -f $kdepotpath; then - if ! test -f $kdepotpath; then
- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot - kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
- fi - fi
+# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
+# if ! test -f $kdepotpath; then +# if ! test -f $kdepotpath; then
+# kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot +# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
+# fi +# fi
$MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \

@ -4,7 +4,7 @@
if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
export EXTRACTRC PREPARETIPS export EXTRACTRC PREPARETIPS
+kdepotpath=/opt/trinity/include/tde/kde.pot +kdepotpath=/opt/trinity/include/tde/tde.pot
+ +
for subdir in $dirs; do for subdir in $dirs; do
test -z "$VERBOSE" || echo "Making messages in $subdir" test -z "$VERBOSE" || echo "Making messages in $subdir"
@ -13,13 +13,13 @@
fi 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 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:-`tde-config --expandvars --install include`}/kde.pot - kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
- if ! test -f $kdepotpath; then - if ! test -f $kdepotpath; then
- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot - kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
- fi - fi
+# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
+# if ! test -f $kdepotpath; then +# if ! test -f $kdepotpath; then
+# kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot +# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
+# fi +# fi
$MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \

@ -4,7 +4,7 @@
if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
export EXTRACTRC PREPARETIPS export EXTRACTRC PREPARETIPS
+kdepotpath=/opt/trinity/include/tde/kde.pot +kdepotpath=/opt/trinity/include/tde/tde.pot
+ +
for subdir in $dirs; do for subdir in $dirs; do
test -z "$VERBOSE" || echo "Making messages in $subdir" test -z "$VERBOSE" || echo "Making messages in $subdir"
@ -13,13 +13,13 @@
fi 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 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:-`tde-config --expandvars --install include`}/kde.pot - kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
- if ! test -f $kdepotpath; then - if ! test -f $kdepotpath; then
- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot - kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
- fi - fi
+# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
+# if ! test -f $kdepotpath; then +# if ! test -f $kdepotpath; then
+# kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot +# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
+# fi +# fi
$MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \

@ -4,7 +4,7 @@
if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
export EXTRACTRC PREPARETIPS export EXTRACTRC PREPARETIPS
+kdepotpath=/opt/trinity/include/tde/kde.pot +kdepotpath=/opt/trinity/include/tde/tde.pot
+ +
for subdir in $dirs; do for subdir in $dirs; do
test -z "$VERBOSE" || echo "Making messages in $subdir" test -z "$VERBOSE" || echo "Making messages in $subdir"
@ -13,13 +13,13 @@
fi 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 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:-`tde-config --expandvars --install include`}/kde.pot - kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
- if ! test -f $kdepotpath; then - if ! test -f $kdepotpath; then
- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot - kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
- fi - fi
+# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
+# if ! test -f $kdepotpath; then +# if ! test -f $kdepotpath; then
+# kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot +# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
+# fi +# fi
$MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \

@ -34,7 +34,7 @@ DEB_CMAKE_EXTRA_FLAGS := \
-DWITH_SNMP="ON" \ -DWITH_SNMP="ON" \
-DWITH_SENSORS="ON" \ -DWITH_SENSORS="ON" \
-DWITH_XMMS="ON" \ -DWITH_XMMS="ON" \
-DWITH_KNEWSTUFF="ON" -DWITH_TDENEWSTUFF="ON"
DOC_HTML_PRUNE := kcontrol-trinity ktimer-trinity kcharselect-trinity ksim-trinity DOC_HTML_PRUNE := kcontrol-trinity ktimer-trinity kcharselect-trinity ksim-trinity

@ -4,7 +4,7 @@
if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
export EXTRACTRC PREPARETIPS export EXTRACTRC PREPARETIPS
+kdepotpath=/opt/trinity/include/tde/kde.pot +kdepotpath=/opt/trinity/include/tde/tde.pot
+ +
for subdir in $dirs; do for subdir in $dirs; do
test -z "$VERBOSE" || echo "Making messages in $subdir" test -z "$VERBOSE" || echo "Making messages in $subdir"
@ -13,13 +13,13 @@
fi 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 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:-`tde-config --expandvars --install include`}/kde.pot - kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
- if ! test -f $kdepotpath; then - if ! test -f $kdepotpath; then
- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot - kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
- fi - fi
+# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
+# if ! test -f $kdepotpath; then +# if ! test -f $kdepotpath; then
+# kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot +# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
+# fi +# fi
$MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \

@ -4,7 +4,7 @@
if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
export EXTRACTRC PREPARETIPS export EXTRACTRC PREPARETIPS
+kdepotpath=/usr/include/tde/kde.pot +kdepotpath=/usr/include/tde/tde.pot
+ +
for subdir in $dirs; do for subdir in $dirs; do
test -z "$VERBOSE" || echo "Making messages in $subdir" test -z "$VERBOSE" || echo "Making messages in $subdir"
@ -13,13 +13,13 @@
fi 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 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:-`tde-config --expandvars --install include`}/kde.pot - kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
- if ! test -f $kdepotpath; then - if ! test -f $kdepotpath; then
- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot - kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
- fi - fi
+# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
+# if ! test -f $kdepotpath; then +# if ! test -f $kdepotpath; then
+# kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot +# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
+# fi +# fi
$MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \

Loading…
Cancel
Save