Merge branch 'master' of ssh://kiao.no-ip.info:443/~/pakxe

4 files changed, 13 insertions, 9 deletions

diff --git a/base/lvm2/.footprint b/base/lvm2/.footprint
index 5f64206f9..5245bcb62 100644
--- a/base/lvm2/.footprint
+++ b/base/lvm2/.footprint
@@ -8,15 +8,17 @@ drwx------	root/root	etc/rc.d/init.d/
 -rwxr-xr-x	root/root	etc/rc.d/init.d/lvmnodes
 drwx------	root/root	etc/rc.d/rcsysinit.d/
 lrwxrwxrwx	root/root	etc/rc.d/rcsysinit.d/S19lvmnodes -> ../init.d/lvmnodes
+drwxr-xr-x	root/root	lib/
+-r-xr-xr-x	root/root	lib/libdevmapper.so.1.02
 drwxr-xr-x	root/root	sbin/
-lrwxrwxrwx	root/root	sbin/dmsetup -> dmsetup.static
+-r-xr-xr-x	root/root	sbin/dmsetup
 -r-xr-xr-x	root/root	sbin/fsadm
 lrwxrwxrwx	root/root	sbin/lvchange -> lvm
 lrwxrwxrwx	root/root	sbin/lvconvert -> lvm
 lrwxrwxrwx	root/root	sbin/lvcreate -> lvm
 lrwxrwxrwx	root/root	sbin/lvdisplay -> lvm
 lrwxrwxrwx	root/root	sbin/lvextend -> lvm
-lrwxrwxrwx	root/root	sbin/lvm -> lvm.static
+-r-xr-xr-x	root/root	sbin/lvm
 lrwxrwxrwx	root/root	sbin/lvmchange -> lvm
 -r-xr-xr-x	root/root	sbin/lvmconf
 lrwxrwxrwx	root/root	sbin/lvmdiskscan -> lvm
@@ -58,6 +60,8 @@ lrwxrwxrwx	root/root	sbin/vgs -> lvm
 lrwxrwxrwx	root/root	sbin/vgscan -> lvm
 lrwxrwxrwx	root/root	sbin/vgsplit -> lvm
 drwxr-xr-x	root/root	usr/
+drwxr-xr-x	root/root	usr/include/
+-r--r--r--	root/root	usr/include/libdevmapper.h
 drwxr-xr-x	root/root	usr/lib/
 lrwxrwxrwx	root/root	usr/lib/libdevmapper.so -> ../../lib/libdevmapper.so.1.02
 drwxr-xr-x	root/root	usr/share/
diff --git a/base/lvm2/Pkgfile b/base/lvm2/Pkgfile
index a9c3b2fcd..0751e305d 100644
--- a/base/lvm2/Pkgfile
+++ b/base/lvm2/Pkgfile
@@ -5,7 +5,7 @@
 
 name=lvm2
 version=2.02.79
-release=1
+release=2
 source=(ftp://sources.redhat.com/pub/lvm2/LVM2.$version.tgz\
 	lvmnodes)
 build() {
@@ -26,10 +26,10 @@ build() {
 	install -d -m 1777 $PKG/var/lock
 	install -d -m 0700 $PKG/var/lock/lvm
 	# devel in device-mapper
-	rm -r $PKG/{lib,usr/include}
-	rm $PKG/sbin/{lvm,dmsetup}
-	ln -s lvm.static $PKG/sbin/lvm
-	ln -s dmsetup.static $PKG/sbin/dmsetup
+	# rm -r $PKG/{lib,usr/include}
+	# rm $PKG/sbin/{lvm,dmsetup}
+	# ln -s lvm.static $PKG/sbin/lvm
+	# ln -s dmsetup.static $PKG/sbin/dmsetup
 }
 
 
diff --git a/extra/networkmanager/Pkgfile b/extra/networkmanager/Pkgfile
index fa6b9d8e8..4bf0eb7ea 100644
--- a/extra/networkmanager/Pkgfile
+++ b/extra/networkmanager/Pkgfile
@@ -3,7 +3,7 @@
 # Maintainer: NuTyX core team
 # Packager: thierryn1 at hispeed dot ch
 # Depends on: wpa_supplicant, dbus-glib, hal, intltool, libnl, policykit, nss, wireless_tools, ppp, nss, polkit, iptables
-# Run on: wpa_supplicant,dbus-glib,hal,intltool,libnl,policykit,nss,wireless_tools,ppp,nss,polkit,iptables
+# Run on: wpa_supplicant,dbus-glib,hal,intltool,libnl,policykit,nss,wireless_tools,ppp,nss,polkit
 
 name=networkmanager
 version=0.8.2
diff --git a/kde/kde/Pkgfile b/kde/kde/Pkgfile
index 317f0e7f2..bad9f83ca 100755
--- a/kde/kde/Pkgfile
+++ b/kde/kde/Pkgfile
@@ -3,7 +3,7 @@
 # Maintainer: NuTyX packager team
 # Packager: lesibel at free dot fr
 # Depends on: imagemagick, curl, xorg, kdelibs, kdepimlibs, kdeadmin, kdegraphics, kdenetwork, kdemultimedia, kdeutils, kde-l10n-fr, kdebase, kdebase-runtime, kdebase-workspace, kdeplasma-addons, kdegames, kipi-plugins, gtk-kde4, phonon, desktop-file-utils, shared-mime-info, nas, atk, xine-lib, taglib, qimageblitz, pilot-link, gnokii, libical, akonadi, gpgme, boost, lcms, oxygen-icons, soprano, strigi, eigen, libspectre, ede1
-# Run on: curl,ntfs-3g,qt,kdelibs,kdepimlibs,kdebase,kdeartwork,kdemultimedia,kdegraphics,kdenetwork,kdeutils,kde-l10n-fr,desktop-file-utils,nas,pilot-link,gnokii,ede1,wicd
+# Run on: curl,ntfs-3g,qt,neon,kdelibs,kdepimlibs,kdebase,kdemultimedia,kdegraphics,kdenetwork,kde-l10n-fr,desktop-file-utils,nas,pilot-link,gnokii,ede1,wicd
 
 name=kde
 version=4.6.0