From 7f82f589a750e58475958f12f16a67e4b970d1a3 Mon Sep 17 00:00:00 2001
From: Valeriy Timchenko <ValTimchenko@gmail.com>
Date: Tue, 28 Dec 2010 23:51:37 -0200
Subject: office/org-mode: Updated for version 7.4.

Signed-off-by: Niels Horn <niels.horn@slackbuilds.org>
---
 office/org-mode/README              | 31 ++++++++++++++++---------------
 office/org-mode/org-mode.SlackBuild |  4 +++-
 office/org-mode/org-mode.info       |  8 ++++----
 office/org-mode/slack-desc          |  2 +-
 4 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/office/org-mode/README b/office/org-mode/README
index 25f5db92c7..ca97958eca 100644
--- a/office/org-mode/README
+++ b/office/org-mode/README
@@ -1,17 +1,18 @@
-Org is an Emacs mode for keeping notes, maintaining TODO lists, and doing 
-project planning with a fast and effective plain-text system.
+Org is  an Emacs mode for  keeping notes, maintaining  TODO lists, and
+doing project planning with a fast and effective plain-text system.
 
-Org keeps simple things simple.  When first fired up, it should feel like a 
-straightforward, easy to use outliner.  Complexity is not imposed, but a 
-large amount of functionality is available when you need it.  Org is a 
-toolbox and can be used in different ways, for example as:
+Org keeps  simple things simple. When  first fired up,  it should feel
+like  a  straightforward, easy  to  use  outliner.  Complexity is  not
+imposed, but  a large  amount of functionality  is available  when you
+need  it. Org is  a toolbox  and can  be used  in different  ways, for
+example as:
 
-* an outline extension with visibility cycling and structure editing
-* an ASCII system and table editor for taking structured notes
-* an ASCII table editor with spreadsheet-like capabilities
-* a TODO list editor
-* a full agenda and planner with deadlines and work scheduling
-* an environment to implement David Allen's GTD system
-* a basic database application
-* a simple hypertext system, with HTML and LaTeX export
-* a publishing tool to create a set of interlinked webpages
+- an outline extension with visibility cycling and structure editing
+- an ASCII system and table editor for taking structured notes
+- an ASCII table editor with spreadsheet-like capabilities
+- a TODO list editor
+- a full agenda and planner with deadlines and work scheduling
+- an environment to implement David Allen's GTD system
+- a basic database application
+- a simple hypertext system, with HTML and LaTeX export
+- a publishing tool to create a set of interlinked webpages
diff --git a/office/org-mode/org-mode.SlackBuild b/office/org-mode/org-mode.SlackBuild
index 19269eec46..64bfa6891d 100644
--- a/office/org-mode/org-mode.SlackBuild
+++ b/office/org-mode/org-mode.SlackBuild
@@ -5,7 +5,7 @@
 # Written by Valeriy Timchenko <ValTimchenko@gmail.com>
 
 PRGNAM=org-mode
-VERSION=${VERSION:-7.02}
+VERSION=${VERSION:-7.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -61,6 +61,8 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
 
 rm -f $PKG/usr/info/dir
 gzip -9 $PKG/usr/info/*
+# Move org.gz to org-$VERSION.gz, so EMACS's org.gz won't be overwritten
+mv $PKG/usr/info/{org,org-$VERSION}.gz
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
diff --git a/office/org-mode/org-mode.info b/office/org-mode/org-mode.info
index d4ec5c3188..655120ed43 100644
--- a/office/org-mode/org-mode.info
+++ b/office/org-mode/org-mode.info
@@ -1,10 +1,10 @@
 PRGNAM="org-mode"
-VERSION="7.02"
+VERSION="7.4"
 HOMEPAGE="http://orgmode.org"
-DOWNLOAD="http://orgmode.org/org-7.02.tar.gz"
-MD5SUM="02ef12a1e7b129de57752fefd73c5383"
+DOWNLOAD="http://orgmode.org/org-7.4.tar.gz"
+MD5SUM="88975d9202dfdfd7d66d238a31820fe7"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Valeriy Timchenko"
 EMAIL="ValTimchenko@gmail.com"
-APPROVED="rworkman"
+APPROVED="Niels Horn"
diff --git a/office/org-mode/slack-desc b/office/org-mode/slack-desc
index aaf08840cd..21de59c07e 100644
--- a/office/org-mode/slack-desc
+++ b/office/org-mode/slack-desc
@@ -12,7 +12,7 @@ org-mode: Org-mode is for keeping notes, maintaining ToDo lists, doing project
 org-mode: planning, and authoring with a fast and effective plain-text system. 
 org-mode:
 org-mode: "If humans could mate with software, I'd have org-mode's babies."
-org-mode:  -- Chris League on his Twitter feed
+org-mode:                                   Chris League on his Twitter feed.
 org-mode:
 org-mode: Org-mode home page is: http://orgmode.org
 org-mode:
-- 
cgit v1.2.3