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
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
|
Author: Daniel Baumann <daniel@debian.org>
Description: Adjusts icon directory.
diff -Naurp gadmin-openvpn-server.orig/Makefile.am gadmin-openvpn-server/Makefile.am
--- gadmin-openvpn-server.orig/Makefile.am 2008-09-23 16:38:31.000000000 +0000
+++ gadmin-openvpn-server/Makefile.am 2008-11-16 08:09:15.000000000 +0000
@@ -10,15 +10,15 @@ EXTRA_DIST = \
install-data-local:
@$(NORMAL_INSTALL)
if test -d $(srcdir)/pixmaps; then \
- $(mkinstalldirs) $(DESTDIR)$(datadir)/pixmaps/gadmin-openvpn-server; \
+ $(mkinstalldirs) $(DESTDIR)$(datadir)/icons; \
for pixmap in $(srcdir)/pixmaps/*; do \
if test -f $$pixmap; then \
- $(INSTALL_DATA) $$pixmap $(DESTDIR)$(datadir)/pixmaps/gadmin-openvpn-server; \
+ $(INSTALL_DATA) $$pixmap $(DESTDIR)$(datadir)/icons; \
fi \
done \
fi;
- if test -d $(DESTDIR)$(datadir)/pixmaps; then \
- cp pixmaps/gadmin-openvpn-server.png $(DESTDIR)$(datadir)/pixmaps/; \
+ if test -d $(DESTDIR)$(datadir)/icons; then \
+ cp pixmaps/gadmin-openvpn-server.png $(DESTDIR)$(datadir)/icons/; \
fi;
if test -f $(DESTDIR)$(bindir)/consolehelper && test ! -f $(DESTDIR)$(bindir)/gadmin-openvpn-server; then \
ln -s $(DESTDIR)$(bindir)/consolehelper $(DESTDIR)$(bindir)/gadmin-openvpn-server; \
@@ -55,10 +55,10 @@ install-data-local:
dist-hook:
if test -d pixmaps; then \
- mkdir $(DESTDIR)$(distdir)/pixmaps; \
+ mkdir $(DESTDIR)$(distdir)/icons; \
for pixmap in pixmaps/*; do \
if test -f $$pixmap; then \
- cp -p $$pixmap $(DESTDIR)$(distdir)/pixmaps; \
+ cp -p $$pixmap $(DESTDIR)$(distdir)/icons; \
fi \
done \
fi
diff -Naurp gadmin-openvpn-server.orig/Makefile.in gadmin-openvpn-server/Makefile.in
--- gadmin-openvpn-server.orig/Makefile.in 2008-11-11 22:06:24.000000000 +0000
+++ gadmin-openvpn-server/Makefile.in 2008-11-16 08:08:49.000000000 +0000
@@ -636,15 +636,15 @@ uninstall-am:
install-data-local:
@$(NORMAL_INSTALL)
if test -d $(srcdir)/pixmaps; then \
- $(mkinstalldirs) $(DESTDIR)$(datadir)/pixmaps/gadmin-openvpn-server; \
+ $(mkinstalldirs) $(DESTDIR)$(datadir)/icons; \
for pixmap in $(srcdir)/pixmaps/*; do \
if test -f $$pixmap; then \
- $(INSTALL_DATA) $$pixmap $(DESTDIR)$(datadir)/pixmaps/gadmin-openvpn-server; \
+ $(INSTALL_DATA) $$pixmap $(DESTDIR)$(datadir)/icons; \
fi \
done \
fi;
- if test -d $(DESTDIR)$(datadir)/pixmaps; then \
- cp pixmaps/gadmin-openvpn-server.png $(DESTDIR)$(datadir)/pixmaps/; \
+ if test -d $(DESTDIR)$(datadir)/icons; then \
+ cp pixmaps/gadmin-openvpn-server.png $(DESTDIR)$(datadir)/icons/; \
fi;
if test -f $(DESTDIR)$(bindir)/consolehelper && test ! -f $(DESTDIR)$(bindir)/gadmin-openvpn-server; then \
ln -s $(DESTDIR)$(bindir)/consolehelper $(DESTDIR)$(bindir)/gadmin-openvpn-server; \
@@ -681,10 +681,10 @@ install-data-local:
dist-hook:
if test -d pixmaps; then \
- mkdir $(DESTDIR)$(distdir)/pixmaps; \
+ mkdir $(DESTDIR)$(distdir)/icons; \
for pixmap in pixmaps/*; do \
if test -f $$pixmap; then \
- cp -p $$pixmap $(DESTDIR)$(distdir)/pixmaps; \
+ cp -p $$pixmap $(DESTDIR)$(distdir)/icons; \
fi \
done \
fi
diff -Naurp gadmin-openvpn-server.orig/src/create_main_window.c gadmin-openvpn-server/src/create_main_window.c
--- gadmin-openvpn-server.orig/src/create_main_window.c 2008-10-05 21:00:22.000000000 +0000
+++ gadmin-openvpn-server/src/create_main_window.c 2008-11-16 08:09:38.000000000 +0000
@@ -52,7 +52,7 @@ void create_main_window(struct w *widget
g_free(info);
/* Set the main window icon */
- pixmap_directory = g_strdup_printf("%s/pixmaps/gadmin-openvpn-server", PACKAGE_DATA_DIR);
+ pixmap_directory = g_strdup_printf("%s/icons", PACKAGE_DATA_DIR);
add_pixmap_directory(pixmap_directory);
g_free(pixmap_directory);
|
