Package: auto-multiple-choice
Version: 1.0.3-1
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu ubuntu-patch precise

Hello,

librsvg 2.35 dropped the old "rsvg" compatibility script [1]. As soon
as this lands in Debian, auto-multiple-choice will FTBFS. (We already
have librsvg 2.35 in Ubuntu, that's how I noticed).

Attached debdiff will use rsvg-convert instead, which works with both
old and future librsvg versions.

Thanks for considering,

Martin

[1] 
http://git.gnome.org/browse/librsvg/commit/?id=fd76212e2dc8e41b2c23d6e76c02cc7803da4a12
-- 
Martin Pitt                        | http://www.piware.de
Ubuntu Developer (www.ubuntu.com)  | Debian Developer  (www.debian.org)
 * Add 40-rsvg-convert.patch: Use rsvg-convert, the old "rsvg" script is gone
   since librsvg 2.35.
--- auto-multiple-choice-1.0.3/debian/patches/40-rsvg-convert.patch     
1970-01-01 01:00:00.000000000 +0100
+++ auto-multiple-choice-1.0.3/debian/patches/40-rsvg-convert.patch     
2012-02-14 08:49:45.000000000 +0100
@@ -0,0 +1,33 @@
+Description: Use rsvg-convert, the old "rsvg" script is gone since librsvg 
2.35.
+Author: Martin Pitt <martin.p...@ubuntu.com>
+
+Index: auto-multiple-choice-1.0.3/doc/Makefile
+===================================================================
+--- auto-multiple-choice-1.0.3.orig/doc/Makefile       2012-02-14 
08:48:47.000000000 +0100
++++ auto-multiple-choice-1.0.3/doc/Makefile    2012-02-14 08:48:51.000000000 
+0100
+@@ -40,10 +40,10 @@
+       rm -f *~
+ 
+ html/images/callouts/%.png: img_src/callouts/%.svg
+-      rsvg -w 12 -h 12 $< $@
++      rsvg-convert -w 12 -h 12 $< -o $@
+ 
+ html/images/%.png: img_src/%.svg
+-      rsvg -w 24 -h 24 $< $@
++      rsvg-convert -w 24 -h 24 $< -o $@
+ 
+ %.tex: %.xml
+       dblatex -t tex --xslt-opts="--nonet" --xslt-opts="--catalogs" 
$(DBLATEX_OPT) $< -o $@
+Index: auto-multiple-choice-1.0.3/Makefile
+===================================================================
+--- auto-multiple-choice-1.0.3.orig/Makefile   2012-02-14 08:48:51.000000000 
+0100
++++ auto-multiple-choice-1.0.3/Makefile        2012-02-14 08:49:41.936004967 
+0100
+@@ -152,7 +152,7 @@
+       convert -density 300 $< $*-%03d.ppm
+ 
+ %.png: %.svg
+-      rsvg -w 32 -h 32 $< $@
++      rsvg-convert -w 32 -h 32 $< -o $@
+ 
+ %.xpm: %.png
+       pngtopnm $< | ppmtoxpm > $@
diff -Nru auto-multiple-choice-1.0.3/debian/patches/series 
auto-multiple-choice-1.0.3/debian/patches/series
--- auto-multiple-choice-1.0.3/debian/patches/series    2011-12-22 
18:49:21.000000000 +0100
+++ auto-multiple-choice-1.0.3/debian/patches/series    2012-02-14 
08:47:07.000000000 +0100
@@ -1,3 +1,4 @@
 05-Makefile.patch
 20-en.po.patch
 30-gcc4.6.path
+40-rsvg-convert.patch

Attachment: signature.asc
Description: Digital signature

Reply via email to