python-distutils-extra

Merge lp:~angeloc/python-distutils-extra/fix-for-1002076 into lp:python-distutils-extra

  1. fix-for-1002076
  2. Merge into debian
Proposed by Angelo Compagnucci
Status: Merged
Merge reported by: Martin Pitt
Merged at revision: not available
Proposed branch: lp:~angeloc/python-distutils-extra/fix-for-1002076
Merge into: lp:python-distutils-extra
Diff against target: 12 lines (+1/-1)
1 file modified
debian/local/python-mkdebian (+1/-1)
To merge this branch: bzr merge lp:~angeloc/python-distutils-extra/fix-for-1002076
Reviewer Review Type Date Requested Status
Martin Pitt (community) Approve
Marty Pitt Pending
Registry Administrators Pending
Review via email: mp+106549@code.launchpad.net

Description of the change

Fixes wrong kde4 ui file detection regular expression.

The wrong regular expression adds a wrong python-kde4-dev dependency also when not required and throws error for packages doesn't depends on python-kde4 like the ones made with pyside.

To post a comment you must log in.
Revision history for this message
Martin Pitt (pitti) wrote :

Thank you for the fix!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/local/python-mkdebian'
2--- debian/local/python-mkdebian 2012-03-06 22:06:33 +0000
3+++ debian/local/python-mkdebian 2012-05-20 22:26:20 +0000
4@@ -146,7 +146,7 @@
5
6 # calculate extra build dependencies
7 bdeps = ''
8- if subprocess.call('find -name "*.ui" | xargs grep -q \'<widget class="Q\'',
9+ if subprocess.call('find -name "*.ui" | xargs grep -q \'<widget class="K\'',
10 shell=True) == 0:
11 print 'Package uses KDE *.ui files, adding python-kde4-dev build dependency'
12 bdeps += ',\n python-kde4-dev'

Subscribers

People subscribed via source and target branches

to all changes:
to status/vote changes: