From ff542adb16230d6a23204ecd9227da143d1a3814 Mon Sep 17 00:00:00 2001
From: Valeriy Timchenko <ValTimchenko@gmail.com>
Date: Tue, 31 May 2011 23:20:59 -0400
Subject: [PATCH] office/org-mode: Updated for version 7.5.

Signed-off-by: dsomero <xgizzmo@slackbuilds.org>
---
 office/org-mode/org-mode.SlackBuild | 11 ++++++++---
 office/org-mode/org-mode.info       |  8 ++++----
 office/org-mode/slack-desc          |  4 ++--
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/office/org-mode/org-mode.SlackBuild b/office/org-mode/org-mode.SlackBuild
index 64bfa6891d..a6f4c34c1a 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.4}
+VERSION=${VERSION:-7.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -54,7 +54,7 @@ find . \
 patch Makefile $CWD/Makefile.patch
 DESTDIR=/usr make all pdf html
 DESTDIR=$PKG/usr make install
-DESTDIR=$PKG/usr PKG=$PKG make install-info 
+DESTDIR=$PKG/usr PKG=$PKG make install-info
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
@@ -66,8 +66,13 @@ mv $PKG/usr/info/{org,org-$VERSION}.gz
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  Changes.org README request-assign-future.txt doc/*.pdf doc/*.html \
+  README request-assign-future.txt doc/*.pdf doc/*.html \
   $PKG/usr/doc/$PRGNAM-$VERSION
+
+# Move contrib/ to /usr/share/org-mode-$VERSION
+mkdir -p $PKG/usr/share/$PRGNAM-$VERSION
+cp -R contrib $PKG/usr/share/$PRGNAM-$VERSION
+
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/office/org-mode/org-mode.info b/office/org-mode/org-mode.info
index 655120ed43..bfa8c44ecc 100644
--- a/office/org-mode/org-mode.info
+++ b/office/org-mode/org-mode.info
@@ -1,10 +1,10 @@
 PRGNAM="org-mode"
-VERSION="7.4"
+VERSION="7.5"
 HOMEPAGE="http://orgmode.org"
-DOWNLOAD="http://orgmode.org/org-7.4.tar.gz"
-MD5SUM="88975d9202dfdfd7d66d238a31820fe7"
+DOWNLOAD="http://orgmode.org/org-7.5.tar.gz"
+MD5SUM="556215534aa7a308ddc84c796f695e32"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Valeriy Timchenko"
 EMAIL="ValTimchenko@gmail.com"
-APPROVED="Niels Horn"
+APPROVED="dsomero"
diff --git a/office/org-mode/slack-desc b/office/org-mode/slack-desc
index 21de59c07e..2f5451b319 100644
--- a/office/org-mode/slack-desc
+++ b/office/org-mode/slack-desc
@@ -8,8 +8,8 @@
         |-----handy-ruler------------------------------------------------------|
 org-mode: Org-mode ("An Emacs mode for Notes, Project Planning, and Authoring")
 org-mode:
-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 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.