Author: ranger
Date: Tue Feb 19 19:06:29 2008
New Revision: 1143
URL:
<http://svn.finkproject.org/websvn/listing.php?sc=1&rev=1143&repname=user%3a+ranger>
Log:
use alternatives for kdesu so jack can package his whacky kdesu replacement
Modified:
trunk/experimental/10.4/main/finkinfo/kde/kdebase3-unified.info
trunk/experimental/common/main/finkinfo/kde/kdebase3-unified.info
Modified: trunk/experimental/10.4/main/finkinfo/kde/kdebase3-unified.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/main/finkinfo/kde/kdebase3-unified.info&rev=1143&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/kde/kdebase3-unified.info (original)
+++ trunk/experimental/10.4/main/finkinfo/kde/kdebase3-unified.info Tue Feb 19
19:06:29 2008
@@ -137,6 +137,7 @@
install -d -m 755 "%d`%p/bin/xfontpath basedir`"
mv "%i/share/apps/konsole/fonts" "%d`%p/bin/xfontpath basedir`/konsole"
+ mv "%i/bin/kdesu" "%i/bin/kdesu-kdebase"
<<
DocFiles: AUTHORS COPYING INSTALL README README.pam
SplitOff: <<
@@ -740,24 +741,30 @@
<<
PostInstScript: <<
-update-alternatives --install /etc/pam.d/kde pam.d-kde
%p/etc/pam.d/kde 50
-update-alternatives --install /etc/pam.d/kdm pam.d-kdm
%p/etc/pam.d/kdm 50
-update-alternatives --install /etc/pam.d/kcheckpass pam.d-kcheckpass
%p/etc/pam.d/kcheckpass 50
-update-alternatives --install /etc/pam.d/kscreensaver pam.d-kscreensaver
%p/etc/pam.d/kscreensaver 50
-if test -x "%p/bin/xfontpath"; then
- "%p/bin/xfontpath" --silent install konsole
+if [ configure = "$1" ]; then
+ update-alternatives --install %p/bin/kdesu kdesu
%p/bin/kdesu-kdebase 1
+ update-alternatives --install /etc/pam.d/kde pam.d-kde
%p/etc/pam.d/kde 50
+ update-alternatives --install /etc/pam.d/kdm pam.d-kdm
%p/etc/pam.d/kdm 50
+ update-alternatives --install /etc/pam.d/kcheckpass pam.d-kcheckpass
%p/etc/pam.d/kcheckpass 50
+ update-alternatives --install /etc/pam.d/kscreensaver
pam.d-kscreensaver %p/etc/pam.d/kscreensaver 50
+ if test -x "%p/bin/xfontpath"; then
+ "%p/bin/xfontpath" --silent install konsole
+ fi
+ if [ -x "%p/bin/kde-update-caches.sh" ]; then
+ %p/bin/kde-update-caches.sh >/dev/null 2>&1 || :
+ fi
fi
-if [ -x "%p/bin/kde-update-caches.sh" ]; then
- %p/bin/kde-update-caches.sh >/dev/null 2>&1 || :
-fi
<<
PreRmScript: <<
-update-alternatives --remove pam.d-kde %p/etc/pam.d/kde
-update-alternatives --remove pam.d-kdm %p/etc/pam.d/kdm
-update-alternatives --remove pam.d-kcheckpass %p/etc/pam.d/kcheckpass
-update-alternatives --remove pam.d-kscreensaver %p/etc/pam.d/kscreensaver
-if test -x "%p/bin/xfontpath"; then
- "%p/bin/xfontpath" --silent remove konsole
+if [ upgrade != "$1" ]; then
+ update-alternatives --remove kdesu %p/bin/kdesu-kdebase
+ update-alternatives --remove pam.d-kde %p/etc/pam.d/kde
+ update-alternatives --remove pam.d-kdm %p/etc/pam.d/kdm
+ update-alternatives --remove pam.d-kcheckpass %p/etc/pam.d/kcheckpass
+ update-alternatives --remove pam.d-kscreensaver
%p/etc/pam.d/kscreensaver
+ if test -x "%p/bin/xfontpath"; then
+ "%p/bin/xfontpath" --silent remove konsole
+ fi
fi
<<
Modified: trunk/experimental/common/main/finkinfo/kde/kdebase3-unified.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/kde/kdebase3-unified.info&rev=1143&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/kde/kdebase3-unified.info (original)
+++ trunk/experimental/common/main/finkinfo/kde/kdebase3-unified.info Tue Feb
19 19:06:29 2008
@@ -134,27 +134,34 @@
install -d -m 755 "%d`%p/bin/xfontpath basedir`"
mv "%i/share/apps/konsole/fonts" "%d`%p/bin/xfontpath basedir`/konsole"
+ mv "%i/bin/kdesu" "%i/bin/kdesu-kdebase"
<<
PostInstScript: <<
- update-alternatives --install /etc/pam.d/kde pam.d-kde
%p/etc/pam.d/kde 50
- update-alternatives --install /etc/pam.d/kdm pam.d-kdm
%p/etc/pam.d/kdm 50
- update-alternatives --install /etc/pam.d/kcheckpass pam.d-kcheckpass
%p/etc/pam.d/kcheckpass 50
- update-alternatives --install /etc/pam.d/kscreensaver
pam.d-kscreensaver %p/etc/pam.d/kscreensaver 50
- if test -x "%p/bin/xfontpath"; then
- "%p/bin/xfontpath" --silent install konsole
+ if [ configure = "$1" ]; then
+ update-alternatives --install %p/bin/kdesu kdesu
%p/bin/kdesu-kdebase 1
+ update-alternatives --install /etc/pam.d/kde pam.d-kde
%p/etc/pam.d/kde 50
+ update-alternatives --install /etc/pam.d/kdm pam.d-kdm
%p/etc/pam.d/kdm 50
+ update-alternatives --install /etc/pam.d/kcheckpass
pam.d-kcheckpass %p/etc/pam.d/kcheckpass 50
+ update-alternatives --install /etc/pam.d/kscreensaver
pam.d-kscreensaver %p/etc/pam.d/kscreensaver 50
+ if test -x "%p/bin/xfontpath"; then
+ "%p/bin/xfontpath" --silent install konsole
+ fi
+ if [ -x "%p/bin/kde-update-caches.sh" ]; then
+ %p/bin/kde-update-caches.sh >/dev/null 2>&1 || :
+ fi
fi
- if [ -x "%p/bin/kde-update-caches.sh" ]; then
- %p/bin/kde-update-caches.sh >/dev/null 2>&1 || :
- fi
<<
PreRmScript: <<
- update-alternatives --remove pam.d-kde %p/etc/pam.d/kde
- update-alternatives --remove pam.d-kdm %p/etc/pam.d/kdm
- update-alternatives --remove pam.d-kcheckpass %p/etc/pam.d/kcheckpass
- update-alternatives --remove pam.d-kscreensaver
%p/etc/pam.d/kscreensaver
- if test -x "%p/bin/xfontpath"; then
- "%p/bin/xfontpath" --silent remove konsole
+ if [ upgrade != "$1" ]; then
+ update-alternatives --remove kdesu
%p/bin/kdesu-kdebase
+ update-alternatives --remove pam.d-kde %p/etc/pam.d/kde
+ update-alternatives --remove pam.d-kdm %p/etc/pam.d/kdm
+ update-alternatives --remove pam.d-kcheckpass
%p/etc/pam.d/kcheckpass
+ update-alternatives --remove pam.d-kscreensaver
%p/etc/pam.d/kscreensaver
+ if test -x "%p/bin/xfontpath"; then
+ "%p/bin/xfontpath" --silent remove konsole
+ fi
fi
<<
DocFiles: AUTHORS COPYING INSTALL README README.pam
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
