Merge branch '3.0' into 3.1

This commit is contained in:
Juergen Daubert 2014-05-31 14:33:43 +02:00
commit c5e264bc8c
6 changed files with 27 additions and 7 deletions

View File

@ -35,15 +35,29 @@ lrwxrwxrwx root/root usr/lib/libbtrfs.so.0 -> libbtrfs.so.0.1
-rwxr-xr-x root/root usr/lib/libbtrfs.so.0.1
drwxr-xr-x root/root usr/man/
drwxr-xr-x root/root usr/man/man8/
-rw-r--r-- root/root usr/man/man8/btrfs-balance.8.gz
-rw-r--r-- root/root usr/man/man8/btrfs-check.8.gz
-rw-r--r-- root/root usr/man/man8/btrfs-convert.8.gz
-rw-r--r-- root/root usr/man/man8/btrfs-debug-tree.8.gz
-rw-r--r-- root/root usr/man/man8/btrfs-device.8.gz
-rw-r--r-- root/root usr/man/man8/btrfs-filesystem.8.gz
-rw-r--r-- root/root usr/man/man8/btrfs-find-root.8.gz
-rw-r--r-- root/root usr/man/man8/btrfs-image.8.gz
-rw-r--r-- root/root usr/man/man8/btrfs-inspect-internal.8.gz
-rw-r--r-- root/root usr/man/man8/btrfs-map-logical.8.gz
-rw-r--r-- root/root usr/man/man8/btrfs-property.8.gz
-rw-r--r-- root/root usr/man/man8/btrfs-qgroup.8.gz
-rw-r--r-- root/root usr/man/man8/btrfs-quota.8.gz
-rw-r--r-- root/root usr/man/man8/btrfs-receive.8.gz
-rw-r--r-- root/root usr/man/man8/btrfs-replace.8.gz
-rw-r--r-- root/root usr/man/man8/btrfs-rescue.8.gz
-rw-r--r-- root/root usr/man/man8/btrfs-restore.8.gz
-rw-r--r-- root/root usr/man/man8/btrfs-scrub.8.gz
-rw-r--r-- root/root usr/man/man8/btrfs-send.8.gz
-rw-r--r-- root/root usr/man/man8/btrfs-show-super.8.gz
-rw-r--r-- root/root usr/man/man8/btrfs-subvolume.8.gz
-rw-r--r-- root/root usr/man/man8/btrfs-zero-log.8.gz
-rw-r--r-- root/root usr/man/man8/btrfs.8.gz
-rw-r--r-- root/root usr/man/man8/btrfsck.8.gz
-rw-r--r-- root/root usr/man/man8/btrfstune.8.gz
-rw-r--r-- root/root usr/man/man8/fsck.btrfs.8.gz
-rw-r--r-- root/root usr/man/man8/mkfs.btrfs.8.gz

View File

@ -1 +1,2 @@
761d07cfe5b468ec733e90a57b413e5c btrfs-progs-v3.14.1.tar.xz
d0dcd83ccecefd3310da787afaec4f3d btrfs-progs-man-v3.14.2.tar.xz
18dadb86a668c3fe26b2bcb57bbdf59e btrfs-progs-v3.14.2.tar.xz

View File

@ -4,12 +4,16 @@
# Depends on: util-linux e2fsprogs lzo
name=btrfs-progs
version=v3.14.1
version=v3.14.2
release=1
source=(https://www.kernel.org/pub/linux/kernel/people/mason/btrfs-progs/$name-$version.tar.xz)
source=(https://www.kernel.org/pub/linux/kernel/people/mason/btrfs-progs/$name-$version.tar.xz
http://crux.nu/files/distfiles/$name-man-$version.tar.xz)
build() {
cd $name-$version
sed -i '/btrfs-check.8.gz/d' Documentation/Makefile
make CFLAGS="$CFLAGS"
make prefix=/usr bindir=/sbin DESTDIR=$PKG install
make prefix=/usr bindir=/sbin mandir=/usr/man DESTDIR=$PKG install
}

View File

@ -75,6 +75,7 @@ drwxr-xr-x root/root usr/share/vim/colors/
-rw-r--r-- root/root usr/share/vim/colors/desert.vim
-rw-r--r-- root/root usr/share/vim/colors/elflord.vim
-rw-r--r-- root/root usr/share/vim/colors/evening.vim
-rw-r--r-- root/root usr/share/vim/colors/industry.vim
-rw-r--r-- root/root usr/share/vim/colors/koehler.vim
-rw-r--r-- root/root usr/share/vim/colors/morning.vim
-rw-r--r-- root/root usr/share/vim/colors/murphy.vim

View File

@ -1 +1 @@
b4db9434d6dd4d7c55cc2f9cac8af5e3 vim-7.4.205.tar.xz
af80c3d62fd5b5c48a5dab2c238db226 vim-7.4.316.tar.xz

View File

@ -4,7 +4,7 @@
# Depends on: ncurses acl
name=vim
version=7.4.205
version=7.4.316
release=1
source=(http://crux.nu/files/distfiles/$name-$version.tar.xz)