diff options
Diffstat (limited to 'debian/lenny')
241 files changed, 610 insertions, 616 deletions
diff --git a/debian/lenny/applications/abakus/debian/abakus-trinity.menu b/debian/lenny/applications/abakus/debian/abakus-trinity.menu index 7692affbf..bd59ecd41 100644 --- a/debian/lenny/applications/abakus/debian/abakus-trinity.menu +++ b/debian/lenny/applications/abakus/debian/abakus-trinity.menu @@ -3,4 +3,4 @@ title="AbaKus"\ command="/opt/trinity/bin/abakus"\ hints="TDE"\ - icon="/usr/share/pixmaps/abakus.xpm" + icon="/opt/trinity/share/pixmaps/abakus.xpm" diff --git a/debian/lenny/applications/amarok.cmake/debian/amarok-trinity.menu b/debian/lenny/applications/amarok.cmake/debian/amarok-trinity.menu index 7bd18dffa..51d4e1f8b 100644 --- a/debian/lenny/applications/amarok.cmake/debian/amarok-trinity.menu +++ b/debian/lenny/applications/amarok.cmake/debian/amarok-trinity.menu @@ -3,6 +3,6 @@ section="Applications/Sound"\ hints="TDE"\ title="Amarok"\ - icon32x32="/usr/share/pixmaps/amarok.xpm"\ - icon16x16="/usr/share/pixmaps/amarok-16.xpm"\ + icon32x32="/opt/trinity/share/pixmaps/amarok.xpm"\ + icon16x16="/opt/trinity/share/pixmaps/amarok-16.xpm"\ command="/opt/trinity/bin/amarok" diff --git a/debian/lenny/applications/amarok/debian/amarok-trinity.menu b/debian/lenny/applications/amarok/debian/amarok-trinity.menu index 7bd18dffa..51d4e1f8b 100644 --- a/debian/lenny/applications/amarok/debian/amarok-trinity.menu +++ b/debian/lenny/applications/amarok/debian/amarok-trinity.menu @@ -3,6 +3,6 @@ section="Applications/Sound"\ hints="TDE"\ title="Amarok"\ - icon32x32="/usr/share/pixmaps/amarok.xpm"\ - icon16x16="/usr/share/pixmaps/amarok-16.xpm"\ + icon32x32="/opt/trinity/share/pixmaps/amarok.xpm"\ + icon16x16="/opt/trinity/share/pixmaps/amarok-16.xpm"\ command="/opt/trinity/bin/amarok" diff --git a/debian/lenny/applications/amarok/debian/rules b/debian/lenny/applications/amarok/debian/rules index 77b0e3159..bb6288758 100755 --- a/debian/lenny/applications/amarok/debian/rules +++ b/debian/lenny/applications/amarok/debian/rules @@ -71,7 +71,7 @@ debian/stamp-automake: $(patsubst %,binary-install/%,$(DEB_PACKAGES)):: if test -e debian/$(cdbs_curpkg).lintian; then \ install -p -D -m644 debian/$(cdbs_curpkg).lintian \ - debian/$(cdbs_curpkg)/opt/trinity/share/lintian/overrides/$(cdbs_curpkg); \ + debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \ fi clean:: diff --git a/debian/lenny/applications/bibletime/debian/menu b/debian/lenny/applications/bibletime/debian/menu index 7ba4e395f..cf2c01b5d 100644 --- a/debian/lenny/applications/bibletime/debian/menu +++ b/debian/lenny/applications/bibletime/debian/menu @@ -1,6 +1,6 @@ ?package(bibletime):\ needs="X11"\ - hints="KDE,Bible"\ + hints="TDE,Bible"\ section="Applications/Education"\ title="BibleTime"\ icon="/opt/trinity/share/pixmaps/bibletime.xpm"\ diff --git a/debian/lenny/applications/digikam/debian/digikam-trinity.menu b/debian/lenny/applications/digikam/debian/digikam-trinity.menu index 949e0fba8..e4f9ec786 100644 --- a/debian/lenny/applications/digikam/debian/digikam-trinity.menu +++ b/debian/lenny/applications/digikam/debian/digikam-trinity.menu @@ -2,6 +2,6 @@ needs="X11"\ section="Applications/Viewers"\ title="digikam"\ - icon32x32="/usr/share/pixmaps/digikam.xpm"\ - icon16x16="/usr/share/pixmaps/digikam-16.xpm"\ + icon32x32="/opt/trinity/share/pixmaps/digikam.xpm"\ + icon16x16="/opt/trinity/share/pixmaps/digikam-16.xpm"\ command="/opt/trinity/bin/digikam" diff --git a/debian/lenny/applications/digikam/debian/showfoto-trinity.menu b/debian/lenny/applications/digikam/debian/showfoto-trinity.menu index 32ce26612..4210733e4 100644 --- a/debian/lenny/applications/digikam/debian/showfoto-trinity.menu +++ b/debian/lenny/applications/digikam/debian/showfoto-trinity.menu @@ -2,6 +2,6 @@ needs="X11"\ section="Applications/Viewers"\ title="showfoto"\ - icon32x32="/usr/share/pixmaps/showfoto.xpm"\ - icon16x16="/usr/share/pixmaps/showfoto-16.xpm"\ + icon32x32="/opt/trinity/share/pixmaps/showfoto.xpm"\ + icon16x16="/opt/trinity/share/pixmaps/showfoto-16.xpm"\ command="/opt/trinity/bin/showfoto" diff --git a/debian/lenny/applications/filelight/debian/menu b/debian/lenny/applications/filelight/debian/menu index 4db4c3f62..db52bceb9 100644 --- a/debian/lenny/applications/filelight/debian/menu +++ b/debian/lenny/applications/filelight/debian/menu @@ -1,6 +1,6 @@ ?package(filelight):needs="X11" \ section="Apps/System" \ - hints="KDE, Monitoring, Files" \ + hints="TDE, Monitoring, Files" \ command="/opt/trinity/bin/filelight" \ title="Filelight" \ longtitle="Filelight: disk usage as concentric rings" diff --git a/debian/lenny/applications/gwenview/debian/gwenview.lintian b/debian/lenny/applications/gwenview/debian/gwenview.lintian index 6fdaead63..0e247a6ab 100644 --- a/debian/lenny/applications/gwenview/debian/gwenview.lintian +++ b/debian/lenny/applications/gwenview/debian/gwenview.lintian @@ -1,3 +1,3 @@ -gwenview binary: non-dev-pkg-with-shlib-symlink opt/trinity/lib/libgwenviewcore.so.1.0.0 opt/trinity/lib/libgwenviewcore.so -gwenview binary: shlib-missing-in-control-file libtdeinit_gwenview.so for opt/trinity/lib/libtdeinit_gwenview.so -gwenview binary: package-name-doesnt-match-sonames libgwenviewcore1 libtdeinit-gwenview +gwenview-trinity binary: non-dev-pkg-with-shlib-symlink opt/trinity/lib/libgwenviewcore.so.1.0.0 opt/trinity/lib/libgwenviewcore.so +gwenview-trinity binary: shlib-missing-in-control-file libtdeinit_gwenview.so for opt/trinity/lib/libtdeinit_gwenview.so +gwenview-trinity binary: package-name-doesnt-match-sonames libgwenviewcore1 libtdeinit-gwenview diff --git a/debian/lenny/applications/gwenview/debian/menu b/debian/lenny/applications/gwenview/debian/menu index c20d8c34c..c139009e3 100644 --- a/debian/lenny/applications/gwenview/debian/menu +++ b/debian/lenny/applications/gwenview/debian/menu @@ -1,7 +1,7 @@ ?package(gwenview):\ needs="X11"\ section="Applications/Viewers"\ - hints="KDE,Images"\ + hints="TDE,Images"\ title="Gwenview"\ command="/opt/trinity/bin/gwenview"\ - icon="/usr/share/pixmaps/gwenview.xpm" + icon="/opt/trinity/share/pixmaps/gwenview.xpm" diff --git a/debian/lenny/applications/gwenview/debian/rules b/debian/lenny/applications/gwenview/debian/rules index d6423c512..2fca00e50 100755 --- a/debian/lenny/applications/gwenview/debian/rules +++ b/debian/lenny/applications/gwenview/debian/rules @@ -37,8 +37,8 @@ debian/stamp-bootstrap: touch debian/stamp-bootstrap install/gwenview-trinity:: - install -p -D -m644 debian/gwenview.xpm debian/gwenview/opt/trinity/share/pixmaps/gwenview.xpm - install -p -D -m644 debian/gwenview.lintian debian/gwenview/opt/trinity/share/lintian/overrides/gwenview + install -p -D -m644 debian/gwenview.xpm debian/$(cdbs_curpkg)/opt/trinity/share/pixmaps/gwenview.xpm + install -p -D -m644 debian/gwenview.lintian debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg) - cd $(CURDIR)/debian/gwenview/opt/trinity/share/doc/tde/HTML/en/gwenview; \ + cd $(CURDIR)/debian/$(cdbs_curpkg)/opt/trinity/share/doc/tde/HTML/en/gwenview; \ /opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/gwenview/index.docbook diff --git a/debian/lenny/applications/k3b/debian/k3b-trinity.menu b/debian/lenny/applications/k3b/debian/k3b-trinity.menu index f07382ed8..52a67ba44 100644 --- a/debian/lenny/applications/k3b/debian/k3b-trinity.menu +++ b/debian/lenny/applications/k3b/debian/k3b-trinity.menu @@ -3,4 +3,4 @@ section="Applications/File Management"\ title="K3b"\ command="/opt/trinity/bin/k3b"\ - icon="/usr/share/pixmaps/k3b.xpm" + icon="/opt/trinity/share/pixmaps/k3b.xpm" diff --git a/debian/lenny/applications/k3b/debian/k3b.menu b/debian/lenny/applications/k3b/debian/k3b.menu index c6f95c029..52a67ba44 100644 --- a/debian/lenny/applications/k3b/debian/k3b.menu +++ b/debian/lenny/applications/k3b/debian/k3b.menu @@ -2,5 +2,5 @@ needs="X11"\ section="Applications/File Management"\ title="K3b"\ - command="/usr/bin/k3b"\ - icon="/usr/share/pixmaps/k3b.xpm" + command="/opt/trinity/bin/k3b"\ + icon="/opt/trinity/share/pixmaps/k3b.xpm" diff --git a/debian/lenny/applications/k9copy/debian/control b/debian/lenny/applications/k9copy/debian/control index 6453a7353..6fc30c6ea 100644 --- a/debian/lenny/applications/k9copy/debian/control +++ b/debian/lenny/applications/k9copy/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> XSBC-Original-Maintainer: Anthony Mercatante <tonio@ubuntu.com> -Build-Depends: debhelper (>= 5), cdbs, tdelibs4-trinity-dev, docbook2x, libdvdread-dev, libdbus-1-dev, libk3b-trinity-dev, libavformat-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: debhelper (>= 5), cdbs, tdelibs4-trinity-dev, docbook2x, docbook-xml, libdvdread-dev, libdbus-1-dev, libk3b-trinity-dev, libavformat-dev, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Package: k9copy-trinity diff --git a/debian/lenny/applications/k9copy/debian/k9copy.1.docbook b/debian/lenny/applications/k9copy/debian/k9copy.1.docbook index ff14d9107..96001a6ad 100644 --- a/debian/lenny/applications/k9copy/debian/k9copy.1.docbook +++ b/debian/lenny/applications/k9copy/debian/k9copy.1.docbook @@ -24,7 +24,7 @@ </refmeta> <refnamediv> <refname>k9copy</refname> - <refpurpose>DVD copy tool for KDE</refpurpose> + <refpurpose>DVD copy tool for TDE</refpurpose> </refnamediv> <refsynopsisdiv> <cmdsynopsis> @@ -33,14 +33,14 @@ <option><replaceable>Qt-options</replaceable></option> </arg> <arg choice="opt"> - <option><replaceable>KDE-options</replaceable></option> + <option><replaceable>TDE-options</replaceable></option> </arg> </cmdsynopsis> </refsynopsisdiv> <refsect1> <title>DESCRIPTION</title> <para> - DVD copy tool for KDE. + DVD copy tool for TDE. </para> <para> k9copy is a DVD backup utility which allow the copy of one or more titles from a DVD9 to a DVD5. @@ -49,7 +49,7 @@ <refsect1> <title>OPTIONS</title> <para> - All <productname>KDE</productname> and <productname>Qt</productname> + All <productname>TDE</productname> and <productname>Qt</productname> programs accept a some common command-line options. k9copy has no application-specific options. </para> @@ -65,8 +65,8 @@ <listitem> <para>Show Qt specific options</para> </listitem> </varlistentry> <varlistentry> - <term> <option>--help-kde</option> </term> - <listitem> <para>Show KDE specific options</para> </listitem> + <term> <option>--help-tde</option> </term> + <listitem> <para>Show TDE specific options</para> </listitem> </varlistentry> <varlistentry> <term> <option>--help-all</option> </term> diff --git a/debian/lenny/applications/k9copy/debian/rules b/debian/lenny/applications/k9copy/debian/rules index 8afe2157c..9d406d017 100755 --- a/debian/lenny/applications/k9copy/debian/rules +++ b/debian/lenny/applications/k9copy/debian/rules @@ -30,11 +30,12 @@ debian/stamp-bootstrap: make -f admin/Makefile.common cvs touch debian/stamp-bootstrap -install/k9copy:: - dh_install src/k9copy.desktop opt/trinity/share/applications/tde - dh_link usr/share/doc/tde/HTML/en/k9copy usr/share/doc/k9copy/html +install/k9copy-trinity:: + dh_installman k9copy.1 + mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/ + dh_link opt/trinity/share/doc/tde/HTML/en/k9copy usr/share/doc/$(cdbs_curpkg)/html -build/k9copy:: +build/k9copy-trinity:: docbook2x-man debian/k9copy.1.docbook clean:: diff --git a/debian/lenny/applications/kaffeine/debian/menu b/debian/lenny/applications/kaffeine/debian/menu index c9f3a50ac..50780b0a2 100644 --- a/debian/lenny/applications/kaffeine/debian/menu +++ b/debian/lenny/applications/kaffeine/debian/menu @@ -4,4 +4,4 @@ hints="TDE"\ title="Kaffeine"\ command="/opt/trinity/bin/kaffeine"\ - icon="/usr/share/pixmaps/kaffeine.xpm" + icon="/opt/trinity/share/pixmaps/kaffeine.xpm" diff --git a/debian/lenny/applications/kaffeine/debian/rules b/debian/lenny/applications/kaffeine/debian/rules index 9021f8fb0..2f9fed447 100755 --- a/debian/lenny/applications/kaffeine/debian/rules +++ b/debian/lenny/applications/kaffeine/debian/rules @@ -33,24 +33,24 @@ debian/stamp-bootstrap: touch debian/stamp-bootstrap install/kaffeine-trinity:: - install -D -p -m0644 debian/kaffeine.xpm debian/kaffeine/opt/trinity/share/pixmaps/kaffeine.xpm - install -D -p -m0644 debian/kaffeine-trinity.lintian-overrides debian/kaffeine/opt/trinity/share/lintian/overrides/kaffeine - install -D -p -m0755 debian/install-css.sh debian/kaffeine/opt/trinity/share/doc/kaffeine/install-css.sh - install -D -p -m0644 debian/kaffeine-iso.desktop debian/kaffeine/opt/trinity/share/applications/tde/kaffeine-iso.desktop + install -D -p -m0644 debian/kaffeine.xpm debian/$(cdbs_curpkg)/opt/trinity/share/pixmaps/kaffeine.xpm + install -D -p -m0644 debian/kaffeine-trinity.lintian-overrides debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg) + install -D -p -m0755 debian/install-css.sh debian/$(cdbs_curpkg)/opt/trinity/share/doc/kaffeine/install-css.sh + install -D -p -m0644 debian/kaffeine-iso.desktop debian/$(cdbs_curpkg)/opt/trinity/share/applications/tde/kaffeine-iso.desktop #Debian additions - install -D -p -m0755 debian/install-codecs debian/kaffeine/opt/trinity/lib/kaffeine/install-codecs - install -D -p -m0644 debian/kaffeine_xine-install-dvdcss.desktop debian/kaffeine/opt/trinity/share/services/kaffeine_xine-install-dvdcss.desktop - install -D -p -m0644 debian/kaffeine_xine-install-ffmpeg.desktop debian/kaffeine/opt/trinity/share/services/kaffeine_xine-install-ffmpeg.desktop - install -D -p -m0644 debian/kaffeine_codecinstall.desktop debian/kaffeine/opt/trinity/share/servicetypes/kaffeine_codecinstall.desktop + install -D -p -m0755 debian/install-codecs debian/$(cdbs_curpkg)/opt/trinity/lib/kaffeine/install-codecs + install -D -p -m0644 debian/kaffeine_xine-install-dvdcss.desktop debian/$(cdbs_curpkg)/opt/trinity/share/services/kaffeine_xine-install-dvdcss.desktop + install -D -p -m0644 debian/kaffeine_xine-install-ffmpeg.desktop debian/$(cdbs_curpkg)/opt/trinity/share/services/kaffeine_xine-install-ffmpeg.desktop + install -D -p -m0644 debian/kaffeine_codecinstall.desktop debian/$(cdbs_curpkg)/opt/trinity/share/servicetypes/kaffeine_codecinstall.desktop # file shipped by tdelibs - rm -f debian/kaffeine/opt/trinity/share/mimelnk/application/x-mplayer2.desktop + rm -f debian/$(cdbs_curpkg)/opt/trinity/share/mimelnk/application/x-mplayer2.desktop # Bogus, shouldn't be shipped.. - rm -f debian/kaffeine/opt/trinity/share/doc/tde/HTML/en/doc/CMakeLists.txt + rm -f debian/$(cdbs_curpkg)/opt/trinity/share/doc/tde/HTML/en/doc/CMakeLists.txt binary-install/kaffeine-trinity:: - mv debian/kaffeine-trinity/usr/share/man debian/kaffeine-trinity/opt/trinity/share/ + mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/ get-orig-source: @@dh_testdir diff --git a/debian/lenny/applications/kbarcode/debian/menu b/debian/lenny/applications/kbarcode/debian/menu index 48b3f8eff..e27b90141 100644 --- a/debian/lenny/applications/kbarcode/debian/menu +++ b/debian/lenny/applications/kbarcode/debian/menu @@ -1,6 +1,6 @@ ?package(kbarcode):\ needs="X11"\ section="Applications/Graphics"\ - hints="KDE,Barcode"\ + hints="TDE,Barcode"\ title="KBarcode"\ - command="/usr/bin/kbarcode" + command="/opt/trinity/bin/kbarcode" diff --git a/debian/lenny/applications/kcpuload/debian/menu b/debian/lenny/applications/kcpuload/debian/menu index 181ec82e6..1ae39c62a 100644 --- a/debian/lenny/applications/kcpuload/debian/menu +++ b/debian/lenny/applications/kcpuload/debian/menu @@ -4,4 +4,4 @@ kderemove="1"\ title="KCPULoad"\ command="/opt/trinity/bin/kcpuload"\ - icon="/usr/share/pixmaps/kcpuload.xpm" + icon="/opt/trinity/share/pixmaps/kcpuload.xpm" diff --git a/debian/lenny/applications/keep/debian/control b/debian/lenny/applications/keep/debian/control index 0adb5638a..ea5cae910 100644 --- a/debian/lenny/applications/keep/debian/control +++ b/debian/lenny/applications/keep/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: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org> -Build-Depends: cdbs, debhelper (>= 5), tdelibs4-trinity-dev, docbook2x, automake, autoconf, libtool, libltdl-dev +Build-Depends: cdbs, debhelper (>= 5), tdelibs4-trinity-dev, docbook2x, docbook-xml, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Package: keep-trinity diff --git a/debian/lenny/applications/keep/debian/keep.xml b/debian/lenny/applications/keep/debian/keep.xml index 0f07da7f0..0e97d35b3 100644 --- a/debian/lenny/applications/keep/debian/keep.xml +++ b/debian/lenny/applications/keep/debian/keep.xml @@ -24,7 +24,7 @@ </refmeta> <refnamediv> <refname>keep</refname> - <refpurpose>backup system for KDE</refpurpose> + <refpurpose>backup system for TDE</refpurpose> </refnamediv> <refsynopsisdiv> <cmdsynopsis> @@ -33,14 +33,14 @@ <option><replaceable>Qt-options</replaceable></option> </arg> <arg choice="opt"> - <option><replaceable>KDE-options</replaceable></option> + <option><replaceable>TDE-options</replaceable></option> </arg> </cmdsynopsis> </refsynopsisdiv> <refsect1> <title>DESCRIPTION</title> <para> - backup system for KDE. + backup system for TDE. </para> <para> The behavior is quite simple: you choose the files you want to backup, you set up the frequency and the number of backup you want to have, and Keep will backup them automatically. @@ -49,7 +49,7 @@ <refsect1> <title>OPTIONS</title> <para> - All <productname>KDE</productname> and <productname>Qt</productname> + All <productname>TDE</productname> and <productname>Qt</productname> programs accept a some common command-line options. keep has no application-specific options. </para> @@ -65,8 +65,8 @@ <listitem> <para>Show Qt specific options</para> </listitem> </varlistentry> <varlistentry> - <term> <option>--help-kde</option> </term> - <listitem> <para>Show KDE specific options</para> </listitem> + <term> <option>--help-tde</option> </term> + <listitem> <para>Show TDE specific options</para> </listitem> </varlistentry> <varlistentry> <term> <option>--help-all</option> </term> diff --git a/debian/lenny/applications/keep/debian/rules b/debian/lenny/applications/keep/debian/rules index 1b5054df6..c08262790 100755 --- a/debian/lenny/applications/keep/debian/rules +++ b/debian/lenny/applications/keep/debian/rules @@ -31,8 +31,13 @@ debian/stamp-bootstrap: make -f admin/Makefile.common cvs touch debian/stamp-bootstrap -build/keep:: +build/keep-trinity:: /usr/bin/docbook2x-man debian/keep.xml +install/keep-trinity:: + dh_installman keep.1 + mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/ + clean:: + rm -f debian/stamp-bootstrap rm -f keep.1 diff --git a/debian/lenny/applications/kerry/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/kerry/debian/cdbs/debian-qt-kde.mk index d135c4257..4a11bc028 100644 --- a/debian/lenny/applications/kerry/debian/cdbs/debian-qt-kde.mk +++ b/debian/lenny/applications/kerry/debian/cdbs/debian-qt-kde.mk @@ -75,11 +75,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi if test -e debian/$(cdbs_curpkg).lintian; then \ install -p -D -m644 debian/$(cdbs_curpkg).lintian \ - debian/$(cdbs_curpkg)/opt/trinity/share/lintian/overrides/$(cdbs_curpkg); \ + debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \ fi if test -e debian/$(cdbs_curpkg).presubj; then \ install -p -D -m644 debian/$(cdbs_curpkg).presubj \ - debian/$(cdbs_curpkg)/opt/trinity/share/bug/$(cdbs_curpkg)/presubj; \ + debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ fi binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: diff --git a/debian/lenny/applications/kile/debian/menu b/debian/lenny/applications/kile/debian/menu index 2d5ca41b0..1ab2d756b 100644 --- a/debian/lenny/applications/kile/debian/menu +++ b/debian/lenny/applications/kile/debian/menu @@ -4,4 +4,4 @@ title="Kile" \ longtitle="Kile (LaTeX development environment)" \ command="/opt/trinity/bin/kile" \ - icon="/usr/share/pixmaps/kile.xpm" + icon="/opt/trinity/share/pixmaps/kile.xpm" diff --git a/debian/lenny/applications/knetload/debian/menu b/debian/lenny/applications/knetload/debian/menu index d6e27b1a4..4a380d449 100644 --- a/debian/lenny/applications/knetload/debian/menu +++ b/debian/lenny/applications/knetload/debian/menu @@ -3,4 +3,4 @@ hints="TDE"\ title="KNetLoad"\ command="/opt/trinity/bin/knetload"\ - icon="/usr/share/pixmaps/knetload.xpm" + icon="/opt/trinity/share/pixmaps/knetload.xpm" diff --git a/debian/lenny/applications/knetworkmanager.cmake/debian/menu b/debian/lenny/applications/knetworkmanager.cmake/debian/menu index 9775e9c7c..3853fafff 100644 --- a/debian/lenny/applications/knetworkmanager.cmake/debian/menu +++ b/debian/lenny/applications/knetworkmanager.cmake/debian/menu @@ -1,6 +1,6 @@ -?package(network-manager-kde): \ +?package(network-manager-tde): \ needs="X11" \ section="Applications/Network/Monitoring" \ title="KNetworkManager" \ - longtitle="A KDE frontend for NetworkManager" \ + longtitle="A TDE frontend for NetworkManager" \ command="/opt/trinity/bin/knetworkmanager" diff --git a/debian/lenny/applications/knetworkmanager8/debian/menu b/debian/lenny/applications/knetworkmanager8/debian/menu index 9775e9c7c..3853fafff 100644 --- a/debian/lenny/applications/knetworkmanager8/debian/menu +++ b/debian/lenny/applications/knetworkmanager8/debian/menu @@ -1,6 +1,6 @@ -?package(network-manager-kde): \ +?package(network-manager-tde): \ needs="X11" \ section="Applications/Network/Monitoring" \ title="KNetworkManager" \ - longtitle="A KDE frontend for NetworkManager" \ + longtitle="A TDE frontend for NetworkManager" \ command="/opt/trinity/bin/knetworkmanager" diff --git a/debian/lenny/applications/koffice/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/koffice/debian/cdbs/debian-qt-kde.mk index 53c516a66..b93e7c154 100644 --- a/debian/lenny/applications/koffice/debian/cdbs/debian-qt-kde.mk +++ b/debian/lenny/applications/koffice/debian/cdbs/debian-qt-kde.mk @@ -75,11 +75,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi if test -e debian/$(cdbs_curpkg).lintian; then \ install -p -D -m644 debian/$(cdbs_curpkg).lintian \ - debian/$(cdbs_curpkg)/opt/trinity/share/lintian/overrides/$(cdbs_curpkg); \ + debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \ fi if test -e debian/$(cdbs_curpkg).presubj; then \ install -p -D -m644 debian/$(cdbs_curpkg).presubj \ - debian/$(cdbs_curpkg)/opt/trinity/share/bug/$(cdbs_curpkg)/presubj; \ + debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ fi binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: diff --git a/debian/lenny/applications/koffice/debian/chalk-data-trinity.lintian b/debian/lenny/applications/koffice/debian/chalk-data-trinity.lintian index 820cf112f..7500cb18d 100644 --- a/debian/lenny/applications/koffice/debian/chalk-data-trinity.lintian +++ b/debian/lenny/applications/koffice/debian/chalk-data-trinity.lintian @@ -1,17 +1,17 @@ -chalk-data: executable-not-elf-or-script ./usr/share/apps/chalk/scripts/torturepainting/torture-painting.rb -chalk-data: executable-not-elf-or-script ./usr/share/apps/chalk/scripts/reshapehisto/reshapehisto.rc -chalk-data: executable-not-elf-or-script ./usr/share/apps/chalk/scripts/changecs/changecs.rc -chalk-data: executable-not-elf-or-script ./usr/share/apps/chalk/scripts/randompaint/randompaint.rb -chalk-data: executable-not-elf-or-script ./usr/share/apps/chalk/scripts/filterstest/filterstest.rb -chalk-data: executable-not-elf-or-script ./usr/share/apps/chalk/scripts/invertpython/invert.py -chalk-data: executable-not-elf-or-script ./usr/share/apps/chalk/scripts/invertpython/invertpython.rc -chalk-data: executable-not-elf-or-script ./usr/share/apps/chalk/scripts/torturefilters/torture-filters.rc -chalk-data: executable-not-elf-or-script ./usr/share/apps/chalk/scripts/reshapehisto/reshapehisto.py -chalk-data: executable-not-elf-or-script ./usr/share/apps/chalk/scripts/invertruby/invertruby.rc -chalk-data: executable-not-elf-or-script ./usr/share/apps/chalk/scripts/filterstest/filterstest.rc -chalk-data: executable-not-elf-or-script ./usr/share/apps/chalk/scripts/torturepainting/torture-painting.rc -chalk-data: executable-not-elf-or-script ./usr/share/apps/chalk/scripts/torturefilters/torture-filters.rb -chalk-data: executable-not-elf-or-script ./usr/share/apps/chalk/scripts/changecs/changecs.rb -chalk-data: executable-not-elf-or-script ./usr/share/apps/chalk/scripts/invertruby/invert.rb -chalk-data: executable-not-elf-or-script ./usr/share/apps/chalk/scripts/randompaint/randompaint.rc -chalk-data: desktop-command-not-in-package /usr/share/applications/tde/chalk.desktop chalk +chalk-data-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/chalk/scripts/torturepainting/torture-painting.rb +chalk-data-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/chalk/scripts/reshapehisto/reshapehisto.rc +chalk-data-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/chalk/scripts/changecs/changecs.rc +chalk-data-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/chalk/scripts/randompaint/randompaint.rb +chalk-data-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/chalk/scripts/filterstest/filterstest.rb +chalk-data-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/chalk/scripts/invertpython/invert.py +chalk-data-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/chalk/scripts/invertpython/invertpython.rc +chalk-data-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/chalk/scripts/torturefilters/torture-filters.rc +chalk-data-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/chalk/scripts/reshapehisto/reshapehisto.py +chalk-data-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/chalk/scripts/invertruby/invertruby.rc +chalk-data-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/chalk/scripts/filterstest/filterstest.rc +chalk-data-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/chalk/scripts/torturepainting/torture-painting.rc +chalk-data-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/chalk/scripts/torturefilters/torture-filters.rb +chalk-data-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/chalk/scripts/changecs/changecs.rb +chalk-data-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/chalk/scripts/invertruby/invert.rb +chalk-data-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/chalk/scripts/randompaint/randompaint.rc +chalk-data-trinity: desktop-command-not-in-package /opt/trinity/share/applications/tde/chalk.desktop chalk diff --git a/debian/lenny/applications/koffice/debian/chalk-trinity.lintian b/debian/lenny/applications/koffice/debian/chalk-trinity.lintian index 08adc5291..1d75d150d 100644 --- a/debian/lenny/applications/koffice/debian/chalk-trinity.lintian +++ b/debian/lenny/applications/koffice/debian/chalk-trinity.lintian @@ -1,4 +1,4 @@ -chalk: shlib-missing-in-control-file libtdeinit_chalk.so for usr/lib/libtdeinit_chalk.so -chalk: menu-icon-missing /usr/share/pixmaps/chalk.xpm -chalk: package-name-doesnt-match-sonames libtdeinit-chalk libchalk-cmyk-u16-0 libchalk-gray-u16-0 libchalk-lms-f32-0 libchalk-rgb-f16half0 libchalk-rgb-f32-0 libchalk-rgb-u16-0 libchalk-ycbcr-u16-0 libchalk-ycbcr-u8-0 libchalkcolor1 libchalkcommon1 libchalkgrayscale0 libchalkimage1 libchalkrgb0 libchalkscripting0 libchalkui1 +chalk-trinity: shlib-missing-in-control-file libtdeinit_chalk.so for opt/trinity/lib/libtdeinit_chalk.so +chalk-trinity: menu-icon-missing /opt/trinity/share/pixmaps/chalk.xpm +chalk-trinity: package-name-doesnt-match-sonames libtdeinit-chalk libchalk-cmyk-u16-0 libchalk-gray-u16-0 libchalk-lms-f32-0 libchalk-rgb-f16half0 libchalk-rgb-f32-0 libchalk-rgb-u16-0 libchalk-ycbcr-u16-0 libchalk-ycbcr-u8-0 libchalkcolor1 libchalkcommon1 libchalkgrayscale0 libchalkimage1 libchalkrgb0 libchalkscripting0 libchalkui1 diff --git a/debian/lenny/applications/koffice/debian/chalk-trinity.menu b/debian/lenny/applications/koffice/debian/chalk-trinity.menu index 2354092d2..d5c662a09 100644 --- a/debian/lenny/applications/koffice/debian/chalk-trinity.menu +++ b/debian/lenny/applications/koffice/debian/chalk-trinity.menu @@ -1,7 +1,7 @@ ?package(chalk):\ needs="x11"\ section="Applications/Graphics"\ - hints="KDE,Bitmap"\ + hints="TDE,Bitmap"\ title="Chalk"\ longtitle="Chalk (Image Manipulation)"\ icon="/opt/trinity/share/pixmaps/chalk.xpm"\ diff --git a/debian/lenny/applications/koffice/debian/karbon-trinity.lintian b/debian/lenny/applications/koffice/debian/karbon-trinity.lintian index 9733b0a93..b08ff3b43 100644 --- a/debian/lenny/applications/koffice/debian/karbon-trinity.lintian +++ b/debian/lenny/applications/koffice/debian/karbon-trinity.lintian @@ -1,2 +1,2 @@ -karbon: shlib-missing-in-control-file libtdeinit_karbon.so for usr/lib/libtdeinit_karbon.so -karbon: package-name-doesnt-match-sonames libkarboncommon0 libtdeinit-karbon +karbon-trinity: shlib-missing-in-control-file libtdeinit_karbon.so for opt/trinity/lib/libtdeinit_karbon.so +karbon-trinity: package-name-doesnt-match-sonames libkarboncommon0 libtdeinit-karbon diff --git a/debian/lenny/applications/koffice/debian/karbon-trinity.menu b/debian/lenny/applications/koffice/debian/karbon-trinity.menu index 0329fc505..b44ea5b50 100644 --- a/debian/lenny/applications/koffice/debian/karbon-trinity.menu +++ b/debian/lenny/applications/koffice/debian/karbon-trinity.menu @@ -1,7 +1,7 @@ ?package(karbon):\ needs="x11"\ section="Applications/Graphics"\ - hints="KDE,Vector"\ + hints="TDE,Vector"\ title="Karbon"\ longtitle="Karbon (Scalable Graphics)"\ icon="/opt/trinity/share/pixmaps/karbon.xpm"\ diff --git a/debian/lenny/applications/koffice/debian/kchart-trinity.lintian b/debian/lenny/applications/koffice/debian/kchart-trinity.lintian index 4a9df9c9e..b548f2d00 100644 --- a/debian/lenny/applications/koffice/debian/kchart-trinity.lintian +++ b/debian/lenny/applications/koffice/debian/kchart-trinity.lintian @@ -1,5 +1,5 @@ # There is no -dev package. -kchart: non-dev-pkg-with-shlib-symlink usr/lib/libkdchart.so.0.0.0 usr/lib/libkdchart.so -kchart: shlib-missing-in-control-file libtdeinit_kchart.so for usr/lib/libtdeinit_kchart.so -kchart: package-name-doesnt-match-sonames libkchartcommon2 libkchartimageexport4 libkdchart0 libtdeinit-kchart +kchart-trinity: non-dev-pkg-with-shlib-symlink opt/trinity/lib/libkdchart.so.0.0.0 opt/trinity/lib/libkdchart.so +kchart-trinity: shlib-missing-in-control-file libtdeinit_kchart.so for opt/trinity/lib/libtdeinit_kchart.so +kchart-trinity: package-name-doesnt-match-sonames libkchartcommon2 libkchartimageexport4 libkdchart0 libtdeinit-kchart diff --git a/debian/lenny/applications/koffice/debian/kchart-trinity.menu b/debian/lenny/applications/koffice/debian/kchart-trinity.menu index 405e19fec..5939ec5d4 100644 --- a/debian/lenny/applications/koffice/debian/kchart-trinity.menu +++ b/debian/lenny/applications/koffice/debian/kchart-trinity.menu @@ -1,7 +1,7 @@ ?package(kchart):\ needs="x11"\ section="Applications/Office"\ - hints="KDE,Graphs"\ + hints="TDE,Graphs"\ title="KChart"\ longtitle="KChart (Charting)"\ icon="/opt/trinity/share/pixmaps/kchart.xpm"\ diff --git a/debian/lenny/applications/koffice/debian/kexi-trinity.lintian b/debian/lenny/applications/koffice/debian/kexi-trinity.lintian index 5288fb87d..c89fb0678 100644 --- a/debian/lenny/applications/koffice/debian/kexi-trinity.lintian +++ b/debian/lenny/applications/koffice/debian/kexi-trinity.lintian @@ -1,14 +1,14 @@ -kexi: shlib-missing-in-control-file libtdeinit_kexi.so for usr/lib/libtdeinit_kexi.so -kexi: executable-not-elf-or-script ./usr/share/apps/kexi/scripts/projectdocumentor/ProjectDocumentor.rc -kexi: executable-not-elf-or-script ./usr/share/apps/kexi/scripts/importxhtml/ImportXHTML.py -kexi: executable-not-elf-or-script ./usr/share/apps/kexi/scripts/copycenter/readme.html -kexi: executable-not-elf-or-script ./usr/share/apps/kexi/scripts/copycenter/CopyCenterPluginKexiDB.py -kexi: executable-not-elf-or-script ./usr/share/apps/kexi/scripts/exportxhtml/ExportXHTML.py -kexi: executable-not-elf-or-script ./usr/share/apps/kexi/scripts/copycenter/CopyCenter.rc -kexi: executable-not-elf-or-script ./usr/share/apps/kexi/scripts/projectdocumentor/ProjectDocumentor.py -kexi: executable-not-elf-or-script ./usr/share/apps/kexi/scripts/importxhtml/ImportXHTML.rc -kexi: executable-not-elf-or-script ./usr/share/apps/kexi/scripts/copycenter/CopyCenterPluginQtSQL.py -kexi: executable-not-elf-or-script ./usr/share/apps/kexi/kross/python/kexiapp/__init__.py -kexi: executable-not-elf-or-script ./usr/share/apps/kexi/scripts/exportxhtml/ExportXHTML.rc -kexi: executable-not-elf-or-script ./usr/share/apps/kexi/scripts/copycenter/CopyCenter.py -kexi: package-name-doesnt-match-sonames libtdeinit-kexi libkexicore2 libkexidatatable2 libkexidb2 libkexidbparser2 libkexiextendedwidgets2 libkexiformutils2 libkexiguiutils2 libkeximain2 libkeximigrate2 libkexirelationsview2 libkexisql2-2 libkexisql3-3 libkexiutils2 libkformdesigner2 +kexi-trinity: shlib-missing-in-control-file libtdeinit_kexi.so for opt/trinity/lib/libtdeinit_kexi.so +kexi-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/kexi/scripts/projectdocumentor/ProjectDocumentor.rc +kexi-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/kexi/scripts/importxhtml/ImportXHTML.py +kexi-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/kexi/scripts/copycenter/readme.html +kexi-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/kexi/scripts/copycenter/CopyCenterPluginKexiDB.py +kexi-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/kexi/scripts/exportxhtml/ExportXHTML.py +kexi-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/kexi/scripts/copycenter/CopyCenter.rc +kexi-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/kexi/scripts/projectdocumentor/ProjectDocumentor.py +kexi-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/kexi/scripts/importxhtml/ImportXHTML.rc +kexi-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/kexi/scripts/copycenter/CopyCenterPluginQtSQL.py +kexi-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/kexi/kross/python/kexiapp/__init__.py +kexi-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/kexi/scripts/exportxhtml/ExportXHTML.rc +kexi-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/kexi/scripts/copycenter/CopyCenter.py +kexi-trinity: package-name-doesnt-match-sonames libtdeinit-kexi libkexicore2 libkexidatatable2 libkexidb2 libkexidbparser2 libkexiextendedwidgets2 libkexiformutils2 libkexiguiutils2 libkeximain2 libkeximigrate2 libkexirelationsview2 libkexisql2-2 libkexisql3-3 libkexiutils2 libkformdesigner2 diff --git a/debian/lenny/applications/koffice/debian/kformula-trinity.lintian b/debian/lenny/applications/koffice/debian/kformula-trinity.lintian index 1062b39db..25a8c006f 100644 --- a/debian/lenny/applications/koffice/debian/kformula-trinity.lintian +++ b/debian/lenny/applications/koffice/debian/kformula-trinity.lintian @@ -1,4 +1,4 @@ -kformula: no-shlibs-control-file usr/lib/libtdeinit_kformula.so -kformula: postinst-must-call-ldconfig usr/lib/libtdeinit_kformula.so -kformula: postrm-should-call-ldconfig usr/lib/libtdeinit_kformula.so -kformula: package-name-doesnt-match-sonames libtdeinit-kformula +kformula-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kformula.so +kformula-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kformula.so +kformula-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kformula.so +kformula-trinity: package-name-doesnt-match-sonames libtdeinit-kformula diff --git a/debian/lenny/applications/koffice/debian/kivio-data-trinity.lintian b/debian/lenny/applications/koffice/debian/kivio-data-trinity.lintian index d77987c69..66e15fdb7 100644 --- a/debian/lenny/applications/koffice/debian/kivio-data-trinity.lintian +++ b/debian/lenny/applications/koffice/debian/kivio-data-trinity.lintian @@ -1,2 +1,2 @@ -kivio-data: desktop-command-not-in-package /usr/share/applications/tde/kivio.desktop kivio +kivio-data-trinity: desktop-command-not-in-package /opt/trinity/share/applications/tde/kivio.desktop kivio diff --git a/debian/lenny/applications/koffice/debian/kivio-trinity.lintian b/debian/lenny/applications/koffice/debian/kivio-trinity.lintian index 02a07173b..1ff9e3f76 100644 --- a/debian/lenny/applications/koffice/debian/kivio-trinity.lintian +++ b/debian/lenny/applications/koffice/debian/kivio-trinity.lintian @@ -1,4 +1,4 @@ -kivio: shlib-missing-in-control-file libtdeinit_kivio.so for usr/lib/libtdeinit_kivio.so -kivio: menu-icon-missing /usr/share/pixmaps/kivio.xpm -kivio: package-name-doesnt-match-sonames libtdeinit-kivio libkiviocommon0 +kivio-trinity: shlib-missing-in-control-file libtdeinit_kivio.so for opt/trinity/lib/libtdeinit_kivio.so +kivio-trinity: menu-icon-missing /opt/trinity/share/pixmaps/kivio.xpm +kivio-trinity: package-name-doesnt-match-sonames libtdeinit-kivio libkiviocommon0 diff --git a/debian/lenny/applications/koffice/debian/kivio-trinity.menu b/debian/lenny/applications/koffice/debian/kivio-trinity.menu index db45a4245..ea5177019 100644 --- a/debian/lenny/applications/koffice/debian/kivio-trinity.menu +++ b/debian/lenny/applications/koffice/debian/kivio-trinity.menu @@ -1,7 +1,7 @@ ?package(kivio):\ needs="x11"\ section="Applications/Graphics"\ - hints="KDE,Vector"\ + hints="TDE,Vector"\ title="Kivio"\ longtitle="Kivio (Flowchart and Diagram Editing)"\ icon="/opt/trinity/share/pixmaps/kivio.xpm"\ diff --git a/debian/lenny/applications/koffice/debian/koffice-libs-trinity.lintian b/debian/lenny/applications/koffice/debian/koffice-libs-trinity.lintian index bdf6f40e1..1137a9b12 100644 --- a/debian/lenny/applications/koffice/debian/koffice-libs-trinity.lintian +++ b/debian/lenny/applications/koffice/debian/koffice-libs-trinity.lintian @@ -1 +1 @@ -koffice-libs: package-name-doesnt-match-sonames libkformulalib4 libkochart1 libkofficecore3 libkofficeui3 libkopainter2 libkopalette1 libkoproperty2 libkotext3 libkowmf2 libkrossapi1 libkrossmain1 libkstore3 libkwmailmerge-interface4 libkwmf3 libkwordexportfilters1 +koffice-libs-trinity: package-name-doesnt-match-sonames libkformulalib4 libkochart1 libkofficecore3 libkofficeui3 libkopainter2 libkopalette1 libkoproperty2 libkotext3 libkowmf2 libkrossapi1 libkrossmain1 libkstore3 libkwmailmerge-interface4 libkwmf3 libkwordexportfilters1 diff --git a/debian/lenny/applications/koffice/debian/koshell-trinity.lintian b/debian/lenny/applications/koffice/debian/koshell-trinity.lintian index 45d130a4e..c77411ba2 100644 --- a/debian/lenny/applications/koffice/debian/koshell-trinity.lintian +++ b/debian/lenny/applications/koffice/debian/koshell-trinity.lintian @@ -1,4 +1,4 @@ -koshell: no-shlibs-control-file usr/lib/libtdeinit_koshell.so -koshell: postinst-must-call-ldconfig usr/lib/libtdeinit_koshell.so -koshell: postrm-should-call-ldconfig usr/lib/libtdeinit_koshell.so -koshell: package-name-doesnt-match-sonames libtdeinit-koshell +koshell-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_koshell.so +koshell-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_koshell.so +koshell-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_koshell.so +koshell-trinity: package-name-doesnt-match-sonames libtdeinit-koshell diff --git a/debian/lenny/applications/koffice/debian/kplato-trinity.lintian b/debian/lenny/applications/koffice/debian/kplato-trinity.lintian index f08eafe73..74f77679d 100644 --- a/debian/lenny/applications/koffice/debian/kplato-trinity.lintian +++ b/debian/lenny/applications/koffice/debian/kplato-trinity.lintian @@ -1,4 +1,4 @@ -kplato: no-shlibs-control-file usr/lib/libtdeinit_kplato.so -kplato: postinst-must-call-ldconfig usr/lib/libtdeinit_kplato.so -kplato: postrm-should-call-ldconfig usr/lib/libtdeinit_kplato.so -kplato: package-name-doesnt-match-sonames libtdeinit-kplato +kplato-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kplato.so +kplato-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kplato.so +kplato-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kplato.so +kplato-trinity: package-name-doesnt-match-sonames libtdeinit-kplato diff --git a/debian/lenny/applications/koffice/debian/kpresenter-data-trinity.lintian b/debian/lenny/applications/koffice/debian/kpresenter-data-trinity.lintian index 68e69e640..8a7a4f113 100644 --- a/debian/lenny/applications/koffice/debian/kpresenter-data-trinity.lintian +++ b/debian/lenny/applications/koffice/debian/kpresenter-data-trinity.lintian @@ -1,2 +1,2 @@ -kpresenter-data: desktop-command-not-in-package /usr/share/applications/tde/kpresenter.desktop kpresenter +kpresenter-data-trinity: desktop-command-not-in-package /opt/trinity/share/applications/tde/kpresenter.desktop kpresenter diff --git a/debian/lenny/applications/koffice/debian/kpresenter-trinity.lintian b/debian/lenny/applications/koffice/debian/kpresenter-trinity.lintian index 6e7af5591..dc55d0006 100644 --- a/debian/lenny/applications/koffice/debian/kpresenter-trinity.lintian +++ b/debian/lenny/applications/koffice/debian/kpresenter-trinity.lintian @@ -1,4 +1,4 @@ -kpresenter: script-with-language-extension usr/bin/kprconverter.pl -kpresenter: shlib-missing-in-control-file libtdeinit_kpresenter.so for usr/lib/libtdeinit_kpresenter.so -kpresenter: menu-icon-missing /usr/share/pixmaps/kpresenter.xpm -kpresenter: package-name-doesnt-match-sonames libtdeinit-kpresenter libkpresenterimageexport4 libkpresenterprivate4 +kpresenter-trinity: script-with-language-extension opt/trinity/bin/kprconverter.pl +kpresenter-trinity: shlib-missing-in-control-file libtdeinit_kpresenter.so for opt/trinity/lib/libtdeinit_kpresenter.so +kpresenter-trinity: menu-icon-missing /opt/trinity/share/pixmaps/kpresenter.xpm +kpresenter-trinity: package-name-doesnt-match-sonames libtdeinit-kpresenter libkpresenterimageexport4 libkpresenterprivate4 diff --git a/debian/lenny/applications/koffice/debian/kpresenter-trinity.menu b/debian/lenny/applications/koffice/debian/kpresenter-trinity.menu index 52bff66e1..dda510fcf 100644 --- a/debian/lenny/applications/koffice/debian/kpresenter-trinity.menu +++ b/debian/lenny/applications/koffice/debian/kpresenter-trinity.menu @@ -1,7 +1,7 @@ ?package(kpresenter):\ needs="x11"\ section="Applications/Office"\ - hints="KDE,Presentation"\ + hints="TDE,Presentation"\ title="KPresenter"\ longtitle="KPresenter (Slide Presentations)"\ icon="/opt/trinity/share/pixmaps/kpresenter.xpm"\ diff --git a/debian/lenny/applications/koffice/debian/kspread-trinity.lintian b/debian/lenny/applications/koffice/debian/kspread-trinity.lintian index b47c3a364..44cb7cb45 100644 --- a/debian/lenny/applications/koffice/debian/kspread-trinity.lintian +++ b/debian/lenny/applications/koffice/debian/kspread-trinity.lintian @@ -1,7 +1,7 @@ -kspread: shlib-missing-in-control-file libtdeinit_kspread.so for usr/lib/libtdeinit_kspread.so -kspread: executable-not-elf-or-script ./usr/share/apps/kspread/scripts/scripteditor/ScriptEditor.rc -kspread: executable-not-elf-or-script ./usr/share/apps/kspread/scripts/exporthtml/ExportHtml.rc -kspread: executable-not-elf-or-script ./usr/share/apps/kspread/scripts/exporthtml/ExportHtml.py -kspread: executable-not-elf-or-script ./usr/share/apps/kspread/scripts/scripteditor/ScriptEditor.py -kspread: package-name-doesnt-match-sonames libtdeinit-kspread libkspreadcommon0 +kspread-trinity: shlib-missing-in-control-file libtdeinit_kspread.so for opt/trinity/lib/libtdeinit_kspread.so +kspread-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/kspread/scripts/scripteditor/ScriptEditor.rc +kspread-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/kspread/scripts/exporthtml/ExportHtml.rc +kspread-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/kspread/scripts/exporthtml/ExportHtml.py +kspread-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/kspread/scripts/scripteditor/ScriptEditor.py +kspread-trinity: package-name-doesnt-match-sonames libtdeinit-kspread libkspreadcommon0 diff --git a/debian/lenny/applications/koffice/debian/kspread-trinity.menu b/debian/lenny/applications/koffice/debian/kspread-trinity.menu index 8a6987024..d3cec2c14 100644 --- a/debian/lenny/applications/koffice/debian/kspread-trinity.menu +++ b/debian/lenny/applications/koffice/debian/kspread-trinity.menu @@ -1,7 +1,7 @@ ?package(kspread):\ needs="x11"\ section="Applications/Office"\ - hints="KDE,Spreadsheets"\ + hints="TDE,Spreadsheets"\ title="KSpread"\ longtitle="KSpread (Spreadsheets)"\ icon="/opt/trinity/share/pixmaps/kspread.xpm"\ diff --git a/debian/lenny/applications/koffice/debian/kthesaurus-trinity.lintian b/debian/lenny/applications/koffice/debian/kthesaurus-trinity.lintian index 7d7018a77..252102b05 100644 --- a/debian/lenny/applications/koffice/debian/kthesaurus-trinity.lintian +++ b/debian/lenny/applications/koffice/debian/kthesaurus-trinity.lintian @@ -1,5 +1,5 @@ -kthesaurus: no-shlibs-control-file usr/lib/libtdeinit_kthesaurus.so -kthesaurus: postinst-must-call-ldconfig usr/lib/libtdeinit_kthesaurus.so -kthesaurus: postrm-should-call-ldconfig usr/lib/libtdeinit_kthesaurus.so -kthesaurus: package-name-doesnt-match-sonames libtdeinit-kthesaurus +kthesaurus-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kthesaurus.so +kthesaurus-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kthesaurus.so +kthesaurus-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kthesaurus.so +kthesaurus-trinity: package-name-doesnt-match-sonames libtdeinit-kthesaurus diff --git a/debian/lenny/applications/koffice/debian/kugar-trinity.lintian b/debian/lenny/applications/koffice/debian/kugar-trinity.lintian index 5b8ec0d77..8504ff61f 100644 --- a/debian/lenny/applications/koffice/debian/kugar-trinity.lintian +++ b/debian/lenny/applications/koffice/debian/kugar-trinity.lintian @@ -1,4 +1,4 @@ -kugar: shlib-missing-in-control-file libtdeinit_kudesigner.so for usr/lib/libtdeinit_kudesigner.so -kugar: shlib-missing-in-control-file libtdeinit_kugar.so for usr/lib/libtdeinit_kugar.so -kugar: shlib-missing-in-control-file libkudesignercore.so for usr/lib/libkudesignercore.so -kugar: package-name-doesnt-match-sonames libtdeinit-kudesigner libtdeinit-kugar libkudesignercore libkugarlib1 +kugar-trinity: shlib-missing-in-control-file libtdeinit_kudesigner.so for opt/trinity/lib/libtdeinit_kudesigner.so +kugar-trinity: shlib-missing-in-control-file libtdeinit_kugar.so for opt/trinity/lib/libtdeinit_kugar.so +kugar-trinity: shlib-missing-in-control-file libkudesignercore.so for opt/trinity/lib/libkudesignercore.so +kugar-trinity: package-name-doesnt-match-sonames libtdeinit-kudesigner libtdeinit-kugar libkudesignercore libkugarlib1 diff --git a/debian/lenny/applications/koffice/debian/kword-data-trinity.lintian b/debian/lenny/applications/koffice/debian/kword-data-trinity.lintian index 6fa3d857b..09c395552 100644 --- a/debian/lenny/applications/koffice/debian/kword-data-trinity.lintian +++ b/debian/lenny/applications/koffice/debian/kword-data-trinity.lintian @@ -1,2 +1,2 @@ -kword-data: desktop-command-not-in-package /usr/share/applications/tde/kword.desktop kword +kword-data-trinity: desktop-command-not-in-package /opt/trinity/share/applications/tde/kword.desktop kword diff --git a/debian/lenny/applications/koffice/debian/kword-trinity.lintian b/debian/lenny/applications/koffice/debian/kword-trinity.lintian index 5d08d84ca..2c396f259 100644 --- a/debian/lenny/applications/koffice/debian/kword-trinity.lintian +++ b/debian/lenny/applications/koffice/debian/kword-trinity.lintian @@ -1,4 +1,4 @@ -kword: shlib-missing-in-control-file libtdeinit_kword.so for usr/lib/libtdeinit_kword.so -kword: menu-icon-missing /usr/share/pixmaps/kword.xpm -kword: package-name-doesnt-match-sonames libtdeinit-kword libkwordprivate4 +kword-trinity: shlib-missing-in-control-file libtdeinit_kword.so for opt/trinity/lib/libtdeinit_kword.so +kword-trinity: menu-icon-missing /opt/trinity/share/pixmaps/kword.xpm +kword-trinity: package-name-doesnt-match-sonames libtdeinit-kword libkwordprivate4 diff --git a/debian/lenny/applications/koffice/debian/kword-trinity.menu b/debian/lenny/applications/koffice/debian/kword-trinity.menu index 2dfdc2579..ce452d45d 100644 --- a/debian/lenny/applications/koffice/debian/kword-trinity.menu +++ b/debian/lenny/applications/koffice/debian/kword-trinity.menu @@ -1,7 +1,7 @@ ?package(kword):\ needs="x11"\ section="Applications/Office"\ - hints="KDE,Word processors"\ + hints="TDE,Word processors"\ title="KWord"\ longtitle="KWord (Word Processing)"\ icon="/opt/trinity/share/pixmaps/kword.xpm"\ diff --git a/debian/lenny/applications/konversation/debian/control b/debian/lenny/applications/konversation/debian/control index 0484a4144..b82a416b3 100644 --- a/debian/lenny/applications/konversation/debian/control +++ b/debian/lenny/applications/konversation/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: Modestas Vainius <modestas@vainius.eu> -Build-Depends: debhelper (>= 5.0), cdbs (>= 0.4.27-3), tdelibs4-trinity-dev, xsltproc, docbook-xsl, libxi-dev, quilt (>= 0.40), automake, autoconf, libtool, libltdl-dev +Build-Depends: debhelper (>= 5.0), cdbs (>= 0.4.27-3), tdelibs4-trinity-dev, xsltproc, docbook-xsl, docbook-xml, libxi-dev, quilt (>= 0.40), automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 DM-Upload-Allowed: yes Homepage: http://konversation.kde.org/ diff --git a/debian/lenny/applications/konversation/debian/konversation-trinity.manpages b/debian/lenny/applications/konversation/debian/konversation-trinity.manpages index 13cdaf4b2..8b3496a3d 100644 --- a/debian/lenny/applications/konversation/debian/konversation-trinity.manpages +++ b/debian/lenny/applications/konversation/debian/konversation-trinity.manpages @@ -1 +1 @@ -debian/man/*.1 +#debian/man/*.1 diff --git a/debian/lenny/applications/konversation/debian/konversation-trinity.menu b/debian/lenny/applications/konversation/debian/konversation-trinity.menu index 0fbd13937..5adcdf7fc 100644 --- a/debian/lenny/applications/konversation/debian/konversation-trinity.menu +++ b/debian/lenny/applications/konversation/debian/konversation-trinity.menu @@ -2,8 +2,8 @@ needs="X11"\ section="Applications/Network/Communication"\ title="Konversation IRC Client"\ - hints="KDE,IRC Clients"\ - icon="/usr/share/pixmaps/konversation32x32.xpm"\ - icon16x16="/usr/share/pixmaps/konversation16x16.xpm"\ - icon32x32="/usr/share/pixmaps/konversation32x32.xpm"\ + hints="TDE,IRC Clients"\ + icon="/opt/trinity/share/pixmaps/konversation32x32.xpm"\ + icon16x16="/opt/trinity/share/pixmaps/konversation16x16.xpm"\ + icon32x32="/opt/trinity/share/pixmaps/konversation32x32.xpm"\ command="/opt/trinity/bin/konversation" diff --git a/debian/lenny/applications/konversation/debian/man/konversation.1.docbook b/debian/lenny/applications/konversation/debian/man/konversation.1.docbook index f48e27b95..719d6e158 100644 --- a/debian/lenny/applications/konversation/debian/man/konversation.1.docbook +++ b/debian/lenny/applications/konversation/debian/man/konversation.1.docbook @@ -25,7 +25,7 @@ </refmeta> <refnamediv> <refname>konversation</refname> - <refpurpose>user friendly IRC client for KDE</refpurpose> + <refpurpose>user friendly IRC client for TDE</refpurpose> </refnamediv> <refsynopsisdiv> <cmdsynopsis> @@ -34,7 +34,7 @@ <option><replaceable>Qt-options</replaceable></option> </arg> <arg choice="opt"> - <option><replaceable>KDE-options</replaceable></option> + <option><replaceable>TDE-options</replaceable></option> </arg> <arg choice="opt"> <option><replaceable>options</replaceable></option> @@ -57,7 +57,7 @@ <refsect1> <title>OPTIONS</title> <para> - All <productname>KDE</productname> and <productname>Qt</productname> + All <productname>TDE</productname> and <productname>Qt</productname> programs accept a some common command-line options. </para> <para> @@ -72,8 +72,8 @@ <listitem> <para>Show Qt specific options</para> </listitem> </varlistentry> <varlistentry> - <term> <option>--help-kde</option> </term> - <listitem> <para>Show KDE specific options</para> </listitem> + <term> <option>--help-tde</option> </term> + <listitem> <para>Show TDE specific options</para> </listitem> </varlistentry> <varlistentry> <term> <option>--help-all</option> </term> @@ -138,9 +138,9 @@ <refsect1> <title>SCRIPTING</title> <para>Konversation looks for scripts in <filename - class="directory">/usr/share/apps/konversation/scripts</filename> and + class="directory">/opt/trinity/share/apps/konversation/scripts</filename> and in <filename - class="directory">~/.kde/share/apps/konversation/scripts</filename>. + class="directory">~/.trinity/share/apps/konversation/scripts</filename>. To execute a script, use the <command>exec</command> command:</para> <cmdsynopsis> <command>/exec</command> @@ -157,19 +157,19 @@ <para> <variablelist> <varlistentry> - <term><filename>~/.kde/share/config/konversationrc</filename></term> + <term><filename>~/.trinity/share/config/konversationrc</filename></term> <listitem><para>Main configuration</para></listitem> </varlistentry> <varlistentry> <term> - <filename>~/.kde/share/config/konversation.eventsrc</filename> + <filename>~/.trinity/share/config/konversation.eventsrc</filename> </term> <listitem><para>Notification settings</para></listitem> </varlistentry> <varlistentry> <term> <filename - class="directory">~/.kde/share/apps/konversation/logs</filename> + class="directory">~/.trinity/share/apps/konversation/logs</filename> </term> <listitem><para>Directory containing channel log files</para></listitem> diff --git a/debian/lenny/applications/konversation/debian/man/konversationircprotocolhandler.1.docbook b/debian/lenny/applications/konversation/debian/man/konversationircprotocolhandler.1.docbook index 1752d7b2c..3a82060c1 100644 --- a/debian/lenny/applications/konversation/debian/man/konversationircprotocolhandler.1.docbook +++ b/debian/lenny/applications/konversation/debian/man/konversationircprotocolhandler.1.docbook @@ -44,8 +44,8 @@ connection to the specified IRC server in a running Konversation client. </para> <para> - This program is registered with KDE as a handler for the irc URI scheme, - and KDE applications will use this program to handle such URI. + This program is registered with TDE as a handler for the irc URI scheme, + and TDE applications will use this program to handle such URI. (For example, it will be called if a user clicks on an irc:// link on a web page in Konqueror.) </para> diff --git a/debian/lenny/applications/konversation/debian/rules b/debian/lenny/applications/konversation/debian/rules index 0e973a150..a547b5e8a 100755 --- a/debian/lenny/applications/konversation/debian/rules +++ b/debian/lenny/applications/konversation/debian/rules @@ -38,7 +38,7 @@ DB2MAN = /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl $(XP) $(DB2MAN) $< GENERATED_MANPAGES := $(patsubst %.docbook,%,$(wildcard debian/man/*.docbook)) -build/konversation:: $(GENERATED_MANPAGES) +build/konversation-trinity:: $(GENERATED_MANPAGES) clean:: -rm -f $(GENERATED_MANPAGES) -rm -f po/*/konversation.gmo @@ -47,3 +47,5 @@ clean:: install/konversation-trinity:: install -D -m 644 konversation/scripts/README \ debian/konversation-trinity/opt/trinity/share/doc/konversation/README.scripts + dh_installman debian/man/*.1 + mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/ diff --git a/debian/lenny/applications/kpicosim/debian/menu b/debian/lenny/applications/kpicosim/debian/menu index 12de54d49..d62b7dcb0 100644 --- a/debian/lenny/applications/kpicosim/debian/menu +++ b/debian/lenny/applications/kpicosim/debian/menu @@ -1,2 +1,2 @@ ?package(kpicosim):needs="X11" section="Apps/Science"\ - title="kpicosim" command="/usr/bin/kpicosim" + title="kpicosim" command="/opt/trinity/bin/kpicosim" diff --git a/debian/lenny/applications/kpowersave.cmake/debian/kpowersave-trinity.lintian b/debian/lenny/applications/kpowersave.cmake/debian/kpowersave-trinity.lintian index edff50852..8f6135226 100644 --- a/debian/lenny/applications/kpowersave.cmake/debian/kpowersave-trinity.lintian +++ b/debian/lenny/applications/kpowersave.cmake/debian/kpowersave-trinity.lintian @@ -1,5 +1,5 @@ -kpowersave: no-shlibs-control-file opt/trinity/lib/libtdeinit_kpowersave.so -kpowersave: package-name-doesnt-match-sonames libtdeinit-kpowersave -kpowersave: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kpowersave.so -kpowersave: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kpowersave.so +kpowersave-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kpowersave.so +kpowersave-trinity: package-name-doesnt-match-sonames libtdeinit-kpowersave +kpowersave-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kpowersave.so +kpowersave-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kpowersave.so diff --git a/debian/lenny/applications/kpowersave.cmake/debian/menu b/debian/lenny/applications/kpowersave.cmake/debian/menu index 6ae0f9833..0dbd62cc4 100644 --- a/debian/lenny/applications/kpowersave.cmake/debian/menu +++ b/debian/lenny/applications/kpowersave.cmake/debian/menu @@ -3,5 +3,5 @@ section="Applications/System/Monitoring"\ title="KPowersave"\ longtitle="Battery monitor and general power management"\ - icon="/usr/share/pixmaps/kpowersave.xpm"\ + icon="/opt/trinity/share/pixmaps/kpowersave.xpm"\ command="/opt/trinity/bin/kpowersave" diff --git a/debian/lenny/applications/kpowersave.cmake/debian/rules b/debian/lenny/applications/kpowersave.cmake/debian/rules index 7f153b395..0d2383bae 100755 --- a/debian/lenny/applications/kpowersave.cmake/debian/rules +++ b/debian/lenny/applications/kpowersave.cmake/debian/rules @@ -19,6 +19,6 @@ DEB_INSTALL_DOCS_ALL := AUTHORS NEWS DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" -install/kpowersave:: - install -p -D -m644 debian/kpowersave-trinity.lintian debian/kpowersave/opt/trinity/share/lintian/overrides/kpowersave - install -p -D -m644 debian/kpowersave-trinity.linda debian/kpowersave/opt/trinity/share/linda/overrides/kpowersave +install/kpowersave-trinity:: + install -p -D -m644 debian/$(cdbs_curpkg).lintian debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg) + install -p -D -m644 debian/$(cdbs_curpkg).linda debian/$(cdbs_curpkg)/usr/share/linda/overrides/$(cdbs_curpkg) diff --git a/debian/lenny/applications/kpowersave/debian/kpowersave-trinity.lintian b/debian/lenny/applications/kpowersave/debian/kpowersave-trinity.lintian index edff50852..8f6135226 100644 --- a/debian/lenny/applications/kpowersave/debian/kpowersave-trinity.lintian +++ b/debian/lenny/applications/kpowersave/debian/kpowersave-trinity.lintian @@ -1,5 +1,5 @@ -kpowersave: no-shlibs-control-file opt/trinity/lib/libtdeinit_kpowersave.so -kpowersave: package-name-doesnt-match-sonames libtdeinit-kpowersave -kpowersave: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kpowersave.so -kpowersave: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kpowersave.so +kpowersave-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kpowersave.so +kpowersave-trinity: package-name-doesnt-match-sonames libtdeinit-kpowersave +kpowersave-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kpowersave.so +kpowersave-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kpowersave.so diff --git a/debian/lenny/applications/kpowersave/debian/rules b/debian/lenny/applications/kpowersave/debian/rules index 961465395..0cf9afbec 100755 --- a/debian/lenny/applications/kpowersave/debian/rules +++ b/debian/lenny/applications/kpowersave/debian/rules @@ -30,8 +30,8 @@ debian/stamp-bootstrap: touch debian/stamp-bootstrap install/kpowersave-trinity:: - install -p -D -m644 debian/kpowersave-trinity.lintian debian/kpowersave/opt/trinity/share/lintian/overrides/kpowersave - install -p -D -m644 debian/kpowersave-trinity.linda debian/kpowersave/opt/trinity/share/linda/overrides/kpowersave + install -p -D -m644 debian/$(cdbs_curpkg).lintian debian/kpowersave/usr/share/lintian/overrides/$(cdbs_curpkg) + install -p -D -m644 debian/$(cdbs_curpkg).linda debian/kpowersave/usr/share/linda/overrides/$(cdbs_curpkg) binary-install/kpowersave-trinity:: mv debian/kpowersave-trinity/usr/share/man debian/kpowersave-trinity/opt/trinity/share/ diff --git a/debian/lenny/applications/krusader/debian/menu b/debian/lenny/applications/krusader/debian/menu index 8999b22e7..be83ad7d4 100644 --- a/debian/lenny/applications/krusader/debian/menu +++ b/debian/lenny/applications/krusader/debian/menu @@ -3,8 +3,8 @@ section="Applications/Network/File Transfer"\ hints="TDE"\ title="krusader (File Manager)"\ - icon32x32="/usr/share/pixmaps/krusader_user.xpm"\ - icon16x16="/usr/share/pixmaps/krusader_user-16.xpm"\ + icon32x32="/opt/trinity/share/pixmaps/krusader_user.xpm"\ + icon16x16="/opt/trinity/share/pixmaps/krusader_user-16.xpm"\ command="/opt/trinity/bin/krusader" ?package(krusader):\ @@ -12,6 +12,6 @@ section="Applications/Network/File Transfer"\ hints="TDE"\ title="krusader - root-mode (File Manager)"\ - icon32x32="/usr/share/pixmaps/krusader_root.xpm"\ - icon16x16="/usr/share/pixmaps/krusader_root-16.xpm"\ + icon32x32="/opt/trinity/share/pixmaps/krusader_root.xpm"\ + icon16x16="/opt/trinity/share/pixmaps/krusader_root-16.xpm"\ command="tdesu -c /opt/trinity/bin/krusader" diff --git a/debian/lenny/applications/krusader/debian/rules b/debian/lenny/applications/krusader/debian/rules index 5a95e522d..4b297b1ae 100755 --- a/debian/lenny/applications/krusader/debian/rules +++ b/debian/lenny/applications/krusader/debian/rules @@ -48,7 +48,7 @@ install/krusader-trinity:: $(DEB_DESTDIR)/opt/trinity/share/config/tdeio_isorc # install lintian override install -D -p -m0644 debian/krusader.lintian-overrides \ - $(DEB_DESTDIR)/opt/trinity/share/lintian/overrides/krusader + $(DEB_DESTDIR)/usr/share/lintian/overrides/$(cdbs_curpkg) binary-post-install/krusader-trinity:: rm -rf debian/krusader-trinity/etc/trinity/ diff --git a/debian/lenny/applications/ktechlab/debian/menu b/debian/lenny/applications/ktechlab/debian/menu index bb72dd11c..400129a6c 100644 --- a/debian/lenny/applications/ktechlab/debian/menu +++ b/debian/lenny/applications/ktechlab/debian/menu @@ -3,4 +3,4 @@ hints="TDE" \ title="KTechLab" \ command="/opt/trinity/bin/ktechlab" \ - icon="/usr/share/pixmaps/ktechlab.xpm" + icon="/opt/trinity/share/pixmaps/ktechlab.xpm" diff --git a/debian/lenny/applications/ktorrent/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/ktorrent/debian/cdbs/debian-qt-kde.mk index 53c516a66..b93e7c154 100644 --- a/debian/lenny/applications/ktorrent/debian/cdbs/debian-qt-kde.mk +++ b/debian/lenny/applications/ktorrent/debian/cdbs/debian-qt-kde.mk @@ -75,11 +75,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi if test -e debian/$(cdbs_curpkg).lintian; then \ install -p -D -m644 debian/$(cdbs_curpkg).lintian \ - debian/$(cdbs_curpkg)/opt/trinity/share/lintian/overrides/$(cdbs_curpkg); \ + debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \ fi if test -e debian/$(cdbs_curpkg).presubj; then \ install -p -D -m644 debian/$(cdbs_curpkg).presubj \ - debian/$(cdbs_curpkg)/opt/trinity/share/bug/$(cdbs_curpkg)/presubj; \ + debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ fi binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: diff --git a/debian/lenny/applications/kuickshow/debian/kuickshow-trinity.menu b/debian/lenny/applications/kuickshow/debian/kuickshow-trinity.menu index eee2e1417..eb28ff0fe 100644 --- a/debian/lenny/applications/kuickshow/debian/kuickshow-trinity.menu +++ b/debian/lenny/applications/kuickshow/debian/kuickshow-trinity.menu @@ -3,8 +3,8 @@ section="Apps/Graphics"\ hints="TDE"\ title="Kuickshow"\ - icon32x32="/usr/share/pixmaps/kuickshow.xpm"\ - icon16x16="/usr/share/pixmaps/kuickshow-16.xpm"\ + icon32x32="/opt/trinity/share/pixmaps/kuickshow.xpm"\ + icon16x16="/opt/trinity/share/pixmaps/kuickshow-16.xpm"\ command="/opt/trinity/bin/kuickshow" # Icon 32x32 kuickshow/src/cr32-app-kuickshow.png kuickshow.xpm diff --git a/debian/lenny/applications/potracegui/debian/potracegui-trinity.menu b/debian/lenny/applications/potracegui/debian/potracegui-trinity.menu index ec42ba351..57290a786 100644 --- a/debian/lenny/applications/potracegui/debian/potracegui-trinity.menu +++ b/debian/lenny/applications/potracegui/debian/potracegui-trinity.menu @@ -1,4 +1,4 @@ ?package(potracegui):needs="X11" section="Apps/Graphics"\ title="potracegui" command="/opt/trinity/bin/potracegui"\ - hints="KDE frontend for tracing programs" + hints="TDE frontend for tracing programs" diff --git a/debian/lenny/applications/smb4k/debian/menu b/debian/lenny/applications/smb4k/debian/menu index c56defa90..a20388544 100644 --- a/debian/lenny/applications/smb4k/debian/menu +++ b/debian/lenny/applications/smb4k/debian/menu @@ -3,6 +3,6 @@ section="Applications/Network"\ hints="TDE"\ kderemove="1"\ - title="SAMBA for KDE"\ + title="SAMBA for TDE"\ longtitle="SAMBA Advanced Browser"\ command="/opt/trinity/bin/smb4k" diff --git a/debian/lenny/applications/tdepowersave/debian/control b/debian/lenny/applications/tdepowersave/debian/control index 3c3de5835..dcd5ab3f9 100644 --- a/debian/lenny/applications/tdepowersave/debian/control +++ b/debian/lenny/applications/tdepowersave/debian/control @@ -13,7 +13,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Conflicts: kpowersave-trinity, kpowersave-nohal-trinity Description: Power management applet for Trinity - KPowersave is a TDE systray applet which allows to control the power + TDEPowersave is a TDE systray applet which allows to control the power management settings and policies of your computer. It relies on the TDE hardware library to do the heavy lifting. . @@ -33,7 +33,7 @@ Description: Power management applet for Trinity * KNotify support * online help * localisations for many languages - KPowersave supports schemes with following configurable specific + TDEPowersave supports schemes with following configurable specific settings for: * screensaver * DPMS diff --git a/debian/lenny/applications/tdepowersave/debian/install b/debian/lenny/applications/tdepowersave/debian/install index 4a1194bd1..8d2341734 100644 --- a/debian/lenny/applications/tdepowersave/debian/install +++ b/debian/lenny/applications/tdepowersave/debian/install @@ -1 +1 @@ -debian/kpowersave.xpm usr/share/pixmaps +debian/tdepowersave.xpm opt/trinity/share/pixmaps diff --git a/debian/lenny/applications/tdepowersave/debian/kpowersave-nohal-trinity.lintian b/debian/lenny/applications/tdepowersave/debian/kpowersave-nohal-trinity.lintian deleted file mode 100644 index edff50852..000000000 --- a/debian/lenny/applications/tdepowersave/debian/kpowersave-nohal-trinity.lintian +++ /dev/null @@ -1,5 +0,0 @@ -kpowersave: no-shlibs-control-file opt/trinity/lib/libtdeinit_kpowersave.so -kpowersave: package-name-doesnt-match-sonames libtdeinit-kpowersave -kpowersave: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kpowersave.so -kpowersave: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kpowersave.so - diff --git a/debian/lenny/applications/tdepowersave/debian/manpages b/debian/lenny/applications/tdepowersave/debian/manpages index c8fa7b85f..aff0f8470 100644 --- a/debian/lenny/applications/tdepowersave/debian/manpages +++ b/debian/lenny/applications/tdepowersave/debian/manpages @@ -1 +1 @@ -debian/kpowersave.1 +debian/tdepowersave.1 diff --git a/debian/lenny/applications/tdepowersave/debian/menu b/debian/lenny/applications/tdepowersave/debian/menu index 6ae0f9833..c2c6cc3d2 100644 --- a/debian/lenny/applications/tdepowersave/debian/menu +++ b/debian/lenny/applications/tdepowersave/debian/menu @@ -1,7 +1,7 @@ -?package(kpowersave):\ +?package(tdepowersave):\ needs="X11"\ section="Applications/System/Monitoring"\ - title="KPowersave"\ + title="TDEPowersave"\ longtitle="Battery monitor and general power management"\ - icon="/usr/share/pixmaps/kpowersave.xpm"\ - command="/opt/trinity/bin/kpowersave" + icon="/opt/trinity/share/pixmaps/tdepowersave.xpm"\ + command="/opt/trinity/bin/tdepowersave" diff --git a/debian/lenny/applications/tdepowersave/debian/rules b/debian/lenny/applications/tdepowersave/debian/rules index 97acebf07..485481ef7 100755 --- a/debian/lenny/applications/tdepowersave/debian/rules +++ b/debian/lenny/applications/tdepowersave/debian/rules @@ -29,9 +29,9 @@ debian/stamp-bootstrap: make -f admin/Makefile.common cvs touch debian/stamp-bootstrap -install/kpowersave:: - install -p -D -m644 debian/tdepowersave-trinity.lintian debian/kpowersave/opt/trinity/share/lintian/overrides/kpowersave - install -p -D -m644 debian/tdepowersave-trinity.linda debian/kpowersave/opt/trinity/share/linda/overrides/kpowersave +install/tdepowersave-trinity:: + install -p -D -m644 debian/tdepowersave-trinity.lintian debian/tdepowersave-trinity/usr/share/lintian/overrides/tdepowersave-trinity + install -p -D -m644 debian/tdepowersave-trinity.linda debian/tdepowersave-trinity/usr/share/linda/overrides/tdepowersave-trinity clean:: find . -name Makefile.in | xargs rm -f diff --git a/debian/lenny/applications/tdepowersave/debian/kpowersave-nohal-trinity.linda b/debian/lenny/applications/tdepowersave/debian/tdepowersave-trinity.linda index ff5153632..ff5153632 100644 --- a/debian/lenny/applications/tdepowersave/debian/kpowersave-nohal-trinity.linda +++ b/debian/lenny/applications/tdepowersave/debian/tdepowersave-trinity.linda diff --git a/debian/lenny/applications/tdepowersave/debian/tdepowersave-trinity.lintian b/debian/lenny/applications/tdepowersave/debian/tdepowersave-trinity.lintian new file mode 100644 index 000000000..e27c64261 --- /dev/null +++ b/debian/lenny/applications/tdepowersave/debian/tdepowersave-trinity.lintian @@ -0,0 +1,5 @@ +tdepowersave-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdepowersave.so +tdepowersave-trinity: package-name-doesnt-match-sonames libtdeinit-tdepowersave +tdepowersave-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_tdepowersave.so +tdepowersave-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_tdepowersave.so + diff --git a/debian/lenny/applications/tdepowersave/debian/kpowersave.1 b/debian/lenny/applications/tdepowersave/debian/tdepowersave.1 index 0ab1d6f90..d79cfd21d 100644 --- a/debian/lenny/applications/tdepowersave/debian/kpowersave.1 +++ b/debian/lenny/applications/tdepowersave/debian/tdepowersave.1 @@ -1,12 +1,12 @@ .\" This file was generated by kdemangen.pl -.TH KPOWERSAVE 1 "Sep 2005" "K Desktop Environment" "A KDE KPart Application" +.TH TDEPOWERSAVE 1 "Sep 2005" "Trinity Desktop Environment" "A TDE KPart Application" .SH NAME -kpowersave -\- A KDE KPart Application +tdepowersave +\- A TDE KPart Application .SH SYNOPSIS -kpowersave [Qt\-options] [KDE\-options] +tdepowersave [Qt\-options] [TDE\-options] .SH DESCRIPTION -A KDE KPart Application +A TDE KPart Application .SH OPTIONS .SS Generic options: .TP @@ -16,8 +16,8 @@ Show help about options .B \-\-help\-qt Show Qt specific options .TP -.B \-\-help\-kde -Show KDE specific options +.B \-\-help\-tde +Show TDE specific options .TP .B \-\-help\-all Show all options @@ -34,7 +34,7 @@ Show license information .B \-\- End of options .SS -.SS KDE options: +.SS TDE options: .TP .B \-\-caption <caption> Use 'caption' as name in the titlebar @@ -133,10 +133,10 @@ mirrors the whole layout of widgets .SS .SH SEE ALSO -Full user documentation is available through the KDE Help Center. You can also enter the URL -.BR help:/kpowersave/ +Full user documentation is available through the TDE Help Center. You can also enter the URL +.BR help:/tdepowersave/ directly into konqueror or you can run -.BR "`khelpcenter help:/kpowersave/'" +.BR "`khelpcenter help:/tdepowersave/'" from the command-line. .br .SH AUTHORS diff --git a/debian/lenny/applications/tdepowersave/debian/kpowersave.xpm b/debian/lenny/applications/tdepowersave/debian/tdepowersave.xpm index 99d178492..a7b0f2e7c 100644 --- a/debian/lenny/applications/tdepowersave/debian/kpowersave.xpm +++ b/debian/lenny/applications/tdepowersave/debian/tdepowersave.xpm @@ -1,5 +1,5 @@ /* XPM */ -static char * kpowersave_xpm[] = { +static char * tdepowersave_xpm[] = { "32 32 593 2", " c None", ". c #6D2121", diff --git a/debian/lenny/applications/tdepowersave/debian/watch b/debian/lenny/applications/tdepowersave/debian/watch deleted file mode 100644 index 832285e63..000000000 --- a/debian/lenny/applications/tdepowersave/debian/watch +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -http://sf.net/powersave/kpowersave-(.*)\.tar\.bz2 diff --git a/debian/lenny/applications/tdesvn/debian/tdesvn-trinity.menu b/debian/lenny/applications/tdesvn/debian/tdesvn-trinity.menu index 12595e540..c91c6ddce 100644 --- a/debian/lenny/applications/tdesvn/debian/tdesvn-trinity.menu +++ b/debian/lenny/applications/tdesvn/debian/tdesvn-trinity.menu @@ -1,8 +1,8 @@ ?package(tdesvn):\ needs="X11"\ section="Applications/Programming"\ - hints="KDE,Version control"\ - title="KDESvn"\ + hints="TDE,Version control"\ + title="TDESvn"\ longtitle="SVN client"\ - icon="/usr/share/pixmaps/tdesvn.xpm"\ + icon="/opt/trinity/share/pixmaps/tdesvn.xpm"\ command="/opt/trinity/bin/tdesvn" diff --git a/debian/lenny/applications/wlassistant/debian/wlassistant-trinity.menu b/debian/lenny/applications/wlassistant/debian/wlassistant-trinity.menu index 4004b5a65..8b3f1d669 100644 --- a/debian/lenny/applications/wlassistant/debian/wlassistant-trinity.menu +++ b/debian/lenny/applications/wlassistant/debian/wlassistant-trinity.menu @@ -2,8 +2,8 @@ needs="X11"\ section="Applications/Network/Monitoring"\ hints="TDE"\ - icon32x32="/usr/share/pixmaps/wlassistant.xpm"\ - icon16x16="/usr/share/pixmaps/wlassistant-16.xpm"\ + icon32x32="/opt/trinity/share/pixmaps/wlassistant.xpm"\ + icon16x16="/opt/trinity/share/pixmaps/wlassistant-16.xpm"\ title="wlassistant"\ command="/opt/trinity/bin/tdesu -X -c /opt/trinity/bin/wlassistant" diff --git a/debian/lenny/applications/yakuake/debian/yakuake-trinity.menu b/debian/lenny/applications/yakuake/debian/yakuake-trinity.menu index 80d76482b..2f92c629a 100644 --- a/debian/lenny/applications/yakuake/debian/yakuake-trinity.menu +++ b/debian/lenny/applications/yakuake/debian/yakuake-trinity.menu @@ -2,7 +2,7 @@ needs="X11"\ section="Applications/Terminal Emulators"\ title="YaKuake"\ - icon32x32="/usr/share/pixmaps/yakuake.xpm"\ - icon16x16="/usr/share/pixmaps/yakuake-16.xpm"\ + icon32x32="/opt/trinity/share/pixmaps/yakuake.xpm"\ + icon16x16="/opt/trinity/share/pixmaps/yakuake-16.xpm"\ command="/opt/trinity/bin/yakuake" diff --git a/debian/lenny/metapackages/rename-meta/Makefile b/debian/lenny/metapackages/rename-meta/Makefile index a36e6a1c9..a36e6a1c9 100755..100644 --- a/debian/lenny/metapackages/rename-meta/Makefile +++ b/debian/lenny/metapackages/rename-meta/Makefile diff --git a/debian/lenny/metapackages/rename-meta/debian/changelog b/debian/lenny/metapackages/rename-meta/debian/changelog index adf2ec8c1..adf2ec8c1 100755..100644 --- a/debian/lenny/metapackages/rename-meta/debian/changelog +++ b/debian/lenny/metapackages/rename-meta/debian/changelog diff --git a/debian/lenny/metapackages/rename-meta/debian/compat b/debian/lenny/metapackages/rename-meta/debian/compat index 7ed6ff82d..7ed6ff82d 100755..100644 --- a/debian/lenny/metapackages/rename-meta/debian/compat +++ b/debian/lenny/metapackages/rename-meta/debian/compat diff --git a/debian/lenny/metapackages/rename-meta/debian/control b/debian/lenny/metapackages/rename-meta/debian/control index 0647d30f3..8a3c151cb 100644 --- a/debian/lenny/metapackages/rename-meta/debian/control +++ b/debian/lenny/metapackages/rename-meta/debian/control @@ -102,12 +102,6 @@ Depends: tdeprint-trinity Conflicts: kdeprint-trinity (< 4:13.9.9) Description: Transitional dummy package. This can be safely removed after your TDE upgrade has completed. -Package: kdesktop-trinity -Architecture: all -Depends: tdesktop-trinity -Conflicts: kdesktop-trinity (< 4:13.9.9) -Description: Transitional dummy package. This can be safely removed after your TDE upgrade has completed. - Package: kwin-trinity Architecture: all Depends: twin-trinity @@ -516,12 +510,6 @@ Depends: tdeaddons-trinity-doc-html Conflicts: kdeaddons-trinity-doc-html (< 4:13.9.9) Description: Transitional dummy package. This can be safely removed after your TDE upgrade has completed. -Package: atlantikdesigner-trinity -Architecture: all -Depends: atlantitdesigner-trinity -Conflicts: atlantikdesigner-trinity (< 4:13.9.9) -Description: Transitional dummy package. This can be safely removed after your TDE upgrade has completed. - Package: kdeaddons-kfile-plugins-trinity Architecture: all Depends: tdeaddons-kfile-plugins-trinity diff --git a/debian/lenny/metapackages/rename-meta/debian/dirs b/debian/lenny/metapackages/rename-meta/debian/dirs index e69de29bb..e69de29bb 100755..100644 --- a/debian/lenny/metapackages/rename-meta/debian/dirs +++ b/debian/lenny/metapackages/rename-meta/debian/dirs diff --git a/debian/lenny/metapackages/rename-meta/debian/kdm-kde3.postinst b/debian/lenny/metapackages/rename-meta/debian/kdm-trinity.postinst index 8db089c93..e026f2bfe 100644 --- a/debian/lenny/metapackages/rename-meta/debian/kdm-kde3.postinst +++ b/debian/lenny/metapackages/rename-meta/debian/kdm-trinity.postinst @@ -1,5 +1,5 @@ #! /bin/sh -# postinst script for kdm-kde3 +# postinst script for kdm-trinity # # see: dh_installdeb(1) diff --git a/debian/lenny/tdeaccessibility/debian/cdbs/debian-qt-kde.mk b/debian/lenny/tdeaccessibility/debian/cdbs/debian-qt-kde.mk index d135c4257..4a11bc028 100644 --- a/debian/lenny/tdeaccessibility/debian/cdbs/debian-qt-kde.mk +++ b/debian/lenny/tdeaccessibility/debian/cdbs/debian-qt-kde.mk @@ -75,11 +75,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi if test -e debian/$(cdbs_curpkg).lintian; then \ install -p -D -m644 debian/$(cdbs_curpkg).lintian \ - debian/$(cdbs_curpkg)/opt/trinity/share/lintian/overrides/$(cdbs_curpkg); \ + debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \ fi if test -e debian/$(cdbs_curpkg).presubj; then \ install -p -D -m644 debian/$(cdbs_curpkg).presubj \ - debian/$(cdbs_curpkg)/opt/trinity/share/bug/$(cdbs_curpkg)/presubj; \ + debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ fi binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: diff --git a/debian/lenny/tdeaccessibility/debian/control b/debian/lenny/tdeaccessibility/debian/control index bc2ab50d2..fef62b6bc 100644 --- a/debian/lenny/tdeaccessibility/debian/control +++ b/debian/lenny/tdeaccessibility/debian/control @@ -13,7 +13,7 @@ Architecture: all Replaces: kdeaccessibility-trinity (<< 4:14.0.0) Breaks: kdeaccessibility-trinity (<< 4:14.0.0) Depends: kmag-trinity (>= ${Source-Version}), kmousetool-trinity (>= ${Source-Version}), kmouth-trinity (>= ${Source-Version}), kbstate-trinity (>= ${Source-Version}), ksayit-trinity (>= ${Source-Version}), kttsd-trinity (>= ${Source-Version}) -Recommends: kde-icons-mono-trinity (>= ${Source-Version}) +Recommends: tde-icons-mono-trinity (>= ${Source-Version}) Suggests: kttsd-contrib-plugins-trinity (>= ${Source-Version}), tdeaccessibility-trinity-doc-html (>= ${Source-Version}) Description: accessibility packages from the official Trinity release KDE (the K Desktop Environment) is a powerful Open Source graphical @@ -46,7 +46,7 @@ Description: KDE accessibility documentation in HTML format This package is part of Trinity, and a component of the KDE accessibility module. See the 'kde-trinity' and 'tdeaccessibility-trinity' packages for more information. -Package: kde-icons-mono-trinity +Package: tde-icons-mono-trinity Section: tde Architecture: all Replaces: kde-icons-mono-trinity (<< 4:14.0.0) diff --git a/debian/lenny/tdeaccessibility/debian/kde-icons-mono-trinity.install b/debian/lenny/tdeaccessibility/debian/tde-icons-mono-trinity.install index 8c4265ceb..8c4265ceb 100644 --- a/debian/lenny/tdeaccessibility/debian/kde-icons-mono-trinity.install +++ b/debian/lenny/tdeaccessibility/debian/tde-icons-mono-trinity.install diff --git a/debian/lenny/tdeaddons/debian/atlantikdesigner-trinity.menu b/debian/lenny/tdeaddons/debian/atlantikdesigner-trinity.menu index 3f5845f50..f010da8d3 100644 --- a/debian/lenny/tdeaddons/debian/atlantikdesigner-trinity.menu +++ b/debian/lenny/tdeaddons/debian/atlantikdesigner-trinity.menu @@ -1,6 +1,6 @@ ?package(atlantikdesigner):needs="X11"\ section="Games/Tool"\ - hints="KDE,Monopoly"\ + hints="TDE,Monopoly"\ title="Atlantik Designer"\ longtitle="Atlantik Designer (Monopoly(R)-like Board Designer)"\ command="/opt/trinity/bin/atlantikdesigner"\ diff --git a/debian/lenny/tdeaddons/debian/cdbs/debian-qt-kde.mk b/debian/lenny/tdeaddons/debian/cdbs/debian-qt-kde.mk index d135c4257..4a11bc028 100644 --- a/debian/lenny/tdeaddons/debian/cdbs/debian-qt-kde.mk +++ b/debian/lenny/tdeaddons/debian/cdbs/debian-qt-kde.mk @@ -75,11 +75,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi if test -e debian/$(cdbs_curpkg).lintian; then \ install -p -D -m644 debian/$(cdbs_curpkg).lintian \ - debian/$(cdbs_curpkg)/opt/trinity/share/lintian/overrides/$(cdbs_curpkg); \ + debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \ fi if test -e debian/$(cdbs_curpkg).presubj; then \ install -p -D -m644 debian/$(cdbs_curpkg).presubj \ - debian/$(cdbs_curpkg)/opt/trinity/share/bug/$(cdbs_curpkg)/presubj; \ + debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ fi binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: diff --git a/debian/lenny/tdeaddons/debian/kate-plugins-trinity.lintian b/debian/lenny/tdeaddons/debian/kate-plugins-trinity.lintian index d4625a389..27eca0292 100644 --- a/debian/lenny/tdeaddons/debian/kate-plugins-trinity.lintian +++ b/debian/lenny/tdeaddons/debian/kate-plugins-trinity.lintian @@ -1,2 +1,2 @@ # Doesn't need to be executable - only run from within kate. -kate-plugins: script-not-executable ./usr/share/apps/kate/scripts/html-tidy.sh +kate-plugins-trinity: script-not-executable ./opt/trinity/share/apps/kate/scripts/html-tidy.sh diff --git a/debian/lenny/tdeaddons/debian/kicker-applets-trinity.lintian b/debian/lenny/tdeaddons/debian/kicker-applets-trinity.lintian index 3007e3556..705d74139 100644 --- a/debian/lenny/tdeaddons/debian/kicker-applets-trinity.lintian +++ b/debian/lenny/tdeaddons/debian/kicker-applets-trinity.lintian @@ -1,3 +1,3 @@ # Call is inserted by debhelper and is correct. -kicker-applets: postinst-has-useless-call-to-ldconfig -kicker-applets: postrm-has-useless-call-to-ldconfig +kicker-applets-trinity: postinst-has-useless-call-to-ldconfig +kicker-applets-trinity: postrm-has-useless-call-to-ldconfig diff --git a/debian/lenny/tdeadmin/debian/cdbs/debian-qt-kde.mk b/debian/lenny/tdeadmin/debian/cdbs/debian-qt-kde.mk index d135c4257..4a11bc028 100644 --- a/debian/lenny/tdeadmin/debian/cdbs/debian-qt-kde.mk +++ b/debian/lenny/tdeadmin/debian/cdbs/debian-qt-kde.mk @@ -75,11 +75,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi if test -e debian/$(cdbs_curpkg).lintian; then \ install -p -D -m644 debian/$(cdbs_curpkg).lintian \ - debian/$(cdbs_curpkg)/opt/trinity/share/lintian/overrides/$(cdbs_curpkg); \ + debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \ fi if test -e debian/$(cdbs_curpkg).presubj; then \ install -p -D -m644 debian/$(cdbs_curpkg).presubj \ - debian/$(cdbs_curpkg)/opt/trinity/share/bug/$(cdbs_curpkg)/presubj; \ + debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ fi binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: diff --git a/debian/lenny/tdeadmin/debian/kcron-trinity.menu b/debian/lenny/tdeadmin/debian/kcron-trinity.menu index 40ce7f089..0bb50e9c8 100644 --- a/debian/lenny/tdeadmin/debian/kcron-trinity.menu +++ b/debian/lenny/tdeadmin/debian/kcron-trinity.menu @@ -2,7 +2,7 @@ needs="X11"\ section="Applications/Editors"\ hints="TDE"\ - title="KDE Task Scheduler"\ - icon32x32="/usr/share/pixmaps/kcron.xpm"\ - icon16x16="/usr/share/pixmaps/kcron-16.xpm"\ + title="TDE Task Scheduler"\ + icon32x32="/opt/trinity/share/pixmaps/kcron.xpm"\ + icon16x16="/opt/trinity/share/pixmaps/kcron-16.xpm"\ command="/opt/trinity/bin/kcron" diff --git a/debian/lenny/tdeadmin/debian/kdat-trinity.menu b/debian/lenny/tdeadmin/debian/kdat-trinity.menu index 398c54bd6..dc7ab1da7 100644 --- a/debian/lenny/tdeadmin/debian/kdat-trinity.menu +++ b/debian/lenny/tdeadmin/debian/kdat-trinity.menu @@ -3,6 +3,6 @@ section="Applications/System/Hardware"\ hints="TDE"\ title="KDat"\ - icon32x32="/usr/share/pixmaps/kdat.xpm"\ - icon16x16="/usr/share/pixmaps/kdat-16.xpm"\ + icon32x32="/opt/trinity/share/pixmaps/kdat.xpm"\ + icon16x16="/opt/trinity/share/pixmaps/kdat-16.xpm"\ command="/opt/trinity/bin/kdat" diff --git a/debian/lenny/tdeadmin/debian/kpackage-trinity.menu b/debian/lenny/tdeadmin/debian/kpackage-trinity.menu index 0274b1556..fb84cc32b 100644 --- a/debian/lenny/tdeadmin/debian/kpackage-trinity.menu +++ b/debian/lenny/tdeadmin/debian/kpackage-trinity.menu @@ -2,7 +2,7 @@ needs="X11"\ section="Applications/System/Package Management"\ hints="TDE"\ - title="KDE Package Manager"\ - icon32x32="/usr/share/pixmaps/kpackage.xpm"\ - icon16x16="/usr/share/pixmaps/kpackage-16.xpm"\ + title="TDE Package Manager"\ + icon32x32="/opt/trinity/share/pixmaps/kpackage.xpm"\ + icon16x16="/opt/trinity/share/pixmaps/kpackage-16.xpm"\ command="/opt/trinity/bin/kpackage" diff --git a/debian/lenny/tdeadmin/debian/ksysv-trinity.menu b/debian/lenny/tdeadmin/debian/ksysv-trinity.menu index 1da3e1e60..45353ae4b 100644 --- a/debian/lenny/tdeadmin/debian/ksysv-trinity.menu +++ b/debian/lenny/tdeadmin/debian/ksysv-trinity.menu @@ -2,7 +2,7 @@ needs="X11"\ section="Applications/Editors"\ hints="TDE"\ - title="KDE SysV-Init Editor"\ - icon32x32="/usr/share/pixmaps/ksysv.xpm"\ - icon16x16="/usr/share/pixmaps/ksysv-16.xpm"\ + title="TDE SysV-Init Editor"\ + icon32x32="/opt/trinity/share/pixmaps/ksysv.xpm"\ + icon16x16="/opt/trinity/share/pixmaps/ksysv-16.xpm"\ command="/opt/trinity/bin/ksysv" diff --git a/debian/lenny/tdeadmin/debian/kuser-trinity.menu b/debian/lenny/tdeadmin/debian/kuser-trinity.menu index b66726e62..52d2a8afc 100644 --- a/debian/lenny/tdeadmin/debian/kuser-trinity.menu +++ b/debian/lenny/tdeadmin/debian/kuser-trinity.menu @@ -2,7 +2,7 @@ needs="X11"\ section="Applications/System/Administration"\ hints="TDE"\ - title="KDE User Manager"\ - icon32x32="/usr/share/pixmaps/kuser.xpm"\ - icon16x16="/usr/share/pixmaps/kuser-16.xpm"\ + title="TDE User Manager"\ + icon32x32="/opt/trinity/share/pixmaps/kuser.xpm"\ + icon16x16="/opt/trinity/share/pixmaps/kuser-16.xpm"\ command="/opt/trinity/bin/kuser" diff --git a/debian/lenny/tdeadmin/debian/lilo-config-trinity.lintian b/debian/lenny/tdeadmin/debian/lilo-config-trinity.lintian index dc8ec46fb..f268b6b2a 100644 --- a/debian/lenny/tdeadmin/debian/lilo-config-trinity.lintian +++ b/debian/lenny/tdeadmin/debian/lilo-config-trinity.lintian @@ -1 +1 @@ -lilo-config: menu-command-not-in-package /usr/share/menu/lilo-config:6 /opt/trinity/bin/tdesu +lilo-config-trinity: menu-command-not-in-package /usr/share/menu/lilo-config-trinity:6 /opt/trinity/bin/tdesu diff --git a/debian/lenny/tdeartwork/debian/control b/debian/lenny/tdeartwork/debian/control index 56a6ec0d3..7ac1920c6 100644 --- a/debian/lenny/tdeartwork/debian/control +++ b/debian/lenny/tdeartwork/debian/control @@ -13,7 +13,7 @@ Architecture: all Section: tde Replaces: kdeartwork-trinity (<< 4:14.0.0) Breaks: kdeartwork-trinity (<< 4:14.0.0) -Depends: tdeartwork-misc-trinity (>= ${Source-Version}), tdeartwork-emoticons-trinity (>= ${Source-Version}), tdeartwork-style-trinity (>= ${Source-Version}), tdeartwork-theme-icon-trinity (>= ${Source-Version}), tdeartwork-theme-window-trinity (>= ${Source-Version}), kdewallpapers-trinity (>= ${Source-Version}), tdescreensaver-trinity (>= ${Source-Version}) +Depends: tdeartwork-misc-trinity (>= ${Source-Version}), tdeartwork-emoticons-trinity (>= ${Source-Version}), tdeartwork-style-trinity (>= ${Source-Version}), tdeartwork-theme-icon-trinity (>= ${Source-Version}), tdeartwork-theme-window-trinity (>= ${Source-Version}), tdewallpapers-trinity (>= ${Source-Version}), tdescreensaver-trinity (>= ${Source-Version}) Recommends: tdescreensaver-xsavers-trinity Description: themes, styles and more from the official Trinity release KDE (the K Desktop Environment) is a powerful Open Source graphical @@ -98,7 +98,7 @@ Description: window decoration themes released with Trinity This package is part of Trinity, and a component of the KDE artwork module. See the 'kde-trinity' and 'tdeartwork-trinity' packages for more information. -Package: kdewallpapers-trinity +Package: tdewallpapers-trinity Architecture: all Section: tde Replaces: kdewallpapers-trinity (<< 4:14.0.0) diff --git a/debian/lenny/tdeartwork/debian/kdewallpapers-trinity.install b/debian/lenny/tdeartwork/debian/tdewallpapers-trinity.install index 681454953..681454953 100644 --- a/debian/lenny/tdeartwork/debian/kdewallpapers-trinity.install +++ b/debian/lenny/tdeartwork/debian/tdewallpapers-trinity.install diff --git a/debian/lenny/tdebase/debian/kate-trinity.lintian b/debian/lenny/tdebase/debian/kate-trinity.lintian index 0ad1f24b6..d6a673d2f 100644 --- a/debian/lenny/tdebase/debian/kate-trinity.lintian +++ b/debian/lenny/tdebase/debian/kate-trinity.lintian @@ -1,2 +1,2 @@ -kate: shlib-missing-in-control-file libtdeinit_kwrite.so usr/lib/libtdeinit_kwrite.so -kate: shlib-missing-in-control-file libtdeinit_kate.so usr/lib/libtdeinit_kate.so +kate-trinity: shlib-missing-in-control-file libtdeinit_kwrite.so opt/trinity/lib/libtdeinit_kwrite.so +kate-trinity: shlib-missing-in-control-file libtdeinit_kate.so opt/trinity/lib/libtdeinit_kate.so diff --git a/debian/lenny/tdebase/debian/kate-trinity.menu b/debian/lenny/tdebase/debian/kate-trinity.menu index 378fa940e..b22f58e72 100644 --- a/debian/lenny/tdebase/debian/kate-trinity.menu +++ b/debian/lenny/tdebase/debian/kate-trinity.menu @@ -1,7 +1,7 @@ ?package(kate):\ needs="X11"\ section="Applications/Editors"\ - hints="KDE,Text"\ + hints="TDE,Text"\ title="Kate"\ icon32x32="/opt/trinity/share/pixmaps/kate.xpm"\ icon16x16="/opt/trinity/share/pixmaps/kate-16.xpm"\ @@ -10,7 +10,7 @@ ?package(kate):\ needs="X11"\ section="Applications/Editors"\ - hints="KDE,Text"\ + hints="TDE,Text"\ title="KWrite"\ icon32x32="/opt/trinity/share/pixmaps/kwrite.xpm"\ icon16x16="/opt/trinity/share/pixmaps/kwrite-16.xpm"\ diff --git a/debian/lenny/tdebase/debian/kcontrol-trinity.lintian b/debian/lenny/tdebase/debian/kcontrol-trinity.lintian index a1120501f..95c1d8196 100644 --- a/debian/lenny/tdebase/debian/kcontrol-trinity.lintian +++ b/debian/lenny/tdebase/debian/kcontrol-trinity.lintian @@ -1,3 +1,3 @@ -kcontrol: shlib-missing-in-control-file libtdeinit_kaccess.so usr/lib/libtdeinit_kaccess.so -kcontrol: shlib-missing-in-control-file libtdeinit_kcontrol.so usr/lib/libtdeinit_kcontrol.so -kcontrol: shlib-missing-in-control-file libtdeinit_tderandrinithack.so usr/lib/libtdeinit_tderandrinithack.so +kcontrol-trinity: shlib-missing-in-control-file libtdeinit_kaccess.so opt/trinity/lib/libtdeinit_kaccess.so +kcontrol-trinity: shlib-missing-in-control-file libtdeinit_kcontrol.so opt/trinity/lib/libtdeinit_kcontrol.so +kcontrol-trinity: shlib-missing-in-control-file libtdeinit_tderandrinithack.so opt/trinity/lib/libtdeinit_tderandrinithack.so diff --git a/debian/lenny/tdebase/debian/kdesktop-trinity.lintian b/debian/lenny/tdebase/debian/kdesktop-trinity.lintian index 478f4fbc8..caf101636 100644 --- a/debian/lenny/tdebase/debian/kdesktop-trinity.lintian +++ b/debian/lenny/tdebase/debian/kdesktop-trinity.lintian @@ -1 +1 @@ -kdesktop: no-shlibs-control-file usr/lib/libtdeinit_kdesktop.so +kdesktop-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kdesktop.so diff --git a/debian/lenny/tdebase/debian/khelpcenter-trinity.lintian b/debian/lenny/tdebase/debian/khelpcenter-trinity.lintian index 44eb5fc11..3a278bff7 100644 --- a/debian/lenny/tdebase/debian/khelpcenter-trinity.lintian +++ b/debian/lenny/tdebase/debian/khelpcenter-trinity.lintian @@ -1,3 +1,3 @@ -khelpcenter: no-shlibs-control-file usr/lib/libtdeinit_khelpcenter.so -khelpcenter: postinst-must-call-ldconfig usr/lib/libtdeinit_khelpcenter.so -khelpcenter: postrm-should-call-ldconfig usr/lib/libtdeinit_khelpcenter.so +khelpcenter-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_khelpcenter.so +khelpcenter-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_khelpcenter.so +khelpcenter-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_khelpcenter.so diff --git a/debian/lenny/tdebase/debian/khelpcenter-trinity.menu b/debian/lenny/tdebase/debian/khelpcenter-trinity.menu index e353cea94..06387a37b 100644 --- a/debian/lenny/tdebase/debian/khelpcenter-trinity.menu +++ b/debian/lenny/tdebase/debian/khelpcenter-trinity.menu @@ -2,7 +2,7 @@ needs="X11"\ section="Help"\ hints="TDE"\ - title="KDE Help Center"\ + title="TDE Help Center"\ icon32x32="/opt/trinity/share/pixmaps/khelpcenter.xpm"\ icon16x16="/opt/trinity/share/pixmaps/khelpcenter-16.xpm"\ command="/opt/trinity/bin/khelpcenter" diff --git a/debian/lenny/tdebase/debian/kicker-trinity.lintian b/debian/lenny/tdebase/debian/kicker-trinity.lintian index f600f5d82..9f6cb2e4d 100644 --- a/debian/lenny/tdebase/debian/kicker-trinity.lintian +++ b/debian/lenny/tdebase/debian/kicker-trinity.lintian @@ -1,3 +1,3 @@ -kicker: shlib-missing-in-control-file libtdeinit_extensionproxy.so usr/lib/libtdeinit_extensionproxy.so -kicker: shlib-missing-in-control-file libtdeinit_kicker.so usr/lib/libtdeinit_kicker.so -kicker: shlib-missing-in-control-file libtdeinit_appletproxy.so usr/lib/libtdeinit_appletproxy.so +kicker-trinity: shlib-missing-in-control-file libtdeinit_extensionproxy.so opt/trinity/lib/libtdeinit_extensionproxy.so +kicker-trinity: shlib-missing-in-control-file libtdeinit_kicker.so opt/trinity/lib/libtdeinit_kicker.so +kicker-trinity: shlib-missing-in-control-file libtdeinit_appletproxy.so opt/trinity/lib/libtdeinit_appletproxy.so diff --git a/debian/lenny/tdebase/debian/klipper-trinity.lintian b/debian/lenny/tdebase/debian/klipper-trinity.lintian index f7bcf9946..bee8b8020 100644 --- a/debian/lenny/tdebase/debian/klipper-trinity.lintian +++ b/debian/lenny/tdebase/debian/klipper-trinity.lintian @@ -1,3 +1,3 @@ -klipper: no-shlibs-control-file usr/lib/libtdeinit_klipper.so -klipper: postinst-must-call-ldconfig usr/lib/libtdeinit_klipper.so -klipper: postrm-should-call-ldconfig usr/lib/libtdeinit_klipper.so +klipper-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_klipper.so +klipper-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_klipper.so +klipper-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_klipper.so diff --git a/debian/lenny/tdebase/debian/kmenuedit-trinity.lintian b/debian/lenny/tdebase/debian/kmenuedit-trinity.lintian index 154077ad9..c36dd0445 100644 --- a/debian/lenny/tdebase/debian/kmenuedit-trinity.lintian +++ b/debian/lenny/tdebase/debian/kmenuedit-trinity.lintian @@ -1,4 +1,4 @@ -kmenuedit: no-shlibs-control-file usr/lib/libtdeinit_kcontroledit.so -kmenuedit: no-shlibs-control-file usr/lib/libtdeinit_kmenuedit.so -kmenuedit: postinst-must-call-ldconfig usr/lib/libtdeinit_kcontroledit.so -kmenuedit: postrm-should-call-ldconfig usr/lib/libtdeinit_kcontroledit.so +kmenuedit-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kcontroledit.so +kmenuedit-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kmenuedit.so +kmenuedit-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kcontroledit.so +kmenuedit-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kcontroledit.so diff --git a/debian/lenny/tdebase/debian/konqueror-trinity.lintian b/debian/lenny/tdebase/debian/konqueror-trinity.lintian index 243cafb9f..670ed2c27 100644 --- a/debian/lenny/tdebase/debian/konqueror-trinity.lintian +++ b/debian/lenny/tdebase/debian/konqueror-trinity.lintian @@ -1,3 +1,3 @@ -konqueror: shlib-missing-in-control-file libtdeinit_keditbookmarks.so usr/lib/libtdeinit_keditbookmarks.so -konqueror: shlib-missing-in-control-file libtdeinit_kfmclient.so usr/lib/libtdeinit_kfmclient.so -konqueror: shlib-missing-in-control-file libtdeinit_konqueror.so usr/lib/libtdeinit_konqueror.so +konqueror-trinity: shlib-missing-in-control-file libtdeinit_keditbookmarks.so opt/trinity/lib/libtdeinit_keditbookmarks.so +konqueror-trinity: shlib-missing-in-control-file libtdeinit_kfmclient.so opt/trinity/lib/libtdeinit_kfmclient.so +konqueror-trinity: shlib-missing-in-control-file libtdeinit_konqueror.so opt/trinity/lib/libtdeinit_konqueror.so diff --git a/debian/lenny/tdebase/debian/konqueror-trinity.menu b/debian/lenny/tdebase/debian/konqueror-trinity.menu index 7f2ffa797..5fed6cc8e 100644 --- a/debian/lenny/tdebase/debian/konqueror-trinity.menu +++ b/debian/lenny/tdebase/debian/konqueror-trinity.menu @@ -10,7 +10,7 @@ ?package(konqueror):\ needs="X11"\ section="Applications/Network/Web Browsing"\ - hints="KDE,Web browsers"\ + hints="TDE,Web browsers"\ title="Konqueror"\ icon32x32="/opt/trinity/share/pixmaps/konqueror.xpm"\ icon16x16="/opt/trinity/share/pixmaps/konqueror-16.xpm"\ @@ -19,7 +19,7 @@ ?package(konqueror):\ needs="X11"\ section="Applications/File Management"\ - hints="KDE,File managers"\ + hints="TDE,File managers"\ title="Konqueror"\ icon32x32="/opt/trinity/share/pixmaps/kfm.xpm"\ icon16x16="/opt/trinity/share/pixmaps/kfm-16.xpm"\ diff --git a/debian/lenny/tdebase/debian/konsole-trinity.lintian b/debian/lenny/tdebase/debian/konsole-trinity.lintian index 765754c3e..7006dfe10 100644 --- a/debian/lenny/tdebase/debian/konsole-trinity.lintian +++ b/debian/lenny/tdebase/debian/konsole-trinity.lintian @@ -1,3 +1,3 @@ -konsole: no-shlibs-control-file usr/lib/libtdeinit_konsole.so -konsole: postinst-must-call-ldconfig usr/lib/libtdeinit_konsole.so -konsole: postrm-should-call-ldconfig usr/lib/libtdeinit_konsole.so +konsole-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_konsole.so +konsole-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_konsole.so +konsole-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_konsole.so diff --git a/debian/lenny/tdebase/debian/ksmserver-trinity.lintian b/debian/lenny/tdebase/debian/ksmserver-trinity.lintian index 20f94f8ee..2c7c61596 100644 --- a/debian/lenny/tdebase/debian/ksmserver-trinity.lintian +++ b/debian/lenny/tdebase/debian/ksmserver-trinity.lintian @@ -1,2 +1,2 @@ -ksmserver: no-shlibs-control-file usr/lib/libtdeinit_ksmserver.so -ksmserver: postinst-must-call-ldconfig usr/lib/libtdeinit_ksmserver.so +ksmserver-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_ksmserver.so +ksmserver-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_ksmserver.so diff --git a/debian/lenny/tdebase/debian/ksysguard-trinity.menu b/debian/lenny/tdebase/debian/ksysguard-trinity.menu index 5b66c9a43..efe01ba5e 100644 --- a/debian/lenny/tdebase/debian/ksysguard-trinity.menu +++ b/debian/lenny/tdebase/debian/ksysguard-trinity.menu @@ -2,7 +2,7 @@ needs="X11"\ section="Applications/System/Monitoring"\ hints="TDE"\ - title="KDE System Guard"\ + title="TDE System Guard"\ icon32x32="/opt/trinity/share/pixmaps/ksysguard.xpm"\ icon16x16="/opt/trinity/share/pixmaps/ksysguard-16.xpm"\ command="/opt/trinity/bin/ksysguard" @@ -11,7 +11,7 @@ needs="X11"\ section="Applications/System/Monitoring"\ hints="TDE"\ - title="KDE System Guard - Process Table"\ + title="TDE System Guard - Process Table"\ command="/opt/trinity/bin/kpm" # Icon 32x32 ksysguard/cr32-app-ksysguard.png ksysguard.xpm diff --git a/debian/lenny/tdebase/debian/tdebase-trinity-bin.lintian b/debian/lenny/tdebase/debian/tdebase-trinity-bin.lintian index 3f56c6d4a..07cf159e7 100644 --- a/debian/lenny/tdebase/debian/tdebase-trinity-bin.lintian +++ b/debian/lenny/tdebase/debian/tdebase-trinity-bin.lintian @@ -1,6 +1,6 @@ -tdebase-bin: setgid-binary usr/bin/tdesud 2755 root/nogroup -tdebase-bin: no-shlibs-control-file usr/lib/libtdeinit_kcminit.so -tdebase-bin: no-shlibs-control-file usr/lib/libtdeinit_khotkeys.so -tdebase-bin: no-shlibs-control-file usr/lib/libtdeinit_kxkb.so -tdebase-bin: postinst-must-call-ldconfig usr/lib/libtdeinit_khotkeys.so -tdebase-bin: postrm-should-call-ldconfig usr/lib/libtdeinit_khotkeys.so +tdebase-bin-trinity: setgid-binary opt/trinity/bin/tdesud 2755 root/nogroup +tdebase-bin-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kcminit.so +tdebase-bin-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_khotkeys.so +tdebase-bin-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kxkb.so +tdebase-bin-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_khotkeys.so +tdebase-bin-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_khotkeys.so diff --git a/debian/lenny/tdebase/debian/tdeprint-trinity.lintian b/debian/lenny/tdebase/debian/tdeprint-trinity.lintian index 9da8261d7..52cd10d88 100644 --- a/debian/lenny/tdebase/debian/tdeprint-trinity.lintian +++ b/debian/lenny/tdebase/debian/tdeprint-trinity.lintian @@ -1,4 +1,4 @@ -tdeprint: no-shlibs-control-file usr/lib/libtdeinit_kjobviewer.so -tdeprint: no-shlibs-control-file usr/lib/libtdeinit_kprinter.so -tdeprint: postinst-must-call-ldconfig usr/lib/libtdeinit_kjobviewer.so -tdeprint: postrm-should-call-ldconfig usr/lib/libtdeinit_kjobviewer.so +tdeprint-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kjobviewer.so +tdeprint-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kprinter.so +tdeprint-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kjobviewer.so +tdeprint-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kjobviewer.so diff --git a/debian/lenny/tdebase/debian/tdeprint-trinity.menu b/debian/lenny/tdebase/debian/tdeprint-trinity.menu index 1e840a172..44d628ae7 100644 --- a/debian/lenny/tdebase/debian/tdeprint-trinity.menu +++ b/debian/lenny/tdebase/debian/tdeprint-trinity.menu @@ -20,7 +20,7 @@ needs="X11"\ section="Applications/System/Administration"\ hints="TDE"\ - title="KDEPrintFax"\ + title="TDEPrintFax"\ icon32x32="/opt/trinity/share/pixmaps/tdeprintfax.xpm"\ icon16x16="/opt/trinity/share/pixmaps/tdeprintfax-16.xpm"\ command="/opt/trinity/bin/tdeprintfax" diff --git a/debian/lenny/tdebase/debian/twin-trinity.lintian b/debian/lenny/tdebase/debian/twin-trinity.lintian index b6272e484..d0cfc8eb8 100644 --- a/debian/lenny/tdebase/debian/twin-trinity.lintian +++ b/debian/lenny/tdebase/debian/twin-trinity.lintian @@ -1,2 +1,2 @@ -twin: shlib-missing-in-control-file libtdeinit_twin.so usr/lib/libtdeinit_twin.so -twin: shlib-missing-in-control-file libtdeinit_twin_rules_dialog.so usr/lib/libtdeinit_twin_rules_dialog.so +twin-trinity: shlib-missing-in-control-file libtdeinit_twin.so opt/trinity/lib/libtdeinit_twin.so +twin-trinity: shlib-missing-in-control-file libtdeinit_twin_rules_dialog.so opt/trinity/lib/libtdeinit_twin_rules_dialog.so diff --git a/debian/lenny/tdebindings/debian/kjscmd-trinity.menu b/debian/lenny/tdebindings/debian/kjscmd-trinity.menu index dce8b0826..0e5402a75 100644 --- a/debian/lenny/tdebindings/debian/kjscmd-trinity.menu +++ b/debian/lenny/tdebindings/debian/kjscmd-trinity.menu @@ -2,5 +2,5 @@ needs="X11"\ section="Applications/Programming"\ hints="TDE"\ - title="KDE JavaScript Console"\ + title="TDE JavaScript Console"\ command="/opt/trinity/bin/kjscmd --console --exec" diff --git a/debian/lenny/tdeedu/debian/cdbs/debian-qt-kde.mk b/debian/lenny/tdeedu/debian/cdbs/debian-qt-kde.mk index d135c4257..4a11bc028 100644 --- a/debian/lenny/tdeedu/debian/cdbs/debian-qt-kde.mk +++ b/debian/lenny/tdeedu/debian/cdbs/debian-qt-kde.mk @@ -75,11 +75,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi if test -e debian/$(cdbs_curpkg).lintian; then \ install -p -D -m644 debian/$(cdbs_curpkg).lintian \ - debian/$(cdbs_curpkg)/opt/trinity/share/lintian/overrides/$(cdbs_curpkg); \ + debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \ fi if test -e debian/$(cdbs_curpkg).presubj; then \ install -p -D -m644 debian/$(cdbs_curpkg).presubj \ - debian/$(cdbs_curpkg)/opt/trinity/share/bug/$(cdbs_curpkg)/presubj; \ + debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ fi binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: diff --git a/debian/lenny/tdegames/debian/atlantik-trinity.menu b/debian/lenny/tdegames/debian/atlantik-trinity.menu index 116271705..fe8d367a9 100644 --- a/debian/lenny/tdegames/debian/atlantik-trinity.menu +++ b/debian/lenny/tdegames/debian/atlantik-trinity.menu @@ -1,9 +1,9 @@ ?package(atlantik):\ needs="x11"\ section="Games/Board"\ - hints="KDE,Monopoly"\ + hints="TDE,Monopoly"\ title="Atlantik"\ - icon32x32="/usr/share/pixmaps/atlantik.xpm"\ - icon16x16="/usr/share/pixmaps/atlantik-16.xpm"\ + icon32x32="/opt/trinity/share/pixmaps/atlantik.xpm"\ + icon16x16="/opt/trinity/share/pixmaps/atlantik-16.xpm"\ command="/opt/trinity/games/atlantik" diff --git a/debian/lenny/tdegames/debian/cdbs/debian-qt-kde.mk b/debian/lenny/tdegames/debian/cdbs/debian-qt-kde.mk index d135c4257..4a11bc028 100644 --- a/debian/lenny/tdegames/debian/cdbs/debian-qt-kde.mk +++ b/debian/lenny/tdegames/debian/cdbs/debian-qt-kde.mk @@ -75,11 +75,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi if test -e debian/$(cdbs_curpkg).lintian; then \ install -p -D -m644 debian/$(cdbs_curpkg).lintian \ - debian/$(cdbs_curpkg)/opt/trinity/share/lintian/overrides/$(cdbs_curpkg); \ + debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \ fi if test -e debian/$(cdbs_curpkg).presubj; then \ install -p -D -m644 debian/$(cdbs_curpkg).presubj \ - debian/$(cdbs_curpkg)/opt/trinity/share/bug/$(cdbs_curpkg)/presubj; \ + debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ fi binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: diff --git a/debian/lenny/tdegames/debian/kasteroids-trinity.menu b/debian/lenny/tdegames/debian/kasteroids-trinity.menu index e7a7dc8af..a285649c8 100644 --- a/debian/lenny/tdegames/debian/kasteroids-trinity.menu +++ b/debian/lenny/tdegames/debian/kasteroids-trinity.menu @@ -3,7 +3,7 @@ section="Games/Arcade"\ hints="TDE"\ title="KAsteroids"\ - icon32x32="/usr/share/pixmaps/kasteroids.xpm"\ - icon16x16="/usr/share/pixmaps/kasteroids-16.xpm"\ + icon32x32="/opt/trinity/share/pixmaps/kasteroids.xpm"\ + icon16x16="/opt/trinity/share/pixmaps/kasteroids-16.xpm"\ command="/opt/trinity/games/kasteroids" diff --git a/debian/lenny/tdegames/debian/katomic-trinity.menu b/debian/lenny/tdegames/debian/katomic-trinity.menu index 3026b7fb1..9957053f3 100644 --- a/debian/lenny/tdegames/debian/katomic-trinity.menu +++ b/debian/lenny/tdegames/debian/katomic-trinity.menu @@ -2,8 +2,8 @@ needs="x11"\ section="Games/Puzzles"\ hints="TDE"\ - title="KDE Atomic Entertainment"\ - icon32x32="/usr/share/pixmaps/katomic.xpm"\ - icon16x16="/usr/share/pixmaps/katomic-16.xpm"\ + title="TDE Atomic Entertainment"\ + icon32x32="/opt/trinity/share/pixmaps/katomic.xpm"\ + icon16x16="/opt/trinity/share/pixmaps/katomic-16.xpm"\ command="/opt/trinity/games/katomic" diff --git a/debian/lenny/tdegames/debian/kbackgammon-trinity.menu b/debian/lenny/tdegames/debian/kbackgammon-trinity.menu index 5a4f30f0e..6c995c404 100644 --- a/debian/lenny/tdegames/debian/kbackgammon-trinity.menu +++ b/debian/lenny/tdegames/debian/kbackgammon-trinity.menu @@ -2,8 +2,8 @@ needs="x11"\ section="Games/Board"\ hints="TDE"\ - title="KDE Backgammon"\ - icon32x32="/usr/share/pixmaps/kbackgammon.xpm"\ - icon16x16="/usr/share/pixmaps/kbackgammon-16.xpm"\ + title="TDE Backgammon"\ + icon32x32="/opt/trinity/share/pixmaps/kbackgammon.xpm"\ + icon16x16="/opt/trinity/share/pixmaps/kbackgammon-16.xpm"\ command="/opt/trinity/games/kbackgammon" diff --git a/debian/lenny/tdegames/debian/kbattleship-trinity.menu b/debian/lenny/tdegames/debian/kbattleship-trinity.menu index f402671bb..b8b558bd3 100644 --- a/debian/lenny/tdegames/debian/kbattleship-trinity.menu +++ b/debian/lenny/tdegames/debian/kbattleship-trinity.menu @@ -3,6 +3,6 @@ section="Games/Board"\ hints="TDE"\ title="KBattleship"\ - icon32x32="/usr/share/pixmaps/kbattleship.xpm"\ - icon16x16="/usr/share/pixmaps/kbattleship-16.xpm"\ + icon32x32="/opt/trinity/share/pixmaps/kbattleship.xpm"\ + icon16x16="/opt/trinity/share/pixmaps/kbattleship-16.xpm"\ command="/opt/trinity/games/kbattleship" diff --git a/debian/lenny/tdegames/debian/kblackbox-trinity.menu b/debian/lenny/tdegames/debian/kblackbox-trinity.menu index 008eaf055..11f768544 100644 --- a/debian/lenny/tdegames/debian/kblackbox-trinity.menu +++ b/debian/lenny/tdegames/debian/kblackbox-trinity.menu @@ -1,9 +1,9 @@ ?package(kblackbox):\ needs="x11"\ section="Games/Puzzles"\ - hints="KDE,BlackBox"\ + hints="TDE,BlackBox"\ title="KBlackBox"\ - icon32x32="/usr/share/pixmaps/kblackbox.xpm"\ - icon16x16="/usr/share/pixmaps/kblackbox-16.xpm"\ + icon32x32="/opt/trinity/share/pixmaps/kblackbox.xpm"\ + icon16x16="/opt/trinity/share/pixmaps/kblackbox-16.xpm"\ command="/opt/trinity/games/kblackbox" diff --git a/debian/lenny/tdegames/debian/kbounce-trinity.menu b/debian/lenny/tdegames/debian/kbounce-trinity.menu index aa0d01b1e..0a253aed1 100644 --- a/debian/lenny/tdegames/debian/kbounce-trinity.menu +++ b/debian/lenny/tdegames/debian/kbounce-trinity.menu @@ -2,8 +2,8 @@ needs="x11"\ section="Games/Arcade"\ hints="TDE"\ - title="KDE Bounce Ball Game"\ - icon32x32="/usr/share/pixmaps/kbounce.xpm"\ - icon16x16="/usr/share/pixmaps/kbounce-16.xpm"\ + title="TDE Bounce Ball Game"\ + icon32x32="/opt/trinity/share/pixmaps/kbounce.xpm"\ + icon16x16="/opt/trinity/share/pixmaps/kbounce-16.xpm"\ command="/opt/trinity/games/kbounce" diff --git a/debian/lenny/tdegames/debian/kenolaba-trinity.menu b/debian/lenny/tdegames/debian/kenolaba-trinity.menu index 5786cf47b..a278ebaef 100644 --- a/debian/lenny/tdegames/debian/kenolaba-trinity.menu +++ b/debian/lenny/tdegames/debian/kenolaba-trinity.menu @@ -3,6 +3,6 @@ section="Games/Board"\ hints="TDE"\ title="KEnolaba"\ - icon32x32="/usr/share/pixmaps/kenolaba.xpm"\ - icon16x16="/usr/share/pixmaps/kenolaba-16.xpm"\ + icon32x32="/opt/trinity/share/pixmaps/kenolaba.xpm"\ + icon16x16="/opt/trinity/share/pixmaps/kenolaba-16.xpm"\ command="/opt/trinity/games/kenolaba" diff --git a/debian/lenny/tdegames/debian/kfouleggs-trinity.menu b/debian/lenny/tdegames/debian/kfouleggs-trinity.menu index 49b76d6ee..21c26ee09 100644 --- a/debian/lenny/tdegames/debian/kfouleggs-trinity.menu +++ b/debian/lenny/tdegames/debian/kfouleggs-trinity.menu @@ -2,8 +2,8 @@ needs="x11"\ section="Games/Tetris-like"\ hints="TDE"\ - title="KDE Foul Eggs"\ - icon32x32="/usr/share/pixmaps/kfouleggs.xpm"\ - icon16x16="/usr/share/pixmaps/kfouleggs-16.xpm"\ + title="TDE Foul Eggs"\ + icon32x32="/opt/trinity/share/pixmaps/kfouleggs.xpm"\ + icon16x16="/opt/trinity/share/pixmaps/kfouleggs-16.xpm"\ command="/opt/trinity/games/kfouleggs" diff --git a/debian/lenny/tdegames/debian/kgoldrunner-trinity.menu b/debian/lenny/tdegames/debian/kgoldrunner-trinity.menu index e240fcebe..ffb4366cd 100644 --- a/debian/lenny/tdegames/debian/kgoldrunner-trinity.menu +++ b/debian/lenny/tdegames/debian/kgoldrunner-trinity.menu @@ -3,7 +3,7 @@ section="Games/Arcade"\ hints="TDE"\ title="KGoldrunner"\ - icon32x32="/usr/share/pixmaps/kgoldrunner.xpm"\ - icon16x16="/usr/share/pixmaps/kgoldrunner-16.xpm"\ + icon32x32="/opt/trinity/share/pixmaps/kgoldrunner.xpm"\ + icon16x16="/opt/trinity/share/pixmaps/kgoldrunner-16.xpm"\ command="/opt/trinity/games/kgoldrunner" diff --git a/debian/lenny/tdegames/debian/kjumpingcube-trinity.menu b/debian/lenny/tdegames/debian/kjumpingcube-trinity.menu index 5c8c3481e..67b86ee8b 100644 --- a/debian/lenny/tdegames/debian/kjumpingcube-trinity.menu +++ b/debian/lenny/tdegames/debian/kjumpingcube-trinity.menu @@ -3,7 +3,7 @@ section="Games/Strategy"\ hints="TDE"\ title="KJumpingCube"\ - icon32x32="/usr/share/pixmaps/kjumpingcube.xpm"\ - icon16x16="/usr/share/pixmaps/kjumpingcube-16.xpm"\ + icon32x32="/opt/trinity/share/pixmaps/kjumpingcube.xpm"\ + icon16x16="/opt/trinity/share/pixmaps/kjumpingcube-16.xpm"\ command="/opt/trinity/games/kjumpingcube" diff --git a/debian/lenny/tdegames/debian/klickety-trinity.menu b/debian/lenny/tdegames/debian/klickety-trinity.menu index 111245dbb..c09e19b68 100644 --- a/debian/lenny/tdegames/debian/klickety-trinity.menu +++ b/debian/lenny/tdegames/debian/klickety-trinity.menu @@ -3,7 +3,7 @@ section="Games/Puzzles"\ hints="TDE"\ title="Klickety"\ - icon32x32="/usr/share/pixmaps/klickety.xpm"\ - icon16x16="/usr/share/pixmaps/klickety-16.xpm"\ + icon32x32="/opt/trinity/share/pixmaps/klickety.xpm"\ + icon16x16="/opt/trinity/share/pixmaps/klickety-16.xpm"\ command="/opt/trinity/games/klickety" diff --git a/debian/lenny/tdegames/debian/klines-trinity.menu b/debian/lenny/tdegames/debian/klines-trinity.menu index d4ec4624a..9ae566b1a 100644 --- a/debian/lenny/tdegames/debian/klines-trinity.menu +++ b/debian/lenny/tdegames/debian/klines-trinity.menu @@ -3,6 +3,6 @@ section="Games/Board"\ hints="TDE"\ title="KLines"\ - icon32x32="/usr/share/pixmaps/klines.xpm"\ - icon16x16="/usr/share/pixmaps/klines-16.xpm"\ + icon32x32="/opt/trinity/share/pixmaps/klines.xpm"\ + icon16x16="/opt/trinity/share/pixmaps/klines-16.xpm"\ command="/opt/trinity/games/klines" diff --git a/debian/lenny/tdegames/debian/kmahjongg-trinity.menu b/debian/lenny/tdegames/debian/kmahjongg-trinity.menu index a69063cfe..4fc4960f3 100644 --- a/debian/lenny/tdegames/debian/kmahjongg-trinity.menu +++ b/debian/lenny/tdegames/debian/kmahjongg-trinity.menu @@ -1,9 +1,9 @@ ?package(kmahjongg):\ needs="x11"\ section="Games/Board"\ - hints="KDE,Mahjongg"\ + hints="TDE,Mahjongg"\ title="KMahjongg"\ - icon32x32="/usr/share/pixmaps/kmahjongg.xpm"\ - icon16x16="/usr/share/pixmaps/kmahjongg-16.xpm"\ + icon32x32="/opt/trinity/share/pixmaps/kmahjongg.xpm"\ + icon16x16="/opt/trinity/share/pixmaps/kmahjongg-16.xpm"\ command="/opt/trinity/games/kmahjongg" diff --git a/debian/lenny/tdegames/debian/kmines-trinity.menu b/debian/lenny/tdegames/debian/kmines-trinity.menu index e74163e9d..732a11666 100644 --- a/debian/lenny/tdegames/debian/kmines-trinity.menu +++ b/debian/lenny/tdegames/debian/kmines-trinity.menu @@ -1,9 +1,9 @@ ?package(kmines):\ needs="x11"\ section="Games/Puzzles"\ - hints="KDE,Mines"\ + hints="TDE,Mines"\ title="Kmines"\ - icon32x32="/usr/share/pixmaps/kmines.xpm"\ - icon16x16="/usr/share/pixmaps/kmines-16.xpm"\ + icon32x32="/opt/trinity/share/pixmaps/kmines.xpm"\ + icon16x16="/opt/trinity/share/pixmaps/kmines-16.xpm"\ command="/opt/trinity/games/kmines" diff --git a/debian/lenny/tdegames/debian/knetwalk-trinity.menu b/debian/lenny/tdegames/debian/knetwalk-trinity.menu index 8e67087bc..c4f3a3b8a 100644 --- a/debian/lenny/tdegames/debian/knetwalk-trinity.menu +++ b/debian/lenny/tdegames/debian/knetwalk-trinity.menu @@ -1,9 +1,9 @@ ?package(knetwalk):\ needs="x11"\ section="Games/Puzzles"\ - hints="KDE,Mines"\ + hints="TDE,Mines"\ title="KNetwalk"\ - icon32x32="/usr/share/pixmaps/knetwalk.xpm"\ - icon16x16="/usr/share/pixmaps/knetwalk-16.xpm"\ + icon32x32="/opt/trinity/share/pixmaps/knetwalk.xpm"\ + icon16x16="/opt/trinity/share/pixmaps/knetwalk-16.xpm"\ command="/opt/trinity/games/knetwalk" diff --git a/debian/lenny/tdegames/debian/kolf-trinity.menu b/debian/lenny/tdegames/debian/kolf-trinity.menu index 082abe64f..76b540ffb 100644 --- a/debian/lenny/tdegames/debian/kolf-trinity.menu +++ b/debian/lenny/tdegames/debian/kolf-trinity.menu @@ -2,8 +2,8 @@ needs="x11"\ section="Games/Arcade"\ hints="TDE"\ - title="KDE Miniature Golf"\ - icon32x32="/usr/share/pixmaps/kolf.xpm"\ - icon16x16="/usr/share/pixmaps/kolf-16.xpm"\ + title="TDE Miniature Golf"\ + icon32x32="/opt/trinity/share/pixmaps/kolf.xpm"\ + icon16x16="/opt/trinity/share/pixmaps/kolf-16.xpm"\ command="/opt/trinity/games/kolf" diff --git a/debian/lenny/tdegames/debian/konquest-trinity.menu b/debian/lenny/tdegames/debian/konquest-trinity.menu index 6f1ba3d5b..f44bf7c5b 100644 --- a/debian/lenny/tdegames/debian/konquest-trinity.menu +++ b/debian/lenny/tdegames/debian/konquest-trinity.menu @@ -3,7 +3,7 @@ section="Games/Strategy"\ hints="TDE"\ title="Konquest"\ - icon32x32="/usr/share/pixmaps/konquest.xpm"\ - icon16x16="/usr/share/pixmaps/konquest-16.xpm"\ + icon32x32="/opt/trinity/share/pixmaps/konquest.xpm"\ + icon16x16="/opt/trinity/share/pixmaps/konquest-16.xpm"\ command="/opt/trinity/games/konquest" diff --git a/debian/lenny/tdegames/debian/kpat-trinity.menu b/debian/lenny/tdegames/debian/kpat-trinity.menu index e5a38e07a..ab4bac664 100644 --- a/debian/lenny/tdegames/debian/kpat-trinity.menu +++ b/debian/lenny/tdegames/debian/kpat-trinity.menu @@ -2,8 +2,8 @@ needs="x11"\ section="Games/Card"\ hints="TDE"\ - title="KDE Patience"\ - icon32x32="/usr/share/pixmaps/kpat.xpm"\ - icon16x16="/usr/share/pixmaps/kpat-16.xpm"\ + title="TDE Patience"\ + icon32x32="/opt/trinity/share/pixmaps/kpat.xpm"\ + icon16x16="/opt/trinity/share/pixmaps/kpat-16.xpm"\ command="/opt/trinity/games/kpat" diff --git a/debian/lenny/tdegames/debian/kpoker-trinity.menu b/debian/lenny/tdegames/debian/kpoker-trinity.menu index c2d4159ae..c47a27f13 100644 --- a/debian/lenny/tdegames/debian/kpoker-trinity.menu +++ b/debian/lenny/tdegames/debian/kpoker-trinity.menu @@ -2,8 +2,8 @@ needs="x11"\ section="Games/Card"\ hints="TDE"\ - title="KDE Poker"\ - icon32x32="/usr/share/pixmaps/kpoker.xpm"\ - icon16x16="/usr/share/pixmaps/kpoker-16.xpm"\ + title="TDE Poker"\ + icon32x32="/opt/trinity/share/pixmaps/kpoker.xpm"\ + icon16x16="/opt/trinity/share/pixmaps/kpoker-16.xpm"\ command="/opt/trinity/games/kpoker" diff --git a/debian/lenny/tdegames/debian/kreversi-trinity.menu b/debian/lenny/tdegames/debian/kreversi-trinity.menu index b70e74f45..1f5ae31ef 100644 --- a/debian/lenny/tdegames/debian/kreversi-trinity.menu +++ b/debian/lenny/tdegames/debian/kreversi-trinity.menu @@ -2,8 +2,8 @@ needs="x11"\ section="Games/Board"\ hints="TDE"\ - title="KDE Reversi"\ - icon32x32="/usr/share/pixmaps/kreversi.xpm"\ - icon16x16="/usr/share/pixmaps/kreversi-16.xpm"\ + title="TDE Reversi"\ + icon32x32="/opt/trinity/share/pixmaps/kreversi.xpm"\ + icon16x16="/opt/trinity/share/pixmaps/kreversi-16.xpm"\ command="/opt/trinity/games/kreversi" diff --git a/debian/lenny/tdegames/debian/ksame-trinity.menu b/debian/lenny/tdegames/debian/ksame-trinity.menu index 47dfe1141..fe5b27701 100644 --- a/debian/lenny/tdegames/debian/ksame-trinity.menu +++ b/debian/lenny/tdegames/debian/ksame-trinity.menu @@ -1,9 +1,9 @@ ?package(ksame):\ needs="x11"\ section="Games/Puzzles"\ - hints="KDE,SameGame"\ - title="KDE SameGame"\ - icon32x32="/usr/share/pixmaps/ksame.xpm"\ - icon16x16="/usr/share/pixmaps/ksame-16.xpm"\ + hints="TDE,SameGame"\ + title="TDE SameGame"\ + icon32x32="/opt/trinity/share/pixmaps/ksame.xpm"\ + icon16x16="/opt/trinity/share/pixmaps/ksame-16.xpm"\ command="/opt/trinity/games/ksame" diff --git a/debian/lenny/tdegames/debian/kshisen-trinity.menu b/debian/lenny/tdegames/debian/kshisen-trinity.menu index a39078df3..9f7dea281 100644 --- a/debian/lenny/tdegames/debian/kshisen-trinity.menu +++ b/debian/lenny/tdegames/debian/kshisen-trinity.menu @@ -2,8 +2,8 @@ needs="x11"\ section="Games/Board"\ hints="TDE"\ - title="KDE Shisen-Sho"\ - icon32x32="/usr/share/pixmaps/kshisen.xpm"\ - icon16x16="/usr/share/pixmaps/kshisen-16.xpm"\ + title="TDE Shisen-Sho"\ + icon32x32="/opt/trinity/share/pixmaps/kshisen.xpm"\ + icon16x16="/opt/trinity/share/pixmaps/kshisen-16.xpm"\ command="/opt/trinity/games/kshisen" diff --git a/debian/lenny/tdegames/debian/ksirtet-trinity.menu b/debian/lenny/tdegames/debian/ksirtet-trinity.menu index 24fd18497..3550e7243 100644 --- a/debian/lenny/tdegames/debian/ksirtet-trinity.menu +++ b/debian/lenny/tdegames/debian/ksirtet-trinity.menu @@ -2,8 +2,8 @@ needs="x11"\ section="Games/Tetris-like"\ hints="TDE"\ - title="KDE Sirtet"\ - icon32x32="/usr/share/pixmaps/ksirtet.xpm"\ - icon16x16="/usr/share/pixmaps/ksirtet-16.xpm"\ + title="TDE Sirtet"\ + icon32x32="/opt/trinity/share/pixmaps/ksirtet.xpm"\ + icon16x16="/opt/trinity/share/pixmaps/ksirtet-16.xpm"\ command="/opt/trinity/games/ksirtet" diff --git a/debian/lenny/tdegames/debian/ksmiletris-trinity.menu b/debian/lenny/tdegames/debian/ksmiletris-trinity.menu index bd7016ec5..854fbeaa7 100644 --- a/debian/lenny/tdegames/debian/ksmiletris-trinity.menu +++ b/debian/lenny/tdegames/debian/ksmiletris-trinity.menu @@ -2,8 +2,8 @@ needs="x11"\ section="Games/Tetris-like"\ hints="TDE"\ - title="KDE Smiletris"\ - icon32x32="/usr/share/pixmaps/ksmiletris.xpm"\ - icon16x16="/usr/share/pixmaps/ksmiletris-16.xpm"\ + title="TDE Smiletris"\ + icon32x32="/opt/trinity/share/pixmaps/ksmiletris.xpm"\ + icon16x16="/opt/trinity/share/pixmaps/ksmiletris-16.xpm"\ command="/opt/trinity/games/ksmiletris" diff --git a/debian/lenny/tdegames/debian/ksnake-trinity.menu b/debian/lenny/tdegames/debian/ksnake-trinity.menu index aff1ff762..f64835ed1 100644 --- a/debian/lenny/tdegames/debian/ksnake-trinity.menu +++ b/debian/lenny/tdegames/debian/ksnake-trinity.menu @@ -2,8 +2,8 @@ needs="x11"\ section="Games/Arcade"\ hints="TDE"\ - title="KDE Snake Race"\ - icon32x32="/usr/share/pixmaps/ksnake.xpm"\ - icon16x16="/usr/share/pixmaps/ksnake-16.xpm"\ + title="TDE Snake Race"\ + icon32x32="/opt/trinity/share/pixmaps/ksnake.xpm"\ + icon16x16="/opt/trinity/share/pixmaps/ksnake-16.xpm"\ command="/opt/trinity/games/ksnake" diff --git a/debian/lenny/tdegames/debian/ksokoban-trinity.menu b/debian/lenny/tdegames/debian/ksokoban-trinity.menu index 9477f6aad..b32d23fa0 100644 --- a/debian/lenny/tdegames/debian/ksokoban-trinity.menu +++ b/debian/lenny/tdegames/debian/ksokoban-trinity.menu @@ -1,9 +1,9 @@ ?package(ksokoban):\ needs="x11"\ section="Games/Puzzles"\ - hints="KDE,Sokoban"\ - title="KDE Sokoban"\ - icon32x32="/usr/share/pixmaps/ksokoban.xpm"\ - icon16x16="/usr/share/pixmaps/ksokoban-16.xpm"\ + hints="TDE,Sokoban"\ + title="TDE Sokoban"\ + icon32x32="/opt/trinity/share/pixmaps/ksokoban.xpm"\ + icon16x16="/opt/trinity/share/pixmaps/ksokoban-16.xpm"\ command="/opt/trinity/games/ksokoban" diff --git a/debian/lenny/tdegames/debian/kspaceduel-trinity.menu b/debian/lenny/tdegames/debian/kspaceduel-trinity.menu index fc371d376..dcbb8be1f 100644 --- a/debian/lenny/tdegames/debian/kspaceduel-trinity.menu +++ b/debian/lenny/tdegames/debian/kspaceduel-trinity.menu @@ -2,8 +2,8 @@ needs="x11"\ section="Games/Arcade"\ hints="TDE"\ - title="KDE SpaceDuel"\ - icon32x32="/usr/share/pixmaps/kspaceduel.xpm"\ - icon16x16="/usr/share/pixmaps/kspaceduel-16.xpm"\ + title="TDE SpaceDuel"\ + icon32x32="/opt/trinity/share/pixmaps/kspaceduel.xpm"\ + icon16x16="/opt/trinity/share/pixmaps/kspaceduel-16.xpm"\ command="/opt/trinity/games/kspaceduel" diff --git a/debian/lenny/tdegames/debian/ktron-trinity.menu b/debian/lenny/tdegames/debian/ktron-trinity.menu index 5815cd46e..a79bac48e 100644 --- a/debian/lenny/tdegames/debian/ktron-trinity.menu +++ b/debian/lenny/tdegames/debian/ktron-trinity.menu @@ -2,8 +2,8 @@ needs="x11"\ section="Games/Arcade"\ hints="TDE"\ - title="KDE Tron"\ - icon32x32="/usr/share/pixmaps/ktron.xpm"\ - icon16x16="/usr/share/pixmaps/ktron-16.xpm"\ + title="TDE Tron"\ + icon32x32="/opt/trinity/share/pixmaps/ktron.xpm"\ + icon16x16="/opt/trinity/share/pixmaps/ktron-16.xpm"\ command="/opt/trinity/games/ktron" diff --git a/debian/lenny/tdegames/debian/ktuberling-trinity.menu b/debian/lenny/tdegames/debian/ktuberling-trinity.menu index dd349623a..9f6dcf55b 100644 --- a/debian/lenny/tdegames/debian/ktuberling-trinity.menu +++ b/debian/lenny/tdegames/debian/ktuberling-trinity.menu @@ -2,8 +2,8 @@ needs="x11"\ section="Games/Toys"\ hints="TDE"\ - title="KDE Potato Guy"\ - icon32x32="/usr/share/pixmaps/ktuberling.xpm"\ - icon16x16="/usr/share/pixmaps/ktuberling-16.xpm"\ + title="TDE Potato Guy"\ + icon32x32="/opt/trinity/share/pixmaps/ktuberling.xpm"\ + icon16x16="/opt/trinity/share/pixmaps/ktuberling-16.xpm"\ command="/opt/trinity/games/ktuberling" diff --git a/debian/lenny/tdegames/debian/kwin4-trinity.menu b/debian/lenny/tdegames/debian/kwin4-trinity.menu index 4b754c211..01aaabaec 100644 --- a/debian/lenny/tdegames/debian/kwin4-trinity.menu +++ b/debian/lenny/tdegames/debian/kwin4-trinity.menu @@ -3,7 +3,7 @@ section="Games/Board"\ hints="TDE"\ title="KWin4"\ - icon32x32="/usr/share/pixmaps/twin4.xpm"\ - icon16x16="/usr/share/pixmaps/twin4-16.xpm"\ + icon32x32="/opt/trinity/share/pixmaps/twin4.xpm"\ + icon16x16="/opt/trinity/share/pixmaps/twin4-16.xpm"\ command="/opt/trinity/games/twin4" diff --git a/debian/lenny/tdegames/debian/lskat-trinity.menu b/debian/lenny/tdegames/debian/lskat-trinity.menu index a4d714d7e..f8b8fb58f 100644 --- a/debian/lenny/tdegames/debian/lskat-trinity.menu +++ b/debian/lenny/tdegames/debian/lskat-trinity.menu @@ -2,8 +2,8 @@ needs="x11"\ section="Games/Card"\ hints="TDE"\ - title="KDE Lieutnant Skat"\ - icon32x32="/usr/share/pixmaps/lskat.xpm"\ - icon16x16="/usr/share/pixmaps/lskat-16.xpm"\ + title="TDE Lieutnant Skat"\ + icon32x32="/opt/trinity/share/pixmaps/lskat.xpm"\ + icon16x16="/opt/trinity/share/pixmaps/lskat-16.xpm"\ command="/opt/trinity/games/lskat" diff --git a/debian/lenny/tdegraphics/debian/cdbs/debian-qt-kde.mk b/debian/lenny/tdegraphics/debian/cdbs/debian-qt-kde.mk index a4e1eaef5..df08f2d37 100644 --- a/debian/lenny/tdegraphics/debian/cdbs/debian-qt-kde.mk +++ b/debian/lenny/tdegraphics/debian/cdbs/debian-qt-kde.mk @@ -75,11 +75,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi if test -e debian/$(cdbs_curpkg).lintian; then \ install -p -D -m644 debian/$(cdbs_curpkg).lintian \ - debian/$(cdbs_curpkg)/opt/trinity/share/lintian/overrides/$(cdbs_curpkg); \ + debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \ fi if test -e debian/$(cdbs_curpkg).presubj; then \ install -p -D -m644 debian/$(cdbs_curpkg).presubj \ - debian/$(cdbs_curpkg)/opt/trinity/share/bug/$(cdbs_curpkg)/presubj; \ + debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ fi binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: diff --git a/debian/lenny/tdegraphics/debian/kdvi-trinity.menu b/debian/lenny/tdegraphics/debian/kdvi-trinity.menu index ff4a21a01..f1bfa96a5 100644 --- a/debian/lenny/tdegraphics/debian/kdvi-trinity.menu +++ b/debian/lenny/tdegraphics/debian/kdvi-trinity.menu @@ -1,7 +1,7 @@ ?package(kdvi):\ needs="X11"\ section="Applications/Viewers"\ - hints="KDE,DVI,Documents"\ + hints="TDE,DVI,Documents"\ title="KDVI"\ icon32x32="/opt/trinity/share/pixmaps/kdvi.xpm"\ icon16x16="/opt/trinity/share/pixmaps/kdvi-16.xpm"\ diff --git a/debian/lenny/tdegraphics/debian/kfaxview-trinity.lintian b/debian/lenny/tdegraphics/debian/kfaxview-trinity.lintian index 7d86c17d3..77a1b0e8e 100644 --- a/debian/lenny/tdegraphics/debian/kfaxview-trinity.lintian +++ b/debian/lenny/tdegraphics/debian/kfaxview-trinity.lintian @@ -1,4 +1,4 @@ -kfaxview: no-shlibs-control-file opt/trinity/lib/libkfaximage.so -kfaxview: postinst-must-call-ldconfig opt/trinity/lib/libkfaximage.so -kfaxview: postrm-should-call-ldconfig opt/trinity/lib/libkfaximage.so -kfaxview: package-name-doesnt-match-sonames libkfaximage +kfaxview-trinity: no-shlibs-control-file opt/trinity/lib/libkfaximage.so +kfaxview-trinity: postinst-must-call-ldconfig opt/trinity/lib/libkfaximage.so +kfaxview-trinity: postrm-should-call-ldconfig opt/trinity/lib/libkfaximage.so +kfaxview-trinity: package-name-doesnt-match-sonames libkfaximage diff --git a/debian/lenny/tdegraphics/debian/kghostview-trinity.lintian b/debian/lenny/tdegraphics/debian/kghostview-trinity.lintian index 5bf0bd75c..00a976862 100644 --- a/debian/lenny/tdegraphics/debian/kghostview-trinity.lintian +++ b/debian/lenny/tdegraphics/debian/kghostview-trinity.lintian @@ -1 +1 @@ -kghostview: package-name-doesnt-match-sonames libkghostviewlib0 +kghostview-trinity: package-name-doesnt-match-sonames libkghostviewlib0 diff --git a/debian/lenny/tdegraphics/debian/kghostview-trinity.menu b/debian/lenny/tdegraphics/debian/kghostview-trinity.menu index b6398cbaf..cd27c5660 100644 --- a/debian/lenny/tdegraphics/debian/kghostview-trinity.menu +++ b/debian/lenny/tdegraphics/debian/kghostview-trinity.menu @@ -1,7 +1,7 @@ ?package(kghostview):\ needs="X11"\ section="Applications/Viewers"\ - hints="KDE,Documents"\ + hints="TDE,Documents"\ title="KGhostView"\ icon32x32="/opt/trinity/share/pixmaps/kghostview.xpm"\ icon16x16="/opt/trinity/share/pixmaps/kghostview-16.xpm"\ diff --git a/debian/lenny/tdegraphics/debian/kmrml-trinity.lintian b/debian/lenny/tdegraphics/debian/kmrml-trinity.lintian index e3a5ddb8a..0193c9699 100644 --- a/debian/lenny/tdegraphics/debian/kmrml-trinity.lintian +++ b/debian/lenny/tdegraphics/debian/kmrml-trinity.lintian @@ -1,4 +1,4 @@ -kmrml: no-shlibs-control-file opt/trinity/lib/libtdeinit_mrmlsearch.so -kmrml: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_mrmlsearch.so -kmrml: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_mrmlsearch.so -kmrml: package-name-doesnt-match-sonames libtdeinit-mrmlsearch +kmrml-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_mrmlsearch.so +kmrml-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_mrmlsearch.so +kmrml-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_mrmlsearch.so +kmrml-trinity: package-name-doesnt-match-sonames libtdeinit-mrmlsearch diff --git a/debian/lenny/tdegraphics/debian/kpovmodeler-trinity.lintian b/debian/lenny/tdegraphics/debian/kpovmodeler-trinity.lintian index 18443a699..354b0da93 100644 --- a/debian/lenny/tdegraphics/debian/kpovmodeler-trinity.lintian +++ b/debian/lenny/tdegraphics/debian/kpovmodeler-trinity.lintian @@ -1 +1 @@ -kpovmodeler: package-name-doesnt-match-sonames libkpovmodeler0 +kpovmodeler-trinity: package-name-doesnt-match-sonames libkpovmodeler0 diff --git a/debian/lenny/tdegraphics/debian/kpovmodeler-trinity.menu b/debian/lenny/tdegraphics/debian/kpovmodeler-trinity.menu index 5e1179c29..3287726f7 100644 --- a/debian/lenny/tdegraphics/debian/kpovmodeler-trinity.menu +++ b/debian/lenny/tdegraphics/debian/kpovmodeler-trinity.menu @@ -1,7 +1,7 @@ ?package(kpovmodeler):\ needs="X11"\ section="Applications/Graphics"\ - hints="KDE,Modeler"\ + hints="TDE,Modeler"\ title="KPovModeler"\ icon32x32="/opt/trinity/share/pixmaps/kpovmodeler.xpm"\ icon16x16="/opt/trinity/share/pixmaps/kpovmodeler-16.xpm"\ diff --git a/debian/lenny/tdegraphics/debian/ksvg-trinity.lintian b/debian/lenny/tdegraphics/debian/ksvg-trinity.lintian index 9f56c22ee..64f139273 100644 --- a/debian/lenny/tdegraphics/debian/ksvg-trinity.lintian +++ b/debian/lenny/tdegraphics/debian/ksvg-trinity.lintian @@ -1 +1 @@ -ksvg: package-name-doesnt-match-sonames libtext2path0 libksvg0 +ksvg-trinity: package-name-doesnt-match-sonames libtext2path0 libksvg0 diff --git a/debian/lenny/tdegraphics/debian/kuickshow-trinity.lintian b/debian/lenny/tdegraphics/debian/kuickshow-trinity.lintian index 4551b5f0c..89f453cea 100644 --- a/debian/lenny/tdegraphics/debian/kuickshow-trinity.lintian +++ b/debian/lenny/tdegraphics/debian/kuickshow-trinity.lintian @@ -1,4 +1,4 @@ -kuickshow: no-shlibs-control-file opt/trinity/lib/libtdeinit_kuickshow.so -kuickshow: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kuickshow.so -kuickshow: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kuickshow.so -kuickshow: package-name-doesnt-match-sonames libtdeinit-kuickshow +kuickshow-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kuickshow.so +kuickshow-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kuickshow.so +kuickshow-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kuickshow.so +kuickshow-trinity: package-name-doesnt-match-sonames libtdeinit-kuickshow diff --git a/debian/lenny/tdegraphics/debian/kview-trinity.lintian b/debian/lenny/tdegraphics/debian/kview-trinity.lintian index b81a18ccc..fc787acd7 100644 --- a/debian/lenny/tdegraphics/debian/kview-trinity.lintian +++ b/debian/lenny/tdegraphics/debian/kview-trinity.lintian @@ -1,3 +1,3 @@ -kview: shlib-missing-in-control-file libphotobook.so opt/trinity/lib/libphotobook.so -kview: shlib-missing-in-control-file libtdeinit_kview.so opt/trinity/lib/libtdeinit_kview.so -kview: package-name-doesnt-match-sonames libtdeinit-kview libkimageviewer0 +kview-trinity: shlib-missing-in-control-file libphotobook.so opt/trinity/lib/libphotobook.so +kview-trinity: shlib-missing-in-control-file libtdeinit_kview.so opt/trinity/lib/libtdeinit_kview.so +kview-trinity: package-name-doesnt-match-sonames libtdeinit-kview libkimageviewer0 diff --git a/debian/lenny/tdegraphics/debian/kview-trinity.menu b/debian/lenny/tdegraphics/debian/kview-trinity.menu index b835f26fc..e40a31e43 100644 --- a/debian/lenny/tdegraphics/debian/kview-trinity.menu +++ b/debian/lenny/tdegraphics/debian/kview-trinity.menu @@ -1,7 +1,7 @@ ?package(kview):\ needs="X11"\ section="Applications/Viewers"\ - hints="KDE,Images"\ + hints="TDE,Images"\ title="KView"\ icon32x32="/opt/trinity/share/pixmaps/kview.xpm"\ icon16x16="/opt/trinity/share/pixmaps/kview-16.xpm"\ diff --git a/debian/lenny/tdegraphics/debian/kviewshell-trinity.lintian b/debian/lenny/tdegraphics/debian/kviewshell-trinity.lintian index 6ed9b4a4e..1a2ace9c6 100644 --- a/debian/lenny/tdegraphics/debian/kviewshell-trinity.lintian +++ b/debian/lenny/tdegraphics/debian/kviewshell-trinity.lintian @@ -1,2 +1,2 @@ -kviewshell: shlib-missing-in-control-file libdjvu.so opt/trinity/lib/libdjvu.so -kviewshell: package-name-doesnt-match-sonames libtdemultipage0 libdjvu +kviewshell-trinity: shlib-missing-in-control-file libdjvu.so opt/trinity/lib/libdjvu.so +kviewshell-trinity: package-name-doesnt-match-sonames libtdemultipage0 libdjvu diff --git a/debian/lenny/tdelibs/debian/tdelibs4c2a-trinity.lintian b/debian/lenny/tdelibs/debian/tdelibs4c2a-trinity.lintian index 98b98d0e1..4a5ad60ed 100644 --- a/debian/lenny/tdelibs/debian/tdelibs4c2a-trinity.lintian +++ b/debian/lenny/tdelibs/debian/tdelibs4c2a-trinity.lintian @@ -1,15 +1,15 @@ -tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kaddprinterwizard.so -tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_cupsdconf.so -tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_dcopserver.so -tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdecmshell.so -tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdeio_http_cache_cleaner.so -tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdebuildsycoca.so -tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kded.so -tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kcookiejar.so -tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdelauncher.so -tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdeconf_update.so -tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdeio_uiserver.so -tdelibs4c2a binary: setuid-binary opt/trinity/bin/fileshareset 4755 root/root -tdelibs4c2a binary: setuid-binary opt/trinity/bin/kgrantpty 4755 root/root -tdelibs4c2a binary: setuid-binary opt/trinity/bin/kpac_dhcp_helper 4755 root/root -tdelibs4c2a binary: setuid-binary opt/trinity/bin/start_tdeinit 4755 root/root +tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kaddprinterwizard.so +tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_cupsdconf.so +tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_dcopserver.so +tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdecmshell.so +tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdeio_http_cache_cleaner.so +tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdebuildsycoca.so +tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kded.so +tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kcookiejar.so +tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdelauncher.so +tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdeconf_update.so +tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdeio_uiserver.so +tdelibs4c2a-trinity binary: setuid-binary opt/trinity/bin/fileshareset 4755 root/root +tdelibs4c2a-trinity binary: setuid-binary opt/trinity/bin/kgrantpty 4755 root/root +tdelibs4c2a-trinity binary: setuid-binary opt/trinity/bin/kpac_dhcp_helper 4755 root/root +tdelibs4c2a-trinity binary: setuid-binary opt/trinity/bin/start_tdeinit 4755 root/root diff --git a/debian/lenny/tdemultimedia/debian/cdbs/debian-qt-kde.mk b/debian/lenny/tdemultimedia/debian/cdbs/debian-qt-kde.mk index d135c4257..4a11bc028 100644 --- a/debian/lenny/tdemultimedia/debian/cdbs/debian-qt-kde.mk +++ b/debian/lenny/tdemultimedia/debian/cdbs/debian-qt-kde.mk @@ -75,11 +75,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi if test -e debian/$(cdbs_curpkg).lintian; then \ install -p -D -m644 debian/$(cdbs_curpkg).lintian \ - debian/$(cdbs_curpkg)/opt/trinity/share/lintian/overrides/$(cdbs_curpkg); \ + debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \ fi if test -e debian/$(cdbs_curpkg).presubj; then \ install -p -D -m644 debian/$(cdbs_curpkg).presubj \ - debian/$(cdbs_curpkg)/opt/trinity/share/bug/$(cdbs_curpkg)/presubj; \ + debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ fi binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: diff --git a/debian/lenny/tdemultimedia/debian/kmix-trinity.lintian b/debian/lenny/tdemultimedia/debian/kmix-trinity.lintian index a2a96f9ee..c802a5b07 100644 --- a/debian/lenny/tdemultimedia/debian/kmix-trinity.lintian +++ b/debian/lenny/tdemultimedia/debian/kmix-trinity.lintian @@ -1,4 +1,4 @@ -kmix: no-shlibs-control-file opt/trinity/lib/libtdeinit_kmixctrl.so -kmix: no-shlibs-control-file opt/trinity/lib/libtdeinit_kmix.so -kmix: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kmixctrl.so -kmix: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kmixctrl.so +kmix-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kmixctrl.so +kmix-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kmix.so +kmix-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kmixctrl.so +kmix-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kmixctrl.so diff --git a/debian/lenny/tdemultimedia/debian/krec-trinity.lintian b/debian/lenny/tdemultimedia/debian/krec-trinity.lintian index b09b553d8..9cba1f36a 100644 --- a/debian/lenny/tdemultimedia/debian/krec-trinity.lintian +++ b/debian/lenny/tdemultimedia/debian/krec-trinity.lintian @@ -1,3 +1,3 @@ -krec: no-shlibs-control-file opt/trinity/lib/libtdeinit_krec.so -krec: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_krec.so -krec: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_krec.so +krec-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_krec.so +krec-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_krec.so +krec-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_krec.so diff --git a/debian/lenny/tdemultimedia/debian/libarts1-xine-trinity.lintian b/debian/lenny/tdemultimedia/debian/libarts1-xine-trinity.lintian index bfbcf2995..ef72447cf 100644 --- a/debian/lenny/tdemultimedia/debian/libarts1-xine-trinity.lintian +++ b/debian/lenny/tdemultimedia/debian/libarts1-xine-trinity.lintian @@ -1 +1 @@ -libarts1-xine: no-shlibs-control-file opt/trinity/lib/libarts_xine.so +libarts1-xine-trinity: no-shlibs-control-file opt/trinity/lib/libarts_xine.so diff --git a/debian/lenny/tdemultimedia/debian/noatun-trinity.lintian b/debian/lenny/tdemultimedia/debian/noatun-trinity.lintian index 89faa71aa..834dbc664 100644 --- a/debian/lenny/tdemultimedia/debian/noatun-trinity.lintian +++ b/debian/lenny/tdemultimedia/debian/noatun-trinity.lintian @@ -1,4 +1,4 @@ -noatun: shlib-missing-in-control-file libwinskinvis.so opt/trinity/lib/libwinskinvis.so -noatun: shlib-missing-in-control-file libartseffects.so opt/trinity/lib/libartseffects.so -noatun: shlib-missing-in-control-file libnoatunarts.so opt/trinity/lib/libnoatunarts.so -noatun: shlib-missing-in-control-file libtdeinit_noatun.so opt/trinity/lib/libtdeinit_noatun.so +noatun-trinity: shlib-missing-in-control-file libwinskinvis.so opt/trinity/lib/libwinskinvis.so +noatun-trinity: shlib-missing-in-control-file libartseffects.so opt/trinity/lib/libartseffects.so +noatun-trinity: shlib-missing-in-control-file libnoatunarts.so opt/trinity/lib/libnoatunarts.so +noatun-trinity: shlib-missing-in-control-file libtdeinit_noatun.so opt/trinity/lib/libtdeinit_noatun.so diff --git a/debian/lenny/tdenetwork/debian/knewsticker-trinity.lintian b/debian/lenny/tdenetwork/debian/knewsticker-trinity.lintian index c7c412887..566329697 100644 --- a/debian/lenny/tdenetwork/debian/knewsticker-trinity.lintian +++ b/debian/lenny/tdenetwork/debian/knewsticker-trinity.lintian @@ -1 +1 @@ -knewsticker: menu-command-not-in-package /opt/trinity/lib/menu/knewsticker:8 /opt/trinity/bin/appletproxy +knewsticker-trinity: menu-command-not-in-package /opt/trinity/lib/menu/knewsticker:8 /opt/trinity/bin/appletproxy diff --git a/debian/lenny/tdenetwork/debian/kopete-trinity.menu b/debian/lenny/tdenetwork/debian/kopete-trinity.menu index 4f809de8d..b74f7ab77 100644 --- a/debian/lenny/tdenetwork/debian/kopete-trinity.menu +++ b/debian/lenny/tdenetwork/debian/kopete-trinity.menu @@ -1,7 +1,7 @@ ?package(kopete):\ needs="X11"\ section="Apps/Net"\ - hints="KDE,IM"\ + hints="TDE,IM"\ title="Kopete"\ icon32x32="/opt/trinity/share/pixmaps/kopete.xpm"\ icon16x16="/opt/trinity/share/pixmaps/kopete-16.xpm"\ diff --git a/debian/lenny/tdenetwork/debian/kppp-trinity.lintian b/debian/lenny/tdenetwork/debian/kppp-trinity.lintian index 58308748b..5a3a22357 100644 --- a/debian/lenny/tdenetwork/debian/kppp-trinity.lintian +++ b/debian/lenny/tdenetwork/debian/kppp-trinity.lintian @@ -1,3 +1,3 @@ -kppp: setuid-binary opt/trinity/bin/kppp 4754 root/dip -kppp: non-standard-executable-perm opt/trinity/bin/kppplogview 0754 != 0755 -kppp: non-standard-file-perm etc/ppp/peers/kppp-options 0640 != 0644 +kppp-trinity: setuid-binary opt/trinity/bin/kppp 4754 root/dip +kppp-trinity: non-standard-executable-perm opt/trinity/bin/kppplogview 0754 != 0755 +kppp-trinity: non-standard-file-perm etc/ppp/peers/kppp-options 0640 != 0644 diff --git a/debian/lenny/tdenetwork/debian/ksirc-trinity.lintian b/debian/lenny/tdenetwork/debian/ksirc-trinity.lintian index 265515419..f219b1176 100644 --- a/debian/lenny/tdenetwork/debian/ksirc-trinity.lintian +++ b/debian/lenny/tdenetwork/debian/ksirc-trinity.lintian @@ -1,3 +1,3 @@ -ksirc: no-shlibs-control-file opt/trinity/lib/libtdeinit_ksirc.so -ksirc: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_ksirc.so -ksirc: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_ksirc.so +ksirc-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_ksirc.so +ksirc-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_ksirc.so +ksirc-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_ksirc.so diff --git a/debian/lenny/tdenetwork/debian/ksirc-trinity.menu b/debian/lenny/tdenetwork/debian/ksirc-trinity.menu index 7d0ac36b3..1ae203b55 100644 --- a/debian/lenny/tdenetwork/debian/ksirc-trinity.menu +++ b/debian/lenny/tdenetwork/debian/ksirc-trinity.menu @@ -1,7 +1,7 @@ ?package(ksirc):\ needs="X11"\ section="Apps/Net"\ - hints="KDE,IRC"\ + hints="TDE,IRC"\ title="KSirc"\ icon32x32="/opt/trinity/share/pixmaps/ksirc.xpm"\ icon16x16="/opt/trinity/share/pixmaps/ksirc-16.xpm"\ diff --git a/debian/lenny/tdenetwork/debian/kwifimanager-trinity.lintian b/debian/lenny/tdenetwork/debian/kwifimanager-trinity.lintian index c953beb6c..1586f0f0a 100644 --- a/debian/lenny/tdenetwork/debian/kwifimanager-trinity.lintian +++ b/debian/lenny/tdenetwork/debian/kwifimanager-trinity.lintian @@ -1,3 +1,3 @@ -kwifimanager: no-shlibs-control-file opt/trinity/lib/libkwireless.so -kwifimanager: postinst-must-call-ldconfig opt/trinity/lib/libkwireless.so -kwifimanager: postrm-should-call-ldconfig opt/trinity/lib/libkwireless.so +kwifimanager-trinity: no-shlibs-control-file opt/trinity/lib/libkwireless.so +kwifimanager-trinity: postinst-must-call-ldconfig opt/trinity/lib/libkwireless.so +kwifimanager-trinity: postrm-should-call-ldconfig opt/trinity/lib/libkwireless.so diff --git a/debian/lenny/tdepim/debian/akregator-trinity.menu b/debian/lenny/tdepim/debian/akregator-trinity.menu index 21d583f1e..06cf54f0e 100644 --- a/debian/lenny/tdepim/debian/akregator-trinity.menu +++ b/debian/lenny/tdepim/debian/akregator-trinity.menu @@ -3,6 +3,6 @@ section="Applications/Network/Web News"\ hints="TDE"\ title="aKregator"\ - icon32x32="/usr/share/pixmaps/akregator.xpm"\ - icon16x16="/usr/share/pixmaps/akregator-16.xpm"\ + icon32x32="/opt/trinity/share/pixmaps/akregator.xpm"\ + icon16x16="/opt/trinity/share/pixmaps/akregator-16.xpm"\ command="/opt/trinity/bin/akregator" diff --git a/debian/lenny/tdepim/debian/kaddressbook-trinity.menu b/debian/lenny/tdepim/debian/kaddressbook-trinity.menu index 61b962fe4..02504802f 100644 --- a/debian/lenny/tdepim/debian/kaddressbook-trinity.menu +++ b/debian/lenny/tdepim/debian/kaddressbook-trinity.menu @@ -3,6 +3,6 @@ section="Applications/Data Management"\ hints="TDE"\ title="KAddressbook"\ - icon32x32="/usr/share/pixmaps/kaddressbook.xpm"\ - icon16x16="/usr/share/pixmaps/kaddressbook-16.xpm"\ + icon32x32="/opt/trinity/share/pixmaps/kaddressbook.xpm"\ + icon16x16="/opt/trinity/share/pixmaps/kaddressbook-16.xpm"\ command="/opt/trinity/bin/kaddressbook" diff --git a/debian/lenny/tdepim/debian/kalarm-trinity.menu b/debian/lenny/tdepim/debian/kalarm-trinity.menu index 237e68f5a..a3c634694 100644 --- a/debian/lenny/tdepim/debian/kalarm-trinity.menu +++ b/debian/lenny/tdepim/debian/kalarm-trinity.menu @@ -3,6 +3,6 @@ section="Applications/Data Management"\ hints="TDE"\ title="KAlarm"\ - icon32x32="/usr/share/pixmaps/kalarm.xpm"\ - icon16x16="/usr/share/pixmaps/kalarm-16.xpm"\ + icon32x32="/opt/trinity/share/pixmaps/kalarm.xpm"\ + icon16x16="/opt/trinity/share/pixmaps/kalarm-16.xpm"\ command="/opt/trinity/bin/kalarm" diff --git a/debian/lenny/tdepim/debian/karm-trinity.menu b/debian/lenny/tdepim/debian/karm-trinity.menu index 3dd2ce7a1..ed4af43be 100644 --- a/debian/lenny/tdepim/debian/karm-trinity.menu +++ b/debian/lenny/tdepim/debian/karm-trinity.menu @@ -3,6 +3,6 @@ section="Applications/Project Management"\ hints="TDE"\ title="KArm"\ - icon32x32="/usr/share/pixmaps/karm.xpm"\ - icon16x16="/usr/share/pixmaps/karm-16.xpm"\ + icon32x32="/opt/trinity/share/pixmaps/karm.xpm"\ + icon16x16="/opt/trinity/share/pixmaps/karm-16.xpm"\ command="/opt/trinity/bin/karm" diff --git a/debian/lenny/tdepim/debian/kmail-trinity.menu b/debian/lenny/tdepim/debian/kmail-trinity.menu index 186aa91b5..f2c27bf83 100644 --- a/debian/lenny/tdepim/debian/kmail-trinity.menu +++ b/debian/lenny/tdepim/debian/kmail-trinity.menu @@ -1,8 +1,8 @@ ?package(kmail):\ needs="X11"\ section="Applications/Network/Communication"\ - hints="KDE,Mail"\ + hints="TDE,Mail"\ title="KMail"\ - icon32x32="/usr/share/pixmaps/kmail.xpm"\ - icon16x16="/usr/share/pixmaps/kmail-16.xpm"\ + icon32x32="/opt/trinity/share/pixmaps/kmail.xpm"\ + icon16x16="/opt/trinity/share/pixmaps/kmail-16.xpm"\ command="/opt/trinity/bin/kmail" diff --git a/debian/lenny/tdepim/debian/kmailcvt-trinity.menu b/debian/lenny/tdepim/debian/kmailcvt-trinity.menu index 1fdaa32b6..6f7a24a9e 100644 --- a/debian/lenny/tdepim/debian/kmailcvt-trinity.menu +++ b/debian/lenny/tdepim/debian/kmailcvt-trinity.menu @@ -1,6 +1,6 @@ ?package(kmailcvt):\ needs="X11"\ section="Applications/Data Management"\ - hints="KDE,Mail"\ + hints="TDE,Mail"\ title="KMail/KAB Import Tool"\ command="/opt/trinity/bin/kmailcvt" diff --git a/debian/lenny/tdepim/debian/knode-trinity.menu b/debian/lenny/tdepim/debian/knode-trinity.menu index 97a22d6ab..5c5fdbe46 100644 --- a/debian/lenny/tdepim/debian/knode-trinity.menu +++ b/debian/lenny/tdepim/debian/knode-trinity.menu @@ -1,8 +1,8 @@ ?package(knode):\ needs="X11"\ section="Applications/Network/Communication"\ - hints="KDE,News"\ + hints="TDE,News"\ title="KNode"\ - icon32x32="/usr/share/pixmaps/knode.xpm"\ - icon16x16="/usr/share/pixmaps/knode-16.xpm"\ + icon32x32="/opt/trinity/share/pixmaps/knode.xpm"\ + icon16x16="/opt/trinity/share/pixmaps/knode-16.xpm"\ command="/opt/trinity/bin/knode" diff --git a/debian/lenny/tdepim/debian/knotes-trinity.menu b/debian/lenny/tdepim/debian/knotes-trinity.menu index 5f7950cec..6a16b329b 100644 --- a/debian/lenny/tdepim/debian/knotes-trinity.menu +++ b/debian/lenny/tdepim/debian/knotes-trinity.menu @@ -3,6 +3,6 @@ section="Applications/Data Management"\ hints="TDE"\ title="KNotes"\ - icon32x32="/usr/share/pixmaps/knotes.xpm"\ - icon16x16="/usr/share/pixmaps/knotes-16.xpm"\ + icon32x32="/opt/trinity/share/pixmaps/knotes.xpm"\ + icon16x16="/opt/trinity/share/pixmaps/knotes-16.xpm"\ command="/opt/trinity/bin/knotes" diff --git a/debian/lenny/tdepim/debian/kontact-trinity.menu b/debian/lenny/tdepim/debian/kontact-trinity.menu index 82f335a93..631ad2ff2 100644 --- a/debian/lenny/tdepim/debian/kontact-trinity.menu +++ b/debian/lenny/tdepim/debian/kontact-trinity.menu @@ -3,6 +3,6 @@ section="Applications/Data Management"\ hints="TDE"\ title="Kontact"\ - icon32x32="/usr/share/pixmaps/kontact.xpm"\ - icon16x16="/usr/share/pixmaps/kontact-16.xpm"\ + icon32x32="/opt/trinity/share/pixmaps/kontact.xpm"\ + icon16x16="/opt/trinity/share/pixmaps/kontact-16.xpm"\ command="/opt/trinity/bin/kontact" diff --git a/debian/lenny/tdepim/debian/korganizer-trinity.menu b/debian/lenny/tdepim/debian/korganizer-trinity.menu index 949d187c4..954c13991 100644 --- a/debian/lenny/tdepim/debian/korganizer-trinity.menu +++ b/debian/lenny/tdepim/debian/korganizer-trinity.menu @@ -3,6 +3,6 @@ section="Applications/Data Management"\ hints="TDE"\ title="KOrganizer"\ - icon32x32="/usr/share/pixmaps/korganizer.xpm"\ - icon16x16="/usr/share/pixmaps/korganizer-16.xpm"\ + icon32x32="/opt/trinity/share/pixmaps/korganizer.xpm"\ + icon16x16="/opt/trinity/share/pixmaps/korganizer-16.xpm"\ command="/opt/trinity/bin/korganizer" diff --git a/debian/lenny/tdepim/debian/korn-trinity.menu b/debian/lenny/tdepim/debian/korn-trinity.menu index e12f773c6..7fbe02cee 100644 --- a/debian/lenny/tdepim/debian/korn-trinity.menu +++ b/debian/lenny/tdepim/debian/korn-trinity.menu @@ -3,6 +3,6 @@ section="Applications/Network/Web News"\ hints="TDE"\ title="KOrn"\ - icon32x32="/usr/share/pixmaps/korn.xpm"\ - icon16x16="/usr/share/pixmaps/korn-16.xpm"\ + icon32x32="/opt/trinity/share/pixmaps/korn.xpm"\ + icon16x16="/opt/trinity/share/pixmaps/korn-16.xpm"\ command="/opt/trinity/bin/korn" diff --git a/debian/lenny/tdepim/debian/ktnef-trinity.menu b/debian/lenny/tdepim/debian/ktnef-trinity.menu index 8a1cbda31..8b16ab8ae 100644 --- a/debian/lenny/tdepim/debian/ktnef-trinity.menu +++ b/debian/lenny/tdepim/debian/ktnef-trinity.menu @@ -3,6 +3,6 @@ section="Applications/Viewers"\ hints="TDE"\ title="KTnef"\ - icon32x32="/usr/share/pixmaps/ktnef.xpm"\ - icon16x16="/usr/share/pixmaps/ktnef-16.xpm"\ + icon32x32="/opt/trinity/share/pixmaps/ktnef.xpm"\ + icon16x16="/opt/trinity/share/pixmaps/ktnef-16.xpm"\ command="/opt/trinity/bin/ktnef" diff --git a/debian/lenny/tdepim/debian/tdepim-wizards-trinity.menu b/debian/lenny/tdepim/debian/tdepim-wizards-trinity.menu index 8d8c937df..030d74014 100644 --- a/debian/lenny/tdepim/debian/tdepim-wizards-trinity.menu +++ b/debian/lenny/tdepim/debian/tdepim-wizards-trinity.menu @@ -16,7 +16,7 @@ needs="X11"\ section="Applications/Network/Communication"\ hints="TDE"\ - title="KDE Groupware Wizard"\ + title="TDE Groupware Wizard"\ command="/opt/trinity/bin/groupwarewizard" ?package(tdepim-wizards):\ diff --git a/debian/lenny/tdesdk/debian/cervisia-trinity.lintian b/debian/lenny/tdesdk/debian/cervisia-trinity.lintian index a7760d061..6759ea297 100644 --- a/debian/lenny/tdesdk/debian/cervisia-trinity.lintian +++ b/debian/lenny/tdesdk/debian/cervisia-trinity.lintian @@ -1,9 +1,9 @@ # tdeconf_update scripts don't need to be executable. -cervisia: script-not-executable ./usr/share/apps/tdeconf_update/change_colors.pl -cervisia: script-not-executable ./usr/share/apps/tdeconf_update/move_repositories.pl +cervisia-trinity: script-not-executable ./opt/trinity/share/apps/tdeconf_update/change_colors.pl +cervisia-trinity: script-not-executable ./opt/trinity/share/apps/tdeconf_update/move_repositories.pl # This is from tdeinit black magic. -cervisia: no-shlibs-control-file opt/trinity/lib/libtdeinit_cervisia.so -cervisia: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_cervisia.so -cervisia: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_cervisia.so -cervisia: package-name-doesnt-match-sonames libtdeinit-cervisia +cervisia-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_cervisia.so +cervisia-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_cervisia.so +cervisia-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_cervisia.so +cervisia-trinity: package-name-doesnt-match-sonames libtdeinit-cervisia diff --git a/debian/lenny/tdesdk/debian/cervisia-trinity.menu b/debian/lenny/tdesdk/debian/cervisia-trinity.menu index e2cbd329c..d19784c16 100644 --- a/debian/lenny/tdesdk/debian/cervisia-trinity.menu +++ b/debian/lenny/tdesdk/debian/cervisia-trinity.menu @@ -1,9 +1,9 @@ ?package(cervisia):\ needs="x11"\ section="Applications/Programming"\ - hints="KDE,Version control"\ + hints="TDE,Version control"\ title="Cervisia"\ longtitle="Cervisia (CVS Frontend)"\ - icon="/usr/share/pixmaps/cervisia.xpm"\ + icon="/opt/trinity/share/pixmaps/cervisia.xpm"\ command="/opt/trinity/bin/cervisia" diff --git a/debian/lenny/tdesdk/debian/kapptemplate-trinity.lintian b/debian/lenny/tdesdk/debian/kapptemplate-trinity.lintian index 81e5ffeaf..803257d10 100644 --- a/debian/lenny/tdesdk/debian/kapptemplate-trinity.lintian +++ b/debian/lenny/tdesdk/debian/kapptemplate-trinity.lintian @@ -1,11 +1,11 @@ # These are files to provide for new applications. -kapptemplate: extra-license-file usr/share/apps/kapptemplate/appframework/no-exe/COPYING -kapptemplate: extra-license-file usr/share/apps/kapptemplate/appframework/COPYING -kapptemplate: executable-not-elf-or-script ./usr/share/apps/kapptemplate/admin/Doxyfile.global -kapptemplate: script-not-executable ./usr/share/apps/kapptemplate/admin/config.pl -kapptemplate: script-not-executable ./usr/share/apps/kapptemplate/admin/cvs.sh -kapptemplate: script-not-executable ./usr/share/apps/kapptemplate/admin/doxygen.sh -kapptemplate: script-not-executable ./usr/share/apps/kapptemplate/admin/bcheck.pl -kapptemplate: script-not-executable ./usr/share/apps/kapptemplate/admin/conf.change.pl -kapptemplate: script-not-executable ./usr/share/apps/kapptemplate/admin/am_edit -kapptemplate: script-not-executable ./usr/share/apps/kapptemplate/include/kapptemplate.common +kapptemplate-trinity: extra-license-file opt/trinity/share/apps/kapptemplate/appframework/no-exe/COPYING +kapptemplate-trinity: extra-license-file opt/trinity/share/apps/kapptemplate/appframework/COPYING +kapptemplate-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/kapptemplate/admin/Doxyfile.global +kapptemplate-trinity: script-not-executable ./opt/trinity/share/apps/kapptemplate/admin/config.pl +kapptemplate-trinity: script-not-executable ./opt/trinity/share/apps/kapptemplate/admin/cvs.sh +kapptemplate-trinity: script-not-executable ./opt/trinity/share/apps/kapptemplate/admin/doxygen.sh +kapptemplate-trinity: script-not-executable ./opt/trinity/share/apps/kapptemplate/admin/bcheck.pl +kapptemplate-trinity: script-not-executable ./opt/trinity/share/apps/kapptemplate/admin/conf.change.pl +kapptemplate-trinity: script-not-executable ./opt/trinity/share/apps/kapptemplate/admin/am_edit +kapptemplate-trinity: script-not-executable ./opt/trinity/share/apps/kapptemplate/include/kapptemplate.common diff --git a/debian/lenny/tdesdk/debian/kbabel-trinity.lintian b/debian/lenny/tdesdk/debian/kbabel-trinity.lintian index 96e416558..d2f345fca 100644 --- a/debian/lenny/tdesdk/debian/kbabel-trinity.lintian +++ b/debian/lenny/tdesdk/debian/kbabel-trinity.lintian @@ -1,2 +1,2 @@ # This does not include a separate library package. -kbabel: package-name-doesnt-match-sonames libkbabelcommon3 libkbabeldictplugin1 +kbabel-trinity: package-name-doesnt-match-sonames libkbabelcommon3 libkbabeldictplugin1 diff --git a/debian/lenny/tdesdk/debian/kbabel-trinity.menu b/debian/lenny/tdesdk/debian/kbabel-trinity.menu index 62d116d5c..844de065d 100644 --- a/debian/lenny/tdesdk/debian/kbabel-trinity.menu +++ b/debian/lenny/tdesdk/debian/kbabel-trinity.menu @@ -1,27 +1,27 @@ ?package(kbabel):\ needs="x11"\ section="Applications/Text"\ - hints="KDE,l10n"\ + hints="TDE,l10n"\ title="KBabel"\ longtitle="KBabel (Translation Tool)"\ - icon="/usr/share/pixmaps/kbabel.xpm"\ + icon="/opt/trinity/share/pixmaps/kbabel.xpm"\ command="/opt/trinity/bin/kbabel" ?package(kbabel):\ needs="x11"\ section="Applications/Text"\ - hints="KDE,l10n"\ + hints="TDE,l10n"\ title="KBabel Dictionary"\ longtitle="KBabel Dictionary (Translation Tool Dictionary)"\ - icon="/usr/share/pixmaps/kbabeldict.xpm"\ + icon="/opt/trinity/share/pixmaps/kbabeldict.xpm"\ command="/opt/trinity/bin/kbabeldict" ?package(kbabel):\ needs="x11"\ section="Applications/Text"\ - hints="KDE,l10n"\ + hints="TDE,l10n"\ title="KBabel Catalog Manager"\ longtitle="KBabel Catalog Manager (Translation Tool Catalog Manager)"\ - icon="/usr/share/pixmaps/catalogmanager.xpm"\ + icon="/opt/trinity/share/pixmaps/catalogmanager.xpm"\ command="/opt/trinity/bin/catalogmanager" diff --git a/debian/lenny/tdesdk/debian/kbugbuster-trinity.menu b/debian/lenny/tdesdk/debian/kbugbuster-trinity.menu index d03ad5010..e804977e4 100644 --- a/debian/lenny/tdesdk/debian/kbugbuster-trinity.menu +++ b/debian/lenny/tdesdk/debian/kbugbuster-trinity.menu @@ -3,6 +3,6 @@ section="Applications/Project Management"\ hints="TDE"\ title="KBugBuster"\ - longtitle="KBugBuster (KDE Bug Management)"\ - icon="/usr/share/pixmaps/kbugbuster.xpm"\ + longtitle="KBugBuster (TDE Bug Management)"\ + icon="/opt/trinity/share/pixmaps/kbugbuster.xpm"\ command="/opt/trinity/bin/kbugbuster" diff --git a/debian/lenny/tdesdk/debian/kompare-trinity.lintian b/debian/lenny/tdesdk/debian/kompare-trinity.lintian index 857a388be..70173c488 100644 --- a/debian/lenny/tdesdk/debian/kompare-trinity.lintian +++ b/debian/lenny/tdesdk/debian/kompare-trinity.lintian @@ -1,3 +1,3 @@ # This does not include a separate library package. -kompare: package-name-doesnt-match-sonames libkompareinterface0 -kompare: non-dev-pkg-with-shlib-symlink opt/trinity/lib/libkompareinterface.so.0.0.0 opt/trinity/lib/libkompareinterface.so +kompare-trinity: package-name-doesnt-match-sonames libkompareinterface0 +kompare-trinity: non-dev-pkg-with-shlib-symlink opt/trinity/lib/libkompareinterface.so.0.0.0 opt/trinity/lib/libkompareinterface.so diff --git a/debian/lenny/tdesdk/debian/kompare-trinity.menu b/debian/lenny/tdesdk/debian/kompare-trinity.menu index d8cee1e5f..72c04f5fe 100644 --- a/debian/lenny/tdesdk/debian/kompare-trinity.menu +++ b/debian/lenny/tdesdk/debian/kompare-trinity.menu @@ -4,6 +4,6 @@ hints="TDE"\ title="Kompare"\ longtitle="Kompare (Diff/Patch Frontend)"\ - icon="/usr/share/pixmaps/kompare.xpm"\ + icon="/opt/trinity/share/pixmaps/kompare.xpm"\ command="/opt/trinity/bin/kompare" diff --git a/debian/lenny/tdesdk/debian/kspy-trinity.lintian b/debian/lenny/tdesdk/debian/kspy-trinity.lintian index 85c1a0252..84d9c917f 100644 --- a/debian/lenny/tdesdk/debian/kspy-trinity.lintian +++ b/debian/lenny/tdesdk/debian/kspy-trinity.lintian @@ -1,5 +1,5 @@ # There is no -dev package. -kspy: non-dev-pkg-with-shlib-symlink opt/trinity/lib/libkspy.so.1.2.0 opt/trinity/lib/libkspy.so +kspy-trinity: non-dev-pkg-with-shlib-symlink opt/trinity/lib/libkspy.so.1.2.0 opt/trinity/lib/libkspy.so # This does not come with a separate library package. -kspy: package-name-doesnt-match-sonames libkspy1 +kspy-trinity: package-name-doesnt-match-sonames libkspy1 diff --git a/debian/lenny/tdesdk/debian/kuiviewer-trinity.menu b/debian/lenny/tdesdk/debian/kuiviewer-trinity.menu index 6b0c16029..01628115e 100644 --- a/debian/lenny/tdesdk/debian/kuiviewer-trinity.menu +++ b/debian/lenny/tdesdk/debian/kuiviewer-trinity.menu @@ -4,6 +4,6 @@ hints="TDE"\ title="KUIViewer"\ longtitle="KUIViewer (Qt Designer UI File Viewer)"\ - icon="/usr/share/pixmaps/kuiviewer.xpm"\ + icon="/opt/trinity/share/pixmaps/kuiviewer.xpm"\ command="/opt/trinity/bin/kuiviewer" diff --git a/debian/lenny/tdesdk/debian/libcvsservice0-trinity.lintian b/debian/lenny/tdesdk/debian/libcvsservice0-trinity.lintian index f3a4e3325..ed7e5eea1 100644 --- a/debian/lenny/tdesdk/debian/libcvsservice0-trinity.lintian +++ b/debian/lenny/tdesdk/debian/libcvsservice0-trinity.lintian @@ -1,3 +1,3 @@ # This is from tdeinit black magic. -libcvsservice0: shlib-missing-in-control-file libtdeinit_cvsaskpass.so opt/trinity/lib/libtdeinit_cvsaskpass.so -libcvsservice0: shlib-missing-in-control-file libtdeinit_cvsservice.so opt/trinity/lib/libtdeinit_cvsservice.so +libcvsservice0-trinity: shlib-missing-in-control-file libtdeinit_cvsaskpass.so opt/trinity/lib/libtdeinit_cvsaskpass.so +libcvsservice0-trinity: shlib-missing-in-control-file libtdeinit_cvsservice.so opt/trinity/lib/libtdeinit_cvsservice.so diff --git a/debian/lenny/tdesdk/debian/tdecachegrind-trinity.menu b/debian/lenny/tdesdk/debian/tdecachegrind-trinity.menu index c23fa742b..4c9261ebb 100644 --- a/debian/lenny/tdesdk/debian/tdecachegrind-trinity.menu +++ b/debian/lenny/tdesdk/debian/tdecachegrind-trinity.menu @@ -4,6 +4,6 @@ hints="TDE"\ title="KCachegrind"\ longtitle="KCachegrind (Profiler Frontend)"\ - icon="/usr/share/pixmaps/tdecachegrind.xpm"\ + icon="/opt/trinity/share/pixmaps/tdecachegrind.xpm"\ command="/opt/trinity/bin/tdecachegrind" diff --git a/debian/lenny/tdesdk/debian/tdesdk-scripts-trinity.lintian b/debian/lenny/tdesdk/debian/tdesdk-scripts-trinity.lintian index e3136bc9c..cecda9973 100644 --- a/debian/lenny/tdesdk/debian/tdesdk-scripts-trinity.lintian +++ b/debian/lenny/tdesdk/debian/tdesdk-scripts-trinity.lintian @@ -1,3 +1,3 @@ # The syntax error is just perlpod docs appearing after the script exits. -tdesdk-scripts: shell-script-fails-syntax-check ./opt/trinity/bin/cvsversion -tdesdk-scripts: shell-script-fails-syntax-check ./opt/trinity/bin/kde-build +tdesdk-scripts-trinity: shell-script-fails-syntax-check ./opt/trinity/bin/cvsversion +tdesdk-scripts-trinity: shell-script-fails-syntax-check ./opt/trinity/bin/kde-build diff --git a/debian/lenny/tdesdk/debian/umbrello-trinity.lintian b/debian/lenny/tdesdk/debian/umbrello-trinity.lintian index 5ebb37a57..17c9ba52c 100644 --- a/debian/lenny/tdesdk/debian/umbrello-trinity.lintian +++ b/debian/lenny/tdesdk/debian/umbrello-trinity.lintian @@ -1,2 +1,2 @@ # this is not a script but a template, so it should not be executable -umbrello: script-not-executable ./usr/share/apps/umbrello/headings/heading.py +umbrello-trinity: script-not-executable ./opt/trinity/share/apps/umbrello/headings/heading.py diff --git a/debian/lenny/tdesdk/debian/umbrello-trinity.menu b/debian/lenny/tdesdk/debian/umbrello-trinity.menu index b31aa1af8..234f273e9 100644 --- a/debian/lenny/tdesdk/debian/umbrello-trinity.menu +++ b/debian/lenny/tdesdk/debian/umbrello-trinity.menu @@ -4,6 +4,6 @@ hints="TDE"\ title="Umbrello"\ longtitle="Umbrello (UML Modeller)"\ - icon="/usr/share/pixmaps/umbrello.xpm"\ + icon="/opt/trinity/share/pixmaps/umbrello.xpm"\ command="/opt/trinity/bin/umbrello" diff --git a/debian/lenny/tdetoys/debian/kweather-trinity.lintian b/debian/lenny/tdetoys/debian/kweather-trinity.lintian index b6c7e13d9..2a4387162 100644 --- a/debian/lenny/tdetoys/debian/kweather-trinity.lintian +++ b/debian/lenny/tdetoys/debian/kweather-trinity.lintian @@ -1,2 +1,2 @@ -kweather: no-shlibs-control-file usr/lib/trinity/libtdeinit_kweatherreport.so -kweather: package-name-doesnt-match-sonames libtdeinit-kweatherreport +kweather-trinity: no-shlibs-control-file opt/trinity/lib/trinity/libtdeinit_kweatherreport.so +kweather-trinity: package-name-doesnt-match-sonames libtdeinit-kweatherreport diff --git a/debian/lenny/tdeutils/debian/ark-trinity-trinity.lintian b/debian/lenny/tdeutils/debian/ark-trinity-trinity.lintian index 2b8d3a553..47861fafc 100644 --- a/debian/lenny/tdeutils/debian/ark-trinity-trinity.lintian +++ b/debian/lenny/tdeutils/debian/ark-trinity-trinity.lintian @@ -1,3 +1,3 @@ -ark: no-shlibs-control-file opt/trinity/lib/libtdeinit_ark.so -ark: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_ark.so -ark: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_ark.so +ark-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_ark.so +ark-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_ark.so +ark-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_ark.so diff --git a/debian/lenny/tdeutils/debian/ark-trinity.menu b/debian/lenny/tdeutils/debian/ark-trinity.menu index 8b8cfe9ac..5f567aced 100644 --- a/debian/lenny/tdeutils/debian/ark-trinity.menu +++ b/debian/lenny/tdeutils/debian/ark-trinity.menu @@ -3,8 +3,8 @@ section="Apps/Tools"\ hints="TDE"\ title="Ark"\ - icon32x32="/usr/share/pixmaps/ark.xpm"\ - icon16x16="/usr/share/pixmaps/ark-16.xpm"\ + icon32x32="/opt/trinity/share/pixmaps/ark.xpm"\ + icon16x16="/opt/trinity/share/pixmaps/ark-16.xpm"\ command="/opt/trinity/bin/ark" # Icon 32x32 ark/cr32-app-ark.png ark.xpm diff --git a/debian/lenny/tdeutils/debian/control b/debian/lenny/tdeutils/debian/control index 56d984a2a..43aff85f0 100644 --- a/debian/lenny/tdeutils/debian/control +++ b/debian/lenny/tdeutils/debian/control @@ -13,7 +13,7 @@ Section: tde Architecture: all Replaces: kdeutils-trinity (<< 4:14.0.0) Breaks: kdeutils-trinity (<< 4:14.0.0) -Depends: ark-trinity (>= ${Source-Version}), kcalc-trinity (>= ${Source-Version}), kcharselect-trinity (>= ${Source-Version}), kdelirc-trinity (>= ${Source-Version}), tdessh-trinity (>= ${Source-Version}), kdf-trinity (>= ${Source-Version}), kedit-trinity (>= ${Source-Version}), kfloppy-trinity (>= ${Source-Version}), kgpg-trinity (>= ${Source-Version}), khexedit-trinity (>= ${Source-Version}), kjots-trinity (>= ${Source-Version}), klaptopdaemon-trinity (>= ${Source-Version}) | kpowersave-trinity, kmilo-trinity (>= ${Source-Version}), kregexpeditor-trinity (>= ${Source-Version}), ksim-trinity (>= ${Source-Version}), ktimer-trinity (>= ${Source-Version}), tdewalletmanager-trinity (>= ${Source-Version}), superkaramba-trinity (>= ${Source-Version}) +Depends: ark-trinity (>= ${Source-Version}), kcalc-trinity (>= ${Source-Version}), kcharselect-trinity (>= ${Source-Version}), tdelirc-trinity (>= ${Source-Version}), tdessh-trinity (>= ${Source-Version}), kdf-trinity (>= ${Source-Version}), kedit-trinity (>= ${Source-Version}), kfloppy-trinity (>= ${Source-Version}), kgpg-trinity (>= ${Source-Version}), khexedit-trinity (>= ${Source-Version}), kjots-trinity (>= ${Source-Version}), klaptopdaemon-trinity (>= ${Source-Version}) | kpowersave-trinity, kmilo-trinity (>= ${Source-Version}), kregexpeditor-trinity (>= ${Source-Version}), ksim-trinity (>= ${Source-Version}), ktimer-trinity (>= ${Source-Version}), tdewalletmanager-trinity (>= ${Source-Version}), superkaramba-trinity (>= ${Source-Version}) Suggests: tdeutils-trinity-doc-html (>= ${Source-Version}) Description: general purpose utilities from the official Trinity release KDE (the K Desktop Environment) is a powerful Open Source graphical @@ -61,7 +61,7 @@ Section: utils Architecture: any Replaces: kdeutils-trinity-dev (<< 4:14.0.0) Breaks: kdeutils-trinity-dev (<< 4:14.0.0) -Depends: ark-trinity (= ${Source-Version}), kcalc-trinity (= ${Source-Version}), kdelirc-trinity (= ${Source-Version}), kedit-trinity (= ${Source-Version}), khexedit-trinity (= ${Source-Version}), klaptopdaemon-trinity (= ${Source-Version}), kmilo-trinity (= ${Source-Version}), kregexpeditor-trinity (= ${Source-Version}), ksim-trinity (= ${Source-Version}), tdelibs4-trinity-dev +Depends: ark-trinity (= ${Source-Version}), kcalc-trinity (= ${Source-Version}), tdelirc-trinity (= ${Source-Version}), kedit-trinity (= ${Source-Version}), khexedit-trinity (= ${Source-Version}), klaptopdaemon-trinity (= ${Source-Version}), kmilo-trinity (= ${Source-Version}), kregexpeditor-trinity (= ${Source-Version}), ksim-trinity (= ${Source-Version}), tdelibs4-trinity-dev Description: development files for the Trinity utilities module This package contains development files needed to compile tdeutils applications. @@ -124,7 +124,7 @@ Description: character selector for Trinity This package is part of Trinity, as a component of the KDE utilities module. See the 'kde-trinity' and 'tdeutils-trinity' packages for more information. -Package: kdelirc-trinity +Package: tdelirc-trinity Section: utils Architecture: any Replaces: kdelirc-trinity (<< 4:14.0.0) @@ -140,8 +140,8 @@ Description: infrared control for Trinity Package: tdessh-trinity Section: tde Architecture: any -Replaces: tdessh-trinity (<< 4:14.0.0) -Breaks: tdessh-trinity (<< 4:14.0.0) +Replaces: kdessh-trinity (<< 4:14.0.0) +Breaks: kdessh-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, openssh-client | ssh-client Description: ssh frontend for Trinity This package contains KDE's frontend for ssh. diff --git a/debian/lenny/tdeutils/debian/kcalc-trinity-trinity.lintian b/debian/lenny/tdeutils/debian/kcalc-trinity-trinity.lintian index 075ce6c50..0b36154e5 100644 --- a/debian/lenny/tdeutils/debian/kcalc-trinity-trinity.lintian +++ b/debian/lenny/tdeutils/debian/kcalc-trinity-trinity.lintian @@ -1,3 +1,3 @@ -kcalc: no-shlibs-control-file opt/trinity/lib/libtdeinit_kcalc.so -kcalc: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kcalc.so -kcalc: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kcalc.so +kcalc-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kcalc.so +kcalc-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kcalc.so +kcalc-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kcalc.so diff --git a/debian/lenny/tdeutils/debian/kcalc-trinity.menu b/debian/lenny/tdeutils/debian/kcalc-trinity.menu index 146e4b1fb..c5b8eb908 100644 --- a/debian/lenny/tdeutils/debian/kcalc-trinity.menu +++ b/debian/lenny/tdeutils/debian/kcalc-trinity.menu @@ -1,10 +1,10 @@ ?package(kcalc):\ needs="X11"\ section="Apps/Math"\ - hints="KDE,Calculators"\ + hints="TDE,Calculators"\ title="KCalc"\ - icon32x32="/usr/share/pixmaps/kcalc.xpm"\ - icon16x16="/usr/share/pixmaps/kcalc-16.xpm"\ + icon32x32="/opt/trinity/share/pixmaps/kcalc.xpm"\ + icon16x16="/opt/trinity/share/pixmaps/kcalc-16.xpm"\ command="/opt/trinity/bin/kcalc" # Icon 32x32 kcalc/cr32-app-kcalc.png kcalc.xpm diff --git a/debian/lenny/tdeutils/debian/kcharselect-trinity.menu b/debian/lenny/tdeutils/debian/kcharselect-trinity.menu index 59a49f72d..045b58017 100644 --- a/debian/lenny/tdeutils/debian/kcharselect-trinity.menu +++ b/debian/lenny/tdeutils/debian/kcharselect-trinity.menu @@ -1,10 +1,10 @@ ?package(kcharselect):\ needs="X11"\ section="Apps/Tools"\ - hints="KDE,Characters"\ + hints="TDE,Characters"\ title="KCharSelect"\ - icon32x32="/usr/share/pixmaps/kcharselect.xpm"\ - icon16x16="/usr/share/pixmaps/kcharselect-16.xpm"\ + icon32x32="/opt/trinity/share/pixmaps/kcharselect.xpm"\ + icon16x16="/opt/trinity/share/pixmaps/kcharselect-16.xpm"\ command="/opt/trinity/bin/kcharselect" # Icon 32x32 kcharselect/cr48-app-kcharselect.png kcharselect.xpm diff --git a/debian/lenny/tdeutils/debian/kdelirc-trinity.lintian b/debian/lenny/tdeutils/debian/kdelirc-trinity.lintian deleted file mode 100644 index 986b7f7d4..000000000 --- a/debian/lenny/tdeutils/debian/kdelirc-trinity.lintian +++ /dev/null @@ -1,3 +0,0 @@ -kdelirc: no-shlibs-control-file opt/trinity/lib/libtdeinit_irkick.so -kdelirc: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_irkick.so -kdelirc: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_irkick.so diff --git a/debian/lenny/tdeutils/debian/kdf-trinity.menu b/debian/lenny/tdeutils/debian/kdf-trinity.menu index b8faa3bd4..62373d1df 100644 --- a/debian/lenny/tdeutils/debian/kdf-trinity.menu +++ b/debian/lenny/tdeutils/debian/kdf-trinity.menu @@ -3,8 +3,8 @@ section="Apps/System"\ hints="TDE"\ title="KDiskFree"\ - icon32x32="/usr/share/pixmaps/kdf.xpm"\ - icon16x16="/usr/share/pixmaps/kdf-16.xpm"\ + icon32x32="/opt/trinity/share/pixmaps/kdf.xpm"\ + icon16x16="/opt/trinity/share/pixmaps/kdf-16.xpm"\ command="/opt/trinity/bin/kdf" ?package(kdf):\ @@ -12,8 +12,8 @@ section="Apps/System"\ hints="TDE"\ title="kwikdisk"\ - icon32x32="/usr/share/pixmaps/kwikdisk.xpm"\ - icon16x16="/usr/share/pixmaps/kwikdisk-16.xpm"\ + icon32x32="/opt/trinity/share/pixmaps/kwikdisk.xpm"\ + icon16x16="/opt/trinity/share/pixmaps/kwikdisk-16.xpm"\ command="/opt/trinity/bin/kwikdisk" # Icon 32x32 kdf/pics/cr32-app-kdf.png kdf.xpm diff --git a/debian/lenny/tdeutils/debian/kedit-trinity.lintian b/debian/lenny/tdeutils/debian/kedit-trinity.lintian index a2a63b3ba..fdde7bd3b 100644 --- a/debian/lenny/tdeutils/debian/kedit-trinity.lintian +++ b/debian/lenny/tdeutils/debian/kedit-trinity.lintian @@ -1,3 +1,3 @@ -kedit: no-shlibs-control-file opt/trinity/lib/libtdeinit_kedit.so -kedit: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kedit.so -kedit: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kedit.so +kedit-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kedit.so +kedit-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kedit.so +kedit-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kedit.so diff --git a/debian/lenny/tdeutils/debian/kedit-trinity.menu b/debian/lenny/tdeutils/debian/kedit-trinity.menu index a22b486b0..28d62014d 100644 --- a/debian/lenny/tdeutils/debian/kedit-trinity.menu +++ b/debian/lenny/tdeutils/debian/kedit-trinity.menu @@ -1,10 +1,10 @@ ?package(kedit):\ needs="X11"\ section="Apps/Editors"\ - hints="KDE,Text"\ + hints="TDE,Text"\ title="KEdit"\ - icon32x32="/usr/share/pixmaps/kedit.xpm"\ - icon16x16="/usr/share/pixmaps/kedit-16.xpm"\ + icon32x32="/opt/trinity/share/pixmaps/kedit.xpm"\ + icon16x16="/opt/trinity/share/pixmaps/kedit-16.xpm"\ command="/opt/trinity/bin/kedit" # Icon 32x32 kedit/pixmaps/cr32-app-kedit.png kedit.xpm diff --git a/debian/lenny/tdeutils/debian/kfloppy-trinity.menu b/debian/lenny/tdeutils/debian/kfloppy-trinity.menu index 60c18c954..66612d5bb 100644 --- a/debian/lenny/tdeutils/debian/kfloppy-trinity.menu +++ b/debian/lenny/tdeutils/debian/kfloppy-trinity.menu @@ -3,8 +3,8 @@ section="Apps/System"\ hints="TDE"\ title="KFloppy"\ - icon32x32="/usr/share/pixmaps/kfloppy.xpm"\ - icon16x16="/usr/share/pixmaps/kfloppy-16.xpm"\ + icon32x32="/opt/trinity/share/pixmaps/kfloppy.xpm"\ + icon16x16="/opt/trinity/share/pixmaps/kfloppy-16.xpm"\ command="/opt/trinity/bin/kfloppy" # Icon 32x32 kfloppy/cr32-app-kfloppy.png kfloppy.xpm diff --git a/debian/lenny/tdeutils/debian/kgpg-trinity.menu b/debian/lenny/tdeutils/debian/kgpg-trinity.menu index eb33f37ea..630a11407 100644 --- a/debian/lenny/tdeutils/debian/kgpg-trinity.menu +++ b/debian/lenny/tdeutils/debian/kgpg-trinity.menu @@ -3,8 +3,8 @@ section="Apps/Tools"\ hints="TDE"\ title="Kgpg"\ - icon32x32="/usr/share/pixmaps/kgpg.xpm"\ - icon16x16="/usr/share/pixmaps/kgpg-16.xpm"\ + icon32x32="/opt/trinity/share/pixmaps/kgpg.xpm"\ + icon16x16="/opt/trinity/share/pixmaps/kgpg-16.xpm"\ command="/opt/trinity/bin/kgpg" # Icon 32x32 kgpg/cr32-app-kgpg.png kgpg.xpm diff --git a/debian/lenny/tdeutils/debian/khexedit-trinity.menu b/debian/lenny/tdeutils/debian/khexedit-trinity.menu index 68dc4dc04..a22c59831 100644 --- a/debian/lenny/tdeutils/debian/khexedit-trinity.menu +++ b/debian/lenny/tdeutils/debian/khexedit-trinity.menu @@ -3,8 +3,8 @@ section="Apps/Tools"\ hints="TDE"\ title="KHexEdit"\ - icon32x32="/usr/share/pixmaps/khexedit.xpm"\ - icon16x16="/usr/share/pixmaps/khexedit-16.xpm"\ + icon32x32="/opt/trinity/share/pixmaps/khexedit.xpm"\ + icon16x16="/opt/trinity/share/pixmaps/khexedit-16.xpm"\ command="/opt/trinity/bin/khexedit" # Icon 32x32 khexedit/cr32-app-khexedit.png khexedit.xpm diff --git a/debian/lenny/tdeutils/debian/kjots-trinity.menu b/debian/lenny/tdeutils/debian/kjots-trinity.menu index 7133b6e69..aa2e44bd3 100644 --- a/debian/lenny/tdeutils/debian/kjots-trinity.menu +++ b/debian/lenny/tdeutils/debian/kjots-trinity.menu @@ -3,8 +3,8 @@ section="Apps/Tools"\ hints="TDE"\ title="KJots"\ - icon32x32="/usr/share/pixmaps/kjots.xpm"\ - icon16x16="/usr/share/pixmaps/kjots-16.xpm"\ + icon32x32="/opt/trinity/share/pixmaps/kjots.xpm"\ + icon16x16="/opt/trinity/share/pixmaps/kjots-16.xpm"\ command="/opt/trinity/bin/kjots" # Icon 32x32 kjots/icons/cr32-app-kjots.png kjots.xpm diff --git a/debian/lenny/tdeutils/debian/kregexpeditor-trinity.menu b/debian/lenny/tdeutils/debian/kregexpeditor-trinity.menu index ccf18b04c..fdfb1893f 100644 --- a/debian/lenny/tdeutils/debian/kregexpeditor-trinity.menu +++ b/debian/lenny/tdeutils/debian/kregexpeditor-trinity.menu @@ -3,8 +3,8 @@ section="Apps/Tools"\ hints="TDE"\ title="Kregexpeditor"\ - icon32x32="/usr/share/pixmaps/kregexpeditor.xpm"\ - icon16x16="/usr/share/pixmaps/kregexpeditor-16.xpm"\ + icon32x32="/opt/trinity/share/pixmaps/kregexpeditor.xpm"\ + icon16x16="/opt/trinity/share/pixmaps/kregexpeditor-16.xpm"\ command="/opt/trinity/bin/kregexpeditor" # Icon 32x32 kregexpeditor/cr32-app-kregexpeditor.png kregexpeditor.xpm diff --git a/debian/lenny/tdeutils/debian/ktimer-trinity.menu b/debian/lenny/tdeutils/debian/ktimer-trinity.menu index bcae05384..e25f4cf9e 100644 --- a/debian/lenny/tdeutils/debian/ktimer-trinity.menu +++ b/debian/lenny/tdeutils/debian/ktimer-trinity.menu @@ -3,8 +3,8 @@ section="Apps/Tools"\ hints="TDE"\ title="KTimer"\ - icon32x32="/usr/share/pixmaps/ktimer.xpm"\ - icon16x16="/usr/share/pixmaps/ktimer-16.xpm"\ + icon32x32="/opt/trinity/share/pixmaps/ktimer.xpm"\ + icon16x16="/opt/trinity/share/pixmaps/ktimer-16.xpm"\ command="/opt/trinity/bin/ktimer" # Icon 32x32 ktimer/cr32-app-ktimer.png ktimer.xpm diff --git a/debian/lenny/tdeutils/debian/superkaramba-trinity.menu b/debian/lenny/tdeutils/debian/superkaramba-trinity.menu index fe8fb9c8d..bd29663a0 100644 --- a/debian/lenny/tdeutils/debian/superkaramba-trinity.menu +++ b/debian/lenny/tdeutils/debian/superkaramba-trinity.menu @@ -3,8 +3,8 @@ section="Apps/Tools"\ hints="TDE"\ title="Superkaramba"\ - icon32x32="/usr/share/pixmaps/superkaramba.xpm"\ - icon16x16="/usr/share/pixmaps/superkaramba-16.xpm"\ + icon32x32="/opt/trinity/share/pixmaps/superkaramba.xpm"\ + icon16x16="/opt/trinity/share/pixmaps/superkaramba-16.xpm"\ command="/opt/trinity/bin/superkaramba" # Icon 32x32 superkaramba/icons/cr32-app-superkaramba.png superkaramba.xpm diff --git a/debian/lenny/tdeutils/debian/kdelirc-trinity.install b/debian/lenny/tdeutils/debian/tdelirc-trinity.install index 8570e2ffa..8570e2ffa 100644 --- a/debian/lenny/tdeutils/debian/kdelirc-trinity.install +++ b/debian/lenny/tdeutils/debian/tdelirc-trinity.install diff --git a/debian/lenny/tdeutils/debian/tdelirc-trinity.lintian b/debian/lenny/tdeutils/debian/tdelirc-trinity.lintian new file mode 100644 index 000000000..0c89583f3 --- /dev/null +++ b/debian/lenny/tdeutils/debian/tdelirc-trinity.lintian @@ -0,0 +1,3 @@ +tdelirc-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_irkick.so +tdelirc-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_irkick.so +tdelirc-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_irkick.so diff --git a/debian/lenny/tdeutils/debian/kdessh-trinity.install b/debian/lenny/tdeutils/debian/tdessh-trinity.install index cf26ccd1d..cf26ccd1d 100644 --- a/debian/lenny/tdeutils/debian/kdessh-trinity.install +++ b/debian/lenny/tdeutils/debian/tdessh-trinity.install diff --git a/debian/lenny/tdevelop/debian/tdevelop-data-trinity.lintian b/debian/lenny/tdevelop/debian/tdevelop-data-trinity.lintian index a0041fc4c..91e79108d 100644 --- a/debian/lenny/tdevelop/debian/tdevelop-data-trinity.lintian +++ b/debian/lenny/tdevelop/debian/tdevelop-data-trinity.lintian @@ -1,11 +1,11 @@ # These files are provided to create new applications. -tdevelop-data: extra-license-file usr/share/apps/kdevappwizard/template-common/COPYING -tdevelop-data: extra-license-file usr/share/apps/kdevappwizard/template-common/COPYING.LIB -tdevelop-data: extra-license-file usr/share/apps/kdevappwizard/template-common/LICENSE.QPL -tdevelop-data: extra-license-file usr/share/apps/kdevappwizard/template-common/LICENSE.BSD +tdevelop-data-trinity: extra-license-file opt/trinity/share/apps/kdevappwizard/template-common/COPYING +tdevelop-data-trinity: extra-license-file opt/trinity/share/apps/kdevappwizard/template-common/COPYING.LIB +tdevelop-data-trinity: extra-license-file opt/trinity/share/apps/kdevappwizard/template-common/LICENSE.QPL +tdevelop-data-trinity: extra-license-file opt/trinity/share/apps/kdevappwizard/template-common/LICENSE.BSD # This file is a template, not a script. -tdevelop-data: script-not-executable ./usr/share/apps/kdevfilecreate/file-templates/pl +tdevelop-data-trinity: script-not-executable ./opt/trinity/share/apps/kdevfilecreate/file-templates/pl # This file is used internally by tdeio_pydoc.la and invoked explicitly with python. -tdevelop-data: script-not-executable ./usr/share/apps/tdeio_pydoc/kde_pydoc.py +tdevelop-data-trinity: script-not-executable ./opt/trinity/share/apps/tdeio_pydoc/kde_pydoc.py # This file is used internally by libkdevcvsservice.la and invoked explicitly with sh. -tdevelop-data: script-not-executable ./usr/share/apps/kdevcvsservice/buildcvs.sh +tdevelop-data-trinity: script-not-executable ./opt/trinity/share/apps/kdevcvsservice/buildcvs.sh diff --git a/debian/lenny/tdevelop/debian/tdevelop-trinity.menu b/debian/lenny/tdevelop/debian/tdevelop-trinity.menu index 3734293c3..dbf27f386 100644 --- a/debian/lenny/tdevelop/debian/tdevelop-trinity.menu +++ b/debian/lenny/tdevelop/debian/tdevelop-trinity.menu @@ -1,8 +1,8 @@ ?package(tdevelop):\ needs="X11"\ section="Applications/Programming"\ - hints="KDE,Development"\ + hints="TDE,Development"\ title="KDevelop"\ longtitle="KDevelop (Development Environment)"\ - icon="/usr/share/pixmaps/tdevelop.xpm"\ + icon="/opt/trinity/share/pixmaps/tdevelop.xpm"\ command="/opt/trinity/bin/tdevelop" diff --git a/debian/lenny/tdewebdev/debian/cdbs/debian-qt-kde.mk b/debian/lenny/tdewebdev/debian/cdbs/debian-qt-kde.mk index d135c4257..4a11bc028 100644 --- a/debian/lenny/tdewebdev/debian/cdbs/debian-qt-kde.mk +++ b/debian/lenny/tdewebdev/debian/cdbs/debian-qt-kde.mk @@ -75,11 +75,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi if test -e debian/$(cdbs_curpkg).lintian; then \ install -p -D -m644 debian/$(cdbs_curpkg).lintian \ - debian/$(cdbs_curpkg)/opt/trinity/share/lintian/overrides/$(cdbs_curpkg); \ + debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \ fi if test -e debian/$(cdbs_curpkg).presubj; then \ install -p -D -m644 debian/$(cdbs_curpkg).presubj \ - debian/$(cdbs_curpkg)/opt/trinity/share/bug/$(cdbs_curpkg)/presubj; \ + debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ fi binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: diff --git a/debian/lenny/tdewebdev/debian/quanta-data-trinity.lintian b/debian/lenny/tdewebdev/debian/quanta-data-trinity.lintian index d8906a5be..1b1814f88 100644 --- a/debian/lenny/tdewebdev/debian/quanta-data-trinity.lintian +++ b/debian/lenny/tdewebdev/debian/quanta-data-trinity.lintian @@ -1,6 +1,6 @@ # These are shipped with quanta's kommander scripts and do not need to be # executable. -quanta-data: script-not-executable ./usr/share/apps/quanta/scripts/dwt.pl -quanta-data: script-not-executable ./usr/share/apps/quanta/scripts/TemplateMagic.pl -quanta-data: script-not-executable ./usr/share/apps/quanta/scripts/externalpreview.sh +quanta-data-trinity: script-not-executable ./opt/trinity/share/apps/quanta/scripts/dwt.pl +quanta-data-trinity: script-not-executable ./opt/trinity/share/apps/quanta/scripts/TemplateMagic.pl +quanta-data-trinity: script-not-executable ./opt/trinity/share/apps/quanta/scripts/externalpreview.sh diff --git a/debian/lenny/tdewebdev/debian/quanta-trinity.lintian b/debian/lenny/tdewebdev/debian/quanta-trinity.lintian index 09ae4739d..f46ec301f 100644 --- a/debian/lenny/tdewebdev/debian/quanta-trinity.lintian +++ b/debian/lenny/tdewebdev/debian/quanta-trinity.lintian @@ -1,4 +1,4 @@ # This tag is required for apps already in the KDE menu. -quanta: menu-item-contains-unknown-tag kderemove /opt/trinity/lib/menu/quanta:9 +quanta-trinity: menu-item-contains-unknown-tag kderemove /opt/trinity/lib/menu/quanta:9 # This is part of the docbook docs. -quanta: extra-license-file opt/trinity/share/doc/tde/HTML/en/quanta/credits-license.docbook +quanta-trinity: extra-license-file opt/trinity/share/doc/tde/HTML/en/quanta/credits-license.docbook |