Re: [Freeciv-Dev] (PR#39680) Archlinux add in Freeciv Distro's page

2007-09-07 Thread nikita bukhvostov

URL: http://bugs.freeciv.org/Ticket/Display.html?id=39680 

URL: http://bugs.freeciv.org/Ticket/Display.html?id=39680 

 On 9/7/07, nikita bukhvostov [EMAIL PROTECTED] wrote:
 
  URL: http://bugs.freeciv.org/Ticket/Display.html?id=39680 
 
  Need to add Archlinux in Freeciv More distributions page
  (http://freeciv.wikia.com/wiki/More_distributions).
  Now in support list:
  - freeciv-beta 2.1.0b6-1
PKGBUILD* in AUR**
 
 (http://aur.archlinux.org/packages.php?do_Details=1ID=7894O=0L=0C=0K=freecivSB=nSO=aPP=25do_MyPackages=0do_Orphans=0SeB=nd)
# Maintainer: Nikita dragon_djanic Bukhvostov
 [EMAIL PROTECTED]
 
  - freeciv-beta-svn 13101-1
PKGBUILD* in AUR**
 
 (http://aur.archlinux.org/packages.php?do_Details=1ID=12045O=0L=0C=0K=freecivSB=nSO=aPP=25do_MyPackages=0do_Orphans=0SeB=nd)
# Maintainer: Elmo Todurov [EMAIL PROTECTED]
 
  - freeciv-svn 12994-1
PKGBUILD* in AUR**
 
 (http://aur.archlinux.org/packages.php?do_Details=1ID=3366O=0L=0C=0K=freecivSB=nSO=aPP=25do_MyPackages=0do_Orphans=0SeB=nd)
# Maintainer: Slash [EMAIL PROTECTED]
 
  * - PKGBUILD it's as Ebuild for Gentoo, but this for Archlinux
 
  ~Nikita dragon_djanic Bukhvostov
  ** - http://aur.archlinux.org
 
 

 2007/9/7, Daniel Markstedt [EMAIL PROTECTED]:

 Thanks for the info. Actually, it's preferred that you make this kind
 of updates yourself! That's the point of a wiki, isn't it. ;)

  ~Daniel

Hhhh =) I know, I know,  but it maybe can to help people..

~Nikita dragon_djanic Bukhvostov



___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


Re: [Freeciv-Dev] (PR#39680) Archlinux add in Freeciv Distro's page

2007-09-07 Thread Daniel Markstedt

URL: http://bugs.freeciv.org/Ticket/Display.html?id=39680 

On 9/7/07, nikita bukhvostov [EMAIL PROTECTED] wrote:

 URL: http://bugs.freeciv.org/Ticket/Display.html?id=39680 

 Need to add Archlinux in Freeciv More distributions page
 (http://freeciv.wikia.com/wiki/More_distributions).
 Now in support list:
 - freeciv-beta 2.1.0b6-1
   PKGBUILD* in AUR**
 (http://aur.archlinux.org/packages.php?do_Details=1ID=7894O=0L=0C=0K=freecivSB=nSO=aPP=25do_MyPackages=0do_Orphans=0SeB=nd)
   # Maintainer: Nikita dragon_djanic Bukhvostov [EMAIL PROTECTED]

 - freeciv-beta-svn 13101-1
   PKGBUILD* in AUR**
 (http://aur.archlinux.org/packages.php?do_Details=1ID=12045O=0L=0C=0K=freecivSB=nSO=aPP=25do_MyPackages=0do_Orphans=0SeB=nd)
   # Maintainer: Elmo Todurov [EMAIL PROTECTED]

 - freeciv-svn 12994-1
   PKGBUILD* in AUR**
 (http://aur.archlinux.org/packages.php?do_Details=1ID=3366O=0L=0C=0K=freecivSB=nSO=aPP=25do_MyPackages=0do_Orphans=0SeB=nd)
   # Maintainer: Slash [EMAIL PROTECTED]

 * - PKGBUILD it's as Ebuild for Gentoo, but this for Archlinux

 ~Nikita dragon_djanic Bukhvostov
 ** - http://aur.archlinux.org



Thanks for the info. Actually, it's preferred that you make this kind
of updates yourself! That's the point of a wiki, isn't it. ;)

 ~Daniel



___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


[Freeciv-Dev] (PR#39680) Archlinux add in Freeciv Distro's page

2007-09-07 Thread nikita bukhvostov

URL: http://bugs.freeciv.org/Ticket/Display.html?id=39680 

Need to add Archlinux in Freeciv More distributions page
(http://freeciv.wikia.com/wiki/More_distributions).
Now in support list:
- freeciv-beta 2.1.0b6-1
  PKGBUILD* in AUR**
(http://aur.archlinux.org/packages.php?do_Details=1ID=7894O=0L=0C=0K=freecivSB=nSO=aPP=25do_MyPackages=0do_Orphans=0SeB=nd)
  # Maintainer: Nikita dragon_djanic Bukhvostov [EMAIL PROTECTED]

- freeciv-beta-svn 13101-1
  PKGBUILD* in AUR**
(http://aur.archlinux.org/packages.php?do_Details=1ID=12045O=0L=0C=0K=freecivSB=nSO=aPP=25do_MyPackages=0do_Orphans=0SeB=nd)
  # Maintainer: Elmo Todurov [EMAIL PROTECTED]

- freeciv-svn 12994-1
  PKGBUILD* in AUR**
(http://aur.archlinux.org/packages.php?do_Details=1ID=3366O=0L=0C=0K=freecivSB=nSO=aPP=25do_MyPackages=0do_Orphans=0SeB=nd)
  # Maintainer: Slash [EMAIL PROTECTED]

* - PKGBUILD it's as Ebuild for Gentoo, but this for Archlinux

~Nikita dragon_djanic Bukhvostov
** - http://aur.archlinux.org



___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


Re: [Freeciv-Dev] (PR#39374) Re: (PR#39644) auth warnings

2007-09-07 Thread Egor Vyscrebentsov

URL: http://bugs.freeciv.org/Ticket/Display.html?id=39374 

On Thu, 6 Sep 2007 Marko Lindqvist wrote:

 On 03/09/07, Egor Vyscrebentsov  wrote:
 
  In theory, it may causes troubles, but I don't have them (yet).
  And I didn't test tutorial...

  Did you mean this to go in or just to be available for anybody to
 use locally?
  (It helps, thanks!)

I see no reason to commit this (due to influence of moving to lua5.1),
but we may mention about it in doc/BUGS, for example.
--enable-debug on x86_64 seems to be used rarely.

PS. In lua5.1 LUAI_UMEM - size_t is used.

-- 
Thanks, evyscr



___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


Re: [Freeciv-Dev] (PR#39669) [Patch] Some events cleanup

2007-09-07 Thread Marko Lindqvist

URL: http://bugs.freeciv.org/Ticket/Display.html?id=39669 

On 04/09/07, Marko Lindqvist  wrote:

  - Trunk only: Function used in outputting soundspec entries added,
 but commented out

 This part taken out. Attached as separate patch in case it's needed
in the future.


 - ML

diff -Nurd -X.diff_ignore freeciv/common/events.c freeciv/common/events.c
--- freeciv/common/events.c	2007-08-04 18:38:32.0 +0300
+++ freeciv/common/events.c	2007-09-07 19:12:07.0 +0300
@@ -153,7 +153,7 @@
  */
 static int event_to_index[E_LAST];
 
-int sorted_events[E_LAST];
+enum event_type sorted_events[E_LAST];
 
 
 /**
@@ -166,8 +166,10 @@
   if (events[event_to_index[event]].event == event) {
 return events[event_to_index[event]].full_descr;
   }
+
   freelog(LOG_ERROR, unknown event %d, event);
-  return UNKNOWN EVENT;
+  return UNKNOWN EVENT; /* FIXME: Should be marked for translation?
+   * we get non-translated in log message. */
 }
 
 /**
@@ -176,8 +178,8 @@
 **/
 static int compar_event_message_texts(const void *i1, const void *i2)
 {
-  const int *j1 = i1;
-  const int *j2 = i2;
+  const enum event_type *j1 = i1;
+  const enum event_type *j2 = i2;
   
   return mystrcasecmp(get_event_message_text(*j1),
 		  get_event_message_text(*j2));
@@ -254,10 +256,14 @@
 int j;
 
 if (events[i].section_orig) {
+  /* TRANS: Most event descriptions come in two parts Civ: Transfer
+   *This format is their glue. */
+  const char *event_format = Q_(?eventdescr:%s: %s);
+
   events[i].full_descr = fc_malloc(strlen(_(events[i].descr_orig))
+ strlen(_(events[i].section_orig))
-   + strlen(: ) + 1);
-  sprintf(events[i].full_descr, %s: %s,
+   + strlen(event_format) + 1);
+  sprintf(events[i].full_descr, event_format,
   _(events[i].section_orig),
   _(events[i].descr_orig));
 } else {
diff -Nurd -X.diff_ignore freeciv/common/events.h freeciv/common/events.h
--- freeciv/common/events.h	2007-08-05 16:40:58.0 +0300
+++ freeciv/common/events.h	2007-09-07 19:07:00.0 +0300
@@ -17,7 +17,10 @@
 
 /* Add new event types to the end. Client saves message settings by
  * type number and installing new event type in between would cause
- * erronous loading of existing .civclientrc */
+ * erronous loading of existing .civclientrc
+ * When adding events to stable branch, there is risk that TRUNK
+ * already has allocated next slot for something else (and has
+ * new event in upper slot) */
 enum event_type {
   E_CITY_CANTBUILD,
   E_CITY_LOST,
@@ -124,13 +127,13 @@
   /* 
* Note: If you add a new event, make sure you make a similar change
* to the events array in common/events.c using GEN_EV and to
-   * data/stdsounds.spec.
+   * data/stdsounds.soundspec.
*/
   E_LAST
 };
 
-extern int sorted_events[];	/* [E_LAST], sorted by the
-	   translated message text */
+extern enum event_type sorted_events[];	   /* [E_LAST], sorted by the
+	* translated message text */
 
 const char *get_event_message_text(enum event_type event);
 const char *get_event_sound_tag(enum event_type event);
@@ -158,4 +161,3 @@
 }
 
 #endif /* FC__EVENTS_H */
-
diff -Nurd -X.diff_ignore freeciv/data/stdsounds.soundspec freeciv/data/stdsounds.soundspec
--- freeciv/data/stdsounds.soundspec	2007-08-04 18:37:57.0 +0300
+++ freeciv/data/stdsounds.soundspec	2007-09-07 19:07:00.0 +0300
@@ -191,73 +191,114 @@
 ;w_united_nations = 
 ;w_womens_suffrage = 
 
-;e_anarchy = 
+
+; This list contains all events up to E_TECH_GOAL
+; (as numbered in common/events.h), in the sorted order.
+; Alphabetical sorting is based on event descriptions,
+; not to these tag names. These have been sorted using
+; Freeciv internal language (en_US)
+
+;e_ai_debug = 
 ;e_broadcast_report = 
-;e_cancel_pact = 
-;e_city_aq_building = 
-;e_city_aqueduct = 
-;e_city_build = 
+;e_caravan_action = 
+;e_chat_error = 
+;e_chat_msg = 
 ;e_city_cantbuild = 
-;e_city_cma_release = 
+;e_city_lost = 
+;e_city_love = 
 ;e_city_disorder = 
 ;e_city_famine = 
 ;e_city_famine_feared = 
-;e_city_gran_throttle = 
 ;e_city_growth = 
-;e_city_lost = 
-;e_city_love = 
 ;e_city_may_soon_grow = 
+;e_city_aqueduct = 
+;e_city_aq_building = 
 ;e_city_normal = 
 ;e_city_nuked = 
-;e_city_wonder_will_be_built = 
-;e_destroyed = 
-;e_dipl_incident = 
-;e_diplomated = 
+;e_city_production_changed = 
+;e_city_cma_release = 
+;e_city_gran_throttle = 
+;e_city_transfer = 
+;e_city_build = 
+;e_worklist = 
+;e_uprising = 
+;e_civil_war = 
+;e_anarchy = 
 ;e_first_contact = 
+;e_new_government = 
+;e_low_on_funds = 
+;e_pollution = 
+;e_revolt_done 

[Freeciv-Dev] (PR#11101) Release differing from what is tested in betas

2007-09-07 Thread Marko Lindqvist

URL: http://bugs.freeciv.org/Ticket/Display.html?id=11101 

Original message to this ticket:
---

Subject: Running without sanity checking not tested before release
Date: Sat, 20 Nov 2004 16:56:50 +0200
From: Marko Lindqvist


I'm a bit worried about amount of code in sanitycheck.c that is
executed even in beta releases but not in releases. We can only hope
that sanity checking is not in fact required for correct behavior.
Disabling sanity checking from betas would probably cause more harm
than good, though.

---

 Beta -status should be removed from Release Candidates, if we do any.

 (version.in:FREECIV_BETA_VERSION)


 - ML



___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


Re: [Freeciv-Dev] (PR#39675) Font in SDL-client and Save/Load game in SDL-client

2007-09-07 Thread nikita bukhvostov

URL: http://bugs.freeciv.org/Ticket/Display.html?id=39675 

2007/9/7, Christian Prochaska [EMAIL PROTECTED]:

 URL: http://bugs.freeciv.org/Ticket/Display.html?id=39675 


 DejaVuSansCondensed.ttf looks too blurry in my opinion, but
 DejaVuSans.ttf is fine with me, especially after the greater line
 spacing turned out to be a bug in SDL_ttf
 (http://www.devolution.com/pipermail/sdl/2006-January/071982.html).

DejaVu Sans Condensed looks small blurry, but I love this font because
because slim, not fatty and just like me...
Ok, I think _DejaVu Sans_ (not Condensed) is optimal..

 So it's just Vera with more characters now, isn't it?

Maybe.. ;)

~Nikita dragon_djanic Bukhvostov



___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


Re: [Freeciv-Dev] gui-mui

2007-09-07 Thread Marko Lindqvist
On 07/09/07, Daniel Markstedt  wrote:
 On 8/25/07, Per I. Mathisen  wrote:
  On Fri, 24 Aug 2007, William Allen Simpson wrote:
   (Ignoring the problem that gui-mui still only handles a single unit.)
 
  gui-mui has not been updated in a very long time, and should probably just
  be removed from S2_1 and trunk. Amiga users can perhaps use gui-sdl?
  (Amiga users still exist?)

 Could we remove it soon? All those gui-mui specific strings are very
 annoying when starting up a new localization (I'm working on a Korean
 translation). Let's at least remove gui-mui/* from freeciv.pot...

 It should be removed from freeciv.pot and distribution now (S2_1 and
trunk). I don't much care if it's still kept under version control a
bit longer or not.


 - ML

___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


Re: [Freeciv-Dev] (PR#39584) [Bug] Trunk --disable-nls broken

2007-09-07 Thread Marko Lindqvist

URL: http://bugs.freeciv.org/Ticket/Display.html?id=39584 

On 19/08/07, Marko Lindqvist wrote:

  No po/Makefile of any kind is generated if there is --disable-nls
 configure option.

 Patch.

 If configured with --disable-nls, will refuse to 'make dist' as that
packet would lack generated localization files.
 It is possible to create tarball in system lacking gettext. If
configured with '--enable-nls=no-gmo-dist' instead of '--disable-nls',
'make dist' makes tarball without generated localization files. 'make
distcheck' will fail in such environment.


 - ML

diff -Nurd -X.diff_ignore freeciv/configure.ac freeciv/configure.ac
--- freeciv/configure.ac	2007-09-07 13:54:28.0 +0300
+++ freeciv/configure.ac	2007-09-08 00:46:14.0 +0300
@@ -206,11 +206,16 @@
 no pl pt pt_BR ro ru sv uk zh_CN
 
 AC_ARG_ENABLE([nls],
-[  --disable-nlsdo not use add localization support],
+[  --disable-nlsdo not add localization support],
 [case ${enableval} in
   yes) USE_NLS=yes ;;
-  no)  USE_NLS=no ;;
-  *)   AC_MSG_ERROR([bad value ${enableval} for --disable-nls]) ;;
+  no)  USE_NLS=no  ;;
+
+  dnl NLS disabled, but 'make dist' allowed. That dist will lack
+  dnl all generated localization files.
+  no-gmo-dist) USE_NLS=no
+   FORCE_DIST=yes ;;
+  *)   AC_MSG_ERROR([bad value ${enableval} for --enable-nls]) ;;
 esac], [USE_NLS=yes])
 
 if test $USE_NLS = yes ; then
@@ -312,6 +317,13 @@
 echo error
 )
   fi
+else
+  dnl Setup POFILES even when NLS disabled.
+  dnl AM_GLIB_GNU_GETTEXT does this when NLS enabled.
+  for lang in $ALL_LINGUAS; do
+POFILES=$POFILES $lang.po
+  done
+  AC_SUBST([POFILES])
 fi
 
 EXTRA_GCC_DEBUG_CFLAGS=
@@ -667,7 +679,7 @@
 dnl commonly used _() and N_() macros to work, there should be somewhere
 dnl in that 'po/Makefile' a call to xgettext with --keyword=_ and
 dnl --keyword=N_ as arguments.  To support Q_() and PL_(),
-dnl the following simply dnl replaces instances of 
+dnl the following simply replaces instances of 
 dnl --keyword=N_ with --keyword=N_ --keyword=Q_ --keyword=PL_:1,2
 dnl in the 'po/Makefile' file.
 AC_CONFIG_COMMANDS([fc_default-1],[[if test -f po/Makefile ; then
@@ -830,4 +842,35 @@
 AC_CONFIG_FILES([civ:bootstrap/civ.in], [chmod +x civ])
 AC_CONFIG_FILES([ser:bootstrap/ser.in], [chmod +x ser])
 AC_CONFIG_COMMANDS([default],[[ chmod +x bootstrap/undep.sh ; bootstrap/undep.sh ]],[[]])
+
+if test $USE_NLS != yes ; then
+
+  dnl Produced config.status will have constant value of FORCE_DIST,
+  dnl but it still checks 'if test x$FORCE_DIST = xyes'. We cannot
+  dnl do that check in configure when producing config.status.
+  AC_CONFIG_COMMANDS([po/Makefile], [
+dnl Usually glib-gettext.m4:AM_GLIB_GNU_GETTEXT outputs commands to
+dnl generate po/Makefile.
+dnl If NLS is disabled, we generate one here.
+rm -f po/Makefile
+
+dnl - Add nonls_warn as dependency to dist -target
+dnl - Remove dependencies from update-po, so it is never rebuilt
+dnl - Set list of distributed files (no generated files)
+sed -e 's/^dist distdir:.*/dist distdir: nonls_warn/' \
+-e 's/^update-po:.*/update-po:/' \
+-e 's/^DISTFILES =.*/DISTFILES = ChangeLog Makefile.in.in POTFILES.in POTFILES.skip \$(POFILES)/' \
+po/Makefile.in  po/Makefile
+
+dnl Create nonls_warn target.
+echo  po/Makefile
+echo nonls_warn:  po/Makefile
+if test x$FORCE_DIST = xyes ; then
+  echo 	@echo Building dist without generated localization files!  po/Makefile
+else
+  echo 	@echo Cannot build dist with NLS disabled!  /bin/false  po/Makefile
+fi
+  ], [FORCE_DIST=$FORCE_DIST])
+fi
+
 AC_OUTPUT
diff -Nurd -X.diff_ignore freeciv/po/Makefile.in.in freeciv/po/Makefile.in.in
--- freeciv/po/Makefile.in.in	2007-08-12 11:00:09.0 +0300
+++ freeciv/po/Makefile.in.in	2007-09-07 21:37:00.0 +0300
@@ -47,8 +47,9 @@
 
 POFILES = @POFILES@
 GMOFILES = @GMOFILES@
-DISTFILES = ChangeLog Makefile.in.in POTFILES.in POTFILES.skip \
-$(PACKAGE).pot $(POFILES) $(GMOFILES)
+
+# Keep this in one line, since configure replaces it when NLS disabled
+DISTFILES = ChangeLog Makefile.in.in POTFILES.in POTFILES.skip $(PACKAGE).pot $(POFILES) $(GMOFILES)
 
 POTFILES = \
 
@@ -154,6 +155,9 @@
 	rm -f $(GMOFILES)
 
 distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+
+# If you change following line, update also configure.ac where it
+# builds Makefile if NLS disabled.
 dist distdir:
 	$(MAKE) update-po
 	@$(MAKE) dist2
@@ -165,6 +169,8 @@
 	  cp -p $$dir/$$file $(distdir); \
 	done
 
+# If you change following line, update also configure.ac where it
+# builds Makefile if NLS disabled.
 update-po: Makefile nb.po
 	$(MAKE) $(PACKAGE).pot
 	if test $(PACKAGE) = gettext; then PATH=`pwd`/../src:$$PATH; fi; \
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


[Freeciv-Dev] (PR#39681) [Patch] Remove gui-mui from distribution and translation

2007-09-07 Thread Marko Lindqvist

URL: http://bugs.freeciv.org/Ticket/Display.html?id=39681 

 $subject


 - ML

diff -Nurd -X.diff_ignore freeciv/client/Makefile.am freeciv/client/Makefile.am
--- freeciv/client/Makefile.am	2007-08-26 22:07:41.0 +0300
+++ freeciv/client/Makefile.am	2007-09-08 00:59:38.0 +0300
@@ -37,75 +37,8 @@
 CLIENTICON=../win32/clienticon.o
 endif
 
-EXTRA_DIST= 	gui-mui/autogroupclass.c \
-		gui-mui/autogroupclass.h \
-		gui-mui/chatline.c   \
-		gui-mui/chatline.h   \
-		gui-mui/citydlg.c\
-		gui-mui/citydlg.h\
-		gui-mui/cityrep.c\
-		gui-mui/cityrep.h\
-		gui-mui/colors.c \
-		gui-mui/colors.h \
-		gui-mui/colortextclass.c \
-		gui-mui/colortextclass.h \
-		gui-mui/connectdlg.c \
-		gui-mui/connectdlg.h \
-		gui-mui/dialogs.c\
-		gui-mui/dialogs.h\
-		gui-mui/diplodlg.c   \
-		gui-mui/diplodlg.h   \
-		gui-mui/finddlg.c\
-		gui-mui/finddlg.h\
-		gui-mui/gamedlgs.c   \
-		gui-mui/gotodlg.c\
-		gui-mui/gotodlg.h\
-		gui-mui/graphics.c   \
-		gui-mui/graphics.h   \
-		gui-mui/gui_main.c   \
-		gui-mui/gui_main.h   \
-		gui-mui/helpdlg.c\
-		gui-mui/helpdlg.h\
-		gui-mui/historystringclass.c \
-		gui-mui/historystringclass.h \
-		gui-mui/inputdlg.c   \
-		gui-mui/inputdlg.h   \
-		gui-mui/inteldlg.c   \
-		gui-mui/inteldlg.h   \
-		gui-mui/mapclass.c   \
-		gui-mui/mapclass.h   \
-		gui-mui/mapctrl.c\
-		gui-mui/mapctrl.h\
-		gui-mui/mapview.c\
-		gui-mui/mapview.h\
-		gui-mui/messagedlg.c \
-		gui-mui/messagedlg.h \
-		gui-mui/messagewin.c \
-		gui-mui/messagewin.h \
-		gui-mui/muistuff.c   \
-		gui-mui/muistuff.h   \
-		gui-mui/objecttreeclass.c\
-		gui-mui/objecttreeclass.h\
-		gui-mui/optiondlg.h  \
-		gui-mui/overviewclass.c  \
-		gui-mui/overviewclass.h  \
-		gui-mui/plrdlg.c \
-		gui-mui/plrdlg.h \
-		gui-mui/ratesdlg.h   \
-		gui-mui/repodlgs.c   \
-		gui-mui/repodlgs.h   \
-		gui-mui/scrollbuttonclass.c  \
-		gui-mui/scrollbuttonclass.h  \
-		gui-mui/spaceshipdlg.c   \
-		gui-mui/spaceshipdlg.h   \
-		gui-mui/transparentstringclass.c \
-		gui-mui/transparentstringclass.h \
-		gui-mui/wldlg.c  \
-		gui-mui/wldlg.h  \
-		gui-mui/worklistclass.c  \
-		gui-mui/worklistclass.h  \
-		\
-		$(ALL_AUDIO_SDL_FILES)
+EXTRA_DIST= \
+	$(ALL_AUDIO_SDL_FILES)
 
 
 ## This is usually false, so include is not recursed into 
diff -Nurd -X.diff_ignore freeciv/configure.ac freeciv/configure.ac
--- freeciv/configure.ac	2007-09-07 13:54:28.0 +0300
+++ freeciv/configure.ac	2007-09-08 01:00:03.0 +0300
@@ -699,8 +699,7 @@
 dnl Most of the C comments copied to freeciv.pot are spurious; 
 dnl change to only copy those with prefix TRANS:
 dnl Also add --escape to the arguments to convert extended
-dnl characters to escape characters.  This affects some of the 
-dnl gui-mui strings, which use 0x1B escape character.
+dnl characters to escape characters.
 AC_CONFIG_COMMANDS([fc_default-4],[[if test -f po/Makefile ; then
  if grep 'add-comments=TRANS: --escape' po/Makefile /dev/null 21 ; then
# has already been modified
diff -Nurd -X.diff_ignore freeciv/po/POTFILES.in freeciv/po/POTFILES.in
--- freeciv/po/POTFILES.in	2007-09-06 14:44:13.0 +0300
+++ freeciv/po/POTFILES.in	2007-09-08 01:00:25.0 +0300
@@ -111,30 +111,6 @@
 client/gui-gtk-2.0/theme_dlg.c
 client/gui-gtk-2.0/tileset_dlg.c
 client/gui-gtk-2.0/wldlg.c
-client/gui-mui/chatline.c
-client/gui-mui/citydlg.c
-client/gui-mui/cityrep.c
-client/gui-mui/connectdlg.c
-client/gui-mui/dialogs.c
-client/gui-mui/diplodlg.c
-client/gui-mui/finddlg.c
-client/gui-mui/gamedlgs.c
-client/gui-mui/gotodlg.c
-client/gui-mui/graphics.c
-client/gui-mui/gui_main.c
-client/gui-mui/helpdlg.c
-client/gui-mui/inputdlg.c
-client/gui-mui/inteldlg.c
-client/gui-mui/mapclass.c
-client/gui-mui/mapctrl.c
-client/gui-mui/mapview.c
-client/gui-mui/messagedlg.c
-client/gui-mui/messagewin.c
-client/gui-mui/plrdlg.c
-client/gui-mui/repodlgs.c
-client/gui-mui/spaceshipdlg.c
-client/gui-mui/wldlg.c
-client/gui-mui/worklistclass.c
 client/gui-sdl/caravan_dialog.c
 client/gui-sdl/chatline.c
 client/gui-sdl/citydlg.c
diff -Nurd -X.diff_ignore freeciv/po/POTFILES.skip freeciv/po/POTFILES.skip
--- freeciv/po/POTFILES.skip	2007-08-04 18:38:22.0 +0300
+++ freeciv/po/POTFILES.skip