Merge lp:~sil2100/ubuntu/raring/google-mock/switch_to_dh_python into lp:ubuntu/raring/google-mock

[Łukasz Zemczak]

* debian/rules, debian/control:
  - Switched from using python-support to dh_python2

* debian/rules, debian/control:
  - Switched from using python-support to dh_python2

[Didier Roche-Tolomelli (didrocks)]

42 override_dh_pysupport:
43 - dh_pysupport debian/google-mock/usr/share/google-mock/cpp
44 + dh_python2 debian/google-mock/usr/share/google-mock/cpp

I think that removing this stenza and having directly dh --with python2 should do the same, can you try something around that please?

The rest looks good :)

review: Needs Fixing

[lp:~sil2100/ubuntu/raring/google-mock/switch_to_dh_python]

10. By Łukasz Zemczak on 2012-12-06

Make it better as suggested by Didier!

[Michael Terry (mterry)]

This looks good except for the hard-coded python Depends. That will come from ${python:Depends} just fine. With that fix, approved.

review: Needs Fixing

[lp:~sil2100/ubuntu/raring/google-mock/switch_to_dh_python]

11. By Łukasz Zemczak on 2012-12-07

Remove the hard-coded python dependency.

[Łukasz Zemczak (sil2100)]

Done. Actually, I added this dependency because lintian was spouting warnings about that, since the python dep wasn't added during one of my test builds through ${python:Depends}. But I think this was due to an earlier packaging error I made. So it indeed should be all fine now, sorry about that one ;)

=== modified file 'debian/changelog'
--- debian/changelog	2012-11-09 09:56:28 +0000
+++ debian/changelog	2012-12-07 11:09:22 +0000
@@ -1,3 +1,10 @@
+google-mock (1.6.0-0ubuntu3) UNRELEASED; urgency=low
+
+  * debian/rules, debian/control:
+    - Switched from using python-support to dh_python2
+
+ -- Łukasz 'sil2100' Zemczak <[e-mail]>  Thu, 06 Dec 2012 12:15:20 +0100
+
 google-mock (1.6.0-0ubuntu2) raring; urgency=low
 
   * debian/copyright:

=== modified file 'debian/control'
--- debian/control	2011-07-01 02:44:57 +0000
+++ debian/control	2012-12-07 11:09:22 +0000
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Fredrik Hallenberg <[e-mail]>
-Build-Depends: debhelper (>= 7.0.50~), autotools-dev, python-support, libgtest-dev (>= 1.6.0)
+Build-Depends: debhelper (>= 7.0.50~), autotools-dev, python-dev (>= 2.6.6-3~), libgtest-dev (>= 1.6.0)
 Standards-Version: 3.9.1
 Homepage: http://code.google.com/p/googlemock/
 

=== modified file 'debian/rules'
--- debian/rules	2012-11-09 08:51:38 +0000
+++ debian/rules	2012-12-07 11:09:22 +0000
@@ -5,7 +5,7 @@
 #export DH_VERBOSE=1
 
 %:
-	dh  $@
+	dh $@ --with python2
 
 override_dh_auto_configure:
 	dh_auto_configure -- --enable-external-gtest
@@ -17,5 +17,3 @@
 	rm -f debian/google-mock/usr/lib/libgtest*
 	rm -rf debian/google-mock/usr/include/gtest*
 
-override_dh_pysupport:
-	dh_pysupport debian/google-mock/usr/share/google-mock/cpp