Hi Wolfram and Charles On Mon, Dec 15, 2008 at 06:28:24AM +0100, Salvatore Bonaccorso wrote: > I'm not a Debian Developer nor a Debian Maintainer yet, so I think I > cannot myself propose a NMU. (and then a unblock request to the > release managers). > > If you agree, I would prepare a package inkscape_0.46-2.lenny2 > applying the 05_fix_latex_patch.dpatch, and if you agree also one for > unstable (0.46-3.1) as NMU.
The files are uploaded to: http://people.ee.ethz.ch/~bonaccos/debian/inkscape/ In particular: http://people.ee.ethz.ch/~bonaccos/debian/inkscape/inkscape_0.46-2.lenny2.dsc http://people.ee.ethz.ch/~bonaccos/debian/inkscape/inkscape_0.46-2.lenny2.diff.gz http://people.ee.ethz.ch/~bonaccos/debian/inkscape/inkscape_0.46.orig.tar.gz Changelog entry: ---(0.46-2.lenny2 changelog)----------------------------------------- inkscape (0.46-2.lenny2) testing; urgency=low * Non-maintainer upload. * Add patch to give back LaTeX formula rendering option (Closes: #464154, #506285). * Add debian/watch file (Closes: #508690). * Fix lintian warning: menu-item-uses-apps-section (Closes: #508692). * Add support in bash completition file for svgz and pdf (Closes: #428226). -- Salvatore Bonaccorso <salvatore.bonacco...@gmail.com> Thu, 18 Dec 2008 21:06:33 +0100 --------------------------------------------------------------------- Attached to the email is further the debdiff between 0.46-2.lenny1 and 0.46-2.lenny2. The "same" would apply to sid. Further I do not know if it would be good to move python-lxml to Recommends? I would like to say, that I'm to "aggressive" I'm sorry. I wouldn't in any case try to "steal" or hijack your package! Would only like to see "fixed" (regarding LaTeX issue) package if possible in Lenny ;-) Kind regards and thanks Salvatore Bonaccorso -- .-. Debian GNU/Linux -- The power of freedom ---------------------- oo| Salvatore Bonaccorso Email: salvatore.bonacco...@gmail.com /`'\ GPG key ID: 0x518DA394 http://arda.homelinux.org/~salvi/ (\_;/) Fingerprint: 346C D422 1366 FA52 D898 5666 BD45 6753 518D A394
diff -u inkscape-0.46/debian/inkscape.menu inkscape-0.46/debian/inkscape.menu
--- inkscape-0.46/debian/inkscape.menu
+++ inkscape-0.46/debian/inkscape.menu
@@ -1,4 +1,4 @@
-?package(inkscape): needs="X11" section="Apps/Graphics"\
+?package(inkscape): needs="X11" section="Applications/Graphics"\
hints="Vector"\
title="Inkscape" command="/usr/bin/inkscape"\
icon="/usr/share/pixmaps/inkscape.xpm"\
diff -u inkscape-0.46/debian/changelog inkscape-0.46/debian/changelog
--- inkscape-0.46/debian/changelog
+++ inkscape-0.46/debian/changelog
@@ -1,3 +1,15 @@
+inkscape (0.46-2.lenny2) testing; urgency=low
+
+ * Non-maintainer upload.
+ * Add patch to give back LaTeX formula rendering option
+ (Closes: #464154, #506285).
+ * Add debian/watch file (Closes: #508690).
+ * Fix lintian warning: menu-item-uses-apps-section (Closes: #508692).
+ * Add support in bash completition file for svgz and pdf
+ (Closes: #428226).
+
+ -- Salvatore Bonaccorso <salvatore.bonacco...@gmail.com> Thu, 18 Dec 2008 21:06:33 +0100
+
inkscape (0.46-2.lenny1) testing; urgency=low
* Non-maintainer upload.
diff -u inkscape-0.46/debian/inkscape.bash inkscape-0.46/debian/inkscape.bash
--- inkscape-0.46/debian/inkscape.bash
+++ inkscape-0.46/debian/inkscape.bash
@@ -18,7 +18,7 @@
-j --export-id-only -t --export-use-hints -b --export-background= \
-y --export-background-opacity= -l --export-plain-svg= -s --slideshow' -- $cur ) )
else
- _filedir '@(svg|ai|dia|eps|ani|bmp|cur|gif|ico|jpe|jpg|pbm|pcx|pgm|png|ppm|pnm|ras|targa|tga|tif|tiff|wbmp|xbm|xpm|ggr|ps|sk|txt|wmf)'
+ _filedir '@(svg|svgz|ai|dia|eps|ani|bmp|cur|gif|ico|jpe|jpg|pbm|pcx|pgm|png|ppm|pnm|ras|targa|tga|tif|tiff|wbmp|xbm|xpm|ggr|ps|pdf|sk|txt|wmf)'
fi
}
diff -u inkscape-0.46/debian/patches/00list inkscape-0.46/debian/patches/00list
--- inkscape-0.46/debian/patches/00list
+++ inkscape-0.46/debian/patches/00list
@@ -4,0 +5 @@
+05_fix_latex_patch
only in patch2:
unchanged:
--- inkscape-0.46.orig/debian/watch
+++ inkscape-0.46/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://sf.net/inkscape/inkscape-(.*).tar.gz
only in patch2:
unchanged:
--- inkscape-0.46.orig/debian/patches/05_fix_latex_patch.dpatch
+++ inkscape-0.46/debian/patches/05_fix_latex_patch.dpatch
@@ -0,0 +1,74 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 05_fix_latex_patch.dpatch by Salvatore Bonaccorso <salvatore.bonacco...@gmail.com>
+##
+## DP: Fix LaTeX formula rendering
+## DP: Patch is taken from: https://bugs.launchpad.net/inkscape/+bug/55273
+
+...@dpatch@
+
+--- inkscape-0.46.orig/share/extensions/eqtexsvg.py 2008-11-20 21:45:36.339896646 +0100
++++ inkscape-0.46/share/extensions/eqtexsvg.py 2008-11-20 21:46:11.067896917 +0100
+@@ -49,16 +49,18 @@
+ doc_sizeW = max(doc_width,doc_height)
+
+ def clone_and_rewrite(self, node_in):
+- if node_in.tag != 'svg':
+- node_out = inkex.etree.Element(inkex.addNS(node_in.tag,'svg'))
++ in_tag = node_in.tag.rsplit('}',1)[-1]
++ if in_tag != 'svg':
++ node_out = inkex.etree.Element(inkex.addNS(in_tag,'svg'))
+ for name in node_in.attrib:
+ node_out.set(name, node_in.attrib[name])
+ else:
+ node_out = inkex.etree.Element(inkex.addNS('g','svg'))
+ for c in node_in.iterchildren():
+- if c.tag in ('g', 'path', 'polyline', 'polygon'):
++ c_tag = c.tag.rsplit('}',1)[-1]
++ if c_tag in ('g', 'path', 'polyline', 'polygon'):
+ child = clone_and_rewrite(self, c)
+- if c.tag == 'g':
++ if c_tag == 'g':
+ child.set('transform','matrix('+str(doc_sizeH/700.)+',0,0,'+str(-doc_sizeH/700.)+','+str(-doc_sizeH*0.25)+','+str(doc_sizeW*0.75)+')')
+ node_out.append(child)
+
+@@ -86,6 +88,7 @@
+ dvi_file = os.path.join(base_dir, "eq.dvi")
+ svg_file = os.path.join(base_dir, "eq.svg")
+ out_file = os.path.join(base_dir, "eq.out")
++ err_file = os.path.join(base_dir, "eq.err")
+
+ def clean():
+ os.remove(latex_file)
+@@ -95,6 +98,8 @@
+ os.remove(dvi_file)
+ os.remove(svg_file)
+ os.remove(out_file)
++ if os.path.exists(err_file):
++ os.remove(err_file)
+ os.rmdir(base_dir)
+
+ create_equation_tex(latex_file, self.options.formula)
+@@ -109,10 +114,20 @@
+ sys.exit(1)
+
+ os.system('dvips -q -f -E -D 600 -y 5000 -o ' + ps_file + ' ' + dvi_file)
+- #os.system('cd ' + base_dir)
+- os.system('pstoedit -f plot-svg -dt -ssp ' + ps_file + ' ' + svg_file + '> ' + out_file)
+- svg_open(self, svg_file)
++ # cd to base_dir is necessary, because pstoedit
++ # writes temporary files to cwd and needs write
++ # permissions
++ os.system('cd ' + base_dir + ' ; pstoedit -f plot-svg -dt -ssp ' + ps_file + ' ' + svg_file + ' > ' + out_file + ' 2> ' + err_file)
++
++ # forward errors to stderr but skip pstoedit header
++ if os.path.exists(err_file):
++ err_stream = open(err_file, 'r')
++ for line in err_stream:
++ if not line.startswith('pstoedit: version'):
++ sys.stderr.write(line + '\n')
++ err_stream.close()
+
++ svg_open(self, svg_file)
+ clean()
+
+ e = EQTEXSVG()
signature.asc
Description: Digital signature
