[haiku-commits] haiku: hrev48343 - src/apps/aboutsystem build/jam

  • From: pulkomandy@xxxxxxxxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Thu, 20 Nov 2014 08:38:28 +0100 (CET)

hrev48343 adds 2 changesets to branch 'master'
old head: b64e832220493e5ccb63cc7b1da568a97143c02b
new head: 05a922cd4da0be9b032ca14b47504fc297dc9e24
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=05a922c+%5Eb64e832

----------------------------------------------------------------------------

a730d25: AboutSystem: credit taos only for German.
  
  As requested on the mailing list.
  Keep a comment to remember to not re-add him next time we update the
  list.

05a922c: Exclude netfs package from x86_64
  
  It is broken in a lot of places, more than I'm confident fixing.

                                 [ Adrien Destugues <pulkomandy@xxxxxxxxx> ]

----------------------------------------------------------------------------

2 files changed, 8 insertions(+), 7 deletions(-)
build/jam/HaikuPackages        |  5 +++--
src/apps/aboutsystem/Credits.h | 10 +++++-----

############################################################################

Commit:      a730d2560c8f8909708e34657551ecba49f1991c
URL:         http://cgit.haiku-os.org/haiku/commit/?id=a730d25
Author:      Adrien Destugues <pulkomandy@xxxxxxxxx>
Date:        Wed Nov 19 19:51:36 2014 UTC

AboutSystem: credit taos only for German.

As requested on the mailing list.
Keep a comment to remember to not re-add him next time we update the
list.

----------------------------------------------------------------------------

diff --git a/src/apps/aboutsystem/Credits.h b/src/apps/aboutsystem/Credits.h
index 552a4a6..4cbe1d1 100644
--- a/src/apps/aboutsystem/Credits.h
+++ b/src/apps/aboutsystem/Credits.h
@@ -96,7 +96,7 @@ static const Translation kTranslations[] = {
                "fatigatti\n"
                "mpescador\n"
                "OscarL\n"
-               "taos\n"
+               // "taos\n" bugfixes only, no actual translations
        },
        { "fi",
                "Jorma Karvonen (Karvjorm)\n"
@@ -130,7 +130,7 @@ static const Translation kTranslations[] = {
        { "hr",
                "Ivica Koli\n"
                "Zlatko Sehanović\n"
-               "taos\n"
+               // "taos\n" bugfixes only, no actual translations
                "zvacet\n"
        },
        { "hu",
@@ -188,7 +188,7 @@ static const Translation kTranslations[] = {
                "michiel\n"
                "Sintendo\n"
                "Tagliano\n"
-               "taos\n"
+               // "taos\n" bugfixes only, no actual translations
                "wrench123456789\n"
        },
        { "pl",
@@ -208,7 +208,7 @@ static const Translation kTranslations[] = {
                "Adriano Duarte\n"
                "Louis de M.\n"
                "Michael Vinícius de Oliveira (michaelvo)\n"
-               "taos\n"
+               // "taos\n" bugfixes only, no actual translations
        },
        { "pt_BR",
                "Cabral Bandeira (beyraq)\n"
@@ -242,7 +242,7 @@ static const Translation kTranslations[] = {
                "Vladimir Vasilenko\n"
                "Siaržuk Žarski\n"
                "Ruskidecko\n"
-               "taos\n"
+               // "taos\n" bugfixes only, no actual translations
        },
        { "sk",
                "Bachoru\n"

############################################################################

Revision:    hrev48343
Commit:      05a922cd4da0be9b032ca14b47504fc297dc9e24
URL:         http://cgit.haiku-os.org/haiku/commit/?id=05a922c
Author:      Adrien Destugues <pulkomandy@xxxxxxxxx>
Date:        Thu Nov 20 07:36:27 2014 UTC

Exclude netfs package from x86_64

It is broken in a lot of places, more than I'm confident fixing.

----------------------------------------------------------------------------

diff --git a/build/jam/HaikuPackages b/build/jam/HaikuPackages
index e8563e5..4b040d8 100644
--- a/build/jam/HaikuPackages
+++ b/build/jam/HaikuPackages
@@ -1,13 +1,14 @@
 # The packages we build. Each is defined in its own file in the packages/
 # subdirectory.
-local packages =
+local packages = [ FFilterByBuildFeatures
        HaikuDevel
        HaikuLoader
        HaikuUserguide
        HaikuWelcome
        MakefileEngine
-       NetFS
+       NetFS@!x86_64
        UserlandFS
+       ]
        ;
 
 if $(HAIKU_BUILD_TYPE) = bootstrap {


Other related posts:

  • » [haiku-commits] haiku: hrev48343 - src/apps/aboutsystem build/jam - pulkomandy