diff options
Diffstat (limited to 'ubuntu/maverick')
4 files changed, 30 insertions, 11 deletions
diff --git a/ubuntu/maverick/metapackages/rename-meta/debian/control b/ubuntu/maverick/metapackages/rename-meta/debian/control index 118cdbbad..f05b7c707 100644 --- a/ubuntu/maverick/metapackages/rename-meta/debian/control +++ b/ubuntu/maverick/metapackages/rename-meta/debian/control @@ -90,6 +90,12 @@ Depends: tdebase-tdeio-plugins-trinity Conflicts: kdebase-kio-plugins-trinity (<< 4:13.9.9) Description: Transitional dummy package. This can be safely removed after your TDE upgrade has completed. +Package: kdebase-kio-smb-trinity +Architecture: all +Depends: tdebase-tdeio-smb-trinity +Conflicts: kdebase-kio-smb-trinity (<< 4:13.9.9) +Description: Transitional dummy package. This can be safely removed after your TDE upgrade has completed. + Package: kdepasswd-trinity Architecture: all Depends: tdepasswd-trinity diff --git a/ubuntu/maverick/tdebase/debian/control b/ubuntu/maverick/tdebase/debian/control index 54bb2dec0..a96ad0088 100644 --- a/ubuntu/maverick/tdebase/debian/control +++ b/ubuntu/maverick/tdebase/debian/control @@ -185,7 +185,7 @@ Architecture: any Replaces: kdebase-kio-plugins-kde3 (<< 4:14.0.0~), kdebase-kio-plugins-trinity (<< 4:14.0.0~) Breaks: kdebase-kio-plugins-kde3 (<< 4:14.0.0~), kdebase-kio-plugins-trinity (<< 4:14.0.0~) Depends: ${shlibs:Depends}, kdesktop-trinity, libsasl2-modules, psmisc, man-db (>= 2.5.1-1) -Recommends: udisks2 | udisks | pmount, cryptsetup, kamera-trinity, tdemultimedia-tdeio-plugins-trinity +Recommends: udisks2 | udisks | pmount, cryptsetup, kamera-trinity, tdebase-tdeio-smb-trinity, tdemultimedia-tdeio-plugins-trinity Suggests: khelpcenter-trinity, mtools Conflicts: tdebase-libs-trinity (<< 4:3.0.0), mediamanager Description: core I/O slaves for TDE @@ -201,6 +201,19 @@ Description: core I/O slaves for TDE This package is part of TDE, and a component of the TDE base module. See the 'tde-trinity' and 'tdebase-trinity' packages for more information. +Package: tdebase-tdeio-smb-trinity +Section: tde +Architecture: any +Replaces: kdebase-kio-smb-trinity (<< 4:14.0.0~) +Breaks: kdebase-kio-smb-trinity (<< 4:14.0.0~) +Depends: ${shlibs:Depends}, kdesktop-trinity +Conflicts: kdebase-kio-plugins-trinity (<< 4:3.5.13.3~), tdebase-tdeio-plugins-trinity (<< 4:14.0.5~) +Description: SMB I/O slave for TDE + This package includes SMB tdeioslave. + . + This package is part of TDE, and a component of the TDE base module. + See the 'tde-trinity' and 'tdebase-trinity' packages for more information. + Package: tdepasswd-trinity Section: utils Architecture: any diff --git a/ubuntu/maverick/tdebase/debian/tdebase-tdeio-plugins-trinity.install b/ubuntu/maverick/tdebase/debian/tdebase-tdeio-plugins-trinity.install index 64cf55459..e5072b177 100644 --- a/ubuntu/maverick/tdebase/debian/tdebase-tdeio-plugins-trinity.install +++ b/ubuntu/maverick/tdebase/debian/tdebase-tdeio-plugins-trinity.install @@ -64,8 +64,6 @@ debian/tmp/opt/trinity/lib/trinity/tdeio_settings.la debian/tmp/opt/trinity/lib/trinity/tdeio_settings.so debian/tmp/opt/trinity/lib/trinity/tdeio_sftp.la debian/tmp/opt/trinity/lib/trinity/tdeio_sftp.so -debian/tmp/opt/trinity/lib/trinity/tdeio_smb.la -debian/tmp/opt/trinity/lib/trinity/tdeio_smb.so debian/tmp/opt/trinity/lib/trinity/tdeio_smtp.la debian/tmp/opt/trinity/lib/trinity/tdeio_smtp.so debian/tmp/opt/trinity/lib/trinity/tdeio_system.la @@ -88,8 +86,6 @@ debian/tmp/opt/trinity/share/apps/tdeio_finger/tdeio_finger.pl debian/tmp/opt/trinity/share/apps/tdeio_info/kde-info2html debian/tmp/opt/trinity/share/apps/tdeio_info/kde-info2html.conf debian/tmp/opt/trinity/share/apps/tdeio_man/tdeio_man.css -debian/tmp/opt/trinity/share/apps/konqueror/dirtree/remote/smb-network.desktop -debian/tmp/opt/trinity/share/apps/remoteview/smb-network.desktop debian/tmp/opt/trinity/share/apps/systemview/documents.desktop debian/tmp/opt/trinity/share/apps/systemview/home.desktop debian/tmp/opt/trinity/share/apps/systemview/media.desktop @@ -139,7 +135,6 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/rlogin debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/rtsp debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/settings debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/sftp -debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/smb debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/smtp debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/ssh debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/tar @@ -151,8 +146,6 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/zeroconf debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/zip debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/mac.png debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/mac.png -debian/tmp/opt/trinity/share/mimelnk/application/x-smb-server.desktop -debian/tmp/opt/trinity/share/mimelnk/application/x-smb-workgroup.desktop debian/tmp/opt/trinity/share/mimelnk/inode/system_directory.desktop debian/tmp/opt/trinity/share/mimelnk/media/audiocd.desktop debian/tmp/opt/trinity/share/mimelnk/media/blankcd.desktop @@ -197,8 +190,6 @@ debian/tmp/opt/trinity/share/mimelnk/media/removable_mounted_decrypted.desktop debian/tmp/opt/trinity/share/mimelnk/media/removable_unmounted.desktop debian/tmp/opt/trinity/share/mimelnk/media/removable_unmounted_decrypted.desktop debian/tmp/opt/trinity/share/mimelnk/media/removable_unmounted_encrypted.desktop -debian/tmp/opt/trinity/share/mimelnk/media/smb_mounted.desktop -debian/tmp/opt/trinity/share/mimelnk/media/smb_unmounted.desktop debian/tmp/opt/trinity/share/mimelnk/media/svcd.desktop debian/tmp/opt/trinity/share/mimelnk/media/vcd.desktop debian/tmp/opt/trinity/share/mimelnk/media/zip_mounted.desktop @@ -251,7 +242,6 @@ debian/tmp/opt/trinity/share/services/programs.protocol debian/tmp/opt/trinity/share/services/remote.protocol debian/tmp/opt/trinity/share/services/settings.protocol debian/tmp/opt/trinity/share/services/sftp.protocol -debian/tmp/opt/trinity/share/services/smb.protocol debian/tmp/opt/trinity/share/services/smtp.protocol debian/tmp/opt/trinity/share/services/smtps.protocol debian/tmp/opt/trinity/share/services/system.protocol diff --git a/ubuntu/maverick/tdebase/debian/tdebase-tdeio-smb-trinity.install b/ubuntu/maverick/tdebase/debian/tdebase-tdeio-smb-trinity.install new file mode 100644 index 000000000..3bce0d8b2 --- /dev/null +++ b/ubuntu/maverick/tdebase/debian/tdebase-tdeio-smb-trinity.install @@ -0,0 +1,10 @@ +debian/tmp/opt/trinity/lib/trinity/tdeio_smb.la +debian/tmp/opt/trinity/lib/trinity/tdeio_smb.so +debian/tmp/opt/trinity/share/apps/konqueror/dirtree/remote/smb-network.desktop +debian/tmp/opt/trinity/share/apps/remoteview/smb-network.desktop +debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/smb +debian/tmp/opt/trinity/share/mimelnk/application/x-smb-server.desktop +debian/tmp/opt/trinity/share/mimelnk/application/x-smb-workgroup.desktop +debian/tmp/opt/trinity/share/mimelnk/media/smb_mounted.desktop +debian/tmp/opt/trinity/share/mimelnk/media/smb_unmounted.desktop +debian/tmp/opt/trinity/share/services/smb.protocol |