GNOME.org
 

[atomix/wip/gtk3-port] Moved data files into data directory

commit 6e6b0cb0aff3a60bd172fe31e1583bfaa47c1fef
Author: Robert Roth <robert roth off gmail com>
Date:   Tue Jan 13 15:47:20 2015 +0200

    Moved data files into data directory

 Makefile.am                                        |   31 +------------
 configure.ac                                       |    7 ++-
 data/Makefile.am                                   |   24 +++++++++++
 atomix-icon.png => data/atomix-icon.png            |  Bin 4295 -> 4295 bytes
 atomix-logo.png => data/atomix-logo.png            |  Bin 54611 -> 54611 bytes
 atomix.desktop.in => data/atomix.desktop.in        |    0
 {level => data/level}/Makefile.am                  |    0
 {level => data/level}/aceticacid.atomix.xml        |    0
 {level => data/level}/acetone.atomix.xml           |    0
 {level => data/level}/butanol.atomix.xml           |    0
 {level => data/level}/cyclobutane.atomix.xml       |    0
 {level => data/level}/dimethylether.atomix.xml     |    0
 {level => data/level}/ethanal.atomix.xml           |    0
 {level => data/level}/ethane.atomix.xml            |    0
 {level => data/level}/ethanol.atomix.xml           |    0
 {level => data/level}/ethylene.atomix.xml          |    0
 {level => data/level}/glycerin.atomix.xml          |    0
 {level => data/level}/lactic-acid.atomix.xml       |    0
 {level => data/level}/methanal.atomix.xml          |    0
 {level => data/level}/methane.atomix.xml           |    0
 {level => data/level}/methanol.atomix.xml          |    0
 {level => data/level}/propanal.atomix.xml          |    0
 {level => data/level}/propylene.atomix.xml         |    0
 {level => data/level}/pyran.atomix.xml             |    0
 {level => data/level}/sequence                     |    0
 {level => data/level}/transbutylen.atomix.xml      |    0
 {level => data/level}/water.atomix.xml             |    0
 {themes => data/themes}/Makefile.am                |    0
 {themes => data/themes}/default/Makefile.am        |    0
 {themes => data/themes}/default/arrow-bottom.png   |  Bin 578 -> 578 bytes
 {themes => data/themes}/default/arrow-left.png     |  Bin 573 -> 573 bytes
 {themes => data/themes}/default/arrow-right.png    |  Bin 487 -> 487 bytes
 {themes => data/themes}/default/arrow-top.png      |  Bin 568 -> 568 bytes
 {themes => data/themes}/default/atom-c.png         |  Bin 1994 -> 1994 bytes
 {themes => data/themes}/default/atom-f.png         |  Bin 1955 -> 1955 bytes
 {themes => data/themes}/default/atom-h.png         |  Bin 2018 -> 2018 bytes
 {themes => data/themes}/default/atom-n.png         |  Bin 2065 -> 2065 bytes
 {themes => data/themes}/default/atom-o.png         |  Bin 2252 -> 2252 bytes
 {themes => data/themes}/default/cursor.png         |  Bin 298 -> 298 bytes
 {themes => data/themes}/default/decor-fence.png    |  Bin 206 -> 206 bytes
 {themes => data/themes}/default/decor-holes.png    |  Bin 237 -> 237 bytes
 {themes => data/themes}/default/decor-liquid.png   |  Bin 945 -> 945 bytes
 {themes => data/themes}/default/floor.png          |  Bin 267 -> 267 bytes
 .../themes}/default/link-bottom-double.png         |  Bin 314 -> 314 bytes
 .../themes}/default/link-bottom-left.png           |  Bin 346 -> 346 bytes
 .../themes}/default/link-bottom-right.png          |  Bin 365 -> 365 bytes
 {themes => data/themes}/default/link-bottom.png    |  Bin 208 -> 208 bytes
 .../themes}/default/link-left-double.png           |  Bin 329 -> 329 bytes
 {themes => data/themes}/default/link-left.png      |  Bin 206 -> 206 bytes
 .../themes}/default/link-right-double.png          |  Bin 318 -> 318 bytes
 {themes => data/themes}/default/link-right.png     |  Bin 206 -> 206 bytes
 .../themes}/default/link-top-double.png            |  Bin 309 -> 309 bytes
 {themes => data/themes}/default/link-top-left.png  |  Bin 411 -> 411 bytes
 {themes => data/themes}/default/link-top-right.png |  Bin 374 -> 374 bytes
 {themes => data/themes}/default/link-top.png       |  Bin 204 -> 204 bytes
 .../themes}/default/shadow-bottom-right.png        |  Bin 178 -> 178 bytes
 .../themes}/default/shadow-left-top.png            |  Bin 210 -> 210 bytes
 {themes => data/themes}/default/shadow-left.png    |  Bin 132 -> 132 bytes
 .../themes}/default/shadow-top-left-both.png       |  Bin 246 -> 246 bytes
 .../themes}/default/shadow-top-left.png            |  Bin 205 -> 205 bytes
 {themes => data/themes}/default/shadow-top.png     |  Bin 128 -> 128 bytes
 {themes => data/themes}/default/theme              |    0
 .../themes}/default/wall-bottom-left.png           |  Bin 544 -> 544 bytes
 .../themes}/default/wall-bottom-right.png          |  Bin 469 -> 469 bytes
 .../themes}/default/wall-horizontal-bottomx.png    |  Bin 448 -> 448 bytes
 .../themes}/default/wall-horizontal-left-end.png   |  Bin 609 -> 609 bytes
 .../themes}/default/wall-horizontal-right-end.png  |  Bin 583 -> 583 bytes
 .../themes}/default/wall-horizontal-topx.png       |  Bin 636 -> 636 bytes
 .../themes}/default/wall-horizontal.png            |  Bin 259 -> 259 bytes
 {themes => data/themes}/default/wall-single.png    |  Bin 621 -> 621 bytes
 {themes => data/themes}/default/wall-top-left.png  |  Bin 476 -> 476 bytes
 {themes => data/themes}/default/wall-top-right.png |  Bin 548 -> 548 bytes
 .../themes}/default/wall-vertical-bottom-end.png   |  Bin 513 -> 513 bytes
 .../themes}/default/wall-vertical-leftx.png        |  Bin 576 -> 576 bytes
 .../themes}/default/wall-vertical-rightx.png       |  Bin 424 -> 424 bytes
 .../themes}/default/wall-vertical-top-end.png      |  Bin 559 -> 559 bytes
 {themes => data/themes}/default/wall-vertical.png  |  Bin 261 -> 261 bytes
 po/POTFILES.in                                     |   44 +++++++++----------
 78 files changed, 52 insertions(+), 54 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 8e5d11f..0dd6269 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,38 +1,13 @@
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
-SUBDIRS = po src level themes
-
-logodir = $(pkgdatadir)
-logo_DATA = atomix-logo.png
-
-icondir = $(datadir)/pixmaps
-icon_DATA = atomix-icon.png
-
-scoredir=$(localstatedir)/games
-
-appdir = $(datadir)/applications
-app_in_files = atomix.desktop.in
-app_DATA = $(app_in_files:.desktop.in=.desktop)
+SUBDIRS = po src data
 
 EXTRA_DIST = \
         intltool-extract.in \
         intltool-merge.in   \
-        intltool-update.in \
-       $(app_in_files) \
-       $(logo_DATA) \
-       $(icon_DATA)
+        intltool-update.in
 
 DISTCLEANFILES = \
        intltool-extract \
        intltool-merge \
-       intltool-update \
-       $(app_DATA)
-
- INTLTOOL_DESKTOP_RULE@
-
-install-data-local:
-       -$(mkinstalldirs) $(DESTDIR)$(scoredir)
-       -touch $(DESTDIR)$(scoredir)/atomix.scores
-       -chown games.games $(DESTDIR)$(scoredir)/atomix.scores
-       -chmod 664 $(DESTDIR)$(scoredir)/atomix.scores
-       -chgrp games $(DESTDIR)$(bindir)/atomix && chmod 2755 $(DESTDIR)$(bindir)/atomix
+       intltool-update
diff --git a/configure.ac b/configure.ac
index e600c38..6ae0913 100644
--- a/configure.ac
+++ b/configure.ac
@@ -48,8 +48,9 @@ AC_CONFIG_FILES([
 Makefile
 po/Makefile.in
 src/Makefile
-themes/Makefile
-themes/default/Makefile
-level/Makefile])
+data/Makefile
+data/themes/Makefile
+data/themes/default/Makefile
+data/level/Makefile])
 
 AC_OUTPUT
diff --git a/data/Makefile.am b/data/Makefile.am
new file mode 100644
index 0000000..8ab0158
--- /dev/null
+++ b/data/Makefile.am
@@ -0,0 +1,24 @@
+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+
+SUBDIRS = level themes
+
+logodir = $(pkgdatadir)
+logo_DATA = atomix-logo.png
+
+icondir = $(datadir)/pixmaps
+icon_DATA = atomix-icon.png
+
+ INTLTOOL_DESKTOP_RULE@
+
+appdir = $(datadir)/applications
+app_in_files = atomix.desktop.in
+app_DATA = $(app_in_files:.desktop.in=.desktop)
+
+EXTRA_DIST = \
+       $(app_in_files) \
+       $(logo_DATA) \
+       $(icon_DATA)
+
+DISTCLEANFILES = \
+       $(app_DATA)
+
diff --git a/atomix.desktop.in b/data/atomix.desktop.in
similarity index 100%
rename from atomix.desktop.in
rename to data/atomix.desktop.in
diff --git a/level/Makefile.am b/data/level/Makefile.am
similarity index 100%
rename from level/Makefile.am
rename to data/level/Makefile.am
diff --git a/level/aceticacid.atomix.xml b/data/level/aceticacid.atomix.xml
similarity index 100%
rename from level/aceticacid.atomix.xml
rename to data/level/aceticacid.atomix.xml
diff --git a/level/acetone.atomix.xml b/data/level/acetone.atomix.xml
similarity index 100%
rename from level/acetone.atomix.xml
rename to data/level/acetone.atomix.xml
diff --git a/level/butanol.atomix.xml b/data/level/butanol.atomix.xml
similarity index 100%
rename from level/butanol.atomix.xml
rename to data/level/butanol.atomix.xml
diff --git a/level/cyclobutane.atomix.xml b/data/level/cyclobutane.atomix.xml
similarity index 100%
rename from level/cyclobutane.atomix.xml
rename to data/level/cyclobutane.atomix.xml
diff --git a/level/dimethylether.atomix.xml b/data/level/dimethylether.atomix.xml
similarity index 100%
rename from level/dimethylether.atomix.xml
rename to data/level/dimethylether.atomix.xml
diff --git a/level/ethanal.atomix.xml b/data/level/ethanal.atomix.xml
similarity index 100%
rename from level/ethanal.atomix.xml
rename to data/level/ethanal.atomix.xml
diff --git a/level/ethane.atomix.xml b/data/level/ethane.atomix.xml
similarity index 100%
rename from level/ethane.atomix.xml
rename to data/level/ethane.atomix.xml
diff --git a/level/ethanol.atomix.xml b/data/level/ethanol.atomix.xml
similarity index 100%
rename from level/ethanol.atomix.xml
rename to data/level/ethanol.atomix.xml
diff --git a/level/ethylene.atomix.xml b/data/level/ethylene.atomix.xml
similarity index 100%
rename from level/ethylene.atomix.xml
rename to data/level/ethylene.atomix.xml
diff --git a/level/glycerin.atomix.xml b/data/level/glycerin.atomix.xml
similarity index 100%
rename from level/glycerin.atomix.xml
rename to data/level/glycerin.atomix.xml
diff --git a/level/lactic-acid.atomix.xml b/data/level/lactic-acid.atomix.xml
similarity index 100%
rename from level/lactic-acid.atomix.xml
rename to data/level/lactic-acid.atomix.xml
diff --git a/level/methanal.atomix.xml b/data/level/methanal.atomix.xml
similarity index 100%
rename from level/methanal.atomix.xml
rename to data/level/methanal.atomix.xml
diff --git a/level/methane.atomix.xml b/data/level/methane.atomix.xml
similarity index 100%
rename from level/methane.atomix.xml
rename to data/level/methane.atomix.xml
diff --git a/level/methanol.atomix.xml b/data/level/methanol.atomix.xml
similarity index 100%
rename from level/methanol.atomix.xml
rename to data/level/methanol.atomix.xml
diff --git a/level/propanal.atomix.xml b/data/level/propanal.atomix.xml
similarity index 100%
rename from level/propanal.atomix.xml
rename to data/level/propanal.atomix.xml
diff --git a/level/propylene.atomix.xml b/data/level/propylene.atomix.xml
similarity index 100%
rename from level/propylene.atomix.xml
rename to data/level/propylene.atomix.xml
diff --git a/level/pyran.atomix.xml b/data/level/pyran.atomix.xml
similarity index 100%
rename from level/pyran.atomix.xml
rename to data/level/pyran.atomix.xml
diff --git a/level/sequence b/data/level/sequence
similarity index 100%
rename from level/sequence
rename to data/level/sequence
diff --git a/level/transbutylen.atomix.xml b/data/level/transbutylen.atomix.xml
similarity index 100%
rename from level/transbutylen.atomix.xml
rename to data/level/transbutylen.atomix.xml
diff --git a/level/water.atomix.xml b/data/level/water.atomix.xml
similarity index 100%
rename from level/water.atomix.xml
rename to data/level/water.atomix.xml
diff --git a/themes/Makefile.am b/data/themes/Makefile.am
similarity index 100%
rename from themes/Makefile.am
rename to data/themes/Makefile.am
diff --git a/themes/default/Makefile.am b/data/themes/default/Makefile.am
similarity index 100%
rename from themes/default/Makefile.am
rename to data/themes/default/Makefile.am
diff --git a/themes/default/theme b/data/themes/default/theme
similarity index 100%
rename from themes/default/theme
rename to data/themes/default/theme
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 1472e1a..1795ccf 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,27 +1,25 @@
-level/aceticacid.atomix.xml
-level/acetone.atomix.xml
-level/butanol.atomix.xml
-level/cyclobutane.atomix.xml
-level/dimethylether.atomix.xml
-level/ethanal.atomix.xml
-level/ethane.atomix.xml
-level/ethanol.atomix.xml
-level/ethylene.atomix.xml
-level/glycerin.atomix.xml
-level/lactic-acid.atomix.xml
-level/methanal.atomix.xml
-level/methane.atomix.xml
-level/methanol.atomix.xml
-level/propanal.atomix.xml
-level/propylene.atomix.xml
-level/pyran.atomix.xml
-level/transbutylen.atomix.xml
-level/water.atomix.xml
-src/board.c
-src/games-runtime.c
-src/games-scores-dialog.c
+data/level/aceticacid.atomix.xml
+data/level/acetone.atomix.xml
+data/level/butanol.atomix.xml
+data/level/cyclobutane.atomix.xml
+data/level/dimethylether.atomix.xml
+data/level/ethanal.atomix.xml
+data/level/ethane.atomix.xml
+data/level/ethanol.atomix.xml
+data/level/ethylene.atomix.xml
+data/level/glycerin.atomix.xml
+data/level/lactic-acid.atomix.xml
+data/level/methanal.atomix.xml
+data/level/methane.atomix.xml
+data/level/methanol.atomix.xml
+data/level/propanal.atomix.xml
+data/level/propylene.atomix.xml
+data/level/pyran.atomix.xml
+data/level/transbutylen.atomix.xml
+data/level/water.atomix.xml
+src/board-gtk.c
 src/games-show.c
 src/level-manager.c
 src/main.c
 src/theme-manager.c
-atomix.desktop.in
+data/atomix.desktop.in
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]