summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsibel <lesibel at free dot fr>2010-07-30 08:11:52 +0200
committersibel <lesibel at free dot fr>2010-07-30 08:11:52 +0200
commit5cbbe9fb59f8409c1f2c4560b38470cc6511903e (patch)
tree91d9759c66da0d0f94427d36979502863ff78672
parenta8a70452f839147e7d812b0d249bc4c71ec7c908 (diff)
parentb071c8e7728c924212400e8424972f7873de38a3 (diff)
downloadnutyx-extra-5cbbe9fb59f8409c1f2c4560b38470cc6511903e.tar.gz
nutyx-extra-5cbbe9fb59f8409c1f2c4560b38470cc6511903e.tar.bz2
nutyx-extra-5cbbe9fb59f8409c1f2c4560b38470cc6511903e.tar.xz
nutyx-extra-5cbbe9fb59f8409c1f2c4560b38470cc6511903e.zip
Merge branch 'master' of ssh://kiao.no-ip.info:443/~/attapu
-rw-r--r--extra/dbus/.footprint6
-rwxr-xr-xextra/dbus/Pkgfile5
-rw-r--r--kde/kdelibs/.footprint1
-rwxr-xr-xkde/kdelibs/Pkgfile3
4 files changed, 9 insertions, 6 deletions
diff --git a/extra/dbus/.footprint b/extra/dbus/.footprint
index b023694d0..a32798934 100644
--- a/extra/dbus/.footprint
+++ b/extra/dbus/.footprint
@@ -9,9 +9,9 @@ drwxr-xr-x root/root etc/rc.d/
drwxr-xr-x root/root etc/rc.d/init.d/
-rwxr-xr-x root/root etc/rc.d/init.d/dbus
drwxr-xr-x root/root etc/rc.d/rc0.d/
-lrwxrwxrwx root/root etc/rc.d/rc0.d/K30dbus -> ../init.d/dbus
+lrwxrwxrwx root/root etc/rc.d/rc0.d/K85dbus -> ../init.d/dbus
drwxr-xr-x root/root etc/rc.d/rc1.d/
-lrwxrwxrwx root/root etc/rc.d/rc1.d/K30dbus -> ../init.d/dbus
+lrwxrwxrwx root/root etc/rc.d/rc1.d/K85dbus -> ../init.d/dbus
drwxr-xr-x root/root etc/rc.d/rc2.d/
lrwxrwxrwx root/root etc/rc.d/rc2.d/S20dbus -> ../init.d/dbus
drwxr-xr-x root/root etc/rc.d/rc3.d/
@@ -21,7 +21,7 @@ lrwxrwxrwx root/root etc/rc.d/rc4.d/S20dbus -> ../init.d/dbus
drwxr-xr-x root/root etc/rc.d/rc5.d/
lrwxrwxrwx root/root etc/rc.d/rc5.d/S20dbus -> ../init.d/dbus
drwxr-xr-x root/root etc/rc.d/rc6.d/
-lrwxrwxrwx root/root etc/rc.d/rc6.d/K30dbus -> ../init.d/dbus
+lrwxrwxrwx root/root etc/rc.d/rc6.d/K85dbus -> ../init.d/dbus
drwxr-xr-x root/root etc/rc.d/rcsysinit.d/
drwxr-xr-x root/root etc/sysconfig/
drwxr-xr-x root/root usr/
diff --git a/extra/dbus/Pkgfile b/extra/dbus/Pkgfile
index 85cb43749..f867858b3 100755
--- a/extra/dbus/Pkgfile
+++ b/extra/dbus/Pkgfile
@@ -6,7 +6,7 @@
name=dbus
version=1.2.24
-release=1
+release=2
source=(http://dbus.freedesktop.org/releases/dbus/$name-$version.tar.gz \
session-local.conf\
dbus)
@@ -26,4 +26,7 @@ build() {
cd ../$scripts-$scriptsversion
make DESTDIR=$PKG install-dbus
install -m755 ../dbus $PKG/etc/rc.d/init.d/
+ mv $PKG/etc/rc.d/rc0.d/K{30,85}dbus
+ mv $PKG/etc/rc.d/rc6.d/K{30,85}dbus
+ mv $PKG/etc/rc.d/rc1.d/K{30,85}dbus
}
diff --git a/kde/kdelibs/.footprint b/kde/kdelibs/.footprint
index cb0c5ea61..a74237d89 100644
--- a/kde/kdelibs/.footprint
+++ b/kde/kdelibs/.footprint
@@ -4,7 +4,6 @@ drwxr-xr-x root/root etc/dbus-1/system.d/
-rw-r--r-- root/root etc/dbus-1/system.d/org.kde.auth.conf
drwxr-xr-x root/root etc/xdg/
drwxr-xr-x root/root etc/xdg/menus/
--rw-r--r-- root/root etc/xdg/menus/applications.menu
drwxr-xr-x root/root usr/
drwxr-xr-x root/root usr/bin/
-rwxr-xr-x root/root usr/bin/checkXML
diff --git a/kde/kdelibs/Pkgfile b/kde/kdelibs/Pkgfile
index 10ace834c..b7a371fef 100755
--- a/kde/kdelibs/Pkgfile
+++ b/kde/kdelibs/Pkgfile
@@ -6,7 +6,7 @@
name=kdelibs
version=4.4.95
-release=2
+release=1
source=(ftp://ftp.kde.org/pub/kde/unstable/$version/src/$name-$version.tar.bz2)
build() {
@@ -25,5 +25,6 @@ build() {
make -j3
make DESTDIR=$PKG install
rm -r $PKG/usr/share/doc
+ rm $PKG/etc/xdg/menus/applications.menu
}