[oe-commits] org.oe.dev samba: fix packaging and close 3146.

[Laibsch commit]

samba: fix packaging and close 3146.

Author: Laibsch at openembedded.org
Branch: org.openembedded.dev
Revision: 56e1065540e7dba03559387ef0025d4a89c4fe3e
ViewMTN: http://monotone.openembedded.org/revision/info/56e1065540e7dba03559387ef0025d4a89c4fe3e
Files:
1
packages/samba/samba-essential_3.0.20.bb
packages/samba/samba.inc
packages/samba/samba_3.0.10.bb
packages/samba/samba_3.0.14a.bb
packages/samba/samba_3.0.20.bb
packages/samba/samba_3.0.23c.bb
packages/samba/samba_3.0.5.bb
packages/samba/samba_3.0.9.bb
Diffs:

#
# mt diff -r54f92ebb261ee619bb7206811608fa3cf0d5de26 -r56e1065540e7dba03559387ef0025d4a89c4fe3e
#
#
#
# patch "packages/samba/samba-essential_3.0.20.bb"
#  from [79344126cf7248cd03678738543aba6c774308ac]
#    to [afaf03a7a90f3fea3dc7443c848f4c11933f074d]
# 
# patch "packages/samba/samba.inc"
#  from [7d4adb1461ffec0246a42e66fb6a18b8ca48912d]
#    to [77999b13a6dc8e6af6540bfe9a51f2ac9c11d3b9]
# 
# patch "packages/samba/samba_3.0.10.bb"
#  from [91586326d34250a76373b8f0f463b1ce410ae6f7]
#    to [5e9cb486a1020218a3b2994775f129ecf8ca0573]
# 
# patch "packages/samba/samba_3.0.14a.bb"
#  from [f2cb1ee6a99a760ecfcaf60a33cbb3f886739058]
#    to [3c919ecb4b243466161f937e7f05033cf7465b09]
# 
# patch "packages/samba/samba_3.0.20.bb"
#  from [59ef4fedfcccc9793317fb4b36075d610e8de000]
#    to [7492c4a07d82301f50368aef36326ea0fc99fd1f]
# 
# patch "packages/samba/samba_3.0.23c.bb"
#  from [be528ec63ea7db2e3846a6b3b89327e1d3fb653d]
#    to [cbb50ee71590ebe4810837194adc5397eb68d774]
# 
# patch "packages/samba/samba_3.0.5.bb"
#  from [91586326d34250a76373b8f0f463b1ce410ae6f7]
#    to [5e9cb486a1020218a3b2994775f129ecf8ca0573]
# 
# patch "packages/samba/samba_3.0.9.bb"
#  from [91586326d34250a76373b8f0f463b1ce410ae6f7]
#    to [5e9cb486a1020218a3b2994775f129ecf8ca0573]
#
============================================================
--- packages/samba/samba-essential_3.0.20.bb	79344126cf7248cd03678738543aba6c774308ac
+++ packages/samba/samba-essential_3.0.20.bb	afaf03a7a90f3fea3dc7443c848f4c11933f074d
@@ -1,7 +1,7 @@ inherit update-rc.d
 require samba-essential.inc
 inherit update-rc.d
 
-PR = "r5"
+PR = "r6"
 
 SRC_URI = "file://config-lfs.patch;patch=1 \
 	   file://init-essential \
============================================================
--- packages/samba/samba.inc	7d4adb1461ffec0246a42e66fb6a18b8ca48912d
+++ packages/samba/samba.inc	77999b13a6dc8e6af6540bfe9a51f2ac9c11d3b9
@@ -13,9 +13,11 @@ EXTRA_OECONF='--disable-cups --with-read
               --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}"
 
============================================================
--- packages/samba/samba_3.0.10.bb	91586326d34250a76373b8f0f463b1ce410ae6f7
+++ packages/samba/samba_3.0.10.bb	5e9cb486a1020218a3b2994775f129ecf8ca0573
@@ -1 +1,3 @@ require samba.inc
 require samba.inc
+
+PR = "r1"
============================================================
--- packages/samba/samba_3.0.14a.bb	f2cb1ee6a99a760ecfcaf60a33cbb3f886739058
+++ packages/samba/samba_3.0.14a.bb	3c919ecb4b243466161f937e7f05033cf7465b09
@@ -1,7 +1,7 @@ inherit update-rc.d
 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}-dbg += "${libdir}/vfs/.debug
 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"
============================================================
--- packages/samba/samba_3.0.20.bb	59ef4fedfcccc9793317fb4b36075d610e8de000
+++ packages/samba/samba_3.0.20.bb	7492c4a07d82301f50368aef36326ea0fc99fd1f
@@ -1,7 +1,7 @@ inherit update-rc.d
 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}-dbg += "${libdir}/vfs/.debug
 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"
============================================================
--- packages/samba/samba_3.0.23c.bb	be528ec63ea7db2e3846a6b3b89327e1d3fb653d
+++ packages/samba/samba_3.0.23c.bb	cbb50ee71590ebe4810837194adc5397eb68d774
@@ -1,7 +1,7 @@ inherit update-rc.d
 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_${PN} += "${libdir}/vfs/*.so ${lib
 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"
============================================================
--- packages/samba/samba_3.0.5.bb	91586326d34250a76373b8f0f463b1ce410ae6f7
+++ packages/samba/samba_3.0.5.bb	5e9cb486a1020218a3b2994775f129ecf8ca0573
@@ -1 +1,3 @@ require samba.inc
 require samba.inc
+
+PR = "r1"
============================================================
--- packages/samba/samba_3.0.9.bb	91586326d34250a76373b8f0f463b1ce410ae6f7
+++ packages/samba/samba_3.0.9.bb	5e9cb486a1020218a3b2994775f129ecf8ca0573
@@ -1 +1,3 @@ require samba.inc
 require samba.inc
+
+PR = "r1"