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 @@ -2,13 +2,14 @@ Section: graphics Priority: extra Maintainer: Debian QA Group -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 +Build-Depends: debhelper (>> 4.0.0) +Build-Depends-Indep: inkscape (>= 0.42.2+0.43pre1-1), fdupes, libreoffice-dev, java-gcj-compat Standards-Version: 3.6.2 Homepage: http://www.openclipart.org Package: openclipart Architecture: all -Depends: openclipart-svg (>= ${Source-Version}), openclipart-png (>= ${Source-Version}), openclipart-openoffice.org (= ${Source-Version}) +Depends: openclipart-svg (>= ${Source-Version}), openclipart-png (>= ${Source-Version}), openclipart-libreoffice (= ${Source-Version}) Description: Open Clip Art Library The Open Clip Art Library is a collection of 100% license-free, royalty-free, and restriction-free art that you can use for any purpose. @@ -43,12 +44,12 @@ -Package: openclipart-openoffice.org +Package: openclipart-libreoffice Architecture: all Depends: ${shlibs:Depends}, ${misc:Depends}, openclipart-png (= ${Source-Version}) -Conflicts: openclipart (<< 0.10+dfsg-3), openoffice.org-common (<< 1:${basis-version}), openoffice.org-common (>= 1:${basis-version}.99) -Recommends: openoffice.org -Description: clip art for OpenOffice.org gallery +Conflicts: openclipart (<< 0.10+dfsg-3), libreoffice-common (<< 1:${basis-version}), libreoffice-common (>= 1:${basis-version}.99) +Recommends: libreoffice +Description: clip art for OpenOffice.org/LibreOffice gallery The Open Clip Art Library is a collection of 100% license-free, royalty-free, and restriction-free art that you can use for any purpose. . - This package contains the OpenOffice.org Gallery info files. + This package contains the OpenOffice.org/LibreOffice Gallery info files. 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,14 +1,24 @@ -openclipart (0.18+dfsg-10) unstable; urgency=low +openclipart (0.18+dfsg-10ubuntu1) natty; 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. + * merging LibreOffice renaming from debian (LP: #739839) (LP: #755989) - -- Miguel Ruiz Tue, 05 Oct 2010 00:13:15 -0400 + -- Bjoern Michaelsen Thu, 28 Apr 2011 20:24:58 +0200 + +openclipart (0.18+dfsg-11) unstable; urgency=low + + * QA upload + * adapt for LibreOffice + + -- Rene Engelhard Sun, 13 Feb 2011 13:11:38 +0100 + +openclipart (0.18+dfsg-10) unstable; urgency=medium + + * QA upload + * set maintainer to Debian QA Group + * throw away empty lines and double lines from the inkscape calls, + thanks Wolfram Quester (closes: #594036) + + -- Rene Engelhard Tue, 24 Aug 2010 23:55:26 +0200 openclipart (0.18+dfsg-9) unstable; urgency=low 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,7 +43,6 @@ # 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` ; \ @@ -53,11 +52,11 @@ $(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 -z -w 1500 --export-png=$(CURDIR)/build/usr/share/openclipart/png/$$dir/$$pngfile \ - $$dir/$$file ; \ + inkscape -w 1500 --export-png=$(CURDIR)/build/usr/share/openclipart/png/$$dir/$$pngfile \ + $$dir/$$file 2>&1 | grep -v "^$$" | uniq; \ else \ - inkscape -z --export-png=$(CURDIR)/build/usr/share/openclipart/png/$$dir/$$pngfile \ - $$dir/$$file ; \ + inkscape --export-png=$(CURDIR)/build/usr/share/openclipart/png/$$dir/$$pngfile \ + $$dir/$$file 2>&1 | grep -v "^$$" | uniq; \ fi ; \ done @@ -82,7 +81,7 @@ # Create OOo gallery files; we need to add the files in hunks # because we othererwise may get too many arguments.... - mkdir -p $(CURDIR)/build/usr/lib/openoffice/$(shell readlink /usr/lib/openoffice/basis-link)/share/gallery + mkdir -p $(CURDIR)/build/usr/lib/libreoffice/$(shell readlink /usr/lib/libreoffice/basis-link)/share/gallery for dir in `find build/usr/share/openclipart/png -mindepth 1 -maxdepth 1 -type d | LC_CTYPE=C sort` ; do \ gal_name=$${dir##*/}; \ gal_oooname=`echo $$gal_name | awk '{gsub("_"," ");a=toupper(substr($$0,1,1));b=substr($$0,2);print a b}'` ; \ @@ -91,7 +90,7 @@ split -d -l 250 build/$$gal_name.filelist build/$$gal_name.filelist- ; \ for file in build/$$gal_name.filelist-*; do \ echo "Processing filelist $$file"; \ - SAL_USE_VCLPLUGIN="svp" /usr/lib/openoffice/basis-link/program/gengal --name "$$gal_oooname" --path "$(CURDIR)/build/usr/lib/openoffice/`readlink /usr/lib/openoffice/basis-link`/share/gallery" --destdir "$(CURDIR)/build" --number-from "70" `cat $$file | xargs`; \ + SAL_USE_VCLPLUGIN="svp" /usr/lib/libreoffice/basis-link/program/gengal --name "$$gal_oooname" --path "$(CURDIR)/build/usr/lib/libreoffice/`readlink /usr/lib/libreoffice/basis-link`/share/gallery" --destdir "$(CURDIR)/build" --number-from "70" `cat $$file | xargs`; \ done; \ done @@ -112,9 +111,9 @@ $(CURDIR)/debian/openclipart-svg/usr/share/openclipart/svg/ # Install OOo files - mkdir -p $(CURDIR)/debian/openclipart-openoffice.org/usr/lib/openoffice/$(shell readlink /usr/lib/openoffice/basis-link)/share/gallery - cp -af $(CURDIR)/build/usr/lib/openoffice/$(shell readlink /usr/lib/openoffice/basis-link)/share/gallery/* \ - $(CURDIR)/debian/openclipart-openoffice.org/usr/lib/openoffice/$(shell readlink /usr/lib/openoffice/basis-link)/share/gallery/ + mkdir -p $(CURDIR)/debian/openclipart-libreoffice/usr/lib/libreoffice/$(shell readlink /usr/lib/libreoffice/basis-link)/share/gallery + cp -af $(CURDIR)/build/usr/lib/libreoffice/$(shell readlink /usr/lib/libreoffice/basis-link)/share/gallery/* \ + $(CURDIR)/debian/openclipart-libreoffice/usr/lib/libreoffice/$(shell readlink /usr/lib/libreoffice/basis-link)/share/gallery/ # Install Overrides file install -p -o root -g root -m 644 $(CURDIR)/debian/openclipart-svg.overrides $(CURDIR)/debian/openclipart-svg/usr/share/lintian/overrides/openclipart-svg @@ -144,7 +143,7 @@ dh_installdeb # dh_perl dh_shlibdeps - dh_gencontrol -- -V'basis-version=$(shell readlink /usr/lib/openoffice/basis-link | sed -e "s/basis//")' + dh_gencontrol -- -V'basis-version=$(shell readlink /usr/lib/libreoffice/basis-link | sed -e "s/basis//")' dh_md5sums dh_builddeb