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
=== modified file 'debian/changelog'
--- debian/changelog 2011-05-30 09:02:49 +0000
+++ debian/changelog 2011-05-30 18:02:37 +0000
@@ -1,3 +1,22 @@
1inkscape (0.48.1-2ubuntu5) oneiric; urgency=low
2
3 * debian/rules: No need to manually call intltool-update on build. This
4 is now handled by dh_translations.
5 * debian/control: No longer suggest python and skencil. They do not
6 offer any enhancement to Inkscape (LP: #762541)
7 * debian/control: Suggest transfig to allow import of xfig files
8 (LP: #668300)
9 * debian/patches/02-add-shebangs-and-fix-permissions.dpatch:
10 No longer mark JavaScript extension files as standalone executables
11 (LP: #602005):
12 - share/extensions/*.js: Revert addition of shebangs
13 - share/extensions/Makefile.am: Install *.js using _DATA rule rather
14 than _SCRIPTS rule to avoid giving executable permission
15 * debian/patches/fix-fontforge-glyph-template.dpatch: Cherry-pick
16 patch from uptream trunk to fix layer structure in template (LP: #565296)
17
18 -- Alex Valavanis <valavanisalex@gmail.com> Mon, 30 May 2011 18:50:49 +0100
19
1inkscape (0.48.1-2ubuntu4) oneiric; urgency=low20inkscape (0.48.1-2ubuntu4) oneiric; urgency=low
221
3 * debian/rules: Drop broken code to add translation domain to desktop files.22 * debian/rules: Drop broken code to add translation domain to desktop files.
423
=== modified file 'debian/control'
--- debian/control 2011-05-30 08:07:52 +0000
+++ debian/control 2011-05-30 18:02:37 +0000
@@ -49,9 +49,8 @@
49 libgnomevfs2-extra,49 libgnomevfs2-extra,
50 libsvg-perl,50 libsvg-perl,
51 libxml-xql-perl,51 libxml-xql-perl,
52 python,
53 pstoedit,52 pstoedit,
54 skencil53 transfig
55Recommends: aspell,54Recommends: aspell,
56 libwmf-bin,55 libwmf-bin,
57 imagemagick,56 imagemagick,
5857
=== modified file 'debian/patches/00list'
--- debian/patches/00list 2011-05-01 01:08:10 +0000
+++ debian/patches/00list 2011-05-30 18:02:37 +0000
@@ -3,3 +3,4 @@
303-add-missing-mimetypes303-add-missing-mimetypes
401_add_unity_quicklist_support.patch401_add_unity_quicklist_support.patch
504-fix-gcc4.6-ftbfs.dpatch504-fix-gcc4.6-ftbfs.dpatch
6fix-fontforge-glyph-template.dpatch
67
=== modified file 'debian/patches/01-libwpg0.2.dpatch' (properties changed: -x to +x)
=== modified file 'debian/patches/01_add_unity_quicklist_support.patch.dpatch' (properties changed: -x to +x)
=== modified file 'debian/patches/02-add-shebangs-and-fix-permissions.dpatch' (properties changed: -x to +x)
--- debian/patches/02-add-shebangs-and-fix-permissions.dpatch 2011-02-14 13:48:21 +0000
+++ debian/patches/02-add-shebangs-and-fix-permissions.dpatch 2011-05-30 18:02:37 +0000
@@ -6,149 +6,166 @@
6## DP: Taken from upstream's Bug tracker at6## DP: Taken from upstream's Bug tracker at
7## DP: https://bugs.launchpad.net/inkscape/+bug/6020057## DP: https://bugs.launchpad.net/inkscape/+bug/602005
8## DP: original patch by Leo Jackson8## DP: original patch by Leo Jackson
9## DP: 2011-05-30: Modified by Alex Valavanis <valavanisalex@gmail.com>:
10## DP: * Do not add shebangs to JavaScript files. They cannot be run as
11## DP: standalone scripts.
12## DP: * Install JavaScript files using _DATA rule rather than _SCRIPTS
13## DP: rule to avoid making them executable.
914
10@DPATCH@15@DPATCH@
1116diff -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
12=== modified file 'share/extensions/Barcode/Base.py'17--- inkscape_0.48.1-2ubuntu5~/share/extensions/Barcode/Base.py 2011-05-30 17:38:10.000000000 +0100
13--- a/share/extensions/Barcode/Base.py 2008-03-29 10:21:03 +000018+++ inkscape_0.48.1-2ubuntu5/share/extensions/Barcode/Base.py 2011-05-30 17:43:57.893386425 +0100
14+++ b/share/extensions/Barcode/Base.py 2010-07-24 17:56:48 +0000
15@@ -1,3 +1,4 @@19@@ -1,3 +1,4 @@
16+#!/usr/bin/env python20+#!/usr/bin/env python
17 '''21 '''
18 Copyright (C) 2007 Martin Owens22 Copyright (C) 2007 Martin Owens
19 23
2024diff -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
21=== modified file 'share/extensions/Barcode/Code128.py'25--- inkscape_0.48.1-2ubuntu5~/share/extensions/Barcode/Code128.py 2011-05-30 17:38:10.000000000 +0100
22--- a/share/extensions/Barcode/Code128.py 2010-02-28 22:40:23 +000026+++ inkscape_0.48.1-2ubuntu5/share/extensions/Barcode/Code128.py 2011-05-30 17:43:57.893386425 +0100
23+++ b/share/extensions/Barcode/Code128.py 2010-07-24 17:56:48 +0000
24@@ -1,3 +1,4 @@27@@ -1,3 +1,4 @@
25+#!/usr/bin/env python 28+#!/usr/bin/env python
26 '''29 '''
27 Copyright (C) 2007 Martin Owens30 Copyright (C) 2007 Martin Owens
28 31
2932diff -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
30=== modified file 'share/extensions/Barcode/Code39.py'33--- inkscape_0.48.1-2ubuntu5~/share/extensions/Barcode/Code39.py 2011-05-30 17:38:10.000000000 +0100
31--- a/share/extensions/Barcode/Code39.py 2007-04-25 00:53:02 +000034+++ inkscape_0.48.1-2ubuntu5/share/extensions/Barcode/Code39.py 2011-05-30 17:43:57.893386425 +0100
32+++ b/share/extensions/Barcode/Code39.py 2010-07-24 17:56:48 +000035@@ -1,3 +1,4 @@
33@@ -1,3 +1,4 @@36+#!/usr/bin/env python
34+#!/usr/bin/env python37 '''
35 '''38 Copyright (C) 2007 Martin Owens
36 Copyright (C) 2007 Martin Owens39
37 40diff -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
3841--- inkscape_0.48.1-2ubuntu5~/share/extensions/Barcode/Code39Ext.py 2011-05-30 17:38:10.000000000 +0100
39=== modified file 'share/extensions/Barcode/Code39Ext.py'42+++ inkscape_0.48.1-2ubuntu5/share/extensions/Barcode/Code39Ext.py 2011-05-30 17:43:57.893386425 +0100
40--- a/share/extensions/Barcode/Code39Ext.py 2007-04-25 00:53:02 +000043@@ -1,3 +1,4 @@
41+++ b/share/extensions/Barcode/Code39Ext.py 2010-07-24 17:56:48 +000044+#!/usr/bin/env python
42@@ -1,3 +1,4 @@45 '''
43+#!/usr/bin/env python46 Copyright (C) 2007 Martin Owens
44 '''47
45 Copyright (C) 2007 Martin Owens48diff -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
46 49--- inkscape_0.48.1-2ubuntu5~/share/extensions/Barcode/Code93.py 2011-05-30 17:38:10.000000000 +0100
4750+++ inkscape_0.48.1-2ubuntu5/share/extensions/Barcode/Code93.py 2011-05-30 17:43:57.893386425 +0100
48=== modified file 'share/extensions/Barcode/Code93.py'51@@ -1,3 +1,4 @@
49--- a/share/extensions/Barcode/Code93.py 2010-04-27 17:09:54 +000052+#!/usr/bin/env python
50+++ b/share/extensions/Barcode/Code93.py 2010-07-24 17:56:48 +000053 '''
51@@ -1,3 +1,4 @@54 Copyright (C) 2007 Martin Owens
52+#!/usr/bin/env python55
53 '''56diff -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
54 Copyright (C) 2007 Martin Owens57--- inkscape_0.48.1-2ubuntu5~/share/extensions/Barcode/EAN13.py 2011-05-30 17:38:10.000000000 +0100
55 58+++ inkscape_0.48.1-2ubuntu5/share/extensions/Barcode/EAN13.py 2011-05-30 17:43:57.893386425 +0100
5659@@ -1,3 +1,4 @@
57=== modified file 'share/extensions/Barcode/EAN13.py'60+#!/usr/bin/env python
58--- a/share/extensions/Barcode/EAN13.py 2009-12-20 22:09:40 +000061 '''
59+++ b/share/extensions/Barcode/EAN13.py 2010-07-24 17:56:48 +000062 Copyright (C) 2007 Martin Owens
60@@ -1,3 +1,4 @@63
61+#!/usr/bin/env python64diff -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
62 '''65--- inkscape_0.48.1-2ubuntu5~/share/extensions/Barcode/EAN5.py 2011-05-30 17:38:10.000000000 +0100
63 Copyright (C) 2007 Martin Owens66+++ inkscape_0.48.1-2ubuntu5/share/extensions/Barcode/EAN5.py 2011-05-30 17:43:57.893386425 +0100
64
65
66=== modified file 'share/extensions/Barcode/EAN5.py'
67--- a/share/extensions/Barcode/EAN5.py 2009-12-22 00:13:41 +0000
68+++ b/share/extensions/Barcode/EAN5.py 2010-07-24 17:56:48 +0000
69@@ -1,3 +1,4 @@67@@ -1,3 +1,4 @@
70+#!/usr/bin/env python 68+#!/usr/bin/env python
71 ''' 69 '''
72 Copyright (C) 2007 Martin Owens 70 Copyright (C) 2007 Martin Owens
73 Copyright (C) 2009 Aaron C Spike 71 Copyright (C) 2009 Aaron C Spike
7472diff -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
75=== modified file 'share/extensions/Barcode/EAN8.py'73--- inkscape_0.48.1-2ubuntu5~/share/extensions/Barcode/EAN8.py 2011-05-30 17:38:10.000000000 +0100
76--- a/share/extensions/Barcode/EAN8.py 2007-04-25 00:53:02 +000074+++ inkscape_0.48.1-2ubuntu5/share/extensions/Barcode/EAN8.py 2011-05-30 17:43:57.893386425 +0100
77+++ b/share/extensions/Barcode/EAN8.py 2010-07-24 17:56:48 +000075@@ -1,3 +1,4 @@
78@@ -1,3 +1,4 @@76+#!/usr/bin/env python
79+#!/usr/bin/env python77 '''
80 '''78 Copyright (C) 2007 Martin Owens
81 Copyright (C) 2007 Martin Owens79
82 80diff -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
8381--- inkscape_0.48.1-2ubuntu5~/share/extensions/Barcode/RM4CC.py 2011-05-30 17:38:10.000000000 +0100
84=== modified file 'share/extensions/Barcode/RM4CC.py'82+++ inkscape_0.48.1-2ubuntu5/share/extensions/Barcode/RM4CC.py 2011-05-30 17:43:57.893386425 +0100
85--- a/share/extensions/Barcode/RM4CC.py 2007-04-25 00:53:02 +000083@@ -1,3 +1,4 @@
86+++ b/share/extensions/Barcode/RM4CC.py 2010-07-24 17:56:48 +000084+#!/usr/bin/env python
87@@ -1,3 +1,4 @@85 '''
88+#!/usr/bin/env python86 Copyright (C) 2007 Martin Owens
89 '''87
90 Copyright (C) 2007 Martin Owens88diff -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
91 89--- inkscape_0.48.1-2ubuntu5~/share/extensions/Barcode/UPCA.py 2011-05-30 17:38:10.000000000 +0100
9290+++ inkscape_0.48.1-2ubuntu5/share/extensions/Barcode/UPCA.py 2011-05-30 17:43:57.893386425 +0100
93=== modified file 'share/extensions/Barcode/UPCA.py'91@@ -1,3 +1,4 @@
94--- a/share/extensions/Barcode/UPCA.py 2009-12-20 22:09:40 +000092+#!/usr/bin/env python
95+++ b/share/extensions/Barcode/UPCA.py 2010-07-24 17:56:48 +000093 '''
96@@ -1,3 +1,4 @@94 Copyright (C) 2007 Martin Owens
97+#!/usr/bin/env python95
98 '''96diff -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
99 Copyright (C) 2007 Martin Owens97--- inkscape_0.48.1-2ubuntu5~/share/extensions/Barcode/UPCE.py 2011-05-30 17:38:10.000000000 +0100
100 98+++ inkscape_0.48.1-2ubuntu5/share/extensions/Barcode/UPCE.py 2011-05-30 17:43:57.893386425 +0100
10199@@ -1,3 +1,4 @@
102=== modified file 'share/extensions/Barcode/UPCE.py'100+#!/usr/bin/env python
103--- a/share/extensions/Barcode/UPCE.py 2009-12-20 22:09:40 +0000101 '''
104+++ b/share/extensions/Barcode/UPCE.py 2010-07-24 17:56:48 +0000102 Copyright (C) 2007 Martin Owens
105@@ -1,3 +1,4 @@103
106+#!/usr/bin/env python104diff -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
107 '''105--- inkscape_0.48.1-2ubuntu5~/share/extensions/Barcode/__init__.py 2011-05-30 17:38:10.000000000 +0100
108 Copyright (C) 2007 Martin Owens106+++ inkscape_0.48.1-2ubuntu5/share/extensions/Barcode/__init__.py 2011-05-30 17:43:57.893386425 +0100
109
110
111=== modified file 'share/extensions/Barcode/__init__.py'
112--- a/share/extensions/Barcode/__init__.py 2009-12-21 23:48:17 +0000
113+++ b/share/extensions/Barcode/__init__.py 2010-07-24 17:56:48 +0000
114@@ -1,4 +1,4 @@107@@ -1,4 +1,4 @@
115-108-
116+#!/usr/bin/env python109+#!/usr/bin/env python
117 '''110 '''
118 Barcodes SVG Extention111 Barcodes SVG Extention
119 112
120113diff -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
121=== modified file 'share/extensions/SpSVG.pm'114--- inkscape_0.48.1-2ubuntu5~/share/extensions/Makefile.am 2011-05-30 17:38:10.000000000 +0100
122--- a/share/extensions/SpSVG.pm 2006-01-16 02:36:01 +0000115+++ inkscape_0.48.1-2ubuntu5/share/extensions/Makefile.am 2011-05-30 17:46:40.853386475 +0100
123+++ b/share/extensions/SpSVG.pm 2010-07-24 17:56:48 +0000116@@ -73,13 +73,9 @@
117 inkex.py \
118 Inkscape.pm \
119 inkwebeffect.py \
120- inkweb.js \
121 interp.py \
122 interp_att_g.py \
123- jessyInk.js \
124 jessyInk_autoTexts.py \
125- jessyInk_core_mouseHandler_noclick.js \
126- jessyInk_core_mouseHandler_zoomControl.js \
127 jessyInk_effects.py \
128 jessyInk_export.py \
129 jessyInk_install.py \
130@@ -161,6 +157,10 @@
131 yocto_css.py
132
133 otherstuff = \
134+ inkweb.js \
135+ jessyInk.js \
136+ jessyInk_core_mouseHandler_noclick.js \
137+ jessyInk_core_mouseHandler_zoomControl.js \
138 aisvg.xslt \
139 colors.xml \
140 jessyInk_video.svg \
141diff -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
142--- inkscape_0.48.1-2ubuntu5~/share/extensions/SpSVG.pm 2011-05-30 17:38:10.000000000 +0100
143+++ inkscape_0.48.1-2ubuntu5/share/extensions/SpSVG.pm 2011-05-30 17:43:57.893386425 +0100
124@@ -1,4 +1,4 @@144@@ -1,4 +1,4 @@
125-#!/usr/bin/perl -w145-#!/usr/bin/perl -w
126+#!/usr/bin/env perl -w146+#!/usr/bin/env perl -w
127 #147 #
128 # SpSVG148 # SpSVG
129 # 149 #
130150diff -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
131=== modified file 'share/extensions/color_blackandwhite.py'151--- inkscape_0.48.1-2ubuntu5~/share/extensions/color_blackandwhite.py 2011-05-30 17:38:10.000000000 +0100
132--- a/share/extensions/color_blackandwhite.py 2010-02-14 09:46:42 +0000152+++ inkscape_0.48.1-2ubuntu5/share/extensions/color_blackandwhite.py 2011-05-30 17:43:57.893386425 +0100
133+++ b/share/extensions/color_blackandwhite.py 2010-07-24 17:56:48 +0000
134@@ -1,3 +1,4 @@153@@ -1,3 +1,4 @@
135+#!/usr/bin/env python154+#!/usr/bin/env python
136 import coloreffect,sys155 import coloreffect,sys
137 156
138 class C(coloreffect.ColorEffect):157 class C(coloreffect.ColorEffect):
139158diff -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
140=== modified file 'share/extensions/color_brighter.py'159--- inkscape_0.48.1-2ubuntu5~/share/extensions/color_brighter.py 2011-05-30 17:38:10.000000000 +0100
141--- a/share/extensions/color_brighter.py 2008-03-29 10:21:03 +0000160+++ inkscape_0.48.1-2ubuntu5/share/extensions/color_brighter.py 2011-05-30 17:43:57.893386425 +0100
142+++ b/share/extensions/color_brighter.py 2010-07-24 17:56:48 +0000
143@@ -1,3 +1,4 @@161@@ -1,3 +1,4 @@
144+#!/usr/bin/env python162+#!/usr/bin/env python
145 import coloreffect163 import coloreffect
146 164
147 class C(coloreffect.ColorEffect):165 class C(coloreffect.ColorEffect):
148166diff -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
149=== modified file 'share/extensions/color_custom.py'167--- inkscape_0.48.1-2ubuntu5~/share/extensions/color_custom.py 2011-05-30 17:38:10.000000000 +0100
150--- a/share/extensions/color_custom.py 2008-03-29 10:21:03 +0000168+++ inkscape_0.48.1-2ubuntu5/share/extensions/color_custom.py 2011-05-30 17:43:57.893386425 +0100
151+++ b/share/extensions/color_custom.py 2010-07-24 17:56:48 +0000
152@@ -1,3 +1,4 @@169@@ -1,3 +1,4 @@
153+#!/usr/bin/env python170+#!/usr/bin/env python
154 import coloreffect171 import coloreffect
@@ -161,19 +178,17 @@
161-c.affect()178-c.affect()
162\ No newline at end of file179\ No newline at end of file
163+c.affect()180+c.affect()
164181diff -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
165=== modified file 'share/extensions/color_darker.py'182--- inkscape_0.48.1-2ubuntu5~/share/extensions/color_darker.py 2011-05-30 17:38:10.000000000 +0100
166--- a/share/extensions/color_darker.py 2008-03-29 10:21:03 +0000183+++ inkscape_0.48.1-2ubuntu5/share/extensions/color_darker.py 2011-05-30 17:43:57.893386425 +0100
167+++ b/share/extensions/color_darker.py 2010-07-24 17:56:48 +0000
168@@ -1,3 +1,4 @@184@@ -1,3 +1,4 @@
169+#!/usr/bin/env python185+#!/usr/bin/env python
170 import coloreffect186 import coloreffect
171 187
172 class C(coloreffect.ColorEffect):188 class C(coloreffect.ColorEffect):
173189diff -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
174=== modified file 'share/extensions/color_desaturate.py'190--- inkscape_0.48.1-2ubuntu5~/share/extensions/color_desaturate.py 2011-05-30 17:38:10.000000000 +0100
175--- a/share/extensions/color_desaturate.py 2008-03-29 10:21:03 +0000191+++ inkscape_0.48.1-2ubuntu5/share/extensions/color_desaturate.py 2011-05-30 17:43:57.893386425 +0100
176+++ b/share/extensions/color_desaturate.py 2010-07-24 17:56:48 +0000
177@@ -1,3 +1,4 @@192@@ -1,3 +1,4 @@
178+#!/usr/bin/env python193+#!/usr/bin/env python
179 import coloreffect194 import coloreffect
@@ -186,10 +201,9 @@
186-c.affect()201-c.affect()
187\ No newline at end of file202\ No newline at end of file
188+c.affect()203+c.affect()
189204diff -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
190=== modified file 'share/extensions/color_grayscale.py'205--- inkscape_0.48.1-2ubuntu5~/share/extensions/color_grayscale.py 2011-05-30 17:38:10.000000000 +0100
191--- a/share/extensions/color_grayscale.py 2008-03-29 10:21:03 +0000206+++ inkscape_0.48.1-2ubuntu5/share/extensions/color_grayscale.py 2011-05-30 17:43:57.893386425 +0100
192+++ b/share/extensions/color_grayscale.py 2010-07-24 17:56:48 +0000
193@@ -1,3 +1,4 @@207@@ -1,3 +1,4 @@
194+#!/usr/bin/env python208+#!/usr/bin/env python
195 import coloreffect209 import coloreffect
@@ -202,64 +216,57 @@
202-c.affect()216-c.affect()
203\ No newline at end of file217\ No newline at end of file
204+c.affect()218+c.affect()
205219diff -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
206=== modified file 'share/extensions/color_lesshue.py'220--- inkscape_0.48.1-2ubuntu5~/share/extensions/color_lesshue.py 2011-05-30 17:38:10.000000000 +0100
207--- a/share/extensions/color_lesshue.py 2008-03-29 10:21:03 +0000221+++ inkscape_0.48.1-2ubuntu5/share/extensions/color_lesshue.py 2011-05-30 17:43:57.903386425 +0100
208+++ b/share/extensions/color_lesshue.py 2010-07-24 17:56:48 +0000222@@ -1,3 +1,4 @@
209@@ -1,3 +1,4 @@223+#!/usr/bin/env python
210+#!/usr/bin/env python224 import coloreffect, inkex
211 import coloreffect, inkex225
212 226 class C(coloreffect.ColorEffect):
213 class C(coloreffect.ColorEffect):227diff -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
214228--- inkscape_0.48.1-2ubuntu5~/share/extensions/color_lesslight.py 2011-05-30 17:38:10.000000000 +0100
215=== modified file 'share/extensions/color_lesslight.py'229+++ inkscape_0.48.1-2ubuntu5/share/extensions/color_lesslight.py 2011-05-30 17:43:57.903386425 +0100
216--- a/share/extensions/color_lesslight.py 2008-03-29 10:21:03 +0000230@@ -1,3 +1,4 @@
217+++ b/share/extensions/color_lesslight.py 2010-07-24 17:56:48 +0000231+#!/usr/bin/env python
218@@ -1,3 +1,4 @@232 import coloreffect, inkex
219+#!/usr/bin/env python233
220 import coloreffect, inkex234 class C(coloreffect.ColorEffect):
221 235diff -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
222 class C(coloreffect.ColorEffect):236--- inkscape_0.48.1-2ubuntu5~/share/extensions/color_lesssaturation.py 2011-05-30 17:38:10.000000000 +0100
223237+++ inkscape_0.48.1-2ubuntu5/share/extensions/color_lesssaturation.py 2011-05-30 17:43:57.903386425 +0100
224=== modified file 'share/extensions/color_lesssaturation.py'238@@ -1,3 +1,4 @@
225--- a/share/extensions/color_lesssaturation.py 2008-03-29 10:21:03 +0000239+#!/usr/bin/env python
226+++ b/share/extensions/color_lesssaturation.py 2010-07-24 17:56:48 +0000240 import coloreffect, inkex
227@@ -1,3 +1,4 @@241
228+#!/usr/bin/env python242 class C(coloreffect.ColorEffect):
229 import coloreffect, inkex243diff -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
230 244--- inkscape_0.48.1-2ubuntu5~/share/extensions/color_morehue.py 2011-05-30 17:38:10.000000000 +0100
231 class C(coloreffect.ColorEffect):245+++ inkscape_0.48.1-2ubuntu5/share/extensions/color_morehue.py 2011-05-30 17:43:57.903386425 +0100
232246@@ -1,3 +1,4 @@
233=== modified file 'share/extensions/color_morehue.py'247+#!/usr/bin/env python
234--- a/share/extensions/color_morehue.py 2008-03-29 10:21:03 +0000248 import coloreffect, inkex
235+++ b/share/extensions/color_morehue.py 2010-07-24 17:56:48 +0000249
236@@ -1,3 +1,4 @@250 class C(coloreffect.ColorEffect):
237+#!/usr/bin/env python251diff -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
238 import coloreffect, inkex252--- inkscape_0.48.1-2ubuntu5~/share/extensions/color_morelight.py 2011-05-30 17:38:10.000000000 +0100
239 253+++ inkscape_0.48.1-2ubuntu5/share/extensions/color_morelight.py 2011-05-30 17:43:57.903386425 +0100
240 class C(coloreffect.ColorEffect):254@@ -1,3 +1,4 @@
241255+#!/usr/bin/env python
242=== modified file 'share/extensions/color_morelight.py'256 import coloreffect, inkex
243--- a/share/extensions/color_morelight.py 2008-03-29 10:21:03 +0000257
244+++ b/share/extensions/color_morelight.py 2010-07-24 17:56:48 +0000258 class C(coloreffect.ColorEffect):
245@@ -1,3 +1,4 @@259diff -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
246+#!/usr/bin/env python260--- inkscape_0.48.1-2ubuntu5~/share/extensions/color_moresaturation.py 2011-05-30 17:38:10.000000000 +0100
247 import coloreffect, inkex261+++ inkscape_0.48.1-2ubuntu5/share/extensions/color_moresaturation.py 2011-05-30 17:43:57.903386425 +0100
248 262@@ -1,3 +1,4 @@
249 class C(coloreffect.ColorEffect):263+#!/usr/bin/env python
250264 import coloreffect, inkex
251=== modified file 'share/extensions/color_moresaturation.py'265
252--- a/share/extensions/color_moresaturation.py 2008-03-29 10:21:03 +0000266 class C(coloreffect.ColorEffect):
253+++ b/share/extensions/color_moresaturation.py 2010-07-24 17:56:48 +0000267diff -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
254@@ -1,3 +1,4 @@268--- inkscape_0.48.1-2ubuntu5~/share/extensions/color_negative.py 2011-05-30 17:38:10.000000000 +0100
255+#!/usr/bin/env python269+++ inkscape_0.48.1-2ubuntu5/share/extensions/color_negative.py 2011-05-30 17:43:57.903386425 +0100
256 import coloreffect, inkex
257
258 class C(coloreffect.ColorEffect):
259
260=== modified file 'share/extensions/color_negative.py'
261--- a/share/extensions/color_negative.py 2008-03-29 10:21:03 +0000
262+++ b/share/extensions/color_negative.py 2010-07-24 17:56:48 +0000
263@@ -1,3 +1,4 @@270@@ -1,3 +1,4 @@
264+#!/usr/bin/env python271+#!/usr/bin/env python
265 import coloreffect272 import coloreffect
@@ -272,19 +279,17 @@
272-c.affect()279-c.affect()
273\ No newline at end of file280\ No newline at end of file
274+c.affect()281+c.affect()
275282diff -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
276=== modified file 'share/extensions/color_randomize.py'283--- inkscape_0.48.1-2ubuntu5~/share/extensions/color_randomize.py 2011-05-30 17:38:10.000000000 +0100
277--- a/share/extensions/color_randomize.py 2008-05-23 06:31:40 +0000284+++ inkscape_0.48.1-2ubuntu5/share/extensions/color_randomize.py 2011-05-30 17:43:57.903386425 +0100
278+++ b/share/extensions/color_randomize.py 2010-07-24 17:56:48 +0000
279@@ -1,3 +1,4 @@285@@ -1,3 +1,4 @@
280+#!/usr/bin/env python286+#!/usr/bin/env python
281 import coloreffect,random,inkex287 import coloreffect,random,inkex
282 288
283 class C(coloreffect.ColorEffect):289 class C(coloreffect.ColorEffect):
284290diff -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
285=== modified file 'share/extensions/color_removeblue.py'291--- inkscape_0.48.1-2ubuntu5~/share/extensions/color_removeblue.py 2011-05-30 17:38:10.000000000 +0100
286--- a/share/extensions/color_removeblue.py 2008-03-29 10:21:03 +0000292+++ inkscape_0.48.1-2ubuntu5/share/extensions/color_removeblue.py 2011-05-30 17:43:57.903386425 +0100
287+++ b/share/extensions/color_removeblue.py 2010-07-24 17:56:48 +0000
288@@ -1,3 +1,4 @@293@@ -1,3 +1,4 @@
289+#!/usr/bin/env python294+#!/usr/bin/env python
290 import coloreffect295 import coloreffect
@@ -297,10 +302,9 @@
297-c.affect()302-c.affect()
298\ No newline at end of file303\ No newline at end of file
299+c.affect()304+c.affect()
300305diff -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
301=== modified file 'share/extensions/color_removegreen.py'306--- inkscape_0.48.1-2ubuntu5~/share/extensions/color_removegreen.py 2011-05-30 17:38:10.000000000 +0100
302--- a/share/extensions/color_removegreen.py 2008-03-29 10:21:03 +0000307+++ inkscape_0.48.1-2ubuntu5/share/extensions/color_removegreen.py 2011-05-30 17:43:57.903386425 +0100
303+++ b/share/extensions/color_removegreen.py 2010-07-24 17:56:48 +0000
304@@ -1,3 +1,4 @@308@@ -1,3 +1,4 @@
305+#!/usr/bin/env python309+#!/usr/bin/env python
306 import coloreffect310 import coloreffect
@@ -313,10 +317,9 @@
313-c.affect()317-c.affect()
314\ No newline at end of file318\ No newline at end of file
315+c.affect()319+c.affect()
316320diff -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
317=== modified file 'share/extensions/color_removered.py'321--- inkscape_0.48.1-2ubuntu5~/share/extensions/color_removered.py 2011-05-30 17:38:10.000000000 +0100
318--- a/share/extensions/color_removered.py 2008-03-29 10:21:03 +0000322+++ inkscape_0.48.1-2ubuntu5/share/extensions/color_removered.py 2011-05-30 17:43:57.903386425 +0100
319+++ b/share/extensions/color_removered.py 2010-07-24 17:56:48 +0000
320@@ -1,3 +1,4 @@323@@ -1,3 +1,4 @@
321+#!/usr/bin/env python324+#!/usr/bin/env python
322 import coloreffect325 import coloreffect
@@ -329,19 +332,17 @@
329-c.affect()332-c.affect()
330\ No newline at end of file333\ No newline at end of file
331+c.affect()334+c.affect()
332335diff -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
333=== modified file 'share/extensions/color_replace.py'336--- inkscape_0.48.1-2ubuntu5~/share/extensions/color_replace.py 2011-05-30 17:38:10.000000000 +0100
334--- a/share/extensions/color_replace.py 2008-04-15 16:17:21 +0000337+++ inkscape_0.48.1-2ubuntu5/share/extensions/color_replace.py 2011-05-30 17:43:57.903386425 +0100
335+++ b/share/extensions/color_replace.py 2010-07-24 17:56:48 +0000
336@@ -1,3 +1,4 @@338@@ -1,3 +1,4 @@
337+#!/usr/bin/env python339+#!/usr/bin/env python
338 import coloreffect340 import coloreffect
339 341
340 import inkex342 import inkex
341343diff -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
342=== modified file 'share/extensions/color_rgbbarrel.py'344--- inkscape_0.48.1-2ubuntu5~/share/extensions/color_rgbbarrel.py 2011-05-30 17:38:10.000000000 +0100
343--- a/share/extensions/color_rgbbarrel.py 2008-03-29 10:21:03 +0000345+++ inkscape_0.48.1-2ubuntu5/share/extensions/color_rgbbarrel.py 2011-05-30 17:43:57.903386425 +0100
344+++ b/share/extensions/color_rgbbarrel.py 2010-07-24 17:56:48 +0000
345@@ -1,3 +1,4 @@346@@ -1,3 +1,4 @@
346+#!/usr/bin/env python347+#!/usr/bin/env python
347 import coloreffect348 import coloreffect
@@ -354,177 +355,124 @@
354-c.affect()355-c.affect()
355\ No newline at end of file356\ No newline at end of file
356+c.affect()357+c.affect()
357358diff -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
358=== modified file 'share/extensions/dxf_templates.py'359--- inkscape_0.48.1-2ubuntu5~/share/extensions/dxf_templates.py 2011-05-30 17:38:10.000000000 +0100
359--- a/share/extensions/dxf_templates.py 2008-12-29 23:08:47 +0000360+++ inkscape_0.48.1-2ubuntu5/share/extensions/dxf_templates.py 2011-05-30 17:43:57.903386425 +0100
360+++ b/share/extensions/dxf_templates.py 2010-07-24 17:56:48 +0000
361@@ -1,3 +1,4 @@361@@ -1,3 +1,4 @@
362+#!/usr/bin/env python362+#!/usr/bin/env python
363 r14_header = ''' 0363 r14_header = ''' 0
364 SECTION364 SECTION
365 2365 2
366366diff -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
367=== modified file 'share/extensions/inkweb.js'367--- inkscape_0.48.1-2ubuntu5~/share/extensions/render_alphabetsoup_config.py 2011-05-30 17:38:10.000000000 +0100
368--- a/share/extensions/inkweb.js 2009-04-28 22:44:25 +0000368+++ inkscape_0.48.1-2ubuntu5/share/extensions/render_alphabetsoup_config.py 2011-05-30 17:43:57.903386425 +0100
369+++ b/share/extensions/inkweb.js 2010-07-24 17:56:48 +0000
370@@ -1,3 +1,4 @@
371+#!/usr/bin/env js
372 /*
373 ** InkWeb - Inkscape's Javscript features for the open vector web
374 **
375
376=== modified file 'share/extensions/jessyInk.js'
377--- a/share/extensions/jessyInk.js 2010-06-04 22:18:31 +0000
378+++ b/share/extensions/jessyInk.js 2010-07-24 17:56:48 +0000
379@@ -1,3 +1,4 @@
380+#!/usr/bin/env js
381 // Copyright 2008, 2009 Hannes Hochreiner
382 // This program is free software: you can redistribute it and/or modify
383 // it under the terms of the GNU General Public License as published by
384
385=== modified file 'share/extensions/jessyInk_core_mouseHandler_noclick.js'
386--- a/share/extensions/jessyInk_core_mouseHandler_noclick.js 2010-06-04 22:18:31 +0000
387+++ b/share/extensions/jessyInk_core_mouseHandler_noclick.js 2010-07-24 17:56:48 +0000
388@@ -1,3 +1,4 @@
389+#!/usr/bin/env js
390 // Copyright 2008, 2009 Hannes Hochreiner
391 // This program is free software: you can redistribute it and/or modify
392 // it under the terms of the GNU General Public License as published by
393
394=== modified file 'share/extensions/jessyInk_core_mouseHandler_zoomControl.js'
395--- a/share/extensions/jessyInk_core_mouseHandler_zoomControl.js 2010-06-04 22:18:31 +0000
396+++ b/share/extensions/jessyInk_core_mouseHandler_zoomControl.js 2010-07-24 17:56:48 +0000
397@@ -1,3 +1,4 @@
398+#!/usr/bin/env js
399 // Copyright 2008, 2009 Hannes Hochreiner
400 // This program is free software: you can redistribute it and/or modify
401 // it under the terms of the GNU General Public License as published by
402
403=== modified file 'share/extensions/render_alphabetsoup_config.py'
404--- a/share/extensions/render_alphabetsoup_config.py 2008-05-23 06:31:40 +0000
405+++ b/share/extensions/render_alphabetsoup_config.py 2010-07-24 17:56:48 +0000
406@@ -1,3 +1,4 @@369@@ -1,3 +1,4 @@
407+#!/usr/bin/env python370+#!/usr/bin/env python
408 # Syntax format: (raise your hand if you know lisp :-)371 # Syntax format: (raise your hand if you know lisp :-)
409 #372 #
410 # 'state0': ("file.svg", ( ( ('state1', dx, dy, T-B, L|R),),373 # 'state0': ("file.svg", ( ( ('state1', dx, dy, T-B, L|R),),
411374diff -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
412=== modified file 'share/extensions/render_barcode.py'375--- inkscape_0.48.1-2ubuntu5~/share/extensions/render_barcode.py 2011-05-30 17:38:10.000000000 +0100
413--- a/share/extensions/render_barcode.py 2009-01-06 16:13:13 +0000376+++ inkscape_0.48.1-2ubuntu5/share/extensions/render_barcode.py 2011-05-30 17:43:57.903386425 +0100
414+++ b/share/extensions/render_barcode.py 2010-07-24 17:56:48 +0000
415@@ -1,3 +1,4 @@377@@ -1,3 +1,4 @@
416+#!/usr/bin/env python378+#!/usr/bin/env python
417 '''379 '''
418 Copyright (C) 2007 Martin Owens380 Copyright (C) 2007 Martin Owens
419 381
420382diff -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
421=== modified file 'share/extensions/run_command.py'383--- inkscape_0.48.1-2ubuntu5~/share/extensions/run_command.py 2011-05-30 17:38:10.000000000 +0100
422--- a/share/extensions/run_command.py 2010-02-04 00:32:27 +0000384+++ inkscape_0.48.1-2ubuntu5/share/extensions/run_command.py 2011-05-30 17:43:57.903386425 +0100
423+++ b/share/extensions/run_command.py 2010-07-24 17:56:48 +0000
424@@ -1,3 +1,4 @@385@@ -1,3 +1,4 @@
425+#!/usr/bin/env python386+#!/usr/bin/env python
426 import os387 import os
427 import sys388 import sys
428 import tempfile389 import tempfile
429390diff -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
430=== modified file 'share/extensions/svg_and_media_zip_output.py'391--- inkscape_0.48.1-2ubuntu5~/share/extensions/svg_and_media_zip_output.py 2011-05-30 17:38:10.000000000 +0100
431--- a/share/extensions/svg_and_media_zip_output.py 2010-03-03 13:04:57 +0000392+++ inkscape_0.48.1-2ubuntu5/share/extensions/svg_and_media_zip_output.py 2011-05-30 17:43:57.903386425 +0100
432+++ b/share/extensions/svg_and_media_zip_output.py 2010-07-24 17:56:48 +0000
433@@ -1,4 +1,4 @@393@@ -1,4 +1,4 @@
434-#! /usr/bin/env python394-#! /usr/bin/env python
435+#!/usr/bin/env python395+#!/usr/bin/env python
436 """396 """
437 svg_and_media_zip_output.py397 svg_and_media_zip_output.py
438 An extention which collects all images to the documents directory and398 An extention which collects all images to the documents directory and
439399diff -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
440=== modified file 'share/extensions/svg_regex.py'400--- inkscape_0.48.1-2ubuntu5~/share/extensions/svg_regex.py 2011-05-30 17:38:10.000000000 +0100
441--- a/share/extensions/svg_regex.py 2009-08-04 20:15:08 +0000401+++ inkscape_0.48.1-2ubuntu5/share/extensions/svg_regex.py 2011-05-30 17:43:57.903386425 +0100
442+++ b/share/extensions/svg_regex.py 2010-07-24 17:56:48 +0000
443@@ -1,3 +1,4 @@402@@ -1,3 +1,4 @@
444+#!/usr/bin/env python403+#!/usr/bin/env python
445 # This software is OSI Certified Open Source Software.404 # This software is OSI Certified Open Source Software.
446 # OSI Certified is a certification mark of the Open Source Initiative.405 # OSI Certified is a certification mark of the Open Source Initiative.
447 # 406 #
448407diff -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
449=== modified file 'share/extensions/text_braille.py'408--- inkscape_0.48.1-2ubuntu5~/share/extensions/text_braille.py 2011-05-30 17:38:10.000000000 +0100
450--- a/share/extensions/text_braille.py 2008-03-29 10:21:03 +0000409+++ inkscape_0.48.1-2ubuntu5/share/extensions/text_braille.py 2011-05-30 17:43:57.903386425 +0100
451+++ b/share/extensions/text_braille.py 2010-07-24 17:56:48 +0000
452@@ -1,3 +1,4 @@410@@ -1,3 +1,4 @@
453+#!/usr/bin/env python411+#!/usr/bin/env python
454 #encoding: utf-8412 #encoding: utf-8
455 import chardataeffect, inkex, string413 import chardataeffect, inkex, string
456 414
457415diff -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
458=== modified file 'share/extensions/text_flipcase.py'416--- inkscape_0.48.1-2ubuntu5~/share/extensions/text_flipcase.py 2011-05-30 17:38:10.000000000 +0100
459--- a/share/extensions/text_flipcase.py 2008-03-29 10:21:03 +0000417+++ inkscape_0.48.1-2ubuntu5/share/extensions/text_flipcase.py 2011-05-30 17:43:57.903386425 +0100
460+++ b/share/extensions/text_flipcase.py 2010-07-24 17:56:48 +0000418@@ -1,3 +1,4 @@
461@@ -1,3 +1,4 @@419+#!/usr/bin/env python
462+#!/usr/bin/env python420 import chardataeffect, inkex, string
463 import chardataeffect, inkex, string421
464 422 class C(chardataeffect.CharDataEffect):
465 class C(chardataeffect.CharDataEffect):423diff -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
466424--- inkscape_0.48.1-2ubuntu5~/share/extensions/text_lowercase.py 2011-05-30 17:38:10.000000000 +0100
467=== modified file 'share/extensions/text_lowercase.py'425+++ inkscape_0.48.1-2ubuntu5/share/extensions/text_lowercase.py 2011-05-30 17:43:57.903386425 +0100
468--- a/share/extensions/text_lowercase.py 2008-03-29 10:21:03 +0000426@@ -1,3 +1,4 @@
469+++ b/share/extensions/text_lowercase.py 2010-07-24 17:56:48 +0000427+#!/usr/bin/env python
470@@ -1,3 +1,4 @@428 import chardataeffect, inkex, string
471+#!/usr/bin/env python429
472 import chardataeffect, inkex, string430 class C(chardataeffect.CharDataEffect):
473 431diff -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
474 class C(chardataeffect.CharDataEffect):432--- inkscape_0.48.1-2ubuntu5~/share/extensions/text_randomcase.py 2011-05-30 17:38:10.000000000 +0100
475433+++ inkscape_0.48.1-2ubuntu5/share/extensions/text_randomcase.py 2011-05-30 17:43:57.903386425 +0100
476=== modified file 'share/extensions/text_randomcase.py'
477--- a/share/extensions/text_randomcase.py 2008-03-29 10:21:03 +0000
478+++ b/share/extensions/text_randomcase.py 2010-07-24 17:56:48 +0000
479@@ -1,3 +1,4 @@434@@ -1,3 +1,4 @@
480+#!/usr/bin/env python435+#!/usr/bin/env python
481 import chardataeffect, inkex, string436 import chardataeffect, inkex, string
482 437
483 import random438 import random
484439diff -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
485=== modified file 'share/extensions/text_replace.py'440--- inkscape_0.48.1-2ubuntu5~/share/extensions/text_replace.py 2011-05-30 17:38:10.000000000 +0100
486--- a/share/extensions/text_replace.py 2008-05-23 06:15:31 +0000441+++ inkscape_0.48.1-2ubuntu5/share/extensions/text_replace.py 2011-05-30 17:43:57.903386425 +0100
487+++ b/share/extensions/text_replace.py 2010-07-24 17:56:48 +0000442@@ -1,3 +1,4 @@
488@@ -1,3 +1,4 @@443+#!/usr/bin/env python
489+#!/usr/bin/env python444 import chardataeffect, inkex, string
490 import chardataeffect, inkex, string445
491 446 class C(chardataeffect.CharDataEffect):
492 class C(chardataeffect.CharDataEffect):447diff -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
493448--- inkscape_0.48.1-2ubuntu5~/share/extensions/text_sentencecase.py 2011-05-30 17:38:10.000000000 +0100
494=== modified file 'share/extensions/text_sentencecase.py'449+++ inkscape_0.48.1-2ubuntu5/share/extensions/text_sentencecase.py 2011-05-30 17:43:57.903386425 +0100
495--- a/share/extensions/text_sentencecase.py 2008-03-29 10:21:03 +0000450@@ -1,3 +1,4 @@
496+++ b/share/extensions/text_sentencecase.py 2010-07-24 17:56:48 +0000451+#!/usr/bin/env python
497@@ -1,3 +1,4 @@452 import chardataeffect, inkex, string
498+#!/usr/bin/env python453
499 import chardataeffect, inkex, string454 class C(chardataeffect.CharDataEffect):
500 455diff -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
501 class C(chardataeffect.CharDataEffect):456--- inkscape_0.48.1-2ubuntu5~/share/extensions/text_titlecase.py 2011-05-30 17:38:10.000000000 +0100
502457+++ inkscape_0.48.1-2ubuntu5/share/extensions/text_titlecase.py 2011-05-30 17:43:57.913386425 +0100
503=== modified file 'share/extensions/text_titlecase.py'458@@ -1,3 +1,4 @@
504--- a/share/extensions/text_titlecase.py 2008-03-29 10:21:03 +0000459+#!/usr/bin/env python
505+++ b/share/extensions/text_titlecase.py 2010-07-24 17:56:48 +0000460 import chardataeffect, inkex, string
506@@ -1,3 +1,4 @@461
507+#!/usr/bin/env python462 class C(chardataeffect.CharDataEffect):
508 import chardataeffect, inkex, string463diff -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
509 464--- inkscape_0.48.1-2ubuntu5~/share/extensions/text_uppercase.py 2011-05-30 17:38:10.000000000 +0100
510 class C(chardataeffect.CharDataEffect):465+++ inkscape_0.48.1-2ubuntu5/share/extensions/text_uppercase.py 2011-05-30 17:43:57.913386425 +0100
511466@@ -1,3 +1,4 @@
512=== modified file 'share/extensions/text_uppercase.py'467+#!/usr/bin/env python
513--- a/share/extensions/text_uppercase.py 2008-03-29 10:21:03 +0000468 import chardataeffect, inkex, string
514+++ b/share/extensions/text_uppercase.py 2010-07-24 17:56:48 +0000469
515@@ -1,3 +1,4 @@470 class C(chardataeffect.CharDataEffect):
516+#!/usr/bin/env python471diff -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
517 import chardataeffect, inkex, string472--- inkscape_0.48.1-2ubuntu5~/share/extensions/voronoi.py 2011-05-30 17:38:10.000000000 +0100
518 473+++ inkscape_0.48.1-2ubuntu5/share/extensions/voronoi.py 2011-05-30 17:43:57.913386425 +0100
519 class C(chardataeffect.CharDataEffect):
520
521diff --git a/share/extensions/voronoi.py b/share/extensions/voronoi.py
522index be15fbe..923298d 100644
523--- a/share/extensions/voronoi.py
524+++ b/share/extensions/voronoi.py
525@@ -1,3 +1,4 @@474@@ -1,3 +1,4 @@
526+#! /usr/bin/env python475+#! /usr/bin/env python
527 #############################################################################476 #############################################################################
528 #477 #
529 # Voronoi diagram calculator/ Delaunay triangulator478 # Voronoi diagram calculator/ Delaunay triangulator
530
531479
=== modified file 'debian/patches/03-add-missing-mimetypes.dpatch' (properties changed: -x to +x)
=== modified file 'debian/patches/04-fix-gcc4.6-ftbfs.dpatch' (properties changed: -x to +x)
=== added file 'debian/patches/fix-fontforge-glyph-template.dpatch'
--- debian/patches/fix-fontforge-glyph-template.dpatch 1970-01-01 00:00:00 +0000
+++ debian/patches/fix-fontforge-glyph-template.dpatch 2011-05-30 18:02:37 +0000
@@ -0,0 +1,82 @@
1#! /bin/sh /usr/share/dpatch/dpatch-run
2# From: JazzyNico <nicoduf@yahoo.fr>
3# Description: Fix layer structure in fontforge glyph template
4# Origin: upstream, https://bazaar.launchpad.net/~inkscape.dev/inkscape/trunk/revision/9693
5# Bug: https://launchpad.net/bugs/565296
6# Bug-Ubuntu: https://launchpad.net/bugs/565296
7# Last-Update: 2011-05-30
8
9@DPATCH@
10diff -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
11--- inkscape_0.48.1-2ubuntu5~/share/templates/fontforge_glyph.svg 2011-05-30 17:38:10.000000000 +0100
12+++ inkscape_0.48.1-2ubuntu5/share/templates/fontforge_glyph.svg 2011-05-30 18:41:57.088216494 +0100
13@@ -1,32 +1,17 @@
14 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
15 <!-- Created with Inkscape (http://www.inkscape.org/) -->
16 <svg
17- xmlns:dc="http://purl.org/dc/elements/1.1/"
18- xmlns:cc="http://creativecommons.org/ns#"
19- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
20- xmlns:svg="http://www.w3.org/2000/svg"
21 xmlns="http://www.w3.org/2000/svg"
22 xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
23 xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
24- version="1.0"
25+ xmlns:xlink="http://www.w3.org/1999/xlink"
26+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
27+ xmlns:cc="http://web.resource.org/cc/"
28+ xmlns:dc="http://purl.org/dc/elements/1.1/"
29 width="1000"
30- height="1000"
31- id="svg5496"
32- sodipodi:version="0.32"
33- inkscape:version="0.45+devel"
34- sodipodi:docname="fontforge_glyph.svg"
35- inkscape:output_extension="org.inkscape.output.svg.inkscape">
36- <metadata
37- id="metadata5594">
38- <rdf:RDF>
39- <cc:Work
40- rdf:about="">
41- <dc:format>image/svg+xml</dc:format>
42- <dc:type
43- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
44- </cc:Work>
45- </rdf:RDF>
46- </metadata>
47+ height="1000">
48+ <defs
49+ id="defs5498" />
50 <sodipodi:namedview
51 inkscape:window-height="618"
52 inkscape:window-width="641"
53@@ -44,14 +29,25 @@
54 inkscape:cy="500"
55 inkscape:window-x="0"
56 inkscape:window-y="25"
57- inkscape:current-layer="svg5496">
58- <sodipodi:guide
59+ inkscape:current-layer="layer1">
60+ <sodipodi:guide
61 orientation="horizontal"
62 position="200"
63 id="guide5596" />
64 </sodipodi:namedview>
65- <defs
66- id="defs5498" />
67+ <metadata
68+ id="metadata5594">
69+ <rdf:RDF>
70+ <cc:Work
71+ rdf:about="">
72+ <dc:format>image/svg+xml</dc:format>
73+ <dc:type
74+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
75+ </cc:Work>
76+ </rdf:RDF>
77+ </metadata>
78 <g
79+ inkscape:label="Layer 1"
80+ inkscape:groupmode="layer"
81 id="layer1" />
82 </svg>
083
=== modified file 'debian/rules'
--- debian/rules 2011-05-30 08:07:52 +0000
+++ debian/rules 2011-05-30 18:02:37 +0000
@@ -60,7 +60,6 @@
6060
61build: config.status61build: config.status
62 dh_testdir62 dh_testdir
63 cd po; intltool-update -p
6463
65ifneq "$(wildcard /usr/share/misc/config.sub)" ""64ifneq "$(wildcard /usr/share/misc/config.sub)" ""
66 cp -f /usr/share/misc/config.sub config.sub65 cp -f /usr/share/misc/config.sub config.sub

Subscribers

People subscribed via source and target branches