Don't use the #5 patch. We still need to run dh_translations in Ubuntu so the way you're doing it is fine. Another way is to use dh -- with gnome since that will run dh_translations in Ubuntu but not in Debian. This was done with inkscape (and reverted once inkscape was demoted to universe and we stopped using language packs for it).
https://salsa.debian.org/multimedia-team/inkscape/commit/0eacd8152 And I'm attaching another patch for you that I accidentally forwarded to the wrong bug last year! Thanks, Jeremy Bicha
From 4dcfea9c4b650980e80053589366c76fffdfab81 Mon Sep 17 00:00:00 2001 From: Jeremy Bicha <jbi...@ubuntu.com> Date: Fri, 8 Dec 2017 19:47:39 -0500 Subject: [PATCH 8/8] Add disable-block-tests.patch and re-enable build tests Disable tests that we can't run during the build Closes: #883901 --- debian/patches/disable-block-tests.patch | 44 ++++++++++++++++++++++++++++++++ debian/patches/series | 2 +- debian/rules | 1 - 3 files changed, 45 insertions(+), 2 deletions(-) create mode 100644 debian/patches/disable-block-tests.patch diff --git a/debian/patches/disable-block-tests.patch b/debian/patches/disable-block-tests.patch new file mode 100644 index 0000000..de91a51 --- /dev/null +++ b/debian/patches/disable-block-tests.patch @@ -0,0 +1,44 @@ +Description: Disable block tests that don't work in our + minimal build environment. Instead of disabling, + we should see about running these tests with + autopkgtest, probably with isolation-machine +Author: Jeremy Bicha <jbi...@ubuntu.com> +Bug: https://bugzilla.gnome.org/show_bug.cgi?id=785960 +--- + tests/test_BlockSpecial.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +--- a/tests/test_BlockSpecial.cc ++++ b/tests/test_BlockSpecial.cc +@@ -203,6 +203,7 @@ TEST( BlockSpecialTest, NamedBlockSpecia + EXPECT_BSEQTUP( bs2, "/", 0, 0 ); + } + ++/* Disable test that fails in our build environment + TEST( BlockSpecialTest, NamedBlockSpecialObjectBlockDevice ) + { + std::string bname = get_block_name( 0 ); +@@ -213,6 +214,7 @@ TEST( BlockSpecialTest, NamedBlockSpecia + EXPECT_STREQ( bs.m_name.c_str(), bname.c_str() ); + EXPECT_TRUE( bs.m_major > 0 || bs.m_minor > 0 ); + } ++*/ + + TEST( BlockSpecialTest, NamedBlockSpecialObjectBlockDeviceDuplicate ) + { +@@ -228,6 +230,7 @@ TEST( BlockSpecialTest, NamedBlockSpecia + EXPECT_EQ( bs1.m_minor, bs2.m_minor ); + } + ++/* Disable 2 tests that fail in our build environment + TEST( BlockSpecialTest, TwoNamedBlockSpecialObjectBlockDevices ) + { + std::string bname1 = get_block_name( 0 ); +@@ -256,6 +259,7 @@ TEST( BlockSpecialTest, NamedBlockSpecia + EXPECT_EQ( lnk.m_major, bs.m_major ); + EXPECT_EQ( lnk.m_minor, bs.m_minor ); + } ++*/ + + TEST( BlockSpecialTest, PreRegisteredCacheUsedBeforeFileSystem ) + { diff --git a/debian/patches/series b/debian/patches/series index 8b13789..ceb1441 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1 @@ - +disable-block-tests.patch diff --git a/debian/rules b/debian/rules index 641f073..bc81918 100755 --- a/debian/rules +++ b/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f # -*- makefile -*- -export DEB_BUILD_OPTIONS = nocheck export DEB_BUILD_MAINT_OPTIONS = hardening=+all export DEB_LDFLAGS_MAINT_APPEND = -Wl,-z,defs -Wl,-O1 -Wl,--as-needed -- 2.14.1
