3 files changed, 11 insertions, 13 deletions
diff --git a/network/graphite-carbon/doinst.sh b/network/graphite-carbon/doinst.sh
index c521772f82..b11adc4f0f 100644
--- a/network/graphite-carbon/doinst.sh
+++ b/network/graphite-carbon/doinst.sh
@@ -22,6 +22,5 @@ preserve_perms() {
   config $NEW
 }
 
-preserve_perms etc/rc.d/rc.carbon-cache.new
-config etc/logrotate.d/graphite-carbon.new
-for i in etc/carbon/*.new ; do config $i ; done
+for i in etc/rc.d/rc.carbon-*.new ; do preserve_perms $i ; done
+for i in etc/carbon/*.new etc/logrotate.d/graphite-carbon.new ; do config $i ; done
diff --git a/network/graphite-carbon/graphite-carbon.SlackBuild b/network/graphite-carbon/graphite-carbon.SlackBuild
index e1a1d32a0e..8f44bdc5b8 100644
--- a/network/graphite-carbon/graphite-carbon.SlackBuild
+++ b/network/graphite-carbon/graphite-carbon.SlackBuild
@@ -23,12 +23,11 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=graphite-carbon
-VERSION=${VERSION:-0.9.13_pre1}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-0.9.15}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 SRCNAM=carbon
-SRCVER=${SRCVER:-0.9.13-pre1}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -77,9 +76,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $SRCNAM-$SRCVER
-tar xvf $CWD/$SRCVER.tar.gz || tar xvf $CWD/$SRCNAM-$SRCVER.tar.gz
-cd $SRCNAM-$SRCVER
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+cd $SRCNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -116,7 +115,7 @@ for i in $PKG/etc/carbon/*.example ; do mv $i ${i/.example/.new} ; done
 for i in $PKG/usr/bin/*.py ; do mv $i ${i/.py/} ; done
 
 # Cruft removal
-rm -rf $PKG/usr/storage
+rm -rf $PKG/usr/{storage,examples}
 
 # Manpages thanks to Debian folks!
 mkdir -p $PKG/usr/man
diff --git a/network/graphite-carbon/graphite-carbon.info b/network/graphite-carbon/graphite-carbon.info
index 7452ccb246..7bc565d938 100644
--- a/network/graphite-carbon/graphite-carbon.info
+++ b/network/graphite-carbon/graphite-carbon.info
@@ -1,8 +1,8 @@
 PRGNAM="graphite-carbon"
-VERSION="0.9.13_pre1"
+VERSION="0.9.15"
 HOMEPAGE="https://github.com/graphite-project/"
-DOWNLOAD="https://github.com/graphite-project/carbon/archive/0.9.13-pre1.tar.gz"
-MD5SUM="1c87be1d874ad74dd7f148b18c158fe2"
+DOWNLOAD="https://github.com/graphite-project/carbon/archive/0.9.15/carbon-0.9.15.tar.gz"
+MD5SUM="1962b92b8b672b33d99b00c303fdd5aa"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="python-whisper python-twisted"