samba: fix packaging and close 3146.

diff --git a/packages/samba/samba-essential_3.0.20.bb b/packages/samba/samba-essential_3.0.20.bb
index 75febf4..ecf591d 100644 (file)
--- a/packages/samba/samba-essential_3.0.20.bb
+++ b/packages/samba/samba-essential_3.0.20.bb
@@ -1,7 +1,7 @@
 require samba-essential.inc
 inherit update-rc.d
 
-PR = "r5"
+PR = "r6"
 
 SRC_URI = "file://config-lfs.patch;patch=1 \
           file://init-essential \

diff --git a/packages/samba/samba.inc b/packages/samba/samba.inc
index bcae4e7..ab9ab42 100644 (file)
--- a/packages/samba/samba.inc
+++ b/packages/samba/samba.inc
@@ -13,9 +13,11 @@ EXTRA_OECONF='--disable-cups --with-readline=${STAGING_LIBDIR}/.. \
               --with-libiconv=${STAGING_LIBDIR}/.. \
              --without-ads --without-automount --with-smbmount'
 
-PACKAGES =+ "libsmbclient libsmbclient-dev cifs cifs-doc"
-FILES_cifs = "${bindir}/mount.cifs"
-FILES_cifs-doc = "${docdir}/mount.cifs.8"
+PACKAGES =+ "libsmbclient libsmbclient-dev cifs cifs-doc smbfs smbfs-doc"
+FILES_smbfs = "${bindir}/smbmount ${bindir}/smbumount ${bindir}/smbmnt"
+FILES_smbfs-doc = "${mandir}/man8/smbmount.8 ${mandir}/man8/smbumount.8 ${mandir}/man8/smbmnt.8"
+FILES_cifs = "${sbindir}/mount.cifs ${sbindir}/umount.cifs"
+FILES_cifs-doc = "${mandir}/man8/mount.cifs.8 ${mandir}/man8/umount.cifs.8"
 FILES_libsmbclient = "${libdir}/libsmbclient.so.*"
 FILES_libsmbclient-dev = "${libdir}/libsmbclient.so ${includedir}"
 

diff --git a/packages/samba/samba_3.0.10.bb b/packages/samba/samba_3.0.10.bb
index 895ce6b..265f695 100644 (file)
--- a/packages/samba/samba_3.0.10.bb
+++ b/packages/samba/samba_3.0.10.bb
@@ -1 +1,3 @@
 require samba.inc
+
+PR = "r1"

diff --git a/packages/samba/samba_3.0.14a.bb b/packages/samba/samba_3.0.14a.bb
index d191363..90d3c94 100644 (file)
--- a/packages/samba/samba_3.0.14a.bb
+++ b/packages/samba/samba_3.0.14a.bb
@@ -1,7 +1,7 @@
 require samba.inc
 inherit update-rc.d
 
-PR = "r15"
+PR = "r16"
 
 SRC_URI += "file://config-lfs.patch;patch=1 \
           file://init \
@@ -48,4 +48,4 @@ FILES_${PN} += "${libdir}/vfs/*.so ${libdir}/charset/*.so ${libdir}/*.dat"
 FILES_${PN}-dbg += "${libdir}/vfs/.debug/*.so ${libdir}/charset/.debug/*.so"
 #
 # bug fix for samba.inc:
-FILES_cifs-doc = "${mandir}/man8/mount.cifs.8"
+FILES_cifs-doc += "${mandir}/man8/mount.cifs.8"

diff --git a/packages/samba/samba_3.0.20.bb b/packages/samba/samba_3.0.20.bb
index fb2407c..a4ca7e9 100644 (file)
--- a/packages/samba/samba_3.0.20.bb
+++ b/packages/samba/samba_3.0.20.bb
@@ -1,7 +1,7 @@
 require samba.inc
 inherit update-rc.d
 
-PR = "r5"
+PR = "r6"
 
 SRC_URI += "file://config-lfs.patch;patch=1 \
           file://init \
@@ -48,4 +48,4 @@ FILES_${PN} += "${libdir}/vfs/*.so ${libdir}/charset/*.so ${libdir}/*.dat"
 FILES_${PN}-dbg += "${libdir}/vfs/.debug/*.so ${libdir}/charset/.debug/*.so"
 #
 # bug fix for samba.inc:
-FILES_cifs-doc = "${mandir}/man8/mount.cifs.8"
+FILES_cifs-doc += "${mandir}/man8/mount.cifs.8"

diff --git a/packages/samba/samba_3.0.23c.bb b/packages/samba/samba_3.0.23c.bb
index 74f0593..ef1359c 100644 (file)
--- a/packages/samba/samba_3.0.23c.bb
+++ b/packages/samba/samba_3.0.23c.bb
@@ -1,7 +1,7 @@
 require samba.inc
 inherit update-rc.d
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI += "file://config-lfs.patch;patch=1 \
           file://init \
@@ -46,4 +46,4 @@ FILES_swat = "${sbindir}/swat ${datadir}/swat ${libdir}/*.msg"
 FILES_${PN} += "${libdir}/vfs/*.so ${libdir}/charset/*.so ${libdir}/*.dat ${libdir}/auth/*.so"
 #
 # bug fix for samba.inc:
-FILES_cifs-doc = "${mandir}/man8/mount.cifs.8"
+FILES_cifs-doc += "${mandir}/man8/mount.cifs.8"

diff --git a/packages/samba/samba_3.0.5.bb b/packages/samba/samba_3.0.5.bb
index 895ce6b..265f695 100644 (file)
--- a/packages/samba/samba_3.0.5.bb
+++ b/packages/samba/samba_3.0.5.bb
@@ -1 +1,3 @@
 require samba.inc
+
+PR = "r1"

diff --git a/packages/samba/samba_3.0.9.bb b/packages/samba/samba_3.0.9.bb
index 895ce6b..265f695 100644 (file)
--- a/packages/samba/samba_3.0.9.bb
+++ b/packages/samba/samba_3.0.9.bb
@@ -1 +1,3 @@
 require samba.inc
+
+PR = "r1"