Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master z-rejected grimoire by Remko van der Vossen (2348b09f85306f1b10ac0d593668fd3d450a5e53)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Remko van der Vossen <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master z-rejected grimoire by Remko van der Vossen (2348b09f85306f1b10ac0d593668fd3d450a5e53)
  • Date: Sat, 3 Jul 2010 07:06:41 -0500

GIT changes to master z-rejected grimoire by Remko van der Vossen
<wich AT sourcemage.org>:

z-http/opera/FINAL | 8 ++++++++
z-http/opera/HISTORY | 1 +
z-http/opera/INSTALL | 2 +-
3 files changed, 10 insertions(+), 1 deletion(-)

New commits:
commit 2348b09f85306f1b10ac0d593668fd3d450a5e53
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

opera: play nicely with shared mime database

diff --git a/z-http/opera/FINAL b/z-http/opera/FINAL
new file mode 100755
index 0000000..38362e7
--- /dev/null
+++ b/z-http/opera/FINAL
@@ -0,0 +1,8 @@
+if spell_ok desktop-file-utils; then
+ "$INSTALL_ROOT/usr/bin/update-desktop-database"
"$INSTALL_ROOT/usr/share/applications"
+fi &&
+if spell_ok shared-mime-info; then
+ mkdir -p "$INSTALL_ROOT/usr/share/mime/packages"
+ "$INSTALL_ROOT/usr/bin/update-mime-database" "$INSTALL_ROOT/usr/share/mime"
+ rmdir "$INSTALL_ROOT/usr/share/mime/packages" >/dev/null 2>&1
+fi
diff --git a/z-http/opera/HISTORY b/z-http/opera/HISTORY
index 11b0906..f9c8eea 100644
--- a/z-http/opera/HISTORY
+++ b/z-http/opera/HISTORY
@@ -1,6 +1,7 @@
2010-07-03 Remko van der Vossen <wich AT sourcemage.org>
* DETAILS: version 10.60
* CONFIGURE, DEPENDS, INSTALL, PREPARE: updated for new release method
+ * INSTALL, FINAL: Update desktop and mime databases outside INSTALL

2010-06-23 Remko van der Vossen <wich AT sourcemage.org>
* DETAILS: version 10.11
diff --git a/z-http/opera/INSTALL b/z-http/opera/INSTALL
index f67470c..e898c3d 100755
--- a/z-http/opera/INSTALL
+++ b/z-http/opera/INSTALL
@@ -1,5 +1,5 @@
cd $SOURCE_DIRECTORY &&
-sed -i -e "s,/usr/local,$INSTALL_ROOT/usr," install &&
+sed -i -e "s,/usr/local,$INSTALL_ROOT/usr,;"'/finalize_xdg[^(]*$/d' install
&&
./install --system --unattended &&
if [[ $OPERA_TOOLKIT != "gtk+2" ]]; then
rm -f $INSTALL_ROOT/usr/lib/opera/liboperagtk.so



  • [SM-Commit] GIT changes to master z-rejected grimoire by Remko van der Vossen (2348b09f85306f1b10ac0d593668fd3d450a5e53), Remko van der Vossen, 07/03/2010

Archive powered by MHonArc 2.6.24.

Top of Page