Date: Saturday, November 28, 2009 @ 01:50:54 Author: eric Revision: 59853
Merged revisions 58761,59852 via svnmerge from svn+ssh://gerolde.archlinux.org/srv/svn-packages/lvm2/trunk ........ r58761 | thomas | 2009-11-14 05:12:18 -0500 (Sat, 14 Nov 2009) | 2 lines Fix booting from LVM if a mirror or snapshot volume is present ........ r59852 | eric | 2009-11-28 01:50:34 -0500 (Sat, 28 Nov 2009) | 2 lines upgpkg: lvm2 2.02.56-1 Upstream update ........ Modified: lvm2/repos/testing-i686/ (properties) lvm2/repos/testing-i686/ChangeLog lvm2/repos/testing-i686/PKGBUILD lvm2/repos/testing-i686/lvm2_install --------------+ ChangeLog | 6 ++++++ PKGBUILD | 22 ++++++++-------------- lvm2_install | 2 +- 3 files changed, 15 insertions(+), 15 deletions(-) Property changes on: lvm2/repos/testing-i686 ___________________________________________________________________ Modified: svnmerge-integrated - /lvm2/trunk:1-58298 + /lvm2/trunk:1-59852 Modified: testing-i686/ChangeLog =================================================================== --- testing-i686/ChangeLog 2009-11-28 06:50:34 UTC (rev 59852) +++ testing-i686/ChangeLog 2009-11-28 06:50:54 UTC (rev 59853) @@ -1,3 +1,9 @@ +2009-11-27 Eric Belanger <e...@archlinux.org> + + * lvm2 2.02.56-1 + * device-mapper 1.02.40-1 + * Upstream update + 2009-10-31 Eric Belanger <e...@archlinux.org> * lvm2 2.02.54-1 Modified: testing-i686/PKGBUILD =================================================================== --- testing-i686/PKGBUILD 2009-11-28 06:50:34 UTC (rev 59852) +++ testing-i686/PKGBUILD 2009-11-28 06:50:54 UTC (rev 59853) @@ -3,30 +3,24 @@ pkgbase=lvm2 pkgname=('lvm2' 'device-mapper') -pkgver=2.02.54 -_pkgverdm=1.02.39 +pkgver=2.02.56 +_pkgverdm=1.02.40 _pkgverlvm=${pkgver} -pkgrel=2 +pkgrel=1 arch=('i686' 'x86_64') url="http://sourceware.org/lvm2/" license=('GPL') groups=('base') source=(ftp://sources.redhat.com/pub/lvm2/LVM2.${_pkgverlvm}.tgz lvm2_install - lvm2_hook - dm-rules-remove-last_rule.patch) -md5sums=('6a33416469652b01aa48cefbe9cac8c1' - '40dccdb1044f00fc1e29ca549933d4bd' - 'd6f3ca901747c386aa0d842e9ea64413' - 'ffd137d13f7683dc3f60004c8d2f9ced') -sha1sums=('794fd5078f7f96eeb1ff1b9ddc47e37a13e8a75d' - '86358b3360373dcd1d7e1bf009fe6e6d0c70cdc3' - '0c2a367f2217e6363e5e80257cbc7730d3841e42' - '0af2a71ae2593cf312e7c4b07593d566d61a4c60') + lvm2_hook) +md5sums=('0326c0c7fd53c2043dcedec169c59a4c' 'a28ae1f1bcb78347da4c43c669601229'\ + 'd6f3ca901747c386aa0d842e9ea64413') +sha1sums=('1a70cb4d4fe7566aace9d38ee18413c79e91b684' 'c15361c896d3ca263651391e41d2640cd5261e26'\ + '0c2a367f2217e6363e5e80257cbc7730d3841e42') build() { cd "${srcdir}/LVM2.${_pkgverlvm}" - patch -p1 -i "${srcdir}/dm-rules-remove-last_rule.patch" || return 1 ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --enable-readline \ --enable-pkgconfig --enable-static_link --with-staticdir=/sbin \ --enable-dmeventd --enable-cmdlib \ Modified: testing-i686/lvm2_install =================================================================== --- testing-i686/lvm2_install 2009-11-28 06:50:34 UTC (rev 59852) +++ testing-i686/lvm2_install 2009-11-28 06:50:54 UTC (rev 59853) @@ -2,7 +2,7 @@ install () { - MODULES=" dm-mod " + MODULES=" dm-mod dm-snapshot dm-mirror" BINARIES="" FILES="" SCRIPT="lvm2"