r35120 - /desktop/unstable/gnome-games/debian/patches/02_swell-foop-datadir.patch

biebl at users.alioth.debian.org biebl at users.alioth.debian.org
Wed May 23 05:33:34 UTC 2012 

Author: biebl
Date: Wed May 23 05:33:34 2012
New Revision: 35120

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=35120
Log:
Refresh patch to apply without fuzz

Modified:
    desktop/unstable/gnome-games/debian/patches/02_swell-foop-datadir.patch

Modified: 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=35120&op=diff
==============================================================================
--- desktop/unstable/gnome-games/debian/patches/02_swell-foop-datadir.patch [utf-8] (original)
+++ desktop/unstable/gnome-games/debian/patches/02_swell-foop-datadir.patch [utf-8] Wed May 23 05:33:34 2012
@@ -4,11 +4,11 @@
 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)
+Index: gnome-games-3.4.2/swell-foop/data/Makefile.am
+===================================================================
+--- gnome-games-3.4.2.orig/swell-foop/data/Makefile.am	2012-05-23 07:32:31.627967707 +0200
++++ gnome-games-3.4.2/swell-foop/data/Makefile.am	2012-05-23 07:32:34.119967618 +0200
+@@ -5,7 +5,7 @@
  @INTLTOOL_XML_NOMERGE_RULE@
  @GSETTINGS_RULES@
  
@@ -17,31 +17,31 @@
  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
+Index: gnome-games-3.4.2/swell-foop/data/themes/colors/Makefile.am
+===================================================================
+--- gnome-games-3.4.2.orig/swell-foop/data/themes/colors/Makefile.am	2012-05-23 07:32:31.627967707 +0200
++++ gnome-games-3.4.2/swell-foop/data/themes/colors/Makefile.am	2012-05-23 07:32:34.119967618 +0200
 @@ -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
+Index: gnome-games-3.4.2/swell-foop/data/themes/shapesandcolors/Makefile.am
+===================================================================
+--- gnome-games-3.4.2.orig/swell-foop/data/themes/shapesandcolors/Makefile.am	2012-05-23 07:32:31.627967707 +0200
++++ gnome-games-3.4.2/swell-foop/data/themes/shapesandcolors/Makefile.am	2012-05-23 07:32:34.119967618 +0200
 @@ -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 = \
+Index: gnome-games-3.4.2/swell-foop/src/Makefile.am
+===================================================================
+--- gnome-games-3.4.2.orig/swell-foop/src/Makefile.am	2012-05-23 07:32:31.627967707 +0200
++++ gnome-games-3.4.2/swell-foop/src/Makefile.am	2012-05-23 07:32:34.119967618 +0200
+@@ -17,8 +17,8 @@
  	-I$(top_srcdir)/libgames-support \
  	-DVERSION=\"$(VERSION)\" \
  	-DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\" \
@@ -52,21 +52,21 @@
  	$(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
+Index: gnome-games-3.4.2/swell-foop/src/config.vapi
+===================================================================
+--- gnome-games-3.4.2.orig/swell-foop/src/config.vapi	2012-05-23 07:32:31.627967707 +0200
++++ gnome-games-3.4.2/swell-foop/src/config.vapi	2012-05-23 07:32:34.119967618 +0200
 @@ -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
+Index: gnome-games-3.4.2/swell-foop/src/game-view.vala
+===================================================================
+--- gnome-games-3.4.2.orig/swell-foop/src/game-view.vala	2012-05-23 07:32:31.627967707 +0200
++++ gnome-games-3.4.2/swell-foop/src/game-view.vala	2012-05-23 07:32:34.119967618 +0200
+@@ -245,7 +245,7 @@
          try
          {
              for (int i = 0; i < 4; i++)
@@ -75,11 +75,11 @@
          }
          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
+Index: gnome-games-3.4.2/swell-foop/src/swell-foop.vala
+===================================================================
+--- gnome-games-3.4.2.orig/swell-foop/src/swell-foop.vala	2012-05-23 07:32:31.627967707 +0200
++++ gnome-games-3.4.2/swell-foop/src/swell-foop.vala	2012-05-23 07:32:34.119967618 +0200
+@@ -229,7 +229,7 @@
          var preferences_builder = new Gtk.Builder ();
          try
          {
@@ -88,5 +88,3 @@
          }
          catch (Error e)
          {
---
-cgit v0.9.0.2

More information about the pkg-gnome-commits mailing list