Ubuntu

Merge lp:~valavanisalex/ubuntu/precise/inkscape/fix-966221 into lp:ubuntu/precise/inkscape

Proposed by Alex Valavanis on 2012-03-27
Reviewer Review Type Date Requested Status
Didier Roche Approve on 2012-03-28
Ubuntu branches 2012-03-27 Pending
Review via email: mp+99633@code.launchpad.net

Description of the Change

This merge finally brings us back a bit closer to the Debian package. It also switches to the quilt patch system instead of the now obsolete dpatch.

To post a comment you must log in.
Didier Roche (didrocks) wrote :

Thanks a lot for your work here!
Everything looks good, just a nitpicky one please do not list again the already written bug report numbers from a previous merge (that would spam launchpad and close again the bugs). I removed it before merging.

Other than that, excellent work ;)

review: Approve

Preview Diff

1=== modified file 'debian/changelog'
2--- debian/changelog 2012-03-06 19:01:58 +0000
3+++ debian/changelog 2012-03-27 22:04:50 +0000
4@@ -1,3 +1,50 @@
5+inkscape (0.48.3.1-1ubuntu1) precise; urgency=low
6+
7+ * Merge from Debian Unstable (LP: #966221). Remaining changes:
8+ - debian/control:
9+ + Ubuntu maintainers
10+ + Build against lcms2 (LP: #885324)
11+ + Drop build-dependency on specific libwpd/libwpg version.
12+ + promote libgnomevfs2-extra to recommends (lp: #496223)
13+ + Demote pstoedit to Suggests (universe package).
14+ + Suggest transfig to allow import of xfig files (LP: #668300)
15+ + Drop unnecessary python and skencil suggestions (LP: #762541)
16+ + Promote python-lxml, python-numpy, python-uniconvertor to Recommends.
17+ - Handle translation tasks for Ubuntu main (LP: #726850):
18+ + debian/rules: Add dh_translations to binary-arch rule
19+ + debian/control: Build-Depends dh-translations
20+ - debian/patches/01_add_unity_quicklist_support.patch: add "New Drawing"
21+ to Unity quicklist (LP: #676886)
22+
23+ -- Alex Valavanis <valavanisalex@gmail.com> Tue, 27 Mar 2012 20:47:17 +0100
24+
25+inkscape (0.48.3.1-1) unstable; urgency=low
26+
27+ * [cb1a6e2] delete 01-libwpg0.2.dpatch since proper patch appied upstream
28+ * [041bdd7] delete 02-add-shebangs-and-fix-permissions.dpatch (applied
29+ upstream)
30+ * [518e31b] delete 03-add-missing-mimetypes.dpatch (applied upstream)
31+ * [df995c3] add datamatrix patch from ubuntu (closes: #618835)
32+ * [169ca97] Imported Upstream version 0.48.3.1, this handles the following
33+ debian bugs:
34+ - closes: #665560: inkscape: Including individual glib headers no longer
35+ supported
36+ - closes: #627637: JessyInk: Embedded Javascript Broken
37+ - closes: #559332: inkscape: Cairo rendering broken for "use" elements
38+ with scaling or a viewBox
39+ - closes: #596836: clipart search spews messages in console
40+ - closes: #628035: inkscape: in the pdf export dialog a wrong pdf version
41+ is reported
42+ - closes: #651196: French manpage has accents replaced by some garbage
43+ - closes: #633150: inkscape: New upstream version 0.48.3 is available
44+ * [3f6e27a] use quilt instead of dpatch for patch handling
45+ * [dd10775] Acknowledge NMU, inkscape doesn't register for handling of pdf
46+ and ps anymore (closes: #613752)
47+ * upload sponsored by Guido Guenther <agx@debian.org>
48+ Thank you very much!
49+
50+ -- Wolfram Quester <wolfi@sigxcpu.org> Sun, 25 Mar 2012 13:51:37 +0200
51+
52 inkscape (0.48.3.1-0ubuntu2) precise; urgency=low
53
54 * promote libgnomevfs2-extra to recommends (lp: #496223)
55
56=== modified file 'debian/control'
57--- debian/control 2012-03-04 23:45:24 +0000
58+++ debian/control 2012-03-27 22:04:50 +0000
59@@ -10,7 +10,6 @@
60 automake,
61 debhelper (>= 7.0.0),
62 dh-translations,
63- dpatch,
64 intltool,
65 libart-2.0-dev (>= 2.3.10),
66 libaspell-dev,
67@@ -37,6 +36,7 @@
68 libxslt1-dev,
69 pkg-config,
70 python-dev,
71+ quilt,
72 zlib1g-dev
73 Standards-Version: 3.8.1
74
75
76=== removed file 'debian/patches/00list'
77--- debian/patches/00list 2012-02-16 10:21:27 +0000
78+++ debian/patches/00list 1970-01-01 00:00:00 +0000
79@@ -1,2 +0,0 @@
80-01_add_unity_quicklist_support.patch
81-fix-datamatrix-ui.dpatch
82
83=== added file 'debian/patches/01-fix-datamatrix-ui.dpatch'
84--- debian/patches/01-fix-datamatrix-ui.dpatch 1970-01-01 00:00:00 +0000
85+++ debian/patches/01-fix-datamatrix-ui.dpatch 2012-03-27 22:04:50 +0000
86@@ -0,0 +1,147 @@
87+#! /bin/sh /usr/share/dpatch/dpatch-run
88+# From: JazzyNico <nicoduf@yahoo.fr>
89+# Description: Prevent invalid input in Datamatrix extension dialog
90+# Origin: upstream, https://bazaar.launchpad.net/~inkscape.dev/inkscape/trunk/revision/10127
91+# Bug: https://launchpad.net/bugs/738108
92+# Bug-Debian: http://bugs.debian.org/618835
93+# Bug-Ubuntu: https://launchpad.net/bugs/738108
94+# Last-Update: 2011-06-02
95+
96+@DPATCH@
97+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' fix-791728~/share/extensions/render_barcode_datamatrix.inx fix-791728/share/extensions/render_barcode_datamatrix.inx
98+--- fix-791728~/share/extensions/render_barcode_datamatrix.inx 2011-06-02 09:40:37.000000000 +0100
99++++ fix-791728/share/extensions/render_barcode_datamatrix.inx 2011-06-02 18:05:57.251139168 +0100
100+@@ -4,10 +4,40 @@
101+ <id>il.datamatrix</id>
102+ <dependency type="executable" location="extensions">render_barcode_datamatrix.py</dependency>
103+ <dependency type="executable" location="extensions">inkex.py</dependency>
104+- <param name="text" type="string" _gui-text="Text">Inkscape</param>
105+- <param name="rows" type="int" min="8" max="144" _gui-text="Rows">10</param>
106+- <param name="cols" type="int" min="10" max="144" _gui-text="Cols">10</param>
107+- <param name="size" type="int" min="1" max="1000" _gui-text="Square Size / px">4</param>
108++ <param name="text" type="string" _gui-text="Text:">Inkscape</param>
109++ <param name="symbol" _gui-text="Size, in unit squares:" type="enum">
110++ <item value="sq10">10x10</item>
111++ <item value="sq12">12x12</item>
112++ <item value="sq14">14x14</item>
113++ <item value="sq16">16x16</item>
114++ <item value="sq18">18x18</item>
115++ <item value="sq20">20x20</item>
116++ <item value="sq22">22x22</item>
117++ <item value="sq24">24x24</item>
118++ <item value="sq26">26x26</item>
119++ <item value="sq32">32x32</item>
120++ <item value="sq36">36x36</item>
121++ <item value="sq40">40x40</item>
122++ <item value="sq44">44x44</item>
123++ <item value="sq48">48x48</item>
124++ <item value="sq52">52x52</item>
125++ <item value="sq64">64x64</item>
126++ <item value="sq72">72x72</item>
127++ <item value="sq80">80x80</item>
128++ <item value="sq88">88x88</item>
129++ <item value="sq96">96x96</item>
130++ <item value="sq104">104x104</item>
131++ <item value="sq120">120x120</item>
132++ <item value="sq132">132x132</item>
133++ <item value="sq144">144x144</item>
134++ <item value="rect8x18">8x18</item>
135++ <item value="rect8x32">8x32</item>
136++ <item value="rect12x26">12x26</item>
137++ <item value="rect12x36">12x36</item>
138++ <item value="rect16x36">16x36</item>
139++ <item value="rect16x48">16x48</item>
140++ </param>
141++ <param name="size" type="int" min="1" max="1000" _gui-text="Square Size (px):">4</param>
142+ <effect>
143+ <object-type>all</object-type>
144+ <effects-menu>
145+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' fix-791728~/share/extensions/render_barcode_datamatrix.py fix-791728/share/extensions/render_barcode_datamatrix.py
146+--- fix-791728~/share/extensions/render_barcode_datamatrix.py 2011-06-02 09:40:37.000000000 +0100
147++++ fix-791728/share/extensions/render_barcode_datamatrix.py 2011-06-02 18:05:57.381139168 +0100
148+@@ -57,6 +57,39 @@
149+ import gettext
150+ _ = gettext.gettext
151+
152++symbols = {
153++ 'sq10': (10, 10),
154++ 'sq12': (12, 12),
155++ 'sq14': (14, 14),
156++ 'sq16': (16, 16),
157++ 'sq18': (18, 18),
158++ 'sq20': (20, 20),
159++ 'sq22': (22, 22),
160++ 'sq24': (24, 24),
161++ 'sq26': (26, 26),
162++ 'sq32': (32, 32),
163++ 'sq36': (36, 36),
164++ 'sq40': (40, 40),
165++ 'sq44': (44, 44),
166++ 'sq48': (48, 48),
167++ 'sq52': (52, 52),
168++ 'sq64': (64, 64),
169++ 'sq72': (72, 72),
170++ 'sq80': (80, 80),
171++ 'sq88': (88, 88),
172++ 'sq96': (96, 96),
173++ 'sq104': (104, 104),
174++ 'sq120': (120, 120),
175++ 'sq132': (132, 132),
176++ 'sq144': (144, 144),
177++ 'rect8x18': (8, 18),
178++ 'rect8x32': (8, 32),
179++ 'rect12x26': (12, 26),
180++ 'rect12x36': (12, 36),
181++ 'rect16x36': (16, 36),
182++ 'rect16x48': (16, 48),
183++}
184++
185+ #ENCODING ROUTINES ===================================================
186+ # Take an input string and convert it to a sequence (or sequences)
187+ # of codewords as specified in ISO/IEC 16022:2006 (section 5.2.3)
188+@@ -167,6 +200,7 @@
189+ #RETURN ERROR
190+ else:
191+ inkex.errormsg(_('Unrecognised DataMatrix size'))
192++ exit(0)
193+
194+ return None
195+
196+@@ -616,6 +650,9 @@
197+ self.OptionParser.add_option("--text",
198+ action="store", type="string",
199+ dest="TEXT", default='Inkscape')
200++ self.OptionParser.add_option("--symbol",
201++ action="store", type="string",
202++ dest="SYMBOL", default='')
203+ self.OptionParser.add_option("--rows",
204+ action="store", type="int",
205+ dest="ROWS", default=10)
206+@@ -630,6 +667,12 @@
207+
208+ so = self.options
209+
210++ rows = so.ROWS
211++ cols = so.COLS
212++ if (so.SYMBOL != '' and (so.SYMBOL in symbols)):
213++ rows = symbols[so.SYMBOL][0]
214++ cols = symbols[so.SYMBOL][1]
215++
216+ if so.TEXT == '': #abort if converting blank text
217+ inkex.errormsg(_('Please enter an input string'))
218+ else:
219+@@ -644,11 +687,11 @@
220+ grp = inkex.etree.SubElement(self.current_layer, 'g', grp_attribs)#the group to put everything in
221+
222+ #GENERATE THE DATAMATRIX
223+- encoded = encode( so.TEXT, (so.ROWS, so.COLS) ) #get the pattern of squares
224+- render_data_matrix( encoded, so.SIZE, so.COLS*so.SIZE*1.5, grp ) # generate the SVG elements
225++ encoded = encode( so.TEXT, (rows, cols) ) #get the pattern of squares
226++ render_data_matrix( encoded, so.SIZE, cols*so.SIZE*1.5, grp ) # generate the SVG elements
227+
228+ if __name__ == '__main__':
229+ e = DataMatrix()
230+ e.affect()
231+
232+-# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 encoding=utf-8 textwidth=99
233++# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 fileencoding=utf-8 textwidth=99
234
235=== added file 'debian/patches/01_add_unity_quicklist_support.patch'
236--- debian/patches/01_add_unity_quicklist_support.patch 1970-01-01 00:00:00 +0000
237+++ debian/patches/01_add_unity_quicklist_support.patch 2012-03-27 22:04:50 +0000
238@@ -0,0 +1,19 @@
239+# Description: Add Unity static quicklist support to inkscape
240+# Forwarded: https://bugs.launchpad.net/inkscape/+bug/676886
241+# Bug-Ubuntu: https://bugs.launchpad.net/bugs/676886
242+# Author: Didier Roche <didrocks@ubuntu.com>
243+
244+Index: fix-966221/inkscape.desktop.in
245+===================================================================
246+--- fix-966221.orig/inkscape.desktop.in 2012-03-27 21:18:48.097841449 +0100
247++++ fix-966221/inkscape.desktop.in 2012-03-27 21:19:37.049839772 +0100
248+@@ -12,3 +12,9 @@
249+ Terminal=false
250+ StartupNotify=true
251+ Icon=inkscape
252++X-Ayatana-Desktop-Shortcuts=Drawing
253++
254++[Drawing Shortcut Group]
255++_Name=New Drawing
256++Exec=inkscape
257++TargetEnvironment=Unity
258
259=== removed file 'debian/patches/01_add_unity_quicklist_support.patch.dpatch'
260--- debian/patches/01_add_unity_quicklist_support.patch.dpatch 2011-06-01 18:05:51 +0000
261+++ debian/patches/01_add_unity_quicklist_support.patch.dpatch 1970-01-01 00:00:00 +0000
262@@ -1,20 +0,0 @@
263-#! /bin/sh /usr/share/dpatch/dpatch-run
264-# Description: Add Unity static quicklist support to inkscape
265-# Forwarded: https://bugs.launchpad.net/inkscape/+bug/676886
266-# Bug-Ubuntu: https://bugs.launchpad.net/bugs/676886
267-# Author: Didier Roche <didrocks@ubuntu.com>
268-
269-@DPATCH@
270-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/inkscape.desktop.in inkscape-0.48.1/inkscape.desktop.in
271---- inkscape-0.48.1~/inkscape.desktop.in 2010-07-13 05:48:40.000000000 +0200
272-+++ inkscape-0.48.1/inkscape.desktop.in 2011-02-17 16:21:42.690388423 +0100
273-@@ -12,3 +12,9 @@
274- Terminal=false
275- StartupNotify=true
276- Icon=inkscape
277-+X-Ayatana-Desktop-Shortcuts=Drawing
278-+
279-+[Drawing Shortcut Group]
280-+_Name=New Drawing
281-+Exec=inkscape
282-+TargetEnvironment=Unity
283
284=== added file 'debian/patches/02-drop-pdf-ps.diff'
285--- debian/patches/02-drop-pdf-ps.diff 1970-01-01 00:00:00 +0000
286+++ debian/patches/02-drop-pdf-ps.diff 2012-03-27 22:04:50 +0000
287@@ -0,0 +1,14 @@
288+diff --git a/inkscape.desktop.in b/inkscape.desktop.in
289+index 5c0de64..62ce1e4 100644
290+--- a/inkscape.desktop.in
291++++ b/inkscape.desktop.in
292+@@ -6,7 +6,7 @@ _X-GNOME-FullName=Inkscape Vector Graphics Editor
293+ _Comment=Create and edit Scalable Vector Graphics images
294+ Type=Application
295+ Categories=Graphics;VectorGraphics;GTK;
296+-MimeType=image/svg+xml;image/svg+xml-compressed;application/vnd.corel-draw;application/pdf;application/postscript;image/x-eps;application/illustrator;
297++MimeType=image/svg+xml;image/svg+xml-compressed;application/vnd.corel-draw;image/x-eps;application/illustrator;
298+ Exec=inkscape %F
299+ TryExec=inkscape
300+ Terminal=false
301+
302
303=== removed file 'debian/patches/fix-datamatrix-ui.dpatch'
304--- debian/patches/fix-datamatrix-ui.dpatch 2011-07-10 11:35:30 +0000
305+++ debian/patches/fix-datamatrix-ui.dpatch 1970-01-01 00:00:00 +0000
306@@ -1,147 +0,0 @@
307-#! /bin/sh /usr/share/dpatch/dpatch-run
308-# From: JazzyNico <nicoduf@yahoo.fr>
309-# Description: Prevent invalid input in Datamatrix extension dialog
310-# Origin: upstream, https://bazaar.launchpad.net/~inkscape.dev/inkscape/trunk/revision/10127
311-# Bug: https://launchpad.net/bugs/738108
312-# Bug-Debian: http://bugs.debian.org/618835
313-# Bug-Ubuntu: https://launchpad.net/bugs/738108
314-# Last-Update: 2011-06-02
315-
316-@DPATCH@
317-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' fix-791728~/share/extensions/render_barcode_datamatrix.inx fix-791728/share/extensions/render_barcode_datamatrix.inx
318---- fix-791728~/share/extensions/render_barcode_datamatrix.inx 2011-06-02 09:40:37.000000000 +0100
319-+++ fix-791728/share/extensions/render_barcode_datamatrix.inx 2011-06-02 18:05:57.251139168 +0100
320-@@ -4,10 +4,40 @@
321- <id>il.datamatrix</id>
322- <dependency type="executable" location="extensions">render_barcode_datamatrix.py</dependency>
323- <dependency type="executable" location="extensions">inkex.py</dependency>
324-- <param name="text" type="string" _gui-text="Text">Inkscape</param>
325-- <param name="rows" type="int" min="8" max="144" _gui-text="Rows">10</param>
326-- <param name="cols" type="int" min="10" max="144" _gui-text="Cols">10</param>
327-- <param name="size" type="int" min="1" max="1000" _gui-text="Square Size / px">4</param>
328-+ <param name="text" type="string" _gui-text="Text:">Inkscape</param>
329-+ <param name="symbol" _gui-text="Size, in unit squares:" type="enum">
330-+ <item value="sq10">10x10</item>
331-+ <item value="sq12">12x12</item>
332-+ <item value="sq14">14x14</item>
333-+ <item value="sq16">16x16</item>
334-+ <item value="sq18">18x18</item>
335-+ <item value="sq20">20x20</item>
336-+ <item value="sq22">22x22</item>
337-+ <item value="sq24">24x24</item>
338-+ <item value="sq26">26x26</item>
339-+ <item value="sq32">32x32</item>
340-+ <item value="sq36">36x36</item>
341-+ <item value="sq40">40x40</item>
342-+ <item value="sq44">44x44</item>
343-+ <item value="sq48">48x48</item>
344-+ <item value="sq52">52x52</item>
345-+ <item value="sq64">64x64</item>
346-+ <item value="sq72">72x72</item>
347-+ <item value="sq80">80x80</item>
348-+ <item value="sq88">88x88</item>
349-+ <item value="sq96">96x96</item>
350-+ <item value="sq104">104x104</item>
351-+ <item value="sq120">120x120</item>
352-+ <item value="sq132">132x132</item>
353-+ <item value="sq144">144x144</item>
354-+ <item value="rect8x18">8x18</item>
355-+ <item value="rect8x32">8x32</item>
356-+ <item value="rect12x26">12x26</item>
357-+ <item value="rect12x36">12x36</item>
358-+ <item value="rect16x36">16x36</item>
359-+ <item value="rect16x48">16x48</item>
360-+ </param>
361-+ <param name="size" type="int" min="1" max="1000" _gui-text="Square Size (px):">4</param>
362- <effect>
363- <object-type>all</object-type>
364- <effects-menu>
365-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' fix-791728~/share/extensions/render_barcode_datamatrix.py fix-791728/share/extensions/render_barcode_datamatrix.py
366---- fix-791728~/share/extensions/render_barcode_datamatrix.py 2011-06-02 09:40:37.000000000 +0100
367-+++ fix-791728/share/extensions/render_barcode_datamatrix.py 2011-06-02 18:05:57.381139168 +0100
368-@@ -57,6 +57,39 @@
369- import gettext
370- _ = gettext.gettext
371-
372-+symbols = {
373-+ 'sq10': (10, 10),
374-+ 'sq12': (12, 12),
375-+ 'sq14': (14, 14),
376-+ 'sq16': (16, 16),
377-+ 'sq18': (18, 18),
378-+ 'sq20': (20, 20),
379-+ 'sq22': (22, 22),
380-+ 'sq24': (24, 24),
381-+ 'sq26': (26, 26),
382-+ 'sq32': (32, 32),
383-+ 'sq36': (36, 36),
384-+ 'sq40': (40, 40),
385-+ 'sq44': (44, 44),
386-+ 'sq48': (48, 48),
387-+ 'sq52': (52, 52),
388-+ 'sq64': (64, 64),
389-+ 'sq72': (72, 72),
390-+ 'sq80': (80, 80),
391-+ 'sq88': (88, 88),
392-+ 'sq96': (96, 96),
393-+ 'sq104': (104, 104),
394-+ 'sq120': (120, 120),
395-+ 'sq132': (132, 132),
396-+ 'sq144': (144, 144),
397-+ 'rect8x18': (8, 18),
398-+ 'rect8x32': (8, 32),
399-+ 'rect12x26': (12, 26),
400-+ 'rect12x36': (12, 36),
401-+ 'rect16x36': (16, 36),
402-+ 'rect16x48': (16, 48),
403-+}
404-+
405- #ENCODING ROUTINES ===================================================
406- # Take an input string and convert it to a sequence (or sequences)
407- # of codewords as specified in ISO/IEC 16022:2006 (section 5.2.3)
408-@@ -167,6 +200,7 @@
409- #RETURN ERROR
410- else:
411- inkex.errormsg(_('Unrecognised DataMatrix size'))
412-+ exit(0)
413-
414- return None
415-
416-@@ -616,6 +650,9 @@
417- self.OptionParser.add_option("--text",
418- action="store", type="string",
419- dest="TEXT", default='Inkscape')
420-+ self.OptionParser.add_option("--symbol",
421-+ action="store", type="string",
422-+ dest="SYMBOL", default='')
423- self.OptionParser.add_option("--rows",
424- action="store", type="int",
425- dest="ROWS", default=10)
426-@@ -630,6 +667,12 @@
427-
428- so = self.options
429-
430-+ rows = so.ROWS
431-+ cols = so.COLS
432-+ if (so.SYMBOL != '' and (so.SYMBOL in symbols)):
433-+ rows = symbols[so.SYMBOL][0]
434-+ cols = symbols[so.SYMBOL][1]
435-+
436- if so.TEXT == '': #abort if converting blank text
437- inkex.errormsg(_('Please enter an input string'))
438- else:
439-@@ -644,11 +687,11 @@
440- grp = inkex.etree.SubElement(self.current_layer, 'g', grp_attribs)#the group to put everything in
441-
442- #GENERATE THE DATAMATRIX
443-- encoded = encode( so.TEXT, (so.ROWS, so.COLS) ) #get the pattern of squares
444-- render_data_matrix( encoded, so.SIZE, so.COLS*so.SIZE*1.5, grp ) # generate the SVG elements
445-+ encoded = encode( so.TEXT, (rows, cols) ) #get the pattern of squares
446-+ render_data_matrix( encoded, so.SIZE, cols*so.SIZE*1.5, grp ) # generate the SVG elements
447-
448- if __name__ == '__main__':
449- e = DataMatrix()
450- e.affect()
451-
452--# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 encoding=utf-8 textwidth=99
453-+# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 fileencoding=utf-8 textwidth=99
454
455=== added file 'debian/patches/series'
456--- debian/patches/series 1970-01-01 00:00:00 +0000
457+++ debian/patches/series 2012-03-27 22:04:50 +0000
458@@ -0,0 +1,3 @@
459+01-fix-datamatrix-ui.dpatch
460+02-drop-pdf-ps.diff
461+01_add_unity_quicklist_support.patch
462
463=== modified file 'debian/rules'
464--- debian/rules 2011-05-30 17:02:03 +0000
465+++ debian/rules 2012-03-27 22:04:50 +0000
466@@ -6,8 +6,8 @@
467 # Uncomment this to turn on verbose mode.
468 #export DH_VERBOSE=1
469
470-# use dpatch:
471-include /usr/share/dpatch/dpatch.make
472+# use quilt for patches:
473+include /usr/share/quilt/quilt.make
474
475 # These are used for cross-compiling and for saving the configure script
476 # from having to guess our platform (since we know it already)
477@@ -99,6 +99,8 @@
478 install -D -o root -g root -m 644 $(CURDIR)/debian/inkscape.bash $(CURDIR)/debian/inkscape/etc/bash_completion.d/inkscape
479 chmod a+x $(CURDIR)/debian/inkscape/usr/share/inkscape/extensions/xaml2svg/
480
481+
482+
483 # Build architecture-independent files here.
484 binary-indep: build install
485 # We have nothing to do by default.

Subscribers

People subscribed via source and target branches