From 0dbb650839f6fef8214c9510cb4fcb85e04b1218 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 24 May 2009 03:47:19 +0200 Subject: [PATCH] various fixes and upgrades --- packages/other/module-init-tools/url | 2 +- packages/toolchain/devel/cmake/install | 1 - packages/x11/app/xinit/install | 2 +- packages/x11/app/xwd/install | 3 +++ packages/x11/app/xwd/scripts/{screenshot.sh => screenshot} | 2 ++ 5 files changed, 7 insertions(+), 3 deletions(-) rename packages/x11/app/xwd/scripts/{screenshot.sh => screenshot} (94%) mode change 100644 => 100755 diff --git a/packages/other/module-init-tools/url b/packages/other/module-init-tools/url index 3ad2fb0f77..e966721847 100644 --- a/packages/other/module-init-tools/url +++ b/packages/other/module-init-tools/url @@ -1 +1 @@ -http://ftp.ch.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-3.6.tar.bz2 +http://ftp.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-3.8.tar.bz2 diff --git a/packages/toolchain/devel/cmake/install b/packages/toolchain/devel/cmake/install index 88c1e729e2..61e9ef0b5e 100755 --- a/packages/toolchain/devel/cmake/install +++ b/packages/toolchain/devel/cmake/install @@ -3,7 +3,6 @@ . config/options cp $PKG_BUILD/bin/cmake \ - $PKG_BUILD/bin/ccmake \ $PKG_BUILD/bin/cpack \ $PKG_BUILD/bin/ctest \ $ROOT/$TOOLCHAIN/bin diff --git a/packages/x11/app/xinit/install b/packages/x11/app/xinit/install index 3581ea570d..6ffdd4a68f 100755 --- a/packages/x11/app/xinit/install +++ b/packages/x11/app/xinit/install @@ -11,4 +11,4 @@ chmod +x $INSTALL/usr/bin/startx mkdir -p $INSTALL/usr/lib/X11/xinit/ cp -PR $PKG_DIR/scripts/xinitrc $INSTALL/usr/lib/X11/xinit/ -cp -PR $PKG_DIR/scripts/xserverrc $INSTALL/usr/lib/X11/xinit/ \ No newline at end of file +cp -PR $PKG_DIR/scripts/xserverrc $INSTALL/usr/lib/X11/xinit/ diff --git a/packages/x11/app/xwd/install b/packages/x11/app/xwd/install index 916f28304e..a23f46fc41 100755 --- a/packages/x11/app/xwd/install +++ b/packages/x11/app/xwd/install @@ -2,5 +2,8 @@ . config/options +PKG_DIR=`find $PACKAGES -type d -name $1` + mkdir -p $INSTALL/usr/bin cp -PR $PKG_BUILD/$1 $INSTALL/usr/bin +cp -PR $PKG_DIR/scripts/screenshot $INSTALL/usr/bin diff --git a/packages/x11/app/xwd/scripts/screenshot.sh b/packages/x11/app/xwd/scripts/screenshot old mode 100644 new mode 100755 similarity index 94% rename from packages/x11/app/xwd/scripts/screenshot.sh rename to packages/x11/app/xwd/scripts/screenshot index 99becafd9b..4cd022e5cb --- a/packages/x11/app/xwd/scripts/screenshot.sh +++ b/packages/x11/app/xwd/scripts/screenshot @@ -4,6 +4,8 @@ # # Author Tómas Edwardsson +. /etc/sysconfig + [ -f $HOME/noscreenshot ] && exit