summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--debian/_base/applications/settings/tde-guidance/debian/README.Debian107
-rw-r--r--debian/_base/applications/settings/tde-guidance/debian/control3
-rw-r--r--debian/_base/applications/settings/tde-guidance/debian/guidance-backends-trinity.install3
-rwxr-xr-xdebian/_base/applications/settings/tde-guidance/debian/rules12
-rw-r--r--debian/_base/applications/settings/tde-guidance/debian/tde-guidance-trinity.install8
-rw-r--r--ubuntu/_base/applications/settings/tde-guidance/debian/README.Debian107
-rw-r--r--ubuntu/_base/applications/settings/tde-guidance/debian/control7
-rw-r--r--ubuntu/_base/applications/settings/tde-guidance/debian/guidance-backends-trinity.install3
-rwxr-xr-xubuntu/_base/applications/settings/tde-guidance/debian/rules12
-rw-r--r--ubuntu/_base/applications/settings/tde-guidance/debian/tde-guidance-trinity.install8
10 files changed, 4 insertions, 266 deletions
diff --git a/debian/_base/applications/settings/tde-guidance/debian/README.Debian b/debian/_base/applications/settings/tde-guidance/debian/README.Debian
deleted file mode 100644
index b0302c211..000000000
--- a/debian/_base/applications/settings/tde-guidance/debian/README.Debian
+++ /dev/null
@@ -1,107 +0,0 @@
-Debian kde-extras Team
-----------------------
-
-1. Contacts
------------
-
-General help requests
- <debian-kde@lists.debian.org> mailing list
- #debian-kde on irc
-
-Packaging queries
- <debian-qt-kde@lists.debian.org> mailing list
- #debian-qt-kde on irc
-
-Maintainers
- <pkg-kde-extras@lists.alioth.debian.org> mailing list
-
-
-2. Subversion repository
-------------------------
-
-You can browse it only at:
-
-http://svn.debian.org/wsvn/pkg-kde/kde-extras/
-
-To "checkout" the repository use these commands:
-
- $ svn co svn+ssh://${ALIOTH_USERNAME}@svn.debian.org/svn/pkg-kde/kde-extras
-
-Authorized SSH keys are controlled at https://alioth.debian.org/account/
-
-The repository layout is:
-
-- packagename/
-    - trunk/
-    - branches/
-    - tags/
-        - 0.7.2-1/
-        - 0.7.2-2/
-        - 0.7.2-2ubuntu1/
-        - 0.7.2-2ubuntu2/
-        - 0.7.2-2ubuntu3/
-        - 0.8.0/
-        ...
-
-If only one version of the package is available at the time, development must
-be made at trunk/ dir, copying the dir to tags/'pkg-version' each time a new
-release is made.
-
-When, at some point, the need to have two different versions at the same time
-arises (for example, if we need a version to be in unstable and a different one
-to be in experimental), experimental development will be made in trunk/ and
-if a new unstable package needs to be cooked, copying
-tag/'latest_version_in_sid' to tag/'latest_version_in_sid'+1 will make the
-trick.
-
-3. Using svn-buildpackage
---------------------------
-
-Packages with an upstream tarball will require you to set the mergeWithUpstream
-property first (from the package root) so that svn-buildpackage will look for
-the .orig.tar.gz in the ../tarballs directory.
-
- % svn propset mergeWithUpstream 1 debian
-
-Please note that this only works for packages which have only the debian/
-directory committed. Consequently, you must use CDBS's simple-patchsys.mk or
-dpatch to modify the upstream sources.
-
-After you have finished and committed your Debian patches via
-
- % svn commit [PACKAGE]
-
-as well as copying the orig.tar.gz to ../tarballs/ if necessary, you may build
-your package with the following commands:
-
- % svn-buildpackage --svn-ignore-new -rfakeroot
-
-Please, don't commit tarballs/ or build-area/ directories to SVN.
-
-4. Tarballs and Build-area directories
-------------------------------------
-
-During pkg development before uploaded to debian the tarballs can be found at:
-
- http://pkg-kde.alioth.debian.org/kde-extra/orig.tar.gz/
-
-You need to place those dirs in the parent directory of the one from which you're
-running svn-buildpackage. Usually this means placing tarballs/ and build-area/ dirs
-in 'pkgname'/ dir, at the same level as trunk/
-
-If you want to compile inside one version in tags/ dir, you'll need to place those
-dirs inside that dir. Of course the easiest and cleanest way of doing it is
-by making a symlink of those dirs inside tags/ dir.
-
-5. Using svn-inject
--------------------
-
-To inject a new package into the Debian KDE Extras svn archive you should use svn-inject(1)
-as follows:
-
- svn-inject -o <package>.dsc svn+ssh://${ALIOTH_USERNAME}@svn.debian.org/svn/pkg-kde/kde-extras
-
-Type in your alioth password a few hundred times :-) and your package should be
-uploaded to the archive. Note you will also need to manually copy the
-package.orig.tar.gz to your tarballs directory. The -o option is important as
-this ensures that we 'Only keep modified files under SVN control'
diff --git a/debian/_base/applications/settings/tde-guidance/debian/control b/debian/_base/applications/settings/tde-guidance/debian/control
index f4bd8ab18..646d4babc 100644
--- a/debian/_base/applications/settings/tde-guidance/debian/control
+++ b/debian/_base/applications/settings/tde-guidance/debian/control
@@ -18,12 +18,11 @@ Breaks: kde-guidance-trinity (<< 4:14.0.0~)
Conflicts: guidance-power-manager, kde-guidance-powermanager
Provides: ${python3:Provides}
Description: collection of TDE system administration tools for GNU/Linux [Trinity]
- Guidance currently consists of four programs designed to help you
+ Guidance currently consists of three programs designed to help you
look after your system:
o userconfig - User and Group administration
o serviceconfig - Service/daemon administration
o mountconfig - Disk and filesystem administration
- o wineconfig - Wine configuration
.
These tools are available in Trinity Control Center, System Settings
or can be run as standalone applications.
diff --git a/debian/_base/applications/settings/tde-guidance/debian/guidance-backends-trinity.install b/debian/_base/applications/settings/tde-guidance/debian/guidance-backends-trinity.install
index 14d1e06fd..d9e850d6c 100644
--- a/debian/_base/applications/settings/tde-guidance/debian/guidance-backends-trinity.install
+++ b/debian/_base/applications/settings/tde-guidance/debian/guidance-backends-trinity.install
@@ -1,4 +1 @@
/usr/lib/python*/dist-packages/tde-guidance/MicroHAL.py
-/usr/lib/python*/dist-packages/tde-guidance/drivedetect.py
-/usr/lib/python*/dist-packages/tde-guidance/wineread.py
-/usr/lib/python*/dist-packages/tde-guidance/winewrite.py
diff --git a/debian/_base/applications/settings/tde-guidance/debian/rules b/debian/_base/applications/settings/tde-guidance/debian/rules
index 271f17e68..908924c49 100755
--- a/debian/_base/applications/settings/tde-guidance/debian/rules
+++ b/debian/_base/applications/settings/tde-guidance/debian/rules
@@ -33,16 +33,12 @@ 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/32-wine.png \
- $(DEB_DESTDIR)/opt/trinity/share/icons/crystalsvg/32x32/apps/wineconfig.png
install -D -p -m0644 $(DEB_DESTDIR)/usr/share/icons/crystalsvg/16x16/apps/daemons.png \
$(DEB_DESTDIR)/opt/trinity/share/icons/crystalsvg/16x16/apps/daemons.png
install -D -p -m0644 $(DEB_DESTDIR)/usr/share/icons/crystalsvg/16x16/apps/disksfilesystems.png \
$(DEB_DESTDIR)/opt/trinity/share/icons/crystalsvg/16x16/apps/disksfilesystems.png
install -D -p -m0644 $(DEB_DESTDIR)/usr/share/icons/crystalsvg/16x16/apps/userconfig.png \
$(DEB_DESTDIR)/opt/trinity/share/icons/crystalsvg/16x16/apps/userconfig.png
- install -D -p -m0644 $(DEB_DESTDIR)/usr/share/icons/crystalsvg/16x16/apps/wineconfig.png \
- $(DEB_DESTDIR)/opt/trinity/share/icons/crystalsvg/16x16/apps/wineconfig.png
# install lintian overrides
install -D -p -m0644 debian/tde-guidance-trinity.lintian-overrides \
@@ -51,15 +47,11 @@ install/tde-guidance-trinity::
# fix binary-or-shlib-defines-rpath
chrpath -d $(DEB_DESTDIR)/opt/trinity/lib/trinity/kcm_*.so*
- # fix executable-not-elf-or-script
- chmod 0644 $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/pics/kdewinewizard.png
-
# fix the link properly
mkdir -p debian/tde-guidance-trinity/opt/trinity/bin
(cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf $(GUIDANCE_INST_PATH)/mountconfig.py mountconfig)
(cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf $(GUIDANCE_INST_PATH)/serviceconfig.py serviceconfig)
(cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf $(GUIDANCE_INST_PATH)/userconfig.py userconfig)
- (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf $(GUIDANCE_INST_PATH)/wineconfig.py wineconfig)
# move python modules in PYSUPPORT_PATH
mkdir -p $(PYSUPPORT_PATH)
@@ -72,7 +64,6 @@ install/tde-guidance-trinity::
cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/sizeview.py $(PYSUPPORT_PATH)
cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/unixauthdb.py $(PYSUPPORT_PATH)
cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/userconfig.py $(PYSUPPORT_PATH)
- cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/wineconfig.py $(PYSUPPORT_PATH)
# fix script-not-executable
chmod 0755 $(PYSUPPORT_PATH)/fuser.py
@@ -89,9 +80,6 @@ binary-install/tde-guidance-trinity::
install/guidance-backends-trinity::
mkdir -p $(PYSUPPORT_PATH)
cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/MicroHAL.py $(PYSUPPORT_PATH)
- cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/drivedetect.py $(PYSUPPORT_PATH)
- cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/wineread.py $(PYSUPPORT_PATH)
- cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/winewrite.py $(PYSUPPORT_PATH)
clean::
rm -rf build
diff --git a/debian/_base/applications/settings/tde-guidance/debian/tde-guidance-trinity.install b/debian/_base/applications/settings/tde-guidance/debian/tde-guidance-trinity.install
index 0cc8b62ad..2c427e763 100644
--- a/debian/_base/applications/settings/tde-guidance/debian/tde-guidance-trinity.install
+++ b/debian/_base/applications/settings/tde-guidance/debian/tde-guidance-trinity.install
@@ -1,21 +1,17 @@
opt/trinity/lib/trinity/kcm_serviceconfig.la
opt/trinity/lib/trinity/kcm_userconfig.la
opt/trinity/lib/trinity/kcm_mountconfig.la
-opt/trinity/lib/trinity/kcm_wineconfig.la
opt/trinity/share/icons/crystalsvg/32x32/apps/daemons.png
opt/trinity/share/icons/crystalsvg/32x32/apps/disksfilesystems.png
opt/trinity/share/icons/crystalsvg/32x32/apps/userconfig.png
-opt/trinity/share/icons/crystalsvg/32x32/apps/wineconfig.png
opt/trinity/share/icons/crystalsvg/16x16/apps/daemons.png
opt/trinity/share/icons/crystalsvg/16x16/apps/disksfilesystems.png
opt/trinity/share/icons/crystalsvg/16x16/apps/userconfig.png
-opt/trinity/share/icons/crystalsvg/16x16/apps/wineconfig.png
opt/trinity/share/doc/tde/HTML/en/guidance/index.cache.bz2
opt/trinity/share/doc/tde/HTML/en/guidance/index.html
opt/trinity/share/applications/tde/serviceconfig.desktop
opt/trinity/share/applications/tde/userconfig.desktop
opt/trinity/share/applications/tde/mountconfig.desktop
-opt/trinity/share/applications/tde/wineconfig.desktop
opt/trinity/share/apps/guidance/pics/laserwarn.png
opt/trinity/share/apps/guidance/pics/hi32-app-daemons.png
opt/trinity/share/apps/guidance/pics/hi16-encrypted.png
@@ -48,8 +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/32-wine.png
-opt/trinity/share/apps/guidance/pics/kdewinewizard.png
usr/lib/python3/dist-packages/tde-guidance/SMBShareSelectDialog.py
usr/lib/python3/dist-packages/tde-guidance/SimpleCommandRunner.py
usr/lib/python3/dist-packages/tde-guidance/fuser.py
@@ -59,9 +53,7 @@ usr/lib/python3/dist-packages/tde-guidance/serviceconfig.py
usr/lib/python3/dist-packages/tde-guidance/sizeview.py
usr/lib/python3/dist-packages/tde-guidance/unixauthdb.py
usr/lib/python3/dist-packages/tde-guidance/userconfig.py
-usr/lib/python3/dist-packages/tde-guidance/wineconfig.py
opt/trinity/lib/trinity/kcm_serviceconfig.so
opt/trinity/lib/trinity/kcm_userconfig.so
opt/trinity/lib/trinity/kcm_mountconfig.so
-opt/trinity/lib/trinity/kcm_wineconfig.so
usr/share/lintian/overrides/tde-guidance-trinity
diff --git a/ubuntu/_base/applications/settings/tde-guidance/debian/README.Debian b/ubuntu/_base/applications/settings/tde-guidance/debian/README.Debian
deleted file mode 100644
index b0302c211..000000000
--- a/ubuntu/_base/applications/settings/tde-guidance/debian/README.Debian
+++ /dev/null
@@ -1,107 +0,0 @@
-Debian kde-extras Team
-----------------------
-
-1. Contacts
------------
-
-General help requests
- <debian-kde@lists.debian.org> mailing list
- #debian-kde on irc
-
-Packaging queries
- <debian-qt-kde@lists.debian.org> mailing list
- #debian-qt-kde on irc
-
-Maintainers
- <pkg-kde-extras@lists.alioth.debian.org> mailing list
-
-
-2. Subversion repository
-------------------------
-
-You can browse it only at:
-
-http://svn.debian.org/wsvn/pkg-kde/kde-extras/
-
-To "checkout" the repository use these commands:
-
- $ svn co svn+ssh://${ALIOTH_USERNAME}@svn.debian.org/svn/pkg-kde/kde-extras
-
-Authorized SSH keys are controlled at https://alioth.debian.org/account/
-
-The repository layout is:
-
-- packagename/
-    - trunk/
-    - branches/
-    - tags/
-        - 0.7.2-1/
-        - 0.7.2-2/
-        - 0.7.2-2ubuntu1/
-        - 0.7.2-2ubuntu2/
-        - 0.7.2-2ubuntu3/
-        - 0.8.0/
-        ...
-
-If only one version of the package is available at the time, development must
-be made at trunk/ dir, copying the dir to tags/'pkg-version' each time a new
-release is made.
-
-When, at some point, the need to have two different versions at the same time
-arises (for example, if we need a version to be in unstable and a different one
-to be in experimental), experimental development will be made in trunk/ and
-if a new unstable package needs to be cooked, copying
-tag/'latest_version_in_sid' to tag/'latest_version_in_sid'+1 will make the
-trick.
-
-3. Using svn-buildpackage
---------------------------
-
-Packages with an upstream tarball will require you to set the mergeWithUpstream
-property first (from the package root) so that svn-buildpackage will look for
-the .orig.tar.gz in the ../tarballs directory.
-
- % svn propset mergeWithUpstream 1 debian
-
-Please note that this only works for packages which have only the debian/
-directory committed. Consequently, you must use CDBS's simple-patchsys.mk or
-dpatch to modify the upstream sources.
-
-After you have finished and committed your Debian patches via
-
- % svn commit [PACKAGE]
-
-as well as copying the orig.tar.gz to ../tarballs/ if necessary, you may build
-your package with the following commands:
-
- % svn-buildpackage --svn-ignore-new -rfakeroot
-
-Please, don't commit tarballs/ or build-area/ directories to SVN.
-
-4. Tarballs and Build-area directories
-------------------------------------
-
-During pkg development before uploaded to debian the tarballs can be found at:
-
- http://pkg-kde.alioth.debian.org/kde-extra/orig.tar.gz/
-
-You need to place those dirs in the parent directory of the one from which you're
-running svn-buildpackage. Usually this means placing tarballs/ and build-area/ dirs
-in 'pkgname'/ dir, at the same level as trunk/
-
-If you want to compile inside one version in tags/ dir, you'll need to place those
-dirs inside that dir. Of course the easiest and cleanest way of doing it is
-by making a symlink of those dirs inside tags/ dir.
-
-5. Using svn-inject
--------------------
-
-To inject a new package into the Debian KDE Extras svn archive you should use svn-inject(1)
-as follows:
-
- svn-inject -o <package>.dsc svn+ssh://${ALIOTH_USERNAME}@svn.debian.org/svn/pkg-kde/kde-extras
-
-Type in your alioth password a few hundred times :-) and your package should be
-uploaded to the archive. Note you will also need to manually copy the
-package.orig.tar.gz to your tarballs directory. The -o option is important as
-this ensures that we 'Only keep modified files under SVN control'
diff --git a/ubuntu/_base/applications/settings/tde-guidance/debian/control b/ubuntu/_base/applications/settings/tde-guidance/debian/control
index 8b552881a..eb53a2466 100644
--- a/ubuntu/_base/applications/settings/tde-guidance/debian/control
+++ b/ubuntu/_base/applications/settings/tde-guidance/debian/control
@@ -18,12 +18,11 @@ Breaks: kde-guidance-kde3 (<< 4:14.0.0~), kde-guidance-trinity (<< 4:14.0.0~)
Conflicts: guidance-power-manager, kde-guidance-powermanager
Provides: ${python3:Provides}
Description: collection of TDE system administration tools for GNU/Linux [Trinity]
- Guidance currently consists of four programs designed to help you
+ Guidance currently consists of three programs designed to help you
look after your system:
o userconfig - User and Group administration
o serviceconfig - Service/daemon administration
o mountconfig - Disk and filesystem administration
- o wineconfig - Wine configuration
.
These tools are available in Trinity Control Center, System Settings
or can be run as standalone applications.
@@ -33,8 +32,8 @@ Description: collection of TDE system administration tools for GNU/Linux [Trinit
Package: guidance-backends-trinity
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, hwdata, python3-all, python3-all-dev
-Replaces: guidance-backends-kde3 (<< 4:14.0.0~), guidance-backends-trinity (<< 4:14.0.0~)
-Breaks: guidance-backends-kde3 (<< 4:14.0.0~), guidance-backends-trinity (<< 4:14.0.0~)
+Replaces: guidance-backends-trinity (<< 4:14.0.0~)
+Breaks: guidance-backends-trinity (<< 4:14.0.0~)
Conflicts: guidance-power-manager, kde-guidance-powermanager
Provides: ${python3:Provides}
Description: collection of system administration tools for GNU/Linux [Trinity]
diff --git a/ubuntu/_base/applications/settings/tde-guidance/debian/guidance-backends-trinity.install b/ubuntu/_base/applications/settings/tde-guidance/debian/guidance-backends-trinity.install
index 14d1e06fd..d9e850d6c 100644
--- a/ubuntu/_base/applications/settings/tde-guidance/debian/guidance-backends-trinity.install
+++ b/ubuntu/_base/applications/settings/tde-guidance/debian/guidance-backends-trinity.install
@@ -1,4 +1 @@
/usr/lib/python*/dist-packages/tde-guidance/MicroHAL.py
-/usr/lib/python*/dist-packages/tde-guidance/drivedetect.py
-/usr/lib/python*/dist-packages/tde-guidance/wineread.py
-/usr/lib/python*/dist-packages/tde-guidance/winewrite.py
diff --git a/ubuntu/_base/applications/settings/tde-guidance/debian/rules b/ubuntu/_base/applications/settings/tde-guidance/debian/rules
index 271f17e68..908924c49 100755
--- a/ubuntu/_base/applications/settings/tde-guidance/debian/rules
+++ b/ubuntu/_base/applications/settings/tde-guidance/debian/rules
@@ -33,16 +33,12 @@ 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/32-wine.png \
- $(DEB_DESTDIR)/opt/trinity/share/icons/crystalsvg/32x32/apps/wineconfig.png
install -D -p -m0644 $(DEB_DESTDIR)/usr/share/icons/crystalsvg/16x16/apps/daemons.png \
$(DEB_DESTDIR)/opt/trinity/share/icons/crystalsvg/16x16/apps/daemons.png
install -D -p -m0644 $(DEB_DESTDIR)/usr/share/icons/crystalsvg/16x16/apps/disksfilesystems.png \
$(DEB_DESTDIR)/opt/trinity/share/icons/crystalsvg/16x16/apps/disksfilesystems.png
install -D -p -m0644 $(DEB_DESTDIR)/usr/share/icons/crystalsvg/16x16/apps/userconfig.png \
$(DEB_DESTDIR)/opt/trinity/share/icons/crystalsvg/16x16/apps/userconfig.png
- install -D -p -m0644 $(DEB_DESTDIR)/usr/share/icons/crystalsvg/16x16/apps/wineconfig.png \
- $(DEB_DESTDIR)/opt/trinity/share/icons/crystalsvg/16x16/apps/wineconfig.png
# install lintian overrides
install -D -p -m0644 debian/tde-guidance-trinity.lintian-overrides \
@@ -51,15 +47,11 @@ install/tde-guidance-trinity::
# fix binary-or-shlib-defines-rpath
chrpath -d $(DEB_DESTDIR)/opt/trinity/lib/trinity/kcm_*.so*
- # fix executable-not-elf-or-script
- chmod 0644 $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/pics/kdewinewizard.png
-
# fix the link properly
mkdir -p debian/tde-guidance-trinity/opt/trinity/bin
(cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf $(GUIDANCE_INST_PATH)/mountconfig.py mountconfig)
(cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf $(GUIDANCE_INST_PATH)/serviceconfig.py serviceconfig)
(cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf $(GUIDANCE_INST_PATH)/userconfig.py userconfig)
- (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf $(GUIDANCE_INST_PATH)/wineconfig.py wineconfig)
# move python modules in PYSUPPORT_PATH
mkdir -p $(PYSUPPORT_PATH)
@@ -72,7 +64,6 @@ install/tde-guidance-trinity::
cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/sizeview.py $(PYSUPPORT_PATH)
cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/unixauthdb.py $(PYSUPPORT_PATH)
cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/userconfig.py $(PYSUPPORT_PATH)
- cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/wineconfig.py $(PYSUPPORT_PATH)
# fix script-not-executable
chmod 0755 $(PYSUPPORT_PATH)/fuser.py
@@ -89,9 +80,6 @@ binary-install/tde-guidance-trinity::
install/guidance-backends-trinity::
mkdir -p $(PYSUPPORT_PATH)
cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/MicroHAL.py $(PYSUPPORT_PATH)
- cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/drivedetect.py $(PYSUPPORT_PATH)
- cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/wineread.py $(PYSUPPORT_PATH)
- cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/winewrite.py $(PYSUPPORT_PATH)
clean::
rm -rf build
diff --git a/ubuntu/_base/applications/settings/tde-guidance/debian/tde-guidance-trinity.install b/ubuntu/_base/applications/settings/tde-guidance/debian/tde-guidance-trinity.install
index 0cc8b62ad..2c427e763 100644
--- a/ubuntu/_base/applications/settings/tde-guidance/debian/tde-guidance-trinity.install
+++ b/ubuntu/_base/applications/settings/tde-guidance/debian/tde-guidance-trinity.install
@@ -1,21 +1,17 @@
opt/trinity/lib/trinity/kcm_serviceconfig.la
opt/trinity/lib/trinity/kcm_userconfig.la
opt/trinity/lib/trinity/kcm_mountconfig.la
-opt/trinity/lib/trinity/kcm_wineconfig.la
opt/trinity/share/icons/crystalsvg/32x32/apps/daemons.png
opt/trinity/share/icons/crystalsvg/32x32/apps/disksfilesystems.png
opt/trinity/share/icons/crystalsvg/32x32/apps/userconfig.png
-opt/trinity/share/icons/crystalsvg/32x32/apps/wineconfig.png
opt/trinity/share/icons/crystalsvg/16x16/apps/daemons.png
opt/trinity/share/icons/crystalsvg/16x16/apps/disksfilesystems.png
opt/trinity/share/icons/crystalsvg/16x16/apps/userconfig.png
-opt/trinity/share/icons/crystalsvg/16x16/apps/wineconfig.png
opt/trinity/share/doc/tde/HTML/en/guidance/index.cache.bz2
opt/trinity/share/doc/tde/HTML/en/guidance/index.html
opt/trinity/share/applications/tde/serviceconfig.desktop
opt/trinity/share/applications/tde/userconfig.desktop
opt/trinity/share/applications/tde/mountconfig.desktop
-opt/trinity/share/applications/tde/wineconfig.desktop
opt/trinity/share/apps/guidance/pics/laserwarn.png
opt/trinity/share/apps/guidance/pics/hi32-app-daemons.png
opt/trinity/share/apps/guidance/pics/hi16-encrypted.png
@@ -48,8 +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/32-wine.png
-opt/trinity/share/apps/guidance/pics/kdewinewizard.png
usr/lib/python3/dist-packages/tde-guidance/SMBShareSelectDialog.py
usr/lib/python3/dist-packages/tde-guidance/SimpleCommandRunner.py
usr/lib/python3/dist-packages/tde-guidance/fuser.py
@@ -59,9 +53,7 @@ usr/lib/python3/dist-packages/tde-guidance/serviceconfig.py
usr/lib/python3/dist-packages/tde-guidance/sizeview.py
usr/lib/python3/dist-packages/tde-guidance/unixauthdb.py
usr/lib/python3/dist-packages/tde-guidance/userconfig.py
-usr/lib/python3/dist-packages/tde-guidance/wineconfig.py
opt/trinity/lib/trinity/kcm_serviceconfig.so
opt/trinity/lib/trinity/kcm_userconfig.so
opt/trinity/lib/trinity/kcm_mountconfig.so
-opt/trinity/lib/trinity/kcm_wineconfig.so
usr/share/lintian/overrides/tde-guidance-trinity