r35117 - in /desktop/unstable/gnome-games/debian: changelog gnotravex.install patches/02_swell-foop-datadir.patch patches/series swell-foop.install

biebl at users.alioth.debian.org biebl at users.alioth.debian.org
Wed May 23 05:29:46 UTC 2012 

Author: biebl
Date: Wed May 23 05:29:43 2012
New Revision: 35117

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=35117
Log:
* debian/patches/02_swell-foop-datadir.patch: Install data files into
  /usr/share/swell-foop not /usr/share/gnome-games and use the correct path
  for the gettext translations. Patch cherry-picked from upstream Git.
* debian/swell-foop.install: Update accordingly.

Added:
    desktop/unstable/gnome-games/debian/patches/02_swell-foop-datadir.patch
Modified:
    desktop/unstable/gnome-games/debian/changelog
    desktop/unstable/gnome-games/debian/gnotravex.install
    desktop/unstable/gnome-games/debian/patches/series
    desktop/unstable/gnome-games/debian/swell-foop.install

Modified: desktop/unstable/gnome-games/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-games/debian/changelog?rev=35117&op=diff
==============================================================================
--- desktop/unstable/gnome-games/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-games/debian/changelog [utf-8] Wed May 23 05:29:43 2012
@@ -1,3 +1,12 @@
+gnome-games (1:3.4.2-2) UNRELEASED; urgency=low
+
+  * debian/patches/02_swell-foop-datadir.patch: Install data files into
+    /usr/share/swell-foop not /usr/share/gnome-games and use the correct path
+    for the gettext translations. Patch cherry-picked from upstream Git.
+  * debian/swell-foop.install: Update accordingly.
+
+ -- Michael Biebl <biebl at debian.org>  Wed, 23 May 2012 07:25:58 +0200
+
 gnome-games (1:3.4.2-1) unstable; urgency=low
 
   [ Jeremy Bicha ]

Modified: desktop/unstable/gnome-games/debian/gnotravex.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-games/debian/gnotravex.install?rev=35117&op=diff
==============================================================================
--- desktop/unstable/gnome-games/debian/gnotravex.install [utf-8] (original)
+++ desktop/unstable/gnome-games/debian/gnotravex.install [utf-8] Wed May 23 05:29:43 2012
@@ -1,6 +1,6 @@
 usr/games/gnotravex
+usr/share/gnotravex
 usr/share/applications/gnotravex.desktop
-usr/share/gnotravex
 usr/share/help/*/gnotravex
 usr/share/icons/hicolor/*/*/gnotravex.*
 usr/share/man/man6/gnotravex.6

Added: desktop/unstable/gnome-games/debian/patches/02_swell-foop-datadir.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-games/debian/patches/02_swell-foop-datadir.patch?rev=35117&op=file
==============================================================================
--- desktop/unstable/gnome-games/debian/patches/02_swell-foop-datadir.patch (added)
+++ desktop/unstable/gnome-games/debian/patches/02_swell-foop-datadir.patch [utf-8] Wed May 23 05:29:43 2012
@@ -1,0 +1,92 @@
+From 4b1819b285ed3e6b8ddae2acde20e349405a8c6e Mon Sep 17 00:00:00 2001
+From: Robert Ancell <robert.ancell at canonical.com>
+Date: Fri, 04 May 2012 01:45:37 +0000
+Subject: swell-foop: Install into /usr/share/swell-foop not /usr/share/gnome-games
+
+---
+diff --git a/swell-foop/data/Makefile.am b/swell-foop/data/Makefile.am
+index 29d2d0a..9245e58 100644
+--- a/swell-foop/data/Makefile.am
++++ b/swell-foop/data/Makefile.am
+@@ -5,7 +5,7 @@ gsettings_SCHEMAS = $(gsettings_in_file:.xml.in=.xml)
+ @INTLTOOL_XML_NOMERGE_RULE@
+ @GSETTINGS_RULES@
+ 
+-swelldir=$(pkgdatadir)/swell-foop
++swelldir=$(datadir)/swell-foop
+ swell_DATA = \
+     preferences.ui
+ 
+diff --git a/swell-foop/data/themes/colors/Makefile.am b/swell-foop/data/themes/colors/Makefile.am
+index 16467bf..c6532ed 100644
+--- a/swell-foop/data/themes/colors/Makefile.am
++++ b/swell-foop/data/themes/colors/Makefile.am
+@@ -1,4 +1,4 @@
+-themedir = $(pkgdatadir)/swell-foop/themes/colors
++themedir = $(datadir)/swell-foop/themes/colors
+ theme_DATA = \
+ 	bkg.svg \
+ 	blue.svg \
+diff --git a/swell-foop/data/themes/shapesandcolors/Makefile.am b/swell-foop/data/themes/shapesandcolors/Makefile.am
+index ca7c22e..96c42f8 100644
+--- a/swell-foop/data/themes/shapesandcolors/Makefile.am
++++ b/swell-foop/data/themes/shapesandcolors/Makefile.am
+@@ -1,4 +1,4 @@
+-themedir = $(pkgdatadir)/swell-foop/themes/shapesandcolors
++themedir = $(datadir)/swell-foop/themes/shapesandcolors
+ theme_DATA = \
+ 	bkg.svg \
+ 	blue.svg \
+diff --git a/swell-foop/src/Makefile.am b/swell-foop/src/Makefile.am
+index a81e180..fc6890d 100644
+--- a/swell-foop/src/Makefile.am
++++ b/swell-foop/src/Makefile.am
+@@ -17,8 +17,8 @@ swell_foop_CFLAGS = \
+ 	-I$(top_srcdir)/libgames-support \
+ 	-DVERSION=\"$(VERSION)\" \
+ 	-DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\" \
+-	-DPKGDATADIR=\""$(pkgdatadir)/swell-foop"\" \
+-	-DLOCALEDIR=\"$(pkgdatadir)/locale\" \
++	-DDATADIR=\""$(datadir)/swell-foop"\" \
++	-DLOCALEDIR=\"$(datadir)/locale\" \
+ 	$(GHTREAD_CFLAGS) \
+ 	$(GMODULE_CFLAGS) \
+ 	$(GTK_CFLAGS) \
+diff --git a/swell-foop/src/config.vapi b/swell-foop/src/config.vapi
+index a1787ca..9116fad 100644
+--- a/swell-foop/src/config.vapi
++++ b/swell-foop/src/config.vapi
+@@ -1,4 +1,4 @@
+-public const string PKGDATADIR;
++public const string DATADIR;
+ public const string LOCALEDIR;
+ public const string GETTEXT_PACKAGE;
+ public const string VERSION;
+diff --git a/swell-foop/src/game-view.vala b/swell-foop/src/game-view.vala
+index d1f5fb5..3c87964 100644
+--- a/swell-foop/src/game-view.vala
++++ b/swell-foop/src/game-view.vala
+@@ -245,7 +245,7 @@ public class Theme
+         try
+         {
+             for (int i = 0; i < 4; i++)
+-                textures[i] = new Clutter.Texture.from_file (Path.build_filename (PKGDATADIR, "themes", name, colors[i] + ".svg"));
++                textures[i] = new Clutter.Texture.from_file (Path.build_filename (DATADIR, "themes", name, colors[i] + ".svg"));
+         }
+         catch (Clutter.TextureError e)
+         {
+diff --git a/swell-foop/src/swell-foop.vala b/swell-foop/src/swell-foop.vala
+index 4e2b9ae..efb0207 100644
+--- a/swell-foop/src/swell-foop.vala
++++ b/swell-foop/src/swell-foop.vala
+@@ -227,7 +227,7 @@ public class SwellFoop : Gtk.Application
+         var preferences_builder = new Gtk.Builder ();
+         try
+         {
+-            preferences_builder.add_from_file (Path.build_filename (PKGDATADIR, "preferences.ui", null));
++            preferences_builder.add_from_file (Path.build_filename (DATADIR, "preferences.ui", null));
+         }
+         catch (Error e)
+         {
+--
+cgit v0.9.0.2

Modified: desktop/unstable/gnome-games/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-games/debian/patches/series?rev=35117&op=diff
==============================================================================
--- desktop/unstable/gnome-games/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gnome-games/debian/patches/series [utf-8] Wed May 23 05:29:43 2012
@@ -1,2 +1,3 @@
 01_swell-foop-setgid.patch
+02_swell-foop-datadir.patch
 91_fix-gnuchess6-compatibility.patch

Modified: desktop/unstable/gnome-games/debian/swell-foop.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-games/debian/swell-foop.install?rev=35117&op=diff
==============================================================================
--- desktop/unstable/gnome-games/debian/swell-foop.install [utf-8] (original)
+++ desktop/unstable/gnome-games/debian/swell-foop.install [utf-8] Wed May 23 05:29:43 2012
@@ -1,5 +1,5 @@
 usr/games/swell-foop
-usr/share/gnome-games/swell-foop
+usr/share/swell-foop
 usr/share/applications/swell-foop.desktop
 usr/share/help/*/swell-foop
 usr/share/icons/hicolor/*/apps/swell-foop.*

More information about the pkg-gnome-commits mailing list