summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2014-10-11 18:11:02 +0200
committerFrançois Andriot <albator78@libertysurf.fr>2014-10-11 18:11:02 +0200
commit4bbefc607c98b54b2d8bbb63713291e0bbeeb3e5 (patch)
treec19abebff2f32ec288fa164232f276e823c54d8d
parent80079a90b181381659701966048476c9c372498d (diff)
parent6caf07a2fce46cb2400c8955374c0ef329bd4c5a (diff)
downloadtde-packaging-4bbefc607c98b54b2d8bbb63713291e0bbeeb3e5.tar.gz
tde-packaging-4bbefc607c98b54b2d8bbb63713291e0bbeeb3e5.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
-rw-r--r--debian/lenny/metapackages/synaptic-trinity/debian/postrm2
-rw-r--r--debian/lenny/metapackages/synaptic-trinity/debian/preinst2
-rwxr-xr-xdebian/lenny/tdevelop/debian/rules4
-rw-r--r--debian/squeeze/metapackages/synaptic-trinity/debian/postrm2
-rw-r--r--debian/squeeze/metapackages/synaptic-trinity/debian/preinst2
-rwxr-xr-xdebian/squeeze/tdevelop/debian/rules4
-rw-r--r--ubuntu/maverick/metapackages/synaptic-trinity/debian/postrm2
-rw-r--r--ubuntu/maverick/metapackages/synaptic-trinity/debian/preinst2
-rwxr-xr-xubuntu/maverick/tdevelop/debian/rules4
9 files changed, 12 insertions, 12 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/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/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/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/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."
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