Package: dia / 0.97.1-7

fix-helpdir.patch Patch series | download
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
60
61
62
63
64
65
Description: Use Debian help path
 This patch fixes Dia to use Debian's help directory for documentation
Author: Roland Stigge <stigge@antcom.de>

--- dia-0.97.1.orig/app/commands.c
+++ dia-0.97.1/app/commands.c
@@ -632,16 +632,14 @@ edit_redo_callback (GtkAction *action)
 void
 help_manual_callback (GtkAction *action)
 {
-#ifdef GNOME
-  gnome_help_display("dia", NULL, NULL);
-#else
   char *helpdir, *helpindex = NULL, *command;
   guint bestscore = G_MAXINT;
   GDir *dp;
   const char *dentry;
   GError *error = NULL;
 
-  helpdir = dia_get_data_directory("help");
+  /* helpdir = dia_get_data_directory("help"); */
+  helpdir = g_strdup("/usr/share/doc/dia-common/html");
   if (!helpdir) {
     message_warning(_("Could not find help directory"));
     return;
@@ -696,7 +694,6 @@ help_manual_callback (GtkAction *action)
 #endif
 
   g_free(helpindex);
-#endif
 }
 
 static void 
--- dia-0.97.1.orig/xmldocs.make
+++ dia-0.97.1/xmldocs.make
@@ -36,13 +36,8 @@
 # **********  Begin of section some packagers may need to modify  **********
 # This variable (helpdocdir) specifies where the documents should be installed.
 # This default value should work for most packages.
-if HAVE_GNOME
-helpdocdir = $(datadir)/gnome/help/$(docname)/$(lang)
-install-data-hook: install-data-hook-omf
-else
-helpdocdir = $(datadir)/$(docname)/help/$(lang)
+helpdocdir = $(datadir)/doc/dia-common/html/$(lang)
 install-data-hook:
-endif
 
 # **********  You should not have to edit below this line  **********
 xml_files = $(entities) $(docname).xml
--- dia-0.97.1.orig/doc/Makefile.am
+++ dia-0.97.1/doc/Makefile.am
@@ -8,11 +8,7 @@ EXTRA_DIST = \
 	shape.dtd \
 	sheet.dtd
 
-if HAVE_GNOME
-helpdir = $(datadir)/gnome/help/$(docname)
-else
-helpdir = $(pkgdatadir)/help
-endif
+helpdir = $(datadir)/doc/dia-common/html
 
 sysdoc = $(DESTDIR)$(docdir)