Merge ~mkukri/ubuntu/+source/xserver-xorg-input-synaptics:merge into ubuntu/+source/xserver-xorg-input-synaptics:ubuntu/devel
- Git
- lp:~mkukri/ubuntu/+source/xserver-xorg-input-synaptics
- merge
- Merge into ubuntu/devel
Status: | Merged |
---|---|
Merge reported by: | Mate Kukri |
Merged at revision: | 504592bd85db81a22bcc5e9f8fbbae61cbba8ab4 |
Proposed branch: | ~mkukri/ubuntu/+source/xserver-xorg-input-synaptics:merge |
Merge into: | ubuntu/+source/xserver-xorg-input-synaptics:ubuntu/devel |
Diff against target: |
2169 lines (+2147/-0) 3 files modified
debian/changelog (+6/-0) debian/patches/130_add_docs.patch (+2140/-0) debian/patches/series (+1/-0) |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Simon Quigley (community) | Approve | ||
Dan Bungert (community) | Needs Fixing | ||
Review via email: mp+456947@code.launchpad.net |
This proposal supersedes a proposal from 2023-12-01.
Commit message
Description of the change
ubuntu1 FTBFS-d, but it seems to be because the uploaded .diff.gz didn't include some files. Anyone uploading, please make sure the output is like the first snippet, and that the resulting .diff.gz has those files.
I know the Debian .diff.gz shouldn't really modify upstream files, but the upstream git repo and tarball is not perfectly identical, and Debian does the same thing.
See a successful PPA testbuild here: https:/
I locally get the following dpkg-buildpackage output (similar result to the Debian version):
```
dpkg-source: warning: the diff modifies the following upstream files:
.gitlab-ci.yml
ChangeLog
autogen.sh
docs/README.alps
docs/tapndrag.dia
docs/trouble-
```
Vs from launchpad build log it seems to show that only the gitlab-ci.yml was there:
```
dpkg-source: info: upstream files that have been modified:
/<<PKGBUILDDIR
```
Dan Bungert (dbungert) wrote (last edit ): Posted in a previous version of this proposal | # |
Mate Kukri (mkukri) wrote (last edit ): Posted in a previous version of this proposal | # |
Hi Dan, thanks for the review.
> I see the changelog says "No change rebuild" but what's going on here is
> something different. If I diff the actual 1.9.2-1ubuntu1 version to this, it
> does show differences similar to what is shown in your change description. So
> this isn't a "No change rebuild" - if you debdiff source package for such an
> upload I would only expect a difference on debian/changelog. So the changelog
> should instead reflect that. What's going on here is a correction to a
> previous flawed upload, which is fine but should be noted in the
> debian/changelog file. What that should be really depends on the rest of
> what's going on.
As for as changelog goes, of course I'll go and fix that. I put that there because it was a no change rebuild on my machine, but in retrospect that is indeed wrong because the source package that was uploaded did not match my build of ubuntu1.
> > I know the Debian .diff.gz shouldn't really modify upstream files,
> > but the upstream git repo and tarball is not perfectly identical,
>
> Source repacking is a thing and intended for some problems of this sort, for
> instance if the upstream tarball has things that are believed to be non-
> distributable. Is that the case here?
What is going on is that the upstream git repository has extra files compared to the upstream tarball,
and these "modifications" are merely adding those to the files from the tarball (because of the packaging actually being based on upstream git).
This seems to be limited to "autogen.sh" and some extra README files. All of which appear to be under the same license as the rest of the package.
> > and Debian does the same thing.
>
> It really would be more common to patch these files instead of modifying them
> directly, even if the Debian version were to be doing it in a non-standard
> way. Is there a reason we can't patch these files here in the quilt flow?
I can do this if you prefer, however the packaging is based on the upstream git repository, so it would imply extra diff removing the files and adding patches, and diverging from Debian for what appears to me not much benefit in this case.
Mate Kukri (mkukri) : Posted in a previous version of this proposal | # |
Dan Bungert (dbungert) wrote : | # |
> This proposal supersedes
It isn't always necessary to supersede, you can keep a MP around and force-push. Some other reviewers prefer to list the target branch as "debian/sid" like you had the first time.
> Re-upload to fix FTBFS caused by missing files in `1.9.2-1ubuntu1`
If I build the source package from this branch, it looks pretty much the same as ubuntu1, just adding your changelog, so this proposal will fail to address the FTBFS.
$ debdiff xserver-
changelog | 6 ++++++
1 file changed, 6 insertions(+)
Please understand that the contents of this git repo kind of don't matter, except in what source package is produced from here. That source package is what is uploaded, this is just a staging location to help produce that source package, and the needed changes are not yet in the source package.
> however the packaging is based on the upstream git repository, so it would imply extra diff removing the files and adding patches, and diverging from Debian for what appears to me not much benefit in this case
The files are missing because they aren't in the source package. We have to represent them in a source-package compatible way, or this problem of missing files will continue to happen. And as the package is FTBFS, there are functional changes in there, so yes we should be adding a patch or patches.
Mate Kukri (mkukri) wrote : | # |
I believe I understand how it works, the problem here is that I have naively rebased this atop the ubuntu/devel branch which being an import of the incorrect upload, of course does not include the files.
If you build my old version, it should include the files with the caveat of the warning being present about modification to upstream sources.
I do agree that moving them to a patch seems like a somewhat better solution and I'll fix this.
> > This proposal supersedes
>
> It isn't always necessary to supersede, you can keep a MP around and force-
> push. Some other reviewers prefer to list the target branch as "debian/sid"
> like you had the first time.
>
> > Re-upload to fix FTBFS caused by missing files in `1.9.2-1ubuntu1`
>
> If I build the source package from this branch, it looks pretty much the same
> as ubuntu1, just adding your changelog, so this proposal will fail to address
> the FTBFS.
>
> $ debdiff xserver-
> changelog | 6 ++++++
> 1 file changed, 6 insertions(+)
>
> Please understand that the contents of this git repo kind of don't matter,
> except in what source package is produced from here. That source package is
> what is uploaded, this is just a staging location to help produce that source
> package, and the needed changes are not yet in the source package.
>
> > however the packaging is based on the upstream git repository, so it would
> imply extra diff removing the files and adding patches, and diverging from
> Debian for what appears to me not much benefit in this case
>
> The files are missing because they aren't in the source package. We have to
> represent them in a source-package compatible way, or this problem of missing
> files will continue to happen. And as the package is FTBFS, there are
> functional changes in there, so yes we should be adding a patch or patches.
- 3acfae8... by Mate Kukri
-
- d/p/130_
add_docs. patch: Add required docs not present in upstream
tarball - 504592b... by Mate Kukri
-
releasing package xserver-
xorg-input- synaptics version 1.9.2-1ubuntu2
Mate Kukri (mkukri) wrote : | # |
Added the docs now
Simon Quigley (tsimonq2) wrote : | # |
Is .git in the tarball?
Mate Kukri (mkukri) wrote : | # |
> Is .git in the tarball?
It isn't I don't think, but for some reason dpkg-buildpackage tries to include it for this and other 1.0 packages unless I pass it the `-i` flag.
Mate Kukri (mkukri) : | # |
Preview Diff
1 | diff --git a/debian/changelog b/debian/changelog |
2 | index 4345efc..8abdd35 100644 |
3 | --- a/debian/changelog |
4 | +++ b/debian/changelog |
5 | @@ -1,3 +1,9 @@ |
6 | +xserver-xorg-input-synaptics (1.9.2-1ubuntu2) noble; urgency=medium |
7 | + |
8 | + * d/p/130_add_docs.patch: Add docs not present in upstream tarball |
9 | + |
10 | + -- Mate Kukri <mate.kukri@canonical.com> Fri, 01 Dec 2023 10:11:30 +0000 |
11 | + |
12 | xserver-xorg-input-synaptics (1.9.2-1ubuntu1) noble; urgency=medium |
13 | |
14 | * Merge with Debian unstable. Remaining changes: |
15 | diff --git a/debian/patches/130_add_docs.patch b/debian/patches/130_add_docs.patch |
16 | new file mode 100644 |
17 | index 0000000..556e2e3 |
18 | --- /dev/null |
19 | +++ b/debian/patches/130_add_docs.patch |
20 | @@ -0,0 +1,2140 @@ |
21 | +Description: Add docs directory missing from upstream tarball |
22 | +Author: Mate Kukri <mate.kukri@canonical.com> |
23 | +Last-Update: 2023-12-06 |
24 | +--- |
25 | +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ |
26 | +Index: xserver-xorg-input-synaptics-ubuntu/docs/README.alps |
27 | +=================================================================== |
28 | +--- /dev/null |
29 | ++++ xserver-xorg-input-synaptics-ubuntu/docs/README.alps |
30 | +@@ -0,0 +1,77 @@ |
31 | ++It is possible to use this driver with an ALPS Glidepoint device. If |
32 | ++you use an older 2.6 linux kernel which has no ALPS input driver, you |
33 | ++need to apply the ALPS kernel patch in the alps.patch file. See |
34 | ++http://www.kernelnewbies.org/faq/ for information about how to apply |
35 | ++kernel patches and compile kernels. |
36 | ++ |
37 | ++Note! If you use kernel 2.6.11 or later, the alps patch is already |
38 | ++included, so you don't have to patch your kernel. |
39 | ++ |
40 | ++Since ALPS touchpads don't have the same resolution as Synaptics |
41 | ++touchpads, you probably have to change some parameter values. Here is |
42 | ++an example InputDevice section for the X configuration file. |
43 | ++ |
44 | ++Section "InputDevice" |
45 | ++ Driver "synaptics" |
46 | ++ Identifier "Mouse[1]" |
47 | ++ Option "Device" "/dev/psaux" |
48 | ++ Option "Protocol" "auto-dev" |
49 | ++# enable SHMConfig if you want to enable synclient |
50 | ++# NB: enabling SHMConfig is insecure, since any user can invoke it |
51 | ++# Option "SHMConfig" "on" |
52 | ++ Option "LeftEdge" "120" |
53 | ++ Option "RightEdge" "830" |
54 | ++ Option "TopEdge" "120" |
55 | ++ Option "BottomEdge" "650" |
56 | ++ Option "FingerLow" "14" |
57 | ++ Option "FingerHigh" "15" |
58 | ++ Option "MaxTapTime" "180" |
59 | ++ Option "MaxTapMove" "110" |
60 | ++ Option "EmulateMidButtonTime" "75" |
61 | ++ Option "VertScrollDelta" "20" |
62 | ++ Option "HorizScrollDelta" "20" |
63 | ++ Option "CornerCoasting" "1" |
64 | ++ Option "CoastingSpeed" "3" |
65 | ++ Option "MinSpeed" "0.3" |
66 | ++ Option "MaxSpeed" "0.75" |
67 | ++ Option "AccelFactor" "0.015" |
68 | ++ Option "EdgeMotionMinSpeed" "200" |
69 | ++ Option "EdgeMotionMaxSpeed" "200" |
70 | ++ Option "UpDownScrolling" "1" |
71 | ++ Option "CircularScrolling" "1" |
72 | ++ Option "CircScrollDelta" "0.1" |
73 | ++ Option "CircScrollTrigger" "2" |
74 | ++EndSection |
75 | ++ |
76 | ++If you use a 2.4 linux kernel, you don't need to patch the kernel, but |
77 | ++you should instead set "Protocol" like this: |
78 | ++ |
79 | ++ Option "Protocol" "alps" |
80 | ++ |
81 | ++ |
82 | ++On some (all?) ALPS hardware, it is not possible to disable tapping |
83 | ++unless you apply the patch below. However, some users have reported |
84 | ++that this patch breaks tap-and-drag operations, which is why the patch |
85 | ++is not included in the main alps.patch file. |
86 | ++ |
87 | ++--- linux/drivers/input/mouse/alps.c~alps-test3 2004-02-28 20:46:34.000000000 +0100 |
88 | +++++ linux-petero/drivers/input/mouse/alps.c 2004-02-28 20:49:12.000000000 +0100 |
89 | ++@@ -87,6 +87,10 @@ static void ALPS_process_packet(struct p |
90 | ++ y = (packet[4] & 0x7f) | ((packet[3] & 0x70)<<(7-4)); |
91 | ++ z = packet[5]; |
92 | ++ |
93 | +++ if (packet[2] & 1) { |
94 | +++ z = 35; |
95 | +++ } |
96 | +++ |
97 | ++ if (z > 0) { |
98 | ++ input_report_abs(dev, ABS_X, x); |
99 | ++ input_report_abs(dev, ABS_Y, y); |
100 | ++@@ -97,7 +101,6 @@ static void ALPS_process_packet(struct p |
101 | ++ if (z > 30) input_report_key(dev, BTN_TOUCH, 1); |
102 | ++ if (z < 25) input_report_key(dev, BTN_TOUCH, 0); |
103 | ++ |
104 | ++- left |= (packet[2] ) & 1; |
105 | ++ left |= (packet[3] ) & 1; |
106 | ++ right |= (packet[3] >> 1) & 1; |
107 | ++ if (packet[0] == 0xff) { |
108 | +Index: xserver-xorg-input-synaptics-ubuntu/docs/tapndrag.dia |
109 | +=================================================================== |
110 | +--- /dev/null |
111 | ++++ xserver-xorg-input-synaptics-ubuntu/docs/tapndrag.dia |
112 | +@@ -0,0 +1,1891 @@ |
113 | ++<?xml version="1.0" encoding="UTF-8"?> |
114 | ++<dia:diagram xmlns:dia="http://www.lysator.liu.se/~alla/dia/"> |
115 | ++ <dia:diagramdata> |
116 | ++ <dia:attribute name="background"> |
117 | ++ <dia:color val="#ffffff"/> |
118 | ++ </dia:attribute> |
119 | ++ <dia:attribute name="pagebreak"> |
120 | ++ <dia:color val="#000099"/> |
121 | ++ </dia:attribute> |
122 | ++ <dia:attribute name="paper"> |
123 | ++ <dia:composite type="paper"> |
124 | ++ <dia:attribute name="name"> |
125 | ++ <dia:string>#A4#</dia:string> |
126 | ++ </dia:attribute> |
127 | ++ <dia:attribute name="tmargin"> |
128 | ++ <dia:real val="2.8222000598907471"/> |
129 | ++ </dia:attribute> |
130 | ++ <dia:attribute name="bmargin"> |
131 | ++ <dia:real val="2.8222000598907471"/> |
132 | ++ </dia:attribute> |
133 | ++ <dia:attribute name="lmargin"> |
134 | ++ <dia:real val="2.8222000598907471"/> |
135 | ++ </dia:attribute> |
136 | ++ <dia:attribute name="rmargin"> |
137 | ++ <dia:real val="2.8222000598907471"/> |
138 | ++ </dia:attribute> |
139 | ++ <dia:attribute name="is_portrait"> |
140 | ++ <dia:boolean val="true"/> |
141 | ++ </dia:attribute> |
142 | ++ <dia:attribute name="scaling"> |
143 | ++ <dia:real val="0.45899999141693115"/> |
144 | ++ </dia:attribute> |
145 | ++ <dia:attribute name="fitto"> |
146 | ++ <dia:boolean val="false"/> |
147 | ++ </dia:attribute> |
148 | ++ </dia:composite> |
149 | ++ </dia:attribute> |
150 | ++ <dia:attribute name="grid"> |
151 | ++ <dia:composite type="grid"> |
152 | ++ <dia:attribute name="width_x"> |
153 | ++ <dia:real val="1"/> |
154 | ++ </dia:attribute> |
155 | ++ <dia:attribute name="width_y"> |
156 | ++ <dia:real val="1"/> |
157 | ++ </dia:attribute> |
158 | ++ <dia:attribute name="visible_x"> |
159 | ++ <dia:int val="1"/> |
160 | ++ </dia:attribute> |
161 | ++ <dia:attribute name="visible_y"> |
162 | ++ <dia:int val="1"/> |
163 | ++ </dia:attribute> |
164 | ++ <dia:composite type="color"/> |
165 | ++ </dia:composite> |
166 | ++ </dia:attribute> |
167 | ++ <dia:attribute name="color"> |
168 | ++ <dia:color val="#d8e5e5"/> |
169 | ++ </dia:attribute> |
170 | ++ <dia:attribute name="guides"> |
171 | ++ <dia:composite type="guides"> |
172 | ++ <dia:attribute name="hguides"/> |
173 | ++ <dia:attribute name="vguides"/> |
174 | ++ </dia:composite> |
175 | ++ </dia:attribute> |
176 | ++ </dia:diagramdata> |
177 | ++ <dia:layer name="Background" visible="true" active="true"> |
178 | ++ <dia:object type="UML - Usecase" version="0" id="O0"> |
179 | ++ <dia:attribute name="obj_pos"> |
180 | ++ <dia:point val="10.3763,6.64119"/> |
181 | ++ </dia:attribute> |
182 | ++ <dia:attribute name="obj_bb"> |
183 | ++ <dia:rectangle val="10.3263,6.59119;13.6763,8.69119"/> |
184 | ++ </dia:attribute> |
185 | ++ <dia:attribute name="meta"> |
186 | ++ <dia:composite type="dict"/> |
187 | ++ </dia:attribute> |
188 | ++ <dia:attribute name="elem_corner"> |
189 | ++ <dia:point val="10.3763,6.64119"/> |
190 | ++ </dia:attribute> |
191 | ++ <dia:attribute name="elem_width"> |
192 | ++ <dia:real val="3.25"/> |
193 | ++ </dia:attribute> |
194 | ++ <dia:attribute name="elem_height"> |
195 | ++ <dia:real val="2"/> |
196 | ++ </dia:attribute> |
197 | ++ <dia:attribute name="line_width"> |
198 | ++ <dia:real val="0.10000000000000001"/> |
199 | ++ </dia:attribute> |
200 | ++ <dia:attribute name="line_colour"> |
201 | ++ <dia:color val="#000000"/> |
202 | ++ </dia:attribute> |
203 | ++ <dia:attribute name="fill_colour"> |
204 | ++ <dia:color val="#ffffff"/> |
205 | ++ </dia:attribute> |
206 | ++ <dia:attribute name="text_outside"> |
207 | ++ <dia:boolean val="false"/> |
208 | ++ </dia:attribute> |
209 | ++ <dia:attribute name="collaboration"> |
210 | ++ <dia:boolean val="false"/> |
211 | ++ </dia:attribute> |
212 | ++ <dia:attribute name="text"> |
213 | ++ <dia:composite type="text"> |
214 | ++ <dia:attribute name="string"> |
215 | ++ <dia:string>#Start#</dia:string> |
216 | ++ </dia:attribute> |
217 | ++ <dia:attribute name="font"> |
218 | ++ <dia:font family="arial" style="0" name="Helvetica"/> |
219 | ++ </dia:attribute> |
220 | ++ <dia:attribute name="height"> |
221 | ++ <dia:real val="0.80000000000000004"/> |
222 | ++ </dia:attribute> |
223 | ++ <dia:attribute name="pos"> |
224 | ++ <dia:point val="12.0013,7.82119"/> |
225 | ++ </dia:attribute> |
226 | ++ <dia:attribute name="color"> |
227 | ++ <dia:color val="#000000"/> |
228 | ++ </dia:attribute> |
229 | ++ <dia:attribute name="alignment"> |
230 | ++ <dia:enum val="1"/> |
231 | ++ </dia:attribute> |
232 | ++ </dia:composite> |
233 | ++ </dia:attribute> |
234 | ++ </dia:object> |
235 | ++ <dia:object type="UML - Usecase" version="0" id="O1"> |
236 | ++ <dia:attribute name="obj_pos"> |
237 | ++ <dia:point val="10.3763,13.1485"/> |
238 | ++ </dia:attribute> |
239 | ++ <dia:attribute name="obj_bb"> |
240 | ++ <dia:rectangle val="10.3263,13.0985;13.6763,15.1985"/> |
241 | ++ </dia:attribute> |
242 | ++ <dia:attribute name="meta"> |
243 | ++ <dia:composite type="dict"/> |
244 | ++ </dia:attribute> |
245 | ++ <dia:attribute name="elem_corner"> |
246 | ++ <dia:point val="10.3763,13.1485"/> |
247 | ++ </dia:attribute> |
248 | ++ <dia:attribute name="elem_width"> |
249 | ++ <dia:real val="3.25"/> |
250 | ++ </dia:attribute> |
251 | ++ <dia:attribute name="elem_height"> |
252 | ++ <dia:real val="2"/> |
253 | ++ </dia:attribute> |
254 | ++ <dia:attribute name="line_width"> |
255 | ++ <dia:real val="0.10000000000000001"/> |
256 | ++ </dia:attribute> |
257 | ++ <dia:attribute name="line_colour"> |
258 | ++ <dia:color val="#000000"/> |
259 | ++ </dia:attribute> |
260 | ++ <dia:attribute name="fill_colour"> |
261 | ++ <dia:color val="#ffffff"/> |
262 | ++ </dia:attribute> |
263 | ++ <dia:attribute name="text_outside"> |
264 | ++ <dia:boolean val="false"/> |
265 | ++ </dia:attribute> |
266 | ++ <dia:attribute name="collaboration"> |
267 | ++ <dia:boolean val="false"/> |
268 | ++ </dia:attribute> |
269 | ++ <dia:attribute name="text"> |
270 | ++ <dia:composite type="text"> |
271 | ++ <dia:attribute name="string"> |
272 | ++ <dia:string>#1#</dia:string> |
273 | ++ </dia:attribute> |
274 | ++ <dia:attribute name="font"> |
275 | ++ <dia:font family="arial" style="0" name="Helvetica"/> |
276 | ++ </dia:attribute> |
277 | ++ <dia:attribute name="height"> |
278 | ++ <dia:real val="0.80000000000000004"/> |
279 | ++ </dia:attribute> |
280 | ++ <dia:attribute name="pos"> |
281 | ++ <dia:point val="12.0013,14.3285"/> |
282 | ++ </dia:attribute> |
283 | ++ <dia:attribute name="color"> |
284 | ++ <dia:color val="#000000"/> |
285 | ++ </dia:attribute> |
286 | ++ <dia:attribute name="alignment"> |
287 | ++ <dia:enum val="1"/> |
288 | ++ </dia:attribute> |
289 | ++ </dia:composite> |
290 | ++ </dia:attribute> |
291 | ++ </dia:object> |
292 | ++ <dia:object type="UML - Usecase" version="0" id="O2"> |
293 | ++ <dia:attribute name="obj_pos"> |
294 | ++ <dia:point val="3.81628,19.5885"/> |
295 | ++ </dia:attribute> |
296 | ++ <dia:attribute name="obj_bb"> |
297 | ++ <dia:rectangle val="3.76628,19.5385;7.11628,21.6385"/> |
298 | ++ </dia:attribute> |
299 | ++ <dia:attribute name="meta"> |
300 | ++ <dia:composite type="dict"/> |
301 | ++ </dia:attribute> |
302 | ++ <dia:attribute name="elem_corner"> |
303 | ++ <dia:point val="3.81628,19.5885"/> |
304 | ++ </dia:attribute> |
305 | ++ <dia:attribute name="elem_width"> |
306 | ++ <dia:real val="3.25"/> |
307 | ++ </dia:attribute> |
308 | ++ <dia:attribute name="elem_height"> |
309 | ++ <dia:real val="2"/> |
310 | ++ </dia:attribute> |
311 | ++ <dia:attribute name="line_width"> |
312 | ++ <dia:real val="0.10000000000000001"/> |
313 | ++ </dia:attribute> |
314 | ++ <dia:attribute name="line_colour"> |
315 | ++ <dia:color val="#000000"/> |
316 | ++ </dia:attribute> |
317 | ++ <dia:attribute name="fill_colour"> |
318 | ++ <dia:color val="#ffffff"/> |
319 | ++ </dia:attribute> |
320 | ++ <dia:attribute name="text_outside"> |
321 | ++ <dia:boolean val="false"/> |
322 | ++ </dia:attribute> |
323 | ++ <dia:attribute name="collaboration"> |
324 | ++ <dia:boolean val="false"/> |
325 | ++ </dia:attribute> |
326 | ++ <dia:attribute name="text"> |
327 | ++ <dia:composite type="text"> |
328 | ++ <dia:attribute name="string"> |
329 | ++ <dia:string>#2b#</dia:string> |
330 | ++ </dia:attribute> |
331 | ++ <dia:attribute name="font"> |
332 | ++ <dia:font family="arial" style="0" name="Helvetica"/> |
333 | ++ </dia:attribute> |
334 | ++ <dia:attribute name="height"> |
335 | ++ <dia:real val="0.80000000000000004"/> |
336 | ++ </dia:attribute> |
337 | ++ <dia:attribute name="pos"> |
338 | ++ <dia:point val="5.44128,20.7685"/> |
339 | ++ </dia:attribute> |
340 | ++ <dia:attribute name="color"> |
341 | ++ <dia:color val="#000000"/> |
342 | ++ </dia:attribute> |
343 | ++ <dia:attribute name="alignment"> |
344 | ++ <dia:enum val="1"/> |
345 | ++ </dia:attribute> |
346 | ++ </dia:composite> |
347 | ++ </dia:attribute> |
348 | ++ </dia:object> |
349 | ++ <dia:object type="UML - Usecase" version="0" id="O3"> |
350 | ++ <dia:attribute name="obj_pos"> |
351 | ++ <dia:point val="10.3763,26.743"/> |
352 | ++ </dia:attribute> |
353 | ++ <dia:attribute name="obj_bb"> |
354 | ++ <dia:rectangle val="10.3263,26.693;13.6763,28.793"/> |
355 | ++ </dia:attribute> |
356 | ++ <dia:attribute name="meta"> |
357 | ++ <dia:composite type="dict"/> |
358 | ++ </dia:attribute> |
359 | ++ <dia:attribute name="elem_corner"> |
360 | ++ <dia:point val="10.3763,26.743"/> |
361 | ++ </dia:attribute> |
362 | ++ <dia:attribute name="elem_width"> |
363 | ++ <dia:real val="3.25"/> |
364 | ++ </dia:attribute> |
365 | ++ <dia:attribute name="elem_height"> |
366 | ++ <dia:real val="2"/> |
367 | ++ </dia:attribute> |
368 | ++ <dia:attribute name="line_width"> |
369 | ++ <dia:real val="0.10000000000000001"/> |
370 | ++ </dia:attribute> |
371 | ++ <dia:attribute name="line_colour"> |
372 | ++ <dia:color val="#000000"/> |
373 | ++ </dia:attribute> |
374 | ++ <dia:attribute name="fill_colour"> |
375 | ++ <dia:color val="#ffffff"/> |
376 | ++ </dia:attribute> |
377 | ++ <dia:attribute name="text_outside"> |
378 | ++ <dia:boolean val="false"/> |
379 | ++ </dia:attribute> |
380 | ++ <dia:attribute name="collaboration"> |
381 | ++ <dia:boolean val="false"/> |
382 | ++ </dia:attribute> |
383 | ++ <dia:attribute name="text"> |
384 | ++ <dia:composite type="text"> |
385 | ++ <dia:attribute name="string"> |
386 | ++ <dia:string>#3#</dia:string> |
387 | ++ </dia:attribute> |
388 | ++ <dia:attribute name="font"> |
389 | ++ <dia:font family="arial" style="0" name="Helvetica"/> |
390 | ++ </dia:attribute> |
391 | ++ <dia:attribute name="height"> |
392 | ++ <dia:real val="0.80000000000000004"/> |
393 | ++ </dia:attribute> |
394 | ++ <dia:attribute name="pos"> |
395 | ++ <dia:point val="12.0013,27.923"/> |
396 | ++ </dia:attribute> |
397 | ++ <dia:attribute name="color"> |
398 | ++ <dia:color val="#000000"/> |
399 | ++ </dia:attribute> |
400 | ++ <dia:attribute name="alignment"> |
401 | ++ <dia:enum val="1"/> |
402 | ++ </dia:attribute> |
403 | ++ </dia:composite> |
404 | ++ </dia:attribute> |
405 | ++ </dia:object> |
406 | ++ <dia:object type="UML - Usecase" version="0" id="O4"> |
407 | ++ <dia:attribute name="obj_pos"> |
408 | ++ <dia:point val="19.7687,13.1485"/> |
409 | ++ </dia:attribute> |
410 | ++ <dia:attribute name="obj_bb"> |
411 | ++ <dia:rectangle val="19.7187,13.0985;23.0687,15.1985"/> |
412 | ++ </dia:attribute> |
413 | ++ <dia:attribute name="meta"> |
414 | ++ <dia:composite type="dict"/> |
415 | ++ </dia:attribute> |
416 | ++ <dia:attribute name="elem_corner"> |
417 | ++ <dia:point val="19.7687,13.1485"/> |
418 | ++ </dia:attribute> |
419 | ++ <dia:attribute name="elem_width"> |
420 | ++ <dia:real val="3.25"/> |
421 | ++ </dia:attribute> |
422 | ++ <dia:attribute name="elem_height"> |
423 | ++ <dia:real val="2"/> |
424 | ++ </dia:attribute> |
425 | ++ <dia:attribute name="line_width"> |
426 | ++ <dia:real val="0.10000000000000001"/> |
427 | ++ </dia:attribute> |
428 | ++ <dia:attribute name="line_colour"> |
429 | ++ <dia:color val="#000000"/> |
430 | ++ </dia:attribute> |
431 | ++ <dia:attribute name="fill_colour"> |
432 | ++ <dia:color val="#ffffff"/> |
433 | ++ </dia:attribute> |
434 | ++ <dia:attribute name="text_outside"> |
435 | ++ <dia:boolean val="false"/> |
436 | ++ </dia:attribute> |
437 | ++ <dia:attribute name="collaboration"> |
438 | ++ <dia:boolean val="false"/> |
439 | ++ </dia:attribute> |
440 | ++ <dia:attribute name="text"> |
441 | ++ <dia:composite type="text"> |
442 | ++ <dia:attribute name="string"> |
443 | ++ <dia:string>#Move#</dia:string> |
444 | ++ </dia:attribute> |
445 | ++ <dia:attribute name="font"> |
446 | ++ <dia:font family="arial" style="0" name="Helvetica"/> |
447 | ++ </dia:attribute> |
448 | ++ <dia:attribute name="height"> |
449 | ++ <dia:real val="0.80000000000000004"/> |
450 | ++ </dia:attribute> |
451 | ++ <dia:attribute name="pos"> |
452 | ++ <dia:point val="21.3937,14.3285"/> |
453 | ++ </dia:attribute> |
454 | ++ <dia:attribute name="color"> |
455 | ++ <dia:color val="#000000"/> |
456 | ++ </dia:attribute> |
457 | ++ <dia:attribute name="alignment"> |
458 | ++ <dia:enum val="1"/> |
459 | ++ </dia:attribute> |
460 | ++ </dia:composite> |
461 | ++ </dia:attribute> |
462 | ++ </dia:object> |
463 | ++ <dia:object type="UML - Usecase" version="0" id="O5"> |
464 | ++ <dia:attribute name="obj_pos"> |
465 | ++ <dia:point val="19.7687,26.743"/> |
466 | ++ </dia:attribute> |
467 | ++ <dia:attribute name="obj_bb"> |
468 | ++ <dia:rectangle val="19.7187,26.693;23.0687,28.793"/> |
469 | ++ </dia:attribute> |
470 | ++ <dia:attribute name="meta"> |
471 | ++ <dia:composite type="dict"/> |
472 | ++ </dia:attribute> |
473 | ++ <dia:attribute name="elem_corner"> |
474 | ++ <dia:point val="19.7687,26.743"/> |
475 | ++ </dia:attribute> |
476 | ++ <dia:attribute name="elem_width"> |
477 | ++ <dia:real val="3.25"/> |
478 | ++ </dia:attribute> |
479 | ++ <dia:attribute name="elem_height"> |
480 | ++ <dia:real val="2"/> |
481 | ++ </dia:attribute> |
482 | ++ <dia:attribute name="line_width"> |
483 | ++ <dia:real val="0.10000000000000001"/> |
484 | ++ </dia:attribute> |
485 | ++ <dia:attribute name="line_colour"> |
486 | ++ <dia:color val="#000000"/> |
487 | ++ </dia:attribute> |
488 | ++ <dia:attribute name="fill_colour"> |
489 | ++ <dia:color val="#ffffff"/> |
490 | ++ </dia:attribute> |
491 | ++ <dia:attribute name="text_outside"> |
492 | ++ <dia:boolean val="false"/> |
493 | ++ </dia:attribute> |
494 | ++ <dia:attribute name="collaboration"> |
495 | ++ <dia:boolean val="false"/> |
496 | ++ </dia:attribute> |
497 | ++ <dia:attribute name="text"> |
498 | ++ <dia:composite type="text"> |
499 | ++ <dia:attribute name="string"> |
500 | ++ <dia:string>#Drag#</dia:string> |
501 | ++ </dia:attribute> |
502 | ++ <dia:attribute name="font"> |
503 | ++ <dia:font family="arial" style="0" name="Helvetica"/> |
504 | ++ </dia:attribute> |
505 | ++ <dia:attribute name="height"> |
506 | ++ <dia:real val="0.80000000000000004"/> |
507 | ++ </dia:attribute> |
508 | ++ <dia:attribute name="pos"> |
509 | ++ <dia:point val="21.3937,27.923"/> |
510 | ++ </dia:attribute> |
511 | ++ <dia:attribute name="color"> |
512 | ++ <dia:color val="#000000"/> |
513 | ++ </dia:attribute> |
514 | ++ <dia:attribute name="alignment"> |
515 | ++ <dia:enum val="1"/> |
516 | ++ </dia:attribute> |
517 | ++ </dia:composite> |
518 | ++ </dia:attribute> |
519 | ++ </dia:object> |
520 | ++ <dia:object type="Standard - Line" version="0" id="O6"> |
521 | ++ <dia:attribute name="obj_pos"> |
522 | ++ <dia:point val="12.0013,8.64119"/> |
523 | ++ </dia:attribute> |
524 | ++ <dia:attribute name="obj_bb"> |
525 | ++ <dia:rectangle val="11.5204,8.59119;12.4822,13.2603"/> |
526 | ++ </dia:attribute> |
527 | ++ <dia:attribute name="conn_endpoints"> |
528 | ++ <dia:point val="12.0013,8.64119"/> |
529 | ++ <dia:point val="12.0013,13.1485"/> |
530 | ++ </dia:attribute> |
531 | ++ <dia:attribute name="numcp"> |
532 | ++ <dia:int val="1"/> |
533 | ++ </dia:attribute> |
534 | ++ <dia:attribute name="end_arrow"> |
535 | ++ <dia:enum val="1"/> |
536 | ++ </dia:attribute> |
537 | ++ <dia:attribute name="end_arrow_length"> |
538 | ++ <dia:real val="0.80000000000000004"/> |
539 | ++ </dia:attribute> |
540 | ++ <dia:attribute name="end_arrow_width"> |
541 | ++ <dia:real val="0.80000000000000004"/> |
542 | ++ </dia:attribute> |
543 | ++ <dia:connections> |
544 | ++ <dia:connection handle="0" to="O0" connection="6"/> |
545 | ++ <dia:connection handle="1" to="O1" connection="1"/> |
546 | ++ </dia:connections> |
547 | ++ </dia:object> |
548 | ++ <dia:object type="Standard - Line" version="0" id="O7"> |
549 | ++ <dia:attribute name="obj_pos"> |
550 | ++ <dia:point val="12.0013,15.1485"/> |
551 | ++ </dia:attribute> |
552 | ++ <dia:attribute name="obj_bb"> |
553 | ++ <dia:rectangle val="11.5204,15.0985;12.4822,19.7503"/> |
554 | ++ </dia:attribute> |
555 | ++ <dia:attribute name="conn_endpoints"> |
556 | ++ <dia:point val="12.0013,15.1485"/> |
557 | ++ <dia:point val="12.0013,19.6385"/> |
558 | ++ </dia:attribute> |
559 | ++ <dia:attribute name="numcp"> |
560 | ++ <dia:int val="1"/> |
561 | ++ </dia:attribute> |
562 | ++ <dia:attribute name="end_arrow"> |
563 | ++ <dia:enum val="1"/> |
564 | ++ </dia:attribute> |
565 | ++ <dia:attribute name="end_arrow_length"> |
566 | ++ <dia:real val="0.80000000000000004"/> |
567 | ++ </dia:attribute> |
568 | ++ <dia:attribute name="end_arrow_width"> |
569 | ++ <dia:real val="0.80000000000000004"/> |
570 | ++ </dia:attribute> |
571 | ++ <dia:connections> |
572 | ++ <dia:connection handle="0" to="O1" connection="6"/> |
573 | ++ <dia:connection handle="1" to="O34" connection="1"/> |
574 | ++ </dia:connections> |
575 | ++ </dia:object> |
576 | ++ <dia:object type="Standard - Line" version="0" id="O8"> |
577 | ++ <dia:attribute name="obj_pos"> |
578 | ++ <dia:point val="5.44128,21.5885"/> |
579 | ++ </dia:attribute> |
580 | ++ <dia:attribute name="obj_bb"> |
581 | ++ <dia:rectangle val="5.37057,21.5178;10.9311,27.1152"/> |
582 | ++ </dia:attribute> |
583 | ++ <dia:attribute name="conn_endpoints"> |
584 | ++ <dia:point val="5.44128,21.5885"/> |
585 | ++ <dia:point val="10.8523,27.0359"/> |
586 | ++ </dia:attribute> |
587 | ++ <dia:attribute name="numcp"> |
588 | ++ <dia:int val="1"/> |
589 | ++ </dia:attribute> |
590 | ++ <dia:attribute name="end_arrow"> |
591 | ++ <dia:enum val="1"/> |
592 | ++ </dia:attribute> |
593 | ++ <dia:attribute name="end_arrow_length"> |
594 | ++ <dia:real val="0.80000000000000004"/> |
595 | ++ </dia:attribute> |
596 | ++ <dia:attribute name="end_arrow_width"> |
597 | ++ <dia:real val="0.80000000000000004"/> |
598 | ++ </dia:attribute> |
599 | ++ <dia:connections> |
600 | ++ <dia:connection handle="0" to="O2" connection="6"/> |
601 | ++ <dia:connection handle="1" to="O3" connection="0"/> |
602 | ++ </dia:connections> |
603 | ++ </dia:object> |
604 | ++ <dia:object type="Standard - Line" version="0" id="O9"> |
605 | ++ <dia:attribute name="obj_pos"> |
606 | ++ <dia:point val="13.6263,14.1485"/> |
607 | ++ </dia:attribute> |
608 | ++ <dia:attribute name="obj_bb"> |
609 | ++ <dia:rectangle val="13.5763,13.6676;19.8805,14.6294"/> |
610 | ++ </dia:attribute> |
611 | ++ <dia:attribute name="conn_endpoints"> |
612 | ++ <dia:point val="13.6263,14.1485"/> |
613 | ++ <dia:point val="19.7687,14.1485"/> |
614 | ++ </dia:attribute> |
615 | ++ <dia:attribute name="numcp"> |
616 | ++ <dia:int val="1"/> |
617 | ++ </dia:attribute> |
618 | ++ <dia:attribute name="end_arrow"> |
619 | ++ <dia:enum val="1"/> |
620 | ++ </dia:attribute> |
621 | ++ <dia:attribute name="end_arrow_length"> |
622 | ++ <dia:real val="0.80000000000000004"/> |
623 | ++ </dia:attribute> |
624 | ++ <dia:attribute name="end_arrow_width"> |
625 | ++ <dia:real val="0.80000000000000004"/> |
626 | ++ </dia:attribute> |
627 | ++ <dia:connections> |
628 | ++ <dia:connection handle="0" to="O1" connection="4"/> |
629 | ++ <dia:connection handle="1" to="O4" connection="3"/> |
630 | ++ </dia:connections> |
631 | ++ </dia:object> |
632 | ++ <dia:object type="Standard - Arc" version="0" id="O10"> |
633 | ++ <dia:attribute name="obj_pos"> |
634 | ++ <dia:point val="21.3937,13.1485"/> |
635 | ++ </dia:attribute> |
636 | ++ <dia:attribute name="obj_bb"> |
637 | ++ <dia:rectangle val="13.0819,8.25411;21.4621,13.2169"/> |
638 | ++ </dia:attribute> |
639 | ++ <dia:attribute name="conn_endpoints"> |
640 | ++ <dia:point val="21.3937,13.1485"/> |
641 | ++ <dia:point val="13.1503,8.3483"/> |
642 | ++ </dia:attribute> |
643 | ++ <dia:attribute name="curve_distance"> |
644 | ++ <dia:real val="0.34190799999999999"/> |
645 | ++ </dia:attribute> |
646 | ++ <dia:attribute name="end_arrow"> |
647 | ++ <dia:enum val="1"/> |
648 | ++ </dia:attribute> |
649 | ++ <dia:attribute name="end_arrow_length"> |
650 | ++ <dia:real val="0.80000000000000004"/> |
651 | ++ </dia:attribute> |
652 | ++ <dia:attribute name="end_arrow_width"> |
653 | ++ <dia:real val="0.80000000000000004"/> |
654 | ++ </dia:attribute> |
655 | ++ <dia:connections> |
656 | ++ <dia:connection handle="0" to="O4" connection="1"/> |
657 | ++ <dia:connection handle="1" to="O0" connection="7"/> |
658 | ++ </dia:connections> |
659 | ++ </dia:object> |
660 | ++ <dia:object type="Standard - BezierLine" version="0" id="O11"> |
661 | ++ <dia:attribute name="obj_pos"> |
662 | ++ <dia:point val="22.5427,27.0359"/> |
663 | ++ </dia:attribute> |
664 | ++ <dia:attribute name="obj_bb"> |
665 | ++ <dia:rectangle val="13.6263,7.35592;26.3479,27.1059"/> |
666 | ++ </dia:attribute> |
667 | ++ <dia:attribute name="bez_points"> |
668 | ++ <dia:point val="22.5427,27.0359"/> |
669 | ++ <dia:point val="31.4003,15.2912"/> |
670 | ++ <dia:point val="22.9859,9.4912"/> |
671 | ++ <dia:point val="13.6263,7.64119"/> |
672 | ++ </dia:attribute> |
673 | ++ <dia:attribute name="corner_types"> |
674 | ++ <dia:enum val="0"/> |
675 | ++ <dia:enum val="0"/> |
676 | ++ </dia:attribute> |
677 | ++ <dia:attribute name="end_arrow"> |
678 | ++ <dia:enum val="1"/> |
679 | ++ </dia:attribute> |
680 | ++ <dia:attribute name="end_arrow_length"> |
681 | ++ <dia:real val="0.80000000000000004"/> |
682 | ++ </dia:attribute> |
683 | ++ <dia:attribute name="end_arrow_width"> |
684 | ++ <dia:real val="0.80000000000000004"/> |
685 | ++ </dia:attribute> |
686 | ++ <dia:connections> |
687 | ++ <dia:connection handle="0" to="O5" connection="2"/> |
688 | ++ <dia:connection handle="3" to="O0" connection="4"/> |
689 | ++ </dia:connections> |
690 | ++ </dia:object> |
691 | ++ <dia:object type="Standard - BezierLine" version="0" id="O12"> |
692 | ++ <dia:attribute name="obj_pos"> |
693 | ++ <dia:point val="10.3763,27.743"/> |
694 | ++ </dia:attribute> |
695 | ++ <dia:attribute name="obj_bb"> |
696 | ++ <dia:rectangle val="3.38587,21.2956;10.4428,28.2854"/> |
697 | ++ </dia:attribute> |
698 | ++ <dia:attribute name="bez_points"> |
699 | ++ <dia:point val="10.3763,27.743"/> |
700 | ++ <dia:point val="7.18118,29.2357"/> |
701 | ++ <dia:point val="1.35186,27.3857"/> |
702 | ++ <dia:point val="4.29223,21.2956"/> |
703 | ++ </dia:attribute> |
704 | ++ <dia:attribute name="corner_types"> |
705 | ++ <dia:enum val="0"/> |
706 | ++ <dia:enum val="0"/> |
707 | ++ </dia:attribute> |
708 | ++ <dia:attribute name="end_arrow"> |
709 | ++ <dia:enum val="1"/> |
710 | ++ </dia:attribute> |
711 | ++ <dia:attribute name="end_arrow_length"> |
712 | ++ <dia:real val="0.80000000000000004"/> |
713 | ++ </dia:attribute> |
714 | ++ <dia:attribute name="end_arrow_width"> |
715 | ++ <dia:real val="0.80000000000000004"/> |
716 | ++ </dia:attribute> |
717 | ++ <dia:connections> |
718 | ++ <dia:connection handle="0" to="O3" connection="3"/> |
719 | ++ <dia:connection handle="3" to="O2" connection="5"/> |
720 | ++ </dia:connections> |
721 | ++ </dia:object> |
722 | ++ <dia:object type="UML - Note" version="0" id="O13"> |
723 | ++ <dia:attribute name="obj_pos"> |
724 | ++ <dia:point val="1.84118,30.7912"/> |
725 | ++ </dia:attribute> |
726 | ++ <dia:attribute name="obj_bb"> |
727 | ++ <dia:rectangle val="1.79118,30.7412;15.4962,41.3412"/> |
728 | ++ </dia:attribute> |
729 | ++ <dia:attribute name="meta"> |
730 | ++ <dia:composite type="dict"/> |
731 | ++ </dia:attribute> |
732 | ++ <dia:attribute name="elem_corner"> |
733 | ++ <dia:point val="1.84118,30.7912"/> |
734 | ++ </dia:attribute> |
735 | ++ <dia:attribute name="elem_width"> |
736 | ++ <dia:real val="13.605"/> |
737 | ++ </dia:attribute> |
738 | ++ <dia:attribute name="elem_height"> |
739 | ++ <dia:real val="10.500000000000002"/> |
740 | ++ </dia:attribute> |
741 | ++ <dia:attribute name="line_width"> |
742 | ++ <dia:real val="0.10000000000000001"/> |
743 | ++ </dia:attribute> |
744 | ++ <dia:attribute name="line_colour"> |
745 | ++ <dia:color val="#000000"/> |
746 | ++ </dia:attribute> |
747 | ++ <dia:attribute name="fill_colour"> |
748 | ++ <dia:color val="#ffffff"/> |
749 | ++ </dia:attribute> |
750 | ++ <dia:attribute name="text"> |
751 | ++ <dia:composite type="text"> |
752 | ++ <dia:attribute name="string"> |
753 | ++ <dia:string>#T : Touch |
754 | ++R : Release |
755 | ++TO : Tap Timeout |
756 | ++TO2: Mouse click timeout |
757 | ++TO3: Double tap timeout |
758 | ++TO4: Single tap timeout |
759 | ++TO5: Locked drag timeout |
760 | ++M : Finger movement |
761 | ++[U]: Generate button up event |
762 | ++[D]: Generate button down event |
763 | ++L : Locked drags enabled |
764 | ++TDG: Tap-and-drag gesture enabled#</dia:string> |
765 | ++ </dia:attribute> |
766 | ++ <dia:attribute name="font"> |
767 | ++ <dia:font family="courier new" style="0" name="Courier"/> |
768 | ++ </dia:attribute> |
769 | ++ <dia:attribute name="height"> |
770 | ++ <dia:real val="0.80000000000000004"/> |
771 | ++ </dia:attribute> |
772 | ++ <dia:attribute name="pos"> |
773 | ++ <dia:point val="2.19118,31.9737"/> |
774 | ++ </dia:attribute> |
775 | ++ <dia:attribute name="color"> |
776 | ++ <dia:color val="#000000"/> |
777 | ++ </dia:attribute> |
778 | ++ <dia:attribute name="alignment"> |
779 | ++ <dia:enum val="0"/> |
780 | ++ </dia:attribute> |
781 | ++ </dia:composite> |
782 | ++ </dia:attribute> |
783 | ++ </dia:object> |
784 | ++ <dia:object type="Standard - Text" version="1" id="O14"> |
785 | ++ <dia:attribute name="obj_pos"> |
786 | ++ <dia:point val="11.23,10.8357"/> |
787 | ++ </dia:attribute> |
788 | ++ <dia:attribute name="obj_bb"> |
789 | ++ <dia:rectangle val="11.0375,10.3032;11.4225,11.0282"/> |
790 | ++ </dia:attribute> |
791 | ++ <dia:attribute name="text"> |
792 | ++ <dia:composite type="text"> |
793 | ++ <dia:attribute name="string"> |
794 | ++ <dia:string>#T#</dia:string> |
795 | ++ </dia:attribute> |
796 | ++ <dia:attribute name="font"> |
797 | ++ <dia:font family="courier new" style="0" name="Courier"/> |
798 | ++ </dia:attribute> |
799 | ++ <dia:attribute name="height"> |
800 | ++ <dia:real val="0.80000000000000004"/> |
801 | ++ </dia:attribute> |
802 | ++ <dia:attribute name="pos"> |
803 | ++ <dia:point val="11.23,10.8357"/> |
804 | ++ </dia:attribute> |
805 | ++ <dia:attribute name="color"> |
806 | ++ <dia:color val="#000000"/> |
807 | ++ </dia:attribute> |
808 | ++ <dia:attribute name="alignment"> |
809 | ++ <dia:enum val="1"/> |
810 | ++ </dia:attribute> |
811 | ++ </dia:composite> |
812 | ++ </dia:attribute> |
813 | ++ <dia:attribute name="valign"> |
814 | ++ <dia:enum val="3"/> |
815 | ++ </dia:attribute> |
816 | ++ </dia:object> |
817 | ++ <dia:object type="Standard - Text" version="1" id="O15"> |
818 | ++ <dia:attribute name="obj_pos"> |
819 | ++ <dia:point val="8.4912,23.1912"/> |
820 | ++ </dia:attribute> |
821 | ++ <dia:attribute name="obj_bb"> |
822 | ++ <dia:rectangle val="7.9137,22.6587;9.0687,24.1837"/> |
823 | ++ </dia:attribute> |
824 | ++ <dia:attribute name="text"> |
825 | ++ <dia:composite type="text"> |
826 | ++ <dia:attribute name="string"> |
827 | ++ <dia:string>#T |
828 | ++[D]#</dia:string> |
829 | ++ </dia:attribute> |
830 | ++ <dia:attribute name="font"> |
831 | ++ <dia:font family="courier new" style="0" name="Courier"/> |
832 | ++ </dia:attribute> |
833 | ++ <dia:attribute name="height"> |
834 | ++ <dia:real val="0.80000000000000004"/> |
835 | ++ </dia:attribute> |
836 | ++ <dia:attribute name="pos"> |
837 | ++ <dia:point val="8.4912,23.1912"/> |
838 | ++ </dia:attribute> |
839 | ++ <dia:attribute name="color"> |
840 | ++ <dia:color val="#000000"/> |
841 | ++ </dia:attribute> |
842 | ++ <dia:attribute name="alignment"> |
843 | ++ <dia:enum val="1"/> |
844 | ++ </dia:attribute> |
845 | ++ </dia:composite> |
846 | ++ </dia:attribute> |
847 | ++ <dia:attribute name="valign"> |
848 | ++ <dia:enum val="3"/> |
849 | ++ </dia:attribute> |
850 | ++ </dia:object> |
851 | ++ <dia:object type="Standard - Text" version="1" id="O16"> |
852 | ++ <dia:attribute name="obj_pos"> |
853 | ++ <dia:point val="17.0662,11.0357"/> |
854 | ++ </dia:attribute> |
855 | ++ <dia:attribute name="obj_bb"> |
856 | ++ <dia:rectangle val="16.8737,10.5032;17.2587,11.2282"/> |
857 | ++ </dia:attribute> |
858 | ++ <dia:attribute name="text"> |
859 | ++ <dia:composite type="text"> |
860 | ++ <dia:attribute name="string"> |
861 | ++ <dia:string>#R#</dia:string> |
862 | ++ </dia:attribute> |
863 | ++ <dia:attribute name="font"> |
864 | ++ <dia:font family="courier new" style="0" name="Courier"/> |
865 | ++ </dia:attribute> |
866 | ++ <dia:attribute name="height"> |
867 | ++ <dia:real val="0.80000000000000004"/> |
868 | ++ </dia:attribute> |
869 | ++ <dia:attribute name="pos"> |
870 | ++ <dia:point val="17.0662,11.0357"/> |
871 | ++ </dia:attribute> |
872 | ++ <dia:attribute name="color"> |
873 | ++ <dia:color val="#000000"/> |
874 | ++ </dia:attribute> |
875 | ++ <dia:attribute name="alignment"> |
876 | ++ <dia:enum val="1"/> |
877 | ++ </dia:attribute> |
878 | ++ </dia:composite> |
879 | ++ </dia:attribute> |
880 | ++ <dia:attribute name="valign"> |
881 | ++ <dia:enum val="3"/> |
882 | ++ </dia:attribute> |
883 | ++ </dia:object> |
884 | ++ <dia:object type="Standard - Line" version="0" id="O17"> |
885 | ++ <dia:attribute name="obj_pos"> |
886 | ++ <dia:point val="13.6263,27.743"/> |
887 | ++ </dia:attribute> |
888 | ++ <dia:attribute name="obj_bb"> |
889 | ++ <dia:rectangle val="13.5763,27.2621;19.8805,28.2239"/> |
890 | ++ </dia:attribute> |
891 | ++ <dia:attribute name="conn_endpoints"> |
892 | ++ <dia:point val="13.6263,27.743"/> |
893 | ++ <dia:point val="19.7687,27.743"/> |
894 | ++ </dia:attribute> |
895 | ++ <dia:attribute name="numcp"> |
896 | ++ <dia:int val="1"/> |
897 | ++ </dia:attribute> |
898 | ++ <dia:attribute name="end_arrow"> |
899 | ++ <dia:enum val="1"/> |
900 | ++ </dia:attribute> |
901 | ++ <dia:attribute name="end_arrow_length"> |
902 | ++ <dia:real val="0.80000000000000004"/> |
903 | ++ </dia:attribute> |
904 | ++ <dia:attribute name="end_arrow_width"> |
905 | ++ <dia:real val="0.80000000000000004"/> |
906 | ++ </dia:attribute> |
907 | ++ <dia:connections> |
908 | ++ <dia:connection handle="0" to="O3" connection="4"/> |
909 | ++ <dia:connection handle="1" to="O5" connection="3"/> |
910 | ++ </dia:connections> |
911 | ++ </dia:object> |
912 | ++ <dia:object type="Standard - Text" version="1" id="O18"> |
913 | ++ <dia:attribute name="obj_pos"> |
914 | ++ <dia:point val="12.9069,17.2258"/> |
915 | ++ </dia:attribute> |
916 | ++ <dia:attribute name="obj_bb"> |
917 | ++ <dia:rectangle val="12.7144,16.6933;13.0994,17.4183"/> |
918 | ++ </dia:attribute> |
919 | ++ <dia:attribute name="text"> |
920 | ++ <dia:composite type="text"> |
921 | ++ <dia:attribute name="string"> |
922 | ++ <dia:string>#R#</dia:string> |
923 | ++ </dia:attribute> |
924 | ++ <dia:attribute name="font"> |
925 | ++ <dia:font family="courier new" style="0" name="Courier"/> |
926 | ++ </dia:attribute> |
927 | ++ <dia:attribute name="height"> |
928 | ++ <dia:real val="0.80000000000000004"/> |
929 | ++ </dia:attribute> |
930 | ++ <dia:attribute name="pos"> |
931 | ++ <dia:point val="12.9069,17.2258"/> |
932 | ++ </dia:attribute> |
933 | ++ <dia:attribute name="color"> |
934 | ++ <dia:color val="#000000"/> |
935 | ++ </dia:attribute> |
936 | ++ <dia:attribute name="alignment"> |
937 | ++ <dia:enum val="1"/> |
938 | ++ </dia:attribute> |
939 | ++ </dia:composite> |
940 | ++ </dia:attribute> |
941 | ++ <dia:attribute name="valign"> |
942 | ++ <dia:enum val="3"/> |
943 | ++ </dia:attribute> |
944 | ++ </dia:object> |
945 | ++ <dia:object type="Standard - Text" version="1" id="O19"> |
946 | ++ <dia:attribute name="obj_pos"> |
947 | ++ <dia:point val="5.32686,26.1857"/> |
948 | ++ </dia:attribute> |
949 | ++ <dia:attribute name="obj_bb"> |
950 | ++ <dia:rectangle val="4.74936,25.6532;5.90436,27.1782"/> |
951 | ++ </dia:attribute> |
952 | ++ <dia:attribute name="text"> |
953 | ++ <dia:composite type="text"> |
954 | ++ <dia:attribute name="string"> |
955 | ++ <dia:string>#R |
956 | ++[U]#</dia:string> |
957 | ++ </dia:attribute> |
958 | ++ <dia:attribute name="font"> |
959 | ++ <dia:font family="courier new" style="0" name="Courier"/> |
960 | ++ </dia:attribute> |
961 | ++ <dia:attribute name="height"> |
962 | ++ <dia:real val="0.80000000000000004"/> |
963 | ++ </dia:attribute> |
964 | ++ <dia:attribute name="pos"> |
965 | ++ <dia:point val="5.32686,26.1857"/> |
966 | ++ </dia:attribute> |
967 | ++ <dia:attribute name="color"> |
968 | ++ <dia:color val="#000000"/> |
969 | ++ </dia:attribute> |
970 | ++ <dia:attribute name="alignment"> |
971 | ++ <dia:enum val="1"/> |
972 | ++ </dia:attribute> |
973 | ++ </dia:composite> |
974 | ++ </dia:attribute> |
975 | ++ <dia:attribute name="valign"> |
976 | ++ <dia:enum val="3"/> |
977 | ++ </dia:attribute> |
978 | ++ </dia:object> |
979 | ++ <dia:object type="Standard - Text" version="1" id="O20"> |
980 | ++ <dia:attribute name="obj_pos"> |
981 | ++ <dia:point val="16.3912,13.6912"/> |
982 | ++ </dia:attribute> |
983 | ++ <dia:attribute name="obj_bb"> |
984 | ++ <dia:rectangle val="15.0437,13.1587;17.7387,13.8837"/> |
985 | ++ </dia:attribute> |
986 | ++ <dia:attribute name="text"> |
987 | ++ <dia:composite type="text"> |
988 | ++ <dia:attribute name="string"> |
989 | ++ <dia:string>#TO or M#</dia:string> |
990 | ++ </dia:attribute> |
991 | ++ <dia:attribute name="font"> |
992 | ++ <dia:font family="courier new" style="0" name="Courier"/> |
993 | ++ </dia:attribute> |
994 | ++ <dia:attribute name="height"> |
995 | ++ <dia:real val="0.80000000000000004"/> |
996 | ++ </dia:attribute> |
997 | ++ <dia:attribute name="pos"> |
998 | ++ <dia:point val="16.3912,13.6912"/> |
999 | ++ </dia:attribute> |
1000 | ++ <dia:attribute name="color"> |
1001 | ++ <dia:color val="#000000"/> |
1002 | ++ </dia:attribute> |
1003 | ++ <dia:attribute name="alignment"> |
1004 | ++ <dia:enum val="1"/> |
1005 | ++ </dia:attribute> |
1006 | ++ </dia:composite> |
1007 | ++ </dia:attribute> |
1008 | ++ <dia:attribute name="valign"> |
1009 | ++ <dia:enum val="3"/> |
1010 | ++ </dia:attribute> |
1011 | ++ </dia:object> |
1012 | ++ <dia:object type="Standard - Text" version="1" id="O21"> |
1013 | ++ <dia:attribute name="obj_pos"> |
1014 | ++ <dia:point val="16.1,28.5375"/> |
1015 | ++ </dia:attribute> |
1016 | ++ <dia:attribute name="obj_bb"> |
1017 | ++ <dia:rectangle val="14.3675,28.005;17.8325,29.53"/> |
1018 | ++ </dia:attribute> |
1019 | ++ <dia:attribute name="text"> |
1020 | ++ <dia:composite type="text"> |
1021 | ++ <dia:attribute name="string"> |
1022 | ++ <dia:string>#(TO or M) |
1023 | ++and TDG#</dia:string> |
1024 | ++ </dia:attribute> |
1025 | ++ <dia:attribute name="font"> |
1026 | ++ <dia:font family="courier new" style="0" name="Courier"/> |
1027 | ++ </dia:attribute> |
1028 | ++ <dia:attribute name="height"> |
1029 | ++ <dia:real val="0.80000000000000004"/> |
1030 | ++ </dia:attribute> |
1031 | ++ <dia:attribute name="pos"> |
1032 | ++ <dia:point val="16.1,28.5375"/> |
1033 | ++ </dia:attribute> |
1034 | ++ <dia:attribute name="color"> |
1035 | ++ <dia:color val="#000000"/> |
1036 | ++ </dia:attribute> |
1037 | ++ <dia:attribute name="alignment"> |
1038 | ++ <dia:enum val="1"/> |
1039 | ++ </dia:attribute> |
1040 | ++ </dia:composite> |
1041 | ++ </dia:attribute> |
1042 | ++ <dia:attribute name="valign"> |
1043 | ++ <dia:enum val="3"/> |
1044 | ++ </dia:attribute> |
1045 | ++ </dia:object> |
1046 | ++ <dia:object type="Standard - Text" version="1" id="O22"> |
1047 | ++ <dia:attribute name="obj_pos"> |
1048 | ++ <dia:point val="4.54118,17.5412"/> |
1049 | ++ </dia:attribute> |
1050 | ++ <dia:attribute name="obj_bb"> |
1051 | ++ <dia:rectangle val="3.96368,17.0087;5.11868,18.5337"/> |
1052 | ++ </dia:attribute> |
1053 | ++ <dia:attribute name="text"> |
1054 | ++ <dia:composite type="text"> |
1055 | ++ <dia:attribute name="string"> |
1056 | ++ <dia:string>#TO3 |
1057 | ++[D]#</dia:string> |
1058 | ++ </dia:attribute> |
1059 | ++ <dia:attribute name="font"> |
1060 | ++ <dia:font family="courier new" style="0" name="Courier"/> |
1061 | ++ </dia:attribute> |
1062 | ++ <dia:attribute name="height"> |
1063 | ++ <dia:real val="0.80000000000000004"/> |
1064 | ++ </dia:attribute> |
1065 | ++ <dia:attribute name="pos"> |
1066 | ++ <dia:point val="4.54118,17.5412"/> |
1067 | ++ </dia:attribute> |
1068 | ++ <dia:attribute name="color"> |
1069 | ++ <dia:color val="#000000"/> |
1070 | ++ </dia:attribute> |
1071 | ++ <dia:attribute name="alignment"> |
1072 | ++ <dia:enum val="1"/> |
1073 | ++ </dia:attribute> |
1074 | ++ </dia:composite> |
1075 | ++ </dia:attribute> |
1076 | ++ <dia:attribute name="valign"> |
1077 | ++ <dia:enum val="3"/> |
1078 | ++ </dia:attribute> |
1079 | ++ </dia:object> |
1080 | ++ <dia:object type="Standard - Text" version="1" id="O23"> |
1081 | ++ <dia:attribute name="obj_pos"> |
1082 | ++ <dia:point val="24.4912,17.8412"/> |
1083 | ++ </dia:attribute> |
1084 | ++ <dia:attribute name="obj_bb"> |
1085 | ++ <dia:rectangle val="23.3362,17.3087;25.6462,18.8337"/> |
1086 | ++ </dia:attribute> |
1087 | ++ <dia:attribute name="text"> |
1088 | ++ <dia:composite type="text"> |
1089 | ++ <dia:attribute name="string"> |
1090 | ++ <dia:string>#R & !L |
1091 | ++[U]#</dia:string> |
1092 | ++ </dia:attribute> |
1093 | ++ <dia:attribute name="font"> |
1094 | ++ <dia:font family="courier new" style="0" name="Courier"/> |
1095 | ++ </dia:attribute> |
1096 | ++ <dia:attribute name="height"> |
1097 | ++ <dia:real val="0.80000000000000004"/> |
1098 | ++ </dia:attribute> |
1099 | ++ <dia:attribute name="pos"> |
1100 | ++ <dia:point val="24.4912,17.8412"/> |
1101 | ++ </dia:attribute> |
1102 | ++ <dia:attribute name="color"> |
1103 | ++ <dia:color val="#000000"/> |
1104 | ++ </dia:attribute> |
1105 | ++ <dia:attribute name="alignment"> |
1106 | ++ <dia:enum val="1"/> |
1107 | ++ </dia:attribute> |
1108 | ++ </dia:composite> |
1109 | ++ </dia:attribute> |
1110 | ++ <dia:attribute name="valign"> |
1111 | ++ <dia:enum val="3"/> |
1112 | ++ </dia:attribute> |
1113 | ++ </dia:object> |
1114 | ++ <dia:object type="UML - Usecase" version="0" id="O24"> |
1115 | ++ <dia:attribute name="obj_pos"> |
1116 | ++ <dia:point val="19.7687,32.4912"/> |
1117 | ++ </dia:attribute> |
1118 | ++ <dia:attribute name="obj_bb"> |
1119 | ++ <dia:rectangle val="19.7187,32.4412;23.0687,34.5412"/> |
1120 | ++ </dia:attribute> |
1121 | ++ <dia:attribute name="meta"> |
1122 | ++ <dia:composite type="dict"/> |
1123 | ++ </dia:attribute> |
1124 | ++ <dia:attribute name="elem_corner"> |
1125 | ++ <dia:point val="19.7687,32.4912"/> |
1126 | ++ </dia:attribute> |
1127 | ++ <dia:attribute name="elem_width"> |
1128 | ++ <dia:real val="3.25"/> |
1129 | ++ </dia:attribute> |
1130 | ++ <dia:attribute name="elem_height"> |
1131 | ++ <dia:real val="2"/> |
1132 | ++ </dia:attribute> |
1133 | ++ <dia:attribute name="line_width"> |
1134 | ++ <dia:real val="0.10000000000000001"/> |
1135 | ++ </dia:attribute> |
1136 | ++ <dia:attribute name="line_colour"> |
1137 | ++ <dia:color val="#000000"/> |
1138 | ++ </dia:attribute> |
1139 | ++ <dia:attribute name="fill_colour"> |
1140 | ++ <dia:color val="#ffffff"/> |
1141 | ++ </dia:attribute> |
1142 | ++ <dia:attribute name="text_outside"> |
1143 | ++ <dia:boolean val="false"/> |
1144 | ++ </dia:attribute> |
1145 | ++ <dia:attribute name="collaboration"> |
1146 | ++ <dia:boolean val="false"/> |
1147 | ++ </dia:attribute> |
1148 | ++ <dia:attribute name="text"> |
1149 | ++ <dia:composite type="text"> |
1150 | ++ <dia:attribute name="string"> |
1151 | ++ <dia:string>#4#</dia:string> |
1152 | ++ </dia:attribute> |
1153 | ++ <dia:attribute name="font"> |
1154 | ++ <dia:font family="arial" style="0" name="Helvetica"/> |
1155 | ++ </dia:attribute> |
1156 | ++ <dia:attribute name="height"> |
1157 | ++ <dia:real val="0.80000000000000004"/> |
1158 | ++ </dia:attribute> |
1159 | ++ <dia:attribute name="pos"> |
1160 | ++ <dia:point val="21.3937,33.6712"/> |
1161 | ++ </dia:attribute> |
1162 | ++ <dia:attribute name="color"> |
1163 | ++ <dia:color val="#000000"/> |
1164 | ++ </dia:attribute> |
1165 | ++ <dia:attribute name="alignment"> |
1166 | ++ <dia:enum val="1"/> |
1167 | ++ </dia:attribute> |
1168 | ++ </dia:composite> |
1169 | ++ </dia:attribute> |
1170 | ++ </dia:object> |
1171 | ++ <dia:object type="UML - Usecase" version="0" id="O25"> |
1172 | ++ <dia:attribute name="obj_pos"> |
1173 | ++ <dia:point val="19.7687,38.0412"/> |
1174 | ++ </dia:attribute> |
1175 | ++ <dia:attribute name="obj_bb"> |
1176 | ++ <dia:rectangle val="19.7187,37.9912;23.0687,40.0912"/> |
1177 | ++ </dia:attribute> |
1178 | ++ <dia:attribute name="meta"> |
1179 | ++ <dia:composite type="dict"/> |
1180 | ++ </dia:attribute> |
1181 | ++ <dia:attribute name="elem_corner"> |
1182 | ++ <dia:point val="19.7687,38.0412"/> |
1183 | ++ </dia:attribute> |
1184 | ++ <dia:attribute name="elem_width"> |
1185 | ++ <dia:real val="3.25"/> |
1186 | ++ </dia:attribute> |
1187 | ++ <dia:attribute name="elem_height"> |
1188 | ++ <dia:real val="2"/> |
1189 | ++ </dia:attribute> |
1190 | ++ <dia:attribute name="line_width"> |
1191 | ++ <dia:real val="0.10000000000000001"/> |
1192 | ++ </dia:attribute> |
1193 | ++ <dia:attribute name="line_colour"> |
1194 | ++ <dia:color val="#000000"/> |
1195 | ++ </dia:attribute> |
1196 | ++ <dia:attribute name="fill_colour"> |
1197 | ++ <dia:color val="#ffffff"/> |
1198 | ++ </dia:attribute> |
1199 | ++ <dia:attribute name="text_outside"> |
1200 | ++ <dia:boolean val="false"/> |
1201 | ++ </dia:attribute> |
1202 | ++ <dia:attribute name="collaboration"> |
1203 | ++ <dia:boolean val="false"/> |
1204 | ++ </dia:attribute> |
1205 | ++ <dia:attribute name="text"> |
1206 | ++ <dia:composite type="text"> |
1207 | ++ <dia:attribute name="string"> |
1208 | ++ <dia:string>#5#</dia:string> |
1209 | ++ </dia:attribute> |
1210 | ++ <dia:attribute name="font"> |
1211 | ++ <dia:font family="arial" style="0" name="Helvetica"/> |
1212 | ++ </dia:attribute> |
1213 | ++ <dia:attribute name="height"> |
1214 | ++ <dia:real val="0.80000000000000004"/> |
1215 | ++ </dia:attribute> |
1216 | ++ <dia:attribute name="pos"> |
1217 | ++ <dia:point val="21.3937,39.2212"/> |
1218 | ++ </dia:attribute> |
1219 | ++ <dia:attribute name="color"> |
1220 | ++ <dia:color val="#000000"/> |
1221 | ++ </dia:attribute> |
1222 | ++ <dia:attribute name="alignment"> |
1223 | ++ <dia:enum val="1"/> |
1224 | ++ </dia:attribute> |
1225 | ++ </dia:composite> |
1226 | ++ </dia:attribute> |
1227 | ++ </dia:object> |
1228 | ++ <dia:object type="Standard - Line" version="0" id="O26"> |
1229 | ++ <dia:attribute name="obj_pos"> |
1230 | ++ <dia:point val="21.3937,28.743"/> |
1231 | ++ </dia:attribute> |
1232 | ++ <dia:attribute name="obj_bb"> |
1233 | ++ <dia:rectangle val="20.9128,28.693;21.8746,32.603"/> |
1234 | ++ </dia:attribute> |
1235 | ++ <dia:attribute name="conn_endpoints"> |
1236 | ++ <dia:point val="21.3937,28.743"/> |
1237 | ++ <dia:point val="21.3937,32.4912"/> |
1238 | ++ </dia:attribute> |
1239 | ++ <dia:attribute name="numcp"> |
1240 | ++ <dia:int val="1"/> |
1241 | ++ </dia:attribute> |
1242 | ++ <dia:attribute name="end_arrow"> |
1243 | ++ <dia:enum val="1"/> |
1244 | ++ </dia:attribute> |
1245 | ++ <dia:attribute name="end_arrow_length"> |
1246 | ++ <dia:real val="0.80000000000000004"/> |
1247 | ++ </dia:attribute> |
1248 | ++ <dia:attribute name="end_arrow_width"> |
1249 | ++ <dia:real val="0.80000000000000004"/> |
1250 | ++ </dia:attribute> |
1251 | ++ <dia:connections> |
1252 | ++ <dia:connection handle="0" to="O5" connection="6"/> |
1253 | ++ <dia:connection handle="1" to="O24" connection="1"/> |
1254 | ++ </dia:connections> |
1255 | ++ </dia:object> |
1256 | ++ <dia:object type="Standard - Line" version="0" id="O27"> |
1257 | ++ <dia:attribute name="obj_pos"> |
1258 | ++ <dia:point val="21.3937,34.4912"/> |
1259 | ++ </dia:attribute> |
1260 | ++ <dia:attribute name="obj_bb"> |
1261 | ++ <dia:rectangle val="20.9128,34.4412;21.8746,38.153"/> |
1262 | ++ </dia:attribute> |
1263 | ++ <dia:attribute name="conn_endpoints"> |
1264 | ++ <dia:point val="21.3937,34.4912"/> |
1265 | ++ <dia:point val="21.3937,38.0412"/> |
1266 | ++ </dia:attribute> |
1267 | ++ <dia:attribute name="numcp"> |
1268 | ++ <dia:int val="1"/> |
1269 | ++ </dia:attribute> |
1270 | ++ <dia:attribute name="end_arrow"> |
1271 | ++ <dia:enum val="1"/> |
1272 | ++ </dia:attribute> |
1273 | ++ <dia:attribute name="end_arrow_length"> |
1274 | ++ <dia:real val="0.80000000000000004"/> |
1275 | ++ </dia:attribute> |
1276 | ++ <dia:attribute name="end_arrow_width"> |
1277 | ++ <dia:real val="0.80000000000000004"/> |
1278 | ++ </dia:attribute> |
1279 | ++ <dia:connections> |
1280 | ++ <dia:connection handle="0" to="O24" connection="6"/> |
1281 | ++ <dia:connection handle="1" to="O25" connection="1"/> |
1282 | ++ </dia:connections> |
1283 | ++ </dia:object> |
1284 | ++ <dia:object type="Standard - Text" version="1" id="O28"> |
1285 | ++ <dia:attribute name="obj_pos"> |
1286 | ++ <dia:point val="20.15,30.7875"/> |
1287 | ++ </dia:attribute> |
1288 | ++ <dia:attribute name="obj_bb"> |
1289 | ++ <dia:rectangle val="19.1875,30.255;21.1125,30.98"/> |
1290 | ++ </dia:attribute> |
1291 | ++ <dia:attribute name="text"> |
1292 | ++ <dia:composite type="text"> |
1293 | ++ <dia:attribute name="string"> |
1294 | ++ <dia:string>#R & L#</dia:string> |
1295 | ++ </dia:attribute> |
1296 | ++ <dia:attribute name="font"> |
1297 | ++ <dia:font family="courier new" style="0" name="Courier"/> |
1298 | ++ </dia:attribute> |
1299 | ++ <dia:attribute name="height"> |
1300 | ++ <dia:real val="0.80000000000000004"/> |
1301 | ++ </dia:attribute> |
1302 | ++ <dia:attribute name="pos"> |
1303 | ++ <dia:point val="20.15,30.7875"/> |
1304 | ++ </dia:attribute> |
1305 | ++ <dia:attribute name="color"> |
1306 | ++ <dia:color val="#000000"/> |
1307 | ++ </dia:attribute> |
1308 | ++ <dia:attribute name="alignment"> |
1309 | ++ <dia:enum val="1"/> |
1310 | ++ </dia:attribute> |
1311 | ++ </dia:composite> |
1312 | ++ </dia:attribute> |
1313 | ++ <dia:attribute name="valign"> |
1314 | ++ <dia:enum val="3"/> |
1315 | ++ </dia:attribute> |
1316 | ++ </dia:object> |
1317 | ++ <dia:object type="Standard - Text" version="1" id="O29"> |
1318 | ++ <dia:attribute name="obj_pos"> |
1319 | ++ <dia:point val="20.7108,36.3412"/> |
1320 | ++ </dia:attribute> |
1321 | ++ <dia:attribute name="obj_bb"> |
1322 | ++ <dia:rectangle val="20.5183,35.8087;20.9033,36.5337"/> |
1323 | ++ </dia:attribute> |
1324 | ++ <dia:attribute name="text"> |
1325 | ++ <dia:composite type="text"> |
1326 | ++ <dia:attribute name="string"> |
1327 | ++ <dia:string>#T#</dia:string> |
1328 | ++ </dia:attribute> |
1329 | ++ <dia:attribute name="font"> |
1330 | ++ <dia:font family="courier new" style="0" name="Courier"/> |
1331 | ++ </dia:attribute> |
1332 | ++ <dia:attribute name="height"> |
1333 | ++ <dia:real val="0.80000000000000004"/> |
1334 | ++ </dia:attribute> |
1335 | ++ <dia:attribute name="pos"> |
1336 | ++ <dia:point val="20.7108,36.3412"/> |
1337 | ++ </dia:attribute> |
1338 | ++ <dia:attribute name="color"> |
1339 | ++ <dia:color val="#000000"/> |
1340 | ++ </dia:attribute> |
1341 | ++ <dia:attribute name="alignment"> |
1342 | ++ <dia:enum val="1"/> |
1343 | ++ </dia:attribute> |
1344 | ++ </dia:composite> |
1345 | ++ </dia:attribute> |
1346 | ++ <dia:attribute name="valign"> |
1347 | ++ <dia:enum val="3"/> |
1348 | ++ </dia:attribute> |
1349 | ++ </dia:object> |
1350 | ++ <dia:object type="Standard - Text" version="1" id="O30"> |
1351 | ++ <dia:attribute name="obj_pos"> |
1352 | ++ <dia:point val="16.7608,32.1912"/> |
1353 | ++ </dia:attribute> |
1354 | ++ <dia:attribute name="obj_bb"> |
1355 | ++ <dia:rectangle val="16.3758,31.6587;17.1458,33.9837"/> |
1356 | ++ </dia:attribute> |
1357 | ++ <dia:attribute name="text"> |
1358 | ++ <dia:composite type="text"> |
1359 | ++ <dia:attribute name="string"> |
1360 | ++ <dia:string>#TO |
1361 | ++or |
1362 | ++M#</dia:string> |
1363 | ++ </dia:attribute> |
1364 | ++ <dia:attribute name="font"> |
1365 | ++ <dia:font family="courier new" style="0" name="Courier"/> |
1366 | ++ </dia:attribute> |
1367 | ++ <dia:attribute name="height"> |
1368 | ++ <dia:real val="0.80000000000000004"/> |
1369 | ++ </dia:attribute> |
1370 | ++ <dia:attribute name="pos"> |
1371 | ++ <dia:point val="16.7608,32.1912"/> |
1372 | ++ </dia:attribute> |
1373 | ++ <dia:attribute name="color"> |
1374 | ++ <dia:color val="#000000"/> |
1375 | ++ </dia:attribute> |
1376 | ++ <dia:attribute name="alignment"> |
1377 | ++ <dia:enum val="1"/> |
1378 | ++ </dia:attribute> |
1379 | ++ </dia:composite> |
1380 | ++ </dia:attribute> |
1381 | ++ <dia:attribute name="valign"> |
1382 | ++ <dia:enum val="3"/> |
1383 | ++ </dia:attribute> |
1384 | ++ </dia:object> |
1385 | ++ <dia:object type="Standard - BezierLine" version="0" id="O31"> |
1386 | ++ <dia:attribute name="obj_pos"> |
1387 | ++ <dia:point val="20.2447,38.3341"/> |
1388 | ++ </dia:attribute> |
1389 | ++ <dia:attribute name="obj_bb"> |
1390 | ++ <dia:rectangle val="17.4188,28.4368;20.3142,38.4036"/> |
1391 | ++ </dia:attribute> |
1392 | ++ <dia:attribute name="bez_points"> |
1393 | ++ <dia:point val="20.2447,38.3341"/> |
1394 | ++ <dia:point val="17.1,36.1875"/> |
1395 | ++ <dia:point val="16.101,30.8446"/> |
1396 | ++ <dia:point val="20.2447,28.4501"/> |
1397 | ++ </dia:attribute> |
1398 | ++ <dia:attribute name="corner_types"> |
1399 | ++ <dia:enum val="0"/> |
1400 | ++ <dia:enum val="0"/> |
1401 | ++ </dia:attribute> |
1402 | ++ <dia:attribute name="end_arrow"> |
1403 | ++ <dia:enum val="1"/> |
1404 | ++ </dia:attribute> |
1405 | ++ <dia:attribute name="end_arrow_length"> |
1406 | ++ <dia:real val="0.80000000000000004"/> |
1407 | ++ </dia:attribute> |
1408 | ++ <dia:attribute name="end_arrow_width"> |
1409 | ++ <dia:real val="0.80000000000000004"/> |
1410 | ++ </dia:attribute> |
1411 | ++ <dia:connections> |
1412 | ++ <dia:connection handle="0" to="O25" connection="0"/> |
1413 | ++ <dia:connection handle="3" to="O5" connection="5"/> |
1414 | ++ </dia:connections> |
1415 | ++ </dia:object> |
1416 | ++ <dia:object type="Standard - BezierLine" version="0" id="O32"> |
1417 | ++ <dia:attribute name="obj_pos"> |
1418 | ++ <dia:point val="23.0187,39.0412"/> |
1419 | ++ </dia:attribute> |
1420 | ++ <dia:attribute name="obj_bb"> |
1421 | ++ <dia:rectangle val="12.0013,5.45917;30.2892,39.1017"/> |
1422 | ++ </dia:attribute> |
1423 | ++ <dia:attribute name="bez_points"> |
1424 | ++ <dia:point val="23.0187,39.0412"/> |
1425 | ++ <dia:point val="32.7991,36.6412"/> |
1426 | ++ <dia:point val="35.6,-1.25"/> |
1427 | ++ <dia:point val="12.0013,6.64119"/> |
1428 | ++ </dia:attribute> |
1429 | ++ <dia:attribute name="corner_types"> |
1430 | ++ <dia:enum val="0"/> |
1431 | ++ <dia:enum val="0"/> |
1432 | ++ </dia:attribute> |
1433 | ++ <dia:attribute name="end_arrow"> |
1434 | ++ <dia:enum val="1"/> |
1435 | ++ </dia:attribute> |
1436 | ++ <dia:attribute name="end_arrow_length"> |
1437 | ++ <dia:real val="0.80000000000000004"/> |
1438 | ++ </dia:attribute> |
1439 | ++ <dia:attribute name="end_arrow_width"> |
1440 | ++ <dia:real val="0.80000000000000004"/> |
1441 | ++ </dia:attribute> |
1442 | ++ <dia:connections> |
1443 | ++ <dia:connection handle="0" to="O25" connection="4"/> |
1444 | ++ <dia:connection handle="3" to="O0" connection="1"/> |
1445 | ++ </dia:connections> |
1446 | ++ </dia:object> |
1447 | ++ <dia:object type="Standard - Text" version="1" id="O33"> |
1448 | ++ <dia:attribute name="obj_pos"> |
1449 | ++ <dia:point val="31.1912,22.9412"/> |
1450 | ++ </dia:attribute> |
1451 | ++ <dia:attribute name="obj_bb"> |
1452 | ++ <dia:rectangle val="30.6137,22.4087;31.7687,23.9337"/> |
1453 | ++ </dia:attribute> |
1454 | ++ <dia:attribute name="text"> |
1455 | ++ <dia:composite type="text"> |
1456 | ++ <dia:attribute name="string"> |
1457 | ++ <dia:string>#R |
1458 | ++[U]#</dia:string> |
1459 | ++ </dia:attribute> |
1460 | ++ <dia:attribute name="font"> |
1461 | ++ <dia:font family="courier new" style="0" name="Courier"/> |
1462 | ++ </dia:attribute> |
1463 | ++ <dia:attribute name="height"> |
1464 | ++ <dia:real val="0.80000000000000004"/> |
1465 | ++ </dia:attribute> |
1466 | ++ <dia:attribute name="pos"> |
1467 | ++ <dia:point val="31.1912,22.9412"/> |
1468 | ++ </dia:attribute> |
1469 | ++ <dia:attribute name="color"> |
1470 | ++ <dia:color val="#000000"/> |
1471 | ++ </dia:attribute> |
1472 | ++ <dia:attribute name="alignment"> |
1473 | ++ <dia:enum val="1"/> |
1474 | ++ </dia:attribute> |
1475 | ++ </dia:composite> |
1476 | ++ </dia:attribute> |
1477 | ++ <dia:attribute name="valign"> |
1478 | ++ <dia:enum val="3"/> |
1479 | ++ </dia:attribute> |
1480 | ++ </dia:object> |
1481 | ++ <dia:object type="UML - Usecase" version="0" id="O34"> |
1482 | ++ <dia:attribute name="obj_pos"> |
1483 | ++ <dia:point val="10.3763,19.6385"/> |
1484 | ++ </dia:attribute> |
1485 | ++ <dia:attribute name="obj_bb"> |
1486 | ++ <dia:rectangle val="10.3263,19.5885;13.6763,21.6885"/> |
1487 | ++ </dia:attribute> |
1488 | ++ <dia:attribute name="meta"> |
1489 | ++ <dia:composite type="dict"/> |
1490 | ++ </dia:attribute> |
1491 | ++ <dia:attribute name="elem_corner"> |
1492 | ++ <dia:point val="10.3763,19.6385"/> |
1493 | ++ </dia:attribute> |
1494 | ++ <dia:attribute name="elem_width"> |
1495 | ++ <dia:real val="3.25"/> |
1496 | ++ </dia:attribute> |
1497 | ++ <dia:attribute name="elem_height"> |
1498 | ++ <dia:real val="2"/> |
1499 | ++ </dia:attribute> |
1500 | ++ <dia:attribute name="line_width"> |
1501 | ++ <dia:real val="0.10000000000000001"/> |
1502 | ++ </dia:attribute> |
1503 | ++ <dia:attribute name="line_colour"> |
1504 | ++ <dia:color val="#000000"/> |
1505 | ++ </dia:attribute> |
1506 | ++ <dia:attribute name="fill_colour"> |
1507 | ++ <dia:color val="#ffffff"/> |
1508 | ++ </dia:attribute> |
1509 | ++ <dia:attribute name="text_outside"> |
1510 | ++ <dia:boolean val="false"/> |
1511 | ++ </dia:attribute> |
1512 | ++ <dia:attribute name="collaboration"> |
1513 | ++ <dia:boolean val="false"/> |
1514 | ++ </dia:attribute> |
1515 | ++ <dia:attribute name="text"> |
1516 | ++ <dia:composite type="text"> |
1517 | ++ <dia:attribute name="string"> |
1518 | ++ <dia:string>#2a#</dia:string> |
1519 | ++ </dia:attribute> |
1520 | ++ <dia:attribute name="font"> |
1521 | ++ <dia:font family="arial" style="0" name="Helvetica"/> |
1522 | ++ </dia:attribute> |
1523 | ++ <dia:attribute name="height"> |
1524 | ++ <dia:real val="0.80000000000000004"/> |
1525 | ++ </dia:attribute> |
1526 | ++ <dia:attribute name="pos"> |
1527 | ++ <dia:point val="12.0013,20.8185"/> |
1528 | ++ </dia:attribute> |
1529 | ++ <dia:attribute name="color"> |
1530 | ++ <dia:color val="#000000"/> |
1531 | ++ </dia:attribute> |
1532 | ++ <dia:attribute name="alignment"> |
1533 | ++ <dia:enum val="1"/> |
1534 | ++ </dia:attribute> |
1535 | ++ </dia:composite> |
1536 | ++ </dia:attribute> |
1537 | ++ </dia:object> |
1538 | ++ <dia:object type="UML - Usecase" version="0" id="O35"> |
1539 | ++ <dia:attribute name="obj_pos"> |
1540 | ++ <dia:point val="3.36628,12.7652"/> |
1541 | ++ </dia:attribute> |
1542 | ++ <dia:attribute name="obj_bb"> |
1543 | ++ <dia:rectangle val="3.31628,12.7152;7.59378,15.6002"/> |
1544 | ++ </dia:attribute> |
1545 | ++ <dia:attribute name="meta"> |
1546 | ++ <dia:composite type="dict"/> |
1547 | ++ </dia:attribute> |
1548 | ++ <dia:attribute name="elem_corner"> |
1549 | ++ <dia:point val="3.36628,12.7652"/> |
1550 | ++ </dia:attribute> |
1551 | ++ <dia:attribute name="elem_width"> |
1552 | ++ <dia:real val="4.1775000000000002"/> |
1553 | ++ </dia:attribute> |
1554 | ++ <dia:attribute name="elem_height"> |
1555 | ++ <dia:real val="2.7850000000000001"/> |
1556 | ++ </dia:attribute> |
1557 | ++ <dia:attribute name="line_width"> |
1558 | ++ <dia:real val="0.10000000000000001"/> |
1559 | ++ </dia:attribute> |
1560 | ++ <dia:attribute name="line_colour"> |
1561 | ++ <dia:color val="#000000"/> |
1562 | ++ </dia:attribute> |
1563 | ++ <dia:attribute name="fill_colour"> |
1564 | ++ <dia:color val="#ffffff"/> |
1565 | ++ </dia:attribute> |
1566 | ++ <dia:attribute name="text_outside"> |
1567 | ++ <dia:boolean val="false"/> |
1568 | ++ </dia:attribute> |
1569 | ++ <dia:attribute name="collaboration"> |
1570 | ++ <dia:boolean val="false"/> |
1571 | ++ </dia:attribute> |
1572 | ++ <dia:attribute name="text"> |
1573 | ++ <dia:composite type="text"> |
1574 | ++ <dia:attribute name="string"> |
1575 | ++ <dia:string>#Single |
1576 | ++Tap#</dia:string> |
1577 | ++ </dia:attribute> |
1578 | ++ <dia:attribute name="font"> |
1579 | ++ <dia:font family="arial" style="0" name="Helvetica"/> |
1580 | ++ </dia:attribute> |
1581 | ++ <dia:attribute name="height"> |
1582 | ++ <dia:real val="0.80000000000000004"/> |
1583 | ++ </dia:attribute> |
1584 | ++ <dia:attribute name="pos"> |
1585 | ++ <dia:point val="5.45503,13.9377"/> |
1586 | ++ </dia:attribute> |
1587 | ++ <dia:attribute name="color"> |
1588 | ++ <dia:color val="#000000"/> |
1589 | ++ </dia:attribute> |
1590 | ++ <dia:attribute name="alignment"> |
1591 | ++ <dia:enum val="1"/> |
1592 | ++ </dia:attribute> |
1593 | ++ </dia:composite> |
1594 | ++ </dia:attribute> |
1595 | ++ </dia:object> |
1596 | ++ <dia:object type="Standard - Text" version="1" id="O36"> |
1597 | ++ <dia:attribute name="obj_pos"> |
1598 | ++ <dia:point val="9.61628,16.9857"/> |
1599 | ++ </dia:attribute> |
1600 | ++ <dia:attribute name="obj_bb"> |
1601 | ++ <dia:rectangle val="9.03878,16.4532;10.1938,17.9782"/> |
1602 | ++ </dia:attribute> |
1603 | ++ <dia:attribute name="text"> |
1604 | ++ <dia:composite type="text"> |
1605 | ++ <dia:attribute name="string"> |
1606 | ++ <dia:string>#TO4 |
1607 | ++[D]#</dia:string> |
1608 | ++ </dia:attribute> |
1609 | ++ <dia:attribute name="font"> |
1610 | ++ <dia:font family="courier new" style="0" name="Courier"/> |
1611 | ++ </dia:attribute> |
1612 | ++ <dia:attribute name="height"> |
1613 | ++ <dia:real val="0.80000000000000004"/> |
1614 | ++ </dia:attribute> |
1615 | ++ <dia:attribute name="pos"> |
1616 | ++ <dia:point val="9.61628,16.9857"/> |
1617 | ++ </dia:attribute> |
1618 | ++ <dia:attribute name="color"> |
1619 | ++ <dia:color val="#000000"/> |
1620 | ++ </dia:attribute> |
1621 | ++ <dia:attribute name="alignment"> |
1622 | ++ <dia:enum val="1"/> |
1623 | ++ </dia:attribute> |
1624 | ++ </dia:composite> |
1625 | ++ </dia:attribute> |
1626 | ++ <dia:attribute name="valign"> |
1627 | ++ <dia:enum val="3"/> |
1628 | ++ </dia:attribute> |
1629 | ++ </dia:object> |
1630 | ++ <dia:object type="Standard - Line" version="0" id="O37"> |
1631 | ++ <dia:attribute name="obj_pos"> |
1632 | ++ <dia:point val="12.0013,21.6385"/> |
1633 | ++ </dia:attribute> |
1634 | ++ <dia:attribute name="obj_bb"> |
1635 | ++ <dia:rectangle val="11.5204,21.5885;12.4822,26.8548"/> |
1636 | ++ </dia:attribute> |
1637 | ++ <dia:attribute name="conn_endpoints"> |
1638 | ++ <dia:point val="12.0013,21.6385"/> |
1639 | ++ <dia:point val="12.0013,26.743"/> |
1640 | ++ </dia:attribute> |
1641 | ++ <dia:attribute name="numcp"> |
1642 | ++ <dia:int val="1"/> |
1643 | ++ </dia:attribute> |
1644 | ++ <dia:attribute name="end_arrow"> |
1645 | ++ <dia:enum val="1"/> |
1646 | ++ </dia:attribute> |
1647 | ++ <dia:attribute name="end_arrow_length"> |
1648 | ++ <dia:real val="0.80000000000000004"/> |
1649 | ++ </dia:attribute> |
1650 | ++ <dia:attribute name="end_arrow_width"> |
1651 | ++ <dia:real val="0.80000000000000004"/> |
1652 | ++ </dia:attribute> |
1653 | ++ <dia:connections> |
1654 | ++ <dia:connection handle="0" to="O34" connection="6"/> |
1655 | ++ <dia:connection handle="1" to="O3" connection="1"/> |
1656 | ++ </dia:connections> |
1657 | ++ </dia:object> |
1658 | ++ <dia:object type="Standard - Text" version="1" id="O38"> |
1659 | ++ <dia:attribute name="obj_pos"> |
1660 | ++ <dia:point val="13.2364,23.2857"/> |
1661 | ++ </dia:attribute> |
1662 | ++ <dia:attribute name="obj_bb"> |
1663 | ++ <dia:rectangle val="12.6589,22.7532;13.8139,24.2782"/> |
1664 | ++ </dia:attribute> |
1665 | ++ <dia:attribute name="text"> |
1666 | ++ <dia:composite type="text"> |
1667 | ++ <dia:attribute name="string"> |
1668 | ++ <dia:string>#T |
1669 | ++[D]#</dia:string> |
1670 | ++ </dia:attribute> |
1671 | ++ <dia:attribute name="font"> |
1672 | ++ <dia:font family="courier new" style="0" name="Courier"/> |
1673 | ++ </dia:attribute> |
1674 | ++ <dia:attribute name="height"> |
1675 | ++ <dia:real val="0.80000000000000004"/> |
1676 | ++ </dia:attribute> |
1677 | ++ <dia:attribute name="pos"> |
1678 | ++ <dia:point val="13.2364,23.2857"/> |
1679 | ++ </dia:attribute> |
1680 | ++ <dia:attribute name="color"> |
1681 | ++ <dia:color val="#000000"/> |
1682 | ++ </dia:attribute> |
1683 | ++ <dia:attribute name="alignment"> |
1684 | ++ <dia:enum val="1"/> |
1685 | ++ </dia:attribute> |
1686 | ++ </dia:composite> |
1687 | ++ </dia:attribute> |
1688 | ++ <dia:attribute name="valign"> |
1689 | ++ <dia:enum val="3"/> |
1690 | ++ </dia:attribute> |
1691 | ++ </dia:object> |
1692 | ++ <dia:object type="Standard - Line" version="0" id="O39"> |
1693 | ++ <dia:attribute name="obj_pos"> |
1694 | ++ <dia:point val="5.44128,12.7652"/> |
1695 | ++ </dia:attribute> |
1696 | ++ <dia:attribute name="obj_bb"> |
1697 | ++ <dia:rectangle val="5.37093,8.2776;10.9389,12.8356"/> |
1698 | ++ </dia:attribute> |
1699 | ++ <dia:attribute name="conn_endpoints"> |
1700 | ++ <dia:point val="5.44128,12.7652"/> |
1701 | ++ <dia:point val="10.8523,8.3483"/> |
1702 | ++ </dia:attribute> |
1703 | ++ <dia:attribute name="numcp"> |
1704 | ++ <dia:int val="1"/> |
1705 | ++ </dia:attribute> |
1706 | ++ <dia:attribute name="end_arrow"> |
1707 | ++ <dia:enum val="1"/> |
1708 | ++ </dia:attribute> |
1709 | ++ <dia:attribute name="end_arrow_length"> |
1710 | ++ <dia:real val="0.80000000000000004"/> |
1711 | ++ </dia:attribute> |
1712 | ++ <dia:attribute name="end_arrow_width"> |
1713 | ++ <dia:real val="0.80000000000000004"/> |
1714 | ++ </dia:attribute> |
1715 | ++ <dia:connections> |
1716 | ++ <dia:connection handle="0" to="O35" connection="1"/> |
1717 | ++ <dia:connection handle="1" to="O0" connection="5"/> |
1718 | ++ </dia:connections> |
1719 | ++ </dia:object> |
1720 | ++ <dia:object type="Standard - Text" version="1" id="O40"> |
1721 | ++ <dia:attribute name="obj_pos"> |
1722 | ++ <dia:point val="7.37686,9.76072"/> |
1723 | ++ </dia:attribute> |
1724 | ++ <dia:attribute name="obj_bb"> |
1725 | ++ <dia:rectangle val="6.79936,9.22822;7.95436,10.7532"/> |
1726 | ++ </dia:attribute> |
1727 | ++ <dia:attribute name="text"> |
1728 | ++ <dia:composite type="text"> |
1729 | ++ <dia:attribute name="string"> |
1730 | ++ <dia:string>#TO2 |
1731 | ++[U]#</dia:string> |
1732 | ++ </dia:attribute> |
1733 | ++ <dia:attribute name="font"> |
1734 | ++ <dia:font family="courier new" style="0" name="Courier"/> |
1735 | ++ </dia:attribute> |
1736 | ++ <dia:attribute name="height"> |
1737 | ++ <dia:real val="0.80000000000000004"/> |
1738 | ++ </dia:attribute> |
1739 | ++ <dia:attribute name="pos"> |
1740 | ++ <dia:point val="7.37686,9.76072"/> |
1741 | ++ </dia:attribute> |
1742 | ++ <dia:attribute name="color"> |
1743 | ++ <dia:color val="#000000"/> |
1744 | ++ </dia:attribute> |
1745 | ++ <dia:attribute name="alignment"> |
1746 | ++ <dia:enum val="1"/> |
1747 | ++ </dia:attribute> |
1748 | ++ </dia:composite> |
1749 | ++ </dia:attribute> |
1750 | ++ <dia:attribute name="valign"> |
1751 | ++ <dia:enum val="3"/> |
1752 | ++ </dia:attribute> |
1753 | ++ </dia:object> |
1754 | ++ <dia:object type="Standard - Line" version="0" id="O41"> |
1755 | ++ <dia:attribute name="obj_pos"> |
1756 | ++ <dia:point val="7.51628,14.1485"/> |
1757 | ++ </dia:attribute> |
1758 | ++ <dia:attribute name="obj_bb"> |
1759 | ++ <dia:rectangle val="7.46628,13.6676;10.4881,14.6294"/> |
1760 | ++ </dia:attribute> |
1761 | ++ <dia:attribute name="conn_endpoints"> |
1762 | ++ <dia:point val="7.51628,14.1485"/> |
1763 | ++ <dia:point val="10.3763,14.1485"/> |
1764 | ++ </dia:attribute> |
1765 | ++ <dia:attribute name="numcp"> |
1766 | ++ <dia:int val="1"/> |
1767 | ++ </dia:attribute> |
1768 | ++ <dia:attribute name="end_arrow"> |
1769 | ++ <dia:enum val="1"/> |
1770 | ++ </dia:attribute> |
1771 | ++ <dia:attribute name="end_arrow_length"> |
1772 | ++ <dia:real val="0.80000000000000004"/> |
1773 | ++ </dia:attribute> |
1774 | ++ <dia:attribute name="end_arrow_width"> |
1775 | ++ <dia:real val="0.80000000000000004"/> |
1776 | ++ </dia:attribute> |
1777 | ++ <dia:connections> |
1778 | ++ <dia:connection handle="0" to="O35" connection="4"/> |
1779 | ++ <dia:connection handle="1" to="O1" connection="3"/> |
1780 | ++ </dia:connections> |
1781 | ++ </dia:object> |
1782 | ++ <dia:object type="Standard - Text" version="1" id="O42"> |
1783 | ++ <dia:attribute name="obj_pos"> |
1784 | ++ <dia:point val="8.77686,12.9857"/> |
1785 | ++ </dia:attribute> |
1786 | ++ <dia:attribute name="obj_bb"> |
1787 | ++ <dia:rectangle val="8.19936,12.4532;9.35436,13.9782"/> |
1788 | ++ </dia:attribute> |
1789 | ++ <dia:attribute name="text"> |
1790 | ++ <dia:composite type="text"> |
1791 | ++ <dia:attribute name="string"> |
1792 | ++ <dia:string>#T |
1793 | ++[U]#</dia:string> |
1794 | ++ </dia:attribute> |
1795 | ++ <dia:attribute name="font"> |
1796 | ++ <dia:font family="courier new" style="0" name="Courier"/> |
1797 | ++ </dia:attribute> |
1798 | ++ <dia:attribute name="height"> |
1799 | ++ <dia:real val="0.80000000000000004"/> |
1800 | ++ </dia:attribute> |
1801 | ++ <dia:attribute name="pos"> |
1802 | ++ <dia:point val="8.77686,12.9857"/> |
1803 | ++ </dia:attribute> |
1804 | ++ <dia:attribute name="color"> |
1805 | ++ <dia:color val="#000000"/> |
1806 | ++ </dia:attribute> |
1807 | ++ <dia:attribute name="alignment"> |
1808 | ++ <dia:enum val="1"/> |
1809 | ++ </dia:attribute> |
1810 | ++ </dia:composite> |
1811 | ++ </dia:attribute> |
1812 | ++ <dia:attribute name="valign"> |
1813 | ++ <dia:enum val="3"/> |
1814 | ++ </dia:attribute> |
1815 | ++ </dia:object> |
1816 | ++ <dia:object type="Standard - Arc" version="0" id="O43"> |
1817 | ++ <dia:attribute name="obj_pos"> |
1818 | ++ <dia:point val="10.3763,20.6385"/> |
1819 | ++ </dia:attribute> |
1820 | ++ <dia:attribute name="obj_bb"> |
1821 | ++ <dia:rectangle val="6.86308,15.0734;10.4452,20.7074"/> |
1822 | ++ </dia:attribute> |
1823 | ++ <dia:attribute name="conn_endpoints"> |
1824 | ++ <dia:point val="10.3763,20.6385"/> |
1825 | ++ <dia:point val="6.932,15.1423"/> |
1826 | ++ </dia:attribute> |
1827 | ++ <dia:attribute name="curve_distance"> |
1828 | ++ <dia:real val="0.01"/> |
1829 | ++ </dia:attribute> |
1830 | ++ <dia:attribute name="end_arrow"> |
1831 | ++ <dia:enum val="1"/> |
1832 | ++ </dia:attribute> |
1833 | ++ <dia:attribute name="end_arrow_length"> |
1834 | ++ <dia:real val="0.80000000000000004"/> |
1835 | ++ </dia:attribute> |
1836 | ++ <dia:attribute name="end_arrow_width"> |
1837 | ++ <dia:real val="0.80000000000000004"/> |
1838 | ++ </dia:attribute> |
1839 | ++ <dia:connections> |
1840 | ++ <dia:connection handle="0" to="O34" connection="3"/> |
1841 | ++ <dia:connection handle="1" to="O35" connection="7"/> |
1842 | ++ </dia:connections> |
1843 | ++ </dia:object> |
1844 | ++ <dia:object type="Standard - BezierLine" version="0" id="O44"> |
1845 | ++ <dia:attribute name="obj_pos"> |
1846 | ++ <dia:point val="22.5427,32.7841"/> |
1847 | ++ </dia:attribute> |
1848 | ++ <dia:attribute name="obj_bb"> |
1849 | ++ <dia:rectangle val="13.1503,6.39214;28.0842,32.8535"/> |
1850 | ++ </dia:attribute> |
1851 | ++ <dia:attribute name="bez_points"> |
1852 | ++ <dia:point val="22.5427,32.7841"/> |
1853 | ++ <dia:point val="34.574,14.9804"/> |
1854 | ++ <dia:point val="24.7,6.1875"/> |
1855 | ++ <dia:point val="13.1503,6.93408"/> |
1856 | ++ </dia:attribute> |
1857 | ++ <dia:attribute name="corner_types"> |
1858 | ++ <dia:enum val="0"/> |
1859 | ++ <dia:enum val="0"/> |
1860 | ++ </dia:attribute> |
1861 | ++ <dia:attribute name="end_arrow"> |
1862 | ++ <dia:enum val="1"/> |
1863 | ++ </dia:attribute> |
1864 | ++ <dia:attribute name="end_arrow_length"> |
1865 | ++ <dia:real val="0.80000000000000004"/> |
1866 | ++ </dia:attribute> |
1867 | ++ <dia:attribute name="end_arrow_width"> |
1868 | ++ <dia:real val="0.80000000000000004"/> |
1869 | ++ </dia:attribute> |
1870 | ++ <dia:connections> |
1871 | ++ <dia:connection handle="0" to="O24" connection="2"/> |
1872 | ++ <dia:connection handle="3" to="O0" connection="2"/> |
1873 | ++ </dia:connections> |
1874 | ++ </dia:object> |
1875 | ++ <dia:object type="Standard - Text" version="1" id="O45"> |
1876 | ++ <dia:attribute name="obj_pos"> |
1877 | ++ <dia:point val="26.2,27.525"/> |
1878 | ++ </dia:attribute> |
1879 | ++ <dia:attribute name="obj_bb"> |
1880 | ++ <dia:rectangle val="26.2,26.93;27.5025,27.675"/> |
1881 | ++ </dia:attribute> |
1882 | ++ <dia:attribute name="text"> |
1883 | ++ <dia:composite type="text"> |
1884 | ++ <dia:attribute name="string"> |
1885 | ++ <dia:string>#TO5#</dia:string> |
1886 | ++ </dia:attribute> |
1887 | ++ <dia:attribute name="font"> |
1888 | ++ <dia:font family="sans" style="0" name="Helvetica"/> |
1889 | ++ </dia:attribute> |
1890 | ++ <dia:attribute name="height"> |
1891 | ++ <dia:real val="0.80000000000000004"/> |
1892 | ++ </dia:attribute> |
1893 | ++ <dia:attribute name="pos"> |
1894 | ++ <dia:point val="26.2,27.525"/> |
1895 | ++ </dia:attribute> |
1896 | ++ <dia:attribute name="color"> |
1897 | ++ <dia:color val="#000000"/> |
1898 | ++ </dia:attribute> |
1899 | ++ <dia:attribute name="alignment"> |
1900 | ++ <dia:enum val="0"/> |
1901 | ++ </dia:attribute> |
1902 | ++ </dia:composite> |
1903 | ++ </dia:attribute> |
1904 | ++ <dia:attribute name="valign"> |
1905 | ++ <dia:enum val="3"/> |
1906 | ++ </dia:attribute> |
1907 | ++ </dia:object> |
1908 | ++ <dia:object type="Standard - Arc" version="0" id="O46"> |
1909 | ++ <dia:attribute name="obj_pos"> |
1910 | ++ <dia:point val="13.1503,27.0359"/> |
1911 | ++ </dia:attribute> |
1912 | ++ <dia:attribute name="obj_bb"> |
1913 | ++ <dia:rectangle val="13.1003,14.6561;17.8,27.0859"/> |
1914 | ++ </dia:attribute> |
1915 | ++ <dia:attribute name="conn_endpoints"> |
1916 | ++ <dia:point val="13.1503,27.0359"/> |
1917 | ++ <dia:point val="13.1503,14.8556"/> |
1918 | ++ </dia:attribute> |
1919 | ++ <dia:attribute name="curve_distance"> |
1920 | ++ <dia:real val="4.5996514805718602"/> |
1921 | ++ </dia:attribute> |
1922 | ++ <dia:attribute name="line_width"> |
1923 | ++ <dia:real val="0.10000000149011612"/> |
1924 | ++ </dia:attribute> |
1925 | ++ <dia:attribute name="end_arrow"> |
1926 | ++ <dia:enum val="1"/> |
1927 | ++ </dia:attribute> |
1928 | ++ <dia:attribute name="end_arrow_length"> |
1929 | ++ <dia:real val="0.79999999999999993"/> |
1930 | ++ </dia:attribute> |
1931 | ++ <dia:attribute name="end_arrow_width"> |
1932 | ++ <dia:real val="0.79999999999999993"/> |
1933 | ++ </dia:attribute> |
1934 | ++ <dia:connections> |
1935 | ++ <dia:connection handle="0" to="O3" connection="2"/> |
1936 | ++ <dia:connection handle="1" to="O1" connection="7"/> |
1937 | ++ </dia:connections> |
1938 | ++ </dia:object> |
1939 | ++ <dia:object type="Standard - Text" version="1" id="O47"> |
1940 | ++ <dia:attribute name="obj_pos"> |
1941 | ++ <dia:point val="19.8272,20.6239"/> |
1942 | ++ </dia:attribute> |
1943 | ++ <dia:attribute name="obj_bb"> |
1944 | ++ <dia:rectangle val="18.0947,20.0914;21.5597,22.4164"/> |
1945 | ++ </dia:attribute> |
1946 | ++ <dia:attribute name="text"> |
1947 | ++ <dia:composite type="text"> |
1948 | ++ <dia:attribute name="string"> |
1949 | ++ <dia:string>#(TO or M) |
1950 | ++and !TDG |
1951 | ++[U]#</dia:string> |
1952 | ++ </dia:attribute> |
1953 | ++ <dia:attribute name="font"> |
1954 | ++ <dia:font family="courier new" style="0" name="Courier"/> |
1955 | ++ </dia:attribute> |
1956 | ++ <dia:attribute name="height"> |
1957 | ++ <dia:real val="0.80000000000000004"/> |
1958 | ++ </dia:attribute> |
1959 | ++ <dia:attribute name="pos"> |
1960 | ++ <dia:point val="19.8272,20.6239"/> |
1961 | ++ </dia:attribute> |
1962 | ++ <dia:attribute name="color"> |
1963 | ++ <dia:color val="#000000"/> |
1964 | ++ </dia:attribute> |
1965 | ++ <dia:attribute name="alignment"> |
1966 | ++ <dia:enum val="1"/> |
1967 | ++ </dia:attribute> |
1968 | ++ </dia:composite> |
1969 | ++ </dia:attribute> |
1970 | ++ <dia:attribute name="valign"> |
1971 | ++ <dia:enum val="3"/> |
1972 | ++ </dia:attribute> |
1973 | ++ </dia:object> |
1974 | ++ <dia:object type="Standard - Line" version="0" id="O48"> |
1975 | ++ <dia:attribute name="obj_pos"> |
1976 | ++ <dia:point val="5.44128,19.5885"/> |
1977 | ++ </dia:attribute> |
1978 | ++ <dia:attribute name="obj_bb"> |
1979 | ++ <dia:rectangle val="4.97124,15.4384;5.93303,19.6387"/> |
1980 | ++ </dia:attribute> |
1981 | ++ <dia:attribute name="conn_endpoints"> |
1982 | ++ <dia:point val="5.44128,19.5885"/> |
1983 | ++ <dia:point val="5.45503,15.5502"/> |
1984 | ++ </dia:attribute> |
1985 | ++ <dia:attribute name="numcp"> |
1986 | ++ <dia:int val="1"/> |
1987 | ++ </dia:attribute> |
1988 | ++ <dia:attribute name="end_arrow"> |
1989 | ++ <dia:enum val="1"/> |
1990 | ++ </dia:attribute> |
1991 | ++ <dia:attribute name="end_arrow_length"> |
1992 | ++ <dia:real val="0.79999999999999993"/> |
1993 | ++ </dia:attribute> |
1994 | ++ <dia:attribute name="end_arrow_width"> |
1995 | ++ <dia:real val="0.79999999999999993"/> |
1996 | ++ </dia:attribute> |
1997 | ++ <dia:connections> |
1998 | ++ <dia:connection handle="0" to="O2" connection="1"/> |
1999 | ++ <dia:connection handle="1" to="O35" connection="6"/> |
2000 | ++ </dia:connections> |
2001 | ++ </dia:object> |
2002 | ++ </dia:layer> |
2003 | ++</dia:diagram> |
2004 | +Index: xserver-xorg-input-synaptics-ubuntu/docs/trouble-shooting.txt |
2005 | +=================================================================== |
2006 | +--- /dev/null |
2007 | ++++ xserver-xorg-input-synaptics-ubuntu/docs/trouble-shooting.txt |
2008 | +@@ -0,0 +1,152 @@ |
2009 | ++Trouble-shooting guide |
2010 | ++---------------------- |
2011 | ++ |
2012 | ++Contents |
2013 | ++-------- |
2014 | ++ |
2015 | ++1. Check that the touchpad is correctly detected by the kernel |
2016 | ++2. Check that an external PS/2 mouse isn't causing problems |
2017 | ++3. Check if some other program is using the /dev/psaux device |
2018 | ++4. Check that the evdev kernel driver is available |
2019 | ++5. Check that the synaptics driver is properly loaded by the X server |
2020 | ++6. Check that the touchpad is enabled in the BIOS/hardware |
2021 | ++ |
2022 | ++ |
2023 | ++1. Check that the touchpad is correctly detected by the kernel |
2024 | ++-------------------------------------------------------------- |
2025 | ++ |
2026 | ++If you are using a 2.6 linux kernel, check the /proc/bus/input/devices |
2027 | ++file. The touchpad must be identified a "SynPS/2 Synaptics TouchPad" |
2028 | ++or an "AlpsPS/2 ALPS TouchPad". If it is identified as a "PS/2 Generic |
2029 | ++Mouse" or "PS/2 Synaptics TouchPad", something is wrong. |
2030 | ++ |
2031 | ++Possible fixes: |
2032 | ++ |
2033 | ++1. Check your BIOS settings. Some BIOSes can do USB -> PS/2 mouse |
2034 | ++ emulation which can interfere with the touchpad. There may be a way |
2035 | ++ to disable the legacy mouse emulation from the BIOS setup program. |
2036 | ++ |
2037 | ++2. Arrange so that the kernel initializes the USB subsystem before the |
2038 | ++ PS/2 touchpad. Initializing the USB mouse sometimes disables the |
2039 | ++ BIOS emulation. Compiling psmouse as a module and loading it in |
2040 | ++ /etc/rc.d/rc.local usually assures the USB is initialized first. |
2041 | ++ |
2042 | ++3. Disconnect the USB mouse and restart the computer. (Not really a fix, |
2043 | ++ but can help when trying to figure out what's wrong.) |
2044 | ++ |
2045 | ++4. Make sure your boot loader doesn't pass any parameter to the kernel |
2046 | ++ that disables mouse extensions. ("psmouse_proto=bare" for example). |
2047 | ++ Alternatively, if psmouse is compiled as a module, make sure that |
2048 | ++ modprobe doesn't pass such parameters. Check /etc/modprobe.conf and |
2049 | ++ "rmmod psmouse; modprobe -v psmouse". |
2050 | ++ |
2051 | ++If you run a 2.4 kernel or an non-linux kernel, the |
2052 | ++/proc/bus/input/devices file is not available, but the BIOS setting |
2053 | ++could be relevant anyway. |
2054 | ++ |
2055 | ++ |
2056 | ++2. Check that an external PS/2 mouse isn't causing problems |
2057 | ++----------------------------------------------------------- |
2058 | ++ |
2059 | ++If you want to use an external PS/2 mouse at the same time as the |
2060 | ++synaptics touchpad driver, you must use a 2.6 linux kernel and your |
2061 | ++hardware (keyboard controller) must support active multiplexing. You |
2062 | ++should see something like this when the computer boots: |
2063 | ++ |
2064 | ++ mice: PS/2 mouse device common for all mice |
2065 | ++ i8042.c: Detected active multiplexing controller, rev 1.1. |
2066 | ++ serio: i8042 AUX0 port at 0x60,0x64 irq 12 |
2067 | ++ serio: i8042 AUX1 port at 0x60,0x64 irq 12 |
2068 | ++ serio: i8042 AUX2 port at 0x60,0x64 irq 12 |
2069 | ++ serio: i8042 AUX3 port at 0x60,0x64 irq 12 |
2070 | ++ |
2071 | ++If you don't use a 2.6 kernel or your hardware doesn't support active |
2072 | ++multiplexing, you can't use an external PS/2 mouse together with the |
2073 | ++touchpad driver. |
2074 | ++ |
2075 | ++ |
2076 | ++3. Check if some other program is using the /dev/psaux device |
2077 | ++------------------------------------------------------------- |
2078 | ++ |
2079 | ++If you use a 2.4 linux kernel, only one program at a time can reliably |
2080 | ++read from /dev/psaux. This means that if you for example have GPM |
2081 | ++running, it will probably prevent the synaptics driver from working |
2082 | ++correctly. It also means that if you have a second InputDevice in your |
2083 | ++X configuration file, it must not read from /dev/psaux. You probably |
2084 | ++want it to read from /dev/input/mice instead, which will handle USB |
2085 | ++mice in both 2.4 and 2.6 linux kernels, and both USB and external PS/2 |
2086 | ++mice if you use a 2.6 kernel. |
2087 | ++ |
2088 | ++The 2.6 linux kernel fixes the /dev/psaux shortcoming, so that you can |
2089 | ++safely run GPM and the synaptics driver at the same time. |
2090 | ++ |
2091 | ++ |
2092 | ++4. Check that the evdev kernel driver is available |
2093 | ++-------------------------------------------------- |
2094 | ++ |
2095 | ++If you are using a 2.6 linux kernel, the evdev kernel driver is needed |
2096 | ++for the X driver to be able to communicate with the kernel driver. |
2097 | ++Check the /proc/bus/input/devices file. The Handlers= line should |
2098 | ++contain an event device name, like this: |
2099 | ++ |
2100 | ++ H: Handlers=mouse0 event0 |
2101 | ++ |
2102 | ++If there is no event handler, you either have to load the evdev kernel |
2103 | ++module or recompile the kernel and build it into the kernel. If you |
2104 | ++don't want to recompile the kernel, adding "/sbin/modprobe evdev" to |
2105 | ++/etc/rc.d/rc.sysinit usually works. |
2106 | ++ |
2107 | ++ |
2108 | ++5. Check that the synaptics driver is properly loaded by the X server |
2109 | ++--------------------------------------------------------------------- |
2110 | ++ |
2111 | ++The X log file is usually called /var/log/XFree86.0.log or |
2112 | ++/var/log/Xorg.0.log. It should contain something like this: |
2113 | ++ |
2114 | ++ (II) LoadModule: "synaptics" |
2115 | ++ (II) Loading /usr/X11R6/lib/modules/input/synaptics_drv.o |
2116 | ++ (II) Module synaptics: vendor="X.Org Foundation" |
2117 | ++ compiled for 4.3.99.902, module version = 1.0.0 |
2118 | ++ Module class: X.Org XInput Driver |
2119 | ++ ABI class: X.Org XInput driver, version 0.4 |
2120 | ++ |
2121 | ++If the LoadModule line is missing, you probably forgot to add |
2122 | ++ |
2123 | ++ Load "synaptics" |
2124 | ++ |
2125 | ++to the "Module" section in the X config file, or you modified the |
2126 | ++wrong config file. Some systems that have been upgraded from XFree86 |
2127 | ++to Xorg or from XFree86 3.x to XFree86 4.x can have multiple config |
2128 | ++files in the /etc/X11/ directory, but only one is used. |
2129 | ++ |
2130 | ++Next, check that the log file also contains a line like this: |
2131 | ++ |
2132 | ++ (II) Synaptics touchpad driver version 0.13.4 |
2133 | ++ |
2134 | ++If there is no such line, there is probably a binary compatibility |
2135 | ++problem between the synaptics driver and the X server. |
2136 | ++ |
2137 | ++Possible fixes: |
2138 | ++ |
2139 | ++1. Try upgrading to the latest synaptics driver. |
2140 | ++ |
2141 | ++2. Try installing the X SDK package if it is available for your |
2142 | ++ version of X. (In Fedora Core 2, that package is called |
2143 | ++ xorg-x11-sdk-6.7.0-2.i386.rpm.) Then re-compile the synaptics |
2144 | ++ driver and try again. |
2145 | ++ |
2146 | ++3. Make sure the driver is compiled with the same compiler version as |
2147 | ++ the X server. |
2148 | ++ |
2149 | ++ |
2150 | ++6. Check that the touchpad is enabled in the BIOS/hardware |
2151 | ++---------------------------------------------------------- |
2152 | ++ |
2153 | ++On some computers, it is possible to disable the touchpad either with |
2154 | ++a special key combination, from the BIOS, or with a special touchpad |
2155 | ++on/off button. On some machines, cycling the power doesn't |
2156 | ++automatically re-enable the touchpad. |
2157 | ++ |
2158 | ++If the touchpad appears to be dead, try to enable it from the BIOS or |
2159 | ++using a key combination. One user also reported that he had to remove |
2160 | ++the computer battery to make his touchpad operational again. |
2161 | diff --git a/debian/patches/series b/debian/patches/series |
2162 | index 33a1f81..b50e954 100644 |
2163 | --- a/debian/patches/series |
2164 | +++ b/debian/patches/series |
2165 | @@ -9,3 +9,4 @@ |
2166 | 124_syndaemon_events.patch |
2167 | 128_disable_three_click_action.patch |
2168 | 129_disable_three_touch_tap.patch |
2169 | +130_add_docs.patch |
Hi Mate, thanks for the MP.
I see the changelog says "No change rebuild" but what's going on here is something different. If I diff the actual 1.9.2-1ubuntu1 version to this, it does show differences similar to what is shown in your change description. So this isn't a "No change rebuild" - if you debdiff source package for such an upload I would only expect a difference on debian/changelog. So the changelog should instead reflect that. What's going on here is a correction to a previous flawed upload, which is fine but should be noted in the debian/changelog file. What that should be really depends on the rest of what's going on.
> I know the Debian .diff.gz shouldn't really modify upstream files,
> but the upstream git repo and tarball is not perfectly identical,
Source repacking is a thing and intended for some problems of this sort, for instance if the upstream tarball has things that are believed to be non-distributable. Is that the case here?
> and Debian does the same thing.
It really would be more common to patch these files instead of modifying them directly, even if the Debian version were to be doing it in a non-standard way. Is there a reason we can't patch these files here in the quilt flow?