February 2013 - openSUSE Commits - openSUSE Mailing Lists

commit apache2-mod_macro for openSUSE:Factory
by root＠hilbert.suse.de 01 Feb '13

01 Feb '13

Hello community, here is the log from the commit of package apache2-mod_macro for openSUSE:Factory checked in at 2013-02-01 10:59:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/apache2-mod_macro (Old) and /work/SRC/openSUSE:Factory/.apache2-mod_macro.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "apache2-mod_macro", Maintainer is "draht(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/apache2-mod_macro/apache2-mod_macro.changes 2012-02-21 12:14:51.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.apache2-mod_macro.new/apache2-mod_macro.changes 2013-02-01 10:59:43.000000000 +0100 @@ -1,0 +2,18 @@ +Mon Jan 28 19:50:27 UTC 2013 - dimstar(a)opensuse.org + +- Update to version 1.2.1: + + Minor documentation update. +- Changes from version 1.2.0: + + Port to Apache 2.4 API +- Changes from version 1.1.11: + + Fix compilation on MacOS X + + Style-updated documentation +- Changes from version 1.1.10: + + Escape @-arguments, useful in some case +- Changes from version 1.1.9: + + fix Error/Warning coredump, because Apache 2.2 has changed how + to access bthe current filename and line number. +- Fix build with apache 2.4: apxs2 moved from %{_sbindir} to + %{_bindir}. + +------------------------------------------------------------------- Old: ---- mod_macro-1.1.8.tar.bz2 New: ---- mod_macro-1.2.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apache2-mod_macro.spec ++++++ --- /var/tmp/diff_new_pack.lOtCH3/_old 2013-02-01 10:59:44.000000000 +0100 +++ /var/tmp/diff_new_pack.lOtCH3/_new 2013-02-01 10:59:44.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package apache2-mod_macro # -# 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 @@ -17,10 +17,10 @@ Name: apache2-mod_macro -BuildRequires: apache2-devel +BuildRequires: apache2-devel >= 2.4 BuildRequires: pcre-devel %define modname mod_macro -%define apxs /usr/sbin/apxs2 +%define apxs %{_bindir}/apxs2 %define apache apache2 %define apache_libexecdir %(%{apxs} -q LIBEXECDIR) %define apache_sysconfdir %(%{apxs} -q SYSCONFDIR) @@ -28,14 +28,15 @@ %define apache_serverroot %(%{apxs} -q PREFIX) %define apache_localstatedir %(%{apxs} -q LOCALSTATEDIR) %define apache_mmn %(MMN=$(%{apxs} -q LIBEXECDIR)_MMN; test -x $MMN && $MMN) -Version: 1.1.8 +Version: 1.2.1 Release: 0 -Requires: apache2 %{apache_mmn} +Requires: %{apache_mmn} +Requires: apache2 Summary: Define and Use Macros within the Apache Configuration License: BSD-3-Clause Group: Productivity/Networking/Web/Servers Url: http://www.coelho.net/mod_macro/ -Source: http://www.coelho.net/mod_macro/%{modname}-%{version}.tar.bz2 +Source: http://www.coelho.net/mod_macro/%{modname}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build #Docdir: %{_defaultdocdir}/%{apache} -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kvm for openSUSE:12.3
by root＠hilbert.suse.de 01 Feb '13

01 Feb '13

Hello community, here is the log from the commit of package kvm for openSUSE:12.3 checked in at 2013-02-01 10:13:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3/kvm (Old) and /work/SRC/openSUSE:12.3/.kvm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kvm", Maintainer is "BROGERS(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:12.3/kvm/kvm.changes 2013-01-31 01:22:49.000000000 +0100 +++ /work/SRC/openSUSE:12.3/.kvm.new/kvm.changes 2013-02-01 10:13:22.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Jan 31 17:08:48 UTC 2013 - brogers(a)suse.com + +- Resolved seabios build issue with patch being evaluated upstream. + +------------------------------------------------------------------- New: ---- seabios-reformat-lst-in-case-it-is-generated-by-new-iasl.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kvm.spec ++++++ --- /var/tmp/diff_new_pack.1goRLo/_old 2013-02-01 10:13:24.000000000 +0100 +++ /var/tmp/diff_new_pack.1goRLo/_new 2013-02-01 10:13:24.000000000 +0100 @@ -129,6 +129,7 @@ # seabios patches Patch20: seabios-sanitize-version.patch +Patch21: seabios-reformat-lst-in-case-it-is-generated-by-new-iasl.patch # vgabios patches Patch40: vgabios-bcc-paths.patch @@ -215,6 +216,7 @@ done # seabios patches %patch20 -p1 +%patch21 -p1 # vgabios patches %patch40 -p1 ++++++ seabios-reformat-lst-in-case-it-is-generated-by-new-iasl.patch ++++++ Subject: [PATCH] Reformat .lst in case it is generated by new iasl New iasl generate .lst as 'number: ' instead of 'number....', then acpi_extrace.py fails to extract any useful information, building fails. Signed-off-by: Bo Yang <boyang(a)suse.com> --- Makefile | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/roms/seabios/Makefile b/roms/seabios/Makefile index f28d86c..e87210b 100644 --- a/roms/seabios/Makefile +++ b/roms/seabios/Makefile @@ -217,6 +217,7 @@ $(OUT)%.hex: src/%.dsl ./tools/acpi_extract_preprocess.py ./tools/acpi_extract.p $(Q)cpp -P $< > $(OUT)$*.dsl.i.orig $(Q)$(PYTHON) ./tools/acpi_extract_preprocess.py $(OUT)$*.dsl.i.orig > $(OUT)$*.dsl.i $(Q)$(IASL) $(call iasl-option,$(IASL),-Pn,) -vs -l -tc -p $(OUT)$* $(OUT)$*.dsl.i + $(Q)sed -i 's/^$ *[0-9A-Fa-f]\+$: /\1..../' $(OUT)$*.lst $(Q)$(PYTHON) ./tools/acpi_extract.py $(OUT)$*.lst > $(OUT)$*.off $(Q)cat $(OUT)$*.off > $@ -- 1.6.0.2 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kvm for openSUSE:Factory
by root＠hilbert.suse.de 01 Feb '13

01 Feb '13

Hello community, here is the log from the commit of package kvm for openSUSE:Factory checked in at 2013-02-01 10:13:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kvm (Old) and /work/SRC/openSUSE:Factory/.kvm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kvm", Maintainer is "BROGERS(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/kvm/kvm.changes 2013-01-10 13:07:12.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kvm.new/kvm.changes 2013-02-01 10:13:12.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Jan 31 17:08:48 UTC 2013 - brogers(a)suse.com + +- Resolved seabios build issue with patch being evaluated upstream. + +------------------------------------------------------------------- New: ---- seabios-reformat-lst-in-case-it-is-generated-by-new-iasl.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kvm.spec ++++++ --- /var/tmp/diff_new_pack.4TmHcu/_old 2013-02-01 10:13:15.000000000 +0100 +++ /var/tmp/diff_new_pack.4TmHcu/_new 2013-02-01 10:13:15.000000000 +0100 @@ -129,6 +129,7 @@ # seabios patches Patch20: seabios-sanitize-version.patch +Patch21: seabios-reformat-lst-in-case-it-is-generated-by-new-iasl.patch # vgabios patches Patch40: vgabios-bcc-paths.patch @@ -215,6 +216,7 @@ done # seabios patches %patch20 -p1 +%patch21 -p1 # vgabios patches %patch40 -p1 ++++++ seabios-reformat-lst-in-case-it-is-generated-by-new-iasl.patch ++++++ Subject: [PATCH] Reformat .lst in case it is generated by new iasl New iasl generate .lst as 'number: ' instead of 'number....', then acpi_extrace.py fails to extract any useful information, building fails. Signed-off-by: Bo Yang <boyang(a)suse.com> --- Makefile | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/roms/seabios/Makefile b/roms/seabios/Makefile index f28d86c..e87210b 100644 --- a/roms/seabios/Makefile +++ b/roms/seabios/Makefile @@ -217,6 +217,7 @@ $(OUT)%.hex: src/%.dsl ./tools/acpi_extract_preprocess.py ./tools/acpi_extract.p $(Q)cpp -P $< > $(OUT)$*.dsl.i.orig $(Q)$(PYTHON) ./tools/acpi_extract_preprocess.py $(OUT)$*.dsl.i.orig > $(OUT)$*.dsl.i $(Q)$(IASL) $(call iasl-option,$(IASL),-Pn,) -vs -l -tc -p $(OUT)$* $(OUT)$*.dsl.i + $(Q)sed -i 's/^$ *[0-9A-Fa-f]\+$: /\1..../' $(OUT)$*.lst $(Q)$(PYTHON) ./tools/acpi_extract.py $(OUT)$*.lst > $(OUT)$*.off $(Q)cat $(OUT)$*.off > $@ -- 1.6.0.2 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xfce4-branding-openSUSE for openSUSE:12.3
by root＠hilbert.suse.de 01 Feb '13

01 Feb '13

Hello community, here is the log from the commit of package xfce4-branding-openSUSE for openSUSE:12.3 checked in at 2013-02-01 09:50:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3/xfce4-branding-openSUSE (Old) and /work/SRC/openSUSE:12.3/.xfce4-branding-openSUSE.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xfce4-branding-openSUSE", Maintainer is "xfce-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:12.3/xfce4-branding-openSUSE/xfce4-branding-openSUSE.changes 2013-01-31 01:45:43.000000000 +0100 +++ /work/SRC/openSUSE:12.3/.xfce4-branding-openSUSE.new/xfce4-branding-openSUSE.changes 2013-02-01 09:50:50.000000000 +0100 @@ -1,0 +2,7 @@ +Thu Jan 31 17:20:27 UTC 2013 - gber(a)opensuse.org + +- 12.3 specific xfce4-panel branding +- adapt to Terminal rename +- adapt to new name of the mixer plugin + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xfce4-branding-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.T3YkLR/_old 2013-02-01 09:50:50.000000000 +0100 +++ /var/tmp/diff_new_pack.T3YkLR/_new 2013-02-01 09:50:50.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package xfce4-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 @@ -48,7 +48,7 @@ BuildRequires: midori-branding-upstream BuildRequires: wallpaper-branding %if 0%{?suse_version} >= 1220 -# owns %{_datadir}/xfce/applications/defaults.list symlink target +# owns %%{_datadir}/xfce/applications/defaults.list symlink target Requires: libgio-2_0-0 %endif %if 0%{?suse_version} > 1220 @@ -97,7 +97,7 @@ License: CC-BY-SA-3.0 and GPL-2.0+ Group: System/GUI/XFCE %if 0%{?suse_version} >= 1220 -# owns %{_datadir}/xfce/applications/defaults.list symlink target +# owns %%{_datadir}/xfce/applications/defaults.list symlink target Requires: libgio-2_0-0 %endif %if 0%{?suse_version} > 1220 @@ -231,8 +231,8 @@ %setup -q -a1 %build -cp %{_sysconfdir}/xdg/midori/search etc/xdg/midori/search -cat >>etc/xdg/midori/search <<'EOF' +cp %{_sysconfdir}/xdg/midori/search base/etc/xdg/midori/search +cat >base/etc/xdg/midori/search <<'EOF' [openSUSE Software] name=openSUSE Software @@ -242,19 +242,18 @@ EOF %install -find etc usr -depth -print | cpio -pvd %{buildroot} +for dir in base %{?suse_version}; do + if [ -d "${dir}" ]; then + ( + cd $dir + find . -depth -print | cpio -puvd %{buildroot} + ) + fi +done ( cd openSUSE-xfce-icon-theme - find openSUSE-Xfce -depth -print | cpio -pvd %{buildroot}%{_datadir}/icons + find openSUSE-Xfce -depth -print | cpio -puvd %{buildroot}%{_datadir}/icons ) -# xfce_defaults.conf needs support from glib2 only available in >= 12.2 -%if 0%{?suse_version} >= 1220 -install -d -m 755 %{buildroot}%{_datadir}/xfce/applications/ -ln -s %{_localstatedir}/cache/gio-2.0/xfce-defaults.list \ - %{buildroot}%{_datadir}/xfce/applications/defaults.list -%else -rm -f %{buildroot}%{_sysconfdir}/xfce_defaults.conf -%endif %fdupes %{buildroot}%{_datadir}/icons/openSUSE-Xfce ++++++ xfce4-branding-openSUSE-4.10.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-branding-openSUSE-4.10.0/1220/etc/xfce_defaults.conf new/xfce4-branding-openSUSE-4.10.0/1220/etc/xfce_defaults.conf --- old/xfce4-branding-openSUSE-4.10.0/1220/etc/xfce_defaults.conf 1970-01-01 01:00:00.000000000 +0100 +++ new/xfce4-branding-openSUSE-4.10.0/1220/etc/xfce_defaults.conf 2012-10-04 15:06:48.000000000 +0200 @@ -0,0 +1,73 @@ +# Xfce Default Applications Source +# /etc/xfcer_defaults.conf +# +# After any change of this file run +# suse-update-mime-defaults +# +# This list is a source for defaults.list. +# +# If application in this list is installed, it is used as default in GNOME. +# It works in following way: +# 1. Read this file. +# 2. Collect all available desktop files. +# 3. Go through all declared MIME types and search for default application +# for defaults.list in following order: +# 3.1 Installed application listed here for certain MIME type. +# 3.2 Installed application listed here as preferred default. +# 3.3 Installed application listed here as default. +# 3.4 Installed application with GNOME in Categories. +# 3.5 Installed application with GTK in Categories. +# 3.6 Installed application. +# If there are more applications in the same order, it uses pseudo-randomly +# one of them (last in aplhabetical order). +# +# Syntax: +# Use xxx as default for all MIME types it declares (see 3.3): +# xxx.desktop +# Use xxx as preferred default for all MIME types it declares (see 3.2): +# !xxx.desktop +# Use xxx as default for mime/type (see 3.1): +# mime/type=xxx.desktop + +# URI schemes +x-scheme-handler/http=firefox.desktop +x-scheme-handler/https=firefox.desktop +x-scheme-handler/ftp=firefox.desktop +x-scheme-handler/mailto=thunderbird.desktop +# All URI schemes declared by yelp +yelp.desktop + +# Prefer totem for multimedia where possible +!totem.desktop + +# Prefer Install Software over file-roller +application/x-rpm=package-manager.desktop +!gpk-install-file.desktop + +# Xfce default applications +ristretto.desktop +evince.desktop +leafpad.desktop +file-roller.desktop +# file-roller supports iso, but most people will prefer brasero: +application/x-cd-image=brasero.desktop +Thunar-folder-handler.desktop +# evince supports multi-page tiff, but most people will prefer ristretto: +image/tiff=ristretto.desktop +# evince supports odp, but we really want OOo +application/vnd.sun.xml.impress=impress.desktop +application/vnd.oasis.opendocument.presentation=impress.desktop + +# Firefox +firefox.desktop + +# OpenOffice +base.desktop +calc.desktop +draw.desktop +impress.desktop +math.desktop +web.desktop +writer.desktop +# Do not prefer writer for text/plain: +text/plain=leafpad.desktop diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-branding-openSUSE-4.10.0/1220/usr/share/xfce/applications/defaults.list new/xfce4-branding-openSUSE-4.10.0/1220/usr/share/xfce/applications/defaults.list --- old/xfce4-branding-openSUSE-4.10.0/1220/usr/share/xfce/applications/defaults.list 1970-01-01 01:00:00.000000000 +0100 +++ new/xfce4-branding-openSUSE-4.10.0/1220/usr/share/xfce/applications/defaults.list 2013-02-01 09:50:50.000000000 +0100 @@ -0,0 +1 @@ +symbolic link to /var/cache/gio-2.0/xfce-defaults.list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-branding-openSUSE-4.10.0/1230/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml new/xfce4-branding-openSUSE-4.10.0/1230/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml --- old/xfce4-branding-openSUSE-4.10.0/1230/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/xfce4-branding-openSUSE-4.10.0/1230/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml 2013-01-31 21:28:59.000000000 +0100 @@ -0,0 +1,73 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<channel name="xfce4-panel" version="1.0"> + <property name="configver" type="int" value="2"/> + <property name="panels" type="array"> + <value type="int" value="1"/> + <property name="panel-1" type="empty"> + <property name="position" type="string" value="p=10;x=0;y=0"/> + <property name="length" type="uint" value="100"/> + <property name="position-locked" type="bool" value="true"/> + <property name="size" type="uint" value="24"/> + <property name="length-adjust" type="bool" value="false"/> + <property name="plugin-ids" type="array"> + <value type="int" value="1"/> + <value type="int" value="2"/> + <value type="int" value="3"/> + <value type="int" value="4"/> + <value type="int" value="5"/> + <value type="int" value="6"/> + <value type="int" value="7"/> + <value type="int" value="8"/> + <value type="int" value="9"/> + <value type="int" value="10"/> + <value type="int" value="11"/> + <value type="int" value="12"/> + </property> + </property> + </property> + <property name="plugins" type="empty"> + <property name="plugin-1" type="string" value="applicationsmenu"> + <property name="button-icon" type="string" value="xfce4-opensuse-dark"/> + <property name="button-title" type="string" value="openSUSE"/> + <property name="show-tooltips" type="bool" value="true"/> + </property> + <property name="plugin-2" type="string" value="separator"/> + <property name="plugin-3" type="string" value="showdesktop"/> + <property name="plugin-4" type="string" value="tasklist"/> + <property name="plugin-5" type="string" value="separator"> + <property name="expand" type="bool" value="true"/> + <property name="style" type="uint" value="0"/> + </property> + <property name="plugin-6" type="string" value="mixer"/> + <property name="plugin-7" type="string" value="systray"> + <property name="show-frame" type="bool" value="false"/> + </property> + <property name="plugin-8" type="string" value="pager"/> + <property name="plugin-9" type="string" value="separator"> + <property name="style" type="uint" value="0"/> + </property> + <property name="plugin-10" type="string" value="clock"> + <property name="show-frame" type="bool" value="false"/> + </property> + <property name="plugin-11" type="string" value="separator"> + <property name="style" type="uint" value="0"/> + </property> + <property name="plugin-12" type="string" value="actions"> + <property name="items" type="array"> + <value type="string" value="+lock-screen"/> + <value type="string" value="+switch-user"/> + <value type="string" value="+logout-dialog"/> + <value type="string" value="+separator"/> + <value type="string" value="+suspend"/> + <value type="string" value="+hibernate"/> + <value type="string" value="+separator"/> + <value type="string" value="+restart"/> + <value type="string" value="+shutdown"/> + <value type="string" value="-separator"/> + <value type="string" value="-logout"/> + </property> + <property name="appearance" type="uint" value="1"/> + </property> + </property> +</channel> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-branding-openSUSE-4.10.0/1230/etc/xfce_defaults.conf new/xfce4-branding-openSUSE-4.10.0/1230/etc/xfce_defaults.conf --- old/xfce4-branding-openSUSE-4.10.0/1230/etc/xfce_defaults.conf 1970-01-01 01:00:00.000000000 +0100 +++ new/xfce4-branding-openSUSE-4.10.0/1230/etc/xfce_defaults.conf 2012-10-04 15:06:48.000000000 +0200 @@ -0,0 +1,73 @@ +# Xfce Default Applications Source +# /etc/xfcer_defaults.conf +# +# After any change of this file run +# suse-update-mime-defaults +# +# This list is a source for defaults.list. +# +# If application in this list is installed, it is used as default in GNOME. +# It works in following way: +# 1. Read this file. +# 2. Collect all available desktop files. +# 3. Go through all declared MIME types and search for default application +# for defaults.list in following order: +# 3.1 Installed application listed here for certain MIME type. +# 3.2 Installed application listed here as preferred default. +# 3.3 Installed application listed here as default. +# 3.4 Installed application with GNOME in Categories. +# 3.5 Installed application with GTK in Categories. +# 3.6 Installed application. +# If there are more applications in the same order, it uses pseudo-randomly +# one of them (last in aplhabetical order). +# +# Syntax: +# Use xxx as default for all MIME types it declares (see 3.3): +# xxx.desktop +# Use xxx as preferred default for all MIME types it declares (see 3.2): +# !xxx.desktop +# Use xxx as default for mime/type (see 3.1): +# mime/type=xxx.desktop + +# URI schemes +x-scheme-handler/http=firefox.desktop +x-scheme-handler/https=firefox.desktop +x-scheme-handler/ftp=firefox.desktop +x-scheme-handler/mailto=thunderbird.desktop +# All URI schemes declared by yelp +yelp.desktop + +# Prefer totem for multimedia where possible +!totem.desktop + +# Prefer Install Software over file-roller +application/x-rpm=package-manager.desktop +!gpk-install-file.desktop + +# Xfce default applications +ristretto.desktop +evince.desktop +leafpad.desktop +file-roller.desktop +# file-roller supports iso, but most people will prefer brasero: +application/x-cd-image=brasero.desktop +Thunar-folder-handler.desktop +# evince supports multi-page tiff, but most people will prefer ristretto: +image/tiff=ristretto.desktop +# evince supports odp, but we really want OOo +application/vnd.sun.xml.impress=impress.desktop +application/vnd.oasis.opendocument.presentation=impress.desktop + +# Firefox +firefox.desktop + +# OpenOffice +base.desktop +calc.desktop +draw.desktop +impress.desktop +math.desktop +web.desktop +writer.desktop +# Do not prefer writer for text/plain: +text/plain=leafpad.desktop diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-branding-openSUSE-4.10.0/1230/usr/share/xfce/applications/defaults.list new/xfce4-branding-openSUSE-4.10.0/1230/usr/share/xfce/applications/defaults.list --- old/xfce4-branding-openSUSE-4.10.0/1230/usr/share/xfce/applications/defaults.list 1970-01-01 01:00:00.000000000 +0100 +++ new/xfce4-branding-openSUSE-4.10.0/1230/usr/share/xfce/applications/defaults.list 2013-02-01 09:50:50.000000000 +0100 @@ -0,0 +1 @@ +symbolic link to /var/cache/gio-2.0/xfce-defaults.list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/menus/xfce-applications.menu new/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/menus/xfce-applications.menu --- old/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/menus/xfce-applications.menu 1970-01-01 01:00:00.000000000 +0100 +++ new/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/menus/xfce-applications.menu 2012-07-01 11:14:39.000000000 +0200 @@ -0,0 +1,173 @@ +<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN" + "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd"> + +<Menu> + <Name>Xfce</Name> + + <DefaultAppDirs/> + <DefaultDirectoryDirs/> + <DefaultMergeDirs/> + + <Menu> + <Name>Accessories</Name> + <Directory>xfce-accessories.directory</Directory> + <Include> + <And> + <Or> + <Category>Accessibility</Category> + <Category>Core</Category> + <Category>Legacy</Category> + <Category>Utility</Category> + </Or> + <Not> + <Or> + <Category>DiscBurning</Category> + <Category>System</Category> + </Or> + </Not> + </And> + </Include> + <Exclude> + <Category>X-Xfce-Toplevel</Category> + <Category>Settings</Category> + </Exclude> + </Menu> + + <Menu> + <Name>Development</Name> + <Directory>xfce-development.directory</Directory> + <Include> + <Category>Development</Category> + </Include> + </Menu> + + <Menu> + <Name>Education</Name> + <Directory>xfce-education.directory</Directory> + <Include> + <Category>Education</Category> + </Include> + </Menu> + + <Menu> + <Name>Games</Name> + <Directory>xfce-games.directory</Directory> + <Include> + <Category>Game</Category> + </Include> + </Menu> + + <Menu> + <Name>Graphics</Name> + <Directory>xfce-graphics.directory</Directory> + <Include> + <Category>Graphics</Category> + </Include> + </Menu> + + <Menu> + <Name>Multimedia</Name> + <Directory>xfce-multimedia.directory</Directory> + <Include> + <Or> + <Category>Audio</Category> + <Category>Video</Category> + <Category>AudioVideo</Category> + <Category>DiscBurning</Category> + </Or> + </Include> + <Exclude> + <Category>Settings</Category> + </Exclude> + </Menu> + + <Menu> + <Name>Network</Name> + <Directory>xfce-network.directory</Directory> + <Include> + <Category>Network</Category> + </Include> + <Exclude> + <Category>X-Xfce-Toplevel</Category> + </Exclude> + </Menu> + + <Menu> + <Name>Office</Name> + <Directory>xfce-office.directory</Directory> + <Include> + <Category>Office</Category> + </Include> + </Menu> + + <Menu> + <Name>Science</Name> + <Directory>xfce-science.directory</Directory> + <Include> + <Category>Science</Category> + </Include> + </Menu> + + <Menu> + <Name>System</Name> + <Directory>xfce-system.directory</Directory> + <Include> + <Or> + <Category>Emulator</Category> + <Category>System</Category> + </Or> + </Include> + <Exclude> + <Category>X-Xfce-Toplevel</Category> + <Category>Settings</Category> + <Category>PackageManager</Category> + </Exclude> + </Menu> + + <Menu> + <Name>Settings</Name> + <Directory>xfce-settings.directory</Directory> + <Include> + <Filename>xfce-settings-manager.desktop</Filename> + <Filename>YaST.desktop</Filename> + <Filename>package-manager.desktop</Filename> + </Include> + <Layout> + <Filename>xfce-settings-manager.desktop</Filename> + <Filename>YaST.desktop</Filename> + <Filename>package-manager.desktop</Filename> + </Layout> + </Menu> + + <Menu> + <Name>Other</Name> + <Directory>xfce-other.directory</Directory> + <OnlyUnallocated/> + <Include> + <All/> + </Include> + <Exclude> + <Category>Settings</Category> + <Category>PackageManager</Category> + <Category>X-Xfce-Toplevel</Category> + </Exclude> + </Menu> + + <Include> + <Filename>xfce4-run.desktop</Filename> + <Filename>xfce4-about.desktop</Filename> + <Filename>xfce4-session-logout.desktop</Filename> + </Include> + + <Layout> + <Merge type="menus"/> + <Menuname>Other</Menuname> + <Separator/> + <Menuname>Settings</Menuname> + <Separator/> + <Merge type="files"/> + <Filename>xfce4-run.desktop</Filename> + <Filename>xfce4-about.desktop</Filename> + <Filename>xfce4-session-logout.desktop</Filename> + </Layout> +</Menu> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/menus/xfce-settings-manager.menu new/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/menus/xfce-settings-manager.menu --- old/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/menus/xfce-settings-manager.menu 1970-01-01 01:00:00.000000000 +0100 +++ new/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/menus/xfce-settings-manager.menu 2012-07-01 11:14:44.000000000 +0200 @@ -0,0 +1,106 @@ +<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN" + "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd"> + +<Menu> + <Name>Settings</Name> + + <DefaultAppDirs/> + <DefaultDirectoryDirs/> + <DefaultMergeDirs/> + + <Menu> + <Name>Personal</Name> + <Directory>xfce-personal.directory</Directory> + <Include> + <Or> + <And> + <Category>Settings</Category> + <Category>X-XFCE-SettingsDialog</Category> + <Category>X-XFCE-PersonalSettings</Category> + </And> + <And> + <Category>Settings</Category> + <Category>DesktopSettings</Category> + <Not> + <Category>X-XFCE-HardwareSettings</Category> + <Category>X-XFCE-SystemSettings</Category> + </Not> + </And> + </Or> + </Include> + <Exclude> + <Filename>xfce-settings-manager.desktop</Filename> + </Exclude> + </Menu> + + <Menu> + <Name>Hardware</Name> + <Directory>xfce-hardware.directory</Directory> + <Include> + <Or> + <And> + <Category>Settings</Category> + <Category>X-XFCE-SettingsDialog</Category> + <Category>X-XFCE-HardwareSettings</Category> + </And> + <And> + <Category>Settings</Category> + <Category>HardwareSettings</Category> + <Not> + <Category>X-XFCE-PersonalSettings</Category> + <Category>X-XFCE-SystemSettings</Category> + </Not> + </And> + </Or> + </Include> + </Menu> + + <Menu> + <Name>System</Name> + <Directory>xfce-system.directory</Directory> + <Include> + <Or> + <And> + <Category>Settings</Category> + <Category>X-XFCE-SettingsDialog</Category> + <Category>X-XFCE-SystemSettings</Category> + </And> + <And> + <Category>Settings</Category> + <Category>System</Category> + <Not> + <Or> + <Category>X-XFCE-PersonalSettings</Category> + <Category>X-XFCE-HardwareSettings</Category> + <Category>HardwareSettings</Category> + <Category>DesktopSettings</Category> + <Category>X-SuSE-YaST</Category> + </Or> + </Not> + </And> + <Category>PackageManager</Category> + </Or> + </Include> + </Menu> + + <Menu> + <Name>Other</Name> + <Directory>xfce-other.directory</Directory> + <OnlyUnallocated/> + <Include> + <Category>Settings</Category> + </Include> + <Exclude> + <Filename>xfce-settings-manager.desktop</Filename> + <Category>X-SuSE-YaST</Category> + </Exclude> + </Menu> + + <Layout> + <Menuname>Personal</Menuname> + <Menuname>Hardware</Menuname> + <Menuname>System</Menuname> + <Menuname>Other</Menuname> + <Merge type="menus"/> + </Layout> +</Menu> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/midori/config new/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/midori/config --- old/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/midori/config 1970-01-01 01:00:00.000000000 +0100 +++ new/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/midori/config 2012-06-05 09:48:42.000000000 +0200 @@ -0,0 +1,2 @@ +[settings] +homepage=http://www.opensuse.org/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/xfce4/helpers.rc new/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/xfce4/helpers.rc --- old/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/xfce4/helpers.rc 1970-01-01 01:00:00.000000000 +0100 +++ new/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/xfce4/helpers.rc 2013-01-31 18:20:16.000000000 +0100 @@ -0,0 +1,10 @@ +# +# openSUSE helpers.rc for Xfce's Preferred Applications +# +# Copyright (c) 2005-2006 Benedikt Meurer <benny(a)xfce.org> +# + +WebBrowser=firefox +MailReader=thunderbird +TerminalEmulator=xfce4-terminal +FileManager=Thunar diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/thunar-volman.xml new/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/thunar-volman.xml --- old/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/thunar-volman.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/thunar-volman.xml 2012-06-05 09:48:42.000000000 +0200 @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<channel name="thunar-volman" version="1.0"> + <property name="automount-drives" type="empty"> + <property name="enabled" type="bool" value="true"/> + </property> + <property name="automount-media" type="empty"> + <property name="enabled" type="bool" value="true"/> + </property> + <property name="autobrowse" type="empty"> + <property name="enabled" type="bool" value="true"/> + </property> + <property name="autoburn" type="empty"> + <property name="enabled" type="bool" value="true"/> + <property name="data-cd-command" type="string" value="/usr/bin/brasero"/> + <property name="audio-cd-command" type="string" value="/usr/bin/brasero"/> + </property> + <property name="autoplay-audio-cds" type="empty"> + <property name="enabled" type="bool" value="false"/> + <property name="command" type="string" value="/usr/bin/totem cdda://%d"/> + </property> + <property name="autoplay-video-cds" type="empty"> + <property name="command" type="string" value="/usr/bin/totem dvd://%d"/> + <property name="enabled" type="bool" value="false"/> + </property> + <property name="autoipod" type="empty"> + <property name="command" type="string" value="/usr/bin/rhythmbox"/> + <property name="enabled" type="bool" value="false"/> + </property> + <property name="autophoto" type="empty"> + <property name="command" type="string" value="/usr/bin/shotwell"/> + <property name="enabled" type="bool" value="false"/> + </property> +</channel> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml new/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml --- old/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml 2012-06-05 09:48:42.000000000 +0200 @@ -0,0 +1,79 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<channel name="xfce4-keyboard-shortcuts" version="1.0"> + <property name="commands" type="empty"> + <property name="default" type="empty"> + <property name="<Alt>F1" type="string" value="xfce4-popup-applicationsmenu"/> + <property name="<Alt>F2" type="string" value="xfce4-appfinder --collapsed"> + <property name="startup-notify" type="bool" value="true"/> + </property> + <property name="<Alt>F3" type="string" value="xfce4-appfinder"> + <property name="startup-notify" type="bool" value="true"/> + </property> + <property name="<Control><Alt>Delete" type="string" value="xflock4"/> + <property name="XF86Display" type="string" value="xfce4-display-settings --minimal"/> + <property name="<Super>p" type="string" value="xfce4-display-settings --minimal"/> + <property name="<Control>Escape" type="string" value="xfdesktop --menu"/> + <property name="<Alt>Print" type="string" value="xfce4-screenshooter -w"/> + <property name="Print" type="string" value="xfce4-screenshooter -f"/> + <property name="XF86WWW" type="string" value="exo-open --launch WebBrowser"/> + <property name="XF86Mail" type="string" value="exo-open --launch MailReader"/> + </property> + </property> + <property name="xfwm4" type="empty"> + <property name="default" type="empty"> + <property name="<Alt>Insert" type="string" value="add_workspace_key"/> + <property name="Escape" type="string" value="cancel_key"/> + <property name="Left" type="string" value="left_key"/> + <property name="Right" type="string" value="right_key"/> + <property name="Up" type="string" value="up_key"/> + <property name="Down" type="string" value="down_key"/> + <property name="<Alt>Tab" type="string" value="cycle_windows_key"/> + <property name="<Alt><Shift>Tab" type="string" value="cycle_reverse_windows_key"/> + <property name="<Alt>Delete" type="string" value="del_workspace_key"/> + <property name="<Control><Alt>Down" type="string" value="down_workspace_key"/> + <property name="<Control><Alt>Left" type="string" value="left_workspace_key"/> + <property name="<Shift><Alt>Page_Down" type="string" value="lower_window_key"/> + <property name="<Alt>F4" type="string" value="close_window_key"/> + <property name="<Alt>F6" type="string" value="stick_window_key"/> + <property name="<Alt>F7" type="string" value="move_window_key"/> + <property name="<Alt>F8" type="string" value="resize_window_key"/> + <property name="<Alt>F9" type="string" value="hide_window_key"/> + <property name="<Alt>F10" type="string" value="maximize_window_key"/> + <property name="<Alt>F11" type="string" value="fullscreen_key"/> + <property name="<Alt>F12" type="string" value="above_key"/> + <property name="<Control><Shift><Alt>Left" type="string" value="move_window_left_key"/> + <property name="<Alt><Control>End" type="string" value="move_window_next_workspace_key"/> + <property name="<Alt><Control>Home" type="string" value="move_window_prev_workspace_key"/> + <property name="<Control><Shift><Alt>Right" type="string" value="move_window_right_key"/> + <property name="<Control><Shift><Alt>Up" type="string" value="move_window_up_key"/> + <property name="<Alt><Control>KP_1" type="string" value="move_window_workspace_1_key"/> + <property name="<Alt><Control>KP_2" type="string" value="move_window_workspace_2_key"/> + <property name="<Alt><Control>KP_3" type="string" value="move_window_workspace_3_key"/> + <property name="<Alt><Control>KP_4" type="string" value="move_window_workspace_4_key"/> + <property name="<Alt><Control>KP_5" type="string" value="move_window_workspace_5_key"/> + <property name="<Alt><Control>KP_6" type="string" value="move_window_workspace_6_key"/> + <property name="<Alt><Control>KP_7" type="string" value="move_window_workspace_7_key"/> + <property name="<Alt><Control>KP_8" type="string" value="move_window_workspace_8_key"/> + <property name="<Alt><Control>KP_9" type="string" value="move_window_workspace_9_key"/> + <property name="<Alt>space" type="string" value="popup_menu_key"/> + <property name="<Shift><Alt>Page_Up" type="string" value="raise_window_key"/> + <property name="<Control><Alt>Right" type="string" value="right_workspace_key"/> + <property name="<Control><Alt>d" type="string" value="show_desktop_key"/> + <property name="<Control><Alt>Up" type="string" value="up_workspace_key"/> + <property name="<Super>Tab" type="string" value="switch_window_key"/> + <property name="<Control>F1" type="string" value="workspace_1_key"/> + <property name="<Control>F2" type="string" value="workspace_2_key"/> + <property name="<Control>F3" type="string" value="workspace_3_key"/> + <property name="<Control>F4" type="string" value="workspace_4_key"/> + <property name="<Control>F5" type="string" value="workspace_5_key"/> + <property name="<Control>F6" type="string" value="workspace_6_key"/> + <property name="<Control>F7" type="string" value="workspace_7_key"/> + <property name="<Control>F8" type="string" value="workspace_8_key"/> + <property name="<Control>F9" type="string" value="workspace_9_key"/> + <property name="<Control>F10" type="string" value="workspace_10_key"/> + <property name="<Control>F11" type="string" value="workspace_11_key"/> + <property name="<Control>F12" type="string" value="workspace_12_key"/> + </property> + </property> +</channel> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml new/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml --- old/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml 2012-06-05 09:48:42.000000000 +0200 @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<channel name="xfce4-notifyd" version="1.0"> + <property name="notify-location" type="uint" value="3"/> +</channel> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml new/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml --- old/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml 2013-01-31 19:32:57.000000000 +0100 @@ -0,0 +1,69 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<channel name="xfce4-panel" version="1.0"> + <property name="configver" type="int" value="2"/> + <property name="panels" type="array"> + <value type="int" value="1"/> + <property name="panel-1" type="empty"> + <property name="position" type="string" value="p=10;x=0;y=0"/> + <property name="length" type="uint" value="100"/> + <property name="position-locked" type="bool" value="true"/> + <property name="size" type="uint" value="24"/> + <property name="length-adjust" type="bool" value="false"/> + <property name="plugin-ids" type="array"> + <value type="int" value="1"/> + <value type="int" value="2"/> + <value type="int" value="3"/> + <value type="int" value="4"/> + <value type="int" value="5"/> + <value type="int" value="6"/> + <value type="int" value="7"/> + <value type="int" value="8"/> + <value type="int" value="9"/> + <value type="int" value="10"/> + <value type="int" value="11"/> + <value type="int" value="12"/> + </property> + </property> + </property> + <property name="plugins" type="empty"> + <property name="plugin-1" type="string" value="applicationsmenu"> + <property name="button-icon" type="string" value="xfce4-opensuse-dark"/> + <property name="button-title" type="string" value="openSUSE"/> + <property name="show-tooltips" type="bool" value="true"/> + </property> + <property name="plugin-2" type="string" value="separator"/> + <property name="plugin-3" type="string" value="showdesktop"/> + <property name="plugin-4" type="string" value="tasklist"/> + <property name="plugin-5" type="string" value="separator"> + <property name="expand" type="bool" value="true"/> + <property name="style" type="uint" value="0"/> + </property> + <property name="plugin-6" type="string" value="mixer"/> + <property name="plugin-7" type="string" value="systray"> + <property name="show-frame" type="bool" value="false"/> + </property> + <property name="plugin-8" type="string" value="pager"/> + <property name="plugin-9" type="string" value="separator"/> + <property name="plugin-10" type="string" value="clock"> + <property name="show-frame" type="bool" value="false"/> + </property> + <property name="plugin-11" type="string" value="separator"/> + <property name="plugin-12" type="string" value="actions"> + <property name="items" type="array"> + <value type="string" value="+lock-screen"/> + <value type="string" value="+switch-user"/> + <value type="string" value="+logout-dialog"/> + <value type="string" value="+separator"/> + <value type="string" value="+suspend"/> + <value type="string" value="+hibernate"/> + <value type="string" value="+separator"/> + <value type="string" value="+restart"/> + <value type="string" value="+shutdown"/> + <value type="string" value="-separator"/> + <value type="string" value="-logout"/> + </property> + <property name="appearance" type="uint" value="1"/> + </property> + </property> +</channel> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml new/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml --- old/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml 2012-10-22 17:04:20.000000000 +0200 @@ -0,0 +1,50 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<channel name="xfce4-session" version="1.0"> + <property name="general" type="empty"> + <property name="FailsafeSessionName" type="string" value="Failsafe"/> + <property name="SaveOnExit" type="bool" value="false"/> + <property name="AutoSave" type="bool" value="false"/> + </property> + <property name="sessions" type="empty"> + <property name="Failsafe" type="empty"> + <property name="IsFailsafe" type="bool" value="true"/> + <property name="Count" type="int" value="5"/> + <property name="Client0_Command" type="array"> + <value type="string" value="xfwm4"/> + </property> + <property name="Client0_PerScreen" type="bool" value="false"/> + <property name="Client1_Command" type="array"> + <value type="string" value="xfsettingsd"/> + </property> + <property name="Client1_PerScreen" type="bool" value="false"/> + <property name="Client2_Command" type="array"> + <value type="string" value="xfce4-panel"/> + </property> + <property name="Client2_PerScreen" type="bool" value="false"/> + <property name="Client3_Command" type="array"> + <value type="string" value="Thunar"/> + <value type="string" value="--daemon"/> + </property> + <property name="Client3_PerScreen" type="bool" value="false"/> + <property name="Client4_Command" type="array"> + <value type="string" value="xfdesktop"/> + </property> + <property name="Client4_PerScreen" type="bool" value="false"/> + </property> + </property> + <property name="splash" type="empty"> + <property name="Engine" type="string" value="simple"/> + <property name="engines" type="empty"> + <property name="simple" type="empty"> + <property name="Font" type="string" value="Sans 10"/> + <property name="BgColor" type="string" value="#D5DAD5"/> + <property name="FgColor" type="string" value="#000000"/> + <property name="Image" type="string" value="/usr/share/pixmaps/xfce4-splash-openSUSE.png"/> + </property> + </property> + </property> + <property name="compat" type="empty"> + <property name="LaunchGNOME" type="bool" value="true"/> + </property> +</channel> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml new/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml --- old/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml 2012-06-05 09:48:42.000000000 +0200 @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<channel name="xfwm4" version="1.0"> + <property name="general" type="empty"> + <property name="theme" type="string" value="Kelabu"/> + <property name="title_font" type="string" value="Sans Bold 10"/> + <property name="double_click_time" type="int" value="400"/> + <property name="use_compositing" type="bool" value="true"/> + <property name="show_dock_shadow" type="bool" value="false"/> + <property name="show_frame_shadow" type="bool" value="true"/> + <property name="show_popup_shadow" type="bool" value="true"/> + <property name="workspace_count" type="int" value="2"/> + <property name="wrap_windows" type="bool" value="false"/> + <property name="tile_on_move" type="bool" value="true"/> + </property> +</channel> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml new/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml --- old/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml 2012-06-05 09:48:42.000000000 +0200 @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<channel name="xsettings" version="1.0"> + <property name="Net" type="empty"> + <property name="ThemeName" type="string" value="Adwaita"/> + <property name="IconThemeName" type="string" value="openSUSE-Xfce"/> + </property> + <property name="Xft" type="empty"> + <property name="DPI" type="int" value="-1"/> + <property name="Antialias" type="int" value="1"/> + <property name="Hinting" type="int" value="-1"/> + <property name="HintStyle" type="string" value="hintfull"/> + <property name="RGBA" type="string" value="none"/> + </property> + <property name="Gtk" type="empty"> + <property name="CursorThemeName" type="string" value="Adwaita"/> + </property> +</channel> Files old/xfce4-branding-openSUSE-4.10.0/base/usr/share/pixmaps/xfce4-opensuse-dark.png and new/xfce4-branding-openSUSE-4.10.0/base/usr/share/pixmaps/xfce4-opensuse-dark.png differ Files old/xfce4-branding-openSUSE-4.10.0/base/usr/share/pixmaps/xfce4-opensuse-light.png and new/xfce4-branding-openSUSE-4.10.0/base/usr/share/pixmaps/xfce4-opensuse-light.png differ Files old/xfce4-branding-openSUSE-4.10.0/base/usr/share/pixmaps/xfce4-suse.png and new/xfce4-branding-openSUSE-4.10.0/base/usr/share/pixmaps/xfce4-suse.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-branding-openSUSE-4.10.0/base/usr/share/wallpapers/xfce/default.wallpaper new/xfce4-branding-openSUSE-4.10.0/base/usr/share/wallpapers/xfce/default.wallpaper --- old/xfce4-branding-openSUSE-4.10.0/base/usr/share/wallpapers/xfce/default.wallpaper 1970-01-01 01:00:00.000000000 +0100 +++ new/xfce4-branding-openSUSE-4.10.0/base/usr/share/wallpapers/xfce/default.wallpaper 2013-02-01 09:50:50.000000000 +0100 @@ -0,0 +1 @@ +symbolic link to /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-branding-openSUSE-4.10.0/etc/xdg/menus/xfce-applications.menu new/xfce4-branding-openSUSE-4.10.0/etc/xdg/menus/xfce-applications.menu --- old/xfce4-branding-openSUSE-4.10.0/etc/xdg/menus/xfce-applications.menu 2012-07-01 11:14:39.000000000 +0200 +++ new/xfce4-branding-openSUSE-4.10.0/etc/xdg/menus/xfce-applications.menu 1970-01-01 01:00:00.000000000 +0100 @@ -1,173 +0,0 @@ -<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN" - "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd"> - -<Menu> - <Name>Xfce</Name> - - <DefaultAppDirs/> - <DefaultDirectoryDirs/> - <DefaultMergeDirs/> - - <Menu> - <Name>Accessories</Name> - <Directory>xfce-accessories.directory</Directory> - <Include> - <And> - <Or> - <Category>Accessibility</Category> - <Category>Core</Category> - <Category>Legacy</Category> - <Category>Utility</Category> - </Or> - <Not> - <Or> - <Category>DiscBurning</Category> - <Category>System</Category> - </Or> - </Not> - </And> - </Include> - <Exclude> - <Category>X-Xfce-Toplevel</Category> - <Category>Settings</Category> - </Exclude> - </Menu> - - <Menu> - <Name>Development</Name> - <Directory>xfce-development.directory</Directory> - <Include> - <Category>Development</Category> - </Include> - </Menu> - - <Menu> - <Name>Education</Name> - <Directory>xfce-education.directory</Directory> - <Include> - <Category>Education</Category> - </Include> - </Menu> - - <Menu> - <Name>Games</Name> - <Directory>xfce-games.directory</Directory> - <Include> - <Category>Game</Category> - </Include> - </Menu> - - <Menu> - <Name>Graphics</Name> - <Directory>xfce-graphics.directory</Directory> - <Include> - <Category>Graphics</Category> - </Include> - </Menu> - - <Menu> - <Name>Multimedia</Name> - <Directory>xfce-multimedia.directory</Directory> - <Include> - <Or> - <Category>Audio</Category> - <Category>Video</Category> - <Category>AudioVideo</Category> - <Category>DiscBurning</Category> - </Or> - </Include> - <Exclude> - <Category>Settings</Category> - </Exclude> - </Menu> - - <Menu> - <Name>Network</Name> - <Directory>xfce-network.directory</Directory> - <Include> - <Category>Network</Category> - </Include> - <Exclude> - <Category>X-Xfce-Toplevel</Category> - </Exclude> - </Menu> - - <Menu> - <Name>Office</Name> - <Directory>xfce-office.directory</Directory> - <Include> - <Category>Office</Category> - </Include> - </Menu> - - <Menu> - <Name>Science</Name> - <Directory>xfce-science.directory</Directory> - <Include> - <Category>Science</Category> - </Include> - </Menu> - - <Menu> - <Name>System</Name> - <Directory>xfce-system.directory</Directory> - <Include> - <Or> - <Category>Emulator</Category> - <Category>System</Category> - </Or> - </Include> - <Exclude> - <Category>X-Xfce-Toplevel</Category> - <Category>Settings</Category> - <Category>PackageManager</Category> - </Exclude> - </Menu> - - <Menu> - <Name>Settings</Name> - <Directory>xfce-settings.directory</Directory> - <Include> - <Filename>xfce-settings-manager.desktop</Filename> - <Filename>YaST.desktop</Filename> - <Filename>package-manager.desktop</Filename> - </Include> - <Layout> - <Filename>xfce-settings-manager.desktop</Filename> - <Filename>YaST.desktop</Filename> - <Filename>package-manager.desktop</Filename> - </Layout> - </Menu> - - <Menu> - <Name>Other</Name> - <Directory>xfce-other.directory</Directory> - <OnlyUnallocated/> - <Include> - <All/> - </Include> - <Exclude> - <Category>Settings</Category> - <Category>PackageManager</Category> - <Category>X-Xfce-Toplevel</Category> - </Exclude> - </Menu> - - <Include> - <Filename>xfce4-run.desktop</Filename> - <Filename>xfce4-about.desktop</Filename> - <Filename>xfce4-session-logout.desktop</Filename> - </Include> - - <Layout> - <Merge type="menus"/> - <Menuname>Other</Menuname> - <Separator/> - <Menuname>Settings</Menuname> - <Separator/> - <Merge type="files"/> - <Filename>xfce4-run.desktop</Filename> - <Filename>xfce4-about.desktop</Filename> - <Filename>xfce4-session-logout.desktop</Filename> - </Layout> -</Menu> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-branding-openSUSE-4.10.0/etc/xdg/menus/xfce-settings-manager.menu new/xfce4-branding-openSUSE-4.10.0/etc/xdg/menus/xfce-settings-manager.menu --- old/xfce4-branding-openSUSE-4.10.0/etc/xdg/menus/xfce-settings-manager.menu 2012-07-01 11:14:44.000000000 +0200 +++ new/xfce4-branding-openSUSE-4.10.0/etc/xdg/menus/xfce-settings-manager.menu 1970-01-01 01:00:00.000000000 +0100 @@ -1,106 +0,0 @@ -<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN" - "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd"> - -<Menu> - <Name>Settings</Name> - - <DefaultAppDirs/> - <DefaultDirectoryDirs/> - <DefaultMergeDirs/> - - <Menu> - <Name>Personal</Name> - <Directory>xfce-personal.directory</Directory> - <Include> - <Or> - <And> - <Category>Settings</Category> - <Category>X-XFCE-SettingsDialog</Category> - <Category>X-XFCE-PersonalSettings</Category> - </And> - <And> - <Category>Settings</Category> - <Category>DesktopSettings</Category> - <Not> - <Category>X-XFCE-HardwareSettings</Category> - <Category>X-XFCE-SystemSettings</Category> - </Not> - </And> - </Or> - </Include> - <Exclude> - <Filename>xfce-settings-manager.desktop</Filename> - </Exclude> - </Menu> - - <Menu> - <Name>Hardware</Name> - <Directory>xfce-hardware.directory</Directory> - <Include> - <Or> - <And> - <Category>Settings</Category> - <Category>X-XFCE-SettingsDialog</Category> - <Category>X-XFCE-HardwareSettings</Category> - </And> - <And> - <Category>Settings</Category> - <Category>HardwareSettings</Category> - <Not> - <Category>X-XFCE-PersonalSettings</Category> - <Category>X-XFCE-SystemSettings</Category> - </Not> - </And> - </Or> - </Include> - </Menu> - - <Menu> - <Name>System</Name> - <Directory>xfce-system.directory</Directory> - <Include> - <Or> - <And> - <Category>Settings</Category> - <Category>X-XFCE-SettingsDialog</Category> - <Category>X-XFCE-SystemSettings</Category> - </And> - <And> - <Category>Settings</Category> - <Category>System</Category> - <Not> - <Or> - <Category>X-XFCE-PersonalSettings</Category> - <Category>X-XFCE-HardwareSettings</Category> - <Category>HardwareSettings</Category> - <Category>DesktopSettings</Category> - <Category>X-SuSE-YaST</Category> - </Or> - </Not> - </And> - <Category>PackageManager</Category> - </Or> - </Include> - </Menu> - - <Menu> - <Name>Other</Name> - <Directory>xfce-other.directory</Directory> - <OnlyUnallocated/> - <Include> - <Category>Settings</Category> - </Include> - <Exclude> - <Filename>xfce-settings-manager.desktop</Filename> - <Category>X-SuSE-YaST</Category> - </Exclude> - </Menu> - - <Layout> - <Menuname>Personal</Menuname> - <Menuname>Hardware</Menuname> - <Menuname>System</Menuname> - <Menuname>Other</Menuname> - <Merge type="menus"/> - </Layout> -</Menu> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-branding-openSUSE-4.10.0/etc/xdg/midori/config new/xfce4-branding-openSUSE-4.10.0/etc/xdg/midori/config --- old/xfce4-branding-openSUSE-4.10.0/etc/xdg/midori/config 2012-06-05 09:48:42.000000000 +0200 +++ new/xfce4-branding-openSUSE-4.10.0/etc/xdg/midori/config 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -[settings] -homepage=http://www.opensuse.org/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-branding-openSUSE-4.10.0/etc/xdg/xfce4/helpers.rc new/xfce4-branding-openSUSE-4.10.0/etc/xdg/xfce4/helpers.rc --- old/xfce4-branding-openSUSE-4.10.0/etc/xdg/xfce4/helpers.rc 2012-06-05 09:48:42.000000000 +0200 +++ new/xfce4-branding-openSUSE-4.10.0/etc/xdg/xfce4/helpers.rc 1970-01-01 01:00:00.000000000 +0100 @@ -1,10 +0,0 @@ -# -# openSUSE helpers.rc for Xfce's Preferred Applications -# -# Copyright (c) 2005-2006 Benedikt Meurer <benny(a)xfce.org> -# - -WebBrowser=firefox -MailReader=thunderbird -TerminalEmulator=Terminal -FileManager=Thunar diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-branding-openSUSE-4.10.0/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/thunar-volman.xml new/xfce4-branding-openSUSE-4.10.0/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/thunar-volman.xml --- old/xfce4-branding-openSUSE-4.10.0/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/thunar-volman.xml 2012-06-05 09:48:42.000000000 +0200 +++ new/xfce4-branding-openSUSE-4.10.0/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/thunar-volman.xml 1970-01-01 01:00:00.000000000 +0100 @@ -1,34 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<channel name="thunar-volman" version="1.0"> - <property name="automount-drives" type="empty"> - <property name="enabled" type="bool" value="true"/> - </property> - <property name="automount-media" type="empty"> - <property name="enabled" type="bool" value="true"/> - </property> - <property name="autobrowse" type="empty"> - <property name="enabled" type="bool" value="true"/> - </property> - <property name="autoburn" type="empty"> - <property name="enabled" type="bool" value="true"/> - <property name="data-cd-command" type="string" value="/usr/bin/brasero"/> - <property name="audio-cd-command" type="string" value="/usr/bin/brasero"/> - </property> - <property name="autoplay-audio-cds" type="empty"> - <property name="enabled" type="bool" value="false"/> - <property name="command" type="string" value="/usr/bin/totem cdda://%d"/> - </property> - <property name="autoplay-video-cds" type="empty"> - <property name="command" type="string" value="/usr/bin/totem dvd://%d"/> - <property name="enabled" type="bool" value="false"/> - </property> - <property name="autoipod" type="empty"> - <property name="command" type="string" value="/usr/bin/rhythmbox"/> - <property name="enabled" type="bool" value="false"/> - </property> - <property name="autophoto" type="empty"> - <property name="command" type="string" value="/usr/bin/shotwell"/> - <property name="enabled" type="bool" value="false"/> - </property> -</channel> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-branding-openSUSE-4.10.0/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml new/xfce4-branding-openSUSE-4.10.0/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml --- old/xfce4-branding-openSUSE-4.10.0/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml 2012-06-05 09:48:42.000000000 +0200 +++ new/xfce4-branding-openSUSE-4.10.0/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml 1970-01-01 01:00:00.000000000 +0100 @@ -1,79 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<channel name="xfce4-keyboard-shortcuts" version="1.0"> - <property name="commands" type="empty"> - <property name="default" type="empty"> - <property name="<Alt>F1" type="string" value="xfce4-popup-applicationsmenu"/> - <property name="<Alt>F2" type="string" value="xfce4-appfinder --collapsed"> - <property name="startup-notify" type="bool" value="true"/> - </property> - <property name="<Alt>F3" type="string" value="xfce4-appfinder"> - <property name="startup-notify" type="bool" value="true"/> - </property> - <property name="<Control><Alt>Delete" type="string" value="xflock4"/> - <property name="XF86Display" type="string" value="xfce4-display-settings --minimal"/> - <property name="<Super>p" type="string" value="xfce4-display-settings --minimal"/> - <property name="<Control>Escape" type="string" value="xfdesktop --menu"/> - <property name="<Alt>Print" type="string" value="xfce4-screenshooter -w"/> - <property name="Print" type="string" value="xfce4-screenshooter -f"/> - <property name="XF86WWW" type="string" value="exo-open --launch WebBrowser"/> - <property name="XF86Mail" type="string" value="exo-open --launch MailReader"/> - </property> - </property> - <property name="xfwm4" type="empty"> - <property name="default" type="empty"> - <property name="<Alt>Insert" type="string" value="add_workspace_key"/> - <property name="Escape" type="string" value="cancel_key"/> - <property name="Left" type="string" value="left_key"/> - <property name="Right" type="string" value="right_key"/> - <property name="Up" type="string" value="up_key"/> - <property name="Down" type="string" value="down_key"/> - <property name="<Alt>Tab" type="string" value="cycle_windows_key"/> - <property name="<Alt><Shift>Tab" type="string" value="cycle_reverse_windows_key"/> - <property name="<Alt>Delete" type="string" value="del_workspace_key"/> - <property name="<Control><Alt>Down" type="string" value="down_workspace_key"/> - <property name="<Control><Alt>Left" type="string" value="left_workspace_key"/> - <property name="<Shift><Alt>Page_Down" type="string" value="lower_window_key"/> - <property name="<Alt>F4" type="string" value="close_window_key"/> - <property name="<Alt>F6" type="string" value="stick_window_key"/> - <property name="<Alt>F7" type="string" value="move_window_key"/> - <property name="<Alt>F8" type="string" value="resize_window_key"/> - <property name="<Alt>F9" type="string" value="hide_window_key"/> - <property name="<Alt>F10" type="string" value="maximize_window_key"/> - <property name="<Alt>F11" type="string" value="fullscreen_key"/> - <property name="<Alt>F12" type="string" value="above_key"/> - <property name="<Control><Shift><Alt>Left" type="string" value="move_window_left_key"/> - <property name="<Alt><Control>End" type="string" value="move_window_next_workspace_key"/> - <property name="<Alt><Control>Home" type="string" value="move_window_prev_workspace_key"/> - <property name="<Control><Shift><Alt>Right" type="string" value="move_window_right_key"/> - <property name="<Control><Shift><Alt>Up" type="string" value="move_window_up_key"/> - <property name="<Alt><Control>KP_1" type="string" value="move_window_workspace_1_key"/> - <property name="<Alt><Control>KP_2" type="string" value="move_window_workspace_2_key"/> - <property name="<Alt><Control>KP_3" type="string" value="move_window_workspace_3_key"/> - <property name="<Alt><Control>KP_4" type="string" value="move_window_workspace_4_key"/> - <property name="<Alt><Control>KP_5" type="string" value="move_window_workspace_5_key"/> - <property name="<Alt><Control>KP_6" type="string" value="move_window_workspace_6_key"/> - <property name="<Alt><Control>KP_7" type="string" value="move_window_workspace_7_key"/> - <property name="<Alt><Control>KP_8" type="string" value="move_window_workspace_8_key"/> - <property name="<Alt><Control>KP_9" type="string" value="move_window_workspace_9_key"/> - <property name="<Alt>space" type="string" value="popup_menu_key"/> - <property name="<Shift><Alt>Page_Up" type="string" value="raise_window_key"/> - <property name="<Control><Alt>Right" type="string" value="right_workspace_key"/> - <property name="<Control><Alt>d" type="string" value="show_desktop_key"/> - <property name="<Control><Alt>Up" type="string" value="up_workspace_key"/> - <property name="<Super>Tab" type="string" value="switch_window_key"/> - <property name="<Control>F1" type="string" value="workspace_1_key"/> - <property name="<Control>F2" type="string" value="workspace_2_key"/> - <property name="<Control>F3" type="string" value="workspace_3_key"/> - <property name="<Control>F4" type="string" value="workspace_4_key"/> - <property name="<Control>F5" type="string" value="workspace_5_key"/> - <property name="<Control>F6" type="string" value="workspace_6_key"/> - <property name="<Control>F7" type="string" value="workspace_7_key"/> - <property name="<Control>F8" type="string" value="workspace_8_key"/> - <property name="<Control>F9" type="string" value="workspace_9_key"/> - <property name="<Control>F10" type="string" value="workspace_10_key"/> - <property name="<Control>F11" type="string" value="workspace_11_key"/> - <property name="<Control>F12" type="string" value="workspace_12_key"/> - </property> - </property> -</channel> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-branding-openSUSE-4.10.0/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml new/xfce4-branding-openSUSE-4.10.0/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml --- old/xfce4-branding-openSUSE-4.10.0/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml 2012-06-05 09:48:42.000000000 +0200 +++ new/xfce4-branding-openSUSE-4.10.0/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml 1970-01-01 01:00:00.000000000 +0100 @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<channel name="xfce4-notifyd" version="1.0"> - <property name="notify-location" type="uint" value="3"/> -</channel> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-branding-openSUSE-4.10.0/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml new/xfce4-branding-openSUSE-4.10.0/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml --- old/xfce4-branding-openSUSE-4.10.0/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml 2012-06-23 16:01:55.000000000 +0200 +++ new/xfce4-branding-openSUSE-4.10.0/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml 1970-01-01 01:00:00.000000000 +0100 @@ -1,69 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<channel name="xfce4-panel" version="1.0"> - <property name="configver" type="int" value="2"/> - <property name="panels" type="array"> - <value type="int" value="1"/> - <property name="panel-1" type="empty"> - <property name="position" type="string" value="p=10;x=0;y=0"/> - <property name="length" type="uint" value="100"/> - <property name="position-locked" type="bool" value="true"/> - <property name="size" type="uint" value="24"/> - <property name="length-adjust" type="bool" value="false"/> - <property name="plugin-ids" type="array"> - <value type="int" value="1"/> - <value type="int" value="2"/> - <value type="int" value="3"/> - <value type="int" value="4"/> - <value type="int" value="5"/> - <value type="int" value="6"/> - <value type="int" value="7"/> - <value type="int" value="8"/> - <value type="int" value="9"/> - <value type="int" value="10"/> - <value type="int" value="11"/> - <value type="int" value="12"/> - </property> - </property> - </property> - <property name="plugins" type="empty"> - <property name="plugin-1" type="string" value="applicationsmenu"> - <property name="button-icon" type="string" value="xfce4-opensuse-dark"/> - <property name="button-title" type="string" value="openSUSE"/> - <property name="show-tooltips" type="bool" value="true"/> - </property> - <property name="plugin-2" type="string" value="separator"/> - <property name="plugin-3" type="string" value="showdesktop"/> - <property name="plugin-4" type="string" value="tasklist"/> - <property name="plugin-5" type="string" value="separator"> - <property name="expand" type="bool" value="true"/> - <property name="style" type="uint" value="0"/> - </property> - <property name="plugin-6" type="string" value="xfce4-mixer-plugin"/> - <property name="plugin-7" type="string" value="systray"> - <property name="show-frame" type="bool" value="false"/> - </property> - <property name="plugin-8" type="string" value="pager"/> - <property name="plugin-9" type="string" value="separator"/> - <property name="plugin-10" type="string" value="clock"> - <property name="show-frame" type="bool" value="false"/> - </property> - <property name="plugin-11" type="string" value="separator"/> - <property name="plugin-12" type="string" value="actions"> - <property name="items" type="array"> - <value type="string" value="+lock-screen"/> - <value type="string" value="+switch-user"/> - <value type="string" value="+logout-dialog"/> - <value type="string" value="+separator"/> - <value type="string" value="+suspend"/> - <value type="string" value="+hibernate"/> - <value type="string" value="+separator"/> - <value type="string" value="+restart"/> - <value type="string" value="+shutdown"/> - <value type="string" value="-separator"/> - <value type="string" value="-logout"/> - </property> - <property name="appearance" type="uint" value="1"/> - </property> - </property> -</channel> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-branding-openSUSE-4.10.0/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml new/xfce4-branding-openSUSE-4.10.0/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml --- old/xfce4-branding-openSUSE-4.10.0/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml 2012-10-22 17:04:20.000000000 +0200 +++ new/xfce4-branding-openSUSE-4.10.0/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml 1970-01-01 01:00:00.000000000 +0100 @@ -1,50 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<channel name="xfce4-session" version="1.0"> - <property name="general" type="empty"> - <property name="FailsafeSessionName" type="string" value="Failsafe"/> - <property name="SaveOnExit" type="bool" value="false"/> - <property name="AutoSave" type="bool" value="false"/> - </property> - <property name="sessions" type="empty"> - <property name="Failsafe" type="empty"> - <property name="IsFailsafe" type="bool" value="true"/> - <property name="Count" type="int" value="5"/> - <property name="Client0_Command" type="array"> - <value type="string" value="xfwm4"/> - </property> - <property name="Client0_PerScreen" type="bool" value="false"/> - <property name="Client1_Command" type="array"> - <value type="string" value="xfsettingsd"/> - </property> - <property name="Client1_PerScreen" type="bool" value="false"/> - <property name="Client2_Command" type="array"> - <value type="string" value="xfce4-panel"/> - </property> - <property name="Client2_PerScreen" type="bool" value="false"/> - <property name="Client3_Command" type="array"> - <value type="string" value="Thunar"/> - <value type="string" value="--daemon"/> - </property> - <property name="Client3_PerScreen" type="bool" value="false"/> - <property name="Client4_Command" type="array"> - <value type="string" value="xfdesktop"/> - </property> - <property name="Client4_PerScreen" type="bool" value="false"/> - </property> - </property> - <property name="splash" type="empty"> - <property name="Engine" type="string" value="simple"/> - <property name="engines" type="empty"> - <property name="simple" type="empty"> - <property name="Font" type="string" value="Sans 10"/> - <property name="BgColor" type="string" value="#D5DAD5"/> - <property name="FgColor" type="string" value="#000000"/> - <property name="Image" type="string" value="/usr/share/pixmaps/xfce4-splash-openSUSE.png"/> - </property> - </property> - </property> - <property name="compat" type="empty"> - <property name="LaunchGNOME" type="bool" value="true"/> - </property> -</channel> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-branding-openSUSE-4.10.0/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml new/xfce4-branding-openSUSE-4.10.0/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml --- old/xfce4-branding-openSUSE-4.10.0/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml 2012-06-05 09:48:42.000000000 +0200 +++ new/xfce4-branding-openSUSE-4.10.0/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml 1970-01-01 01:00:00.000000000 +0100 @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<channel name="xfwm4" version="1.0"> - <property name="general" type="empty"> - <property name="theme" type="string" value="Kelabu"/> - <property name="title_font" type="string" value="Sans Bold 10"/> - <property name="double_click_time" type="int" value="400"/> - <property name="use_compositing" type="bool" value="true"/> - <property name="show_dock_shadow" type="bool" value="false"/> - <property name="show_frame_shadow" type="bool" value="true"/> - <property name="show_popup_shadow" type="bool" value="true"/> - <property name="workspace_count" type="int" value="2"/> - <property name="wrap_windows" type="bool" value="false"/> - <property name="tile_on_move" type="bool" value="true"/> - </property> -</channel> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-branding-openSUSE-4.10.0/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml new/xfce4-branding-openSUSE-4.10.0/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml --- old/xfce4-branding-openSUSE-4.10.0/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml 2012-06-05 09:48:42.000000000 +0200 +++ new/xfce4-branding-openSUSE-4.10.0/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml 1970-01-01 01:00:00.000000000 +0100 @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<channel name="xsettings" version="1.0"> - <property name="Net" type="empty"> - <property name="ThemeName" type="string" value="Adwaita"/> - <property name="IconThemeName" type="string" value="openSUSE-Xfce"/> - </property> - <property name="Xft" type="empty"> - <property name="DPI" type="int" value="-1"/> - <property name="Antialias" type="int" value="1"/> - <property name="Hinting" type="int" value="-1"/> - <property name="HintStyle" type="string" value="hintfull"/> - <property name="RGBA" type="string" value="none"/> - </property> - <property name="Gtk" type="empty"> - <property name="CursorThemeName" type="string" value="Adwaita"/> - </property> -</channel> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-branding-openSUSE-4.10.0/etc/xfce_defaults.conf new/xfce4-branding-openSUSE-4.10.0/etc/xfce_defaults.conf --- old/xfce4-branding-openSUSE-4.10.0/etc/xfce_defaults.conf 2012-10-04 15:06:48.000000000 +0200 +++ new/xfce4-branding-openSUSE-4.10.0/etc/xfce_defaults.conf 1970-01-01 01:00:00.000000000 +0100 @@ -1,73 +0,0 @@ -# Xfce Default Applications Source -# /etc/xfcer_defaults.conf -# -# After any change of this file run -# suse-update-mime-defaults -# -# This list is a source for defaults.list. -# -# If application in this list is installed, it is used as default in GNOME. -# It works in following way: -# 1. Read this file. -# 2. Collect all available desktop files. -# 3. Go through all declared MIME types and search for default application -# for defaults.list in following order: -# 3.1 Installed application listed here for certain MIME type. -# 3.2 Installed application listed here as preferred default. -# 3.3 Installed application listed here as default. -# 3.4 Installed application with GNOME in Categories. -# 3.5 Installed application with GTK in Categories. -# 3.6 Installed application. -# If there are more applications in the same order, it uses pseudo-randomly -# one of them (last in aplhabetical order). -# -# Syntax: -# Use xxx as default for all MIME types it declares (see 3.3): -# xxx.desktop -# Use xxx as preferred default for all MIME types it declares (see 3.2): -# !xxx.desktop -# Use xxx as default for mime/type (see 3.1): -# mime/type=xxx.desktop - -# URI schemes -x-scheme-handler/http=firefox.desktop -x-scheme-handler/https=firefox.desktop -x-scheme-handler/ftp=firefox.desktop -x-scheme-handler/mailto=thunderbird.desktop -# All URI schemes declared by yelp -yelp.desktop - -# Prefer totem for multimedia where possible -!totem.desktop - -# Prefer Install Software over file-roller -application/x-rpm=package-manager.desktop -!gpk-install-file.desktop - -# Xfce default applications -ristretto.desktop -evince.desktop -leafpad.desktop -file-roller.desktop -# file-roller supports iso, but most people will prefer brasero: -application/x-cd-image=brasero.desktop -Thunar-folder-handler.desktop -# evince supports multi-page tiff, but most people will prefer ristretto: -image/tiff=ristretto.desktop -# evince supports odp, but we really want OOo -application/vnd.sun.xml.impress=impress.desktop -application/vnd.oasis.opendocument.presentation=impress.desktop - -# Firefox -firefox.desktop - -# OpenOffice -base.desktop -calc.desktop -draw.desktop -impress.desktop -math.desktop -web.desktop -writer.desktop -# Do not prefer writer for text/plain: -text/plain=leafpad.desktop Files old/xfce4-branding-openSUSE-4.10.0/usr/share/pixmaps/xfce4-opensuse-dark.png and new/xfce4-branding-openSUSE-4.10.0/usr/share/pixmaps/xfce4-opensuse-dark.png differ Files old/xfce4-branding-openSUSE-4.10.0/usr/share/pixmaps/xfce4-opensuse-light.png and new/xfce4-branding-openSUSE-4.10.0/usr/share/pixmaps/xfce4-opensuse-light.png differ Files old/xfce4-branding-openSUSE-4.10.0/usr/share/pixmaps/xfce4-suse.png and new/xfce4-branding-openSUSE-4.10.0/usr/share/pixmaps/xfce4-suse.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-branding-openSUSE-4.10.0/usr/share/wallpapers/xfce/default.wallpaper new/xfce4-branding-openSUSE-4.10.0/usr/share/wallpapers/xfce/default.wallpaper --- old/xfce4-branding-openSUSE-4.10.0/usr/share/wallpapers/xfce/default.wallpaper 2013-02-01 09:50:50.000000000 +0100 +++ new/xfce4-branding-openSUSE-4.10.0/usr/share/wallpapers/xfce/default.wallpaper 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -symbolic link to /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xfce4-branding-openSUSE for openSUSE:Factory
by root＠hilbert.suse.de 01 Feb '13

01 Feb '13

Hello community, here is the log from the commit of package xfce4-branding-openSUSE for openSUSE:Factory checked in at 2013-02-01 09:50:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xfce4-branding-openSUSE (Old) and /work/SRC/openSUSE:Factory/.xfce4-branding-openSUSE.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xfce4-branding-openSUSE", Maintainer is "xfce-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/xfce4-branding-openSUSE/xfce4-branding-openSUSE.changes 2013-01-22 18:18:55.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.xfce4-branding-openSUSE.new/xfce4-branding-openSUSE.changes 2013-02-01 09:50:45.000000000 +0100 @@ -1,0 +2,7 @@ +Thu Jan 31 17:20:27 UTC 2013 - gber(a)opensuse.org + +- 12.3 specific xfce4-panel branding +- adapt to Terminal rename +- adapt to new name of the mixer plugin + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xfce4-branding-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.xW58vb/_old 2013-02-01 09:50:46.000000000 +0100 +++ /var/tmp/diff_new_pack.xW58vb/_new 2013-02-01 09:50:46.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package xfce4-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 @@ -48,7 +48,7 @@ BuildRequires: midori-branding-upstream BuildRequires: wallpaper-branding %if 0%{?suse_version} >= 1220 -# owns %{_datadir}/xfce/applications/defaults.list symlink target +# owns %%{_datadir}/xfce/applications/defaults.list symlink target Requires: libgio-2_0-0 %endif %if 0%{?suse_version} > 1220 @@ -97,7 +97,7 @@ License: CC-BY-SA-3.0 and GPL-2.0+ Group: System/GUI/XFCE %if 0%{?suse_version} >= 1220 -# owns %{_datadir}/xfce/applications/defaults.list symlink target +# owns %%{_datadir}/xfce/applications/defaults.list symlink target Requires: libgio-2_0-0 %endif %if 0%{?suse_version} > 1220 @@ -231,8 +231,8 @@ %setup -q -a1 %build -cp %{_sysconfdir}/xdg/midori/search etc/xdg/midori/search -cat >>etc/xdg/midori/search <<'EOF' +cp %{_sysconfdir}/xdg/midori/search base/etc/xdg/midori/search +cat >base/etc/xdg/midori/search <<'EOF' [openSUSE Software] name=openSUSE Software @@ -242,19 +242,18 @@ EOF %install -find etc usr -depth -print | cpio -pvd %{buildroot} +for dir in base %{?suse_version}; do + if [ -d "${dir}" ]; then + ( + cd $dir + find . -depth -print | cpio -puvd %{buildroot} + ) + fi +done ( cd openSUSE-xfce-icon-theme - find openSUSE-Xfce -depth -print | cpio -pvd %{buildroot}%{_datadir}/icons + find openSUSE-Xfce -depth -print | cpio -puvd %{buildroot}%{_datadir}/icons ) -# xfce_defaults.conf needs support from glib2 only available in >= 12.2 -%if 0%{?suse_version} >= 1220 -install -d -m 755 %{buildroot}%{_datadir}/xfce/applications/ -ln -s %{_localstatedir}/cache/gio-2.0/xfce-defaults.list \ - %{buildroot}%{_datadir}/xfce/applications/defaults.list -%else -rm -f %{buildroot}%{_sysconfdir}/xfce_defaults.conf -%endif %fdupes %{buildroot}%{_datadir}/icons/openSUSE-Xfce ++++++ xfce4-branding-openSUSE-4.10.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-branding-openSUSE-4.10.0/1220/etc/xfce_defaults.conf new/xfce4-branding-openSUSE-4.10.0/1220/etc/xfce_defaults.conf --- old/xfce4-branding-openSUSE-4.10.0/1220/etc/xfce_defaults.conf 1970-01-01 01:00:00.000000000 +0100 +++ new/xfce4-branding-openSUSE-4.10.0/1220/etc/xfce_defaults.conf 2012-10-04 15:06:48.000000000 +0200 @@ -0,0 +1,73 @@ +# Xfce Default Applications Source +# /etc/xfcer_defaults.conf +# +# After any change of this file run +# suse-update-mime-defaults +# +# This list is a source for defaults.list. +# +# If application in this list is installed, it is used as default in GNOME. +# It works in following way: +# 1. Read this file. +# 2. Collect all available desktop files. +# 3. Go through all declared MIME types and search for default application +# for defaults.list in following order: +# 3.1 Installed application listed here for certain MIME type. +# 3.2 Installed application listed here as preferred default. +# 3.3 Installed application listed here as default. +# 3.4 Installed application with GNOME in Categories. +# 3.5 Installed application with GTK in Categories. +# 3.6 Installed application. +# If there are more applications in the same order, it uses pseudo-randomly +# one of them (last in aplhabetical order). +# +# Syntax: +# Use xxx as default for all MIME types it declares (see 3.3): +# xxx.desktop +# Use xxx as preferred default for all MIME types it declares (see 3.2): +# !xxx.desktop +# Use xxx as default for mime/type (see 3.1): +# mime/type=xxx.desktop + +# URI schemes +x-scheme-handler/http=firefox.desktop +x-scheme-handler/https=firefox.desktop +x-scheme-handler/ftp=firefox.desktop +x-scheme-handler/mailto=thunderbird.desktop +# All URI schemes declared by yelp +yelp.desktop + +# Prefer totem for multimedia where possible +!totem.desktop + +# Prefer Install Software over file-roller +application/x-rpm=package-manager.desktop +!gpk-install-file.desktop + +# Xfce default applications +ristretto.desktop +evince.desktop +leafpad.desktop +file-roller.desktop +# file-roller supports iso, but most people will prefer brasero: +application/x-cd-image=brasero.desktop +Thunar-folder-handler.desktop +# evince supports multi-page tiff, but most people will prefer ristretto: +image/tiff=ristretto.desktop +# evince supports odp, but we really want OOo +application/vnd.sun.xml.impress=impress.desktop +application/vnd.oasis.opendocument.presentation=impress.desktop + +# Firefox +firefox.desktop + +# OpenOffice +base.desktop +calc.desktop +draw.desktop +impress.desktop +math.desktop +web.desktop +writer.desktop +# Do not prefer writer for text/plain: +text/plain=leafpad.desktop diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-branding-openSUSE-4.10.0/1220/usr/share/xfce/applications/defaults.list new/xfce4-branding-openSUSE-4.10.0/1220/usr/share/xfce/applications/defaults.list --- old/xfce4-branding-openSUSE-4.10.0/1220/usr/share/xfce/applications/defaults.list 1970-01-01 01:00:00.000000000 +0100 +++ new/xfce4-branding-openSUSE-4.10.0/1220/usr/share/xfce/applications/defaults.list 2013-02-01 09:50:46.000000000 +0100 @@ -0,0 +1 @@ +symbolic link to /var/cache/gio-2.0/xfce-defaults.list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-branding-openSUSE-4.10.0/1230/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml new/xfce4-branding-openSUSE-4.10.0/1230/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml --- old/xfce4-branding-openSUSE-4.10.0/1230/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/xfce4-branding-openSUSE-4.10.0/1230/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml 2013-01-31 21:28:59.000000000 +0100 @@ -0,0 +1,73 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<channel name="xfce4-panel" version="1.0"> + <property name="configver" type="int" value="2"/> + <property name="panels" type="array"> + <value type="int" value="1"/> + <property name="panel-1" type="empty"> + <property name="position" type="string" value="p=10;x=0;y=0"/> + <property name="length" type="uint" value="100"/> + <property name="position-locked" type="bool" value="true"/> + <property name="size" type="uint" value="24"/> + <property name="length-adjust" type="bool" value="false"/> + <property name="plugin-ids" type="array"> + <value type="int" value="1"/> + <value type="int" value="2"/> + <value type="int" value="3"/> + <value type="int" value="4"/> + <value type="int" value="5"/> + <value type="int" value="6"/> + <value type="int" value="7"/> + <value type="int" value="8"/> + <value type="int" value="9"/> + <value type="int" value="10"/> + <value type="int" value="11"/> + <value type="int" value="12"/> + </property> + </property> + </property> + <property name="plugins" type="empty"> + <property name="plugin-1" type="string" value="applicationsmenu"> + <property name="button-icon" type="string" value="xfce4-opensuse-dark"/> + <property name="button-title" type="string" value="openSUSE"/> + <property name="show-tooltips" type="bool" value="true"/> + </property> + <property name="plugin-2" type="string" value="separator"/> + <property name="plugin-3" type="string" value="showdesktop"/> + <property name="plugin-4" type="string" value="tasklist"/> + <property name="plugin-5" type="string" value="separator"> + <property name="expand" type="bool" value="true"/> + <property name="style" type="uint" value="0"/> + </property> + <property name="plugin-6" type="string" value="mixer"/> + <property name="plugin-7" type="string" value="systray"> + <property name="show-frame" type="bool" value="false"/> + </property> + <property name="plugin-8" type="string" value="pager"/> + <property name="plugin-9" type="string" value="separator"> + <property name="style" type="uint" value="0"/> + </property> + <property name="plugin-10" type="string" value="clock"> + <property name="show-frame" type="bool" value="false"/> + </property> + <property name="plugin-11" type="string" value="separator"> + <property name="style" type="uint" value="0"/> + </property> + <property name="plugin-12" type="string" value="actions"> + <property name="items" type="array"> + <value type="string" value="+lock-screen"/> + <value type="string" value="+switch-user"/> + <value type="string" value="+logout-dialog"/> + <value type="string" value="+separator"/> + <value type="string" value="+suspend"/> + <value type="string" value="+hibernate"/> + <value type="string" value="+separator"/> + <value type="string" value="+restart"/> + <value type="string" value="+shutdown"/> + <value type="string" value="-separator"/> + <value type="string" value="-logout"/> + </property> + <property name="appearance" type="uint" value="1"/> + </property> + </property> +</channel> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-branding-openSUSE-4.10.0/1230/etc/xfce_defaults.conf new/xfce4-branding-openSUSE-4.10.0/1230/etc/xfce_defaults.conf --- old/xfce4-branding-openSUSE-4.10.0/1230/etc/xfce_defaults.conf 1970-01-01 01:00:00.000000000 +0100 +++ new/xfce4-branding-openSUSE-4.10.0/1230/etc/xfce_defaults.conf 2012-10-04 15:06:48.000000000 +0200 @@ -0,0 +1,73 @@ +# Xfce Default Applications Source +# /etc/xfcer_defaults.conf +# +# After any change of this file run +# suse-update-mime-defaults +# +# This list is a source for defaults.list. +# +# If application in this list is installed, it is used as default in GNOME. +# It works in following way: +# 1. Read this file. +# 2. Collect all available desktop files. +# 3. Go through all declared MIME types and search for default application +# for defaults.list in following order: +# 3.1 Installed application listed here for certain MIME type. +# 3.2 Installed application listed here as preferred default. +# 3.3 Installed application listed here as default. +# 3.4 Installed application with GNOME in Categories. +# 3.5 Installed application with GTK in Categories. +# 3.6 Installed application. +# If there are more applications in the same order, it uses pseudo-randomly +# one of them (last in aplhabetical order). +# +# Syntax: +# Use xxx as default for all MIME types it declares (see 3.3): +# xxx.desktop +# Use xxx as preferred default for all MIME types it declares (see 3.2): +# !xxx.desktop +# Use xxx as default for mime/type (see 3.1): +# mime/type=xxx.desktop + +# URI schemes +x-scheme-handler/http=firefox.desktop +x-scheme-handler/https=firefox.desktop +x-scheme-handler/ftp=firefox.desktop +x-scheme-handler/mailto=thunderbird.desktop +# All URI schemes declared by yelp +yelp.desktop + +# Prefer totem for multimedia where possible +!totem.desktop + +# Prefer Install Software over file-roller +application/x-rpm=package-manager.desktop +!gpk-install-file.desktop + +# Xfce default applications +ristretto.desktop +evince.desktop +leafpad.desktop +file-roller.desktop +# file-roller supports iso, but most people will prefer brasero: +application/x-cd-image=brasero.desktop +Thunar-folder-handler.desktop +# evince supports multi-page tiff, but most people will prefer ristretto: +image/tiff=ristretto.desktop +# evince supports odp, but we really want OOo +application/vnd.sun.xml.impress=impress.desktop +application/vnd.oasis.opendocument.presentation=impress.desktop + +# Firefox +firefox.desktop + +# OpenOffice +base.desktop +calc.desktop +draw.desktop +impress.desktop +math.desktop +web.desktop +writer.desktop +# Do not prefer writer for text/plain: +text/plain=leafpad.desktop diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-branding-openSUSE-4.10.0/1230/usr/share/xfce/applications/defaults.list new/xfce4-branding-openSUSE-4.10.0/1230/usr/share/xfce/applications/defaults.list --- old/xfce4-branding-openSUSE-4.10.0/1230/usr/share/xfce/applications/defaults.list 1970-01-01 01:00:00.000000000 +0100 +++ new/xfce4-branding-openSUSE-4.10.0/1230/usr/share/xfce/applications/defaults.list 2013-02-01 09:50:46.000000000 +0100 @@ -0,0 +1 @@ +symbolic link to /var/cache/gio-2.0/xfce-defaults.list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/menus/xfce-applications.menu new/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/menus/xfce-applications.menu --- old/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/menus/xfce-applications.menu 1970-01-01 01:00:00.000000000 +0100 +++ new/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/menus/xfce-applications.menu 2012-07-01 11:14:39.000000000 +0200 @@ -0,0 +1,173 @@ +<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN" + "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd"> + +<Menu> + <Name>Xfce</Name> + + <DefaultAppDirs/> + <DefaultDirectoryDirs/> + <DefaultMergeDirs/> + + <Menu> + <Name>Accessories</Name> + <Directory>xfce-accessories.directory</Directory> + <Include> + <And> + <Or> + <Category>Accessibility</Category> + <Category>Core</Category> + <Category>Legacy</Category> + <Category>Utility</Category> + </Or> + <Not> + <Or> + <Category>DiscBurning</Category> + <Category>System</Category> + </Or> + </Not> + </And> + </Include> + <Exclude> + <Category>X-Xfce-Toplevel</Category> + <Category>Settings</Category> + </Exclude> + </Menu> + + <Menu> + <Name>Development</Name> + <Directory>xfce-development.directory</Directory> + <Include> + <Category>Development</Category> + </Include> + </Menu> + + <Menu> + <Name>Education</Name> + <Directory>xfce-education.directory</Directory> + <Include> + <Category>Education</Category> + </Include> + </Menu> + + <Menu> + <Name>Games</Name> + <Directory>xfce-games.directory</Directory> + <Include> + <Category>Game</Category> + </Include> + </Menu> + + <Menu> + <Name>Graphics</Name> + <Directory>xfce-graphics.directory</Directory> + <Include> + <Category>Graphics</Category> + </Include> + </Menu> + + <Menu> + <Name>Multimedia</Name> + <Directory>xfce-multimedia.directory</Directory> + <Include> + <Or> + <Category>Audio</Category> + <Category>Video</Category> + <Category>AudioVideo</Category> + <Category>DiscBurning</Category> + </Or> + </Include> + <Exclude> + <Category>Settings</Category> + </Exclude> + </Menu> + + <Menu> + <Name>Network</Name> + <Directory>xfce-network.directory</Directory> + <Include> + <Category>Network</Category> + </Include> + <Exclude> + <Category>X-Xfce-Toplevel</Category> + </Exclude> + </Menu> + + <Menu> + <Name>Office</Name> + <Directory>xfce-office.directory</Directory> + <Include> + <Category>Office</Category> + </Include> + </Menu> + + <Menu> + <Name>Science</Name> + <Directory>xfce-science.directory</Directory> + <Include> + <Category>Science</Category> + </Include> + </Menu> + + <Menu> + <Name>System</Name> + <Directory>xfce-system.directory</Directory> + <Include> + <Or> + <Category>Emulator</Category> + <Category>System</Category> + </Or> + </Include> + <Exclude> + <Category>X-Xfce-Toplevel</Category> + <Category>Settings</Category> + <Category>PackageManager</Category> + </Exclude> + </Menu> + + <Menu> + <Name>Settings</Name> + <Directory>xfce-settings.directory</Directory> + <Include> + <Filename>xfce-settings-manager.desktop</Filename> + <Filename>YaST.desktop</Filename> + <Filename>package-manager.desktop</Filename> + </Include> + <Layout> + <Filename>xfce-settings-manager.desktop</Filename> + <Filename>YaST.desktop</Filename> + <Filename>package-manager.desktop</Filename> + </Layout> + </Menu> + + <Menu> + <Name>Other</Name> + <Directory>xfce-other.directory</Directory> + <OnlyUnallocated/> + <Include> + <All/> + </Include> + <Exclude> + <Category>Settings</Category> + <Category>PackageManager</Category> + <Category>X-Xfce-Toplevel</Category> + </Exclude> + </Menu> + + <Include> + <Filename>xfce4-run.desktop</Filename> + <Filename>xfce4-about.desktop</Filename> + <Filename>xfce4-session-logout.desktop</Filename> + </Include> + + <Layout> + <Merge type="menus"/> + <Menuname>Other</Menuname> + <Separator/> + <Menuname>Settings</Menuname> + <Separator/> + <Merge type="files"/> + <Filename>xfce4-run.desktop</Filename> + <Filename>xfce4-about.desktop</Filename> + <Filename>xfce4-session-logout.desktop</Filename> + </Layout> +</Menu> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/menus/xfce-settings-manager.menu new/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/menus/xfce-settings-manager.menu --- old/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/menus/xfce-settings-manager.menu 1970-01-01 01:00:00.000000000 +0100 +++ new/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/menus/xfce-settings-manager.menu 2012-07-01 11:14:44.000000000 +0200 @@ -0,0 +1,106 @@ +<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN" + "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd"> + +<Menu> + <Name>Settings</Name> + + <DefaultAppDirs/> + <DefaultDirectoryDirs/> + <DefaultMergeDirs/> + + <Menu> + <Name>Personal</Name> + <Directory>xfce-personal.directory</Directory> + <Include> + <Or> + <And> + <Category>Settings</Category> + <Category>X-XFCE-SettingsDialog</Category> + <Category>X-XFCE-PersonalSettings</Category> + </And> + <And> + <Category>Settings</Category> + <Category>DesktopSettings</Category> + <Not> + <Category>X-XFCE-HardwareSettings</Category> + <Category>X-XFCE-SystemSettings</Category> + </Not> + </And> + </Or> + </Include> + <Exclude> + <Filename>xfce-settings-manager.desktop</Filename> + </Exclude> + </Menu> + + <Menu> + <Name>Hardware</Name> + <Directory>xfce-hardware.directory</Directory> + <Include> + <Or> + <And> + <Category>Settings</Category> + <Category>X-XFCE-SettingsDialog</Category> + <Category>X-XFCE-HardwareSettings</Category> + </And> + <And> + <Category>Settings</Category> + <Category>HardwareSettings</Category> + <Not> + <Category>X-XFCE-PersonalSettings</Category> + <Category>X-XFCE-SystemSettings</Category> + </Not> + </And> + </Or> + </Include> + </Menu> + + <Menu> + <Name>System</Name> + <Directory>xfce-system.directory</Directory> + <Include> + <Or> + <And> + <Category>Settings</Category> + <Category>X-XFCE-SettingsDialog</Category> + <Category>X-XFCE-SystemSettings</Category> + </And> + <And> + <Category>Settings</Category> + <Category>System</Category> + <Not> + <Or> + <Category>X-XFCE-PersonalSettings</Category> + <Category>X-XFCE-HardwareSettings</Category> + <Category>HardwareSettings</Category> + <Category>DesktopSettings</Category> + <Category>X-SuSE-YaST</Category> + </Or> + </Not> + </And> + <Category>PackageManager</Category> + </Or> + </Include> + </Menu> + + <Menu> + <Name>Other</Name> + <Directory>xfce-other.directory</Directory> + <OnlyUnallocated/> + <Include> + <Category>Settings</Category> + </Include> + <Exclude> + <Filename>xfce-settings-manager.desktop</Filename> + <Category>X-SuSE-YaST</Category> + </Exclude> + </Menu> + + <Layout> + <Menuname>Personal</Menuname> + <Menuname>Hardware</Menuname> + <Menuname>System</Menuname> + <Menuname>Other</Menuname> + <Merge type="menus"/> + </Layout> +</Menu> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/midori/config new/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/midori/config --- old/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/midori/config 1970-01-01 01:00:00.000000000 +0100 +++ new/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/midori/config 2012-06-05 09:48:42.000000000 +0200 @@ -0,0 +1,2 @@ +[settings] +homepage=http://www.opensuse.org/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/xfce4/helpers.rc new/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/xfce4/helpers.rc --- old/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/xfce4/helpers.rc 1970-01-01 01:00:00.000000000 +0100 +++ new/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/xfce4/helpers.rc 2013-01-31 18:20:16.000000000 +0100 @@ -0,0 +1,10 @@ +# +# openSUSE helpers.rc for Xfce's Preferred Applications +# +# Copyright (c) 2005-2006 Benedikt Meurer <benny(a)xfce.org> +# + +WebBrowser=firefox +MailReader=thunderbird +TerminalEmulator=xfce4-terminal +FileManager=Thunar diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/thunar-volman.xml new/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/thunar-volman.xml --- old/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/thunar-volman.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/thunar-volman.xml 2012-06-05 09:48:42.000000000 +0200 @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<channel name="thunar-volman" version="1.0"> + <property name="automount-drives" type="empty"> + <property name="enabled" type="bool" value="true"/> + </property> + <property name="automount-media" type="empty"> + <property name="enabled" type="bool" value="true"/> + </property> + <property name="autobrowse" type="empty"> + <property name="enabled" type="bool" value="true"/> + </property> + <property name="autoburn" type="empty"> + <property name="enabled" type="bool" value="true"/> + <property name="data-cd-command" type="string" value="/usr/bin/brasero"/> + <property name="audio-cd-command" type="string" value="/usr/bin/brasero"/> + </property> + <property name="autoplay-audio-cds" type="empty"> + <property name="enabled" type="bool" value="false"/> + <property name="command" type="string" value="/usr/bin/totem cdda://%d"/> + </property> + <property name="autoplay-video-cds" type="empty"> + <property name="command" type="string" value="/usr/bin/totem dvd://%d"/> + <property name="enabled" type="bool" value="false"/> + </property> + <property name="autoipod" type="empty"> + <property name="command" type="string" value="/usr/bin/rhythmbox"/> + <property name="enabled" type="bool" value="false"/> + </property> + <property name="autophoto" type="empty"> + <property name="command" type="string" value="/usr/bin/shotwell"/> + <property name="enabled" type="bool" value="false"/> + </property> +</channel> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml new/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml --- old/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml 2012-06-05 09:48:42.000000000 +0200 @@ -0,0 +1,79 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<channel name="xfce4-keyboard-shortcuts" version="1.0"> + <property name="commands" type="empty"> + <property name="default" type="empty"> + <property name="<Alt>F1" type="string" value="xfce4-popup-applicationsmenu"/> + <property name="<Alt>F2" type="string" value="xfce4-appfinder --collapsed"> + <property name="startup-notify" type="bool" value="true"/> + </property> + <property name="<Alt>F3" type="string" value="xfce4-appfinder"> + <property name="startup-notify" type="bool" value="true"/> + </property> + <property name="<Control><Alt>Delete" type="string" value="xflock4"/> + <property name="XF86Display" type="string" value="xfce4-display-settings --minimal"/> + <property name="<Super>p" type="string" value="xfce4-display-settings --minimal"/> + <property name="<Control>Escape" type="string" value="xfdesktop --menu"/> + <property name="<Alt>Print" type="string" value="xfce4-screenshooter -w"/> + <property name="Print" type="string" value="xfce4-screenshooter -f"/> + <property name="XF86WWW" type="string" value="exo-open --launch WebBrowser"/> + <property name="XF86Mail" type="string" value="exo-open --launch MailReader"/> + </property> + </property> + <property name="xfwm4" type="empty"> + <property name="default" type="empty"> + <property name="<Alt>Insert" type="string" value="add_workspace_key"/> + <property name="Escape" type="string" value="cancel_key"/> + <property name="Left" type="string" value="left_key"/> + <property name="Right" type="string" value="right_key"/> + <property name="Up" type="string" value="up_key"/> + <property name="Down" type="string" value="down_key"/> + <property name="<Alt>Tab" type="string" value="cycle_windows_key"/> + <property name="<Alt><Shift>Tab" type="string" value="cycle_reverse_windows_key"/> + <property name="<Alt>Delete" type="string" value="del_workspace_key"/> + <property name="<Control><Alt>Down" type="string" value="down_workspace_key"/> + <property name="<Control><Alt>Left" type="string" value="left_workspace_key"/> + <property name="<Shift><Alt>Page_Down" type="string" value="lower_window_key"/> + <property name="<Alt>F4" type="string" value="close_window_key"/> + <property name="<Alt>F6" type="string" value="stick_window_key"/> + <property name="<Alt>F7" type="string" value="move_window_key"/> + <property name="<Alt>F8" type="string" value="resize_window_key"/> + <property name="<Alt>F9" type="string" value="hide_window_key"/> + <property name="<Alt>F10" type="string" value="maximize_window_key"/> + <property name="<Alt>F11" type="string" value="fullscreen_key"/> + <property name="<Alt>F12" type="string" value="above_key"/> + <property name="<Control><Shift><Alt>Left" type="string" value="move_window_left_key"/> + <property name="<Alt><Control>End" type="string" value="move_window_next_workspace_key"/> + <property name="<Alt><Control>Home" type="string" value="move_window_prev_workspace_key"/> + <property name="<Control><Shift><Alt>Right" type="string" value="move_window_right_key"/> + <property name="<Control><Shift><Alt>Up" type="string" value="move_window_up_key"/> + <property name="<Alt><Control>KP_1" type="string" value="move_window_workspace_1_key"/> + <property name="<Alt><Control>KP_2" type="string" value="move_window_workspace_2_key"/> + <property name="<Alt><Control>KP_3" type="string" value="move_window_workspace_3_key"/> + <property name="<Alt><Control>KP_4" type="string" value="move_window_workspace_4_key"/> + <property name="<Alt><Control>KP_5" type="string" value="move_window_workspace_5_key"/> + <property name="<Alt><Control>KP_6" type="string" value="move_window_workspace_6_key"/> + <property name="<Alt><Control>KP_7" type="string" value="move_window_workspace_7_key"/> + <property name="<Alt><Control>KP_8" type="string" value="move_window_workspace_8_key"/> + <property name="<Alt><Control>KP_9" type="string" value="move_window_workspace_9_key"/> + <property name="<Alt>space" type="string" value="popup_menu_key"/> + <property name="<Shift><Alt>Page_Up" type="string" value="raise_window_key"/> + <property name="<Control><Alt>Right" type="string" value="right_workspace_key"/> + <property name="<Control><Alt>d" type="string" value="show_desktop_key"/> + <property name="<Control><Alt>Up" type="string" value="up_workspace_key"/> + <property name="<Super>Tab" type="string" value="switch_window_key"/> + <property name="<Control>F1" type="string" value="workspace_1_key"/> + <property name="<Control>F2" type="string" value="workspace_2_key"/> + <property name="<Control>F3" type="string" value="workspace_3_key"/> + <property name="<Control>F4" type="string" value="workspace_4_key"/> + <property name="<Control>F5" type="string" value="workspace_5_key"/> + <property name="<Control>F6" type="string" value="workspace_6_key"/> + <property name="<Control>F7" type="string" value="workspace_7_key"/> + <property name="<Control>F8" type="string" value="workspace_8_key"/> + <property name="<Control>F9" type="string" value="workspace_9_key"/> + <property name="<Control>F10" type="string" value="workspace_10_key"/> + <property name="<Control>F11" type="string" value="workspace_11_key"/> + <property name="<Control>F12" type="string" value="workspace_12_key"/> + </property> + </property> +</channel> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml new/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml --- old/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml 2012-06-05 09:48:42.000000000 +0200 @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<channel name="xfce4-notifyd" version="1.0"> + <property name="notify-location" type="uint" value="3"/> +</channel> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml new/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml --- old/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml 2013-01-31 19:32:57.000000000 +0100 @@ -0,0 +1,69 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<channel name="xfce4-panel" version="1.0"> + <property name="configver" type="int" value="2"/> + <property name="panels" type="array"> + <value type="int" value="1"/> + <property name="panel-1" type="empty"> + <property name="position" type="string" value="p=10;x=0;y=0"/> + <property name="length" type="uint" value="100"/> + <property name="position-locked" type="bool" value="true"/> + <property name="size" type="uint" value="24"/> + <property name="length-adjust" type="bool" value="false"/> + <property name="plugin-ids" type="array"> + <value type="int" value="1"/> + <value type="int" value="2"/> + <value type="int" value="3"/> + <value type="int" value="4"/> + <value type="int" value="5"/> + <value type="int" value="6"/> + <value type="int" value="7"/> + <value type="int" value="8"/> + <value type="int" value="9"/> + <value type="int" value="10"/> + <value type="int" value="11"/> + <value type="int" value="12"/> + </property> + </property> + </property> + <property name="plugins" type="empty"> + <property name="plugin-1" type="string" value="applicationsmenu"> + <property name="button-icon" type="string" value="xfce4-opensuse-dark"/> + <property name="button-title" type="string" value="openSUSE"/> + <property name="show-tooltips" type="bool" value="true"/> + </property> + <property name="plugin-2" type="string" value="separator"/> + <property name="plugin-3" type="string" value="showdesktop"/> + <property name="plugin-4" type="string" value="tasklist"/> + <property name="plugin-5" type="string" value="separator"> + <property name="expand" type="bool" value="true"/> + <property name="style" type="uint" value="0"/> + </property> + <property name="plugin-6" type="string" value="mixer"/> + <property name="plugin-7" type="string" value="systray"> + <property name="show-frame" type="bool" value="false"/> + </property> + <property name="plugin-8" type="string" value="pager"/> + <property name="plugin-9" type="string" value="separator"/> + <property name="plugin-10" type="string" value="clock"> + <property name="show-frame" type="bool" value="false"/> + </property> + <property name="plugin-11" type="string" value="separator"/> + <property name="plugin-12" type="string" value="actions"> + <property name="items" type="array"> + <value type="string" value="+lock-screen"/> + <value type="string" value="+switch-user"/> + <value type="string" value="+logout-dialog"/> + <value type="string" value="+separator"/> + <value type="string" value="+suspend"/> + <value type="string" value="+hibernate"/> + <value type="string" value="+separator"/> + <value type="string" value="+restart"/> + <value type="string" value="+shutdown"/> + <value type="string" value="-separator"/> + <value type="string" value="-logout"/> + </property> + <property name="appearance" type="uint" value="1"/> + </property> + </property> +</channel> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml new/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml --- old/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml 2012-10-22 17:04:20.000000000 +0200 @@ -0,0 +1,50 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<channel name="xfce4-session" version="1.0"> + <property name="general" type="empty"> + <property name="FailsafeSessionName" type="string" value="Failsafe"/> + <property name="SaveOnExit" type="bool" value="false"/> + <property name="AutoSave" type="bool" value="false"/> + </property> + <property name="sessions" type="empty"> + <property name="Failsafe" type="empty"> + <property name="IsFailsafe" type="bool" value="true"/> + <property name="Count" type="int" value="5"/> + <property name="Client0_Command" type="array"> + <value type="string" value="xfwm4"/> + </property> + <property name="Client0_PerScreen" type="bool" value="false"/> + <property name="Client1_Command" type="array"> + <value type="string" value="xfsettingsd"/> + </property> + <property name="Client1_PerScreen" type="bool" value="false"/> + <property name="Client2_Command" type="array"> + <value type="string" value="xfce4-panel"/> + </property> + <property name="Client2_PerScreen" type="bool" value="false"/> + <property name="Client3_Command" type="array"> + <value type="string" value="Thunar"/> + <value type="string" value="--daemon"/> + </property> + <property name="Client3_PerScreen" type="bool" value="false"/> + <property name="Client4_Command" type="array"> + <value type="string" value="xfdesktop"/> + </property> + <property name="Client4_PerScreen" type="bool" value="false"/> + </property> + </property> + <property name="splash" type="empty"> + <property name="Engine" type="string" value="simple"/> + <property name="engines" type="empty"> + <property name="simple" type="empty"> + <property name="Font" type="string" value="Sans 10"/> + <property name="BgColor" type="string" value="#D5DAD5"/> + <property name="FgColor" type="string" value="#000000"/> + <property name="Image" type="string" value="/usr/share/pixmaps/xfce4-splash-openSUSE.png"/> + </property> + </property> + </property> + <property name="compat" type="empty"> + <property name="LaunchGNOME" type="bool" value="true"/> + </property> +</channel> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml new/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml --- old/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml 2012-06-05 09:48:42.000000000 +0200 @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<channel name="xfwm4" version="1.0"> + <property name="general" type="empty"> + <property name="theme" type="string" value="Kelabu"/> + <property name="title_font" type="string" value="Sans Bold 10"/> + <property name="double_click_time" type="int" value="400"/> + <property name="use_compositing" type="bool" value="true"/> + <property name="show_dock_shadow" type="bool" value="false"/> + <property name="show_frame_shadow" type="bool" value="true"/> + <property name="show_popup_shadow" type="bool" value="true"/> + <property name="workspace_count" type="int" value="2"/> + <property name="wrap_windows" type="bool" value="false"/> + <property name="tile_on_move" type="bool" value="true"/> + </property> +</channel> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml new/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml --- old/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml 2012-06-05 09:48:42.000000000 +0200 @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<channel name="xsettings" version="1.0"> + <property name="Net" type="empty"> + <property name="ThemeName" type="string" value="Adwaita"/> + <property name="IconThemeName" type="string" value="openSUSE-Xfce"/> + </property> + <property name="Xft" type="empty"> + <property name="DPI" type="int" value="-1"/> + <property name="Antialias" type="int" value="1"/> + <property name="Hinting" type="int" value="-1"/> + <property name="HintStyle" type="string" value="hintfull"/> + <property name="RGBA" type="string" value="none"/> + </property> + <property name="Gtk" type="empty"> + <property name="CursorThemeName" type="string" value="Adwaita"/> + </property> +</channel> Files old/xfce4-branding-openSUSE-4.10.0/base/usr/share/pixmaps/xfce4-opensuse-dark.png and new/xfce4-branding-openSUSE-4.10.0/base/usr/share/pixmaps/xfce4-opensuse-dark.png differ Files old/xfce4-branding-openSUSE-4.10.0/base/usr/share/pixmaps/xfce4-opensuse-light.png and new/xfce4-branding-openSUSE-4.10.0/base/usr/share/pixmaps/xfce4-opensuse-light.png differ Files old/xfce4-branding-openSUSE-4.10.0/base/usr/share/pixmaps/xfce4-suse.png and new/xfce4-branding-openSUSE-4.10.0/base/usr/share/pixmaps/xfce4-suse.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-branding-openSUSE-4.10.0/base/usr/share/wallpapers/xfce/default.wallpaper new/xfce4-branding-openSUSE-4.10.0/base/usr/share/wallpapers/xfce/default.wallpaper --- old/xfce4-branding-openSUSE-4.10.0/base/usr/share/wallpapers/xfce/default.wallpaper 1970-01-01 01:00:00.000000000 +0100 +++ new/xfce4-branding-openSUSE-4.10.0/base/usr/share/wallpapers/xfce/default.wallpaper 2013-02-01 09:50:46.000000000 +0100 @@ -0,0 +1 @@ +symbolic link to /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-branding-openSUSE-4.10.0/etc/xdg/menus/xfce-applications.menu new/xfce4-branding-openSUSE-4.10.0/etc/xdg/menus/xfce-applications.menu --- old/xfce4-branding-openSUSE-4.10.0/etc/xdg/menus/xfce-applications.menu 2012-07-01 11:14:39.000000000 +0200 +++ new/xfce4-branding-openSUSE-4.10.0/etc/xdg/menus/xfce-applications.menu 1970-01-01 01:00:00.000000000 +0100 @@ -1,173 +0,0 @@ -<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN" - "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd"> - -<Menu> - <Name>Xfce</Name> - - <DefaultAppDirs/> - <DefaultDirectoryDirs/> - <DefaultMergeDirs/> - - <Menu> - <Name>Accessories</Name> - <Directory>xfce-accessories.directory</Directory> - <Include> - <And> - <Or> - <Category>Accessibility</Category> - <Category>Core</Category> - <Category>Legacy</Category> - <Category>Utility</Category> - </Or> - <Not> - <Or> - <Category>DiscBurning</Category> - <Category>System</Category> - </Or> - </Not> - </And> - </Include> - <Exclude> - <Category>X-Xfce-Toplevel</Category> - <Category>Settings</Category> - </Exclude> - </Menu> - - <Menu> - <Name>Development</Name> - <Directory>xfce-development.directory</Directory> - <Include> - <Category>Development</Category> - </Include> - </Menu> - - <Menu> - <Name>Education</Name> - <Directory>xfce-education.directory</Directory> - <Include> - <Category>Education</Category> - </Include> - </Menu> - - <Menu> - <Name>Games</Name> - <Directory>xfce-games.directory</Directory> - <Include> - <Category>Game</Category> - </Include> - </Menu> - - <Menu> - <Name>Graphics</Name> - <Directory>xfce-graphics.directory</Directory> - <Include> - <Category>Graphics</Category> - </Include> - </Menu> - - <Menu> - <Name>Multimedia</Name> - <Directory>xfce-multimedia.directory</Directory> - <Include> - <Or> - <Category>Audio</Category> - <Category>Video</Category> - <Category>AudioVideo</Category> - <Category>DiscBurning</Category> - </Or> - </Include> - <Exclude> - <Category>Settings</Category> - </Exclude> - </Menu> - - <Menu> - <Name>Network</Name> - <Directory>xfce-network.directory</Directory> - <Include> - <Category>Network</Category> - </Include> - <Exclude> - <Category>X-Xfce-Toplevel</Category> - </Exclude> - </Menu> - - <Menu> - <Name>Office</Name> - <Directory>xfce-office.directory</Directory> - <Include> - <Category>Office</Category> - </Include> - </Menu> - - <Menu> - <Name>Science</Name> - <Directory>xfce-science.directory</Directory> - <Include> - <Category>Science</Category> - </Include> - </Menu> - - <Menu> - <Name>System</Name> - <Directory>xfce-system.directory</Directory> - <Include> - <Or> - <Category>Emulator</Category> - <Category>System</Category> - </Or> - </Include> - <Exclude> - <Category>X-Xfce-Toplevel</Category> - <Category>Settings</Category> - <Category>PackageManager</Category> - </Exclude> - </Menu> - - <Menu> - <Name>Settings</Name> - <Directory>xfce-settings.directory</Directory> - <Include> - <Filename>xfce-settings-manager.desktop</Filename> - <Filename>YaST.desktop</Filename> - <Filename>package-manager.desktop</Filename> - </Include> - <Layout> - <Filename>xfce-settings-manager.desktop</Filename> - <Filename>YaST.desktop</Filename> - <Filename>package-manager.desktop</Filename> - </Layout> - </Menu> - - <Menu> - <Name>Other</Name> - <Directory>xfce-other.directory</Directory> - <OnlyUnallocated/> - <Include> - <All/> - </Include> - <Exclude> - <Category>Settings</Category> - <Category>PackageManager</Category> - <Category>X-Xfce-Toplevel</Category> - </Exclude> - </Menu> - - <Include> - <Filename>xfce4-run.desktop</Filename> - <Filename>xfce4-about.desktop</Filename> - <Filename>xfce4-session-logout.desktop</Filename> - </Include> - - <Layout> - <Merge type="menus"/> - <Menuname>Other</Menuname> - <Separator/> - <Menuname>Settings</Menuname> - <Separator/> - <Merge type="files"/> - <Filename>xfce4-run.desktop</Filename> - <Filename>xfce4-about.desktop</Filename> - <Filename>xfce4-session-logout.desktop</Filename> - </Layout> -</Menu> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-branding-openSUSE-4.10.0/etc/xdg/menus/xfce-settings-manager.menu new/xfce4-branding-openSUSE-4.10.0/etc/xdg/menus/xfce-settings-manager.menu --- old/xfce4-branding-openSUSE-4.10.0/etc/xdg/menus/xfce-settings-manager.menu 2012-07-01 11:14:44.000000000 +0200 +++ new/xfce4-branding-openSUSE-4.10.0/etc/xdg/menus/xfce-settings-manager.menu 1970-01-01 01:00:00.000000000 +0100 @@ -1,106 +0,0 @@ -<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN" - "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd"> - -<Menu> - <Name>Settings</Name> - - <DefaultAppDirs/> - <DefaultDirectoryDirs/> - <DefaultMergeDirs/> - - <Menu> - <Name>Personal</Name> - <Directory>xfce-personal.directory</Directory> - <Include> - <Or> - <And> - <Category>Settings</Category> - <Category>X-XFCE-SettingsDialog</Category> - <Category>X-XFCE-PersonalSettings</Category> - </And> - <And> - <Category>Settings</Category> - <Category>DesktopSettings</Category> - <Not> - <Category>X-XFCE-HardwareSettings</Category> - <Category>X-XFCE-SystemSettings</Category> - </Not> - </And> - </Or> - </Include> - <Exclude> - <Filename>xfce-settings-manager.desktop</Filename> - </Exclude> - </Menu> - - <Menu> - <Name>Hardware</Name> - <Directory>xfce-hardware.directory</Directory> - <Include> - <Or> - <And> - <Category>Settings</Category> - <Category>X-XFCE-SettingsDialog</Category> - <Category>X-XFCE-HardwareSettings</Category> - </And> - <And> - <Category>Settings</Category> - <Category>HardwareSettings</Category> - <Not> - <Category>X-XFCE-PersonalSettings</Category> - <Category>X-XFCE-SystemSettings</Category> - </Not> - </And> - </Or> - </Include> - </Menu> - - <Menu> - <Name>System</Name> - <Directory>xfce-system.directory</Directory> - <Include> - <Or> - <And> - <Category>Settings</Category> - <Category>X-XFCE-SettingsDialog</Category> - <Category>X-XFCE-SystemSettings</Category> - </And> - <And> - <Category>Settings</Category> - <Category>System</Category> - <Not> - <Or> - <Category>X-XFCE-PersonalSettings</Category> - <Category>X-XFCE-HardwareSettings</Category> - <Category>HardwareSettings</Category> - <Category>DesktopSettings</Category> - <Category>X-SuSE-YaST</Category> - </Or> - </Not> - </And> - <Category>PackageManager</Category> - </Or> - </Include> - </Menu> - - <Menu> - <Name>Other</Name> - <Directory>xfce-other.directory</Directory> - <OnlyUnallocated/> - <Include> - <Category>Settings</Category> - </Include> - <Exclude> - <Filename>xfce-settings-manager.desktop</Filename> - <Category>X-SuSE-YaST</Category> - </Exclude> - </Menu> - - <Layout> - <Menuname>Personal</Menuname> - <Menuname>Hardware</Menuname> - <Menuname>System</Menuname> - <Menuname>Other</Menuname> - <Merge type="menus"/> - </Layout> -</Menu> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-branding-openSUSE-4.10.0/etc/xdg/midori/config new/xfce4-branding-openSUSE-4.10.0/etc/xdg/midori/config --- old/xfce4-branding-openSUSE-4.10.0/etc/xdg/midori/config 2012-06-05 09:48:42.000000000 +0200 +++ new/xfce4-branding-openSUSE-4.10.0/etc/xdg/midori/config 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -[settings] -homepage=http://www.opensuse.org/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-branding-openSUSE-4.10.0/etc/xdg/xfce4/helpers.rc new/xfce4-branding-openSUSE-4.10.0/etc/xdg/xfce4/helpers.rc --- old/xfce4-branding-openSUSE-4.10.0/etc/xdg/xfce4/helpers.rc 2012-06-05 09:48:42.000000000 +0200 +++ new/xfce4-branding-openSUSE-4.10.0/etc/xdg/xfce4/helpers.rc 1970-01-01 01:00:00.000000000 +0100 @@ -1,10 +0,0 @@ -# -# openSUSE helpers.rc for Xfce's Preferred Applications -# -# Copyright (c) 2005-2006 Benedikt Meurer <benny(a)xfce.org> -# - -WebBrowser=firefox -MailReader=thunderbird -TerminalEmulator=Terminal -FileManager=Thunar diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-branding-openSUSE-4.10.0/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/thunar-volman.xml new/xfce4-branding-openSUSE-4.10.0/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/thunar-volman.xml --- old/xfce4-branding-openSUSE-4.10.0/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/thunar-volman.xml 2012-06-05 09:48:42.000000000 +0200 +++ new/xfce4-branding-openSUSE-4.10.0/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/thunar-volman.xml 1970-01-01 01:00:00.000000000 +0100 @@ -1,34 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<channel name="thunar-volman" version="1.0"> - <property name="automount-drives" type="empty"> - <property name="enabled" type="bool" value="true"/> - </property> - <property name="automount-media" type="empty"> - <property name="enabled" type="bool" value="true"/> - </property> - <property name="autobrowse" type="empty"> - <property name="enabled" type="bool" value="true"/> - </property> - <property name="autoburn" type="empty"> - <property name="enabled" type="bool" value="true"/> - <property name="data-cd-command" type="string" value="/usr/bin/brasero"/> - <property name="audio-cd-command" type="string" value="/usr/bin/brasero"/> - </property> - <property name="autoplay-audio-cds" type="empty"> - <property name="enabled" type="bool" value="false"/> - <property name="command" type="string" value="/usr/bin/totem cdda://%d"/> - </property> - <property name="autoplay-video-cds" type="empty"> - <property name="command" type="string" value="/usr/bin/totem dvd://%d"/> - <property name="enabled" type="bool" value="false"/> - </property> - <property name="autoipod" type="empty"> - <property name="command" type="string" value="/usr/bin/rhythmbox"/> - <property name="enabled" type="bool" value="false"/> - </property> - <property name="autophoto" type="empty"> - <property name="command" type="string" value="/usr/bin/shotwell"/> - <property name="enabled" type="bool" value="false"/> - </property> -</channel> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-branding-openSUSE-4.10.0/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml new/xfce4-branding-openSUSE-4.10.0/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml --- old/xfce4-branding-openSUSE-4.10.0/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml 2012-06-05 09:48:42.000000000 +0200 +++ new/xfce4-branding-openSUSE-4.10.0/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml 1970-01-01 01:00:00.000000000 +0100 @@ -1,79 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<channel name="xfce4-keyboard-shortcuts" version="1.0"> - <property name="commands" type="empty"> - <property name="default" type="empty"> - <property name="<Alt>F1" type="string" value="xfce4-popup-applicationsmenu"/> - <property name="<Alt>F2" type="string" value="xfce4-appfinder --collapsed"> - <property name="startup-notify" type="bool" value="true"/> - </property> - <property name="<Alt>F3" type="string" value="xfce4-appfinder"> - <property name="startup-notify" type="bool" value="true"/> - </property> - <property name="<Control><Alt>Delete" type="string" value="xflock4"/> - <property name="XF86Display" type="string" value="xfce4-display-settings --minimal"/> - <property name="<Super>p" type="string" value="xfce4-display-settings --minimal"/> - <property name="<Control>Escape" type="string" value="xfdesktop --menu"/> - <property name="<Alt>Print" type="string" value="xfce4-screenshooter -w"/> - <property name="Print" type="string" value="xfce4-screenshooter -f"/> - <property name="XF86WWW" type="string" value="exo-open --launch WebBrowser"/> - <property name="XF86Mail" type="string" value="exo-open --launch MailReader"/> - </property> - </property> - <property name="xfwm4" type="empty"> - <property name="default" type="empty"> - <property name="<Alt>Insert" type="string" value="add_workspace_key"/> - <property name="Escape" type="string" value="cancel_key"/> - <property name="Left" type="string" value="left_key"/> - <property name="Right" type="string" value="right_key"/> - <property name="Up" type="string" value="up_key"/> - <property name="Down" type="string" value="down_key"/> - <property name="<Alt>Tab" type="string" value="cycle_windows_key"/> - <property name="<Alt><Shift>Tab" type="string" value="cycle_reverse_windows_key"/> - <property name="<Alt>Delete" type="string" value="del_workspace_key"/> - <property name="<Control><Alt>Down" type="string" value="down_workspace_key"/> - <property name="<Control><Alt>Left" type="string" value="left_workspace_key"/> - <property name="<Shift><Alt>Page_Down" type="string" value="lower_window_key"/> - <property name="<Alt>F4" type="string" value="close_window_key"/> - <property name="<Alt>F6" type="string" value="stick_window_key"/> - <property name="<Alt>F7" type="string" value="move_window_key"/> - <property name="<Alt>F8" type="string" value="resize_window_key"/> - <property name="<Alt>F9" type="string" value="hide_window_key"/> - <property name="<Alt>F10" type="string" value="maximize_window_key"/> - <property name="<Alt>F11" type="string" value="fullscreen_key"/> - <property name="<Alt>F12" type="string" value="above_key"/> - <property name="<Control><Shift><Alt>Left" type="string" value="move_window_left_key"/> - <property name="<Alt><Control>End" type="string" value="move_window_next_workspace_key"/> - <property name="<Alt><Control>Home" type="string" value="move_window_prev_workspace_key"/> - <property name="<Control><Shift><Alt>Right" type="string" value="move_window_right_key"/> - <property name="<Control><Shift><Alt>Up" type="string" value="move_window_up_key"/> - <property name="<Alt><Control>KP_1" type="string" value="move_window_workspace_1_key"/> - <property name="<Alt><Control>KP_2" type="string" value="move_window_workspace_2_key"/> - <property name="<Alt><Control>KP_3" type="string" value="move_window_workspace_3_key"/> - <property name="<Alt><Control>KP_4" type="string" value="move_window_workspace_4_key"/> - <property name="<Alt><Control>KP_5" type="string" value="move_window_workspace_5_key"/> - <property name="<Alt><Control>KP_6" type="string" value="move_window_workspace_6_key"/> - <property name="<Alt><Control>KP_7" type="string" value="move_window_workspace_7_key"/> - <property name="<Alt><Control>KP_8" type="string" value="move_window_workspace_8_key"/> - <property name="<Alt><Control>KP_9" type="string" value="move_window_workspace_9_key"/> - <property name="<Alt>space" type="string" value="popup_menu_key"/> - <property name="<Shift><Alt>Page_Up" type="string" value="raise_window_key"/> - <property name="<Control><Alt>Right" type="string" value="right_workspace_key"/> - <property name="<Control><Alt>d" type="string" value="show_desktop_key"/> - <property name="<Control><Alt>Up" type="string" value="up_workspace_key"/> - <property name="<Super>Tab" type="string" value="switch_window_key"/> - <property name="<Control>F1" type="string" value="workspace_1_key"/> - <property name="<Control>F2" type="string" value="workspace_2_key"/> - <property name="<Control>F3" type="string" value="workspace_3_key"/> - <property name="<Control>F4" type="string" value="workspace_4_key"/> - <property name="<Control>F5" type="string" value="workspace_5_key"/> - <property name="<Control>F6" type="string" value="workspace_6_key"/> - <property name="<Control>F7" type="string" value="workspace_7_key"/> - <property name="<Control>F8" type="string" value="workspace_8_key"/> - <property name="<Control>F9" type="string" value="workspace_9_key"/> - <property name="<Control>F10" type="string" value="workspace_10_key"/> - <property name="<Control>F11" type="string" value="workspace_11_key"/> - <property name="<Control>F12" type="string" value="workspace_12_key"/> - </property> - </property> -</channel> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-branding-openSUSE-4.10.0/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml new/xfce4-branding-openSUSE-4.10.0/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml --- old/xfce4-branding-openSUSE-4.10.0/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml 2012-06-05 09:48:42.000000000 +0200 +++ new/xfce4-branding-openSUSE-4.10.0/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml 1970-01-01 01:00:00.000000000 +0100 @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<channel name="xfce4-notifyd" version="1.0"> - <property name="notify-location" type="uint" value="3"/> -</channel> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-branding-openSUSE-4.10.0/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml new/xfce4-branding-openSUSE-4.10.0/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml --- old/xfce4-branding-openSUSE-4.10.0/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml 2012-06-23 16:01:55.000000000 +0200 +++ new/xfce4-branding-openSUSE-4.10.0/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml 1970-01-01 01:00:00.000000000 +0100 @@ -1,69 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<channel name="xfce4-panel" version="1.0"> - <property name="configver" type="int" value="2"/> - <property name="panels" type="array"> - <value type="int" value="1"/> - <property name="panel-1" type="empty"> - <property name="position" type="string" value="p=10;x=0;y=0"/> - <property name="length" type="uint" value="100"/> - <property name="position-locked" type="bool" value="true"/> - <property name="size" type="uint" value="24"/> - <property name="length-adjust" type="bool" value="false"/> - <property name="plugin-ids" type="array"> - <value type="int" value="1"/> - <value type="int" value="2"/> - <value type="int" value="3"/> - <value type="int" value="4"/> - <value type="int" value="5"/> - <value type="int" value="6"/> - <value type="int" value="7"/> - <value type="int" value="8"/> - <value type="int" value="9"/> - <value type="int" value="10"/> - <value type="int" value="11"/> - <value type="int" value="12"/> - </property> - </property> - </property> - <property name="plugins" type="empty"> - <property name="plugin-1" type="string" value="applicationsmenu"> - <property name="button-icon" type="string" value="xfce4-opensuse-dark"/> - <property name="button-title" type="string" value="openSUSE"/> - <property name="show-tooltips" type="bool" value="true"/> - </property> - <property name="plugin-2" type="string" value="separator"/> - <property name="plugin-3" type="string" value="showdesktop"/> - <property name="plugin-4" type="string" value="tasklist"/> - <property name="plugin-5" type="string" value="separator"> - <property name="expand" type="bool" value="true"/> - <property name="style" type="uint" value="0"/> - </property> - <property name="plugin-6" type="string" value="xfce4-mixer-plugin"/> - <property name="plugin-7" type="string" value="systray"> - <property name="show-frame" type="bool" value="false"/> - </property> - <property name="plugin-8" type="string" value="pager"/> - <property name="plugin-9" type="string" value="separator"/> - <property name="plugin-10" type="string" value="clock"> - <property name="show-frame" type="bool" value="false"/> - </property> - <property name="plugin-11" type="string" value="separator"/> - <property name="plugin-12" type="string" value="actions"> - <property name="items" type="array"> - <value type="string" value="+lock-screen"/> - <value type="string" value="+switch-user"/> - <value type="string" value="+logout-dialog"/> - <value type="string" value="+separator"/> - <value type="string" value="+suspend"/> - <value type="string" value="+hibernate"/> - <value type="string" value="+separator"/> - <value type="string" value="+restart"/> - <value type="string" value="+shutdown"/> - <value type="string" value="-separator"/> - <value type="string" value="-logout"/> - </property> - <property name="appearance" type="uint" value="1"/> - </property> - </property> -</channel> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-branding-openSUSE-4.10.0/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml new/xfce4-branding-openSUSE-4.10.0/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml --- old/xfce4-branding-openSUSE-4.10.0/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml 2012-10-22 17:04:20.000000000 +0200 +++ new/xfce4-branding-openSUSE-4.10.0/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml 1970-01-01 01:00:00.000000000 +0100 @@ -1,50 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<channel name="xfce4-session" version="1.0"> - <property name="general" type="empty"> - <property name="FailsafeSessionName" type="string" value="Failsafe"/> - <property name="SaveOnExit" type="bool" value="false"/> - <property name="AutoSave" type="bool" value="false"/> - </property> - <property name="sessions" type="empty"> - <property name="Failsafe" type="empty"> - <property name="IsFailsafe" type="bool" value="true"/> - <property name="Count" type="int" value="5"/> - <property name="Client0_Command" type="array"> - <value type="string" value="xfwm4"/> - </property> - <property name="Client0_PerScreen" type="bool" value="false"/> - <property name="Client1_Command" type="array"> - <value type="string" value="xfsettingsd"/> - </property> - <property name="Client1_PerScreen" type="bool" value="false"/> - <property name="Client2_Command" type="array"> - <value type="string" value="xfce4-panel"/> - </property> - <property name="Client2_PerScreen" type="bool" value="false"/> - <property name="Client3_Command" type="array"> - <value type="string" value="Thunar"/> - <value type="string" value="--daemon"/> - </property> - <property name="Client3_PerScreen" type="bool" value="false"/> - <property name="Client4_Command" type="array"> - <value type="string" value="xfdesktop"/> - </property> - <property name="Client4_PerScreen" type="bool" value="false"/> - </property> - </property> - <property name="splash" type="empty"> - <property name="Engine" type="string" value="simple"/> - <property name="engines" type="empty"> - <property name="simple" type="empty"> - <property name="Font" type="string" value="Sans 10"/> - <property name="BgColor" type="string" value="#D5DAD5"/> - <property name="FgColor" type="string" value="#000000"/> - <property name="Image" type="string" value="/usr/share/pixmaps/xfce4-splash-openSUSE.png"/> - </property> - </property> - </property> - <property name="compat" type="empty"> - <property name="LaunchGNOME" type="bool" value="true"/> - </property> -</channel> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-branding-openSUSE-4.10.0/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml new/xfce4-branding-openSUSE-4.10.0/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml --- old/xfce4-branding-openSUSE-4.10.0/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml 2012-06-05 09:48:42.000000000 +0200 +++ new/xfce4-branding-openSUSE-4.10.0/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml 1970-01-01 01:00:00.000000000 +0100 @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<channel name="xfwm4" version="1.0"> - <property name="general" type="empty"> - <property name="theme" type="string" value="Kelabu"/> - <property name="title_font" type="string" value="Sans Bold 10"/> - <property name="double_click_time" type="int" value="400"/> - <property name="use_compositing" type="bool" value="true"/> - <property name="show_dock_shadow" type="bool" value="false"/> - <property name="show_frame_shadow" type="bool" value="true"/> - <property name="show_popup_shadow" type="bool" value="true"/> - <property name="workspace_count" type="int" value="2"/> - <property name="wrap_windows" type="bool" value="false"/> - <property name="tile_on_move" type="bool" value="true"/> - </property> -</channel> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-branding-openSUSE-4.10.0/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml new/xfce4-branding-openSUSE-4.10.0/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml --- old/xfce4-branding-openSUSE-4.10.0/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml 2012-06-05 09:48:42.000000000 +0200 +++ new/xfce4-branding-openSUSE-4.10.0/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml 1970-01-01 01:00:00.000000000 +0100 @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<channel name="xsettings" version="1.0"> - <property name="Net" type="empty"> - <property name="ThemeName" type="string" value="Adwaita"/> - <property name="IconThemeName" type="string" value="openSUSE-Xfce"/> - </property> - <property name="Xft" type="empty"> - <property name="DPI" type="int" value="-1"/> - <property name="Antialias" type="int" value="1"/> - <property name="Hinting" type="int" value="-1"/> - <property name="HintStyle" type="string" value="hintfull"/> - <property name="RGBA" type="string" value="none"/> - </property> - <property name="Gtk" type="empty"> - <property name="CursorThemeName" type="string" value="Adwaita"/> - </property> -</channel> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-branding-openSUSE-4.10.0/etc/xfce_defaults.conf new/xfce4-branding-openSUSE-4.10.0/etc/xfce_defaults.conf --- old/xfce4-branding-openSUSE-4.10.0/etc/xfce_defaults.conf 2012-10-04 15:06:48.000000000 +0200 +++ new/xfce4-branding-openSUSE-4.10.0/etc/xfce_defaults.conf 1970-01-01 01:00:00.000000000 +0100 @@ -1,73 +0,0 @@ -# Xfce Default Applications Source -# /etc/xfcer_defaults.conf -# -# After any change of this file run -# suse-update-mime-defaults -# -# This list is a source for defaults.list. -# -# If application in this list is installed, it is used as default in GNOME. -# It works in following way: -# 1. Read this file. -# 2. Collect all available desktop files. -# 3. Go through all declared MIME types and search for default application -# for defaults.list in following order: -# 3.1 Installed application listed here for certain MIME type. -# 3.2 Installed application listed here as preferred default. -# 3.3 Installed application listed here as default. -# 3.4 Installed application with GNOME in Categories. -# 3.5 Installed application with GTK in Categories. -# 3.6 Installed application. -# If there are more applications in the same order, it uses pseudo-randomly -# one of them (last in aplhabetical order). -# -# Syntax: -# Use xxx as default for all MIME types it declares (see 3.3): -# xxx.desktop -# Use xxx as preferred default for all MIME types it declares (see 3.2): -# !xxx.desktop -# Use xxx as default for mime/type (see 3.1): -# mime/type=xxx.desktop - -# URI schemes -x-scheme-handler/http=firefox.desktop -x-scheme-handler/https=firefox.desktop -x-scheme-handler/ftp=firefox.desktop -x-scheme-handler/mailto=thunderbird.desktop -# All URI schemes declared by yelp -yelp.desktop - -# Prefer totem for multimedia where possible -!totem.desktop - -# Prefer Install Software over file-roller -application/x-rpm=package-manager.desktop -!gpk-install-file.desktop - -# Xfce default applications -ristretto.desktop -evince.desktop -leafpad.desktop -file-roller.desktop -# file-roller supports iso, but most people will prefer brasero: -application/x-cd-image=brasero.desktop -Thunar-folder-handler.desktop -# evince supports multi-page tiff, but most people will prefer ristretto: -image/tiff=ristretto.desktop -# evince supports odp, but we really want OOo -application/vnd.sun.xml.impress=impress.desktop -application/vnd.oasis.opendocument.presentation=impress.desktop - -# Firefox -firefox.desktop - -# OpenOffice -base.desktop -calc.desktop -draw.desktop -impress.desktop -math.desktop -web.desktop -writer.desktop -# Do not prefer writer for text/plain: -text/plain=leafpad.desktop Files old/xfce4-branding-openSUSE-4.10.0/usr/share/pixmaps/xfce4-opensuse-dark.png and new/xfce4-branding-openSUSE-4.10.0/usr/share/pixmaps/xfce4-opensuse-dark.png differ Files old/xfce4-branding-openSUSE-4.10.0/usr/share/pixmaps/xfce4-opensuse-light.png and new/xfce4-branding-openSUSE-4.10.0/usr/share/pixmaps/xfce4-opensuse-light.png differ Files old/xfce4-branding-openSUSE-4.10.0/usr/share/pixmaps/xfce4-suse.png and new/xfce4-branding-openSUSE-4.10.0/usr/share/pixmaps/xfce4-suse.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-branding-openSUSE-4.10.0/usr/share/wallpapers/xfce/default.wallpaper new/xfce4-branding-openSUSE-4.10.0/usr/share/wallpapers/xfce/default.wallpaper --- old/xfce4-branding-openSUSE-4.10.0/usr/share/wallpapers/xfce/default.wallpaper 2013-02-01 09:50:46.000000000 +0100 +++ new/xfce4-branding-openSUSE-4.10.0/usr/share/wallpapers/xfce/default.wallpaper 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -symbolic link to /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit stellarium for openSUSE:Factory
by root＠hilbert.suse.de 01 Feb '13

01 Feb '13

Hello community, here is the log from the commit of package stellarium for openSUSE:Factory checked in at 2013-02-01 09:49:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/stellarium (Old) and /work/SRC/openSUSE:Factory/.stellarium.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "stellarium", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/stellarium/stellarium.changes 2012-10-16 12:03:38.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.stellarium.new/stellarium.changes 2013-02-01 09:49:57.000000000 +0100 @@ -1,0 +2,44 @@ +Thu Jan 31 15:55:43 UTC 2013 - badshah400(a)gmail.com + +- Update to version 0.12.0: + + New features: + - New rendering engine (LP: #673183) + - Editable keybindings (LP: #1098851, #1035635, #832256, + #789002) + - Scripting for plugins (LP: #1040242) + - Some transneptunian objects (LP: #899084, #1051205) + - New geographical locations (LP: #1051803) + - New textures for DSO + - DeltaT and lunar acceleration computation (LP: #575621) + + Improvements: + - Improving the scripting engine (LP: #1059368) + - Improving the plugins (LP: #1082167, #1042714) + - Improving the coordinate grids (LP: #1036294) + - Improving the constellation boundaries (LP: #1039072) + - Improving the search tool + + Bug fixes: + - Clang Wself-assign warning during build process on some + platforms (LP: #1097358) + - Bugs in Observability plugin (LP: #1042059, #1054599, + #1053058) + - Bugs in TUI plugin (LP: #1083380) + - Bugs in Satellites plugin (LP: #1048220) + - Bugs in Compass plugin (LP: #695891) + - Bugs in scripting engine (LP: #1046518, #1092781) + - Font corruption bugs (LP: #597633, #778747, #819278, + #903310) + - Screen flashing in fullscreen mode (LP: #716695, #824788) + - Lost nebula images (LP: #1042393, #1051038) + - Bugs in Night Vision mode (LP: #578367) + - Bugs in GUI and Core (LP: #1090722, #1082510, #1071455, + #1071458, #1056868, #1054600, #1045111, #1040944, #1077545) + - Crashes (LP: #1043640, #1044654, #1045783) +- Drop outdated user guide from package, and corresponding + .desktop file (the user guide is now on the wiki + http://www.stellarium.org/wiki/index.php/Stellarium_User_Guide) +- Drop build dependency on ImageMagick, as the install script now + automatically installs prepackaged icons in the hicolor + directory +- Require qt >= 4.8 and cmake >= 2.8.7 for building. + +------------------------------------------------------------------- @@ -22 +66 @@ - - Various Stellarium freezes and crashed (LP: #1005155, + - Various Stellarium freezes and crashes (LP: #1005155, Old: ---- stellarium-0.11.4.tar.gz stellarium_user_guide-0.10.2-1.pdf stellarium_user_guide.desktop New: ---- stellarium-0.12.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ stellarium.spec ++++++ --- /var/tmp/diff_new_pack.ArY2Ej/_old 2013-02-01 09:50:03.000000000 +0100 +++ /var/tmp/diff_new_pack.ArY2Ej/_new 2013-02-01 09:50:03.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package stellarium # -# 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 @@ -17,22 +17,19 @@ Name: stellarium -Version: 0.11.4 +Version: 0.12.0 Release: 0 Summary: Astronomical Sky Simulator License: GPL-2.0+ Group: Productivity/Scientific/Astronomy Url: http://stellarium.sourceforge.net Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -Source1: stellarium_user_guide-0.10.2-1.pdf -Source2: stellarium_user_guide.desktop -BuildRequires: ImageMagick BuildRequires: Mesa-devel -BuildRequires: cmake +BuildRequires: cmake >= 2.8.7 BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: hicolor-icon-theme -BuildRequires: libqt4-devel >= 4.6 +BuildRequires: libqt4-devel >= 4.8 BuildRequires: phonon-devel BuildRequires: update-desktop-files BuildRequires: zlib-devel @@ -47,11 +44,6 @@ %prep %setup -q -install -p -m644 %{S:1} stellarium_user_guide.pdf - -# This creates 5 png images with res from 64x64 down to 16x16 -# named from %%{name}-0.png to %%{name}-4.png respectively, all of which we install. -convert data/%{name}.ico %{name}.png # Remove Apache licensed file used only for Windows builds and not needed here anyway # See bnc#766373 @@ -65,20 +57,12 @@ %install make install DESTDIR=%{?buildroot} -install -p -D -m0644 %{name}-0.png %{buildroot}%{_datadir}/icons/hicolor/64x64/apps/%{name}.png -install -p -D -m0644 %{name}-1.png %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/%{name}.png -install -p -D -m0644 %{name}-2.png %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/%{name}.png -install -p -D -m0644 %{name}-3.png %{buildroot}%{_datadir}/icons/hicolor/24x24/apps/%{name}.png -install -p -D -m0644 %{name}-4.png %{buildroot}%{_datadir}/icons/hicolor/16x16/apps/%{name}.png # Remove .xpm icon from /usr/share/pixmaps as we already # install appropriate icons in the hicolor directory rm %{buildroot}%{_datadir}/pixmaps/%{name}.xpm %suse_update_desktop_file -c stellarium Stellarium "Planetarium in your computer" stellarium stellarium Science Astronomy -%suse_update_desktop_file -n -i stellarium_user_guide -# entry for susehelp -%{__install} -pDm 644 %{S:2} %{buildroot}/%{_datadir}/susehelp/meta/Stellarium/stellarium_user_guide.desktop mkdir -p %{buildroot}/%{_datadir}/stellarium/data/script_internet_update %fdupes %{buildroot} @@ -102,15 +86,13 @@ %files -f %{name}.lang %defattr(-,root,root,755) -%doc AUTHORS ChangeLog COPYING README stellarium_user_guide.pdf -%dir %{_datadir}/susehelp/ -%dir %{_datadir}/susehelp/meta -%dir %{_datadir}/susehelp/meta/Stellarium +%doc AUTHORS ChangeLog COPYING README +%dir %{_datadir}/icons/hicolor/512x512/ +%dir %{_datadir}/icons/hicolor/512x512/apps/ %{_bindir}/%{name} %{_datadir}/%{name} %{_datadir}/applications/%{name}*.desktop %{_datadir}/icons/hicolor/*/apps/%{name}.* -%{_datadir}/susehelp/meta/Stellarium/stellarium_user_guide.desktop %{_mandir}/man1/%{name}.1%{ext_man} %changelog ++++++ stellarium-0.11.4.tar.gz -> stellarium-0.12.0.tar.gz ++++++ /work/SRC/openSUSE:Factory/stellarium/stellarium-0.11.4.tar.gz /work/SRC/openSUSE:Factory/.stellarium.new/stellarium-0.12.0.tar.gz differ: char 5, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit package-translations for openSUSE:12.3
by root＠hilbert.suse.de 01 Feb '13

01 Feb '13

Hello community, here is the log from the commit of package package-translations for openSUSE:12.3 checked in at 2013-02-01 09:49:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3/package-translations (Old) and /work/SRC/openSUSE:12.3/.package-translations.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "package-translations", Maintainer is "coolo(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:12.3/package-translations/package-translations.changes 2013-01-31 01:29:53.000000000 +0100 +++ /work/SRC/openSUSE:12.3/.package-translations.new/package-translations.changes 2013-02-01 09:49:50.000000000 +0100 @@ -2 +2 @@ -Wed Jan 30 16:13:49 CET 2013 - <coolo(a)suse.com> +Thu Jan 31 16:13:50 CET 2013 - <coolo(a)suse.com> @@ -4 +4 @@ -- automated update on 2013-01-30 +- automated update on 2013-01-31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ package-translations.tar.bz2 ++++++ Files old/mo/package-translations-ja.mo and new/mo/package-translations-ja.mo differ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit package-translations for openSUSE:Factory
by root＠hilbert.suse.de 01 Feb '13

01 Feb '13

Hello community, here is the log from the commit of package package-translations for openSUSE:Factory checked in at 2013-02-01 09:49:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/package-translations (Old) and /work/SRC/openSUSE:Factory/.package-translations.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "package-translations", Maintainer is "coolo(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/package-translations/package-translations.changes 2013-01-30 22:23:15.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.package-translations.new/package-translations.changes 2013-02-01 09:49:42.000000000 +0100 @@ -2 +2 @@ -Wed Jan 30 16:13:49 CET 2013 - <coolo(a)suse.com> +Thu Jan 31 16:13:50 CET 2013 - <coolo(a)suse.com> @@ -4 +4 @@ -- automated update on 2013-01-30 +- automated update on 2013-01-31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ package-translations.tar.bz2 ++++++ Files old/mo/package-translations-ja.mo and new/mo/package-translations-ja.mo differ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit osc for openSUSE:Factory
by root＠hilbert.suse.de 01 Feb '13

01 Feb '13

Hello community, here is the log from the commit of package osc for openSUSE:Factory checked in at 2013-02-01 09:49:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/osc (Old) and /work/SRC/openSUSE:Factory/.osc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "osc", Maintainer is "adrian(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/osc/osc.changes 2012-12-05 14:01:20.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.osc.new/osc.changes 2013-02-01 09:49:26.000000000 +0100 @@ -1,0 +2,11 @@ +Thu Jan 31 15:45:58 UTC 2013 - adrian(a)suse.com + +- update to 0.138.0: + - add support to remove repositories recursively (mostly only usefull for admins) + - submitrequest: old not anymore used maintenance code got removed. It is possible now + to create one request to submit all changed packages of an project in + one request. Just run "osc sr" in the checked out project directory. + - disable keyring usage by default. print warning about misconfigured keyrings. + - prdiff: new command to diff entire projects + +------------------------------------------------------------------- Old: ---- osc-0.137.0.tar.gz New: ---- osc-0.138.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ osc.spec ++++++ --- /var/tmp/diff_new_pack.KGh0Hd/_old 2013-02-01 09:49:27.000000000 +0100 +++ /var/tmp/diff_new_pack.KGh0Hd/_new 2013-02-01 09:49:27.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package osc # -# 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 @@ -17,7 +17,7 @@ Name: osc -Version: 0.137.0 +Version: 0.138.0 Release: 0 Summary: openSUSE Build Service Commander License: GPL-2.0+ ++++++ _service ++++++ --- /var/tmp/diff_new_pack.KGh0Hd/_old 2013-02-01 09:49:27.000000000 +0100 +++ /var/tmp/diff_new_pack.KGh0Hd/_new 2013-02-01 09:49:27.000000000 +0100 @@ -1,6 +1,6 @@ <services> <service name="tar_scm" mode="disabled"> - <param name="version">0.137.0</param> + <param name="version">0.138.0</param> <param name="url">git://github.com/openSUSE/osc.git</param> <param name="scm">git</param> </service> ++++++ osc-0.137.0.tar.gz -> osc-0.138.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.137.0/.travis.yml new/osc-0.138.0/.travis.yml --- old/osc-0.137.0/.travis.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/osc-0.138.0/.travis.yml 2013-01-31 16:46:36.000000000 +0100 @@ -0,0 +1,7 @@ +language: python +python: + - "2.7" +before_install: + - sudo apt-get update -qq + - sudo apt-get install -qq diffstat +script: cd tests; python suite.py diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.137.0/NEWS new/osc-0.138.0/NEWS --- old/osc-0.137.0/NEWS 2012-12-04 16:45:58.000000000 +0100 +++ new/osc-0.138.0/NEWS 2013-01-31 16:46:36.000000000 +0100 @@ -1,3 +1,11 @@ +0.138 + - add support to remove repositories recursively (mostly only usefull for admins) + - submitrequest: old not anymore used maintenance code got removed. It is possible now + to create one request to submit all changed packages of an project in + one request. Just run "osc sr" in the checked out project directory. + - disable keyring usage by default. print warning about misconfigured keyrings. + - prdiff: new command to diff entire projects + 0.137 - support single binary download via getbinaries command - support to set the bugowner diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.137.0/osc/commandline.py new/osc-0.138.0/osc/commandline.py --- old/osc-0.137.0/osc/commandline.py 2012-12-04 16:45:58.000000000 +0100 +++ new/osc-0.138.0/osc/commandline.py 2013-01-31 16:46:36.000000000 +0100 @@ -548,6 +548,8 @@ help='edit metadata') @cmdln.option('-c', '--create', action='store_true', help='create attribute without values') + @cmdln.option('-R', '--remove-linking-repositories', action='store_true', + help='Try to remove also all repositories building against remove ones.') @cmdln.option('-s', '--set', metavar='ATTRIBUTE_VALUES', help='set attribute values') @cmdln.option('--delete', action='store_true', @@ -697,6 +699,7 @@ edit_meta(metatype='prj', edit=True, force=opts.force, + remove_linking_repositories=opts.remove_linking_repositories, path_args=quote_plus(project), apiurl=apiurl, template_args=({ @@ -762,6 +765,7 @@ data=f, edit=opts.edit, force=opts.force, + remove_linking_repositories=opts.remove_linking_repositories, apiurl=apiurl, path_args=quote_plus(project)) elif cmd == 'pkg': @@ -819,6 +823,8 @@ @cmdln.option('--nodevelproject', action='store_true', help='do not follow a defined devel project ' \ '(primary project where a package is developed)') + @cmdln.option('--seperate-requests', action='store_true', + help='Create multiple request instead of a single one (when command is used for entire project)') @cmdln.option('--cleanup', action='store_true', help='remove package if submission gets accepted (default for home:<id>:branch projects)') @cmdln.option('--no-cleanup', action='store_true', @@ -866,6 +872,10 @@ elif opts.no_update: src_update = "noupdate" + myreqs = [] + if opts.supersede: + myreqs = [opts.supersede] + args = slash_split(args) # remove this block later again @@ -885,94 +895,74 @@ if len(args) > 4: raise oscerr.WrongArgs('Too many arguments.') - if len(args) > 0 and len(args) <= 2 and is_project_dir(os.getcwd()): - sys.exit('osc submitrequest from project directory is only working without target specs and for source linked files\n') + if len(args) == 2 and is_project_dir(os.getcwd()): + sys.exit('You can not specify a target package when submitting an entire project\n') apiurl = self.get_api_url() - if len(args) == 0 and is_project_dir(os.getcwd()): + if len(args) < 2 and is_project_dir(os.getcwd()): import cgi - # submit requests for multiple packages are currently handled via multiple requests - # They could be also one request with multiple actions, but that avoids to accepts parts of it. project = store_read_project(os.curdir) sr_ids = [] - pi = [] - pac = [] - targetprojects = [] + # for single request + actionxml = "" + options_block="" + if src_update: + options_block="""<options><sourceupdate>%s</sourceupdate></options> """ % (src_update) + # loop via all packages for checking their state for p in meta_get_packagelist(apiurl, project): - if p.startswith("_patchinfo:") or p.startswith("patchinfo"): - pi.append(p) - else: - # get _link info from server, that knows about the local state ... - u = makeurl(apiurl, ['source', project, p]) - f = http_GET(u) - root = ET.parse(f).getroot() - linkinfo = root.find('linkinfo') - if linkinfo == None: - print "Package ", p, " is not a source link." + print "XXX", p + # get _link info from server, that knows about the local state ... + u = makeurl(apiurl, ['source', project, p]) + f = http_GET(u) + root = ET.parse(f).getroot() + if len(args) == 1: + target_project = args[0] + linkinfo = root.find('linkinfo') + if linkinfo == None: + if len(args) < 1: + print "Package ", p, " is not a source link and no target specified." sys.exit("This is currently not supported.") + else: if linkinfo.get('error'): print "Package ", p, " is a broken source link." sys.exit("Please fix this first") t = linkinfo.get('project') if t: + if target_project == None: + target_project = t if len(root.findall('entry')) > 1: # This is not really correct, but should work mostly # Real fix is to ask the api if sources are modificated # but there is no such call yet. - targetprojects.append(t) - pac.append(p) print "Submitting package ", p else: - print " Skipping package ", p + print " Skipping not modified package ", p + next else: print "Skipping package ", p, " since it is a source link pointing inside the project." - serviceinfo = root.find('serviceinfo') - if serviceinfo != None: - if serviceinfo.get('code') != "succeeded": - print "Package ", p, " has a ", serviceinfo.get('code'), " source service" - sys.exit("Please fix this first") - if serviceinfo.get('error'): - print "Package ", p, " contains a failed source service." - sys.exit("Please fix this first") - - # was this project created by clone request ? - u = makeurl(apiurl, ['source', project, '_attribute', 'OBS:RequestCloned']) - f = http_GET(u) - root = ET.parse(f).getroot() - value = root.findtext('attribute/value') - myreqs = {} - if value: - myreqs = [ value ] - - if not opts.yes: - if pi: - print "Submitting patchinfo ", ', '.join(pi), " to ", ', '.join(targetprojects) - repl = raw_input('\nEverything fine? Can we create the requests ? (y/n) ') - if repl.lower() != 'y': - print >>sys.stderr, 'Aborted...' - raise oscerr.UserAbort() - + next - # loop via all packages to do the action - for p in pac: - result = create_submit_request(apiurl, project, p) - if not result: -# sys.exit(result) - sys.exit("submit request creation failed") - sr_ids.append(result) - - # create submit requests for all found patchinfos - actionxml="" - options_block="" - if src_update: - options_block="""<options><sourceupdate>%s</sourceupdate></options> """ % (src_update) + serviceinfo = root.find('serviceinfo') + if serviceinfo != None: + if serviceinfo.get('code') != "succeeded": + print "Package ", p, " has a ", serviceinfo.get('code'), " source service" + sys.exit("Please fix this first") + if serviceinfo.get('error'): + print "Package ", p, " contains a failed source service." + sys.exit("Please fix this first") - for p in pi: - for t in targetprojects: + # submitting this package + if opts.seperate_requests: + # create a single request + result = create_submit_request(apiurl, project, p) + if not result: + sys.exit("submit request creation failed") + sr_ids.append(result) + else: s = """<action type="submit"> <source project="%s" package="%s" /> <target project="%s" package="%s" /> %s </action>""" % \ - (project, p, t, p, options_block) + (project, p, t, p, options_block) actionxml += s if actionxml != "": @@ -984,18 +974,26 @@ root = ET.parse(f).getroot() sr_ids.append(root.get('id')) - print "Requests created: ", + print "Request created: ", for i in sr_ids: print i, - repl = '' - if len(myreqs) > 0 and not opts.supersede: + # was this project created by clone request ? + u = makeurl(apiurl, ['source', project, '_attribute', 'OBS:RequestCloned']) + f = http_GET(u) + root = ET.parse(f).getroot() + value = root.findtext('attribute/value') + if value: + repl = '' print '\n\nThere are already following submit request: %s.' % \ ', '.join([str(i) for i in myreqs ]) repl = raw_input('\nSupersede the old requests? (y/n) ') if repl.lower() == 'y': - for req in myreqs: - change_request_state(apiurl, str(req), 'superseded', + myreqs += [ value ] + + if len(myreqs) > 0: + for req in myreqs: + change_request_state(apiurl, str(req), 'superseded', 'superseded by %s' % result, result) sys.exit('Successfully finished') @@ -3507,6 +3505,158 @@ run_pager(rdiff) + def _get_branch_parent(self, prj): + m = re.match('^home:[^:]+:branches:(.+)', prj) + # OBS_Maintained is a special case + if m and prj.find(':branches:OBS_Maintained:') == -1: + return m.group(1) + return None + + def _prdiff_skip_package(self, opts, pkg): + if opts.exclude and re.search(opts.exclude, pkg): + return True + + if opts.include and not re.search(opts.include, pkg): + return True + + return False + + def _prdiff_output_diff(self, opts, rdiff): + if opts.diffstat: + print + p = subprocess.Popen("diffstat", + stdin=subprocess.PIPE, + stdout=subprocess.PIPE, + close_fds=True) + p.stdin.write(rdiff) + p.stdin.close() + diffstat = "".join(p.stdout.readlines()) + print diffstat + elif opts.unified: + print + print rdiff + #run_pager(rdiff) + + def _prdiff_output_matching_requests(self, opts, requests, + srcprj, pkg): + """ + Search through the given list of requests and output any + submitrequests which target pkg and originate from srcprj. + """ + for req in requests: + for action in req.get_actions('submit'): + if action.src_project != srcprj: + continue + + if action.tgt_package != pkg: + continue + + print + print req.list_view() + break + + @cmdln.alias('projectdiff') + @cmdln.alias('projdiff') + @cmdln.option('-r', '--requests', action='store_true', + help='show open requests for any packages with differences') + @cmdln.option('-e', '--exclude', metavar='REGEXP', dest='exclude', + help='skip packages matching REGEXP') + @cmdln.option('-i', '--include', metavar='REGEXP', dest='include', + help='only consider packages matching REGEXP') + @cmdln.option('-n', '--show-not-in-old', action='store_true', + help='show packages only in the new project') + @cmdln.option('-o', '--show-not-in-new', action='store_true', + help='show packages only in the old project') + @cmdln.option('-u', '--unified', action='store_true', + help='show full unified diffs of differences') + @cmdln.option('-d', '--diffstat', action='store_true', + help='show diffstat of differences') + + def do_prdiff(self, subcmd, opts, *args): + """${cmd_name}: Server-side diff of two projects + + Compares two projects and either summarises or outputs the + differences in full. In the second form, a project is compared + with one of its branches inside a home:$USER project (the branch + is treated as NEWPRJ). The home branch is optional if the current + working directory is a checked out copy of it. + + Usage: + osc prdiff [OPTIONS] OLDPRJ NEWPRJ + osc prdiff [OPTIONS] [home:$USER:branch:$PRJ] + + ${cmd_option_list} + """ + + if len(args) > 2: + raise oscerr.WrongArgs('Too many arguments.') + + if len(args) == 0: + if is_project_dir(os.curdir): + newprj = Project('.', getPackageList=False).name + oldprj = self._get_branch_parent(newprj) + if oldprj is None: + raise oscerr.WrongArgs('Current directory is not a valid home branch.') + else: + raise oscerr.WrongArgs('Current directory is not a project.') + elif len(args) == 1: + newprj = args[0] + oldprj = self._get_branch_parent(newprj) + if oldprj is None: + raise oscerr.WrongArgs('Single-argument form must be for a home branch.') + elif len(args) == 2: + oldprj, newprj = args + else: + raise RuntimeError('BUG in argument parsing, please report.\n' + 'args: ' + repr(args)) + + if opts.diffstat and opts.unified: + print >>sys.stderr, 'error - cannot specify both --diffstat and --unified' + sys.exit(1) + + apiurl = self.get_api_url() + + old_packages = meta_get_packagelist(apiurl, oldprj) + new_packages = meta_get_packagelist(apiurl, newprj) + + if opts.requests: + requests = get_request_list(apiurl, project=oldprj, + req_state=('new', 'review')) + + for pkg in old_packages: + if self._prdiff_skip_package(opts, pkg): + continue + + if pkg not in new_packages: + if opts.show_not_in_new: + print "old only: %s" % pkg + continue + + rdiff = server_diff_noex( + apiurl, + oldprj, pkg, None, + newprj, pkg, None, + unified=True, missingok=False, meta=False, expand=True + ) + + if rdiff: + print "differs: %s" % pkg + self._prdiff_output_diff(opts, rdiff) + + if opts.requests: + self._prdiff_output_matching_requests(opts, requests, + newprj, pkg) + else: + print "identical: %s" % pkg + + for pkg in new_packages: + if self._prdiff_skip_package(opts, pkg): + continue + + if pkg not in old_packages: + if opts.show_not_in_old: + print "new only: %s" % pkg + @cmdln.hide(1) @cmdln.alias('in') def do_install(self, subcmd, opts, *args): @@ -4380,6 +4530,8 @@ help='hide the legend') @cmdln.option('-c', '--csv', action='store_true', help='csv output') + @cmdln.option('', '--xml', action='store_true', default=False, + help='generate output in XML') @cmdln.option('-s', '--status-filter', metavar='STATUS', help='show only packages with buildstatus STATUS (see legend)') @cmdln.option('-n', '--name-filter', metavar='EXPR', @@ -4413,6 +4565,10 @@ wd = os.curdir project = store_read_project(wd) + if opts.xml: + print ''.join(show_prj_results_meta(apiurl, project)) + return + print '\n'.join(get_prj_results(apiurl, project, hide_legend=opts.hide_legend, csv=opts.csv, status_filter=opts.status_filter, name_filter=opts.name_filter, repo=opts.repo, arch=opts.arch, vertical=opts.vertical, show_excluded=opts.show_excluded)) @@ -4435,6 +4591,8 @@ @cmdln.alias('buildlogtail') @cmdln.option('-o', '--offset', metavar='OFFSET', help='get log start or end from the offset') + @cmdln.option('-s', '--strip-time', action='store_true', + help='strip leading build time from the log') def do_buildlog(self, subcmd, opts, *args): """${cmd_name}: Shows the build log of a package @@ -4485,8 +4643,8 @@ offset=0 elif opts.offset: offset = int(opts.offset) - - print_buildlog(apiurl, project, package, repository, arch, offset) + strip_time = opts.strip_time or conf.config['buildlog_strip_time'] + print_buildlog(apiurl, project, package, repository, arch, offset, strip_time) def print_repos(self, repos_only=False, exc_class=oscerr.WrongArgs, exc_msg='Missing arguments'): @@ -4515,6 +4673,8 @@ @cmdln.alias('remotebuildlogtail') @cmdln.option('-o', '--offset', metavar='OFFSET', help='get log starting or ending from the offset') + @cmdln.option('-s', '--strip-time', action='store_true', + help='strip leading build time from the log') def do_remotebuildlog(self, subcmd, opts, *args): """${cmd_name}: Shows the build log of a package @@ -4558,12 +4718,14 @@ offset=0 elif opts.offset: offset = int(opts.offset) - - print_buildlog(apiurl, project, package, repository, arch, offset) + strip_time = opts.strip_time or conf.config['buildlog_strip_time'] + print_buildlog(apiurl, project, package, repository, arch, offset, strip_time) @cmdln.alias('lbl') @cmdln.option('-o', '--offset', metavar='OFFSET', help='get log starting from offset') + @cmdln.option('-s', '--strip-time', action='store_true', + help='strip leading build time from the log') def do_localbuildlog(self, subcmd, opts, *args): """${cmd_name}: Shows the build log of a local buildchroot @@ -4616,6 +4778,8 @@ f.seek(offset) data = f.read(BUFSIZE) while len(data): + if opts.strip_time or conf.config['buildlog_strip_time']: + data = buildlog_strip_time(data) sys.stdout.write(data) data = f.read(BUFSIZE) f.close() @@ -6495,6 +6659,7 @@ if opts.bugowner_only or opts.bugowner or opts.set_bugowner or opts.set_bugowner_request or subcmd == 'bugowner': roles = [ 'bugowner' ] + args = slash_split(args) if len(args) == 0: try: pac = store_read_package('.') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.137.0/osc/conf.py new/osc-0.138.0/osc/conf.py --- old/osc-0.137.0/osc/conf.py 2012-12-04 16:45:58.000000000 +0100 +++ new/osc-0.138.0/osc/conf.py 2013-01-31 16:46:36.000000000 +0100 @@ -103,6 +103,8 @@ 'builtin_signature_check': '1', # by default use builtin check for verify pkgs 'icecream': '0', + 'buildlog_strip_time': '0', # strips the build time from the build log + 'debug': '0', 'http_debug': '0', 'http_full_debug': '0', @@ -110,8 +112,8 @@ 'verbose': '1', 'traceback': '0', 'post_mortem': '0', - 'use_keyring': '1', - 'gnome_keyring': '1', + 'use_keyring': '0', + 'gnome_keyring': '0', 'cookiejar': '~/.osc_cookiejar', # fallback for osc build option --no-verify 'no_verify': '0', @@ -165,7 +167,7 @@ boolean_opts = ['debug', 'do_package_tracking', 'http_debug', 'post_mortem', 'traceback', 'check_filelist', 'plaintext_passwd', 'checkout_no_colon', 'checkout_rooted', 'check_for_request_on_action', 'linkcontrol', 'show_download_progress', 'request_show_interactive', 'review_inherit_group', 'use_keyring', 'gnome_keyring', 'no_verify', 'builtin_signature_check', 'http_full_debug', - 'include_request_from_project', 'local_service_run'] + 'include_request_from_project', 'local_service_run', 'buildlog_strip_time'] api_host_options = ['user', 'pass', 'passx', 'aliases', 'http_headers', 'email', 'sslcertck', 'cafile', 'capath', 'trusted_prj'] @@ -232,6 +234,9 @@ # This should not be 0 # build-uid = +# strip leading build time information from the build log +# buildlog_strip_time = 1 + # extra packages to install when building packages locally (osc build) # this corresponds to osc build's -x option and can be overridden with that # -x '' can also be given on the command line to override this setting, or @@ -851,6 +856,9 @@ if not config['plaintext_passwd']: password = passwordx + if password is None or len(password) == 0: + print >>sys.stderr, 'no password defined for ', url, '.\nPlease fix your keyring entry or python-keyring setup.' + if cp.has_option(url, 'http_headers'): http_headers = cp.get(url, 'http_headers') http_headers = http_header_regexp.findall(http_headers) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.137.0/osc/core.py new/osc-0.138.0/osc/core.py --- old/osc-0.137.0/osc/core.py 2012-12-04 16:45:58.000000000 +0100 +++ new/osc-0.138.0/osc/core.py 2013-01-31 16:46:36.000000000 +0100 @@ -3,7 +3,7 @@ # and distributed under the terms of the GNU General Public Licence, # either version 2, or version 3 (at your option). -__version__ = '0.137' +__version__ = '0.138' # __store_version__ is to be incremented when the format of the working copy # "store" changes in an incompatible way. Please add any needed migration @@ -466,11 +466,73 @@ elem.tail = i class Project: - """represent a project directory, holding packages""" + """ + Represent a checked out project directory, holding packages. + + :Attributes: + ``dir`` + The directory path containing the project. + + ``name`` + The name of the project. + + ``apiurl`` + The endpoint URL of the API server. + + ``pacs_available`` + List of names of packages available server-side. + This is only populated if ``getPackageList`` is set + to ``True`` in the constructor. + + ``pacs_have`` + List of names of packages which exist server-side + and exist in the local project working copy (if + 'do_package_tracking' is disabled). + If 'do_package_tracking' is enabled it represents the + list names of packages which are tracked in the project + working copy (that is it might contain packages which + exist on the server as well as packages which do not + exist on the server (for instance if the local package + was added or if the package was removed on the server-side)). + + ``pacs_excluded`` + List of names of packages in the local project directory + which are excluded by the `exclude_glob` configuration + variable. Only set if `do_package_tracking` is enabled. + + ``pacs_unvers`` + List of names of packages in the local project directory + which are not tracked. Only set if `do_package_tracking` + is enabled. + + ``pacs_broken`` + List of names of packages which are tracked but do not + exist in the local project working copy. Only set if + `do_package_tracking` is enabled. + + ``pacs_missing`` + List of names of packages which exist server-side but + are not expected to exist in the local project directory. + """ + REQ_STOREFILES = ('_project', '_apiurl') if conf.config['do_package_tracking']: REQ_STOREFILES += ('_packages',) + def __init__(self, dir, getPackageList=True, progress_obj=None, wc_check=True): + """ + Constructor. + + :Parameters: + `dir` : str + The directory path containing the checked out project. + + `getPackageList` : bool + Set to `False` if you want to skip retrieval from the + server of the list of packages in the project . + + `wc_check` : bool + """ import fnmatch self.dir = dir self.absdir = os.path.abspath(dir) @@ -609,6 +671,10 @@ ET.SubElement(self.pac_root, 'package', name=name, state=state) def read_packages(self): + """ + Returns an ``xml.etree.cElementTree`` object representing the + parsed contents of the project's ``.osc/_packages`` XML file. + """ global store packages_file = os.path.join(self.absdir, store, '_packages') @@ -3160,7 +3226,7 @@ return data -def make_meta_url(metatype, path_args=None, apiurl=None, force=False): +def make_meta_url(metatype, path_args=None, apiurl=None, force=False, remove_linking_repositories=False): global metatypes if not apiurl: @@ -3175,6 +3241,8 @@ query = {} if force: query = { 'force': '1' } + if remove_linking_repositories: + query['remove_linking_repositories'] = '1' return makeurl(apiurl, [path], query) @@ -3185,6 +3253,7 @@ template_args=None, edit=False, force=False, + remove_linking_repositories=False, change_is_required=False, apiurl=None): @@ -3202,7 +3271,7 @@ if edit: change_is_required = True - url = make_meta_url(metatype, path_args, apiurl, force) + url = make_meta_url(metatype, path_args, apiurl, force, remove_linking_repositories) f=metafile(url, data, change_is_required, metatypes[metatype]['file_ext']) if edit: @@ -5089,7 +5158,13 @@ raise oscerr.OscIOError(None, 'Content-Length is not matching file size for %s: %i vs %i file size' % (url, cl, read)) -def print_buildlog(apiurl, prj, package, repository, arch, offset = 0): +def buildlog_strip_time(data): + """Strips the leading build time from the log""" + time_regex = re.compile('^\[\s{0,5}\d+s\]\s', re.M) + return time_regex.sub('', data) + + +def print_buildlog(apiurl, prj, package, repository, arch, offset=0, strip_time=False): """prints out the buildlog on stdout""" # to protect us against control characters @@ -5104,6 +5179,8 @@ u = makeurl(apiurl, ['build', prj, repository, arch, package, '_log'], query=query) for data in streamfile(u): offset += len(data) + if strip_time: + data = buildlog_strip_time(data) sys.stdout.write(data.translate(all_bytes, remove_bytes)) if start_offset == offset: break diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.137.0/tests/common.py new/osc-0.138.0/tests/common.py --- old/osc-0.137.0/tests/common.py 2012-12-04 16:45:58.000000000 +0100 +++ new/osc-0.138.0/tests/common.py 2013-01-31 16:46:36.000000000 +0100 @@ -106,7 +106,11 @@ class OscTestCase(unittest.TestCase): def setUp(self, copytree=True): - osc.core.conf.get_config(override_conffile=os.path.join(self._get_fixtures_dir(), 'oscrc')) + oscrc = os.path.join(self._get_fixtures_dir(), 'oscrc') + osc.core.conf.get_config(override_conffile=oscrc, + override_no_keyring=True, override_no_gnome_keyring=True) + os.environ['OSC_CONFIG'] = oscrc + self.tmpdir = tempfile.mkdtemp(prefix='osc_test') if copytree: shutil.copytree(os.path.join(self._get_fixtures_dir(), 'osctest'), os.path.join(self.tmpdir, 'osctest')) @@ -156,3 +160,13 @@ continue self.assertTrue(os.path.exists(os.path.join('.osc', i.get('name')))) self.assertEqual(osc.core.dgst(os.path.join('.osc', i.get('name'))), i.get('md5')) + + def assertEqualMultiline(self, got, exp): + if (got + exp).find('\n') == -1: + self.assertEqual(got, exp) + else: + start_delim = "\n" + (" 8< ".join(["-----"] * 8)) + "\n" + end_delim = "\n" + (" >8 ".join(["-----"] * 8)) + "\n\n" + self.assertEqual(got, exp, + "got:" + start_delim + got + end_delim + + "expected:" + start_delim + exp + end_delim) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.137.0/tests/prdiff_fixtures/common-two-diff new/osc-0.138.0/tests/prdiff_fixtures/common-two-diff --- old/osc-0.137.0/tests/prdiff_fixtures/common-two-diff 1970-01-01 01:00:00.000000000 +0100 +++ new/osc-0.138.0/tests/prdiff_fixtures/common-two-diff 2013-01-31 16:46:36.000000000 +0100 @@ -0,0 +1,10 @@ +Index: common-two +=================================================================== +--- common-two 2013-01-18 19:18:38.225983117 +0000 ++++ common-two 2013-01-18 19:19:27.882082325 +0000 +@@ -1,4 +1,5 @@ + line one + line two + line three ++an extra line + last line diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.137.0/tests/prdiff_fixtures/home:user:branches:some:project/.osc/_apiurl new/osc-0.138.0/tests/prdiff_fixtures/home:user:branches:some:project/.osc/_apiurl --- old/osc-0.137.0/tests/prdiff_fixtures/home:user:branches:some:project/.osc/_apiurl 1970-01-01 01:00:00.000000000 +0100 +++ new/osc-0.138.0/tests/prdiff_fixtures/home:user:branches:some:project/.osc/_apiurl 2013-01-31 16:46:36.000000000 +0100 @@ -0,0 +1 @@ +http://localhost diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.137.0/tests/prdiff_fixtures/home:user:branches:some:project/.osc/_packages new/osc-0.138.0/tests/prdiff_fixtures/home:user:branches:some:project/.osc/_packages --- old/osc-0.137.0/tests/prdiff_fixtures/home:user:branches:some:project/.osc/_packages 1970-01-01 01:00:00.000000000 +0100 +++ new/osc-0.138.0/tests/prdiff_fixtures/home:user:branches:some:project/.osc/_packages 2013-01-31 16:46:36.000000000 +0100 @@ -0,0 +1,4 @@ +<project name="home:user:branches:some:project"> + <package name="common-one" state=" " /> + <package name="common-two" state=" " /> +</project> \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.137.0/tests/prdiff_fixtures/home:user:branches:some:project/.osc/_project new/osc-0.138.0/tests/prdiff_fixtures/home:user:branches:some:project/.osc/_project --- old/osc-0.137.0/tests/prdiff_fixtures/home:user:branches:some:project/.osc/_project 1970-01-01 01:00:00.000000000 +0100 +++ new/osc-0.138.0/tests/prdiff_fixtures/home:user:branches:some:project/.osc/_project 2013-01-31 16:46:36.000000000 +0100 @@ -0,0 +1 @@ +home:user:branches:some:project diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.137.0/tests/prdiff_fixtures/home:user:branches:some:project/common-two new/osc-0.138.0/tests/prdiff_fixtures/home:user:branches:some:project/common-two --- old/osc-0.137.0/tests/prdiff_fixtures/home:user:branches:some:project/common-two 1970-01-01 01:00:00.000000000 +0100 +++ new/osc-0.138.0/tests/prdiff_fixtures/home:user:branches:some:project/common-two 2013-01-31 16:46:36.000000000 +0100 @@ -0,0 +1,5 @@ +line one +line two +line three +an extra line +last line \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.137.0/tests/prdiff_fixtures/home:user:branches:some:project/directory new/osc-0.138.0/tests/prdiff_fixtures/home:user:branches:some:project/directory --- old/osc-0.137.0/tests/prdiff_fixtures/home:user:branches:some:project/directory 1970-01-01 01:00:00.000000000 +0100 +++ new/osc-0.138.0/tests/prdiff_fixtures/home:user:branches:some:project/directory 2013-01-31 16:46:36.000000000 +0100 @@ -0,0 +1,6 @@ +<directory count='4'> + <entry name="common-one"/> + <entry name="common-two"/> + <entry name="common-three"/> + <entry name="only-in-new"/> +</directory> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.137.0/tests/prdiff_fixtures/new:prj/common-two new/osc-0.138.0/tests/prdiff_fixtures/new:prj/common-two --- old/osc-0.137.0/tests/prdiff_fixtures/new:prj/common-two 1970-01-01 01:00:00.000000000 +0100 +++ new/osc-0.138.0/tests/prdiff_fixtures/new:prj/common-two 2013-01-31 16:46:36.000000000 +0100 @@ -0,0 +1,5 @@ +line one +line two +line three +an extra line +last line \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.137.0/tests/prdiff_fixtures/new:prj/directory new/osc-0.138.0/tests/prdiff_fixtures/new:prj/directory --- old/osc-0.137.0/tests/prdiff_fixtures/new:prj/directory 1970-01-01 01:00:00.000000000 +0100 +++ new/osc-0.138.0/tests/prdiff_fixtures/new:prj/directory 2013-01-31 16:46:36.000000000 +0100 @@ -0,0 +1,6 @@ +<directory count='4'> + <entry name="common-one"/> + <entry name="common-two"/> + <entry name="common-three"/> + <entry name="only-in-new"/> +</directory> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.137.0/tests/prdiff_fixtures/no-requests new/osc-0.138.0/tests/prdiff_fixtures/no-requests --- old/osc-0.137.0/tests/prdiff_fixtures/no-requests 1970-01-01 01:00:00.000000000 +0100 +++ new/osc-0.138.0/tests/prdiff_fixtures/no-requests 2013-01-31 16:46:36.000000000 +0100 @@ -0,0 +1,2 @@ +<collection matches="0"> +</collection> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.137.0/tests/prdiff_fixtures/old:prj/common-two new/osc-0.138.0/tests/prdiff_fixtures/old:prj/common-two --- old/osc-0.137.0/tests/prdiff_fixtures/old:prj/common-two 1970-01-01 01:00:00.000000000 +0100 +++ new/osc-0.138.0/tests/prdiff_fixtures/old:prj/common-two 2013-01-31 16:46:36.000000000 +0100 @@ -0,0 +1,4 @@ +line one +line two +line three +last line \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.137.0/tests/prdiff_fixtures/old:prj/directory new/osc-0.138.0/tests/prdiff_fixtures/old:prj/directory --- old/osc-0.137.0/tests/prdiff_fixtures/old:prj/directory 1970-01-01 01:00:00.000000000 +0100 +++ new/osc-0.138.0/tests/prdiff_fixtures/old:prj/directory 2013-01-31 16:46:36.000000000 +0100 @@ -0,0 +1,6 @@ +<directory count='4'> + <entry name="common-one"/> + <entry name="common-two"/> + <entry name="common-three"/> + <entry name="only-in-old"/> +</directory> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.137.0/tests/prdiff_fixtures/oscrc new/osc-0.138.0/tests/prdiff_fixtures/oscrc --- old/osc-0.137.0/tests/prdiff_fixtures/oscrc 1970-01-01 01:00:00.000000000 +0100 +++ new/osc-0.138.0/tests/prdiff_fixtures/oscrc 2013-01-31 16:46:36.000000000 +0100 @@ -0,0 +1,103 @@ +[general] +# URL to access API server, e.g. https://api.opensuse.org +# you also need a section [https://api.opensuse.org] with the credentials +apiurl = http://localhost +# Downloaded packages are cached here. Must be writable by you. +#packagecachedir = /var/tmp/osbuild-packagecache +# Wrapper to call build as root (sudo, su -, ...) +#su-wrapper = su -c +# rootdir to setup the chroot environment +# can contain %(repo)s, %(arch)s, %(project)s and %(package)s for replacement, e.g. +# /srv/oscbuild/%(repo)s-%(arch)s or +# /srv/oscbuild/%(repo)s-%(arch)s-%(project)s-%(package)s +#build-root = /var/tmp/build-root +# compile with N jobs (default: "getconf _NPROCESSORS_ONLN") +#build-jobs = N +# build-type to use - values can be (depending on the capabilities of the 'build' script) +# empty - chroot build +# kvm - kvm VM build (needs build-device, build-swap, build-memory) +# xen - xen VM build (needs build-device, build-swap, build-memory) +# experimental: +# qemu - qemu VM build +# lxc - lxc build +#build-type = +# build-device is the disk-image file to use as root for VM builds +# e.g. /var/tmp/FILE.root +#build-device = /var/tmp/FILE.root +# build-swap is the disk-image to use as swap for VM builds +# e.g. /var/tmp/FILE.swap +#build-swap = /var/tmp/FILE.swap +# build-memory is the amount of memory used in the VM +# value in MB - e.g. 512 +#build-memory = 512 +# build-vmdisk-rootsize is the size of the disk-image used as root in a VM build +# values in MB - e.g. 4096 +#build-vmdisk-rootsize = 4096 +# build-vmdisk-swapsize is the size of the disk-image used as swap in a VM build +# values in MB - e.g. 1024 +#build-vmdisk-swapsize = 1024 +# Numeric uid:gid to assign to the "abuild" user in the build-root +# or "caller" to use the current users uid:gid +# This is convenient when sharing the buildroot with ordinary userids +# on the host. +# This should not be 0 +# build-uid = +# extra packages to install when building packages locally (osc build) +# this corresponds to osc build's -x option and can be overridden with that +# -x '' can also be given on the command line to override this setting, or +# you can have an empty setting here. +#extra-pkgs = vim gdb strace +# build platform is used if the platform argument is omitted to osc build +#build_repository = openSUSE_Factory +# default project for getpac or bco +#getpac_default_project = openSUSE:Factory +# alternate filesystem layout: have multiple subdirs, where colons were. +#checkout_no_colon = 0 +# local files to ignore with status, addremove, .... +#exclude_glob = .osc CVS .svn .* _linkerror *~ #*# *.orig *.bak *.changes.* +# keep passwords in plaintext. If you see this comment, your osc +# already uses the encrypted password, and only keeps them in plain text +# for backwards compatibility. Default will change to 0 in future releases. +# You can remove the plaintext password without harm, if you do not need +# backwards compatibility. +#plaintext_passwd = 1 +# limit the age of requests shown with 'osc req list'. +# this is a default only, can be overridden by 'osc req list -D NNN' +# Use 0 for unlimted. +#request_list_days = 0 +# show info useful for debugging +#debug = 1 +# show HTTP traffic useful for debugging +#http_debug = 1 +# Skip signature verification of packages used for build. +#no_verify = 1 +# jump into the debugger in case of errors +#post_mortem = 1 +# print call traces in case of errors +#traceback = 1 +# use KDE/Gnome/MacOS/Windows keyring for credentials if available +#use_keyring = 1 +# check for unversioned/removed files before commit +#check_filelist = 1 +# check for pending requests after executing an action (e.g. checkout, update, commit) +#check_for_request_on_action = 0 +# what to do with the source package if the submitrequest has been accepted. If +# nothing is specified the API default is used +#submitrequest_on_accept_action = cleanup|update|noupdate +#review requests interactively (default: off) +#request_show_review = 1 +# Directory with executables to validate sources, esp before committing +#source_validator_directory = /usr/lib/osc/source_validators + +[http://localhost] +user=Admin +pass=opensuse +# set aliases for this apiurl +# aliases = foo, bar +# email used in .changes, unless the one from osc meta prj <user> will be used +# email = +# additional headers to pass to a request, e.g. for special authentication +#http_headers = Host: foofoobar, +# User: mumblegack +# Force using of keyring for this API +#keyring = 1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.137.0/tests/prdiff_fixtures/osctest/.osc/_apiurl new/osc-0.138.0/tests/prdiff_fixtures/osctest/.osc/_apiurl --- old/osc-0.137.0/tests/prdiff_fixtures/osctest/.osc/_apiurl 1970-01-01 01:00:00.000000000 +0100 +++ new/osc-0.138.0/tests/prdiff_fixtures/osctest/.osc/_apiurl 2013-01-31 16:46:36.000000000 +0100 @@ -0,0 +1 @@ +http://localhost diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.137.0/tests/prdiff_fixtures/osctest/.osc/_packages new/osc-0.138.0/tests/prdiff_fixtures/osctest/.osc/_packages --- old/osc-0.137.0/tests/prdiff_fixtures/osctest/.osc/_packages 1970-01-01 01:00:00.000000000 +0100 +++ new/osc-0.138.0/tests/prdiff_fixtures/osctest/.osc/_packages 2013-01-31 16:46:36.000000000 +0100 @@ -0,0 +1,4 @@ +<project name="home:user:branches:some:project"> + <package name="common-one" state=" " /> + <package name="common-two" state=" " /> +</project> \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.137.0/tests/prdiff_fixtures/osctest/.osc/_project new/osc-0.138.0/tests/prdiff_fixtures/osctest/.osc/_project --- old/osc-0.137.0/tests/prdiff_fixtures/osctest/.osc/_project 1970-01-01 01:00:00.000000000 +0100 +++ new/osc-0.138.0/tests/prdiff_fixtures/osctest/.osc/_project 2013-01-31 16:46:36.000000000 +0100 @@ -0,0 +1 @@ +home:user:branches:some:project diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.137.0/tests/prdiff_fixtures/osctest/common-one/.osc/_apiurl new/osc-0.138.0/tests/prdiff_fixtures/osctest/common-one/.osc/_apiurl --- old/osc-0.137.0/tests/prdiff_fixtures/osctest/common-one/.osc/_apiurl 1970-01-01 01:00:00.000000000 +0100 +++ new/osc-0.138.0/tests/prdiff_fixtures/osctest/common-one/.osc/_apiurl 2013-01-31 16:46:36.000000000 +0100 @@ -0,0 +1 @@ +http://localhost diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.137.0/tests/prdiff_fixtures/osctest/common-one/.osc/_files new/osc-0.138.0/tests/prdiff_fixtures/osctest/common-one/.osc/_files --- old/osc-0.137.0/tests/prdiff_fixtures/osctest/common-one/.osc/_files 1970-01-01 01:00:00.000000000 +0100 +++ new/osc-0.138.0/tests/prdiff_fixtures/osctest/common-one/.osc/_files 2013-01-31 16:46:36.000000000 +0100 @@ -0,0 +1,4 @@ +<directory name="common-one" rev="f53d033d63c3d6e9a8e4493225976122" srcmd5="f53d033d63c3d6e9a8e4493225976122"> + <linkinfo baserev="896e6d6d675d03b6934946d03a976450" lsrcmd5="0cf460222270b58e2a9a3d695b1d945d" package="common-one" project="some:project" srcmd5="8c7ed3cf5ec0b4aa20ef159fd8c51b76" /> + <entry md5="1a4c23ccf2eb12403acbfa3258233a9d" mtime="1352816081" name="common-one.spec" size="3457" /> +</directory> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.137.0/tests/prdiff_fixtures/osctest/common-one/.osc/_meta new/osc-0.138.0/tests/prdiff_fixtures/osctest/common-one/.osc/_meta --- old/osc-0.137.0/tests/prdiff_fixtures/osctest/common-one/.osc/_meta 1970-01-01 01:00:00.000000000 +0100 +++ new/osc-0.138.0/tests/prdiff_fixtures/osctest/common-one/.osc/_meta 2013-01-31 16:46:36.000000000 +0100 @@ -0,0 +1,10 @@ +<package name="common-one" project="home:user:branches:some:project"> + <title>blah</title> + <description>foo</description> + <debuginfo> + <enable repository="openSUSE_12.2"/> + <enable repository="openSUSE_Factory"/> + <enable repository="SLE_11_SP2"/> + </debuginfo> +</package> + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.137.0/tests/prdiff_fixtures/osctest/common-one/.osc/_osclib_version new/osc-0.138.0/tests/prdiff_fixtures/osctest/common-one/.osc/_osclib_version --- old/osc-0.137.0/tests/prdiff_fixtures/osctest/common-one/.osc/_osclib_version 1970-01-01 01:00:00.000000000 +0100 +++ new/osc-0.138.0/tests/prdiff_fixtures/osctest/common-one/.osc/_osclib_version 2013-01-31 16:46:36.000000000 +0100 @@ -0,0 +1 @@ +1.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.137.0/tests/prdiff_fixtures/osctest/common-one/.osc/_package new/osc-0.138.0/tests/prdiff_fixtures/osctest/common-one/.osc/_package --- old/osc-0.137.0/tests/prdiff_fixtures/osctest/common-one/.osc/_package 1970-01-01 01:00:00.000000000 +0100 +++ new/osc-0.138.0/tests/prdiff_fixtures/osctest/common-one/.osc/_package 2013-01-31 16:46:36.000000000 +0100 @@ -0,0 +1 @@ +common-one \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.137.0/tests/prdiff_fixtures/osctest/common-one/.osc/_project new/osc-0.138.0/tests/prdiff_fixtures/osctest/common-one/.osc/_project --- old/osc-0.137.0/tests/prdiff_fixtures/osctest/common-one/.osc/_project 1970-01-01 01:00:00.000000000 +0100 +++ new/osc-0.138.0/tests/prdiff_fixtures/osctest/common-one/.osc/_project 2013-01-31 16:46:36.000000000 +0100 @@ -0,0 +1 @@ +home:user:branches:some:project diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.137.0/tests/prdiff_fixtures/osctest/common-one/.osc/common-one.spec new/osc-0.138.0/tests/prdiff_fixtures/osctest/common-one/.osc/common-one.spec --- old/osc-0.137.0/tests/prdiff_fixtures/osctest/common-one/.osc/common-one.spec 1970-01-01 01:00:00.000000000 +0100 +++ new/osc-0.138.0/tests/prdiff_fixtures/osctest/common-one/.osc/common-one.spec 2013-01-31 16:46:36.000000000 +0100 @@ -0,0 +1 @@ +contents are irrelevant diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.137.0/tests/prdiff_fixtures/osctest/common-one/common-one.spec new/osc-0.138.0/tests/prdiff_fixtures/osctest/common-one/common-one.spec --- old/osc-0.137.0/tests/prdiff_fixtures/osctest/common-one/common-one.spec 1970-01-01 01:00:00.000000000 +0100 +++ new/osc-0.138.0/tests/prdiff_fixtures/osctest/common-one/common-one.spec 2013-01-31 16:46:36.000000000 +0100 @@ -0,0 +1 @@ +contents are irrelevant diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.137.0/tests/prdiff_fixtures/osctest/common-two/.osc/_apiurl new/osc-0.138.0/tests/prdiff_fixtures/osctest/common-two/.osc/_apiurl --- old/osc-0.137.0/tests/prdiff_fixtures/osctest/common-two/.osc/_apiurl 1970-01-01 01:00:00.000000000 +0100 +++ new/osc-0.138.0/tests/prdiff_fixtures/osctest/common-two/.osc/_apiurl 2013-01-31 16:46:36.000000000 +0100 @@ -0,0 +1 @@ +http://localhost diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.137.0/tests/prdiff_fixtures/osctest/common-two/.osc/_files new/osc-0.138.0/tests/prdiff_fixtures/osctest/common-two/.osc/_files --- old/osc-0.137.0/tests/prdiff_fixtures/osctest/common-two/.osc/_files 1970-01-01 01:00:00.000000000 +0100 +++ new/osc-0.138.0/tests/prdiff_fixtures/osctest/common-two/.osc/_files 2013-01-31 16:46:36.000000000 +0100 @@ -0,0 +1,4 @@ +<directory name="common-two" rev="f53d033d63c3d6e9a8e4493225976122" srcmd5="f53d033d63c3d6e9a8e4493225976122"> + <linkinfo baserev="896e6d6d675d03b6934946d03a976450" lsrcmd5="0cf460222270b58e2a9a3d695b1d945d" package="common-two" project="some:project" srcmd5="8c7ed3cf5ec0b4aa20ef159fd8c51b76" /> + <entry md5="1a4c23ccf2eb12403acbfa3258233a9d" mtime="1352816081" name="common-two.spec" size="3457" /> +</directory> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.137.0/tests/prdiff_fixtures/osctest/common-two/.osc/_meta new/osc-0.138.0/tests/prdiff_fixtures/osctest/common-two/.osc/_meta --- old/osc-0.137.0/tests/prdiff_fixtures/osctest/common-two/.osc/_meta 1970-01-01 01:00:00.000000000 +0100 +++ new/osc-0.138.0/tests/prdiff_fixtures/osctest/common-two/.osc/_meta 2013-01-31 16:46:36.000000000 +0100 @@ -0,0 +1,10 @@ +<package name="common-two" project="home:user:branches:some:project"> + <title>blah</title> + <description>foo</description> + <debuginfo> + <enable repository="openSUSE_12.2"/> + <enable repository="openSUSE_Factory"/> + <enable repository="SLE_11_SP2"/> + </debuginfo> +</package> + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.137.0/tests/prdiff_fixtures/osctest/common-two/.osc/_osclib_version new/osc-0.138.0/tests/prdiff_fixtures/osctest/common-two/.osc/_osclib_version --- old/osc-0.137.0/tests/prdiff_fixtures/osctest/common-two/.osc/_osclib_version 1970-01-01 01:00:00.000000000 +0100 +++ new/osc-0.138.0/tests/prdiff_fixtures/osctest/common-two/.osc/_osclib_version 2013-01-31 16:46:36.000000000 +0100 @@ -0,0 +1 @@ +1.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.137.0/tests/prdiff_fixtures/osctest/common-two/.osc/_package new/osc-0.138.0/tests/prdiff_fixtures/osctest/common-two/.osc/_package --- old/osc-0.137.0/tests/prdiff_fixtures/osctest/common-two/.osc/_package 1970-01-01 01:00:00.000000000 +0100 +++ new/osc-0.138.0/tests/prdiff_fixtures/osctest/common-two/.osc/_package 2013-01-31 16:46:36.000000000 +0100 @@ -0,0 +1 @@ +common-two \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.137.0/tests/prdiff_fixtures/osctest/common-two/.osc/_project new/osc-0.138.0/tests/prdiff_fixtures/osctest/common-two/.osc/_project --- old/osc-0.137.0/tests/prdiff_fixtures/osctest/common-two/.osc/_project 1970-01-01 01:00:00.000000000 +0100 +++ new/osc-0.138.0/tests/prdiff_fixtures/osctest/common-two/.osc/_project 2013-01-31 16:46:36.000000000 +0100 @@ -0,0 +1 @@ +home:user:branches:some:project diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.137.0/tests/prdiff_fixtures/osctest/common-two/.osc/common-two.spec new/osc-0.138.0/tests/prdiff_fixtures/osctest/common-two/.osc/common-two.spec --- old/osc-0.137.0/tests/prdiff_fixtures/osctest/common-two/.osc/common-two.spec 1970-01-01 01:00:00.000000000 +0100 +++ new/osc-0.138.0/tests/prdiff_fixtures/osctest/common-two/.osc/common-two.spec 2013-01-31 16:46:36.000000000 +0100 @@ -0,0 +1 @@ +contents are irrelevant diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.137.0/tests/prdiff_fixtures/osctest/common-two/common-two.spec new/osc-0.138.0/tests/prdiff_fixtures/osctest/common-two/common-two.spec --- old/osc-0.137.0/tests/prdiff_fixtures/osctest/common-two/common-two.spec 1970-01-01 01:00:00.000000000 +0100 +++ new/osc-0.138.0/tests/prdiff_fixtures/osctest/common-two/common-two.spec 2013-01-31 16:46:36.000000000 +0100 @@ -0,0 +1 @@ +contents are irrelevant diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.137.0/tests/prdiff_fixtures/request new/osc-0.138.0/tests/prdiff_fixtures/request --- old/osc-0.137.0/tests/prdiff_fixtures/request 1970-01-01 01:00:00.000000000 +0100 +++ new/osc-0.138.0/tests/prdiff_fixtures/request 2013-01-31 16:46:36.000000000 +0100 @@ -0,0 +1,16 @@ +<collection matches="1"> + <request id="148023"> + <action type="submit"> + <source project="home:user:branches:some:project" package="common-two" rev="7"/> + <target project="some:project" package="common-two"/> + <options> + <sourceupdate>update</sourceupdate> + </options> + </action> + <state name="new" who="user" when="2013-01-11T11:04:14"> + <comment/> + </state> + <description>- Fix it to work +- Improve support for something</description> + </request> +</collection> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.137.0/tests/prdiff_fixtures/some:project/.osc/_apiurl new/osc-0.138.0/tests/prdiff_fixtures/some:project/.osc/_apiurl --- old/osc-0.137.0/tests/prdiff_fixtures/some:project/.osc/_apiurl 1970-01-01 01:00:00.000000000 +0100 +++ new/osc-0.138.0/tests/prdiff_fixtures/some:project/.osc/_apiurl 2013-01-31 16:46:36.000000000 +0100 @@ -0,0 +1 @@ +http://localhost diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.137.0/tests/prdiff_fixtures/some:project/.osc/_packages new/osc-0.138.0/tests/prdiff_fixtures/some:project/.osc/_packages --- old/osc-0.137.0/tests/prdiff_fixtures/some:project/.osc/_packages 1970-01-01 01:00:00.000000000 +0100 +++ new/osc-0.138.0/tests/prdiff_fixtures/some:project/.osc/_packages 2013-01-31 16:46:36.000000000 +0100 @@ -0,0 +1,4 @@ +<project name="some:project"> + <package name="common-one" state=" " /> + <package name="common-two" state=" " /> +</project> \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.137.0/tests/prdiff_fixtures/some:project/.osc/_project new/osc-0.138.0/tests/prdiff_fixtures/some:project/.osc/_project --- old/osc-0.137.0/tests/prdiff_fixtures/some:project/.osc/_project 1970-01-01 01:00:00.000000000 +0100 +++ new/osc-0.138.0/tests/prdiff_fixtures/some:project/.osc/_project 2013-01-31 16:46:36.000000000 +0100 @@ -0,0 +1 @@ +some:project diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.137.0/tests/prdiff_fixtures/some:project/common-two new/osc-0.138.0/tests/prdiff_fixtures/some:project/common-two --- old/osc-0.137.0/tests/prdiff_fixtures/some:project/common-two 1970-01-01 01:00:00.000000000 +0100 +++ new/osc-0.138.0/tests/prdiff_fixtures/some:project/common-two 2013-01-31 16:46:36.000000000 +0100 @@ -0,0 +1,5 @@ +line one +line two +line three +an extra line +last line \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.137.0/tests/prdiff_fixtures/some:project/directory new/osc-0.138.0/tests/prdiff_fixtures/some:project/directory --- old/osc-0.137.0/tests/prdiff_fixtures/some:project/directory 1970-01-01 01:00:00.000000000 +0100 +++ new/osc-0.138.0/tests/prdiff_fixtures/some:project/directory 2013-01-31 16:46:36.000000000 +0100 @@ -0,0 +1,6 @@ +<directory count='4'> + <entry name="common-one"/> + <entry name="common-two"/> + <entry name="common-three"/> + <entry name="only-in-new"/> +</directory> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.137.0/tests/suite.py new/osc-0.138.0/tests/suite.py --- old/osc-0.137.0/tests/suite.py 2012-12-04 16:45:58.000000000 +0100 +++ new/osc-0.138.0/tests/suite.py 2013-01-31 16:46:36.000000000 +0100 @@ -21,6 +21,7 @@ import test_project_status import test_request import test_setlinkrev +import test_prdiff suite = unittest.TestSuite() suite.addTests(test_addfiles.suite()) @@ -36,6 +37,7 @@ suite.addTests(test_project_status.suite()) suite.addTests(test_request.suite()) suite.addTests(test_setlinkrev.suite()) +suite.addTests(test_prdiff.suite()) if have_xmlrunner: result = xmlrunner.XMLTestRunner(output=os.path.join(os.getcwd(), 'junit-xml-results')).run(suite) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.137.0/tests/test_difffiles.py new/osc-0.138.0/tests/test_difffiles.py --- old/osc-0.137.0/tests/test_difffiles.py 2012-12-04 16:45:58.000000000 +0100 +++ new/osc-0.138.0/tests/test_difffiles.py 2013-01-31 16:46:36.000000000 +0100 @@ -1,6 +1,7 @@ import osc.core import osc.oscerr import os +import re from common import GET, OscTestCase FIXTURES_DIR = os.path.join(os.getcwd(), 'difffile_fixtures') @@ -295,10 +296,40 @@ self.__check_diff(p, '', 3) def __check_diff(self, p, exp, revision=None): - s = '' + got = '' for i in p.get_diff(revision): - s += ''.join(i) - self.assertEqual(s, exp) + got += ''.join(i) + + # When a hunk header refers to a single line in the "from" + # file and/or the "to" file, e.g. + # + # @@ -37,37 +41,43 @@ + # @@ -37,39 +41,41 @@ + # @@ -37,37 +41,41 @@ + # + # some systems will avoid repeating the line number: + # + # @@ -37 +41,43 @@ + # @@ -37,39 +41 @@ + # @@ -37 +41 @@ + # + # so we need to canonise the output to avoid false negative + # test failures. + + # TODO: Package.get_diff should return a consistent format + # (regardless of the used python version) + def __canonise_diff(diff): + # we cannot use re.M because python 2.6's re.sub does + # not support a flags argument + diff = [re.sub('^@@ -(\d+) ', '@@ -\\1,\\1 ', line) + for line in diff.split('\n')] + diff = [re.sub('^(@@ -\d+,\d+) \+(\d+) ', '\\1 +\\2,\\2 ', line) + for line in diff] + return '\n'.join(diff) + + got = __canonise_diff(got) + exp = __canonise_diff(exp) + self.assertEqualMultiline(got, exp) if __name__ == '__main__': import unittest diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.137.0/tests/test_prdiff.py new/osc-0.138.0/tests/test_prdiff.py --- old/osc-0.137.0/tests/test_prdiff.py 1970-01-01 01:00:00.000000000 +0100 +++ new/osc-0.138.0/tests/test_prdiff.py 2013-01-31 16:46:36.000000000 +0100 @@ -0,0 +1,272 @@ +import osc.commandline +import osc.core +import osc.oscerr +import os +import re +import sys +import urllib2 +from common import GET, POST, OscTestCase, addExpectedRequest, EXPECTED_REQUESTS + + +FIXTURES_DIR = os.path.join(os.getcwd(), 'prdiff_fixtures') +API_URL = 'http://localhost/' +UPSTREAM = 'some:project' +BRANCH = 'home:user:branches:' + UPSTREAM + +def rdiff_url(pkg, oldprj, newprj): + return API_URL + 'source/%s/%s?unified=1&opackage=%s&oproject=%s&cmd=diff&expand=1&filelimit=0' % \ + (newprj, pkg, pkg, oldprj.replace(':', '%3A')) + +def request_url(prj): + return API_URL + 'search/request?match=%%28state%%2F%%40name%%3D%%27new%%27+or+state%%2F%%40name%%3D%%27review%%27%%29+and+%%28action%%2Ftarget%%2F%%40project%%3D%%27%s%%27+or+submit%%2Ftarget%%2F%%40project%%3D%%27%s%%27+or+action%%2Fsource%%2F%%40project%%3D%%27%s%%27+or+submit%%2Fsource%%2F%%40project%%3D%%27%s%%27%%29' % \ + tuple([prj.replace(':', '%3A')] * 4) + +def GET_PROJECT_PACKAGES(*projects): + def decorator(test_method): + def wrapped_test_method(*args): + for project in projects: + addExpectedRequest('GET', API_URL + 'source/' + project, + file='%s/directory' % project) + test_method(*args) + # "rename" method otherwise we cannot specify a TestCaseClass.testName + # cmdline arg when using unittest.main() + wrapped_test_method.__name__ = test_method.__name__ + return wrapped_test_method + return decorator + +def POST_RDIFF(oldprj, newprj): + def decorator(test_method): + def wrapped_test_method(*args): + addExpectedRequest('POST', rdiff_url('common-one', oldprj, newprj), exp='', text='') + addExpectedRequest('POST', rdiff_url('common-two', oldprj, newprj), exp='', file='common-two-diff') + addExpectedRequest('POST', rdiff_url('common-three', oldprj, newprj), exp='', text='') + test_method(*args) + # "rename" method otherwise we cannot specify a TestCaseClass.testName + # cmdline arg when using unittest.main() + wrapped_test_method.__name__ = test_method.__name__ + return wrapped_test_method + return decorator + +def suite(): + import unittest + return unittest.makeSuite(TestProjectDiff) + +class TestProjectDiff(OscTestCase): + diff_hdr = 'Index: %s\n===================================================================' + def _get_fixtures_dir(self): + return FIXTURES_DIR + + def _change_to_tmpdir(self, *args): + os.chdir(os.path.join(self.tmpdir, *args)) + + def _run_prdiff(self, *args): + """Runs osc prdiff, returning captured STDOUT as a string.""" + cli = osc.commandline.Osc() + argv = ['osc', '--no-keyring', '--no-gnome-keyring', 'prdiff'] + argv.extend(args) + cli.main(argv=argv) + return sys.stdout.getvalue() + + + def testPrdiffTooManyArgs(self): + def runner(): + self._run_prdiff('one', 'two', 'superfluous-arg') + self.assertRaises(osc.oscerr.WrongArgs, runner) + + + @GET_PROJECT_PACKAGES(UPSTREAM, BRANCH) + @POST_RDIFF(UPSTREAM, BRANCH) + @POST(rdiff_url('only-in-new', UPSTREAM, BRANCH), exp='', text='') + def testPrdiffZeroArgs(self): + exp = """identical: common-one +differs: common-two +identical: common-three +identical: only-in-new +""" + def runner(): + self._run_prdiff() + + os.chdir('/tmp') + self.assertRaises(osc.oscerr.WrongArgs, runner) + + self._change_to_tmpdir(FIXTURES_DIR, UPSTREAM) + self.assertRaises(osc.oscerr.WrongArgs, runner) + + self._change_to_tmpdir(FIXTURES_DIR, BRANCH) + out = self._run_prdiff() + self.assertEqualMultiline(out, exp) + + + @GET_PROJECT_PACKAGES(UPSTREAM, BRANCH) + @POST_RDIFF(UPSTREAM, BRANCH) + @POST(rdiff_url('only-in-new', UPSTREAM, BRANCH), exp='', text='') + def testPrdiffOneArg(self): + self._change_to_tmpdir() + exp = """identical: common-one +differs: common-two +identical: common-three +identical: only-in-new +""" + out = self._run_prdiff('home:user:branches:some:project') + self.assertEqualMultiline(out, exp) + + + @GET_PROJECT_PACKAGES('old:prj', 'new:prj') + @POST_RDIFF('old:prj', 'new:prj') + def testPrdiffTwoArgs(self): + self._change_to_tmpdir() + exp = """identical: common-one +differs: common-two +identical: common-three +""" + out = self._run_prdiff('old:prj', 'new:prj') + self.assertEqualMultiline(out, exp) + + + @GET_PROJECT_PACKAGES('old:prj', 'new:prj') + @POST_RDIFF('old:prj', 'new:prj') + def testPrdiffOldOnly(self): + self._change_to_tmpdir() + exp = """identical: common-one +differs: common-two +identical: common-three +old only: only-in-old +""" + out = self._run_prdiff('--show-not-in-new', 'old:prj', 'new:prj') + self.assertEqualMultiline(out, exp) + + + @GET_PROJECT_PACKAGES('old:prj', 'new:prj') + @POST_RDIFF('old:prj', 'new:prj') + def testPrdiffNewOnly(self): + self._change_to_tmpdir() + exp = """identical: common-one +differs: common-two +identical: common-three +new only: only-in-new +""" + out = self._run_prdiff('--show-not-in-old', 'old:prj', 'new:prj') + self.assertEqualMultiline(out, exp) + + + @GET_PROJECT_PACKAGES('old:prj', 'new:prj') + @POST_RDIFF('old:prj', 'new:prj') + def testPrdiffDiffstat(self): + self._change_to_tmpdir() + exp = """identical: common-one +differs: common-two + + common-two | 1 + + 1 file changed, 1 insertion(+) + +identical: common-three +""" + out = self._run_prdiff('--diffstat', 'old:prj', 'new:prj') + self.assertEqualMultiline(out, exp) + + + @GET_PROJECT_PACKAGES('old:prj', 'new:prj') + @POST_RDIFF('old:prj', 'new:prj') + def testPrdiffUnified(self): + self._change_to_tmpdir() + exp = """identical: common-one +differs: common-two + +Index: common-two +=================================================================== +--- common-two\t2013-01-18 19:18:38.225983117 +0000 ++++ common-two\t2013-01-18 19:19:27.882082325 +0000 +@@ -1,4 +1,5 @@ + line one + line two + line three ++an extra line + last line + +identical: common-three +""" + out = self._run_prdiff('--unified', 'old:prj', 'new:prj') + self.assertEqualMultiline(out, exp) + + + @GET_PROJECT_PACKAGES('old:prj', 'new:prj') + @POST(rdiff_url('common-two', 'old:prj', 'new:prj'), exp='', file='common-two-diff') + @POST(rdiff_url('common-three', 'old:prj', 'new:prj'), exp='', text='') + def testPrdiffInclude(self): + self._change_to_tmpdir() + exp = """differs: common-two +identical: common-three +""" + out = self._run_prdiff('--include', 'common-t', + 'old:prj', 'new:prj') + self.assertEqualMultiline(out, exp) + + + @GET_PROJECT_PACKAGES('old:prj', 'new:prj') + @POST(rdiff_url('common-two', 'old:prj', 'new:prj'), exp='', file='common-two-diff') + @POST(rdiff_url('common-three', 'old:prj', 'new:prj'), exp='', text='') + def testPrdiffExclude(self): + self._change_to_tmpdir() + exp = """differs: common-two +identical: common-three +""" + out = self._run_prdiff('--exclude', 'one', 'old:prj', 'new:prj') + self.assertEqualMultiline(out, exp) + + + @GET_PROJECT_PACKAGES('old:prj', 'new:prj') + @POST(rdiff_url('common-two', 'old:prj', 'new:prj'), exp='', file='common-two-diff') + def testPrdiffIncludeExclude(self): + self._change_to_tmpdir() + exp = """differs: common-two +""" + out = self._run_prdiff('--include', 'common-t', + '--exclude', 'three', + 'old:prj', 'new:prj') + self.assertEqualMultiline(out, exp) + + + @GET_PROJECT_PACKAGES(UPSTREAM, BRANCH) + @GET(request_url(UPSTREAM), exp='', file='request') + @POST(rdiff_url('common-one', UPSTREAM, BRANCH), exp='', text='') + @POST(rdiff_url('common-two', UPSTREAM, BRANCH), exp='', file='common-two-diff') + @POST(rdiff_url('common-three', UPSTREAM, BRANCH), exp='', file='common-two-diff') + @POST(rdiff_url('only-in-new', UPSTREAM, BRANCH), exp='', text='') + def testPrdiffRequestsMatching(self): + self._change_to_tmpdir() + exp = """identical: common-one +differs: common-two + +148023 State:new By:user When:2013-01-11T11:04:14 + submit: home:user:branches:some:project/common-two -> some:project + Descr: - Fix it to work - Improve support for something + +differs: common-three +identical: only-in-new +""" + out = self._run_prdiff('--requests', UPSTREAM, BRANCH) + self.assertEqualMultiline(out, exp) + + + # Reverse the direction of the diff. + @GET_PROJECT_PACKAGES(BRANCH, UPSTREAM) + @GET(request_url(BRANCH), exp='', file='no-requests') + @POST(rdiff_url('common-one', BRANCH, UPSTREAM), exp='', text='') + @POST(rdiff_url('common-two', BRANCH, UPSTREAM), exp='', file='common-two-diff') + @POST(rdiff_url('common-three', BRANCH, UPSTREAM), exp='', file='common-two-diff') + @POST(rdiff_url('only-in-new', BRANCH, UPSTREAM), exp='', text='') + def testPrdiffRequestsSwitched(self): + self._change_to_tmpdir() + exp = """identical: common-one +differs: common-two +differs: common-three +identical: only-in-new +""" + out = self._run_prdiff('--requests', BRANCH, UPSTREAM) + self.assertEqualMultiline(out, exp) + + + +if __name__ == '__main__': + import unittest + unittest.main() ++++++ osc.dsc ++++++ --- /var/tmp/diff_new_pack.KGh0Hd/_old 2013-02-01 09:49:28.000000000 +0100 +++ /var/tmp/diff_new_pack.KGh0Hd/_new 2013-02-01 09:49:28.000000000 +0100 @@ -1,6 +1,6 @@ Format: 1.0 Source: osc -Version: 0.137.0 +Version: 0.138.0 Binary: osc Maintainer: Adrian Schroeter <adrian(a)suse.de> Architecture: any -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit ntfs-3g_ntfsprogs for openSUSE:12.3
by root＠hilbert.suse.de 01 Feb '13

01 Feb '13

Hello community, here is the log from the commit of package ntfs-3g_ntfsprogs for openSUSE:12.3 checked in at 2013-02-01 09:48:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3/ntfs-3g_ntfsprogs (Old) and /work/SRC/openSUSE:12.3/.ntfs-3g_ntfsprogs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ntfs-3g_ntfsprogs", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:12.3/ntfs-3g_ntfsprogs/ntfs-3g_ntfsprogs.changes 2013-01-31 01:28:26.000000000 +0100 +++ /work/SRC/openSUSE:12.3/.ntfs-3g_ntfsprogs.new/ntfs-3g_ntfsprogs.changes 2013-02-01 09:48:29.000000000 +0100 @@ -1,0 +2,8 @@ +Thu Jan 31 21:04:14 UTC 2013 - badshah400(a)gmail.com + +- Add ntfs-3g_ntfsprogs-use-caution-with-fastboot.patch to + prevent partitions with metadata cached in Windows (when + FastBoot is enabled) from being mounted; patch taken from + upstream git and rebased (bnc#798337 / rh#859373). + +------------------------------------------------------------------- New: ---- ntfs-3g_ntfsprogs-use-caution-with-fastboot.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ntfs-3g_ntfsprogs.spec ++++++ --- /var/tmp/diff_new_pack.8EiJrH/_old 2013-02-01 09:48:29.000000000 +0100 +++ /var/tmp/diff_new_pack.8EiJrH/_new 2013-02-01 09:48:29.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package ntfs-3g_ntfsprogs # -# 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 @@ -25,6 +25,8 @@ Source: %{name}-%{version}.tar.bz2 Source1: buildall.sh Source2: 21-storage-ntfs-3g.fdi +# PATCH-FIX-UPSTREAM ntfs-3g_ntfsprogs-use-caution-with-fastboot.patch rh#859373 badshah400(a)gmail.com -- Prevent partitions with metadata cached in Windows from being mounted; patch taken from upstream git +Patch0: ntfs-3g_ntfsprogs-use-caution-with-fastboot.patch Url: http://ntfs-3g.org/ %if 0%{?sles_version} BuildRequires: fuse-devel >= 2.6.0 @@ -97,6 +99,7 @@ %prep %setup -q +%patch0 -p1 %build # ++++++ ntfs-3g_ntfsprogs-use-caution-with-fastboot.patch ++++++ >From 4d0b9163c9ef1f0cdbbf533317b291220c7fd1c7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jean-Pierre=20Andr=C3=A9?= <jpandre(a)users.sourceforge.net> Date: Wed, 12 Sep 2012 09:42:24 +0200 Subject: [PATCH] Accepted processing restart pages v 2.0 with no warning (used by Windows 8) In the $LogFile, Windows 8 defines restart pages with version 2.0. The checks designed for version 1.1 appear to apply, so accept v 2.0 and apply the usual checks. --- libntfs-3g/logfile.c | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) Index: ntfs-3g_ntfsprogs-2012.1.15/libntfs-3g/logfile.c =================================================================== --- ntfs-3g_ntfsprogs-2012.1.15.orig/libntfs-3g/logfile.c +++ ntfs-3g_ntfsprogs-2012.1.15/libntfs-3g/logfile.c @@ -84,13 +84,21 @@ static BOOL ntfs_check_restart_page_head "position in $LogFile.\n"); return FALSE; } - /* We only know how to handle version 1.1. */ - if (sle16_to_cpu(rp->major_ver) != 1 || - sle16_to_cpu(rp->minor_ver) != 1) { + /* + * We only know how to handle version 1.1 and 2.0, though + * version 2.0 is probably related to cached metadata in + * Windows 8, and we will refuse to mount. + * Nevertheless, do all the relevant checks before rejecting. + */ + if (((rp->major_ver != const_cpu_to_le16(1)) + || (rp->minor_ver != const_cpu_to_le16(1))) + && ((rp->major_ver != const_cpu_to_le16(2)) + || (rp->minor_ver != const_cpu_to_le16(0)))) { ntfs_log_error("$LogFile version %i.%i is not " - "supported. (This driver supports version " - "1.1 only.)\n", (int)sle16_to_cpu(rp->major_ver), - (int)sle16_to_cpu(rp->minor_ver)); + "supported.\n (This driver supports version " + "1.1 and 2.0 only.)\n", + (int)sle16_to_cpu(rp->major_ver), + (int)sle16_to_cpu(rp->minor_ver)); return FALSE; } /* Index: ntfs-3g_ntfsprogs-2012.1.15/libntfs-3g/volume.c =================================================================== --- ntfs-3g_ntfsprogs-2012.1.15.orig/libntfs-3g/volume.c +++ ntfs-3g_ntfsprogs-2012.1.15/libntfs-3g/volume.c @@ -89,13 +89,9 @@ static const char *corrupt_volume_msg = "for more details.\n"; static const char *hibernated_volume_msg = -"The NTFS partition is hibernated. Please resume and shutdown Windows\n" -"properly, or mount the volume read-only with the 'ro' mount option, or\n" -"mount the volume read-write with the 'remove_hiberfile' mount option.\n" -"For example type on the command line:\n" -"\n" -" mount -t ntfs-3g -o remove_hiberfile %s %s\n" -"\n"; +"The NTFS partition is in an unsafe state. Please resume and shutdown\n" +"Windows fully (no hibernation or fast restarting), or mount the volume\n" +"read-only with the 'ro' mount option.\n"; static const char *unclean_journal_msg = "Write access is denied because the disk wasn't safely powered\n" @@ -649,6 +645,24 @@ static int ntfs_volume_check_logfile(ntf if (!ntfs_check_logfile(na, &rp) || !ntfs_is_logfile_clean(na, rp)) err = EOPNOTSUPP; + /* + * If the latest restart page was identified as version + * 2.0, then Windows may have kept a cached copy of + * metadata for fast restarting, and we should not mount. + * Hibernation will be seen the same way on a non + * Windows-system partition, so we have to use the same + * error code (EPERM). + * The restart page may also be identified as version 2.0 + * when access to the file system is terminated abruptly + * by unplugging or power cut, so mounting is also rejected + * after such an event. + */ + if (rp + && (rp->major_ver == const_cpu_to_le16(2)) + && (rp->minor_ver == const_cpu_to_le16(0))) { + ntfs_log_error("Metadata kept in Windows cache, refused to mount.\n"); + err = EPERM; + } free(rp); ntfs_attr_close(na); out: @@ -1200,7 +1214,8 @@ ntfs_volume *ntfs_device_mount(struct nt ntfs_volume_check_hiberfile(vol, 1) < 0) goto error_exit; if (ntfs_volume_check_logfile(vol) < 0) { - if (!(flags & MS_RECOVER)) + /* Always reject cached metadata for now */ + if (!(flags & MS_RECOVER) || (errno == EPERM)) goto error_exit; ntfs_log_info("The file system wasn't safely " "closed on Windows. Fixing.\n"); @@ -1642,6 +1657,10 @@ int ntfs_volume_error(int err) ret = NTFS_VOLUME_CORRUPT; break; case EPERM: + /* + * Hibernation and fast restarting are seen the + * same way on a non Windows-system partition. + */ ret = NTFS_VOLUME_HIBERNATED; break; case EOPNOTSUPP: Index: ntfs-3g_ntfsprogs-2012.1.15/src/ntfs-3g.8.in =================================================================== --- ntfs-3g_ntfsprogs-2012.1.15.orig/src/ntfs-3g.8.in +++ ntfs-3g_ntfsprogs-2012.1.15/src/ntfs-3g.8.in @@ -36,6 +36,22 @@ a few differences mentioned below in rel .PP The \fIvolume\fR to be mounted can be either a block device or an image file. +.SS Windows hibernation and fast restarting +On computers which can be dual-booted into Windows or Linux, Windows has +to be fully shut down before booting into Linux, otherwise the NTFS file +systems on internal disks may be left in an inconsistent state and changes +made by Linux may be ignored by Windows. +.P +So, Windows may not be left in hibernation when starting Linux, in order +to avoid inconsistencies. Moreover, the fast restart feature available on +recent Windows systems has to be disabled. This can be achieved by issuing +as an Administrator the Windows command which disables both +hibernation and fast restarting : +.RS +.sp +powercfg /h off +.sp +.RE .SS Access Handling and Security By default, files and directories are owned by the effective user and group of the mounting process, and everybody has -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0