diff options
author | sibel <lesibel at free dot fr> | 2010-10-11 10:56:19 +0200 |
---|---|---|
committer | sibel <lesibel at free dot fr> | 2010-10-11 10:56:19 +0200 |
commit | 43eb8ccb76cf2eb9e59064c541dbe5c7fcaf0bbe (patch) | |
tree | 74e1acab066f2645840e891d9684c766002ad75d | |
parent | f0e28fbc0bf87c0d4d4eadd03cbe62083e405338 (diff) | |
parent | 473b056c8124afc9b3daeb06f5cf84342997ee7b (diff) | |
download | nutyx-pakxe-43eb8ccb76cf2eb9e59064c541dbe5c7fcaf0bbe.tar.gz nutyx-pakxe-43eb8ccb76cf2eb9e59064c541dbe5c7fcaf0bbe.tar.bz2 nutyx-pakxe-43eb8ccb76cf2eb9e59064c541dbe5c7fcaf0bbe.tar.xz nutyx-pakxe-43eb8ccb76cf2eb9e59064c541dbe5c7fcaf0bbe.zip |
Merge branch 'master' of ssh://kiao.no-ip.info:443/~/attapu
-rwxr-xr-x | acompiler/skype/Pkgfile | 2 | ||||
-rw-r--r-- | acompiler/skype/pre-install | 4 | ||||
-rw-r--r-- | base/directfb-1.0/Pkgfile | 1 | ||||
-rw-r--r-- | base/kernel-32/.md5sum | 4 | ||||
-rw-r--r-- | base/kernel-32/Pkgfile | 6 | ||||
-rw-r--r-- | base/kernel-33/.md5sum | 4 | ||||
-rw-r--r-- | base/kernel-33/Pkgfile | 6 | ||||
-rw-r--r-- | base/kernel-34/.md5sum | 4 | ||||
-rw-r--r-- | base/kernel-34/Pkgfile | 6 | ||||
-rw-r--r-- | base/kernel/.md5sum | 3 | ||||
-rw-r--r-- | base/kernel/Pkgfile | 6 | ||||
-rw-r--r-- | extra/gestpkg-1.2/pre-install | 4 | ||||
-rw-r--r-- | extra/gestpkg/pre-install | 3 | ||||
-rw-r--r--[-rwxr-xr-x] | extra/qt/post-install | 6 |
14 files changed, 33 insertions, 26 deletions
diff --git a/acompiler/skype/Pkgfile b/acompiler/skype/Pkgfile index 7bc65fd04..d882e8eb1 100755 --- a/acompiler/skype/Pkgfile +++ b/acompiler/skype/Pkgfile @@ -2,7 +2,7 @@ # URL: http://skype.com/ # Maintainer: NuTyX core team # Packager: thierryn1 at hispeed dot ch -# Depends on: qt +# Depends on: name=skype version=2.1.0.81 diff --git a/acompiler/skype/pre-install b/acompiler/skype/pre-install index c883e9713..d2a69c2ad 100644 --- a/acompiler/skype/pre-install +++ b/acompiler/skype/pre-install @@ -1,3 +1,3 @@ -if ( pkginfo -i | grep skype_static > /dev/null ) ; then - pkgrm skype_static +if ! ( pkginfo -i | grep ^"qt " > /dev/null ) ; then + pkg-get depinst qt fi diff --git a/base/directfb-1.0/Pkgfile b/base/directfb-1.0/Pkgfile index 55ce8a6ae..a42e3f9b8 100644 --- a/base/directfb-1.0/Pkgfile +++ b/base/directfb-1.0/Pkgfile @@ -11,6 +11,7 @@ source=(http://www.directfb.org/downloads/Core/DirectFB-1.0/DirectFB-$version.ta libpng-1.4.patch) # To build with multicore add --enable-multi build() { + export POSIXLY_CORRECT="yes" cd DirectFB-$version patch -Np1 -i ../libpng-1.4.patch ./configure --prefix=/usr \ diff --git a/base/kernel-32/.md5sum b/base/kernel-32/.md5sum index 4bc807cba..423269de5 100644 --- a/base/kernel-32/.md5sum +++ b/base/kernel-32/.md5sum @@ -1,7 +1,7 @@ bf3ce0e47060702fe0b415315de5a1ae config 38550ec26e5368286e2fde8fb03fa744 config_64 2492f02b9f4a88d19bd6c208ce98330f install-attapu.ash -8ba54feb5e098b759d0306c29767a3a4 installtools-08102010.tar.gz +6edc41a8e435fef04989ea29099d6de8 installtools-10102010.tar.gz 260551284ac224c3a43c4adac7df4879 linux-2.6.32.tar.bz2 -087bd17651890c88a00df293cc24ca85 nutyx-initrd-extra-08102010.tar.bz2 +fe7d856a5a25df09f839e9db156a77ae nutyx-initrd-extra-10102010.tar.bz2 e3346e3b4b92f048b8ecded829f45cdf patch-2.6.32.24.bz2 diff --git a/base/kernel-32/Pkgfile b/base/kernel-32/Pkgfile index c2afafac5..94d23c67e 100644 --- a/base/kernel-32/Pkgfile +++ b/base/kernel-32/Pkgfile @@ -6,11 +6,11 @@ name=kernel-32 version=2.6.32.24 _BaseVersion=2.6.32 -release=2 +release=3 PKGMK_NO_STRIP="yes" SCRIPT_VERSION="attapu" -_extra=08102010 -_tools=08102010 +_extra=10102010 +_tools=10102010 source=(http://www.kernel.org/pub/linux/kernel/v2.6/linux-${_BaseVersion}.tar.bz2 config_64 config\ http://www.kernel.org/pub/linux/kernel/v2.6/patch-$version.bz2\ http://nutyx.meticul.eu/install-${SCRIPT_VERSION}.ash\ diff --git a/base/kernel-33/.md5sum b/base/kernel-33/.md5sum index 48efe7239..61767b9d9 100644 --- a/base/kernel-33/.md5sum +++ b/base/kernel-33/.md5sum @@ -1,7 +1,7 @@ 9d9c70259591cc6d8797bb84b9dbd0ab config 38550ec26e5368286e2fde8fb03fa744 config_64 2492f02b9f4a88d19bd6c208ce98330f install-attapu.ash -8ba54feb5e098b759d0306c29767a3a4 installtools-08102010.tar.gz +6edc41a8e435fef04989ea29099d6de8 installtools-10102010.tar.gz c3883760b18d50e8d78819c54d579b00 linux-2.6.33.tar.bz2 -087bd17651890c88a00df293cc24ca85 nutyx-initrd-extra-08102010.tar.bz2 +fe7d856a5a25df09f839e9db156a77ae nutyx-initrd-extra-10102010.tar.bz2 04b3affb4f7fb3035303a32bd6080baf patch-2.6.33.7.bz2 diff --git a/base/kernel-33/Pkgfile b/base/kernel-33/Pkgfile index c2f1f2cc1..e5830fc75 100644 --- a/base/kernel-33/Pkgfile +++ b/base/kernel-33/Pkgfile @@ -6,11 +6,11 @@ name=kernel-33 version=2.6.33.7 _BaseVersion=2.6.33 -release=2 +release=3 PKGMK_NO_STRIP="yes" SCRIPT_VERSION="attapu" -_extra=08102010 -_tools=08102010 +_extra=10102010 +_tools=10102010 source=(http://www.kernel.org/pub/linux/kernel/v2.6/linux-${_BaseVersion}.tar.bz2 config_64 config\ http://www.kernel.org/pub/linux/kernel/v2.6/patch-$version.bz2\ http://nutyx.meticul.eu/install-${SCRIPT_VERSION}.ash\ diff --git a/base/kernel-34/.md5sum b/base/kernel-34/.md5sum index 9fdda9b58..3cd5a1cd9 100644 --- a/base/kernel-34/.md5sum +++ b/base/kernel-34/.md5sum @@ -1,7 +1,7 @@ e2bd86401936497febd12a08ab942466 config 38550ec26e5368286e2fde8fb03fa744 config_64 2492f02b9f4a88d19bd6c208ce98330f install-attapu.ash -8ba54feb5e098b759d0306c29767a3a4 installtools-08102010.tar.gz +6edc41a8e435fef04989ea29099d6de8 installtools-10102010.tar.gz 10eebcb0178fb4540e2165bfd7efc7ad linux-2.6.34.tar.bz2 -087bd17651890c88a00df293cc24ca85 nutyx-initrd-extra-08102010.tar.bz2 +fe7d856a5a25df09f839e9db156a77ae nutyx-initrd-extra-10102010.tar.bz2 a88e4b5a9fcb23c2229301ac4dae1f1a patch-2.6.34.7.bz2 diff --git a/base/kernel-34/Pkgfile b/base/kernel-34/Pkgfile index 1035359d8..d9914232b 100644 --- a/base/kernel-34/Pkgfile +++ b/base/kernel-34/Pkgfile @@ -6,11 +6,11 @@ name=kernel-34 version=2.6.34.7 _BaseVersion=2.6.34 -release=2 +release=3 PKGMK_NO_STRIP="yes" SCRIPT_VERSION="attapu" -_extra=08102010 -_tools=08102010 +_extra=10102010 +_tools=10102010 source=(http://www.kernel.org/pub/linux/kernel/v2.6/linux-${_BaseVersion}.tar.bz2 config_64 config\ http://www.kernel.org/pub/linux/kernel/v2.6/patch-$version.bz2\ http://nutyx.meticul.eu/install-${SCRIPT_VERSION}.ash\ diff --git a/base/kernel/.md5sum b/base/kernel/.md5sum index bd6a896e1..b1f2241ad 100644 --- a/base/kernel/.md5sum +++ b/base/kernel/.md5sum @@ -1,4 +1,7 @@ f81f5d6e85b9ed5832b6be2a56c52101 config 9182da73932b4cbc635414d6f0af02ca config_64 +2492f02b9f4a88d19bd6c208ce98330f install-attapu.ash +6edc41a8e435fef04989ea29099d6de8 installtools-10102010.tar.gz 091abeb4684ce03d1d936851618687b6 linux-2.6.35.tar.bz2 +fe7d856a5a25df09f839e9db156a77ae nutyx-initrd-extra-10102010.tar.bz2 6a00ec267b0100f20a3fa900b97a5b7f patch-2.6.35.7.bz2 diff --git a/base/kernel/Pkgfile b/base/kernel/Pkgfile index c83b50ce9..281768203 100644 --- a/base/kernel/Pkgfile +++ b/base/kernel/Pkgfile @@ -6,11 +6,11 @@ name=kernel version=2.6.35.7 _BaseVersion=2.6.35 -release=2 +release=3 PKGMK_NO_STRIP="yes" SCRIPT_VERSION="attapu" -_extra=08102010 -_tools=08102010 +_extra=10102010 +_tools=10102010 source=(http://www.kernel.org/pub/linux/kernel/v2.6/linux-${_BaseVersion}.tar.bz2 config_64 config\ http://www.kernel.org/pub/linux/kernel/v2.6/patch-$version.bz2\ http://nutyx.meticul.eu/install-${SCRIPT_VERSION}.ash\ diff --git a/extra/gestpkg-1.2/pre-install b/extra/gestpkg-1.2/pre-install index 343eab591..e0fc0092e 100644 --- a/extra/gestpkg-1.2/pre-install +++ b/extra/gestpkg-1.2/pre-install @@ -1,3 +1,3 @@ -if ( pkginfo -l gestpkg > /dev/null); then - pkgrm gestpkg +if ( pkginfo -i | grep ^"gestpkg " > /dev/null ) ; then + pkgrm gestpkg fi diff --git a/extra/gestpkg/pre-install b/extra/gestpkg/pre-install new file mode 100644 index 000000000..f7e04387e --- /dev/null +++ b/extra/gestpkg/pre-install @@ -0,0 +1,3 @@ +if ( pkginfo -i | grep ^"gestpkg-1.2 " > /dev/null ) ; then + pkgrm gestpkg-1.2 +fi diff --git a/extra/qt/post-install b/extra/qt/post-install index 37057e467..afd2d4e5e 100755..100644 --- a/extra/qt/post-install +++ b/extra/qt/post-install @@ -1,4 +1,4 @@ -#!/bin/bash -if ( pkginfo -i | grep phonon > /dev/null ) ; then - pkgrm phonon +if ! ( pkginfo -i | grep phonon > /dev/null ) ; then + pkg-get depinst phonon fi + |