diff options
Diffstat (limited to 'ubuntu')
26 files changed, 116 insertions, 157 deletions
diff --git a/ubuntu/maverick/applications/keep/debian/patches/kubuntu_01_kdepot.diff b/ubuntu/maverick/applications/keep/debian/patches/kubuntu_01_kdepot.diff index ebdf4630a..696f9093c 100644 --- a/ubuntu/maverick/applications/keep/debian/patches/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick/applications/keep/debian/patches/kubuntu_01_kdepot.diff @@ -5,7 +5,7 @@ diff -Nur keep-0.4.0/admin/cvs.sh keep-0.4.0.new/admin/cvs.sh if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/usr/include/tde/kde.pot ++kdepotpath=/usr/include/tde/tde.pot + for subdir in $dirs; do 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 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 - kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot + kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot fi diff --git a/ubuntu/maverick/applications/kopete-otr/debian/control b/ubuntu/maverick/applications/kopete-otr/debian/control index 711b9549e..8af438bc8 100644 --- a/ubuntu/maverick/applications/kopete-otr/debian/control +++ b/ubuntu/maverick/applications/kopete-otr/debian/control @@ -3,9 +3,8 @@ Section: tde Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> 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 -Homepage: http://kopete-otr.follefuder.org/ Package: kopete-otr-trinity Architecture: any diff --git a/ubuntu/maverick/applications/tde-guidance/debian/rules b/ubuntu/maverick/applications/tde-guidance/debian/rules index 5046494ad..217eea9ed 100755..100644 --- a/ubuntu/maverick/applications/tde-guidance/debian/rules +++ b/ubuntu/maverick/applications/tde-guidance/debian/rules @@ -1,6 +1,9 @@ #!/usr/bin/make -f 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/class/python-distutils.mk @@ -11,7 +14,7 @@ include /usr/share/cdbs/1/rules/utils.mk DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp DEB_UPDATE_RCD_PARAMS := multiuser 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 LDFLAGS_APPEND := -L/opt/trinity/lib @@ -43,11 +46,11 @@ install/tde-guidance-trinity:: # fix the link properly 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 /opt/trinity/share/python-support/tde-guidance-trinity/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 /opt/trinity/share/python-support/tde-guidance-trinity/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)/mountconfig.py mountconfig) + (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 $(GUIDANCE_INST_PATH)/userconfig.py userconfig) + (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 $(GUIDANCE_INST_PATH)/grubconfig.py grubconfig) # move python modules in PYSUPPORT_PATH 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/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:: rm -rf build @@ -155,9 +113,6 @@ clean:: common-install-prehook-impl:: # 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 touch list @@ -190,4 +145,3 @@ common-install-prehook-impl:: 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-powermanager-trinity/.version diff --git a/ubuntu/maverick/applications/tde-guidance/debian/tde-guidance-trinity.install b/ubuntu/maverick/applications/tde-guidance/debian/tde-guidance-trinity.install index 7a0a28549..fe690a9c2 100644 --- a/ubuntu/maverick/applications/tde-guidance/debian/tde-guidance-trinity.install +++ b/ubuntu/maverick/applications/tde-guidance/debian/tde-guidance-trinity.install @@ -1,7 +1,7 @@ -opt/trinity/lib/trinity/kcm_serviceconfig.la opt/trinity/lib/ -opt/trinity/lib/trinity/kcm_userconfig.la opt/trinity/lib/ -opt/trinity/lib/trinity/kcm_mountconfig.la opt/trinity/lib/ -opt/trinity/lib/trinity/kcm_wineconfig.la opt/trinity/lib/ +opt/trinity/lib/trinity/kcm_serviceconfig.la +opt/trinity/lib/trinity/kcm_userconfig.la +opt/trinity/lib/trinity/kcm_mountconfig.la +opt/trinity/lib/trinity/kcm_wineconfig.la 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/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/userconfig.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_userconfig.so opt/trinity/lib/ -opt/trinity/lib/trinity/kcm_mountconfig.so opt/trinity/lib/ -opt/trinity/lib/trinity/kcm_wineconfig.so opt/trinity/lib/ +opt/trinity/lib/trinity/kcm_serviceconfig.so +opt/trinity/lib/trinity/kcm_userconfig.so +opt/trinity/lib/trinity/kcm_mountconfig.so +opt/trinity/lib/trinity/kcm_wineconfig.so usr/share/lintian/overrides/tde-guidance-trinity diff --git a/ubuntu/maverick/dependencies/python-tqt/debian/rules b/ubuntu/maverick/dependencies/python-tqt/debian/rules index b8b687940..2f57b4b0b 100755 --- a/ubuntu/maverick/dependencies/python-tqt/debian/rules +++ b/ubuntu/maverick/dependencies/python-tqt/debian/rules @@ -52,6 +52,7 @@ build-%/configure-stamp: cd build-$* && echo yes \ | python$* ../configure.py \ -c -n /usr/include/tqscintilla \ + -e python$* \ -o /usr/lib -u -j $(SPLIT) \ -d /usr/lib/python$*/$(call py_sitename,$*)/python_tqt \ -l /usr/include/python$* \ @@ -66,6 +67,7 @@ dbg-build-%/configure-stamp: cd dbg-build-$* && echo yes \ | python$*-dbg ../configure.py \ -c -n /usr/include/tqscintilla \ + -e python$* \ -o /usr/lib -u -j $(SPLIT) \ -d /usr/lib/python$*/$(call py_sitename,$*)/python_tqt \ -l /usr/include/python$*_d \ diff --git a/ubuntu/maverick/dependencies/sip4-tqt/debian/rules b/ubuntu/maverick/dependencies/sip4-tqt/debian/rules index df0c6da05..86a541601 100755 --- a/ubuntu/maverick/dependencies/sip4-tqt/debian/rules +++ b/ubuntu/maverick/dependencies/sip4-tqt/debian/rules @@ -41,6 +41,7 @@ build-%/configure-stamp: cd build-$* \ && python$* ../configure.py \ -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="" touch $@ @@ -50,6 +51,7 @@ dbg-build-%/configure-stamp: cd dbg-build-$* \ && python$*-dbg ../configure.py \ -d /usr/lib/python$*/$(call py_sitename,$*)/sip4_tqt \ + -g python$* \ -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="" touch $@ diff --git a/ubuntu/maverick/libraries/python-trinity/debian/rules b/ubuntu/maverick/libraries/python-trinity/debian/rules index 473caac7d..ff41b19f7 100755 --- a/ubuntu/maverick/libraries/python-trinity/debian/rules +++ b/ubuntu/maverick/libraries/python-trinity/debian/rules @@ -48,6 +48,7 @@ build-%/configure-stamp: mkdir -p build-$* cd build-$* && python$* ../configure.py \ -c -u -k /opt/trinity -o /opt/trinity/include -n /opt/trinity/lib \ + -e python$* \ -v /opt/trinity/share/sip/trinity -j $(SPLIT) touch $@ @@ -56,6 +57,7 @@ dbg-build-%/configure-stamp: mkdir -p dbg-build-$* cd dbg-build-$* && python$*-dbg ../configure.py \ -c -u -k /opt/trinity -o /opt/trinity/include -n /opt/trinity/lib \ + -e python$* \ -v /opt/trinity/share/sip/trinity -j $(SPLIT) touch $@ diff --git a/ubuntu/maverick/tdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick/tdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff index 20ad1b0b7..39dd7745e 100644 --- a/ubuntu/maverick/tdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick/tdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/opt/trinity/include/tde/kde.pot ++kdepotpath=/opt/trinity/include/tde/tde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -13,13 +13,13 @@ fi perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile -- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot - fi -+# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot ++# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick/tdeaddons/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick/tdeaddons/debian/patches/common/kubuntu_01_kdepot.diff index 20ad1b0b7..39dd7745e 100644 --- a/ubuntu/maverick/tdeaddons/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick/tdeaddons/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/opt/trinity/include/tde/kde.pot ++kdepotpath=/opt/trinity/include/tde/tde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -13,13 +13,13 @@ fi perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile -- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot - fi -+# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot ++# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick/tdeadmin/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick/tdeadmin/debian/patches/common/kubuntu_01_kdepot.diff index 20ad1b0b7..39dd7745e 100644 --- a/ubuntu/maverick/tdeadmin/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick/tdeadmin/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/opt/trinity/include/tde/kde.pot ++kdepotpath=/opt/trinity/include/tde/tde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -13,13 +13,13 @@ fi perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile -- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot - fi -+# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot ++# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick/tdebindings/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick/tdebindings/debian/patches/common/kubuntu_01_kdepot.diff index 20ad1b0b7..39dd7745e 100644 --- a/ubuntu/maverick/tdebindings/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick/tdebindings/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/opt/trinity/include/tde/kde.pot ++kdepotpath=/opt/trinity/include/tde/tde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -13,13 +13,13 @@ fi perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile -- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot - fi -+# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot ++# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick/tdeedu/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick/tdeedu/debian/patches/common/kubuntu_01_kdepot.diff index 20ad1b0b7..39dd7745e 100644 --- a/ubuntu/maverick/tdeedu/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick/tdeedu/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/opt/trinity/include/tde/kde.pot ++kdepotpath=/opt/trinity/include/tde/tde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -13,13 +13,13 @@ fi perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile -- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot - fi -+# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot ++# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick/tdegames/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick/tdegames/debian/patches/common/kubuntu_01_kdepot.diff index 20ad1b0b7..39dd7745e 100644 --- a/ubuntu/maverick/tdegames/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick/tdegames/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/opt/trinity/include/tde/kde.pot ++kdepotpath=/opt/trinity/include/tde/tde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -13,13 +13,13 @@ fi perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile -- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot - fi -+# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot ++# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick/tdegraphics/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick/tdegraphics/debian/patches/common/kubuntu_01_kdepot.diff index 20ad1b0b7..39dd7745e 100644 --- a/ubuntu/maverick/tdegraphics/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick/tdegraphics/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/opt/trinity/include/tde/kde.pot ++kdepotpath=/opt/trinity/include/tde/tde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -13,13 +13,13 @@ fi perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile -- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot - fi -+# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot ++# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick/tdelibs/debian/rules b/ubuntu/maverick/tdelibs/debian/rules index 153082462..0a71d8964 100755 --- a/ubuntu/maverick/tdelibs/debian/rules +++ b/ubuntu/maverick/tdelibs/debian/rules @@ -105,9 +105,9 @@ common-install-prehook-impl:: # sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \ # 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 - cp -Rp kde.pot po/tdelibs.pot + cp -Rp tde.pot po/tdelibs.pot # generate .po files for .desktop etc files if [ -f debian/kubuntu-desktop-i18n/createdesktop.pl ]; then \ diff --git a/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.install b/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.install index c69d5700b..21dafee6a 100644 --- a/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.install +++ b/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.install @@ -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.policy 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/ksgmltools2/customization/af/catalog debian/tmp/opt/trinity/share/apps/ksgmltools2/customization/af/catalog.xml diff --git a/ubuntu/maverick/tdelibs/debian/tdelibs14-trinity-dev.install b/ubuntu/maverick/tdelibs/debian/tdelibs14-trinity-dev.install index 4a738709b..73c87967b 100644 --- a/ubuntu/maverick/tdelibs/debian/tdelibs14-trinity-dev.install +++ b/ubuntu/maverick/tdelibs/debian/tdelibs14-trinity-dev.install @@ -218,7 +218,7 @@ debian/tmp/opt/trinity/include/tdesensordevice.h debian/tmp/opt/trinity/include/tdestoragedevice.h debian/tmp/opt/trinity/include/tdelibs_export.h debian/tmp/opt/trinity/include/kdemacros.h -debian/tmp/opt/trinity/include/kde.pot +debian/tmp/opt/trinity/include/tde.pot debian/tmp/opt/trinity/include/tdeprint/driver.h debian/tmp/opt/trinity/include/tdeprint/kiconselectaction.h debian/tmp/opt/trinity/include/tdeprint/kmjob.h @@ -433,16 +433,16 @@ debian/tmp/opt/trinity/include/tdemulticastsocket.h debian/tmp/opt/trinity/include/tdemultipledrag.h debian/tmp/opt/trinity/include/tdemultitabbar.h debian/tmp/opt/trinity/include/knetworkinterface.h -debian/tmp/opt/trinity/include/knewstuff/downloaddialog.h -debian/tmp/opt/trinity/include/knewstuff/engine.h -debian/tmp/opt/trinity/include/knewstuff/entry.h -debian/tmp/opt/trinity/include/knewstuff/knewstuffbutton.h -debian/tmp/opt/trinity/include/knewstuff/knewstuffgeneric.h -debian/tmp/opt/trinity/include/knewstuff/knewstuff.h -debian/tmp/opt/trinity/include/knewstuff/knewstuffsecure.h -debian/tmp/opt/trinity/include/knewstuff/providerdialog.h -debian/tmp/opt/trinity/include/knewstuff/provider.h -debian/tmp/opt/trinity/include/knewstuff/uploaddialog.h +debian/tmp/opt/trinity/include/tdenewstuff/downloaddialog.h +debian/tmp/opt/trinity/include/tdenewstuff/engine.h +debian/tmp/opt/trinity/include/tdenewstuff/entry.h +debian/tmp/opt/trinity/include/tdenewstuff/knewstuffbutton.h +debian/tmp/opt/trinity/include/tdenewstuff/knewstuffgeneric.h +debian/tmp/opt/trinity/include/tdenewstuff/knewstuff.h +debian/tmp/opt/trinity/include/tdenewstuff/knewstuffsecure.h +debian/tmp/opt/trinity/include/tdenewstuff/providerdialog.h +debian/tmp/opt/trinity/include/tdenewstuff/provider.h +debian/tmp/opt/trinity/include/tdenewstuff/uploaddialog.h debian/tmp/opt/trinity/include/knfsshare.h debian/tmp/opt/trinity/include/knotifyclient.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/libtdemid.la debian/tmp/opt/trinity/lib/libtdemid.so -debian/tmp/opt/trinity/lib/libknewstuff.la -debian/tmp/opt/trinity/lib/libknewstuff.so +debian/tmp/opt/trinity/lib/libtdenewstuff.la +debian/tmp/opt/trinity/lib/libtdenewstuff.so debian/tmp/opt/trinity/lib/libtdentlm.la debian/tmp/opt/trinity/lib/libtdentlm.so debian/tmp/opt/trinity/lib/libtdeparts.la diff --git a/ubuntu/maverick/tdelibs/debian/tdelibs14-trinity.install b/ubuntu/maverick/tdelibs/debian/tdelibs14-trinity.install index af088947e..b54ca2e2f 100644 --- a/ubuntu/maverick/tdelibs/debian/tdelibs14-trinity.install +++ b/ubuntu/maverick/tdelibs/debian/tdelibs14-trinity.install @@ -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/libtdemid.so.0 debian/tmp/opt/trinity/lib/libtdemid.so.0.0.95 -debian/tmp/opt/trinity/lib/libknewstuff.so.1 -debian/tmp/opt/trinity/lib/libknewstuff.so.1.0.0 +debian/tmp/opt/trinity/lib/libtdenewstuff.so.1 +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.0.0 debian/tmp/opt/trinity/lib/libtdeparts.so.2 diff --git a/ubuntu/maverick/tdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick/tdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff index 20ad1b0b7..39dd7745e 100644 --- a/ubuntu/maverick/tdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick/tdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/opt/trinity/include/tde/kde.pot ++kdepotpath=/opt/trinity/include/tde/tde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -13,13 +13,13 @@ fi perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile -- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot - fi -+# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot ++# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick/tdenetwork/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick/tdenetwork/debian/patches/common/kubuntu_01_kdepot.diff index 20ad1b0b7..39dd7745e 100644 --- a/ubuntu/maverick/tdenetwork/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick/tdenetwork/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/opt/trinity/include/tde/kde.pot ++kdepotpath=/opt/trinity/include/tde/tde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -13,13 +13,13 @@ fi perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile -- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot - fi -+# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot ++# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick/tdesdk/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick/tdesdk/debian/patches/common/kubuntu_01_kdepot.diff index 20ad1b0b7..39dd7745e 100644 --- a/ubuntu/maverick/tdesdk/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick/tdesdk/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/opt/trinity/include/tde/kde.pot ++kdepotpath=/opt/trinity/include/tde/tde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -13,13 +13,13 @@ fi perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile -- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot - fi -+# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot ++# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick/tdetoys/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick/tdetoys/debian/patches/common/kubuntu_01_kdepot.diff index 20ad1b0b7..39dd7745e 100644 --- a/ubuntu/maverick/tdetoys/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick/tdetoys/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/opt/trinity/include/tde/kde.pot ++kdepotpath=/opt/trinity/include/tde/tde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -13,13 +13,13 @@ fi perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile -- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot - fi -+# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot ++# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick/tdeutils/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick/tdeutils/debian/patches/common/kubuntu_01_kdepot.diff index 20ad1b0b7..39dd7745e 100644 --- a/ubuntu/maverick/tdeutils/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick/tdeutils/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/opt/trinity/include/tde/kde.pot ++kdepotpath=/opt/trinity/include/tde/tde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -13,13 +13,13 @@ fi perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile -- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot - fi -+# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot ++# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick/tdeutils/debian/rules b/ubuntu/maverick/tdeutils/debian/rules index eb3386805..9617d1359 100755 --- a/ubuntu/maverick/tdeutils/debian/rules +++ b/ubuntu/maverick/tdeutils/debian/rules @@ -34,7 +34,7 @@ DEB_CMAKE_EXTRA_FLAGS := \ -DWITH_SNMP="ON" \ -DWITH_SENSORS="ON" \ -DWITH_XMMS="ON" \ - -DWITH_KNEWSTUFF="ON" + -DWITH_TDENEWSTUFF="ON" DOC_HTML_PRUNE := kcontrol-trinity ktimer-trinity kcharselect-trinity ksim-trinity diff --git a/ubuntu/maverick/tdevelop/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick/tdevelop/debian/patches/common/kubuntu_01_kdepot.diff index 20ad1b0b7..39dd7745e 100644 --- a/ubuntu/maverick/tdevelop/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick/tdevelop/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/opt/trinity/include/tde/kde.pot ++kdepotpath=/opt/trinity/include/tde/tde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -13,13 +13,13 @@ fi perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile -- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot - fi -+# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot ++# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick/tdewebdev/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick/tdewebdev/debian/patches/common/kubuntu_01_kdepot.diff index 47aee4140..28c95742b 100644 --- a/ubuntu/maverick/tdewebdev/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick/tdewebdev/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/usr/include/tde/kde.pot ++kdepotpath=/usr/include/tde/tde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -13,13 +13,13 @@ fi perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile -- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot - fi -+# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot ++# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ |