diff -Nru inkscape-0.91/debian/changelog inkscape-0.91/debian/changelog --- inkscape-0.91/debian/changelog 2016-09-04 20:38:19.000000000 +0000 +++ inkscape-0.91/debian/changelog 2016-09-06 08:50:37.000000000 +0000 @@ -1,9 +1,10 @@ -inkscape (0.91-10ubuntu1) yakkety; urgency=medium +inkscape (0.91-11) unstable; urgency=medium - * Merge with Debian, remaining changes: - + use dh-translation to handle Ubuntu translation. + * Build with gnome-pkg-tools for automatic langpack support in Ubuntu. + This will allow to drop the last delta between Debian and Ubuntu. + Thanks to Jeremy Bicha for the patch. - -- Mattia Rizzolo Sun, 04 Sep 2016 20:38:19 +0000 + -- Mattia Rizzolo Tue, 06 Sep 2016 08:50:37 +0000 inkscape (0.91-10) unstable; urgency=medium @@ -11,13 +12,6 @@ -- Mattia Rizzolo Fri, 02 Sep 2016 15:04:34 +0000 -inkscape (0.91-9ubuntu1) yakkety; urgency=medium - - * Resynchronize on Debian, remaining change - - use dh-translation to handle Ubuntu translation - - -- Sebastien Bacher Tue, 31 May 2016 19:45:33 +0200 - inkscape (0.91-9) unstable; urgency=medium * Disable gnome-vfs support. Closes: #822912 diff -Nru inkscape-0.91/debian/control inkscape-0.91/debian/control --- inkscape-0.91/debian/control 2016-09-04 20:37:16.000000000 +0000 +++ inkscape-0.91/debian/control 2016-09-06 08:49:18.000000000 +0000 @@ -1,8 +1,7 @@ Source: inkscape Section: graphics Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Debian Multimedia Maintainers +Maintainer: Debian Multimedia Maintainers Uploaders: Matteo F. Vescovi , Mattia Rizzolo @@ -13,7 +12,7 @@ bash-completion, debhelper (>= 9), dh-python, - dh-translations, + gnome-pkg-tools, intltool, libart-2.0-dev (>= 2.3.10), libaspell-dev, diff -Nru inkscape-0.91/debian/rules inkscape-0.91/debian/rules --- inkscape-0.91/debian/rules 2016-09-04 20:37:16.000000000 +0000 +++ inkscape-0.91/debian/rules 2016-09-06 08:48:55.000000000 +0000 @@ -3,4 +3,7 @@ export DEB_BUILD_MAINT_OPTIONS=hardening=+all %: - dh $@ --buildsystem=autoconf --parallel --with autotools_dev,python2,bash-completion,translations + dh $@ --buildsystem=autoconf --parallel --with autotools_dev,python2,bash-completion,gnome + +override_dh_gnome_clean: + dh_gnome_clean --no-control