[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#601010: please unblock openclipart/0.18+dfsg-10



Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Owner: Miguel Ruiz <debianized@gmail.com>

please unblock openclipart/0.18+dfsg-10

it fixes RC bug #589194

please note that openclipart is an orphan package

the output of both diffstat and debdiff is below

debdiff openclipart_0.18+dfsg-9.dsc openclipart_0.18+dfsg-10.dsc | diffstat
 changelog |   12 ++++++++++++
 control   |    2 +-
 rules     |    5 +++--
 3 files changed, 16 insertions(+), 3 deletions(-)

debdiff openclipart_0.18+dfsg-9.dsc openclipart_0.18+dfsg-10.dsc
diff -u openclipart-0.18+dfsg/debian/changelog openclipart-0.18+dfsg/debian/changelog
--- openclipart-0.18+dfsg/debian/changelog
+++ openclipart-0.18+dfsg/debian/changelog
@@ -1,3 +1,15 @@
+openclipart (0.18+dfsg-10) unstable; urgency=low
+
+  * QA upload.
+  * debian/rules:
+    + Applied patch from Ubuntu. Fixes FTBFS (Closes: #589194)
+      - Skip office/telephone/mobile_phone_01.svg as it appears to be buggy 
+        and causes inkscape to get caught in an infinite loop.
+      - Use inkscape flag -z "Do not use X server".
+      - Thanks to Chris Cheney.
+
+ -- Miguel Ruiz <debianized@gmail.com>  Tue, 05 Oct 2010 00:13:15 -0400
+
 openclipart (0.18+dfsg-9) unstable; urgency=low
 
   * rebuild for OOo 3.2 (closes: #565970)
diff -u openclipart-0.18+dfsg/debian/control openclipart-0.18+dfsg/debian/control
--- openclipart-0.18+dfsg/debian/control
+++ openclipart-0.18+dfsg/debian/control
@@ -1,7 +1,7 @@
 Source: openclipart
 Section: graphics
 Priority: extra
-Maintainer: Rene Engelhard <rene@debian.org>
+Maintainer: Debian QA Group <packages@qa.debian.org>
 Build-Depends-Indep: debhelper (>> 4.0.0), inkscape (>= 0.42.2+0.43pre1-1), fdupes, openoffice.org-dev (>= 1:3.0.0), java-gcj-compat
 Standards-Version: 3.6.2
 Homepage: http://www.openclipart.org
diff -u openclipart-0.18+dfsg/debian/rules openclipart-0.18+dfsg/debian/rules
--- openclipart-0.18+dfsg/debian/rules
+++ openclipart-0.18+dfsg/debian/rules
@@ -43,6 +43,7 @@
 	
 	# Create svg and png files
 	cd $(CURDIR)/clipart && for i in `find . -name "*.svg" -printf "%p " ` ; do \
+		case "$$i" in ./office/telephone/mobile_phone_01.svg) continue ; esac ; \
 		echo "Processing $$i" ; \
 		dir=`dirname $$i` ; \
 		file=`basename $$i` ; \
@@ -52,10 +53,10 @@
 			$(CURDIR)/build/usr/share/openclipart/svg/$$dir/$$file ; \
 		mkdir -p $(CURDIR)/build/usr/share/openclipart/png/$$dir ; \
 		if echo $(OVERSIZED_FILES) | grep -q $$i ; then \
-			inkscape -w 1500 --export-png=$(CURDIR)/build/usr/share/openclipart/png/$$dir/$$pngfile \
+			inkscape -z -w 1500 --export-png=$(CURDIR)/build/usr/share/openclipart/png/$$dir/$$pngfile \
 				 $$dir/$$file ; \
 		else \
-			inkscape --export-png=$(CURDIR)/build/usr/share/openclipart/png/$$dir/$$pngfile \
+			inkscape -z --export-png=$(CURDIR)/build/usr/share/openclipart/png/$$dir/$$pngfile \
 				 $$dir/$$file ; \
 		fi ; \
 	done

Attachment: signature.asc
Description: Digital signature


Reply to: