Merge lp:~kelemeng/usb-creator/bug853227 into lp:ubuntu/oneiric/usb-creator

Proposed by Gabor Kelemen
Status: Merged
Merge reported by: Colin Watson
Merged at revision: not available
Proposed branch: lp:~kelemeng/usb-creator/bug853227
Merge into: lp:ubuntu/oneiric/usb-creator
Diff against target: 12 lines (+1/-1)
1 file modified
debian/rules (+1/-1)
To merge this branch: bzr merge lp:~kelemeng/usb-creator/bug853227
Reviewer Review Type Date Requested Status
Ubuntu branches Pending
Review via email:
To post a comment you must log in.
Revision history for this message
Colin Watson (cjwatson) wrote :

This needs to be merged into lp:usb-creator instead, and isn't based on that branch, so I'll merge this by hand. Thanks!

This needs a build-dependency on dh-translations and a bumped build-dependency on debhelper (for '--with foo,bar') as well. I'll take care of those.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/rules'
2--- debian/rules 2011-05-19 17:58:47 +0000
3+++ debian/rules 2011-09-18 14:04:24 +0000
4@@ -5,7 +5,7 @@
5 xpm_kde := $(CURDIR)/debian/usb-creator-kde/usr/share/pixmaps/
7 %:
8- dh -Spython_distutils --with python2 $@
9+ dh -Spython_distutils --with python2,translations $@
11 override_dh_install:
12 find . -path "$(vendor)/*.svg" -exec cp {} $(dest) \;


People subscribed via source and target branches