diff options
Diffstat (limited to 'ubuntu')
21 files changed, 78 insertions, 137 deletions
diff --git a/ubuntu/maverick/applications/fusion-icon/debian/rules b/ubuntu/maverick/applications/fusion-icon/debian/rules index 88040a563..3fe3dd8ea 100755 --- a/ubuntu/maverick/applications/fusion-icon/debian/rules +++ b/ubuntu/maverick/applications/fusion-icon/debian/rules @@ -14,8 +14,17 @@ binary-install/fusion-icon-trinity:: mkdir -p debian/fusion-icon-trinity/usr/local/lib cp -Rp debian/fusion-icon-trinity/usr/local/* debian/fusion-icon-trinity/usr/ rm -rf debian/fusion-icon-trinity/usr/local + mkdir -p debian/fusion-icon-trinity/temp + mv debian/fusion-icon-trinity/usr/lib debian/fusion-icon-trinity/temp mkdir -p debian/fusion-icon-trinity/opt/trinity cp -Rp debian/fusion-icon-trinity/usr/* debian/fusion-icon-trinity/opt/trinity/ rm -rf debian/fusion-icon-trinity/usr dh_pysupport -pfusion-icon-trinity + ### + # Must be done after invoking dh_pysupport, otherwise python scripts will + # end up in /usr/share/pyshare instead of dist-packages + mkdir -p debian/fusion-icon-trinity/usr + mv debian/fusion-icon-trinity/temp/lib debian/fusion-icon-trinity/usr + rm -rf debian/fusion-icon-trinity/temp + ### dh_icons diff --git a/ubuntu/maverick/applications/k3b/debian/control b/ubuntu/maverick/applications/k3b/debian/control index 4409688e4..c822e9a70 100644 --- a/ubuntu/maverick/applications/k3b/debian/control +++ b/ubuntu/maverick/applications/k3b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org> Uploaders: Francois Marier <francois@debian.org>, Fathi Boudra <fabo@debian.org> -Build-Depends: libdvdread4, libdvdread-dev, alsa, libasound2-dev, lame, libmp3lame-dev, debhelper (>= 6), quilt, cdbs (>= 0.4.52ubuntu18), tdelibs14-trinity-dev (>= 3.5.0), libflac++-dev (>= 1.1.2), flac, libdbus-tqt-1-dev, libpopt-dev, libmpcdec-dev, libtag1-dev (>= 1.4-3), libmad0-dev, chrpath, libavformat-dev, libavcodec-dev, libvorbis-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: libdvdread4, libdvdread-dev, libasound2-dev, lame, libmp3lame-dev, debhelper (>= 6), quilt, cdbs (>= 0.4.52ubuntu18), tdelibs14-trinity-dev (>= 3.5.0), libflac++-dev (>= 1.1.2), flac, libdbus-tqt-1-dev, libpopt-dev, libmpcdec-dev, libtag1-dev (>= 1.4-3), libmad0-dev, chrpath, libavformat-dev, libavcodec-dev, libvorbis-dev, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Homepage: http://www.k3b.org diff --git a/ubuntu/maverick/applications/koffice/debian/control b/ubuntu/maverick/applications/koffice/debian/control index 93ee9dcd3..b5fe69b98 100644 --- a/ubuntu/maverick/applications/koffice/debian/control +++ b/ubuntu/maverick/applications/koffice/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Ral Snchez Siles <rasasi78@gmail.com> -Build-Depends: cdbs (>= 0.4.52ubuntu18), debhelper (>= 5), quilt, binutils (>= 2.14.90.0.7), recode, docbook-to-man, gawk, gettext, flex, tdelibs14-trinity-dev (>= 4:3.4.3), libaspell-dev, libfontconfig1-dev, libopenexr-dev, libpaper-dev, libreadline5-dev | libreadline6-dev, libtiff-dev, libwv2-dev (>= 0.2.2-4), libxml2-dev, libxslt1-dev, python-dev, ruby, ruby-dev, libwpd-dev, libpqxx-dev | libpqxx3-dev, libmysqlclient15-dev | libmysqlclient16-dev | libmysqlclient18-dev, sharutils, bzip2, libpoppler-tqt-dev, libexif-dev, libasound2-dev, libogg-dev, liblcms1-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: cdbs (>= 0.4.52ubuntu18), debhelper (>= 5), quilt, binutils (>= 2.14.90.0.7), recode, docbook-to-man, gawk, gettext, flex, tdelibs14-trinity-dev (>= 4:3.4.3), libaspell-dev, libfontconfig1-dev, libopenexr-dev, libpaper-dev, libreadline5-dev | libreadline6-dev, libtiff-dev, libwv2-dev (>= 0.2.2-4), libxml2-dev, libxslt1-dev, python-dev, ruby, ruby-dev, libwpd-dev, librevenge-dev | libwpd-dev (<< 0.10~) | libwpd8-dev, libpqxx-dev | libpqxx3-dev, libmysqlclient15-dev | libmysqlclient16-dev | libmysqlclient18-dev, sharutils, bzip2, libpoppler-tqt-dev, libexif-dev, libasound2-dev, libogg-dev, liblcms1-dev, automake, autoconf, libtool, libltdl-dev Build-Depends-Indep: libtqtinterface-doc, graphviz, gsfonts-x11 Standards-Version: 3.8.4 Homepage: http://www.koffice.org 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/tdebase/debian/patches/disable_starttde_wallpaper.diff b/ubuntu/maverick/tdebase/debian/patches/disable_starttde_wallpaper.diff index 3949f4040..598cd7092 100644 --- a/ubuntu/maverick/tdebase/debian/patches/disable_starttde_wallpaper.diff +++ b/ubuntu/maverick/tdebase/debian/patches/disable_starttde_wallpaper.diff @@ -7,10 +7,10 @@ -# Make sure a default wallpaper is set. -if [ ! -e "$tdehome/share/config/kdesktoprc" ]; then - # With Trinity this file should exist, but test first. -- if [ -r /usr/share/wallpapers/isadora.png.desktop ]; then +- if [ -r $TDEDIR/share/wallpapers/Trinity-lineart.svg.desktop ]; then -cat >"$tdehome/share/config/kdesktoprc" <<EOF -[Desktop0] --Wallpaper=isadora.png +-Wallpaper=Trinity-lineart.svg -WallpaperMode=Scaled -EOF - fi @@ -18,10 +18,10 @@ +## Make sure a default wallpaper is set. +#if [ ! -e "$tdehome/share/config/kdesktoprc" ]; then +# # With Trinity this file should exist, but test first. -+# if [ -r /usr/share/wallpapers/isadora.png.desktop ]; then ++# if [ -r $TDEDIR/share/wallpapers/Trinity-lineart.svg.desktop ]; then +#cat >"$tdehome/share/config/kdesktoprc" <<EOF +#[Desktop0] -+#Wallpaper=isadora.png ++#Wallpaper=Trinity-lineart.svg +#WallpaperMode=Scaled +#EOF +# fi diff --git a/ubuntu/maverick/tdebase/debian/plasma-desktop.autodetect b/ubuntu/maverick/tdebase/debian/plasma-desktop.autodetect deleted file mode 100755 index b083cb277..000000000 --- a/ubuntu/maverick/tdebase/debian/plasma-desktop.autodetect +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash - -DESKTOP_SESSION="$DESKTOP_SESSION" -echo "You are running $DESKTOP_SESSION" - -if [[ "$DESKTOP_SESSION" == "trinity" ]] -then - # Do nothing, this is Trinity - echo "I detected Trinity" -else - # This is KDE4, start plasma-desktop - echo "I detected KDE4" - /usr/bin/plasma-desktop.kde4 -fi diff --git a/ubuntu/maverick/tdebase/debian/plasma.autodetect b/ubuntu/maverick/tdebase/debian/plasma.autodetect deleted file mode 100755 index c23f68909..000000000 --- a/ubuntu/maverick/tdebase/debian/plasma.autodetect +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash - -DESKTOP_SESSION="$DESKTOP_SESSION" -echo "You are running $DESKTOP_SESSION" - -if [[ "$DESKTOP_SESSION" == "trinity" ]] -then - # Do nothing, this is Trinity - echo "I detected Trinity" -else - # This is KDE4, start plasma - echo "I detected KDE4" - /usr/bin/plasma.kde4 -fi diff --git a/ubuntu/maverick/tdebase/debian/rules b/ubuntu/maverick/tdebase/debian/rules index 1d062ca42..1192433cb 100755 --- a/ubuntu/maverick/tdebase/debian/rules +++ b/ubuntu/maverick/tdebase/debian/rules @@ -291,5 +291,3 @@ binary-install/tdebase-trinity-bin:: binary-install/ksmserver-trinity:: install -p -D -m644 debian/tmp/opt/trinity/share/apps/tdm/sessions/tde.desktop debian/ksmserver-trinity/usr/share/xsessions/trinity.desktop - install -p -D -m755 debian/plasma.autodetect debian/ksmserver-trinity/usr/bin/plasma - install -p -D -m755 debian/plasma-desktop.autodetect debian/ksmserver-trinity/usr/bin/plasma-desktop diff --git a/ubuntu/maverick/tdebase/debian/tdebase-data-trinity.install b/ubuntu/maverick/tdebase/debian/tdebase-data-trinity.install index 0ae53f571..740f0b2ce 100644 --- a/ubuntu/maverick/tdebase/debian/tdebase-data-trinity.install +++ b/ubuntu/maverick/tdebase/debian/tdebase-data-trinity.install @@ -1165,14 +1165,18 @@ debian/tmp/opt/trinity/share/sounds/KDE_Window_UnSticky.ogg debian/tmp/opt/trinity/share/sounds/KDE_Window_UnSticky.wav debian/tmp/opt/trinity/share/wallpapers/All-Good-People-1.jpg debian/tmp/opt/trinity/share/wallpapers/All-Good-People-1.jpg.desktop +debian/tmp/opt/trinity/share/wallpapers/aghi.jpg +debian/tmp/opt/trinity/share/wallpapers/aghi.jpg.desktop +debian/tmp/opt/trinity/share/wallpapers/airplane.jpg +debian/tmp/opt/trinity/share/wallpapers/airplane.jpg.desktop debian/tmp/opt/trinity/share/wallpapers/alta-badia.jpg debian/tmp/opt/trinity/share/wallpapers/alta-badia.jpg.desktop debian/tmp/opt/trinity/share/wallpapers/andes-venezolanos.svgz debian/tmp/opt/trinity/share/wallpapers/andes-venezolanos.svgz.desktop +debian/tmp/opt/trinity/share/wallpapers/another-view.jpg +debian/tmp/opt/trinity/share/wallpapers/another-view.jpg.desktop debian/tmp/opt/trinity/share/wallpapers/aurora.svgz debian/tmp/opt/trinity/share/wallpapers/aurora.svgz.desktop -debian/tmp/opt/trinity/share/wallpapers/aghi.jpg -debian/tmp/opt/trinity/share/wallpapers/aghi.jpg.desktop debian/tmp/opt/trinity/share/wallpapers/blue-bend.jpg debian/tmp/opt/trinity/share/wallpapers/blue-bend.jpg.desktop debian/tmp/opt/trinity/share/wallpapers/celtic.svgz @@ -1195,14 +1199,14 @@ debian/tmp/opt/trinity/share/wallpapers/horse-head-nebula.png debian/tmp/opt/trinity/share/wallpapers/horse-head-nebula.png.desktop debian/tmp/opt/trinity/share/wallpapers/isadora.png debian/tmp/opt/trinity/share/wallpapers/isadora.png.desktop -debian/tmp/opt/trinity/share/wallpapers/Trinity4.png -debian/tmp/opt/trinity/share/wallpapers/Trinity4.png.desktop debian/tmp/opt/trinity/share/wallpapers/konqui.svgz debian/tmp/opt/trinity/share/wallpapers/konqui.svgz.desktop debian/tmp/opt/trinity/share/wallpapers/lineart.svgz debian/tmp/opt/trinity/share/wallpapers/lineart.svgz.desktop debian/tmp/opt/trinity/share/wallpapers/moon.svgz debian/tmp/opt/trinity/share/wallpapers/moon.svgz.desktop +debian/tmp/opt/trinity/share/wallpapers/mountain-lake.jpg +debian/tmp/opt/trinity/share/wallpapers/mountain-lake.jpg.desktop debian/tmp/opt/trinity/share/wallpapers/No-Ones-Laughing-3.jpg debian/tmp/opt/trinity/share/wallpapers/No-Ones-Laughing-3.jpg.desktop debian/tmp/opt/trinity/share/wallpapers/seaofconero.jpg @@ -1219,6 +1223,10 @@ debian/tmp/opt/trinity/share/wallpapers/Time-For-Lunch-2.jpg debian/tmp/opt/trinity/share/wallpapers/Time-For-Lunch-2.jpg.desktop debian/tmp/opt/trinity/share/wallpapers/Totally-New-Product-1.jpg debian/tmp/opt/trinity/share/wallpapers/Totally-New-Product-1.jpg.desktop +debian/tmp/opt/trinity/share/wallpapers/Trinity4.png +debian/tmp/opt/trinity/share/wallpapers/Trinity4.png.desktop +debian/tmp/opt/trinity/share/wallpapers/Trinity-lineart.svg +debian/tmp/opt/trinity/share/wallpapers/Trinity-lineart.svg.desktop debian/tmp/opt/trinity/share/wallpapers/triplegears.jpg debian/tmp/opt/trinity/share/wallpapers/triplegears.jpg.desktop debian/tmp/opt/trinity/share/wallpapers/Won-Ton-Soup-3.jpg diff --git a/ubuntu/maverick/tdebase/debian/tdepasswd-trinity.install b/ubuntu/maverick/tdebase/debian/tdepasswd-trinity.install index 43a7beeaa..a951e7daf 100644 --- a/ubuntu/maverick/tdebase/debian/tdepasswd-trinity.install +++ b/ubuntu/maverick/tdebase/debian/tdepasswd-trinity.install @@ -33,3 +33,6 @@ debian/tmp/opt/trinity/share/apps/tdm/pics/users/Teddybear.png debian/tmp/opt/trinity/share/apps/tdm/pics/users/Turtle.png debian/tmp/opt/trinity/share/config.kcfg/kcm_useraccount.kcfg debian/tmp/opt/trinity/share/config.kcfg/kcm_useraccount_pass.kcfg +debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdepasswd/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdepasswd/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdepasswd/index.docbook diff --git a/ubuntu/maverick/tdebase/debian/tdm-trinity.install b/ubuntu/maverick/tdebase/debian/tdm-trinity.install index 04241c097..afcf37d7b 100644 --- a/ubuntu/maverick/tdebase/debian/tdm-trinity.install +++ b/ubuntu/maverick/tdebase/debian/tdm-trinity.install @@ -44,6 +44,7 @@ debian/tmp/opt/trinity/share/apps/tdm/themes/circles/GdmGreeterTheme.desktop debian/tmp/opt/trinity/share/apps/tdm/themes/circles/help.png debian/tmp/opt/trinity/share/apps/tdm/themes/circles/options.png debian/tmp/opt/trinity/share/apps/tdm/themes/circles/screenshot.png +debian/tmp/opt/trinity/share/apps/tdm/themes/minimalist debian/tmp/opt/trinity/share/apps/tdm/themes/o2_enterprise debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdm/common debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdm/index.cache.bz2 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 7cea1e503..21dafee6a 100644 --- a/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.install +++ b/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.install @@ -160,29 +160,20 @@ debian/tmp/opt/trinity/share/apps/tdeprint/testprint.ps debian/tmp/opt/trinity/share/apps/tdeprint/tiledown.png debian/tmp/opt/trinity/share/apps/tdeprint/tileup.png debian/tmp/opt/trinity/share/apps/tdeprint/tools/escputil.desktop -debian/tmp/opt/trinity/share/apps/tdeui/about/bar-bottom-left.png -debian/tmp/opt/trinity/share/apps/tdeui/about/bar-bottom-middle.png -debian/tmp/opt/trinity/share/apps/tdeui/about/bar-bottom-right.png -debian/tmp/opt/trinity/share/apps/tdeui/about/bar-middle-left.png -debian/tmp/opt/trinity/share/apps/tdeui/about/bar-middle-right.png -debian/tmp/opt/trinity/share/apps/tdeui/about/bar-top-left.png -debian/tmp/opt/trinity/share/apps/tdeui/about/bar-top-middle.png -debian/tmp/opt/trinity/share/apps/tdeui/about/bar-top-right.png -debian/tmp/opt/trinity/share/apps/tdeui/about/bottom-left.png -debian/tmp/opt/trinity/share/apps/tdeui/about/bottom-middle.png -debian/tmp/opt/trinity/share/apps/tdeui/about/bottom-right.png +debian/tmp/opt/trinity/share/apps/tdeui/about/back.png debian/tmp/opt/trinity/share/apps/tdeui/about/box-bottom-left.png debian/tmp/opt/trinity/share/apps/tdeui/about/box-bottom-middle.png debian/tmp/opt/trinity/share/apps/tdeui/about/box-bottom-right.png +debian/tmp/opt/trinity/share/apps/tdeui/about/box-center.png debian/tmp/opt/trinity/share/apps/tdeui/about/box-middle-left.png debian/tmp/opt/trinity/share/apps/tdeui/about/box-middle-right.png debian/tmp/opt/trinity/share/apps/tdeui/about/box-top-left.png debian/tmp/opt/trinity/share/apps/tdeui/about/box-top-middle.png debian/tmp/opt/trinity/share/apps/tdeui/about/box-top-right.png -debian/tmp/opt/trinity/share/apps/tdeui/about/kde_infopage.css -debian/tmp/opt/trinity/share/apps/tdeui/about/kde_infopage_rtl.css debian/tmp/opt/trinity/share/apps/tdeui/about/top-left.png debian/tmp/opt/trinity/share/apps/tdeui/about/top-middle.png +debian/tmp/opt/trinity/share/apps/tdeui/about/kde_infopage.css +debian/tmp/opt/trinity/share/apps/tdeui/about/kde_infopage_rtl.css debian/tmp/opt/trinity/share/apps/tdeui/pics/abouttde.png debian/tmp/opt/trinity/share/apps/tdeui/pics/ktip-background.png debian/tmp/opt/trinity/share/apps/tdeui/pics/ktip-bulb.png @@ -250,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/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 |