Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ethan Grammatikidis (7358256c223de9e5eebcc872322f1aeb6d767856)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ethan Grammatikidis <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ethan Grammatikidis (7358256c223de9e5eebcc872322f1aeb6d767856)
  • Date: Sun, 12 Oct 2008 16:59:26 -0500

GIT changes to master grimoire by Ethan Grammatikidis <eekee57 AT fastmail.fm>:

kde4-apps/FUNCTIONS | 10 +++++-----
kde4-look/FUNCTIONS | 8 ++++----
kde4/FUNCTIONS | 8 ++++----
kde4/HISTORY | 6 ++++++
kde4/kde4-l10n/BUILD | 2 +-
kde4/kde4-l10n/HISTORY | 3 +++
kde4/kdebase-workspace4/HISTORY | 5 +++++
kde4/kdebase-workspace4/init.d/kdm4 | 2 +-
kde4/kdebase-workspace4/kde4.desktop | 4 ++--
kde4/kdebase-workspace4/kde4.sh | 2 +-
10 files changed, 32 insertions(+), 18 deletions(-)

New commits:
commit dd31695da20064d95126cfec5e602a3eb9ac0393
Author: Ethan Grammatikidis <eekee57 AT fastmail.fm>
Commit: Ethan Grammatikidis <eekee57 AT fastmail.fm>

kde4: changed install for proper use of /opt

diff --git a/kde4-apps/FUNCTIONS b/kde4-apps/FUNCTIONS
index 4034f5b..f928a2e 100755
--- a/kde4-apps/FUNCTIONS
+++ b/kde4-apps/FUNCTIONS
@@ -3,7 +3,7 @@ prepare_environment() {
PATH="$QTDIR/bin/qt4:$PATH" &&

persistent_add KDE4DIR &&
- KDE4DIR="$INSTALL_ROOT/opt" &&
+ KDE4DIR="$INSTALL_ROOT/opt/kde4" &&

PATH="$KDE4DIR/bin:$PATH" &&
LD_LIBRARY_PATH="$KDE4DIR/lib:$LD_LIBRARY_PATH" &&
@@ -37,9 +37,9 @@ default_install() {
update_databases() {

source /etc/profile.d/strigi.sh
- update-mime-database /opt/share/mime/
- if [[ -e /opt/share/desktop-directories ]]; then
- update-desktop-database /opt/share/desktop-directories
+ update-mime-database $KDE4DIR/share/mime/
+ if [[ -e $KDE4DIR/share/desktop-directories ]]; then
+ update-desktop-database $KDE4DIR/share/desktop-directories
fi
}

@@ -61,7 +61,7 @@ if [ $VERSION == svn ];then
# svn version has incomplete CMakeLists.txt,
# as it was intended to be part of a larger unit, so fix it!
sed -i '1 a \
-set(CMAKE_MODULE_PATH /opt/share/apps/cmake/modules) \
+set(CMAKE_MODULE_PATH $KDE4DIR/share/apps/cmake/modules) \
find_package(KDE4 REQUIRED) \
include(KDE4Defaults) \
include(MacroLibrary) \
diff --git a/kde4-look/FUNCTIONS b/kde4-look/FUNCTIONS
index 80904c2..303fe79 100755
--- a/kde4-look/FUNCTIONS
+++ b/kde4-look/FUNCTIONS
@@ -3,7 +3,7 @@ prepare_environment() {
PATH="$QTDIR/bin/qt4:$PATH" &&

persistent_add KDE4DIR &&
- KDE4DIR="$INSTALL_ROOT/opt" &&
+ KDE4DIR="$INSTALL_ROOT/opt/kde4" &&

PATH="$KDE4DIR/bin:$PATH" &&
LD_LIBRARY_PATH="$KDE4DIR/lib:$LD_LIBRARY_PATH" &&
@@ -37,9 +37,9 @@ default_install() {
update_databases() {

source /etc/profile.d/strigi.sh
- update-mime-database /opt/share/mime/
- if [[ -e /opt/share/desktop-directories ]]; then
- update-desktop-database /opt/share/desktop-directories
+ update-mime-database $KDE4DIR/share/mime/
+ if [[ -e $KDE4DIR/share/desktop-directories ]]; then
+ update-desktop-database $KDE4DIR/share/desktop-directories
fi
}

diff --git a/kde4/FUNCTIONS b/kde4/FUNCTIONS
index 6318469..e11f47e 100755
--- a/kde4/FUNCTIONS
+++ b/kde4/FUNCTIONS
@@ -3,7 +3,7 @@ prepare_environment() {
PATH="$QTDIR/bin/qt4:$PATH" &&

persistent_add KDE4DIR &&
- KDE4DIR="$INSTALL_ROOT/opt" &&
+ KDE4DIR="$INSTALL_ROOT/opt/kde4" &&

PATH="$KDE4DIR/bin:$PATH" &&
LD_LIBRARY_PATH="$KDE4DIR/lib:$LD_LIBRARY_PATH" &&
@@ -53,9 +53,9 @@ default_install() {
update_databases() {

source /etc/profile.d/strigi.sh
- update-mime-database /opt/share/mime/
- if [[ -e /opt/share/desktop-directories ]]; then
- update-desktop-database /opt/share/desktop-directories
+ update-mime-database $KDE4DIR/share/mime/
+ if [[ -e $KDE4DIR/share/desktop-directories ]]; then
+ update-desktop-database $KDE4DIR/share/desktop-directories
fi
}

diff --git a/kde4/HISTORY b/kde4/HISTORY
index 363132a..832d29c 100644
--- a/kde4/HISTORY
+++ b/kde4/HISTORY
@@ -1,3 +1,9 @@
+2008-10-12 Ethan Grammatikidis <eekee57 AT fastmail.fm>
+ * kde4-apps/FUNCTIONS, kde4-look/FUNCTIONS, kde4/FUNCTIONS:
+ FHS compliance:
+ Changed hard-coding of /opt/share to $KDEBASE/share
+ Changed definition of $KDEBASE to ${INSTALL_ROOT}/opt/kde4
+
2008-09-23 Eric Sandall <sandalle AT sourcemage.org>
* KDE_DEPENDS: kdelibs4 depends on phonon in stable branch as well
kdebase-workspace4 depends on kdelibs4
diff --git a/kde4/kde4-l10n/BUILD b/kde4/kde4-l10n/BUILD
index e4e4f52..58ec720 100755
--- a/kde4/kde4-l10n/BUILD
+++ b/kde4/kde4-l10n/BUILD
@@ -2,7 +2,7 @@ QTDIR=$INSTALL_ROOT/usr &&
PATH=$QTDIR/bin/qt4:$PATH &&

persistent_add KDE4DIR &&
-KDE4DIR=$INSTALL_ROOT/opt &&
+KDE4DIR=$INSTALL_ROOT/opt/kde4 &&

PATH=$KDE4DIR/bin:$PATH &&
LD_LIBRARY_PATH=$KDE4DIR/lib:$LD_LIBRARY_PATH &&
diff --git a/kde4/kde4-l10n/HISTORY b/kde4/kde4-l10n/HISTORY
index 1318f90..89cbca5 100644
--- a/kde4/kde4-l10n/HISTORY
+++ b/kde4/kde4-l10n/HISTORY
@@ -1,3 +1,6 @@
+2008-10-12 Ethan Grammatikidis <eekee57 AT fastmail.fm>
+ * BUILD: /opt -> /opt/kde4 for FHS compliance
+
2008-10-03 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 4.1.2

diff --git a/kde4/kdebase-workspace4/HISTORY b/kde4/kdebase-workspace4/HISTORY
index c8e74cd..31b6368 100644
--- a/kde4/kdebase-workspace4/HISTORY
+++ b/kde4/kdebase-workspace4/HISTORY
@@ -1,3 +1,8 @@
+2008-10-12 Ethan Grammatikidis <eekee57 AT fastmail.fm>
+ * init.d/kdm4: /opt/bin/kdm -> /opt/kde4/bin/kdm
+ * kde4.desktop: /opt/bin -> /opt/kde4/bin
+ * kde4.sh: KDEDIR=/opt -> KDEDIR=/opt/kde4
+
2008-10-10 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 4.1.69

diff --git a/kde4/kdebase-workspace4/init.d/kdm4
b/kde4/kdebase-workspace4/init.d/kdm4
index 815445a..d60e7b1 100755
--- a/kde4/kdebase-workspace4/init.d/kdm4
+++ b/kde4/kdebase-workspace4/init.d/kdm4
@@ -1,6 +1,6 @@
#!/bin/sh

-PROGRAM=/opt/bin/kdm
+PROGRAM=/opt/kde4/bin/kdm
RUNLEVEL=5
PROVIDES=display_manager
NEEDS="smgl-messagebus"
diff --git a/kde4/kdebase-workspace4/kde4.desktop
b/kde4/kdebase-workspace4/kde4.desktop
index 9337d54..7f49c0e 100644
--- a/kde4/kdebase-workspace4/kde4.desktop
+++ b/kde4/kdebase-workspace4/kde4.desktop
@@ -2,8 +2,8 @@
Encoding=UTF-8
Name=KDE4
Comment=This session logs you into KDE4
-Exec=/opt/bin/startkde
-TryExec=/opt/bin/startkde
+Exec=/opt/kde4/bin/startkde
+TryExec=/opt/kde4/bin/startkde
# no icon yet, only the top three are currently used
Icon=
Type=Application
diff --git a/kde4/kdebase-workspace4/kde4.sh b/kde4/kdebase-workspace4/kde4.sh
index 30d058b..a977d8f 100644
--- a/kde4/kdebase-workspace4/kde4.sh
+++ b/kde4/kdebase-workspace4/kde4.sh
@@ -3,7 +3,7 @@ if [ "$USER" != "root" ];then
# setup KDE4 environment for SMGL

export PATH=/usr/bin/qt4:$PATH
-export KDEDIR=/opt
+export KDEDIR=/opt/kde4
export KDEDIRS=$KDEDIR
export KDE_DATA_DIRS=$KDEDIR/share
export PATH=$KDEDIR/bin:$PATH



  • [SM-Commit] GIT changes to master grimoire by Ethan Grammatikidis (7358256c223de9e5eebcc872322f1aeb6d767856), Ethan Grammatikidis, 10/12/2008

Archive powered by MHonArc 2.6.24.

Top of Page