diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-19 11:22:26 +0100 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-19 11:22:26 +0100 |
commit | 56bf63be7060f55d0048fc1f2e37526723bf0dc7 (patch) | |
tree | 5072df371092a3bfded8d6aadca1af5018523291 /extra/samba | |
parent | d697117f3e2c400f8a7cae7bbbbf27166edc277a (diff) | |
parent | b54c21859be3590a319ceade1f58d0b89ac5ef32 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/bitcoin/PKGBUILD
community/chmsee/PKGBUILD
community/projectm/PKGBUILD
extra/apache/PKGBUILD
extra/gv/PKGBUILD
extra/libdc1394/PKGBUILD
extra/libraw1394/PKGBUILD
extra/samba/PKGBUILD
extra/sg3_utils/PKGBUILD
extra/upower/PKGBUILD
extra/xf86-input-aiptek/PKGBUILD
extra/xf86-video-modesetting/PKGBUILD
extra/xorg-server/PKGBUILD
libre/rp-pppoe-libre/PKGBUILD
Diffstat (limited to 'extra/samba')
-rw-r--r-- | extra/samba/PKGBUILD | 10 | ||||
-rw-r--r-- | extra/samba/samba.install | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/extra/samba/PKGBUILD b/extra/samba/PKGBUILD index 7eb130548..48dee7533 100644 --- a/extra/samba/PKGBUILD +++ b/extra/samba/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 178542 2013-02-25 16:00:30Z tpowa $ +# $Id: PKGBUILD 180160 2013-03-18 13:15:20Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgbase=samba pkgname=('libwbclient' 'smbclient' 'samba') -pkgver=3.6.12 +pkgver=3.6.13 # We use the 'A' to fake out pacman's version comparators. Samba chooses # to append 'a','b',etc to their subsequent releases, which pamcan # misconstrues as alpha, beta, etc. Bad samba! -_realver=3.6.12 -pkgrel=2 +_realver=3.6.13 +pkgrel=1 arch=(i686 x86_64 mips64el) url="http://www.samba.org" license=('GPL3') @@ -169,7 +169,7 @@ install='samba.install' mkdir -p ${pkgdir}/usr/lib/pkgconfig install -m644 pkgconfig/smbsharemodes.pc ${pkgdir}/usr/lib/pkgconfig/ } -md5sums=('430fd21a1acd26964d3ccf366df8709a' +md5sums=('b9fe8413cbb6fa4b970a159968db2fb4' '5697da77590ec092cc8a883bae06093c' 'a4bbfa39fee95bba2e7ad6b535fae7e6' '96f82c38f3f540b53f3e5144900acf17' diff --git a/extra/samba/samba.install b/extra/samba/samba.install index d9baeac90..d8c6c49ef 100644 --- a/extra/samba/samba.install +++ b/extra/samba/samba.install @@ -1,7 +1,7 @@ #!/bin/sh post_install() { - systemd-tmpfiles --create /usr/lib/tmpfiles.d/samba.conf + systemd-tmpfiles --create samba.conf } # vim:set ts=2 sw=2 et: |