Merge lp://staging/~dholbach/pkgme/1004081 into lp://staging/pkgme

Proposed by Daniel Holbach
Status: Merged
Approved by: James Westby
Approved revision: 108
Merged at revision: 106
Proposed branch: lp://staging/~dholbach/pkgme/1004081
Merge into: lp://staging/pkgme
Diff against target: 39 lines (+9/-4)
3 files modified
pkgme/distutils_command/pkgme_info.py (+1/-1)
pkgme/templates/control (+1/-0)
pkgme/tests/test_distutils_command.py (+7/-3)
To merge this branch: bzr merge lp://staging/~dholbach/pkgme/1004081
Reviewer Review Type Date Requested Status
James Westby Approve
Jonathan Lange Approve
Review via email: mp+107339@code.staging.launchpad.net

Commit message

Fix a couple of minor packaging bugs in generated packaging.

Description of the change

Fix 1004081.

To post a comment you must log in.
Revision history for this message
Daniel Holbach (dholbach) wrote :

 - ${misc:Depends}: I tested it with
   https://myapps.developer.ubuntu.com/dev/apps/500/ and it worked
   nicely, "dconf-gsettings-backend | gsettings-backend" got added
   during the build
 - I know that specifying the Standards-Version explicitly is not
   ideal, but we wouldn't want pkgme to have to depends on
   debian-policy or anything to figure out which version to use.

Revision history for this message
Jonathan Lange (jml) wrote :

I'm OK with this change.

review: Approve
Revision history for this message
Canonical CA Tarmac (ca-tarmac) wrote :

The attempt to merge lp:~dholbach/pkgme/1004081 into lp:pkgme failed. Below is the output from the failed tests.

Tests running...
======================================================================
FAIL: pkgme.tests.test_distutils_command.pkgme_info_tests.test_depends_is_python_depends
----------------------------------------------------------------------
Traceback (most recent call last):
  File "pkgme/tests/test_distutils_command.py", line 140, in test_depends_is_python_depends
    self.assertEqual("${python:Depends}", cmd.get_depends())
MismatchError: '${python:Depends}' != '${python:Depends}, ${misc:Depends}'

Ran 223 tests in 26.033s
FAILED (failures=1)

/tmp/tmp3l1xiN/virtualenv/lib/python2.6/site-packages/distribute-0.6.10-py2.6.egg/setuptools/command/bdist_egg.py:422: UnicodeWarning: Unicode equal comparison failed to convert both arguments to Unicode - interpreting them as being unequal
  symbols = dict.fromkeys(iter_symbols(code))
simplejson/_speedups.c: In function 'encoder_listencode_obj':
simplejson/_speedups.c:2263: warning: comparison of distinct pointer types lacks a cast
simplejson/_speedups.c:2263: warning: passing argument 2 of 'PyType_IsSubtype' from incompatible pointer type
/usr/include/python2.6/object.h:435: note: expected 'struct PyTypeObject *' but argument is of type 'struct PyObject *'

Revision history for this message
Daniel Holbach (dholbach) wrote :

Fixed the test in the new revision.

lp://staging/~dholbach/pkgme/1004081 updated
107. By Daniel Holbach

change test from checking if Depends equals /usr/share/man/man1/python.1.gz to test if it includes it instead

Revision history for this message
James Westby (james-w) wrote :

Hi Daniel,

Would you add another test that does the same thing for ${misc:Depends} please?

I'd be happy to do this if you rather wouldn't.

Thanks,

James

Revision history for this message
Daniel Holbach (dholbach) wrote :

Done.

lp://staging/~dholbach/pkgme/1004081 updated
108. By Daniel Holbach

test for as well

Revision history for this message
James Westby (james-w) wrote :

Thanks Daniel.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches