From 6dd067829455bf562dc5bf8ee61e133703470c3abce18706c845cc5379b14c40 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Sat, 7 Sep 2013 22:17:46 +0000 Subject: [PATCH] Accepting request 197875 from home:dimstar:branches:GNOME:Factory - Rebase opensuse-bookmarks.patch and sled-bookmarks.patch against epiphany 3.9.90. - Rebase opensuse-bookmarks.patch and sled-bookmarks.patch against epiphany 3.9.90. OBS-URL: https://build.opensuse.org/request/show/197875 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/epiphany-branding-openSUSE?expand=0&rev=34 --- epiphany-branding-SLED.changes | 6 ++++++ epiphany-branding-SLED.spec | 4 ++-- epiphany-branding-openSUSE.changes | 6 ++++++ epiphany-branding-openSUSE.spec | 4 ++-- epiphany-branding.changes.in | 6 ++++++ epiphany-branding.spec.in | 2 +- opensuse-bookmarks.patch | 28 +++++++++++++++------------- sled-bookmarks.patch | 16 +++++++++------- 8 files changed, 47 insertions(+), 25 deletions(-) diff --git a/epiphany-branding-SLED.changes b/epiphany-branding-SLED.changes index 0292bd1..22c2aa8 100644 --- a/epiphany-branding-SLED.changes +++ b/epiphany-branding-SLED.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Sep 7 21:47:22 UTC 2013 - dimstar@opensuse.org + +- Rebase opensuse-bookmarks.patch and sled-bookmarks.patch against + epiphany 3.9.90. + ------------------------------------------------------------------- Wed May 23 07:43:47 UTC 2012 - vuntz@opensuse.org diff --git a/epiphany-branding-SLED.spec b/epiphany-branding-SLED.spec index 26d7513..019116e 100644 --- a/epiphany-branding-SLED.spec +++ b/epiphany-branding-SLED.spec @@ -1,7 +1,7 @@ # # spec file for package epiphany-branding-SLED # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -33,7 +33,7 @@ Source1: branding.conf.in Patch0: opensuse-bookmarks.patch # PATCH-FEATURE-SLED sled-bookmarks.patch vuntz@novell.com -- Add SLED bookmarks Patch1: sled-bookmarks.patch -BuildRequires: epiphany +BuildRequires: epiphany >= 3.9.90 # To be in sync with upstream defaults, do branding as a patch for upstream file. # WARNING: As this package conflicts with epiphany-branding-SLED, you cannot # reuse build root. You have to build in a clean build root every time! diff --git a/epiphany-branding-openSUSE.changes b/epiphany-branding-openSUSE.changes index 0292bd1..22c2aa8 100644 --- a/epiphany-branding-openSUSE.changes +++ b/epiphany-branding-openSUSE.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Sep 7 21:47:22 UTC 2013 - dimstar@opensuse.org + +- Rebase opensuse-bookmarks.patch and sled-bookmarks.patch against + epiphany 3.9.90. + ------------------------------------------------------------------- Wed May 23 07:43:47 UTC 2012 - vuntz@opensuse.org diff --git a/epiphany-branding-openSUSE.spec b/epiphany-branding-openSUSE.spec index 6d76870..8eaab83 100644 --- a/epiphany-branding-openSUSE.spec +++ b/epiphany-branding-openSUSE.spec @@ -1,7 +1,7 @@ # # spec file for package epiphany-branding-openSUSE # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -33,7 +33,7 @@ Source1: branding.conf.in Patch0: opensuse-bookmarks.patch # PATCH-FEATURE-SLED sled-bookmarks.patch vuntz@novell.com -- Add SLED bookmarks Patch1: sled-bookmarks.patch -BuildRequires: epiphany +BuildRequires: epiphany >= 3.9.90 # To be in sync with upstream defaults, do branding as a patch for upstream file. # WARNING: As this package conflicts with epiphany-branding-openSUSE, you cannot # reuse build root. You have to build in a clean build root every time! diff --git a/epiphany-branding.changes.in b/epiphany-branding.changes.in index 0292bd1..22c2aa8 100644 --- a/epiphany-branding.changes.in +++ b/epiphany-branding.changes.in @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Sep 7 21:47:22 UTC 2013 - dimstar@opensuse.org + +- Rebase opensuse-bookmarks.patch and sled-bookmarks.patch against + epiphany 3.9.90. + ------------------------------------------------------------------- Wed May 23 07:43:47 UTC 2012 - vuntz@opensuse.org diff --git a/epiphany-branding.spec.in b/epiphany-branding.spec.in index fb72ce3..a200566 100644 --- a/epiphany-branding.spec.in +++ b/epiphany-branding.spec.in @@ -32,7 +32,7 @@ Source1: branding.conf.in Patch0: opensuse-bookmarks.patch # PATCH-FEATURE-SLED sled-bookmarks.patch vuntz@novell.com -- Add SLED bookmarks Patch1: sled-bookmarks.patch -BuildRequires: epiphany +BuildRequires: epiphany >= 3.9.90 # To be in sync with upstream defaults, do branding as a patch for upstream file. # WARNING: As this package conflicts with epiphany-branding-%{branding_name}, you cannot # reuse build root. You have to build in a clean build root every time! diff --git a/opensuse-bookmarks.patch b/opensuse-bookmarks.patch index ea29bc4..1df66fc 100644 --- a/opensuse-bookmarks.patch +++ b/opensuse-bookmarks.patch @@ -1,25 +1,27 @@ ---- default-bookmarks.rdf.old 2009-08-10 22:29:20.000000000 +0200 -+++ default-bookmarks.rdf 2009-08-13 14:52:57.000000000 +0200 -@@ -6,6 +6,13 @@ +--- default-bookmarks.rdf.orig 2013-09-07 23:22:27.455672063 +0200 ++++ default-bookmarks.rdf 2013-09-07 23:44:49.092161676 +0200 +@@ -5,7 +5,14 @@ + http://www.gnome.org/projects/epiphany/ - -+ -+ -+ -+ -+ -+ -+ +- ++ ++ ++ ++ ++ ++ ++ ++ @@ -16,4 +23,36 @@ - http://www.google.com/search?q=%s&ie=UTF-8&oe=UTF-8 + http://duckduckgo.com/?q=%s&t=epiphany - -\ Pas de fin de ligne à la fin du fichier. +\ No newline at end of file + + openSUSE + http://www.opensuse.org diff --git a/sled-bookmarks.patch b/sled-bookmarks.patch index 3ec981f..01535c0 100644 --- a/sled-bookmarks.patch +++ b/sled-bookmarks.patch @@ -1,19 +1,21 @@ ---- default-bookmarks.rdf.old 2008-07-30 03:43:13.000000000 +0200 -+++ default-bookmarks.rdf 2008-07-30 03:43:24.000000000 +0200 -@@ -6,6 +6,7 @@ +--- default-bookmarks.rdf.orig 2013-09-07 23:45:59.064825543 +0200 ++++ default-bookmarks.rdf 2013-09-07 23:46:23.297055534 +0200 +@@ -5,7 +5,8 @@ + http://www.gnome.org/projects/epiphany/ - -+ +- ++ ++ @@ -16,4 +17,8 @@ - http://www.google.com/search?q=%s&ie=UTF-8&oe=UTF-8 + http://duckduckgo.com/?q=%s&t=epiphany - -\ Pas de fin de ligne à la fin du fichier. +\ No newline at end of file + + Novell Documentation + http://www.novell.com/documentation/