Ubuntu
kicad package

Merge lp:~saltmakrell/ubuntu/trusty/kicad/missing-modules into lp:ubuntu/trusty-proposed/kicad

  1. Trusty (14.04)
  2. missing-modules
  3. Merge into trusty-proposed
Proposed by Ruben Undheim
Status: Merged
Merge reported by: Timo Jyrinki
Merged at revision: not available
Proposed branch: lp:~saltmakrell/ubuntu/trusty/kicad/missing-modules
Merge into: lp:ubuntu/trusty-proposed/kicad
Diff against target: 126 lines (+107/-1)
2 files modified
debian/changelog (+1/-1)
debian/patches/missing_modules.patch (+106/-0)
To merge this branch: bzr merge lp:~saltmakrell/ubuntu/trusty/kicad/missing-modules
Reviewer Review Type Date Requested Status
Ubuntu Development Team Pending
Review via email: mp+233985@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Timo Jyrinki (timo-jyrinki) wrote :

Uploaded to proposed queue: https://launchpad.net/ubuntu/trusty/+queue?queue_state=1&queue_text=

Since the ubuntu1 was already uploaded (even though stuck in -proposed), I bumped the version to ubuntu2. I also added a note to the changelog about the other bug #1315149.

Marking as merged so that it does not linger in the sponsoring queue.

Revision history for this message
Timo Jyrinki (timo-jyrinki) wrote :

Oh, right, forgot to mention but I tested it also and the newest fix got rid of the error messages that popped up earlier. Nice work!

Revision history for this message
Ruben Undheim (saltmakrell) wrote :

Thanks Timo,

Since the fix does not solve all the issues mentioned in bug #1315149 (it wasn't supposed to do that. only what was split into bug #1338168), can we still set it to verification-done now as you've added #1315149 to the changelog?

What remains in #1315149 is really minor stuff - the major part has been fixed.

Revision history for this message
Timo Jyrinki (timo-jyrinki) wrote :

Ah, ok. The branch originally had the #1315149 linked to it (in Launchpad), so I assumed it was intentional.

I believe it can be marked as verification-done and mention that a new bug should be opened for the rest of the issue.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2014-09-02 20:56:08 +0000
3+++ debian/changelog 2014-09-09 18:55:38 +0000
4@@ -2,7 +2,7 @@
5
6 * Fixed missing legacy modules making cvpcb unusable (LP: #1338168)
7
8- -- Ruben Undheim <ruben.undheim@gmail.com> Sat, 05 Jul 2014 23:38:00 +0200
9+ -- Ruben Undheim <ruben.undheim@gmail.com> Tue, 09 Sep 2014 20:15:11 +0200
10
11 kicad (0.20131208+bzr4024-1) unstable; urgency=medium
12
13
14=== modified file 'debian/patches/missing_modules.patch'
15--- debian/patches/missing_modules.patch 2014-07-05 23:47:59 +0000
16+++ debian/patches/missing_modules.patch 2014-09-09 18:55:38 +0000
17@@ -135283,3 +135283,109 @@
18 +$EndSHAPE3D
19 +$EndMODULE SOT363
20 +$EndLIBRARY
21+Index: kicad/library/modules/smd_crystal&oscillator.mod
22+===================================================================
23+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
24++++ kicad/library/modules/smd_crystal&oscillator.mod 2014-09-09 19:21:40.480192359 +0200
25+@@ -0,0 +1,101 @@
26++PCBNEW-LibModule-V1 21/03/2013 14:07:44
27++# encoding utf-8
28++Units mm
29++$INDEX
30++Q_49U3HMS
31++crystal_FA238-TSX3225
32++$EndINDEX
33++$MODULE Q_49U3HMS
34++Po 0 0 0 15 511CC0BB 00000000 ~~
35++Li Q_49U3HMS
36++Sc 0
37++AR
38++Op 0 0 0
39++T0 -0.1 -1.6 0.8 0.8 0 0.15 N V 21 N "Q_49U3HMS"
40++T1 0 1.7 0.8 0.8 0 0.15 N V 21 N "VAL***"
41++DS -4.953 -1.651 -4.953 -1.27 0.15 21
42++DS -4.953 1.651 -4.953 1.27 0.15 21
43++DS 4.953 1.651 4.953 1.27 0.15 21
44++DS 4.953 -1.651 4.953 -1.27 0.15 21
45++DS 5.715 -2.54 5.715 -1.27 0.15 21
46++DS 5.715 2.54 5.715 1.27 0.15 21
47++DS -5.715 2.54 -5.715 1.27 0.15 21
48++DS -5.715 -2.54 -5.715 -1.27 0.15 21
49++DS -4.953 1.651 -4.318 2.286 0.15 21
50++DS -4.318 2.286 4.318 2.286 0.15 21
51++DS 4.318 2.286 4.953 1.651 0.15 21
52++DS 4.953 -1.651 4.318 -2.286 0.15 21
53++DS 4.318 -2.286 -4.318 -2.286 0.15 21
54++DS -4.318 -2.286 -4.953 -1.651 0.15 21
55++DS 5.715 2.54 -5.715 2.54 0.15 21
56++DS -5.715 -2.54 5.715 -2.54 0.15 21
57++$PAD
58++Sh "1" R 5.4991 1.99898 0 0 0
59++Dr 0 0 0
60++At SMD N 00888000
61++Ne 0 ""
62++Po -4.699 0
63++$EndPAD
64++$PAD
65++Sh "2" R 5.4991 1.99898 0 0 0
66++Dr 0 0 0
67++At SMD N 00888000
68++Ne 0 ""
69++Po 4.699 0
70++$EndPAD
71++$SHAPE3D
72++Na "smd/smd_crystal&oscillator/crystal_hc-49-smd.wrl"
73++Sc 1 1 1
74++Of 0 0 0
75++Ro 0 0 0
76++$EndSHAPE3D
77++$EndMODULE Q_49U3HMS
78++$MODULE crystal_FA238-TSX3225
79++Po 0 0 0 15 514AEB06 00000000 ~~
80++Li crystal_FA238-TSX3225
81++Cd crystal Epson Toyocom FA-238 and TSX-3225 series
82++Sc 0
83++AR
84++Op 0 0 0
85++T0 -0.1 -2.3 0.8 0.8 0 0.15 N V 21 N "crystal_FA238-TSX3225"
86++T1 0.2 2.3 0.8 0.8 0 0.15 N V 21 N "VAL***"
87++DS -1.6 -1.3 1.6 -1.3 0.15 21
88++DS 1.6 -1.3 1.6 1.3 0.15 21
89++DS 1.6 1.3 -1.6 1.3 0.15 21
90++DS -1.6 1.3 -1.6 -1.3 0.15 21
91++$PAD
92++Sh "1" R 1.4 1.2 0 0 0
93++Dr 0 0 0
94++At SMD N 00888000
95++Ne 0 ""
96++Po -1.1 0.8
97++$EndPAD
98++$PAD
99++Sh "3" R 1.4 1.2 0 0 0
100++Dr 0 0 0
101++At SMD N 00888000
102++Ne 0 ""
103++Po 1.1 0.8
104++$EndPAD
105++$PAD
106++Sh "3" R 1.4 1.2 0 0 0
107++Dr 0 0 0
108++At SMD N 00888000
109++Ne 0 ""
110++Po -1.1 -0.8
111++$EndPAD
112++$PAD
113++Sh "2" R 1.4 1.2 0 0 0
114++Dr 0 0 0
115++At SMD N 00888000
116++Ne 0 ""
117++Po 1.1 -0.8
118++$EndPAD
119++$SHAPE3D
120++Na "smd/smd_crystal&oscillator/crystal_4pins_smd.wrl"
121++Sc 0.24 0.24 0.24
122++Of 0 0 0
123++Ro 0 0 0
124++$EndSHAPE3D
125++$EndMODULE crystal_FA238-TSX3225
126++$EndLIBRARY

Subscribers

People subscribed via source and target branches

to all changes: