[gnome-games] gnome-mahjongg: Rename mahjongg to gnome-mahjongg so it has a unique name



commit 3ff289e78836186b3d6cf91cefe3a6e59e3dc518
Author: Robert Ancell <robert ancell canonical com>
Date:   Sun Jul 15 14:09:44 2012 +1200

    gnome-mahjongg: Rename mahjongg to gnome-mahjongg so it has a unique name

 configure.ac                                       |   20 ++++++++++----------
 {mahjongg => gnome-mahjongg}/Makefile.am           |    0
 {mahjongg => gnome-mahjongg}/data/Makefile.am      |   16 ++++++++--------
 .../data/gnome-mahjongg.6                          |    0
 .../data/gnome-mahjongg.desktop.in.in              |    4 ++--
 .../data/icons/16x16/gnome-mahjongg.png            |  Bin 598 -> 598 bytes
 .../data/icons/22x22/gnome-mahjongg.png            |  Bin 1037 -> 1037 bytes
 .../data/icons/24x24/gnome-mahjongg.png            |  Bin 1070 -> 1070 bytes
 .../data/icons/32x32/gnome-mahjongg.png            |  Bin 1799 -> 1799 bytes
 .../data/icons/48x48/gnome-mahjongg.png            |  Bin 2268 -> 2268 bytes
 .../data/icons/Makefile.am                         |   12 ++++++------
 .../data/icons/scalable/gnome-mahjongg.svg         |    0
 {mahjongg => gnome-mahjongg}/data/mahjongg.map     |    0
 .../data/org.gnome.gnome-mahjongg.gschema.xml.in   |    2 +-
 {mahjongg => gnome-mahjongg}/data/postmodern.svg   |    0
 {mahjongg => gnome-mahjongg}/data/smooth.png       |  Bin 336403 -> 336403 bytes
 .../data/translatable_game_names.h                 |    0
 .../help/C/bug-filing.page                         |    0
 {mahjongg => gnome-mahjongg}/help/C/choosing.page  |    0
 {mahjongg => gnome-mahjongg}/help/C/develop.page   |    0
 .../help/C/documentation.page                      |    0
 .../help/C/figures/hints-video.ogv                 |  Bin 910004 -> 910004 bytes
 .../help/C/figures/layout-bridges.png              |  Bin 75672 -> 75672 bytes
 .../help/C/figures/layout-cloud.png                |  Bin 99466 -> 99466 bytes
 .../help/C/figures/layout-conf-cross.png           |  Bin 49713 -> 49713 bytes
 .../help/C/figures/layout-difficult.png            |  Bin 80602 -> 80602 bytes
 .../help/C/figures/layout-easy.png                 |  Bin 83600 -> 83600 bytes
 .../help/C/figures/layout-pyramid-walls.png        |  Bin 49785 -> 49785 bytes
 .../help/C/figures/layout-red-dragon.png           |  Bin 93763 -> 93763 bytes
 .../help/C/figures/layout-tic-tac-toe.png          |  Bin 40805 -> 40805 bytes
 .../help/C/figures/layout-ziggurat.png             |  Bin 74616 -> 74616 bytes
 .../help/C/figures/logo.png                        |  Bin 598 -> 598 bytes
 .../help/C/figures/logo32.png                      |  Bin 1799 -> 1799 bytes
 .../help/C/figures/mahjongg-video.ogv              |  Bin 297175 -> 297175 bytes
 .../help/C/figures/moves-left.png                  |  Bin 3600 -> 3600 bytes
 {mahjongg => gnome-mahjongg}/help/C/gameplay.page  |    0
 {mahjongg => gnome-mahjongg}/help/C/hints.page     |    0
 {mahjongg => gnome-mahjongg}/help/C/index.page     |    0
 {mahjongg => gnome-mahjongg}/help/C/legal.xml      |    0
 {mahjongg => gnome-mahjongg}/help/C/license.page   |    0
 {mahjongg => gnome-mahjongg}/help/C/map.page       |    0
 {mahjongg => gnome-mahjongg}/help/C/moves.page     |    0
 {mahjongg => gnome-mahjongg}/help/C/pause.page     |    0
 {mahjongg => gnome-mahjongg}/help/C/rules.page     |    0
 {mahjongg => gnome-mahjongg}/help/C/scoring.page   |    0
 {mahjongg => gnome-mahjongg}/help/C/shortcuts.page |    0
 {mahjongg => gnome-mahjongg}/help/C/strategy.page  |    0
 {mahjongg => gnome-mahjongg}/help/C/toolbar.page   |    0
 {mahjongg => gnome-mahjongg}/help/C/translate.page |    0
 {mahjongg => gnome-mahjongg}/help/ChangeLog.old    |    0
 {mahjongg => gnome-mahjongg}/help/Makefile.am      |    2 +-
 {mahjongg => gnome-mahjongg}/help/ca/ca.po         |    0
 .../help/ca/figures/mahjongg.png                   |  Bin 93897 -> 93897 bytes
 .../help/ca/figures/no-move.png                    |  Bin 10717 -> 10717 bytes
 .../help/ca/figures/preferences.png                |  Bin 17903 -> 17903 bytes
 .../help/ca/figures/toolbar.png                    |  Bin 9176 -> 9176 bytes
 {mahjongg => gnome-mahjongg}/help/cs/cs.po         |    0
 .../help/cs/figures/mahjongg.png                   |  Bin 92897 -> 92897 bytes
 .../help/cs/figures/no-move.png                    |  Bin 14634 -> 14634 bytes
 .../help/cs/figures/preferences.png                |  Bin 20018 -> 20018 bytes
 .../help/cs/figures/toolbar.png                    |  Bin 8494 -> 8494 bytes
 {mahjongg => gnome-mahjongg}/help/da/da.po         |    0
 {mahjongg => gnome-mahjongg}/help/de/de.po         |    0
 .../help/de/figures/moves-left.png                 |  Bin 2283 -> 2283 bytes
 {mahjongg => gnome-mahjongg}/help/el/el.po         |    0
 .../help/el/figures/mahjongg.png                   |  Bin 96798 -> 96798 bytes
 .../help/el/figures/preferences.png                |  Bin 26277 -> 26277 bytes
 .../help/el/figures/toolbar.png                    |  Bin 12001 -> 12001 bytes
 {mahjongg => gnome-mahjongg}/help/en_GB/en_GB.po   |    0
 {mahjongg => gnome-mahjongg}/help/es/es.po         |    0
 .../help/es/figures/mahjongg.png                   |  Bin 104384 -> 104384 bytes
 .../help/es/figures/no-move.png                    |  Bin 9124 -> 9124 bytes
 .../help/es/figures/preferences.png                |  Bin 15538 -> 15538 bytes
 .../help/es/figures/toolbar.png                    |  Bin 9104 -> 9104 bytes
 {mahjongg => gnome-mahjongg}/help/eu/eu.po         |    0
 .../help/eu/figures/mahjongg.png                   |  Bin 92478 -> 92478 bytes
 .../help/eu/figures/no-move.png                    |  Bin 9475 -> 9475 bytes
 .../help/eu/figures/preferences.png                |  Bin 14825 -> 14825 bytes
 .../help/eu/figures/toolbar.png                    |  Bin 10102 -> 10102 bytes
 .../help/fr/figures/mahjongg.png                   |  Bin 113819 -> 113819 bytes
 .../help/fr/figures/moves-left.png                 |  Bin 5502 -> 5502 bytes
 .../help/fr/figures/no-move.png                    |  Bin 10904 -> 10904 bytes
 .../help/fr/figures/preferences.png                |  Bin 19785 -> 19785 bytes
 .../help/fr/figures/toolbar.png                    |  Bin 10502 -> 10502 bytes
 {mahjongg => gnome-mahjongg}/help/fr/fr.po         |    0
 .../help/it/figures/mahjongg.png                   |  Bin 115539 -> 115539 bytes
 .../help/it/figures/no-move.png                    |  Bin 9583 -> 9583 bytes
 .../help/it/figures/preferences.png                |  Bin 18888 -> 18888 bytes
 .../help/it/figures/toolbar.png                    |  Bin 10572 -> 10572 bytes
 {mahjongg => gnome-mahjongg}/help/it/it.po         |    0
 {mahjongg => gnome-mahjongg}/help/mahjongg.omf.in  |    0
 {mahjongg => gnome-mahjongg}/help/oc/oc.po         |    0
 .../help/pl/figures/mahjongg.png                   |  Bin 102340 -> 102340 bytes
 .../help/pl/figures/no-move.png                    |  Bin 11067 -> 11067 bytes
 .../help/pl/figures/preferences.png                |  Bin 19967 -> 19967 bytes
 .../help/pl/figures/toolbar.png                    |  Bin 14236 -> 14236 bytes
 {mahjongg => gnome-mahjongg}/help/pl/pl.po         |    0
 {mahjongg => gnome-mahjongg}/help/ru/ru.po         |    0
 {mahjongg => gnome-mahjongg}/help/sl/sl.po         |    0
 .../help/sr/figures/mahjongg.png                   |  Bin 27346 -> 27346 bytes
 .../help/sr/figures/no-move.png                    |  Bin 9753 -> 9753 bytes
 .../help/sr/figures/preferences.png                |  Bin 18392 -> 18392 bytes
 .../help/sr/figures/toolbar.png                    |  Bin 10673 -> 10673 bytes
 {mahjongg => gnome-mahjongg}/help/sr/sr.po         |    0
 .../help/sr latin/figures/mahjongg.png             |  Bin 27410 -> 27410 bytes
 .../help/sr latin/figures/no-move.png              |  Bin 10402 -> 10402 bytes
 .../help/sr latin/figures/preferences.png          |  Bin 18252 -> 18252 bytes
 .../help/sr latin/figures/toolbar.png              |  Bin 10856 -> 10856 bytes
 .../help/sr latin/sr latin po                      |    0
 .../help/sv/figures/mahjongg.png                   |  Bin 102535 -> 102535 bytes
 .../help/sv/figures/no-move.png                    |  Bin 8211 -> 8211 bytes
 .../help/sv/figures/preferences.png                |  Bin 20611 -> 20611 bytes
 .../help/sv/figures/toolbar.png                    |  Bin 12697 -> 12697 bytes
 {mahjongg => gnome-mahjongg}/help/sv/sv.po         |    0
 {mahjongg => gnome-mahjongg}/help/zh_CN/zh_CN.po   |    0
 {mahjongg => gnome-mahjongg}/src/Makefile.am       |   16 ++++++++--------
 {mahjongg => gnome-mahjongg}/src/config.vapi       |    0
 {mahjongg => gnome-mahjongg}/src/fixes.vapi        |    0
 {mahjongg => gnome-mahjongg}/src/game-view.vala    |    0
 {mahjongg => gnome-mahjongg}/src/game.vala         |    0
 .../src/gnome-mahjongg.vala                        |   14 +++++++-------
 {mahjongg => gnome-mahjongg}/src/map.vala          |    0
 po/POTFILES.in                                     |   14 +++++++-------
 po/POTFILES.skip                                   |   10 +++++-----
 124 files changed, 55 insertions(+), 55 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 4261857..4bb37cb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@ AM_MAINTAINER_MODE([enable])
 # we support and which features to check for
 
 # This is the canonical list of all game subdirectories.
-allgames="glchess glines gnect gnibbles gnobots2 gnomine gnotravex gnotski gtali iagno lightsoff mahjongg quadrapassel gnome-sudoku swell-foop"
+allgames="glchess glines gnect gnibbles gnobots2 gnomine gnotravex gnotski gtali iagno lightsoff gnome-mahjongg quadrapassel gnome-sudoku swell-foop"
 AC_SUBST([allgames])
 staginggames=""
 AC_SUBST([staginggames])
@@ -117,7 +117,7 @@ need_gmenu=no
 
 for game in $gamelist; do
   case $game in
-    glchess|gnomine|gnotravex|iagno|lightsoff|mahjongg|quadrapassel|swell-foop) need_vala=yes ;;
+    glchess|gnomine|gnotravex|iagno|lightsoff|gnome-mahjongg|quadrapassel|swell-foop) need_vala=yes ;;
     *) ;;
   esac
   case $game in
@@ -141,7 +141,7 @@ for game in $gamelist; do
     *) ;;
   esac
   case $game in
-    gnomine|gnotravex|iagno|lightsoff|mahjongg|quadrapassel|swell-foop) need_gmenu=yes ;;
+    gnomine|gnotravex|iagno|lightsoff|gnome-mahjongg|quadrapassel|swell-foop) need_gmenu=yes ;;
     *) ;;
   esac
 done
@@ -168,7 +168,7 @@ AM_CONDITIONAL([BUILD_GNOTSKI],[test "$build_gnotski" = "yes"])
 AM_CONDITIONAL([BUILD_GTALI],[test "$build_gtali" = "yes"])
 AM_CONDITIONAL([BUILD_IAGNO],[test "$build_iagno" = "yes"])
 AM_CONDITIONAL([BUILD_LIGHTSOFF],[test "$build_lightsoff" = "yes"])
-AM_CONDITIONAL([BUILD_MAHJONGG],[test "$build_mahjongg" = "yes"])
+AM_CONDITIONAL([BUILD_GNOME_MAHJONGG],[test "$build_gnome_mahjongg" = "yes"])
 AM_CONDITIONAL([BUILD_SWELL_FOOP],[test "$build_swell_foop" = "yes"])
 
 # Locate various programs
@@ -480,12 +480,12 @@ swell-foop/data/themes/shapesandcolors/Makefile
 swell-foop/data/swell-foop.desktop.in
 swell-foop/help/Makefile
 swell-foop/src/Makefile
-mahjongg/Makefile
-mahjongg/data/Makefile
-mahjongg/data/icons/Makefile
-mahjongg/data/mahjongg.desktop.in
-mahjongg/help/Makefile
-mahjongg/src/Makefile
+gnome-mahjongg/Makefile
+gnome-mahjongg/data/Makefile
+gnome-mahjongg/data/icons/Makefile
+gnome-mahjongg/data/gnome-mahjongg.desktop.in
+gnome-mahjongg/help/Makefile
+gnome-mahjongg/src/Makefile
 gtali/Makefile
 gtali/data/Makefile
 gtali/data/icons/Makefile
diff --git a/mahjongg/Makefile.am b/gnome-mahjongg/Makefile.am
similarity index 100%
rename from mahjongg/Makefile.am
rename to gnome-mahjongg/Makefile.am
diff --git a/mahjongg/data/Makefile.am b/gnome-mahjongg/data/Makefile.am
similarity index 64%
rename from mahjongg/data/Makefile.am
rename to gnome-mahjongg/data/Makefile.am
index 9f7eb0f..18a9bb7 100644
--- a/mahjongg/data/Makefile.am
+++ b/gnome-mahjongg/data/Makefile.am
@@ -1,22 +1,22 @@
 SUBDIRS = icons
 
-mapdir = $(datadir)/mahjongg/maps
+mapdir = $(datadir)/gnome-mahjongg/maps
 map_DATA = \
 	mahjongg.map
 
-themedir = $(datadir)/mahjongg/themes
+themedir = $(datadir)/gnome-mahjongg/themes
 theme_DATA = \
 	smooth.png	\
 	postmodern.svg
 
-gsettings_in_file = org.gnome.mahjongg.gschema.xml.in
+gsettings_in_file = org.gnome.gnome-mahjongg.gschema.xml.in
 gsettings_SCHEMAS = $(gsettings_in_file:.xml.in=.xml)
 @INTLTOOL_XML_NOMERGE_RULE@
 @GSETTINGS_RULES@
 
-man_MANS = mahjongg.6
+man_MANS = gnome-mahjongg.6
 
-desktop_in_files = mahjongg.desktop.in.in
+desktop_in_files = gnome-mahjongg.desktop.in.in
 desktopdir = $(datadir)/applications
 desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop)
 
@@ -33,9 +33,9 @@ DISTCLEANFILES = $(desktop_DATA) $(gsettings_SCHEMAS)
 install-scorefiles-local:
 	-$(mkinstalldirs) $(DESTDIR)$(scoredir)
 	-for i in easy difficult confounding pyramid tictactoe cloud dragon bridges ziggurat; do \
-		touch $(DESTDIR)$(scoredir)/mahjongg.$$i.scores; \
-		chown $(scores_user):$(scores_group) $(DESTDIR)$(scoredir)/mahjongg.$$i.scores; \
-		chmod 664 $(DESTDIR)$(scoredir)/mahjongg.$$i.scores; \
+		touch $(DESTDIR)$(scoredir)/gnome-mahjongg.$$i.scores; \
+		chown $(scores_user):$(scores_group) $(DESTDIR)$(scoredir)/gnome-mahjongg.$$i.scores; \
+		chmod 664 $(DESTDIR)$(scoredir)/gnome-mahjongg.$$i.scores; \
 	done
 
 install-data-local: install-scorefiles-local
diff --git a/mahjongg/data/mahjongg.6 b/gnome-mahjongg/data/gnome-mahjongg.6
similarity index 100%
rename from mahjongg/data/mahjongg.6
rename to gnome-mahjongg/data/gnome-mahjongg.6
diff --git a/mahjongg/data/mahjongg.desktop.in.in b/gnome-mahjongg/data/gnome-mahjongg.desktop.in.in
similarity index 89%
rename from mahjongg/data/mahjongg.desktop.in.in
rename to gnome-mahjongg/data/gnome-mahjongg.desktop.in.in
index 62f04fc..ea363a5 100644
--- a/mahjongg/data/mahjongg.desktop.in.in
+++ b/gnome-mahjongg/data/gnome-mahjongg.desktop.in.in
@@ -1,8 +1,8 @@
 [Desktop Entry]
 _Name=Mahjongg
 _Comment=Disassemble a pile of tiles by removing matching pairs
-Exec=mahjongg
-Icon=mahjongg
+Exec=gnome-mahjongg
+Icon=gnome-mahjongg
 Terminal=false
 Type=Application
 Categories=GNOME;GTK;Game;BoardGame;
diff --git a/mahjongg/data/icons/16x16/mahjongg.png b/gnome-mahjongg/data/icons/16x16/gnome-mahjongg.png
similarity index 100%
rename from mahjongg/data/icons/16x16/mahjongg.png
rename to gnome-mahjongg/data/icons/16x16/gnome-mahjongg.png
diff --git a/mahjongg/data/icons/22x22/mahjongg.png b/gnome-mahjongg/data/icons/22x22/gnome-mahjongg.png
similarity index 100%
rename from mahjongg/data/icons/22x22/mahjongg.png
rename to gnome-mahjongg/data/icons/22x22/gnome-mahjongg.png
diff --git a/mahjongg/data/icons/24x24/mahjongg.png b/gnome-mahjongg/data/icons/24x24/gnome-mahjongg.png
similarity index 100%
rename from mahjongg/data/icons/24x24/mahjongg.png
rename to gnome-mahjongg/data/icons/24x24/gnome-mahjongg.png
diff --git a/mahjongg/data/icons/32x32/mahjongg.png b/gnome-mahjongg/data/icons/32x32/gnome-mahjongg.png
similarity index 100%
rename from mahjongg/data/icons/32x32/mahjongg.png
rename to gnome-mahjongg/data/icons/32x32/gnome-mahjongg.png
diff --git a/mahjongg/data/icons/48x48/mahjongg.png b/gnome-mahjongg/data/icons/48x48/gnome-mahjongg.png
similarity index 100%
rename from mahjongg/data/icons/48x48/mahjongg.png
rename to gnome-mahjongg/data/icons/48x48/gnome-mahjongg.png
diff --git a/mahjongg/data/icons/Makefile.am b/gnome-mahjongg/data/icons/Makefile.am
similarity index 62%
rename from mahjongg/data/icons/Makefile.am
rename to gnome-mahjongg/data/icons/Makefile.am
index 11ea74c..0df66a9 100644
--- a/mahjongg/data/icons/Makefile.am
+++ b/gnome-mahjongg/data/icons/Makefile.am
@@ -5,11 +5,11 @@ icon32dir=$(datadir)/icons/hicolor/32x32/apps
 icon48dir=$(datadir)/icons/hicolor/48x48/apps
 iconscalabledir=$(datadir)/icons/hicolor/scalable/apps
 
-icon16_DATA = 16x16/mahjongg.png
-icon22_DATA = 22x22/mahjongg.png
-icon24_DATA = 24x24/mahjongg.png
-icon32_DATA = 32x32/mahjongg.png
-icon48_DATA = 48x48/mahjongg.png
-iconscalable_DATA = scalable/mahjongg.svg
+icon16_DATA = 16x16/gnome-mahjongg.png
+icon22_DATA = 22x22/gnome-mahjongg.png
+icon24_DATA = 24x24/gnome-mahjongg.png
+icon32_DATA = 32x32/gnome-mahjongg.png
+icon48_DATA = 48x48/gnome-mahjongg.png
+iconscalable_DATA = scalable/gnome-mahjongg.svg
 
 EXTRA_DIST = $(icon16_DATA) $(icon22_DATA) $(icon24_DATA) $(icon32_DATA) $(icon48_DATA) $(icon256_DATA) $(iconscalable_DATA)
diff --git a/mahjongg/data/icons/scalable/mahjongg.svg b/gnome-mahjongg/data/icons/scalable/gnome-mahjongg.svg
similarity index 100%
rename from mahjongg/data/icons/scalable/mahjongg.svg
rename to gnome-mahjongg/data/icons/scalable/gnome-mahjongg.svg
diff --git a/mahjongg/data/mahjongg.map b/gnome-mahjongg/data/mahjongg.map
similarity index 100%
rename from mahjongg/data/mahjongg.map
rename to gnome-mahjongg/data/mahjongg.map
diff --git a/mahjongg/data/org.gnome.mahjongg.gschema.xml.in b/gnome-mahjongg/data/org.gnome.gnome-mahjongg.gschema.xml.in
similarity index 77%
rename from mahjongg/data/org.gnome.mahjongg.gschema.xml.in
rename to gnome-mahjongg/data/org.gnome.gnome-mahjongg.gschema.xml.in
index 8d8cd80..9e924ec 100644
--- a/mahjongg/data/org.gnome.mahjongg.gschema.xml.in
+++ b/gnome-mahjongg/data/org.gnome.gnome-mahjongg.gschema.xml.in
@@ -1,5 +1,5 @@
 <schemalist>
-  <schema id="org.gnome.mahjongg" path="/org/gnome/mahjongg/" gettext-domain="gnome-games">
+  <schema id="org.gnome.gnome-mahjongg" path="/org/gnome/gnome-mahjongg/" gettext-domain="gnome-games">
 
     <key name="show-toolbar" type="b">
       <default>true</default>
diff --git a/mahjongg/data/postmodern.svg b/gnome-mahjongg/data/postmodern.svg
similarity index 100%
rename from mahjongg/data/postmodern.svg
rename to gnome-mahjongg/data/postmodern.svg
diff --git a/mahjongg/data/smooth.png b/gnome-mahjongg/data/smooth.png
similarity index 100%
rename from mahjongg/data/smooth.png
rename to gnome-mahjongg/data/smooth.png
diff --git a/mahjongg/data/translatable_game_names.h b/gnome-mahjongg/data/translatable_game_names.h
similarity index 100%
rename from mahjongg/data/translatable_game_names.h
rename to gnome-mahjongg/data/translatable_game_names.h
diff --git a/mahjongg/help/C/bug-filing.page b/gnome-mahjongg/help/C/bug-filing.page
similarity index 100%
rename from mahjongg/help/C/bug-filing.page
rename to gnome-mahjongg/help/C/bug-filing.page
diff --git a/mahjongg/help/C/choosing.page b/gnome-mahjongg/help/C/choosing.page
similarity index 100%
rename from mahjongg/help/C/choosing.page
rename to gnome-mahjongg/help/C/choosing.page
diff --git a/mahjongg/help/C/develop.page b/gnome-mahjongg/help/C/develop.page
similarity index 100%
rename from mahjongg/help/C/develop.page
rename to gnome-mahjongg/help/C/develop.page
diff --git a/mahjongg/help/C/documentation.page b/gnome-mahjongg/help/C/documentation.page
similarity index 100%
rename from mahjongg/help/C/documentation.page
rename to gnome-mahjongg/help/C/documentation.page
diff --git a/mahjongg/help/C/figures/hints-video.ogv b/gnome-mahjongg/help/C/figures/hints-video.ogv
similarity index 100%
rename from mahjongg/help/C/figures/hints-video.ogv
rename to gnome-mahjongg/help/C/figures/hints-video.ogv
diff --git a/mahjongg/help/C/figures/layout-bridges.png b/gnome-mahjongg/help/C/figures/layout-bridges.png
similarity index 100%
rename from mahjongg/help/C/figures/layout-bridges.png
rename to gnome-mahjongg/help/C/figures/layout-bridges.png
diff --git a/mahjongg/help/C/figures/layout-cloud.png b/gnome-mahjongg/help/C/figures/layout-cloud.png
similarity index 100%
rename from mahjongg/help/C/figures/layout-cloud.png
rename to gnome-mahjongg/help/C/figures/layout-cloud.png
diff --git a/mahjongg/help/C/figures/layout-conf-cross.png b/gnome-mahjongg/help/C/figures/layout-conf-cross.png
similarity index 100%
rename from mahjongg/help/C/figures/layout-conf-cross.png
rename to gnome-mahjongg/help/C/figures/layout-conf-cross.png
diff --git a/mahjongg/help/C/figures/layout-difficult.png b/gnome-mahjongg/help/C/figures/layout-difficult.png
similarity index 100%
rename from mahjongg/help/C/figures/layout-difficult.png
rename to gnome-mahjongg/help/C/figures/layout-difficult.png
diff --git a/mahjongg/help/C/figures/layout-easy.png b/gnome-mahjongg/help/C/figures/layout-easy.png
similarity index 100%
rename from mahjongg/help/C/figures/layout-easy.png
rename to gnome-mahjongg/help/C/figures/layout-easy.png
diff --git a/mahjongg/help/C/figures/layout-pyramid-walls.png b/gnome-mahjongg/help/C/figures/layout-pyramid-walls.png
similarity index 100%
rename from mahjongg/help/C/figures/layout-pyramid-walls.png
rename to gnome-mahjongg/help/C/figures/layout-pyramid-walls.png
diff --git a/mahjongg/help/C/figures/layout-red-dragon.png b/gnome-mahjongg/help/C/figures/layout-red-dragon.png
similarity index 100%
rename from mahjongg/help/C/figures/layout-red-dragon.png
rename to gnome-mahjongg/help/C/figures/layout-red-dragon.png
diff --git a/mahjongg/help/C/figures/layout-tic-tac-toe.png b/gnome-mahjongg/help/C/figures/layout-tic-tac-toe.png
similarity index 100%
rename from mahjongg/help/C/figures/layout-tic-tac-toe.png
rename to gnome-mahjongg/help/C/figures/layout-tic-tac-toe.png
diff --git a/mahjongg/help/C/figures/layout-ziggurat.png b/gnome-mahjongg/help/C/figures/layout-ziggurat.png
similarity index 100%
rename from mahjongg/help/C/figures/layout-ziggurat.png
rename to gnome-mahjongg/help/C/figures/layout-ziggurat.png
diff --git a/mahjongg/help/C/figures/logo.png b/gnome-mahjongg/help/C/figures/logo.png
similarity index 100%
rename from mahjongg/help/C/figures/logo.png
rename to gnome-mahjongg/help/C/figures/logo.png
diff --git a/mahjongg/help/C/figures/logo32.png b/gnome-mahjongg/help/C/figures/logo32.png
similarity index 100%
rename from mahjongg/help/C/figures/logo32.png
rename to gnome-mahjongg/help/C/figures/logo32.png
diff --git a/mahjongg/help/C/figures/mahjongg-video.ogv b/gnome-mahjongg/help/C/figures/mahjongg-video.ogv
similarity index 100%
rename from mahjongg/help/C/figures/mahjongg-video.ogv
rename to gnome-mahjongg/help/C/figures/mahjongg-video.ogv
diff --git a/mahjongg/help/C/figures/moves-left.png b/gnome-mahjongg/help/C/figures/moves-left.png
similarity index 100%
rename from mahjongg/help/C/figures/moves-left.png
rename to gnome-mahjongg/help/C/figures/moves-left.png
diff --git a/mahjongg/help/C/gameplay.page b/gnome-mahjongg/help/C/gameplay.page
similarity index 100%
rename from mahjongg/help/C/gameplay.page
rename to gnome-mahjongg/help/C/gameplay.page
diff --git a/mahjongg/help/C/hints.page b/gnome-mahjongg/help/C/hints.page
similarity index 100%
rename from mahjongg/help/C/hints.page
rename to gnome-mahjongg/help/C/hints.page
diff --git a/mahjongg/help/C/index.page b/gnome-mahjongg/help/C/index.page
similarity index 100%
rename from mahjongg/help/C/index.page
rename to gnome-mahjongg/help/C/index.page
diff --git a/mahjongg/help/C/legal.xml b/gnome-mahjongg/help/C/legal.xml
similarity index 100%
rename from mahjongg/help/C/legal.xml
rename to gnome-mahjongg/help/C/legal.xml
diff --git a/mahjongg/help/C/license.page b/gnome-mahjongg/help/C/license.page
similarity index 100%
rename from mahjongg/help/C/license.page
rename to gnome-mahjongg/help/C/license.page
diff --git a/mahjongg/help/C/map.page b/gnome-mahjongg/help/C/map.page
similarity index 100%
rename from mahjongg/help/C/map.page
rename to gnome-mahjongg/help/C/map.page
diff --git a/mahjongg/help/C/moves.page b/gnome-mahjongg/help/C/moves.page
similarity index 100%
rename from mahjongg/help/C/moves.page
rename to gnome-mahjongg/help/C/moves.page
diff --git a/mahjongg/help/C/pause.page b/gnome-mahjongg/help/C/pause.page
similarity index 100%
rename from mahjongg/help/C/pause.page
rename to gnome-mahjongg/help/C/pause.page
diff --git a/mahjongg/help/C/rules.page b/gnome-mahjongg/help/C/rules.page
similarity index 100%
rename from mahjongg/help/C/rules.page
rename to gnome-mahjongg/help/C/rules.page
diff --git a/mahjongg/help/C/scoring.page b/gnome-mahjongg/help/C/scoring.page
similarity index 100%
rename from mahjongg/help/C/scoring.page
rename to gnome-mahjongg/help/C/scoring.page
diff --git a/mahjongg/help/C/shortcuts.page b/gnome-mahjongg/help/C/shortcuts.page
similarity index 100%
rename from mahjongg/help/C/shortcuts.page
rename to gnome-mahjongg/help/C/shortcuts.page
diff --git a/mahjongg/help/C/strategy.page b/gnome-mahjongg/help/C/strategy.page
similarity index 100%
rename from mahjongg/help/C/strategy.page
rename to gnome-mahjongg/help/C/strategy.page
diff --git a/mahjongg/help/C/toolbar.page b/gnome-mahjongg/help/C/toolbar.page
similarity index 100%
rename from mahjongg/help/C/toolbar.page
rename to gnome-mahjongg/help/C/toolbar.page
diff --git a/mahjongg/help/C/translate.page b/gnome-mahjongg/help/C/translate.page
similarity index 100%
rename from mahjongg/help/C/translate.page
rename to gnome-mahjongg/help/C/translate.page
diff --git a/mahjongg/help/ChangeLog.old b/gnome-mahjongg/help/ChangeLog.old
similarity index 100%
rename from mahjongg/help/ChangeLog.old
rename to gnome-mahjongg/help/ChangeLog.old
diff --git a/mahjongg/help/Makefile.am b/gnome-mahjongg/help/Makefile.am
similarity index 97%
rename from mahjongg/help/Makefile.am
rename to gnome-mahjongg/help/Makefile.am
index 927b5fd..9d13fc3 100644
--- a/mahjongg/help/Makefile.am
+++ b/gnome-mahjongg/help/Makefile.am
@@ -1,5 +1,5 @@
 @YELP_HELP_RULES@
-HELP_ID = mahjongg
+HELP_ID = gnome-mahjongg
 
 HELP_MEDIA = \
 	figures/hints-video.ogv		\
diff --git a/mahjongg/help/ca/ca.po b/gnome-mahjongg/help/ca/ca.po
similarity index 100%
rename from mahjongg/help/ca/ca.po
rename to gnome-mahjongg/help/ca/ca.po
diff --git a/mahjongg/help/ca/figures/mahjongg.png b/gnome-mahjongg/help/ca/figures/mahjongg.png
similarity index 100%
rename from mahjongg/help/ca/figures/mahjongg.png
rename to gnome-mahjongg/help/ca/figures/mahjongg.png
diff --git a/mahjongg/help/ca/figures/no-move.png b/gnome-mahjongg/help/ca/figures/no-move.png
similarity index 100%
rename from mahjongg/help/ca/figures/no-move.png
rename to gnome-mahjongg/help/ca/figures/no-move.png
diff --git a/mahjongg/help/ca/figures/preferences.png b/gnome-mahjongg/help/ca/figures/preferences.png
similarity index 100%
rename from mahjongg/help/ca/figures/preferences.png
rename to gnome-mahjongg/help/ca/figures/preferences.png
diff --git a/mahjongg/help/ca/figures/toolbar.png b/gnome-mahjongg/help/ca/figures/toolbar.png
similarity index 100%
rename from mahjongg/help/ca/figures/toolbar.png
rename to gnome-mahjongg/help/ca/figures/toolbar.png
diff --git a/mahjongg/help/cs/cs.po b/gnome-mahjongg/help/cs/cs.po
similarity index 100%
rename from mahjongg/help/cs/cs.po
rename to gnome-mahjongg/help/cs/cs.po
diff --git a/mahjongg/help/cs/figures/mahjongg.png b/gnome-mahjongg/help/cs/figures/mahjongg.png
similarity index 100%
rename from mahjongg/help/cs/figures/mahjongg.png
rename to gnome-mahjongg/help/cs/figures/mahjongg.png
diff --git a/mahjongg/help/cs/figures/no-move.png b/gnome-mahjongg/help/cs/figures/no-move.png
similarity index 100%
rename from mahjongg/help/cs/figures/no-move.png
rename to gnome-mahjongg/help/cs/figures/no-move.png
diff --git a/mahjongg/help/cs/figures/preferences.png b/gnome-mahjongg/help/cs/figures/preferences.png
similarity index 100%
rename from mahjongg/help/cs/figures/preferences.png
rename to gnome-mahjongg/help/cs/figures/preferences.png
diff --git a/mahjongg/help/cs/figures/toolbar.png b/gnome-mahjongg/help/cs/figures/toolbar.png
similarity index 100%
rename from mahjongg/help/cs/figures/toolbar.png
rename to gnome-mahjongg/help/cs/figures/toolbar.png
diff --git a/mahjongg/help/da/da.po b/gnome-mahjongg/help/da/da.po
similarity index 100%
rename from mahjongg/help/da/da.po
rename to gnome-mahjongg/help/da/da.po
diff --git a/mahjongg/help/de/de.po b/gnome-mahjongg/help/de/de.po
similarity index 100%
rename from mahjongg/help/de/de.po
rename to gnome-mahjongg/help/de/de.po
diff --git a/mahjongg/help/de/figures/moves-left.png b/gnome-mahjongg/help/de/figures/moves-left.png
similarity index 100%
rename from mahjongg/help/de/figures/moves-left.png
rename to gnome-mahjongg/help/de/figures/moves-left.png
diff --git a/mahjongg/help/el/el.po b/gnome-mahjongg/help/el/el.po
similarity index 100%
rename from mahjongg/help/el/el.po
rename to gnome-mahjongg/help/el/el.po
diff --git a/mahjongg/help/el/figures/mahjongg.png b/gnome-mahjongg/help/el/figures/mahjongg.png
similarity index 100%
rename from mahjongg/help/el/figures/mahjongg.png
rename to gnome-mahjongg/help/el/figures/mahjongg.png
diff --git a/mahjongg/help/el/figures/preferences.png b/gnome-mahjongg/help/el/figures/preferences.png
similarity index 100%
rename from mahjongg/help/el/figures/preferences.png
rename to gnome-mahjongg/help/el/figures/preferences.png
diff --git a/mahjongg/help/el/figures/toolbar.png b/gnome-mahjongg/help/el/figures/toolbar.png
similarity index 100%
rename from mahjongg/help/el/figures/toolbar.png
rename to gnome-mahjongg/help/el/figures/toolbar.png
diff --git a/mahjongg/help/en_GB/en_GB.po b/gnome-mahjongg/help/en_GB/en_GB.po
similarity index 100%
rename from mahjongg/help/en_GB/en_GB.po
rename to gnome-mahjongg/help/en_GB/en_GB.po
diff --git a/mahjongg/help/es/es.po b/gnome-mahjongg/help/es/es.po
similarity index 100%
rename from mahjongg/help/es/es.po
rename to gnome-mahjongg/help/es/es.po
diff --git a/mahjongg/help/es/figures/mahjongg.png b/gnome-mahjongg/help/es/figures/mahjongg.png
similarity index 100%
rename from mahjongg/help/es/figures/mahjongg.png
rename to gnome-mahjongg/help/es/figures/mahjongg.png
diff --git a/mahjongg/help/es/figures/no-move.png b/gnome-mahjongg/help/es/figures/no-move.png
similarity index 100%
rename from mahjongg/help/es/figures/no-move.png
rename to gnome-mahjongg/help/es/figures/no-move.png
diff --git a/mahjongg/help/es/figures/preferences.png b/gnome-mahjongg/help/es/figures/preferences.png
similarity index 100%
rename from mahjongg/help/es/figures/preferences.png
rename to gnome-mahjongg/help/es/figures/preferences.png
diff --git a/mahjongg/help/es/figures/toolbar.png b/gnome-mahjongg/help/es/figures/toolbar.png
similarity index 100%
rename from mahjongg/help/es/figures/toolbar.png
rename to gnome-mahjongg/help/es/figures/toolbar.png
diff --git a/mahjongg/help/eu/eu.po b/gnome-mahjongg/help/eu/eu.po
similarity index 100%
rename from mahjongg/help/eu/eu.po
rename to gnome-mahjongg/help/eu/eu.po
diff --git a/mahjongg/help/eu/figures/mahjongg.png b/gnome-mahjongg/help/eu/figures/mahjongg.png
similarity index 100%
rename from mahjongg/help/eu/figures/mahjongg.png
rename to gnome-mahjongg/help/eu/figures/mahjongg.png
diff --git a/mahjongg/help/eu/figures/no-move.png b/gnome-mahjongg/help/eu/figures/no-move.png
similarity index 100%
rename from mahjongg/help/eu/figures/no-move.png
rename to gnome-mahjongg/help/eu/figures/no-move.png
diff --git a/mahjongg/help/eu/figures/preferences.png b/gnome-mahjongg/help/eu/figures/preferences.png
similarity index 100%
rename from mahjongg/help/eu/figures/preferences.png
rename to gnome-mahjongg/help/eu/figures/preferences.png
diff --git a/mahjongg/help/eu/figures/toolbar.png b/gnome-mahjongg/help/eu/figures/toolbar.png
similarity index 100%
rename from mahjongg/help/eu/figures/toolbar.png
rename to gnome-mahjongg/help/eu/figures/toolbar.png
diff --git a/mahjongg/help/fr/figures/mahjongg.png b/gnome-mahjongg/help/fr/figures/mahjongg.png
similarity index 100%
rename from mahjongg/help/fr/figures/mahjongg.png
rename to gnome-mahjongg/help/fr/figures/mahjongg.png
diff --git a/mahjongg/help/fr/figures/moves-left.png b/gnome-mahjongg/help/fr/figures/moves-left.png
similarity index 100%
rename from mahjongg/help/fr/figures/moves-left.png
rename to gnome-mahjongg/help/fr/figures/moves-left.png
diff --git a/mahjongg/help/fr/figures/no-move.png b/gnome-mahjongg/help/fr/figures/no-move.png
similarity index 100%
rename from mahjongg/help/fr/figures/no-move.png
rename to gnome-mahjongg/help/fr/figures/no-move.png
diff --git a/mahjongg/help/fr/figures/preferences.png b/gnome-mahjongg/help/fr/figures/preferences.png
similarity index 100%
rename from mahjongg/help/fr/figures/preferences.png
rename to gnome-mahjongg/help/fr/figures/preferences.png
diff --git a/mahjongg/help/fr/figures/toolbar.png b/gnome-mahjongg/help/fr/figures/toolbar.png
similarity index 100%
rename from mahjongg/help/fr/figures/toolbar.png
rename to gnome-mahjongg/help/fr/figures/toolbar.png
diff --git a/mahjongg/help/fr/fr.po b/gnome-mahjongg/help/fr/fr.po
similarity index 100%
rename from mahjongg/help/fr/fr.po
rename to gnome-mahjongg/help/fr/fr.po
diff --git a/mahjongg/help/it/figures/mahjongg.png b/gnome-mahjongg/help/it/figures/mahjongg.png
similarity index 100%
rename from mahjongg/help/it/figures/mahjongg.png
rename to gnome-mahjongg/help/it/figures/mahjongg.png
diff --git a/mahjongg/help/it/figures/no-move.png b/gnome-mahjongg/help/it/figures/no-move.png
similarity index 100%
rename from mahjongg/help/it/figures/no-move.png
rename to gnome-mahjongg/help/it/figures/no-move.png
diff --git a/mahjongg/help/it/figures/preferences.png b/gnome-mahjongg/help/it/figures/preferences.png
similarity index 100%
rename from mahjongg/help/it/figures/preferences.png
rename to gnome-mahjongg/help/it/figures/preferences.png
diff --git a/mahjongg/help/it/figures/toolbar.png b/gnome-mahjongg/help/it/figures/toolbar.png
similarity index 100%
rename from mahjongg/help/it/figures/toolbar.png
rename to gnome-mahjongg/help/it/figures/toolbar.png
diff --git a/mahjongg/help/it/it.po b/gnome-mahjongg/help/it/it.po
similarity index 100%
rename from mahjongg/help/it/it.po
rename to gnome-mahjongg/help/it/it.po
diff --git a/mahjongg/help/mahjongg.omf.in b/gnome-mahjongg/help/mahjongg.omf.in
similarity index 100%
rename from mahjongg/help/mahjongg.omf.in
rename to gnome-mahjongg/help/mahjongg.omf.in
diff --git a/mahjongg/help/oc/oc.po b/gnome-mahjongg/help/oc/oc.po
similarity index 100%
rename from mahjongg/help/oc/oc.po
rename to gnome-mahjongg/help/oc/oc.po
diff --git a/mahjongg/help/pl/figures/mahjongg.png b/gnome-mahjongg/help/pl/figures/mahjongg.png
similarity index 100%
rename from mahjongg/help/pl/figures/mahjongg.png
rename to gnome-mahjongg/help/pl/figures/mahjongg.png
diff --git a/mahjongg/help/pl/figures/no-move.png b/gnome-mahjongg/help/pl/figures/no-move.png
similarity index 100%
rename from mahjongg/help/pl/figures/no-move.png
rename to gnome-mahjongg/help/pl/figures/no-move.png
diff --git a/mahjongg/help/pl/figures/preferences.png b/gnome-mahjongg/help/pl/figures/preferences.png
similarity index 100%
rename from mahjongg/help/pl/figures/preferences.png
rename to gnome-mahjongg/help/pl/figures/preferences.png
diff --git a/mahjongg/help/pl/figures/toolbar.png b/gnome-mahjongg/help/pl/figures/toolbar.png
similarity index 100%
rename from mahjongg/help/pl/figures/toolbar.png
rename to gnome-mahjongg/help/pl/figures/toolbar.png
diff --git a/mahjongg/help/pl/pl.po b/gnome-mahjongg/help/pl/pl.po
similarity index 100%
rename from mahjongg/help/pl/pl.po
rename to gnome-mahjongg/help/pl/pl.po
diff --git a/mahjongg/help/ru/ru.po b/gnome-mahjongg/help/ru/ru.po
similarity index 100%
rename from mahjongg/help/ru/ru.po
rename to gnome-mahjongg/help/ru/ru.po
diff --git a/mahjongg/help/sl/sl.po b/gnome-mahjongg/help/sl/sl.po
similarity index 100%
rename from mahjongg/help/sl/sl.po
rename to gnome-mahjongg/help/sl/sl.po
diff --git a/mahjongg/help/sr/figures/mahjongg.png b/gnome-mahjongg/help/sr/figures/mahjongg.png
similarity index 100%
rename from mahjongg/help/sr/figures/mahjongg.png
rename to gnome-mahjongg/help/sr/figures/mahjongg.png
diff --git a/mahjongg/help/sr/figures/no-move.png b/gnome-mahjongg/help/sr/figures/no-move.png
similarity index 100%
rename from mahjongg/help/sr/figures/no-move.png
rename to gnome-mahjongg/help/sr/figures/no-move.png
diff --git a/mahjongg/help/sr/figures/preferences.png b/gnome-mahjongg/help/sr/figures/preferences.png
similarity index 100%
rename from mahjongg/help/sr/figures/preferences.png
rename to gnome-mahjongg/help/sr/figures/preferences.png
diff --git a/mahjongg/help/sr/figures/toolbar.png b/gnome-mahjongg/help/sr/figures/toolbar.png
similarity index 100%
rename from mahjongg/help/sr/figures/toolbar.png
rename to gnome-mahjongg/help/sr/figures/toolbar.png
diff --git a/mahjongg/help/sr/sr.po b/gnome-mahjongg/help/sr/sr.po
similarity index 100%
rename from mahjongg/help/sr/sr.po
rename to gnome-mahjongg/help/sr/sr.po
diff --git a/mahjongg/help/sr latin/figures/mahjongg.png b/gnome-mahjongg/help/sr latin/figures/mahjongg.png
similarity index 100%
rename from mahjongg/help/sr latin/figures/mahjongg.png
rename to gnome-mahjongg/help/sr latin/figures/mahjongg.png
diff --git a/mahjongg/help/sr latin/figures/no-move.png b/gnome-mahjongg/help/sr latin/figures/no-move.png
similarity index 100%
rename from mahjongg/help/sr latin/figures/no-move.png
rename to gnome-mahjongg/help/sr latin/figures/no-move.png
diff --git a/mahjongg/help/sr latin/figures/preferences.png b/gnome-mahjongg/help/sr latin/figures/preferences.png
similarity index 100%
rename from mahjongg/help/sr latin/figures/preferences.png
rename to gnome-mahjongg/help/sr latin/figures/preferences.png
diff --git a/mahjongg/help/sr latin/figures/toolbar.png b/gnome-mahjongg/help/sr latin/figures/toolbar.png
similarity index 100%
rename from mahjongg/help/sr latin/figures/toolbar.png
rename to gnome-mahjongg/help/sr latin/figures/toolbar.png
diff --git a/mahjongg/help/sr latin/sr latin po b/gnome-mahjongg/help/sr latin/sr latin po
similarity index 100%
rename from mahjongg/help/sr latin/sr latin po
rename to gnome-mahjongg/help/sr latin/sr latin po
diff --git a/mahjongg/help/sv/figures/mahjongg.png b/gnome-mahjongg/help/sv/figures/mahjongg.png
similarity index 100%
rename from mahjongg/help/sv/figures/mahjongg.png
rename to gnome-mahjongg/help/sv/figures/mahjongg.png
diff --git a/mahjongg/help/sv/figures/no-move.png b/gnome-mahjongg/help/sv/figures/no-move.png
similarity index 100%
rename from mahjongg/help/sv/figures/no-move.png
rename to gnome-mahjongg/help/sv/figures/no-move.png
diff --git a/mahjongg/help/sv/figures/preferences.png b/gnome-mahjongg/help/sv/figures/preferences.png
similarity index 100%
rename from mahjongg/help/sv/figures/preferences.png
rename to gnome-mahjongg/help/sv/figures/preferences.png
diff --git a/mahjongg/help/sv/figures/toolbar.png b/gnome-mahjongg/help/sv/figures/toolbar.png
similarity index 100%
rename from mahjongg/help/sv/figures/toolbar.png
rename to gnome-mahjongg/help/sv/figures/toolbar.png
diff --git a/mahjongg/help/sv/sv.po b/gnome-mahjongg/help/sv/sv.po
similarity index 100%
rename from mahjongg/help/sv/sv.po
rename to gnome-mahjongg/help/sv/sv.po
diff --git a/mahjongg/help/zh_CN/zh_CN.po b/gnome-mahjongg/help/zh_CN/zh_CN.po
similarity index 100%
rename from mahjongg/help/zh_CN/zh_CN.po
rename to gnome-mahjongg/help/zh_CN/zh_CN.po
diff --git a/mahjongg/src/Makefile.am b/gnome-mahjongg/src/Makefile.am
similarity index 66%
rename from mahjongg/src/Makefile.am
rename to gnome-mahjongg/src/Makefile.am
index afce347..cbaa1b2 100644
--- a/mahjongg/src/Makefile.am
+++ b/gnome-mahjongg/src/Makefile.am
@@ -1,29 +1,29 @@
-bin_PROGRAMS = mahjongg
+bin_PROGRAMS = gnome-mahjongg
 
-mahjongg_SOURCES = 	\
+gnome_mahjongg_SOURCES = 	\
 	config.vapi	\
 	fixes.vapi	\
 	game.vala	\
 	game-view.vala	\
-	mahjongg.vala	\
+	gnome-mahjongg.vala	\
 	map.vala
 
-mahjongg_VALAFLAGS = \
+gnome_mahjongg_VALAFLAGS = \
 	--pkg posix \
 	--pkg gtk+-3.0 \
 	--vapidir $(top_srcdir)/libgames-support \
 	--pkg GnomeGamesSupport-1.0
 
-mahjongg_CFLAGS = \
+gnome_mahjongg_CFLAGS = \
 	-I$(top_srcdir)/libgames-support \
 	-DVERSION=\"$(VERSION)\" \
 	-DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\" \
-	-DDATA_DIRECTORY=\"$(datadir)/mahjongg\" \
+	-DDATA_DIRECTORY=\"$(datadir)/gnome-mahjongg\" \
 	-DLOCALEDIR=\"$(datadir)/locale\" \
 	$(GTK_CFLAGS) \
 	$(RSVG_CFLAGS)
 
-mahjongg_LDADD = \
+gnome_mahjongg_LDADD = \
 	$(top_builddir)/libgames-support/libgames-support.la \
 	$(GTK_LIBS)	\
 	$(RSVG_LIBS) \
@@ -31,7 +31,7 @@ mahjongg_LDADD = \
 
 install-exec-hook:
 	-if test "$(setgid)" = "true"; then \
-	  chgrp $(scores_group) $(DESTDIR)$(bindir)/mahjongg && chmod 2555 $(DESTDIR)$(bindir)/mahjongg ;\
+	  chgrp $(scores_group) $(DESTDIR)$(bindir)/gnome-mahjongg && chmod 2555 $(DESTDIR)$(bindir)/gnome-mahjongg ;\
 	fi
 
 CLEANFILES = \
diff --git a/mahjongg/src/config.vapi b/gnome-mahjongg/src/config.vapi
similarity index 100%
rename from mahjongg/src/config.vapi
rename to gnome-mahjongg/src/config.vapi
diff --git a/mahjongg/src/fixes.vapi b/gnome-mahjongg/src/fixes.vapi
similarity index 100%
rename from mahjongg/src/fixes.vapi
rename to gnome-mahjongg/src/fixes.vapi
diff --git a/mahjongg/src/game-view.vala b/gnome-mahjongg/src/game-view.vala
similarity index 100%
rename from mahjongg/src/game-view.vala
rename to gnome-mahjongg/src/game-view.vala
diff --git a/mahjongg/src/game.vala b/gnome-mahjongg/src/game.vala
similarity index 100%
rename from mahjongg/src/game.vala
rename to gnome-mahjongg/src/game.vala
diff --git a/mahjongg/src/mahjongg.vala b/gnome-mahjongg/src/gnome-mahjongg.vala
similarity index 98%
rename from mahjongg/src/mahjongg.vala
rename to gnome-mahjongg/src/gnome-mahjongg.vala
index ad079f5..1800ffc 100644
--- a/mahjongg/src/mahjongg.vala
+++ b/gnome-mahjongg/src/gnome-mahjongg.vala
@@ -25,7 +25,7 @@ public class Mahjongg : Gtk.Application
 
     public Mahjongg ()
     {
-        Object (application_id: "org.gnome.mahjongg", flags: ApplicationFlags.FLAGS_NONE);
+        Object (application_id: "org.gnome.gnome-mahjongg", flags: ApplicationFlags.FLAGS_NONE);
 
         add_action_entries (action_entries, this);
     }
@@ -34,11 +34,11 @@ public class Mahjongg : Gtk.Application
     {
         base.startup ();
 
-        settings = new Settings ("org.gnome.mahjongg");
+        settings = new Settings ("org.gnome.gnome-mahjongg");
 
         load_maps ();
 
-        highscores = new GnomeGamesSupport.Scores ("mahjongg",
+        highscores = new GnomeGamesSupport.Scores ("gnome-mahjongg",
                                                    new GnomeGamesSupport.ScoresCategory[0],
                                                    null, null, 0,
                                                    GnomeGamesSupport.ScoreStyle.TIME_ASCENDING);
@@ -51,7 +51,7 @@ public class Mahjongg : Gtk.Application
         window = new Gtk.ApplicationWindow (this);
         window.title = _("Mahjongg");
         window.set_default_size (530, 440);
-        GnomeGamesSupport.settings_bind_window_state ("/org/gnome/mahjongg/", window);
+        GnomeGamesSupport.settings_bind_window_state ("/org/gnome/gnome-mahjongg/", window);
 
         var status_box = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 10);
 
@@ -543,7 +543,7 @@ public class Mahjongg : Gtk.Application
                                "artists", artists,
                                "documenters", documenters,
                                "translator-credits", _("translator-credits"),
-                               "logo-icon-name", "mahjongg",
+                               "logo-icon-name", "gnome-mahjongg",
                                "website", "http://www.gnome.org/projects/gnome-games";,
                                "website-label", _("GNOME Games web site"),
                                null);
@@ -647,7 +647,7 @@ public class Mahjongg : Gtk.Application
     {
         try
         {
-            Gtk.show_uri (window.get_screen (), "help:mahjongg", Gtk.get_current_event_time ());
+            Gtk.show_uri (window.get_screen (), "help:gnome-mahjongg", Gtk.get_current_event_time ());
         }
         catch (Error e)
         {
@@ -775,7 +775,7 @@ public class Mahjongg : Gtk.Application
         GnomeGamesSupport.stock_init ();
 
         Environment.set_application_name (_("Mahjongg"));
-        Gtk.Window.set_default_icon_name ("mahjongg");
+        Gtk.Window.set_default_icon_name ("gnome-mahjongg");
 
         var app = new Mahjongg ();
         var result = app.run ();
diff --git a/mahjongg/src/map.vala b/gnome-mahjongg/src/map.vala
similarity index 100%
rename from mahjongg/src/map.vala
rename to gnome-mahjongg/src/map.vala
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 591616a..f04c088 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -112,13 +112,13 @@ lightsoff/src/game-view.vala
 lightsoff/src/led-array.vala
 lightsoff/src/lightsoff.vala
 lightsoff/src/puzzle-generator.vala
-mahjongg/data/mahjongg.desktop.in.in
-mahjongg/data/org.gnome.mahjongg.gschema.xml.in
-mahjongg/data/translatable_game_names.h
-mahjongg/src/game.vala
-mahjongg/src/game-view.vala
-mahjongg/src/mahjongg.vala
-mahjongg/src/map.vala
+gnome-mahjongg/data/gnome-mahjongg.desktop.in.in
+gnome-mahjongg/data/org.gnome.gnome-mahjongg.gschema.xml.in
+gnome-mahjongg/data/translatable_game_names.h
+gnome-mahjongg/src/game.vala
+gnome-mahjongg/src/game-view.vala
+gnome-mahjongg/src/gnome-mahjongg.vala
+gnome-mahjongg/src/map.vala
 quadrapassel/data/org.gnome.quadrapassel.gschema.xml.in
 quadrapassel/data/quadrapassel.desktop.in.in
 quadrapassel/src/game.vala
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index a8fbf8e..27a8790 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -45,11 +45,11 @@ lightsoff/src/game-view.c
 lightsoff/src/led-array.c
 lightsoff/src/lightsoff.c
 lightsoff/src/puzzle-generator.c
-mahjongg/data/mahjongg.desktop.in
-mahjongg/src/game.c
-mahjongg/src/game-view.c
-mahjongg/src/mahjongg.c
-mahjongg/src/map.c
+gnome-mahjongg/data/gnome-mahjongg.desktop.in
+gnome-mahjongg/src/game.c
+gnome-mahjongg/src/game-view.c
+gnome-mahjongg/src/gnome-mahjongg.c
+gnome-mahjongg/src/map.c
 quadrapassel/data/quadrapassel.desktop.in
 quadrapassel/src/game.c
 quadrapassel/src/game-view.c



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]