tag 574191 + patch thanks Hi,
The attached simple patch makes imview build on armel, by renaming the internal "user" class used by server/interpreter.cxx, thus avoiding the name conflict. Regards, Adam
diff -u imview-1.1.9c/debian/changelog imview-1.1.9c/debian/changelog --- imview-1.1.9c/debian/changelog +++ imview-1.1.9c/debian/changelog @@ -1,3 +1,10 @@ +imview (1.1.9c-5.1) unstable; urgency=low + + * Non-maintainer upload. + * Rename "user" class in server/interpreter to fix armel FTBFS + + -- Adam D. Barratt <[email protected]> Tue, 16 Mar 2010 23:19:07 +0000 + imview (1.1.9c-5) unstable; urgency=low * copyright: Update current upstream source location, fix whitespace only in patch2: unchanged: --- imview-1.1.9c.orig/server/interpreter.cxx +++ imview-1.1.9c/server/interpreter.cxx @@ -336,7 +336,7 @@ //bool user::matches = false; // no one is authenticated by default -user::user(void) { +interpreter_user::interpreter_user(void) { // find out who is running the show // this is a bit flaky, but should do for now. Proper security will // be for later. @@ -379,7 +379,7 @@ return; } -int user::perform(vector<string> &l, string &result) { +int interpreter_user::perform(vector<string> &l, string &result) { ostringstream osm, osnm; string fullname; @@ -1439,7 +1439,7 @@ tokens["help"] = new interpreter_help; tokens["?"] = new interpreter_help; tokens["pf"] = new print_pointfile; - tokens["user"] = new user; + tokens["user"] = new interpreter_user; tokens["deny"] = new deny; tokens["put"] = new put; tokens["putm"] = new putm; only in patch2: unchanged: --- imview-1.1.9c.orig/server/interpreter.hxx +++ imview-1.1.9c/server/interpreter.hxx @@ -100,11 +100,11 @@ }; // much-needed authentication -class user:public action{ +class interpreter_user:public action{ string server_user; // who is running the server now? // static bool matches; public: - user(void); // constructor + interpreter_user(void); // constructor // static bool unauthenticate(void) {matches = false;} // static bool authenticated(void) {return matches;} int perform(vector<string> &l, string &result);
