Skip to content

Commit d886d08

Browse files
committed
Merge pull request #279 from ros-infrastructure/oneric_is_stupid
use deb helper version 7 on oneric
2 parents be82e97 + d6ac589 commit d886d08

File tree

4 files changed

+4
-2
lines changed

4 files changed

+4
-2
lines changed

bloom/generators/debian/generator.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -311,6 +311,8 @@ def generate_substitutions_from_package(
311311
package.maintainers[0].email
312312
))
313313
data['changelogs'] = changelogs
314+
# Use debhelper version 7 for oneric, otherwise 9
315+
data['debhelper_version'] = 7 if os_version in ['oneiric'] else 9
314316
# Summarize dependencies
315317
summarize_dependency_mapping(data, depends, build_depends, resolved_deps)
316318

bloom/generators/debian/templates/compat

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
@(debhelper_version)

bloom/generators/debian/templates/control.em

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Source: @(Package)
22
Section: misc
33
Priority: extra
44
Maintainer: @(Maintainer)
5-
Build-Depends: debhelper (>= 9.0.0), @(', '.join(BuildDepends))
5+
Build-Depends: debhelper (>= @(debhelper_version).0.0), @(', '.join(BuildDepends))
66
Homepage: @(Homepage)
77
Standards-Version: 3.9.2
88

0 commit comments

Comments
 (0)