diff --git a/srcpkgs/base-files/files/vkpurge b/srcpkgs/base-files/files/vkpurge index 351e73c53d..4471c35d68 100644 --- a/srcpkgs/base-files/files/vkpurge +++ b/srcpkgs/base-files/files/vkpurge @@ -23,15 +23,14 @@ _EOF list_kernels() { - local k kpkg installed kver kvertmp skip _f + local k kpkg installed kver skip _f - for k in /boot/initramfs-*.img; do + for k in /lib/modules/*; do _f=$(basename $k) - kver=$(xbps-uhelper getpkgversion ${_f}) - kvertmp=$(xbps-uhelper getpkgversion ${_f}|sed -e 's|-rc|rc|') + kver=$(echo ${_f}|sed -e 's|-rc|rc|') for kpkg in kernel kernel-snapshot; do installed=$(xbps-uhelper -r / version $kpkg) - if [ "$installed" = "${kvertmp%.img}" ]; then + if [ "$installed" = "${kver}" ]; then skip=1 break fi @@ -40,7 +39,7 @@ list_kernels() unset skip continue fi - echo "${kver%.img}" + echo "${_f}" done } diff --git a/srcpkgs/base-files/template b/srcpkgs/base-files/template index ca4326b0b5..a3f392add5 100644 --- a/srcpkgs/base-files/template +++ b/srcpkgs/base-files/template @@ -1,10 +1,10 @@ # Template file for 'base-files' pkgname=base-files -version=0.64 +version=0.66 +revision=1 noarch=yes bootstrap=yes fulldepends="base-directories xbps-triggers" -revision=1 short_desc="Void GNU/Linux base system files" maintainer="Juan RP " homepage="http://code.google.com/p/xbps" @@ -43,7 +43,7 @@ do_install() { usb-load-ehci-first.conf vinstall ${FILESDIR}/blacklist.conf 644 etc/modprobe.d - # Install comman licenses, from Debian. + # Install common licenses, from Debian. vmkdir usr/share/licenses install -m644 ${FILESDIR}/licenses/* ${DESTDIR}/usr/share/licenses diff --git a/srcpkgs/eog/eog-devel.template b/srcpkgs/eog/eog-devel.template index f3a95d4c28..07e95574cd 100644 --- a/srcpkgs/eog/eog-devel.template +++ b/srcpkgs/eog/eog-devel.template @@ -1,16 +1,13 @@ # Template file for 'eog-devel'. # +noarch=yes depends="gtk+3-devel" short_desc="${sourcepkg} - development files" long_desc="${long_desc} This package contains files for development, headers, static libs, etc." - -noarch=yes - -do_install() -{ +do_install() { vmove usr/include usr vmove usr/lib/pkgconfig usr/lib vmove usr/share/gtk-doc usr/share diff --git a/srcpkgs/eog/template b/srcpkgs/eog/template index a160a1f0ce..c1874a490e 100644 --- a/srcpkgs/eog/template +++ b/srcpkgs/eog/template @@ -1,26 +1,22 @@ # Template file for 'eog' pkgname=eog -version=3.4.1 -distfiles="${GNOME_SITE}/eog/3.4/eog-$version.tar.xz" +version=3.4.2 +revision=1 build_style=gnu-configure configure_args="--disable-scrollkeeper" depends="hicolor-icon-theme desktop-file-utils" makedepends="which pkg-config intltool gnome-doc-utils gnome-desktop-devel libpeas-devel lcms2-devel exempi-devel libexif-devel librsvg-devel" fulldepends="gnome-icon-theme gsettings-desktop-schemas shared-mime-info" -revision=2 +gtk_iconcache_dirs="/usr/share/icons/hicolor" +subpackages="eog-devel" short_desc="Eye of GNOME graphics viewer program" maintainer="Juan RP " homepage="http://www.gnome.org" license="GPL-2" -checksum=cf29997ee065341fa323abc849732bfa18ab564cc0d931d61eaa473953d3e216 +distfiles="${GNOME_SITE}/eog/3.4/eog-$version.tar.xz" +checksum=8dd79cd2118ba6055efc4ebe815bdeeeb3c1310bb915035c1a56ef3188c75d5a long_desc=" eog or the Eye of GNOME is a simple graphics viewer for the GNOME desktop which uses the gdk-pixbuf library. It can deal with large images, and zoom and scroll with constant memory usage. Its goals are simplicity and standards compliance." - -gtk_iconcache_dirs="/usr/share/icons/hicolor" -subpackages="eog-devel" - - - diff --git a/srcpkgs/kernel-snapshot/files/x86_64-dotconfig b/srcpkgs/kernel-snapshot/files/x86_64-dotconfig index 60adf34e28..28685c5615 100644 --- a/srcpkgs/kernel-snapshot/files/x86_64-dotconfig +++ b/srcpkgs/kernel-snapshot/files/x86_64-dotconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 3.5.0-rc1 Kernel Configuration +# Linux/x86_64 3.5.0-rc2 Kernel Configuration # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -54,7 +54,7 @@ CONFIG_BUILDTIME_EXTABLE_SORT=y CONFIG_EXPERIMENTAL=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_CROSS_COMPILE="" -CONFIG_LOCALVERSION=1" +CONFIG_LOCALVERSION="" # CONFIG_LOCALVERSION_AUTO is not set CONFIG_HAVE_KERNEL_GZIP=y CONFIG_HAVE_KERNEL_BZIP2=y @@ -440,6 +440,7 @@ CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y # CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set CONFIG_CROSS_MEMORY_ATTACH=y CONFIG_CLEANCACHE=y +CONFIG_FRONTSWAP=y CONFIG_X86_CHECK_BIOS_CORRUPTION=y CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y CONFIG_X86_RESERVE_LOW=64 diff --git a/srcpkgs/kernel-snapshot/template b/srcpkgs/kernel-snapshot/template index b1f6d0d102..0558229edf 100644 --- a/srcpkgs/kernel-snapshot/template +++ b/srcpkgs/kernel-snapshot/template @@ -2,7 +2,7 @@ # _kmajor=3.5 _kminor=0 -_kpatch=rc1 +_kpatch=rc2 pkgname=kernel-snapshot version=${_kmajor}.${_kminor}${_kpatch} @@ -23,7 +23,7 @@ long_desc=" This package provides the linux kernel image and associated modules for the testing kernel (future stable releases)." distfiles="http://www.kernel.org/pub/linux//kernel/v3.0/testing/linux-${_kmajor}-${_kpatch}.tar.xz" -checksum=0e70f05246c8f2f1720bb4028b7c867a4c54b43f5603cbdcafd3dc772faa0ee2 +checksum=d450b1a2debe246864b1b494b00b74f29965306c63e4d5095d7be6eb5b65da7c if [ -n "$revision" ]; then _kernver="${_kmajor}.${_kminor}-${_kpatch}_${revision}"