[SCM] supercollider/master: Exclude bundled minified js prettify; use package instead

[danstowell-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit dabf09e1a1285390ea17f0ba22735244d06e9181
Author: Dan Stowell <danstowell at users.sourceforge.net>
Date:   Fri Oct 3 09:11:49 2014 +0100

    Exclude bundled minified js prettify; use package instead

diff --git a/debian/changelog b/debian/changelog
index 9b8596b..3f9cf40 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+supercollider (1:3.6.6~repack-2) unstable; urgency=low
+
+  * Exclude bundled minified javascript-prettify, use package.
+
+ -- Dan Stowell <danstowell at users.sourceforge.net>  Fri, 03 Oct 2014 09:14:36 +0100
+
 supercollider (1:3.6.6~repack-1) unstable; urgency=low
 
   * Imported upstream version 3.6.6.
diff --git a/debian/control b/debian/control
index c8b708f..595006c 100644
--- a/debian/control
+++ b/debian/control
@@ -75,7 +75,7 @@ Description: real time audio synthesis programming language
 
 Package: supercollider-common
 Architecture: all
-Depends: ${misc:Depends}
+Depends: ${misc:Depends}, libjs-prettify
 Breaks: supercollider-server (<< 1:3.5)
 Replaces: supercollider-doc, supercollider-server (<< 1:3.5)
 Description: common files for SuperCollider
diff --git a/debian/rules b/debian/rules
index 16789bc..7ef3304 100755
--- a/debian/rules
+++ b/debian/rules
@@ -49,7 +49,8 @@ DEB_UPSTREAM_REPACKAGE_EXCLUDES = \
 				  external_libraries/sndfile.hh \
 				  external_libraries/simplejson-*/ \
 				  external_libraries/icu \
-				  HelpSource/MathJax/
+				  HelpSource/MathJax/ \
+				  HelpSource/prettify.js
 DEB_UPSTREAM_URL = http://prdownloads.sourceforge.net/supercollider
 DEB_UPSTREAM_TARBALL_BASENAME_MANGLE = s/supercollider(.*)/SuperCollider$$1-Source-linux/
 DEB_UPSTREAM_TARBALL_EXTENSION = tar.bz2
diff --git a/debian/supercollider-common.links b/debian/supercollider-common.links
index abe91ec..2f932e5 100644
--- a/debian/supercollider-common.links
+++ b/debian/supercollider-common.links
@@ -1 +1,2 @@
 usr/share/javascript/mathjax usr/share/SuperCollider/HelpSource/MathJax
+usr/share/javascript/prettify/prettify.js usr/share/SuperCollider/HelpSource/prettify.js

-- 
supercollider packaging