[SCM] sonic-pi/master: Add missing examples/ directory to Debian package. (fixes https://github.com/samaaron/sonic-pi/issues/1229)

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

The following commit has been merged in the master branch:
commit 3b328c9ac3d029ecdc4b57ddafa0d30b7a60c7d5
Author: Hanno Zulla <hanno.zulla at epublica.de>
Date:   Tue May 17 10:46:33 2016 +0200

    Add missing examples/ directory to Debian package.
    (fixes https://github.com/samaaron/sonic-pi/issues/1229)

diff --git a/debian/patches/07-examples-path.patch b/debian/patches/07-examples-path.patch
new file mode 100644
index 0000000..11ebe68
--- /dev/null
+++ b/debian/patches/07-examples-path.patch
@@ -0,0 +1,24 @@
+Description: add missing examples/ dir in Debian package
+ As desribed in this bug report
+ <URL: https://github.com/samaaron/sonic-pi/issues/1229>,
+ the Debian package for Sonic Pi 2.10.0 was missing the
+ examples/ directory during installation. 
+Forwarded: no
+Author: Hanno Zulla <kontakt at hanno.de>
+Last-Update: 2016-05-17
+
+Index: sonic-pi/app/server/sonicpi/lib/sonicpi/util.rb
+===================================================================
+--- sonic-pi.orig/app/server/sonicpi/lib/sonicpi/util.rb	2016-05-17 10:39:11.043342370 +0200
++++ sonic-pi/app/server/sonicpi/lib/sonicpi/util.rb	2016-05-17 10:41:41.361916610 +0200
+@@ -265,7 +265,9 @@
+     end
+ 
+     def examples_path
+-      File.absolute_path("#{etc_path}/examples")
++      linux_fhs? ?
++        File.absolute_path("/usr/share/sonic-pi/examples") :
++        File.absolute_path("#{etc_path}/examples")
+     end
+ 
+     def server_path
diff --git a/debian/patches/series b/debian/patches/series
index 831576a..5520480 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
 04-rename-ruby-beautify-legacy.patch
 05-doc-base-index.patch
 06-paths.patch
+07-examples-path.patch
diff --git a/debian/sonic-pi-server.install b/debian/sonic-pi-server.install
index eeb5309..e1ea844 100644
--- a/debian/sonic-pi-server.install
+++ b/debian/sonic-pi-server.install
@@ -6,5 +6,6 @@ app/server/vendor/ruby-beautify/lib/ruby-beautify-legacy           usr/lib/sonic
 
 etc/synthdefs/compiled                                             usr/share/sonic-pi/synthdefs
 etc/snippets                                                       usr/share/sonic-pi
+etc/examples                                                       usr/share/sonic-pi
 
 debian/extra/README-JACKD                                          usr/share/doc/sonic-pi

-- 
sonic-pi packaging