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 d6d743b277)
6 years ago · de3089c49c
parent 9aa657bc9a
commit de3089c49c
6 changed files with 45 additions and 24 deletions
--- a/debian/lenny/tdebindings/debian/libkjsembed-trinity-dev.install
+++ b/debian/lenny/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/
+
--- a/debian/lenny/tdebindings/debian/rules
+++ b/debian/lenny/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::
--- a/debian/squeeze/tdebindings/debian/libkjsembed-trinity-dev.install
+++ b/debian/squeeze/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/
+
--- a/debian/squeeze/tdebindings/debian/rules
+++ b/debian/squeeze/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::
--- 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/
+
--- 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::