diff -Nru speed-dreams-base-2.0.0+r4687/debian/changelog speed-dreams-base-2.0.0+r4687/debian/changelog --- speed-dreams-base-2.0.0+r4687/debian/changelog 2012-04-22 01:30:40.000000000 +0000 +++ speed-dreams-base-2.0.0+r4687/debian/changelog 2012-12-02 12:15:59.000000000 +0000 @@ -1,3 +1,9 @@ +speed-dreams-base (2.0.0+r4687-0ubuntu1~lucid2) lucid; urgency=low + + * Fix missing quickrace and practice modes + + -- falkTX Sun, 02 Dec 2012 12:15:37 +0000 + speed-dreams-base (2.0.0+r4687-0ubuntu1~lucid1) lucid; urgency=low * New upstream release diff -Nru speed-dreams-base-2.0.0+r4687/debian/circuit_CMakeLists.txt speed-dreams-base-2.0.0+r4687/debian/circuit_CMakeLists.txt --- speed-dreams-base-2.0.0+r4687/debian/circuit_CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 +++ speed-dreams-base-2.0.0+r4687/debian/circuit_CMakeLists.txt 2012-12-02 12:35:00.000000000 +0000 @@ -0,0 +1,11 @@ +INCLUDE(../../../cmake/macros.cmake) + +# Official track sets. +ADD_SUBDIRECTORY(espie) + +# Work-in-progress track sets. +IF(NOT OPTION_OFFICIAL_ONLY) + + ADD_SUBDIRECTORY(bueno) + +ENDIF() \ No newline at end of file diff -Nru speed-dreams-base-2.0.0+r4687/debian/circuit_CMakeLists.txt.upstream speed-dreams-base-2.0.0+r4687/debian/circuit_CMakeLists.txt.upstream --- speed-dreams-base-2.0.0+r4687/debian/circuit_CMakeLists.txt.upstream 1970-01-01 00:00:00.000000000 +0000 +++ speed-dreams-base-2.0.0+r4687/debian/circuit_CMakeLists.txt.upstream 2012-12-02 12:30:06.000000000 +0000 @@ -0,0 +1,20 @@ +INCLUDE(../../../cmake/macros.cmake) + +# Official track sets. +ADD_SUBDIRECTORY(aalborg) +ADD_SUBDIRECTORY(brondehach) +ADD_SUBDIRECTORY(chemisay) +ADD_SUBDIRECTORY(corkscrew) +ADD_SUBDIRECTORY(espie) +ADD_SUBDIRECTORY(forza) +ADD_SUBDIRECTORY(goldstone-sand) +ADD_SUBDIRECTORY(karwada) +ADD_SUBDIRECTORY(migrants) +ADD_SUBDIRECTORY(ruudskogen) + +# Work-in-progress track sets. +IF(NOT OPTION_OFFICIAL_ONLY) + + ADD_SUBDIRECTORY(bueno) + +ENDIF() \ No newline at end of file diff -Nru speed-dreams-base-2.0.0+r4687/debian/patches/base-only.patch speed-dreams-base-2.0.0+r4687/debian/patches/base-only.patch --- speed-dreams-base-2.0.0+r4687/debian/patches/base-only.patch 2012-04-22 01:12:02.000000000 +0000 +++ speed-dreams-base-2.0.0+r4687/debian/patches/base-only.patch 2012-12-02 12:35:11.000000000 +0000 @@ -1,102 +1,6 @@ -diff -U 3 -H -d -r -N -- speed-dreams-base_2.0.0+r4687.orig/data/cars/models/CMakeLists.txt speed-dreams-base_2.0.0+r4687/data/cars/models/CMakeLists.txt ---- speed-dreams-base_2.0.0+r4687.orig/data/cars/models/CMakeLists.txt 2011-11-26 08:44:30.000000000 +0000 -+++ speed-dreams-base_2.0.0+r4687/data/cars/models/CMakeLists.txt 2012-04-22 02:10:48.000000000 +0100 -@@ -1,24 +1,6 @@ - INCLUDE(../../../cmake/macros.cmake) - - # Official car sets. --ADD_SUBDIRECTORY(36gp-century-r11b) --ADD_SUBDIRECTORY(36gp-ettore-t59) --ADD_SUBDIRECTORY(36gp-milano-12c36) --ADD_SUBDIRECTORY(36gp-milano-tipop3) --ADD_SUBDIRECTORY(36gp-motorunion-typec) --ADD_SUBDIRECTORY(36gp-silber-w25b) --ADD_SUBDIRECTORY(36gp-tridenti-6c34) --ADD_SUBDIRECTORY(36gp-tridenti-v8ri) -- --ADD_SUBDIRECTORY(trb1-boxer-trbrs) --ADD_SUBDIRECTORY(trb1-cavallo-360rb) --ADD_SUBDIRECTORY(trb1-sector-rb1) --ADD_SUBDIRECTORY(trb1-silber-rblk) --ADD_SUBDIRECTORY(trb1-spirit-rb1lt) --ADD_SUBDIRECTORY(trb1-taipan-rb1) --ADD_SUBDIRECTORY(trb1-vieringe-5rb/) --ADD_SUBDIRECTORY(trb1-zaxxon-rb) -- - ADD_SUBDIRECTORY(sc-boxer-96) - ADD_SUBDIRECTORY(sc-cavallo-360) - ADD_SUBDIRECTORY(sc-fmc-gt4) -@@ -26,32 +8,6 @@ - ADD_SUBDIRECTORY(sc-murasama-nsx) - ADD_SUBDIRECTORY(sc-spirit-300) - --ADD_SUBDIRECTORY(ls1-archer-r9) --ADD_SUBDIRECTORY(ls1-newcastle-fury) --ADD_SUBDIRECTORY(ls1-taipan-ltsr) --ADD_SUBDIRECTORY(ls1-toro-rgt) --ADD_SUBDIRECTORY(ls1-vulture-v6r) --ADD_SUBDIRECTORY(ls1-zentek-z7r) -- --ADD_SUBDIRECTORY(ls2-bavaria-g3gtr) --ADD_SUBDIRECTORY(ls2-boxer-96rsr) --ADD_SUBDIRECTORY(ls2-cavallo-360r) --ADD_SUBDIRECTORY(ls2-condor-c400r) --ADD_SUBDIRECTORY(ls2-morley-r900) --ADD_SUBDIRECTORY(ls2-sprite-gts) --ADD_SUBDIRECTORY(ls2-vortex-gt) --ADD_SUBDIRECTORY(ls2-lynx-xkr) -- --ADD_SUBDIRECTORY(mp5-fmc) --ADD_SUBDIRECTORY(mp5-fmc-drift) --ADD_SUBDIRECTORY(mp5-fmc-speedy) -- --ADD_SUBDIRECTORY(rs1-citrus-cs4) --ADD_SUBDIRECTORY(rs1-fmc-centre) --ADD_SUBDIRECTORY(rs1-kenji-08) --ADD_SUBDIRECTORY(rs2-fai-dot) --ADD_SUBDIRECTORY(rs2-lion-2m) -- - # Work-in-progress car sets. - IF(NOT OPTION_OFFICIAL_ONLY) - -diff -U 3 -H -d -r -N -- speed-dreams-base_2.0.0+r4687.orig/data/tracks/CMakeLists.txt speed-dreams-base_2.0.0+r4687/data/tracks/CMakeLists.txt ---- speed-dreams-base_2.0.0+r4687.orig/data/tracks/CMakeLists.txt 2011-08-15 10:16:56.000000000 +0100 -+++ speed-dreams-base_2.0.0+r4687/data/tracks/CMakeLists.txt 2012-04-22 02:10:48.000000000 +0100 -@@ -1,10 +1,7 @@ - INCLUDE(../../cmake/macros.cmake) - - # Official track sets. --ADD_SUBDIRECTORY(dirt) - ADD_SUBDIRECTORY(circuit) --ADD_SUBDIRECTORY(speedway) --ADD_SUBDIRECTORY(road) - - # Work-in-progress track sets. - IF(NOT OPTION_OFFICIAL_ONLY) -diff -U 3 -H -d -r -N -- speed-dreams-base_2.0.0+r4687.orig/data/tracks/circuit/CMakeLists.txt speed-dreams-base_2.0.0+r4687/data/tracks/circuit/CMakeLists.txt ---- speed-dreams-base_2.0.0+r4687.orig/data/tracks/circuit/CMakeLists.txt 2011-02-04 09:32:13.000000000 +0000 -+++ speed-dreams-base_2.0.0+r4687/data/tracks/circuit/CMakeLists.txt 2012-04-22 02:11:09.000000000 +0100 -@@ -1,16 +1,7 @@ - INCLUDE(../../../cmake/macros.cmake) - - # Official track sets. --ADD_SUBDIRECTORY(aalborg) --ADD_SUBDIRECTORY(brondehach) --ADD_SUBDIRECTORY(chemisay) --ADD_SUBDIRECTORY(corkscrew) - ADD_SUBDIRECTORY(espie) --ADD_SUBDIRECTORY(forza) --ADD_SUBDIRECTORY(goldstone-sand) --ADD_SUBDIRECTORY(karwada) --ADD_SUBDIRECTORY(migrants) --ADD_SUBDIRECTORY(ruudskogen) - - # Work-in-progress track sets. - IF(NOT OPTION_OFFICIAL_ONLY) -diff -U 3 -H -d -r -N -- speed-dreams-base_2.0.0+r4687.orig/src/drivers/simplix/CMakeLists.txt speed-dreams-base_2.0.0+r4687/src/drivers/simplix/CMakeLists.txt ---- speed-dreams-base_2.0.0+r4687.orig/src/drivers/simplix/CMakeLists.txt 2012-01-10 19:13:11.000000000 +0000 -+++ speed-dreams-base_2.0.0+r4687/src/drivers/simplix/CMakeLists.txt 2012-04-22 02:10:48.000000000 +0100 -@@ -5,12 +5,7 @@ +--- speed-dreams-base-2.0.0+r4687.orig/src/drivers/simplix/CMakeLists.txt ++++ speed-dreams-base-2.0.0+r4687/src/drivers/simplix/CMakeLists.txt +@@ -5,12 +5,7 @@ SET(ROBOT_NAME "simplix") # Official-only simplix interface. SET(ROBOT_INTERFACE LEGACY WELCOME @@ -109,7 +13,7 @@ my_simplix_0 my_simplix_1 my_simplix_2 my_simplix_3 my_simplix_4 my_simplix_5 my_simplix_6 my_simplix_7 my_simplix_8 my_simplix_9) -@@ -83,7 +78,7 @@ +@@ -83,7 +78,7 @@ SET(ROBOT_SOURCES ) # Official-only simplix instances. @@ -118,7 +22,7 @@ IF(NOT OPTION_OFFICIAL_ONLY) -@@ -100,10 +95,7 @@ +@@ -100,10 +95,7 @@ ROBOT_MODULE(NAME ${ROBOT_NAME} VERSION # The data associated to the ubiquitous robot module and its clones. # simplix @@ -130,7 +34,7 @@ sc-murasama-nsx sc-spirit-300 tracks 0) -@@ -112,16 +104,6 @@ +@@ -112,16 +104,6 @@ ROBOT_DATA(NAME ${ROBOT_NAME} PREFIX src FILES ${ROBOT_NAME}.xml default.xml logo.rgb readme.txt SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml *.rgb) @@ -147,7 +51,7 @@ # SuperCars SET(ROBOT_SUBDIRS 0 1 2 3 4 5 6 7 8 9 12 13 sc-boxer-96 sc-spirit-300 sc-cavallo-360 sc-fmc-gt4 -@@ -132,45 +114,6 @@ +@@ -132,45 +114,6 @@ ROBOT_DATA(NAME simplix_sc PREFIX simpli FILES simplix_sc.xml default.xml logo.rgb readme.txt SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg) @@ -193,10 +97,9 @@ # Work-in-progress / unofficial simplix instances. IF(NOT OPTION_OFFICIAL_ONLY) -diff -U 3 -H -d -r -N -- speed-dreams-base_2.0.0+r4687.orig/src/drivers/usr/CMakeLists.txt speed-dreams-base_2.0.0+r4687/src/drivers/usr/CMakeLists.txt ---- speed-dreams-base_2.0.0+r4687.orig/src/drivers/usr/CMakeLists.txt 2012-01-02 19:28:37.000000000 +0000 -+++ speed-dreams-base_2.0.0+r4687/src/drivers/usr/CMakeLists.txt 2012-04-22 02:10:48.000000000 +0100 -@@ -6,12 +6,7 @@ +--- speed-dreams-base-2.0.0+r4687.orig/src/drivers/usr/CMakeLists.txt ++++ speed-dreams-base-2.0.0+r4687/src/drivers/usr/CMakeLists.txt +@@ -6,12 +6,7 @@ SET(ROBOT_NAME "usr") # Official-only USR interface. SET(ROBOT_INTERFACE LEGACY WELCOME @@ -209,7 +112,7 @@ ) SET(ROBOT_SOURCES -@@ -36,7 +31,7 @@ +@@ -36,7 +31,7 @@ SET(ROBOT_SOURCES src/xmldefs.h) # Official-only USR instances. @@ -218,7 +121,7 @@ ROBOT_MODULE(NAME ${ROBOT_NAME} VERSION 3.0.0 SOVERSION 1.0.0 INTERFACE ${ROBOT_INTERFACE} -@@ -54,20 +49,6 @@ +@@ -54,20 +49,6 @@ ROBOT_DATA(NAME ${ROBOT_NAME} PREFIX src #FILES README SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png) @@ -239,7 +142,7 @@ ################### # USR_SC ################### -@@ -79,55 +60,3 @@ +@@ -79,55 +60,3 @@ SET(ROBOT_SUBDIRS 1 2 3 4 5 6 7 8 9 10 1 ROBOT_DATA(NAME usr_sc PREFIX usr_sc FILES usr_sc.xml default.xml logo.rgb readme.txt SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg) @@ -295,9 +198,8 @@ - FILES usr_rs.xml default.xml logo.rgb readme.txt - SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg) - -diff -U 3 -H -d -r -N -- speed-dreams-base_2.0.0+r4687.orig/src/modules/simu/CMakeLists.txt speed-dreams-base_2.0.0+r4687/src/modules/simu/CMakeLists.txt ---- speed-dreams-base_2.0.0+r4687.orig/src/modules/simu/CMakeLists.txt 2010-11-06 09:27:01.000000000 +0000 -+++ speed-dreams-base_2.0.0+r4687/src/modules/simu/CMakeLists.txt 2012-04-22 02:10:48.000000000 +0100 +--- speed-dreams-base-2.0.0+r4687.orig/src/modules/simu/CMakeLists.txt ++++ speed-dreams-base-2.0.0+r4687/src/modules/simu/CMakeLists.txt @@ -1,10 +1,6 @@ INCLUDE(../../../cmake/macros.cmake) @@ -309,9 +211,8 @@ # Unofficial / obsolete simulation engines. IF(NOT OPTION_OFFICIAL_ONLY) -diff -U 3 -H -d -r -N -- speed-dreams-base_2.0.0+r4687.orig/src/raceman/CMakeLists.txt speed-dreams-base_2.0.0+r4687/src/raceman/CMakeLists.txt ---- speed-dreams-base_2.0.0+r4687.orig/src/raceman/CMakeLists.txt 2012-03-25 13:52:05.000000000 +0100 -+++ speed-dreams-base_2.0.0+r4687/src/raceman/CMakeLists.txt 2012-04-22 02:10:48.000000000 +0100 +--- speed-dreams-base-2.0.0+r4687.orig/src/raceman/CMakeLists.txt ++++ speed-dreams-base-2.0.0+r4687/src/raceman/CMakeLists.txt @@ -1,14 +1,7 @@ INCLUDE(../../cmake/macros.cmake) @@ -324,7 +225,80 @@ - championship-36gp.xml championship-ls-gt1.xml championship-mp5.xml - career.xml - career_supercars.xmls career_ls1.xmls) -+ FILES singleevent-challenge.xml singleevent-endurance.xml) ++ FILES practice.xml quickrace.xml singleevent-challenge.xml singleevent-endurance.xml) SD_INSTALL_FILES(DATA config/raceman/extra USER config/raceman/extra FILES extra/skill.xml) +--- speed-dreams-base-2.0.0+r4687.orig/data/tracks/CMakeLists.txt ++++ speed-dreams-base-2.0.0+r4687/data/tracks/CMakeLists.txt +@@ -1,10 +1,7 @@ + INCLUDE(../../cmake/macros.cmake) + + # Official track sets. +-ADD_SUBDIRECTORY(dirt) + ADD_SUBDIRECTORY(circuit) +-ADD_SUBDIRECTORY(speedway) +-ADD_SUBDIRECTORY(road) + + # Work-in-progress track sets. + IF(NOT OPTION_OFFICIAL_ONLY) +--- speed-dreams-base-2.0.0+r4687.orig/data/cars/models/CMakeLists.txt ++++ speed-dreams-base-2.0.0+r4687/data/cars/models/CMakeLists.txt +@@ -1,24 +1,6 @@ + INCLUDE(../../../cmake/macros.cmake) + + # Official car sets. +-ADD_SUBDIRECTORY(36gp-century-r11b) +-ADD_SUBDIRECTORY(36gp-ettore-t59) +-ADD_SUBDIRECTORY(36gp-milano-12c36) +-ADD_SUBDIRECTORY(36gp-milano-tipop3) +-ADD_SUBDIRECTORY(36gp-motorunion-typec) +-ADD_SUBDIRECTORY(36gp-silber-w25b) +-ADD_SUBDIRECTORY(36gp-tridenti-6c34) +-ADD_SUBDIRECTORY(36gp-tridenti-v8ri) +- +-ADD_SUBDIRECTORY(trb1-boxer-trbrs) +-ADD_SUBDIRECTORY(trb1-cavallo-360rb) +-ADD_SUBDIRECTORY(trb1-sector-rb1) +-ADD_SUBDIRECTORY(trb1-silber-rblk) +-ADD_SUBDIRECTORY(trb1-spirit-rb1lt) +-ADD_SUBDIRECTORY(trb1-taipan-rb1) +-ADD_SUBDIRECTORY(trb1-vieringe-5rb/) +-ADD_SUBDIRECTORY(trb1-zaxxon-rb) +- + ADD_SUBDIRECTORY(sc-boxer-96) + ADD_SUBDIRECTORY(sc-cavallo-360) + ADD_SUBDIRECTORY(sc-fmc-gt4) +@@ -26,32 +8,6 @@ ADD_SUBDIRECTORY(sc-lynx-220) + ADD_SUBDIRECTORY(sc-murasama-nsx) + ADD_SUBDIRECTORY(sc-spirit-300) + +-ADD_SUBDIRECTORY(ls1-archer-r9) +-ADD_SUBDIRECTORY(ls1-newcastle-fury) +-ADD_SUBDIRECTORY(ls1-taipan-ltsr) +-ADD_SUBDIRECTORY(ls1-toro-rgt) +-ADD_SUBDIRECTORY(ls1-vulture-v6r) +-ADD_SUBDIRECTORY(ls1-zentek-z7r) +- +-ADD_SUBDIRECTORY(ls2-bavaria-g3gtr) +-ADD_SUBDIRECTORY(ls2-boxer-96rsr) +-ADD_SUBDIRECTORY(ls2-cavallo-360r) +-ADD_SUBDIRECTORY(ls2-condor-c400r) +-ADD_SUBDIRECTORY(ls2-morley-r900) +-ADD_SUBDIRECTORY(ls2-sprite-gts) +-ADD_SUBDIRECTORY(ls2-vortex-gt) +-ADD_SUBDIRECTORY(ls2-lynx-xkr) +- +-ADD_SUBDIRECTORY(mp5-fmc) +-ADD_SUBDIRECTORY(mp5-fmc-drift) +-ADD_SUBDIRECTORY(mp5-fmc-speedy) +- +-ADD_SUBDIRECTORY(rs1-citrus-cs4) +-ADD_SUBDIRECTORY(rs1-fmc-centre) +-ADD_SUBDIRECTORY(rs1-kenji-08) +-ADD_SUBDIRECTORY(rs2-fai-dot) +-ADD_SUBDIRECTORY(rs2-lion-2m) +- + # Work-in-progress car sets. + IF(NOT OPTION_OFFICIAL_ONLY) + diff -Nru speed-dreams-base-2.0.0+r4687/debian/patches/base-only.patch.old speed-dreams-base-2.0.0+r4687/debian/patches/base-only.patch.old --- speed-dreams-base-2.0.0+r4687/debian/patches/base-only.patch.old 1970-01-01 00:00:00.000000000 +0000 +++ speed-dreams-base-2.0.0+r4687/debian/patches/base-only.patch.old 2012-04-22 01:12:02.000000000 +0000 @@ -0,0 +1,330 @@ +diff -U 3 -H -d -r -N -- speed-dreams-base_2.0.0+r4687.orig/data/cars/models/CMakeLists.txt speed-dreams-base_2.0.0+r4687/data/cars/models/CMakeLists.txt +--- speed-dreams-base_2.0.0+r4687.orig/data/cars/models/CMakeLists.txt 2011-11-26 08:44:30.000000000 +0000 ++++ speed-dreams-base_2.0.0+r4687/data/cars/models/CMakeLists.txt 2012-04-22 02:10:48.000000000 +0100 +@@ -1,24 +1,6 @@ + INCLUDE(../../../cmake/macros.cmake) + + # Official car sets. +-ADD_SUBDIRECTORY(36gp-century-r11b) +-ADD_SUBDIRECTORY(36gp-ettore-t59) +-ADD_SUBDIRECTORY(36gp-milano-12c36) +-ADD_SUBDIRECTORY(36gp-milano-tipop3) +-ADD_SUBDIRECTORY(36gp-motorunion-typec) +-ADD_SUBDIRECTORY(36gp-silber-w25b) +-ADD_SUBDIRECTORY(36gp-tridenti-6c34) +-ADD_SUBDIRECTORY(36gp-tridenti-v8ri) +- +-ADD_SUBDIRECTORY(trb1-boxer-trbrs) +-ADD_SUBDIRECTORY(trb1-cavallo-360rb) +-ADD_SUBDIRECTORY(trb1-sector-rb1) +-ADD_SUBDIRECTORY(trb1-silber-rblk) +-ADD_SUBDIRECTORY(trb1-spirit-rb1lt) +-ADD_SUBDIRECTORY(trb1-taipan-rb1) +-ADD_SUBDIRECTORY(trb1-vieringe-5rb/) +-ADD_SUBDIRECTORY(trb1-zaxxon-rb) +- + ADD_SUBDIRECTORY(sc-boxer-96) + ADD_SUBDIRECTORY(sc-cavallo-360) + ADD_SUBDIRECTORY(sc-fmc-gt4) +@@ -26,32 +8,6 @@ + ADD_SUBDIRECTORY(sc-murasama-nsx) + ADD_SUBDIRECTORY(sc-spirit-300) + +-ADD_SUBDIRECTORY(ls1-archer-r9) +-ADD_SUBDIRECTORY(ls1-newcastle-fury) +-ADD_SUBDIRECTORY(ls1-taipan-ltsr) +-ADD_SUBDIRECTORY(ls1-toro-rgt) +-ADD_SUBDIRECTORY(ls1-vulture-v6r) +-ADD_SUBDIRECTORY(ls1-zentek-z7r) +- +-ADD_SUBDIRECTORY(ls2-bavaria-g3gtr) +-ADD_SUBDIRECTORY(ls2-boxer-96rsr) +-ADD_SUBDIRECTORY(ls2-cavallo-360r) +-ADD_SUBDIRECTORY(ls2-condor-c400r) +-ADD_SUBDIRECTORY(ls2-morley-r900) +-ADD_SUBDIRECTORY(ls2-sprite-gts) +-ADD_SUBDIRECTORY(ls2-vortex-gt) +-ADD_SUBDIRECTORY(ls2-lynx-xkr) +- +-ADD_SUBDIRECTORY(mp5-fmc) +-ADD_SUBDIRECTORY(mp5-fmc-drift) +-ADD_SUBDIRECTORY(mp5-fmc-speedy) +- +-ADD_SUBDIRECTORY(rs1-citrus-cs4) +-ADD_SUBDIRECTORY(rs1-fmc-centre) +-ADD_SUBDIRECTORY(rs1-kenji-08) +-ADD_SUBDIRECTORY(rs2-fai-dot) +-ADD_SUBDIRECTORY(rs2-lion-2m) +- + # Work-in-progress car sets. + IF(NOT OPTION_OFFICIAL_ONLY) + +diff -U 3 -H -d -r -N -- speed-dreams-base_2.0.0+r4687.orig/data/tracks/CMakeLists.txt speed-dreams-base_2.0.0+r4687/data/tracks/CMakeLists.txt +--- speed-dreams-base_2.0.0+r4687.orig/data/tracks/CMakeLists.txt 2011-08-15 10:16:56.000000000 +0100 ++++ speed-dreams-base_2.0.0+r4687/data/tracks/CMakeLists.txt 2012-04-22 02:10:48.000000000 +0100 +@@ -1,10 +1,7 @@ + INCLUDE(../../cmake/macros.cmake) + + # Official track sets. +-ADD_SUBDIRECTORY(dirt) + ADD_SUBDIRECTORY(circuit) +-ADD_SUBDIRECTORY(speedway) +-ADD_SUBDIRECTORY(road) + + # Work-in-progress track sets. + IF(NOT OPTION_OFFICIAL_ONLY) +diff -U 3 -H -d -r -N -- speed-dreams-base_2.0.0+r4687.orig/data/tracks/circuit/CMakeLists.txt speed-dreams-base_2.0.0+r4687/data/tracks/circuit/CMakeLists.txt +--- speed-dreams-base_2.0.0+r4687.orig/data/tracks/circuit/CMakeLists.txt 2011-02-04 09:32:13.000000000 +0000 ++++ speed-dreams-base_2.0.0+r4687/data/tracks/circuit/CMakeLists.txt 2012-04-22 02:11:09.000000000 +0100 +@@ -1,16 +1,7 @@ + INCLUDE(../../../cmake/macros.cmake) + + # Official track sets. +-ADD_SUBDIRECTORY(aalborg) +-ADD_SUBDIRECTORY(brondehach) +-ADD_SUBDIRECTORY(chemisay) +-ADD_SUBDIRECTORY(corkscrew) + ADD_SUBDIRECTORY(espie) +-ADD_SUBDIRECTORY(forza) +-ADD_SUBDIRECTORY(goldstone-sand) +-ADD_SUBDIRECTORY(karwada) +-ADD_SUBDIRECTORY(migrants) +-ADD_SUBDIRECTORY(ruudskogen) + + # Work-in-progress track sets. + IF(NOT OPTION_OFFICIAL_ONLY) +diff -U 3 -H -d -r -N -- speed-dreams-base_2.0.0+r4687.orig/src/drivers/simplix/CMakeLists.txt speed-dreams-base_2.0.0+r4687/src/drivers/simplix/CMakeLists.txt +--- speed-dreams-base_2.0.0+r4687.orig/src/drivers/simplix/CMakeLists.txt 2012-01-10 19:13:11.000000000 +0000 ++++ speed-dreams-base_2.0.0+r4687/src/drivers/simplix/CMakeLists.txt 2012-04-22 02:10:48.000000000 +0100 +@@ -5,12 +5,7 @@ + + # Official-only simplix interface. + SET(ROBOT_INTERFACE LEGACY WELCOME +- simplix_trb1a simplix_trb1b + simplix_sca simplix_scb +- simplix_36GP +- simplix_ls1 +- simplix_ls2 +- simplix_mp5 + my_simplix_0 my_simplix_1 my_simplix_2 my_simplix_3 my_simplix_4 + my_simplix_5 my_simplix_6 my_simplix_7 my_simplix_8 my_simplix_9) + +@@ -83,7 +78,7 @@ + ) + + # Official-only simplix instances. +-SET(ROBOT_CLONES simplix_36GP simplix_sc simplix_trb1 simplix_ls1 simplix_ls2 simplix_mp5) ++SET(ROBOT_CLONES simplix_sc) + + IF(NOT OPTION_OFFICIAL_ONLY) + +@@ -100,10 +95,7 @@ + + # The data associated to the ubiquitous robot module and its clones. + # simplix +-SET(ROBOT_SUBDIRS trb1-cavallo-360rb +- ls1-archer-r9 ls1-cavallo-570s1 ls1-newcastle-fury ls1-taipan-ltsr +- ls1-toro-rgt ls1-vulture-v6r ls1-zentek-z7r +- sc-boxer-96 sc-cavallo-360 sc-fmc-gt4 sc-lynx-220 ++SET(ROBOT_SUBDIRS sc-boxer-96 sc-cavallo-360 sc-fmc-gt4 sc-lynx-220 + sc-murasama-nsx sc-spirit-300 + tracks + 0) +@@ -112,16 +104,6 @@ + FILES ${ROBOT_NAME}.xml default.xml logo.rgb readme.txt + SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml *.rgb) + +-# 36GP +-SET(ROBOT_SUBDIRS 0 1 2 3 4 5 6 7 8 9 +- 36gp-ettore-t59 36gp-milano-12c36 36gp-silber-w25b +- 36gp-tridenti-6c34 36gp-tridenti-v8ri +- tracks) +- +-ROBOT_DATA(NAME simplix_36GP PREFIX simplix_36GP +- FILES simplix_36GP.xml default.xml logo.rgb readme.txt +- SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg) +- + # SuperCars + SET(ROBOT_SUBDIRS 0 1 2 3 4 5 6 7 8 9 12 13 + sc-boxer-96 sc-spirit-300 sc-cavallo-360 sc-fmc-gt4 +@@ -132,45 +114,6 @@ + FILES simplix_sc.xml default.xml logo.rgb readme.txt + SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg) + +-# LS1 +-SET(ROBOT_SUBDIRS 0 1 2 3 4 5 6 7 8 9 10 11 12 13 +- ls1-archer-r9 ls1-vulture-v6r ls1-toro-rgt +- ls1-cavallo-570s1 ls1-zentek-z7r ls1-newcastle-fury +- ls1-taipan-ltsr +- tracks) +- +-ROBOT_DATA(NAME simplix_ls1 PREFIX simplix_ls1 +- FILES simplix_ls1.xml default.xml logo.rgb readme.txt +- SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg) +-# LS2 +-SET(ROBOT_SUBDIRS 0 +- ls2-bavaria-g3gtr +- tracks) +- +-ROBOT_DATA(NAME simplix_ls2 PREFIX simplix_ls2 +- FILES simplix_ls2.xml default.xml logo.rgb readme.txt +- SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg) +- +-# TRB1 +-SET(ROBOT_SUBDIRS 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 +- trb1-cavallo-360rb trb1-boxer-trbrs trb1-spirit-rb1lt +- trb1-taipan-rb1 trb1-silber-rblk trb1-sector-rb1 +- trb1-zaxxon-rb trb1-vieringe-5rb +- tracks) +- +-ROBOT_DATA(NAME simplix_trb1 PREFIX simplix_trb1 +- FILES simplix_trb1.xml default.xml logo.rgb readme.txt +- SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg) +- +-# MP5 +-SET(ROBOT_SUBDIRS 0 1 2 3 4 5 +- mp5-fmc mp5-fmc-drift mp5-fmc-speedy +- tracks) +- +-ROBOT_DATA(NAME simplix_mp5 PREFIX simplix_mp5 +- FILES simplix_mp5.xml default.xml logo.rgb readme.txt +- SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg) +- + # Work-in-progress / unofficial simplix instances. + IF(NOT OPTION_OFFICIAL_ONLY) + +diff -U 3 -H -d -r -N -- speed-dreams-base_2.0.0+r4687.orig/src/drivers/usr/CMakeLists.txt speed-dreams-base_2.0.0+r4687/src/drivers/usr/CMakeLists.txt +--- speed-dreams-base_2.0.0+r4687.orig/src/drivers/usr/CMakeLists.txt 2012-01-02 19:28:37.000000000 +0000 ++++ speed-dreams-base_2.0.0+r4687/src/drivers/usr/CMakeLists.txt 2012-04-22 02:10:48.000000000 +0100 +@@ -6,12 +6,7 @@ + + # Official-only USR interface. + SET(ROBOT_INTERFACE LEGACY WELCOME +- usr_trb1 + usr_sc +- usr_ls1 +- usr_ls2 +- usr_36GP +- usr_rs + ) + + SET(ROBOT_SOURCES +@@ -36,7 +31,7 @@ + src/xmldefs.h) + + # Official-only USR instances. +-SET(ROBOT_CLONES usr_trb1 usr_sc usr_ls1 usr_ls2 usr_36GP usr_rs) ++SET(ROBOT_CLONES usr_sc) + + ROBOT_MODULE(NAME ${ROBOT_NAME} VERSION 3.0.0 SOVERSION 1.0.0 + INTERFACE ${ROBOT_INTERFACE} +@@ -54,20 +49,6 @@ + #FILES README + SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png) + +- +-################### +-# USR_TRB1 +-################### +-SET(ROBOT_SUBDIRS 1 2 3 4 5 6 7 8 9 10 11 12 13 14 +- trb1-boxer-trbrs trb1-cavallo-360rb trb1-sector-rb1 +- trb1-silber-rblk trb1-spirit-rb1lt trb1-taipan-rb1 +- trb1-zaxxon-rb +- tracks) +- +-ROBOT_DATA(NAME usr_trb1 PREFIX usr_trb1 +- FILES usr_trb1.xml default.xml logo.rgb readme.txt +- SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg) +- + ################### + # USR_SC + ################### +@@ -79,55 +60,3 @@ + ROBOT_DATA(NAME usr_sc PREFIX usr_sc + FILES usr_sc.xml default.xml logo.rgb readme.txt + SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg) +- +-################### +-# USR_LS1 +-################### +-SET(ROBOT_SUBDIRS 1 2 3 4 5 6 7 8 9 10 11 12 13 14 +- ls1-archer-r9 ls1-vulture-v6r ls1-zentek-z7r +- ls1-cavallo-570s1 ls1-newcastle-fury +- ls1-taipan-ltsr ls1-toro-rgt +- tracks) +- +-ROBOT_DATA(NAME usr_ls1 PREFIX usr_ls1 +- FILES usr_ls1.xml default.xml logo.rgb readme.txt +- SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg) +- +-################### +-# USR_LS2 +-################### +-SET(ROBOT_SUBDIRS 1 2 3 4 5 6 7 8 9 10 11 12 13 14 +- ls2-bavaria-g3gtr ls2-boxer-96rsr +- ls2-cavallo-360r ls2-condor-c400r +- ls2-morley-r900 ls2-sprite-gts +- ls2-vortex-gt ls2-lynx-xkr +- tracks) +- +-ROBOT_DATA(NAME usr_ls2 PREFIX usr_ls2 +- FILES usr_ls2.xml default.xml logo.rgb readme.txt +- SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg) +- +-################### +-# USR_36GP +-################### +-SET(ROBOT_SUBDIRS 1 2 3 4 5 6 7 8 9 10 11 12 +- 36gp-ettore-t59 36gp-milano-12c36 36gp-milano-tipop3 +- 36gp-motorunion-typec 36gp-tridenti-6c34 +- 36gp-tridenti-v8ri +- tracks) +- +-ROBOT_DATA(NAME usr_36GP PREFIX usr_36GP +- FILES usr_36GP.xml default.xml logo.rgb readme.txt +- SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg) +- +-################### +-# USR_RS +-################### +-SET(ROBOT_SUBDIRS 1 +- rs1-kenji-08 +- tracks) +- +-ROBOT_DATA(NAME usr_rs PREFIX usr_rs +- FILES usr_rs.xml default.xml logo.rgb readme.txt +- SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg) +- +diff -U 3 -H -d -r -N -- speed-dreams-base_2.0.0+r4687.orig/src/modules/simu/CMakeLists.txt speed-dreams-base_2.0.0+r4687/src/modules/simu/CMakeLists.txt +--- speed-dreams-base_2.0.0+r4687.orig/src/modules/simu/CMakeLists.txt 2010-11-06 09:27:01.000000000 +0000 ++++ speed-dreams-base_2.0.0+r4687/src/modules/simu/CMakeLists.txt 2012-04-22 02:10:48.000000000 +0100 +@@ -1,10 +1,6 @@ + INCLUDE(../../../cmake/macros.cmake) + + ADD_SUBDIRECTORY(simuv2.1) +-ADD_SUBDIRECTORY(simuv3) +- +-# Should normally becomes obsolete in 2.0. +-ADD_SUBDIRECTORY(simuv2) + + # Unofficial / obsolete simulation engines. + IF(NOT OPTION_OFFICIAL_ONLY) +diff -U 3 -H -d -r -N -- speed-dreams-base_2.0.0+r4687.orig/src/raceman/CMakeLists.txt speed-dreams-base_2.0.0+r4687/src/raceman/CMakeLists.txt +--- speed-dreams-base_2.0.0+r4687.orig/src/raceman/CMakeLists.txt 2012-03-25 13:52:05.000000000 +0100 ++++ speed-dreams-base_2.0.0+r4687/src/raceman/CMakeLists.txt 2012-04-22 02:10:48.000000000 +0100 +@@ -1,14 +1,7 @@ + INCLUDE(../../cmake/macros.cmake) + + SD_INSTALL_FILES(DATA config/raceman USER config/raceman +- FILES practice.xml quickrace.xml +- singleevent-36gp.xml +- singleevent-challenge.xml singleevent-endurance.xml +- singleevent-ls-gt1.xml singleevent-mp5.xml +- championship.xml championship-supercars.xml championship-trb1.xml +- championship-36gp.xml championship-ls-gt1.xml championship-mp5.xml +- career.xml +- career_supercars.xmls career_ls1.xmls) ++ FILES singleevent-challenge.xml singleevent-endurance.xml) + + SD_INSTALL_FILES(DATA config/raceman/extra USER config/raceman/extra + FILES extra/skill.xml) diff -Nru speed-dreams-base-2.0.0+r4687/debian/patches/base-only.patch2 speed-dreams-base-2.0.0+r4687/debian/patches/base-only.patch2 --- speed-dreams-base-2.0.0+r4687/debian/patches/base-only.patch2 1970-01-01 00:00:00.000000000 +0000 +++ speed-dreams-base-2.0.0+r4687/debian/patches/base-only.patch2 2012-12-02 12:21:46.000000000 +0000 @@ -0,0 +1,323 @@ +--- speed-dreams-base-2.0.0+r4687.orig/src/drivers/simplix/CMakeLists.txt ++++ speed-dreams-base-2.0.0+r4687/src/drivers/simplix/CMakeLists.txt +@@ -5,12 +5,7 @@ SET(ROBOT_NAME "simplix") + + # Official-only simplix interface. + SET(ROBOT_INTERFACE LEGACY WELCOME +- simplix_trb1a simplix_trb1b + simplix_sca simplix_scb +- simplix_36GP +- simplix_ls1 +- simplix_ls2 +- simplix_mp5 + my_simplix_0 my_simplix_1 my_simplix_2 my_simplix_3 my_simplix_4 + my_simplix_5 my_simplix_6 my_simplix_7 my_simplix_8 my_simplix_9) + +@@ -83,7 +78,7 @@ SET(ROBOT_SOURCES + ) + + # Official-only simplix instances. +-SET(ROBOT_CLONES simplix_36GP simplix_sc simplix_trb1 simplix_ls1 simplix_ls2 simplix_mp5) ++SET(ROBOT_CLONES simplix_sc) + + IF(NOT OPTION_OFFICIAL_ONLY) + +@@ -100,10 +95,7 @@ ROBOT_MODULE(NAME ${ROBOT_NAME} VERSION + + # The data associated to the ubiquitous robot module and its clones. + # simplix +-SET(ROBOT_SUBDIRS trb1-cavallo-360rb +- ls1-archer-r9 ls1-cavallo-570s1 ls1-newcastle-fury ls1-taipan-ltsr +- ls1-toro-rgt ls1-vulture-v6r ls1-zentek-z7r +- sc-boxer-96 sc-cavallo-360 sc-fmc-gt4 sc-lynx-220 ++SET(ROBOT_SUBDIRS sc-boxer-96 sc-cavallo-360 sc-fmc-gt4 sc-lynx-220 + sc-murasama-nsx sc-spirit-300 + tracks + 0) +@@ -112,16 +104,6 @@ ROBOT_DATA(NAME ${ROBOT_NAME} PREFIX src + FILES ${ROBOT_NAME}.xml default.xml logo.rgb readme.txt + SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml *.rgb) + +-# 36GP +-SET(ROBOT_SUBDIRS 0 1 2 3 4 5 6 7 8 9 +- 36gp-ettore-t59 36gp-milano-12c36 36gp-silber-w25b +- 36gp-tridenti-6c34 36gp-tridenti-v8ri +- tracks) +- +-ROBOT_DATA(NAME simplix_36GP PREFIX simplix_36GP +- FILES simplix_36GP.xml default.xml logo.rgb readme.txt +- SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg) +- + # SuperCars + SET(ROBOT_SUBDIRS 0 1 2 3 4 5 6 7 8 9 12 13 + sc-boxer-96 sc-spirit-300 sc-cavallo-360 sc-fmc-gt4 +@@ -132,45 +114,6 @@ ROBOT_DATA(NAME simplix_sc PREFIX simpli + FILES simplix_sc.xml default.xml logo.rgb readme.txt + SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg) + +-# LS1 +-SET(ROBOT_SUBDIRS 0 1 2 3 4 5 6 7 8 9 10 11 12 13 +- ls1-archer-r9 ls1-vulture-v6r ls1-toro-rgt +- ls1-cavallo-570s1 ls1-zentek-z7r ls1-newcastle-fury +- ls1-taipan-ltsr +- tracks) +- +-ROBOT_DATA(NAME simplix_ls1 PREFIX simplix_ls1 +- FILES simplix_ls1.xml default.xml logo.rgb readme.txt +- SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg) +-# LS2 +-SET(ROBOT_SUBDIRS 0 +- ls2-bavaria-g3gtr +- tracks) +- +-ROBOT_DATA(NAME simplix_ls2 PREFIX simplix_ls2 +- FILES simplix_ls2.xml default.xml logo.rgb readme.txt +- SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg) +- +-# TRB1 +-SET(ROBOT_SUBDIRS 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 +- trb1-cavallo-360rb trb1-boxer-trbrs trb1-spirit-rb1lt +- trb1-taipan-rb1 trb1-silber-rblk trb1-sector-rb1 +- trb1-zaxxon-rb trb1-vieringe-5rb +- tracks) +- +-ROBOT_DATA(NAME simplix_trb1 PREFIX simplix_trb1 +- FILES simplix_trb1.xml default.xml logo.rgb readme.txt +- SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg) +- +-# MP5 +-SET(ROBOT_SUBDIRS 0 1 2 3 4 5 +- mp5-fmc mp5-fmc-drift mp5-fmc-speedy +- tracks) +- +-ROBOT_DATA(NAME simplix_mp5 PREFIX simplix_mp5 +- FILES simplix_mp5.xml default.xml logo.rgb readme.txt +- SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg) +- + # Work-in-progress / unofficial simplix instances. + IF(NOT OPTION_OFFICIAL_ONLY) + +--- speed-dreams-base-2.0.0+r4687.orig/src/drivers/usr/CMakeLists.txt ++++ speed-dreams-base-2.0.0+r4687/src/drivers/usr/CMakeLists.txt +@@ -6,12 +6,7 @@ SET(ROBOT_NAME "usr") + + # Official-only USR interface. + SET(ROBOT_INTERFACE LEGACY WELCOME +- usr_trb1 + usr_sc +- usr_ls1 +- usr_ls2 +- usr_36GP +- usr_rs + ) + + SET(ROBOT_SOURCES +@@ -36,7 +31,7 @@ SET(ROBOT_SOURCES + src/xmldefs.h) + + # Official-only USR instances. +-SET(ROBOT_CLONES usr_trb1 usr_sc usr_ls1 usr_ls2 usr_36GP usr_rs) ++SET(ROBOT_CLONES usr_sc) + + ROBOT_MODULE(NAME ${ROBOT_NAME} VERSION 3.0.0 SOVERSION 1.0.0 + INTERFACE ${ROBOT_INTERFACE} +@@ -54,20 +49,6 @@ ROBOT_DATA(NAME ${ROBOT_NAME} PREFIX src + #FILES README + SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png) + +- +-################### +-# USR_TRB1 +-################### +-SET(ROBOT_SUBDIRS 1 2 3 4 5 6 7 8 9 10 11 12 13 14 +- trb1-boxer-trbrs trb1-cavallo-360rb trb1-sector-rb1 +- trb1-silber-rblk trb1-spirit-rb1lt trb1-taipan-rb1 +- trb1-zaxxon-rb +- tracks) +- +-ROBOT_DATA(NAME usr_trb1 PREFIX usr_trb1 +- FILES usr_trb1.xml default.xml logo.rgb readme.txt +- SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg) +- + ################### + # USR_SC + ################### +@@ -79,55 +60,3 @@ SET(ROBOT_SUBDIRS 1 2 3 4 5 6 7 8 9 10 1 + ROBOT_DATA(NAME usr_sc PREFIX usr_sc + FILES usr_sc.xml default.xml logo.rgb readme.txt + SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg) +- +-################### +-# USR_LS1 +-################### +-SET(ROBOT_SUBDIRS 1 2 3 4 5 6 7 8 9 10 11 12 13 14 +- ls1-archer-r9 ls1-vulture-v6r ls1-zentek-z7r +- ls1-cavallo-570s1 ls1-newcastle-fury +- ls1-taipan-ltsr ls1-toro-rgt +- tracks) +- +-ROBOT_DATA(NAME usr_ls1 PREFIX usr_ls1 +- FILES usr_ls1.xml default.xml logo.rgb readme.txt +- SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg) +- +-################### +-# USR_LS2 +-################### +-SET(ROBOT_SUBDIRS 1 2 3 4 5 6 7 8 9 10 11 12 13 14 +- ls2-bavaria-g3gtr ls2-boxer-96rsr +- ls2-cavallo-360r ls2-condor-c400r +- ls2-morley-r900 ls2-sprite-gts +- ls2-vortex-gt ls2-lynx-xkr +- tracks) +- +-ROBOT_DATA(NAME usr_ls2 PREFIX usr_ls2 +- FILES usr_ls2.xml default.xml logo.rgb readme.txt +- SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg) +- +-################### +-# USR_36GP +-################### +-SET(ROBOT_SUBDIRS 1 2 3 4 5 6 7 8 9 10 11 12 +- 36gp-ettore-t59 36gp-milano-12c36 36gp-milano-tipop3 +- 36gp-motorunion-typec 36gp-tridenti-6c34 +- 36gp-tridenti-v8ri +- tracks) +- +-ROBOT_DATA(NAME usr_36GP PREFIX usr_36GP +- FILES usr_36GP.xml default.xml logo.rgb readme.txt +- SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg) +- +-################### +-# USR_RS +-################### +-SET(ROBOT_SUBDIRS 1 +- rs1-kenji-08 +- tracks) +- +-ROBOT_DATA(NAME usr_rs PREFIX usr_rs +- FILES usr_rs.xml default.xml logo.rgb readme.txt +- SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg) +- +--- speed-dreams-base-2.0.0+r4687.orig/src/modules/simu/CMakeLists.txt ++++ speed-dreams-base-2.0.0+r4687/src/modules/simu/CMakeLists.txt +@@ -1,10 +1,6 @@ + INCLUDE(../../../cmake/macros.cmake) + + ADD_SUBDIRECTORY(simuv2.1) +-ADD_SUBDIRECTORY(simuv3) +- +-# Should normally becomes obsolete in 2.0. +-ADD_SUBDIRECTORY(simuv2) + + # Unofficial / obsolete simulation engines. + IF(NOT OPTION_OFFICIAL_ONLY) +--- speed-dreams-base-2.0.0+r4687.orig/src/raceman/CMakeLists.txt ++++ speed-dreams-base-2.0.0+r4687/src/raceman/CMakeLists.txt +@@ -1,14 +1,7 @@ + INCLUDE(../../cmake/macros.cmake) + + SD_INSTALL_FILES(DATA config/raceman USER config/raceman +- FILES practice.xml quickrace.xml +- singleevent-36gp.xml +- singleevent-challenge.xml singleevent-endurance.xml +- singleevent-ls-gt1.xml singleevent-mp5.xml +- championship.xml championship-supercars.xml championship-trb1.xml +- championship-36gp.xml championship-ls-gt1.xml championship-mp5.xml +- career.xml +- career_supercars.xmls career_ls1.xmls) ++ FILES practice.xml quickrace.xml singleevent-challenge.xml singleevent-endurance.xml) + + SD_INSTALL_FILES(DATA config/raceman/extra USER config/raceman/extra + FILES extra/skill.xml) +--- speed-dreams-base-2.0.0+r4687.orig/data/tracks/CMakeLists.txt ++++ speed-dreams-base-2.0.0+r4687/data/tracks/CMakeLists.txt +@@ -1,10 +1,7 @@ + INCLUDE(../../cmake/macros.cmake) + + # Official track sets. +-ADD_SUBDIRECTORY(dirt) + ADD_SUBDIRECTORY(circuit) +-ADD_SUBDIRECTORY(speedway) +-ADD_SUBDIRECTORY(road) + + # Work-in-progress track sets. + IF(NOT OPTION_OFFICIAL_ONLY) +--- speed-dreams-base-2.0.0+r4687.orig/data/tracks/circuit/CMakeLists.txt ++++ speed-dreams-base-2.0.0+r4687/data/tracks/circuit/CMakeLists.txt +@@ -1,16 +1,7 @@ + INCLUDE(../../../cmake/macros.cmake) + + # Official track sets. +-ADD_SUBDIRECTORY(aalborg) +-ADD_SUBDIRECTORY(brondehach) +-ADD_SUBDIRECTORY(chemisay) +-ADD_SUBDIRECTORY(corkscrew) + ADD_SUBDIRECTORY(espie) +-ADD_SUBDIRECTORY(forza) +-ADD_SUBDIRECTORY(goldstone-sand) +-ADD_SUBDIRECTORY(karwada) +-ADD_SUBDIRECTORY(migrants) +-ADD_SUBDIRECTORY(ruudskogen) + + # Work-in-progress track sets. + IF(NOT OPTION_OFFICIAL_ONLY) +--- speed-dreams-base-2.0.0+r4687.orig/data/cars/models/CMakeLists.txt ++++ speed-dreams-base-2.0.0+r4687/data/cars/models/CMakeLists.txt +@@ -1,24 +1,6 @@ + INCLUDE(../../../cmake/macros.cmake) + + # Official car sets. +-ADD_SUBDIRECTORY(36gp-century-r11b) +-ADD_SUBDIRECTORY(36gp-ettore-t59) +-ADD_SUBDIRECTORY(36gp-milano-12c36) +-ADD_SUBDIRECTORY(36gp-milano-tipop3) +-ADD_SUBDIRECTORY(36gp-motorunion-typec) +-ADD_SUBDIRECTORY(36gp-silber-w25b) +-ADD_SUBDIRECTORY(36gp-tridenti-6c34) +-ADD_SUBDIRECTORY(36gp-tridenti-v8ri) +- +-ADD_SUBDIRECTORY(trb1-boxer-trbrs) +-ADD_SUBDIRECTORY(trb1-cavallo-360rb) +-ADD_SUBDIRECTORY(trb1-sector-rb1) +-ADD_SUBDIRECTORY(trb1-silber-rblk) +-ADD_SUBDIRECTORY(trb1-spirit-rb1lt) +-ADD_SUBDIRECTORY(trb1-taipan-rb1) +-ADD_SUBDIRECTORY(trb1-vieringe-5rb/) +-ADD_SUBDIRECTORY(trb1-zaxxon-rb) +- + ADD_SUBDIRECTORY(sc-boxer-96) + ADD_SUBDIRECTORY(sc-cavallo-360) + ADD_SUBDIRECTORY(sc-fmc-gt4) +@@ -26,32 +8,6 @@ ADD_SUBDIRECTORY(sc-lynx-220) + ADD_SUBDIRECTORY(sc-murasama-nsx) + ADD_SUBDIRECTORY(sc-spirit-300) + +-ADD_SUBDIRECTORY(ls1-archer-r9) +-ADD_SUBDIRECTORY(ls1-newcastle-fury) +-ADD_SUBDIRECTORY(ls1-taipan-ltsr) +-ADD_SUBDIRECTORY(ls1-toro-rgt) +-ADD_SUBDIRECTORY(ls1-vulture-v6r) +-ADD_SUBDIRECTORY(ls1-zentek-z7r) +- +-ADD_SUBDIRECTORY(ls2-bavaria-g3gtr) +-ADD_SUBDIRECTORY(ls2-boxer-96rsr) +-ADD_SUBDIRECTORY(ls2-cavallo-360r) +-ADD_SUBDIRECTORY(ls2-condor-c400r) +-ADD_SUBDIRECTORY(ls2-morley-r900) +-ADD_SUBDIRECTORY(ls2-sprite-gts) +-ADD_SUBDIRECTORY(ls2-vortex-gt) +-ADD_SUBDIRECTORY(ls2-lynx-xkr) +- +-ADD_SUBDIRECTORY(mp5-fmc) +-ADD_SUBDIRECTORY(mp5-fmc-drift) +-ADD_SUBDIRECTORY(mp5-fmc-speedy) +- +-ADD_SUBDIRECTORY(rs1-citrus-cs4) +-ADD_SUBDIRECTORY(rs1-fmc-centre) +-ADD_SUBDIRECTORY(rs1-kenji-08) +-ADD_SUBDIRECTORY(rs2-fai-dot) +-ADD_SUBDIRECTORY(rs2-lion-2m) +- + # Work-in-progress car sets. + IF(NOT OPTION_OFFICIAL_ONLY) + diff -Nru speed-dreams-base-2.0.0+r4687/debian/rules speed-dreams-base-2.0.0+r4687/debian/rules --- speed-dreams-base-2.0.0+r4687/debian/rules 2012-04-22 00:34:39.000000000 +0000 +++ speed-dreams-base-2.0.0+r4687/debian/rules 2012-12-02 12:39:17.000000000 +0000 @@ -3,6 +3,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk build: + cp $(CURDIR)/debian/circuit_CMakeLists.txt $(CURDIR)/data/tracks/circuit/CMakeLists.txt cmake -DCMAKE_INSTALL_PREFIX=/usr -DOPTION_OFFICIAL_ONLY:BOOL=ON . make -j 4 @@ -16,3 +17,4 @@ if [ -f Makefile ]; then make clean; fi rm -rf clobber.sh config.h doxygen_config install_manifest.txt xmlversion_loc.txt CMakeFiles CMakeCache.txt Makefile *.cmake rm -f src/drivers/simplix/simplix_sc.so src/drivers/usr/usr_sc.so + cp $(CURDIR)/debian/circuit_CMakeLists.txt.upstream $(CURDIR)/data/tracks/circuit/CMakeLists.txt