diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2018-10-07 16:46:38 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2018-10-07 17:49:00 +0900 |
| commit | de3089c49c9e66fd7a1d0434deb8cba2d1cc5da9 (patch) | |
| tree | 278c690e80c35fca59d64422756b7f3521632cf7 /ubuntu/maverick/tdebindings/debian | |
| parent | 9aa657bc9a6241d7cfe39c9ae04541fa0d372ea5 (diff) | |
| download | tde-packaging-de3089c49c9e66fd7a1d0434deb8cba2d1cc5da9.tar.gz tde-packaging-de3089c49c9e66fd7a1d0434deb8cba2d1cc5da9.zip | |
DEB: tdebindings - fixed conflict in debug symbols packages related to libksjembed1 and libkjsembed-dev packages.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit d6d743b27723fe2dcff00a214a81fb4fb836799f)
Diffstat (limited to 'ubuntu/maverick/tdebindings/debian')
| -rw-r--r-- | ubuntu/maverick/tdebindings/debian/libkjsembed-trinity-dev.install | 15 | ||||
| -rwxr-xr-x | ubuntu/maverick/tdebindings/debian/rules | 8 |
2 files changed, 15 insertions, 8 deletions
diff --git a/ubuntu/maverick/tdebindings/debian/libkjsembed-trinity-dev.install b/ubuntu/maverick/tdebindings/debian/libkjsembed-trinity-dev.install index 540ad0ca2..6b71195db 100644 --- a/ubuntu/maverick/tdebindings/debian/libkjsembed-trinity-dev.install +++ b/ubuntu/maverick/tdebindings/debian/libkjsembed-trinity-dev.install @@ -9,4 +9,17 @@ kjsembed/plugins/customqobject_plugin.cpp /opt/trinity/share/doc/libkjsembed-tr 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/docs/embedding/simple-embed/ /opt/trinity/share/doc/libkjsembed-trinity-dev/embedding-examples/simple-embed/ +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/ + diff --git a/ubuntu/maverick/tdebindings/debian/rules b/ubuntu/maverick/tdebindings/debian/rules index 7f7315180..ad0ffa221 100755 --- a/ubuntu/maverick/tdebindings/debian/rules +++ b/ubuntu/maverick/tdebindings/debian/rules @@ -32,8 +32,7 @@ endif ### -DEB_CONFIGURE_EXTRA_FLAGS = $(WITH_JAVA) \ - --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib \ +DEB_CONFIGURE_EXTRA_FLAGS = $(WITH_JAVA) --prefix=/opt/trinity \ DO_NOT_COMPILE='dcopc dcopperl kalyptus qtsharp xparts python' DEB_COMPRESS_EXCLUDE += .java .ui .js .rb .map .wav .bmp .cpp .sk @@ -45,11 +44,6 @@ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ # need to be in DEB_SHLIBDEPS_INCLUDE... PACKAGES_WITH_LIBS = libqt3-jni-trinity libsmoketqt1-trinity libsmoketde1-trinity libkjsembed1-trinity -# These packages do not ship files in /usr/lib so need not call ldconfig. -DEB_DH_MAKESHLIBS_ARGS_libtrinity-jni-trinity = -n -DEB_DH_MAKESHLIBS_ARGS_libqt0-ruby-trinity = -n -DEB_DH_MAKESHLIBS_ARGS_libkorundum0-ruby-trinity = -n - ### clean:: |