[fix] : Fixed file conflict

https://bbs.archlinux32.org/viewtopic.php?pid=7428

diff --git a/channels/cinnamon/packages.i686/other.i686 b/channels/cinnamon/packages.i686/other.i686
index d18bb81..8490f8b 100644 (file)
--- a/channels/cinnamon/packages.i686/other.i686
+++ b/channels/cinnamon/packages.i686/other.i686
@@ -14,6 +14,7 @@ xarchiver
 
 
 #-- GVFS --#
+smbclient
 gvfs
 gvfs-smb
 

diff --git a/channels/cinnamon/packages.x86_64/other.x86_64 b/channels/cinnamon/packages.x86_64/other.x86_64
index 924a110..7195001 100644 (file)
--- a/channels/cinnamon/packages.x86_64/other.x86_64
+++ b/channels/cinnamon/packages.x86_64/other.x86_64
@@ -14,6 +14,7 @@ xarchiver
 
 
 #-- GVFS --#
+smbclient
 gvfs
 gvfs-smb
 

diff --git a/channels/i3/packages.i686/packages.i686 b/channels/i3/packages.i686/packages.i686
index 4a24a4b..8f609cd 100644 (file)
--- a/channels/i3/packages.i686/packages.i686
+++ b/channels/i3/packages.i686/packages.i686
@@ -28,6 +28,7 @@ smartmontools
 testdisk
 vim-minimal
 grub-theme-vimix
+smbclient
 gvfs-smb
 gvfs
 sshfs

diff --git a/channels/i3/packages.x86_64/packages.x86_64 b/channels/i3/packages.x86_64/packages.x86_64
index 4a24a4b..8f609cd 100644 (file)
--- a/channels/i3/packages.x86_64/packages.x86_64
+++ b/channels/i3/packages.x86_64/packages.x86_64
@@ -28,6 +28,7 @@ smartmontools
 testdisk
 vim-minimal
 grub-theme-vimix
+smbclient
 gvfs-smb
 gvfs
 sshfs

diff --git a/channels/lxde/packages.i686/other.i686 b/channels/lxde/packages.i686/other.i686
index 67db63d..44847c5 100644 (file)
--- a/channels/lxde/packages.i686/other.i686
+++ b/channels/lxde/packages.i686/other.i686
@@ -14,6 +14,7 @@ xarchiver
 
 
 #-- GVFS --#
+smbclient
 gvfs
 gvfs-smb
 

diff --git a/channels/lxde/packages.x86_64/other.x86_64 b/channels/lxde/packages.x86_64/other.x86_64
index c92970a..6f9317e 100644 (file)
--- a/channels/lxde/packages.x86_64/other.x86_64
+++ b/channels/lxde/packages.x86_64/other.x86_64
@@ -14,6 +14,7 @@ xarchiver
 
 
 #-- GVFS --#
+smbclient
 gvfs
 gvfs-smb
 

diff --git a/channels/xfce/packages.i686/other.i686 b/channels/xfce/packages.i686/other.i686
index da9ef24..a387f66 100644 (file)
--- a/channels/xfce/packages.i686/other.i686
+++ b/channels/xfce/packages.i686/other.i686
@@ -14,6 +14,7 @@ xarchiver
 
 
 #-- GVFS --#
+smbclient
 gvfs
 gvfs-smb
 

diff --git a/channels/xfce/packages.x86_64/other.x86_64 b/channels/xfce/packages.x86_64/other.x86_64
index 0cf2d22..b705a99 100644 (file)
--- a/channels/xfce/packages.x86_64/other.x86_64
+++ b/channels/xfce/packages.x86_64/other.x86_64
@@ -14,6 +14,7 @@ xarchiver
 
 
 #-- GVFS --#
+smbclient
 gvfs
 gvfs-smb