summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2014-01-18 19:10:20 +0100
committerSlávek Banko <slavek.banko@axis.cz>2014-01-18 19:10:20 +0100
commita06b022442ba05572ca07409409251f393929415 (patch)
tree683d83e4743aee41dd402d02b0311f6d6fbf8777
parent6fc0f157ab987c78d0cc331b96e31e0d0c1db8ac (diff)
downloadtde-packaging-a06b022442ba05572ca07409409251f393929415.tar.gz
tde-packaging-a06b022442ba05572ca07409409251f393929415.zip
Update python-sip-tqt dependencies in tde-guidance on Debian and Ubuntu
Update to renamed kdepyuic => tdepyuic Fix references to /usr/share
-rw-r--r--debian/lenny/applications/tde-guidance/debian/control2
-rw-r--r--debian/lenny/applications/tde-guidance/debian/python-distutils-jaunty.mk2
-rwxr-xr-xdebian/lenny/applications/tde-guidance/debian/rules20
-rw-r--r--debian/squeeze/applications/tde-guidance/debian/control2
-rw-r--r--debian/squeeze/applications/tde-guidance/debian/python-distutils-jaunty.mk2
-rwxr-xr-xdebian/squeeze/applications/tde-guidance/debian/rules20
-rw-r--r--debian/wheezy/applications/tde-guidance/debian/control2
-rw-r--r--debian/wheezy/applications/tde-guidance/debian/python-distutils-jaunty.mk2
-rwxr-xr-xdebian/wheezy/applications/tde-guidance/debian/rules20
-rw-r--r--ubuntu/maverick/applications/tde-guidance/debian/control2
-rwxr-xr-xubuntu/maverick/applications/tde-guidance/debian/rules20
-rw-r--r--ubuntu/precise/applications/tde-guidance/debian/control2
-rwxr-xr-xubuntu/precise/applications/tde-guidance/debian/rules20
-rw-r--r--ubuntu/raring/applications/tde-guidance/debian/control2
-rwxr-xr-xubuntu/raring/applications/tde-guidance/debian/rules20
15 files changed, 69 insertions, 69 deletions
diff --git a/debian/lenny/applications/tde-guidance/debian/control b/debian/lenny/applications/tde-guidance/debian/control
index 155ec8d06..a5fb126d4 100644
--- a/debian/lenny/applications/tde-guidance/debian/control
+++ b/debian/lenny/applications/tde-guidance/debian/control
@@ -6,7 +6,7 @@ XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.de
Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org>
Build-Depends: cdbs, debhelper (>= 5), quilt, chrpath, tdelibs14-trinity-dev,
libpythonize0-trinity-dev, libtool, libxml2-utils, libxss-dev, libxxf86vm-dev,
- pytdeextensions-trinity, pytqt-tools, python-tqt, python-trinity-trinity, python-trinity-trinity-dev, python-sip4-dev,
+ pytdeextensions-trinity, pytqt-tools, python-tqt, python-trinity-trinity, python-trinity-trinity-dev, python-sip-tqt-dev,
python-support (>= 0.6), python (>= 2.5), python-dev (>= 2.5), x11proto-scrnsaver-dev, python-tqt-dev, hwdata
Standards-Version: 3.8.4
diff --git a/debian/lenny/applications/tde-guidance/debian/python-distutils-jaunty.mk b/debian/lenny/applications/tde-guidance/debian/python-distutils-jaunty.mk
index db329306c..1a1ec9a8e 100644
--- a/debian/lenny/applications/tde-guidance/debian/python-distutils-jaunty.mk
+++ b/debian/lenny/applications/tde-guidance/debian/python-distutils-jaunty.mk
@@ -83,7 +83,7 @@ endif # pysupport
ifndef DEB_PYTHON_SYSTEM
DEB_PYTHON_COMPILE_VERSION =
-DEB_PYTHON_VERSIONS = 2.1 2.2 2.3 2.4 2.5 2.6
+DEB_PYTHON_VERSIONS = 2.1 2.2 2.3 2.4 2.5 2.6 2.7
else
# default package is the first one declared in 'debian/control'
# (override if necessary)
diff --git a/debian/lenny/applications/tde-guidance/debian/rules b/debian/lenny/applications/tde-guidance/debian/rules
index ad10455d4..849596478 100755
--- a/debian/lenny/applications/tde-guidance/debian/rules
+++ b/debian/lenny/applications/tde-guidance/debian/rules
@@ -45,12 +45,12 @@ install/tde-guidance-trinity::
# fix the link properly
mkdir -p debian/tde-guidance-trinity/opt/trinity/bin
- (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /usr/share/python-support/tde-guidance-trinity/displayconfig.py displayconfig)
- (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /usr/share/python-support/tde-guidance-trinity/mountconfig.py mountconfig)
- (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /usr/share/python-support/tde-guidance-trinity/serviceconfig.py serviceconfig)
- (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /usr/share/python-support/tde-guidance-trinity/userconfig.py userconfig)
- (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /usr/share/python-support/tde-guidance-trinity/wineconfig.py wineconfig)
-# (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /usr/share/python-support/tde-guidance-trinity/grubconfig.py grubconfig)
+ (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /opt/trinity/share/python-support/tde-guidance-trinity/displayconfig.py displayconfig)
+ (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /opt/trinity/share/python-support/tde-guidance-trinity/mountconfig.py mountconfig)
+ (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /opt/trinity/share/python-support/tde-guidance-trinity/serviceconfig.py serviceconfig)
+ (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /opt/trinity/share/python-support/tde-guidance-trinity/userconfig.py userconfig)
+ (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /opt/trinity/share/python-support/tde-guidance-trinity/wineconfig.py wineconfig)
+# (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /opt/trinity/share/python-support/tde-guidance-trinity/grubconfig.py grubconfig)
# put this here since gnome people probably don't want it by default
(cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf ../share/python-support/guidance-backends-trinity/displayconfig-restore.py displayconfig-restore)
@@ -141,7 +141,7 @@ install/tde-guidance-powermanager-trinity::
# generate guidance-power-manager script
echo "#!/bin/sh" > $(DEB_DESTDIR)/opt/trinity/bin/guidance-power-manager
- echo "/usr/share/python-support/tde-guidance-powermanager-trinity/guidance-power-manager.py &" >> $(DEB_DESTDIR)/opt/trinity/bin/guidance-power-manager
+ echo "/opt/trinity/share/python-support/tde-guidance-powermanager-trinity/guidance-power-manager.py &" >> $(DEB_DESTDIR)/opt/trinity/bin/guidance-power-manager
chmod +x $(DEB_DESTDIR)/opt/trinity/bin/guidance-power-manager
# fix script-not-executable
@@ -185,9 +185,9 @@ clean::
common-install-prehook-impl::
# generate form implementation using pytde user interface compiler
- (cd powermanager; /opt/trinity/bin/kdepyuic --usekdei18n guidance_power_manager_ui.ui)
- (cd powermanager; /opt/trinity/bin/kdepyuic --usekdei18n tooltip.ui)
- (cd powermanager; /opt/trinity/bin/kdepyuic --usekdei18n notify.ui)
+ (cd powermanager; /opt/trinity/bin/tdepyuic --usetdei18n guidance_power_manager_ui.ui)
+ (cd powermanager; /opt/trinity/bin/tdepyuic --usetdei18n tooltip.ui)
+ (cd powermanager; /opt/trinity/bin/tdepyuic --usetdei18n notify.ui)
mkdir -p po
touch list
diff --git a/debian/squeeze/applications/tde-guidance/debian/control b/debian/squeeze/applications/tde-guidance/debian/control
index 155ec8d06..a5fb126d4 100644
--- a/debian/squeeze/applications/tde-guidance/debian/control
+++ b/debian/squeeze/applications/tde-guidance/debian/control
@@ -6,7 +6,7 @@ XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.de
Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org>
Build-Depends: cdbs, debhelper (>= 5), quilt, chrpath, tdelibs14-trinity-dev,
libpythonize0-trinity-dev, libtool, libxml2-utils, libxss-dev, libxxf86vm-dev,
- pytdeextensions-trinity, pytqt-tools, python-tqt, python-trinity-trinity, python-trinity-trinity-dev, python-sip4-dev,
+ pytdeextensions-trinity, pytqt-tools, python-tqt, python-trinity-trinity, python-trinity-trinity-dev, python-sip-tqt-dev,
python-support (>= 0.6), python (>= 2.5), python-dev (>= 2.5), x11proto-scrnsaver-dev, python-tqt-dev, hwdata
Standards-Version: 3.8.4
diff --git a/debian/squeeze/applications/tde-guidance/debian/python-distutils-jaunty.mk b/debian/squeeze/applications/tde-guidance/debian/python-distutils-jaunty.mk
index db329306c..1a1ec9a8e 100644
--- a/debian/squeeze/applications/tde-guidance/debian/python-distutils-jaunty.mk
+++ b/debian/squeeze/applications/tde-guidance/debian/python-distutils-jaunty.mk
@@ -83,7 +83,7 @@ endif # pysupport
ifndef DEB_PYTHON_SYSTEM
DEB_PYTHON_COMPILE_VERSION =
-DEB_PYTHON_VERSIONS = 2.1 2.2 2.3 2.4 2.5 2.6
+DEB_PYTHON_VERSIONS = 2.1 2.2 2.3 2.4 2.5 2.6 2.7
else
# default package is the first one declared in 'debian/control'
# (override if necessary)
diff --git a/debian/squeeze/applications/tde-guidance/debian/rules b/debian/squeeze/applications/tde-guidance/debian/rules
index b8ff3cc84..85452d549 100755
--- a/debian/squeeze/applications/tde-guidance/debian/rules
+++ b/debian/squeeze/applications/tde-guidance/debian/rules
@@ -45,12 +45,12 @@ install/tde-guidance-trinity::
# fix the link properly
mkdir -p debian/tde-guidance-trinity/opt/trinity/bin
- (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /usr/share/python-support/tde-guidance-trinity/displayconfig.py displayconfig)
- (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /usr/share/python-support/tde-guidance-trinity/mountconfig.py mountconfig)
- (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /usr/share/python-support/tde-guidance-trinity/serviceconfig.py serviceconfig)
- (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /usr/share/python-support/tde-guidance-trinity/userconfig.py userconfig)
- (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /usr/share/python-support/tde-guidance-trinity/wineconfig.py wineconfig)
-# (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /usr/share/python-support/tde-guidance-trinity/grubconfig.py grubconfig)
+ (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /opt/trinity/share/python-support/tde-guidance-trinity/displayconfig.py displayconfig)
+ (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /opt/trinity/share/python-support/tde-guidance-trinity/mountconfig.py mountconfig)
+ (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /opt/trinity/share/python-support/tde-guidance-trinity/serviceconfig.py serviceconfig)
+ (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /opt/trinity/share/python-support/tde-guidance-trinity/userconfig.py userconfig)
+ (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /opt/trinity/share/python-support/tde-guidance-trinity/wineconfig.py wineconfig)
+# (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /opt/trinity/share/python-support/tde-guidance-trinity/grubconfig.py grubconfig)
# put this here since gnome people probably don't want it by default
(cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf ../share/python-support/guidance-backends-trinity/displayconfig-restore.py displayconfig-restore)
@@ -141,7 +141,7 @@ install/tde-guidance-powermanager-trinity::
# generate guidance-power-manager script
echo "#!/bin/sh" > $(DEB_DESTDIR)/opt/trinity/bin/guidance-power-manager
- echo "/usr/share/python-support/tde-guidance-powermanager-trinity/guidance-power-manager.py &" >> $(DEB_DESTDIR)/opt/trinity/bin/guidance-power-manager
+ echo "/opt/trinity/share/python-support/tde-guidance-powermanager-trinity/guidance-power-manager.py &" >> $(DEB_DESTDIR)/opt/trinity/bin/guidance-power-manager
chmod +x $(DEB_DESTDIR)/opt/trinity/bin/guidance-power-manager
# fix script-not-executable
@@ -185,9 +185,9 @@ clean::
common-install-prehook-impl::
# generate form implementation using pytde user interface compiler
- (cd powermanager; /opt/trinity/bin/kdepyuic --usekdei18n guidance_power_manager_ui.ui)
- (cd powermanager; /opt/trinity/bin/kdepyuic --usekdei18n tooltip.ui)
- (cd powermanager; /opt/trinity/bin/kdepyuic --usekdei18n notify.ui)
+ (cd powermanager; /opt/trinity/bin/tdepyuic --usetdei18n guidance_power_manager_ui.ui)
+ (cd powermanager; /opt/trinity/bin/tdepyuic --usetdei18n tooltip.ui)
+ (cd powermanager; /opt/trinity/bin/tdepyuic --usetdei18n notify.ui)
mkdir -p po
touch list
diff --git a/debian/wheezy/applications/tde-guidance/debian/control b/debian/wheezy/applications/tde-guidance/debian/control
index 155ec8d06..a5fb126d4 100644
--- a/debian/wheezy/applications/tde-guidance/debian/control
+++ b/debian/wheezy/applications/tde-guidance/debian/control
@@ -6,7 +6,7 @@ XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.de
Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org>
Build-Depends: cdbs, debhelper (>= 5), quilt, chrpath, tdelibs14-trinity-dev,
libpythonize0-trinity-dev, libtool, libxml2-utils, libxss-dev, libxxf86vm-dev,
- pytdeextensions-trinity, pytqt-tools, python-tqt, python-trinity-trinity, python-trinity-trinity-dev, python-sip4-dev,
+ pytdeextensions-trinity, pytqt-tools, python-tqt, python-trinity-trinity, python-trinity-trinity-dev, python-sip-tqt-dev,
python-support (>= 0.6), python (>= 2.5), python-dev (>= 2.5), x11proto-scrnsaver-dev, python-tqt-dev, hwdata
Standards-Version: 3.8.4
diff --git a/debian/wheezy/applications/tde-guidance/debian/python-distutils-jaunty.mk b/debian/wheezy/applications/tde-guidance/debian/python-distutils-jaunty.mk
index db329306c..1a1ec9a8e 100644
--- a/debian/wheezy/applications/tde-guidance/debian/python-distutils-jaunty.mk
+++ b/debian/wheezy/applications/tde-guidance/debian/python-distutils-jaunty.mk
@@ -83,7 +83,7 @@ endif # pysupport
ifndef DEB_PYTHON_SYSTEM
DEB_PYTHON_COMPILE_VERSION =
-DEB_PYTHON_VERSIONS = 2.1 2.2 2.3 2.4 2.5 2.6
+DEB_PYTHON_VERSIONS = 2.1 2.2 2.3 2.4 2.5 2.6 2.7
else
# default package is the first one declared in 'debian/control'
# (override if necessary)
diff --git a/debian/wheezy/applications/tde-guidance/debian/rules b/debian/wheezy/applications/tde-guidance/debian/rules
index b8ff3cc84..85452d549 100755
--- a/debian/wheezy/applications/tde-guidance/debian/rules
+++ b/debian/wheezy/applications/tde-guidance/debian/rules
@@ -45,12 +45,12 @@ install/tde-guidance-trinity::
# fix the link properly
mkdir -p debian/tde-guidance-trinity/opt/trinity/bin
- (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /usr/share/python-support/tde-guidance-trinity/displayconfig.py displayconfig)
- (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /usr/share/python-support/tde-guidance-trinity/mountconfig.py mountconfig)
- (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /usr/share/python-support/tde-guidance-trinity/serviceconfig.py serviceconfig)
- (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /usr/share/python-support/tde-guidance-trinity/userconfig.py userconfig)
- (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /usr/share/python-support/tde-guidance-trinity/wineconfig.py wineconfig)
-# (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /usr/share/python-support/tde-guidance-trinity/grubconfig.py grubconfig)
+ (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /opt/trinity/share/python-support/tde-guidance-trinity/displayconfig.py displayconfig)
+ (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /opt/trinity/share/python-support/tde-guidance-trinity/mountconfig.py mountconfig)
+ (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /opt/trinity/share/python-support/tde-guidance-trinity/serviceconfig.py serviceconfig)
+ (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /opt/trinity/share/python-support/tde-guidance-trinity/userconfig.py userconfig)
+ (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /opt/trinity/share/python-support/tde-guidance-trinity/wineconfig.py wineconfig)
+# (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /opt/trinity/share/python-support/tde-guidance-trinity/grubconfig.py grubconfig)
# put this here since gnome people probably don't want it by default
(cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf ../share/python-support/guidance-backends-trinity/displayconfig-restore.py displayconfig-restore)
@@ -141,7 +141,7 @@ install/tde-guidance-powermanager-trinity::
# generate guidance-power-manager script
echo "#!/bin/sh" > $(DEB_DESTDIR)/opt/trinity/bin/guidance-power-manager
- echo "/usr/share/python-support/tde-guidance-powermanager-trinity/guidance-power-manager.py &" >> $(DEB_DESTDIR)/opt/trinity/bin/guidance-power-manager
+ echo "/opt/trinity/share/python-support/tde-guidance-powermanager-trinity/guidance-power-manager.py &" >> $(DEB_DESTDIR)/opt/trinity/bin/guidance-power-manager
chmod +x $(DEB_DESTDIR)/opt/trinity/bin/guidance-power-manager
# fix script-not-executable
@@ -185,9 +185,9 @@ clean::
common-install-prehook-impl::
# generate form implementation using pytde user interface compiler
- (cd powermanager; /opt/trinity/bin/kdepyuic --usekdei18n guidance_power_manager_ui.ui)
- (cd powermanager; /opt/trinity/bin/kdepyuic --usekdei18n tooltip.ui)
- (cd powermanager; /opt/trinity/bin/kdepyuic --usekdei18n notify.ui)
+ (cd powermanager; /opt/trinity/bin/tdepyuic --usetdei18n guidance_power_manager_ui.ui)
+ (cd powermanager; /opt/trinity/bin/tdepyuic --usetdei18n tooltip.ui)
+ (cd powermanager; /opt/trinity/bin/tdepyuic --usetdei18n notify.ui)
mkdir -p po
touch list
diff --git a/ubuntu/maverick/applications/tde-guidance/debian/control b/ubuntu/maverick/applications/tde-guidance/debian/control
index 3fb02ed09..30f06b28e 100644
--- a/ubuntu/maverick/applications/tde-guidance/debian/control
+++ b/ubuntu/maverick/applications/tde-guidance/debian/control
@@ -6,7 +6,7 @@ XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.de
Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org>
Build-Depends: cdbs, debhelper (>= 5), quilt, chrpath, tdelibs14-trinity-dev,
libpythonize0-trinity-dev, libtool, libxml2-utils, libxss-dev, libxxf86vm-dev,
- pytdeextensions-trinity, pytqt-tools, python-tqt, python-trinity-trinity, python-trinity-trinity-dev, python-sip4-dev,
+ pytdeextensions-trinity, pytqt-tools, python-tqt, python-trinity-trinity, python-trinity-trinity-dev, python-sip-tqt-dev,
python-support (>= 0.6), python-all (>= 2.5), python-all-dev (>= 2.5), x11proto-scrnsaver-dev, python-tqt-dev, hwdata
Standards-Version: 3.8.4
diff --git a/ubuntu/maverick/applications/tde-guidance/debian/rules b/ubuntu/maverick/applications/tde-guidance/debian/rules
index b8ff3cc84..85452d549 100755
--- a/ubuntu/maverick/applications/tde-guidance/debian/rules
+++ b/ubuntu/maverick/applications/tde-guidance/debian/rules
@@ -45,12 +45,12 @@ install/tde-guidance-trinity::
# fix the link properly
mkdir -p debian/tde-guidance-trinity/opt/trinity/bin
- (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /usr/share/python-support/tde-guidance-trinity/displayconfig.py displayconfig)
- (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /usr/share/python-support/tde-guidance-trinity/mountconfig.py mountconfig)
- (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /usr/share/python-support/tde-guidance-trinity/serviceconfig.py serviceconfig)
- (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /usr/share/python-support/tde-guidance-trinity/userconfig.py userconfig)
- (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /usr/share/python-support/tde-guidance-trinity/wineconfig.py wineconfig)
-# (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /usr/share/python-support/tde-guidance-trinity/grubconfig.py grubconfig)
+ (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /opt/trinity/share/python-support/tde-guidance-trinity/displayconfig.py displayconfig)
+ (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /opt/trinity/share/python-support/tde-guidance-trinity/mountconfig.py mountconfig)
+ (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /opt/trinity/share/python-support/tde-guidance-trinity/serviceconfig.py serviceconfig)
+ (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /opt/trinity/share/python-support/tde-guidance-trinity/userconfig.py userconfig)
+ (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /opt/trinity/share/python-support/tde-guidance-trinity/wineconfig.py wineconfig)
+# (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /opt/trinity/share/python-support/tde-guidance-trinity/grubconfig.py grubconfig)
# put this here since gnome people probably don't want it by default
(cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf ../share/python-support/guidance-backends-trinity/displayconfig-restore.py displayconfig-restore)
@@ -141,7 +141,7 @@ install/tde-guidance-powermanager-trinity::
# generate guidance-power-manager script
echo "#!/bin/sh" > $(DEB_DESTDIR)/opt/trinity/bin/guidance-power-manager
- echo "/usr/share/python-support/tde-guidance-powermanager-trinity/guidance-power-manager.py &" >> $(DEB_DESTDIR)/opt/trinity/bin/guidance-power-manager
+ echo "/opt/trinity/share/python-support/tde-guidance-powermanager-trinity/guidance-power-manager.py &" >> $(DEB_DESTDIR)/opt/trinity/bin/guidance-power-manager
chmod +x $(DEB_DESTDIR)/opt/trinity/bin/guidance-power-manager
# fix script-not-executable
@@ -185,9 +185,9 @@ clean::
common-install-prehook-impl::
# generate form implementation using pytde user interface compiler
- (cd powermanager; /opt/trinity/bin/kdepyuic --usekdei18n guidance_power_manager_ui.ui)
- (cd powermanager; /opt/trinity/bin/kdepyuic --usekdei18n tooltip.ui)
- (cd powermanager; /opt/trinity/bin/kdepyuic --usekdei18n notify.ui)
+ (cd powermanager; /opt/trinity/bin/tdepyuic --usetdei18n guidance_power_manager_ui.ui)
+ (cd powermanager; /opt/trinity/bin/tdepyuic --usetdei18n tooltip.ui)
+ (cd powermanager; /opt/trinity/bin/tdepyuic --usetdei18n notify.ui)
mkdir -p po
touch list
diff --git a/ubuntu/precise/applications/tde-guidance/debian/control b/ubuntu/precise/applications/tde-guidance/debian/control
index 3fb02ed09..30f06b28e 100644
--- a/ubuntu/precise/applications/tde-guidance/debian/control
+++ b/ubuntu/precise/applications/tde-guidance/debian/control
@@ -6,7 +6,7 @@ XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.de
Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org>
Build-Depends: cdbs, debhelper (>= 5), quilt, chrpath, tdelibs14-trinity-dev,
libpythonize0-trinity-dev, libtool, libxml2-utils, libxss-dev, libxxf86vm-dev,
- pytdeextensions-trinity, pytqt-tools, python-tqt, python-trinity-trinity, python-trinity-trinity-dev, python-sip4-dev,
+ pytdeextensions-trinity, pytqt-tools, python-tqt, python-trinity-trinity, python-trinity-trinity-dev, python-sip-tqt-dev,
python-support (>= 0.6), python-all (>= 2.5), python-all-dev (>= 2.5), x11proto-scrnsaver-dev, python-tqt-dev, hwdata
Standards-Version: 3.8.4
diff --git a/ubuntu/precise/applications/tde-guidance/debian/rules b/ubuntu/precise/applications/tde-guidance/debian/rules
index b8ff3cc84..85452d549 100755
--- a/ubuntu/precise/applications/tde-guidance/debian/rules
+++ b/ubuntu/precise/applications/tde-guidance/debian/rules
@@ -45,12 +45,12 @@ install/tde-guidance-trinity::
# fix the link properly
mkdir -p debian/tde-guidance-trinity/opt/trinity/bin
- (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /usr/share/python-support/tde-guidance-trinity/displayconfig.py displayconfig)
- (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /usr/share/python-support/tde-guidance-trinity/mountconfig.py mountconfig)
- (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /usr/share/python-support/tde-guidance-trinity/serviceconfig.py serviceconfig)
- (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /usr/share/python-support/tde-guidance-trinity/userconfig.py userconfig)
- (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /usr/share/python-support/tde-guidance-trinity/wineconfig.py wineconfig)
-# (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /usr/share/python-support/tde-guidance-trinity/grubconfig.py grubconfig)
+ (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /opt/trinity/share/python-support/tde-guidance-trinity/displayconfig.py displayconfig)
+ (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /opt/trinity/share/python-support/tde-guidance-trinity/mountconfig.py mountconfig)
+ (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /opt/trinity/share/python-support/tde-guidance-trinity/serviceconfig.py serviceconfig)
+ (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /opt/trinity/share/python-support/tde-guidance-trinity/userconfig.py userconfig)
+ (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /opt/trinity/share/python-support/tde-guidance-trinity/wineconfig.py wineconfig)
+# (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /opt/trinity/share/python-support/tde-guidance-trinity/grubconfig.py grubconfig)
# put this here since gnome people probably don't want it by default
(cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf ../share/python-support/guidance-backends-trinity/displayconfig-restore.py displayconfig-restore)
@@ -141,7 +141,7 @@ install/tde-guidance-powermanager-trinity::
# generate guidance-power-manager script
echo "#!/bin/sh" > $(DEB_DESTDIR)/opt/trinity/bin/guidance-power-manager
- echo "/usr/share/python-support/tde-guidance-powermanager-trinity/guidance-power-manager.py &" >> $(DEB_DESTDIR)/opt/trinity/bin/guidance-power-manager
+ echo "/opt/trinity/share/python-support/tde-guidance-powermanager-trinity/guidance-power-manager.py &" >> $(DEB_DESTDIR)/opt/trinity/bin/guidance-power-manager
chmod +x $(DEB_DESTDIR)/opt/trinity/bin/guidance-power-manager
# fix script-not-executable
@@ -185,9 +185,9 @@ clean::
common-install-prehook-impl::
# generate form implementation using pytde user interface compiler
- (cd powermanager; /opt/trinity/bin/kdepyuic --usekdei18n guidance_power_manager_ui.ui)
- (cd powermanager; /opt/trinity/bin/kdepyuic --usekdei18n tooltip.ui)
- (cd powermanager; /opt/trinity/bin/kdepyuic --usekdei18n notify.ui)
+ (cd powermanager; /opt/trinity/bin/tdepyuic --usetdei18n guidance_power_manager_ui.ui)
+ (cd powermanager; /opt/trinity/bin/tdepyuic --usetdei18n tooltip.ui)
+ (cd powermanager; /opt/trinity/bin/tdepyuic --usetdei18n notify.ui)
mkdir -p po
touch list
diff --git a/ubuntu/raring/applications/tde-guidance/debian/control b/ubuntu/raring/applications/tde-guidance/debian/control
index 3fb02ed09..30f06b28e 100644
--- a/ubuntu/raring/applications/tde-guidance/debian/control
+++ b/ubuntu/raring/applications/tde-guidance/debian/control
@@ -6,7 +6,7 @@ XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.de
Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org>
Build-Depends: cdbs, debhelper (>= 5), quilt, chrpath, tdelibs14-trinity-dev,
libpythonize0-trinity-dev, libtool, libxml2-utils, libxss-dev, libxxf86vm-dev,
- pytdeextensions-trinity, pytqt-tools, python-tqt, python-trinity-trinity, python-trinity-trinity-dev, python-sip4-dev,
+ pytdeextensions-trinity, pytqt-tools, python-tqt, python-trinity-trinity, python-trinity-trinity-dev, python-sip-tqt-dev,
python-support (>= 0.6), python-all (>= 2.5), python-all-dev (>= 2.5), x11proto-scrnsaver-dev, python-tqt-dev, hwdata
Standards-Version: 3.8.4
diff --git a/ubuntu/raring/applications/tde-guidance/debian/rules b/ubuntu/raring/applications/tde-guidance/debian/rules
index b8ff3cc84..85452d549 100755
--- a/ubuntu/raring/applications/tde-guidance/debian/rules
+++ b/ubuntu/raring/applications/tde-guidance/debian/rules
@@ -45,12 +45,12 @@ install/tde-guidance-trinity::
# fix the link properly
mkdir -p debian/tde-guidance-trinity/opt/trinity/bin
- (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /usr/share/python-support/tde-guidance-trinity/displayconfig.py displayconfig)
- (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /usr/share/python-support/tde-guidance-trinity/mountconfig.py mountconfig)
- (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /usr/share/python-support/tde-guidance-trinity/serviceconfig.py serviceconfig)
- (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /usr/share/python-support/tde-guidance-trinity/userconfig.py userconfig)
- (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /usr/share/python-support/tde-guidance-trinity/wineconfig.py wineconfig)
-# (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /usr/share/python-support/tde-guidance-trinity/grubconfig.py grubconfig)
+ (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /opt/trinity/share/python-support/tde-guidance-trinity/displayconfig.py displayconfig)
+ (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /opt/trinity/share/python-support/tde-guidance-trinity/mountconfig.py mountconfig)
+ (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /opt/trinity/share/python-support/tde-guidance-trinity/serviceconfig.py serviceconfig)
+ (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /opt/trinity/share/python-support/tde-guidance-trinity/userconfig.py userconfig)
+ (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /opt/trinity/share/python-support/tde-guidance-trinity/wineconfig.py wineconfig)
+# (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /opt/trinity/share/python-support/tde-guidance-trinity/grubconfig.py grubconfig)
# put this here since gnome people probably don't want it by default
(cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf ../share/python-support/guidance-backends-trinity/displayconfig-restore.py displayconfig-restore)
@@ -141,7 +141,7 @@ install/tde-guidance-powermanager-trinity::
# generate guidance-power-manager script
echo "#!/bin/sh" > $(DEB_DESTDIR)/opt/trinity/bin/guidance-power-manager
- echo "/usr/share/python-support/tde-guidance-powermanager-trinity/guidance-power-manager.py &" >> $(DEB_DESTDIR)/opt/trinity/bin/guidance-power-manager
+ echo "/opt/trinity/share/python-support/tde-guidance-powermanager-trinity/guidance-power-manager.py &" >> $(DEB_DESTDIR)/opt/trinity/bin/guidance-power-manager
chmod +x $(DEB_DESTDIR)/opt/trinity/bin/guidance-power-manager
# fix script-not-executable
@@ -185,9 +185,9 @@ clean::
common-install-prehook-impl::
# generate form implementation using pytde user interface compiler
- (cd powermanager; /opt/trinity/bin/kdepyuic --usekdei18n guidance_power_manager_ui.ui)
- (cd powermanager; /opt/trinity/bin/kdepyuic --usekdei18n tooltip.ui)
- (cd powermanager; /opt/trinity/bin/kdepyuic --usekdei18n notify.ui)
+ (cd powermanager; /opt/trinity/bin/tdepyuic --usetdei18n guidance_power_manager_ui.ui)
+ (cd powermanager; /opt/trinity/bin/tdepyuic --usetdei18n tooltip.ui)
+ (cd powermanager; /opt/trinity/bin/tdepyuic --usetdei18n notify.ui)
mkdir -p po
touch list