diff options
Diffstat (limited to 'debian/lenny/applications')
30 files changed, 117 insertions, 117 deletions
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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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:: |