control: reopen -1 control: notfixed -1 0.53.2-2 control: tags -1 patch > * Fix autopkgtest dependencies. Closes: #952610
unfortunately I was testing the patch only this morning, and I saw your upload. The following patch is not enough, because of something printed on stderr. I'm attaching a "fix" (better would be do not throw stuff on stderr) crossbuild FAIL stderr: dpkg-architecture: warning: specified GNU system type arm-linux-gnueabihf does not match CC system type x86_64-linux-gnu, try setting a correct CC environment variable I also cherry-picked an upstream test failure when python is removed and changed to python2 (a change that is retro-compatible, and will break also Debian on the next few days) Also, please depend on rustc and valac on autopkgtests, so on each new rustc and valac upstream releases, meson autopkgtests will be triggered for regressions! thanks a lot Gianfranco
diff -Nru meson-0.53.2/debian/changelog meson-0.53.2/debian/changelog --- meson-0.53.2/debian/changelog 2020-02-28 23:20:11.000000000 +0100 +++ meson-0.53.2/debian/changelog 2020-03-02 12:05:06.000000000 +0100 @@ -1,9 +1,45 @@ +meson (0.53.2-2ubuntu1) focal; urgency=medium + + * Merge from Debian unstable. Remaining changes: + - add debian/patches/6703.patch + - Allow stderr for new test + - depend on rustc and valac, so autopkgtests can pick them up + + -- Gianfranco Costamagna <locutusofb...@debian.org> Mon, 02 Mar 2020 12:05:06 +0100 + meson (0.53.2-2) unstable; urgency=medium * Fix autopkgtest dependencies. Closes: #952610 -- Jussi Pakkanen <jpakk...@gmail.com> Sat, 29 Feb 2020 00:20:11 +0200 +meson (0.53.2-1ubuntu4) focal; urgency=medium + + * Also allow stderr + + -- Gianfranco Costamagna <locutusofb...@debian.org> Mon, 02 Mar 2020 11:58:04 +0100 + +meson (0.53.2-1ubuntu3) focal; urgency=medium + + * debian/patches/6703.patch + - use upstream proposed approach instead of use_python3_tests.patch + * Tweak debian tests/control to fix another test failure (Closes: #952610) + - patch taken from bug report + + -- Gianfranco Costamagna <locutusofb...@debian.org> Mon, 02 Mar 2020 07:24:25 +0100 + +meson (0.53.2-1ubuntu1) focal; urgency=medium + + [ Stefano Rivera ] + * debian/patches/use_python3_tests.patch: + - Update use_python3_tests.patch to catch one more python binary use. + + [ Rico Tzschichholz ] + * debian/tests/control: + - Explicit depends on rustc and valac, so autopkgtests can pick it up + + -- Rico Tzschichholz <ric...@ubuntu.com> Wed, 26 Feb 2020 12:42:13 +0100 + meson (0.53.2-1) unstable; urgency=medium * New upstream release. Closes: #950020, #951487 diff -Nru meson-0.53.2/debian/patches/6703.patch meson-0.53.2/debian/patches/6703.patch --- meson-0.53.2/debian/patches/6703.patch 1970-01-01 01:00:00.000000000 +0100 +++ meson-0.53.2/debian/patches/6703.patch 2020-03-02 07:44:52.000000000 +0100 @@ -0,0 +1,46 @@ +Origin: https://github.com/mesonbuild/meson/pull/6703 +--- meson-0.53.2.orig/run_unittests.py ++++ meson-0.53.2/run_unittests.py +@@ -6650,9 +6650,9 @@ class NativeFileTests(BasePlatformTests) + '--native-file', config, '--native-file', config2, + '-Dcase=find_program']) + +- def _simple_test(self, case, binary): ++ def _simple_test(self, case, binary, entry=None): + wrapper = self.helper_create_binary_wrapper(binary, version='12345') +- config = self.helper_create_native_file({'binaries': {binary: wrapper}}) ++ config = self.helper_create_native_file({'binaries': {entry or binary: wrapper}}) + self.init(self.testcase, extra_args=['--native-file', config, '-Dcase={}'.format(case)]) + + def test_find_program(self): +@@ -6675,16 +6675,21 @@ class NativeFileTests(BasePlatformTests) + # python module breaks. This is fine on other OSes because they + # don't need the extra indirection. + raise unittest.SkipTest('bat indirection breaks internal sanity checks.') +- if os.path.exists('/etc/debian_version'): +- rc = subprocess.call(['pkg-config', '--cflags', 'python2'], +- stdout=subprocess.DEVNULL, +- stderr=subprocess.DEVNULL) +- if rc != 0: +- # Python 2 will be removed in Debian Bullseye, thus we must +- # remove the build dependency on python2-dev. Keep the tests +- # but only run them if dev packages are available. ++ elif is_osx(): ++ binary = 'python' ++ else: ++ binary = 'python2' ++ ++ # We not have python2, check for it ++ for v in ['2', '2.7', '-2.7']: ++ rc = subprocess.call(['pkg-config', '--cflags', 'python{}'.format(v)], ++ stdout=subprocess.DEVNULL, ++ stderr=subprocess.DEVNULL) ++ if rc == 0: ++ break ++ else: + raise unittest.SkipTest('Not running Python 2 tests because dev packages not installed.') +- self._simple_test('python', 'python') ++ self._simple_test('python', binary, entry='python') + + @unittest.skipIf(is_windows(), 'Setting up multiple compilers on windows is hard') + @skip_if_env_set('CC') diff -Nru meson-0.53.2/debian/patches/series meson-0.53.2/debian/patches/series --- meson-0.53.2/debian/patches/series 2020-01-07 20:00:50.000000000 +0100 +++ meson-0.53.2/debian/patches/series 2020-03-02 07:30:20.000000000 +0100 @@ -1,2 +1,3 @@ 1-disable-openmpi.patch 2-disable-rootdir-test.patch +6703.patch diff -Nru meson-0.53.2/debian/tests/control meson-0.53.2/debian/tests/control --- meson-0.53.2/debian/tests/control 2020-02-26 18:43:18.000000000 +0100 +++ meson-0.53.2/debian/tests/control 2020-03-02 12:04:05.000000000 +0100 @@ -5,7 +5,8 @@ Depends: meson, clang Tests: exhaustive -Depends: meson, @builddeps@ +Depends: meson, @builddeps@, rustc, valac Tests: crossbuild Depends: meson, g++, g++-arm-linux-gnueabihf +Restrictions: allow-stderr
