From deaac3a8bbbae5e9d927b03309a6af4d3a4fa886 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Fri, 28 Sep 2018 16:30:24 +0900 Subject: [PATCH] DEB: fixed tdebindings FTBFS caused by libqtjava -> libtqtjava renaming. Signed-off-by: Michele Calgaro --- debian/lenny/tdebindings/debian/changelog | 12 ++++++------ .../debian/libqt3-java-trinity.README.Debian | 4 ++-- .../debian/libqt3-jni-trinity.install | 16 ++++++++-------- debian/squeeze/tdebindings/debian/changelog | 12 ++++++------ .../debian/libqt3-java-trinity.README.Debian | 4 ++-- .../debian/libqt3-jni-trinity.install | 16 ++++++++-------- ubuntu/maverick/tdebindings/debian/changelog | 12 ++++++------ .../debian/libqt3-java-trinity.README.Debian | 4 ++-- .../debian/libqt3-jni-trinity.install | 16 ++++++++-------- 9 files changed, 48 insertions(+), 48 deletions(-) diff --git a/debian/lenny/tdebindings/debian/changelog b/debian/lenny/tdebindings/debian/changelog index 91696228c..3dc544af7 100644 --- a/debian/lenny/tdebindings/debian/changelog +++ b/debian/lenny/tdebindings/debian/changelog @@ -347,7 +347,7 @@ tdebindings (4:3.4.2-1) unstable; urgency=low classes in the appropriate dir now that srcdir != builddir. - Added 014_kdejava_link_qtjava.la_not_-lqtjava.diff to make libkdejava - link against libqtjava.la instead of -lqtjava. + link against libtqtjava.la instead of -lqtjava. - Added 015-smokekde_ignore_KEditToolbarWidget_moveActive_r437699.diff to ignore KEditToolbarWidget::moveActive(), since it fails to link. @@ -461,7 +461,7 @@ tdebindings (4:3.3.0-1~kalyxo2) unstable; urgency=low - add "-l debian/$somepackages/usr/lib" parameter to dh_shlibdeps. * Some other boring changes: - - libqt3-jni.install: added missing libqtjavasupport.{la,so}. + - libqt3-jni.install: added missing libtqtjavasupport.{la,so}. - libkjsembed-dev.docs: added lots of available documentation. - added missing README, NEWS, TODO and ChangeLog files to *.docs. - moved contents from *.examples to *.docs. @@ -474,7 +474,7 @@ tdebindings (4:3.2.92-1) unstable; urgency=low * New upstream version. * debian/patches/013-qtc_clib_qtc_Makefile.am-noqaccessible.diff, - debian/patches/019-libqtjavasupport_la.diff, + debian/patches/019-libtqtjavasupport_la.diff, debian/patches/020-cleanjarfiles.diff: Accepted upstream, removed. * debian/patches/017-install-jnilibs-in-lib-jni.diff: updated. * debian/control: made libqt3-java suggest juic. @@ -564,9 +564,9 @@ tdebindings (4:3.2.1-4) unstable; urgency=low juic program. * debian/rules: fix lintian postinst-has-useless-call-to-ldconfig warnings. - * debian/patches/019-libqtjavasupport_la.diff: Added a library - libqtjavasupport.la, and made both libqtjava and libkdejava link - against it, to remove the dependency of libkdejava on libqtjava, and + * debian/patches/019-libtqtjavasupport_la.diff: Added a library + libtqtjavasupport.la, and made both libtqtjava and libkdejava link + against it, to remove the dependency of libkdejava on libtqtjava, and the accompanying rpathing problem. * debian/control: Added a Build-Depends on libqt3-compat-headers after a chroot test. diff --git a/debian/lenny/tdebindings/debian/libqt3-java-trinity.README.Debian b/debian/lenny/tdebindings/debian/libqt3-java-trinity.README.Debian index 7db60302b..207a511f6 100644 --- a/debian/lenny/tdebindings/debian/libqt3-java-trinity.README.Debian +++ b/debian/lenny/tdebindings/debian/libqt3-java-trinity.README.Debian @@ -45,9 +45,9 @@ executable will be rather large. If you plan on having several of these executables, it may be worth creating a shared qtjava library, like this: - gcj -fjni -shared /usr/share/java/qtjava.jar -o libqtjava-shared.so + gcj -fjni -shared /usr/share/java/qtjava.jar -o libtqtjava-shared.so -And then, after you put libqtjava-shared.so in /usr/lib or similar, you +And then, after you put libtqtjava-shared.so in /usr/lib or similar, you can go like: gcj -fjni Somefile.java --main=Somefile -lqtjava-shared diff --git a/debian/lenny/tdebindings/debian/libqt3-jni-trinity.install b/debian/lenny/tdebindings/debian/libqt3-jni-trinity.install index 0c879683b..fed4aa1f8 100644 --- a/debian/lenny/tdebindings/debian/libqt3-jni-trinity.install +++ b/debian/lenny/tdebindings/debian/libqt3-jni-trinity.install @@ -1,11 +1,11 @@ -debian/tmp/opt/trinity/lib/libqtjavasupport.la -debian/tmp/opt/trinity/lib/libqtjavasupport.so -debian/tmp/opt/trinity/lib/libqtjavasupport.so.1 -debian/tmp/opt/trinity/lib/libqtjavasupport.so.1.0.0 +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/opt/trinity/lib/jni/libqtjava.la -debian/tmp/opt/trinity/lib/jni/libqtjava.so -debian/tmp/opt/trinity/lib/jni/libqtjava.so.1 -debian/tmp/opt/trinity/lib/jni/libqtjava.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 qtjava/ChangeLog /opt/trinity/share/doc/libqt3-jni diff --git a/debian/squeeze/tdebindings/debian/changelog b/debian/squeeze/tdebindings/debian/changelog index 91696228c..3dc544af7 100644 --- a/debian/squeeze/tdebindings/debian/changelog +++ b/debian/squeeze/tdebindings/debian/changelog @@ -347,7 +347,7 @@ tdebindings (4:3.4.2-1) unstable; urgency=low classes in the appropriate dir now that srcdir != builddir. - Added 014_kdejava_link_qtjava.la_not_-lqtjava.diff to make libkdejava - link against libqtjava.la instead of -lqtjava. + link against libtqtjava.la instead of -lqtjava. - Added 015-smokekde_ignore_KEditToolbarWidget_moveActive_r437699.diff to ignore KEditToolbarWidget::moveActive(), since it fails to link. @@ -461,7 +461,7 @@ tdebindings (4:3.3.0-1~kalyxo2) unstable; urgency=low - add "-l debian/$somepackages/usr/lib" parameter to dh_shlibdeps. * Some other boring changes: - - libqt3-jni.install: added missing libqtjavasupport.{la,so}. + - libqt3-jni.install: added missing libtqtjavasupport.{la,so}. - libkjsembed-dev.docs: added lots of available documentation. - added missing README, NEWS, TODO and ChangeLog files to *.docs. - moved contents from *.examples to *.docs. @@ -474,7 +474,7 @@ tdebindings (4:3.2.92-1) unstable; urgency=low * New upstream version. * debian/patches/013-qtc_clib_qtc_Makefile.am-noqaccessible.diff, - debian/patches/019-libqtjavasupport_la.diff, + debian/patches/019-libtqtjavasupport_la.diff, debian/patches/020-cleanjarfiles.diff: Accepted upstream, removed. * debian/patches/017-install-jnilibs-in-lib-jni.diff: updated. * debian/control: made libqt3-java suggest juic. @@ -564,9 +564,9 @@ tdebindings (4:3.2.1-4) unstable; urgency=low juic program. * debian/rules: fix lintian postinst-has-useless-call-to-ldconfig warnings. - * debian/patches/019-libqtjavasupport_la.diff: Added a library - libqtjavasupport.la, and made both libqtjava and libkdejava link - against it, to remove the dependency of libkdejava on libqtjava, and + * debian/patches/019-libtqtjavasupport_la.diff: Added a library + libtqtjavasupport.la, and made both libtqtjava and libkdejava link + against it, to remove the dependency of libkdejava on libtqtjava, and the accompanying rpathing problem. * debian/control: Added a Build-Depends on libqt3-compat-headers after a chroot test. diff --git a/debian/squeeze/tdebindings/debian/libqt3-java-trinity.README.Debian b/debian/squeeze/tdebindings/debian/libqt3-java-trinity.README.Debian index 7db60302b..207a511f6 100644 --- a/debian/squeeze/tdebindings/debian/libqt3-java-trinity.README.Debian +++ b/debian/squeeze/tdebindings/debian/libqt3-java-trinity.README.Debian @@ -45,9 +45,9 @@ executable will be rather large. If you plan on having several of these executables, it may be worth creating a shared qtjava library, like this: - gcj -fjni -shared /usr/share/java/qtjava.jar -o libqtjava-shared.so + gcj -fjni -shared /usr/share/java/qtjava.jar -o libtqtjava-shared.so -And then, after you put libqtjava-shared.so in /usr/lib or similar, you +And then, after you put libtqtjava-shared.so in /usr/lib or similar, you can go like: gcj -fjni Somefile.java --main=Somefile -lqtjava-shared diff --git a/debian/squeeze/tdebindings/debian/libqt3-jni-trinity.install b/debian/squeeze/tdebindings/debian/libqt3-jni-trinity.install index 0c879683b..fed4aa1f8 100644 --- a/debian/squeeze/tdebindings/debian/libqt3-jni-trinity.install +++ b/debian/squeeze/tdebindings/debian/libqt3-jni-trinity.install @@ -1,11 +1,11 @@ -debian/tmp/opt/trinity/lib/libqtjavasupport.la -debian/tmp/opt/trinity/lib/libqtjavasupport.so -debian/tmp/opt/trinity/lib/libqtjavasupport.so.1 -debian/tmp/opt/trinity/lib/libqtjavasupport.so.1.0.0 +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/opt/trinity/lib/jni/libqtjava.la -debian/tmp/opt/trinity/lib/jni/libqtjava.so -debian/tmp/opt/trinity/lib/jni/libqtjava.so.1 -debian/tmp/opt/trinity/lib/jni/libqtjava.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 qtjava/ChangeLog /opt/trinity/share/doc/libqt3-jni diff --git a/ubuntu/maverick/tdebindings/debian/changelog b/ubuntu/maverick/tdebindings/debian/changelog index 91696228c..3dc544af7 100644 --- a/ubuntu/maverick/tdebindings/debian/changelog +++ b/ubuntu/maverick/tdebindings/debian/changelog @@ -347,7 +347,7 @@ tdebindings (4:3.4.2-1) unstable; urgency=low classes in the appropriate dir now that srcdir != builddir. - Added 014_kdejava_link_qtjava.la_not_-lqtjava.diff to make libkdejava - link against libqtjava.la instead of -lqtjava. + link against libtqtjava.la instead of -lqtjava. - Added 015-smokekde_ignore_KEditToolbarWidget_moveActive_r437699.diff to ignore KEditToolbarWidget::moveActive(), since it fails to link. @@ -461,7 +461,7 @@ tdebindings (4:3.3.0-1~kalyxo2) unstable; urgency=low - add "-l debian/$somepackages/usr/lib" parameter to dh_shlibdeps. * Some other boring changes: - - libqt3-jni.install: added missing libqtjavasupport.{la,so}. + - libqt3-jni.install: added missing libtqtjavasupport.{la,so}. - libkjsembed-dev.docs: added lots of available documentation. - added missing README, NEWS, TODO and ChangeLog files to *.docs. - moved contents from *.examples to *.docs. @@ -474,7 +474,7 @@ tdebindings (4:3.2.92-1) unstable; urgency=low * New upstream version. * debian/patches/013-qtc_clib_qtc_Makefile.am-noqaccessible.diff, - debian/patches/019-libqtjavasupport_la.diff, + debian/patches/019-libtqtjavasupport_la.diff, debian/patches/020-cleanjarfiles.diff: Accepted upstream, removed. * debian/patches/017-install-jnilibs-in-lib-jni.diff: updated. * debian/control: made libqt3-java suggest juic. @@ -564,9 +564,9 @@ tdebindings (4:3.2.1-4) unstable; urgency=low juic program. * debian/rules: fix lintian postinst-has-useless-call-to-ldconfig warnings. - * debian/patches/019-libqtjavasupport_la.diff: Added a library - libqtjavasupport.la, and made both libqtjava and libkdejava link - against it, to remove the dependency of libkdejava on libqtjava, and + * debian/patches/019-libtqtjavasupport_la.diff: Added a library + libtqtjavasupport.la, and made both libtqtjava and libkdejava link + against it, to remove the dependency of libkdejava on libtqtjava, and the accompanying rpathing problem. * debian/control: Added a Build-Depends on libqt3-compat-headers after a chroot test. diff --git a/ubuntu/maverick/tdebindings/debian/libqt3-java-trinity.README.Debian b/ubuntu/maverick/tdebindings/debian/libqt3-java-trinity.README.Debian index 7db60302b..207a511f6 100644 --- a/ubuntu/maverick/tdebindings/debian/libqt3-java-trinity.README.Debian +++ b/ubuntu/maverick/tdebindings/debian/libqt3-java-trinity.README.Debian @@ -45,9 +45,9 @@ executable will be rather large. If you plan on having several of these executables, it may be worth creating a shared qtjava library, like this: - gcj -fjni -shared /usr/share/java/qtjava.jar -o libqtjava-shared.so + gcj -fjni -shared /usr/share/java/qtjava.jar -o libtqtjava-shared.so -And then, after you put libqtjava-shared.so in /usr/lib or similar, you +And then, after you put libtqtjava-shared.so in /usr/lib or similar, you can go like: gcj -fjni Somefile.java --main=Somefile -lqtjava-shared diff --git a/ubuntu/maverick/tdebindings/debian/libqt3-jni-trinity.install b/ubuntu/maverick/tdebindings/debian/libqt3-jni-trinity.install index 0c879683b..fed4aa1f8 100644 --- a/ubuntu/maverick/tdebindings/debian/libqt3-jni-trinity.install +++ b/ubuntu/maverick/tdebindings/debian/libqt3-jni-trinity.install @@ -1,11 +1,11 @@ -debian/tmp/opt/trinity/lib/libqtjavasupport.la -debian/tmp/opt/trinity/lib/libqtjavasupport.so -debian/tmp/opt/trinity/lib/libqtjavasupport.so.1 -debian/tmp/opt/trinity/lib/libqtjavasupport.so.1.0.0 +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/opt/trinity/lib/jni/libqtjava.la -debian/tmp/opt/trinity/lib/jni/libqtjava.so -debian/tmp/opt/trinity/lib/jni/libqtjava.so.1 -debian/tmp/opt/trinity/lib/jni/libqtjava.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 qtjava/ChangeLog /opt/trinity/share/doc/libqt3-jni