summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsibel <lesibel@free.fr>2010-10-17 07:59:08 +0200
committersibel <lesibel@free.fr>2010-10-17 07:59:08 +0200
commit3af5bbe0e11490850fdee747763b1c1fb39a2fb7 (patch)
treea9193ffad59b25e71d3774601c1653d67f5cd5cb
parenta4202844b9c0339371993d770a3920e8371a5ad0 (diff)
parent2083e4e86223fcee71dfca8c8abba170939dbaac (diff)
downloadnutyx-pakxe-3af5bbe0e11490850fdee747763b1c1fb39a2fb7.tar.gz
nutyx-pakxe-3af5bbe0e11490850fdee747763b1c1fb39a2fb7.tar.bz2
nutyx-pakxe-3af5bbe0e11490850fdee747763b1c1fb39a2fb7.tar.xz
nutyx-pakxe-3af5bbe0e11490850fdee747763b1c1fb39a2fb7.zip
Merge branch 'master' of ssh://kiao.no-ip.info:443/~/attapu
-rw-r--r--base/cryptsetup/Pkgfile8
-rw-r--r--base/kernel-35/.footprint (renamed from base/kernel/.footprint)2
-rw-r--r--base/kernel-35/.md5sum (renamed from base/kernel/.md5sum)0
-rw-r--r--base/kernel-35/Pkgfile (renamed from base/kernel/Pkgfile)4
-rw-r--r--base/kernel-35/config (renamed from base/kernel/config)0
-rw-r--r--base/kernel-35/config.old (renamed from base/kernel/config.old)0
-rw-r--r--base/kernel-35/config_64 (renamed from base/kernel/config_64)0
-rw-r--r--base/kernel-35/post-install (renamed from base/kernel/post-install)0
-rw-r--r--base/libevent/Pkgfile2
-rwxr-xr-xbase/libpng/Pkgfile2
-rw-r--r--base/links/Pkgfile2
-rw-r--r--base/sg3_utils/Pkgfile2
-rw-r--r--extra/brltty/Pkgfile2
-rw-r--r--extra/fftw/Pkgfile2
-rw-r--r--extra/libmspack/Pkgfile2
-rwxr-xr-xextra/rpmextract/Pkgfile2
-rw-r--r--extra/simple-scan/Pkgfile2
-rw-r--r--kde/libdbusmenu-qt/Pkgfile2
18 files changed, 17 insertions, 17 deletions
diff --git a/base/cryptsetup/Pkgfile b/base/cryptsetup/Pkgfile
index 188c540bc..670bee9d2 100644
--- a/base/cryptsetup/Pkgfile
+++ b/base/cryptsetup/Pkgfile
@@ -1,8 +1,8 @@
-# Description:
-# URL:
+# Description: Permet d'encrypter les périphériques
+# URL: http://cryptsetup.googlecode.com/
# Maintainer: NuTyX core team
-# Packager:
-# Depends on:
+# Packager: guy
+
name=cryptsetup
version=1.0.7
release=1
diff --git a/base/kernel/.footprint b/base/kernel-35/.footprint
index 79562f7a7..e700dbc94 100644
--- a/base/kernel/.footprint
+++ b/base/kernel-35/.footprint
@@ -2680,7 +2680,7 @@ drwxr-xr-x root/root lib/modules/2.6.35-NuTyX/kernel/sound/usb/usx2y/
lrwxrwxrwx root/root lib/modules/2.6.35-NuTyX/source -> /usr/src/linux-2.6.35
drwxr-xr-x root/root root/
drwxr-xr-x root/root root/bin/
--rw-r--r-- root/root root/bin/install-attapu.ash
+-rwxr-xr-- root/root root/bin/install-attapu.ash
drwxr-xr-x root/root usr/
drwxr-xr-x root/root usr/src/
drwxr-xr-x root/root usr/src/linux-2.6.35/
diff --git a/base/kernel/.md5sum b/base/kernel-35/.md5sum
index b1f2241ad..b1f2241ad 100644
--- a/base/kernel/.md5sum
+++ b/base/kernel-35/.md5sum
diff --git a/base/kernel/Pkgfile b/base/kernel-35/Pkgfile
index 281768203..c261567eb 100644
--- a/base/kernel/Pkgfile
+++ b/base/kernel-35/Pkgfile
@@ -3,7 +3,7 @@
# Maintainer: NuTyX core team
# Packager: thierryn1 at hispeed dot ch
-name=kernel
+name=kernel-35
version=2.6.35.7
_BaseVersion=2.6.35
release=3
@@ -72,7 +72,7 @@ mv $SRC/linux-${_BaseVersion}/vmlinux $PKG/usr/src/linux-${_BaseVersion}/
mv $SRC/linux-${_BaseVersion}/Module.symvers $PKG/usr/src/linux-${_BaseVersion}/
rm -r $PKG/lib/firmware
mkdir -p $PKG/root/bin
-install -m644 $SRC/install-${SCRIPT_VERSION}.ash \
+install -m754 $SRC/install-${SCRIPT_VERSION}.ash \
$PKG/root/bin/install-${SCRIPT_VERSION}.ash
cd $SRC
bsdtar -c "-J" -f $PKG/boot/nutyx-initrd.tar.xz nutyx-initrd-2009
diff --git a/base/kernel/config b/base/kernel-35/config
index 560599038..560599038 100644
--- a/base/kernel/config
+++ b/base/kernel-35/config
diff --git a/base/kernel/config.old b/base/kernel-35/config.old
index a793bb504..a793bb504 100644
--- a/base/kernel/config.old
+++ b/base/kernel-35/config.old
diff --git a/base/kernel/config_64 b/base/kernel-35/config_64
index a793bb504..a793bb504 100644
--- a/base/kernel/config_64
+++ b/base/kernel-35/config_64
diff --git a/base/kernel/post-install b/base/kernel-35/post-install
index a9433c1ce..a9433c1ce 100644
--- a/base/kernel/post-install
+++ b/base/kernel-35/post-install
diff --git a/base/libevent/Pkgfile b/base/libevent/Pkgfile
index 38c5e01b9..5ac3c9b7a 100644
--- a/base/libevent/Pkgfile
+++ b/base/libevent/Pkgfile
@@ -1,4 +1,4 @@
-# Decription: Bibliothèque de notification d'événements
+# Description: Bibliothèque de notification d'événements
# URL: http://www.monkey.org/~provos/libevent/
# Maintainer: NuTyX core team
# Packager: lesibel at free dot fr
diff --git a/base/libpng/Pkgfile b/base/libpng/Pkgfile
index a97664348..2c76d10b3 100755
--- a/base/libpng/Pkgfile
+++ b/base/libpng/Pkgfile
@@ -1,4 +1,4 @@
-# t/kernel-pae/.footprintescription: Librairie de fonctions de support PNG
+# Description: Librairie de fonctions de support PNG
# URL: http://www.libpng.org/pub/png/libpng.html
# Maintainer: NuTyX core team
# Packager: thierryn1 at hispeed dot ch
diff --git a/base/links/Pkgfile b/base/links/Pkgfile
index be0d508e4..1c70fc3cc 100644
--- a/base/links/Pkgfile
+++ b/base/links/Pkgfile
@@ -1,4 +1,4 @@
-# Decription: Navigateur en mode texte
+# Description: Navigateur en mode texte
# URL: http://links.twibright.com/
# Maintainer: NuTyX core team
# Packager: lesibel at free dot fr
diff --git a/base/sg3_utils/Pkgfile b/base/sg3_utils/Pkgfile
index d9ca8a8ea..9f882f562 100644
--- a/base/sg3_utils/Pkgfile
+++ b/base/sg3_utils/Pkgfile
@@ -1,4 +1,4 @@
-# Decription: Utilitaires génériques SCSI
+# Description: Utilitaires génériques SCSI
# URL: http://sg.danny.cz/sg/sg3_utils.html
# Maintainer: NuTyX core team
# Packager: lesibel at free dot fr
diff --git a/extra/brltty/Pkgfile b/extra/brltty/Pkgfile
index 37fc53b82..78529f6ce 100644
--- a/extra/brltty/Pkgfile
+++ b/extra/brltty/Pkgfile
@@ -1,4 +1,4 @@
-# Decription: Terminal Braille
+# Description: Terminal Braille
# URL: http://mielke.cc/brltty
# Maintainer: NuTyX core team
# Packager: lesibel at free dot fr
diff --git a/extra/fftw/Pkgfile b/extra/fftw/Pkgfile
index bc38cdc0f..b29e9c410 100644
--- a/extra/fftw/Pkgfile
+++ b/extra/fftw/Pkgfile
@@ -1,4 +1,4 @@
-# Decription: A library for computing the discrete Fourier transform
+# Description: A library for computing the discrete Fourier transform
# URL: http://www.fftw.org/
# Maintainer: NuTyX core team
# Packager: lesibel at free dot fr
diff --git a/extra/libmspack/Pkgfile b/extra/libmspack/Pkgfile
index 5fd88157d..5b1cf373a 100644
--- a/extra/libmspack/Pkgfile
+++ b/extra/libmspack/Pkgfile
@@ -1,4 +1,4 @@
-# Description: ""
+# Description: Librairie pour les formats de Microsoft compressés
# URL: http://www.cabextract.org.uk/libmspack/
# Maintainer: NuTyX core team
# Packager: lesibel at free dot fr
diff --git a/extra/rpmextract/Pkgfile b/extra/rpmextract/Pkgfile
index 2ede3971d..b2224fa87 100755
--- a/extra/rpmextract/Pkgfile
+++ b/extra/rpmextract/Pkgfile
@@ -1,4 +1,4 @@
-# Description:
+# Description: Pour extraire le contenu des paquets RPM
# URL: http://checkgmail.sourceforge.net/
# Maintainer: NutyX core team
# Packager: lesibel at free dot fr
diff --git a/extra/simple-scan/Pkgfile b/extra/simple-scan/Pkgfile
index d7baa14d4..f725c8ca0 100644
--- a/extra/simple-scan/Pkgfile
+++ b/extra/simple-scan/Pkgfile
@@ -1,4 +1,4 @@
-# Decription: Interface simple pour scanner
+# Description: Interface simple pour scanner
# URL: https://launchpad.net/simple-scan/
# Maintainer: NuTyX core team
# Packager: lesibel at free dot fr
diff --git a/kde/libdbusmenu-qt/Pkgfile b/kde/libdbusmenu-qt/Pkgfile
index d7cb61ad3..e952b9d66 100644
--- a/kde/libdbusmenu-qt/Pkgfile
+++ b/kde/libdbusmenu-qt/Pkgfile
@@ -1,4 +1,4 @@
-# Decription: Librairie nécessaire pour implémenter dbus sous Qt
+# Description: Librairie nécessaire pour implémenter dbus sous Qt
# URL: http://people.canonical.com/~agateau/dbusmenu/
# Maintainer: NuTyX core team
# Packager: lesibel at free dot fr