Mailinglist Archive: opensuse-commit (2129 mails)

[root@xxxxxxxxxxxxxxx (h_root)]

Hello community,

here is the log from the commit of package xfce4-desktop
checked in at Wed Apr 30 01:18:07 CEST 2008.


--------
--- xfce4-desktop/xfce4-desktop.changes 2008-03-16 16:01:24.000000000 +0100
+++ xfce4-desktop/xfce4-desktop.changes 2008-04-29 14:33:39.000000000 +0200
@@ -1,0 +2,6 @@
+Tue Apr 29 14:33:08 CEST 2008 - prusnak@xxxxxxx
+
+- moved backdrops to %{_datadir}/wallpapers
+- split upstream backdrops to xfce4-desktop-branding-upstream
+
+-------------------------------------------------------------------



New:
----
  xfdesktop-backdrops.patch

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

Other differences:
------------------
++++++ xfce4-desktop.spec ++++++
--- /var/tmp/diff_new_pack.Bzq879/_old  2008-04-30 01:14:15.000000000 +0200
+++ /var/tmp/diff_new_pack.Bzq879/_new  2008-04-30 01:14:15.000000000 +0200
@@ -19,19 +19,21 @@
 BuildRequires:  thunar-devel
 Summary:        Desktop manager for the Xfce Desktop Environment
 Version:        4.4.2
-Release:        38
+Release:        53
 License:        GPL v2 or later
 Url:            http://www.xfce.org/
 Source0:        xfdesktop-%{version}.tar.bz2
 Source1:        xfce-utils-%{version}.tar.bz2
 Patch0:         xfce-utils-cpp.patch
 Patch1:         xfdesktop-eject.patch
+Patch2:         xfdesktop-backdrops.patch
 Group:          System/GUI/XFCE
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Requires:       gtk2 
 Requires:       xfce4-session >= 4.3
 Requires:       xfce4-panel >= 4.3
 Requires:       cpp
+Requires:       %{name}-branding >= 4.4
 
 %description
 xfce4-desktop contains a desktop manager for the XFce Desktop
@@ -46,9 +48,31 @@
     Benedikt Meurer <benedikt.meurer@xxxxxxxxxxxxxxxxxxxxx>
     Xavier MAILLARD <zedek@xxxxxxxxxxxxxxx>
 
+%package branding-upstream
+License:        GPL v2 or later
+Summary:        Desktop manager for the Xfce Desktop Environment
+Group:          System/GUI/XFCE
+Provides:       %{name}-branding = %{version}
+Supplements:    packageand(branding-upstream:%{name})
+#BRAND: ...
+
+%description branding-upstream
+xfce4-desktop contains a desktop manager for the XFce Desktop
+Environment
+
+
+
+Authors:
+--------
+    Jasper Huijsmans <huysmans@xxxxxxxxxxxxxxxxxxxxx>
+    Olivier Fourdan <fourdan@xxxxxxxx>
+    Benedikt Meurer <benedikt.meurer@xxxxxxxxxxxxxxxxxxxxx>
+    Xavier MAILLARD <zedek@xxxxxxxxxxxxxxx>
+
 %prep
 %setup -q -n xfdesktop-%{version} -b1
 %patch1
+%patch2
 cd ../xfce-utils-%{version}
 %patch0
 
@@ -95,12 +119,20 @@
 %{_mandir}/man1/*
 %{_sysconfdir}/xdg/xfce4
 
+%files -n %{name}-branding-upstream
+%defattr(-,root,root)
+%dir %{_datadir}/wallpapers
+%{_datadir}/wallpapers/*
+
 %changelog
+* Tue Apr 29 2008 prusnak@xxxxxxx
+- moved backdrops to %%{_datadir}/wallpapers
+- split upstream backdrops to xfce4-desktop-branding-upstream
 * Sun Mar 16 2008 crrodriguez@xxxxxxx
 - fix file-not-in-lang rpmlint warnings
 * Wed Dec 12 2007 prusnak@xxxxxxx
 - correct eject function (xfdesktop-eject.patch)
-* Mon Dec 03 2007 bwalle@xxxxxxx
+* Tue Dec 04 2007 bwalle@xxxxxxx
 - update to xfdesktop 4.4.2
   o Fixed the Italian xfdesktop menu causing a crash.
   o Fix missing xfce_rc_close() causing memleak and too many open
@@ -145,7 +177,7 @@
 - removed duplicate copyright header from spec file [#238045]
 - removed sessions for display managers in /etc
   (SUSE uses only /usr/share/xsessions)
-* Sun Jan 21 2007 bwalle@xxxxxxx
+* Mon Jan 22 2007 bwalle@xxxxxxx
 - upgraded to 4.4.0
 * Mon Mar 27 2006 pnemec@xxxxxxx
 - added patch to autogenerate menu, temporary for 4.2.3 (#159376)

++++++ xfdesktop-backdrops.patch ++++++
--- backdrops/Makefile.am
+++ backdrops/Makefile.am
@@ -1,7 +1,7 @@
 # backdrops/Makefile.am
 #
 
-backdropsdir = $(datadir)/xfce4/backdrops
+backdropsdir = $(datadir)/wallpapers
 
 backdrops_DATA =                                                       \
        flower.png                                                      \
--- backdrops/Makefile.in
+++ backdrops/Makefile.in
@@ -272,7 +272,7 @@
 target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-backdropsdir = $(datadir)/xfce4/backdrops
+backdropsdir = $(datadir)/wallpapers
 backdrops_DATA = \
        flower.png                                                      \
        xfce4gradientcurve.png                                          \
--- common/xfdesktop-common.h
+++ common/xfdesktop-common.h
@@ -31,7 +31,7 @@
 #include <X11/Xlib.h>
 
 #define BACKDROP_CHANNEL         "BACKDROP"
-#define DEFAULT_BACKDROP         DATADIR "/xfce4/backdrops/xfce-smoke.png"
+#define DEFAULT_BACKDROP         DATADIR "/wallpapers/xfce-smoke.png"
 #define LIST_TEXT                "# xfce backdrop list"
 #define XFDESKTOP_SELECTION_FMT  "XFDESKTOP_SELECTION_%d"
 #define XFDESKTOP_IMAGE_FILE_FMT "XFDESKTOP_IMAGE_FILE_%d"
--- settings/appearance-settings.c
+++ settings/appearance-settings.c
@@ -594,7 +594,7 @@
     gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(chooser), filter);
     
     gtk_file_chooser_add_shortcut_folder(GTK_FILE_CHOOSER(chooser),
-            DATADIR "/xfce4/backdrops", NULL);
+            DATADIR "/wallpapers", NULL);
     confdir = xfce_resource_save_location(XFCE_RESOURCE_CONFIG,
             "xfce4/desktop/", TRUE);
     if(confdir) {
--- settings/backdrop-list-manager.c
+++ settings/backdrop-list-manager.c
@@ -446,7 +446,7 @@
     gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(chooser), filter);
     
     gtk_file_chooser_add_shortcut_folder(GTK_FILE_CHOOSER(chooser),
-            DATADIR "/xfce4/backdrops", NULL);
+            DATADIR "/wallpapers", NULL);
     gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(chooser), TRUE);
     
     if(_listdlg_last_dir)

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



Remember to have fun...

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