From 4dd12b757689fde246b6e7608d2d44b9bb147a60 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 10 Oct 2014 17:41:45 -0500 Subject: [PATCH 1/2] Fix synaptic-trinity package --- debian/lenny/metapackages/synaptic-trinity/debian/postrm | 2 +- debian/lenny/metapackages/synaptic-trinity/debian/preinst | 2 +- debian/squeeze/metapackages/synaptic-trinity/debian/postrm | 2 +- debian/squeeze/metapackages/synaptic-trinity/debian/preinst | 2 +- ubuntu/maverick/metapackages/synaptic-trinity/debian/postrm | 2 +- ubuntu/maverick/metapackages/synaptic-trinity/debian/preinst | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/debian/lenny/metapackages/synaptic-trinity/debian/postrm b/debian/lenny/metapackages/synaptic-trinity/debian/postrm index e6d06626a..840ae090e 100644 --- a/debian/lenny/metapackages/synaptic-trinity/debian/postrm +++ b/debian/lenny/metapackages/synaptic-trinity/debian/postrm @@ -2,7 +2,7 @@ set -e -package_name=tdesudo-trinity +package_name=synaptic-trinity if [ -z "$package_name" ]; then print >&2 "Internal Error. Please report a bug." diff --git a/debian/lenny/metapackages/synaptic-trinity/debian/preinst b/debian/lenny/metapackages/synaptic-trinity/debian/preinst index eba99aba2..dc1ddc268 100644 --- a/debian/lenny/metapackages/synaptic-trinity/debian/preinst +++ b/debian/lenny/metapackages/synaptic-trinity/debian/preinst @@ -2,7 +2,7 @@ set -e -package_name=tdesudo-trinity +package_name=synaptic-trinity if [ -z "$package_name" ]; then print >&2 "Internal Error. Please report a bug." diff --git a/debian/squeeze/metapackages/synaptic-trinity/debian/postrm b/debian/squeeze/metapackages/synaptic-trinity/debian/postrm index e6d06626a..840ae090e 100644 --- a/debian/squeeze/metapackages/synaptic-trinity/debian/postrm +++ b/debian/squeeze/metapackages/synaptic-trinity/debian/postrm @@ -2,7 +2,7 @@ set -e -package_name=tdesudo-trinity +package_name=synaptic-trinity if [ -z "$package_name" ]; then print >&2 "Internal Error. Please report a bug." diff --git a/debian/squeeze/metapackages/synaptic-trinity/debian/preinst b/debian/squeeze/metapackages/synaptic-trinity/debian/preinst index eba99aba2..dc1ddc268 100644 --- a/debian/squeeze/metapackages/synaptic-trinity/debian/preinst +++ b/debian/squeeze/metapackages/synaptic-trinity/debian/preinst @@ -2,7 +2,7 @@ set -e -package_name=tdesudo-trinity +package_name=synaptic-trinity if [ -z "$package_name" ]; then print >&2 "Internal Error. Please report a bug." diff --git a/ubuntu/maverick/metapackages/synaptic-trinity/debian/postrm b/ubuntu/maverick/metapackages/synaptic-trinity/debian/postrm index e6d06626a..840ae090e 100644 --- a/ubuntu/maverick/metapackages/synaptic-trinity/debian/postrm +++ b/ubuntu/maverick/metapackages/synaptic-trinity/debian/postrm @@ -2,7 +2,7 @@ set -e -package_name=tdesudo-trinity +package_name=synaptic-trinity if [ -z "$package_name" ]; then print >&2 "Internal Error. Please report a bug." diff --git a/ubuntu/maverick/metapackages/synaptic-trinity/debian/preinst b/ubuntu/maverick/metapackages/synaptic-trinity/debian/preinst index eba99aba2..dc1ddc268 100644 --- a/ubuntu/maverick/metapackages/synaptic-trinity/debian/preinst +++ b/ubuntu/maverick/metapackages/synaptic-trinity/debian/preinst @@ -2,7 +2,7 @@ set -e -package_name=tdesudo-trinity +package_name=synaptic-trinity if [ -z "$package_name" ]; then print >&2 "Internal Error. Please report a bug." From 6caf07a2fce46cb2400c8955374c0ef329bd4c5a Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sat, 11 Oct 2014 17:57:21 +0900 Subject: [PATCH 2/2] Fixed detection of location of tqt documentation files. This relates to bug 1859. --- debian/lenny/tdevelop/debian/rules | 4 ++-- debian/squeeze/tdevelop/debian/rules | 4 ++-- ubuntu/maverick/tdevelop/debian/rules | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/debian/lenny/tdevelop/debian/rules b/debian/lenny/tdevelop/debian/rules index 9d5bcbc87..690ea3c9b 100755 --- a/debian/lenny/tdevelop/debian/rules +++ b/debian/lenny/tdevelop/debian/rules @@ -53,7 +53,7 @@ DEB_CONFIGURE_EXTRA_FLAGS := \ --with-pic \ --with-tdelibsdoxy-dir=/opt/trinity/share/doc/tde/HTML/en/tdelibs-apidocs \ --with-pythondir=/usr \ - --with-qtdoc-dir=/usr/share/qt3/doc/html \ +# --with-qtdoc-dir=/usr/share/tqt3/doc/html \ --prefix=/opt/trinity \ --with-extra-libs=/opt/trinity/lib @@ -69,7 +69,7 @@ DEB_CMAKE_EXTRA_FLAGS := \ -DWITH_BUILDTOOL_ALL="ON" \ -DWITH_LANGUAGE_ALL="ON" \ -DWITH_VCS_ALL="ON" \ - -DQT_DOCDIR="/usr/share/qt3/doc/html" + -DQTDIR="/usr/share/tqt3" binary-install/tdevelop-trinity:: mkdir -p debian/tdevelop-trinity/opt/trinity/share/pixmaps diff --git a/debian/squeeze/tdevelop/debian/rules b/debian/squeeze/tdevelop/debian/rules index b240d45ec..ced683e05 100755 --- a/debian/squeeze/tdevelop/debian/rules +++ b/debian/squeeze/tdevelop/debian/rules @@ -53,7 +53,7 @@ DEB_CONFIGURE_EXTRA_FLAGS := \ --with-pic \ --with-tdelibsdoxy-dir=/opt/trinity/share/doc/tde/HTML/en/tdelibs-apidocs \ --with-pythondir=/usr \ - --with-qtdoc-dir=/usr/share/qt3/doc/html \ +# --with-qtdoc-dir=/usr/share/tqt3/doc/html \ --prefix=/opt/trinity \ --with-extra-libs=/opt/trinity/lib @@ -69,7 +69,7 @@ DEB_CMAKE_EXTRA_FLAGS := \ -DWITH_BUILDTOOL_ALL="ON" \ -DWITH_LANGUAGE_ALL="ON" \ -DWITH_VCS_ALL="ON" \ - -DQT_DOCDIR="/usr/share/qt3/doc/html" + -DQTDIR="/usr/share/tqt3" binary-install/tdevelop-trinity:: mkdir -p debian/tdevelop-trinity/opt/trinity/share/pixmaps diff --git a/ubuntu/maverick/tdevelop/debian/rules b/ubuntu/maverick/tdevelop/debian/rules index b240d45ec..ced683e05 100755 --- a/ubuntu/maverick/tdevelop/debian/rules +++ b/ubuntu/maverick/tdevelop/debian/rules @@ -53,7 +53,7 @@ DEB_CONFIGURE_EXTRA_FLAGS := \ --with-pic \ --with-tdelibsdoxy-dir=/opt/trinity/share/doc/tde/HTML/en/tdelibs-apidocs \ --with-pythondir=/usr \ - --with-qtdoc-dir=/usr/share/qt3/doc/html \ +# --with-qtdoc-dir=/usr/share/tqt3/doc/html \ --prefix=/opt/trinity \ --with-extra-libs=/opt/trinity/lib @@ -69,7 +69,7 @@ DEB_CMAKE_EXTRA_FLAGS := \ -DWITH_BUILDTOOL_ALL="ON" \ -DWITH_LANGUAGE_ALL="ON" \ -DWITH_VCS_ALL="ON" \ - -DQT_DOCDIR="/usr/share/qt3/doc/html" + -DQTDIR="/usr/share/tqt3" binary-install/tdevelop-trinity:: mkdir -p debian/tdevelop-trinity/opt/trinity/share/pixmaps