pool/epiphany-branding-openSUSE
SHA256
4
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Accepting request 197875 from home:dimstar:branches:GNOME:Factory

Browse Source 
- 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
This commit is contained in:
Dominique Leuenberger 2013-09-07 22:17:46 +00:00 committed by Git OBS Bridge
parent 208e464853
commit 6dd0678294
8 changed files with 47 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
epiphany-branding-SLED.changes
View File

@ -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 Wed May 23 07:43:47 UTC 2012 - vuntz@opensuse.org

4
epiphany-branding-SLED.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package epiphany-branding-SLED # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -33,7 +33,7 @@ Source1: branding.conf.in
Patch0: opensuse-bookmarks.patch Patch0: opensuse-bookmarks.patch
# PATCH-FEATURE-SLED sled-bookmarks.patch vuntz@novell.com -- Add SLED bookmarks # PATCH-FEATURE-SLED sled-bookmarks.patch vuntz@novell.com -- Add SLED bookmarks
Patch1: sled-bookmarks.patch 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. # 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 # 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! # reuse build root. You have to build in a clean build root every time!

6
epiphany-branding-openSUSE.changes
View File

@ -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 Wed May 23 07:43:47 UTC 2012 - vuntz@opensuse.org

4
epiphany-branding-openSUSE.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package epiphany-branding-openSUSE # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -33,7 +33,7 @@ Source1: branding.conf.in
Patch0: opensuse-bookmarks.patch Patch0: opensuse-bookmarks.patch
# PATCH-FEATURE-SLED sled-bookmarks.patch vuntz@novell.com -- Add SLED bookmarks # PATCH-FEATURE-SLED sled-bookmarks.patch vuntz@novell.com -- Add SLED bookmarks
Patch1: sled-bookmarks.patch 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. # 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 # 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! # reuse build root. You have to build in a clean build root every time!

6
epiphany-branding.changes.in
View File

@ -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 Wed May 23 07:43:47 UTC 2012 - vuntz@opensuse.org

2
epiphany-branding.spec.in
View File

@ -32,7 +32,7 @@ Source1: branding.conf.in
Patch0: opensuse-bookmarks.patch Patch0: opensuse-bookmarks.patch
# PATCH-FEATURE-SLED sled-bookmarks.patch vuntz@novell.com -- Add SLED bookmarks # PATCH-FEATURE-SLED sled-bookmarks.patch vuntz@novell.com -- Add SLED bookmarks
Patch1: sled-bookmarks.patch 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. # 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 # 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! # reuse build root. You have to build in a clean build root every time!

14
opensuse-bookmarks.patch
View File

@ -1,9 +1,11 @@
--- default-bookmarks.rdf.old 2009-08-10 22:29:20.000000000 +0200 --- default-bookmarks.rdf.orig 2013-09-07 23:22:27.455672063 +0200
+++ default-bookmarks.rdf 2009-08-13 14:52:57.000000000 +0200 +++ default-bookmarks.rdf 2013-09-07 23:44:49.092161676 +0200
@@ -6,6 +6,13 @@ @@ -5,7 +5,14 @@
<link>http://www.gnome.org/projects/epiphany/</link>
<items> <items>
<rdf:Seq> <rdf:Seq>
<rdf:li rdf:resource="http://www.google.com"/> - <rdf:li rdf:resource="http://duckduckgo.com"/>
+ <rdf:li rdf:resource="http://duckduckgo.com"/>
+ <rdf:li rdf:resource="http://www.opensuse.org"/> + <rdf:li rdf:resource="http://www.opensuse.org"/>
+ <rdf:li rdf:resource="http://www.opensuse.org/documentation/"/> + <rdf:li rdf:resource="http://www.opensuse.org/documentation/"/>
+ <rdf:li rdf:resource="http://forums.opensuse.org"/> + <rdf:li rdf:resource="http://forums.opensuse.org"/>
@ -16,10 +18,10 @@
</channel> </channel>
@@ -16,4 +23,36 @@ @@ -16,4 +23,36 @@
<ephy:smartlink>http://www.google.com/search?q=%s&amp;ie=UTF-8&amp;oe=UTF-8</ephy:smartlink> <ephy:smartlink>http://duckduckgo.com/?q=%s&amp;t=epiphany</ephy:smartlink>
</item> </item>
-</rdf:RDF> -</rdf:RDF>
\ Pas de fin de ligne à la fin du fichier. \ No newline at end of file
+ <item rdf:about="http://www.opensuse.org"> + <item rdf:about="http://www.opensuse.org">
+ <title>openSUSE</title> + <title>openSUSE</title>
+ <link>http://www.opensuse.org</link> + <link>http://www.opensuse.org</link>

14
sled-bookmarks.patch
View File

@ -1,19 +1,21 @@
--- default-bookmarks.rdf.old 2008-07-30 03:43:13.000000000 +0200 --- default-bookmarks.rdf.orig 2013-09-07 23:45:59.064825543 +0200
+++ default-bookmarks.rdf 2008-07-30 03:43:24.000000000 +0200 +++ default-bookmarks.rdf 2013-09-07 23:46:23.297055534 +0200
@@ -6,6 +6,7 @@ @@ -5,7 +5,8 @@
<link>http://www.gnome.org/projects/epiphany/</link>
<items> <items>
<rdf:Seq> <rdf:Seq>
<rdf:li rdf:resource="http://www.google.com"/> - <rdf:li rdf:resource="http://duckduckgo.com"/>
+ <rdf:li rdf:resource="http://duckduckgo.com"/>
+ <rdf:li rdf:resource="http://www.novell.com/documentation/"/> + <rdf:li rdf:resource="http://www.novell.com/documentation/"/>
</rdf:Seq> </rdf:Seq>
</items> </items>
</channel> </channel>
@@ -16,4 +17,8 @@ @@ -16,4 +17,8 @@
<ephy:smartlink>http://www.google.com/search?q=%s&amp;ie=UTF-8&amp;oe=UTF-8</ephy:smartlink> <ephy:smartlink>http://duckduckgo.com/?q=%s&amp;t=epiphany</ephy:smartlink>
</item> </item>
-</rdf:RDF> -</rdf:RDF>
\ Pas de fin de ligne à la fin du fichier. \ No newline at end of file
+ <item rdf:about="http://www.novell.com/documentation/"> + <item rdf:about="http://www.novell.com/documentation/">
+ <title>Novell Documentation</title> + <title>Novell Documentation</title>
+ <link>http://www.novell.com/documentation/</link> + <link>http://www.novell.com/documentation/</link>