office/scribus: Updated for version 1.3.3.9

5 files changed, 31 insertions, 23 deletions

diff --git a/office/scribus/README b/office/scribus/README
index 7577a8e688..dff295d44f 100644
--- a/office/scribus/README
+++ b/office/scribus/README
@@ -1,4 +1,3 @@
 Scribus is an open-source program that brings award-winning professional page 
 layout to Linux/Unix, MacOS X and Windows desktops with a combination of 
 "press-ready" output and new approaches to page layout.
-
diff --git a/office/scribus/doinst.sh b/office/scribus/doinst.sh
index 3220dcb2d6..34fcca8e04 100644
--- a/office/scribus/doinst.sh
+++ b/office/scribus/doinst.sh
@@ -1,3 +1,8 @@
+
+if [ -x usr/bin/update-desktop-database ]; then
+  usr/bin/update-desktop-database usr/share/applications >/dev/null 2>&1
+fi
+
 if [ -x usr/bin/update-mime-database ]; then
   usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
 fi
diff --git a/office/scribus/scribus.SlackBuild b/office/scribus/scribus.SlackBuild
index 56fbe311cd..25f5d1019f 100644
--- a/office/scribus/scribus.SlackBuild
+++ b/office/scribus/scribus.SlackBuild
@@ -23,12 +23,12 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 # Modified by the SlackBuilds.org project
-# Including input by Yalla-One and some code cleanup by robw810
+# Including input by Yalla-One and some code cleanup by rworkman
 
 set -e
 
 PRGNAM=scribus
-VERSION=1.3.3.8
+VERSION=1.3.3.9
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -55,7 +55,7 @@ chmod -R a-s,u+w,go+r-w .
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
-  --prefix=/opt/kde \
+  --prefix=/usr \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --enable-cairo 
@@ -63,23 +63,17 @@ CXXFLAGS="$SLKCFLAGS" \
 make
 make install-strip DESTDIR=$PKG
 
-# Install .desktop file, icon, and mime information
-install -m 0644 -D scribus.desktop $PKG/opt/kde/share/applications/kde/scribus.desktop
-install -m 0644 -D scribus/icons/scribusicon.png $PKG/opt/kde/share/icons/scribusicon.png
+# Install .desktop file and mime information
+install -m 0644 -D scribus.desktop $PKG/usr/share/applications/kde/scribus.desktop
 install -m 0644 -D scribus.xml $PKG/usr/share/mime/packages/scribus.xml
 
-if [ -d $PKG/opt/kde/man ]; then
-  ( cd $PKG/opt/kde/man
-    find . -type f -exec gzip -9 {} \;
-    for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-  )
-fi
-
-mkdir -p $PKG/usr/doc
-( cd $PKG/usr/doc
-  ln -s ../../opt/kde/share/doc/$PRGNAM-$VERSION $PRGNAM-$VERSION
+mv $PKG/usr/share/man $PKG/usr
+( cd $PKG/usr/man
+  find . -type f -exec gzip -9 {} \;
+  for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
 )
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/share/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/office/scribus/scribus.info b/office/scribus/scribus.info
index d0248f89c2..e7864d4ef4 100644
--- a/office/scribus/scribus.info
+++ b/office/scribus/scribus.info
@@ -1,8 +1,8 @@
 PRGNAM="scribus"
-VERSION="1.3.3.8"
+VERSION="1.3.3.9"
 HOMEPAGE="http://www.scribus.net"
-DOWNLOAD="http://dl.sourceforge.net/scribus/scribus-1.3.3.8.tar.bz2"
-MD5SUM="fa79c8bba3e6e09b0bdeaf16579d6fa1"
+DOWNLOAD="http://dl.sourceforge.net/scribus/scribus-1.3.3.9.tar.bz2"
+MD5SUM="a3d7af62d99d4e0f7485ae549de50df0"
 MAINTAINER="Martin Lefebvre"
 EMAIL="dadexter@gmail.com"
-APPROVED="BP{k}"
+APPROVED="BP{k},rworkman"
diff --git a/office/scribus/slack-desc b/office/scribus/slack-desc
index cc565b2f9a..e4a351c3d6 100644
--- a/office/scribus/slack-desc
+++ b/office/scribus/slack-desc
@@ -1,4 +1,12 @@
-scribus: Scribus 
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+       |-----handy-ruler------------------------------------------------------|
+scribus: Scribus (open-source professional page layout program)
 scribus: 
 scribus: Scribus is an open-source program that brings award-winning
 scribus: professional page layout to Linux/Unix, MacOS X and Windows
@@ -7,3 +15,5 @@ scribus: approaches to page layout.
 scribus: 
 scribus: 
 scribus: 
+scribus: 
+scribus: