summaryrefslogtreecommitdiffstats
path: root/ubuntu/maverick
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2014-10-07 20:16:17 +0200
committerFrançois Andriot <albator78@libertysurf.fr>2014-10-07 20:16:17 +0200
commitda095708ec298f280120584ea411e37f8c1cc83b (patch)
tree1fcad9f8a7bc316df8da0eaaaf04a94acb500332 /ubuntu/maverick
parent8c8c70f82606b92be6bde6660c91b6077c3fd47d (diff)
parent0b607f0a865e2e6d0bd9a0ac7aa5f81030f65e07 (diff)
downloadtde-packaging-da095708ec298f280120584ea411e37f8c1cc83b.tar.gz
tde-packaging-da095708ec298f280120584ea411e37f8c1cc83b.zip
merge
Diffstat (limited to 'ubuntu/maverick')
-rw-r--r--ubuntu/maverick/tdebase/debian/tdebase-tdeio-plugins-trinity.install15
-rwxr-xr-xubuntu/maverick/tdelibs/debian/rules1
2 files changed, 11 insertions, 5 deletions
diff --git a/ubuntu/maverick/tdebase/debian/tdebase-tdeio-plugins-trinity.install b/ubuntu/maverick/tdebase/debian/tdebase-tdeio-plugins-trinity.install
index 3384916a5..802c9cf22 100644
--- a/ubuntu/maverick/tdebase/debian/tdebase-tdeio-plugins-trinity.install
+++ b/ubuntu/maverick/tdebase/debian/tdebase-tdeio-plugins-trinity.install
@@ -308,11 +308,16 @@ debian/tmp/opt/trinity/share/mimelnk/media/cdrom_mounted_decrypted.desktop
debian/tmp/opt/trinity/share/mimelnk/media/cdrom_unmounted.desktop
debian/tmp/opt/trinity/share/mimelnk/media/cdrom_unmounted_decrypted.desktop
debian/tmp/opt/trinity/share/mimelnk/media/cdrom_unmounted_encrypted.desktop
-debian/tmp/opt/trinity/share/mimelnk/media/cdwriter_mounted.desktop
-debian/tmp/opt/trinity/share/mimelnk/media/cdwriter_mounted_decrypted.desktop
-debian/tmp/opt/trinity/share/mimelnk/media/cdwriter_unmounted.desktop
-debian/tmp/opt/trinity/share/mimelnk/media/cdwriter_unmounted_decrypted.desktop
-debian/tmp/opt/trinity/share/mimelnk/media/cdwriter_unmounted_encrypted.desktop
+debian/tmp/opt/trinity/share/mimelnk/media/cd-r_mounted.desktop
+debian/tmp/opt/trinity/share/mimelnk/media/cd-r_mounted_decrypted.desktop
+debian/tmp/opt/trinity/share/mimelnk/media/cd-r_unmounted.desktop
+debian/tmp/opt/trinity/share/mimelnk/media/cd-r_unmounted_decrypted.desktop
+debian/tmp/opt/trinity/share/mimelnk/media/cd-r_unmounted_encrypted.desktop
+debian/tmp/opt/trinity/share/mimelnk/media/cd-rw_mounted.desktop
+debian/tmp/opt/trinity/share/mimelnk/media/cd-rw_mounted_decrypted.desktop
+debian/tmp/opt/trinity/share/mimelnk/media/cd-rw_unmounted.desktop
+debian/tmp/opt/trinity/share/mimelnk/media/cd-rw_unmounted_decrypted.desktop
+debian/tmp/opt/trinity/share/mimelnk/media/cd-rw_unmounted_encrypted.desktop
debian/tmp/opt/trinity/share/mimelnk/media/dvd_mounted.desktop
debian/tmp/opt/trinity/share/mimelnk/media/dvd_mounted_decrypted.desktop
debian/tmp/opt/trinity/share/mimelnk/media/dvd_unmounted.desktop
diff --git a/ubuntu/maverick/tdelibs/debian/rules b/ubuntu/maverick/tdelibs/debian/rules
index 0a71d8964..fcd18aba3 100755
--- a/ubuntu/maverick/tdelibs/debian/rules
+++ b/ubuntu/maverick/tdelibs/debian/rules
@@ -39,6 +39,7 @@ DEB_CMAKE_EXTRA_FLAGS := \
-DWITH_ASPELL="ON" \
-DWITH_HSPELL="ON" \
-DWITH_ELFICON="ON" \
+ -DWITH_TDEHWLIB="ON" \
-DWITH_TDEHWLIB_DAEMONS="ON" \
-DWITH_LOGINDPOWER="ON" \
-DWITH_UPOWER="ON" \