Merge lp:~statik/python-distutils-extra/modernize into lp:python-distutils-extra

Proposed by Elliot Murphy
Status: Merged
Merged at revision: not available
Proposed branch: lp:~statik/python-distutils-extra/modernize
Merge into: lp:python-distutils-extra
Diff against target: 40 lines (+4/-5)
1 file modified
debian/local/python-mkdebian (+4/-5)
To merge this branch: bzr merge lp:~statik/python-distutils-extra/modernize
Reviewer Review Type Date Requested Status
Martin Pitt (community) Needs Fixing
Review via email:

Commit message

Some updates to python-mkdebian.

To post a comment you must log in.
Revision history for this message
Elliot Murphy (statik) wrote :

This branch changes some of the defaults in python-mkdebian. Maybe you will hate this idea, maybe it's good. I know defaults can be controversial, but I believe these changes are good defaults for someone who doesn't know a lot about debian packaging who just wants to turn a python module into a debian package.

I changed from python-central to python-support for consistency with debian python packaging team preference for python-support, to make it easier to move packages that are created with this tool upstream into debian.

I move from CDBS to DH7 because I really like what Joey has done in dh7 and how simple the overrides are. For context, look at slide 44 and 45 of

I pass --buildsystem=python_distutils so that packages work even if there is a makefile in the root (I and some other upstreams like having a makefile with a check command even for a python project). I am not 100% confident whether dh7 takes care of everything that /usr/share/cdbs/1/rules/ was handling.

Update to compat level 7.

Update to Standards-Version: 3.8.3

Finally I fix a typo that caused additional_dependencies defaulting to None instead of []

Revision history for this message
Martin Pitt (pitti) wrote :


thanks for the update. Some remarks:

 * I deliberately used DH 6, so that people could use quickly and p-d-e on Hardy (which does not have DH 7 yet). Doing this move is fine after lucid released and is out in the wild for a while.

 * If we ever get applications which got packaged that way into Ubuntu main, we need to change the packaging back to cdbs, since dh7 knows nothing about our i18n infrastructure (such as adding the gettext domain to .desktop files, stripping translations from gconf schemas, and so on). So for now I'd prefer to stick with CDBS.

I'm fine with the move to pysupport, and of course bumping the standards-version. Also, thanks for the typo fix.

review: Needs Fixing
160. By Elliot Murphy

fixes per review. stick with CDBS due to I18N support. stick with source format 1.0 and compat level 6 to enable this to be used with quickly on Hardy for now.

Revision history for this message
Elliot Murphy (statik) wrote :

Thanks for the quick review! Updated per your comments, also dropped the change to make packages source format 3.0 (quilt) because of what you said about using this on hardy for a while.

161. By Elliot Murphy

Only depend on debhelper 6.

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 2010-02-05 05:13:13 +0000
3+++ debian/local/python-mkdebian 2010-02-05 22:45:21 +0000
4@@ -56,8 +56,7 @@
5 if not os.path.exists('debian/rules'):
6 f = open('debian/rules', 'w')
7 f.write('''#!/usr/bin/make -f
9-DEB_PYTHON_SYSTEM := pycentral
10+DEB_PYTHON_SYSTEM := pysupport
12 include /usr/share/cdbs/1/rules/
13 include /usr/share/cdbs/1/class/
14@@ -140,7 +139,7 @@
15 'Build-Depends': '''cdbs (>= 0.4.43),
16 debhelper (>= 6),
17 python,
18- python-central (>= 0.6.11),
19+ python-support (>= 0.6.4),
20 python-distutils-extra (>= 2.10)%s''' % bdeps,
21 'Maintainer': author,
22 'Package': egg['Name'],
23@@ -154,7 +153,7 @@
24 Priority: extra
25 Build-Depends: %(Build-Depends)s
26 Maintainer: %(Maintainer)s
27-Standards-Version: 3.8.2
28+Standards-Version: 3.8.3
29 XS-Python-Version: current
31 Package: %(Package)s
32@@ -282,7 +281,7 @@
33 help='Add string changelog to debian/changelog (can be specified multiple times)')
34 parser.add_option('', '--dependency', dest='dependencies', action='append',
35 help='Add additional debian package dependency (can be specified multiple times)')
36-parser.set_defaults(changelog=None, dependency=[])
37+parser.set_defaults(changelog=None, dependencies=[])
38 options, args = parser.parse_args()
40 egg = get_egg_info()


People subscribed via source and target branches

to all changes:
to status/vote changes: