diff -u inkscape-0.48.0/debian/dirs inkscape-0.48.0/debian/dirs --- inkscape-0.48.0/debian/dirs +++ inkscape-0.48.0/debian/dirs @@ -2,0 +3 @@ +usr/share/pixmaps/ diff -u inkscape-0.48.0/debian/control inkscape-0.48.0/debian/control --- inkscape-0.48.0/debian/control +++ inkscape-0.48.0/debian/control @@ -4,7 +4,8 @@ Vcs-git: git://git.debian.org/git/collab-maint/inkscape.git Vcs-Browser: http://git.debian.org/?p=git/collab-maint/inkscape.git Homepage: http://www.inkscape.org/ -Maintainer: Wolfram Quester +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Wolfram Quester Build-Depends: debhelper (>= 7.0.0), dpatch, intltool, @@ -45,16 +46,16 @@ libsvg-perl, libxml-xql-perl, python, - python-numpy, - python-lxml, - python-uniconvertor, skencil, - ttf-bitstream-vera + ttf-dejavu, + pstoedit Recommends: aspell, libwmf-bin, - pstoedit, imagemagick, - perlmagick + perlmagick, + python-numpy, + python-lxml, + python-uniconvertor Description: vector-based drawing program Inkscape loads and saves a subset of the SVG (Scalable Vector Graphics) format, a standard maintained by the WWW consortium. diff -u inkscape-0.48.0/debian/changelog inkscape-0.48.0/debian/changelog --- inkscape-0.48.0/debian/changelog +++ inkscape-0.48.0/debian/changelog @@ -1,3 +1,22 @@ +inkscape (0.48.0-1ubuntu1) maverick; urgency=low + + * Merge with Debian unstable (LP: #628048, LP: #401567, LP: #456248, + LP: #463602, LP: #591986) + * debian/control: + - Ubuntu maintainers + - Promote python-lxml, python-numpy, python-uniconvertor to Recommends. + - Demote pstoedit to Suggests (universe package). + - Suggests ttf-dejavu instead of ttf-bitstream-vera (LP: #513319) + * debian/rules: + - Run intltool-update on build (Ubuntu-specific). + - Add translation domain to .desktop files (Ubuntu-specific). + * debian/dirs: + - Add usr/share/pixmaps. Allow inkscape.xpm installation + * drop 50-poppler-API.dpatch (now upstream) + * drop 51-paste-in-unwritable-directory.dpatch (now upstream) + + -- Alex Valavanis Sun, 12 Sep 2010 19:44:58 +0100 + inkscape (0.48.0-1) experimental; urgency=low * [cae07a3] New Upstream version 0.48.0 @@ -18,6 +37,35 @@ -- Wolfram Quester Mon, 16 Aug 2010 13:49:28 +0200 +inkscape (0.47.0-2ubuntu3) maverick; urgency=low + + * 51-paste-in-unwritable-directory.dpatch, debian/control: Allow paste + from clipboard when in unwritable working directory (LP: #211607) + + -- Alexander Valavanis Tue, 06 Apr 2010 00:29:36 +0100 + +inkscape (0.47.0-2ubuntu2) lucid; urgency=low + + * debian/control: Replaced ttf-bitstream-vera suggestion with ttf-dejavu + (LP: #513319). + + -- Mathieu Comandon Sat, 03 Apr 2010 22:08:22 +0200 + +inkscape (0.47.0-2ubuntu1) lucid; urgency=low + + * Merge from debian testing (LP: #533584, LP: #486425). Remaining changes: + - debian/control: + - drop libssl-dev, no longer needed (Closes: #573338). + - promote python-lxml, python-numpy, python-uniconvertor to Recommends. + - demote pstoedit to Suggests (universe package). + - debian/rules: + - Run intltool-update on build (Ubuntu-specific). + - Add translation domain to .desktop files (Ubuntu-specific). + - 50-poppler-API.patch, debian/control: poppler 0.12.2 changed the + GfxColorSpace API (LP: #487038). + + -- Alexander Valavanis Wed, 10 Mar 2010 17:45:24 +0000 + inkscape (0.47.0-2) unstable; urgency=low * Build depend on libaspell-dev, recommend aspell, add explanation to @@ -32,6 +80,31 @@ -- Wolfram Quester Fri, 19 Feb 2010 19:21:33 +0100 +inkscape (0.47.0-1ubuntu2) lucid; urgency=low + + * Brown paper bag update: actually use the correct version of the + source tree. + + -- Kees Cook Thu, 24 Dec 2009 16:10:36 -0800 + +inkscape (0.47.0-1ubuntu1) lucid; urgency=low + + * Merge with Debian testing (LP: #498150). Remaining changes: + - debian/control: + - promote python-lxml, python-numpy, python-uniconvertor to Recommends. + - demote pstoedit to Suggests (universe package). + - drop libssl-dev, no longer needed (Debian bug 484527). + - debian/rules: + - Handle parallel builds via -j (Debian bug 562226). + - Run intltool-update on build (Ubuntu-specific). + - Add translation domain to .desktop files (Ubuntu-specific). + - debian/watch: + - Correctly handle "pre" versions (Debian bug 562225). + * 50-poppler-API.patch, debian/control: poppler 0.12.2 changed the + GfxColorSpace API (LP: #487038). + + -- Kees Cook Wed, 23 Dec 2009 15:38:43 -0800 + inkscape (0.47.0-1) unstable; urgency=low * Imported Upstream version 0.47 @@ -90,6 +163,81 @@ -- Wolfram Quester Wed, 08 Jul 2009 22:37:10 +0200 +inkscape (0.47~pre4-0ubuntu1) karmic; urgency=low + + * New upstream pre-release, bug-fixes only (LP: #432328). + + -- Kees Cook Wed, 14 Oct 2009 11:27:41 -0700 + +inkscape (0.47~pre1-0ubuntu2) karmic; urgency=low + + * No-change rebuild against libmagick++2. + + -- Steve Langasek Sat, 05 Sep 2009 02:34:43 +0000 + +inkscape (0.47~pre1-0ubuntu1) karmic; urgency=low + + * New upstream release. + - Don't constrain maximization on small resolution devices (pre0) + (LP: #348842) + - Fixes segfault on startup (pre0) + (LP: #391149) + + -- Bryce Harrington Thu, 02 Jul 2009 17:09:45 -0700 + +inkscape (0.47~pre0-0ubuntu1) karmic; urgency=low + + * New upstream release + + [ Ted Gould ] + * debian/control: Adding libgsl0 and removing version specifics on boost + + [ Kees Cook ] + * debian/watch: updated to run uupdate and mangle pre-release versions. + * Dropped patches that have been taken upstream: + - 01_mips + - 02-poppler-0.8.3 + - 03-chinese-inkscape + - 05_fix_latex_patch + - 06_gcc-4.4 + - 07_cdr2svg + - 08_skip-bad-utf-on-pdf-import + - 09_gtk-clist + - 10_belarussian + - 11_libpng + - 12_desktop + - 13_slider + - 100_svg_import_improvements + - 102_sp_pattern_painter_free + - 103_bitmap_type_print + + -- Kees Cook Wed, 24 Jun 2009 14:00:43 -0700 + +inkscape (0.46-9ubuntu1) karmic; urgency=low + + * Merge from debian unstable, remaining changes: (LP: #385476) + - debian/patches/100_svg_import_improvements.dpatch: + - 'style' elements at the top level are not lost on import + - Contents of top-level 'defs' elements are not lost on import + - layers are unlocked when they are converted to ordinary groups + - debian/patches/101_gtk_marshal.dpatch: + - Fix build errors against gtk+-2.13.x + - debian/patches/102_sp_pattern_painter_free.dpatch: + - sp_pattern_painter_free that occurs when drawing gears and creating 3d + boxes. + - debian/patches/103_bitmap_type_print.dpatch: + - Bitmap-type print to printer and preview produces low resolution output. + - debian/control: + - Set python-lxml, python-numpy, python-uniconvertor as Recommends + - Build-Depends on automake (>= 1.10), libboost1.35-dev + - move pstoedit from Recommends to Suggests + - debian/rules: + - Handle parallel builds via -j + - Run intltool-update on build + - Add translation domain to .desktop files + + -- Robert Ancell Wed, 10 Jun 2009 17:18:44 +1000 + inkscape (0.46-9) unstable; urgency=low * add 13_slider.dpatch by Marco Presi @@ -136,6 +284,58 @@ -- Wolfram Quester Sun, 08 Mar 2009 12:16:45 +0100 +inkscape (0.46-5ubuntu4) jaunty; urgency=low + + * Add 104_gtk_zero_pagesize.dpatch: + - Cherry pick from 0.47 SVN for the "color value limited to 245" bug + (LP: #257685) + - Cherry pick from 0.47 SVN for other GtkAdjustment related warnings + (LP: #338196) + + -- Артём Попов Wed, 08 Apr 2009 20:04:08 +0700 + +inkscape (0.46-5ubuntu3) jaunty; urgency=low + + * Add 102_sp_pattern_painter_free.dpatch: Fix SIGSEGV in + sp_pattern_painter_free that occurs when drawing gears and creating 3d + boxes. + (LP: #198608) + * Add 103_bitmap_type_print.dpatch: Bitmap-type print to printer and + preview produces low resolution output. + (LP: #258916) + + -- Bryce Harrington Wed, 08 Apr 2009 00:35:13 -0700 + +inkscape (0.46-5ubuntu2) jaunty; urgency=low + + * Add 100_svg_import_improvements.dpatch: + - 'style' elements at the top level are not lost on import + (LP: #196898) + - Contents of top-level 'defs' elements are not lost on import + (LP: #209296) + - layers are unlocked when they are converted to ordinary groups + (LP: #221888) + * Add 101_gtk_marshal.dpatch: Fix build errors against gtk+-2.13.x + (LP: #238217) + + -- Bryce Harrington Tue, 07 Apr 2009 22:32:31 -0700 + +inkscape (0.46-5ubuntu1) jaunty; urgency=low + + * Merge from debian unstable, remaining changes: LP: #321079 + - 03-gtk-includes.dpatch as a workaround of GTK includes bug + - debian/control: + + Add Vcs-Browser, Vcs-Svn, and Homepage (needs-to-goto-debian) + + Set python-lxml, python-numpy, python-uniconvertor as Recommends + + Build-Depends on automake (>= 1.10), libboost1.35-dev + + move pstoedit from Recommends to Suggests + - debian/rules: + + Handle parallel builds via -j + + Run intltool-update on build + + Add translation domain to .desktop files + + -- Bhavani Shankar Sun, 25 Jan 2009 14:55:44 +0530 + inkscape (0.46-5) unstable; urgency=low * Fix error in bash completion file introduced in the last upload. @@ -166,6 +366,27 @@ -- Wolfram Quester Sun, 28 Dec 2008 17:35:10 +0100 +inkscape (0.46-3ubuntu1) jaunty; urgency=low + + * Merge from debian unstable, remaining changes: + - 03-gtk-includes.dpatch as a workaround of GTK includes bug + - debian/control: + + Add Vcs-Browser, Vcs-Svn, and Homepage (needs-to-goto-debian) + + Set python-lxml, python-numpy, python-uniconvertor as Recommends + + Depend on libgnomevfs2-extra + + Build-Depends on automake (>= 1.10), libboost1.35-dev + + move pstoedit from Recommends to Suggests + - debian/rules: + + Handle parallel builds via -j + + Run intltool-update on build + + Add translation domain to .desktop files + - Added patch 100_uniconvertor_binary_name.dpatch as python-uniconvertor + uses uniconvertor as binary name instead of uniconv. + (LP: #200750, needs-to-goto-debian). + - inkscape.bash: Add svgz,ai (needs-to-go-upstream) + + -- Michael Vogt Tue, 25 Nov 2008 15:51:35 +0100 + inkscape (0.46-3) unstable; urgency=low * suggest ttf-bitstream-vera (Closes: #496784) @@ -186,6 +407,23 @@ -- Thomas Viehmann Tue, 09 Sep 2008 23:29:02 +0200 +inkscape (0.46-2ubuntu2) intrepid; urgency=low + + * Drop pstoedit from Recommends to Suggests: It and plotutils are in + universe, and pstoedit does not really provide high quality output. + + -- Martin Pitt Thu, 23 Oct 2008 12:45:17 +0200 + +inkscape (0.46-2ubuntu1) intrepid; urgency=low + + * Merge with Debian unstable to fix FTBFS with current poppler. See + 0.46-1ubuntu1 for remaining Ubuntu changes. + * Add 03-gtk-includes.dpatch as a workaround of GTK includes bug + (LP #247909) to fix FTBFS. (LP: #238223) + * Build against boost 1.35. + + -- Martin Pitt Mon, 11 Aug 2008 12:34:34 +0200 + inkscape (0.46-2) unstable; urgency=low * chmod a+x inkscape/extensions/xaml2svg/ during install in debian/rules @@ -198,6 +436,26 @@ -- Wolfram Quester Tue, 22 Jul 2008 17:48:18 +0200 +inkscape (0.46-1ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, remaining changes: + - debian/control: + + Add Vcs-Browser, Vcs-Svn, and Homepage (needs-to-goto-debian) + + Set maintainer to Ubuntu + + Set python-lxml, python-numpy, python-uniconvertor as Recommends + + Depend on libgnomevfs2-extra + + Build-Depends on automake (>= 1.10) + - debian/rules: + + Handle parallel builds via -j (needs-to-goto-debian) + + Run intltool-update on build (needs-to-goto-debian) + + Add translation domain to .desktop files (needs-to-goto-debian) + - Added patch 100_uniconvertor_binary_name.dpatch as python-uniconvertor + uses uniconvertor as binary name instead of uniconv. + (LP: 200750, needs-to-goto-debian). + - inkscape.bash: Add svgz,ai (needs-to-go-upstream) + + -- Bryce Harrington Thu, 19 Jun 2008 18:46:11 -0700 + inkscape (0.46-1) unstable; urgency=low * acknowledge NMU by Aurelien Jarno, many thanks to him for making inkscape @@ -234,6 +492,61 @@ -- Wolfram Quester Tue, 15 Apr 2008 19:32:15 +0200 +inkscape (0.46-0ubuntu4) intrepid; urgency=low + + * Make use of UniConvertor to r/w additional file formats (LP: #200750). + - Added recommends for python-uniconvertor. + - Added patch uniconvertor_binary_name as python-uniconvertor + uses uniconvertor as binary name instead of uniconv. + + -- Andreas Wenning Mon, 12 May 2008 01:42:09 +0200 + +inkscape (0.46-0ubuntu3) intrepid; urgency=low + + * debian/inkscape.bash: handle compressed SVG files (*.svgz) in bash + completion code (LP: 201309). + + -- Michael Kaiser Tue, 06 May 2008 12:58:49 +0200 + +inkscape (0.46-0ubuntu2) hardy; urgency=low + + * debian/control: add missing Gnome VFS extras Depends (LP: #210336). + + -- Kees Cook Mon, 07 Apr 2008 11:51:21 -0700 + +inkscape (0.46-0ubuntu1) hardy; urgency=low + + * Updstream release update. Final 0.46 (LP: #199674). + + -- Ted Gould Mon, 10 Mar 2008 22:50:10 -0700 + +inkscape (0.46~pre1-0ubuntu2) hardy; urgency=low + + * No-change rebuild against libmagick++10. + + -- Steve Langasek Wed, 20 Feb 2008 17:09:13 +0000 + +inkscape (0.46~pre1-0ubuntu1) hardy; urgency=low + + [ Kees Cook ] + * debian/control: + - add libgtkspell-dev build-dep to gain GtkSpell features (LP: #183547). + - update Standards version (no changes needed). + - add Vcs and Homepage fields. + - switch to new python-lxml dep. + * debian/{control,rules}: switch from dpatch to quilt for more sanity. + * debian/patches/20_fix_glib_and_gxx43_ftbfs.patch: + - merged against upstream fixes. + - added additional fixes for newly written code. + * debian/rules: enable parallel building. + + [ Ted Gould ] + * Updating POTFILES.in to make it so things build correctly. + * debian/control: + - add ImageMagick++ and libboost-dev to build-deps + + -- Kees Cook Sun, 10 Feb 2008 14:20:16 -0800 + inkscape (0.45.1-1.1) unstable; urgency=low * Non-maintainer upload. @@ -248,6 +561,54 @@ -- Aurelien Jarno Mon, 03 Mar 2008 16:58:31 +0100 +inkscape (0.45.1-1ubuntu7) hardy; urgency=low + + * Fix build failure with new upstream glib-2.0. + * Fix build failures with g++-4.3. + + -- Matthias Klose Thu, 31 Jan 2008 17:47:26 +0000 + +inkscape (0.45.1-1ubuntu6) hardy; urgency=low + + * Moved package python-xml from Suggests to Recommends (closes: #115589) + + -- Ralph Sat, 01 Dec 2007 19:07:07 +0000 + +inkscape (0.45.1-1ubuntu5) gutsy; urgency=low + + * debian/patches/10_run_intltoolize_update.patch.dpatch: + - run intltoolize -c -f to fix build issue + + -- Sebastien Bacher Thu, 20 Sep 2007 14:14:23 +0200 + +inkscape (0.45.1-1ubuntu4) gutsy; urgency=low + + * dpatch added to fix error in share/tutorials/tutorial-basic.svg (LP: #117939) + + -- Nathan Handler Tue, 04 Sep 2007 18:25:00 +0200 + +inkscape (0.45.1-1ubuntu3) gutsy; urgency=low + + * Rebuild against glib, now that the fix is actually applied. + + -- Daniel Holbach Mon, 25 Jun 2007 16:28:21 +0200 + +inkscape (0.45.1-1ubuntu2) gutsy; urgency=low + + * Rebuild for glib ABI change. + + -- Daniel Holbach Mon, 25 Jun 2007 11:25:46 +0200 + +inkscape (0.45.1-1ubuntu1) gutsy; urgency=low + + * Merge from debian unstable, remaining changes: + - debian/control: Maintainer fields updated, add python-numpy as + Recommend + - debian/rules: Create POT, add translation domain to .desktop files + - inkscape.desktop.in: Changed 'Name' value to be less technical. + + -- Chris Cheney Wed, 20 Jun 2007 17:08:58 -0500 + inkscape (0.45.1-1) unstable; urgency=low * New upstream release, containing bugfixes @@ -264,6 +625,19 @@ -- Wolfram Quester Wed, 25 Apr 2007 18:57:50 +0200 +inkscape (0.45.1-0ubuntu1) gutsy; urgency=low + + * New upstream release + - Several bug/crash fixes + - Updated translations + - Security: fixed format string overflows in dialogs (CVE-2007-1463) + and whiteboard Jabber protocol (CVE-2007-1464). Dropped + 20_format_string_fixes.dpatch + * Updated maintainer field + * Dropped MIPS patch until next debian merge + + -- Bryce Harrington Tue, 1 May 2007 16:20:24 -0700 + inkscape (0.45-1) unstable; urgency=low * new upstream version. @@ -280,6 +654,46 @@ -- Wolfram Quester Mon, 5 Feb 2007 17:00:44 +0100 +inkscape (0.45-0ubuntu4) feisty; urgency=low + + * Added 'python-numpy' to Recommends for the perspective.py extension + (LP: #97687). + + -- Kees Cook Tue, 3 Apr 2007 09:36:36 -0700 + +inkscape (0.45-0ubuntu3) feisty; urgency=low + + * SECURITY UPDATE: format string overflows in dialog boxes and whiteboard. + * debian/patches/50_format_string_fixes.dpatch added from upstream fixes. + * References + http://inkscape.svn.sourceforge.net/viewvc/inkscape?view=rev&revision=14554 + CVE-2007-1463 CVE-2007-1464 + + -- Kees Cook Fri, 23 Mar 2007 08:30:06 -0700 + +inkscape (0.45-0ubuntu2) feisty; urgency=low + + * debian/control: add libdev-ssl to enable inkboard SSL connections. + + -- Kees Cook Mon, 5 Feb 2007 16:08:44 -0800 + +inkscape (0.45-0ubuntu1) feisty; urgency=low + + * New upstream version: + - fix crasher when opening a svg file (Ubuntu: #79249) + - fix color marker request (Ubuntu: #70908) + - can change objects perspective (Ubuntu: #45314) + - fix documentation about keyboard conflicts for alt-click (Ubuntu: #44764) + * Sync with Debian, Ubuntu changes remaining: + * debian/control.in: + - drop libloudmouth1-dev since it is no longer used + * debian/rules: + - Create POT, add translation domain to .desktop files + * inkscape.desktop.in: + - Changed 'Name' value. + + -- Sebastien Bacher Mon, 5 Feb 2007 23:33:28 +0100 + inkscape (0.45~pre1-1) unstable; urgency=low * new upstream version. @@ -339,7 +753,7 @@ * upload sponsored by Guido Guenther -- Wolfram Quester Tue, 13 Jun 2006 16:30:28 +0200 - + inkscape (0.43-5) unstable; urgency=low * move handling of debian-specific patches to dpatch (and build-depend on diff -u inkscape-0.48.0/debian/rules inkscape-0.48.0/debian/rules --- inkscape-0.48.0/debian/rules +++ inkscape-0.48.0/debian/rules @@ -60,6 +60,7 @@ build: config.status dh_testdir + cd po; intltool-update -p ifneq "$(wildcard /usr/share/misc/config.sub)" "" cp -f /usr/share/misc/config.sub config.sub @@ -96,6 +97,8 @@ # Add here commands to install the package into debian/inkscape. $(MAKE) install DESTDIR=$(CURDIR)/debian/inkscape + install -o root -g root -m 644 $(CURDIR)/debian/inkscape.xpm $(CURDIR)/debian/inkscape/usr/share/pixmaps/inkscape.xpm + install -o root -g root -m 644 $(CURDIR)/debian/inkscape.applications $(CURDIR)/debian/inkscape/usr/share/application-registry/inkscape.applications 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/ chmod -x $(CURDIR)/debian/inkscape/usr/share/inkscape/extensions/text_randomcase.py @@ -143,7 +146,12 @@ chmod -x $(CURDIR)/debian/inkscape/usr/share/inkscape/extensions/inkweb.js chmod -x $(CURDIR)/debian/inkscape/usr/share/inkscape/extensions/run_command.py - + # Add translation domain to .desktop files + DOMAIN=$$(grep --max-count 1 '^GETTEXT_PACKAGE[[:space:]]*=' $(CURDIR)/po/Makefile | sed 's/^.*=[[:space:]]\([^[:space:]]\)/\1/'); \ + for d in $$(find debian/inkscape -type f -name "*.desktop" ); do \ + echo "Adding translation domain $$DOMAIN to $$d..."; \ + echo "X-Ubuntu-Gettext-Domain=$$DOMAIN" >> $$d; \ + done; # Build architecture-independent files here. binary-indep: build install