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

Accepting request 231680 from GNOME:Factory

Browse Source 
Push GNOME:Factory - GNOME 3.12.1

OBS-URL: https://build.opensuse.org/request/show/231680
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/epiphany-branding-openSUSE?expand=0&rev=30
This commit is contained in:
Stephan Kulow 2014-05-05 19:14:22 +00:00 committed by Git OBS Bridge
commit e7bf3c6059
9 changed files with 107 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
COPYING
View File

@ -1,8 +1,8 @@
GNU GENERAL PUBLIC LICENSE GNU GENERAL PUBLIC LICENSE
Version 2, June 1991 Version 2, June 1991
Copyright (C) 1989, 1991 Free Software Foundation, Inc. Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed. of this license document, but changing it is not allowed.
@ -15,7 +15,7 @@ software--to make sure the software is free for all its users. This
General Public License applies to most of the Free Software General Public License applies to most of the Free Software
Foundation's software and to any other program whose authors commit to Foundation's software and to any other program whose authors commit to
using it. (Some other Free Software Foundation software is covered by using it. (Some other Free Software Foundation software is covered by
the GNU Library General Public License instead.) You can apply it to the GNU Lesser General Public License instead.) You can apply it to
your programs, too. your programs, too.
When we speak of free software, we are referring to freedom, not When we speak of free software, we are referring to freedom, not
@ -55,7 +55,7 @@ patent must be licensed for everyone's free use or not licensed at all.
The precise terms and conditions for copying, distribution and The precise terms and conditions for copying, distribution and
modification follow. modification follow.
GNU GENERAL PUBLIC LICENSE GNU GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions:
License. (Exception: if the Program itself is interactive but License. (Exception: if the Program itself is interactive but
does not normally print such an announcement, your work based on does not normally print such an announcement, your work based on
the Program is not required to print an announcement.) the Program is not required to print an announcement.)
These requirements apply to the modified work as a whole. If These requirements apply to the modified work as a whole. If
identifiable sections of that work are not derived from the Program, identifiable sections of that work are not derived from the Program,
and can be reasonably considered independent and separate works in and can be reasonably considered independent and separate works in
@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent
access to copy the source code from the same place counts as access to copy the source code from the same place counts as
distribution of the source code, even though third parties are not distribution of the source code, even though third parties are not
compelled to copy the source along with the object code. compelled to copy the source along with the object code.
4. You may not copy, modify, sublicense, or distribute the Program 4. You may not copy, modify, sublicense, or distribute the Program
except as expressly provided under this License. Any attempt except as expressly provided under this License. Any attempt
otherwise to copy, modify, sublicense or distribute the Program is otherwise to copy, modify, sublicense or distribute the Program is
@ -225,7 +225,7 @@ impose that choice.
This section is intended to make thoroughly clear what is believed to This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License. be a consequence of the rest of this License.
8. If the distribution and/or use of the Program is restricted in 8. If the distribution and/or use of the Program is restricted in
certain countries either by patents or by copyrighted interfaces, the certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Program under this License original copyright holder who places the Program under this License
@ -278,7 +278,7 @@ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGES. POSSIBILITY OF SUCH DAMAGES.
END OF TERMS AND CONDITIONS END OF TERMS AND CONDITIONS
How to Apply These Terms to Your New Programs How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest If you develop a new program, and you want it to be of the greatest
@ -291,7 +291,7 @@ convey the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found. the "copyright" line and a pointer to where the full notice is found.
<one line to give the program's name and a brief idea of what it does.> <one line to give the program's name and a brief idea of what it does.>
Copyright (C) 19yy <name of author> Copyright (C) <year> <name of author>
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
@ -303,17 +303,16 @@ the "copyright" line and a pointer to where the full notice is found.
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License along
along with this program; if not, write to the Free Software with this program; if not, write to the Free Software Foundation, Inc.,
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
Also add information on how to contact you by electronic and paper mail. Also add information on how to contact you by electronic and paper mail.
If the program is interactive, make it output a short notice like this If the program is interactive, make it output a short notice like this
when it starts in an interactive mode: when it starts in an interactive mode:
Gnomovision version 69, Copyright (C) 19yy name of author Gnomovision version 69, Copyright (C) year name of author
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details. under certain conditions; type `show c' for details.
@ -336,5 +335,5 @@ necessary. Here is a sample; alter the names:
This General Public License does not permit incorporating your program into This General Public License does not permit incorporating your program into
proprietary programs. If your program is a subroutine library, you may proprietary programs. If your program is a subroutine library, you may
consider it more useful to permit linking proprietary applications with the consider it more useful to permit linking proprietary applications with the
library. If this is what you want to do, use the GNU Library General library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License. Public License instead of this License.

19
epiphany-branding-SLED.changes
View File

@ -1,3 +1,22 @@
-------------------------------------------------------------------
Thu Apr 3 23:13:23 UTC 2014 - dimstar@opensuse.org
- Bump version to 13.2, to prepare for next version of openSUSE.
-------------------------------------------------------------------
Sun Jan 19 19:46:33 UTC 2014 - dimstar@opensuse.org
- Rebase opensuse-bookmarks.patch and sled-bookmarks.patch for
Epiphany 3.11.3.
-------------------------------------------------------------------
Mon Dec 23 15:09:29 UTC 2013 - dimstar@opensuse.org
- Rebase opensuse-bookmarks.patch and sled-bookmarks.patch for
Epiphany 3.11.2.
- Update COPYING based on latest published GPL-2.0 text:
http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Sep 8 07:14:25 UTC 2013 - zaitor@opensuse.org Sun Sep 8 07:14:25 UTC 2013 - zaitor@opensuse.org

8
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) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2014 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
@ -21,7 +21,7 @@
# Do not edit this auto generated file! Edit epiphany-branding.spec.in. # Do not edit this auto generated file! Edit epiphany-branding.spec.in.
Name: epiphany-branding-SLED Name: epiphany-branding-SLED
Version: 13.1 Version: 13.2
Release: 0 Release: 0
Summary: GNOME Web Browser -- SLED default bookmarks and user agent string Summary: GNOME Web Browser -- SLED default bookmarks and user agent string
License: GPL-2.0+ License: GPL-2.0+
@ -33,11 +33,11 @@ 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 >= 3.9.90 BuildRequires: epiphany >= 3.11.3
# 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!
BuildRequires: epiphany-branding-upstream BuildRequires: epiphany-branding-upstream >= 3.11.2
%if 0%{suse_version} > 1110 %if 0%{suse_version} > 1110
BuildRequires: lsb-release BuildRequires: lsb-release
%else %else

19
epiphany-branding-openSUSE.changes
View File

@ -1,3 +1,22 @@
-------------------------------------------------------------------
Thu Apr 3 23:13:23 UTC 2014 - dimstar@opensuse.org
- Bump version to 13.2, to prepare for next version of openSUSE.
-------------------------------------------------------------------
Sun Jan 19 19:46:33 UTC 2014 - dimstar@opensuse.org
- Rebase opensuse-bookmarks.patch and sled-bookmarks.patch for
Epiphany 3.11.3.
-------------------------------------------------------------------
Mon Dec 23 15:09:29 UTC 2013 - dimstar@opensuse.org
- Rebase opensuse-bookmarks.patch and sled-bookmarks.patch for
Epiphany 3.11.2.
- Update COPYING based on latest published GPL-2.0 text:
http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Sep 8 07:14:25 UTC 2013 - zaitor@opensuse.org Sun Sep 8 07:14:25 UTC 2013 - zaitor@opensuse.org

8
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) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2014 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
@ -21,7 +21,7 @@
# Do not edit this auto generated file! Edit epiphany-branding.spec.in. # Do not edit this auto generated file! Edit epiphany-branding.spec.in.
Name: epiphany-branding-openSUSE Name: epiphany-branding-openSUSE
Version: 13.1 Version: 13.2
Release: 0 Release: 0
Summary: GNOME Web Browser -- openSUSE default bookmarks and user agent string Summary: GNOME Web Browser -- openSUSE default bookmarks and user agent string
License: GPL-2.0+ License: GPL-2.0+
@ -33,11 +33,11 @@ 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 >= 3.9.90 BuildRequires: epiphany >= 3.11.3
# 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!
BuildRequires: epiphany-branding-upstream BuildRequires: epiphany-branding-upstream >= 3.11.2
%if 0%{suse_version} > 1110 %if 0%{suse_version} > 1110
BuildRequires: lsb-release BuildRequires: lsb-release
%else %else

19
epiphany-branding.changes.in
View File

@ -1,3 +1,22 @@
-------------------------------------------------------------------
Thu Apr 3 23:13:23 UTC 2014 - dimstar@opensuse.org
- Bump version to 13.2, to prepare for next version of openSUSE.
-------------------------------------------------------------------
Sun Jan 19 19:46:33 UTC 2014 - dimstar@opensuse.org
- Rebase opensuse-bookmarks.patch and sled-bookmarks.patch for
Epiphany 3.11.3.
-------------------------------------------------------------------
Mon Dec 23 15:09:29 UTC 2013 - dimstar@opensuse.org
- Rebase opensuse-bookmarks.patch and sled-bookmarks.patch for
Epiphany 3.11.2.
- Update COPYING based on latest published GPL-2.0 text:
http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Sep 8 07:14:25 UTC 2013 - zaitor@opensuse.org Sun Sep 8 07:14:25 UTC 2013 - zaitor@opensuse.org

6
epiphany-branding.spec.in
View File

@ -20,7 +20,7 @@
%define build_SLED 0 %define build_SLED 0
Name: epiphany-branding-%{branding_name} Name: epiphany-branding-%{branding_name}
Version: 13.1 Version: 13.2
Release: 0 Release: 0
Summary: GNOME Web Browser -- %{branding_name} default bookmarks and user agent string Summary: GNOME Web Browser -- %{branding_name} default bookmarks and user agent string
License: GPL-2.0+ License: GPL-2.0+
@ -32,11 +32,11 @@ 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 >= 3.9.90 BuildRequires: epiphany >= 3.11.3
# 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!
BuildRequires: epiphany-branding-upstream BuildRequires: epiphany-branding-upstream >= 3.11.2
%if 0%{suse_version} > 1110 %if 0%{suse_version} > 1110
BuildRequires: lsb-release BuildRequires: lsb-release
%else %else

12
opensuse-bookmarks.patch
View File

@ -1,11 +1,9 @@
--- default-bookmarks.rdf.orig 2013-09-07 23:22:27.455672063 +0200 --- default-bookmarks.rdf.orig 2014-01-19 20:41:54.573151069 +0100
+++ default-bookmarks.rdf 2013-09-07 23:44:49.092161676 +0200 +++ default-bookmarks.rdf 2014-01-19 20:44:51.830517615 +0100
@@ -5,7 +5,14 @@ @@ -6,6 +6,13 @@
<link>http://www.gnome.org/projects/epiphany/</link>
<items> <items>
<rdf:Seq> <rdf:Seq>
- <rdf:li rdf:resource="http://duckduckgo.com"/> <rdf:li rdf:resource="https://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"/>
@ -18,7 +16,7 @@
</channel> </channel>
@@ -16,4 +23,36 @@ @@ -16,4 +23,36 @@
<ephy:smartlink>http://duckduckgo.com/?q=%s&amp;t=epiphany</ephy:smartlink> <ephy:smartlink>https://duckduckgo.com/?q=%s&amp;t=epiphany</ephy:smartlink>
</item> </item>
-</rdf:RDF> -</rdf:RDF>
\ No newline at end of file \ No newline at end of file

12
sled-bookmarks.patch
View File

@ -1,18 +1,16 @@
--- default-bookmarks.rdf.orig 2013-09-07 23:45:59.064825543 +0200 --- default-bookmarks.rdf.orig 2014-01-19 20:45:17.806719689 +0100
+++ default-bookmarks.rdf 2013-09-07 23:46:23.297055534 +0200 +++ default-bookmarks.rdf 2014-01-19 20:45:50.762976690 +0100
@@ -5,7 +5,8 @@ @@ -6,6 +6,7 @@
<link>http://www.gnome.org/projects/epiphany/</link>
<items> <items>
<rdf:Seq> <rdf:Seq>
- <rdf:li rdf:resource="http://duckduckgo.com"/> <rdf:li rdf:resource="https://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://duckduckgo.com/?q=%s&amp;t=epiphany</ephy:smartlink> <ephy:smartlink>https://duckduckgo.com/?q=%s&amp;t=epiphany</ephy:smartlink>
</item> </item>
-</rdf:RDF> -</rdf:RDF>
\ No newline at end of file \ No newline at end of file