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

[Daniel Holbach]

Fix a couple of minor packaging bugs in generated packaging.

Fix 1004081.

[Daniel Holbach (dholbach)]

 - ${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.

[Jonathan Lange (jml)]

I'm OK with this change.

review: Approve

[Canonical CA Tarmac (ca-tarmac)]

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 *'

[Daniel Holbach (dholbach)]

Fixed the test in the new revision.

[lp:~dholbach/pkgme/1004081]

107. By Daniel Holbach on 2012-05-28

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

[James Westby (james-w)]

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

[Daniel Holbach (dholbach)]

Done.

[lp:~dholbach/pkgme/1004081]

108. By Daniel Holbach on 2012-05-28

test for as well

[James Westby (james-w)]

Thanks Daniel.

review: Approve

=== modified file 'pkgme/distutils_command/pkgme_info.py'
--- pkgme/distutils_command/pkgme_info.py	2011-12-08 21:18:24 +0000
+++ pkgme/distutils_command/pkgme_info.py	2012-05-28 21:41:17 +0000
@@ -98,4 +98,4 @@
         return "python2"
 
     def get_depends(self):
-        return "${python:Depends}"
+        return "${python:Depends}, ${misc:Depends}"

=== modified file 'pkgme/templates/control'
--- pkgme/templates/control	2010-11-06 21:16:22 +0000
+++ pkgme/templates/control	2012-05-28 21:41:17 +0000
@@ -1,6 +1,7 @@
 Source: $package_name
 Section: $section
 Priority: extra
+Standards-Version: 3.9.3
 Maintainer: $maintainer
 #if $build_depends
 Build-Depends: $build_depends

=== modified file 'pkgme/tests/test_distutils_command.py'
--- pkgme/tests/test_distutils_command.py	2011-12-08 21:19:13 +0000
+++ pkgme/tests/test_distutils_command.py	2012-05-28 21:41:17 +0000
@@ -135,6 +135,10 @@
         cmd = self.get_cmd_with_metadata({})
         self.assertEqual("python2", cmd.get_debhelper_addons())
 
-    def test_depends_is_python_depends(self):
-        cmd = self.get_cmd_with_metadata({})
-        self.assertEqual("${python:Depends}", cmd.get_depends())
+    def test_depends_includes_python_depends(self):
+        cmd = self.get_cmd_with_metadata({})
+        self.assertIn("${python:Depends}", cmd.get_depends())
+
+    def test_depends_includes_misc_depends(self):
+        cmd = self.get_cmd_with_metadata({})
+        self.assertIn("${misc:Depends}", cmd.get_depends())