diff -u inkscape-0.48.2/debian/rules inkscape-0.48.2/debian/rules --- inkscape-0.48.2/debian/rules +++ inkscape-0.48.2/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 @@ -111,7 +112,6 @@ dh_installdocs # dh_installexamples dh_install - dh_translations dh_installmenu # dh_installdebconf # dh_installlogrotate diff -u inkscape-0.48.2/debian/control inkscape-0.48.2/debian/control --- inkscape-0.48.2/debian/control +++ inkscape-0.48.2/debian/control @@ -9,7 +9,6 @@ Build-Depends: autoconf, automake, debhelper (>= 7.0.0), - dh-translations, dpatch, intltool, libart-2.0-dev (>= 2.3.10), @@ -30,8 +29,8 @@ libpopt-dev, libsigc++-2.0-dev (>= 2.0.16-2), libtool, - libwpd-dev (>= 0.9.0), - libwpg-dev (>= 0.2.0), + libwpd-dev, + libwpg-dev, libxml-parser-perl, libxml2-dev (>= 2-2.4.24), libxslt1-dev, diff -u inkscape-0.48.2/debian/changelog inkscape-0.48.2/debian/changelog --- inkscape-0.48.2/debian/changelog +++ inkscape-0.48.2/debian/changelog @@ -1,3 +1,18 @@ +inkscape (0.48.2-0ubuntu1~lucid1) lucid-backports; urgency=low + + * Backport for Lucid (LP: #844697) + * debian/control: + - Drop build-dependency on specific libwpd/libwpg version. + - Drop build-dependency on dh-translations. + * debian/rules: + - Drop use of dh_translations + - Call intltool-update manually + * 03-add-translation-domain.dpatch - New patch to add translation domain to + desktop entry file, replacing functionality of unavailable dh_translations + tool. + + -- Alex Valavanis Fri, 23 Sep 2011 23:46:04 +0100 + inkscape (0.48.2-0ubuntu1) oneiric; urgency=low * New upstream release (LP: #807912). Fixes several Ubuntu bugs: diff -u inkscape-0.48.2/debian/patches/00list inkscape-0.48.2/debian/patches/00list --- inkscape-0.48.2/debian/patches/00list +++ inkscape-0.48.2/debian/patches/00list @@ -3,0 +4 @@ +03-add-translation-domain.dpatch only in patch2: unchanged: --- inkscape-0.48.2.orig/debian/patches/03-add-translation-domain.dpatch +++ inkscape-0.48.2/debian/patches/03-add-translation-domain.dpatch @@ -0,0 +1,23 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +# Description: Add translation domain to inkscape.desktop.in +# This is an Ubuntu-specific fix to allow translations to be stripped +# from the Desktop entry file and read from language packs instead. +# This is only needed for backports to Ubuntu Maverick and earlier. +# Later versions of Ubuntu handle this using dh_translations. +# Author: Alex Valavanis +# Forwarded: not-needed +# Last-Update: 2011-09-23 + + +@DPATCH@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' ubuntu-inkscape-maverick-backport~/inkscape.desktop.in ubuntu-inkscape-maverick-backport/inkscape.desktop.in +--- ubuntu-inkscape-maverick-backport~/inkscape.desktop.in 2011-09-23 23:11:39.092461091 +0100 ++++ ubuntu-inkscape-maverick-backport/inkscape.desktop.in 2011-09-23 23:12:21.834802992 +0100 +@@ -13,6 +13,7 @@ + StartupNotify=true + Icon=inkscape + X-Ayatana-Desktop-Shortcuts=Drawing ++X-Ubuntu-Gettext-Domain=inkscape + + [Drawing Shortcut Group] + _Name=New Drawing