DEB: move tdebindings to /usr folder. This relates to bug 266.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
bug/266/tdebindings-move-to-usr-lib
Michele Calgaro 4 years ago
parent 84af9581d6
commit ae365057f6
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
  1. 2
      debian/lenny/tdebindings/debian/cdbs/kde.mk
  2. 2
      debian/lenny/tdebindings/debian/changelog
  3. 12
      debian/lenny/tdebindings/debian/juic-trinity.install
  4. 6
      debian/lenny/tdebindings/debian/kjscmd-trinity.install
  5. 2
      debian/lenny/tdebindings/debian/kjscmd-trinity.links
  6. 2
      debian/lenny/tdebindings/debian/kjscmd-trinity.menu
  7. 4
      debian/lenny/tdebindings/debian/konqueror-kjsembed-plugin-trinity.install
  8. 8
      debian/lenny/tdebindings/debian/libdcop-perl-trinity.install
  9. 2
      debian/lenny/tdebindings/debian/libdcop3-java-trinity-dev.install
  10. 2
      debian/lenny/tdebindings/debian/libdcop3-java-trinity-dev.links
  11. 2
      debian/lenny/tdebindings/debian/libdcop3-java-trinity.install
  12. 2
      debian/lenny/tdebindings/debian/libdcop3-java-trinity.links
  13. 4
      debian/lenny/tdebindings/debian/libdcop3-jni-trinity.install
  14. 44
      debian/lenny/tdebindings/debian/libkjsembed-trinity-dev.install
  15. 2
      debian/lenny/tdebindings/debian/libkjsembed-trinity-dev.links
  16. 50
      debian/lenny/tdebindings/debian/libkjsembed1-trinity.install
  17. 18
      debian/lenny/tdebindings/debian/libkorundum0-ruby-trinity.install
  18. 22
      debian/lenny/tdebindings/debian/libqt0-ruby-trinity.install
  19. 4
      debian/lenny/tdebindings/debian/libqt3-java-trinity.install
  20. 2
      debian/lenny/tdebindings/debian/libqt3-java-trinity.links
  21. 18
      debian/lenny/tdebindings/debian/libqt3-jni-trinity.install
  22. 4
      debian/lenny/tdebindings/debian/libsmoketde-trinity-dev.install
  23. 2
      debian/lenny/tdebindings/debian/libsmoketde-trinity-dev.links
  24. 4
      debian/lenny/tdebindings/debian/libsmoketde1-trinity.install
  25. 6
      debian/lenny/tdebindings/debian/libsmoketqt-trinity-dev.install
  26. 2
      debian/lenny/tdebindings/debian/libsmoketqt-trinity-dev.links
  27. 4
      debian/lenny/tdebindings/debian/libsmoketqt1-trinity.install
  28. 2
      debian/lenny/tdebindings/debian/libtrinity-java-trinity.install
  29. 2
      debian/lenny/tdebindings/debian/libtrinity-java-trinity.links
  30. 10
      debian/lenny/tdebindings/debian/libtrinity-jni-trinity.install
  31. 2
      debian/lenny/tdebindings/debian/patches/common/kubuntu_01_kdepot.diff
  32. 2
      debian/lenny/tdebindings/debian/python-dcop-trinity.install
  33. 59
      debian/lenny/tdebindings/debian/rules
  34. 40
      debian/lenny/tdebindings/debian/tde-xparts-extras-trinity.install
  35. 2
      debian/lenny/tdebindings/debian/tdebindings-java-trinity.links
  36. 2
      debian/squeeze/tdebindings/debian/cdbs/kde.mk
  37. 2
      debian/squeeze/tdebindings/debian/changelog
  38. 12
      debian/squeeze/tdebindings/debian/juic-trinity.install
  39. 6
      debian/squeeze/tdebindings/debian/kjscmd-trinity.install
  40. 2
      debian/squeeze/tdebindings/debian/kjscmd-trinity.links
  41. 2
      debian/squeeze/tdebindings/debian/kjscmd-trinity.menu
  42. 4
      debian/squeeze/tdebindings/debian/konqueror-kjsembed-plugin-trinity.install
  43. 8
      debian/squeeze/tdebindings/debian/libdcop-perl-trinity.install
  44. 2
      debian/squeeze/tdebindings/debian/libdcop3-java-trinity-dev.install
  45. 2
      debian/squeeze/tdebindings/debian/libdcop3-java-trinity-dev.links
  46. 2
      debian/squeeze/tdebindings/debian/libdcop3-java-trinity.install
  47. 2
      debian/squeeze/tdebindings/debian/libdcop3-java-trinity.links
  48. 4
      debian/squeeze/tdebindings/debian/libdcop3-jni-trinity.install
  49. 44
      debian/squeeze/tdebindings/debian/libkjsembed-trinity-dev.install
  50. 2
      debian/squeeze/tdebindings/debian/libkjsembed-trinity-dev.links
  51. 50
      debian/squeeze/tdebindings/debian/libkjsembed1-trinity.install
  52. 18
      debian/squeeze/tdebindings/debian/libkorundum0-ruby-trinity.install
  53. 22
      debian/squeeze/tdebindings/debian/libqt0-ruby-trinity.install
  54. 4
      debian/squeeze/tdebindings/debian/libqt3-java-trinity.install
  55. 2
      debian/squeeze/tdebindings/debian/libqt3-java-trinity.links
  56. 18
      debian/squeeze/tdebindings/debian/libqt3-jni-trinity.install
  57. 4
      debian/squeeze/tdebindings/debian/libsmoketde-trinity-dev.install
  58. 2
      debian/squeeze/tdebindings/debian/libsmoketde-trinity-dev.links
  59. 4
      debian/squeeze/tdebindings/debian/libsmoketde1-trinity.install
  60. 6
      debian/squeeze/tdebindings/debian/libsmoketqt-trinity-dev.install
  61. 2
      debian/squeeze/tdebindings/debian/libsmoketqt-trinity-dev.links
  62. 4
      debian/squeeze/tdebindings/debian/libsmoketqt1-trinity.install
  63. 2
      debian/squeeze/tdebindings/debian/libtrinity-java-trinity.install
  64. 2
      debian/squeeze/tdebindings/debian/libtrinity-java-trinity.links
  65. 10
      debian/squeeze/tdebindings/debian/libtrinity-jni-trinity.install
  66. 2
      debian/squeeze/tdebindings/debian/patches/common/kubuntu_01_kdepot.diff
  67. 2
      debian/squeeze/tdebindings/debian/python-dcop-trinity.install
  68. 59
      debian/squeeze/tdebindings/debian/rules
  69. 40
      debian/squeeze/tdebindings/debian/tde-xparts-extras-trinity.install
  70. 2
      debian/squeeze/tdebindings/debian/tdebindings-java-trinity.links
  71. 2
      ubuntu/maverick/tdebindings/debian/cdbs/kde.mk
  72. 2
      ubuntu/maverick/tdebindings/debian/changelog
  73. 12
      ubuntu/maverick/tdebindings/debian/juic-trinity.install
  74. 6
      ubuntu/maverick/tdebindings/debian/kjscmd-trinity.install
  75. 2
      ubuntu/maverick/tdebindings/debian/kjscmd-trinity.links
  76. 2
      ubuntu/maverick/tdebindings/debian/kjscmd-trinity.menu
  77. 4
      ubuntu/maverick/tdebindings/debian/konqueror-kjsembed-plugin-trinity.install
  78. 8
      ubuntu/maverick/tdebindings/debian/libdcop-perl-trinity.install
  79. 2
      ubuntu/maverick/tdebindings/debian/libdcop3-java-trinity-dev.install
  80. 2
      ubuntu/maverick/tdebindings/debian/libdcop3-java-trinity-dev.links
  81. 2
      ubuntu/maverick/tdebindings/debian/libdcop3-java-trinity.install
  82. 2
      ubuntu/maverick/tdebindings/debian/libdcop3-java-trinity.links
  83. 4
      ubuntu/maverick/tdebindings/debian/libdcop3-jni-trinity.install
  84. 44
      ubuntu/maverick/tdebindings/debian/libkjsembed-trinity-dev.install
  85. 2
      ubuntu/maverick/tdebindings/debian/libkjsembed-trinity-dev.links
  86. 50
      ubuntu/maverick/tdebindings/debian/libkjsembed1-trinity.install
  87. 18
      ubuntu/maverick/tdebindings/debian/libkorundum0-ruby-trinity.install
  88. 22
      ubuntu/maverick/tdebindings/debian/libqt0-ruby-trinity.install
  89. 4
      ubuntu/maverick/tdebindings/debian/libqt3-java-trinity.install
  90. 2
      ubuntu/maverick/tdebindings/debian/libqt3-java-trinity.links
  91. 18
      ubuntu/maverick/tdebindings/debian/libqt3-jni-trinity.install
  92. 4
      ubuntu/maverick/tdebindings/debian/libsmoketde-trinity-dev.install
  93. 2
      ubuntu/maverick/tdebindings/debian/libsmoketde-trinity-dev.links
  94. 4
      ubuntu/maverick/tdebindings/debian/libsmoketde1-trinity.install
  95. 6
      ubuntu/maverick/tdebindings/debian/libsmoketqt-trinity-dev.install
  96. 2
      ubuntu/maverick/tdebindings/debian/libsmoketqt-trinity-dev.links
  97. 4
      ubuntu/maverick/tdebindings/debian/libsmoketqt1-trinity.install
  98. 2
      ubuntu/maverick/tdebindings/debian/libtrinity-java-trinity.install
  99. 2
      ubuntu/maverick/tdebindings/debian/libtrinity-java-trinity.links
  100. 10
      ubuntu/maverick/tdebindings/debian/libtrinity-jni-trinity.install
  101. 2
      ubuntu/maverick/tdebindings/debian/patches/common/kubuntu_01_kdepot.diff
  102. 2
      ubuntu/maverick/tdebindings/debian/python-dcop-trinity.install
  103. 59
      ubuntu/maverick/tdebindings/debian/rules
  104. 40
      ubuntu/maverick/tdebindings/debian/tde-xparts-extras-trinity.install
  105. 2
      ubuntu/maverick/tdebindings/debian/tdebindings-java-trinity.links

@ -75,7 +75,7 @@ debian/stamp-kde-apidox:
common-install-prehook-impl::
mkdir -p po
-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages
-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/usr/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages
-for file in po/*pot; do \
sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
done

@ -6,7 +6,7 @@ tdebindings-trinity (4:3.5.10-0ubuntu2) karmic; urgency=low
tdebindings-trinity (4:3.5.10-0ubuntu1~intrepid8) intrepid; urgency=low
* Moved Trinity to /opt/trinity
* Moved Trinity to /usr
* Integrated properly with KDE4.2+
-- Timothy Pearson <kb9vqf@pearsoncomputing.net> Wed, 05 March 2009 01:11:00 -0600

@ -1,6 +1,6 @@
qtjava/designer/juic/bin/juic /opt/trinity/bin
qtjava/designer/juic/common/*.xml /opt/trinity/share/juic/common
qtjava/designer/juic/common/*.xsl /opt/trinity/share/juic/common
qtjava/designer/juic/java/*.xml /opt/trinity/share/juic/java
qtjava/designer/juic/java/*.xsl /opt/trinity/share/juic/java
qtjava/designer/juic/juic.xsl /opt/trinity/share/juic
qtjava/designer/juic/bin/juic /usr/bin
qtjava/designer/juic/common/*.xml /usr/share/juic/common
qtjava/designer/juic/common/*.xsl /usr/share/juic/common
qtjava/designer/juic/java/*.xml /usr/share/juic/java
qtjava/designer/juic/java/*.xsl /usr/share/juic/java
qtjava/designer/juic/juic.xsl /usr/share/juic

@ -1,3 +1,3 @@
debian/tmp/opt/trinity/bin/kjscmd
debian/tmp/opt/trinity/share/applications/tde/kjscmd.desktop
debian/tmp/opt/trinity/share/man/man1/kjscmd.1
debian/tmp/usr/bin/kjscmd
debian/tmp/usr/share/applications/tde/kjscmd.desktop
debian/tmp/usr/share/man/man1/kjscmd.1

@ -1 +1 @@
/opt/trinity/share/doc/libkjsembed1 /opt/trinity/share/doc/kjscmd
/usr/share/doc/libkjsembed1 /usr/share/doc/kjscmd

@ -3,4 +3,4 @@
section="Applications/Programming"\
hints="TDE"\
title="TDE JavaScript Console"\
command="/opt/trinity/bin/kjscmd --console --exec"
command="/usr/bin/kjscmd --console --exec"

@ -1,2 +1,2 @@
debian/tmp/opt/trinity/lib/trinity/libjsconsoleplugin.la
debian/tmp/opt/trinity/lib/trinity/libjsconsoleplugin.so
debian/tmp/usr/lib/trinity/libjsconsoleplugin.la
debian/tmp/usr/lib/trinity/libjsconsoleplugin.so

@ -1,4 +1,4 @@
debian/tmp/opt/trinity/lib/perl5/auto/DCOP/*
debian/tmp/opt/trinity/lib/perl5/DCOP.pm
debian/tmp/opt/trinity/lib/perl5/DCOP/*
debian/tmp/opt/trinity/share/man/man3/DCOP.3pm
debian/tmp/usr/lib/perl5/auto/DCOP/*
debian/tmp/usr/lib/perl5/DCOP.pm
debian/tmp/usr/lib/perl5/DCOP/*
debian/tmp/usr/share/man/man3/DCOP.3pm

@ -1 +1 @@
debian/tmp/opt/trinity/bin/dcopidl2java
debian/tmp/usr/bin/dcopidl2java

@ -1 +1 @@
/opt/trinity/share/doc/libdcop3-java /opt/trinity/share/doc/libdcop3-java-dev
/usr/share/doc/libdcop3-java /usr/share/doc/libdcop3-java-dev

@ -1 +1 @@
debian/tmp/opt/trinity/share/java/dcopjava*.jar
debian/tmp/usr/share/java/dcopjava*.jar

@ -1 +1 @@
/opt/trinity/share/doc/libdcop3-jni /opt/trinity/share/doc/libdcop3-java
/usr/share/doc/libdcop3-jni /usr/share/doc/libdcop3-java

@ -1,2 +1,2 @@
debian/tmp/opt/trinity/lib/libjavadcop.la /usr/lib/jni
debian/tmp/opt/trinity/lib/libjavadcop.so /usr/lib/jni
debian/tmp/usr/lib/libjavadcop.la /usr/lib/jni
debian/tmp/usr/lib/libjavadcop.so /usr/lib/jni

@ -1,25 +1,25 @@
debian/tmp/opt/trinity/include/tde/kjsembed/*
debian/tmp/opt/trinity/lib/libkjsembed.so
debian/tmp/opt/trinity/lib/libkjsembed.la
debian/tmp/usr/include/tde/kjsembed/*
debian/tmp/usr/lib/libkjsembed.so
debian/tmp/usr/lib/libkjsembed.la
kjsembed/plugins/customobject_plugin.cpp /opt/trinity/share/doc/libkjsembed-trinity-dev/plugin-examples/customobject/
kjsembed/plugins/customobject_plugin.h /opt/trinity/share/doc/libkjsembed-trinity-dev/plugin-examples/customobject/
kjsembed/plugins/customobject_plugin.desktop /opt/trinity/share/doc/libkjsembed-trinity-dev/plugin-examples/customobject/
kjsembed/plugins/customqobject_plugin.cpp /opt/trinity/share/doc/libkjsembed-trinity-dev/plugin-examples/customqobject/
kjsembed/plugins/customqobject_plugin.h /opt/trinity/share/doc/libkjsembed-trinity-dev/plugin-examples/customqobject/
kjsembed/plugins/customqobject_plugin.desktop /opt/trinity/share/doc/libkjsembed-trinity-dev/plugin-examples/customqobject/
kjsembed/plugins/customobject_plugin.cpp /usr/share/doc/libkjsembed-trinity-dev/plugin-examples/customobject/
kjsembed/plugins/customobject_plugin.h /usr/share/doc/libkjsembed-trinity-dev/plugin-examples/customobject/
kjsembed/plugins/customobject_plugin.desktop /usr/share/doc/libkjsembed-trinity-dev/plugin-examples/customobject/
kjsembed/plugins/customqobject_plugin.cpp /usr/share/doc/libkjsembed-trinity-dev/plugin-examples/customqobject/
kjsembed/plugins/customqobject_plugin.h /usr/share/doc/libkjsembed-trinity-dev/plugin-examples/customqobject/
kjsembed/plugins/customqobject_plugin.desktop /usr/share/doc/libkjsembed-trinity-dev/plugin-examples/customqobject/
kjsembed/docs/embedding/simple-embed/demo.html /opt/trinity/share/doc/libkjsembed-trinity-dev/embedding-examples/simple-embed/
kjsembed/docs/embedding/simple-embed/embedjs.desktop /opt/trinity/share/doc/libkjsembed-trinity-dev/embedding-examples/simple-embed/
kjsembed/docs/embedding/simple-embed/embedjs.lsm /opt/trinity/share/doc/libkjsembed-trinity-dev/embedding-examples/simple-embed/
kjsembed/docs/embedding/simple-embed/embedjsui.rc /opt/trinity/share/doc/libkjsembed-trinity-dev/embedding-examples/simple-embed/
kjsembed/docs/embedding/simple-embed/embedviewimp.cpp /opt/trinity/share/doc/libkjsembed-trinity-dev/embedding-examples/simple-embed/
kjsembed/docs/embedding/simple-embed/embedviewimp.h /opt/trinity/share/doc/libkjsembed-trinity-dev/embedding-examples/simple-embed/
kjsembed/docs/embedding/simple-embed/embedview.ui /opt/trinity/share/doc/libkjsembed-trinity-dev/embedding-examples/simple-embed/
kjsembed/docs/embedding/simple-embed/hi16-app-embedjs.png /opt/trinity/share/doc/libkjsembed-trinity-dev/embedding-examples/simple-embed/
kjsembed/docs/embedding/simple-embed/hi32-app-embedjs.png /opt/trinity/share/doc/libkjsembed-trinity-dev/embedding-examples/simple-embed/
kjsembed/docs/embedding/simple-embed/main.cpp /opt/trinity/share/doc/libkjsembed-trinity-dev/embedding-examples/simple-embed/
kjsembed/docs/embedding/simple-embed/Makefile.am /opt/trinity/share/doc/libkjsembed-trinity-dev/embedding-examples/simple-embed/
kjsembed/docs/embedding/simple-embed/README /opt/trinity/share/doc/libkjsembed-trinity-dev/embedding-examples/simple-embed/
kjsembed/docs/embedding/simple-embed/test.js /opt/trinity/share/doc/libkjsembed-trinity-dev/embedding-examples/simple-embed/
kjsembed/docs/embedding/simple-embed/demo.html /usr/share/doc/libkjsembed-trinity-dev/embedding-examples/simple-embed/
kjsembed/docs/embedding/simple-embed/embedjs.desktop /usr/share/doc/libkjsembed-trinity-dev/embedding-examples/simple-embed/
kjsembed/docs/embedding/simple-embed/embedjs.lsm /usr/share/doc/libkjsembed-trinity-dev/embedding-examples/simple-embed/
kjsembed/docs/embedding/simple-embed/embedjsui.rc /usr/share/doc/libkjsembed-trinity-dev/embedding-examples/simple-embed/
kjsembed/docs/embedding/simple-embed/embedviewimp.cpp /usr/share/doc/libkjsembed-trinity-dev/embedding-examples/simple-embed/
kjsembed/docs/embedding/simple-embed/embedviewimp.h /usr/share/doc/libkjsembed-trinity-dev/embedding-examples/simple-embed/
kjsembed/docs/embedding/simple-embed/embedview.ui /usr/share/doc/libkjsembed-trinity-dev/embedding-examples/simple-embed/
kjsembed/docs/embedding/simple-embed/hi16-app-embedjs.png /usr/share/doc/libkjsembed-trinity-dev/embedding-examples/simple-embed/
kjsembed/docs/embedding/simple-embed/hi32-app-embedjs.png /usr/share/doc/libkjsembed-trinity-dev/embedding-examples/simple-embed/
kjsembed/docs/embedding/simple-embed/main.cpp /usr/share/doc/libkjsembed-trinity-dev/embedding-examples/simple-embed/
kjsembed/docs/embedding/simple-embed/Makefile.am /usr/share/doc/libkjsembed-trinity-dev/embedding-examples/simple-embed/
kjsembed/docs/embedding/simple-embed/README /usr/share/doc/libkjsembed-trinity-dev/embedding-examples/simple-embed/
kjsembed/docs/embedding/simple-embed/test.js /usr/share/doc/libkjsembed-trinity-dev/embedding-examples/simple-embed/

@ -1 +1 @@
/opt/trinity/share/doc/libkjsembed1 /opt/trinity/share/doc/libkjsembed-dev
/usr/share/doc/libkjsembed1 /usr/share/doc/libkjsembed-dev

@ -1,32 +1,32 @@
debian/tmp/opt/trinity/lib/libkjsembed.so.1.0.0
debian/tmp/opt/trinity/lib/libkjsembed.so.1
debian/tmp/usr/lib/libkjsembed.so.1.0.0
debian/tmp/usr/lib/libkjsembed.so.1
debian/tmp/opt/trinity/lib/trinity/libimagefxplugin.la
debian/tmp/opt/trinity/lib/trinity/libimagefxplugin.so
debian/tmp/opt/trinity/share/services/imagefx_plugin.desktop
debian/tmp/usr/lib/trinity/libimagefxplugin.la
debian/tmp/usr/lib/trinity/libimagefxplugin.so
debian/tmp/usr/share/services/imagefx_plugin.desktop
debian/tmp/opt/trinity/lib/trinity/libqprocessplugin.so
debian/tmp/opt/trinity/lib/trinity/libqprocessplugin.la
debian/tmp/opt/trinity/share/services/qprocess_plugin.desktop
debian/tmp/usr/lib/trinity/libqprocessplugin.so
debian/tmp/usr/lib/trinity/libqprocessplugin.la
debian/tmp/usr/share/services/qprocess_plugin.desktop
debian/tmp/opt/trinity/lib/trinity/libfileitemplugin.la
debian/tmp/opt/trinity/lib/trinity/libfileitemplugin.so
debian/tmp/opt/trinity/share/services/tdefileitem_plugin.desktop
debian/tmp/usr/lib/trinity/libfileitemplugin.la
debian/tmp/usr/lib/trinity/libfileitemplugin.so
debian/tmp/usr/share/services/tdefileitem_plugin.desktop
debian/tmp/opt/trinity/share/apps/kjsembed/cmdline.js
debian/tmp/opt/trinity/share/servicetypes/binding_type.desktop
debian/tmp/usr/share/apps/kjsembed/cmdline.js
debian/tmp/usr/share/servicetypes/binding_type.desktop
debian/tmp/opt/trinity/bin/embedjs
debian/tmp/opt/trinity/share/apps/embedjs/embedjsui.rc
debian/tmp/opt/trinity/share/applnk/Utilities/embedjs.desktop
debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/embedjs.png
debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/embedjs.png
debian/tmp/usr/bin/embedjs
debian/tmp/usr/share/apps/embedjs/embedjsui.rc
debian/tmp/usr/share/applnk/Utilities/embedjs.desktop
debian/tmp/usr/share/icons/hicolor/16x16/apps/embedjs.png
debian/tmp/usr/share/icons/hicolor/32x32/apps/embedjs.png
debian/tmp/opt/trinity/lib/trinity/libjavascript.la
debian/tmp/opt/trinity/lib/trinity/libjavascript.so
debian/tmp/opt/trinity/share/apps/kate/scripts/swaptabs.js
debian/tmp/opt/trinity/share/apps/kate/scripts/swaptabs.ui
debian/tmp/opt/trinity/share/apps/kate/scripts/swaptabs.desktop
debian/tmp/opt/trinity/share/services/javascript.desktop
debian/tmp/usr/lib/trinity/libjavascript.la
debian/tmp/usr/lib/trinity/libjavascript.so
debian/tmp/usr/share/apps/kate/scripts/swaptabs.js
debian/tmp/usr/share/apps/kate/scripts/swaptabs.ui
debian/tmp/usr/share/apps/kate/scripts/swaptabs.desktop
debian/tmp/usr/share/services/javascript.desktop
kjsembed/docs/ChangeLog /opt/trinity/share/doc/libkjsembed1
kjsembed/docs/ChangeLog /usr/share/doc/libkjsembed1

@ -1,12 +1,12 @@
debian/tmp/opt/trinity/bin/rbtdesh
debian/tmp/opt/trinity/bin/rbtdeapi
debian/tmp/opt/trinity/bin/krubyinit
debian/tmp/opt/trinity/bin/rbtdeconfig_compiler
debian/tmp/usr/bin/rbtdesh
debian/tmp/usr/bin/rbtdeapi
debian/tmp/usr/bin/krubyinit
debian/tmp/usr/bin/rbtdeconfig_compiler
debian/tmp/opt/trinity/lib/ruby/*/Korundum.rb
debian/tmp/opt/trinity/lib/ruby/*/TDE/korundum.rb
debian/tmp/usr/lib/ruby/*/Korundum.rb
debian/tmp/usr/lib/ruby/*/TDE/korundum.rb
debian/tmp/opt/trinity/lib/*/*/*/korundum.so*
debian/tmp/opt/trinity/lib/*/*/*/korundum.la
debian/tmp/usr/lib/*/*/*/korundum.so*
debian/tmp/usr/lib/*/*/*/korundum.la
korundum/ChangeLog /opt/trinity/share/doc/libkorundum0-ruby
korundum/ChangeLog /usr/share/doc/libkorundum0-ruby

@ -1,15 +1,15 @@
debian/tmp/opt/trinity/bin/rbqtsh
debian/tmp/opt/trinity/bin/rbqtapi
debian/tmp/opt/trinity/bin/rbuic
debian/tmp/opt/trinity/bin/qtrubyinit
debian/tmp/usr/bin/rbqtsh
debian/tmp/usr/bin/rbqtapi
debian/tmp/usr/bin/rbuic
debian/tmp/usr/bin/qtrubyinit
debian/tmp/opt/trinity/lib/ruby/*/Qt/qtruby.rb
debian/tmp/opt/trinity/lib/ruby/*/Qt.rb
debian/tmp/usr/lib/ruby/*/Qt/qtruby.rb
debian/tmp/usr/lib/ruby/*/Qt.rb
debian/tmp/opt/trinity/lib/*/*/*/qtruby.so*
debian/tmp/opt/trinity/lib/*/*/*/qtruby.la
debian/tmp/usr/lib/*/*/*/qtruby.so*
debian/tmp/usr/lib/*/*/*/qtruby.la
debian/tmp/opt/trinity/lib/*/*/*/tqui.so*
debian/tmp/opt/trinity/lib/*/*/*/tqui.la
debian/tmp/usr/lib/*/*/*/tqui.so*
debian/tmp/usr/lib/*/*/*/tqui.la
qtruby/ChangeLog /opt/trinity/share/doc/libqt0-ruby
qtruby/ChangeLog /usr/share/doc/libqt0-ruby

@ -1,2 +1,2 @@
debian/tmp/opt/trinity/share/java/qtjava*.jar
debian/tmp/opt/trinity/share/doc/tde/HTML/en/javalib/*.html /opt/trinity/share/doc/libqt3-java-trinity/html
debian/tmp/usr/share/java/qtjava*.jar
debian/tmp/usr/share/doc/tde/HTML/en/javalib/*.html /usr/share/doc/libqt3-java-trinity/html

@ -1 +1 @@
/opt/trinity/share/doc/libqt3-jni /opt/trinity/share/doc/libqt3-java
/usr/share/doc/libqt3-jni /usr/share/doc/libqt3-java

@ -1,11 +1,11 @@
debian/tmp/opt/trinity/lib/libtqtjavasupport.la
debian/tmp/opt/trinity/lib/libtqtjavasupport.so
debian/tmp/opt/trinity/lib/libtqtjavasupport.so.1
debian/tmp/opt/trinity/lib/libtqtjavasupport.so.1.0.0
debian/tmp/usr/lib/libtqtjavasupport.la
debian/tmp/usr/lib/libtqtjavasupport.so
debian/tmp/usr/lib/libtqtjavasupport.so.1
debian/tmp/usr/lib/libtqtjavasupport.so.1.0.0
debian/tmp/opt/trinity/lib/jni/libtqtjava.la
debian/tmp/opt/trinity/lib/jni/libtqtjava.so
debian/tmp/opt/trinity/lib/jni/libtqtjava.so.1
debian/tmp/opt/trinity/lib/jni/libtqtjava.so.1.0.0
debian/tmp/usr/lib/jni/libtqtjava.la
debian/tmp/usr/lib/jni/libtqtjava.so
debian/tmp/usr/lib/jni/libtqtjava.so.1
debian/tmp/usr/lib/jni/libtqtjava.so.1.0.0
qtjava/ChangeLog /opt/trinity/share/doc/libqt3-jni
qtjava/ChangeLog /usr/share/doc/libqt3-jni

@ -1,2 +1,2 @@
debian/tmp/opt/trinity/lib/libsmoketde.so
debian/tmp/opt/trinity/lib/libsmoketde.la
debian/tmp/usr/lib/libsmoketde.so
debian/tmp/usr/lib/libsmoketde.la

@ -1 +1 @@
/opt/trinity/share/doc/libsmoketde1 /opt/trinity/share/doc/libsmoketde-dev
/usr/share/doc/libsmoketde1 /usr/share/doc/libsmoketde-dev

@ -1,2 +1,2 @@
debian/tmp/opt/trinity/lib/libsmoketde.so.1.2.2
debian/tmp/opt/trinity/lib/libsmoketde.so.1
debian/tmp/usr/lib/libsmoketde.so.1.2.2
debian/tmp/usr/lib/libsmoketde.so.1

@ -1,3 +1,3 @@
debian/tmp/opt/trinity/include/tde/smoke.h
debian/tmp/opt/trinity/lib/libsmoketqt.so
debian/tmp/opt/trinity/lib/libsmoketqt.la
debian/tmp/usr/include/tde/smoke.h
debian/tmp/usr/lib/libsmoketqt.so
debian/tmp/usr/lib/libsmoketqt.la

@ -1 +1 @@
/opt/trinity/share/doc/libsmoketqt1 /opt/trinity/share/doc/libsmoketqt-dev
/usr/share/doc/libsmoketqt1 /usr/share/doc/libsmoketqt-dev

@ -1,2 +1,2 @@
debian/tmp/opt/trinity/lib/libsmoketqt.so.1.2.2
debian/tmp/opt/trinity/lib/libsmoketqt.so.1
debian/tmp/usr/lib/libsmoketqt.so.1.2.2
debian/tmp/usr/lib/libsmoketqt.so.1

@ -1 +1 @@
debian/tmp/opt/trinity/share/java/koala*.jar
debian/tmp/usr/share/java/koala*.jar

@ -1 +1 @@
/opt/trinity/share/doc/libtrinity-jni /opt/trinity/share/doc/libtrinity-java
/usr/share/doc/libtrinity-jni /usr/share/doc/libtrinity-java

@ -1,6 +1,6 @@
debian/tmp/opt/trinity/lib/jni/libtdejava.so.1
debian/tmp/opt/trinity/lib/jni/libtdejava.la
debian/tmp/opt/trinity/lib/jni/libtdejava.so
debian/tmp/opt/trinity/lib/jni/libtdejava.so.1.0.0
debian/tmp/usr/lib/jni/libtdejava.so.1
debian/tmp/usr/lib/jni/libtdejava.la
debian/tmp/usr/lib/jni/libtdejava.so
debian/tmp/usr/lib/jni/libtdejava.so.1.0.0
tdejava/ChangeLog /opt/trinity/share/doc/libtrinity-jni
tdejava/ChangeLog /usr/share/doc/libtrinity-jni

@ -4,7 +4,7 @@
if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
export EXTRACTRC PREPARETIPS
+kdepotpath=/opt/trinity/include/tde/tde.pot
+kdepotpath=/usr/include/tde/tde.pot
+
for subdir in $dirs; do
test -z "$VERBOSE" || echo "Making messages in $subdir"

@ -1 +1 @@
debian/tmp/opt/trinity/lib/python2.*/site-packages
debian/tmp/usr/lib/python2.*/site-packages

@ -14,10 +14,10 @@ DEB_BUILDDIR := $(DEB_SRCDIR)
include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/cdbs/1/rules/utils.mk
DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
DEB_CONFIGURE_INCLUDEDIR := /usr/include/tde
DEB_CONFIGURE_MANDIR := /usr/share/man
DEB_CONFIGURE_PREFIX := /usr
DEB_CONFIGURE_INFODIR := /usr/share/info
cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
@ -32,7 +32,7 @@ endif
###
DEB_CONFIGURE_EXTRA_FLAGS = $(WITH_JAVA) --prefix=/opt/trinity \
DEB_CONFIGURE_EXTRA_FLAGS = $(WITH_JAVA) --prefix=/usr \
DO_NOT_COMPILE='dcopc dcopperl kalyptus qtsharp xparts python'
DEB_COMPRESS_EXCLUDE += .java .ui .js .rb .map .wav .bmp .cpp .sk
@ -84,25 +84,23 @@ endif
upstream_version=$(shell head -1 $(CURDIR)/debian/changelog | sed -e "s,.*:\([^-]*\).*,\1,")
common-install-arch::
# Move the python and ruby bindings to the correct directory
cp -Rp debian/tmp/usr/lib/* debian/tmp/opt/trinity/lib/
rm -rf debian/tmp/usr/lib/*
common-install-indep:: stamp-install-dcopjava
dh_link -i
ifndef WITHOUT_JAVA
# Make sure files are placed in debian/tmp/usr/lib folder if required (temporary fix that
# can be removed when TDE is fully back in /usr folder)
cp -Rp debian/tmp/opt/trinity/lib/* debian/tmp/usr/lib
# Fix up the Java packages so they conform to policy
mkdir -p debian/tmp/opt/trinity/share/java
(cd debian/tmp/opt/trinity/lib/java ; jar cvf ../../share/java/dcopjava-$(upstream_version).jar org/ )
cd debian/tmp/opt/trinity/lib/java; rm -rf org
ln -s dcopjava-$(upstream_version).jar debian/tmp/opt/trinity/share/java/dcopjava.jar
mkdir -p debian/tmp/usr/share/java
(cd debian/tmp/usr/lib/java ; jar cvf ../../share/java/dcopjava-$(upstream_version).jar org/ )
cd debian/tmp/usr/lib/java; rm -rf org
ln -s dcopjava-$(upstream_version).jar debian/tmp/usr/share/java/dcopjava.jar
mv debian/tmp/opt/trinity/lib/java/qtjava.jar debian/tmp/opt/trinity/share/java/qtjava-$(upstream_version).jar
ln -s qtjava-$(upstream_version).jar debian/tmp/opt/trinity/share/java/qtjava.jar
mv debian/tmp/usr/lib/java/qtjava.jar debian/tmp/usr/share/java/qtjava-$(upstream_version).jar
ln -s qtjava-$(upstream_version).jar debian/tmp/usr/share/java/qtjava.jar
mv debian/tmp/opt/trinity/lib/java/koala.jar debian/tmp/opt/trinity/share/java/koala-$(upstream_version).jar
ln -s koala-$(upstream_version).jar debian/tmp/opt/trinity/share/java/koala.jar
mv debian/tmp/usr/lib/java/koala.jar debian/tmp/usr/share/java/koala-$(upstream_version).jar
ln -s koala-$(upstream_version).jar debian/tmp/usr/share/java/koala.jar
endif
common-install-arch:: stamp-install-dcopjava
@ -114,19 +112,6 @@ common-install-arch:: stamp-install-dcopjava
###
binary-install/juic-trinity::
mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/
sed -i "s|UIXSLDIR=/usr|UIXSLDIR=/opt/trinity|" debian/$(cdbs_curpkg)/opt/trinity/bin/juic
binary-install/libdcop3-java-trinity-dev::
mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/
binary-install/libkorundum0-ruby-trinity::
mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/
binary-install/libqt0-ruby-trinity::
mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/
binary-install/python-dcop-trinity::
${DH_PYTHON2} -p$(cdbs_curpkg)
@ -134,16 +119,16 @@ binary-install/python-dcop-trinity::
common-binary-post-install-arch::
for p in $(PACKAGES_WITH_USD_SYMLINK); do \
rm -f debian/$$p/opt/trinity/share/doc/$$p/copyright; \
rm -f debian/$$p/opt/trinity/share/doc/$$p/changelog.Debian; \
rm -f debian/$$p/opt/trinity/share/doc/$$p/changelog; \
rm -f debian/$$p/usr/share/doc/$$p/copyright; \
rm -f debian/$$p/usr/share/doc/$$p/changelog.Debian; \
rm -f debian/$$p/usr/share/doc/$$p/changelog; \
done
common-binary-post-install-indep::
for p in $(PACKAGES_WITH_USD_SYMLINK); do \
rm -f debian/$$p/opt/trinity/share/doc/$$p/copyright; \
rm -f debian/$$p/opt/trinity/share/doc/$$p/changelog.Debian; \
rm -f debian/$$p/opt/trinity/share/doc/$$p/changelog; \
rm -f debian/$$p/usr/share/doc/$$p/copyright; \
rm -f debian/$$p/usr/share/doc/$$p/changelog.Debian; \
rm -f debian/$$p/usr/share/doc/$$p/changelog; \
done
PACKAGES_WITH_USD_SYMLINK = tdebindings-java-trinity libtrinity-java-trinity libqt3-java-trinity \

@ -1,20 +1,20 @@
#debian/tmp/opt/trinity/lib/libdcopc.so.1.0.0
#debian/tmp/opt/trinity/lib/libdcopc.so.1
#debian/tmp/opt/trinity/lib/libdcopc.so
#debian/tmp/opt/trinity/lib/libdcopc.la
#debian/tmp/opt/trinity/include/dcopc
#debian/tmp/opt/trinity/lib/libtdexparts.so.1.0.0
#debian/tmp/opt/trinity/lib/libtdexparts.so.1
#debian/tmp/opt/trinity/lib/libtdexparts.so
#debian/tmp/opt/trinity/lib/libtdexparts.la
#debian/tmp/opt/trinity/lib/libgtkxparts.so.0.0.0
#debian/tmp/opt/trinity/lib/libgtkxparts.so.0
#debian/tmp/opt/trinity/lib/libgtkxparts.so
#debian/tmp/opt/trinity/lib/libgtkxparts.la
#debian/tmp/opt/trinity/include/xtdeparts
#debian/tmp/opt/trinity/lib/libkmozillapart.so.0.0.0
#debian/tmp/opt/trinity/lib/libkmozillapart.so.0
#debian/tmp/opt/trinity/lib/libkmozillapart.so
#debian/tmp/opt/trinity/lib/libkmozillapart.la
#debian/tmp/opt/trinity/bin/kmozilla
#debian/tmp/opt/trinity/share/services/kmozilla.desktop
#debian/tmp/usr/lib/libdcopc.so.1.0.0
#debian/tmp/usr/lib/libdcopc.so.1
#debian/tmp/usr/lib/libdcopc.so
#debian/tmp/usr/lib/libdcopc.la
#debian/tmp/usr/include/dcopc
#debian/tmp/usr/lib/libtdexparts.so.1.0.0
#debian/tmp/usr/lib/libtdexparts.so.1
#debian/tmp/usr/lib/libtdexparts.so
#debian/tmp/usr/lib/libtdexparts.la
#debian/tmp/usr/lib/libgtkxparts.so.0.0.0
#debian/tmp/usr/lib/libgtkxparts.so.0
#debian/tmp/usr/lib/libgtkxparts.so
#debian/tmp/usr/lib/libgtkxparts.la
#debian/tmp/usr/include/xtdeparts
#debian/tmp/usr/lib/libkmozillapart.so.0.0.0
#debian/tmp/usr/lib/libkmozillapart.so.0
#debian/tmp/usr/lib/libkmozillapart.so
#debian/tmp/usr/lib/libkmozillapart.la
#debian/tmp/usr/bin/kmozilla
#debian/tmp/usr/share/services/kmozilla.desktop

@ -1 +1 @@
/opt/trinity/share/doc/libtrinity-java /opt/trinity/share/doc/tdebindings-java
/usr/share/doc/libtrinity-java /usr/share/doc/tdebindings-java

@ -75,7 +75,7 @@ debian/stamp-kde-apidox:
common-install-prehook-impl::
mkdir -p po
-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages
-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/usr/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages
-for file in po/*pot; do \
sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
done

@ -6,7 +6,7 @@ tdebindings-trinity (4:3.5.10-0ubuntu2) karmic; urgency=low
tdebindings-trinity (4:3.5.10-0ubuntu1~intrepid8) intrepid; urgency=low
* Moved Trinity to /opt/trinity
* Moved Trinity to /usr
* Integrated properly with KDE4.2+
-- Timothy Pearson <kb9vqf@pearsoncomputing.net> Wed, 05 March 2009 01:11:00 -0600

@ -1,6 +1,6 @@
qtjava/designer/juic/bin/juic /opt/trinity/bin
qtjava/designer/juic/common/*.xml /opt/trinity/share/juic/common
qtjava/designer/juic/common/*.xsl /opt/trinity/share/juic/common
qtjava/designer/juic/java/*.xml /opt/trinity/share/juic/java
qtjava/designer/juic/java/*.xsl /opt/trinity/share/juic/java
qtjava/designer/juic/juic.xsl /opt/trinity/share/juic
qtjava/designer/juic/bin/juic /usr/bin
qtjava/designer/juic/common/*.xml /usr/share/juic/common
qtjava/designer/juic/common/*.xsl /usr/share/juic/common
qtjava/designer/juic/java/*.xml /usr/share/juic/java
qtjava/designer/juic/java/*.xsl /usr/share/juic/java
qtjava/designer/juic/juic.xsl /usr/share/juic

@ -1,3 +1,3 @@
debian/tmp/opt/trinity/bin/kjscmd
debian/tmp/opt/trinity/share/applications/tde/kjscmd.desktop
debian/tmp/opt/trinity/share/man/man1/kjscmd.1
debian/tmp/usr/bin/kjscmd
debian/tmp/usr/share/applications/tde/kjscmd.desktop
debian/tmp/usr/share/man/man1/kjscmd.1

@ -1 +1 @@
/opt/trinity/share/doc/libkjsembed1 /opt/trinity/share/doc/kjscmd
/usr/share/doc/libkjsembed1 /usr/share/doc/kjscmd

@ -3,4 +3,4 @@
section="Applications/Programming"\
hints="TDE"\
title="TDE JavaScript Console"\
command="/opt/trinity/bin/kjscmd --console --exec"
command="/usr/bin/kjscmd --console --exec"

@ -1,2 +1,2 @@
debian/tmp/opt/trinity/lib/trinity/libjsconsoleplugin.la
debian/tmp/opt/trinity/lib/trinity/libjsconsoleplugin.so
debian/tmp/usr/lib/trinity/libjsconsoleplugin.la
debian/tmp/usr/lib/trinity/libjsconsoleplugin.so

@ -1,4 +1,4 @@
debian/tmp/opt/trinity/lib/perl5/auto/DCOP/*
debian/tmp/opt/trinity/lib/perl5/DCOP.pm
debian/tmp/opt/trinity/lib/perl5/DCOP/*
debian/tmp/opt/trinity/share/man/man3/DCOP.3pm
debian/tmp/usr/lib/perl5/auto/DCOP/*
debian/tmp/usr/lib/perl5/DCOP.pm
debian/tmp/usr/lib/perl5/DCOP/*
debian/tmp/usr/share/man/man3/DCOP.3pm

@ -1 +1 @@
debian/tmp/opt/trinity/bin/dcopidl2java
debian/tmp/usr/bin/dcopidl2java

@ -1 +1 @@
/opt/trinity/share/doc/libdcop3-java /opt/trinity/share/doc/libdcop3-java-dev
/usr/share/doc/libdcop3-java /usr/share/doc/libdcop3-java-dev

@ -1 +1 @@
debian/tmp/opt/trinity/share/java/dcopjava*.jar
debian/tmp/usr/share/java/dcopjava*.jar

@ -1 +1 @@
/opt/trinity/share/doc/libdcop3-jni /opt/trinity/share/doc/libdcop3-java
/usr/share/doc/libdcop3-jni /usr/share/doc/libdcop3-java

@ -1,2 +1,2 @@
debian/tmp/opt/trinity/lib/libjavadcop.la /usr/lib/jni
debian/tmp/opt/trinity/lib/libjavadcop.so /usr/lib/jni
debian/tmp/usr/lib/libjavadcop.la /usr/lib/jni
debian/tmp/usr/lib/libjavadcop.so /usr/lib/jni

@ -1,25 +1,25 @@
debian/tmp/opt/trinity/include/tde/kjsembed/*
debian/tmp/opt/trinity/lib/libkjsembed.so
debian/tmp/opt/trinity/lib/libkjsembed.la
debian/tmp/usr/include/tde/kjsembed/*
debian/tmp/usr/lib/libkjsembed.so
debian/tmp/usr/lib/libkjsembed.la
kjsembed/plugins/customobject_plugin.cpp /opt/trinity/share/doc/libkjsembed-trinity-dev/plugin-examples/customobject/
kjsembed/plugins/customobject_plugin.h /opt/trinity/share/doc/libkjsembed-trinity-dev/plugin-examples/customobject/
kjsembed/plugins/customobject_plugin.desktop /opt/trinity/share/doc/libkjsembed-trinity-dev/plugin-examples/customobject/
kjsembed/plugins/customqobject_plugin.cpp /opt/trinity/share/doc/libkjsembed-trinity-dev/plugin-examples/customqobject/
kjsembed/plugins/customqobject_plugin.h /opt/trinity/share/doc/libkjsembed-trinity-dev/plugin-examples/customqobject/
kjsembed/plugins/customqobject_plugin.desktop /opt/trinity/share/doc/libkjsembed-trinity-dev/plugin-examples/customqobject/
kjsembed/plugins/customobject_plugin.cpp /usr/share/doc/libkjsembed-trinity-dev/plugin-examples/customobject/
kjsembed/plugins/customobject_plugin.h /usr/share/doc/libkjsembed-trinity-dev/plugin-examples/customobject/
kjsembed/plugins/customobject_plugin.desktop /usr/share/doc/libkjsembed-trinity-dev/plugin-examples/customobject/
kjsembed/plugins/customqobject_plugin.cpp /usr/share/doc/libkjsembed-trinity-dev/plugin-examples/customqobject/
kjsembed/plugins/customqobject_plugin.h /usr/share/doc/libkjsembed-trinity-dev/plugin-examples/customqobject/
kjsembed/plugins/customqobject_plugin.desktop /usr/share/doc/libkjsembed-trinity-dev/plugin-examples/customqobject/
kjsembed/docs/embedding/simple-embed/demo.html /opt/trinity/share/doc/libkjsembed-trinity-dev/embedding-examples/simple-embed/
kjsembed/docs/embedding/simple-embed/embedjs.desktop /opt/trinity/share/doc/libkjsembed-trinity-dev/embedding-examples/simple-embed/
kjsembed/docs/embedding/simple-embed/embedjs.lsm /opt/trinity/share/doc/libkjsembed-trinity-dev/embedding-examples/simple-embed/
kjsembed/docs/embedding/simple-embed/embedjsui.rc /opt/trinity/share/doc/libkjsembed-trinity-dev/embedding-examples/simple-embed/
kjsembed/docs/embedding/simple-embed/embedviewimp.cpp /opt/trinity/share/doc/libkjsembed-trinity-dev/embedding-examples/simple-embed/
kjsembed/docs/embedding/simple-embed/embedviewimp.h /opt/trinity/share/doc/libkjsembed-trinity-dev/embedding-examples/simple-embed/
kjsembed/docs/embedding/simple-embed/embedview.ui /opt/trinity/share/doc/libkjsembed-trinity-dev/embedding-examples/simple-embed/
kjsembed/docs/embedding/simple-embed/hi16-app-embedjs.png /opt/trinity/share/doc/libkjsembed-trinity-dev/embedding-examples/simple-embed/
kjsembed/docs/embedding/simple-embed/hi32-app-embedjs.png /opt/trinity/share/doc/libkjsembed-trinity-dev/embedding-examples/simple-embed/
kjsembed/docs/embedding/simple-embed/main.cpp /opt/trinity/share/doc/libkjsembed-trinity-dev/embedding-examples/simple-embed/
kjsembed/docs/embedding/simple-embed/Makefile.am /opt/trinity/share/doc/libkjsembed-trinity-dev/embedding-examples/simple-embed/
kjsembed/docs/embedding/simple-embed/README /opt/trinity/share/doc/libkjsembed-trinity-dev/embedding-examples/simple-embed/
kjsembed/docs/embedding/simple-embed/test.js /opt/trinity/share/doc/libkjsembed-trinity-dev/embedding-examples/simple-embed/
kjsembed/docs/embedding/simple-embed/demo.html /usr/share/doc/libkjsembed-trinity-dev/embedding-examples/simple-embed/
kjsembed/docs/embedding/simple-embed/embedjs.desktop /usr/share/doc/libkjsembed-trinity-dev/embedding-examples/simple-embed/
kjsembed/docs/embedding/simple-embed/embedjs.lsm /usr/share/doc/libkjsembed-trinity-dev/embedding-examples/simple-embed/
kjsembed/docs/embedding/simple-embed/embedjsui.rc /usr/share/doc/libkjsembed-trinity-dev/embedding-examples/simple-embed/
kjsembed/docs/embedding/simple-embed/embedviewimp.cpp /usr/share/doc/libkjsembed-trinity-dev/embedding-examples/simple-embed/
kjsembed/docs/embedding/simple-embed/embedviewimp.h /usr/share/doc/libkjsembed-trinity-dev/embedding-examples/simple-embed/
kjsembed/docs/embedding/simple-embed/embedview.ui /usr/share/doc/libkjsembed-trinity-dev/embedding-examples/simple-embed/
kjsembed/docs/embedding/simple-embed/hi16-app-embedjs.png /usr/share/doc/libkjsembed-trinity-dev/embedding-examples/simple-embed/
kjsembed/docs/embedding/simple-embed/hi32-app-embedjs.png /usr/share/doc/libkjsembed-trinity-dev/embedding-examples/simple-embed/
kjsembed/docs/embedding/simple-embed/main.cpp /usr/share/doc/libkjsembed-trinity-dev/embedding-examples/simple-embed/
kjsembed/docs/embedding/simple-embed/Makefile.am /usr/share/doc/libkjsembed-trinity-dev/embedding-examples/simple-embed/
kjsembed/docs/embedding/simple-embed/README /usr/share/doc/libkjsembed-trinity-dev/embedding-examples/simple-embed/
kjsembed/docs/embedding/simple-embed/test.js /usr/share/doc/libkjsembed-trinity-dev/embedding-examples/simple-embed/

@ -1 +1 @@
/opt/trinity/share/doc/libkjsembed1 /opt/trinity/share/doc/libkjsembed-dev
/usr/share/doc/libkjsembed1 /usr/share/doc/libkjsembed-dev

@ -1,32 +1,32 @@
debian/tmp/opt/trinity/lib/libkjsembed.so.1.0.0
debian/tmp/opt/trinity/lib/libkjsembed.so.1
debian/tmp/usr/lib/libkjsembed.so.1.0.0
debian/tmp/usr/lib/libkjsembed.so.1
debian/tmp/opt/trinity/lib/trinity/libimagefxplugin.la
debian/tmp/opt/trinity/lib/trinity/libimagefxplugin.so
debian/tmp/opt/trinity/share/services/imagefx_plugin.desktop
debian/tmp/usr/lib/trinity/libimagefxplugin.la
debian/tmp/usr/lib/trinity/libimagefxplugin.so
debian/tmp/usr/share/services/imagefx_plugin.desktop
debian/tmp/opt/trinity/lib/trinity/libqprocessplugin.so
debian/tmp/opt/trinity/lib/trinity/libqprocessplugin.la
debian/tmp/opt/trinity/share/services/qprocess_plugin.desktop
debian/tmp/usr/lib/trinity/libqprocessplugin.so
debian/tmp/usr/lib/trinity/libqprocessplugin.la
debian/tmp/usr/share/services/qprocess_plugin.desktop
debian/tmp/opt/trinity/lib/trinity/libfileitemplugin.la
debian/tmp/opt/trinity/lib/trinity/libfileitemplugin.so
debian/tmp/opt/trinity/share/services/tdefileitem_plugin.desktop
debian/tmp/usr/lib/trinity/libfileitemplugin.la
debian/tmp/usr/lib/trinity/libfileitemplugin.so
debian/tmp/usr/share/services/tdefileitem_plugin.desktop
debian/tmp/opt/trinity/share/apps/kjsembed/cmdline.js
debian/tmp/opt/trinity/share/servicetypes/binding_type.desktop
debian/tmp/usr/share/apps/kjsembed/cmdline.js
debian/tmp/usr/share/servicetypes/binding_type.desktop
debian/tmp/opt/trinity/bin/embedjs
debian/tmp/opt/trinity/share/apps/embedjs/embedjsui.rc
debian/tmp/opt/trinity/share/applnk/Utilities/embedjs.desktop
debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/embedjs.png
debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/embedjs.png
debian/tmp/usr/bin/embedjs
debian/tmp/usr/share/apps/embedjs/embedjsui.rc
debian/tmp/usr/share/applnk/Utilities/embedjs.desktop
debian/tmp/usr/share/icons/hicolor/16x16/apps/embedjs.png
debian/tmp/usr/share/icons/hicolor/32x32/apps/embedjs.png
debian/tmp/opt/trinity/lib/trinity/libjavascript.la
debian/tmp/opt/trinity/lib/trinity/libjavascript.so
debian/tmp/opt/trinity/share/apps/kate/scripts/swaptabs.js
debian/tmp/opt/trinity/share/apps/kate/scripts/swaptabs.ui
debian/tmp/opt/trinity/share/apps/kate/scripts/swaptabs.desktop
debian/tmp/opt/trinity/share/services/javascript.desktop
debian/tmp/usr/lib/trinity/libjavascript.la
debian/tmp/usr/lib/trinity/libjavascript.so
debian/tmp/usr/share/apps/kate/scripts/swaptabs.js
debian/tmp/usr/share/apps/kate/scripts/swaptabs.ui
debian/tmp/usr/share/apps/kate/scripts/swaptabs.desktop
debian/tmp/usr/share/services/javascript.desktop
kjsembed/docs/ChangeLog /opt/trinity/share/doc/libkjsembed1
kjsembed/docs/ChangeLog /usr/share/doc/libkjsembed1

@ -1,12 +1,12 @@
debian/tmp/opt/trinity/bin/rbtdesh
debian/tmp/opt/trinity/bin/rbtdeapi
debian/tmp/opt/trinity/bin/krubyinit
debian/tmp/opt/trinity/bin/rbtdeconfig_compiler
debian/tmp/usr/bin/rbtdesh
debian/tmp/usr/bin/rbtdeapi
debian/tmp/usr/bin/krubyinit
debian/tmp/usr/bin/rbtdeconfig_compiler
debian/tmp/opt/trinity/lib/ruby/*/Korundum.rb
debian/tmp/opt/trinity/lib/ruby/*/TDE/korundum.rb
debian/tmp/usr/lib/ruby/*/Korundum.rb
debian/tmp/usr/lib/ruby/*/TDE/korundum.rb
debian/tmp/opt/trinity/lib/*/*/*/korundum.so*
debian/tmp/opt/trinity/lib/*/*/*/korundum.la
debian/tmp/usr/lib/*/*/*/korundum.so*
debian/tmp/usr/lib/*/*/*/korundum.la
korundum/ChangeLog /opt/trinity/share/doc/libkorundum0-ruby
korundum/ChangeLog /usr/share/doc/libkorundum0-ruby

@ -1,15 +1,15 @@
debian/tmp/opt/trinity/bin/rbqtsh
debian/tmp/opt/trinity/bin/rbqtapi
debian/tmp/opt/trinity/bin/rbuic
debian/tmp/opt/trinity/bin/qtrubyinit
debian/tmp/usr/bin/rbqtsh
debian/tmp/usr/bin/rbqtapi
debian/tmp/usr/bin/rbuic
debian/tmp/usr/bin/qtrubyinit
debian/tmp/opt/trinity/lib/ruby/*/Qt/qtruby.rb
debian/tmp/opt/trinity/lib/ruby/*/Qt.rb
debian/tmp/usr/lib/ruby/*/Qt/qtruby.rb
debian/tmp/usr/lib/ruby/*/Qt.rb
debian/tmp/opt/trinity/lib/*/*/*/qtruby.so*
debian/tmp/opt/trinity/lib/*/*/*/qtruby.la
debian/tmp/usr/lib/*/*/*/qtruby.so*
debian/tmp/usr/lib/*/*/*/qtruby.la
debian/tmp/opt/trinity/lib/*/*/*/tqui.so*
debian/tmp/opt/trinity/lib/*/*/*/tqui.la
debian/tmp/usr/lib/*/*/*/tqui.so*
debian/tmp/usr/lib/*/*/*/tqui.la
qtruby/ChangeLog /opt/trinity/share/doc/libqt0-ruby
qtruby/ChangeLog /usr/share/doc/libqt0-ruby

@ -1,2 +1,2 @@
debian/tmp/opt/trinity/share/java/qtjava*.jar
debian/tmp/opt/trinity/share/doc/tde/HTML/en/javalib/*.html /opt/trinity/share/doc/libqt3-java-trinity/html
debian/tmp/usr/share/java/qtjava*.jar
debian/tmp/usr/share/doc/tde/HTML/en/javalib/*.html /usr/share/doc/libqt3-java-trinity/html

@ -1 +1 @@
/opt/trinity/share/doc/libqt3-jni /opt/trinity/share/doc/libqt3-java
/usr/share/doc/libqt3-jni /usr/share/doc/libqt3-java

@ -1,11 +1,11 @@
debian/tmp/opt/trinity/lib/libtqtjavasupport.la
debian/tmp/opt/trinity/lib/libtqtjavasupport.so
debian/tmp/opt/trinity/lib/libtqtjavasupport.so.1
debian/tmp/opt/trinity/lib/libtqtjavasupport.so.1.0.0
debian/tmp/usr/lib/libtqtjavasupport.la
debian/tmp/usr/lib/libtqtjavasupport.so
debian/tmp/usr/lib/libtqtjavasupport.so.1
debian/tmp/usr/lib/libtqtjavasupport.so.1.0.0
debian/tmp/opt/trinity/lib/jni/libtqtjava.la
debian/tmp/opt/trinity/lib/jni/libtqtjava.so
debian/tmp/opt/trinity/lib/jni/libtqtjava.so.1
debian/tmp/opt/trinity/lib/jni/libtqtjava.so.1.0.0
debian/tmp/usr/lib/jni/libtqtjava.la
debian/tmp/usr/lib/jni/libtqtjava.so
debian/tmp/usr/lib/jni/libtqtjava.so.1
debian/tmp/usr/lib/jni/libtqtjava.so.1.0.0
qtjava/ChangeLog /opt/trinity/share/doc/libqt3-jni
qtjava/ChangeLog /usr/share/doc/libqt3-jni

@ -1,2 +1,2 @@
debian/tmp/opt/trinity/lib/libsmoketde.so
debian/tmp/opt/trinity/lib/libsmoketde.la
debian/tmp/usr/lib/libsmoketde.so
debian/tmp/usr/lib/libsmoketde.la

@ -1 +1 @@
/opt/trinity/share/doc/libsmoketde1 /opt/trinity/share/doc/libsmoketde-dev
/usr/share/doc/libsmoketde1 /usr/share/doc/libsmoketde-dev

@ -1,2 +1,2 @@
debian/tmp/opt/trinity/lib/libsmoketde.so.1.2.2
debian/tmp/opt/trinity/lib/libsmoketde.so.1
debian/tmp/usr/lib/libsmoketde.so.1.2.2
debian/tmp/usr/lib/libsmoketde.so.1

@ -1,3 +1,3 @@
debian/tmp/opt/trinity/include/tde/smoke.h
debian/tmp/opt/trinity/lib/libsmoketqt.so
debian/tmp/opt/trinity/lib/libsmoketqt.la
debian/tmp/usr/include/tde/smoke.h
debian/tmp/usr/lib/libsmoketqt.so
debian/tmp/usr/lib/libsmoketqt.la

@ -1 +1 @@
/opt/trinity/share/doc/libsmoketqt1 /opt/trinity/share/doc/libsmoketqt-dev
/usr/share/doc/libsmoketqt1 /usr/share/doc/libsmoketqt-dev

@ -1,2 +1,2 @@
debian/tmp/opt/trinity/lib/libsmoketqt.so.1.2.2
debian/tmp/opt/trinity/lib/libsmoketqt.so.1
debian/tmp/usr/lib/libsmoketqt.so.1.2.2
debian/tmp/usr/lib/libsmoketqt.so.1

@ -1 +1 @@
debian/tmp/opt/trinity/share/java/koala*.jar
debian/tmp/usr/share/java/koala*.jar

@ -1 +1 @@
/opt/trinity/share/doc/libtrinity-jni /opt/trinity/share/doc/libtrinity-java
/usr/share/doc/libtrinity-jni /usr/share/doc/libtrinity-java

@ -1,6 +1,6 @@
debian/tmp/opt/trinity/lib/jni/libtdejava.so.1
debian/tmp/opt/trinity/lib/jni/libtdejava.la
debian/tmp/opt/trinity/lib/jni/libtdejava.so
debian/tmp/opt/trinity/lib/jni/libtdejava.so.1.0.0
debian/tmp/usr/lib/jni/libtdejava.so.1
debian/tmp/usr/lib/jni/libtdejava.la
debian/tmp/usr/lib/jni/libtdejava.so
debian/tmp/usr/lib/jni/libtdejava.so.1.0.0
tdejava/ChangeLog /opt/trinity/share/doc/libtrinity-jni
tdejava/ChangeLog /usr/share/doc/libtrinity-jni

@ -4,7 +4,7 @@
if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
export EXTRACTRC PREPARETIPS
+kdepotpath=/opt/trinity/include/tde/tde.pot
+kdepotpath=/usr/include/tde/tde.pot
+
for subdir in $dirs; do
test -z "$VERBOSE" || echo "Making messages in $subdir"

@ -1 +1 @@
debian/tmp/opt/trinity/lib/python2.*/site-packages
debian/tmp/usr/lib/python2.*/site-packages

@ -14,10 +14,10 @@ DEB_BUILDDIR := $(DEB_SRCDIR)
#include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/cdbs/1/rules/utils.mk
DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
DEB_CONFIGURE_INCLUDEDIR := /usr/include/tde
DEB_CONFIGURE_MANDIR := /usr/share/man
DEB_CONFIGURE_PREFIX := /usr
DEB_CONFIGURE_INFODIR := /usr/share/info
cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
@ -32,7 +32,7 @@ endif
###
DEB_CONFIGURE_EXTRA_FLAGS = $(WITH_JAVA) --prefix=/opt/trinity \
DEB_CONFIGURE_EXTRA_FLAGS = $(WITH_JAVA) --prefix=/usr \
DO_NOT_COMPILE='dcopc dcopperl kalyptus qtsharp xparts python'
DEB_COMPRESS_EXCLUDE += .java .ui .js .rb .map .wav .bmp .cpp .sk
@ -84,25 +84,23 @@ endif
upstream_version=$(shell head -1 $(CURDIR)/debian/changelog | sed -e "s,.*:\([^-]*\).*,\1,")
common-install-arch::
# Move the python and ruby bindings to the correct directory
cp -Rp debian/tmp/usr/lib/* debian/tmp/opt/trinity/lib/
rm -rf debian/tmp/usr/lib/*
common-install-indep:: stamp-install-dcopjava
dh_link -i
ifndef WITHOUT_JAVA
# Make sure files are placed in debian/tmp/usr/lib folder if required (temporary fix that
# can be removed when TDE is fully back in /usr folder)
cp -Rp debian/tmp/opt/trinity/lib/* debian/tmp/usr/lib
# Fix up the Java packages so they conform to policy
mkdir -p debian/tmp/opt/trinity/share/java
(cd debian/tmp/opt/trinity/lib/java ; jar cvf ../../share/java/dcopjava-$(upstream_version).jar org/ )
cd debian/tmp/opt/trinity/lib/java; rm -rf org
ln -s dcopjava-$(upstream_version).jar debian/tmp/opt/trinity/share/java/dcopjava.jar
mkdir -p debian/tmp/usr/share/java
(cd debian/tmp/usr/lib/java ; jar cvf ../../share/java/dcopjava-$(upstream_version).jar org/ )
cd debian/tmp/usr/lib/java; rm -rf org
ln -s dcopjava-$(upstream_version).jar debian/tmp/usr/share/java/dcopjava.jar
mv debian/tmp/opt/trinity/lib/java/qtjava.jar debian/tmp/opt/trinity/share/java/qtjava-$(upstream_version).jar
ln -s qtjava-$(upstream_version).jar debian/tmp/opt/trinity/share/java/qtjava.jar
mv debian/tmp/usr/lib/java/qtjava.jar debian/tmp/usr/share/java/qtjava-$(upstream_version).jar
ln -s qtjava-$(upstream_version).jar debian/tmp/usr/share/java/qtjava.jar
mv debian/tmp/opt/trinity/lib/java/koala.jar debian/tmp/opt/trinity/share/java/koala-$(upstream_version).jar
ln -s koala-$(upstream_version).jar debian/tmp/opt/trinity/share/java/koala.jar
mv debian/tmp/usr/lib/java/koala.jar debian/tmp/usr/share/java/koala-$(upstream_version).jar
ln -s koala-$(upstream_version).jar debian/tmp/usr/share/java/koala.jar
endif
common-install-arch:: stamp-install-dcopjava
@ -114,19 +112,6 @@ common-install-arch:: stamp-install-dcopjava
###
binary-install/juic-trinity::
mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/
sed -i "s|UIXSLDIR=/usr|UIXSLDIR=/opt/trinity|" debian/$(cdbs_curpkg)/opt/trinity/bin/juic
binary-install/libdcop3-java-trinity-dev::
mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/
binary-install/libkorundum0-ruby-trinity::
mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/
binary-install/libqt0-ruby-trinity::
mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/
binary-install/python-dcop-trinity::
${DH_PYTHON2} -p$(cdbs_curpkg)
@ -134,16 +119,16 @@ binary-install/python-dcop-trinity::
common-binary-post-install-arch::
for p in $(PACKAGES_WITH_USD_SYMLINK); do \
rm -f debian/$$p/opt/trinity/share/doc/$$p/copyright; \
rm -f debian/$$p/opt/trinity/share/doc/$$p/changelog.Debian; \
rm -f debian/$$p/opt/trinity/share/doc/$$p/changelog; \
rm -f debian/$$p/usr/share/doc/$$p/copyright; \
rm -f debian/$$p/usr/share/doc/$$p/changelog.Debian; \
rm -f debian/$$p/usr/share/doc/$$p/changelog; \
done
common-binary-post-install-indep::
for p in $(PACKAGES_WITH_USD_SYMLINK); do \
rm -f debian/$$p/opt/trinity/share/doc/$$p/copyright; \
rm -f debian/$$p/opt/trinity/share/doc/$$p/changelog.Debian; \
rm -f debian/$$p/opt/trinity/share/doc/$$p/changelog; \
rm -f debian/$$p/usr/share/doc/$$p/copyright; \
rm -f debian/$$p/usr/share/doc/$$p/changelog.Debian; \
rm -f debian/$$p/usr/share/doc/$$p/changelog; \
done
PACKAGES_WITH_USD_SYMLINK = tdebindings-java-trinity libtrinity-java-trinity libqt3-java-trinity \

@ -1,20 +1,20 @@
#debian/tmp/opt/trinity/lib/libdcopc.so.1.0.0
#debian/tmp/opt/trinity/lib/libdcopc.so.1
#debian/tmp/opt/trinity/lib/libdcopc.so
#debian/tmp/opt/trinity/lib/libdcopc.la
#debian/tmp/opt/trinity/include/dcopc
#debian/tmp/opt/trinity/lib/libtdexparts.so.1.0.0
#debian/tmp/opt/trinity/lib/libtdexparts.so.1
#debian/tmp/opt/trinity/lib/libtdexparts.so
#debian/tmp/opt/trinity/lib/libtdexparts.la
#debian/tmp/opt/trinity/lib/libgtkxparts.so.0.0.0
#debian/tmp/opt/trinity/lib/libgtkxparts.so.0
#debian/tmp/opt/trinity/lib/libgtkxparts.so
#debian/tmp/opt/trinity/lib/libgtkxparts.la
#debian/tmp/opt/trinity/include/xtdeparts
#debian/tmp/opt/trinity/lib/libkmozillapart.so.0.0.0
#debian/tmp/opt/trinity/lib/libkmozillapart.so.0
#debian/tmp/opt/trinity/lib/libkmozillapart.so
#debian/tmp/opt/trinity/lib/libkmozillapart.la
#debian/tmp/opt/trinity/bin/kmozilla
#debian/tmp/opt/trinity/share/services/kmozilla.desktop
#debian/tmp/usr/lib/libdcopc.so.1.0.0
#debian/tmp/usr/lib/libdcopc.so.1
#debian/tmp/usr/lib/libdcopc.so
#debian/tmp/usr/lib/libdcopc.la
#debian/tmp/usr/include/dcopc
#debian/tmp/usr/lib/libtdexparts.so.1.0.0
#debian/tmp/usr/lib/libtdexparts.so.1
#debian/tmp/usr/lib/libtdexparts.so
#debian/tmp/usr/lib/libtdexparts.la
#debian/tmp/usr/lib/libgtkxparts.so.0.0.0
#debian/tmp/usr/lib/libgtkxparts.so.0
#debian/tmp/usr/lib/libgtkxparts.so
#debian/tmp/usr/lib/libgtkxparts.la
#debian/tmp/usr/include/xtdeparts
#debian/tmp/usr/lib/libkmozillapart.so.0.0.0
#debian/tmp/usr/lib/libkmozillapart.so.0
#debian/tmp/usr/lib/libkmozillapart.so
#debian/tmp/usr/lib/libkmozillapart.la
#debian/tmp/usr/bin/kmozilla
#debian/tmp/usr/share/services/kmozilla.desktop

@ -1 +1 @@
/opt/trinity/share/doc/libtrinity-java /opt/trinity/share/doc/tdebindings-java
/usr/share/doc/libtrinity-java /usr/share/doc/tdebindings-java

@ -75,7 +75,7 @@ debian/stamp-kde-apidox:
common-install-prehook-impl::
mkdir -p po
-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages
-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/usr/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages
-for file in po/*pot; do \
sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
done

@ -6,7 +6,7 @@ tdebindings-trinity (4:3.5.10-0ubuntu2) karmic; urgency=low
tdebindings-trinity (4:3.5.10-0ubuntu1~intrepid8) intrepid; urgency=low
* Moved Trinity to /opt/trinity
* Moved Trinity to /usr
* Integrated properly with KDE4.2+
-- Timothy Pearson <kb9vqf@pearsoncomputing.net> Wed, 05 March 2009 01:11:00 -0600

@ -1,6 +1,6 @@
qtjava/designer/juic/bin/juic /opt/trinity/bin
qtjava/designer/juic/common/*.xml /opt/trinity/share/juic/common
qtjava/designer/juic/common/*.xsl /opt/trinity/share/juic/common
qtjava/designer/juic/java/*.xml /opt/trinity/share/juic/java
qtjava/designer/juic/java/*.xsl /opt/trinity/share/juic/java
qtjava/designer/juic/juic.xsl /opt/trinity/share/juic
qtjava/designer/juic/bin/juic /usr/bin
qtjava/designer/juic/common/*.xml /usr/share/juic/common
qtjava/designer/juic/common/*.xsl /usr/share/juic/common
qtjava/designer/juic/java/*.xml /usr/share/juic/java
qtjava/designer/juic/java/*.xsl /usr/share/juic/java
qtjava/designer/juic/juic.xsl /usr/share/juic

@ -1,3 +1,3 @@
debian/tmp/opt/trinity/bin/kjscmd
debian/tmp/opt/trinity/share/applications/tde/kjscmd.desktop
debian/tmp/opt/trinity/share/man/man1/kjscmd.1
debian/tmp/usr/bin/kjscmd
debian/tmp/usr/share/applications/tde/kjscmd.desktop
debian/tmp/usr/share/man/man1/kjscmd.1

@ -1 +1 @@
/opt/trinity/share/doc/libkjsembed1 /opt/trinity/share/doc/kjscmd
/usr/share/doc/libkjsembed1 /usr/share/doc/kjscmd

@ -3,4 +3,4 @@
section="Applications/Programming"\
hints="TDE"\
title="TDE JavaScript Console"\
command="/opt/trinity/bin/kjscmd --console --exec"
command="/usr/bin/kjscmd --console --exec"

@ -1,2 +1,2 @@
debian/tmp/opt/trinity/lib/trinity/libjsconsoleplugin.la
debian/tmp/opt/trinity/lib/trinity/libjsconsoleplugin.so
debian/tmp/usr/lib/trinity/libjsconsoleplugin.la
debian/tmp/usr/lib/trinity/libjsconsoleplugin.so

@ -1,4 +1,4 @@
debian/tmp/opt/trinity/lib/perl5/auto/DCOP/*
debian/tmp/opt/trinity/lib/perl5/DCOP.pm
debian/tmp/opt/trinity/lib/perl5/DCOP/*
debian/tmp/opt/trinity/share/man/man3/DCOP.3pm
debian/tmp/usr/lib/perl5/auto/DCOP/*
debian/tmp/usr/lib/perl5/DCOP.pm
debian/tmp/usr/lib/perl5/DCOP/*
debian/tmp/usr/share/man/man3/DCOP.3pm

@ -1 +1 @@
debian/tmp/opt/trinity/bin/dcopidl2java
debian/tmp/usr/bin/dcopidl2java

@ -1 +1 @@
/opt/trinity/share/doc/libdcop3-java /opt/trinity/share/doc/libdcop3-java-dev
/usr/share/doc/libdcop3-java /usr/share/doc/libdcop3-java-dev

@ -1 +1 @@
debian/tmp/opt/trinity/share/java/dcopjava*.jar
debian/tmp/usr/share/java/dcopjava*.jar

@ -1 +1 @@
/opt/trinity/share/doc/libdcop3-jni /opt/trinity/share/doc/libdcop3-java
/usr/share/doc/libdcop3-jni /usr/share/doc/libdcop3-java

@ -1,2 +1,2 @@
debian/tmp/opt/trinity/lib/libjavadcop.la /usr/lib/jni
debian/tmp/opt/trinity/lib/libjavadcop.so /usr/lib/jni
debian/tmp/usr/lib/libjavadcop.la /usr/lib/jni
debian/tmp/usr/lib/libjavadcop.so /usr/lib/jni

@ -1,25 +1,25 @@
debian/tmp/opt/trinity/include/tde/kjsembed/*
debian/tmp/opt/trinity/lib/libkjsembed.so
debian/tmp/opt/trinity/lib/libkjsembed.la
debian/tmp/usr/include/tde/kjsembed/*
debian/tmp/usr/lib/libkjsembed.so
debian/tmp/usr/lib/libkjsembed.la
kjsembed/plugins/customobject_plugin.cpp /opt/trinity/share/doc/libkjsembed-trinity-dev/plugin-examples/customobject/
kjsembed/plugins/customobject_plugin.h /opt/trinity/share/doc/libkjsembed-trinity-dev/plugin-examples/customobject/
kjsembed/plugins/customobject_plugin.desktop /opt/trinity/share/doc/libkjsembed-trinity-dev/plugin-examples/customobject/
kjsembed/plugins/customqobject_plugin.cpp /opt/trinity/share/doc/libkjsembed-trinity-dev/plugin-examples/customqobject/
kjsembed/plugins/customqobject_plugin.h /opt/trinity/share/doc/libkjsembed-trinity-dev/plugin-examples/customqobject/
kjsembed/plugins/customqobject_plugin.desktop /opt/trinity/share/doc/libkjsembed-trinity-dev/plugin-examples/customqobject/
kjsembed/plugins/customobject_plugin.cpp /usr/share/doc/libkjsembed-trinity-dev/plugin-examples/customobject/
kjsembed/plugins/customobject_plugin.h /usr/share/doc/libkjsembed-trinity-dev/plugin-examples/customobject/
kjsembed/plugins/customobject_plugin.desktop /usr/share/doc/libkjsembed-trinity-dev/plugin-examples/customobject/
kjsembed/plugins/customqobject_plugin.cpp /usr/share/doc/libkjsembed-trinity-dev/plugin-examples/customqobject/
kjsembed/plugins/customqobject_plugin.h /usr/share/doc/libkjsembed-trinity-dev/plugin-examples/customqobject/
kjsembed/plugins/customqobject_plugin.desktop /usr/share/doc/libkjsembed-trinity-dev/plugin-examples/customqobject/
kjsembed/docs/embedding/simple-embed/demo.html /opt/trinity/share/doc/libkjsembed-trinity-dev/embedding-examples/simple-embed/
kjsembed/docs/embedding/simple-embed/embedjs.desktop /opt/trinity/share/doc/libkjsembed-trinity-dev/embedding-examples/simple-embed/
kjsembed/docs/embedding/simple-embed/embedjs.lsm /opt/trinity/share/doc/libkjsembed-trinity-dev/embedding-examples/simple-embed/
kjsembed/docs/embedding/simple-embed/embedjsui.rc /opt/trinity/share/doc/libkjsembed-trinity-dev/embedding-examples/simple-embed/
kjsembed/docs/embedding/simple-embed/embedviewimp.cpp /opt/trinity/share/doc/libkjsembed-trinity-dev/embedding-examples/simple-embed/
kjsembed/docs/embedding/simple-embed/embedviewimp.h /opt/trinity/share/doc/libkjsembed-trinity-dev/embedding-examples/simple-embed/
kjsembed/docs/embedding/simple-embed/embedview.ui /opt/trinity/share/doc/libkjsembed-trinity-dev/embedding-examples/simple-embed/
kjsembed/docs/embedding/simple-embed/hi16-app-embedjs.png /opt/trinity/share/doc/libkjsembed-trinity-dev/embedding-examples/simple-embed/
kjsembed/docs/embedding/simple-embed/hi32-app-embedjs.png /opt/trinity/share/doc/libkjsembed-trinity-dev/embedding-examples/simple-embed/
kjsembed/docs/embedding/simple-embed/main.cpp /opt/trinity/share/doc/libkjsembed-trinity-dev/embedding-examples/simple-embed/
kjsembed/docs/embedding/simple-embed/Makefile.am /opt/trinity/share/doc/libkjsembed-trinity-dev/embedding-examples/simple-embed/
kjsembed/docs/embedding/simple-embed/README /opt/trinity/share/doc/libkjsembed-trinity-dev/embedding-examples/simple-embed/
kjsembed/docs/embedding/simple-embed/test.js /opt/trinity/share/doc/libkjsembed-trinity-dev/embedding-examples/simple-embed/
kjsembed/docs/embedding/simple-embed/demo.html /usr/share/doc/libkjsembed-trinity-dev/embedding-examples/simple-embed/
kjsembed/docs/embedding/simple-embed/embedjs.desktop /usr/share/doc/libkjsembed-trinity-dev/embedding-examples/simple-embed/
kjsembed/docs/embedding/simple-embed/embedjs.lsm /usr/share/doc/libkjsembed-trinity-dev/embedding-examples/simple-embed/
kjsembed/docs/embedding/simple-embed/embedjsui.rc /usr/share/doc/libkjsembed-trinity-dev/embedding-examples/simple-embed/
kjsembed/docs/embedding/simple-embed/embedviewimp.cpp /usr/share/doc/libkjsembed-trinity-dev/embedding-examples/simple-embed/
kjsembed/docs/embedding/simple-embed/embedviewimp.h /usr/share/doc/libkjsembed-trinity-dev/embedding-examples/simple-embed/
kjsembed/docs/embedding/simple-embed/embedview.ui /usr/share/doc/libkjsembed-trinity-dev/embedding-examples/simple-embed/
kjsembed/docs/embedding/simple-embed/hi16-app-embedjs.png /usr/share/doc/libkjsembed-trinity-dev/embedding-examples/simple-embed/
kjsembed/docs/embedding/simple-embed/hi32-app-embedjs.png /usr/share/doc/libkjsembed-trinity-dev/embedding-examples/simple-embed/
kjsembed/docs/embedding/simple-embed/main.cpp /usr/share/doc/libkjsembed-trinity-dev/embedding-examples/simple-embed/
kjsembed/docs/embedding/simple-embed/Makefile.am /usr/share/doc/libkjsembed-trinity-dev/embedding-examples/simple-embed/
kjsembed/docs/embedding/simple-embed/README /usr/share/doc/libkjsembed-trinity-dev/embedding-examples/simple-embed/
kjsembed/docs/embedding/simple-embed/test.js /usr/share/doc/libkjsembed-trinity-dev/embedding-examples/simple-embed/

@ -1 +1 @@
/opt/trinity/share/doc/libkjsembed1 /opt/trinity/share/doc/libkjsembed-dev
/usr/share/doc/libkjsembed1 /usr/share/doc/libkjsembed-dev

@ -1,32 +1,32 @@
debian/tmp/opt/trinity/lib/libkjsembed.so.1.0.0
debian/tmp/opt/trinity/lib/libkjsembed.so.1
debian/tmp/usr/lib/libkjsembed.so.1.0.0
debian/tmp/usr/lib/libkjsembed.so.1
debian/tmp/opt/trinity/lib/trinity/libimagefxplugin.la
debian/tmp/opt/trinity/lib/trinity/libimagefxplugin.so
debian/tmp/opt/trinity/share/services/imagefx_plugin.desktop
debian/tmp/usr/lib/trinity/libimagefxplugin.la
debian/tmp/usr/lib/trinity/libimagefxplugin.so
debian/tmp/usr/share/services/imagefx_plugin.desktop
debian/tmp/opt/trinity/lib/trinity/libqprocessplugin.so
debian/tmp/opt/trinity/lib/trinity/libqprocessplugin.la
debian/tmp/opt/trinity/share/services/qprocess_plugin.desktop
debian/tmp/usr/lib/trinity/libqprocessplugin.so
debian/tmp/usr/lib/trinity/libqprocessplugin.la
debian/tmp/usr/share/services/qprocess_plugin.desktop
debian/tmp/opt/trinity/lib/trinity/libfileitemplugin.la
debian/tmp/opt/trinity/lib/trinity/libfileitemplugin.so
debian/tmp/opt/trinity/share/services/tdefileitem_plugin.desktop
debian/tmp/usr/lib/trinity/libfileitemplugin.la
debian/tmp/usr/lib/trinity/libfileitemplugin.so
debian/tmp/usr/share/services/tdefileitem_plugin.desktop
debian/tmp/opt/trinity/share/apps/kjsembed/cmdline.js
debian/tmp/opt/trinity/share/servicetypes/binding_type.desktop
debian/tmp/usr/share/apps/kjsembed/cmdline.js
debian/tmp/usr/share/servicetypes/binding_type.desktop
debian/tmp/opt/trinity/bin/embedjs
debian/tmp/opt/trinity/share/apps/embedjs/embedjsui.rc
debian/tmp/opt/trinity/share/applnk/Utilities/embedjs.desktop
debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/embedjs.png
debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/embedjs.png
debian/tmp/usr/bin/embedjs
debian/tmp/usr/share/apps/embedjs/embedjsui.rc
debian/tmp/usr/share/applnk/Utilities/embedjs.desktop
debian/tmp/usr/share/icons/hicolor/16x16/apps/embedjs.png
debian/tmp/usr/share/icons/hicolor/32x32/apps/embedjs.png