Merge lp:~timo-jyrinki/ubuntu/raring/google-mock/fix_lintian_errors into lp:ubuntu/raring/google-mock

[Timo Jyrinki]

* debian/copyright:
  - Fix lintian error about template remains, adding authors
  - Copyright information was already correct
* debian/rules:
  - Fix lintian error about non-emptied dependency_libs field in .la

* debian/copyright:
  - Fix lintian error about template remains, adding authors
  - Copyright information was already correct
* debian/rules:
  - Fix lintian error about non-emptied dependency_libs field in .la

[Didier Roche (didrocks)]

All looks good, sponsoring :)

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-07-01 02:44:57 +0000
+++ debian/changelog	2012-11-09 08:54:39 +0000
@@ -1,3 +1,13 @@
+google-mock (1.6.0-0ubuntu2) UNRELEASED; urgency=low
+
+  * debian/copyright:
+    - Fix lintian error about template remains, adding authors
+    - Copyright information was already correct
+  * debian/rules:
+    - Fix lintian error about non-emptied dependency_libs field in .la
+
+ -- Timo Jyrinki <[e-mail]>  Fri, 09 Nov 2012 10:20:35 +0200
+
 google-mock (1.6.0-0ubuntu1) oneiric; urgency=low
 
   * New upstream release

=== modified file 'debian/copyright'
--- debian/copyright	2010-05-17 20:06:27 +0000
+++ debian/copyright	2012-11-09 08:54:39 +0000
@@ -6,8 +6,39 @@
 
     http://code.google.com/p/googlemock/downloads/
 
-Upstream Author(s):
+Upstream Authors:
 
+    Benoit Sigoure <[e-mail]>
+    Bogdan Piloca <[e-mail]>
+    Chandler Carruth <[e-mail]>
+    Dave MacLachlan <[e-mail]>
+    David Anderson <[e-mail]>
+    Dean Sturtevant
+    Gene Volovich <[e-mail]>
+    Hal Burch <[e-mail]>
+    Jeffrey Yasskin <[e-mail]>
+    Jim Keller <[e-mail]>
+    Joe Walnes <[e-mail]>
+    Jon Wray <[e-mail]>
+    Keir Mierle <[e-mail]>
+    Keith Ray <[e-mail]>
+    Kostya Serebryany <[e-mail]>
+    Lev Makhlis
+    Mario Tanev <[e-mail]>
+    Mark Paskin
+    Markus Heule <[e-mail]>
+    Matthew Simmons <[e-mail]>
+    Mike Bland <[e-mail]>
+    Neal Norwitz <[e-mail]>
+    Owen Carlsen <[e-mail]>
+    Paneendra Ba <[e-mail]>
+    Paul Menage <[e-mail]>
+    Piotr Kaminski <[e-mail]>
+    Russ Rufer <[e-mail]>
+    Takeshi Yoshino <[e-mail]>
+    Vadim Berman <[e-mail]>
+    Vlad Losev <[e-mail]>
+    Wolfgang Klier <[e-mail]>
     Zhanyong Wan <[e-mail]>
 
 Copyright:

=== modified file 'debian/rules'
--- debian/rules	2011-07-01 02:44:57 +0000
+++ debian/rules	2012-11-09 08:54:39 +0000
@@ -13,6 +13,7 @@
 override_dh_install:
 	dh_install
 	for f in $$(ls debian/google-mock/usr/bin/*.py); do mv $$f $$(echo $$f | sed s/\.py//); done
+	sed -i "/dependency_libs/ s/'.*'/''/" `find . -name '*.la'`
 	rm -f debian/google-mock/usr/lib/libgtest*
 	rm -rf debian/google-mock/usr/include/gtest*