Source: googletest
Version: 1.8.1-3
Tags: patch
I noticed that googletest and googletest-tools are Architecture:any and
Multi-Arch:same, but their contents are bit-identical accross all
release architectures. Their dependecies are Multi-Arch: foreign or
annotated :any. Thus these packages can safely be converted to
Architecture: all. Doing so saves around 8MB on the mirros and removes
any potential M-A:same version skews from these packages. A little care
must be taken to converted ${binary:Version} dependencies to
${source:Version} and for the dh_install override, but this looks
manageable. Please consider applying the attached patch.
Helmut
diff -Nru googletest-1.8.1/debian/changelog googletest-1.8.1/debian/changelog
--- googletest-1.8.1/debian/changelog 2019-01-12 22:42:59.000000000 +0100
+++ googletest-1.8.1/debian/changelog 2019-06-26 09:31:25.000000000 +0200
@@ -1,3 +1,11 @@
+googletest (1.8.1-3.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Convert googletest and googletest-tools to Architecture:all and
+ Multi-Arch:foreign. Closes: #-1.
+
+ -- Helmut Grohne <helmut.gro...@intenta.de> Wed, 26 Jun 2019 09:31:25 +0200
+
googletest (1.8.1-3) unstable; urgency=medium
[ Steven Robbins ]
diff -Nru googletest-1.8.1/debian/control googletest-1.8.1/debian/control
--- googletest-1.8.1/debian/control 2019-01-12 22:42:59.000000000 +0100
+++ googletest-1.8.1/debian/control 2019-06-26 09:31:25.000000000 +0200
@@ -10,8 +10,8 @@
Vcs-Browser: https://salsa.debian.org/debian/googletest
Package: googletest
-Architecture: any
-Multi-Arch: same
+Architecture: all
+Multi-Arch: foreign
Section: libdevel
Depends: ${misc:Depends}
Conflicts: libgtest-dev (<< 1.8.0), google-mock (<< 1.8.0)
@@ -53,8 +53,8 @@
C++ code under test.
Package: googletest-tools
-Architecture: any
-Multi-Arch: same
+Architecture: all
+Multi-Arch: foreign
Section: libdevel
Depends: ${misc:Depends}, python:any
Conflicts: googletest (<= 1.8.0-8)
@@ -67,7 +67,7 @@
Architecture: any
Multi-Arch: same
Section: libdevel
-Depends: ${misc:Depends}, googletest (= ${binary:Version})
+Depends: ${misc:Depends}, googletest (= ${source:Version})
Conflicts: googletest (<= 1.8.0-8)
Replaces: googletest (<= 1.8.0-8)
Description: Google's framework for writing C++ tests
@@ -109,7 +109,7 @@
Architecture: any
Multi-Arch: same
Section: oldlibs
-Depends: ${misc:Depends}, googletest (= ${binary:Version})
+Depends: ${misc:Depends}, googletest (= ${source:Version})
Description: Google's framework for writing and using C++ mock classes
NOTE: This is a transitional package, retained for backwards compatibility.
New code should instead use either package libgmock-dev (for compiled lib)
diff -Nru googletest-1.8.1/debian/rules googletest-1.8.1/debian/rules
--- googletest-1.8.1/debian/rules 2019-01-12 22:42:59.000000000 +0100
+++ googletest-1.8.1/debian/rules 2019-06-26 09:31:25.000000000 +0200
@@ -33,7 +33,7 @@
cd obj-* && ctest || (cat Testing/Temporary/LastTest.log; exit 1)
endif
-override_dh_install:
+override_dh_install-indep:
dh_install
find debian/googletest/usr/src/googletest -iname autom4te.cache -type d
| xargs rm -rf
find debian/googletest/usr/src/googletest -iname LICENSE -o -iname
.gitignore -o -iname '*.pyc' | xargs rm
