Merge lp:~valavanisalex/ubuntu/oneiric/inkscape/inkscape_0.48.1-2ubuntu5 into lp:ubuntu/oneiric/inkscape

Proposed by Alex Valavanis on 2011-05-30
Status: Merged
Merged at revision: 56
Proposed branch: lp:~valavanisalex/ubuntu/oneiric/inkscape/inkscape_0.48.1-2ubuntu5
Merge into: lp:ubuntu/oneiric/inkscape
Diff against target: 917 lines (+377/-329)
6 files modified
debian/changelog (+19/-0)
debian/control (+1/-2)
debian/patches/00list (+1/-0)
debian/patches/02-add-shebangs-and-fix-permissions.dpatch (+274/-326)
debian/patches/fix-fontforge-glyph-template.dpatch (+82/-0)
debian/rules (+0/-1)
To merge this branch: bzr merge lp:~valavanisalex/ubuntu/oneiric/inkscape/inkscape_0.48.1-2ubuntu5
Reviewer Review Type Date Requested Status
Ubuntu branches 2011-05-30 Pending
Review via email: mp+62901@code.launchpad.net

Description of the change

Here are my proposed changes for the next package version. This branch tidies up the translation improvements in the current release, tweaks a couple of dependencies and improves a previous patch.

To post a comment you must log in.
57. By Alex Valavanis on 2011-05-30

debian/patches/fix-fontforge-glyph-template.dpatch: Cherry-pick
patch from uptream trunk to fix layer structure in template (LP: #565296)

58. By Alex Valavanis on 2011-05-30

Added missing patch file

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 2011-05-30 09:02:49 +0000
3+++ debian/changelog 2011-05-30 18:02:37 +0000
4@@ -1,3 +1,22 @@
5+inkscape (0.48.1-2ubuntu5) oneiric; urgency=low
6+
7+ * debian/rules: No need to manually call intltool-update on build. This
8+ is now handled by dh_translations.
9+ * debian/control: No longer suggest python and skencil. They do not
10+ offer any enhancement to Inkscape (LP: #762541)
11+ * debian/control: Suggest transfig to allow import of xfig files
12+ (LP: #668300)
13+ * debian/patches/02-add-shebangs-and-fix-permissions.dpatch:
14+ No longer mark JavaScript extension files as standalone executables
15+ (LP: #602005):
16+ - share/extensions/*.js: Revert addition of shebangs
17+ - share/extensions/Makefile.am: Install *.js using _DATA rule rather
18+ than _SCRIPTS rule to avoid giving executable permission
19+ * debian/patches/fix-fontforge-glyph-template.dpatch: Cherry-pick
20+ patch from uptream trunk to fix layer structure in template (LP: #565296)
21+
22+ -- Alex Valavanis <valavanisalex@gmail.com> Mon, 30 May 2011 18:50:49 +0100
23+
24 inkscape (0.48.1-2ubuntu4) oneiric; urgency=low
25
26 * debian/rules: Drop broken code to add translation domain to desktop files.
27
28=== modified file 'debian/control'
29--- debian/control 2011-05-30 08:07:52 +0000
30+++ debian/control 2011-05-30 18:02:37 +0000
31@@ -49,9 +49,8 @@
32 libgnomevfs2-extra,
33 libsvg-perl,
34 libxml-xql-perl,
35- python,
36 pstoedit,
37- skencil
38+ transfig
39 Recommends: aspell,
40 libwmf-bin,
41 imagemagick,
42
43=== modified file 'debian/patches/00list'
44--- debian/patches/00list 2011-05-01 01:08:10 +0000
45+++ debian/patches/00list 2011-05-30 18:02:37 +0000
46@@ -3,3 +3,4 @@
47 03-add-missing-mimetypes
48 01_add_unity_quicklist_support.patch
49 04-fix-gcc4.6-ftbfs.dpatch
50+fix-fontforge-glyph-template.dpatch
51
52=== modified file 'debian/patches/01-libwpg0.2.dpatch' (properties changed: -x to +x)
53=== modified file 'debian/patches/01_add_unity_quicklist_support.patch.dpatch' (properties changed: -x to +x)
54=== modified file 'debian/patches/02-add-shebangs-and-fix-permissions.dpatch' (properties changed: -x to +x)
55--- debian/patches/02-add-shebangs-and-fix-permissions.dpatch 2011-02-14 13:48:21 +0000
56+++ debian/patches/02-add-shebangs-and-fix-permissions.dpatch 2011-05-30 18:02:37 +0000
57@@ -6,149 +6,166 @@
58 ## DP: Taken from upstream's Bug tracker at
59 ## DP: https://bugs.launchpad.net/inkscape/+bug/602005
60 ## DP: original patch by Leo Jackson
61+## DP: 2011-05-30: Modified by Alex Valavanis <valavanisalex@gmail.com>:
62+## DP: * Do not add shebangs to JavaScript files. They cannot be run as
63+## DP: standalone scripts.
64+## DP: * Install JavaScript files using _DATA rule rather than _SCRIPTS
65+## DP: rule to avoid making them executable.
66
67 @DPATCH@
68-
69-=== modified file 'share/extensions/Barcode/Base.py'
70---- a/share/extensions/Barcode/Base.py 2008-03-29 10:21:03 +0000
71-+++ b/share/extensions/Barcode/Base.py 2010-07-24 17:56:48 +0000
72+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape_0.48.1-2ubuntu5~/share/extensions/Barcode/Base.py inkscape_0.48.1-2ubuntu5/share/extensions/Barcode/Base.py
73+--- inkscape_0.48.1-2ubuntu5~/share/extensions/Barcode/Base.py 2011-05-30 17:38:10.000000000 +0100
74++++ inkscape_0.48.1-2ubuntu5/share/extensions/Barcode/Base.py 2011-05-30 17:43:57.893386425 +0100
75 @@ -1,3 +1,4 @@
76 +#!/usr/bin/env python
77 '''
78 Copyright (C) 2007 Martin Owens
79
80-
81-=== modified file 'share/extensions/Barcode/Code128.py'
82---- a/share/extensions/Barcode/Code128.py 2010-02-28 22:40:23 +0000
83-+++ b/share/extensions/Barcode/Code128.py 2010-07-24 17:56:48 +0000
84+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape_0.48.1-2ubuntu5~/share/extensions/Barcode/Code128.py inkscape_0.48.1-2ubuntu5/share/extensions/Barcode/Code128.py
85+--- inkscape_0.48.1-2ubuntu5~/share/extensions/Barcode/Code128.py 2011-05-30 17:38:10.000000000 +0100
86++++ inkscape_0.48.1-2ubuntu5/share/extensions/Barcode/Code128.py 2011-05-30 17:43:57.893386425 +0100
87 @@ -1,3 +1,4 @@
88 +#!/usr/bin/env python
89 '''
90 Copyright (C) 2007 Martin Owens
91
92-
93-=== modified file 'share/extensions/Barcode/Code39.py'
94---- a/share/extensions/Barcode/Code39.py 2007-04-25 00:53:02 +0000
95-+++ b/share/extensions/Barcode/Code39.py 2010-07-24 17:56:48 +0000
96-@@ -1,3 +1,4 @@
97-+#!/usr/bin/env python
98- '''
99- Copyright (C) 2007 Martin Owens
100-
101-
102-=== modified file 'share/extensions/Barcode/Code39Ext.py'
103---- a/share/extensions/Barcode/Code39Ext.py 2007-04-25 00:53:02 +0000
104-+++ b/share/extensions/Barcode/Code39Ext.py 2010-07-24 17:56:48 +0000
105-@@ -1,3 +1,4 @@
106-+#!/usr/bin/env python
107- '''
108- Copyright (C) 2007 Martin Owens
109-
110-
111-=== modified file 'share/extensions/Barcode/Code93.py'
112---- a/share/extensions/Barcode/Code93.py 2010-04-27 17:09:54 +0000
113-+++ b/share/extensions/Barcode/Code93.py 2010-07-24 17:56:48 +0000
114-@@ -1,3 +1,4 @@
115-+#!/usr/bin/env python
116- '''
117- Copyright (C) 2007 Martin Owens
118-
119-
120-=== modified file 'share/extensions/Barcode/EAN13.py'
121---- a/share/extensions/Barcode/EAN13.py 2009-12-20 22:09:40 +0000
122-+++ b/share/extensions/Barcode/EAN13.py 2010-07-24 17:56:48 +0000
123-@@ -1,3 +1,4 @@
124-+#!/usr/bin/env python
125- '''
126- Copyright (C) 2007 Martin Owens
127-
128-
129-=== modified file 'share/extensions/Barcode/EAN5.py'
130---- a/share/extensions/Barcode/EAN5.py 2009-12-22 00:13:41 +0000
131-+++ b/share/extensions/Barcode/EAN5.py 2010-07-24 17:56:48 +0000
132+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape_0.48.1-2ubuntu5~/share/extensions/Barcode/Code39.py inkscape_0.48.1-2ubuntu5/share/extensions/Barcode/Code39.py
133+--- inkscape_0.48.1-2ubuntu5~/share/extensions/Barcode/Code39.py 2011-05-30 17:38:10.000000000 +0100
134++++ inkscape_0.48.1-2ubuntu5/share/extensions/Barcode/Code39.py 2011-05-30 17:43:57.893386425 +0100
135+@@ -1,3 +1,4 @@
136++#!/usr/bin/env python
137+ '''
138+ Copyright (C) 2007 Martin Owens
139+
140+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape_0.48.1-2ubuntu5~/share/extensions/Barcode/Code39Ext.py inkscape_0.48.1-2ubuntu5/share/extensions/Barcode/Code39Ext.py
141+--- inkscape_0.48.1-2ubuntu5~/share/extensions/Barcode/Code39Ext.py 2011-05-30 17:38:10.000000000 +0100
142++++ inkscape_0.48.1-2ubuntu5/share/extensions/Barcode/Code39Ext.py 2011-05-30 17:43:57.893386425 +0100
143+@@ -1,3 +1,4 @@
144++#!/usr/bin/env python
145+ '''
146+ Copyright (C) 2007 Martin Owens
147+
148+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape_0.48.1-2ubuntu5~/share/extensions/Barcode/Code93.py inkscape_0.48.1-2ubuntu5/share/extensions/Barcode/Code93.py
149+--- inkscape_0.48.1-2ubuntu5~/share/extensions/Barcode/Code93.py 2011-05-30 17:38:10.000000000 +0100
150++++ inkscape_0.48.1-2ubuntu5/share/extensions/Barcode/Code93.py 2011-05-30 17:43:57.893386425 +0100
151+@@ -1,3 +1,4 @@
152++#!/usr/bin/env python
153+ '''
154+ Copyright (C) 2007 Martin Owens
155+
156+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape_0.48.1-2ubuntu5~/share/extensions/Barcode/EAN13.py inkscape_0.48.1-2ubuntu5/share/extensions/Barcode/EAN13.py
157+--- inkscape_0.48.1-2ubuntu5~/share/extensions/Barcode/EAN13.py 2011-05-30 17:38:10.000000000 +0100
158++++ inkscape_0.48.1-2ubuntu5/share/extensions/Barcode/EAN13.py 2011-05-30 17:43:57.893386425 +0100
159+@@ -1,3 +1,4 @@
160++#!/usr/bin/env python
161+ '''
162+ Copyright (C) 2007 Martin Owens
163+
164+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape_0.48.1-2ubuntu5~/share/extensions/Barcode/EAN5.py inkscape_0.48.1-2ubuntu5/share/extensions/Barcode/EAN5.py
165+--- inkscape_0.48.1-2ubuntu5~/share/extensions/Barcode/EAN5.py 2011-05-30 17:38:10.000000000 +0100
166++++ inkscape_0.48.1-2ubuntu5/share/extensions/Barcode/EAN5.py 2011-05-30 17:43:57.893386425 +0100
167 @@ -1,3 +1,4 @@
168 +#!/usr/bin/env python
169 '''
170 Copyright (C) 2007 Martin Owens
171 Copyright (C) 2009 Aaron C Spike
172-
173-=== modified file 'share/extensions/Barcode/EAN8.py'
174---- a/share/extensions/Barcode/EAN8.py 2007-04-25 00:53:02 +0000
175-+++ b/share/extensions/Barcode/EAN8.py 2010-07-24 17:56:48 +0000
176-@@ -1,3 +1,4 @@
177-+#!/usr/bin/env python
178- '''
179- Copyright (C) 2007 Martin Owens
180-
181-
182-=== modified file 'share/extensions/Barcode/RM4CC.py'
183---- a/share/extensions/Barcode/RM4CC.py 2007-04-25 00:53:02 +0000
184-+++ b/share/extensions/Barcode/RM4CC.py 2010-07-24 17:56:48 +0000
185-@@ -1,3 +1,4 @@
186-+#!/usr/bin/env python
187- '''
188- Copyright (C) 2007 Martin Owens
189-
190-
191-=== modified file 'share/extensions/Barcode/UPCA.py'
192---- a/share/extensions/Barcode/UPCA.py 2009-12-20 22:09:40 +0000
193-+++ b/share/extensions/Barcode/UPCA.py 2010-07-24 17:56:48 +0000
194-@@ -1,3 +1,4 @@
195-+#!/usr/bin/env python
196- '''
197- Copyright (C) 2007 Martin Owens
198-
199-
200-=== modified file 'share/extensions/Barcode/UPCE.py'
201---- a/share/extensions/Barcode/UPCE.py 2009-12-20 22:09:40 +0000
202-+++ b/share/extensions/Barcode/UPCE.py 2010-07-24 17:56:48 +0000
203-@@ -1,3 +1,4 @@
204-+#!/usr/bin/env python
205- '''
206- Copyright (C) 2007 Martin Owens
207-
208-
209-=== modified file 'share/extensions/Barcode/__init__.py'
210---- a/share/extensions/Barcode/__init__.py 2009-12-21 23:48:17 +0000
211-+++ b/share/extensions/Barcode/__init__.py 2010-07-24 17:56:48 +0000
212+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape_0.48.1-2ubuntu5~/share/extensions/Barcode/EAN8.py inkscape_0.48.1-2ubuntu5/share/extensions/Barcode/EAN8.py
213+--- inkscape_0.48.1-2ubuntu5~/share/extensions/Barcode/EAN8.py 2011-05-30 17:38:10.000000000 +0100
214++++ inkscape_0.48.1-2ubuntu5/share/extensions/Barcode/EAN8.py 2011-05-30 17:43:57.893386425 +0100
215+@@ -1,3 +1,4 @@
216++#!/usr/bin/env python
217+ '''
218+ Copyright (C) 2007 Martin Owens
219+
220+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape_0.48.1-2ubuntu5~/share/extensions/Barcode/RM4CC.py inkscape_0.48.1-2ubuntu5/share/extensions/Barcode/RM4CC.py
221+--- inkscape_0.48.1-2ubuntu5~/share/extensions/Barcode/RM4CC.py 2011-05-30 17:38:10.000000000 +0100
222++++ inkscape_0.48.1-2ubuntu5/share/extensions/Barcode/RM4CC.py 2011-05-30 17:43:57.893386425 +0100
223+@@ -1,3 +1,4 @@
224++#!/usr/bin/env python
225+ '''
226+ Copyright (C) 2007 Martin Owens
227+
228+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape_0.48.1-2ubuntu5~/share/extensions/Barcode/UPCA.py inkscape_0.48.1-2ubuntu5/share/extensions/Barcode/UPCA.py
229+--- inkscape_0.48.1-2ubuntu5~/share/extensions/Barcode/UPCA.py 2011-05-30 17:38:10.000000000 +0100
230++++ inkscape_0.48.1-2ubuntu5/share/extensions/Barcode/UPCA.py 2011-05-30 17:43:57.893386425 +0100
231+@@ -1,3 +1,4 @@
232++#!/usr/bin/env python
233+ '''
234+ Copyright (C) 2007 Martin Owens
235+
236+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape_0.48.1-2ubuntu5~/share/extensions/Barcode/UPCE.py inkscape_0.48.1-2ubuntu5/share/extensions/Barcode/UPCE.py
237+--- inkscape_0.48.1-2ubuntu5~/share/extensions/Barcode/UPCE.py 2011-05-30 17:38:10.000000000 +0100
238++++ inkscape_0.48.1-2ubuntu5/share/extensions/Barcode/UPCE.py 2011-05-30 17:43:57.893386425 +0100
239+@@ -1,3 +1,4 @@
240++#!/usr/bin/env python
241+ '''
242+ Copyright (C) 2007 Martin Owens
243+
244+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape_0.48.1-2ubuntu5~/share/extensions/Barcode/__init__.py inkscape_0.48.1-2ubuntu5/share/extensions/Barcode/__init__.py
245+--- inkscape_0.48.1-2ubuntu5~/share/extensions/Barcode/__init__.py 2011-05-30 17:38:10.000000000 +0100
246++++ inkscape_0.48.1-2ubuntu5/share/extensions/Barcode/__init__.py 2011-05-30 17:43:57.893386425 +0100
247 @@ -1,4 +1,4 @@
248 -
249 +#!/usr/bin/env python
250 '''
251 Barcodes SVG Extention
252
253-
254-=== modified file 'share/extensions/SpSVG.pm'
255---- a/share/extensions/SpSVG.pm 2006-01-16 02:36:01 +0000
256-+++ b/share/extensions/SpSVG.pm 2010-07-24 17:56:48 +0000
257+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape_0.48.1-2ubuntu5~/share/extensions/Makefile.am inkscape_0.48.1-2ubuntu5/share/extensions/Makefile.am
258+--- inkscape_0.48.1-2ubuntu5~/share/extensions/Makefile.am 2011-05-30 17:38:10.000000000 +0100
259++++ inkscape_0.48.1-2ubuntu5/share/extensions/Makefile.am 2011-05-30 17:46:40.853386475 +0100
260+@@ -73,13 +73,9 @@
261+ inkex.py \
262+ Inkscape.pm \
263+ inkwebeffect.py \
264+- inkweb.js \
265+ interp.py \
266+ interp_att_g.py \
267+- jessyInk.js \
268+ jessyInk_autoTexts.py \
269+- jessyInk_core_mouseHandler_noclick.js \
270+- jessyInk_core_mouseHandler_zoomControl.js \
271+ jessyInk_effects.py \
272+ jessyInk_export.py \
273+ jessyInk_install.py \
274+@@ -161,6 +157,10 @@
275+ yocto_css.py
276+
277+ otherstuff = \
278++ inkweb.js \
279++ jessyInk.js \
280++ jessyInk_core_mouseHandler_noclick.js \
281++ jessyInk_core_mouseHandler_zoomControl.js \
282+ aisvg.xslt \
283+ colors.xml \
284+ jessyInk_video.svg \
285+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape_0.48.1-2ubuntu5~/share/extensions/SpSVG.pm inkscape_0.48.1-2ubuntu5/share/extensions/SpSVG.pm
286+--- inkscape_0.48.1-2ubuntu5~/share/extensions/SpSVG.pm 2011-05-30 17:38:10.000000000 +0100
287++++ inkscape_0.48.1-2ubuntu5/share/extensions/SpSVG.pm 2011-05-30 17:43:57.893386425 +0100
288 @@ -1,4 +1,4 @@
289 -#!/usr/bin/perl -w
290 +#!/usr/bin/env perl -w
291 #
292 # SpSVG
293 #
294-
295-=== modified file 'share/extensions/color_blackandwhite.py'
296---- a/share/extensions/color_blackandwhite.py 2010-02-14 09:46:42 +0000
297-+++ b/share/extensions/color_blackandwhite.py 2010-07-24 17:56:48 +0000
298+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape_0.48.1-2ubuntu5~/share/extensions/color_blackandwhite.py inkscape_0.48.1-2ubuntu5/share/extensions/color_blackandwhite.py
299+--- inkscape_0.48.1-2ubuntu5~/share/extensions/color_blackandwhite.py 2011-05-30 17:38:10.000000000 +0100
300++++ inkscape_0.48.1-2ubuntu5/share/extensions/color_blackandwhite.py 2011-05-30 17:43:57.893386425 +0100
301 @@ -1,3 +1,4 @@
302 +#!/usr/bin/env python
303 import coloreffect,sys
304
305 class C(coloreffect.ColorEffect):
306-
307-=== modified file 'share/extensions/color_brighter.py'
308---- a/share/extensions/color_brighter.py 2008-03-29 10:21:03 +0000
309-+++ b/share/extensions/color_brighter.py 2010-07-24 17:56:48 +0000
310+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape_0.48.1-2ubuntu5~/share/extensions/color_brighter.py inkscape_0.48.1-2ubuntu5/share/extensions/color_brighter.py
311+--- inkscape_0.48.1-2ubuntu5~/share/extensions/color_brighter.py 2011-05-30 17:38:10.000000000 +0100
312++++ inkscape_0.48.1-2ubuntu5/share/extensions/color_brighter.py 2011-05-30 17:43:57.893386425 +0100
313 @@ -1,3 +1,4 @@
314 +#!/usr/bin/env python
315 import coloreffect
316
317 class C(coloreffect.ColorEffect):
318-
319-=== modified file 'share/extensions/color_custom.py'
320---- a/share/extensions/color_custom.py 2008-03-29 10:21:03 +0000
321-+++ b/share/extensions/color_custom.py 2010-07-24 17:56:48 +0000
322+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape_0.48.1-2ubuntu5~/share/extensions/color_custom.py inkscape_0.48.1-2ubuntu5/share/extensions/color_custom.py
323+--- inkscape_0.48.1-2ubuntu5~/share/extensions/color_custom.py 2011-05-30 17:38:10.000000000 +0100
324++++ inkscape_0.48.1-2ubuntu5/share/extensions/color_custom.py 2011-05-30 17:43:57.893386425 +0100
325 @@ -1,3 +1,4 @@
326 +#!/usr/bin/env python
327 import coloreffect
328@@ -161,19 +178,17 @@
329 -c.affect()
330 \ No newline at end of file
331 +c.affect()
332-
333-=== modified file 'share/extensions/color_darker.py'
334---- a/share/extensions/color_darker.py 2008-03-29 10:21:03 +0000
335-+++ b/share/extensions/color_darker.py 2010-07-24 17:56:48 +0000
336+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape_0.48.1-2ubuntu5~/share/extensions/color_darker.py inkscape_0.48.1-2ubuntu5/share/extensions/color_darker.py
337+--- inkscape_0.48.1-2ubuntu5~/share/extensions/color_darker.py 2011-05-30 17:38:10.000000000 +0100
338++++ inkscape_0.48.1-2ubuntu5/share/extensions/color_darker.py 2011-05-30 17:43:57.893386425 +0100
339 @@ -1,3 +1,4 @@
340 +#!/usr/bin/env python
341 import coloreffect
342
343 class C(coloreffect.ColorEffect):
344-
345-=== modified file 'share/extensions/color_desaturate.py'
346---- a/share/extensions/color_desaturate.py 2008-03-29 10:21:03 +0000
347-+++ b/share/extensions/color_desaturate.py 2010-07-24 17:56:48 +0000
348+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape_0.48.1-2ubuntu5~/share/extensions/color_desaturate.py inkscape_0.48.1-2ubuntu5/share/extensions/color_desaturate.py
349+--- inkscape_0.48.1-2ubuntu5~/share/extensions/color_desaturate.py 2011-05-30 17:38:10.000000000 +0100
350++++ inkscape_0.48.1-2ubuntu5/share/extensions/color_desaturate.py 2011-05-30 17:43:57.893386425 +0100
351 @@ -1,3 +1,4 @@
352 +#!/usr/bin/env python
353 import coloreffect
354@@ -186,10 +201,9 @@
355 -c.affect()
356 \ No newline at end of file
357 +c.affect()
358-
359-=== modified file 'share/extensions/color_grayscale.py'
360---- a/share/extensions/color_grayscale.py 2008-03-29 10:21:03 +0000
361-+++ b/share/extensions/color_grayscale.py 2010-07-24 17:56:48 +0000
362+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape_0.48.1-2ubuntu5~/share/extensions/color_grayscale.py inkscape_0.48.1-2ubuntu5/share/extensions/color_grayscale.py
363+--- inkscape_0.48.1-2ubuntu5~/share/extensions/color_grayscale.py 2011-05-30 17:38:10.000000000 +0100
364++++ inkscape_0.48.1-2ubuntu5/share/extensions/color_grayscale.py 2011-05-30 17:43:57.893386425 +0100
365 @@ -1,3 +1,4 @@
366 +#!/usr/bin/env python
367 import coloreffect
368@@ -202,64 +216,57 @@
369 -c.affect()
370 \ No newline at end of file
371 +c.affect()
372-
373-=== modified file 'share/extensions/color_lesshue.py'
374---- a/share/extensions/color_lesshue.py 2008-03-29 10:21:03 +0000
375-+++ b/share/extensions/color_lesshue.py 2010-07-24 17:56:48 +0000
376-@@ -1,3 +1,4 @@
377-+#!/usr/bin/env python
378- import coloreffect, inkex
379-
380- class C(coloreffect.ColorEffect):
381-
382-=== modified file 'share/extensions/color_lesslight.py'
383---- a/share/extensions/color_lesslight.py 2008-03-29 10:21:03 +0000
384-+++ b/share/extensions/color_lesslight.py 2010-07-24 17:56:48 +0000
385-@@ -1,3 +1,4 @@
386-+#!/usr/bin/env python
387- import coloreffect, inkex
388-
389- class C(coloreffect.ColorEffect):
390-
391-=== modified file 'share/extensions/color_lesssaturation.py'
392---- a/share/extensions/color_lesssaturation.py 2008-03-29 10:21:03 +0000
393-+++ b/share/extensions/color_lesssaturation.py 2010-07-24 17:56:48 +0000
394-@@ -1,3 +1,4 @@
395-+#!/usr/bin/env python
396- import coloreffect, inkex
397-
398- class C(coloreffect.ColorEffect):
399-
400-=== modified file 'share/extensions/color_morehue.py'
401---- a/share/extensions/color_morehue.py 2008-03-29 10:21:03 +0000
402-+++ b/share/extensions/color_morehue.py 2010-07-24 17:56:48 +0000
403-@@ -1,3 +1,4 @@
404-+#!/usr/bin/env python
405- import coloreffect, inkex
406-
407- class C(coloreffect.ColorEffect):
408-
409-=== modified file 'share/extensions/color_morelight.py'
410---- a/share/extensions/color_morelight.py 2008-03-29 10:21:03 +0000
411-+++ b/share/extensions/color_morelight.py 2010-07-24 17:56:48 +0000
412-@@ -1,3 +1,4 @@
413-+#!/usr/bin/env python
414- import coloreffect, inkex
415-
416- class C(coloreffect.ColorEffect):
417-
418-=== modified file 'share/extensions/color_moresaturation.py'
419---- a/share/extensions/color_moresaturation.py 2008-03-29 10:21:03 +0000
420-+++ b/share/extensions/color_moresaturation.py 2010-07-24 17:56:48 +0000
421-@@ -1,3 +1,4 @@
422-+#!/usr/bin/env python
423- import coloreffect, inkex
424-
425- class C(coloreffect.ColorEffect):
426-
427-=== modified file 'share/extensions/color_negative.py'
428---- a/share/extensions/color_negative.py 2008-03-29 10:21:03 +0000
429-+++ b/share/extensions/color_negative.py 2010-07-24 17:56:48 +0000
430+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape_0.48.1-2ubuntu5~/share/extensions/color_lesshue.py inkscape_0.48.1-2ubuntu5/share/extensions/color_lesshue.py
431+--- inkscape_0.48.1-2ubuntu5~/share/extensions/color_lesshue.py 2011-05-30 17:38:10.000000000 +0100
432++++ inkscape_0.48.1-2ubuntu5/share/extensions/color_lesshue.py 2011-05-30 17:43:57.903386425 +0100
433+@@ -1,3 +1,4 @@
434++#!/usr/bin/env python
435+ import coloreffect, inkex
436+
437+ class C(coloreffect.ColorEffect):
438+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape_0.48.1-2ubuntu5~/share/extensions/color_lesslight.py inkscape_0.48.1-2ubuntu5/share/extensions/color_lesslight.py
439+--- inkscape_0.48.1-2ubuntu5~/share/extensions/color_lesslight.py 2011-05-30 17:38:10.000000000 +0100
440++++ inkscape_0.48.1-2ubuntu5/share/extensions/color_lesslight.py 2011-05-30 17:43:57.903386425 +0100
441+@@ -1,3 +1,4 @@
442++#!/usr/bin/env python
443+ import coloreffect, inkex
444+
445+ class C(coloreffect.ColorEffect):
446+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape_0.48.1-2ubuntu5~/share/extensions/color_lesssaturation.py inkscape_0.48.1-2ubuntu5/share/extensions/color_lesssaturation.py
447+--- inkscape_0.48.1-2ubuntu5~/share/extensions/color_lesssaturation.py 2011-05-30 17:38:10.000000000 +0100
448++++ inkscape_0.48.1-2ubuntu5/share/extensions/color_lesssaturation.py 2011-05-30 17:43:57.903386425 +0100
449+@@ -1,3 +1,4 @@
450++#!/usr/bin/env python
451+ import coloreffect, inkex
452+
453+ class C(coloreffect.ColorEffect):
454+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape_0.48.1-2ubuntu5~/share/extensions/color_morehue.py inkscape_0.48.1-2ubuntu5/share/extensions/color_morehue.py
455+--- inkscape_0.48.1-2ubuntu5~/share/extensions/color_morehue.py 2011-05-30 17:38:10.000000000 +0100
456++++ inkscape_0.48.1-2ubuntu5/share/extensions/color_morehue.py 2011-05-30 17:43:57.903386425 +0100
457+@@ -1,3 +1,4 @@
458++#!/usr/bin/env python
459+ import coloreffect, inkex
460+
461+ class C(coloreffect.ColorEffect):
462+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape_0.48.1-2ubuntu5~/share/extensions/color_morelight.py inkscape_0.48.1-2ubuntu5/share/extensions/color_morelight.py
463+--- inkscape_0.48.1-2ubuntu5~/share/extensions/color_morelight.py 2011-05-30 17:38:10.000000000 +0100
464++++ inkscape_0.48.1-2ubuntu5/share/extensions/color_morelight.py 2011-05-30 17:43:57.903386425 +0100
465+@@ -1,3 +1,4 @@
466++#!/usr/bin/env python
467+ import coloreffect, inkex
468+
469+ class C(coloreffect.ColorEffect):
470+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape_0.48.1-2ubuntu5~/share/extensions/color_moresaturation.py inkscape_0.48.1-2ubuntu5/share/extensions/color_moresaturation.py
471+--- inkscape_0.48.1-2ubuntu5~/share/extensions/color_moresaturation.py 2011-05-30 17:38:10.000000000 +0100
472++++ inkscape_0.48.1-2ubuntu5/share/extensions/color_moresaturation.py 2011-05-30 17:43:57.903386425 +0100
473+@@ -1,3 +1,4 @@
474++#!/usr/bin/env python
475+ import coloreffect, inkex
476+
477+ class C(coloreffect.ColorEffect):
478+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape_0.48.1-2ubuntu5~/share/extensions/color_negative.py inkscape_0.48.1-2ubuntu5/share/extensions/color_negative.py
479+--- inkscape_0.48.1-2ubuntu5~/share/extensions/color_negative.py 2011-05-30 17:38:10.000000000 +0100
480++++ inkscape_0.48.1-2ubuntu5/share/extensions/color_negative.py 2011-05-30 17:43:57.903386425 +0100
481 @@ -1,3 +1,4 @@
482 +#!/usr/bin/env python
483 import coloreffect
484@@ -272,19 +279,17 @@
485 -c.affect()
486 \ No newline at end of file
487 +c.affect()
488-
489-=== modified file 'share/extensions/color_randomize.py'
490---- a/share/extensions/color_randomize.py 2008-05-23 06:31:40 +0000
491-+++ b/share/extensions/color_randomize.py 2010-07-24 17:56:48 +0000
492+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape_0.48.1-2ubuntu5~/share/extensions/color_randomize.py inkscape_0.48.1-2ubuntu5/share/extensions/color_randomize.py
493+--- inkscape_0.48.1-2ubuntu5~/share/extensions/color_randomize.py 2011-05-30 17:38:10.000000000 +0100
494++++ inkscape_0.48.1-2ubuntu5/share/extensions/color_randomize.py 2011-05-30 17:43:57.903386425 +0100
495 @@ -1,3 +1,4 @@
496 +#!/usr/bin/env python
497 import coloreffect,random,inkex
498
499 class C(coloreffect.ColorEffect):
500-
501-=== modified file 'share/extensions/color_removeblue.py'
502---- a/share/extensions/color_removeblue.py 2008-03-29 10:21:03 +0000
503-+++ b/share/extensions/color_removeblue.py 2010-07-24 17:56:48 +0000
504+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape_0.48.1-2ubuntu5~/share/extensions/color_removeblue.py inkscape_0.48.1-2ubuntu5/share/extensions/color_removeblue.py
505+--- inkscape_0.48.1-2ubuntu5~/share/extensions/color_removeblue.py 2011-05-30 17:38:10.000000000 +0100
506++++ inkscape_0.48.1-2ubuntu5/share/extensions/color_removeblue.py 2011-05-30 17:43:57.903386425 +0100
507 @@ -1,3 +1,4 @@
508 +#!/usr/bin/env python
509 import coloreffect
510@@ -297,10 +302,9 @@
511 -c.affect()
512 \ No newline at end of file
513 +c.affect()
514-
515-=== modified file 'share/extensions/color_removegreen.py'
516---- a/share/extensions/color_removegreen.py 2008-03-29 10:21:03 +0000
517-+++ b/share/extensions/color_removegreen.py 2010-07-24 17:56:48 +0000
518+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape_0.48.1-2ubuntu5~/share/extensions/color_removegreen.py inkscape_0.48.1-2ubuntu5/share/extensions/color_removegreen.py
519+--- inkscape_0.48.1-2ubuntu5~/share/extensions/color_removegreen.py 2011-05-30 17:38:10.000000000 +0100
520++++ inkscape_0.48.1-2ubuntu5/share/extensions/color_removegreen.py 2011-05-30 17:43:57.903386425 +0100
521 @@ -1,3 +1,4 @@
522 +#!/usr/bin/env python
523 import coloreffect
524@@ -313,10 +317,9 @@
525 -c.affect()
526 \ No newline at end of file
527 +c.affect()
528-
529-=== modified file 'share/extensions/color_removered.py'
530---- a/share/extensions/color_removered.py 2008-03-29 10:21:03 +0000
531-+++ b/share/extensions/color_removered.py 2010-07-24 17:56:48 +0000
532+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape_0.48.1-2ubuntu5~/share/extensions/color_removered.py inkscape_0.48.1-2ubuntu5/share/extensions/color_removered.py
533+--- inkscape_0.48.1-2ubuntu5~/share/extensions/color_removered.py 2011-05-30 17:38:10.000000000 +0100
534++++ inkscape_0.48.1-2ubuntu5/share/extensions/color_removered.py 2011-05-30 17:43:57.903386425 +0100
535 @@ -1,3 +1,4 @@
536 +#!/usr/bin/env python
537 import coloreffect
538@@ -329,19 +332,17 @@
539 -c.affect()
540 \ No newline at end of file
541 +c.affect()
542-
543-=== modified file 'share/extensions/color_replace.py'
544---- a/share/extensions/color_replace.py 2008-04-15 16:17:21 +0000
545-+++ b/share/extensions/color_replace.py 2010-07-24 17:56:48 +0000
546+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape_0.48.1-2ubuntu5~/share/extensions/color_replace.py inkscape_0.48.1-2ubuntu5/share/extensions/color_replace.py
547+--- inkscape_0.48.1-2ubuntu5~/share/extensions/color_replace.py 2011-05-30 17:38:10.000000000 +0100
548++++ inkscape_0.48.1-2ubuntu5/share/extensions/color_replace.py 2011-05-30 17:43:57.903386425 +0100
549 @@ -1,3 +1,4 @@
550 +#!/usr/bin/env python
551 import coloreffect
552
553 import inkex
554-
555-=== modified file 'share/extensions/color_rgbbarrel.py'
556---- a/share/extensions/color_rgbbarrel.py 2008-03-29 10:21:03 +0000
557-+++ b/share/extensions/color_rgbbarrel.py 2010-07-24 17:56:48 +0000
558+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape_0.48.1-2ubuntu5~/share/extensions/color_rgbbarrel.py inkscape_0.48.1-2ubuntu5/share/extensions/color_rgbbarrel.py
559+--- inkscape_0.48.1-2ubuntu5~/share/extensions/color_rgbbarrel.py 2011-05-30 17:38:10.000000000 +0100
560++++ inkscape_0.48.1-2ubuntu5/share/extensions/color_rgbbarrel.py 2011-05-30 17:43:57.903386425 +0100
561 @@ -1,3 +1,4 @@
562 +#!/usr/bin/env python
563 import coloreffect
564@@ -354,177 +355,124 @@
565 -c.affect()
566 \ No newline at end of file
567 +c.affect()
568-
569-=== modified file 'share/extensions/dxf_templates.py'
570---- a/share/extensions/dxf_templates.py 2008-12-29 23:08:47 +0000
571-+++ b/share/extensions/dxf_templates.py 2010-07-24 17:56:48 +0000
572+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape_0.48.1-2ubuntu5~/share/extensions/dxf_templates.py inkscape_0.48.1-2ubuntu5/share/extensions/dxf_templates.py
573+--- inkscape_0.48.1-2ubuntu5~/share/extensions/dxf_templates.py 2011-05-30 17:38:10.000000000 +0100
574++++ inkscape_0.48.1-2ubuntu5/share/extensions/dxf_templates.py 2011-05-30 17:43:57.903386425 +0100
575 @@ -1,3 +1,4 @@
576 +#!/usr/bin/env python
577 r14_header = ''' 0
578 SECTION
579 2
580-
581-=== modified file 'share/extensions/inkweb.js'
582---- a/share/extensions/inkweb.js 2009-04-28 22:44:25 +0000
583-+++ b/share/extensions/inkweb.js 2010-07-24 17:56:48 +0000
584-@@ -1,3 +1,4 @@
585-+#!/usr/bin/env js
586- /*
587- ** InkWeb - Inkscape's Javscript features for the open vector web
588- **
589-
590-=== modified file 'share/extensions/jessyInk.js'
591---- a/share/extensions/jessyInk.js 2010-06-04 22:18:31 +0000
592-+++ b/share/extensions/jessyInk.js 2010-07-24 17:56:48 +0000
593-@@ -1,3 +1,4 @@
594-+#!/usr/bin/env js
595- // Copyright 2008, 2009 Hannes Hochreiner
596- // This program is free software: you can redistribute it and/or modify
597- // it under the terms of the GNU General Public License as published by
598-
599-=== modified file 'share/extensions/jessyInk_core_mouseHandler_noclick.js'
600---- a/share/extensions/jessyInk_core_mouseHandler_noclick.js 2010-06-04 22:18:31 +0000
601-+++ b/share/extensions/jessyInk_core_mouseHandler_noclick.js 2010-07-24 17:56:48 +0000
602-@@ -1,3 +1,4 @@
603-+#!/usr/bin/env js
604- // Copyright 2008, 2009 Hannes Hochreiner
605- // This program is free software: you can redistribute it and/or modify
606- // it under the terms of the GNU General Public License as published by
607-
608-=== modified file 'share/extensions/jessyInk_core_mouseHandler_zoomControl.js'
609---- a/share/extensions/jessyInk_core_mouseHandler_zoomControl.js 2010-06-04 22:18:31 +0000
610-+++ b/share/extensions/jessyInk_core_mouseHandler_zoomControl.js 2010-07-24 17:56:48 +0000
611-@@ -1,3 +1,4 @@
612-+#!/usr/bin/env js
613- // Copyright 2008, 2009 Hannes Hochreiner
614- // This program is free software: you can redistribute it and/or modify
615- // it under the terms of the GNU General Public License as published by
616-
617-=== modified file 'share/extensions/render_alphabetsoup_config.py'
618---- a/share/extensions/render_alphabetsoup_config.py 2008-05-23 06:31:40 +0000
619-+++ b/share/extensions/render_alphabetsoup_config.py 2010-07-24 17:56:48 +0000
620+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape_0.48.1-2ubuntu5~/share/extensions/render_alphabetsoup_config.py inkscape_0.48.1-2ubuntu5/share/extensions/render_alphabetsoup_config.py
621+--- inkscape_0.48.1-2ubuntu5~/share/extensions/render_alphabetsoup_config.py 2011-05-30 17:38:10.000000000 +0100
622++++ inkscape_0.48.1-2ubuntu5/share/extensions/render_alphabetsoup_config.py 2011-05-30 17:43:57.903386425 +0100
623 @@ -1,3 +1,4 @@
624 +#!/usr/bin/env python
625 # Syntax format: (raise your hand if you know lisp :-)
626 #
627 # 'state0': ("file.svg", ( ( ('state1', dx, dy, T-B, L|R),),
628-
629-=== modified file 'share/extensions/render_barcode.py'
630---- a/share/extensions/render_barcode.py 2009-01-06 16:13:13 +0000
631-+++ b/share/extensions/render_barcode.py 2010-07-24 17:56:48 +0000
632+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape_0.48.1-2ubuntu5~/share/extensions/render_barcode.py inkscape_0.48.1-2ubuntu5/share/extensions/render_barcode.py
633+--- inkscape_0.48.1-2ubuntu5~/share/extensions/render_barcode.py 2011-05-30 17:38:10.000000000 +0100
634++++ inkscape_0.48.1-2ubuntu5/share/extensions/render_barcode.py 2011-05-30 17:43:57.903386425 +0100
635 @@ -1,3 +1,4 @@
636 +#!/usr/bin/env python
637 '''
638 Copyright (C) 2007 Martin Owens
639
640-
641-=== modified file 'share/extensions/run_command.py'
642---- a/share/extensions/run_command.py 2010-02-04 00:32:27 +0000
643-+++ b/share/extensions/run_command.py 2010-07-24 17:56:48 +0000
644+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape_0.48.1-2ubuntu5~/share/extensions/run_command.py inkscape_0.48.1-2ubuntu5/share/extensions/run_command.py
645+--- inkscape_0.48.1-2ubuntu5~/share/extensions/run_command.py 2011-05-30 17:38:10.000000000 +0100
646++++ inkscape_0.48.1-2ubuntu5/share/extensions/run_command.py 2011-05-30 17:43:57.903386425 +0100
647 @@ -1,3 +1,4 @@
648 +#!/usr/bin/env python
649 import os
650 import sys
651 import tempfile
652-
653-=== modified file 'share/extensions/svg_and_media_zip_output.py'
654---- a/share/extensions/svg_and_media_zip_output.py 2010-03-03 13:04:57 +0000
655-+++ b/share/extensions/svg_and_media_zip_output.py 2010-07-24 17:56:48 +0000
656+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape_0.48.1-2ubuntu5~/share/extensions/svg_and_media_zip_output.py inkscape_0.48.1-2ubuntu5/share/extensions/svg_and_media_zip_output.py
657+--- inkscape_0.48.1-2ubuntu5~/share/extensions/svg_and_media_zip_output.py 2011-05-30 17:38:10.000000000 +0100
658++++ inkscape_0.48.1-2ubuntu5/share/extensions/svg_and_media_zip_output.py 2011-05-30 17:43:57.903386425 +0100
659 @@ -1,4 +1,4 @@
660 -#! /usr/bin/env python
661 +#!/usr/bin/env python
662 """
663 svg_and_media_zip_output.py
664 An extention which collects all images to the documents directory and
665-
666-=== modified file 'share/extensions/svg_regex.py'
667---- a/share/extensions/svg_regex.py 2009-08-04 20:15:08 +0000
668-+++ b/share/extensions/svg_regex.py 2010-07-24 17:56:48 +0000
669+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape_0.48.1-2ubuntu5~/share/extensions/svg_regex.py inkscape_0.48.1-2ubuntu5/share/extensions/svg_regex.py
670+--- inkscape_0.48.1-2ubuntu5~/share/extensions/svg_regex.py 2011-05-30 17:38:10.000000000 +0100
671++++ inkscape_0.48.1-2ubuntu5/share/extensions/svg_regex.py 2011-05-30 17:43:57.903386425 +0100
672 @@ -1,3 +1,4 @@
673 +#!/usr/bin/env python
674 # This software is OSI Certified Open Source Software.
675 # OSI Certified is a certification mark of the Open Source Initiative.
676 #
677-
678-=== modified file 'share/extensions/text_braille.py'
679---- a/share/extensions/text_braille.py 2008-03-29 10:21:03 +0000
680-+++ b/share/extensions/text_braille.py 2010-07-24 17:56:48 +0000
681+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape_0.48.1-2ubuntu5~/share/extensions/text_braille.py inkscape_0.48.1-2ubuntu5/share/extensions/text_braille.py
682+--- inkscape_0.48.1-2ubuntu5~/share/extensions/text_braille.py 2011-05-30 17:38:10.000000000 +0100
683++++ inkscape_0.48.1-2ubuntu5/share/extensions/text_braille.py 2011-05-30 17:43:57.903386425 +0100
684 @@ -1,3 +1,4 @@
685 +#!/usr/bin/env python
686 #encoding: utf-8
687 import chardataeffect, inkex, string
688
689-
690-=== modified file 'share/extensions/text_flipcase.py'
691---- a/share/extensions/text_flipcase.py 2008-03-29 10:21:03 +0000
692-+++ b/share/extensions/text_flipcase.py 2010-07-24 17:56:48 +0000
693-@@ -1,3 +1,4 @@
694-+#!/usr/bin/env python
695- import chardataeffect, inkex, string
696-
697- class C(chardataeffect.CharDataEffect):
698-
699-=== modified file 'share/extensions/text_lowercase.py'
700---- a/share/extensions/text_lowercase.py 2008-03-29 10:21:03 +0000
701-+++ b/share/extensions/text_lowercase.py 2010-07-24 17:56:48 +0000
702-@@ -1,3 +1,4 @@
703-+#!/usr/bin/env python
704- import chardataeffect, inkex, string
705-
706- class C(chardataeffect.CharDataEffect):
707-
708-=== modified file 'share/extensions/text_randomcase.py'
709---- a/share/extensions/text_randomcase.py 2008-03-29 10:21:03 +0000
710-+++ b/share/extensions/text_randomcase.py 2010-07-24 17:56:48 +0000
711+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape_0.48.1-2ubuntu5~/share/extensions/text_flipcase.py inkscape_0.48.1-2ubuntu5/share/extensions/text_flipcase.py
712+--- inkscape_0.48.1-2ubuntu5~/share/extensions/text_flipcase.py 2011-05-30 17:38:10.000000000 +0100
713++++ inkscape_0.48.1-2ubuntu5/share/extensions/text_flipcase.py 2011-05-30 17:43:57.903386425 +0100
714+@@ -1,3 +1,4 @@
715++#!/usr/bin/env python
716+ import chardataeffect, inkex, string
717+
718+ class C(chardataeffect.CharDataEffect):
719+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape_0.48.1-2ubuntu5~/share/extensions/text_lowercase.py inkscape_0.48.1-2ubuntu5/share/extensions/text_lowercase.py
720+--- inkscape_0.48.1-2ubuntu5~/share/extensions/text_lowercase.py 2011-05-30 17:38:10.000000000 +0100
721++++ inkscape_0.48.1-2ubuntu5/share/extensions/text_lowercase.py 2011-05-30 17:43:57.903386425 +0100
722+@@ -1,3 +1,4 @@
723++#!/usr/bin/env python
724+ import chardataeffect, inkex, string
725+
726+ class C(chardataeffect.CharDataEffect):
727+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape_0.48.1-2ubuntu5~/share/extensions/text_randomcase.py inkscape_0.48.1-2ubuntu5/share/extensions/text_randomcase.py
728+--- inkscape_0.48.1-2ubuntu5~/share/extensions/text_randomcase.py 2011-05-30 17:38:10.000000000 +0100
729++++ inkscape_0.48.1-2ubuntu5/share/extensions/text_randomcase.py 2011-05-30 17:43:57.903386425 +0100
730 @@ -1,3 +1,4 @@
731 +#!/usr/bin/env python
732 import chardataeffect, inkex, string
733
734 import random
735-
736-=== modified file 'share/extensions/text_replace.py'
737---- a/share/extensions/text_replace.py 2008-05-23 06:15:31 +0000
738-+++ b/share/extensions/text_replace.py 2010-07-24 17:56:48 +0000
739-@@ -1,3 +1,4 @@
740-+#!/usr/bin/env python
741- import chardataeffect, inkex, string
742-
743- class C(chardataeffect.CharDataEffect):
744-
745-=== modified file 'share/extensions/text_sentencecase.py'
746---- a/share/extensions/text_sentencecase.py 2008-03-29 10:21:03 +0000
747-+++ b/share/extensions/text_sentencecase.py 2010-07-24 17:56:48 +0000
748-@@ -1,3 +1,4 @@
749-+#!/usr/bin/env python
750- import chardataeffect, inkex, string
751-
752- class C(chardataeffect.CharDataEffect):
753-
754-=== modified file 'share/extensions/text_titlecase.py'
755---- a/share/extensions/text_titlecase.py 2008-03-29 10:21:03 +0000
756-+++ b/share/extensions/text_titlecase.py 2010-07-24 17:56:48 +0000
757-@@ -1,3 +1,4 @@
758-+#!/usr/bin/env python
759- import chardataeffect, inkex, string
760-
761- class C(chardataeffect.CharDataEffect):
762-
763-=== modified file 'share/extensions/text_uppercase.py'
764---- a/share/extensions/text_uppercase.py 2008-03-29 10:21:03 +0000
765-+++ b/share/extensions/text_uppercase.py 2010-07-24 17:56:48 +0000
766-@@ -1,3 +1,4 @@
767-+#!/usr/bin/env python
768- import chardataeffect, inkex, string
769-
770- class C(chardataeffect.CharDataEffect):
771-
772-diff --git a/share/extensions/voronoi.py b/share/extensions/voronoi.py
773-index be15fbe..923298d 100644
774---- a/share/extensions/voronoi.py
775-+++ b/share/extensions/voronoi.py
776+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape_0.48.1-2ubuntu5~/share/extensions/text_replace.py inkscape_0.48.1-2ubuntu5/share/extensions/text_replace.py
777+--- inkscape_0.48.1-2ubuntu5~/share/extensions/text_replace.py 2011-05-30 17:38:10.000000000 +0100
778++++ inkscape_0.48.1-2ubuntu5/share/extensions/text_replace.py 2011-05-30 17:43:57.903386425 +0100
779+@@ -1,3 +1,4 @@
780++#!/usr/bin/env python
781+ import chardataeffect, inkex, string
782+
783+ class C(chardataeffect.CharDataEffect):
784+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape_0.48.1-2ubuntu5~/share/extensions/text_sentencecase.py inkscape_0.48.1-2ubuntu5/share/extensions/text_sentencecase.py
785+--- inkscape_0.48.1-2ubuntu5~/share/extensions/text_sentencecase.py 2011-05-30 17:38:10.000000000 +0100
786++++ inkscape_0.48.1-2ubuntu5/share/extensions/text_sentencecase.py 2011-05-30 17:43:57.903386425 +0100
787+@@ -1,3 +1,4 @@
788++#!/usr/bin/env python
789+ import chardataeffect, inkex, string
790+
791+ class C(chardataeffect.CharDataEffect):
792+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape_0.48.1-2ubuntu5~/share/extensions/text_titlecase.py inkscape_0.48.1-2ubuntu5/share/extensions/text_titlecase.py
793+--- inkscape_0.48.1-2ubuntu5~/share/extensions/text_titlecase.py 2011-05-30 17:38:10.000000000 +0100
794++++ inkscape_0.48.1-2ubuntu5/share/extensions/text_titlecase.py 2011-05-30 17:43:57.913386425 +0100
795+@@ -1,3 +1,4 @@
796++#!/usr/bin/env python
797+ import chardataeffect, inkex, string
798+
799+ class C(chardataeffect.CharDataEffect):
800+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape_0.48.1-2ubuntu5~/share/extensions/text_uppercase.py inkscape_0.48.1-2ubuntu5/share/extensions/text_uppercase.py
801+--- inkscape_0.48.1-2ubuntu5~/share/extensions/text_uppercase.py 2011-05-30 17:38:10.000000000 +0100
802++++ inkscape_0.48.1-2ubuntu5/share/extensions/text_uppercase.py 2011-05-30 17:43:57.913386425 +0100
803+@@ -1,3 +1,4 @@
804++#!/usr/bin/env python
805+ import chardataeffect, inkex, string
806+
807+ class C(chardataeffect.CharDataEffect):
808+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape_0.48.1-2ubuntu5~/share/extensions/voronoi.py inkscape_0.48.1-2ubuntu5/share/extensions/voronoi.py
809+--- inkscape_0.48.1-2ubuntu5~/share/extensions/voronoi.py 2011-05-30 17:38:10.000000000 +0100
810++++ inkscape_0.48.1-2ubuntu5/share/extensions/voronoi.py 2011-05-30 17:43:57.913386425 +0100
811 @@ -1,3 +1,4 @@
812 +#! /usr/bin/env python
813 #############################################################################
814 #
815 # Voronoi diagram calculator/ Delaunay triangulator
816-
817
818=== modified file 'debian/patches/03-add-missing-mimetypes.dpatch' (properties changed: -x to +x)
819=== modified file 'debian/patches/04-fix-gcc4.6-ftbfs.dpatch' (properties changed: -x to +x)
820=== added file 'debian/patches/fix-fontforge-glyph-template.dpatch'
821--- debian/patches/fix-fontforge-glyph-template.dpatch 1970-01-01 00:00:00 +0000
822+++ debian/patches/fix-fontforge-glyph-template.dpatch 2011-05-30 18:02:37 +0000
823@@ -0,0 +1,82 @@
824+#! /bin/sh /usr/share/dpatch/dpatch-run
825+# From: JazzyNico <nicoduf@yahoo.fr>
826+# Description: Fix layer structure in fontforge glyph template
827+# Origin: upstream, https://bazaar.launchpad.net/~inkscape.dev/inkscape/trunk/revision/9693
828+# Bug: https://launchpad.net/bugs/565296
829+# Bug-Ubuntu: https://launchpad.net/bugs/565296
830+# Last-Update: 2011-05-30
831+
832+@DPATCH@
833+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape_0.48.1-2ubuntu5~/share/templates/fontforge_glyph.svg inkscape_0.48.1-2ubuntu5/share/templates/fontforge_glyph.svg
834+--- inkscape_0.48.1-2ubuntu5~/share/templates/fontforge_glyph.svg 2011-05-30 17:38:10.000000000 +0100
835++++ inkscape_0.48.1-2ubuntu5/share/templates/fontforge_glyph.svg 2011-05-30 18:41:57.088216494 +0100
836+@@ -1,32 +1,17 @@
837+ <?xml version="1.0" encoding="UTF-8" standalone="no"?>
838+ <!-- Created with Inkscape (http://www.inkscape.org/) -->
839+ <svg
840+- xmlns:dc="http://purl.org/dc/elements/1.1/"
841+- xmlns:cc="http://creativecommons.org/ns#"
842+- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
843+- xmlns:svg="http://www.w3.org/2000/svg"
844+ xmlns="http://www.w3.org/2000/svg"
845+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
846+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
847+- version="1.0"
848++ xmlns:xlink="http://www.w3.org/1999/xlink"
849++ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
850++ xmlns:cc="http://web.resource.org/cc/"
851++ xmlns:dc="http://purl.org/dc/elements/1.1/"
852+ width="1000"
853+- height="1000"
854+- id="svg5496"
855+- sodipodi:version="0.32"
856+- inkscape:version="0.45+devel"
857+- sodipodi:docname="fontforge_glyph.svg"
858+- inkscape:output_extension="org.inkscape.output.svg.inkscape">
859+- <metadata
860+- id="metadata5594">
861+- <rdf:RDF>
862+- <cc:Work
863+- rdf:about="">
864+- <dc:format>image/svg+xml</dc:format>
865+- <dc:type
866+- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
867+- </cc:Work>
868+- </rdf:RDF>
869+- </metadata>
870++ height="1000">
871++ <defs
872++ id="defs5498" />
873+ <sodipodi:namedview
874+ inkscape:window-height="618"
875+ inkscape:window-width="641"
876+@@ -44,14 +29,25 @@
877+ inkscape:cy="500"
878+ inkscape:window-x="0"
879+ inkscape:window-y="25"
880+- inkscape:current-layer="svg5496">
881+- <sodipodi:guide
882++ inkscape:current-layer="layer1">
883++ <sodipodi:guide
884+ orientation="horizontal"
885+ position="200"
886+ id="guide5596" />
887+ </sodipodi:namedview>
888+- <defs
889+- id="defs5498" />
890++ <metadata
891++ id="metadata5594">
892++ <rdf:RDF>
893++ <cc:Work
894++ rdf:about="">
895++ <dc:format>image/svg+xml</dc:format>
896++ <dc:type
897++ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
898++ </cc:Work>
899++ </rdf:RDF>
900++ </metadata>
901+ <g
902++ inkscape:label="Layer 1"
903++ inkscape:groupmode="layer"
904+ id="layer1" />
905+ </svg>
906
907=== modified file 'debian/rules'
908--- debian/rules 2011-05-30 08:07:52 +0000
909+++ debian/rules 2011-05-30 18:02:37 +0000
910@@ -60,7 +60,6 @@
911
912 build: config.status
913 dh_testdir
914- cd po; intltool-update -p
915
916 ifneq "$(wildcard /usr/share/misc/config.sub)" ""
917 cp -f /usr/share/misc/config.sub config.sub

Subscribers

People subscribed via source and target branches