Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pieter Lenaerts (787818058442f953f9a67107a6241e581c152e13)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Pieter Lenaerts (787818058442f953f9a67107a6241e581c152e13)

Chronological Thread  
    < Chronological >       < Thread >
  • From: Pieter Lenaerts <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Pieter Lenaerts (787818058442f953f9a67107a6241e581c152e13)
  • Date: Sun, 27 Aug 2006 09:50:17 -0500
GIT changes to master grimoire by Pieter Lenaerts <e-type AT sourcemage.org>:

shell-term-fm/rox/BUILD | 2 -
shell-term-fm/rox/DETAILS | 6 ++--
shell-term-fm/rox/FINAL | 1
shell-term-fm/rox/HISTORY | 9 ++++++
shell-term-fm/rox/INSTALL | 47
+++++++++++++++++++++++++++------
shell-term-fm/rox/POST_REMOVE | 1
shell-term-fm/rox/PRE_BUILD | 6 ++++
shell-term-fm/shared-mime-info/BUILD | 5 ++-
shell-term-fm/shared-mime-info/DETAILS | 1
shell-term-fm/shared-mime-info/FINAL | 1
shell-term-fm/shared-mime-info/HISTORY | 5 +++
11 files changed, 69 insertions(+), 15 deletions(-)

New commits:
commit 787818058442f953f9a67107a6241e581c152e13
Author: Pieter Lenaerts <e-type AT sourcemage.org>
Commit: Pieter Lenaerts <e-type AT sourcemage.org>

shared-mime-info: stage root ready

commit 7723dab1009d4a2b640b259aa05cd6a090d9d27c
Author: Pieter Lenaerts <e-type AT sourcemage.org>
Commit: Pieter Lenaerts <e-type AT sourcemage.org>

rox: got stage rooting right

commit b983ff3daa3381687c713714675dc7b515735f0e
Author: Pieter Lenaerts <e-type AT sourcemage.org>
Commit: Pieter Lenaerts <e-type AT sourcemage.org>

rox: updated and stage install and install root proof... I think => WIP
until sure"

"

diff --git a/shell-term-fm/rox/BUILD b/shell-term-fm/rox/BUILD
index c334b28..20d3702 100755
--- a/shell-term-fm/rox/BUILD
+++ b/shell-term-fm/rox/BUILD
@@ -1 +1 @@
-ROX-Filer/AppRun --compile
+${SOURCE_DIRECTORY}/ROX-Filer/AppRun --compile
diff --git a/shell-term-fm/rox/DETAILS b/shell-term-fm/rox/DETAILS
index ed7de3a..646f2e4 100755
--- a/shell-term-fm/rox/DETAILS
+++ b/shell-term-fm/rox/DETAILS
@@ -1,8 +1,8 @@
SPELL=rox
- VERSION=2.4.1
- SOURCE=$SPELL-$VERSION.tgz
+ VERSION=2.5
+ SOURCE=$SPELL-filer-$VERSION.tar.bz2
SOURCE2=$SOURCE.sig
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-filer-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
SOURCE_GPG=thomas.leonard.gpg:$SOURCE.sig:ESTABLISHED_UPSTREAM_KEY
diff --git a/shell-term-fm/rox/FINAL b/shell-term-fm/rox/FINAL
new file mode 100755
index 0000000..2a2d0e3
--- /dev/null
+++ b/shell-term-fm/rox/FINAL
@@ -0,0 +1 @@
+update-mime-database ${INSTALL_ROOT}/usr/share/mime/
diff --git a/shell-term-fm/rox/HISTORY b/shell-term-fm/rox/HISTORY
index 2d8ee22..3f56c21 100644
--- a/shell-term-fm/rox/HISTORY
+++ b/shell-term-fm/rox/HISTORY
@@ -1,3 +1,12 @@
+2006-08-27 Pieter Lenaerts <e-type AT sourcemage.org>
+ * moved update_mime_database to FINAL and added POST_REMOVE sourcing
+ FINAL to ensure that the mime database is updated again after
removal
+
+2006-08-16 Pieter Lenaerts <e-type AT sourcemage.org>
+ * updated to 2.5
+ * added PRE_BUILD: needs to update configure when using old xorg
+ * INSTALL, added POST-INSTALL: now works with stage root and install
root
+
2006-06-28 Eric Sandall <eric AT sandall.us>
* DETAILS: Removed BUILD_API=2, set grimoire-wide

diff --git a/shell-term-fm/rox/INSTALL b/shell-term-fm/rox/INSTALL
index a442f63..4d2f138 100755
--- a/shell-term-fm/rox/INSTALL
+++ b/shell-term-fm/rox/INSTALL
@@ -1,9 +1,40 @@
-./install.sh << EOF
-4
-/usr/libexec/rox
-/usr/bin
-/usr/share
-/usr/share/Choices
-/usr/share/man
-y
+##
+# Create install directories
+mkdir -p ${INSTALL_ROOT}/usr/libexec/rox &&
+mkdir -p ${INSTALL_ROOT}/usr/bin &&
+mkdir -p ${INSTALL_ROOT}/usr/share/Choices/rox.sourceforge.net &&
+mkdir -p ${INSTALL_ROOT}/usr/share/man/man1 &&
+mkdir -p ${INSTALL_ROOT}/usr/share/mime/packages &&
+
+##
+# Copy files
+
+# Script in /usr/bin
+cat > "${INSTALL_ROOT}/usr/bin/rox" << EOF
+#!/bin/sh
+exec /usr/libexec/rox/ROX-Filer/AppRun "\$@"
EOF
+chmod 755 ${INSTALL_ROOT}/usr/bin/rox &&
+
+# Files in /usr/libexec
+cp -r ${SOURCE_DIRECTORY}/ROX-Filer ${INSTALL_ROOT}/usr/libexec/rox/ &&
+
+# Choices to /usr/share/Choices, must check if destination files exist
+for file in MIME-types/*; do
+ if [ -f "$file" ]; then
+ dest="${INSTALL_ROOT}/usr/share/Choices/rox.sourceforge.net/$file"
+ if [ ! -f "$dest" ]; then
+ if [ ! -d "$dest" ]; then
+ cp "$file" "$dest"
+ fi
+ fi
+ fi
+done
+
+# Man pages
+cp rox.1 ${INSTALL_ROOT}/usr/share/man/man1 &&
+ln ${INSTALL_ROOT}/usr/share/man/man1/rox.1 \
+ ${INSTALL_ROOT}/usr/share/man/man1/ROX-Filer.1
+
+# Mime types
+cp rox.xml ${INSTALL_ROOT}/usr/share/mime/packages/
diff --git a/shell-term-fm/rox/POST_REMOVE b/shell-term-fm/rox/POST_REMOVE
new file mode 100755
index 0000000..68ee785
--- /dev/null
+++ b/shell-term-fm/rox/POST_REMOVE
@@ -0,0 +1 @@
+. ${SCRIPT_DIRECTORY}/FINAL
diff --git a/shell-term-fm/rox/PRE_BUILD b/shell-term-fm/rox/PRE_BUILD
new file mode 100755
index 0000000..e20e299
--- /dev/null
+++ b/shell-term-fm/rox/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+if ! check_if_xorg_modular_libs ; then
+ cd ${SOURCE_DIRECTORY}/ROX-Filer/src &&
+ aclocal &&
+ autoconf
+fi
diff --git a/shell-term-fm/shared-mime-info/BUILD
b/shell-term-fm/shared-mime-info/BUILD
index feceeab..567222a 100755
--- a/shell-term-fm/shared-mime-info/BUILD
+++ b/shell-term-fm/shared-mime-info/BUILD
@@ -1,3 +1,4 @@
-make_single &&
-default_build &&
+make_single &&
+OPTS="$OPTS --disable-update-mimedb" &&
+default_build &&
make_normal
diff --git a/shell-term-fm/shared-mime-info/DETAILS
b/shell-term-fm/shared-mime-info/DETAILS
index 6e7932a..3d1a404 100755
--- a/shell-term-fm/shared-mime-info/DETAILS
+++ b/shell-term-fm/shared-mime-info/DETAILS
@@ -10,7 +10,6 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
LICENSE[0]=GPL
KEYWORDS="gnome console kde"
SHORT="Unify the type-guessing for GNOME, KDE and ROX"
- STAGED_INSTALL='off'
cat << EOF
Many programs and desktops use the MIME system to represent the types of
files. Frequently, it is necessary to work out the
correct MIME type for a file. This is generally done by examining the file's
name or contents, and looking up the correct
diff --git a/shell-term-fm/shared-mime-info/FINAL
b/shell-term-fm/shared-mime-info/FINAL
new file mode 100755
index 0000000..2a2d0e3
--- /dev/null
+++ b/shell-term-fm/shared-mime-info/FINAL
@@ -0,0 +1 @@
+update-mime-database ${INSTALL_ROOT}/usr/share/mime/
diff --git a/shell-term-fm/shared-mime-info/HISTORY
b/shell-term-fm/shared-mime-info/HISTORY
index 30a84cc..3f867e4 100644
--- a/shell-term-fm/shared-mime-info/HISTORY
+++ b/shell-term-fm/shared-mime-info/HISTORY
@@ -1,3 +1,8 @@
+2006-08-27 Pieter Lenaerts <e-type AT sourcemage.org>
+ * BUILD: disabled mime update
+ * added FINAL: udpates mime database
+ * DETAILS: removed staged_install=off
+
2006-08-14 Pieter Lenaerts <e-type AT sourcemage.org>
* updated to 0.18



  • [SM-Commit] GIT changes to master grimoire by Pieter Lenaerts (787818058442f953f9a67107a6241e581c152e13), Pieter Lenaerts, 08/27/2006

Archive powered by MHonArc 2.6.24.

Top of Page