<URL: http://bugs.freeciv.org/Ticket/Display.html?id=36054 >
> [EMAIL PROTECTED] - Sa 04. Aug 2007, 12:33:30]: > > Changed source directory hierarchy > Freeciv/gtk-2.0 -> gui-gtk-2.0/Freeciv. > > Hierarchy discussion in #39482. > > > - ML > This should be "gui-gtk-2.0/Freeciv/gtk-2.0" now. Updated patch attached.
Index: configure.ac =================================================================== --- configure.ac (Revision 13158) +++ configure.ac (Arbeitskopie) @@ -728,6 +728,27 @@ data/scenario/Makefile data/nation/Makefile data/themes/Makefile + data/themes/gui-gtk-2.0/Makefile + data/themes/gui-gtk-2.0/Freeciv/Makefile + data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Makefile + data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Arrows/Makefile + data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Buttons/Makefile + data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Check-Radio/Makefile + data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Combo/Makefile + data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Frame-Gap/Makefile + data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Handles/Makefile + data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Lines/Makefile + data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/ListHeaders/Makefile + data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Menu-Menubar/Makefile + data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Others/Makefile + data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Panel/Makefile + data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/ProgressBar/Makefile + data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Range/Makefile + data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Scrollbars/Makefile + data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Shadows/Makefile + data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Spin/Makefile + data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Tabs/Makefile + data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Toolbar/Makefile data/themes/gui-sdl/Makefile data/themes/gui-sdl/human/Makefile data/wonders/Makefile Index: data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/ProgressBar/Makefile.am =================================================================== --- data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/ProgressBar/Makefile.am (Revision 0) +++ data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/ProgressBar/Makefile.am (Revision 0) @@ -0,0 +1,14 @@ +## Process this file with automake to produce Makefile.in + +## Override automake so that "make install" puts these in proper place: +pkgdatadir = $(datadir)/$(PACKAGE)/themes/gui-gtk-2.0/Freeciv/gtk-2.0/ProgressBar + +pkgdata_DATA = \ + progressbar-horiz-1.png \ + progressbar-horiz-2.png \ + progressbar-horiz.png \ + trough-progressbar-horiz-2.png \ + trough-progressbar-horiz.png \ + trough-progressbar-vert.png + +EXTRA_DIST = $(pkgdata_DATA) Index: data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Tabs/Makefile.am =================================================================== --- data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Tabs/Makefile.am (Revision 0) +++ data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Tabs/Makefile.am (Revision 0) @@ -0,0 +1,18 @@ +## Process this file with automake to produce Makefile.in + +## Override automake so that "make install" puts these in proper place: +pkgdatadir = $(datadir)/$(PACKAGE)/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Tabs + +pkgdata_DATA = \ + notebook.png \ + null.png \ + tab-bottom-active.png \ + tab-bottom.png \ + tab-left-active.png \ + tab-left.png \ + tab-right-active.png \ + tab-right.png \ + tab-top-active.png \ + tab-top.png + +EXTRA_DIST = $(pkgdata_DATA) Index: data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Menu-Menubar/Makefile.am =================================================================== --- data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Menu-Menubar/Makefile.am (Revision 0) +++ data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Menu-Menubar/Makefile.am (Revision 0) @@ -0,0 +1,14 @@ +## Process this file with automake to produce Makefile.in + +## Override automake so that "make install" puts these in proper place: +pkgdatadir = $(datadir)/$(PACKAGE)/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Menu-Menubar + +pkgdata_DATA = \ + menubar-item.png \ + menubar.png \ + menuitem.png \ + menuline.png \ + menu-overlay.png \ + menu.png + +EXTRA_DIST = $(pkgdata_DATA) Index: data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Range/Makefile.am =================================================================== --- data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Range/Makefile.am (Revision 0) +++ data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Range/Makefile.am (Revision 0) @@ -0,0 +1,15 @@ +## Process this file with automake to produce Makefile.in + +## Override automake so that "make install" puts these in proper place: +pkgdatadir = $(datadir)/$(PACKAGE)/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Range + +pkgdata_DATA = \ + null.png \ + slider-horiz.png \ + slider-horiz-prelight.png \ + slider-vert.png \ + slider-vert-prelight.png \ + trough-horizontal.png \ + trough-vertical.png + +EXTRA_DIST = $(pkgdata_DATA) Index: data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Buttons/Makefile.am =================================================================== --- data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Buttons/Makefile.am (Revision 0) +++ data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Buttons/Makefile.am (Revision 0) @@ -0,0 +1,13 @@ +## Process this file with automake to produce Makefile.in + +## Override automake so that "make install" puts these in proper place: +pkgdatadir = $(datadir)/$(PACKAGE)/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Buttons + +pkgdata_DATA = \ + button-default.png \ + button-insensitive.png \ + button-normal.png \ + button-prelight.png \ + button-pressed.png + +EXTRA_DIST = $(pkgdata_DATA) Index: data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Combo/Makefile.am =================================================================== --- data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Combo/Makefile.am (Revision 0) +++ data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Combo/Makefile.am (Revision 0) @@ -0,0 +1,14 @@ +## Process this file with automake to produce Makefile.in + +## Override automake so that "make install" puts these in proper place: +pkgdatadir = $(datadir)/$(PACKAGE)/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Combo + +pkgdata_DATA = \ + combo-arrow-insens.png \ + combo-arrow.png \ + combo-arrow-prelight.png \ + combo-inactive.png \ + combo-normal.png \ + combo-prelight.png + +EXTRA_DIST = $(pkgdata_DATA) Index: data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Panel/Makefile.am =================================================================== --- data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Panel/Makefile.am (Revision 0) +++ data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Panel/Makefile.am (Revision 0) @@ -0,0 +1,13 @@ +## Process this file with automake to produce Makefile.in + +## Override automake so that "make install" puts these in proper place: +pkgdatadir = $(datadir)/$(PACKAGE)/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Panel + +pkgdata_DATA = \ + panel-bg.png \ + panelbutton1.png \ + panelbutton2.png \ + panelbutton3.png \ + panelbutton4.png + +EXTRA_DIST = $(pkgdata_DATA) Index: data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Frame-Gap/Makefile.am =================================================================== --- data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Frame-Gap/Makefile.am (Revision 0) +++ data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Frame-Gap/Makefile.am (Revision 0) @@ -0,0 +1,12 @@ +## Process this file with automake to produce Makefile.in + +## Override automake so that "make install" puts these in proper place: +pkgdatadir = $(datadir)/$(PACKAGE)/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Frame-Gap + +pkgdata_DATA = \ + frame1.png \ + frame2.png \ + frame-gap-end.png \ + frame-gap-start.png + +EXTRA_DIST = $(pkgdata_DATA) Index: data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Toolbar/Makefile.am =================================================================== --- data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Toolbar/Makefile.am (Revision 0) +++ data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Toolbar/Makefile.am (Revision 0) @@ -0,0 +1,13 @@ +## Process this file with automake to produce Makefile.in + +## Override automake so that "make install" puts these in proper place: +pkgdatadir = $(datadir)/$(PACKAGE)/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Toolbar + +pkgdata_DATA = \ + toolbar.png \ + toolbutton-normal.png \ + toolbutton-prelight.png \ + toolbutton-pressed.png \ + toolbutton-toggled.png + +EXTRA_DIST = $(pkgdata_DATA) Index: data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Others/Makefile.am =================================================================== --- data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Others/Makefile.am (Revision 0) +++ data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Others/Makefile.am (Revision 0) @@ -0,0 +1,11 @@ +## Process this file with automake to produce Makefile.in + +## Override automake so that "make install" puts these in proper place: +pkgdatadir = $(datadir)/$(PACKAGE)/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Others + +pkgdata_DATA = \ + focus.png \ + null.png \ + ruler.png + +EXTRA_DIST = $(pkgdata_DATA) Index: data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Scrollbars/Makefile.am =================================================================== --- data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Scrollbars/Makefile.am (Revision 0) +++ data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Scrollbars/Makefile.am (Revision 0) @@ -0,0 +1,31 @@ +## Process this file with automake to produce Makefile.in + +## Override automake so that "make install" puts these in proper place: +pkgdatadir = $(datadir)/$(PACKAGE)/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Scrollbars + +pkgdata_DATA = \ + scroll-thumb-horiz.png \ + scroll-thumb-vert.png \ + slider-horiz-insens.png \ + slider-horiz.png \ + slider-horiz-prelight.png \ + slider-vert-insens.png \ + slider-vert.png \ + slider-vert-prelight.png \ + stepper-down-insens.png \ + stepper-down.png \ + stepper-down-prelight.png \ + stepper-left-insens.png \ + stepper-left.png \ + stepper-left-prelight.png \ + stepper.png \ + stepper-right-insens.png \ + stepper-right.png \ + stepper-right-prelight.png \ + stepper-up-insens.png \ + stepper-up.png \ + stepper-up-prelight.png \ + trough-scrollbar-horiz.png \ + trough-scrollbar-vert.png + +EXTRA_DIST = $(pkgdata_DATA) Index: data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/ListHeaders/Makefile.am =================================================================== --- data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/ListHeaders/Makefile.am (Revision 0) +++ data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/ListHeaders/Makefile.am (Revision 0) @@ -0,0 +1,12 @@ +## Process this file with automake to produce Makefile.in + +## Override automake so that "make install" puts these in proper place: +pkgdatadir = $(datadir)/$(PACKAGE)/themes/gui-gtk-2.0/Freeciv/gtk-2.0/ListHeaders + +pkgdata_DATA = \ + list_header-insens.png \ + list_header.png \ + list_header-prelight.png \ + list_header-pressed.png + +EXTRA_DIST = $(pkgdata_DATA) Index: data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Shadows/Makefile.am =================================================================== --- data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Shadows/Makefile.am (Revision 0) +++ data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Shadows/Makefile.am (Revision 0) @@ -0,0 +1,15 @@ +## Process this file with automake to produce Makefile.in + +## Override automake so that "make install" puts these in proper place: +pkgdatadir = $(datadir)/$(PACKAGE)/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Shadows + +pkgdata_DATA = \ + entry-shadow-in.png \ + shadow-etched-out.png \ + shadow-in.png \ + shadow-none.png \ + shadow-out.png \ + text-entry.png \ + text.png + +EXTRA_DIST = $(pkgdata_DATA) Index: data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Check-Radio/Makefile.am =================================================================== --- data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Check-Radio/Makefile.am (Revision 0) +++ data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Check-Radio/Makefile.am (Revision 0) @@ -0,0 +1,18 @@ +## Process this file with automake to produce Makefile.in + +## Override automake so that "make install" puts these in proper place: +pkgdatadir = $(datadir)/$(PACKAGE)/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Check-Radio + +pkgdata_DATA = \ + check1.png \ + check2.png \ + check3.png \ + check4.png \ + checklight.png \ + highlight.png \ + option1.png \ + option2.png \ + option3.png \ + option4.png + +EXTRA_DIST = $(pkgdata_DATA) Index: data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Makefile.am =================================================================== --- data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Makefile.am (Revision 0) +++ data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Makefile.am (Revision 0) @@ -0,0 +1,16 @@ +## Process this file with automake to produce Makefile.in + +## Override automake so that "make install" puts these in proper place: +pkgdatadir = $(datadir)/$(PACKAGE)/themes/gui-gtk-2.0/Freeciv/gtk-2.0 + +SUBDIRS = Arrows Buttons Check-Radio Combo Frame-Gap Handles Lines \ + ListHeaders Menu-Menubar Others Panel ProgressBar Range \ + Scrollbars Shadows Spin Tabs Toolbar + +pkgdata_DATA = \ + bg.png \ + gtkrc \ + menubar.rc \ + panel.rc + +EXTRA_DIST = $(pkgdata_DATA) Index: data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Spin/Makefile.am =================================================================== --- data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Spin/Makefile.am (Revision 0) +++ data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Spin/Makefile.am (Revision 0) @@ -0,0 +1,15 @@ +## Process this file with automake to produce Makefile.in + +## Override automake so that "make install" puts these in proper place: +pkgdatadir = $(datadir)/$(PACKAGE)/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Spin + +pkgdata_DATA = \ + spin-down-disable.png \ + spin-down.png \ + spin-down-prelight.png \ + spin.png \ + spin-up-disable.png \ + spin-up.png \ + spin-up-prelight.png + +EXTRA_DIST = $(pkgdata_DATA) Index: data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Lines/Makefile.am =================================================================== --- data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Lines/Makefile.am (Revision 0) +++ data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Lines/Makefile.am (Revision 0) @@ -0,0 +1,10 @@ +## Process this file with automake to produce Makefile.in + +## Override automake so that "make install" puts these in proper place: +pkgdatadir = $(datadir)/$(PACKAGE)/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Lines + +pkgdata_DATA = \ + line-h.png \ + line-v.png + +EXTRA_DIST = $(pkgdata_DATA) Index: data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Arrows/Makefile.am =================================================================== --- data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Arrows/Makefile.am (Revision 0) +++ data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Arrows/Makefile.am (Revision 0) @@ -0,0 +1,14 @@ +## Process this file with automake to produce Makefile.in + +## Override automake so that "make install" puts these in proper place: +pkgdatadir = $(datadir)/$(PACKAGE)/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Arrows + +pkgdata_DATA = \ + arrow-down.png \ + arrow-left.png \ + arrow-right-norm.png \ + arrow-right.png \ + arrow-right-prelight.png \ + arrow-up.png + +EXTRA_DIST = $(pkgdata_DATA) Index: data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Handles/Makefile.am =================================================================== --- data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Handles/Makefile.am (Revision 0) +++ data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Handles/Makefile.am (Revision 0) @@ -0,0 +1,10 @@ +## Process this file with automake to produce Makefile.in + +## Override automake so that "make install" puts these in proper place: +pkgdatadir = $(datadir)/$(PACKAGE)/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Handles + +pkgdata_DATA = \ + handle-h.png \ + handle-v.png + +EXTRA_DIST = $(pkgdata_DATA) Index: data/themes/gui-gtk-2.0/Freeciv/Makefile.am =================================================================== --- data/themes/gui-gtk-2.0/Freeciv/Makefile.am (Revision 0) +++ data/themes/gui-gtk-2.0/Freeciv/Makefile.am (Revision 0) @@ -0,0 +1,3 @@ +## Process this file with automake to produce Makefile.in + +SUBDIRS = gtk-2.0 Index: data/themes/gui-gtk-2.0/Makefile.am =================================================================== --- data/themes/gui-gtk-2.0/Makefile.am (Revision 0) +++ data/themes/gui-gtk-2.0/Makefile.am (Revision 0) @@ -0,0 +1,3 @@ +## Process this file with automake to produce Makefile.in + +SUBDIRS = Freeciv Index: data/themes/Makefile.am =================================================================== --- data/themes/Makefile.am (Revision 13158) +++ data/themes/Makefile.am (Arbeitskopie) @@ -1,5 +1,9 @@ ## Process this file with automake to produce Makefile.in +if CLIENT_GUI_GTK_2_0 +SUBDIRS = gui-gtk-2.0 +endif + if CLIENT_GUI_SDL SUBDIRS = gui-sdl endif
_______________________________________________ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
