summaryrefslogtreecommitdiffstats
path: root/ubuntu/maverick
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2014-07-16 03:04:42 +0200
committerSlávek Banko <slavek.banko@axis.cz>2014-07-16 03:05:15 +0200
commitf0296a0bbdf067b39dec5551a91d8316eec9b49b (patch)
tree600de1a4e064b49d7e30c6d9826ee1bd36a5fcc4 /ubuntu/maverick
parentc6eec582c412347deeb9681922c1c204c49d74b0 (diff)
downloadtde-packaging-f0296a0bbdf067b39dec5551a91d8316eec9b49b.tar.gz
tde-packaging-f0296a0bbdf067b39dec5551a91d8316eec9b49b.zip
Remove displayconfig module from tde-guidance on Debian and Ubuntu
Diffstat (limited to 'ubuntu/maverick')
-rw-r--r--ubuntu/maverick/applications/tde-guidance/debian/control1
-rw-r--r--ubuntu/maverick/applications/tde-guidance/debian/dirs1
-rw-r--r--ubuntu/maverick/applications/tde-guidance/debian/displayconfig-trinity.169
-rw-r--r--ubuntu/maverick/applications/tde-guidance/debian/guidance-backends-trinity.install16
-rwxr-xr-xubuntu/maverick/applications/tde-guidance/debian/rules34
-rw-r--r--ubuntu/maverick/applications/tde-guidance/debian/tde-guidance-trinity.init33
-rw-r--r--ubuntu/maverick/applications/tde-guidance/debian/tde-guidance-trinity.install5
7 files changed, 2 insertions, 157 deletions
diff --git a/ubuntu/maverick/applications/tde-guidance/debian/control b/ubuntu/maverick/applications/tde-guidance/debian/control
index 75557e68c..2432c6f80 100644
--- a/ubuntu/maverick/applications/tde-guidance/debian/control
+++ b/ubuntu/maverick/applications/tde-guidance/debian/control
@@ -23,7 +23,6 @@ Description: collection of TDE system administration tools for GNU/Linux [Trinit
o userconfig - User and Group administration
o serviceconfig - Service/daemon administration
o mountconfig - Disk and filesystem administration
- o displayconfig - Screen and display configuration
o wineconfig - Wine configuration
.
These tools are available in Trinity Control Center, System Settings
diff --git a/ubuntu/maverick/applications/tde-guidance/debian/dirs b/ubuntu/maverick/applications/tde-guidance/debian/dirs
deleted file mode 100644
index 3dd0bc793..000000000
--- a/ubuntu/maverick/applications/tde-guidance/debian/dirs
+++ /dev/null
@@ -1 +0,0 @@
-var/lib/guidance
diff --git a/ubuntu/maverick/applications/tde-guidance/debian/displayconfig-trinity.1 b/ubuntu/maverick/applications/tde-guidance/debian/displayconfig-trinity.1
deleted file mode 100644
index 304d8e8df..000000000
--- a/ubuntu/maverick/applications/tde-guidance/debian/displayconfig-trinity.1
+++ /dev/null
@@ -1,69 +0,0 @@
-.\" Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh disable hyphenation
-.\" .hy enable hyphenation
-.\" .ad l left justify
-.\" .ad b justify to both left and right margins
-.\" .nf disable filling
-.\" .fi enable filling
-.\" .br insert line break
-.\" .sp <n> insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.TH "DISPLAYCONFIG" "1" "aout 2, 2005" "" ""
-.SH "NAME"
-displayconfig \- screen and display configuration tool
-.SH "SYNOPSIS"
-.B displayconfig
-.RI [ options ]
-.br
-.SH "DESCRIPTION"
-This manual page documents briefly the
-.B displayconfig
-commands. This manual page was written for the Debian distribution
-because the original program does not have a manual page.
-.PP
-.\" TeX users may be more comfortable with the \fB<whatever>\fP and
-.\" \fI<whatever>\fP escape sequences to invode bold face and italics,
-.\" respectively.
-\fBdisplayconfig\fP is a screen and display configuration tool.
-.SH "OPTIONS"
-These programs follow the usual GNU command line syntax, with long
-options starting with two dashes (`\-').
-A summary of options is included below.
-.TP
-.B \-\-help
-Show summary of options.
-.TP
-.B \-\-help\-qt
-Show QT specific help (common for all QT apps).
-.TP
-.B \-\-help\-tde
-Show TDE specific help (common for all TDE apps).
-.TP
-.B \-\-help\-all
-Show the complete help.
-.TP
-.B \-\-author
-Show program author(s).
-.TP
-.B \-v, \-\-version
-Show version of program.
-.TP
-.B \-\-license
-Show program license.
-.SH "SEE ALSO"
-.BR displayconfig-restore (1).
-.BR mountconfig (1).
-.BR serviceconfig (1),
-.BR userconfig (1).
-.br
-.SH "AUTHOR"
-displayconfig was written by <simon@simonzone.com>.
-.PP
-This manual page was written by Fathi Boudra <fboudra@free.fr>,
-for the Debian project (but may be used by others).
diff --git a/ubuntu/maverick/applications/tde-guidance/debian/guidance-backends-trinity.install b/ubuntu/maverick/applications/tde-guidance/debian/guidance-backends-trinity.install
index de6cbc63e..d292fc8d3 100644
--- a/ubuntu/maverick/applications/tde-guidance/debian/guidance-backends-trinity.install
+++ b/ubuntu/maverick/applications/tde-guidance/debian/guidance-backends-trinity.install
@@ -1,19 +1,3 @@
-usr/lib/python*/site-packages/ixf86misc.so
-opt/trinity/share/apps/guidance/vesamodes
-opt/trinity/share/apps/guidance/extramodes
-opt/trinity/share/apps/guidance/widescreenmodes
-opt/trinity/share/apps/guidance/Cards+
-opt/trinity/share/apps/guidance/pcitable
-opt/trinity/share/apps/guidance/MonitorsDB
-opt/trinity/share/python-support/guidance-backends-trinity/displayconfig-hwprobe.py
-opt/trinity/share/python-support/guidance-backends-trinity/xf86misc.py
opt/trinity/share/python-support/guidance-backends-trinity/MicroHAL.py
-opt/trinity/share/python-support/guidance-backends-trinity/ScanPCI.py
-opt/trinity/share/python-support/guidance-backends-trinity/displayconfigabstraction.py
-opt/trinity/share/python-support/guidance-backends-trinity/displayconfig-restore.py
-opt/trinity/share/python-support/guidance-backends-trinity/drivedetect.py
-opt/trinity/share/python-support/guidance-backends-trinity/execwithcapture.py
opt/trinity/share/python-support/guidance-backends-trinity/wineread.py
opt/trinity/share/python-support/guidance-backends-trinity/winewrite.py
-opt/trinity/share/python-support/guidance-backends-trinity/xorgconfig.py
-opt/trinity/share/python-support/guidance-backends-trinity/infimport.py
diff --git a/ubuntu/maverick/applications/tde-guidance/debian/rules b/ubuntu/maverick/applications/tde-guidance/debian/rules
index 85452d549..5046494ad 100755
--- a/ubuntu/maverick/applications/tde-guidance/debian/rules
+++ b/ubuntu/maverick/applications/tde-guidance/debian/rules
@@ -10,7 +10,7 @@ include /usr/share/cdbs/1/rules/utils.mk
DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp
DEB_UPDATE_RCD_PARAMS := multiuser
-DEB_INSTALL_MANPAGES_tde-guidance-trinity := debian/displayconfig-trinity.1 debian/mountconfig-trinity.1 debian/serviceconfig-trinity.1 debian/userconfig-trinity.1
+DEB_INSTALL_MANPAGES_tde-guidance-trinity := debian/mountconfig-trinity.1 debian/serviceconfig-trinity.1 debian/userconfig-trinity.1
PYSUPPORT_PATH = $(DEB_DESTDIR)/opt/trinity/share/python-support
DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
LDFLAGS_APPEND := -L/opt/trinity/lib
@@ -26,8 +26,6 @@ install/tde-guidance-trinity::
$(DEB_DESTDIR)/opt/trinity/share/icons/crystalsvg/32x32/apps/disksfilesystems.png
install -D -p -m0644 $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/pics/hi32-user.png \
$(DEB_DESTDIR)/opt/trinity/share/icons/crystalsvg/32x32/apps/userconfig.png
- install -D -p -m0644 $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/pics/hi32-display.png \
- $(DEB_DESTDIR)/opt/trinity/share/icons/crystalsvg/32x32/apps/displayconfig.png
install -D -p -m0644 $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/pics/32-wine.png \
$(DEB_DESTDIR)/opt/trinity/share/icons/crystalsvg/32x32/apps/wineconfig.png
install -D -p -m0644 kde/wineconfig/pics/16x16/wineconfig.png \
@@ -45,28 +43,20 @@ 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 /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)
-
# move python modules in PYSUPPORT_PATH
mkdir -p $(PYSUPPORT_PATH)/tde-guidance-trinity
cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/SMBShareSelectDialog.py $(PYSUPPORT_PATH)/tde-guidance-trinity
cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/SimpleCommandRunner.py $(PYSUPPORT_PATH)/tde-guidance-trinity
- cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/displayconfig.py $(PYSUPPORT_PATH)/tde-guidance-trinity
- cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/displayconfigwidgets.py $(PYSUPPORT_PATH)/tde-guidance-trinity
cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/fuser.py $(PYSUPPORT_PATH)/tde-guidance-trinity
cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/fuser_ui.py $(PYSUPPORT_PATH)/tde-guidance-trinity
# cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/grubconfig.py $(PYSUPPORT_PATH)/tde-guidance-trinity
- cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/ktimerdialog.py $(PYSUPPORT_PATH)/tde-guidance-trinity
cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/mountconfig.py $(PYSUPPORT_PATH)/tde-guidance-trinity
- cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/servertestdialog.py $(PYSUPPORT_PATH)/tde-guidance-trinity
cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/serviceconfig.py $(PYSUPPORT_PATH)/tde-guidance-trinity
cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/sizeview.py $(PYSUPPORT_PATH)/tde-guidance-trinity
cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/unixauthdb.py $(PYSUPPORT_PATH)/tde-guidance-trinity
@@ -92,30 +82,10 @@ install/tde-guidance-trinity::
done
install/guidance-backends-trinity::
- # install displayconfig-hwprobe.py script
- install -D -p -m0755 displayconfig/displayconfig-hwprobe.py \
- $(PYSUPPORT_PATH)/guidance-backends-trinity/displayconfig-hwprobe.py
-
- for PYDIR in python2.5 python2.6 python2.7 python2.8; do \
- echo "Looking for $(DEB_DESTDIR)/usr/lib/$$PYDIR"; \
- if test -d $(DEB_DESTDIR)/usr/lib/$$PYDIR; then \
- cp $(DEB_DESTDIR)/usr/lib/$$PYDIR/site-packages/xf86misc.py $(PYSUPPORT_PATH)/guidance-backends-trinity; \
- fi; \
- done
-
+ mkdir -p $(PYSUPPORT_PATH)/guidance-backends-trinity
cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/MicroHAL.py $(PYSUPPORT_PATH)/guidance-backends-trinity
- cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/ScanPCI.py $(PYSUPPORT_PATH)/guidance-backends-trinity
- cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/infimport.py $(PYSUPPORT_PATH)/guidance-backends-trinity
- cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/displayconfigabstraction.py $(PYSUPPORT_PATH)/guidance-backends-trinity
- cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/displayconfig-restore.py $(PYSUPPORT_PATH)/guidance-backends-trinity
- cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/drivedetect.py $(PYSUPPORT_PATH)/guidance-backends-trinity
- cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/execwithcapture.py $(PYSUPPORT_PATH)/guidance-backends-trinity
cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/wineread.py $(PYSUPPORT_PATH)/guidance-backends-trinity
cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/winewrite.py $(PYSUPPORT_PATH)/guidance-backends-trinity
- cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/xorgconfig.py $(PYSUPPORT_PATH)/guidance-backends-trinity
-
- rm -f $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/MonitorsDB
- ln -s /usr/share/hwdata/MonitorsDB $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/MonitorsDB
install/tde-guidance-powermanager-trinity::
# install icon to right place
diff --git a/ubuntu/maverick/applications/tde-guidance/debian/tde-guidance-trinity.init b/ubuntu/maverick/applications/tde-guidance/debian/tde-guidance-trinity.init
deleted file mode 100644
index 734e51725..000000000
--- a/ubuntu/maverick/applications/tde-guidance/debian/tde-guidance-trinity.init
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/sh
-### BEGIN INIT INFO
-# Provides: tde-guidance
-# Required-Start: $local_fs $remote_fs
-# Required-Stop: $local_fs $remote_fs
-# Default-Start: 2 3 4 5
-# Default-Stop: 1
-# Short-Description: displayconfig hardware probe
-# Description: displayconfig hardware probe. This program should be run
-# during boot time. It quickly examines the graphics cards
-# (read: PCI devices) in the computer and compares they to
-# the list in the file guidance-gfxhardware-snapshot. If the
-# two lists differ then the Debian package manager is
-# automatically called to regenerate /etc/X11/xorg.conf.
-# This hopefully should mean that people can swap gfx cards
-# in and out and always have a system that will run Xorg.
-# (even though the config will be most likely be suboptimal.
-# Suboptimal is better than no X server).
-### END INIT INFO
-
-case "$1" in
- start)
- /opt/trinity/share/python-support/guidance-backends-trinity/displayconfig-hwprobe.py
- ;;
- stop)
- ;;
- restart|force-reload)
- ;;
- *)
- ;;
-esac
-
-exit 0
diff --git a/ubuntu/maverick/applications/tde-guidance/debian/tde-guidance-trinity.install b/ubuntu/maverick/applications/tde-guidance/debian/tde-guidance-trinity.install
index df391e478..7a0a28549 100644
--- a/ubuntu/maverick/applications/tde-guidance/debian/tde-guidance-trinity.install
+++ b/ubuntu/maverick/applications/tde-guidance/debian/tde-guidance-trinity.install
@@ -44,9 +44,6 @@ opt/trinity/share/apps/guidance/pics/file.png
opt/trinity/share/apps/guidance/pics/important.png
opt/trinity/share/apps/guidance/pics/tux.png
opt/trinity/share/apps/guidance/pics/user.png
-opt/trinity/share/apps/guidance/pics/energystar.png
-opt/trinity/share/apps/guidance/pics/hi32-gfxcard.png
-opt/trinity/share/apps/guidance/pics/hi32-display.png
opt/trinity/share/apps/guidance/pics/32-wine.png
opt/trinity/share/apps/guidance/pics/kdewinewizard.png
opt/trinity/share/python-support/tde-guidance-trinity/SMBShareSelectDialog.py
@@ -54,9 +51,7 @@ opt/trinity/share/python-support/tde-guidance-trinity/SimpleCommandRunner.py
opt/trinity/share/python-support/tde-guidance-trinity/fuser.py
opt/trinity/share/python-support/tde-guidance-trinity/fuser_ui.py
#opt/trinity/share/python-support/tde-guidance-trinity/grubconfig.py
-opt/trinity/share/python-support/tde-guidance-trinity/ktimerdialog.py
opt/trinity/share/python-support/tde-guidance-trinity/mountconfig.py
-opt/trinity/share/python-support/tde-guidance-trinity/servertestdialog.py
opt/trinity/share/python-support/tde-guidance-trinity/serviceconfig.py
opt/trinity/share/python-support/tde-guidance-trinity/sizeview.py
opt/trinity/share/python-support/tde-guidance-trinity/unixauthdb.py