Author: ranger
Date: Sat Aug 30 20:42:52 2008
New Revision: 1231

URL: 
<http://svn.finkproject.org/websvn/listing.php?sc=1&rev=1231&repname=user%3a+ranger>
Log:
more fixes

Modified:
    trunk/experimental/10.4/main/finkinfo/kde/kdebase4-workspace.info
    trunk/experimental/10.4/main/finkinfo/kde/kdelibs4.info
    trunk/experimental/common/main/finkinfo/devel/automoc.info
    trunk/experimental/common/main/finkinfo/devel/kde4-buildenv.info
    trunk/experimental/common/main/finkinfo/kde/kdebase4-workspace.info
    trunk/experimental/common/main/finkinfo/kde/kdelibs4.info
    trunk/experimental/common/main/finkinfo/libs/akonadi.info
    trunk/experimental/common/main/finkinfo/libs/phonon.info

Modified: trunk/experimental/10.4/main/finkinfo/kde/kdebase4-workspace.info
URL: 
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/main/finkinfo/kde/kdebase4-workspace.info&rev=1231&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/kde/kdebase4-workspace.info (original)
+++ trunk/experimental/10.4/main/finkinfo/kde/kdebase4-workspace.info Sat Aug 
30 20:42:52 2008
@@ -20,6 +20,7 @@
        cyrus-sasl2-dev,
        dbus-dev (>= 1.2.0-1),
        expat1,
+       fink (>= 0.26.0-1),
        fontconfig2-dev (>= 2.4.1-1),
        freetype219 (>= 2.3.5-1),
        gettext-tools,

Modified: trunk/experimental/10.4/main/finkinfo/kde/kdelibs4.info
URL: 
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/main/finkinfo/kde/kdelibs4.info&rev=1231&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/kde/kdelibs4.info (original)
+++ trunk/experimental/10.4/main/finkinfo/kde/kdelibs4.info Sat Aug 30 20:42:52 
2008
@@ -1,4 +1,4 @@
-Info3: <<
+Info2: <<
 Package: kdelibs4-%type_pkg[kde]
 Version: 4.1.1
 Revision: 1
@@ -238,20 +238,20 @@
 <<
 
 PostInstScript: <<
-if [ -e "%p/etc/xdg/menus/applications.menu" ] && [ ! -L 
"%p/etc/xdg/menus/applications.menu" ]; then
-       mv "%p/etc/xdg/menus/applications.menu" 
"%p/etc/xdg/menus/applications.menu.bak"
-fi
-update-alternatives --install "%p/etc/xdg/menus/applications.menu" 
"applications.menu" "%p/etc/xdg/menus/kde4-%type_pkg[kde]-applications.menu" 40
-# can't run this in postinst, has to have an X11 instance running  :(
+       if [ -e "%p/etc/xdg/menus/applications.menu" ] && [ ! -L 
"%p/etc/xdg/menus/applications.menu" ]; then
+               mv "%p/etc/xdg/menus/applications.menu" 
"%p/etc/xdg/menus/applications.menu.bak"
+       fi
+       update-alternatives --install "%p/etc/xdg/menus/applications.menu" 
"applications.menu" "%p/etc/xdg/menus/kde4-%type_pkg[kde]-applications.menu" 40
+       # can't run this in postinst, has to have an X11 instance running  :(
 #      env KDEDIR= KDEDIRS= HOME=/tmp XDG_CACHE_HOME=/tmp/kb$$/cache 
XDG_CONFIG_HOME=/tmp/kb$$/config \
 #              XDG_DATA_HOME=/tmp/kb$$/share HISTFILE=/tmp/kb$$/.bash_history 
USER=root LOGNAME=root PATH="%p/lib/kde4-%type_pkg[kde]/bin:$PATH" \
 #              %p/lib/kde4-%type_pkg[kde]/bin/kbuildsycoca --global 
--noincremental --nosignal >/tmp/kbuildsycoca.$$ 2>&1 || :
 <<
 PostRmScript: <<
-if [ -e "%p/etc/xdg/menus/applications.menu" ] && [ ! -L 
"%p/etc/xdg/menus/applications.menu" ]; then
-       mv "%p/etc/xdg/menus/applications.menu" 
"%p/etc/xdg/menus/applications.menu.bak"
-fi
-update-alternatives --remove "applications.menu" 
"%p/etc/xdg/menus/kde4-%type_pkg[kde]-applications.menu"
+       if [ -e "%p/etc/xdg/menus/applications.menu" ] && [ ! -L 
"%p/etc/xdg/menus/applications.menu" ]; then
+               mv "%p/etc/xdg/menus/applications.menu" 
"%p/etc/xdg/menus/applications.menu.bak"
+       fi
+       update-alternatives --remove "applications.menu" 
"%p/etc/xdg/menus/kde4-%type_pkg[kde]-applications.menu"
 <<
 
 DescDetail: Libraries for the K Desktop Environment.

Modified: trunk/experimental/common/main/finkinfo/devel/automoc.info
URL: 
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/devel/automoc.info&rev=1231&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/devel/automoc.info (original)
+++ trunk/experimental/common/main/finkinfo/devel/automoc.info Sat Aug 30 
20:42:52 2008
@@ -31,7 +31,7 @@
 CompileScript: <<
 #!/bin/sh -ev
 
-       export KDE4_PREFIX="%p" KDE4_TYPE="%type_pkg[kde]"
+       export KDE4_PREFIX="%p" KDE4_TYPE="%type_pkg[automoc]" 
KDE4_INSTALL_PREFIX="%p/lib/%type_pkg[automoc]"
        . %p/sbin/kde4-buildenv.sh
 
        mkdir -p build

Modified: trunk/experimental/common/main/finkinfo/devel/kde4-buildenv.info
URL: 
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/devel/kde4-buildenv.info&rev=1231&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/devel/kde4-buildenv.info (original)
+++ trunk/experimental/common/main/finkinfo/devel/kde4-buildenv.info Sat Aug 30 
20:42:52 2008
@@ -10,7 +10,7 @@
        nam-CA: http://www.southofheaven.net/befunk
 <<
 Source: mirror:custom:%n/%n-%v-%r.sh
-Source-MD5: f3984f80eb1bbdd19bdbf5a7e3800c4b
+Source-MD5: aed51586b471aceba1143df4a0a2e65b
 NoSourceDirectory: true
 
 CompileScript: echo "none"

Modified: trunk/experimental/common/main/finkinfo/kde/kdebase4-workspace.info
URL: 
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/kde/kdebase4-workspace.info&rev=1231&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/kde/kdebase4-workspace.info 
(original)
+++ trunk/experimental/common/main/finkinfo/kde/kdebase4-workspace.info Sat Aug 
30 20:42:52 2008
@@ -20,6 +20,7 @@
        cyrus-sasl2-dev,
        dbus-dev (>= 1.2.0-1),
        expat1,
+       fink (>= 0.28.0-1),
        fontconfig2-dev (>= 2.4.1-1),
        freetype219 (>= 2.3.5-1),
        gettext-tools,

Modified: trunk/experimental/common/main/finkinfo/kde/kdelibs4.info
URL: 
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/kde/kdelibs4.info&rev=1231&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/kde/kdelibs4.info (original)
+++ trunk/experimental/common/main/finkinfo/kde/kdelibs4.info Sat Aug 30 
20:42:52 2008
@@ -1,4 +1,4 @@
-Info3: <<
+Info2: <<
 Package: kdelibs4-%type_pkg[kde]
 Version: 4.1.1
 Revision: 1
@@ -23,7 +23,7 @@
        dbus-dev (>= 1.2.0-1),
        enchant1-dev,
        expat1,
-       fink (>= 0.28),
+       fink (>= 0.28.0-1),
        freetype219 (>= 2.3.5-1),
        gettext-tools,
        giflib,

Modified: trunk/experimental/common/main/finkinfo/libs/akonadi.info
URL: 
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/libs/akonadi.info&rev=1231&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/libs/akonadi.info (original)
+++ trunk/experimental/common/main/finkinfo/libs/akonadi.info Sat Aug 30 
20:42:52 2008
@@ -31,7 +31,7 @@
 CompileScript: <<
 #!/bin/sh -ev
 
-       export KDE4_PREFIX="%p" KDE4_TYPE="%type_pkg[akonadi]"
+       export KDE4_PREFIX="%p" KDE4_TYPE="%type_pkg[akonadi]" 
KDE4_INSTALL_PREFIX="%p/lib/%type_pkg[akonadi]"
        . %p/sbin/kde4-buildenv.sh
 
        mkdir build

Modified: trunk/experimental/common/main/finkinfo/libs/phonon.info
URL: 
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/libs/phonon.info&rev=1231&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/libs/phonon.info (original)
+++ trunk/experimental/common/main/finkinfo/libs/phonon.info Sat Aug 30 
20:42:52 2008
@@ -45,7 +45,7 @@
 CompileScript: <<
 #!/bin/sh -ev
 
-       export KDE4_PREFIX="%p" KDE4_TYPE="%type_pkg[phonon]"
+       export KDE4_PREFIX="%p" KDE4_TYPE="%type_pkg[phonon]" 
KDE4_INSTALL_PREFIX="%p/lib/%type_pkg[phonon]"
        . %p/sbin/kde4-buildenv.sh
        export CMAKE_INCLUDE_PATH="%b/../qt-copy/include:$CMAKE_INCLUDE_PATH"
 


-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to