[Pkg-xfce-commits] r2240 - in desktop/branches/svn-snapshots: . xfdesktop4 xfdesktop4/debian xfdesktop4/debian/patches
corsac at alioth.debian.org
corsac at alioth.debian.org
Sat Aug 23 22:50:52 UTC 2008
Author: corsac
Date: 2008-08-23 22:50:51 +0000 (Sat, 23 Aug 2008)
New Revision: 2240
Added:
desktop/branches/svn-snapshots/xfdesktop4/
desktop/branches/svn-snapshots/xfdesktop4/debian/patches/01_provide-missing-desktop.patch
Removed:
desktop/branches/svn-snapshots/xfdesktop4/debian/patches/01_show-backdrop-by-default.patch
desktop/branches/svn-snapshots/xfdesktop4/debian/patches/03_fix-memory-leak.patch
desktop/branches/svn-snapshots/xfdesktop4/debian/patches/04_fix-CRITICAL-register-message-startup.patch
desktop/branches/svn-snapshots/xfdesktop4/debian/patches/05_simplify-free-code.patch
desktop/branches/svn-snapshots/xfdesktop4/debian/patches/07_fix-italian-typos.patch
desktop/branches/svn-snapshots/xfdesktop4/debian/xfdesktop4.lintian
Modified:
desktop/branches/svn-snapshots/xfdesktop4/debian/changelog
desktop/branches/svn-snapshots/xfdesktop4/debian/control
desktop/branches/svn-snapshots/xfdesktop4/debian/patches/series
desktop/branches/svn-snapshots/xfdesktop4/debian/rules
desktop/branches/svn-snapshots/xfdesktop4/debian/xfdesktop4-data.install
desktop/branches/svn-snapshots/xfdesktop4/debian/xfdesktop4.install
Log:
new 4.6 alpha release
Copied: desktop/branches/svn-snapshots/xfdesktop4 (from rev 2217, desktop/trunk/xfdesktop4)
Property changes on: desktop/branches/svn-snapshots/xfdesktop4
___________________________________________________________________
Name: svn:mergeinfo
+
Modified: desktop/branches/svn-snapshots/xfdesktop4/debian/changelog
===================================================================
--- desktop/trunk/xfdesktop4/debian/changelog 2008-08-13 21:30:11 UTC (rev 2217)
+++ desktop/branches/svn-snapshots/xfdesktop4/debian/changelog 2008-08-23 22:50:51 UTC (rev 2240)
@@ -1,11 +1,26 @@
-xfdesktop4 (4.4.2-8) UNRELEASED; urgency=low
+xfdesktop4 (4.5.80-1) UNRELEASED; urgency=low
+ * new upstream alpha release.
* debian/patches:
- 07_fix-italian-typos added, thanks David Paleino. closes: #483709
* debian/control:
- - updated standards version to 3.8.0. No change needed.
+ - update standards version to 3.8.0. No change needed.
+ - update build-deps for Xfce 4.6 Alpha.
+ - remove useless conflicts.
+ * debian/rules:
+ - don't install useless lintian override file
+ * debian/lintian: dropped, now useless
+ * debian/patches:
+ - 01_show-backdrop-by-default dropped due to upstream changes.
+ - 03_fix-memory-leak dropped, included upstream.
+ - 04_fix-CRITICAL-register-message-startup too.
+ - 05_simplify-free-code as well.
+ - 07_fix-italian-typos too.
+ - 01_fix-size-warning-amd64 added.
+ * debian/xfdesktop-data.install:
+ - add /usr/share/desktop-directories files.
- -- Yves-Alexis Perez <corsac at debian.org> Tue, 12 Aug 2008 22:03:52 +0200
+ -- Yves-Alexis Perez <corsac at debian.org> Sun, 24 Aug 2008 00:28:42 +0200
xfdesktop4 (4.4.2-7) unstable; urgency=low
Modified: desktop/branches/svn-snapshots/xfdesktop4/debian/control
===================================================================
--- desktop/trunk/xfdesktop4/debian/control 2008-08-13 21:30:11 UTC (rev 2217)
+++ desktop/branches/svn-snapshots/xfdesktop4/debian/control 2008-08-23 22:50:51 UTC (rev 2240)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
Uploaders: Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>, Yves-Alexis Perez <corsac at debian.org>
-Build-Depends: debhelper (>= 5.0.0), libgtk2.0-dev (>= 2.10.1), libxft-dev, libxml2-dev, xfce4-panel-dev (>= 4.4.2), libexo-0.3-dev (>= 0.3.4-8), libthunar-vfs-1-dev (>= 0.8.0), chrpath, libdbus-glib-1-dev, quilt
+Build-Depends: debhelper (>= 5.0.0), libgtk2.0-dev (>= 2.10.1), libxft-dev, libxml2-dev, xfce4-panel-dev (>= 4.5.80), libexo-0.3-dev (>= 0.3.80), libthunar-vfs-1-dev (>= 0.9.80), chrpath, quilt, libwnck-dev, libxfconf-0-dev, libglade2-dev, libxfce4menu-0.1-dev
Standards-Version: 3.8.0
Homepage: http://www.xfce.org/
Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfdesktop4/
@@ -11,16 +11,14 @@
Package: xfdesktop4-data
Architecture: all
-Replaces: xfdesktop4 (<= 4.4.1-2)
Description: Provides xfdesktop4 desktop background and root menu (common files)
This package contains architecture-independent files for xfdesktop4.
Package: xfdesktop4
Architecture: any
-Depends: ${shlibs:Depends}, xfce4-mcs-manager (>= 4.4.2-3), xfce4-utils, xfdesktop4-data (= ${source:Version}), exo-utils
+Depends: ${shlibs:Depends}, xfce4-utils, xfdesktop4-data (= ${source:Version}), exo-utils
Recommends: dbus-x11, librsvg2-common
Suggests: menu
-Conflicts: menu (<<2.1.12)
Description: Provides desktop background and root menu
This package contains a tool that allows you to switch the background image
and a root menu. Additionally, it contains dialogs to change the number
Added: desktop/branches/svn-snapshots/xfdesktop4/debian/patches/01_provide-missing-desktop.patch
===================================================================
--- desktop/branches/svn-snapshots/xfdesktop4/debian/patches/01_provide-missing-desktop.patch (rev 0)
+++ desktop/branches/svn-snapshots/xfdesktop4/debian/patches/01_provide-missing-desktop.patch 2008-08-23 22:50:51 UTC (rev 2240)
@@ -0,0 +1,13 @@
+diff -urN xfdesktop1/scripts/xfconf-xfdesktop-migration-4.6.desktop.in xfdesktop2/scripts/xfconf-xfdesktop-migration-4.6.desktop.in
+--- xfdesktop1/scripts/xfconf-xfdesktop-migration-4.6.desktop.in 1970-01-01 01:00:00.000000000 +0100
++++ xfdesktop2/scripts/xfconf-xfdesktop-migration-4.6.desktop.in 2008-08-24 00:12:27.000000000 +0200
+@@ -0,0 +1,9 @@
++[Desktop Entry]
++Encoding=UTF-8
++Version=1.0
++Name=Xfconf Xfdesktop Migration Script
++Exec=@datadir@/xfce4/xfconf-migration/xfdesktop-xfconf-migration.pl
++Terminal=false
++Type=Application
++StartupNotify=false
++Terminal=false
Deleted: desktop/branches/svn-snapshots/xfdesktop4/debian/patches/01_show-backdrop-by-default.patch
===================================================================
--- desktop/trunk/xfdesktop4/debian/patches/01_show-backdrop-by-default.patch 2008-08-13 21:30:11 UTC (rev 2217)
+++ desktop/branches/svn-snapshots/xfdesktop4/debian/patches/01_show-backdrop-by-default.patch 2008-08-23 22:50:51 UTC (rev 2240)
@@ -1,14 +0,0 @@
---- xfdesktop4/settings/appearance-settings.c.orig 2006-11-05 11:57:02.000000000 +0100
-+++ xfdesktop4/settings/appearance-settings.c 2006-12-18 12:58:11.000000000 +0100
-@@ -275,9 +275,9 @@
- if(setting)
- bp->show_image = setting->data.v_int == 0 ? FALSE : TRUE;
- else {
-- bp->show_image = FALSE;
-+ bp->show_image = TRUE;
- mcs_manager_set_int(mcs_plugin->manager, setting_name,
-- BACKDROP_CHANNEL, 0);
-+ BACKDROP_CHANNEL, 1);
- }
-
- /* the color style */
Deleted: desktop/branches/svn-snapshots/xfdesktop4/debian/patches/03_fix-memory-leak.patch
===================================================================
--- desktop/trunk/xfdesktop4/debian/patches/03_fix-memory-leak.patch 2008-08-13 21:30:11 UTC (rev 2217)
+++ desktop/branches/svn-snapshots/xfdesktop4/debian/patches/03_fix-memory-leak.patch 2008-08-23 22:50:51 UTC (rev 2240)
@@ -1,34 +0,0 @@
-Index: xfce_4_4/modules/menu/desktop-menu-dentry.c
-===================================================================
---- xfce_4_4/modules/menu/desktop-menu-dentry.c (revision 26634)
-+++ xfce_4_4/modules/menu/desktop-menu-dentry.c (revision 26635)
-@@ -173,6 +173,7 @@
- if(cmpname && g_ascii_strcasecmp(name, cmpname) < 0)
- break;
- }
-+ g_list_free(items);
-
- gtk_menu_shell_insert(menu_shell, mi, i);
-
-Index: xfce_4_4/modules/menu/desktop-menuspec.c
-===================================================================
---- xfce_4_4/modules/menu/desktop-menuspec.c (revision 26651)
-+++ xfce_4_4/modules/menu/desktop-menuspec.c (revision 26652)
-@@ -203,7 +203,7 @@
- else
- foundcat = NULL;
- if(!foundcat) {
-- g_ptr_array_free(revpath, FALSE);
-+ g_ptr_array_free(revpath, TRUE);
- revpath = NULL;
- break;
- }
-@@ -220,7 +220,7 @@
- newpath[totlen] = 0;
-
- g_ptr_array_add(mtfpi->paths, newpath);
-- g_ptr_array_free(revpath, FALSE);
-+ g_ptr_array_free(revpath, TRUE);
- }
- }
- }
Deleted: desktop/branches/svn-snapshots/xfdesktop4/debian/patches/04_fix-CRITICAL-register-message-startup.patch
===================================================================
--- desktop/trunk/xfdesktop4/debian/patches/04_fix-CRITICAL-register-message-startup.patch 2008-08-13 21:30:11 UTC (rev 2217)
+++ desktop/branches/svn-snapshots/xfdesktop4/debian/patches/04_fix-CRITICAL-register-message-startup.patch 2008-08-23 22:50:51 UTC (rev 2240)
@@ -1,15 +0,0 @@
-Index: xfdesktop/src/main.c
-===================================================================
---- xfdesktop/src/main.c (revision 26631)
-+++ xfdesktop/src/main.c (revision 26632)
-@@ -382,8 +382,8 @@
- windowlist_set_show_icons(desktop_gtk_menu_images);
-
- if(mcs_client) {
-- settings_register_callback(menu_settings_changed, NULL);
-- settings_register_callback(windowlist_settings_changed, NULL);
-+ settings_register_callback(menu_settings_changed, desktops[0]);
-+ settings_register_callback(windowlist_settings_changed, desktops[0]);
- }
-
- signal(SIGHUP, sighandler_cb);
Deleted: desktop/branches/svn-snapshots/xfdesktop4/debian/patches/05_simplify-free-code.patch
===================================================================
--- desktop/trunk/xfdesktop4/debian/patches/05_simplify-free-code.patch 2008-08-13 21:30:11 UTC (rev 2217)
+++ desktop/branches/svn-snapshots/xfdesktop4/debian/patches/05_simplify-free-code.patch 2008-08-23 22:50:51 UTC (rev 2240)
@@ -1,28 +0,0 @@
-Index: xfce_4_4/modules/menu/desktop-menu-cache.c
-===================================================================
---- xfce_4_4/modules/menu/desktop-menu-cache.c (revision 26650)
-+++ xfce_4_4/modules/menu/desktop-menu-cache.c (revision 26651)
-@@ -453,17 +453,11 @@
- menu_tree = NULL;
- }
-
-- for(l = menu_files; l; l = l->next)
-- g_free(l->data);
-- if(menu_files) {
-- g_list_free(menu_files);
-- menu_files = NULL;
-- }
-+ g_list_foreach(menu_files, (GFunc)g_free, NULL);
-+ g_list_free(menu_files);
-+ menu_files = NULL;
-
-- for(l = dentry_dirs; l; l = l->next)
-- g_free(l->data);
-- if(dentry_dirs) {
-- g_list_free(dentry_dirs);
-- dentry_dirs = NULL;
-- }
-+ g_list_foreach(dentry_dirs, (GFunc)g_free, NULL);
-+ g_list_free(dentry_dirs);
-+ dentry_dirs = NULL;
- }
Deleted: desktop/branches/svn-snapshots/xfdesktop4/debian/patches/07_fix-italian-typos.patch
===================================================================
--- desktop/trunk/xfdesktop4/debian/patches/07_fix-italian-typos.patch 2008-08-13 21:30:11 UTC (rev 2217)
+++ desktop/branches/svn-snapshots/xfdesktop4/debian/patches/07_fix-italian-typos.patch 2008-08-23 22:50:51 UTC (rev 2240)
@@ -1,14 +0,0 @@
---- xfdesktop/modules/menu/xfce-registered-categories.xml.it.old
-+++ xfdesktop/modules/menu/xfce-registered-categories.xml.it
-@@ -138,9 +138,9 @@
- <category name="HamRadio" replace="Ham Radio" builtin-icon="NETWORK" />
- <category name="News" builtin-icon="NETWORK" />
- <category name="P2P" replace="Peer-to-Peer" builtin-icon="NETWORK" />
-- <category name="RemoteAccess" replace="Accessa remoto" builtin-icon="NETWORK" />
-+ <category name="RemoteAccess" replace="Accesso remoto" builtin-icon="NETWORK" />
- <category name="Telephony" replace="Telefonia" builtin-icon="NETWORK" />
-- <category name="WebBrowser" replace="Naviagazione internet" builtin-icon="NETWORK" />
-+ <category name="WebBrowser" replace="Navigazione internet" builtin-icon="NETWORK" />
- <category name="WebDevelopment" replace="Sviluppo web" builtin-icon="NETWORK" />
- <category name="AudioVideo" replace="Multimedia" toplevel="true" builtin-icon="MULTIMEDIA">
- <subcategory name="HamRadio" />
Modified: desktop/branches/svn-snapshots/xfdesktop4/debian/patches/series
===================================================================
--- desktop/trunk/xfdesktop4/debian/patches/series 2008-08-13 21:30:11 UTC (rev 2217)
+++ desktop/branches/svn-snapshots/xfdesktop4/debian/patches/series 2008-08-23 22:50:51 UTC (rev 2240)
@@ -1,6 +1,3 @@
-01_show-backdrop-by-default.patch
+01_provide-missing-desktop.patch
02_use_eject_where_needed.patch
-03_fix-memory-leak.patch
-04_fix-CRITICAL-register-message-startup.patch
-05_simplify-free-code.patch
-07_fix-italian-typos.patch
+06_fix-size-warning-amd64.patch
Modified: desktop/branches/svn-snapshots/xfdesktop4/debian/rules
===================================================================
--- desktop/trunk/xfdesktop4/debian/rules 2008-08-13 21:30:11 UTC (rev 2217)
+++ desktop/branches/svn-snapshots/xfdesktop4/debian/rules 2008-08-23 22:50:51 UTC (rev 2240)
@@ -61,14 +61,12 @@
$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
- rm -f $(CURDIR)/debian/tmp/usr/lib/xfce4/mcs-plugins/*.la
- rm -f $(CURDIR)/debian/tmp/usr/lib/xfce4/mcs-plugins/*.a
rm -f $(CURDIR)/debian/tmp/usr/lib/xfce4/modules/*.la
rm -f $(CURDIR)/debian/tmp/usr/lib/xfce4/modules/*.a
# lintian override file
- install -D -p -o root -g root -m 644 $(CURDIR)/debian/xfdesktop4.lintian \
- $(CURDIR)/debian/tmp/usr/share/lintian/overrides/xfdesktop4
+ #install -D -p -o root -g root -m 644 $(CURDIR)/debian/xfdesktop4.lintian \
+ #$(CURDIR)/debian/tmp/usr/share/lintian/overrides/xfdesktop4
chrpath -d -k $(CURDIR)/debian/tmp/usr/bin/* \
@@ -97,7 +95,7 @@
dh_installchangelogs ChangeLog
- dh_install
+ dh_install --sourcedir=debian/tmp --list-missing
# why oh why is this necessary?
rm -rf $(CURDIR)/debian/xfdesktop4-data/usr/share/man
Modified: desktop/branches/svn-snapshots/xfdesktop4/debian/xfdesktop4-data.install
===================================================================
--- desktop/trunk/xfdesktop4/debian/xfdesktop4-data.install 2008-08-13 21:30:11 UTC (rev 2217)
+++ desktop/branches/svn-snapshots/xfdesktop4/debian/xfdesktop4-data.install 2008-08-23 22:50:51 UTC (rev 2240)
@@ -1,6 +1,7 @@
-debian/tmp/usr/share/icons
-debian/tmp/usr/share/locale
-debian/tmp/usr/share/man
-debian/tmp/usr/share/pixmaps
-debian/tmp/usr/share/xfce4-menueditor
-debian/tmp/usr/share/xfce4
+usr/share/icons
+usr/share/locale
+usr/share/man
+usr/share/pixmaps
+usr/share/xfce4-menueditor
+usr/share/xfce4
+usr/share/desktop-directories
Modified: desktop/branches/svn-snapshots/xfdesktop4/debian/xfdesktop4.install
===================================================================
--- desktop/trunk/xfdesktop4/debian/xfdesktop4.install 2008-08-13 21:30:11 UTC (rev 2217)
+++ desktop/branches/svn-snapshots/xfdesktop4/debian/xfdesktop4.install 2008-08-23 22:50:51 UTC (rev 2240)
@@ -1,5 +1,4 @@
-debian/tmp/etc
-debian/tmp/usr/bin
-debian/tmp/usr/lib
-debian/tmp/usr/share/applications
-debian/tmp/usr/share/lintian
+etc
+usr/bin
+usr/lib
+usr/share/applications
Deleted: desktop/branches/svn-snapshots/xfdesktop4/debian/xfdesktop4.lintian
===================================================================
--- desktop/trunk/xfdesktop4/debian/xfdesktop4.lintian 2008-08-13 21:30:11 UTC (rev 2217)
+++ desktop/branches/svn-snapshots/xfdesktop4/debian/xfdesktop4.lintian 2008-08-23 22:50:51 UTC (rev 2240)
@@ -1,2 +0,0 @@
-# xfdesktop4 depends on xfce4-ms-manager where is xfce-setting-show
-xfdesktop4: desktop-command-not-in-package /usr/share/applications/xfce-backdrop-settings.desktop xfce-setting-show
More information about the Pkg-xfce-commits
mailing list