diff options
| author | François Andriot <albator78@libertysurf.fr> | 2013-07-21 12:42:38 +0200 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2013-07-21 12:42:38 +0200 |
| commit | d2a5ae6eee8f77ba301f22a990fd68944c94d4ad (patch) | |
| tree | 0bdfdcb57898584e87d89ab3a0172d5b6ce28ce6 /ubuntu/raring/applications | |
| parent | 65166dbf185e59a4f874392b40c7f974e7ae5fb8 (diff) | |
| parent | 0657be6a3626991da456db3946ed1ec316ce6fb7 (diff) | |
| download | tde-packaging-d2a5ae6eee8f77ba301f22a990fd68944c94d4ad.tar.gz tde-packaging-d2a5ae6eee8f77ba301f22a990fd68944c94d4ad.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'ubuntu/raring/applications')
88 files changed, 243 insertions, 237 deletions
diff --git a/ubuntu/raring/applications/abakus/debian/abakus-trinity.menu b/ubuntu/raring/applications/abakus/debian/abakus-trinity.menu index 7692affbf..bd59ecd41 100644 --- a/ubuntu/raring/applications/abakus/debian/abakus-trinity.menu +++ b/ubuntu/raring/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/ubuntu/raring/applications/amarok.cmake/debian/amarok-trinity.menu b/ubuntu/raring/applications/amarok.cmake/debian/amarok-trinity.menu index 7bd18dffa..51d4e1f8b 100644 --- a/ubuntu/raring/applications/amarok.cmake/debian/amarok-trinity.menu +++ b/ubuntu/raring/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/ubuntu/raring/applications/amarok/debian/amarok-trinity.menu b/ubuntu/raring/applications/amarok/debian/amarok-trinity.menu index 7bd18dffa..51d4e1f8b 100644 --- a/ubuntu/raring/applications/amarok/debian/amarok-trinity.menu +++ b/ubuntu/raring/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/ubuntu/raring/applications/amarok/debian/rules b/ubuntu/raring/applications/amarok/debian/rules index 277aff4ec..1b6f7c5fe 100755 --- a/ubuntu/raring/applications/amarok/debian/rules +++ b/ubuntu/raring/applications/amarok/debian/rules @@ -72,7 +72,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/ubuntu/raring/applications/bibletime/debian/menu b/ubuntu/raring/applications/bibletime/debian/menu index 7ba4e395f..cf2c01b5d 100644 --- a/ubuntu/raring/applications/bibletime/debian/menu +++ b/ubuntu/raring/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/ubuntu/raring/applications/digikam/debian/digikam-trinity.menu b/ubuntu/raring/applications/digikam/debian/digikam-trinity.menu index 949e0fba8..e4f9ec786 100644 --- a/ubuntu/raring/applications/digikam/debian/digikam-trinity.menu +++ b/ubuntu/raring/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/ubuntu/raring/applications/digikam/debian/showfoto-trinity.menu b/ubuntu/raring/applications/digikam/debian/showfoto-trinity.menu index 32ce26612..4210733e4 100644 --- a/ubuntu/raring/applications/digikam/debian/showfoto-trinity.menu +++ b/ubuntu/raring/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/ubuntu/raring/applications/filelight/debian/menu b/ubuntu/raring/applications/filelight/debian/menu index 4db4c3f62..db52bceb9 100644 --- a/ubuntu/raring/applications/filelight/debian/menu +++ b/ubuntu/raring/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/ubuntu/raring/applications/gwenview/debian/gwenview.lintian b/ubuntu/raring/applications/gwenview/debian/gwenview.lintian index 6fdaead63..0e247a6ab 100644 --- a/ubuntu/raring/applications/gwenview/debian/gwenview.lintian +++ b/ubuntu/raring/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/ubuntu/raring/applications/gwenview/debian/menu b/ubuntu/raring/applications/gwenview/debian/menu index c20d8c34c..c139009e3 100644 --- a/ubuntu/raring/applications/gwenview/debian/menu +++ b/ubuntu/raring/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/ubuntu/raring/applications/gwenview/debian/rules b/ubuntu/raring/applications/gwenview/debian/rules index d6423c512..2fca00e50 100755 --- a/ubuntu/raring/applications/gwenview/debian/rules +++ b/ubuntu/raring/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/ubuntu/raring/applications/k3b/debian/k3b-trinity.menu b/ubuntu/raring/applications/k3b/debian/k3b-trinity.menu index f07382ed8..52a67ba44 100644 --- a/ubuntu/raring/applications/k3b/debian/k3b-trinity.menu +++ b/ubuntu/raring/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/ubuntu/raring/applications/k3b/debian/k3b.menu b/ubuntu/raring/applications/k3b/debian/k3b.menu index c6f95c029..52a67ba44 100644 --- a/ubuntu/raring/applications/k3b/debian/k3b.menu +++ b/ubuntu/raring/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/ubuntu/raring/applications/k9copy/debian/control b/ubuntu/raring/applications/k9copy/debian/control index d9a4ccd4e..96101dafe 100644 --- a/ubuntu/raring/applications/k9copy/debian/control +++ b/ubuntu/raring/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/ubuntu/raring/applications/k9copy/debian/k9copy.1.docbook b/ubuntu/raring/applications/k9copy/debian/k9copy.1.docbook index ff14d9107..96001a6ad 100644 --- a/ubuntu/raring/applications/k9copy/debian/k9copy.1.docbook +++ b/ubuntu/raring/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/ubuntu/raring/applications/k9copy/debian/rules b/ubuntu/raring/applications/k9copy/debian/rules index 8afe2157c..9d406d017 100755 --- a/ubuntu/raring/applications/k9copy/debian/rules +++ b/ubuntu/raring/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/ubuntu/raring/applications/kaffeine/debian/menu b/ubuntu/raring/applications/kaffeine/debian/menu index c9f3a50ac..50780b0a2 100644 --- a/ubuntu/raring/applications/kaffeine/debian/menu +++ b/ubuntu/raring/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/ubuntu/raring/applications/kaffeine/debian/rules b/ubuntu/raring/applications/kaffeine/debian/rules index 9021f8fb0..2f9fed447 100755 --- a/ubuntu/raring/applications/kaffeine/debian/rules +++ b/ubuntu/raring/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/ubuntu/raring/applications/kbarcode/debian/menu b/ubuntu/raring/applications/kbarcode/debian/menu index 48b3f8eff..e27b90141 100644 --- a/ubuntu/raring/applications/kbarcode/debian/menu +++ b/ubuntu/raring/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/ubuntu/raring/applications/kcpuload/debian/menu b/ubuntu/raring/applications/kcpuload/debian/menu index 181ec82e6..1ae39c62a 100644 --- a/ubuntu/raring/applications/kcpuload/debian/menu +++ b/ubuntu/raring/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/ubuntu/raring/applications/keep/debian/control b/ubuntu/raring/applications/keep/debian/control index f3213cd45..17e87e581 100644 --- a/ubuntu/raring/applications/keep/debian/control +++ b/ubuntu/raring/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/ubuntu/raring/applications/keep/debian/keep.xml b/ubuntu/raring/applications/keep/debian/keep.xml index 0f07da7f0..0e97d35b3 100644 --- a/ubuntu/raring/applications/keep/debian/keep.xml +++ b/ubuntu/raring/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/ubuntu/raring/applications/keep/debian/rules b/ubuntu/raring/applications/keep/debian/rules index 1b5054df6..c08262790 100755 --- a/ubuntu/raring/applications/keep/debian/rules +++ b/ubuntu/raring/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/ubuntu/raring/applications/kerry/debian/cdbs/debian-qt-kde.mk b/ubuntu/raring/applications/kerry/debian/cdbs/debian-qt-kde.mk index d135c4257..4a11bc028 100644 --- a/ubuntu/raring/applications/kerry/debian/cdbs/debian-qt-kde.mk +++ b/ubuntu/raring/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/ubuntu/raring/applications/kile/debian/menu b/ubuntu/raring/applications/kile/debian/menu index 2d5ca41b0..1ab2d756b 100644 --- a/ubuntu/raring/applications/kile/debian/menu +++ b/ubuntu/raring/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/ubuntu/raring/applications/kmatplot/debian/menu b/ubuntu/raring/applications/kmatplot/debian/menu index 6cb3a60a8..31de047d3 100644 --- a/ubuntu/raring/applications/kmatplot/debian/menu +++ b/ubuntu/raring/applications/kmatplot/debian/menu @@ -1,2 +1,2 @@ ?package(kmatplot):needs="X11" section="Apps/Math"\ - title="kmatplot" command="/usr/bin/kmatplot" + title="kmatplot" command="/opt/trinity/bin/kmatplot" diff --git a/ubuntu/raring/applications/knetload/debian/menu b/ubuntu/raring/applications/knetload/debian/menu index d6e27b1a4..4a380d449 100644 --- a/ubuntu/raring/applications/knetload/debian/menu +++ b/ubuntu/raring/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/ubuntu/raring/applications/knetworkmanager.cmake/debian/menu b/ubuntu/raring/applications/knetworkmanager.cmake/debian/menu index 9775e9c7c..3853fafff 100644 --- a/ubuntu/raring/applications/knetworkmanager.cmake/debian/menu +++ b/ubuntu/raring/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/ubuntu/raring/applications/knetworkmanager8/debian/menu b/ubuntu/raring/applications/knetworkmanager8/debian/menu index 9775e9c7c..3853fafff 100644 --- a/ubuntu/raring/applications/knetworkmanager8/debian/menu +++ b/ubuntu/raring/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/ubuntu/raring/applications/koffice/debian/cdbs/debian-qt-kde.mk b/ubuntu/raring/applications/koffice/debian/cdbs/debian-qt-kde.mk index 53c516a66..b93e7c154 100644 --- a/ubuntu/raring/applications/koffice/debian/cdbs/debian-qt-kde.mk +++ b/ubuntu/raring/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/ubuntu/raring/applications/koffice/debian/chalk-data-trinity.lintian b/ubuntu/raring/applications/koffice/debian/chalk-data-trinity.lintian index 820cf112f..7500cb18d 100644 --- a/ubuntu/raring/applications/koffice/debian/chalk-data-trinity.lintian +++ b/ubuntu/raring/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/ubuntu/raring/applications/koffice/debian/chalk-trinity.lintian b/ubuntu/raring/applications/koffice/debian/chalk-trinity.lintian index 08adc5291..1d75d150d 100644 --- a/ubuntu/raring/applications/koffice/debian/chalk-trinity.lintian +++ b/ubuntu/raring/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/ubuntu/raring/applications/koffice/debian/chalk-trinity.menu b/ubuntu/raring/applications/koffice/debian/chalk-trinity.menu index 2354092d2..d5c662a09 100644 --- a/ubuntu/raring/applications/koffice/debian/chalk-trinity.menu +++ b/ubuntu/raring/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/ubuntu/raring/applications/koffice/debian/karbon-trinity.lintian b/ubuntu/raring/applications/koffice/debian/karbon-trinity.lintian index 9733b0a93..b08ff3b43 100644 --- a/ubuntu/raring/applications/koffice/debian/karbon-trinity.lintian +++ b/ubuntu/raring/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/ubuntu/raring/applications/koffice/debian/karbon-trinity.menu b/ubuntu/raring/applications/koffice/debian/karbon-trinity.menu index 0329fc505..b44ea5b50 100644 --- a/ubuntu/raring/applications/koffice/debian/karbon-trinity.menu +++ b/ubuntu/raring/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/ubuntu/raring/applications/koffice/debian/kchart-trinity.lintian b/ubuntu/raring/applications/koffice/debian/kchart-trinity.lintian index 4a9df9c9e..b548f2d00 100644 --- a/ubuntu/raring/applications/koffice/debian/kchart-trinity.lintian +++ b/ubuntu/raring/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/ubuntu/raring/applications/koffice/debian/kchart-trinity.menu b/ubuntu/raring/applications/koffice/debian/kchart-trinity.menu index 405e19fec..5939ec5d4 100644 --- a/ubuntu/raring/applications/koffice/debian/kchart-trinity.menu +++ b/ubuntu/raring/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/ubuntu/raring/applications/koffice/debian/kexi-trinity.lintian b/ubuntu/raring/applications/koffice/debian/kexi-trinity.lintian index 5288fb87d..c89fb0678 100644 --- a/ubuntu/raring/applications/koffice/debian/kexi-trinity.lintian +++ b/ubuntu/raring/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/ubuntu/raring/applications/koffice/debian/kformula-trinity.lintian b/ubuntu/raring/applications/koffice/debian/kformula-trinity.lintian index 1062b39db..25a8c006f 100644 --- a/ubuntu/raring/applications/koffice/debian/kformula-trinity.lintian +++ b/ubuntu/raring/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/ubuntu/raring/applications/koffice/debian/kivio-data-trinity.lintian b/ubuntu/raring/applications/koffice/debian/kivio-data-trinity.lintian index d77987c69..66e15fdb7 100644 --- a/ubuntu/raring/applications/koffice/debian/kivio-data-trinity.lintian +++ b/ubuntu/raring/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/ubuntu/raring/applications/koffice/debian/kivio-trinity.lintian b/ubuntu/raring/applications/koffice/debian/kivio-trinity.lintian index 02a07173b..1ff9e3f76 100644 --- a/ubuntu/raring/applications/koffice/debian/kivio-trinity.lintian +++ b/ubuntu/raring/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/ubuntu/raring/applications/koffice/debian/kivio-trinity.menu b/ubuntu/raring/applications/koffice/debian/kivio-trinity.menu index db45a4245..ea5177019 100644 --- a/ubuntu/raring/applications/koffice/debian/kivio-trinity.menu +++ b/ubuntu/raring/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/ubuntu/raring/applications/koffice/debian/koffice-libs-trinity.lintian b/ubuntu/raring/applications/koffice/debian/koffice-libs-trinity.lintian index bdf6f40e1..1137a9b12 100644 --- a/ubuntu/raring/applications/koffice/debian/koffice-libs-trinity.lintian +++ b/ubuntu/raring/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/ubuntu/raring/applications/koffice/debian/koshell-trinity.lintian b/ubuntu/raring/applications/koffice/debian/koshell-trinity.lintian index 45d130a4e..c77411ba2 100644 --- a/ubuntu/raring/applications/koffice/debian/koshell-trinity.lintian +++ b/ubuntu/raring/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/ubuntu/raring/applications/koffice/debian/kplato-trinity.lintian b/ubuntu/raring/applications/koffice/debian/kplato-trinity.lintian index f08eafe73..74f77679d 100644 --- a/ubuntu/raring/applications/koffice/debian/kplato-trinity.lintian +++ b/ubuntu/raring/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/ubuntu/raring/applications/koffice/debian/kpresenter-data-trinity.lintian b/ubuntu/raring/applications/koffice/debian/kpresenter-data-trinity.lintian index 68e69e640..8a7a4f113 100644 --- a/ubuntu/raring/applications/koffice/debian/kpresenter-data-trinity.lintian +++ b/ubuntu/raring/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/ubuntu/raring/applications/koffice/debian/kpresenter-trinity.lintian b/ubuntu/raring/applications/koffice/debian/kpresenter-trinity.lintian index 6e7af5591..dc55d0006 100644 --- a/ubuntu/raring/applications/koffice/debian/kpresenter-trinity.lintian +++ b/ubuntu/raring/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/ubuntu/raring/applications/koffice/debian/kpresenter-trinity.menu b/ubuntu/raring/applications/koffice/debian/kpresenter-trinity.menu index 52bff66e1..dda510fcf 100644 --- a/ubuntu/raring/applications/koffice/debian/kpresenter-trinity.menu +++ b/ubuntu/raring/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/ubuntu/raring/applications/koffice/debian/kspread-trinity.lintian b/ubuntu/raring/applications/koffice/debian/kspread-trinity.lintian index b47c3a364..44cb7cb45 100644 --- a/ubuntu/raring/applications/koffice/debian/kspread-trinity.lintian +++ b/ubuntu/raring/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/ubuntu/raring/applications/koffice/debian/kspread-trinity.menu b/ubuntu/raring/applications/koffice/debian/kspread-trinity.menu index 8a6987024..d3cec2c14 100644 --- a/ubuntu/raring/applications/koffice/debian/kspread-trinity.menu +++ b/ubuntu/raring/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/ubuntu/raring/applications/koffice/debian/kthesaurus-trinity.lintian b/ubuntu/raring/applications/koffice/debian/kthesaurus-trinity.lintian index 7d7018a77..252102b05 100644 --- a/ubuntu/raring/applications/koffice/debian/kthesaurus-trinity.lintian +++ b/ubuntu/raring/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/ubuntu/raring/applications/koffice/debian/kugar-trinity.lintian b/ubuntu/raring/applications/koffice/debian/kugar-trinity.lintian index 5b8ec0d77..8504ff61f 100644 --- a/ubuntu/raring/applications/koffice/debian/kugar-trinity.lintian +++ b/ubuntu/raring/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/ubuntu/raring/applications/koffice/debian/kword-data-trinity.lintian b/ubuntu/raring/applications/koffice/debian/kword-data-trinity.lintian index 6fa3d857b..09c395552 100644 --- a/ubuntu/raring/applications/koffice/debian/kword-data-trinity.lintian +++ b/ubuntu/raring/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/ubuntu/raring/applications/koffice/debian/kword-trinity.lintian b/ubuntu/raring/applications/koffice/debian/kword-trinity.lintian index 5d08d84ca..2c396f259 100644 --- a/ubuntu/raring/applications/koffice/debian/kword-trinity.lintian +++ b/ubuntu/raring/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/ubuntu/raring/applications/koffice/debian/kword-trinity.menu b/ubuntu/raring/applications/koffice/debian/kword-trinity.menu index 2dfdc2579..ce452d45d 100644 --- a/ubuntu/raring/applications/koffice/debian/kword-trinity.menu +++ b/ubuntu/raring/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/ubuntu/raring/applications/konversation/debian/control b/ubuntu/raring/applications/konversation/debian/control index 9728d2f8e..7d96a609e 100644 --- a/ubuntu/raring/applications/konversation/debian/control +++ b/ubuntu/raring/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/ubuntu/raring/applications/konversation/debian/konversation-trinity.manpages b/ubuntu/raring/applications/konversation/debian/konversation-trinity.manpages index 13cdaf4b2..8b3496a3d 100644 --- a/ubuntu/raring/applications/konversation/debian/konversation-trinity.manpages +++ b/ubuntu/raring/applications/konversation/debian/konversation-trinity.manpages @@ -1 +1 @@ -debian/man/*.1 +#debian/man/*.1 diff --git a/ubuntu/raring/applications/konversation/debian/konversation-trinity.menu b/ubuntu/raring/applications/konversation/debian/konversation-trinity.menu index 0fbd13937..5adcdf7fc 100644 --- a/ubuntu/raring/applications/konversation/debian/konversation-trinity.menu +++ b/ubuntu/raring/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/ubuntu/raring/applications/konversation/debian/man/konversation.1.docbook b/ubuntu/raring/applications/konversation/debian/man/konversation.1.docbook index f48e27b95..719d6e158 100644 --- a/ubuntu/raring/applications/konversation/debian/man/konversation.1.docbook +++ b/ubuntu/raring/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/ubuntu/raring/applications/konversation/debian/man/konversationircprotocolhandler.1.docbook b/ubuntu/raring/applications/konversation/debian/man/konversationircprotocolhandler.1.docbook index 1752d7b2c..3a82060c1 100644 --- a/ubuntu/raring/applications/konversation/debian/man/konversationircprotocolhandler.1.docbook +++ b/ubuntu/raring/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/ubuntu/raring/applications/konversation/debian/rules b/ubuntu/raring/applications/konversation/debian/rules index 0e973a150..a547b5e8a 100755 --- a/ubuntu/raring/applications/konversation/debian/rules +++ b/ubuntu/raring/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/ubuntu/raring/applications/kpicosim/debian/menu b/ubuntu/raring/applications/kpicosim/debian/menu index 12de54d49..d62b7dcb0 100644 --- a/ubuntu/raring/applications/kpicosim/debian/menu +++ b/ubuntu/raring/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/ubuntu/raring/applications/kpowersave.cmake/debian/kpowersave-trinity.lintian b/ubuntu/raring/applications/kpowersave.cmake/debian/kpowersave-trinity.lintian index edff50852..8f6135226 100644 --- a/ubuntu/raring/applications/kpowersave.cmake/debian/kpowersave-trinity.lintian +++ b/ubuntu/raring/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/ubuntu/raring/applications/kpowersave.cmake/debian/menu b/ubuntu/raring/applications/kpowersave.cmake/debian/menu index 6ae0f9833..0dbd62cc4 100644 --- a/ubuntu/raring/applications/kpowersave.cmake/debian/menu +++ b/ubuntu/raring/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/ubuntu/raring/applications/kpowersave.cmake/debian/rules b/ubuntu/raring/applications/kpowersave.cmake/debian/rules index 7f153b395..0d2383bae 100755 --- a/ubuntu/raring/applications/kpowersave.cmake/debian/rules +++ b/ubuntu/raring/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/ubuntu/raring/applications/kpowersave/debian/kpowersave-trinity.lintian b/ubuntu/raring/applications/kpowersave/debian/kpowersave-trinity.lintian index edff50852..8f6135226 100644 --- a/ubuntu/raring/applications/kpowersave/debian/kpowersave-trinity.lintian +++ b/ubuntu/raring/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/ubuntu/raring/applications/kpowersave/debian/rules b/ubuntu/raring/applications/kpowersave/debian/rules index 961465395..0cf9afbec 100755 --- a/ubuntu/raring/applications/kpowersave/debian/rules +++ b/ubuntu/raring/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/ubuntu/raring/applications/krusader/debian/menu b/ubuntu/raring/applications/krusader/debian/menu index 8999b22e7..be83ad7d4 100644 --- a/ubuntu/raring/applications/krusader/debian/menu +++ b/ubuntu/raring/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/ubuntu/raring/applications/krusader/debian/rules b/ubuntu/raring/applications/krusader/debian/rules index 5a95e522d..4b297b1ae 100755 --- a/ubuntu/raring/applications/krusader/debian/rules +++ b/ubuntu/raring/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/ubuntu/raring/applications/ktechlab/debian/menu b/ubuntu/raring/applications/ktechlab/debian/menu index bb72dd11c..400129a6c 100644 --- a/ubuntu/raring/applications/ktechlab/debian/menu +++ b/ubuntu/raring/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/ubuntu/raring/applications/ktorrent/debian/cdbs/debian-qt-kde.mk b/ubuntu/raring/applications/ktorrent/debian/cdbs/debian-qt-kde.mk index 53c516a66..b93e7c154 100644 --- a/ubuntu/raring/applications/ktorrent/debian/cdbs/debian-qt-kde.mk +++ b/ubuntu/raring/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/ubuntu/raring/applications/kuickshow/debian/kuickshow-trinity.menu b/ubuntu/raring/applications/kuickshow/debian/kuickshow-trinity.menu index eee2e1417..eb28ff0fe 100644 --- a/ubuntu/raring/applications/kuickshow/debian/kuickshow-trinity.menu +++ b/ubuntu/raring/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/ubuntu/raring/applications/potracegui/debian/potracegui-trinity.menu b/ubuntu/raring/applications/potracegui/debian/potracegui-trinity.menu index ec42ba351..57290a786 100644 --- a/ubuntu/raring/applications/potracegui/debian/potracegui-trinity.menu +++ b/ubuntu/raring/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/ubuntu/raring/applications/smb4k/debian/menu b/ubuntu/raring/applications/smb4k/debian/menu index c56defa90..a20388544 100644 --- a/ubuntu/raring/applications/smb4k/debian/menu +++ b/ubuntu/raring/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/ubuntu/raring/applications/tdepowersave/debian/control b/ubuntu/raring/applications/tdepowersave/debian/control index 3c3de5835..dcd5ab3f9 100644 --- a/ubuntu/raring/applications/tdepowersave/debian/control +++ b/ubuntu/raring/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/ubuntu/raring/applications/tdepowersave/debian/install b/ubuntu/raring/applications/tdepowersave/debian/install index 4a1194bd1..8d2341734 100644 --- a/ubuntu/raring/applications/tdepowersave/debian/install +++ b/ubuntu/raring/applications/tdepowersave/debian/install @@ -1 +1 @@ -debian/kpowersave.xpm usr/share/pixmaps +debian/tdepowersave.xpm opt/trinity/share/pixmaps diff --git a/ubuntu/raring/applications/tdepowersave/debian/kpowersave-nohal-trinity.lintian b/ubuntu/raring/applications/tdepowersave/debian/kpowersave-nohal-trinity.lintian deleted file mode 100644 index edff50852..000000000 --- a/ubuntu/raring/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/ubuntu/raring/applications/tdepowersave/debian/manpages b/ubuntu/raring/applications/tdepowersave/debian/manpages index c8fa7b85f..aff0f8470 100644 --- a/ubuntu/raring/applications/tdepowersave/debian/manpages +++ b/ubuntu/raring/applications/tdepowersave/debian/manpages @@ -1 +1 @@ -debian/kpowersave.1 +debian/tdepowersave.1 diff --git a/ubuntu/raring/applications/tdepowersave/debian/menu b/ubuntu/raring/applications/tdepowersave/debian/menu index 6ae0f9833..c2c6cc3d2 100644 --- a/ubuntu/raring/applications/tdepowersave/debian/menu +++ b/ubuntu/raring/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/ubuntu/raring/applications/tdepowersave/debian/rules b/ubuntu/raring/applications/tdepowersave/debian/rules index 97acebf07..485481ef7 100755 --- a/ubuntu/raring/applications/tdepowersave/debian/rules +++ b/ubuntu/raring/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/ubuntu/raring/applications/tdepowersave/debian/kpowersave-nohal-trinity.linda b/ubuntu/raring/applications/tdepowersave/debian/tdepowersave-trinity.linda index ff5153632..ff5153632 100644 --- a/ubuntu/raring/applications/tdepowersave/debian/kpowersave-nohal-trinity.linda +++ b/ubuntu/raring/applications/tdepowersave/debian/tdepowersave-trinity.linda diff --git a/ubuntu/raring/applications/tdepowersave/debian/tdepowersave-trinity.lintian b/ubuntu/raring/applications/tdepowersave/debian/tdepowersave-trinity.lintian new file mode 100644 index 000000000..e27c64261 --- /dev/null +++ b/ubuntu/raring/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/ubuntu/raring/applications/tdepowersave/debian/kpowersave.1 b/ubuntu/raring/applications/tdepowersave/debian/tdepowersave.1 index 0ab1d6f90..d79cfd21d 100644 --- a/ubuntu/raring/applications/tdepowersave/debian/kpowersave.1 +++ b/ubuntu/raring/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/ubuntu/raring/applications/tdepowersave/debian/kpowersave.xpm b/ubuntu/raring/applications/tdepowersave/debian/tdepowersave.xpm index 99d178492..a7b0f2e7c 100644 --- a/ubuntu/raring/applications/tdepowersave/debian/kpowersave.xpm +++ b/ubuntu/raring/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/ubuntu/raring/applications/tdepowersave/debian/watch b/ubuntu/raring/applications/tdepowersave/debian/watch deleted file mode 100644 index 832285e63..000000000 --- a/ubuntu/raring/applications/tdepowersave/debian/watch +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -http://sf.net/powersave/kpowersave-(.*)\.tar\.bz2 diff --git a/ubuntu/raring/applications/tdesvn/debian/tdesvn-trinity.menu b/ubuntu/raring/applications/tdesvn/debian/tdesvn-trinity.menu index 12595e540..c91c6ddce 100644 --- a/ubuntu/raring/applications/tdesvn/debian/tdesvn-trinity.menu +++ b/ubuntu/raring/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/ubuntu/raring/applications/wlassistant/debian/wlassistant-trinity.menu b/ubuntu/raring/applications/wlassistant/debian/wlassistant-trinity.menu index 4004b5a65..8b3f1d669 100644 --- a/ubuntu/raring/applications/wlassistant/debian/wlassistant-trinity.menu +++ b/ubuntu/raring/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/ubuntu/raring/applications/yakuake/debian/yakuake-trinity.menu b/ubuntu/raring/applications/yakuake/debian/yakuake-trinity.menu index 80d76482b..2f92c629a 100644 --- a/ubuntu/raring/applications/yakuake/debian/yakuake-trinity.menu +++ b/ubuntu/raring/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" |