1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
|
From: "Dr. Tobias Quathamer" <toddy@debian.org>
Date: Wed, 9 Mar 2016 17:57:17 +0100
Subject: Install soundfont into correct directory
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
Description: This patch changes the path where the soundfont
gets installed to the typical location in Debian.
Author: Dr. Tobias Quathamer <toddy@debian.org>
Author: Dhionel Díaz <ddiaz@cenditel.gob.ve>
Bug-Debian: https://bugs.debian.org/817228
Bug-Debian: https://bugs.debian.org/823972
Forwarded: not-needed
Last-Update: 2016-05-12
---
include/denemo/denemo.h | 2 +-
soundfonts/Makefile.am | 4 ++--
src/core/utils.c | 3 ++-
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/include/denemo/denemo.h b/include/denemo/denemo.h
index b673484..3516c0f 100644
--- a/include/denemo/denemo.h
+++ b/include/denemo/denemo.h
@@ -161,7 +161,7 @@ extern const gchar *Fluidsynth;
#define COMMANDS_DIR "actions"
#define UI_DIR "ui"
-#define SOUNDFONTS_DIR "soundfonts"
+#define SOUNDFONTS_DIR "sf2"
#define PIXMAPS_DIR "pixmaps"
#define FONTS_DIR "denemo"
#define LOCALE_DIR "po"
diff --git a/soundfonts/Makefile.am b/soundfonts/Makefile.am
index 0ca6e8e..a270c18 100644
--- a/soundfonts/Makefile.am
+++ b/soundfonts/Makefile.am
@@ -1,2 +1,2 @@
-soundfontsdir = $(datadir)/${PACKAGE}/soundfonts
-dist_soundfonts_DATA = A320U-license.txt A320U.sf2
+soundfontsdir = $(datadir)/sounds/sf2
+dist_soundfonts_DATA = A320U.sf2
diff --git a/src/core/utils.c b/src/core/utils.c
index d725d76..6f23aaa 100644
--- a/src/core/utils.c
+++ b/src/core/utils.c
@@ -3334,9 +3334,10 @@ get_system_dir (DenemoDirectory dir)
{
case DENEMO_DIR_FONTS:
return g_build_filename ("/usr/share/fonts/truetype/", get_local_dir (dir), NULL);
+ case DENEMO_DIR_SOUNDFONTS:
+ return g_build_filename ("/usr/share/sounds/", get_local_dir (dir), NULL);
case DENEMO_DIR_COMMANDS:
case DENEMO_DIR_UI:
- case DENEMO_DIR_SOUNDFONTS:
case DENEMO_DIR_LILYPOND_INCLUDE:
return g_build_filename (get_system_data_dir (), get_local_dir (dir), NULL);
case DENEMO_DIR_PIXMAPS:
|
