=== modified file 'debian/changelog' --- debian/changelog 2012-03-06 19:01:58 +0000 +++ debian/changelog 2012-03-27 20:25:55 +0000 @@ -1,3 +1,50 @@ +inkscape (0.48.3.1-1ubuntu1) precise; urgency=low + + * Merge from Debian Unstable (LP: #966221). Remaining changes: + - debian/control: + + Ubuntu maintainers + + Build against lcms2 (LP: #885324) + + Drop build-dependency on specific libwpd/libwpg version. + + promote libgnomevfs2-extra to recommends (lp: #496223) + + Demote pstoedit to Suggests (universe package). + + Suggest transfig to allow import of xfig files (LP: #668300) + + Drop unnecessary python and skencil suggestions (LP: #762541) + + Promote python-lxml, python-numpy, python-uniconvertor to Recommends. + - Handle translation tasks for Ubuntu main (LP: #726850): + + debian/rules: Add dh_translations to binary-arch rule + + debian/control: Build-Depends dh-translations + - debian/patches/01_add_unity_quicklist_support.patch: add "New Drawing" + to Unity quicklist (LP: #676886) + + -- Alex Valavanis Tue, 27 Mar 2012 20:47:17 +0100 + +inkscape (0.48.3.1-1) unstable; urgency=low + + * [cb1a6e2] delete 01-libwpg0.2.dpatch since proper patch appied upstream + * [041bdd7] delete 02-add-shebangs-and-fix-permissions.dpatch (applied + upstream) + * [518e31b] delete 03-add-missing-mimetypes.dpatch (applied upstream) + * [df995c3] add datamatrix patch from ubuntu (closes: #618835) + * [169ca97] Imported Upstream version 0.48.3.1, this handles the following + debian bugs: + - closes: #665560: inkscape: Including individual glib headers no longer + supported + - closes: #627637: JessyInk: Embedded Javascript Broken + - closes: #559332: inkscape: Cairo rendering broken for "use" elements + with scaling or a viewBox + - closes: #596836: clipart search spews messages in console + - closes: #628035: inkscape: in the pdf export dialog a wrong pdf version + is reported + - closes: #651196: French manpage has accents replaced by some garbage + - closes: #633150: inkscape: New upstream version 0.48.3 is available + * [3f6e27a] use quilt instead of dpatch for patch handling + * [dd10775] Acknowledge NMU, inkscape doesn't register for handling of pdf + and ps anymore (closes: #613752) + * upload sponsored by Guido Guenther + Thank you very much! + + -- Wolfram Quester Sun, 25 Mar 2012 13:51:37 +0200 + inkscape (0.48.3.1-0ubuntu2) precise; urgency=low * promote libgnomevfs2-extra to recommends (lp: #496223) === modified file 'debian/control' --- debian/control 2012-03-04 23:45:24 +0000 +++ debian/control 2012-03-27 20:31:33 +0000 @@ -10,7 +10,6 @@ automake, debhelper (>= 7.0.0), dh-translations, - dpatch, intltool, libart-2.0-dev (>= 2.3.10), libaspell-dev, @@ -37,6 +36,7 @@ libxslt1-dev, pkg-config, python-dev, + quilt, zlib1g-dev Standards-Version: 3.8.1 === removed file 'debian/patches/00list' --- debian/patches/00list 2012-02-16 10:21:27 +0000 +++ debian/patches/00list 1970-01-01 00:00:00 +0000 @@ -1,2 +0,0 @@ -01_add_unity_quicklist_support.patch -fix-datamatrix-ui.dpatch === added file 'debian/patches/01-fix-datamatrix-ui.dpatch' --- debian/patches/01-fix-datamatrix-ui.dpatch 1970-01-01 00:00:00 +0000 +++ debian/patches/01-fix-datamatrix-ui.dpatch 2012-03-27 19:18:45 +0000 @@ -0,0 +1,147 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +# From: JazzyNico +# Description: Prevent invalid input in Datamatrix extension dialog +# Origin: upstream, https://bazaar.launchpad.net/~inkscape.dev/inkscape/trunk/revision/10127 +# Bug: https://launchpad.net/bugs/738108 +# Bug-Debian: http://bugs.debian.org/618835 +# Bug-Ubuntu: https://launchpad.net/bugs/738108 +# Last-Update: 2011-06-02 + +@DPATCH@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' fix-791728~/share/extensions/render_barcode_datamatrix.inx fix-791728/share/extensions/render_barcode_datamatrix.inx +--- fix-791728~/share/extensions/render_barcode_datamatrix.inx 2011-06-02 09:40:37.000000000 +0100 ++++ fix-791728/share/extensions/render_barcode_datamatrix.inx 2011-06-02 18:05:57.251139168 +0100 +@@ -4,10 +4,40 @@ + il.datamatrix + render_barcode_datamatrix.py + inkex.py +- Inkscape +- 10 +- 10 +- 4 ++ Inkscape ++ ++ 10x10 ++ 12x12 ++ 14x14 ++ 16x16 ++ 18x18 ++ 20x20 ++ 22x22 ++ 24x24 ++ 26x26 ++ 32x32 ++ 36x36 ++ 40x40 ++ 44x44 ++ 48x48 ++ 52x52 ++ 64x64 ++ 72x72 ++ 80x80 ++ 88x88 ++ 96x96 ++ 104x104 ++ 120x120 ++ 132x132 ++ 144x144 ++ 8x18 ++ 8x32 ++ 12x26 ++ 12x36 ++ 16x36 ++ 16x48 ++ ++ 4 + + all + +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' fix-791728~/share/extensions/render_barcode_datamatrix.py fix-791728/share/extensions/render_barcode_datamatrix.py +--- fix-791728~/share/extensions/render_barcode_datamatrix.py 2011-06-02 09:40:37.000000000 +0100 ++++ fix-791728/share/extensions/render_barcode_datamatrix.py 2011-06-02 18:05:57.381139168 +0100 +@@ -57,6 +57,39 @@ + import gettext + _ = gettext.gettext + ++symbols = { ++ 'sq10': (10, 10), ++ 'sq12': (12, 12), ++ 'sq14': (14, 14), ++ 'sq16': (16, 16), ++ 'sq18': (18, 18), ++ 'sq20': (20, 20), ++ 'sq22': (22, 22), ++ 'sq24': (24, 24), ++ 'sq26': (26, 26), ++ 'sq32': (32, 32), ++ 'sq36': (36, 36), ++ 'sq40': (40, 40), ++ 'sq44': (44, 44), ++ 'sq48': (48, 48), ++ 'sq52': (52, 52), ++ 'sq64': (64, 64), ++ 'sq72': (72, 72), ++ 'sq80': (80, 80), ++ 'sq88': (88, 88), ++ 'sq96': (96, 96), ++ 'sq104': (104, 104), ++ 'sq120': (120, 120), ++ 'sq132': (132, 132), ++ 'sq144': (144, 144), ++ 'rect8x18': (8, 18), ++ 'rect8x32': (8, 32), ++ 'rect12x26': (12, 26), ++ 'rect12x36': (12, 36), ++ 'rect16x36': (16, 36), ++ 'rect16x48': (16, 48), ++} ++ + #ENCODING ROUTINES =================================================== + # Take an input string and convert it to a sequence (or sequences) + # of codewords as specified in ISO/IEC 16022:2006 (section 5.2.3) +@@ -167,6 +200,7 @@ + #RETURN ERROR + else: + inkex.errormsg(_('Unrecognised DataMatrix size')) ++ exit(0) + + return None + +@@ -616,6 +650,9 @@ + self.OptionParser.add_option("--text", + action="store", type="string", + dest="TEXT", default='Inkscape') ++ self.OptionParser.add_option("--symbol", ++ action="store", type="string", ++ dest="SYMBOL", default='') + self.OptionParser.add_option("--rows", + action="store", type="int", + dest="ROWS", default=10) +@@ -630,6 +667,12 @@ + + so = self.options + ++ rows = so.ROWS ++ cols = so.COLS ++ if (so.SYMBOL != '' and (so.SYMBOL in symbols)): ++ rows = symbols[so.SYMBOL][0] ++ cols = symbols[so.SYMBOL][1] ++ + if so.TEXT == '': #abort if converting blank text + inkex.errormsg(_('Please enter an input string')) + else: +@@ -644,11 +687,11 @@ + grp = inkex.etree.SubElement(self.current_layer, 'g', grp_attribs)#the group to put everything in + + #GENERATE THE DATAMATRIX +- encoded = encode( so.TEXT, (so.ROWS, so.COLS) ) #get the pattern of squares +- render_data_matrix( encoded, so.SIZE, so.COLS*so.SIZE*1.5, grp ) # generate the SVG elements ++ encoded = encode( so.TEXT, (rows, cols) ) #get the pattern of squares ++ render_data_matrix( encoded, so.SIZE, cols*so.SIZE*1.5, grp ) # generate the SVG elements + + if __name__ == '__main__': + e = DataMatrix() + e.affect() + +-# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 encoding=utf-8 textwidth=99 ++# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 fileencoding=utf-8 textwidth=99 === added file 'debian/patches/01_add_unity_quicklist_support.patch' --- debian/patches/01_add_unity_quicklist_support.patch 1970-01-01 00:00:00 +0000 +++ debian/patches/01_add_unity_quicklist_support.patch 2012-03-27 20:22:47 +0000 @@ -0,0 +1,19 @@ +# Description: Add Unity static quicklist support to inkscape +# Forwarded: https://bugs.launchpad.net/inkscape/+bug/676886 +# Bug-Ubuntu: https://bugs.launchpad.net/bugs/676886 +# Author: Didier Roche + +Index: fix-966221/inkscape.desktop.in +=================================================================== +--- fix-966221.orig/inkscape.desktop.in 2012-03-27 21:18:48.097841449 +0100 ++++ fix-966221/inkscape.desktop.in 2012-03-27 21:19:37.049839772 +0100 +@@ -12,3 +12,9 @@ + Terminal=false + StartupNotify=true + Icon=inkscape ++X-Ayatana-Desktop-Shortcuts=Drawing ++ ++[Drawing Shortcut Group] ++_Name=New Drawing ++Exec=inkscape ++TargetEnvironment=Unity === removed file 'debian/patches/01_add_unity_quicklist_support.patch.dpatch' --- debian/patches/01_add_unity_quicklist_support.patch.dpatch 2011-06-01 18:05:51 +0000 +++ debian/patches/01_add_unity_quicklist_support.patch.dpatch 1970-01-01 00:00:00 +0000 @@ -1,20 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -# Description: Add Unity static quicklist support to inkscape -# Forwarded: https://bugs.launchpad.net/inkscape/+bug/676886 -# Bug-Ubuntu: https://bugs.launchpad.net/bugs/676886 -# Author: Didier Roche - -@DPATCH@ -diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/inkscape.desktop.in inkscape-0.48.1/inkscape.desktop.in ---- inkscape-0.48.1~/inkscape.desktop.in 2010-07-13 05:48:40.000000000 +0200 -+++ inkscape-0.48.1/inkscape.desktop.in 2011-02-17 16:21:42.690388423 +0100 -@@ -12,3 +12,9 @@ - Terminal=false - StartupNotify=true - Icon=inkscape -+X-Ayatana-Desktop-Shortcuts=Drawing -+ -+[Drawing Shortcut Group] -+_Name=New Drawing -+Exec=inkscape -+TargetEnvironment=Unity === added file 'debian/patches/02-drop-pdf-ps.diff' --- debian/patches/02-drop-pdf-ps.diff 1970-01-01 00:00:00 +0000 +++ debian/patches/02-drop-pdf-ps.diff 2012-03-27 19:18:45 +0000 @@ -0,0 +1,14 @@ +diff --git a/inkscape.desktop.in b/inkscape.desktop.in +index 5c0de64..62ce1e4 100644 +--- a/inkscape.desktop.in ++++ b/inkscape.desktop.in +@@ -6,7 +6,7 @@ _X-GNOME-FullName=Inkscape Vector Graphics Editor + _Comment=Create and edit Scalable Vector Graphics images + Type=Application + Categories=Graphics;VectorGraphics;GTK; +-MimeType=image/svg+xml;image/svg+xml-compressed;application/vnd.corel-draw;application/pdf;application/postscript;image/x-eps;application/illustrator; ++MimeType=image/svg+xml;image/svg+xml-compressed;application/vnd.corel-draw;image/x-eps;application/illustrator; + Exec=inkscape %F + TryExec=inkscape + Terminal=false + === removed file 'debian/patches/fix-datamatrix-ui.dpatch' --- debian/patches/fix-datamatrix-ui.dpatch 2011-07-10 11:35:30 +0000 +++ debian/patches/fix-datamatrix-ui.dpatch 1970-01-01 00:00:00 +0000 @@ -1,147 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -# From: JazzyNico -# Description: Prevent invalid input in Datamatrix extension dialog -# Origin: upstream, https://bazaar.launchpad.net/~inkscape.dev/inkscape/trunk/revision/10127 -# Bug: https://launchpad.net/bugs/738108 -# Bug-Debian: http://bugs.debian.org/618835 -# Bug-Ubuntu: https://launchpad.net/bugs/738108 -# Last-Update: 2011-06-02 - -@DPATCH@ -diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' fix-791728~/share/extensions/render_barcode_datamatrix.inx fix-791728/share/extensions/render_barcode_datamatrix.inx ---- fix-791728~/share/extensions/render_barcode_datamatrix.inx 2011-06-02 09:40:37.000000000 +0100 -+++ fix-791728/share/extensions/render_barcode_datamatrix.inx 2011-06-02 18:05:57.251139168 +0100 -@@ -4,10 +4,40 @@ - il.datamatrix - render_barcode_datamatrix.py - inkex.py -- Inkscape -- 10 -- 10 -- 4 -+ Inkscape -+ -+ 10x10 -+ 12x12 -+ 14x14 -+ 16x16 -+ 18x18 -+ 20x20 -+ 22x22 -+ 24x24 -+ 26x26 -+ 32x32 -+ 36x36 -+ 40x40 -+ 44x44 -+ 48x48 -+ 52x52 -+ 64x64 -+ 72x72 -+ 80x80 -+ 88x88 -+ 96x96 -+ 104x104 -+ 120x120 -+ 132x132 -+ 144x144 -+ 8x18 -+ 8x32 -+ 12x26 -+ 12x36 -+ 16x36 -+ 16x48 -+ -+ 4 - - all - -diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' fix-791728~/share/extensions/render_barcode_datamatrix.py fix-791728/share/extensions/render_barcode_datamatrix.py ---- fix-791728~/share/extensions/render_barcode_datamatrix.py 2011-06-02 09:40:37.000000000 +0100 -+++ fix-791728/share/extensions/render_barcode_datamatrix.py 2011-06-02 18:05:57.381139168 +0100 -@@ -57,6 +57,39 @@ - import gettext - _ = gettext.gettext - -+symbols = { -+ 'sq10': (10, 10), -+ 'sq12': (12, 12), -+ 'sq14': (14, 14), -+ 'sq16': (16, 16), -+ 'sq18': (18, 18), -+ 'sq20': (20, 20), -+ 'sq22': (22, 22), -+ 'sq24': (24, 24), -+ 'sq26': (26, 26), -+ 'sq32': (32, 32), -+ 'sq36': (36, 36), -+ 'sq40': (40, 40), -+ 'sq44': (44, 44), -+ 'sq48': (48, 48), -+ 'sq52': (52, 52), -+ 'sq64': (64, 64), -+ 'sq72': (72, 72), -+ 'sq80': (80, 80), -+ 'sq88': (88, 88), -+ 'sq96': (96, 96), -+ 'sq104': (104, 104), -+ 'sq120': (120, 120), -+ 'sq132': (132, 132), -+ 'sq144': (144, 144), -+ 'rect8x18': (8, 18), -+ 'rect8x32': (8, 32), -+ 'rect12x26': (12, 26), -+ 'rect12x36': (12, 36), -+ 'rect16x36': (16, 36), -+ 'rect16x48': (16, 48), -+} -+ - #ENCODING ROUTINES =================================================== - # Take an input string and convert it to a sequence (or sequences) - # of codewords as specified in ISO/IEC 16022:2006 (section 5.2.3) -@@ -167,6 +200,7 @@ - #RETURN ERROR - else: - inkex.errormsg(_('Unrecognised DataMatrix size')) -+ exit(0) - - return None - -@@ -616,6 +650,9 @@ - self.OptionParser.add_option("--text", - action="store", type="string", - dest="TEXT", default='Inkscape') -+ self.OptionParser.add_option("--symbol", -+ action="store", type="string", -+ dest="SYMBOL", default='') - self.OptionParser.add_option("--rows", - action="store", type="int", - dest="ROWS", default=10) -@@ -630,6 +667,12 @@ - - so = self.options - -+ rows = so.ROWS -+ cols = so.COLS -+ if (so.SYMBOL != '' and (so.SYMBOL in symbols)): -+ rows = symbols[so.SYMBOL][0] -+ cols = symbols[so.SYMBOL][1] -+ - if so.TEXT == '': #abort if converting blank text - inkex.errormsg(_('Please enter an input string')) - else: -@@ -644,11 +687,11 @@ - grp = inkex.etree.SubElement(self.current_layer, 'g', grp_attribs)#the group to put everything in - - #GENERATE THE DATAMATRIX -- encoded = encode( so.TEXT, (so.ROWS, so.COLS) ) #get the pattern of squares -- render_data_matrix( encoded, so.SIZE, so.COLS*so.SIZE*1.5, grp ) # generate the SVG elements -+ encoded = encode( so.TEXT, (rows, cols) ) #get the pattern of squares -+ render_data_matrix( encoded, so.SIZE, cols*so.SIZE*1.5, grp ) # generate the SVG elements - - if __name__ == '__main__': - e = DataMatrix() - e.affect() - --# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 encoding=utf-8 textwidth=99 -+# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 fileencoding=utf-8 textwidth=99 === added file 'debian/patches/series' --- debian/patches/series 1970-01-01 00:00:00 +0000 +++ debian/patches/series 2012-03-27 20:18:34 +0000 @@ -0,0 +1,3 @@ +01-fix-datamatrix-ui.dpatch +02-drop-pdf-ps.diff +01_add_unity_quicklist_support.patch === modified file 'debian/rules' --- debian/rules 2011-05-30 17:02:03 +0000 +++ debian/rules 2012-03-27 20:10:45 +0000 @@ -6,8 +6,8 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -# use dpatch: -include /usr/share/dpatch/dpatch.make +# use quilt for patches: +include /usr/share/quilt/quilt.make # These are used for cross-compiling and for saving the configure script # from having to guess our platform (since we know it already) @@ -99,6 +99,8 @@ install -D -o root -g root -m 644 $(CURDIR)/debian/inkscape.bash $(CURDIR)/debian/inkscape/etc/bash_completion.d/inkscape chmod a+x $(CURDIR)/debian/inkscape/usr/share/inkscape/extensions/xaml2svg/ + + # Build architecture-independent files here. binary-indep: build install # We have nothing to do by default.