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

[Alex Valavanis]

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.

[lp:~valavanisalex/ubuntu/oneiric/inkscape/inkscape_0.48.1-2ubuntu5]

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

=== 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 @@
+inkscape (0.48.1-2ubuntu5) oneiric; urgency=low
+
+  * debian/rules: No need to manually call intltool-update on build.  This
+    is now handled by dh_translations.
+  * debian/control: No longer suggest python and skencil.  They do not
+    offer any enhancement to Inkscape (LP: #762541)
+  * debian/control: Suggest transfig to allow import of xfig files 
+    (LP: #668300)
+  * debian/patches/02-add-shebangs-and-fix-permissions.dpatch:
+    No longer mark JavaScript extension files as standalone executables
+    (LP: #602005):
+    - share/extensions/*.js: Revert addition of shebangs
+    - share/extensions/Makefile.am: Install *.js using _DATA rule rather
+      than _SCRIPTS rule to avoid giving executable permission
+  * debian/patches/fix-fontforge-glyph-template.dpatch: Cherry-pick
+    patch from uptream trunk to fix layer structure in template (LP: #565296)
+
+ -- Alex Valavanis <[e-mail]>  Mon, 30 May 2011 18:50:49 +0100
+
 inkscape (0.48.1-2ubuntu4) oneiric; urgency=low
 
   * debian/rules: Drop broken code to add translation domain to desktop files.

=== 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 @@
           libgnomevfs2-extra,
           libsvg-perl,
           libxml-xql-perl,
-          python,
           pstoedit,
-          skencil
+          transfig
 Recommends: aspell,
             libwmf-bin,
             imagemagick,

=== 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 @@
 03-add-missing-mimetypes
 01_add_unity_quicklist_support.patch
 04-fix-gcc4.6-ftbfs.dpatch
+fix-fontforge-glyph-template.dpatch

=== 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 @@
 ## DP: Taken from upstream's Bug tracker at
 ## DP: https://bugs.launchpad.net/inkscape/+bug/602005
 ## DP: original patch by Leo Jackson
+## DP: 2011-05-30: Modified by Alex Valavanis <[e-mail]>:
+## DP: * Do not add shebangs to JavaScript files.  They cannot be run as
+## DP:   standalone scripts.
+## DP: * Install JavaScript files using _DATA rule rather than _SCRIPTS
+## DP:   rule to avoid making them executable.
 
 @DPATCH@
-
-=== modified file 'share/extensions/Barcode/Base.py'
---- a/share/extensions/Barcode/Base.py	2008-03-29 10:21:03 +0000
-+++ b/share/extensions/Barcode/Base.py	2010-07-24 17:56:48 +0000
+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
+--- inkscape_0.48.1-2ubuntu5~/share/extensions/Barcode/Base.py	2011-05-30 17:38:10.000000000 +0100
++++ inkscape_0.48.1-2ubuntu5/share/extensions/Barcode/Base.py	2011-05-30 17:43:57.893386425 +0100
 @@ -1,3 +1,4 @@
 +#!/usr/bin/env python
  '''
  Copyright (C) 2007 Martin Owens
  
-
-=== modified file 'share/extensions/Barcode/Code128.py'
---- a/share/extensions/Barcode/Code128.py	2010-02-28 22:40:23 +0000
-+++ b/share/extensions/Barcode/Code128.py	2010-07-24 17:56:48 +0000
+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
+--- inkscape_0.48.1-2ubuntu5~/share/extensions/Barcode/Code128.py	2011-05-30 17:38:10.000000000 +0100
++++ inkscape_0.48.1-2ubuntu5/share/extensions/Barcode/Code128.py	2011-05-30 17:43:57.893386425 +0100
 @@ -1,3 +1,4 @@
 +#!/usr/bin/env python 
  '''
  Copyright (C) 2007 Martin Owens
  
-
-=== modified file 'share/extensions/Barcode/Code39.py'
---- a/share/extensions/Barcode/Code39.py	2007-04-25 00:53:02 +0000
-+++ b/share/extensions/Barcode/Code39.py	2010-07-24 17:56:48 +0000
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
- '''
- Copyright (C) 2007 Martin Owens
- 
-
-=== modified file 'share/extensions/Barcode/Code39Ext.py'
---- a/share/extensions/Barcode/Code39Ext.py	2007-04-25 00:53:02 +0000
-+++ b/share/extensions/Barcode/Code39Ext.py	2010-07-24 17:56:48 +0000
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
- '''
- Copyright (C) 2007 Martin Owens
- 
-
-=== modified file 'share/extensions/Barcode/Code93.py'
---- a/share/extensions/Barcode/Code93.py	2010-04-27 17:09:54 +0000
-+++ b/share/extensions/Barcode/Code93.py	2010-07-24 17:56:48 +0000
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
- '''
- Copyright (C) 2007 Martin Owens
- 
-
-=== modified file 'share/extensions/Barcode/EAN13.py'
---- a/share/extensions/Barcode/EAN13.py	2009-12-20 22:09:40 +0000
-+++ b/share/extensions/Barcode/EAN13.py	2010-07-24 17:56:48 +0000
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
- '''
- Copyright (C) 2007 Martin Owens
- 
-
-=== modified file 'share/extensions/Barcode/EAN5.py'
---- a/share/extensions/Barcode/EAN5.py	2009-12-22 00:13:41 +0000
-+++ b/share/extensions/Barcode/EAN5.py	2010-07-24 17:56:48 +0000
+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
+--- inkscape_0.48.1-2ubuntu5~/share/extensions/Barcode/Code39.py	2011-05-30 17:38:10.000000000 +0100
++++ inkscape_0.48.1-2ubuntu5/share/extensions/Barcode/Code39.py	2011-05-30 17:43:57.893386425 +0100
+@@ -1,3 +1,4 @@
++#!/usr/bin/env python
+ '''
+ Copyright (C) 2007 Martin Owens
+ 
+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
+--- inkscape_0.48.1-2ubuntu5~/share/extensions/Barcode/Code39Ext.py	2011-05-30 17:38:10.000000000 +0100
++++ inkscape_0.48.1-2ubuntu5/share/extensions/Barcode/Code39Ext.py	2011-05-30 17:43:57.893386425 +0100
+@@ -1,3 +1,4 @@
++#!/usr/bin/env python
+ '''
+ Copyright (C) 2007 Martin Owens
+ 
+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
+--- inkscape_0.48.1-2ubuntu5~/share/extensions/Barcode/Code93.py	2011-05-30 17:38:10.000000000 +0100
++++ inkscape_0.48.1-2ubuntu5/share/extensions/Barcode/Code93.py	2011-05-30 17:43:57.893386425 +0100
+@@ -1,3 +1,4 @@
++#!/usr/bin/env python
+ '''
+ Copyright (C) 2007 Martin Owens
+ 
+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
+--- inkscape_0.48.1-2ubuntu5~/share/extensions/Barcode/EAN13.py	2011-05-30 17:38:10.000000000 +0100
++++ inkscape_0.48.1-2ubuntu5/share/extensions/Barcode/EAN13.py	2011-05-30 17:43:57.893386425 +0100
+@@ -1,3 +1,4 @@
++#!/usr/bin/env python
+ '''
+ Copyright (C) 2007 Martin Owens
+ 
+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
+--- inkscape_0.48.1-2ubuntu5~/share/extensions/Barcode/EAN5.py	2011-05-30 17:38:10.000000000 +0100
++++ inkscape_0.48.1-2ubuntu5/share/extensions/Barcode/EAN5.py	2011-05-30 17:43:57.893386425 +0100
 @@ -1,3 +1,4 @@
 +#!/usr/bin/env python 
  ''' 
  Copyright (C) 2007 Martin Owens 
  Copyright (C) 2009 Aaron C Spike 
-
-=== modified file 'share/extensions/Barcode/EAN8.py'
---- a/share/extensions/Barcode/EAN8.py	2007-04-25 00:53:02 +0000
-+++ b/share/extensions/Barcode/EAN8.py	2010-07-24 17:56:48 +0000
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
- '''
- Copyright (C) 2007 Martin Owens
- 
-
-=== modified file 'share/extensions/Barcode/RM4CC.py'
---- a/share/extensions/Barcode/RM4CC.py	2007-04-25 00:53:02 +0000
-+++ b/share/extensions/Barcode/RM4CC.py	2010-07-24 17:56:48 +0000
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
- '''
- Copyright (C) 2007 Martin Owens
- 
-
-=== modified file 'share/extensions/Barcode/UPCA.py'
---- a/share/extensions/Barcode/UPCA.py	2009-12-20 22:09:40 +0000
-+++ b/share/extensions/Barcode/UPCA.py	2010-07-24 17:56:48 +0000
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
- '''
- Copyright (C) 2007 Martin Owens
- 
-
-=== modified file 'share/extensions/Barcode/UPCE.py'
---- a/share/extensions/Barcode/UPCE.py	2009-12-20 22:09:40 +0000
-+++ b/share/extensions/Barcode/UPCE.py	2010-07-24 17:56:48 +0000
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
- '''
- Copyright (C) 2007 Martin Owens
- 
-
-=== modified file 'share/extensions/Barcode/__init__.py'
---- a/share/extensions/Barcode/__init__.py	2009-12-21 23:48:17 +0000
-+++ b/share/extensions/Barcode/__init__.py	2010-07-24 17:56:48 +0000
+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
+--- inkscape_0.48.1-2ubuntu5~/share/extensions/Barcode/EAN8.py	2011-05-30 17:38:10.000000000 +0100
++++ inkscape_0.48.1-2ubuntu5/share/extensions/Barcode/EAN8.py	2011-05-30 17:43:57.893386425 +0100
+@@ -1,3 +1,4 @@
++#!/usr/bin/env python
+ '''
+ Copyright (C) 2007 Martin Owens
+ 
+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
+--- inkscape_0.48.1-2ubuntu5~/share/extensions/Barcode/RM4CC.py	2011-05-30 17:38:10.000000000 +0100
++++ inkscape_0.48.1-2ubuntu5/share/extensions/Barcode/RM4CC.py	2011-05-30 17:43:57.893386425 +0100
+@@ -1,3 +1,4 @@
++#!/usr/bin/env python
+ '''
+ Copyright (C) 2007 Martin Owens
+ 
+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
+--- inkscape_0.48.1-2ubuntu5~/share/extensions/Barcode/UPCA.py	2011-05-30 17:38:10.000000000 +0100
++++ inkscape_0.48.1-2ubuntu5/share/extensions/Barcode/UPCA.py	2011-05-30 17:43:57.893386425 +0100
+@@ -1,3 +1,4 @@
++#!/usr/bin/env python
+ '''
+ Copyright (C) 2007 Martin Owens
+ 
+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
+--- inkscape_0.48.1-2ubuntu5~/share/extensions/Barcode/UPCE.py	2011-05-30 17:38:10.000000000 +0100
++++ inkscape_0.48.1-2ubuntu5/share/extensions/Barcode/UPCE.py	2011-05-30 17:43:57.893386425 +0100
+@@ -1,3 +1,4 @@
++#!/usr/bin/env python
+ '''
+ Copyright (C) 2007 Martin Owens
+ 
+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
+--- inkscape_0.48.1-2ubuntu5~/share/extensions/Barcode/__init__.py	2011-05-30 17:38:10.000000000 +0100
++++ inkscape_0.48.1-2ubuntu5/share/extensions/Barcode/__init__.py	2011-05-30 17:43:57.893386425 +0100
 @@ -1,4 +1,4 @@
 -
 +#!/usr/bin/env python
  '''
  Barcodes SVG Extention
  
-
-=== modified file 'share/extensions/SpSVG.pm'
---- a/share/extensions/SpSVG.pm	2006-01-16 02:36:01 +0000
-+++ b/share/extensions/SpSVG.pm	2010-07-24 17:56:48 +0000
+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
+--- inkscape_0.48.1-2ubuntu5~/share/extensions/Makefile.am	2011-05-30 17:38:10.000000000 +0100
++++ inkscape_0.48.1-2ubuntu5/share/extensions/Makefile.am	2011-05-30 17:46:40.853386475 +0100
+@@ -73,13 +73,9 @@
+ 	inkex.py \
+ 	Inkscape.pm \
+ 	inkwebeffect.py \
+-	inkweb.js \
+ 	interp.py \
+ 	interp_att_g.py \
+-	jessyInk.js \
+ 	jessyInk_autoTexts.py \
+-	jessyInk_core_mouseHandler_noclick.js \
+-	jessyInk_core_mouseHandler_zoomControl.js \
+ 	jessyInk_effects.py \
+ 	jessyInk_export.py \
+ 	jessyInk_install.py \
+@@ -161,6 +157,10 @@
+ 	yocto_css.py
+ 
+ otherstuff = \
++	inkweb.js \
++	jessyInk.js \
++	jessyInk_core_mouseHandler_noclick.js \
++	jessyInk_core_mouseHandler_zoomControl.js \
+ 	aisvg.xslt \
+ 	colors.xml \
+ 	jessyInk_video.svg \
+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
+--- inkscape_0.48.1-2ubuntu5~/share/extensions/SpSVG.pm	2011-05-30 17:38:10.000000000 +0100
++++ inkscape_0.48.1-2ubuntu5/share/extensions/SpSVG.pm	2011-05-30 17:43:57.893386425 +0100
 @@ -1,4 +1,4 @@
 -#!/usr/bin/perl -w
 +#!/usr/bin/env perl -w
  #
  # SpSVG
  # 
-
-=== modified file 'share/extensions/color_blackandwhite.py'
---- a/share/extensions/color_blackandwhite.py	2010-02-14 09:46:42 +0000
-+++ b/share/extensions/color_blackandwhite.py	2010-07-24 17:56:48 +0000
+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
+--- inkscape_0.48.1-2ubuntu5~/share/extensions/color_blackandwhite.py	2011-05-30 17:38:10.000000000 +0100
++++ inkscape_0.48.1-2ubuntu5/share/extensions/color_blackandwhite.py	2011-05-30 17:43:57.893386425 +0100
 @@ -1,3 +1,4 @@
 +#!/usr/bin/env python
  import coloreffect,sys
  
  class C(coloreffect.ColorEffect):
-
-=== modified file 'share/extensions/color_brighter.py'
---- a/share/extensions/color_brighter.py	2008-03-29 10:21:03 +0000
-+++ b/share/extensions/color_brighter.py	2010-07-24 17:56:48 +0000
+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
+--- inkscape_0.48.1-2ubuntu5~/share/extensions/color_brighter.py	2011-05-30 17:38:10.000000000 +0100
++++ inkscape_0.48.1-2ubuntu5/share/extensions/color_brighter.py	2011-05-30 17:43:57.893386425 +0100
 @@ -1,3 +1,4 @@
 +#!/usr/bin/env python
  import coloreffect
  
  class C(coloreffect.ColorEffect):
-
-=== modified file 'share/extensions/color_custom.py'
---- a/share/extensions/color_custom.py	2008-03-29 10:21:03 +0000
-+++ b/share/extensions/color_custom.py	2010-07-24 17:56:48 +0000
+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
+--- inkscape_0.48.1-2ubuntu5~/share/extensions/color_custom.py	2011-05-30 17:38:10.000000000 +0100
++++ inkscape_0.48.1-2ubuntu5/share/extensions/color_custom.py	2011-05-30 17:43:57.893386425 +0100
 @@ -1,3 +1,4 @@
 +#!/usr/bin/env python
  import coloreffect
@@ -161,19 +178,17 @@
 -c.affect()
 \ No newline at end of file
 +c.affect()
-
-=== modified file 'share/extensions/color_darker.py'
---- a/share/extensions/color_darker.py	2008-03-29 10:21:03 +0000
-+++ b/share/extensions/color_darker.py	2010-07-24 17:56:48 +0000
+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
+--- inkscape_0.48.1-2ubuntu5~/share/extensions/color_darker.py	2011-05-30 17:38:10.000000000 +0100
++++ inkscape_0.48.1-2ubuntu5/share/extensions/color_darker.py	2011-05-30 17:43:57.893386425 +0100
 @@ -1,3 +1,4 @@
 +#!/usr/bin/env python
  import coloreffect
  
  class C(coloreffect.ColorEffect):
-
-=== modified file 'share/extensions/color_desaturate.py'
---- a/share/extensions/color_desaturate.py	2008-03-29 10:21:03 +0000
-+++ b/share/extensions/color_desaturate.py	2010-07-24 17:56:48 +0000
+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
+--- inkscape_0.48.1-2ubuntu5~/share/extensions/color_desaturate.py	2011-05-30 17:38:10.000000000 +0100
++++ inkscape_0.48.1-2ubuntu5/share/extensions/color_desaturate.py	2011-05-30 17:43:57.893386425 +0100
 @@ -1,3 +1,4 @@
 +#!/usr/bin/env python
  import coloreffect
@@ -186,10 +201,9 @@
 -c.affect()
 \ No newline at end of file
 +c.affect()
-
-=== modified file 'share/extensions/color_grayscale.py'
---- a/share/extensions/color_grayscale.py	2008-03-29 10:21:03 +0000
-+++ b/share/extensions/color_grayscale.py	2010-07-24 17:56:48 +0000
+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
+--- inkscape_0.48.1-2ubuntu5~/share/extensions/color_grayscale.py	2011-05-30 17:38:10.000000000 +0100
++++ inkscape_0.48.1-2ubuntu5/share/extensions/color_grayscale.py	2011-05-30 17:43:57.893386425 +0100
 @@ -1,3 +1,4 @@
 +#!/usr/bin/env python
  import coloreffect
@@ -202,64 +216,57 @@
 -c.affect()
 \ No newline at end of file
 +c.affect()
-
-=== modified file 'share/extensions/color_lesshue.py'
---- a/share/extensions/color_lesshue.py	2008-03-29 10:21:03 +0000
-+++ b/share/extensions/color_lesshue.py	2010-07-24 17:56:48 +0000
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
- import coloreffect, inkex
- 
- class C(coloreffect.ColorEffect):
-
-=== modified file 'share/extensions/color_lesslight.py'
---- a/share/extensions/color_lesslight.py	2008-03-29 10:21:03 +0000
-+++ b/share/extensions/color_lesslight.py	2010-07-24 17:56:48 +0000
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
- import coloreffect, inkex
- 
- class C(coloreffect.ColorEffect):
-
-=== modified file 'share/extensions/color_lesssaturation.py'
---- a/share/extensions/color_lesssaturation.py	2008-03-29 10:21:03 +0000
-+++ b/share/extensions/color_lesssaturation.py	2010-07-24 17:56:48 +0000
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
- import coloreffect, inkex
- 
- class C(coloreffect.ColorEffect):
-
-=== modified file 'share/extensions/color_morehue.py'
---- a/share/extensions/color_morehue.py	2008-03-29 10:21:03 +0000
-+++ b/share/extensions/color_morehue.py	2010-07-24 17:56:48 +0000
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
- import coloreffect, inkex
- 
- class C(coloreffect.ColorEffect):
-
-=== modified file 'share/extensions/color_morelight.py'
---- a/share/extensions/color_morelight.py	2008-03-29 10:21:03 +0000
-+++ b/share/extensions/color_morelight.py	2010-07-24 17:56:48 +0000
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
- import coloreffect, inkex
- 
- class C(coloreffect.ColorEffect):
-
-=== modified file 'share/extensions/color_moresaturation.py'
---- a/share/extensions/color_moresaturation.py	2008-03-29 10:21:03 +0000
-+++ b/share/extensions/color_moresaturation.py	2010-07-24 17:56:48 +0000
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
- import coloreffect, inkex
- 
- class C(coloreffect.ColorEffect):
-
-=== modified file 'share/extensions/color_negative.py'
---- a/share/extensions/color_negative.py	2008-03-29 10:21:03 +0000
-+++ b/share/extensions/color_negative.py	2010-07-24 17:56:48 +0000
+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
+--- inkscape_0.48.1-2ubuntu5~/share/extensions/color_lesshue.py	2011-05-30 17:38:10.000000000 +0100
++++ inkscape_0.48.1-2ubuntu5/share/extensions/color_lesshue.py	2011-05-30 17:43:57.903386425 +0100
+@@ -1,3 +1,4 @@
++#!/usr/bin/env python
+ import coloreffect, inkex
+ 
+ class C(coloreffect.ColorEffect):
+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
+--- inkscape_0.48.1-2ubuntu5~/share/extensions/color_lesslight.py	2011-05-30 17:38:10.000000000 +0100
++++ inkscape_0.48.1-2ubuntu5/share/extensions/color_lesslight.py	2011-05-30 17:43:57.903386425 +0100
+@@ -1,3 +1,4 @@
++#!/usr/bin/env python
+ import coloreffect, inkex
+ 
+ class C(coloreffect.ColorEffect):
+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
+--- inkscape_0.48.1-2ubuntu5~/share/extensions/color_lesssaturation.py	2011-05-30 17:38:10.000000000 +0100
++++ inkscape_0.48.1-2ubuntu5/share/extensions/color_lesssaturation.py	2011-05-30 17:43:57.903386425 +0100
+@@ -1,3 +1,4 @@
++#!/usr/bin/env python
+ import coloreffect, inkex
+ 
+ class C(coloreffect.ColorEffect):
+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
+--- inkscape_0.48.1-2ubuntu5~/share/extensions/color_morehue.py	2011-05-30 17:38:10.000000000 +0100
++++ inkscape_0.48.1-2ubuntu5/share/extensions/color_morehue.py	2011-05-30 17:43:57.903386425 +0100
+@@ -1,3 +1,4 @@
++#!/usr/bin/env python
+ import coloreffect, inkex
+ 
+ class C(coloreffect.ColorEffect):
+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
+--- inkscape_0.48.1-2ubuntu5~/share/extensions/color_morelight.py	2011-05-30 17:38:10.000000000 +0100
++++ inkscape_0.48.1-2ubuntu5/share/extensions/color_morelight.py	2011-05-30 17:43:57.903386425 +0100
+@@ -1,3 +1,4 @@
++#!/usr/bin/env python
+ import coloreffect, inkex
+ 
+ class C(coloreffect.ColorEffect):
+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
+--- inkscape_0.48.1-2ubuntu5~/share/extensions/color_moresaturation.py	2011-05-30 17:38:10.000000000 +0100
++++ inkscape_0.48.1-2ubuntu5/share/extensions/color_moresaturation.py	2011-05-30 17:43:57.903386425 +0100
+@@ -1,3 +1,4 @@
++#!/usr/bin/env python
+ import coloreffect, inkex
+ 
+ class C(coloreffect.ColorEffect):
+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
+--- inkscape_0.48.1-2ubuntu5~/share/extensions/color_negative.py	2011-05-30 17:38:10.000000000 +0100
++++ inkscape_0.48.1-2ubuntu5/share/extensions/color_negative.py	2011-05-30 17:43:57.903386425 +0100
 @@ -1,3 +1,4 @@
 +#!/usr/bin/env python
  import coloreffect
@@ -272,19 +279,17 @@
 -c.affect()
 \ No newline at end of file
 +c.affect()
-
-=== modified file 'share/extensions/color_randomize.py'
---- a/share/extensions/color_randomize.py	2008-05-23 06:31:40 +0000
-+++ b/share/extensions/color_randomize.py	2010-07-24 17:56:48 +0000
+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
+--- inkscape_0.48.1-2ubuntu5~/share/extensions/color_randomize.py	2011-05-30 17:38:10.000000000 +0100
++++ inkscape_0.48.1-2ubuntu5/share/extensions/color_randomize.py	2011-05-30 17:43:57.903386425 +0100
 @@ -1,3 +1,4 @@
 +#!/usr/bin/env python
  import coloreffect,random,inkex
  
  class C(coloreffect.ColorEffect):
-
-=== modified file 'share/extensions/color_removeblue.py'
---- a/share/extensions/color_removeblue.py	2008-03-29 10:21:03 +0000
-+++ b/share/extensions/color_removeblue.py	2010-07-24 17:56:48 +0000
+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
+--- inkscape_0.48.1-2ubuntu5~/share/extensions/color_removeblue.py	2011-05-30 17:38:10.000000000 +0100
++++ inkscape_0.48.1-2ubuntu5/share/extensions/color_removeblue.py	2011-05-30 17:43:57.903386425 +0100
 @@ -1,3 +1,4 @@
 +#!/usr/bin/env python
  import coloreffect
@@ -297,10 +302,9 @@
 -c.affect()
 \ No newline at end of file
 +c.affect()
-
-=== modified file 'share/extensions/color_removegreen.py'
---- a/share/extensions/color_removegreen.py	2008-03-29 10:21:03 +0000
-+++ b/share/extensions/color_removegreen.py	2010-07-24 17:56:48 +0000
+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
+--- inkscape_0.48.1-2ubuntu5~/share/extensions/color_removegreen.py	2011-05-30 17:38:10.000000000 +0100
++++ inkscape_0.48.1-2ubuntu5/share/extensions/color_removegreen.py	2011-05-30 17:43:57.903386425 +0100
 @@ -1,3 +1,4 @@
 +#!/usr/bin/env python
  import coloreffect
@@ -313,10 +317,9 @@
 -c.affect()
 \ No newline at end of file
 +c.affect()
-
-=== modified file 'share/extensions/color_removered.py'
---- a/share/extensions/color_removered.py	2008-03-29 10:21:03 +0000
-+++ b/share/extensions/color_removered.py	2010-07-24 17:56:48 +0000
+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
+--- inkscape_0.48.1-2ubuntu5~/share/extensions/color_removered.py	2011-05-30 17:38:10.000000000 +0100
++++ inkscape_0.48.1-2ubuntu5/share/extensions/color_removered.py	2011-05-30 17:43:57.903386425 +0100
 @@ -1,3 +1,4 @@
 +#!/usr/bin/env python
  import coloreffect
@@ -329,19 +332,17 @@
 -c.affect()
 \ No newline at end of file
 +c.affect()
-
-=== modified file 'share/extensions/color_replace.py'
---- a/share/extensions/color_replace.py	2008-04-15 16:17:21 +0000
-+++ b/share/extensions/color_replace.py	2010-07-24 17:56:48 +0000
+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
+--- inkscape_0.48.1-2ubuntu5~/share/extensions/color_replace.py	2011-05-30 17:38:10.000000000 +0100
++++ inkscape_0.48.1-2ubuntu5/share/extensions/color_replace.py	2011-05-30 17:43:57.903386425 +0100
 @@ -1,3 +1,4 @@
 +#!/usr/bin/env python
  import coloreffect
  
  import inkex
-
-=== modified file 'share/extensions/color_rgbbarrel.py'
---- a/share/extensions/color_rgbbarrel.py	2008-03-29 10:21:03 +0000
-+++ b/share/extensions/color_rgbbarrel.py	2010-07-24 17:56:48 +0000
+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
+--- inkscape_0.48.1-2ubuntu5~/share/extensions/color_rgbbarrel.py	2011-05-30 17:38:10.000000000 +0100
++++ inkscape_0.48.1-2ubuntu5/share/extensions/color_rgbbarrel.py	2011-05-30 17:43:57.903386425 +0100
 @@ -1,3 +1,4 @@
 +#!/usr/bin/env python
  import coloreffect
@@ -354,177 +355,124 @@
 -c.affect()
 \ No newline at end of file
 +c.affect()
-
-=== modified file 'share/extensions/dxf_templates.py'
---- a/share/extensions/dxf_templates.py	2008-12-29 23:08:47 +0000
-+++ b/share/extensions/dxf_templates.py	2010-07-24 17:56:48 +0000
+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
+--- inkscape_0.48.1-2ubuntu5~/share/extensions/dxf_templates.py	2011-05-30 17:38:10.000000000 +0100
++++ inkscape_0.48.1-2ubuntu5/share/extensions/dxf_templates.py	2011-05-30 17:43:57.903386425 +0100
 @@ -1,3 +1,4 @@
 +#!/usr/bin/env python
  r14_header = '''  0
  SECTION
    2
-
-=== modified file 'share/extensions/inkweb.js'
---- a/share/extensions/inkweb.js	2009-04-28 22:44:25 +0000
-+++ b/share/extensions/inkweb.js	2010-07-24 17:56:48 +0000
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env js
- /*
- **  InkWeb - Inkscape's Javscript features for the open vector web
- **
-
-=== modified file 'share/extensions/jessyInk.js'
---- a/share/extensions/jessyInk.js	2010-06-04 22:18:31 +0000
-+++ b/share/extensions/jessyInk.js	2010-07-24 17:56:48 +0000
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env js
- // Copyright 2008, 2009 Hannes Hochreiner
- // This program is free software: you can redistribute it and/or modify
- // it under the terms of the GNU General Public License as published by
-
-=== modified file 'share/extensions/jessyInk_core_mouseHandler_noclick.js'
---- a/share/extensions/jessyInk_core_mouseHandler_noclick.js	2010-06-04 22:18:31 +0000
-+++ b/share/extensions/jessyInk_core_mouseHandler_noclick.js	2010-07-24 17:56:48 +0000
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env js
- // Copyright 2008, 2009 Hannes Hochreiner
- // This program is free software: you can redistribute it and/or modify
- // it under the terms of the GNU General Public License as published by
-
-=== modified file 'share/extensions/jessyInk_core_mouseHandler_zoomControl.js'
---- a/share/extensions/jessyInk_core_mouseHandler_zoomControl.js	2010-06-04 22:18:31 +0000
-+++ b/share/extensions/jessyInk_core_mouseHandler_zoomControl.js	2010-07-24 17:56:48 +0000
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env js
- // Copyright 2008, 2009 Hannes Hochreiner
- // This program is free software: you can redistribute it and/or modify
- // it under the terms of the GNU General Public License as published by
-
-=== modified file 'share/extensions/render_alphabetsoup_config.py'
---- a/share/extensions/render_alphabetsoup_config.py	2008-05-23 06:31:40 +0000
-+++ b/share/extensions/render_alphabetsoup_config.py	2010-07-24 17:56:48 +0000
+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
+--- inkscape_0.48.1-2ubuntu5~/share/extensions/render_alphabetsoup_config.py	2011-05-30 17:38:10.000000000 +0100
++++ inkscape_0.48.1-2ubuntu5/share/extensions/render_alphabetsoup_config.py	2011-05-30 17:43:57.903386425 +0100
 @@ -1,3 +1,4 @@
 +#!/usr/bin/env python
  # Syntax format: (raise your hand if you know lisp :-)
  #
  # 'state0':  ("file.svg", ( ( ('state1', dx, dy, T-B, L|R),),
-
-=== modified file 'share/extensions/render_barcode.py'
---- a/share/extensions/render_barcode.py	2009-01-06 16:13:13 +0000
-+++ b/share/extensions/render_barcode.py	2010-07-24 17:56:48 +0000
+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
+--- inkscape_0.48.1-2ubuntu5~/share/extensions/render_barcode.py	2011-05-30 17:38:10.000000000 +0100
++++ inkscape_0.48.1-2ubuntu5/share/extensions/render_barcode.py	2011-05-30 17:43:57.903386425 +0100
 @@ -1,3 +1,4 @@
 +#!/usr/bin/env python
  '''
  Copyright (C) 2007 Martin Owens
  
-
-=== modified file 'share/extensions/run_command.py'
---- a/share/extensions/run_command.py	2010-02-04 00:32:27 +0000
-+++ b/share/extensions/run_command.py	2010-07-24 17:56:48 +0000
+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
+--- inkscape_0.48.1-2ubuntu5~/share/extensions/run_command.py	2011-05-30 17:38:10.000000000 +0100
++++ inkscape_0.48.1-2ubuntu5/share/extensions/run_command.py	2011-05-30 17:43:57.903386425 +0100
 @@ -1,3 +1,4 @@
 +#!/usr/bin/env python
  import os
  import sys
  import tempfile
-
-=== modified file 'share/extensions/svg_and_media_zip_output.py'
---- a/share/extensions/svg_and_media_zip_output.py	2010-03-03 13:04:57 +0000
-+++ b/share/extensions/svg_and_media_zip_output.py	2010-07-24 17:56:48 +0000
+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
+--- inkscape_0.48.1-2ubuntu5~/share/extensions/svg_and_media_zip_output.py	2011-05-30 17:38:10.000000000 +0100
++++ inkscape_0.48.1-2ubuntu5/share/extensions/svg_and_media_zip_output.py	2011-05-30 17:43:57.903386425 +0100
 @@ -1,4 +1,4 @@
 -#! /usr/bin/env python
 +#!/usr/bin/env python
  """
  svg_and_media_zip_output.py
  An extention which collects all images to the documents directory and
-
-=== modified file 'share/extensions/svg_regex.py'
---- a/share/extensions/svg_regex.py	2009-08-04 20:15:08 +0000
-+++ b/share/extensions/svg_regex.py	2010-07-24 17:56:48 +0000
+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
+--- inkscape_0.48.1-2ubuntu5~/share/extensions/svg_regex.py	2011-05-30 17:38:10.000000000 +0100
++++ inkscape_0.48.1-2ubuntu5/share/extensions/svg_regex.py	2011-05-30 17:43:57.903386425 +0100
 @@ -1,3 +1,4 @@
 +#!/usr/bin/env python
  # This software is OSI Certified Open Source Software.
  # OSI Certified is a certification mark of the Open Source Initiative.
  # 
-
-=== modified file 'share/extensions/text_braille.py'
---- a/share/extensions/text_braille.py	2008-03-29 10:21:03 +0000
-+++ b/share/extensions/text_braille.py	2010-07-24 17:56:48 +0000
+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
+--- inkscape_0.48.1-2ubuntu5~/share/extensions/text_braille.py	2011-05-30 17:38:10.000000000 +0100
++++ inkscape_0.48.1-2ubuntu5/share/extensions/text_braille.py	2011-05-30 17:43:57.903386425 +0100
 @@ -1,3 +1,4 @@
 +#!/usr/bin/env python
  #encoding: utf-8
  import chardataeffect, inkex, string
  
-
-=== modified file 'share/extensions/text_flipcase.py'
---- a/share/extensions/text_flipcase.py	2008-03-29 10:21:03 +0000
-+++ b/share/extensions/text_flipcase.py	2010-07-24 17:56:48 +0000
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
- import chardataeffect, inkex, string
- 
- class C(chardataeffect.CharDataEffect):
-
-=== modified file 'share/extensions/text_lowercase.py'
---- a/share/extensions/text_lowercase.py	2008-03-29 10:21:03 +0000
-+++ b/share/extensions/text_lowercase.py	2010-07-24 17:56:48 +0000
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
- import chardataeffect, inkex, string
- 
- class C(chardataeffect.CharDataEffect):
-
-=== modified file 'share/extensions/text_randomcase.py'
---- a/share/extensions/text_randomcase.py	2008-03-29 10:21:03 +0000
-+++ b/share/extensions/text_randomcase.py	2010-07-24 17:56:48 +0000
+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
+--- inkscape_0.48.1-2ubuntu5~/share/extensions/text_flipcase.py	2011-05-30 17:38:10.000000000 +0100
++++ inkscape_0.48.1-2ubuntu5/share/extensions/text_flipcase.py	2011-05-30 17:43:57.903386425 +0100
+@@ -1,3 +1,4 @@
++#!/usr/bin/env python
+ import chardataeffect, inkex, string
+ 
+ class C(chardataeffect.CharDataEffect):
+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
+--- inkscape_0.48.1-2ubuntu5~/share/extensions/text_lowercase.py	2011-05-30 17:38:10.000000000 +0100
++++ inkscape_0.48.1-2ubuntu5/share/extensions/text_lowercase.py	2011-05-30 17:43:57.903386425 +0100
+@@ -1,3 +1,4 @@
++#!/usr/bin/env python
+ import chardataeffect, inkex, string
+ 
+ class C(chardataeffect.CharDataEffect):
+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
+--- inkscape_0.48.1-2ubuntu5~/share/extensions/text_randomcase.py	2011-05-30 17:38:10.000000000 +0100
++++ inkscape_0.48.1-2ubuntu5/share/extensions/text_randomcase.py	2011-05-30 17:43:57.903386425 +0100
 @@ -1,3 +1,4 @@
 +#!/usr/bin/env python
  import chardataeffect, inkex, string
  
  import random
-
-=== modified file 'share/extensions/text_replace.py'
---- a/share/extensions/text_replace.py	2008-05-23 06:15:31 +0000
-+++ b/share/extensions/text_replace.py	2010-07-24 17:56:48 +0000
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
- import chardataeffect, inkex, string
- 
- class C(chardataeffect.CharDataEffect):
-
-=== modified file 'share/extensions/text_sentencecase.py'
---- a/share/extensions/text_sentencecase.py	2008-03-29 10:21:03 +0000
-+++ b/share/extensions/text_sentencecase.py	2010-07-24 17:56:48 +0000
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
- import chardataeffect, inkex, string
- 
- class C(chardataeffect.CharDataEffect):
-
-=== modified file 'share/extensions/text_titlecase.py'
---- a/share/extensions/text_titlecase.py	2008-03-29 10:21:03 +0000
-+++ b/share/extensions/text_titlecase.py	2010-07-24 17:56:48 +0000
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
- import chardataeffect, inkex, string
- 
- class C(chardataeffect.CharDataEffect):
-
-=== modified file 'share/extensions/text_uppercase.py'
---- a/share/extensions/text_uppercase.py	2008-03-29 10:21:03 +0000
-+++ b/share/extensions/text_uppercase.py	2010-07-24 17:56:48 +0000
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
- import chardataeffect, inkex, string
- 
- class C(chardataeffect.CharDataEffect):
-
-diff --git a/share/extensions/voronoi.py b/share/extensions/voronoi.py
-index be15fbe..923298d 100644
---- a/share/extensions/voronoi.py
-+++ b/share/extensions/voronoi.py
+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
+--- inkscape_0.48.1-2ubuntu5~/share/extensions/text_replace.py	2011-05-30 17:38:10.000000000 +0100
++++ inkscape_0.48.1-2ubuntu5/share/extensions/text_replace.py	2011-05-30 17:43:57.903386425 +0100
+@@ -1,3 +1,4 @@
++#!/usr/bin/env python
+ import chardataeffect, inkex, string
+ 
+ class C(chardataeffect.CharDataEffect):
+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
+--- inkscape_0.48.1-2ubuntu5~/share/extensions/text_sentencecase.py	2011-05-30 17:38:10.000000000 +0100
++++ inkscape_0.48.1-2ubuntu5/share/extensions/text_sentencecase.py	2011-05-30 17:43:57.903386425 +0100
+@@ -1,3 +1,4 @@
++#!/usr/bin/env python
+ import chardataeffect, inkex, string
+ 
+ class C(chardataeffect.CharDataEffect):
+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
+--- inkscape_0.48.1-2ubuntu5~/share/extensions/text_titlecase.py	2011-05-30 17:38:10.000000000 +0100
++++ inkscape_0.48.1-2ubuntu5/share/extensions/text_titlecase.py	2011-05-30 17:43:57.913386425 +0100
+@@ -1,3 +1,4 @@
++#!/usr/bin/env python
+ import chardataeffect, inkex, string
+ 
+ class C(chardataeffect.CharDataEffect):
+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
+--- inkscape_0.48.1-2ubuntu5~/share/extensions/text_uppercase.py	2011-05-30 17:38:10.000000000 +0100
++++ inkscape_0.48.1-2ubuntu5/share/extensions/text_uppercase.py	2011-05-30 17:43:57.913386425 +0100
+@@ -1,3 +1,4 @@
++#!/usr/bin/env python
+ import chardataeffect, inkex, string
+ 
+ class C(chardataeffect.CharDataEffect):
+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
+--- inkscape_0.48.1-2ubuntu5~/share/extensions/voronoi.py	2011-05-30 17:38:10.000000000 +0100
++++ inkscape_0.48.1-2ubuntu5/share/extensions/voronoi.py	2011-05-30 17:43:57.913386425 +0100
 @@ -1,3 +1,4 @@
 +#! /usr/bin/env python
  #############################################################################
  #
  # Voronoi diagram calculator/ Delaunay triangulator
-

=== 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 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+# From: JazzyNico <[e-mail]>
+# Description: Fix layer structure in fontforge glyph template
+# Origin: upstream, https://bazaar.launchpad.net/~inkscape.dev/inkscape/trunk/revision/9693
+# Bug: https://launchpad.net/bugs/565296
+# Bug-Ubuntu: https://launchpad.net/bugs/565296
+# Last-Update: 2011-05-30
+
+@DPATCH@
+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
+--- inkscape_0.48.1-2ubuntu5~/share/templates/fontforge_glyph.svg	2011-05-30 17:38:10.000000000 +0100
++++ inkscape_0.48.1-2ubuntu5/share/templates/fontforge_glyph.svg	2011-05-30 18:41:57.088216494 +0100
+@@ -1,32 +1,17 @@
+ <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+ <!-- Created with Inkscape (http://www.inkscape.org/) -->
+ <svg
+-   xmlns:dc="http://purl.org/dc/elements/1.1/"
+-   xmlns:cc="http://creativecommons.org/ns#"
+-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+-   xmlns:svg="http://www.w3.org/2000/svg"
+    xmlns="http://www.w3.org/2000/svg"
+    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+-   version="1.0"
++   xmlns:xlink="http://www.w3.org/1999/xlink"
++   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
++   xmlns:cc="http://web.resource.org/cc/"
++   xmlns:dc="http://purl.org/dc/elements/1.1/"
+    width="1000"
+-   height="1000"
+-   id="svg5496"
+-   sodipodi:version="0.32"
+-   inkscape:version="0.45+devel"
+-   sodipodi:docname="fontforge_glyph.svg"
+-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+-  <metadata
+-     id="metadata5594">
+-    <rdf:RDF>
+-      <cc:Work
+-         rdf:about="">
+-        <dc:format>image/svg+xml</dc:format>
+-        <dc:type
+-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+-      </cc:Work>
+-    </rdf:RDF>
+-  </metadata>
++   height="1000">
++  <defs
++     id="defs5498" />
+   <sodipodi:namedview
+      inkscape:window-height="618"
+      inkscape:window-width="641"
+@@ -44,14 +29,25 @@
+      inkscape:cy="500"
+      inkscape:window-x="0"
+      inkscape:window-y="25"
+-     inkscape:current-layer="svg5496">
+-    <sodipodi:guide
++     inkscape:current-layer="layer1">
++  <sodipodi:guide
+        orientation="horizontal"
+        position="200"
+        id="guide5596" />
+   </sodipodi:namedview>
+-  <defs
+-     id="defs5498" />
++  <metadata
++     id="metadata5594">
++    <rdf:RDF>
++      <cc:Work
++         rdf:about="">
++        <dc:format>image/svg+xml</dc:format>
++        <dc:type
++           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
++      </cc:Work>
++    </rdf:RDF>
++  </metadata>
+   <g
++     inkscape:label="Layer 1"
++     inkscape:groupmode="layer"
+      id="layer1" />
+ </svg>

=== 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 @@
 
 build:  config.status
 	dh_testdir
-	cd po; intltool-update -p
 
 ifneq "$(wildcard /usr/share/misc/config.sub)" ""
 	cp -f /usr/share/misc/config.sub config.sub