1 |
nixphoeni 11/02/03 02:40:46 |
2 |
|
3 |
Modified: gdesklets-core-0.36.3-.in-files.patch |
4 |
Log: |
5 |
Updated patch to include installation of icon and bumped revision |
6 |
|
7 |
(Portage version: 2.1.9.35/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.2 gnome-extra/gdesklets-core/files/gdesklets-core-0.36.3-.in-files.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/gdesklets-core/files/gdesklets-core-0.36.3-.in-files.patch?rev=1.2&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/gdesklets-core/files/gdesklets-core-0.36.3-.in-files.patch?rev=1.2&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/gdesklets-core/files/gdesklets-core-0.36.3-.in-files.patch?r1=1.1&r2=1.2 |
15 |
|
16 |
Index: gdesklets-core-0.36.3-.in-files.patch |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/files/gdesklets-core-0.36.3-.in-files.patch,v |
19 |
retrieving revision 1.1 |
20 |
retrieving revision 1.2 |
21 |
diff -u -r1.1 -r1.2 |
22 |
--- gdesklets-core-0.36.3-.in-files.patch 30 Jan 2011 21:00:25 -0000 1.1 |
23 |
+++ gdesklets-core-0.36.3-.in-files.patch 3 Feb 2011 02:40:46 -0000 1.2 |
24 |
@@ -1,26 +1,89 @@ |
25 |
+=== modified file 'Makefile.am' |
26 |
+--- Makefile.am 2010-12-14 10:24:59 +0000 |
27 |
++++ Makefile.am 2011-01-31 01:20:58 +0000 |
28 |
+@@ -11,8 +11,12 @@ |
29 |
+ autostartdir = $(sysconfdir)/xdg/autostart |
30 |
+ sharedmimepackagedir = $(datadir)/mime/packages |
31 |
+ mimeicondir = $(datadir)/icons/gnome/48x48/mimetypes |
32 |
++pixmapdir = $(datadir)/pixmaps |
33 |
+ basicdeskletsdir = ${installdir} |
34 |
+ |
35 |
++# initialize this so we can add to it later |
36 |
++nobase_dist_install_DATA = |
37 |
++ |
38 |
+ include Makefile_gdesklets.am |
39 |
+ include Makefile_python.am |
40 |
+ |
41 |
+ |
42 |
=== modified file 'Makefile_gdesklets.am' |
43 |
--- Makefile_gdesklets.am 2011-01-06 11:01:06 +0000 |
44 |
-+++ Makefile_gdesklets.am 2011-01-30 20:12:07 +0000 |
45 |
-@@ -20,28 +20,31 @@ |
46 |
++++ Makefile_gdesklets.am 2011-01-31 01:20:58 +0000 |
47 |
+@@ -1,12 +1,14 @@ |
48 |
+ # Set the LDFLAGS for this section |
49 |
+ AM_LDFLAGS = -module -avoid-version -as-needed |
50 |
+ |
51 |
++# Libraries that get installed in these exact subdirectories |
52 |
+ nobase_install_LTLIBRARIES = \ |
53 |
+ libdesklets/system/gtop.la \ |
54 |
+ utils/svg.la \ |
55 |
+ utils/tiling.la \ |
56 |
+ utils/x11.la |
57 |
+ |
58 |
++# Scripts that get distributed and installed |
59 |
+ dist_install_SCRIPTS = \ |
60 |
+ ctrlinfo \ |
61 |
+ gdesklets \ |
62 |
+@@ -16,38 +18,62 @@ |
63 |
+ gdesklets-shell \ |
64 |
+ test-control.py |
65 |
|
66 |
++# "System" scripts that get distributed but not installed |
67 |
+ dist_noinst_SCRIPTS = autogen.sh |
68 |
+ |
69 |
++# Man page |
70 |
dist_man_MANS = doc/man/gdesklets.1 |
71 |
|
72 |
+-EXTRA_DIST = \ |
73 |
+- AUTHORS \ |
74 |
+- COPYING \ |
75 |
+- README \ |
76 |
+- TODO \ |
77 |
+- NEWS \ |
78 |
+- contrib/bash/gdesklets |
79 |
+- |
80 |
+# The .desktop file |
81 |
+desktop_in_files = data/gdesklets.desktop.in |
82 |
+# The shared mime XML file |
83 |
+sharedmimepackage_in_files = data/gdesklets.xml.in |
84 |
+ |
85 |
- EXTRA_DIST = \ |
86 |
- AUTHORS \ |
87 |
- COPYING \ |
88 |
- README \ |
89 |
- TODO \ |
90 |
- NEWS \ |
91 |
-- contrib/bash/gdesklets |
92 |
-+ contrib/bash/gdesklets \ |
93 |
-+ $(desktop_in_files) \ |
94 |
++# Other odds and ends that get distributed, but not installed |
95 |
++# It's up to distro package maintainers to install these |
96 |
++EXTRA_DIST = \ |
97 |
++ AUTHORS \ |
98 |
++ COPYING \ |
99 |
++ README \ |
100 |
++ TODO \ |
101 |
++ NEWS \ |
102 |
++ contrib/bash/gdesklets \ |
103 |
++ $(desktop_in_files) \ |
104 |
+ $(sharedmimepackage_in_files) |
105 |
- |
106 |
++ |
107 |
++# Docs and images that get distributed and installed to these specific |
108 |
++# directories |
109 |
++nobase_dist_install_DATA += \ |
110 |
++ doc/basic/gdesklets-doc.xml \ |
111 |
++ doc/basic/Images/desklet-context-menu.png \ |
112 |
++ doc/basic/Images/desklet-start-shell.png \ |
113 |
++ doc/basic/Images/gdesklets.png \ |
114 |
++ doc/basic/Images/open-command.png \ |
115 |
++ doc/basic/Images/preferences.png \ |
116 |
++ doc/basic/Images/profile.png \ |
117 |
++ doc/basic/Images/remote.png \ |
118 |
++ doc/basic/Images/shell.png \ |
119 |
++ data/about.png \ |
120 |
++ data/gdesklets.png |
121 |
++ |
122 |
++# Additional files that get cleaned by distclean |
123 |
# See http://www.gnu.org/software/hello/manual/automake/Clean.html |
124 |
CLEANFILES = \ |
125 |
po/.intltool-merge-cache |
126 |
@@ -38,4 +101,49 @@ |
127 |
sharedmimepackage_DATA = $(sharedmimepackage_in_files:.xml.in=.xml) |
128 |
@INTLTOOL_XML_RULE@ |
129 |
|
130 |
+ # And the mime icon |
131 |
+-mimeicon_DATA = data/gnome-mime-application-x-gdesklets-display.png |
132 |
++dist_mimeicon_DATA = data/gnome-mime-application-x-gdesklets-display.png |
133 |
+ |
134 |
++# Note, this gets installed in both $(pixmapdir) and $(installdir) |
135 |
+ pixmap_DATA = data/gdesklets.png |
136 |
+ |
137 |
+ libdesklets_system_gtop_la_CFLAGS = $(GLIBTOP_CFLAGS) \ |
138 |
+ |
139 |
+=== modified file 'Makefile_python.am' |
140 |
+--- Makefile_python.am 2010-12-14 10:24:59 +0000 |
141 |
++++ Makefile_python.am 2011-01-31 01:20:58 +0000 |
142 |
+@@ -1,4 +1,4 @@ |
143 |
+-nobase_dist_install_DATA = \ |
144 |
++nobase_dist_install_DATA += \ |
145 |
+ Controls/__init__.py \ |
146 |
+ Controls/ArrayBuffer/__init__.py \ |
147 |
+ Controls/ArrayBuffer/IArrayBuffer.py \ |
148 |
+@@ -48,21 +48,6 @@ |
149 |
+ config/DisplayConfigger.py \ |
150 |
+ config/StateSaver.py \ |
151 |
+ config/settings.py \ |
152 |
+- data/about.png \ |
153 |
+- data/calendar.png \ |
154 |
+- data/gdesklets.desktop \ |
155 |
+- data/gdesklets.png \ |
156 |
+- data/gdesklets.xml \ |
157 |
+- data/gnome-mime-application-x-gdesklets-display.png \ |
158 |
+- doc/basic/gdesklets-doc.xml \ |
159 |
+- doc/basic/Images/desklet-context-menu.png \ |
160 |
+- doc/basic/Images/desklet-start-shell.png \ |
161 |
+- doc/basic/Images/gdesklets.png \ |
162 |
+- doc/basic/Images/open-command.png \ |
163 |
+- doc/basic/Images/preferences.png \ |
164 |
+- doc/basic/Images/profile.png \ |
165 |
+- doc/basic/Images/remote.png \ |
166 |
+- doc/basic/Images/shell.png \ |
167 |
+ display/__init__.py \ |
168 |
+ display/ContainerTarget.py \ |
169 |
+ display/DataTarget.py \ |
170 |
+@@ -212,4 +197,3 @@ |
171 |
+ utils/typeconverter.py \ |
172 |
+ utils/vfs.py \ |
173 |
+ utils/xdr.py |
174 |
+- |