From 855439d3f99b0c152c33ae76a06cce9853f9b8dd Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 6 Oct 2014 12:15:57 -0500 Subject: [PATCH 1/2] Update Debian and Ubuntu packaging for latest GIT sources --- .../debian/tdebase-tdeio-plugins-trinity.install | 15 ++++++++++----- .../debian/tdebase-tdeio-plugins-trinity.install | 15 ++++++++++----- .../debian/tdebase-tdeio-plugins-trinity.install | 15 ++++++++++----- 3 files changed, 30 insertions(+), 15 deletions(-) diff --git a/debian/lenny/tdebase/debian/tdebase-tdeio-plugins-trinity.install b/debian/lenny/tdebase/debian/tdebase-tdeio-plugins-trinity.install index 3384916a5..802c9cf22 100644 --- a/debian/lenny/tdebase/debian/tdebase-tdeio-plugins-trinity.install +++ b/debian/lenny/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/debian/squeeze/tdebase/debian/tdebase-tdeio-plugins-trinity.install b/debian/squeeze/tdebase/debian/tdebase-tdeio-plugins-trinity.install index 3384916a5..802c9cf22 100644 --- a/debian/squeeze/tdebase/debian/tdebase-tdeio-plugins-trinity.install +++ b/debian/squeeze/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/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 From 0b607f0a865e2e6d0bd9a0ac7aa5f81030f65e07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Tue, 7 Oct 2014 01:28:03 +0200 Subject: [PATCH 2/2] Explicitly enable WITH_TDEHWLIB in tdelibs on Debian and Ubuntu --- debian/lenny/tdelibs/debian/rules | 1 + debian/squeeze/tdelibs/debian/rules | 1 + ubuntu/maverick/tdelibs/debian/rules | 1 + 3 files changed, 3 insertions(+) diff --git a/debian/lenny/tdelibs/debian/rules b/debian/lenny/tdelibs/debian/rules index e91b87b96..9fba1d00e 100755 --- a/debian/lenny/tdelibs/debian/rules +++ b/debian/lenny/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" \ diff --git a/debian/squeeze/tdelibs/debian/rules b/debian/squeeze/tdelibs/debian/rules index 7a663d1b2..a2839571e 100755 --- a/debian/squeeze/tdelibs/debian/rules +++ b/debian/squeeze/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" \ 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" \