Remove renaming information from patches since patch-2.7 now interprets it, while patch-2.6 doesn't (bug #435494, thanks to Juergen Rose and Jonathan Callen).

(Portage version: 2.2.0_alpha128/cvs/Linux x86_64)

3 files changed, 8 insertions, 46 deletions

diff --git a/gnome-extra/libgda/ChangeLog b/gnome-extra/libgda/ChangeLog
index 8db927c316d1..9593687fb056 100644
--- a/gnome-extra/libgda/ChangeLog
+++ b/gnome-extra/libgda/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-extra/libgda
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/ChangeLog,v 1.205 2012/07/15 19:02:25 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/ChangeLog,v 1.206 2012/09/20 07:35:36 tetromino Exp $
+
+  20 Sep 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  files/libgda-4.99.1-control-center-icon-collision.patch,
+  files/libgda-4.99.1-gda-browser-doc-collision.patch:
+  Remove renaming information from patches since patch-2.7 now interprets it,
+  while patch-2.6 doesn't (bug #435494, thanks to Juergen Rose and Jonathan
+  Callen).
 
   15 Jul 2012; Raúl Porcel <armin76@gentoo.org> libgda-4.2.12.ebuild,
   libgda-5.0.3-r1.ebuild:
diff --git a/gnome-extra/libgda/files/libgda-4.99.1-control-center-icon-collision.patch b/gnome-extra/libgda/files/libgda-4.99.1-control-center-icon-collision.patch
index 06166e6e6e07..fe814a730490 100644
--- a/gnome-extra/libgda/files/libgda-4.99.1-control-center-icon-collision.patch
+++ b/gnome-extra/libgda/files/libgda-4.99.1-control-center-icon-collision.patch
@@ -13,12 +13,6 @@ Subject: [PATCH] Prevent file collision with gda-control-center-4.0's icons
  ... hicolor_apps_48x48_gda-control-center-5.0.png} |  Bin 3144 -> 3144 bytes
  control-center/gda-control-center-5.0.desktop.in   |    2 +-
  8 files changed, 7 insertions(+), 7 deletions(-)
- rename control-center/data/{hicolor_apps_16x16_gda-control-center.png => hicolor_apps_16x16_gda-control-center-5.0.png} (100%)
- rename control-center/data/{hicolor_apps_22x22_gda-control-center.png => hicolor_apps_22x22_gda-control-center-5.0.png} (100%)
- rename control-center/data/{hicolor_apps_24x24_gda-control-center.png => hicolor_apps_24x24_gda-control-center-5.0.png} (100%)
- rename control-center/data/{hicolor_apps_256x256_gda-control-center.png => hicolor_apps_256x256_gda-control-center-5.0.png} (100%)
- rename control-center/data/{hicolor_apps_32x32_gda-control-center.png => hicolor_apps_32x32_gda-control-center-5.0.png} (100%)
- rename control-center/data/{hicolor_apps_48x48_gda-control-center.png => hicolor_apps_48x48_gda-control-center-5.0.png} (100%)
 
 diff --git a/control-center/data/Makefile.am b/control-center/data/Makefile.am
 index 03fa362..862ec88 100644
@@ -43,30 +37,6 @@ index 03fa362..862ec88 100644
  	$(NULL)
  
  private_icons = \
-diff --git a/control-center/data/hicolor_apps_16x16_gda-control-center.png b/control-center/data/hicolor_apps_16x16_gda-control-center-5.0.png
-similarity index 100%
-rename from control-center/data/hicolor_apps_16x16_gda-control-center.png
-rename to control-center/data/hicolor_apps_16x16_gda-control-center-5.0.png
-diff --git a/control-center/data/hicolor_apps_22x22_gda-control-center.png b/control-center/data/hicolor_apps_22x22_gda-control-center-5.0.png
-similarity index 100%
-rename from control-center/data/hicolor_apps_22x22_gda-control-center.png
-rename to control-center/data/hicolor_apps_22x22_gda-control-center-5.0.png
-diff --git a/control-center/data/hicolor_apps_24x24_gda-control-center.png b/control-center/data/hicolor_apps_24x24_gda-control-center-5.0.png
-similarity index 100%
-rename from control-center/data/hicolor_apps_24x24_gda-control-center.png
-rename to control-center/data/hicolor_apps_24x24_gda-control-center-5.0.png
-diff --git a/control-center/data/hicolor_apps_256x256_gda-control-center.png b/control-center/data/hicolor_apps_256x256_gda-control-center-5.0.png
-similarity index 100%
-rename from control-center/data/hicolor_apps_256x256_gda-control-center.png
-rename to control-center/data/hicolor_apps_256x256_gda-control-center-5.0.png
-diff --git a/control-center/data/hicolor_apps_32x32_gda-control-center.png b/control-center/data/hicolor_apps_32x32_gda-control-center-5.0.png
-similarity index 100%
-rename from control-center/data/hicolor_apps_32x32_gda-control-center.png
-rename to control-center/data/hicolor_apps_32x32_gda-control-center-5.0.png
-diff --git a/control-center/data/hicolor_apps_48x48_gda-control-center.png b/control-center/data/hicolor_apps_48x48_gda-control-center-5.0.png
-similarity index 100%
-rename from control-center/data/hicolor_apps_48x48_gda-control-center.png
-rename to control-center/data/hicolor_apps_48x48_gda-control-center-5.0.png
 diff --git a/control-center/gda-control-center-5.0.desktop.in b/control-center/gda-control-center-5.0.desktop.in
 index 6fd5b58..429787d 100644
 --- a/control-center/gda-control-center-5.0.desktop.in
diff --git a/gnome-extra/libgda/files/libgda-4.99.1-gda-browser-doc-collision.patch b/gnome-extra/libgda/files/libgda-4.99.1-gda-browser-doc-collision.patch
index 9616a42d7ae3..2fd31ab7d1de 100644
--- a/gnome-extra/libgda/files/libgda-4.99.1-gda-browser-doc-collision.patch
+++ b/gnome-extra/libgda/files/libgda-4.99.1-gda-browser-doc-collision.patch
@@ -9,9 +9,6 @@ Subject: [PATCH] Prevent file collision with gda-browser-4.0's gtk-doc files
  ...r-sections.txt => gda-browser-5.0-sections.txt} |    0
  .../{gda-browser.types => gda-browser-5.0.types}   |    0
  4 files changed, 1 insertions(+), 1 deletions(-)
- rename tools/browser/doc/{gda-browser-docs.sgml => gda-browser-5.0-docs.sgml} (100%)
- rename tools/browser/doc/{gda-browser-sections.txt => gda-browser-5.0-sections.txt} (100%)
- rename tools/browser/doc/{gda-browser.types => gda-browser-5.0.types} (100%)
 
 diff --git a/tools/browser/doc/Makefile.am b/tools/browser/doc/Makefile.am
 index 971fa79..cf6637a 100644
@@ -26,18 +23,6 @@ index 971fa79..cf6637a 100644
  
  # The top-level SGML file.
  DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml
-diff --git a/tools/browser/doc/gda-browser-docs.sgml b/tools/browser/doc/gda-browser-5.0-docs.sgml
-similarity index 100%
-rename from tools/browser/doc/gda-browser-docs.sgml
-rename to tools/browser/doc/gda-browser-5.0-docs.sgml
-diff --git a/tools/browser/doc/gda-browser-sections.txt b/tools/browser/doc/gda-browser-5.0-sections.txt
-similarity index 100%
-rename from tools/browser/doc/gda-browser-sections.txt
-rename to tools/browser/doc/gda-browser-5.0-sections.txt
-diff --git a/tools/browser/doc/gda-browser.types b/tools/browser/doc/gda-browser-5.0.types
-similarity index 100%
-rename from tools/browser/doc/gda-browser.types
-rename to tools/browser/doc/gda-browser-5.0.types
 -- 
 1.7.5.3