diff -Nru endless-sky-0.10.2/debian/changelog endless-sky-0.10.2/debian/changelog --- endless-sky-0.10.2/debian/changelog 2023-08-11 14:20:26.000000000 +0000 +++ endless-sky-0.10.2/debian/changelog 2023-10-10 14:57:15.000000000 +0000 @@ -1,3 +1,39 @@ +endless-sky (0.10.2-6) unstable; urgency=medium + + [ Adrian Bunk ] + * Increase test timeout and make test failures fatal again + + -- Damyan Ivanov Tue, 10 Oct 2023 14:57:15 +0000 + +endless-sky (0.10.2-5) unstable; urgency=medium + + * skip tests on hppa too (Closes: #1053733) + + -- Damyan Ivanov Tue, 10 Oct 2023 12:26:11 +0000 + +endless-sky (0.10.2-4) unstable; urgency=medium + + * fix retrieval of build architecture + * skip tests also on hurd-i386 + * d/copyright: clarify multiple patterns leading to redundancy + * d/control: add Rules-Requires-Root: no + + -- Damyan Ivanov Fri, 06 Oct 2023 13:28:14 +0000 + +endless-sky (0.10.2-3) unstable; urgency=medium + + * add explicit build-dependency on uuid-dev + * skip tests in riscv64 (timeouts) + * also skip tests in ia64, powerpc and x32 (never passed before) + + -- Damyan Ivanov Fri, 06 Oct 2023 08:26:36 +0000 + +endless-sky (0.10.2-2) unstable; urgency=medium + + * patch in -latomic fixing linking on armel/mipsel + + -- Damyan Ivanov Thu, 05 Oct 2023 10:09:04 +0000 + endless-sky (0.10.2-1) unstable; urgency=medium * d/watch: add stanza matching github tags @@ -163,7 +199,7 @@ endless-sky (0.9.0-1) unstable; urgency=low - * Dynamic economy (influenced by the player once they have a large fleet). + * Dynamic economy (influenced by the player once they have a large fleet). * New weapon capabilities (slowing, shield disrupting, burst firing). * Fixed many small bugs. * Added the former Korath territory to the map. diff -Nru endless-sky-0.10.2/debian/control endless-sky-0.10.2/debian/control --- endless-sky-0.10.2/debian/control 2023-08-08 09:06:30.000000000 +0000 +++ endless-sky-0.10.2/debian/control 2023-10-06 13:23:26.000000000 +0000 @@ -19,8 +19,10 @@ libsdl2-dev, libmad0-dev, ninja-build, + uuid-dev, xauth , xvfb +Rules-Requires-Root: no Package: endless-sky Architecture: any diff -Nru endless-sky-0.10.2/debian/copyright endless-sky-0.10.2/debian/copyright --- endless-sky-0.10.2/debian/copyright 2023-08-11 14:12:45.000000000 +0000 +++ endless-sky-0.10.2/debian/copyright 2023-10-06 13:13:22.000000000 +0000 @@ -336,7 +336,7 @@ images/land/sky2* images/land/sea3* images/land/beach4* - images/land/canyon9* + images/land/canyon9.* Copyright: Emily Mell License: public-domain Comment: Based on public domain images taken from unsplash.com @@ -468,7 +468,7 @@ License: CC-BY-4.0 Files: - images/scene/engine* + images/scene/engine.* images/scene/engine2* Copyright: NASA License: public-domain @@ -650,7 +650,7 @@ images/outfit/catalytic?ramscoop* images/outfit/anti-missile.* images/outfit/blaster?turret* - images/outfit/blaster* + images/outfit/blaster.* images/outfit/breeder* images/outfit/bunk?room* images/outfit/dwarf?core.* @@ -662,7 +662,7 @@ images/outfit/hai?ionic?turret* images/outfit/heavy?anti-missile.* images/outfit/heavy?laser?turret* - images/outfit/heavy?laser* + images/outfit/heavy?laser.* images/outfit/huge?fuel?cell* images/outfit/large?fuel?cell* images/outfit/medium?fuel?cell* @@ -676,22 +676,22 @@ images/outfit/hyperdrive* images/outfit/large?radar?jammer* images/outfit/small?radar?jammer* - images/outfit/meteor* + images/outfit/meteor.* images/outfit/meteor?launcher* images/outfit/meteor?pod* images/outfit/meteor?storage* images/outfit/mod?blaster?turret* - images/outfit/mod?blaster* + images/outfit/mod?blaster.* images/outfit/particle?cannon* images/outfit/plasma?cannon* images/outfit/plasma?turret* images/outfit/proton?gun* images/outfit/quad?blaster?turret* - images/outfit/rocket* + images/outfit/rocket.* images/outfit/rocket?launcher* images/outfit/rocket?pod* images/outfit/rocket?storage* - images/outfit/sidewinder* + images/outfit/sidewinder.* images/outfit/sidewinder?launcher* images/outfit/sidewinder?pod* images/outfit/sidewinder?storage* @@ -704,7 +704,7 @@ images/outfit/banisher* images/outfit/command?center* images/outfit/fire-lance* - images/outfit/piercer* + images/outfit/piercer.* images/outfit/piercer?launcher* images/outfit/korath?piercer?storage* images/outfit/reverse?thruster?ion* @@ -738,14 +738,14 @@ images/planet/station3c* images/ship/archon?b* images/ship/archon?c* - images/asteroid/plant* - images/asteroid/plant2* - images/asteroid/plant?cluster* + images/asteroid/plant/* + images/asteroid/plant2/* + images/asteroid/plant?cluster/* images/asteroid/space?flora* - images/asteroid/large?plant* - images/asteroid/large?plant2* - images/asteroid/large?plant?cluster* - images/asteroid/large?space?flora* + images/asteroid/large?plant/* + images/asteroid/large?plant2/* + images/asteroid/large?plant?cluster/* + images/asteroid/large?space?flora/* images/asteroid/yottrite* Copyright: Becca Tommaso (tommasobecca03@gmail.com) License: CC-BY-SA-4.0 @@ -780,16 +780,16 @@ Comment: Derived from works by Rob Lavinsky (under the same license). Files: - images/land/badlands0* - images/land/badlands1* - images/land/badlands2* - images/land/badlands5* - images/land/badlands6* - images/land/badlands7* - images/land/badlands8* - images/land/badlands10* - images/land/badlands11* - images/land/badlands12* + images/land/badlands0.* + images/land/badlands1.* + images/land/badlands2.* + images/land/badlands5.* + images/land/badlands6.* + images/land/badlands7.* + images/land/badlands8.* + images/land/badlands10.* + images/land/badlands11.* + images/land/badlands12.* images/land/beach0* images/land/beach2* images/land/beach3* @@ -798,12 +798,14 @@ images/land/beach13* images/land/beach14* images/land/canyon0* - images/land/canyon1* - images/land/canyon7* - images/land/canyon8* - images/land/canyon13* - images/land/canyon14* - images/land/canyon15* + images/land/canyon1.* + images/land/canyon7.* + images/land/canyon8.* + images/land/canyon11.* + images/land/canyon12.* + images/land/canyon13.* + images/land/canyon14.* + images/land/canyon15.* images/land/city2* images/land/city4* images/land/city6* @@ -813,31 +815,31 @@ images/land/city10* images/land/city11* images/land/city12* - images/land/desert1* - images/land/desert2* - images/land/desert11* - images/land/desert12* - images/land/desert13* + images/land/desert1.* + images/land/desert2.* + images/land/desert11.* + images/land/desert12.* + images/land/desert13.* images/land/dune1* - images/land/fields1* - images/land/fields2* - images/land/fields3* - images/land/fields5* - images/land/fields6* - images/land/fields7* - images/land/fields9* - images/land/fields13* - images/land/fields14* - images/land/fields15* - images/land/fog0* - images/land/fog1* - images/land/fog2* - images/land/fog4* - images/land/fog6* - images/land/fog8* - images/land/fog9* - images/land/fog10* - images/land/fog11* + images/land/fields1.* + images/land/fields2.* + images/land/fields3.* + images/land/fields5.* + images/land/fields6.* + images/land/fields7.* + images/land/fields9.* + images/land/fields13.* + images/land/fields14.* + images/land/fields15.* + images/land/fog0.* + images/land/fog1.* + images/land/fog2.* + images/land/fog4.* + images/land/fog6.* + images/land/fog8.* + images/land/fog9.* + images/land/fog10.* + images/land/fog11.* images/land/forest1* images/land/forest2* images/land/forest3* @@ -866,12 +868,12 @@ images/land/mountain7.* images/land/mountain8.* images/land/mountain9.* - images/land/sea1* - images/land/sea5* - images/land/sea7* - images/land/sea8* - images/land/sea18* - images/land/sea19* + images/land/sea1.* + images/land/sea5.* + images/land/sea7.* + images/land/sea8.* + images/land/sea18.* + images/land/sea19.* images/land/sky0* images/land/sky3* images/land/sky4* @@ -881,24 +883,24 @@ images/land/sky9* images/land/sky10* images/land/sky11* - images/land/snow0* - images/land/snow1* - images/land/snow2* - images/land/snow3* - images/land/snow4* - images/land/snow5* - images/land/snow6* - images/land/snow7* - images/land/snow10* - images/land/snow14* - images/land/snow15* - images/land/snow16* - images/land/snow17* - images/land/snow18* - images/land/snow19* - images/land/snow20* - images/land/snow21* - images/land/space2* + images/land/snow0.* + images/land/snow1.* + images/land/snow2.* + images/land/snow3.* + images/land/snow4.* + images/land/snow5.* + images/land/snow6.* + images/land/snow7.* + images/land/snow10.* + images/land/snow14.* + images/land/snow15.* + images/land/snow16.* + images/land/snow17.* + images/land/snow18.* + images/land/snow19.* + images/land/snow20.* + images/land/snow21.* + images/land/space2.* images/land/station4.* images/land/station6.* images/land/station7.* @@ -1110,9 +1112,9 @@ images/ship/clipper* images/ship/dreadnought* images/ship/fury* - images/ship/hauler?i* - images/ship/hauler?ii* - images/ship/hauler?iii* + images/ship/hauler?i.* + images/ship/hauler?ii.* + images/ship/hauler?iii.* images/ship/modified?argosy* images/ship/bastion* images/ship/behemoth* @@ -1132,9 +1134,9 @@ images/thumbnail/clipper* images/thumbnail/dreadnought* images/thumbnail/fury* - images/thumbnail/hauler?i* - images/thumbnail/hauler?ii* - images/thumbnail/hauler?iii* + images/thumbnail/hauler?i.* + images/thumbnail/hauler?ii.* + images/thumbnail/hauler?iii.* images/thumbnail/modified?argosy* images/thumbnail/bastion* images/thumbnail/behemoth* @@ -1308,7 +1310,7 @@ images/hardpoint/buzzer?am* images/hardpoint/locust?turret* images/outfit/ka'het?annihilator?turret* - images/outfit/ka'het?annihilator* + images/outfit/ka'het?annihilator.* images/outfit/ka'het?emp?deployer* images/outfit/ka'het?primary?cooling* images/outfit/ka'het?ravager?turret* @@ -1341,14 +1343,14 @@ images/outfit/large?atomic?thruster.* images/outfit/huge?atomic?steering.* images/outfit/huge?atomic?thruster.* - images/outfit/javelin* + images/outfit/javelin.* images/outfit/javelin?mini?pod* images/outfit/javelin?pod* images/outfit/javelin?storage* - images/outfit/torpedo* + images/outfit/torpedo.* images/outfit/torpedo?launcher* images/outfit/torpedo?storage* - images/outfit/typhoon* + images/outfit/typhoon.* images/outfit/typhoon?launcher* images/outfit/typhoon?storage* images/outfit/cooling?ducts.* @@ -1366,10 +1368,10 @@ images/outfit/dark?reactor* images/outfit/electroweak?reactor* images/outfit/quark?reactor* - images/outfit/hai?jammer* + images/outfit/hai?jammer.* images/outfit/hai?jammer?overclocked* images/outfit/hydra?pod* - images/outfit/hydra* + images/outfit/hydra.* images/outfit/*nanite?fabricator* images/outfit/*shield?relay* images/outfit/lasher?pistol* @@ -1395,9 +1397,9 @@ images/planet/station0* images/planet/station1b* images/planet/station2b* - images/planet/station3b* + images/planet/station3b.* images/planet/station3bd* - images/planet/station4b* + images/planet/station4b.* images/planet/station4bd* images/projectile/annihilator* images/projectile/ravager?beam* @@ -1426,7 +1428,7 @@ Comment: Made in cooperation with Becca Tommaso (tommasobecca03@gmail.com) and derived from works by Michael Zahniser (under the same license) and Maximilian Korber (under the same license) Files: - images/effect/remnant?leak* + images/effect/remnant?leak-* images/effect/remnant?leak?sparkle* Copyright: Benjamin Jackson (gods.benyamin@outlook.com) License: CC-BY-SA-4.0 @@ -1510,9 +1512,9 @@ images/_menu/haze-full+* images/_menu/haze-yellow+* images/planet/browndwarf-l-rouge* - images/planet/browndwarf-l* + images/planet/browndwarf-l.* images/planet/browndwarf-y-rouge* - images/planet/browndwarf-y* + images/planet/browndwarf-y.* Copyright: Lia Gerty (https://github.com/ravenshining) License: CC-BY-SA-4.0 @@ -1524,7 +1526,7 @@ Files: images/planet/browndwarf-t-rouge* - images/planet/browndwarf-t* + images/planet/browndwarf-t.* images/planet/saturn* Copyright: Lia Gerty (https://github.com/ravenshining) License: CC-BY-SA-4.0 @@ -1579,7 +1581,7 @@ Files: images/hardpoint/digger?turret* images/outfit/korath?digger?turret* - images/outfit/korath?digger* + images/outfit/korath?digger.* Copyright: Becca Tommaso and Michael Zahniser License: CC-BY-SA-4.0 Comment: @@ -1616,7 +1618,7 @@ images/outfit/small?embattery* images/outfit/small?sheragi?cooling* images/projectile/pwavecannon* - images/projectile/hion* + images/projectile/hion+.* images/projectile/hionfrag* images/projectile/shardactive* images/projectile/shardinactive* @@ -1739,38 +1741,40 @@ images/star/f-dwarf* images/star/f-giant* images/star/f-supergiant* - images/star/f0* - images/star/f3* + images/star/f0.* + images/star/f3.* images/star/f5-old* - images/star/f5* - images/star/f8* + images/star/f5.* + images/star/f8.* images/star/g-dwarf* images/star/g-giant* images/star/g-supergiant* images/star/g0-old* - images/star/g0* - images/star/g3* + images/star/g0.* + images/star/g3.* images/star/g5-old* - images/star/g5* - images/star/g8* + images/star/g5.* + images/star/g8.* images/star/k-dwarf* images/star/k-giant* images/star/k-supergiant* images/star/k0-old* - images/star/k0* - images/star/k3* + images/star/k0.* + images/star/k3.* images/star/k5-old* - images/star/k5* - images/star/k8* + images/star/k5.* + images/star/k8.* images/star/l-dwarf* images/star/m-dwarf* images/star/m-giant* images/star/m-supergiant* - images/star/m0* - images/star/m3* - images/star/m5* - images/star/m8* - images/star/nova* + images/star/m0.* + images/star/m3.* + images/star/m5.* + images/star/m8.* + images/star/nova+.* + images/star/nova-core.* + images/star/nova-small.* images/star/nova-old* images/star/o-dwarf* images/star/o-giant* @@ -1821,12 +1825,12 @@ images/outfit/*efreti?thruster* images/outfit/finisher?maegrolain* images/outfit/fusion?cannon* - images/outfit/moonbeam* + images/outfit/moonbeam.* images/outfit/moonbeam?turret* images/outfit/nuke* images/outfit/plasma?core* images/outfit/red?sun* - images/outfit/sunbeam* + images/outfit/sunbeam.* images/outfit/sunbeam?turret* images/outfit/thunderhead?launcher* images/outfit/thunderhead?storage* @@ -1835,8 +1839,8 @@ images/outfit/wanderer?heat?sink* images/outfit/white?sun* images/outfit/yellow?sun* - images/planet/ringworld* - images/planet/ringworld?broken?debris* + images/planet/ringworld.* + images/planet/ringworld?broken?debris.* images/planet/ringworld?broken?debris?small* images/planet/ringworld?broken?left* images/planet/ringworld?broken?right* @@ -2049,8 +2053,8 @@ images/ship/gegno?slate* images/ship/gegno?tridymite* images/ship/*jje* - images/ship/modified?dromedary* - images/ship/modified?dromedary?wreck* + images/ship/modified?dromedary.* + images/ship/modified?dromedary?wreck.* images/ship/*vyrmeid* images/ship/*vyuir* images/thumbnail/gegno?augen* @@ -2072,7 +2076,7 @@ images/thumbnail/gegno?shale* images/thumbnail/gegno?slate* images/thumbnail/gegno?tridymite* - images/thumbnail/modified?dromedary* + images/thumbnail/modified?dromedary.* images/thumbnail/modified?dromedary?wreck* images/thumbnail/vyuir* Copyright: Saugia @@ -2122,21 +2126,21 @@ Files: sounds/coalition?launch* sounds/drill* - sounds/ember?tear* + sounds/ember?tear~.* sounds/ember?tear?hit* sounds/gravity?well* sounds/hai?launch* - sounds/human?launch* + sounds/human?launch.* sounds/human?launch?external* sounds/ion?rain* sounds/ion?torch* sounds/korath?afterburner* - sounds/korath?launch* + sounds/korath?launch.* sounds/korath?launch?external* sounds/locust?blaster* sounds/mandible?cannon* sounds/remnant?afterburner* - sounds/remnant?launch* + sounds/remnant?launch.* sounds/remnant?launch?external* sounds/neutron?bolt* sounds/scin?launch* @@ -2165,7 +2169,7 @@ images/hardpoint/shunt-strike* images/icon/firelight* images/outfit/blaze?pike* - images/outfit/firelight* + images/outfit/firelight.* images/outfit/firelight?bank* images/outfit/firelight?rack* images/outfit/korath?inferno* @@ -2173,9 +2177,9 @@ images/planet/station4c* images/planet/station5c* images/planet/station6c* - images/planet/station7c* + images/planet/station7c.* images/planet/station7cb* - images/projectile/firelight* + images/projectile/firelight.* images/projectile/firelight?active* sounds/ionic?blast* Copyright: Saugia @@ -2212,12 +2216,14 @@ Files: images/projectile/ionic?blast* - images/ship/kestrel* + images/ship/kestrel.* + images/ship/kestreloriginal.* images/ship/kestrele* images/ship/kestrels* images/ship/kestrelw* images/ship/osprey* - images/thumbnail/kestrel* + images/thumbnail/kestrel.* + images/thumbnail/kestreloriginal.* images/thumbnail/kestrele* images/thumbnail/kestrels* images/thumbnail/kestrelw* @@ -2248,18 +2254,18 @@ Comment: Derived from works by Michael Zahniser (under the same license). Files: - images/land/fields16* - images/land/fields17* - images/land/fields18* - images/land/fields19* - images/land/fields20* - images/land/fields21* - images/land/fields22* - images/land/fields23* - images/land/fields24* - images/land/fields25* - images/land/fields26* - images/land/fields27* + images/land/fields16.* + images/land/fields17.* + images/land/fields18.* + images/land/fields19.* + images/land/fields20.* + images/land/fields21.* + images/land/fields22.* + images/land/fields23.* + images/land/fields24.* + images/land/fields25.* + images/land/fields26.* + images/land/fields27.* images/land/hills10* images/land/sea20* images/land/sea21* @@ -2274,7 +2280,7 @@ License: CC-BY-SA-4.0 Files: - images/outfit/jump?drive* + images/outfit/jump?drive.* images/outfit/jump?drive?(broken)* Copyright: Scrinarii1337#0001 License: CC-BY-SA-4.0 @@ -2283,7 +2289,7 @@ images/scene/citydark* images/scene/buildings* images/scene/busystreet* - images/scene/iceplains* + images/scene/iceplains.* images/scene/iceplains2* images/scene/iceplains3* images/scene/lonelyrock* @@ -2339,14 +2345,14 @@ Files: images/outfit/twin?blaster* images/outfit/twin?mod?blaster* - images/outfit/repeater* + images/outfit/repeater.* images/outfit/repeater?turret* Copyright: Daeridanii (https://github.com/Daeridanii1) License: CC-BY-SA-4.0 Comment: Derived from works by Becca Tommaso and Michael Zahniser (under the same license). Files: - images/land/badlands13* + images/land/badlands13.* images/land/beach15* images/land/city19* images/land/city20* @@ -2355,8 +2361,8 @@ images/land/city23* images/land/city24* images/land/city25* - images/land/desert14* - images/land/desert15* + images/land/desert14.* + images/land/desert15.* images/land/forest10* images/land/mountain27* images/land/mountain28* diff -Nru endless-sky-0.10.2/debian/patches/atomics.patch endless-sky-0.10.2/debian/patches/atomics.patch --- endless-sky-0.10.2/debian/patches/atomics.patch 1970-01-01 00:00:00.000000000 +0000 +++ endless-sky-0.10.2/debian/patches/atomics.patch 2023-10-05 10:08:09.000000000 +0000 @@ -0,0 +1,22 @@ +Description: link with libatomic + On armel and mipsel, there are a bunch of missing __atomic_load_8 symbols + during linking + . + These are provided by libatomic and that is even in the build-dependencies, + but is missing on the linker command line. + . + The right spot to add it is a bit tricky, appending it to SConstrict near + 'pthread' doesn't seem to have any effect, but adding to CMakeLists.txt works. +Author: Damyan Ivanov + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -123,7 +123,7 @@ target_link_libraries(ExternalLibraries + if(WIN32) + target_link_libraries(ExternalLibraries INTERFACE rpcrt4 Winmm) + else() +- target_link_libraries(ExternalLibraries INTERFACE pthread) ++ target_link_libraries(ExternalLibraries INTERFACE pthread atomic) + endif() + + # Link with the UUID library, which is different for each OS. diff -Nru endless-sky-0.10.2/debian/patches/series endless-sky-0.10.2/debian/patches/series --- endless-sky-0.10.2/debian/patches/series 2023-08-08 09:06:30.000000000 +0000 +++ endless-sky-0.10.2/debian/patches/series 2023-10-05 06:53:48.000000000 +0000 @@ -1,2 +1,3 @@ out/troff.patch out/spelling.patch +atomics.patch diff -Nru endless-sky-0.10.2/debian/rules endless-sky-0.10.2/debian/rules --- endless-sky-0.10.2/debian/rules 2023-08-08 09:39:16.000000000 +0000 +++ endless-sky-0.10.2/debian/rules 2023-10-10 14:57:05.000000000 +0000 @@ -19,5 +19,5 @@ override_dh_auto_test: ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) - cd obj-$(shell dpkg-architecture -q DEB_BUILD_GNU_TYPE) && ctest --label-exclude "(benchmark|integration-debug)" + cd obj-$(shell dpkg-architecture -q DEB_BUILD_GNU_TYPE) && ctest --label-exclude "(benchmark|integration-debug)" --timeout 9000 endif