Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Daniel Pielmeier (billie)" <billie@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-print/hplip/files: hplip-3.11.1-udev-attrs.patch hplip-3.11.1-htmldir.patch hplip-3.11.1-desktop.patch
Date: Mon, 24 Jan 2011 20:52:05
Message-Id: 20110124205156.1D0FB20057@flycatcher.gentoo.org
1 billie 11/01/24 20:51:56
2
3 Added: hplip-3.11.1-udev-attrs.patch
4 hplip-3.11.1-htmldir.patch
5 hplip-3.11.1-desktop.patch
6 Log:
7 Version bump. Fixes bug #352449. Thanks to Ben Sagal for reporting. Remove potential vulnerable versions.
8
9 (Portage version: 2.1.9.25/cvs/Linux i686)
10
11 Revision Changes Path
12 1.1 net-print/hplip/files/hplip-3.11.1-udev-attrs.patch
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/hplip/files/hplip-3.11.1-udev-attrs.patch?rev=1.1&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/hplip/files/hplip-3.11.1-udev-attrs.patch?rev=1.1&content-type=text/plain
16
17 Index: hplip-3.11.1-udev-attrs.patch
18 ===================================================================
19 diff -Naur hplip-3.11.1-old/data/rules/55-hpmud.rules hplip-3.11.1/data/rules/55-hpmud.rules
20 --- hplip-3.11.1-old/data/rules/55-hpmud.rules 2011-01-24 21:01:48.803135668 +0100
21 +++ hplip-3.11.1/data/rules/55-hpmud.rules 2011-01-24 21:03:47.279802334 +0100
22 @@ -21,128 +21,128 @@
23 LABEL="hplip_pid_test"
24
25 # Check for AiO products (0x03f0xx11).
26 -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??11", OWNER="root", GROUP="lp", MODE="660"
27 +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??11", OWNER="root", GROUP="lp", MODE="660"
28
29 # Check for Photosmart products without wildcard since cameras and scanners also used (0x03f0xx02).
30 # The xx02 pid has been retired so this explicit list should not change.
31 # photosmart_d2300_series
32 -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="c302", OWNER="root", GROUP="lp", MODE="660"
33 +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="c302", OWNER="root", GROUP="lp", MODE="660"
34 # photosmart_100
35 -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="3802", OWNER="root", GROUP="lp", MODE="660"
36 +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="3802", OWNER="root", GROUP="lp", MODE="660"
37 # photosmart_1115
38 -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="3402", OWNER="root", GROUP="lp", MODE="660"
39 +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="3402", OWNER="root", GROUP="lp", MODE="660"
40 # photosmart_1215
41 -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="3202", OWNER="root", GROUP="lp", MODE="660"
42 +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="3202", OWNER="root", GROUP="lp", MODE="660"
43 # photosmart_1218
44 -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="3302", OWNER="root", GROUP="lp", MODE="660"
45 +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="3302", OWNER="root", GROUP="lp", MODE="660"
46 # photosmart_130
47 -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="3902", OWNER="root", GROUP="lp", MODE="660"
48 +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="3902", OWNER="root", GROUP="lp", MODE="660"
49 # photosmart_1315
50 -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="3602", OWNER="root", GROUP="lp", MODE="660"
51 +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="3602", OWNER="root", GROUP="lp", MODE="660"
52 # photosmart_140_series
53 -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1002", OWNER="root", GROUP="lp", MODE="660"
54 +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1002", OWNER="root", GROUP="lp", MODE="660"
55 # photosmart_230
56 -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="3502", OWNER="root", GROUP="lp", MODE="660"
57 +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="3502", OWNER="root", GROUP="lp", MODE="660"
58 # photosmart_240_series
59 -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1102", OWNER="root", GROUP="lp", MODE="660"
60 +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1102", OWNER="root", GROUP="lp", MODE="660"
61 # photosmart_320_series
62 -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1202", OWNER="root", GROUP="lp", MODE="660"
63 +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1202", OWNER="root", GROUP="lp", MODE="660"
64 # photosmart_330_series
65 -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1602", OWNER="root", GROUP="lp", MODE="660"
66 +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1602", OWNER="root", GROUP="lp", MODE="660"
67 # photosmart_370_series
68 -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1302", OWNER="root", GROUP="lp", MODE="660"
69 +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1302", OWNER="root", GROUP="lp", MODE="660"
70 # photosmart_380_series
71 -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1702", OWNER="root", GROUP="lp", MODE="660"
72 +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1702", OWNER="root", GROUP="lp", MODE="660"
73 # photosmart_420_series
74 -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1502", OWNER="root", GROUP="lp", MODE="660"
75 +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1502", OWNER="root", GROUP="lp", MODE="660"
76 # photosmart_470_series
77 -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1802", OWNER="root", GROUP="lp", MODE="660"
78 +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1802", OWNER="root", GROUP="lp", MODE="660"
79 # photosmart_7150
80 -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="3a02", OWNER="root", GROUP="lp", MODE="660"
81 -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="3b02", OWNER="root", GROUP="lp", MODE="660"
82 +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="3a02", OWNER="root", GROUP="lp", MODE="660"
83 +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="3b02", OWNER="root", GROUP="lp", MODE="660"
84 # photosmart_7200_series
85 -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="b002", OWNER="root", GROUP="lp", MODE="660"
86 +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="b002", OWNER="root", GROUP="lp", MODE="660"
87 # photosmart_7345
88 -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="2002", OWNER="root", GROUP="lp", MODE="660"
89 +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="2002", OWNER="root", GROUP="lp", MODE="660"
90 # photosmart_7350
91 -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="3c02", OWNER="root", GROUP="lp", MODE="660"
92 +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="3c02", OWNER="root", GROUP="lp", MODE="660"
93 # photosmart_7400_series
94 -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="b802", OWNER="root", GROUP="lp", MODE="660"
95 +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="b802", OWNER="root", GROUP="lp", MODE="660"
96 # photosmart_7550
97 -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="3e02", OWNER="root", GROUP="lp", MODE="660"
98 +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="3e02", OWNER="root", GROUP="lp", MODE="660"
99 # photosmart_7600_series
100 -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="b202", OWNER="root", GROUP="lp", MODE="660"
101 +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="b202", OWNER="root", GROUP="lp", MODE="660"
102 # photosmart_7700_series
103 -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="b402", OWNER="root", GROUP="lp", MODE="660"
104 +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="b402", OWNER="root", GROUP="lp", MODE="660"
105 # photosmart_7800_series
106 -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="c002", OWNER="root", GROUP="lp", MODE="660"
107 +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="c002", OWNER="root", GROUP="lp", MODE="660"
108 # photosmart_7900_series
109 -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="b602", OWNER="root", GROUP="lp", MODE="660"
110 +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="b602", OWNER="root", GROUP="lp", MODE="660"
111 # photosmart_8000_series
112 -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="c102", OWNER="root", GROUP="lp", MODE="660"
113 +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="c102", OWNER="root", GROUP="lp", MODE="660"
114 # photosmart_8100_series
115 -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="ba02", OWNER="root", GROUP="lp", MODE="660"
116 +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="ba02", OWNER="root", GROUP="lp", MODE="660"
117 # photosmart_8200_series
118 -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="c202", OWNER="root", GROUP="lp", MODE="660"
119 +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="c202", OWNER="root", GROUP="lp", MODE="660"
120 # photosmart_8400_series
121 -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="bb02", OWNER="root", GROUP="lp", MODE="660"
122 +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="bb02", OWNER="root", GROUP="lp", MODE="660"
123 # photosmart_8700_series
124 -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="bc02", OWNER="root", GROUP="lp", MODE="660"
125 +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="bc02", OWNER="root", GROUP="lp", MODE="660"
126 # photosmart_a310_series
127 -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1d02", OWNER="root", GROUP="lp", MODE="660"
128 +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1d02", OWNER="root", GROUP="lp", MODE="660"
129 # photosmart_a320_series
130 -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1e02", OWNER="root", GROUP="lp", MODE="660"
131 +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1e02", OWNER="root", GROUP="lp", MODE="660"
132 # photosmart_a430_series
133 -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1902", OWNER="root", GROUP="lp", MODE="660"
134 +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1902", OWNER="root", GROUP="lp", MODE="660"
135 # photosmart_a440_series
136 -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1f02", OWNER="root", GROUP="lp", MODE="660"
137 +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1f02", OWNER="root", GROUP="lp", MODE="660"
138 # photosmart_a510_series
139 -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1a02", OWNER="root", GROUP="lp", MODE="660"
140 +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1a02", OWNER="root", GROUP="lp", MODE="660"
141 # photosmart_a520_series
142 -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="2602", OWNER="root", GROUP="lp", MODE="660"
143 +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="2602", OWNER="root", GROUP="lp", MODE="660"
144 # photosmart_a530_series
145 -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="2b02", OWNER="root", GROUP="lp", MODE="660"
146 +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="2b02", OWNER="root", GROUP="lp", MODE="660"
147 # photosmart_a610_series
148 -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1b02", OWNER="root", GROUP="lp", MODE="660"
149 +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1b02", OWNER="root", GROUP="lp", MODE="660"
150 # photosmart_a620_series
151 -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="2702", OWNER="root", GROUP="lp", MODE="660"
152 +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="2702", OWNER="root", GROUP="lp", MODE="660"
153 # photosmart_a630_series
154 -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="2c02", OWNER="root", GROUP="lp", MODE="660"
155 +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="2c02", OWNER="root", GROUP="lp", MODE="660"
156 # photosmart_a710_series
157 -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1c02", OWNER="root", GROUP="lp", MODE="660"
158 +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1c02", OWNER="root", GROUP="lp", MODE="660"
159 # photosmart_a820_series
160 -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="2902", OWNER="root", GROUP="lp", MODE="660"
161 +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="2902", OWNER="root", GROUP="lp", MODE="660"
162 # photosmart_d5060_series
163 -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="c802", OWNER="root", GROUP="lp", MODE="660"
164 +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="c802", OWNER="root", GROUP="lp", MODE="660"
165 # photosmart_d5100_series
166 -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="c402", OWNER="root", GROUP="lp", MODE="660"
167 +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="c402", OWNER="root", GROUP="lp", MODE="660"
168 # photosmart_d6100_series
169 -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="c502", OWNER="root", GROUP="lp", MODE="660"
170 +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="c502", OWNER="root", GROUP="lp", MODE="660"
171 # photosmart_d7100_series
172 -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="c602", OWNER="root", GROUP="lp", MODE="660"
173 +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="c602", OWNER="root", GROUP="lp", MODE="660"
174 # photosmart_d7300_series
175 -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="c702", OWNER="root", GROUP="lp", MODE="660"
176 +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="c702", OWNER="root", GROUP="lp", MODE="660"
177 # photosmart_pro_b8300_series
178 -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="be02", OWNER="root", GROUP="lp", MODE="660"
179 +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="be02", OWNER="root", GROUP="lp", MODE="660"
180 # photosmart_b8800_series
181 -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="d002", OWNER="root", GROUP="lp", MODE="660"
182 +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="d002", OWNER="root", GROUP="lp", MODE="660"
183 # photosmart_pro_b9100_series
184 -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="bd02", OWNER="root", GROUP="lp", MODE="660"
185 +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="bd02", OWNER="root", GROUP="lp", MODE="660"
186 # Photosmart_B8500_series
187 -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="d102", OWNER="root", GROUP="lp", MODE="660"
188 +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="d102", OWNER="root", GROUP="lp", MODE="660"
189 # Photosmart_A640_series
190 -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="7902", OWNER="root", GROUP="lp", MODE="660"
191 +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="7902", OWNER="root", GROUP="lp", MODE="660"
192
193 # Check for Business Inkjet products (0x03f0xx12).
194 -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??12", OWNER="root", GROUP="lp", MODE="660"
195 +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??12", OWNER="root", GROUP="lp", MODE="660"
196 # Check for Deskjet products (0x03f0xx04).
197 -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??04", OWNER="root", GROUP="lp", MODE="660"
198 +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??04", OWNER="root", GROUP="lp", MODE="660"
199 # Check for LaserJet products (0x03f0xx17).
200 -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??17", OWNER="root", GROUP="lp", MODE="660"
201 +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??17", OWNER="root", GROUP="lp", MODE="660"
202 # Check for LaserJet products (0x03f0xx2a).
203 -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??2a", OWNER="root", GROUP="lp", MODE="660"
204 +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??2a", OWNER="root", GROUP="lp", MODE="660"
205 # Check for DesignJet product (0x03f0xx14).
206 -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??14", OWNER="root", GROUP="lp", MODE="660"
207 +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??14", OWNER="root", GROUP="lp", MODE="660"
208
209 # Removed the following rule because FHS states that /etc should be reserved for static files only. This
210 # functionality should be done in a deb/rpm post install script. 2/11/2009, D Suffield
211 diff -Naur hplip-3.11.1-old/data/rules/56-hpmud_support.rules hplip-3.11.1/data/rules/56-hpmud_support.rules
212 --- hplip-3.11.1-old/data/rules/56-hpmud_support.rules 2011-01-24 21:01:48.803135668 +0100
213 +++ hplip-3.11.1/data/rules/56-hpmud_support.rules 2011-01-24 21:02:52.919802334 +0100
214 @@ -8,8 +8,10 @@
215
216 # Check for LaserJet products (0x03f0xx17).
217 SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??17", ENV{hp_model}="$sysfs{product}", ENV{hp_test}="yes"
218 +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??17", RUN+="/bin/sh -c 'hp_model=%E{ID_MODEL} /usr/bin/hp-mkuri -c &'"
219 # Check for LaserJet products (0x03f0xx2a).
220 SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??2a", ENV{hp_model}="$sysfs{product}", ENV{hp_test}="yes"
221 +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??2a", RUN+="/bin/sh -c 'hp_model=%E{ID_MODEL} /usr/bin/hp-mkuri -c &'"
222 ENV{hp_test}=="yes", RUN+="bin/sh -c '/usr/bin/hp-mkuri -c &'"
223
224 -LABEL="hpmud_rules_end"
225 \ Kein Zeilenumbruch am Dateiende.
226 +LABEL="hpmud_rules_end"
227
228
229
230 1.1 net-print/hplip/files/hplip-3.11.1-htmldir.patch
231
232 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/hplip/files/hplip-3.11.1-htmldir.patch?rev=1.1&view=markup
233 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/hplip/files/hplip-3.11.1-htmldir.patch?rev=1.1&content-type=text/plain
234
235 Index: hplip-3.11.1-htmldir.patch
236 ===================================================================
237 diff -Naur hplip-3.11.1-old/configure.in hplip-3.11.1/configure.in
238 --- hplip-3.11.1-old/configure.in 2011-01-24 20:45:27.429802335 +0100
239 +++ hplip-3.11.1/configure.in 2011-01-24 20:48:34.759802335 +0100
240 @@ -327,6 +327,9 @@
241 AC_ARG_WITH(docdir, AC_HELP_STRING([--with-docdir=DIR], [set hplip documentation directory [default=datadir/doc]]),
242 hpdocdir=$withval, hpdocdir="$datadir/doc/hplip-$VERSION")
243
244 +AC_ARG_WITH(htmldir, AC_HELP_STRING([--with-htmldir=DIR], [set hplip html documentation directory [default=datadir/doc]]),
245 + hphtmldir=$withval, hphtmldir="$datadir/doc/hplip-$VERSION")
246 +
247 AC_MSG_CHECKING([for foomatic ppd install])
248 AC_ARG_ENABLE(foomatic_ppd_install,
249 [ --enable-foomatic-ppd-install enable foomatic static ppd install (default=no), uses hpppddir],
250 @@ -551,6 +554,7 @@
251 AC_DEFINE_DIR([abs_sbindir], [sbindir])
252 AC_DEFINE_DIR([abs_hpppddir], [hpppddir])
253 AC_DEFINE_DIR([abs_docdir], [hpdocdir])
254 +AC_DEFINE_DIR([abs_htmldir], [hphtmldir])
255 abs_ppddir=${abs_hpppddir%/*}
256 AC_DEFINE_DIR([abs_drvdir], [drvdir])
257
258 @@ -558,6 +562,7 @@
259 AC_SUBST(abs_sbindir)
260 AC_SUBST(abs_hpppddir)
261 AC_SUBST(abs_docdir)
262 +AC_SUBST(abs_htmldir)
263 AC_SUBST(abs_ppddir)
264 AC_SUBST(abs_drvdir)
265 AC_SUBST(abs_mimedir)
266 @@ -568,6 +573,7 @@
267 AC_SUBST(cupsfilterdir)
268 AC_SUBST(hpppddir)
269 AC_SUBST(hpdocdir)
270 +AC_SUBST(hphtmldir)
271 AC_SUBST(drvdir)
272 AC_SUBST(network_build)
273 AC_SUBST(pp_build)
274 diff -Naur hplip-3.11.1-old/hplip.conf.in hplip-3.11.1/hplip.conf.in
275 --- hplip-3.11.1-old/hplip.conf.in 2011-01-24 20:45:27.429802335 +0100
276 +++ hplip-3.11.1/hplip.conf.in 2011-01-24 20:49:25.999802335 +0100
277 @@ -9,6 +9,7 @@
278 ppd=@abs_hpppddir@
279 ppdbase=@abs_ppddir@
280 doc=@abs_docdir@
281 +html=@abs_htmldir@
282 icon=@icondir@
283 cupsbackend=@cupsbackenddir@
284 cupsfilter=@cupsfilterdir@
285 @@ -42,4 +43,4 @@
286 lite-build=@lite_build@
287 udev-acl-rules=@udev_acl_rules@
288 hpcups-only-build=@hpcups_only_build@
289 -hpijs-only-build=@hpijs_only_build@
290 \ Kein Zeilenumbruch am Dateiende.
291 +hpijs-only-build=@hpijs_only_build@
292 diff -Naur hplip-3.11.1-old/hplip.list.in hplip-3.11.1/hplip.list.in
293 --- hplip-3.11.1-old/hplip.list.in 2011-01-24 20:45:27.523135669 +0100
294 +++ hplip-3.11.1/hplip.list.in 2011-01-24 20:50:25.959802335 +0100
295 @@ -49,6 +49,7 @@
296 $icondir=@icondir@
297 $systraydir=@systraydir@
298 $docdir=@hpdocdir@
299 +$htmldir=@hphtmldirdir@
300 $version=@VERSION@
301 $internal_tag=@PACKAGE_BUGREPORT@
302
303 @@ -257,11 +258,11 @@
304 @epm_full@f 644 root root $home/pcard/photocard.py pcard/photocard.py
305 @epm_full@f 755 root root $home/info.py info.py
306 # docs
307 -@epm_full@f 644 root root $docdir doc/*
308 -@epm_full@d 775 root root $docdir/images -
309 -@epm_full@f 644 root root $docdir/images doc/images/*
310 -@epm_full@d 775 root root $docdir/styles -
311 -@epm_full@f 644 root root $docdir/styles doc/styles/*
312 +@epm_full@f 644 root root $htmldir doc/*
313 +@epm_full@d 775 root root $htmldir/images -
314 +@epm_full@f 644 root root $htmldir/images doc/images/*
315 +@epm_full@d 775 root root $htmldir/styles -
316 +@epm_full@f 644 root root $htmldir/styles doc/styles/*
317 # python commands
318 @epm_full@l 755 root root $bindir/hp-toolbox ../share/hplip/toolbox.py
319 @epm_full@l 755 root root $bindir/hp-colorcal ../share/hplip/colorcal.py
320 diff -Naur hplip-3.11.1-old/Makefile.am hplip-3.11.1/Makefile.am
321 --- hplip-3.11.1-old/Makefile.am 2011-01-24 20:45:27.429802335 +0100
322 +++ hplip-3.11.1/Makefile.am 2011-01-24 20:51:45.893135668 +0100
323 @@ -9,6 +9,7 @@
324 hplipdir = $(datadir)/hplip
325
326 docdir = $(hpdocdir)
327 +htmldir = $(hphtmldir)
328 doc_DATA = COPYING copyright prnt/hpijs/README_LIBJPG
329 EXTRA_DIST = prnt/hpijs/gdevijs-krgb-1.5-gs8.61.patch prnt/hpijs/README_LIBJPG copyright
330
331 @@ -23,11 +24,11 @@
332
333 if DOC_BUILD
334 wwwsrc = doc
335 -www0dir = $(docdir)
336 +www0dir = $(htmldir)
337 dist_www0_DATA = $(wwwsrc)/index.html $(wwwsrc)/commandline.html $(wwwsrc)/copying.html $(wwwsrc)/devicemanager.html $(wwwsrc)/faxtrouble.html $(wwwsrc)/gettinghelp.html $(wwwsrc)/hpscan.html $(wwwsrc)/mainttask.html $(wwwsrc)/plugins.html $(wwwsrc)/print.html $(wwwsrc)/printing.html $(wwwsrc)/printoptions.html $(wwwsrc)/printtroubleshooting.html $(wwwsrc)/scanning.html $(wwwsrc)/scantrouble.html $(wwwsrc)/sendfax.html $(wwwsrc)/setup.html $(wwwsrc)/systray.html $(wwwsrc)/troubleshooting.html $(wwwsrc)/uninstalling.html $(wwwsrc)/upgrading.html
338 -www3dir = $(docdir)/styles
339 +www3dir = $(htmldir)/styles
340 dist_www3_DATA = $(wwwsrc)/styles/*
341 -www4dir = $(docdir)/images
342 +www4dir = $(htmldir)/images
343 dist_www4_DATA = $(wwwsrc)/images/*
344 endif
345
346
347
348
349 1.1 net-print/hplip/files/hplip-3.11.1-desktop.patch
350
351 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/hplip/files/hplip-3.11.1-desktop.patch?rev=1.1&view=markup
352 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/hplip/files/hplip-3.11.1-desktop.patch?rev=1.1&content-type=text/plain
353
354 Index: hplip-3.11.1-desktop.patch
355 ===================================================================
356 --- Makefile.am.old 2011-01-24 20:40:08.989802335 +0100
357 +++ Makefile.am 2011-01-24 20:40:23.913135667 +0100
358 @@ -332,6 +332,7 @@
359 hppgsz_CFLAGS = $(libapdk_la_CFLAGS)
360 hppgsz_LDADD = libapdk.la -ljpeg -ldl
361
362 +if GUI_BUILD
363 # hplip.desktop
364 hplip_desktopdir = $(icondir)
365 hplip_desktop_DATA = hplip.desktop
366 @@ -339,6 +340,7 @@
367 # hplip-systray.desktop
368 hplip_systraydir = $(systraydir)
369 hplip_systray_DATA = hplip-systray.desktop
370 +endif
371
372 # hpipjs (CUPS filter)
373 hplipjsdir = $(cupsfilterdir)
Report Message
Find on MARC Find on Google Groups