Mailinglist Archive: opensuse-commit (1650 mails)

[root@xxxxxxxxxxxxxxx (h_root)]

Hello community,

here is the log from the commit of package branding-openSUSE
checked in at Mon Oct 6 16:01:13 CEST 2008.


--------
--- branding-openSUSE/branding-openSUSE.changes 2008-04-09 14:31:48.000000000 
+0200
+++ /mounts/work_src_done/STABLE/branding-openSUSE/branding-openSUSE.changes    
2008-10-06 15:50:01.000000000 +0200
@@ -1,0 +2,5 @@
+Mon Oct  6 15:49:56 CEST 2008 - sbrabec@xxxxxxx
+
+- Conflict with other branding providers (FATE#304881).
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ branding-openSUSE.spec ++++++
--- /var/tmp/diff_new_pack.DQ8254/_old  2008-10-06 15:59:05.000000000 +0200
+++ /var/tmp/diff_new_pack.DQ8254/_new  2008-10-06 15:59:05.000000000 +0200
@@ -2,9 +2,16 @@
 # spec file for package branding-openSUSE (Version 11.0)
 #
 # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
 #
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
@@ -13,13 +20,15 @@
 
 Name:           branding-openSUSE
 Version:        11.0
-Release:        3
-License:        GPL v2 or later
+Release:        36
+License:        BSD 3-Clause
 Group:          System/Fhs
+Provides:       branding
+Conflicts:      otherproviders(branding)
 Source:         %{name}-COPYING
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
-Summary:        SuSE brand file
+Summary:        SuSE Brand File
 
 %description
 This package contains the file /etc/SuSE-brand, and its name is used as
@@ -50,6 +59,8 @@
 %{_sysconfdir}/SuSE-brand
 
 %changelog
+* Mon Oct 06 2008 sbrabec@xxxxxxx
+- Conflict with other branding providers (FATE#304881).
 * Wed Apr 09 2008 sbrabec@xxxxxxx
 - Added COPYING file (bnc#373602).
 * Wed Mar 19 2008 sbrabec@xxxxxxx



++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx