[Scummvm-devel] [Scummvm-cvs-logs] scummvm master -> f0071c65adf72f0fda07395b19b28a7e730b619a
Eugene Sandulenko
sev.mail at gmail.com
Sun May 19 11:46:15 CEST 2013
Please rollback the Debian-repacked versions detection.
I do not want to (a) have zillions of our freewared versions
distributed (b) see these stupid arguments about copyrights in .exe
files.
The .exe files are the game data, and if they are insisting on
brain-dead comments about Watcom runtimes, I would prefer that this
would never be in Debian. Because if they were consistent, why don't
they _demand_ sources for all game scripts and data?
Please rollback. This has to be discussed.
Eugene
On 19 May 2013 08:33, bluegr <bluegr at gmail.com> wrote:
> This automated email contains information about 3 new commits which have been
> pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
>
> Summary:
> 2dce7167b9 DRASCULA: Add detection entries for updated unpacked French / Italian versions (bug #3612236)
> d2a97bc928 DRASCULA: Reorder detection entries
> f0071c65ad DRASCULA: Add detection entries for the Debian repacked versions (bug #3612236)
>
>
> Commit: 2dce7167b982b5be45355de0ada6a85af853ca59
> https://github.com/scummvm/scummvm/commit/2dce7167b982b5be45355de0ada6a85af853ca59
> Author: Filippos Karapetis (bluegr at gmail.com)
> Date: 2013-05-18T22:32:36-07:00
>
> Commit Message:
> DRASCULA: Add detection entries for updated unpacked French / Italian versions (bug #3612236)
>
> Changed paths:
> engines/drascula/detection.cpp
>
>
>
> diff --git a/engines/drascula/detection.cpp b/engines/drascula/detection.cpp
> index 8764b82..e7ffeff 100644
> --- a/engines/drascula/detection.cpp
> +++ b/engines/drascula/detection.cpp
> @@ -188,6 +188,19 @@ static const DrasculaGameDescription gameDescriptions[] = {
> },
>
> {
> + // Drascula French version (updated - bug #3612236)
> + {
> + "drascula",
> + 0,
> + AD_ENTRY1s("14.ald", "1f9fbded768bee061cc22bc5bdeab540", 611),
> + Common::FR_FRA,
> + Common::kPlatformDOS,
> + ADGF_NO_FLAGS,
> + GUIO0()
> + },
> + },
> +
> + {
> // Drascula Italian version (original packed version)
> {
> "drascula",
> @@ -199,6 +212,7 @@ static const DrasculaGameDescription gameDescriptions[] = {
> GUIO0()
> },
> },
> +
> {
> // Drascula Italian version
> {
> @@ -213,6 +227,19 @@ static const DrasculaGameDescription gameDescriptions[] = {
> },
>
> {
> + // Drascula Italian version (updated - bug #3612236)
> + {
> + "drascula",
> + 0,
> + AD_ENTRY1s("14.ald", "ccaee939bb3b344c048f28f9205710d1", 2925),
> + Common::IT_ITA,
> + Common::kPlatformDOS,
> + ADGF_NO_FLAGS,
> + GUIO0()
> + },
> + },
> +
> + {
> // Drascula Spanish version (ScummVM repacked files)
> {
> "drascula",
>
>
> Commit: d2a97bc9283b21b540f212651d51afc27a98d3ac
> https://github.com/scummvm/scummvm/commit/d2a97bc9283b21b540f212651d51afc27a98d3ac
> Author: Filippos Karapetis (bluegr at gmail.com)
> Date: 2013-05-18T22:32:37-07:00
>
> Commit Message:
> DRASCULA: Reorder detection entries
>
> Entries have been grouped by type (packed / unpacked) and ordered by
> language, alphabetically
>
> Changed paths:
> engines/drascula/detection.cpp
>
>
>
> diff --git a/engines/drascula/detection.cpp b/engines/drascula/detection.cpp
> index e7ffeff..1917bc8 100644
> --- a/engines/drascula/detection.cpp
> +++ b/engines/drascula/detection.cpp
> @@ -68,33 +68,57 @@ static const PlainGameDescriptor drasculaGames[] = {
> namespace Drascula {
>
> static const DrasculaGameDescription gameDescriptions[] = {
> +
> + //// Packed versions //////////////////////////////////////////////////////
> +
> {
> - // Drascula English version
> + // Drascula English version (original packed files)
> {
> "drascula",
> 0,
> - AD_ENTRY1s("14.ald", "09b2735953edcd43af115c65ae00b10e", 1595),
> + {
> + {"packet.001", 0, "c6a8697396e213a18472542d5f547cb4", 32847563},
> + // HACK: List packet.001 twice to ensure this detector entry
> + // is ranked just as high as the others (which each have two
> + // detection files).
> + {"packet.001", 0, "c6a8697396e213a18472542d5f547cb4", 32847563},
> + {NULL, 0, NULL, 0}
> + },
> Common::EN_ANY,
> Common::kPlatformDOS,
> - ADGF_NO_FLAGS,
> + GF_PACKED,
> GUIO0()
> },
> },
>
> {
> - // Drascula English version (original packed files)
> + // Drascula French version (original packed files)
> {
> "drascula",
> 0,
> {
> {"packet.001", 0, "c6a8697396e213a18472542d5f547cb4", 32847563},
> - // HACK: List packet.001 twice to ensure this detector entry
> - // is ranked just as high as the others (which each have two
> - // detection files).
> + {"packet.002", 1, "4401123400f22f212b89f15fb4b43013", 721122},
> + {NULL, 0, NULL, 0}
> + },
> + Common::FR_FRA,
> + Common::kPlatformDOS,
> + GF_PACKED,
> + GUIO0()
> + },
> + },
> +
> + {
> + // Drascula French version (ScummVM repacked files)
> + {
> + "drascula",
> + 0,
> + {
> {"packet.001", 0, "c6a8697396e213a18472542d5f547cb4", 32847563},
> + {"packet.002", 1, "7b83cedb9bb326ed5143e5c459508d43", 722383},
> {NULL, 0, NULL, 0}
> },
> - Common::EN_ANY,
> + Common::FR_FRA,
> Common::kPlatformDOS,
> GF_PACKED,
> GUIO0()
> @@ -119,16 +143,29 @@ static const DrasculaGameDescription gameDescriptions[] = {
> },
>
> {
> - // Drascula French version (original packed files)
> + // Drascula Italian version (original packed version)
> + {
> + "drascula",
> + 0,
> + AD_ENTRY1s("packet.001", "0253e924af223f5fe52537023385159b", 32564209),
> + Common::IT_ITA,
> + Common::kPlatformDOS,
> + GF_PACKED,
> + GUIO0()
> + },
> + },
> +
> + {
> + // Drascula Italian version (ScummVM repacked files)
> {
> "drascula",
> 0,
> {
> {"packet.001", 0, "c6a8697396e213a18472542d5f547cb4", 32847563},
> - {"packet.002", 1, "4401123400f22f212b89f15fb4b43013", 721122},
> + {"packet.005", 1, "58caac54b891f5d7f335e710e45e5d29", 16209623},
> {NULL, 0, NULL, 0}
> },
> - Common::FR_FRA,
> + Common::IT_ITA,
> Common::kPlatformDOS,
> GF_PACKED,
> GUIO0()
> @@ -149,25 +186,31 @@ static const DrasculaGameDescription gameDescriptions[] = {
> },
>
> {
> - // Drascula Spanish version
> + // Drascula Spanish version (ScummVM repacked files)
> {
> "drascula",
> 0,
> - AD_ENTRY1s("14.ald", "0746ed1a5cc8d9728f790c29813f4b43", 23059),
> + {
> + {"packet.001", 0, "c6a8697396e213a18472542d5f547cb4", 32847563},
> + {"packet.004", 1, "a289d3cf80d50f25ec569b653248437e", 17205838},
> + {NULL, 0, NULL, 0}
> + },
> Common::ES_ESP,
> Common::kPlatformDOS,
> - ADGF_NO_FLAGS,
> + GF_PACKED,
> GUIO0()
> },
> },
>
> + //// Unpacked versions ////////////////////////////////////////////////////
> +
> {
> - // Drascula German version
> + // Drascula English version
> {
> "drascula",
> 0,
> - AD_ENTRY1s("14.ald", "72e46089033d56bad1c179ac36e2a9d2", 610),
> - Common::DE_DEU,
> + AD_ENTRY1s("14.ald", "09b2735953edcd43af115c65ae00b10e", 1595),
> + Common::EN_ANY,
> Common::kPlatformDOS,
> ADGF_NO_FLAGS,
> GUIO0()
> @@ -201,14 +244,14 @@ static const DrasculaGameDescription gameDescriptions[] = {
> },
>
> {
> - // Drascula Italian version (original packed version)
> + // Drascula German version
> {
> "drascula",
> 0,
> - AD_ENTRY1s("packet.001", "0253e924af223f5fe52537023385159b", 32564209),
> - Common::IT_ITA,
> + AD_ENTRY1s("14.ald", "72e46089033d56bad1c179ac36e2a9d2", 610),
> + Common::DE_DEU,
> Common::kPlatformDOS,
> - GF_PACKED,
> + ADGF_NO_FLAGS,
> GUIO0()
> },
> },
> @@ -240,52 +283,14 @@ static const DrasculaGameDescription gameDescriptions[] = {
> },
>
> {
> - // Drascula Spanish version (ScummVM repacked files)
> + // Drascula Spanish version
> {
> "drascula",
> 0,
> - {
> - {"packet.001", 0, "c6a8697396e213a18472542d5f547cb4", 32847563},
> - {"packet.004", 1, "a289d3cf80d50f25ec569b653248437e", 17205838},
> - {NULL, 0, NULL, 0}
> - },
> + AD_ENTRY1s("14.ald", "0746ed1a5cc8d9728f790c29813f4b43", 23059),
> Common::ES_ESP,
> Common::kPlatformDOS,
> - GF_PACKED,
> - GUIO0()
> - },
> - },
> -
> - {
> - // Drascula Italian version (ScummVM repacked files)
> - {
> - "drascula",
> - 0,
> - {
> - {"packet.001", 0, "c6a8697396e213a18472542d5f547cb4", 32847563},
> - {"packet.005", 1, "58caac54b891f5d7f335e710e45e5d29", 16209623},
> - {NULL, 0, NULL, 0}
> - },
> - Common::IT_ITA,
> - Common::kPlatformDOS,
> - GF_PACKED,
> - GUIO0()
> - },
> - },
> -
> - {
> - // Drascula French version (ScummVM repacked files)
> - {
> - "drascula",
> - 0,
> - {
> - {"packet.001", 0, "c6a8697396e213a18472542d5f547cb4", 32847563},
> - {"packet.002", 1, "7b83cedb9bb326ed5143e5c459508d43", 722383},
> - {NULL, 0, NULL, 0}
> - },
> - Common::FR_FRA,
> - Common::kPlatformDOS,
> - GF_PACKED,
> + ADGF_NO_FLAGS,
> GUIO0()
> },
> },
>
>
> Commit: f0071c65adf72f0fda07395b19b28a7e730b619a
> https://github.com/scummvm/scummvm/commit/f0071c65adf72f0fda07395b19b28a7e730b619a
> Author: Filippos Karapetis (bluegr at gmail.com)
> Date: 2013-05-18T22:32:37-07:00
>
> Commit Message:
> DRASCULA: Add detection entries for the Debian repacked versions (bug #3612236)
>
> Changed paths:
> engines/drascula/detection.cpp
>
>
>
> diff --git a/engines/drascula/detection.cpp b/engines/drascula/detection.cpp
> index 1917bc8..038bf76 100644
> --- a/engines/drascula/detection.cpp
> +++ b/engines/drascula/detection.cpp
> @@ -92,6 +92,26 @@ static const DrasculaGameDescription gameDescriptions[] = {
> },
>
> {
> + // Drascula English version (Debian repacked files - bug #3612236)
> + {
> + "drascula",
> + 0,
> + {
> + {"packet.001", 0, "5c4432a7f9352260143c53e925745181", 31909218},
> + // HACK: List packet.001 twice to ensure this detector entry
> + // is ranked just as high as the others (which each have two
> + // detection files).
> + {"packet.001", 0, "5c4432a7f9352260143c53e925745181", 31909218},
> + {NULL, 0, NULL, 0}
> + },
> + Common::EN_ANY,
> + Common::kPlatformDOS,
> + GF_PACKED,
> + GUIO0()
> + },
> + },
> +
> + {
> // Drascula French version (original packed files)
> {
> "drascula",
> @@ -126,6 +146,23 @@ static const DrasculaGameDescription gameDescriptions[] = {
> },
>
> {
> + // Drascula French version (Debian repacked files - bug #3612236)
> + {
> + "drascula",
> + 0,
> + {
> + {"packet.001", 0, "5c4432a7f9352260143c53e925745181", 31909218},
> + {"packet.002", 1, "fa6d0ad818c3740802f948b9d58b292e", 109989},
> + {NULL, 0, NULL, 0}
> + },
> + Common::FR_FRA,
> + Common::kPlatformDOS,
> + GF_PACKED,
> + GUIO0()
> + },
> + },
> +
> + {
> // Drascula German version (original packed files)
> {
> "drascula",
> @@ -143,6 +180,23 @@ static const DrasculaGameDescription gameDescriptions[] = {
> },
>
> {
> + // Drascula German version (Debian repacked files - bug #3612236)
> + {
> + "drascula",
> + 0,
> + {
> + {"packet.001", 0, "5c4432a7f9352260143c53e925745181", 31909218},
> + {"packet.003", 1, "91810ba140e13068309877e96870b97d", 109614},
> + {NULL, 0, NULL, 0}
> + },
> + Common::DE_DEU,
> + Common::kPlatformDOS,
> + GF_PACKED,
> + GUIO0()
> + },
> + },
> +
> + {
> // Drascula Italian version (original packed version)
> {
> "drascula",
> @@ -173,6 +227,23 @@ static const DrasculaGameDescription gameDescriptions[] = {
> },
>
> {
> + // Drascula Italian version (ScummVM repacked files)
> + {
> + "drascula",
> + 0,
> + {
> + {"packet.001", 0, "5c4432a7f9352260143c53e925745181", 31909218},
> + {"packet.005", 1, "3d303929f35059924cccbd72bea75ce8", 15491442},
> + {NULL, 0, NULL, 0}
> + },
> + Common::IT_ITA,
> + Common::kPlatformDOS,
> + GF_PACKED,
> + GUIO0()
> + },
> + },
> +
> + {
> // Drascula Spanish version (original packed version)
> {
> "drascula",
> @@ -202,6 +273,23 @@ static const DrasculaGameDescription gameDescriptions[] = {
> },
> },
>
> + {
> + // Drascula Spanish version (Debian repacked files - bug #3612236)
> + {
> + "drascula",
> + 0,
> + {
> + {"packet.001", 0, "5c4432a7f9352260143c53e925745181", 31909218},
> + {"packet.004", 1, "cec3d3654873e2f6f024ac31eec02a12", 16480118},
> + {NULL, 0, NULL, 0}
> + },
> + Common::ES_ESP,
> + Common::kPlatformDOS,
> + GF_PACKED,
> + GUIO0()
> + },
> + },
> +
> //// Unpacked versions ////////////////////////////////////////////////////
>
> {
>
>
>
> ------------------------------------------------------------------------------
> AlienVault Unified Security Management (USM) platform delivers complete
> security visibility with the essential security capabilities. Easily and
> efficiently configure, manage, and operate all of your security controls
> from a single console and one unified framework. Download a free trial.
> http://p.sf.net/sfu/alienvault_d2d
> _______________________________________________
> Scummvm-cvs-logs mailing list
> Scummvm-cvs-logs at lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/scummvm-cvs-logs
More information about the Scummvm-devel
mailing list