Merge branch 'testing' of ssh://git.chakraos.org:22/core into testing

arpack/PKGBUILD

@@ -1,8 +1,6 @@
 #
 # Platform Packages for Chakra, part of chakra-project.org
 #
-# maintainer abveritas@chakra-project.org
-# contributor Alexander Rødseth <rodseth@gmail.com>
 
 pkgname=arpack
 pkgver=3.1.5
@@ -11,20 +9,21 @@ arch=('x86_64')
 pkgdesc="Fortran77 subroutines designed to solve large scale eigenvalue problems"
 url="http://forge.scilab.org/index.php/p/arpack-ng/"
 license=('BSD')
-depends=('lapack' 'openmpi')
+depends=('lapack' 'openmpi' 'openblas')
 makedepends=('openmpi' 'gcc-fortran')
 provides=('arpack-ng')
-source=("http://forge.scilab.org/upload/$pkgname-ng/files/$pkgname-ng_$pkgver.tar.gz")
-md5sums=('f773f34079a9c24807da6bc2e72fe6df')
+source=("https://github.com/opencollab/arpack-ng/archive/${pkgver}.tar.gz")
+sha256sums=('f609d001a247195c019626cb0f2144db7b08c83f53d875dcdeeee4cdb0609098')
+
 
 build() {
   cd "$pkgname-ng-$pkgver"
 
-  ./configure --prefix=/usr --enable-mpi
+  ./configure --prefix=/usr --enable-mpi --with-blas="openblas" 
   make \
     F77="mpif77" \
-    CFLAGS+=" `pkg-config --cflags ompi` " \
-    LIBS+=" `pkg-config --libs ompi` "
+    CFLAGS+=" $(pkg-config --cflags ompi) " \
+    LIBS+=" $(pkg-config --libs ompi) "
 }
 
 package() {

cmake/PKGBUILD

@@ -1,8 +1,7 @@
 # maintainer: Neophytos Kolokotronis <tetris4ATgmailDOTcom>
 
 pkgname=cmake
-pkgver=3.4.0
-_pkgver=3.4
+pkgver=3.5.1
 pkgrel=1
 pkgdesc="A cross-platform open-source make system"
 arch=('x86_64')
@@ -11,27 +10,23 @@ url="http://www.cmake.org"
 depends=('curl' 'libarchive>=2.3.1' 'shared-mime-info' 'jsoncpp')
 makedepends=('qt5-base' 'python3-sphinx')
 install=${pkgname}.install
-source=("http://www.cmake.org/files/v${_pkgver}/${pkgname}-${pkgver}.tar.gz")
-sha256sums=('a5b82bf6ace6c481cdb911fd5d372a302740cbefd387e05297cb37f7468d1cea')
+source=("http://www.cmake.org/files/v${pkgver%.*}/${pkgname}-${pkgver}.tar.gz"
+        "add_openblas.diff")
+sha256sums=('93d651a754bcf6f0124669646391dd5774c0fc4d407c384e3ae76ef9a60477e8'
+            '9cd72e7c269d06dc2df9ed42f7e0658ffcb8fce64af94098364ac72dbf26e5dc')
 
 prepare() {
   cd "${srcdir}"/${pkgname}-${pkgver}
-  # patch -Np1 < ${srcdir}/findfreetype.patch
+  patch -Np1 < ${srcdir}/add_openblas.diff
 }
 
 build() {
   cd "${srcdir}"/${pkgname}-${pkgver}
 
- # cmake -DBUILD_QtDialog=ON \
- #       -DCMAKE_INSTALL_PREFIX=/usr \
-#	-DCMAKE_USE_SYSTEM_LIBRARIES=ON \
- #       . 
-
-  # below version is for boostrapping cmake;
-  # one can use it to break the recursive makedependency
   ./bootstrap --prefix=/usr \
     --mandir=/share/man \
     --docdir=/share/doc/cmake \
+    --sphinx-man \
     --system-libs \
     --qt-gui \
     --qt-qmake=/usr/lib/qt5/bin/qmake \

cmake/add_openblas.diff

@@ -0,0 +1,72 @@
+diff --git a/Modules/FindBLAS.cmake b/Modules/FindBLAS.cmake
+index 416b666..546ada1 100644
+--- a/Modules/FindBLAS.cmake
++++ b/Modules/FindBLAS.cmake
+@@ -30,9 +30,9 @@
+ #   BLA_F95     if set on tries to find the f95 interfaces for BLAS/LAPACK
+ #
+ # ######### ## List of vendors (BLA_VENDOR) valid in this module #
+-# Goto,ATLAS PhiPACK,CXML,DXML,SunPerf,SCSL,SGIMATH,IBMESSL,Intel10_32
+-# (intel mkl v10 32 bit),Intel10_64lp (intel mkl v10 64 bit,lp thread
+-# model, lp64 model), # Intel10_64lp_seq (intel mkl v10 64
++# Goto,OpenBLAS,ATLAS PhiPACK,CXML,DXML,SunPerf,SCSL,SGIMATH,IBMESSL,
++# Intel10_32 (intel mkl v10 32 bit),Intel10_64lp (intel mkl v10 64 bit,
++# lp thread model, lp64 model), # Intel10_64lp_seq (intel mkl v10 64
+ # bit,sequential code, lp64 model), # Intel( older versions of mkl 32
+ # and 64 bit), ACML,ACML_MP,ACML_GPU,Apple, NAS, Generic C/CXX should be
+ # enabled to use Intel mkl
+@@ -172,6 +172,20 @@ if (BLA_VENDOR STREQUAL "Goto" OR BLA_VENDOR STREQUAL "All")
+  endif()
+ endif ()
+ 
++if (BLA_VENDOR STREQUAL "OpenBLAS" OR BLA_VENDOR STREQUAL "All")
++ if(NOT BLAS_LIBRARIES)
++  # OpenBLAS (http://www.openblas.net)
++  check_fortran_libraries(
++  BLAS_LIBRARIES
++  BLAS
++  sgemm
++  ""
++  "openblas"
++  ""
++  )
++ endif()
++endif ()
++
+ if (BLA_VENDOR STREQUAL "ATLAS" OR BLA_VENDOR STREQUAL "All")
+  if(NOT BLAS_LIBRARIES)
+   # BLAS in ATLAS library? (http://math-atlas.sourceforge.net/)
+diff --git a/Modules/FindLAPACK.cmake b/Modules/FindLAPACK.cmake
+index b11edc3..0058b88 100644
+--- a/Modules/FindLAPACK.cmake
++++ b/Modules/FindLAPACK.cmake
+@@ -31,7 +31,7 @@
+ #   BLA_F95     if set on tries to find the f95 interfaces for BLAS/LAPACK
+ #
+ # ## List of vendors (BLA_VENDOR) valid in this module # Intel(mkl),
+-# ACML,Apple, NAS, Generic
++# OpenBLAS, ACML,Apple, NAS, Generic
+ 
+ #=============================================================================
+ # Copyright 2007-2009 Kitware, Inc.
+@@ -179,6 +179,19 @@ if (BLA_VENDOR STREQUAL "Goto" OR BLA_VENDOR STREQUAL "All")
+   ""
+   )
+  endif()
++
++if (BLA_VENDOR STREQUAL "OpenBLAS" OR BLA_VENDOR STREQUAL "All")
++ if(NOT LAPACK_LIBRARIES)
++  check_lapack_libraries(
++  LAPACK_LIBRARIES
++  LAPACK
++  cheev
++  ""
++  "openblas"
++  "${BLAS_LIBRARIES}"
++  ""
++  )
++ endif()
+ endif ()
+ 
+ 
+

dsdp/PKGBUILD

@@ -3,16 +3,16 @@
 # Contributor: Cristóvão D. Sousa <crisjss@gmail.com>
 pkgname=dsdp
 pkgver=5.8
-pkgrel=1
+pkgrel=2
 pkgdesc="A free open source implementation of an interior-point method for semidefinite programming"
 arch=('i686' 'x86_64')
 url="http://www.mcs.anl.gov/hs/software/DSDP"
 license=('custom')
-depends=("lapack" "blas")
+depends=("lapack" "openblas")
 source=("http://www.mcs.anl.gov/hs/software/${pkgname^^}/${pkgname^^}$pkgver.tar.gz"
         "make.include.patch")
 md5sums=('37c15a3c6c3f13e31262f65ac4364b5e'
-         'd90d4bf5ce00f6f86722db2624675ae5')
+         '3c3493ffb8a2884f8b2e90034fa53504')
 
 build() {
   cd "$srcdir/${pkgname^^}$pkgver"

dsdp/make.include.patch

@@ -11,4 +11,4 @@
 58c58
 < LAPACKBLAS  = -llapack -lblas -lg2c -lm
 ---
-> LAPACKBLAS  = -llapack -lblas -lgfortran -lm
+> LAPACKBLAS  = -llapack -lopenblas -lgfortran -lm

ethtool/PKGBUILD

@@ -4,23 +4,29 @@
 # maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
 
 pkgname=ethtool
-pkgver=3.8
+pkgver=4.2
 pkgrel=1
 pkgdesc="Utility for controlling network drivers and hardware"
-arch=(i686 x86_64)
+arch=(x86_64)
 url="http://www.kernel.org/pub/software/network/ethtool/"
 license=('GPL')
 depends=(glibc)
-source=(http://www.kernel.org/pub/software/network/$pkgname/$pkgname-$pkgver.tar.xz)
-md5sums=('7ae96870bc4f9b43f666650ae30f2685')
+source=(http://www.kernel.org/pub/software/network/$pkgname/$pkgname-$pkgver.tar.{xz,sign})
+md5sums=('8433e71a256678d859ecc264132063c5'
+         'SKIP')
+validpgpkeys=(AC2B29BD34A6AFDDB3F68F35E7BFC8EC95861109) # Ben Hutchings <bwh@kernel.org>
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --mandir=/usr/share/man || return 1
-  make || return 1
+  cd ${pkgname}-${pkgver}
+  ./configure \
+    --prefix=/usr \
+    --mandir=/usr/share/man \
+    --sbindir=/usr/bin
+
+  make
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="${pkgdir}" install || return 1
+  cd $pkgname-$pkgver
+  make DESTDIR="${pkgdir}" install
 }

lapack/PKGBUILD

@@ -1,68 +1,47 @@
-#
-# Chakra Packages for Chakra, part of chakraos.org
-#
 # maintainer (x86_64): AlmAck
 
-pkgbase=lapack
-pkgname=('lapack' 'blas')
-pkgver=3.5.0
-pkgrel=1
+pkgname=lapack
+pkgver=3.6.0
+pkgdesc="Linear Algebra PACKage"
+pkgrel=4
 url="http://www.netlib.org/lapack"
-makedepends=('gcc-fortran' 'cmake')
+depends=("openblas")
+makedepends=('gcc-fortran' 'cmake' 'python2')
 arch=('x86_64')
 license=("custom")
-source=(http://www.netlib.org/${pkgbase}/${pkgbase}-${pkgver}.tgz
+source=(http://www.netlib.org/${pkgname}/${pkgname}-${pkgver}.tgz
         LICENSE.blas)
-md5sums=('b1d3e3e425b2e44a06760ff173104bdf'
+md5sums=('f2f6c67134e851fe189bb3ca1fbb5101'
          '38b6acb8ed5691d25863319d30a8b365')
 
-build() {
+prepare() {
   cd "${srcdir}"
-
   install -d build
-  cd build
+
+}
+
+
+build() {
+  cd "${srcdir}/build"
+
   cmake ../${pkgname}-${pkgver} \
+    -DUSE_OPTIMIZED_BLAS=ON \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_SKIP_RPATH=ON \
     -DBUILD_SHARED_LIBS=ON \
     -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_LIBDIR=lib \
     -DCMAKE_Fortran_COMPILER=gfortran \
     -DLAPACKE=ON
   make
 }
 
-package_lapack() {
-  pkgdesc="Linear Algebra PACKage"
-  depends=("blas=${pkgver}")
+package() {
 
-  install -m755 -d ${pkgdir}/usr/{lib,bin,include}
+  cd ${srcdir}/build
+  make DESTDIR=$pkgdir install
 
-  for libname in liblapack libtmglib liblapacke; do
-    install -m755 "${srcdir}/build/lib/${libname}.so" \
-      "${pkgdir}/usr/lib/"
-    ln -sf ${libname}.so "${pkgdir}/usr/lib/${libname}.so.${pkgver}"
-    ln -sf ${libname}.so "${pkgdir}/usr/lib/${libname}.so.3"
-  done
-  
-  install -m755 "${srcdir}"/build/bin/* "${pkgdir}/usr/bin"
-  install -m644 "${srcdir}"/build/include/* "${pkgdir}/usr/include"
   install -m755 -d "${pkgdir}/usr/share/licenses/lapack"
   install -m644 "${srcdir}/${pkgname}-${pkgver}/LICENSE" \
     "${pkgdir}/usr/share/licenses/lapack/"
 }
-
-package_blas() {
-  pkgdesc="Basic Linear Algebra Subprograms"
-  depends=('gcc-libs')
-
-  install -m755 -d "${pkgdir}/usr/lib"
-  install -m755 "${srcdir}/build/lib/libblas.so" \
-      "${pkgdir}/usr/lib/"
-  ln -sf libblas.so "${pkgdir}/usr/lib/libblas.so.${pkgver}"
-  ln -sf libblas.so "${pkgdir}/usr/lib/libblas.so.3"
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/blas"
-  install -m644 "${srcdir}/LICENSE.blas" \
-    "${pkgdir}/usr/share/licenses/blas/"
-}
-

openblas/PKGBUILD

@@ -1,9 +1,10 @@
 # Maintainer: Fabian Kosmale
+# Contributor (Arch original): Giuseppe Borzi <gborzi _AT_ ieee _DOT_ org>
 
 pkgname=openblas
 _pkgname=OpenBLAS
 pkgver=0.2.17
-pkgrel=1
+pkgrel=8
 pkgdesc="An optimized BLAS library based on GotoBLAS2 1.13 BSD "
 arch=('i686' 'x86_64')
 url="http://www.openblas.net/"
@@ -22,16 +23,17 @@ build() {
   unset CXXFLAGS
   # using and OPENMP=1 should be the most sensible option
   # see https://github.com/xianyi/OpenBLAS/wiki/faq for  details
-  # we use NO_LAPACK, as LAPACK should be provided by our lapack package
-  make USE_OPENMP=1 NO_LAPACK=1 MAJOR_VERSION=3 DYNAMIC_ARCH=1
+  # we use NO_LAPACK and NO_LAPACKE, as LAPACK should be provided by our lapack package
+  make USE_OPENMP=1 NO_LAPACK=1 NO_LAPACKE=1 MAJOR_VERSION=3 DYNAMIC_ARCH=1
 }
 
 package() {
   cd "$srcdir/$_pkgname-$pkgver"
 
-  make PREFIX="$pkgdir/usr" MAJOR_VERSION=3 install
+  make PREFIX="$pkgdir/usr" USE_OPENMP=1 NO_LAPACK=1 NO_LAPACKE=1 MAJOR_VERSION=3 DYNAMIC_ARCH=1 install
   install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 
+
   # Remove reference to ${pkgdir}
   sed -i -e "s|${pkgdir}||" "${pkgdir}/usr/lib/cmake/openblas/OpenBLASConfig.cmake"
 }

pyqt4/PKGBUILD

@@ -1,7 +1,7 @@
 pkgbase=pyqt4
 pkgname=('python-pyqt4-common' 'python3-pyqt4' 'python2-pyqt4')
 pkgver=4.11.4
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 url='http://riverbankcomputing.co.uk/software/pyqt/intro'
 license=('GPL')

python-numpy/PKGBUILD

@@ -7,12 +7,12 @@
 pkgbase=python-numpy
 pkgname=('python3-numpy' 'python2-numpy')
 pkgver=1.10.4
-pkgrel=1
+pkgrel=2
 pkgdesc="Scientific tools for Python"
 arch=('x86_64')
 license=('custom')
 url="http://numpy.org/"
-makedepends=('blas'
+makedepends=('openblas'
              'gcc-fortran'
              'lapack'
              'python3' 'python2'

qrupdate/PKGBUILD

@@ -3,17 +3,21 @@
 pkgname=qrupdate
 pkgver=1.1.2
 _pkgver=1.2
-pkgrel=1
+pkgrel=3
 pkgdesc="Fortran library for fast updates of QR and Cholesky decompositions"
 url="http://sourceforge.net/projects/qrupdate"
 makedepends=('gcc-fortran')
-depends=('atlas-lapack')
+depends=('openblas' 'lapack')
 arch=('x86_64')
 license=('GPL3')
-source=( http://sunet.dl.sourceforge.net/project/qrupdate/qrupdate/$_pkgver/$pkgname-$pkgver.tar.gz)
-options=('!makeflags')
+source=( http://downloads.sourceforge.net/project/qrupdate/qrupdate/$_pkgver/$pkgname-$pkgver.tar.gz)
 md5sums=('6d073887c6e858c24aeda5b54c57a8c4')
 
+prepare() {
+  cd "$srcdir"/$pkgname-$pkgver
+  sed -i "s/BLAS=-lblas/BLAS=-lopenblas/g" Makeconf
+}
+
 build() {
   cd "$srcdir"/$pkgname-$pkgver
 

sip/PKGBUILD

@@ -7,7 +7,7 @@
 pkgbase=sip
 pkgname=('python-sip-common' 'python2-sip' 'python3-sip')
 pkgver=4.16.6
-pkgrel=1
+pkgrel=3
 pkgdesc="A tool for creating Python bindings for C and C++ libraries"
 arch=('x86_64')
 url="http://www.riverbankcomputing.com/software/sip/"
@@ -56,8 +56,8 @@ package_python3-sip() {
     cd ${srcdir}/${pkgbase}-${pkgver}
     msg "Packaging python3-sip"
     make DESTDIR=${pkgdir} install -C siplib
-    install -Dm644 sipconfig.py "${pkgdir}"/usr/lib/python3.4/site-packages/sipconfig.py
-    install -Dm644 sipdistutils.py "${pkgdir}"/usr/lib/python3.4/site-packages/sipdistutils.py
+    install -Dm644 sipconfig.py "${pkgdir}"/usr/lib/python3.5/site-packages/sipconfig.py
+    install -Dm644 sipdistutils.py "${pkgdir}"/usr/lib/python3.5/site-packages/sipdistutils.py
     install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
 

smartmontools/PKGBUILD

@@ -1,33 +1,39 @@
-# maintainer abveritas@chakra-project.org
-# contributor https://www.archlinux.org/packages/extra/x86_64/smartmontools/
+# Maintainer: Samir Benmendil <ram-z@chakraos.org>
+# Contributor: ahveritas@chakra-project.org
+# Contributor: https://www.archlinux.org/packages/extra/x86_64/smartmontools/
 
 pkgname=smartmontools
-pkgver=6.2
+pkgver=6.4
 pkgrel=1
 pkgdesc="Control and monitor S.M.A.R.T. enabled ATA and SCSI Hard Drives"
 url="http://smartmontools.sourceforge.net"
 license=('GPL')
 arch=('x86_64')
-depends=('gcc-libs' 'libcap' 'bash')
+depends=('gcc-libs' 'libcap-ng' 'bash')
 backup=('etc/smartd.conf'
         'etc/conf.d/smartd')
 source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz"
         'smartd.conf')
-md5sums=('d44f84081a12cef79cd17f78044351fc'
+md5sums=('56812c8312fd123ed40ef65afde1049e'
          '28c1b80c41dac52d433961dcfb4f70e0')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
 
   ./configure --prefix=/usr \
               --sysconfdir=/etc \
+              --sbindir=/usr/bin \
               --enable-drivedb \
-              --with-systemdsystemunitdir=/usr/lib/systemd/system
+              --with-libcap-ng=yes \
+              --with-systemdsystemunitdir=/usr/lib/systemd/system \
+              --with-smartdscriptdir=/usr/share/smartmontools \
+              --with-smartdplugindir=/usr/share/smartmontools/smartd_warning.d
+
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
 
   sed -i -e "s:sysconfig/smartmontools:conf.d/smartd:g" smartd.service
   sed -i -e "s:smartd_opts:SMARTD_ARGS:g" smartd.service

suitesparse/PKGBUILD

@@ -5,14 +5,14 @@
 
 pkgname=suitesparse
 pkgver=4.4.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A collection of sparse matrix libraries"
 url="http://www.cise.ufl.edu/research/sparse/SuiteSparse/"
 arch=('x86_64')
 conflicts=('umfpack')
 provides=('umfpack')
 replaces=('umfpack')
-depends=('blas' 'lapack')
+depends=('openblas' 'lapack')
 makedepends=('gcc-fortran')
 license=('GPL')
 source=(http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-$pkgver.tar.gz)
@@ -56,11 +56,11 @@ build() {
       --whole-archive LDL/Lib/libldl.a && \
       ln -sf libldl.so.2.2.1 shared/libldl.so
    ld -shared -soname libcholmod.so.3 -o shared/libcholmod.so.3.0.3 \
-      --whole-archive CHOLMOD/Lib/libcholmod.a -lblas -llapack \
+      --whole-archive CHOLMOD/Lib/libcholmod.a -lopenblas -llapack \
       -L./shared -lamd -lcamd -lcolamd -lccolamd -lsuitesparseconfig -lm && \
       ln -sf libcholmod.so.3.0.3 shared/libcholmod.so
    ld -shared -soname libspqr.so.2 -o shared/libspqr.so.2.0.0 \
-      --whole-archive SPQR/Lib/libspqr.a -lblas -llapack \
+      --whole-archive SPQR/Lib/libspqr.a -lopenblas -llapack \
       -L./shared -lcholmod -lsuitesparseconfig -lm && \
       ln -sf libspqr.so.2.0.0 shared/libspqr.so
    ld -shared -soname libcxsparse.so.3 -o shared/libcxsparse.so.3.1.4 \
@@ -70,7 +70,7 @@ build() {
       --whole-archive KLU/Lib/libklu.a -L./shared -lamd -lbtf \
       -lsuitesparseconfig -lm && ln -sf libklu.so.1.3.2 shared/libklu.so
    ld -shared -soname libumfpack.so.5 -o shared/libumfpack.so.5.7.1 \
-      --whole-archive UMFPACK/Lib/libumfpack.a -lblas -llapack -L./shared \
+      --whole-archive UMFPACK/Lib/libumfpack.a -lopenblas -llapack -L./shared \
       -lamd -lcholmod -lsuitesparseconfig -lm && \
       ln -sf libumfpack.so.5.7.1 shared/libumfpack.so
 }

texinfo/PKGBUILD

@@ -2,7 +2,7 @@
 
 pkgname=texinfo
 pkgver=5.2
-pkgrel=1
+pkgrel=3
 pkgdesc="Utilities to work with and produce manuals, ASCII text, and on-line documentation from a single source file"
 arch=('x86_64')
 url="http://www.gnu.org/software/texinfo/"
@@ -15,6 +15,7 @@ source=(ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig}
 md5sums=('cb489df8a7ee9d10a236197aefdb32c5'
          'SKIP'
          '89724bac1ecbd1a57b1ea81e87f96f44')
+validpgpkeys=('17D3311B14BC0F248267BF020716748A30D155AD') # Karl Berry
 
 prepare() {
   cd ${srcdir}/${pkgname}-${pkgver}

texinfo/texinfo.install

@@ -1,21 +1,21 @@
 infodir=/usr/share/info
-filelist=(info.info info-stnd.info texinfo texinfo-1 texinfo-2 texinfo-3)
+filelist=(info.info info-stnd.info texinfo.info{,-{1,2,3}})
 
 post_install() {
   # Scan *all* info files on install
   for file in $(find $infodir -type f ! -name dir); do
-      install-info $file $infodir/dir 2> /dev/null
+      install-info $file $infodir/dir
   done
 }
 
 post_upgrade() {
   for file in ${filelist[@]}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+    install-info $infodir/$file.gz $infodir/dir
   done
 }
 
 pre_remove() {
   for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
+    install-info --delete $infodir/$file.gz $infodir/dir
   done
 }