[Pkg-xfce-commits] r2753 - in desktop/trunk: exo/debian exo/debian/patches gtk2-engines-xfce/debian libxfce4mcs/debian libxfce4util/debian libxfcegui4/debian libxfcegui4/debian/patches mousepad/debian orage/debian orage/debian/patches thunar/debian thunar/debian/patches xfce-mcs-manager/debian xfce-mcs-plugins/debian xfce4/debian xfce4-appfinder/debian xfce4-dev-tools/debian xfce4-dev-tools/debian/patches xfce4-icon-theme/debian xfce4-mixer/debian xfce4-panel/debian xfce4-panel/debian/patches xfce4-session/debian xfce4-session/debian/patches xfce4-terminal/debian xfce4-utils/debian xfdesktop4/debian xfdesktop4/debian/patches xfprint4/debian xfprint4/debian/patches xfwm4/debian xfwm4-themes/debian
corsac at alioth.debian.org
corsac at alioth.debian.org
Thu Feb 26 23:15:23 UTC 2009
Author: corsac
Date: 2009-02-26 23:15:23 +0000 (Thu, 26 Feb 2009)
New Revision: 2753
Added:
desktop/trunk/mousepad/debian/patches/
desktop/trunk/thunar/debian/patches/04_es-l10n-typo.patch
desktop/trunk/xfce-mcs-plugins/debian/patches/
desktop/trunk/xfce4-panel/debian/patches/01_fix-dnd-file-panel.patch
desktop/trunk/xfdesktop4/debian/patches/03_fix-memory-leak.patch
desktop/trunk/xfdesktop4/debian/patches/04_fix-CRITICAL-register-message-startup.patch
desktop/trunk/xfdesktop4/debian/patches/05_simplify-free-code.patch
desktop/trunk/xfdesktop4/debian/patches/07_fix-italian-typos.patch
desktop/trunk/xfprint4/debian/patches/03_check-default-printer.patch
desktop/trunk/xfwm4/debian/patches/
Removed:
desktop/trunk/exo/debian/patches/04_fix_broken_regexp.patch
desktop/trunk/libxfcegui4/debian/patches/02_fix-menu-icons.patch
desktop/trunk/orage/debian/patches/01_fix-l10n-en_IN.patch
desktop/trunk/xfce4-appfinder/debian/patches/
desktop/trunk/xfce4-mixer/debian/xfce4-mixer.desktop
desktop/trunk/xfce4-session/debian/patches/08_fix-fortune-path.patch
Modified:
desktop/trunk/exo/debian/changelog
desktop/trunk/exo/debian/control
desktop/trunk/exo/debian/patches/series
desktop/trunk/exo/debian/rules
desktop/trunk/gtk2-engines-xfce/debian/changelog
desktop/trunk/gtk2-engines-xfce/debian/control
desktop/trunk/gtk2-engines-xfce/debian/copyright
desktop/trunk/gtk2-engines-xfce/debian/rules
desktop/trunk/libxfce4mcs/debian/changelog
desktop/trunk/libxfce4mcs/debian/rules
desktop/trunk/libxfce4util/debian/changelog
desktop/trunk/libxfce4util/debian/rules
desktop/trunk/libxfcegui4/debian/changelog
desktop/trunk/libxfcegui4/debian/control
desktop/trunk/libxfcegui4/debian/patches/series
desktop/trunk/libxfcegui4/debian/rules
desktop/trunk/mousepad/debian/changelog
desktop/trunk/mousepad/debian/control
desktop/trunk/mousepad/debian/rules
desktop/trunk/orage/debian/changelog
desktop/trunk/orage/debian/control
desktop/trunk/thunar/debian/changelog
desktop/trunk/thunar/debian/control
desktop/trunk/xfce-mcs-manager/debian/changelog
desktop/trunk/xfce-mcs-manager/debian/control
desktop/trunk/xfce-mcs-manager/debian/rules
desktop/trunk/xfce-mcs-plugins/debian/changelog
desktop/trunk/xfce-mcs-plugins/debian/control
desktop/trunk/xfce-mcs-plugins/debian/rules
desktop/trunk/xfce4-appfinder/debian/changelog
desktop/trunk/xfce4-appfinder/debian/control
desktop/trunk/xfce4-appfinder/debian/rules
desktop/trunk/xfce4-dev-tools/debian/changelog
desktop/trunk/xfce4-dev-tools/debian/patches/01-fix-bashism-in-xdt-commit.patch
desktop/trunk/xfce4-icon-theme/debian/changelog
desktop/trunk/xfce4-icon-theme/debian/control
desktop/trunk/xfce4-icon-theme/debian/copyright
desktop/trunk/xfce4-icon-theme/debian/rules
desktop/trunk/xfce4-mixer/debian/changelog
desktop/trunk/xfce4-mixer/debian/control
desktop/trunk/xfce4-mixer/debian/rules
desktop/trunk/xfce4-panel/debian/changelog
desktop/trunk/xfce4-panel/debian/control
desktop/trunk/xfce4-panel/debian/patches/series
desktop/trunk/xfce4-panel/debian/rules
desktop/trunk/xfce4-session/debian/changelog
desktop/trunk/xfce4-session/debian/control
desktop/trunk/xfce4-session/debian/patches/series
desktop/trunk/xfce4-session/debian/rules
desktop/trunk/xfce4-terminal/debian/changelog
desktop/trunk/xfce4-terminal/debian/control
desktop/trunk/xfce4-utils/debian/changelog
desktop/trunk/xfce4-utils/debian/control
desktop/trunk/xfce4-utils/debian/rules
desktop/trunk/xfce4/debian/changelog
desktop/trunk/xfce4/debian/control
desktop/trunk/xfdesktop4/debian/changelog
desktop/trunk/xfdesktop4/debian/control
desktop/trunk/xfdesktop4/debian/patches/series
desktop/trunk/xfdesktop4/debian/rules
desktop/trunk/xfprint4/debian/changelog
desktop/trunk/xfprint4/debian/patches/series
desktop/trunk/xfprint4/debian/rules
desktop/trunk/xfwm4-themes/debian/changelog
desktop/trunk/xfwm4-themes/debian/control
desktop/trunk/xfwm4-themes/debian/rules
desktop/trunk/xfwm4/debian/changelog
desktop/trunk/xfwm4/debian/control
desktop/trunk/xfwm4/debian/rules
Log:
revert to 4.4.2
Modified: desktop/trunk/exo/debian/changelog
===================================================================
--- desktop/trunk/exo/debian/changelog 2009-02-26 20:16:50 UTC (rev 2752)
+++ desktop/trunk/exo/debian/changelog 2009-02-26 23:15:23 UTC (rev 2753)
@@ -1,20 +1,3 @@
-exo (0.3.4-9) UNRELEASED; urgency=low
-
- [ Michael Casadevall ]
- * Merged exo patches from Ubuntu
- * debian/patches:
- - 04_fix_broken_regex.patch added, adds ^ and $ to url expressions to
- prevent exo from mistaking a directory as an e-mail address and opening
- the wrong helper application. Xfce Bug #4330. LP: #262125.
- * debian/control:
- - Added myself as an upload
-
- [ Yves-Alexis Perez ]
- * debian/rules:
- - stop messing with config.{guess,sub}.
-
- -- Yves-Alexis Perez <corsac at debian.org> Thu, 16 Oct 2008 08:29:44 +0200
-
exo (0.3.4-8) experimental; urgency=low
* debian/patches:
Modified: desktop/trunk/exo/debian/control
===================================================================
--- desktop/trunk/exo/debian/control 2009-02-26 20:16:50 UTC (rev 2752)
+++ desktop/trunk/exo/debian/control 2009-02-26 23:15:23 UTC (rev 2753)
@@ -1,7 +1,7 @@
Source: exo
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>, Michael Casadevall <sonicmctails at gmail.com>
+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), libxfcegui4-dev (>= 4.4.2), liburi-perl, xfce4-mcs-manager-dev, chrpath, libhal-storage-dev [!hurd-i386], libnotify-dev, quilt
Standards-Version: 3.8.0
Section: libs
Deleted: desktop/trunk/exo/debian/patches/04_fix_broken_regexp.patch
===================================================================
--- desktop/trunk/exo/debian/patches/04_fix_broken_regexp.patch 2009-02-26 20:16:50 UTC (rev 2752)
+++ desktop/trunk/exo/debian/patches/04_fix_broken_regexp.patch 2009-02-26 23:15:23 UTC (rev 2753)
@@ -1,25 +0,0 @@
-Index: exo-0.3.4/exo/exo-url.c
-===================================================================
---- exo-0.3.4.orig/exo/exo-url.c 2008-10-02 09:51:44.000000000 -0300
-+++ exo-0.3.4/exo/exo-url.c 2008-10-02 09:52:05.000000000 -0300
-@@ -56,14 +56,14 @@
- #define PASSCHARS "-A-Za-z0-9,?;.:/!%$^*&~\"#'"
- #define HOSTCHARS "-A-Za-z0-9"
- #define USER "[" USERCHARS "]+(:["PASSCHARS "]+)?"
--#define MATCH_BROWSER1 "((file|https?|ftps?)://(" USER "@)?)[" HOSTCHARS ".]+(:[0-9]+)?" \
-- "(/[-A-Za-z0-9_$.+!*(),;:@&=?/~#%]*[^]'.}>) \t\r\n,\\\"])?"
--#define MATCH_BROWSER2 "(www|ftp)[" HOSTCHARS "]*\\.[" HOSTCHARS ".]+(:[0-9]+)?" \
-- "(/[-A-Za-z0-9_$.+!*(),;:@&=?/~#%]*[^]'.}>) \t\r\n,\\\"])?"
-+#define MATCH_BROWSER1 "^((file|https?|ftps?)://(" USER "@)?)[" HOSTCHARS ".]+(:[0-9]+)?" \
-+ "(/[-A-Za-z0-9_$.+!*(),;:@&=?/~#%]*[^]'.}>) \t\r\n,\\\"])?$"
-+#define MATCH_BROWSER2 "^(www|ftp)[" HOSTCHARS "]*\\.[" HOSTCHARS ".]+(:[0-9]+)?" \
-+ "(/[-A-Za-z0-9_$.+!*(),;:@&=?/~#%]*[^]'.}>) \t\r\n,\\\"])?$"
- #if !defined(__GLIBC__)
--#define MATCH_MAILER "[a-z0-9][a-z0-9_.-]*@[a-z0-9][a-z0-9-]*(\\.[a-z0-9][a-z0-9-]*)+"
-+#define MATCH_MAILER "^[a-z0-9][a-z0-9_.-]*@[a-z0-9][a-z0-9-]*(\\.[a-z0-9][a-z0-9-]*)+$"
- #else
--#define MATCH_MAILER "\\<[a-z0-9][a-z0-9_.-]*@[a-z0-9][a-z0-9-]*(\\.[a-z0-9][a-z0-9-]*)+\\>"
-+#define MATCH_MAILER "^\\<[a-z0-9][a-z0-9_.-]*@[a-z0-9][a-z0-9-]*(\\.[a-z0-9][a-z0-9-]*)+\\>$"
- #endif
-
-
Modified: desktop/trunk/exo/debian/patches/series
===================================================================
--- desktop/trunk/exo/debian/patches/series 2009-02-26 20:16:50 UTC (rev 2752)
+++ desktop/trunk/exo/debian/patches/series 2009-02-26 23:15:23 UTC (rev 2753)
@@ -1,4 +1,3 @@
01_exo-alt-eject.patch
02_exo-open.1.patch
03_libexo-teardown-crypto-on-eject.patch
-04_fix_broken_regexp.patch
Modified: desktop/trunk/exo/debian/rules
===================================================================
--- desktop/trunk/exo/debian/rules 2009-02-26 20:16:50 UTC (rev 2752)
+++ desktop/trunk/exo/debian/rules 2009-02-26 23:15:23 UTC (rev 2753)
@@ -47,6 +47,13 @@
build-stamp: config.status
dh_testdir
+ifneq "$(wildcard /usr/share/misc/config.sub)" ""
+ cp -f /usr/share/misc/config.sub config.sub
+endif
+ifneq "$(wildcard /usr/share/misc/config.guess)" ""
+ cp -f /usr/share/misc/config.guess config.guess
+endif
+
# Add here commands to compile the package.
$(MAKE)
@@ -60,6 +67,14 @@
# Add here commands to clean up after the build process.
[ ! -f Makefile ] || $(MAKE) distclean
+ifneq "$(wildcard /usr/share/misc/config.sub)" ""
+ rm -f config.sub
+endif
+ifneq "$(wildcard /usr/share/misc/config.guess)" ""
+ rm -f config.guess
+endif
+
+
dh_clean
install: build
Modified: desktop/trunk/gtk2-engines-xfce/debian/changelog
===================================================================
--- desktop/trunk/gtk2-engines-xfce/debian/changelog 2009-02-26 20:16:50 UTC (rev 2752)
+++ desktop/trunk/gtk2-engines-xfce/debian/changelog 2009-02-26 23:15:23 UTC (rev 2753)
@@ -1,15 +1,3 @@
-gtk2-engines-xfce (2.4.3-1) UNRELEASED; urgency=low
-
- * New upstream bugfix release.
- * debian/rules:
- - stop messing with config.{guess,sub}.
- * debian/copyright:
- - update copyright dates.
- * debian/control:
- - update standards version.
-
- -- Yves-Alexis Perez <corsac at debian.org> Tue, 28 Oct 2008 07:26:23 +0100
-
gtk2-engines-xfce (2.4.2-2) unstable; urgency=low
* debian/copyright:
Modified: desktop/trunk/gtk2-engines-xfce/debian/control
===================================================================
--- desktop/trunk/gtk2-engines-xfce/debian/control 2009-02-26 20:16:50 UTC (rev 2752)
+++ desktop/trunk/gtk2-engines-xfce/debian/control 2009-02-26 23:15:23 UTC (rev 2753)
@@ -4,7 +4,7 @@
Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
Uploaders: Martin Loschwitz <madkiss at debian.org>, Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>, Yves-Alexis Perez <corsac at debian.org>
Build-Depends: debhelper (>= 4.1.26), libgtk2.0-dev (>= 2.10.1), libx11-dev (> 2:1.0.0-6), chrpath
-Standards-Version: 3.8.0
+Standards-Version: 3.7.3
Homepage: http://www.xfce.org/
Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/gtk2-engines-xfce/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/gtk2-engines-xfce/
Modified: desktop/trunk/gtk2-engines-xfce/debian/copyright
===================================================================
--- desktop/trunk/gtk2-engines-xfce/debian/copyright 2009-02-26 20:16:50 UTC (rev 2752)
+++ desktop/trunk/gtk2-engines-xfce/debian/copyright 2009-02-26 23:15:23 UTC (rev 2753)
@@ -20,7 +20,7 @@
Alexander Larsson
Owen Taylor <otaylor at redhat.com>
-gtk2-engines-xfce is © 1999-2008 Olivier Fourdan
+gtk2-engines-xfce is © 1999-2007 Olivier Fourdan
License:
This package is free software; you can redistribute it and/or modify
Modified: desktop/trunk/gtk2-engines-xfce/debian/rules
===================================================================
--- desktop/trunk/gtk2-engines-xfce/debian/rules 2009-02-26 20:16:50 UTC (rev 2752)
+++ desktop/trunk/gtk2-engines-xfce/debian/rules 2009-02-26 23:15:23 UTC (rev 2753)
@@ -32,6 +32,11 @@
[ ! -f Makefile ] || $(MAKE) distclean
+ -test -r /usr/share/misc/config.sub && \
+ cp -f /usr/share/misc/config.sub config.sub
+ -test -r /usr/share/misc/config.guess && \
+ cp -f /usr/share/misc/config.guess config.guess
+
dh_clean
install: build
Modified: desktop/trunk/libxfce4mcs/debian/changelog
===================================================================
--- desktop/trunk/libxfce4mcs/debian/changelog 2009-02-26 20:16:50 UTC (rev 2752)
+++ desktop/trunk/libxfce4mcs/debian/changelog 2009-02-26 23:15:23 UTC (rev 2753)
@@ -1,11 +1,3 @@
-libxfce4mcs (4.4.3-1) UNRELEASED; urgency=low
-
- * new upstream bugfix release.
- * debian/rules:
- - stop messing with config.{guess,sub}.
-
- -- Yves-Alexis Perez <corsac at debian.org> Tue, 28 Oct 2008 07:28:41 +0100
-
libxfce4mcs (4.4.2-4) unstable; urgency=low
* debian/control:
Modified: desktop/trunk/libxfce4mcs/debian/rules
===================================================================
--- desktop/trunk/libxfce4mcs/debian/rules 2009-02-26 20:16:50 UTC (rev 2752)
+++ desktop/trunk/libxfce4mcs/debian/rules 2009-02-26 23:15:23 UTC (rev 2753)
@@ -31,6 +31,13 @@
[ ! -f Makefile ] || $(MAKE) distclean
+ifneq "$(wildcard /usr/share/misc/config.sub)" ""
+ cp -f /usr/share/misc/config.sub config.sub
+endif
+ifneq "$(wildcard /usr/share/misc/config.guess)" ""
+ cp -f /usr/share/misc/config.guess config.guess
+endif
+
rm -rf `pwd`/debian/tmp-install
dh_clean
Modified: desktop/trunk/libxfce4util/debian/changelog
===================================================================
--- desktop/trunk/libxfce4util/debian/changelog 2009-02-26 20:16:50 UTC (rev 2752)
+++ desktop/trunk/libxfce4util/debian/changelog 2009-02-26 23:15:23 UTC (rev 2753)
@@ -1,11 +1,3 @@
-libxfce4util (4.4.3-1) UNRELEASED; urgency=low
-
- * new upstream bugfix release.
- * debian/rules:
- - stop messing with config.{guess,sub}.
-
- -- Yves-Alexis Perez <corsac at debian.org> Tue, 28 Oct 2008 07:22:55 +0100
-
libxfce4util (4.4.2-3) unstable; urgency=low
* debian/control:
Modified: desktop/trunk/libxfce4util/debian/rules
===================================================================
--- desktop/trunk/libxfce4util/debian/rules 2009-02-26 20:16:50 UTC (rev 2752)
+++ desktop/trunk/libxfce4util/debian/rules 2009-02-26 23:15:23 UTC (rev 2753)
@@ -42,6 +42,13 @@
[ ! -f Makefile ] || $(MAKE) distclean
+ifneq "$(wildcard /usr/share/misc/config.sub)" ""
+ cp -f /usr/share/misc/config.sub config.sub
+endif
+ifneq "$(wildcard /usr/share/misc/config.guess)" ""
+ cp -f /usr/share/misc/config.guess config.guess
+endif
+
dh_clean
install: build
Modified: desktop/trunk/libxfcegui4/debian/changelog
===================================================================
--- desktop/trunk/libxfcegui4/debian/changelog 2009-02-26 20:16:50 UTC (rev 2752)
+++ desktop/trunk/libxfcegui4/debian/changelog 2009-02-26 23:15:23 UTC (rev 2753)
@@ -1,19 +1,3 @@
-libxfcegui4 (4.4.3-1) UNRELEASED; urgency=low
-
- [ Yves-Alexis Perez ]
- * new upstrean bugfix release.
- * debian/rules:
- - stop messing with config.{guess,sub}.
- * debian/control:
- - update standards version.
-
- [ Michael Casadevall ]
- * debian/patches/02_fix-menu-icons.patch:
- - Fixes Xfce #3614 which prevents icons with dots
- in them from properly showing up in the menu
-
- -- Michael Casadevall <sonicmctails at gmail.com> Tue, 04 Nov 2008 14:57:01 -0500
-
libxfcegui4 (4.4.2-4) unstable; urgency=low
* another “brown paper bag” release.
Modified: desktop/trunk/libxfcegui4/debian/control
===================================================================
--- desktop/trunk/libxfcegui4/debian/control 2009-02-26 20:16:50 UTC (rev 2752)
+++ desktop/trunk/libxfcegui4/debian/control 2009-02-26 23:15:23 UTC (rev 2753)
@@ -2,9 +2,9 @@
Section: libs
Priority: optional
Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
-Uploaders: Martin Loschwitz <madkiss at debian.org>, Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>, Yves-Alexis Perez <corsac at debian.org>, Michael Casadevall <sonicmctails at gmail.com>
+Uploaders: Martin Loschwitz <madkiss at debian.org>, 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.6), bison, libxft-dev, libxfce4util-dev (>= 4.4.2), libxt-dev, libxml2-dev, libstartup-notification0-dev, chrpath, quilt
-Standards-Version: 3.8.0
+Standards-Version: 3.7.3
Homepage: http://www.xfce.org/
Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/libxfcegui4/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/libxfcegui4/
Deleted: desktop/trunk/libxfcegui4/debian/patches/02_fix-menu-icons.patch
===================================================================
--- desktop/trunk/libxfcegui4/debian/patches/02_fix-menu-icons.patch 2009-02-26 20:16:50 UTC (rev 2752)
+++ desktop/trunk/libxfcegui4/debian/patches/02_fix-menu-icons.patch 2009-02-26 23:15:23 UTC (rev 2753)
@@ -1,42 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_fix-menu-icons.dpatch by <gauvain at ulteo.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad libxfcegui4-4.4.2-4ubuntu1~/libxfcegui4/icons.c libxfcegui4-4.4.2-4ubuntu1/libxfcegui4/icons.c
---- libxfcegui4-4.4.2-4ubuntu1~/libxfcegui4/icons.c 2008-05-05 00:45:52.000000000 +0200
-+++ libxfcegui4-4.4.2-4ubuntu1/libxfcegui4/icons.c 2008-05-08 21:12:07.000000000 +0200
-@@ -143,8 +143,12 @@
- ensure_gtk_icon_theme();
-
- /* GtkIconTheme doesn't like extensions */
-- if((p = g_strrstr(name, ".")) && strlen(p) < 6)
-- name_fixed = g_strndup(name, p-name);
-+ if (g_str_has_suffix (name, ".png") || g_str_has_suffix (name, ".svg")
-+ || g_str_has_suffix (name, ".xpm"))
-+ {
-+ if((p = g_strrstr(name, ".")) && strlen(p) < 6)
-+ name_fixed = g_strndup(name, p-name);
-+ }
-
- pix = gtk_icon_theme_load_icon(icon_theme, name_fixed ? name_fixed : name,
- size,
-@@ -221,9 +225,13 @@
- ensure_gtk_icon_theme();
-
- /* GtkIconTheme doesn't like extensions */
-- if((p = g_strrstr(name, ".")) && strlen(p) < 6)
-- name_fixed = g_strndup(name, p-name);
--
-+ if (g_str_has_suffix (name, ".png") || g_str_has_suffix (name, ".svg")
-+ || g_str_has_suffix (name, ".xpm"))
-+ {
-+ if((p = g_strrstr(name, ".")) && strlen(p) < 6)
-+ name_fixed = g_strndup(name, p-name);
-+ }
-+
- info = gtk_icon_theme_lookup_icon(icon_theme,
- name_fixed ? name_fixed : name,
- size, 0);
Modified: desktop/trunk/libxfcegui4/debian/patches/series
===================================================================
--- desktop/trunk/libxfcegui4/debian/patches/series 2009-02-26 20:16:50 UTC (rev 2752)
+++ desktop/trunk/libxfcegui4/debian/patches/series 2009-02-26 23:15:23 UTC (rev 2753)
@@ -1,2 +1 @@
01_xfce-exec-use-thunar.patch
-02_fix-menu-icons.patch
Modified: desktop/trunk/libxfcegui4/debian/rules
===================================================================
--- desktop/trunk/libxfcegui4/debian/rules 2009-02-26 20:16:50 UTC (rev 2752)
+++ desktop/trunk/libxfcegui4/debian/rules 2009-02-26 23:15:23 UTC (rev 2753)
@@ -33,6 +33,13 @@
[ ! -f Makefile ] || $(MAKE) distclean
+ifneq "$(wildcard /usr/share/misc/config.sub)" ""
+ cp -f /usr/share/misc/config.sub config.sub
+endif
+ifneq "$(wildcard /usr/share/misc/config.guess)" ""
+ cp -f /usr/share/misc/config.guess config.guess
+endif
+
dh_clean
install: build
Modified: desktop/trunk/mousepad/debian/changelog
===================================================================
--- desktop/trunk/mousepad/debian/changelog 2009-02-26 20:16:50 UTC (rev 2752)
+++ desktop/trunk/mousepad/debian/changelog 2009-02-26 23:15:23 UTC (rev 2753)
@@ -1,17 +1,3 @@
-mousepad (0.2.14-1) UNRELEASED; urgency=low
-
- * new upstream bugfix release.
- * debian/rules:
- - stop messing with config.{guess,sub}.
- * debian/patches:
- - 01_fix-recent-items-sort dropped, merged upstream.
- * debian/control:
- - remove quilt from build-deps.
- - update standards version to 3.8.0.
- - add build-dep on intltoo.
-
- -- Yves-Alexis Perez <corsac at debian.org> Tue, 28 Oct 2008 14:50:13 +0100
-
mousepad (0.2.13-2) unstable; urgency=low
* debian/control:
Modified: desktop/trunk/mousepad/debian/control
===================================================================
--- desktop/trunk/mousepad/debian/control 2009-02-26 20:16:50 UTC (rev 2752)
+++ desktop/trunk/mousepad/debian/control 2009-02-26 23:15:23 UTC (rev 2753)
@@ -3,9 +3,8 @@
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>, Rudy Godoy <rudy at kernel-panik.org>, Martin Loschwitz <madkiss at debian.org>, Yves-Alexis Perez <corsac at debian.org>
-Build-Depends: debhelper (>= 4.0.0), docbook-to-man, libxfcegui4-dev (>=
- 4.4.2), pkg-config, libxml-parser-perl, chrpath, intltool
-Standards-Version: 3.8.0
+Build-Depends: debhelper (>= 4.0.0), docbook-to-man, libxfcegui4-dev (>= 4.4.2), pkg-config, libxml-parser-perl, chrpath, quilt
+Standards-Version: 3.7.3
Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/mousepad/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/mousepad/
Copied: desktop/trunk/mousepad/debian/patches (from rev 2222, desktop/trunk/mousepad/debian/patches)
Modified: desktop/trunk/mousepad/debian/rules
===================================================================
--- desktop/trunk/mousepad/debian/rules 2009-02-26 20:16:50 UTC (rev 2752)
+++ desktop/trunk/mousepad/debian/rules 2009-02-26 23:15:23 UTC (rev 2753)
@@ -17,7 +17,9 @@
CFLAGS += -O2
endif
-config.status: configure
+include /usr/share/quilt/quilt.make
+
+config.status: patch configure
dh_testdir
# Add here commands to configure the package.
CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --sysconfdir=/etc --enable-final
@@ -34,13 +36,20 @@
touch build-stamp
-clean:
+clean: unpatch
dh_testdir
dh_testroot
rm -f build-stamp mousepad.1
# Add here commands to clean up after the build process.
[ ! -f Makefile ] || $(MAKE) distclean
+ifneq "$(wildcard /usr/share/misc/config.sub)" ""
+ cp -f /usr/share/misc/config.sub config.sub
+endif
+ifneq "$(wildcard /usr/share/misc/config.guess)" ""
+ cp -f /usr/share/misc/config.guess config.guess
+endif
+
dh_clean
install: build
Modified: desktop/trunk/orage/debian/changelog
===================================================================
--- desktop/trunk/orage/debian/changelog 2009-02-26 20:16:50 UTC (rev 2752)
+++ desktop/trunk/orage/debian/changelog 2009-02-26 23:15:23 UTC (rev 2753)
@@ -1,10 +1,3 @@
-orage (4.5.14.0-2) unstable; urgency=low
-
- * debian/patches:
- - 01_fix-l10n-en_IN added (LP: #257964)
-
- -- Michael Casadevall <sonicmctails at gmail.com> Tue, 07 Oct 2008 02:27:23 -0400
-
orage (4.5.14.0-1) unstable; urgency=low
* New upstream release.
Modified: desktop/trunk/orage/debian/control
===================================================================
--- desktop/trunk/orage/debian/control 2009-02-26 20:16:50 UTC (rev 2752)
+++ desktop/trunk/orage/debian/control 2009-02-26 23:15:23 UTC (rev 2753)
@@ -2,7 +2,7 @@
Section: x11
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>, Michael Casadevall <sonicmctails at gmail.com>
+Uploaders: Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>, Yves-Alexis Perez <corsac at debian.org>
Build-Depends: debhelper (>= 4.1.0), xfce4-mcs-manager-dev (>= 4.4.2), cdbs, libxml-parser-perl, libgtk2.0-dev (>= 2.10.1), xfce4-panel-dev (>= 4.4.2), chrpath
Standards-Version: 3.8.0
Homepage: http://www.xfce.org/
Deleted: desktop/trunk/orage/debian/patches/01_fix-l10n-en_IN.patch
===================================================================
--- desktop/trunk/orage/debian/patches/01_fix-l10n-en_IN.patch 2009-02-26 20:16:50 UTC (rev 2752)
+++ desktop/trunk/orage/debian/patches/01_fix-l10n-en_IN.patch 2009-02-26 23:15:23 UTC (rev 2753)
@@ -1,99 +0,0 @@
-diff -Nur -x '*.orig' -x '*~' orage-4.5.14.0/src/day-view.c orage-4.5.14.0.new/src/day-view.c
---- orage-4.5.14.0/src/day-view.c 2008-03-10 17:41:48.000000000 -0400
-+++ orage-4.5.14.0.new/src/day-view.c 2008-10-07 02:19:43.000000000 -0400
-@@ -872,6 +872,9 @@
- }
- tm_date.tm_mday = 1;
- }
-+ /* some rare locales show weekday in the default date, so we need to
-+ * make it correct. Safer would be to call mktime() */
-+ tm_date.tm_wday = ++tm_date.tm_wday%7;
- }
- fill_hour_arrow(dw, days+1);
- g_free(today);
-diff -Nur -x '*.orig' -x '*~' orage-4.5.14.0/src/functions.c orage-4.5.14.0.new/src/functions.c
---- orage-4.5.14.0/src/functions.c 2008-03-06 09:44:26.000000000 -0500
-+++ orage-4.5.14.0.new/src/functions.c 2008-10-07 02:19:43.000000000 -0400
-@@ -350,6 +350,12 @@
- , (unsigned int *)&tm_date.tm_mon
- , (unsigned int *)&tm_date.tm_mday);
- tm_date.tm_year -= 1900;
-+ /* need to fill missing tm_wday and tm_yday, which are in use
-+ * in some locale's default date. For example in en_IN. mktime does it */
-+ if (mktime(&tm_date) == (time_t) -1) {
-+ g_warning("orage: orage_cal_to_i18_date mktime failed %d %d %d"
-+ , tm_date.tm_year, tm_date.tm_mon, tm_date.tm_mday);
-+ }
- return(orage_tm_date_to_i18_date(&tm_date));
- }
-
-@@ -357,26 +363,52 @@
- {
- int i;
- struct tm t = {0,0,0,0,0,0,0,0,0};
-+ char *ret;
-
-+ /*
- i = sscanf(icaltime, XFICAL_APPT_TIME_FORMAT
- , &t.tm_year, &t.tm_mon, &t.tm_mday
- , &t.tm_hour, &t.tm_min, &t.tm_sec);
- switch (i) {
-- case 3: /* date */
-+ case 3: / * date * /
- t.tm_hour = -1;
- t.tm_min = -1;
- t.tm_sec = -1;
- break;
-- case 6: /* time */
-+ case 6: / * time * /
- break;
-- default: /* error */
-+ default: / * error * /
- g_error("orage: orage_icaltime_to_tm_time error %s %d", icaltime, i);
- break;
- }
-- if (real_tm) { /* normalise to standard tm format */
-+
-+ if (real_tm) { / * normalise to standard tm format * /
- t.tm_year -= 1900;
- t.tm_mon -= 1;
- }
-+ */
-+ ret = strptime(icaltime, "%Y%m%dT%H%M%S", &t);
-+ if (ret == NULL) {
-+ /* not all format string matched, so it must be DATE */
-+ /* and tm_wday is not calculated ! */
-+ /* need to fill missing tm_wday and tm_yday, which are in use
-+ * in some locale's default date. For example in en_IN. mktime does it */
-+ if (mktime(&t) == (time_t) -1) {
-+ g_warning("orage: orage_icaltime_to_tm_time mktime failed %d %d %d"
-+ , t.tm_year, t.tm_mon, t.tm_mday);
-+ }
-+ t.tm_hour = -1;
-+ t.tm_min = -1;
-+ t.tm_sec = -1;
-+ }
-+ else if (ret[0] != 0) { /* icaltime was not processed completely */
-+ g_error("orage: orage_icaltime_to_tm_time error %s %s", icaltime, ret);
-+ }
-+
-+ if (!real_tm) { /* convert from standard tm format to "normal" format */
-+ t.tm_year += 1900;
-+ t.tm_mon += 1;
-+ }
- return(t);
- }
-
-@@ -457,6 +489,12 @@
- t->tm_mday = 1;
- }
- t->tm_year -= 1900;
-+ /* need to fill missing tm_wday and tm_yday, which are in use
-+ * in some locale's default date. For example in en_IN. mktime does it */
-+ if (mktime(t) == (time_t) -1) {
-+ g_warning("orage: orage_icaltime_to_tm_time mktime failed %d %d %d"
-+ , t->tm_year, t->tm_mon, t->tm_mday);
-+ }
- }
-
- gint orage_days_between(struct tm *t1, struct tm *t2)
Modified: desktop/trunk/thunar/debian/changelog
===================================================================
--- desktop/trunk/thunar/debian/changelog 2009-02-26 20:16:50 UTC (rev 2752)
+++ desktop/trunk/thunar/debian/changelog 2009-02-26 23:15:23 UTC (rev 2753)
@@ -1,13 +1,9 @@
-thunar (0.9.3-1) UNRELEASED; urgency=low
+thunar (0.9.0-11) UNRELEASED; urgency=low
- * new upstream bugfix release.
* debian/control:
- updated standards version to 3.8.0. No change needed.
- - add build-dep on intltool.
- * debian/patches:
- - 04_es-l10n-typo dropped. merged upstream.
- -- Yves-Alexis Perez <corsac at debian.org> Tue, 28 Oct 2008 13:20:21 +0100
+ -- Yves-Alexis Perez <corsac at debian.org> Tue, 12 Aug 2008 22:02:38 +0200
thunar (0.9.0-10) unstable; urgency=low
Modified: desktop/trunk/thunar/debian/control
===================================================================
--- desktop/trunk/thunar/debian/control 2009-02-26 20:16:50 UTC (rev 2752)
+++ desktop/trunk/thunar/debian/control 2009-02-26 23:15:23 UTC (rev 2753)
@@ -3,11 +3,7 @@
Priority: optional
Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
Uploaders: Yves-Alexis Perez <corsac at debian.org>, Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>
-Build-Depends: debhelper (>= 5.0.0), autotools-dev, libcairo2-dev,
- libexo-0.3-dev (>= 0.3.4-8), cdbs, libxml-parser-perl, libfam-dev,
- libhal-storage-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64],
- libdbus-glib-1-dev, libexif-dev, libgtk2.0-dev (>= 2.10.1),
- xfce4-panel-dev (>= 4.4.2), chrpath, libpcre3-dev, libjpeg62-dev, intltool
+Build-Depends: debhelper (>= 5.0.0), autotools-dev, libcairo2-dev, libexo-0.3-dev (>= 0.3.4-8), cdbs, libxml-parser-perl, libfam-dev, libhal-storage-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], libdbus-glib-1-dev, libexif-dev, libgtk2.0-dev (>= 2.10.1), xfce4-panel-dev (>= 4.4.2), chrpath, libpcre3-dev, libjpeg62-dev
Build-Conflicts: libgamin-dev [!hurd-i386]
Standards-Version: 3.8.0
Homepage: http://thunar.xfce.org
Copied: desktop/trunk/thunar/debian/patches/04_es-l10n-typo.patch (from rev 2222, desktop/trunk/thunar/debian/patches/04_es-l10n-typo.patch)
===================================================================
--- desktop/trunk/thunar/debian/patches/04_es-l10n-typo.patch (rev 0)
+++ desktop/trunk/thunar/debian/patches/04_es-l10n-typo.patch 2009-02-26 23:15:23 UTC (rev 2753)
@@ -0,0 +1,11 @@
+--- Thunar-0.9.0/po/es.po.orig 2008-02-27 15:07:41.000000000 +0100
++++ Thunar-0.9.0/po/es.po 2008-02-27 15:07:46.000000000 +0100
+@@ -649,7 +649,7 @@
+ #. create the "Custom command" expand
+ #: ../thunar/thunar-chooser-dialog.c:294
+ msgid "Use a _custom command:"
+-msgstr "Uar una orden _personalizada:"
++msgstr "Usar una orden _personalizada:"
+
+ #: ../thunar/thunar-chooser-dialog.c:295
+ msgid ""
Modified: desktop/trunk/xfce-mcs-manager/debian/changelog
===================================================================
--- desktop/trunk/xfce-mcs-manager/debian/changelog 2009-02-26 20:16:50 UTC (rev 2752)
+++ desktop/trunk/xfce-mcs-manager/debian/changelog 2009-02-26 23:15:23 UTC (rev 2753)
@@ -1,14 +1,3 @@
-xfce-mcs-manager (4.4.3-1) UNRELEASED; urgency=low
-
- * new upstream bugfix release
- * debian/control:
- - update standards version to 3.8.0.
- - add build-dep on intltool.
- * debian/rules
- - stop messing with config.{guess,sub}.
-
- -- Yves-Alexis Perez <corsac at debian.org> Tue, 28 Oct 2008 08:07:45 +0100
-
xfce-mcs-manager (4.4.2-3) unstable; urgency=low
* add triggers for xfce-mcs-manager refresh
Modified: desktop/trunk/xfce-mcs-manager/debian/control
===================================================================
--- desktop/trunk/xfce-mcs-manager/debian/control 2009-02-26 20:16:50 UTC (rev 2752)
+++ desktop/trunk/xfce-mcs-manager/debian/control 2009-02-26 23:15:23 UTC (rev 2753)
@@ -3,10 +3,8 @@
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 (>= 4.1.25), libgtk2.0-dev (>= 2.10.1),
- libxfce4mcs-dev (>= 4.4.2), libxfcegui4-dev (>= 4.4.2), libxft-dev, chrpath,
- quilt, intltool
-Standards-Version: 3.8.0
+Build-Depends: debhelper (>= 4.1.25), libgtk2.0-dev (>= 2.10.1), libxfce4mcs-dev (>= 4.4.2), libxfcegui4-dev (>= 4.4.2), libxft-dev, chrpath, quilt
+Standards-Version: 3.7.3
Homepage: http://www.xfce.org/
Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfce-mcs-manager/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/xfce-mcs-manager/
Modified: desktop/trunk/xfce-mcs-manager/debian/rules
===================================================================
--- desktop/trunk/xfce-mcs-manager/debian/rules 2009-02-26 20:16:50 UTC (rev 2752)
+++ desktop/trunk/xfce-mcs-manager/debian/rules 2009-02-26 23:15:23 UTC (rev 2753)
@@ -35,6 +35,13 @@
rm -rf build-stamp config.status debian/tmp-install
+ifneq "$(wildcard /usr/share/misc/config.sub)" ""
+ cp -f /usr/share/misc/config.sub config.sub
+endif
+ifneq "$(wildcard /usr/share/misc/config.guess)" ""
+ cp -f /usr/share/misc/config.guess config.guess
+endif
+
dh_clean
install: build
Modified: desktop/trunk/xfce-mcs-plugins/debian/changelog
===================================================================
--- desktop/trunk/xfce-mcs-plugins/debian/changelog 2009-02-26 20:16:50 UTC (rev 2752)
+++ desktop/trunk/xfce-mcs-plugins/debian/changelog 2009-02-26 23:15:23 UTC (rev 2753)
@@ -1,20 +1,3 @@
-xfce-mcs-plugins (4.4.3-1) UNRELEASED; urgency=low
-
- * new upstream bugfix release
- * debian/control:
- - Recommends: aumix so sound buttons work out of the box on
- concerned installs.
- - Recommends: x11-utils for xkill shortcut.
- - update standards version to 3.8.0.
- - add build-dep on intltool.
- - remove build-dep on dpatch.
- * debian/patches:
- - 01_mouse_plugin_memory_fix dropped, merged upstream.
- - 02_fix-mouse-plugin-xinput as well.
- * debian/rules: remove patching stuff.
-
- -- Yves-Alexis Perez <corsac at debian.org> Tue, 28 Oct 2008 08:19:39 +0100
-
xfce-mcs-plugins (4.4.2-4) unstable; urgency=low
* switch to triggers:
Modified: desktop/trunk/xfce-mcs-plugins/debian/control
===================================================================
--- desktop/trunk/xfce-mcs-plugins/debian/control 2009-02-26 20:16:50 UTC (rev 2752)
+++ desktop/trunk/xfce-mcs-plugins/debian/control 2009-02-26 23:15:23 UTC (rev 2753)
@@ -3,10 +3,8 @@
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 (>= 4.1.26), libgtk2.0-dev,
- xfce4-mcs-manager-dev (>= 4.4.2), libxft-dev, libxrandr-dev, libxrender-dev,
- libxxf86vm-dev, chrpath, libxxf86misc-dev, intltool
-Standards-Version: 3.8.0
+Build-Depends: debhelper (>= 4.1.26), libgtk2.0-dev, xfce4-mcs-manager-dev (>= 4.4.2), libxft-dev, libxrandr-dev, libxrender-dev, libxxf86vm-dev, chrpath, dpatch, libxxf86misc-dev
+Standards-Version: 3.7.3
Homepage: http://www.xfce.org/
Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfce-mcs-plugins/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/xfce-mcs-plugins/
@@ -14,7 +12,6 @@
Package: xfce4-mcs-plugins
Architecture: any
Depends: ${shlibs:Depends}, xfce4-mcs-manager (>= 4.4.2-3)
-Recommends: x11-utils, aumix
Description: Special modules for the xfce4-mcs-manager
This package contains some settings manager plugins. The plugins
provide settings dialogs for general items that are not part of a
Copied: desktop/trunk/xfce-mcs-plugins/debian/patches (from rev 2222, desktop/trunk/xfce-mcs-plugins/debian/patches)
Modified: desktop/trunk/xfce-mcs-plugins/debian/rules
===================================================================
--- desktop/trunk/xfce-mcs-plugins/debian/rules 2009-02-26 20:16:50 UTC (rev 2752)
+++ desktop/trunk/xfce-mcs-plugins/debian/rules 2009-02-26 23:15:23 UTC (rev 2753)
@@ -1,5 +1,7 @@
#!/usr/bin/make -f
+include /usr/share/dpatch/dpatch.make
+
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
@@ -17,13 +19,14 @@
./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --enable-xf86misc --prefix=/usr --mandir=\$${prefix}/share/man --enable-final
build: build-stamp
-build-stamp: config.status
+build-stamp: config.status patch-stamp
dh_testdir
$(MAKE)
touch build-stamp
-clean:
+clean: clean1 unpatch
+clean1:
dh_testdir
dh_testroot
rm -f build-stamp
Modified: desktop/trunk/xfce4/debian/changelog
===================================================================
--- desktop/trunk/xfce4/debian/changelog 2009-02-26 20:16:50 UTC (rev 2752)
+++ desktop/trunk/xfce4/debian/changelog 2009-02-26 23:15:23 UTC (rev 2753)
@@ -1,11 +1,3 @@
-xfce4 (4.4.3) UNRELEASED; urgency=low
-
- * new upstream bugfix release
- * debian/control:
- - update standards version to 3.8.0.
-
- -- Yves-Alexis Perez <corsac at debian.org> Tue, 28 Oct 2008 07:41:28 +0100
-
xfce4 (4.4.2.1) unstable; urgency=low
[ Yves-Alexis Perez ]
Modified: desktop/trunk/xfce4/debian/control
===================================================================
--- desktop/trunk/xfce4/debian/control 2009-02-26 20:16:50 UTC (rev 2752)
+++ desktop/trunk/xfce4/debian/control 2009-02-26 23:15:23 UTC (rev 2753)
@@ -4,7 +4,7 @@
Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
Uploaders: Martin Loschwitz <madkiss at debian.org>, Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>, Yves-Alexis Perez <corsac at debian.org>
Build-Depends: debhelper (>= 4.1.26)
-Standards-Version: 3.8.0
+Standards-Version: 3.7.3
Homepage: http://www.xfce.org/
Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfce4/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/xfce4/
Modified: desktop/trunk/xfce4-appfinder/debian/changelog
===================================================================
--- desktop/trunk/xfce4-appfinder/debian/changelog 2009-02-26 20:16:50 UTC (rev 2752)
+++ desktop/trunk/xfce4-appfinder/debian/changelog 2009-02-26 23:15:23 UTC (rev 2753)
@@ -1,25 +1,11 @@
-xfce4-appfinder (4.4.3-1) UNRELEASED; urgency=low
+xfce4-appfinder (4.4.2-2) UNRELEASED; urgency=low
- [ Yves-Alexis Perez ]
- * new upstream bugfix release
* debian/control:
- update my email address.
- - add build-dep on intltool.
- * debian/rules:
- - stop messing with config.{guess,sub}.
+ - update standards version to 3.7.3
- [ Michael Casadevall ]
- * debian/patches/00_enable-label-word-wrap.patch
- - Prevents windows from being drawn too wide (Xfce #3632, LP #94284)
- * debian/control:
- - bumped standards to 3.8.0
- - added myself to uploaders
- - added quilt to build-dep
- * debian/rules:
- - added quilt rules
+ -- Yves-Alexis Perez <corsac at debian.org> Mon, 28 Apr 2008 10:16:40 +0200
- -- Yves-Alexis Perez <corsac at debian.org> Tue, 28 Oct 2008 08:47:17 +0100
-
xfce4-appfinder (4.4.2-1) unstable; urgency=low
[ Yves-Alexis Perez ]
Modified: desktop/trunk/xfce4-appfinder/debian/control
===================================================================
--- desktop/trunk/xfce4-appfinder/debian/control 2009-02-26 20:16:50 UTC (rev 2752)
+++ desktop/trunk/xfce4-appfinder/debian/control 2009-02-26 23:15:23 UTC (rev 2753)
@@ -2,10 +2,9 @@
Section: x11
Priority: optional
Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
-Uploaders: Martin Loschwitz <madkiss at debian.org>, Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>, Yves-Alexis Perez <corsac at debian.org>, Michael Casadevall <sonicmctails at gmail.com>
-Build-Depends: debhelper (>= 4.0.0), libxfcegui4-dev (>= 4.4.2),
- libxfce4mcs-dev (>= 4.4.2), libxft-dev, libxml-parser-perl, quilt, intltool
-Standards-Version: 3.8.0
+Uploaders: Martin Loschwitz <madkiss at debian.org>, Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>, Yves-Alexis Perez <corsac at debian.org>
+Build-Depends: debhelper (>= 4.0.0), libxfcegui4-dev (>= 4.4.2), libxfce4mcs-dev (>= 4.4.2), libxft-dev, libxml-parser-perl
+Standards-Version: 3.7.3
Homepage: http://www.xfce.org/
Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfce4-appfinder/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/xfce4-appfinder/
Modified: desktop/trunk/xfce4-appfinder/debian/rules
===================================================================
--- desktop/trunk/xfce4-appfinder/debian/rules 2009-02-26 20:16:50 UTC (rev 2752)
+++ desktop/trunk/xfce4-appfinder/debian/rules 2009-02-26 23:15:23 UTC (rev 2753)
@@ -1,8 +1,6 @@
#!/usr/bin/make -f
# -*- makefile -*-
-include /usr/share/quilt/quilt.make
-
# These are used for cross-compiling and for saving the configure script
# from having to guess our platform (since we know it already)
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
@@ -16,7 +14,7 @@
CFLAGS += -O2
endif
-config.status: configure $(QUILT_STAMPFN)
+config.status: configure
dh_testdir
# Add here commands to configure the package.
CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --sysconfdir=/etc --enable-final
@@ -29,13 +27,19 @@
$(MAKE)
touch build-stamp
-clean: unpatch
+clean:
dh_testdir
dh_testroot
rm -f build-stamp
# Add here commands to clean up after the build process.
[ ! -f Makefile ] || $(MAKE) distclean
+ifneq "$(wildcard /usr/share/misc/config.sub)" ""
+ cp -f /usr/share/misc/config.sub config.sub
+endif
+ifneq "$(wildcard /usr/share/misc/config.guess)" ""
+ cp -f /usr/share/misc/config.guess config.guess
+endif
dh_clean
Modified: desktop/trunk/xfce4-dev-tools/debian/changelog
===================================================================
--- desktop/trunk/xfce4-dev-tools/debian/changelog 2009-02-26 20:16:50 UTC (rev 2752)
+++ desktop/trunk/xfce4-dev-tools/debian/changelog 2009-02-26 23:15:23 UTC (rev 2753)
@@ -1,10 +1,3 @@
-xfce4-dev-tools (4.4.0.1-7) UNRELEASED; urgency=low
-
- * debian/patches:
- - fix typo in 01-fix-bashism-in-xdt-commit.
-
- -- Yves-Alexis Perez <corsac at debian.org> Tue, 11 Nov 2008 11:41:16 +0100
-
xfce4-dev-tools (4.4.0.1-6) unstable; urgency=low
* debian/patches:
Modified: desktop/trunk/xfce4-dev-tools/debian/patches/01-fix-bashism-in-xdt-commit.patch
===================================================================
--- desktop/trunk/xfce4-dev-tools/debian/patches/01-fix-bashism-in-xdt-commit.patch 2009-02-26 20:16:50 UTC (rev 2752)
+++ desktop/trunk/xfce4-dev-tools/debian/patches/01-fix-bashism-in-xdt-commit.patch 2009-02-26 23:15:23 UTC (rev 2753)
@@ -14,7 +14,7 @@
## Check if SVN is installed
##
-if ! type svn &> /dev/null; then
-+if ! type svn > /dev/null 2>&1; then
++if ! type svn > /dev/nulli 2>&1; then
echo "Subversion needs to be installed."
exit 1
fi
Modified: desktop/trunk/xfce4-icon-theme/debian/changelog
===================================================================
--- desktop/trunk/xfce4-icon-theme/debian/changelog 2009-02-26 20:16:50 UTC (rev 2752)
+++ desktop/trunk/xfce4-icon-theme/debian/changelog 2009-02-26 23:15:23 UTC (rev 2753)
@@ -1,16 +1,11 @@
-xfce4-icon-theme (4.4.3-1) UNRELEASED; urgency=low
+xfce4-icon-theme (4.4.2-2) UNRELEASED; urgency=low
- * new upstream bugfix release.
- * debian/rules:
- - don't execute arch-dep part.
- - stop messing with config.{guess,sub}.
+ * debian/rules: don't execute arch-dep part.
* debian/control:
- update my email address.
- update standards version.
- - add build-dep on intltool.
- * debian/copyright: update dates
- -- Yves-Alexis Perez <corsac at debian.org> Tue, 28 Oct 2008 07:51:34 +0100
+ -- Yves-Alexis Perez <corsac at debian.org> Mon, 28 Apr 2008 10:18:38 +0200
xfce4-icon-theme (4.4.2-1) unstable; urgency=low
Modified: desktop/trunk/xfce4-icon-theme/debian/control
===================================================================
--- desktop/trunk/xfce4-icon-theme/debian/control 2009-02-26 20:16:50 UTC (rev 2752)
+++ desktop/trunk/xfce4-icon-theme/debian/control 2009-02-26 23:15:23 UTC (rev 2753)
@@ -3,8 +3,8 @@
Priority: optional
Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
Uploaders: Martin Loschwitz <madkiss at debian.org>, Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>, Yves-Alexis Perez <corsac at debian.org>
-Build-Depends: debhelper (>= 4.0.0), intltool
-Standards-Version: 3.8.0
+Build-Depends: debhelper (>= 4.0.0)
+Standards-Version: 3.7.3
Homepage: http://www.xfce.org/
Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfce4-icon-theme/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/xfce4-icon-theme/
Modified: desktop/trunk/xfce4-icon-theme/debian/copyright
===================================================================
--- desktop/trunk/xfce4-icon-theme/debian/copyright 2009-02-26 20:16:50 UTC (rev 2752)
+++ desktop/trunk/xfce4-icon-theme/debian/copyright 2009-02-26 23:15:23 UTC (rev 2753)
@@ -7,7 +7,7 @@
François Le Clainche <fleclainche at wanadoo.fr>.
Edscott Wilson García <edscott at xfce.org>
-Copyright © 2004-2008 The Xfce development team.
+Copyright (C) 2004-2006 The Xfce development team.
Copyright:
Modified: desktop/trunk/xfce4-icon-theme/debian/rules
===================================================================
--- desktop/trunk/xfce4-icon-theme/debian/rules 2009-02-26 20:16:50 UTC (rev 2752)
+++ desktop/trunk/xfce4-icon-theme/debian/rules 2009-02-26 23:15:23 UTC (rev 2753)
@@ -34,6 +34,12 @@
# Add here commands to clean up after the build process.
[ ! -f Makefile ] || $(MAKE) distclean
+ifneq "$(wildcard /usr/share/misc/config.sub)" ""
+ cp -f /usr/share/misc/config.sub config.sub
+endif
+ifneq "$(wildcard /usr/share/misc/config.guess)" ""
+ cp -f /usr/share/misc/config.guess config.guess
+endif
dh_clean
Modified: desktop/trunk/xfce4-mixer/debian/changelog
===================================================================
--- desktop/trunk/xfce4-mixer/debian/changelog 2009-02-26 20:16:50 UTC (rev 2752)
+++ desktop/trunk/xfce4-mixer/debian/changelog 2009-02-26 23:15:23 UTC (rev 2753)
@@ -1,18 +1,3 @@
-xfce4-mixer (4.4.3-1) UNRELEASED; urgency=low
-
- [Yves-Alexis Perez]
- * new upstream bugfix release
- * debian/rules:
- - stop messing with config.{guess,sub}.
- - but mess with a crappy .desktop file present in the tarball.
- * debian/control:
- - add build-dep on intltool.
-
- [Stefan Ott]
- * debian/xfce4-mixer.desktop: New menu item for the mixer closes: #496773
-
- -- Yves-Alexis Perez <corsac at debian.org> Tue, 04 Nov 2008 23:10:40 +0100
-
xfce4-mixer (4.4.2-3) unstable; urgency=low
* switch to triggers:
Modified: desktop/trunk/xfce4-mixer/debian/control
===================================================================
--- desktop/trunk/xfce4-mixer/debian/control 2009-02-26 20:16:50 UTC (rev 2752)
+++ desktop/trunk/xfce4-mixer/debian/control 2009-02-26 23:15:23 UTC (rev 2753)
@@ -3,11 +3,8 @@
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 (>= 4.2.1), libgtk2.0-dev (>= 2.10.1), libxft-dev,
- xfce4-panel-dev (>= 4.4.2),
- libasound2-dev (>= 0.9.0) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
- libxml-parser-perl, chrpath, quilt, dpkg-dev (>= 1.14.4), intltool
-Standards-Version: 3.8.0
+Build-Depends: debhelper (>= 4.2.1), libgtk2.0-dev (>= 2.10.1), libxft-dev, xfce4-panel-dev (>= 4.4.2), libasound2-dev (>= 0.9.0) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libxml-parser-perl, chrpath, quilt, dpkg-dev (>= 1.14.4)
+Standards-Version: 3.7.3
Homepage: http://www.xfce.org/
Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfce4-mixer/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/xfce4-mixer/
Modified: desktop/trunk/xfce4-mixer/debian/rules
===================================================================
--- desktop/trunk/xfce4-mixer/debian/rules 2009-02-26 20:16:50 UTC (rev 2752)
+++ desktop/trunk/xfce4-mixer/debian/rules 2009-02-26 23:15:23 UTC (rev 2753)
@@ -47,8 +47,6 @@
build-stamp: config.status
dh_testdir
- # workaround the sucky .desktop file
- rm -f panel-plugin/xfce4-mixer.desktop
#build the two variants:
for variant in $(VARIANTS);do \
@@ -72,6 +70,12 @@
[ ! -f Makefile ] || $(MAKE) distclean
+ifneq "$(wildcard /usr/share/misc/config.sub)" ""
+ cp -f /usr/share/misc/config.sub config.sub
+endif
+ifneq "$(wildcard /usr/share/misc/config.guess)" ""
+ cp -f /usr/share/misc/config.guess config.guess
+endif
dh_clean $(CURDIR)/patch-stamp
@@ -99,8 +103,6 @@
install -c -m 644 $(CURDIR)/debian/xfce4-mixer.xpm \
$(CURDIR)/debian/xfce4-mixer/usr/share/pixmaps
- # install the desktop menu item
- dh_install debian/xfce4-mixer.desktop /usr/share/applications
rm -f $(CURDIR)/debian/xfce4-mixer/usr/lib/xfce4/mcs-plugins/*.la
rm -f $(CURDIR)/debian/xfce4-mixer/usr/lib/xfce4/mcs-plugins/*.a
Deleted: desktop/trunk/xfce4-mixer/debian/xfce4-mixer.desktop
===================================================================
--- desktop/trunk/xfce4-mixer/debian/xfce4-mixer.desktop 2009-02-26 20:16:50 UTC (rev 2752)
+++ desktop/trunk/xfce4-mixer/debian/xfce4-mixer.desktop 2009-02-26 23:15:23 UTC (rev 2753)
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Volume Control
-Comment=Xfce4 Audio Mixer
-Exec=xfce4-mixer
-Icon=xfce-sound
-Categories=GTK;AudioVideo;Audio;Mixer;
-Terminal=false
-Type=Application
-
Modified: desktop/trunk/xfce4-panel/debian/changelog
===================================================================
--- desktop/trunk/xfce4-panel/debian/changelog 2009-02-26 20:16:50 UTC (rev 2752)
+++ desktop/trunk/xfce4-panel/debian/changelog 2009-02-26 23:15:23 UTC (rev 2753)
@@ -1,21 +1,3 @@
-xfce4-panel (4.4.3-1) UNRELEASED; urgency=low
-
- [ Yves-Alexis Perez ]
- * new upstream bugfix release
- * debian/control:
- - update standards version yo 3.8.0.
- - add build-dep on intltool.
- * debian/rules:
- - stop messing with config.{guess,sub}.
- * debian/patches:
- - 01_fix-dnd-file-panel dropped, merged upstream.
-
- [ Michael Casadevall ]
- * debian/control:
- Bumped libxfce4mcs build-dep to 4.4.3
-
- -- Michael Casadevall <sonicmctails at gmail.com> Mon, 10 Nov 2008 05:48:25 -0500
-
xfce4-panel (4.4.2-6) unstable; urgency=low
* switch to triggers:
Modified: desktop/trunk/xfce4-panel/debian/control
===================================================================
--- desktop/trunk/xfce4-panel/debian/control 2009-02-26 20:16:50 UTC (rev 2752)
+++ desktop/trunk/xfce4-panel/debian/control 2009-02-26 23:15:23 UTC (rev 2753)
@@ -3,10 +3,8 @@
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.6), bison,
- libxft-dev, libxml2-dev, xfce4-mcs-manager-dev (>= 4.4.3), chrpath, quilt,
- intltool
-Standards-Version: 3.8.0
+Build-Depends: debhelper (>> 5.0.0), libgtk2.0-dev (>= 2.10.6), bison, libxft-dev, libxml2-dev, xfce4-mcs-manager-dev (>= 4.4.1), chrpath, quilt
+Standards-Version: 3.7.3
Homepage: http://www.xfce.org/
Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfce4-panel/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/xfce4-panel/
Copied: desktop/trunk/xfce4-panel/debian/patches/01_fix-dnd-file-panel.patch (from rev 2222, desktop/trunk/xfce4-panel/debian/patches/01_fix-dnd-file-panel.patch)
===================================================================
--- desktop/trunk/xfce4-panel/debian/patches/01_fix-dnd-file-panel.patch (rev 0)
+++ desktop/trunk/xfce4-panel/debian/patches/01_fix-dnd-file-panel.patch 2009-02-26 23:15:23 UTC (rev 2753)
@@ -0,0 +1,1086 @@
+Index: xfce_4_4/ChangeLog
+===================================================================
+--- xfce_4_4/ChangeLog (revision 26668)
++++ xfce_4_4/ChangeLog (revision 26669)
+@@ -1,3 +1,9 @@
++2008-03-09 19:02 nick
++
++ * Fix bug 3815 and a crash in FreeBSD-amd64. Quite a lot (if not all)
++ dnd code changed. So give it some testing if you're using the
++ 4.4 branch.
++
+ 2007-11-17 17:47 kelnos
+
+ * docs/API/libxfce4panel-decl-list.txt,
+Index: xfce_4_4/panel/panel.c
+===================================================================
+--- xfce_4_4/panel/panel.c (revision 26668)
++++ xfce_4_4/panel/panel.c (revision 26669)
+@@ -87,6 +87,7 @@
+ static void panel_menu_deactivated (GtkWidget *item);
+
+ static void panel_menu_opened (GtkWidget *item);
++static void _item_start_move (GtkWidget *item, Panel *panel);
+
+ /* DND dest */
+ static void _panel_drag_data_received (GtkWidget *widget,
+@@ -110,21 +111,6 @@
+ GdkDragContext *drag_context,
+ Panel *panel);
+
+-static void _panel_drag_end (GtkWidget *widget,
+- GdkDragContext *drag_context,
+- Panel *panel);
+-
+-static void _panel_drag_data_get (GtkWidget *widget,
+- GdkDragContext *drag_context,
+- GtkSelectionData *data,
+- guint info,
+- guint time,
+- Panel *panel);
+-
+-static void _panel_drag_data_delete (GtkWidget *widget,
+- GdkDragContext *drag_context,
+- Panel *panel);
+-
+ /* pass through button press events */
+ static gboolean _panel_itembar_button_pressed (GtkWidget *widget,
+ GdkEventButton *ev,
+@@ -255,6 +241,9 @@
+ priv->itembar = xfce_itembar_new (GTK_ORIENTATION_HORIZONTAL);
+ gtk_widget_show (priv->itembar);
+ gtk_container_add (GTK_CONTAINER (panel), priv->itembar);
++
++ panel_dnd_set_dest_name_and_widget (priv->itembar);
++ panel_dnd_set_source_widget (priv->itembar);
+
+ /* don't allow the wm to close the panel window */
+ g_signal_connect (panel, "delete-event", G_CALLBACK (gtk_true), NULL);
+@@ -269,15 +258,6 @@
+ g_signal_connect (priv->itembar, "drag-begin",
+ G_CALLBACK (_panel_drag_begin), panel);
+
+- g_signal_connect (priv->itembar, "drag-end",
+- G_CALLBACK (_panel_drag_end), panel);
+-
+- g_signal_connect (priv->itembar, "drag-data-get",
+- G_CALLBACK (_panel_drag_data_get), panel);
+-
+- g_signal_connect (priv->itembar, "drag-data-delete",
+- G_CALLBACK (_panel_drag_data_delete), panel);
+-
+ /* mouse click */
+ g_signal_connect (priv->itembar, "button-press-event",
+ G_CALLBACK (_panel_itembar_button_pressed), panel);
+@@ -441,76 +421,87 @@
+ guint time,
+ Panel *panel)
+ {
+- gboolean handled = FALSE;
++ XfceItembar *itembar = XFCE_ITEMBAR (widget);;
++ PanelPrivate *priv = panel->priv;
++ XfcePanelItem *item;
++ GtkWidget *plugin;
++ gint index;
++ gint oldindex;
++ gboolean expand;
++ gboolean succeed = FALSE;
+
+ DBG (" + drag data received: %d", info);
+
+- if (data->length > 0)
++ /* get the drop index */
++ index = xfce_itembar_get_drop_index (itembar, x, y);
++
++ switch (info)
+ {
+- XfceItembar *itembar;
+- PanelPrivate *priv;
+- XfcePanelItem *item;
+- GtkWidget *plugin;
+- int index;
+- int oldindex = -1;
+- gboolean expand;
+-
+- itembar = XFCE_ITEMBAR (widget);
+-
+- switch (info)
+- {
+- case TARGET_PLUGIN_NAME:
+- handled = TRUE;
+- index = xfce_itembar_get_drop_index (itembar, x, y);
+- panel_insert_item (panel, (const char *)data->data, index);
++ case TARGET_PLUGIN_NAME:
++ if (data->length > 0)
++ {
++ /* insert the new plugin */
++ panel_insert_item (panel, (const gchar *) data->data, index);
++
++ /* succeeded */
++ succeed = TRUE;
++ }
++ break;
++
++ case TARGET_PLUGIN_WIDGET:
++ /* get the plugin from the drag context */
++ plugin = gtk_drag_get_source_widget (context);
++
++ /* try the drag_widget or leave */
++ if (!plugin || !XFCE_IS_PANEL_ITEM (plugin))
+ break;
++
++ if (gtk_widget_get_parent (plugin) != widget)
++ {
++ /* get the plugin and information */
++ item = XFCE_PANEL_ITEM (plugin);
++ expand = xfce_panel_item_get_expand (item);
+
+- case TARGET_PLUGIN_WIDGET:
+- plugin = panel_dnd_get_plugin_from_data (data);
+- if (!plugin || !GTK_IS_WIDGET (plugin))
+- break;
+-
+- handled = TRUE;
+- index = xfce_itembar_get_drop_index (itembar, x, y);
+-
+- if (plugin->parent != widget)
+- {
+- item = XFCE_PANEL_ITEM (plugin);
+- expand = xfce_panel_item_get_expand (item);
+- priv = panel->priv;
+-
+- g_object_freeze_notify (G_OBJECT (widget));
++ /* freeze plugin notifications */
++ g_object_freeze_notify (G_OBJECT (widget));
++
++ /* move the plugin from the old panel to the new one */
++ gtk_widget_reparent (GTK_WIDGET (plugin), widget);
++
++ /* update the plugin */
++ xfce_panel_item_set_size (item, priv->size);
++ xfce_panel_item_set_screen_position (item, priv->screen_position);
++
++ /* update the itembar */
++ xfce_itembar_reorder_child (itembar, plugin, index);
++ xfce_itembar_set_child_expand (itembar, plugin, expand);
++
++ /* thaw update notifications */
++ g_object_thaw_notify (G_OBJECT (widget));
++ }
++ else /* move on same panel */
++ {
++ /* get the old index */
++ oldindex = xfce_itembar_get_item_index (itembar, plugin);
++
++ if (index > oldindex)
++ index--;
+
+- gtk_widget_reparent (GTK_WIDGET (plugin), widget);
+-
+- xfce_panel_item_set_size (item, priv->size);
+-
+- xfce_panel_item_set_screen_position (item,
+- priv->screen_position);
+-
++ if (index != oldindex)
+ xfce_itembar_reorder_child (itembar, plugin, index);
+-
+- g_object_thaw_notify (G_OBJECT (widget));
+-
+- xfce_itembar_set_child_expand (itembar, plugin, expand);
+- }
+- else /* only when moving on the same panel */
+- {
+- oldindex = xfce_itembar_get_item_index (itembar, plugin);
+-
+- if (index > oldindex) index--;
+-
+- if (index != oldindex)
+- xfce_itembar_reorder_child (itembar, plugin, index);
+- }
+- break;
+-
+- default:
+- break;
+- }
++ }
++
++ /* properly handled */
++ succeed = TRUE;
++
++ break;
++
++ default:
++ break;
+ }
+-
+- gtk_drag_finish (context, handled, FALSE, time);
++
++ /* finish the drag */
++ gtk_drag_finish (context, succeed, FALSE, time);
+ }
+
+ static gboolean
+@@ -521,15 +512,17 @@
+ guint time,
+ Panel *panel)
+ {
+- GdkAtom atom = gtk_drag_dest_find_target (widget, context, NULL);
++ GdkAtom target = gtk_drag_dest_find_target (widget, context, NULL);
++
++ /* we cannot handle the drag data */
++ if (G_UNLIKELY (target == GDK_NONE))
++ return FALSE;
+
+- if (atom != GDK_NONE)
+- {
+- gtk_drag_get_data (widget, context, atom, time);
+- return TRUE;
+- }
+-
+- return FALSE;
++ /* request the drag data */
++ gtk_drag_get_data (widget, context, target, time);
++
++ /* we call gtk_drag_finish later */
++ return TRUE;
+ }
+
+ /* DND source */
+@@ -538,112 +531,29 @@
+ GdkDragContext *drag_context,
+ Panel *panel)
+ {
+- int x, y, rootx, rooty, w, h;
+- GtkWidget *plugin;
+- GdkPixbuf *pb;
+- PanelPrivate *priv = panel->priv;
+-
++ gint x, y, rootx, rooty;
++ GtkWidget *plugin;
++
+ DBG (" + drag begin");
+
+- if (priv->drag_widget)
+- {
+- plugin = priv->drag_widget;
+-
+- /* allow menu to close, in order to not mess up the snapshot of the
+- * plugin -- TODO: find a better way to do this */
+- while (gtk_events_pending ())
+- gtk_main_iteration ();
+- }
+- else
+- {
+- x = y = 0;
+- gdk_display_get_pointer (gtk_widget_get_display (widget),
+- NULL, &x, &y, NULL);
+- gdk_window_get_root_origin (widget->window, &rootx, &rooty);
+- x -= rootx;
+- y -= rooty;
+-
+- plugin = xfce_itembar_get_item_at_point (XFCE_ITEMBAR (widget), x, y);
+- }
+-
+- if (plugin)
+- {
+- GdkDrawable *d = GDK_DRAWABLE (plugin->window);
+-
+- gdk_drawable_get_size (d, &w, &h);
+- pb = gdk_pixbuf_get_from_drawable (NULL, d, NULL, 0, 0, 0, 0, w, h);
+- gtk_drag_set_icon_pixbuf (drag_context, pb, 0, 0);
+- g_object_unref (G_OBJECT (pb));
+-
+- priv->drag_widget = plugin;
+- }
+- else
+- DBG ("No Plugin");
++ /* get the pointer position */
++ gdk_display_get_pointer (gtk_widget_get_display (widget), NULL, &x, &y, NULL);
++
++ /* get the window root coordinates */
++ gdk_window_get_root_origin (widget->window, &rootx, &rooty);
++
++ /* calc the position inside the panel */
++ x -= rootx;
++ y -= rooty;
++
++ /* get the plugin on the itembar at this position */
++ plugin = xfce_itembar_get_item_at_point (XFCE_ITEMBAR (widget), x, y);
++
++ /* start an item move */
++ if (G_LIKELY (plugin))
++ _item_start_move (plugin, panel);
+ }
+
+-static void
+-_panel_drag_end (GtkWidget *widget,
+- GdkDragContext *drag_context,
+- Panel *panel)
+-{
+- PanelPrivate *priv = panel->priv;
+-
+- priv->drag_widget = NULL;
+-
+- if (!priv->edit_mode)
+- {
+- const GPtrArray *panels = panel_app_get_panel_list ();
+- int i;
+-
+- for (i = 0; i < panels->len; ++i)
+- {
+- Panel *p = g_ptr_array_index (panels, i);
+-
+- priv = p->priv;
+-
+- xfce_itembar_lower_event_window (XFCE_ITEMBAR (priv->itembar));
+- panel_dnd_unset_dest (priv->itembar);
+- panel_dnd_unset_source (priv->itembar);
+- panel_set_items_sensitive (p, TRUE);
+-
+- panel_unblock_autohide (p);
+- }
+- }
+-}
+-
+-static void
+-_panel_drag_data_get (GtkWidget *widget,
+- GdkDragContext *drag_context,
+- GtkSelectionData *data,
+- guint info,
+- guint time,
+- Panel *panel)
+-{
+- if (info == TARGET_PLUGIN_WIDGET)
+- {
+- PanelPrivate *priv = panel->priv;
+-
+- if (priv->drag_widget)
+- {
+- panel_dnd_set_widget_data (data, priv->drag_widget);
+- }
+- }
+-}
+-
+-static void
+-_panel_drag_data_delete (GtkWidget *widget,
+- GdkDragContext *drag_context,
+- Panel *panel)
+-{
+- PanelPrivate *priv = panel->priv;
+-
+- if (priv->drag_widget)
+- {
+- xfce_panel_item_remove (XFCE_PANEL_ITEM (priv->drag_widget));
+- priv->drag_widget = NULL;
+- }
+-}
+-
+ /* pass through right-click events when the event window of itembar is raised
+ */
+ static gboolean
+@@ -651,6 +561,8 @@
+ GdkEventButton *ev,
+ Panel *panel)
+ {
++ GtkWidget *plugin;
++
+ if (xfce_itembar_event_window_is_raised (XFCE_ITEMBAR (widget)))
+ {
+ guint modifiers;
+@@ -660,8 +572,6 @@
+ if (ev->button == 3 || (ev->button == 1 &&
+ (ev->state & modifiers) == GDK_CONTROL_MASK))
+ {
+- GtkWidget *plugin;
+-
+ plugin = xfce_itembar_get_item_at_point (XFCE_ITEMBAR (widget),
+ ev->x, ev->y);
+ if (plugin)
+@@ -670,14 +580,6 @@
+ return TRUE;
+ }
+ }
+- else if (ev->button == 1)
+- {
+- PanelPrivate *priv = panel->priv;
+-
+- priv->drag_widget =
+- xfce_itembar_get_item_at_point (XFCE_ITEMBAR (widget),
+- ev->x, ev->y);
+- }
+ }
+
+ return FALSE;
+@@ -863,13 +765,44 @@
+ }
+
+ static void
++_item_start_move_end (GtkWidget *item,
++ GdkDragContext *context,
++ Panel *panel)
++{
++ PanelPrivate *priv = panel->priv;
++ Panel *p;
++
++ DBG ("+ finish item drag");
++
++ /* disconnect drag end signal */
++ g_signal_handlers_disconnect_by_func (G_OBJECT (item), G_CALLBACK (_item_start_move_end), panel);
++
++ if (!priv->edit_mode)
++ {
++ const GPtrArray *panels = panel_app_get_panel_list ();
++ gint i;
++
++ for (i = 0; i < panels->len; ++i)
++ {
++ p = g_ptr_array_index (panels, i);
++ priv = p->priv;
++
++ xfce_itembar_lower_event_window (XFCE_ITEMBAR (priv->itembar));
++ panel_set_items_sensitive (p, TRUE);
++
++ panel_unblock_autohide (p);
++ }
++ }
++}
++
++static void
+ _item_start_move (GtkWidget *item,
+ Panel *panel)
+ {
+ const GPtrArray *panels = panel_app_get_panel_list ();
+ PanelPrivate *priv;
+ Panel *p;
+- int i;
++ gint i;
+
+ for (i = 0; i < panels->len; ++i)
+ {
+@@ -879,19 +812,16 @@
+ if (!priv->edit_mode)
+ {
+ panel_set_items_sensitive (p, FALSE);
+-
+- panel_dnd_set_dest (priv->itembar);
+- panel_dnd_set_widget_source (priv->itembar);
+ xfce_itembar_raise_event_window (XFCE_ITEMBAR (priv->itembar));
+-
+ panel_block_autohide (p);
+ }
+ }
+
+- priv = panel->priv;
+- priv->drag_widget = item;
+-
+- panel_dnd_begin_drag (priv->itembar);
++ /* start the drag */
++ panel_dnd_begin_drag (item);
++
++ /* signal to make panels sensitive after a drop */
++ g_signal_connect (G_OBJECT (item), "drag-end", G_CALLBACK (_item_start_move_end), panel);
+ }
+
+ extern void panel_set_hidden (Panel *panel,
+Index: xfce_4_4/panel/panel-dnd.c
+===================================================================
+--- xfce_4_4/panel/panel-dnd.c (revision 26668)
++++ xfce_4_4/panel/panel-dnd.c (revision 26669)
+@@ -36,110 +36,72 @@
+ static const GtkTargetEntry dest_target_list[] =
+ {
+ { "application/x-xfce-panel-plugin-name", 0, TARGET_PLUGIN_NAME },
+- { "application/x-xfce-panel-plugin-widget",
+- GTK_TARGET_SAME_APP, TARGET_PLUGIN_WIDGET },
+- { "text/plain", 0, TARGET_FILE },
+- { "text/uri-list", 0, TARGET_FILE },
+- { "UTF8_STRING", 0, TARGET_FILE }
++ { "application/x-xfce-panel-plugin-widget", GTK_TARGET_SAME_APP, TARGET_PLUGIN_WIDGET }
+ };
+
+-static const guint n_dest_targets = G_N_ELEMENTS (dest_target_list);
+-
+ static const GtkTargetEntry name_target_list[] =
+ {
+ { "application/x-xfce-panel-plugin-name", 0, TARGET_PLUGIN_NAME }
+ };
+
+-static const guint n_name_targets = G_N_ELEMENTS (name_target_list);
+-
+ static const GtkTargetEntry widget_target_list[] =
+ {
+- { "application/x-xfce-panel-plugin-widget", 0, TARGET_PLUGIN_WIDGET }
++ { "application/x-xfce-panel-plugin-widget", GTK_TARGET_SAME_APP, TARGET_PLUGIN_WIDGET }
+ };
+
+-static guint n_widget_targets = G_N_ELEMENTS (widget_target_list);
+-
+ /* public API */
+
+ void
+-panel_dnd_set_dest (GtkWidget *widget)
++panel_dnd_set_dest_name_and_widget (GtkWidget *widget)
+ {
+ gtk_drag_dest_set (widget,
+ GTK_DEST_DEFAULT_HIGHLIGHT | GTK_DEST_DEFAULT_MOTION,
+- dest_target_list, n_dest_targets, GDK_ACTION_COPY);
++ dest_target_list, G_N_ELEMENTS (dest_target_list),
++ GDK_ACTION_MOVE | GDK_ACTION_COPY);
+ }
+
+ void
+-panel_dnd_set_widget_delete_dest (GtkWidget *widget)
++panel_dnd_set_dest_widget (GtkWidget *widget)
+ {
+ gtk_drag_dest_set (widget,
+ GTK_DEST_DEFAULT_HIGHLIGHT | GTK_DEST_DEFAULT_MOTION,
+- widget_target_list, n_widget_targets,
+- GDK_ACTION_MOVE);
++ widget_target_list, G_N_ELEMENTS (widget_target_list), GDK_ACTION_MOVE);
+ }
+
+ void
+-panel_dnd_unset_dest (GtkWidget *widget)
++panel_dnd_set_source_name (GtkWidget *widget)
+ {
+- gtk_drag_dest_unset (widget);
+-}
+-
+-GtkWidget *
+-panel_dnd_get_plugin_from_data (GtkSelectionData *data)
+-{
+- glong *n;
+-
+- n = (glong *)data->data;
+- DBG (" + get pointer: %ld", *n);
+-
+- return GTK_WIDGET (GINT_TO_POINTER (*n));
+-}
+-
+-void
+-panel_dnd_set_name_source (GtkWidget *widget)
+-{
+ gtk_drag_source_set (widget, GDK_BUTTON1_MASK,
+- name_target_list, n_name_targets,
+- GDK_ACTION_COPY);
++ name_target_list, G_N_ELEMENTS (name_target_list), GDK_ACTION_COPY);
+ }
+
+ void
+-panel_dnd_set_widget_source (GtkWidget *widget)
++panel_dnd_set_source_widget (GtkWidget *widget)
+ {
+ gtk_drag_source_set (widget, GDK_BUTTON1_MASK,
+- widget_target_list, n_widget_targets,
+- GDK_ACTION_COPY|GDK_ACTION_MOVE);
++ widget_target_list, G_N_ELEMENTS (widget_target_list), GDK_ACTION_COPY);
+ }
+
+-void panel_dnd_unset_source (GtkWidget *widget)
+-{
+- gtk_drag_source_unset (widget);
+-}
+-
+ void
+-panel_dnd_set_widget_data (GtkSelectionData *data, GtkWidget *widget)
+-{
+- glong n = GPOINTER_TO_INT (widget);
+-
+- DBG (" + set pointer: %ld", n);
+-
+- gtk_selection_data_set (data, data->target, 32, (guchar *) &n, sizeof (n));
+-}
+-
+-void
+ panel_dnd_begin_drag (GtkWidget *widget)
+ {
+- static GtkTargetList *list = NULL;
+- GdkEvent *ev;
++ GtkTargetList *target_list ;
++ GdkEvent *event;
+
+- if (G_UNLIKELY (list == NULL))
++ event = gtk_get_current_event();
++ if (G_LIKELY (event))
+ {
+- list = gtk_target_list_new (widget_target_list, n_widget_targets);
+- }
++ /* create a new target list */
++ target_list = gtk_target_list_new (widget_target_list, G_N_ELEMENTS (widget_target_list));
++
++ /* begin the drag */
++ gtk_drag_begin (widget, target_list, GDK_ACTION_MOVE, 1, event);
+
+- ev = gtk_get_current_event();
+- gtk_drag_begin (widget, list, GDK_ACTION_COPY, 1, ev);
++ /* release the target list */
++ gtk_target_list_unref (target_list);
+
+- gdk_event_free (ev);
++ /* free the event */
++ gdk_event_free (event);
++ }
+ }
+
+Index: xfce_4_4/panel/panel-dnd.h
+===================================================================
+--- xfce_4_4/panel/panel-dnd.h (revision 26668)
++++ xfce_4_4/panel/panel-dnd.h (revision 26669)
+@@ -27,27 +27,17 @@
+ enum
+ {
+ TARGET_PLUGIN_NAME,
+- TARGET_PLUGIN_WIDGET,
+- TARGET_FILE
++ TARGET_PLUGIN_WIDGET
+ };
+
+-void panel_dnd_set_dest (GtkWidget *widget);
++void panel_dnd_set_dest_name_and_widget (GtkWidget *widget);
+
+-void panel_dnd_set_widget_delete_dest (GtkWidget *widget);
++void panel_dnd_set_dest_widget (GtkWidget *widget);
+
+-void panel_dnd_unset_dest (GtkWidget *widget);
++void panel_dnd_set_source_name (GtkWidget *widget);
+
+-GtkWidget *panel_dnd_get_plugin_from_data (GtkSelectionData *data);
++void panel_dnd_set_source_widget (GtkWidget *widget);
+
+-
+-void panel_dnd_set_name_source (GtkWidget *widget);
+-
+-void panel_dnd_set_widget_source (GtkWidget *widget);
+-
+-void panel_dnd_unset_source (GtkWidget *widget);
+-
+-void panel_dnd_set_widget_data (GtkSelectionData *data, GtkWidget *plugin);
+-
+ void panel_dnd_begin_drag (GtkWidget *widget);
+
+ #endif /* _PANEL_DND_H */
+Index: xfce_4_4/panel/panel-private.h
+===================================================================
+--- xfce_4_4/panel/panel-private.h (revision 26668)
++++ xfce_4_4/panel/panel-private.h (revision 26669)
+@@ -55,7 +55,6 @@
+ {
+ GtkWidget *itembar;
+ GtkWidget *menu;
+- GtkWidget *drag_widget;
+
+ int size;
+ int monitor;
+Index: xfce_4_4/panel/panel-dialogs.c
+===================================================================
+--- xfce_4_4/panel/panel-dialogs.c (revision 26668)
++++ xfce_4_4/panel/panel-dialogs.c (revision 26669)
+@@ -140,50 +140,60 @@
+ return FALSE;
+ }
+
++static XfcePanelItemInfo *
++get_selected_tree_item (PanelItemsDialog *pid)
++{
++ GtkTreeSelection *selection;
++ GtkTreeModel *model;
++ GtkTreeIter iter;
++ XfcePanelItemInfo *info = NULL;
++
++ /* get the tree selection */
++ selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (pid->tree));
++ if (G_LIKELY (selection))
++ {
++ /* get the selected item */
++ if (gtk_tree_selection_get_selected (selection, &model, &iter))
++ gtk_tree_model_get (model, &iter, 0, &info, -1);
++ }
++
++ return info;
++}
+
++
+ static gboolean
+ add_selected_item (PanelItemsDialog *pid)
+ {
+- GtkTreeSelection *sel;
+- GtkTreeModel *model;
+- GtkTreeIter iter;
+ XfcePanelItemInfo *info;
+- GtkWidget *item = NULL;
++ GtkWidget *item = NULL;
+
+- sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (pid->tree));
+-
+- if (!sel)
+- return FALSE;
+-
+- if (!gtk_tree_selection_get_selected (sel, &model, &iter))
+- return FALSE;
+-
+- gtk_tree_model_get (model, &iter, 0, &info, -1);
+-
+- if (!xfce_panel_item_manager_is_available (info->name))
+- return FALSE;
+-
+- if (pid->active)
++ /* get the selected item */
++ info = get_selected_tree_item (pid);
++ if (G_LIKELY (info && xfce_panel_item_manager_is_available (info->name)))
+ {
+- PanelPrivate *priv = PANEL_GET_PRIVATE (pid->panel);
+- int n;
++ if (pid->active)
++ {
++ PanelPrivate *priv = PANEL_GET_PRIVATE (pid->panel);
++ gint n;
+
+- n = xfce_itembar_get_item_index (XFCE_ITEMBAR (priv->itembar),
+- pid->active);
++ n = xfce_itembar_get_item_index (XFCE_ITEMBAR (priv->itembar), pid->active);
+
+- item = panel_insert_item (pid->panel, info->name, n + 1);
+- }
+- else
+- {
+- item = panel_add_item (pid->panel, info->name);
+- }
++ item = panel_insert_item (pid->panel, info->name, n + 1);
++ }
++ else
++ {
++ item = panel_add_item (pid->panel, info->name);
++ }
+
+- if (item)
+- g_idle_add ((GSourceFunc)item_configure_timeout, item);
+- else
+- xfce_err (_("Could not open \"%s\" module"), info->name);
++ if (item)
++ g_idle_add ((GSourceFunc)item_configure_timeout, item);
++ else
++ xfce_err (_("Could not open \"%s\" module"), info->name);
+
+- return TRUE;
++ return TRUE;
++ }
++
++ return FALSE;
+ }
+
+ static gboolean
+@@ -191,31 +201,12 @@
+ PanelItemsDialog *pid)
+ {
+ if (evt->button == 1 && evt->type == GDK_2BUTTON_PRESS)
+- {
+- return add_selected_item (pid);
+- }
++ return add_selected_item (pid);
+
+ return FALSE;
+ }
+
+ static void
+-cursor_changed (GtkTreeView * tv, PanelItemsDialog *pid)
+-{
+- GtkTreeSelection *sel;
+- GtkTreeModel *model;
+- GtkTreeIter iter;
+- XfcePanelItemInfo *info;
+-
+- if (!(sel = gtk_tree_view_get_selection (tv)))
+- return;
+-
+- if (!gtk_tree_selection_get_selected (sel, &model, &iter))
+- return;
+-
+- gtk_tree_model_get (model, &iter, 0, &info, -1);
+-}
+-
+-static void
+ treeview_destroyed (GtkWidget * tv)
+ {
+ GtkTreeModel *store;
+@@ -226,7 +217,7 @@
+
+ static void
+ render_icon (GtkTreeViewColumn * col, GtkCellRenderer * cell,
+- GtkTreeModel * model, GtkTreeIter * iter, gpointer data)
++ GtkTreeModel * model, GtkTreeIter * iter, gpointer data)
+ {
+ XfcePanelItemInfo *info;
+
+@@ -244,7 +235,7 @@
+
+ static void
+ render_text (GtkTreeViewColumn * col, GtkCellRenderer * cell,
+- GtkTreeModel * model, GtkTreeIter * iter, GtkWidget * treeview)
++ GtkTreeModel * model, GtkTreeIter * iter, GtkWidget * treeview)
+ {
+ XfcePanelItemInfo *info;
+
+@@ -279,66 +270,83 @@
+ static void
+ treeview_data_received (GtkWidget *widget, GdkDragContext *context,
+ gint x, gint y, GtkSelectionData *data,
+- guint info, guint time, gpointer user_data)
++ guint info, guint time, PanelItemsDialog *pid)
+ {
+- gboolean handled = FALSE;
+-
+- DBG (" + drag data received: %d", info);
++ gboolean succeeded = FALSE;
++ GtkWidget *item;
+
+- if (data->length && info == TARGET_PLUGIN_WIDGET)
+- handled = TRUE;
+-
+- gtk_drag_finish (context, handled, handled, time);
++ /* get the drag source */
++ item = gtk_drag_get_source_widget (context);
++
++ if (item && XFCE_IS_PANEL_ITEM (item))
++ {
++ /* ask to remove the item */
++ xfce_panel_item_remove (XFCE_PANEL_ITEM (item));
++
++ succeeded = TRUE;
++ }
++
++ /* finish the drag */
++ gtk_drag_finish (context, succeeded, FALSE, time);
+ }
+
+ static gboolean
+ treeview_drag_drop (GtkWidget *widget, GdkDragContext *context,
+- gint x, gint y, guint time, gpointer user_data)
++ gint x, gint y, guint time, PanelItemsDialog *pid)
+ {
+- GdkAtom atom = gtk_drag_dest_find_target (widget, context, NULL);
++ GdkAtom target = gtk_drag_dest_find_target (widget, context, NULL);
++
++ /* we cannot handle the drag data */
++ if (G_UNLIKELY (target == GDK_NONE))
++ return FALSE;
+
+- if (atom != GDK_NONE)
+- {
+- gtk_drag_get_data (widget, context, atom, time);
+- return TRUE;
+- }
++ /* request the drag data */
++ gtk_drag_get_data (widget, context, target, time);
++
++ /* we call gtk_drag_finish later */
++ return TRUE;
++}
+
+- return FALSE;
++static void
++treeview_drag_begin (GtkWidget *treeview, GdkDragContext *context,
++ PanelItemsDialog *pid)
++{
++ XfcePanelItemInfo *item_info;
++
++ DBG (" + drag begin");
++
++ /* set nice drag icon */
++ item_info = get_selected_tree_item (pid);
++ if (G_LIKELY (item_info && item_info->icon))
++ gtk_drag_set_icon_pixbuf (context, item_info->icon, 0, 0);
+ }
+
+ static void
+ treeview_data_get (GtkWidget *widget, GdkDragContext *drag_context,
+ GtkSelectionData *data, guint info,
+- guint time, gpointer user_data)
++ guint time, PanelItemsDialog *pid)
+ {
++ XfcePanelItemInfo *item_info;
++ const gchar *item_name;
++
+ DBG (" + drag data get: %d", info);
+
+- if (info == TARGET_PLUGIN_NAME)
++ if (G_LIKELY (info == TARGET_PLUGIN_NAME))
+ {
+- GtkTreeSelection *sel;
+- GtkTreeModel *model;
+- GtkTreeIter iter;
+- XfcePanelItemInfo *info;
+-
+- sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (widget));
+-
+- if (!sel)
++ /* get the selected item info */
++ item_info = get_selected_tree_item (pid);
++ if (G_LIKELY (item_info))
+ {
+- DBG ("No selection!");
+- return;
++ item_name = item_info->name;
++
++ if (xfce_panel_item_manager_is_available (item_name))
++ {
++ DBG (" + set selection data: %s", item_name);
++
++ /* set the selection data */
++ gtk_selection_data_set (data, data->target, 8, (guchar *) item_name, strlen (item_name));
++ }
+ }
+-
+- if (!gtk_tree_selection_get_selected (sel, &model, &iter))
+- return;
+-
+- gtk_tree_model_get (model, &iter, 0, &info, -1);
+-
+- if (!xfce_panel_item_manager_is_available (info->name))
+- return;
+-
+- DBG (" + set data: %s", info->name);
+- gtk_selection_data_set (data, data->target, 8,
+- (guchar *)info->name, strlen (info->name));
+ }
+ }
+
+@@ -408,10 +416,10 @@
+ scroll = gtk_scrolled_window_new (NULL, NULL);
+ gtk_widget_show (scroll);
+ gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scroll),
+- GTK_POLICY_NEVER,
++ GTK_POLICY_NEVER,
+ GTK_POLICY_NEVER);
+ gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scroll),
+- GTK_SHADOW_IN);
++ GTK_SHADOW_IN);
+ gtk_box_pack_start (GTK_BOX (pid->items_box), scroll, TRUE, TRUE, 0);
+
+ store = gtk_list_store_new (1, G_TYPE_POINTER);
+@@ -433,19 +441,14 @@
+ g_object_unref (G_OBJECT (store));
+
+ /* dnd */
+- panel_dnd_set_name_source (tv);
++ panel_dnd_set_source_name (tv);
++ panel_dnd_set_dest_name_and_widget (tv);
+
+- panel_dnd_set_widget_delete_dest (tv);
+-
+- g_signal_connect (tv, "drag-data-get", G_CALLBACK (treeview_data_get),
+- pid);
+-
+- g_signal_connect (tv, "drag-data-received",
+- G_CALLBACK (treeview_data_received), pid);
++ g_signal_connect (tv, "drag-data-get", G_CALLBACK (treeview_data_get), pid);
++ g_signal_connect (tv, "drag-data-received", G_CALLBACK (treeview_data_received), pid);
++ g_signal_connect (tv, "drag-drop", G_CALLBACK (treeview_drag_drop), pid);
++ g_signal_connect (tv, "drag-begin", G_CALLBACK (treeview_drag_begin), pid);
+
+- g_signal_connect (tv, "drag-drop",
+- G_CALLBACK (treeview_drag_drop), pid);
+-
+ /* create the view */
+ col = gtk_tree_view_column_new ();
+ gtk_tree_view_column_set_spacing (col, BORDER);
+@@ -454,14 +457,14 @@
+ cell = gtk_cell_renderer_pixbuf_new ();
+ gtk_tree_view_column_pack_start (col, cell, FALSE);
+ gtk_tree_view_column_set_cell_data_func (col, cell,
+- (GtkTreeCellDataFunc)
+- render_icon, NULL, NULL);
++ (GtkTreeCellDataFunc)
++ render_icon, NULL, NULL);
+
+ cell = gtk_cell_renderer_text_new ();
+ gtk_tree_view_column_pack_start (col, cell, TRUE);
+ gtk_tree_view_column_set_cell_data_func (col, cell,
+- (GtkTreeCellDataFunc)
+- render_text, tv, NULL);
++ (GtkTreeCellDataFunc)
++ render_text, tv, NULL);
+
+ color = &(tv->style->fg[GTK_STATE_INSENSITIVE]);
+ g_object_set (cell, "foreground-gdk", color, NULL);
+@@ -481,17 +484,12 @@
+ GTK_POLICY_ALWAYS);
+ }
+
+- gtk_list_store_append (store, &iter);
+- gtk_list_store_set (store, &iter, 0,
+- g_ptr_array_index (pid->items, i), -1);
++ gtk_list_store_append (store, &iter);
++ gtk_list_store_set (store, &iter, 0, g_ptr_array_index (pid->items, i), -1);
+ }
+
+- g_signal_connect (tv, "cursor_changed", G_CALLBACK (cursor_changed),
+- pid);
++ g_signal_connect (tv, "button-press-event", G_CALLBACK (treeview_dblclick), pid);
+
+- g_signal_connect (tv, "button-press-event",
+- G_CALLBACK (treeview_dblclick), pid);
+-
+ path = gtk_tree_path_new_from_string ("0");
+ gtk_tree_view_set_cursor (GTK_TREE_VIEW (tv), path, NULL, FALSE);
+ gtk_tree_path_free (path);
+@@ -505,9 +503,6 @@
+ panel_block_autohide (panel);
+
+ xfce_itembar_raise_event_window (XFCE_ITEMBAR (priv->itembar));
+-
+- panel_dnd_set_dest (priv->itembar);
+- panel_dnd_set_widget_source (priv->itembar);
+
+ panel_set_items_sensitive (panel, FALSE);
+
+@@ -524,9 +519,6 @@
+ xfce_itembar_lower_event_window (XFCE_ITEMBAR (priv->itembar));
+
+ panel_set_items_sensitive (panel, TRUE);
+-
+- panel_dnd_unset_dest (priv->itembar);
+- panel_dnd_unset_source (priv->itembar);
+
+ priv->edit_mode = FALSE;
+ }
+@@ -537,9 +529,7 @@
+ if (response != GTK_RESPONSE_HELP)
+ {
+ if (response == GTK_RESPONSE_OK)
+- {
+ add_selected_item (pid);
+- }
+
+ items_dialog_widget = NULL;
+ g_ptr_array_foreach (pid->panels, (GFunc)item_dialog_closed, NULL);
+Index: xfce_4_4/panel/panel-properties.c
+===================================================================
+--- xfce_4_4/panel/panel-properties.c (revision 26668)
++++ xfce_4_4/panel/panel-properties.c (revision 26669)
+@@ -939,7 +939,7 @@
+
+ g_signal_connect (panel, "move-end", G_CALLBACK (panel_move_end), NULL);
+
+- panel_dnd_set_dest (GTK_WIDGET (panel));
++ panel_dnd_set_dest_name_and_widget (GTK_WIDGET (panel));
+ g_signal_connect (panel, "drag-motion", G_CALLBACK (drag_motion), NULL);
+ g_signal_connect (panel, "drag-leave", G_CALLBACK (drag_leave), NULL);
+ }
+Index: xfce_4_4/NEWS
+===================================================================
+--- xfce_4_4/NEWS (revision 26668)
++++ xfce_4_4/NEWS (revision 26669)
+@@ -1,3 +1,12 @@
++4.4.3
++=====
++- Quite a bit code changed in the dnd code. Mostly to fix segfaul in
++ FreeBSD-amd64, but more problems were discovered and a lot of code
++ was simplified and a memory leak was plugged.
++- Don't respond the uri drags, we don't use it and it only causes problems
++ like hiding the panel when a file was dragged over the panel (Bug #3815).
++
++
+ 4.4.2
+ =====
+ - Fix window manager hints reporting width 1 pixel too wide (bug #3402).
Modified: desktop/trunk/xfce4-panel/debian/patches/series
===================================================================
--- desktop/trunk/xfce4-panel/debian/patches/series 2009-02-26 20:16:50 UTC (rev 2752)
+++ desktop/trunk/xfce4-panel/debian/patches/series 2009-02-26 23:15:23 UTC (rev 2753)
@@ -1 +1,2 @@
+01_fix-dnd-file-panel.patch
02_fix-screen-config-dialog.patch
Modified: desktop/trunk/xfce4-panel/debian/rules
===================================================================
--- desktop/trunk/xfce4-panel/debian/rules 2009-02-26 20:16:50 UTC (rev 2752)
+++ desktop/trunk/xfce4-panel/debian/rules 2009-02-26 23:15:23 UTC (rev 2753)
@@ -32,6 +32,13 @@
[ ! -f Makefile ] || $(MAKE) distclean
+ifneq "$(wildcard /usr/share/misc/config.sub)" ""
+ cp -f /usr/share/misc/config.sub config.sub
+endif
+ifneq "$(wildcard /usr/share/misc/config.guess)" ""
+ cp -f /usr/share/misc/config.guess config.guess
+endif
+
dh_clean
install: build
Modified: desktop/trunk/xfce4-session/debian/changelog
===================================================================
--- desktop/trunk/xfce4-session/debian/changelog 2009-02-26 20:16:50 UTC (rev 2752)
+++ desktop/trunk/xfce4-session/debian/changelog 2009-02-26 23:15:23 UTC (rev 2753)
@@ -1,15 +1,10 @@
-xfce4-session (4.4.3-1) UNRELEASED; urgency=low
+xfce4-session (4.4.2-7) UNRELEASED; urgency=low
- * new upstream bugfix release
* debian/patches:
- 07_startup-speed added, speed up startup by not waiting for forks().
- series edited to correctly include 06_rephrase-tip.
- - 08_fix-fortune-path added, use absolute path when calling fortune.
- closes: #497199
- * debian/control:
- - add build-dep on intltool.
- -- Yves-Alexis Perez <corsac at debian.org> Tue, 28 Oct 2008 11:40:46 +0100
+ -- Yves-Alexis Perez <corsac at debian.org> Wed, 20 Aug 2008 09:26:13 +0200
xfce4-session (4.4.2-6) unstable; urgency=low
Modified: desktop/trunk/xfce4-session/debian/control
===================================================================
--- desktop/trunk/xfce4-session/debian/control 2009-02-26 20:16:50 UTC (rev 2752)
+++ desktop/trunk/xfce4-session/debian/control 2009-02-26 23:15:23 UTC (rev 2753)
@@ -3,10 +3,8 @@
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 (>= 4.0.0), xfce4-mcs-manager-dev (>= 4.4.2),
- xbase-clients, libxml-parser-perl, chrpath, quilt, fortune-mod, libdbus-1-dev,
- intltool
-Standards-Version: 3.8.0
+Build-Depends: debhelper (>= 4.0.0), xfce4-mcs-manager-dev (>= 4.4.2), xbase-clients, libxml-parser-perl, chrpath, quilt, fortune-mod, libdbus-1-dev
+Standards-Version: 3.7.3
Homepage: http://www.xfce.org/
Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfce4-session/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/xfce4-session/
Deleted: desktop/trunk/xfce4-session/debian/patches/08_fix-fortune-path.patch
===================================================================
--- desktop/trunk/xfce4-session/debian/patches/08_fix-fortune-path.patch 2009-02-26 20:16:50 UTC (rev 2752)
+++ desktop/trunk/xfce4-session/debian/patches/08_fix-fortune-path.patch 2009-02-26 23:15:23 UTC (rev 2753)
@@ -1,18 +0,0 @@
-diff --git a/xfce4-tips/main.c b/xfce4-tips/main.c
-index 0961879..4f88935 100644
---- a/xfce4-tips/main.c
-+++ b/xfce4-tips/main.c
-@@ -115,11 +115,11 @@ next_cb(GtkWidget *btn, GtkTextBuffer *textbuf)
-
- switch (option) {
- case OPTION_TIPS:
-- strcpy(buffer, "fortune " TIPSDIR "/tips");
-+ strcpy(buffer, "/usr/games/fortune " TIPSDIR "/tips");
- break;
-
- case OPTION_FORTUNES:
-- strcpy(buffer, "fortune");
-+ strcpy(buffer, "/usr/games/fortune");
- break;
- }
-
Modified: desktop/trunk/xfce4-session/debian/patches/series
===================================================================
--- desktop/trunk/xfce4-session/debian/patches/series 2009-02-26 20:16:50 UTC (rev 2752)
+++ desktop/trunk/xfce4-session/debian/patches/series 2009-02-26 23:15:23 UTC (rev 2753)
@@ -5,4 +5,3 @@
05_fix-resize-simple-splash-engine.patch
06_rephrase-tip.patch
07_startup-speed.patch
-08_fix-fortune-path.patch
Modified: desktop/trunk/xfce4-session/debian/rules
===================================================================
--- desktop/trunk/xfce4-session/debian/rules 2009-02-26 20:16:50 UTC (rev 2752)
+++ desktop/trunk/xfce4-session/debian/rules 2009-02-26 23:15:23 UTC (rev 2753)
@@ -58,7 +58,14 @@
# Add here commands to clean up after the build process.
[ ! -f Makefile ] || $(MAKE) distclean
+#ifneq "$(wildcard /usr/share/misc/config.sub)" ""
+# cp -f /usr/share/misc/config.sub config.sub
+#endif
+#ifneq "$(wildcard /usr/share/misc/config.guess)" ""
+# cp -f /usr/share/misc/config.guess config.guess
+#endif
+
dh_clean
install: build
Modified: desktop/trunk/xfce4-terminal/debian/changelog
===================================================================
--- desktop/trunk/xfce4-terminal/debian/changelog 2009-02-26 20:16:50 UTC (rev 2752)
+++ desktop/trunk/xfce4-terminal/debian/changelog 2009-02-26 23:15:23 UTC (rev 2753)
@@ -1,13 +1,9 @@
-xfce4-terminal (0.2.8.3-1) UNRELEASED; urgency=low
+xfce4-terminal (0.2.8-6) UNRELEASED; urgency=low
- * new upstream bugfix release.
- * debian/control:
- - replace dbus by dbus-x11 in Recommends:, to make sure people using dbus
- have a session bus available.
- - update standards version to 3.8.0.
- - add build-dep on intltool.
+ * debian/control: replace dbus by dbus-x11 in Recommends:, to make sure
+ people using dbus have a session bus available.
- -- Yves-Alexis Perez <corsac at debian.org> Tue, 28 Oct 2008 14:24:48 +0100
+ -- Yves-Alexis Perez <corsac at debian.org> Fri, 25 Apr 2008 08:38:41 +0200
xfce4-terminal (0.2.8-5) unstable; urgency=low
Modified: desktop/trunk/xfce4-terminal/debian/control
===================================================================
--- desktop/trunk/xfce4-terminal/debian/control 2009-02-26 20:16:50 UTC (rev 2752)
+++ desktop/trunk/xfce4-terminal/debian/control 2009-02-26 23:15:23 UTC (rev 2753)
@@ -3,10 +3,8 @@
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>, Rudy Godoy <rudy at kernel-panik.org>, Martin Loschwitz <madkiss at debian.org>, Yves-Alexis Perez <corsac at debian.org>
-Build-Depends: debhelper (>= 4.1.0), libdbus-glib-1-dev,
- libexo-0.3-dev (>= 0.3.4), libvte-dev (>= 1:0.14), libxml-perl,
- libstartup-notification0-dev, cdbs, chrpath, intltool
-Standards-Version: 3.8.0
+Build-Depends: debhelper (>= 4.1.0), libdbus-glib-1-dev, libexo-0.3-dev (>= 0.3.4), libvte-dev (>= 1:0.14), libxml-perl, libstartup-notification0-dev, cdbs, chrpath
+Standards-Version: 3.7.3
Homepage: http://terminal.os-cillation.com/
Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfce4-terminal/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/xfce4-terminal/
Modified: desktop/trunk/xfce4-utils/debian/changelog
===================================================================
--- desktop/trunk/xfce4-utils/debian/changelog 2009-02-26 20:16:50 UTC (rev 2752)
+++ desktop/trunk/xfce4-utils/debian/changelog 2009-02-26 23:15:23 UTC (rev 2753)
@@ -1,13 +1,3 @@
-xfce4-utils (4.4.3-1) UNRELEASED; urgency=low
-
- * new upstream bugfix release
- * debian/control:
- - update standards version to 3.8.0.
- * debian/rules:
- - stop messing with config.{guess,sub}.
-
- -- Yves-Alexis Perez <corsac at debian.org> Tue, 28 Oct 2008 07:32:05 +0100
-
xfce4-utils (4.4.2-8) unstable; urgency=low
* debian/{postinst,prerm} dropped, we don't install any mcs plugin anyway.
Modified: desktop/trunk/xfce4-utils/debian/control
===================================================================
--- desktop/trunk/xfce4-utils/debian/control 2009-02-26 20:16:50 UTC (rev 2752)
+++ desktop/trunk/xfce4-utils/debian/control 2009-02-26 23:15:23 UTC (rev 2753)
@@ -4,7 +4,7 @@
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 (>= 4.1.26), libgtk2.0-dev (>= 2.10.6), libxft-dev, xfce4-mcs-manager-dev (>= 4.4.2), chrpath, quilt, libdbus-glib-1-dev, libdbus-1-dev
-Standards-Version: 3.8.0
+Standards-Version: 3.7.3
Homepage: http://www.xfce.org/
Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfce4-utils/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/xfce4-utils/
Modified: desktop/trunk/xfce4-utils/debian/rules
===================================================================
--- desktop/trunk/xfce4-utils/debian/rules 2009-02-26 20:16:50 UTC (rev 2752)
+++ desktop/trunk/xfce4-utils/debian/rules 2009-02-26 23:15:23 UTC (rev 2753)
@@ -34,6 +34,11 @@
-rm -f configure-stamp build-stamp
[ ! -f Makefile ] || $(MAKE) distclean
+ -test -r /usr/share/misc/config.sub && \
+ cp -f /usr/share/misc/config.sub config.sub
+ -test -r /usr/share/misc/config.guess && \
+ cp -f /usr/share/misc/config.guess config.guess
+
dh_clean
install: build
Modified: desktop/trunk/xfdesktop4/debian/changelog
===================================================================
--- desktop/trunk/xfdesktop4/debian/changelog 2009-02-26 20:16:50 UTC (rev 2752)
+++ desktop/trunk/xfdesktop4/debian/changelog 2009-02-26 23:15:23 UTC (rev 2753)
@@ -1,18 +1,11 @@
-xfdesktop4 (4.4.3-1) UNRELEASED; urgency=low
+xfdesktop4 (4.4.2-8) UNRELEASED; urgency=low
- * new upstream bugfix release
- - italian typos fixed closes: #483709
* debian/patches:
- - 03_fix-memory-leak dropped, merged upstream.
- - 04_fix-CRITICAL-register-message-startup.patch too.
- - 05_simplify-free-code as well.
+ - 07_fix-italian-typos added, thanks David Paleino. closes: #483709
* debian/control:
- updated standards version to 3.8.0. No change needed.
- - update description based on xfce.org one.
- * debian/rules:
- - stop messing with config.{guess,sub}.
- -- Yves-Alexis Perez <corsac at debian.org> Tue, 28 Oct 2008 13:49:13 +0100
+ -- Yves-Alexis Perez <corsac at debian.org> Tue, 12 Aug 2008 22:03:52 +0200
xfdesktop4 (4.4.2-7) unstable; urgency=low
Modified: desktop/trunk/xfdesktop4/debian/control
===================================================================
--- desktop/trunk/xfdesktop4/debian/control 2009-02-26 20:16:50 UTC (rev 2752)
+++ desktop/trunk/xfdesktop4/debian/control 2009-02-26 23:15:23 UTC (rev 2753)
@@ -21,13 +21,11 @@
Recommends: dbus-x11, librsvg2-common
Suggests: menu
Conflicts: menu (<<2.1.12)
-Description: desktop manager for Xfce Desktop Environment
- xfdesktop is the desktop manager of Xfce4.
- It sets the background image, provides a right-click menu to launch
- applications and can optionally show files (including application launchers)
- or iconified windows. It includes gradient support for background color,
- saturation support for background image, real multiscreen and xinerama
- support, and it provides a desktop menu editor.
+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
+ of available desktop workspaces and their names. It also contains a panel
+ plugin to display the menu on the panel
Package: xfdesktop4-dbg
Architecture: any
Copied: desktop/trunk/xfdesktop4/debian/patches/03_fix-memory-leak.patch (from rev 2222, desktop/trunk/xfdesktop4/debian/patches/03_fix-memory-leak.patch)
===================================================================
--- desktop/trunk/xfdesktop4/debian/patches/03_fix-memory-leak.patch (rev 0)
+++ desktop/trunk/xfdesktop4/debian/patches/03_fix-memory-leak.patch 2009-02-26 23:15:23 UTC (rev 2753)
@@ -0,0 +1,34 @@
+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);
+ }
+ }
+ }
Copied: desktop/trunk/xfdesktop4/debian/patches/04_fix-CRITICAL-register-message-startup.patch (from rev 2222, desktop/trunk/xfdesktop4/debian/patches/04_fix-CRITICAL-register-message-startup.patch)
===================================================================
--- desktop/trunk/xfdesktop4/debian/patches/04_fix-CRITICAL-register-message-startup.patch (rev 0)
+++ desktop/trunk/xfdesktop4/debian/patches/04_fix-CRITICAL-register-message-startup.patch 2009-02-26 23:15:23 UTC (rev 2753)
@@ -0,0 +1,15 @@
+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);
Copied: desktop/trunk/xfdesktop4/debian/patches/05_simplify-free-code.patch (from rev 2222, desktop/trunk/xfdesktop4/debian/patches/05_simplify-free-code.patch)
===================================================================
--- desktop/trunk/xfdesktop4/debian/patches/05_simplify-free-code.patch (rev 0)
+++ desktop/trunk/xfdesktop4/debian/patches/05_simplify-free-code.patch 2009-02-26 23:15:23 UTC (rev 2753)
@@ -0,0 +1,28 @@
+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;
+ }
Copied: desktop/trunk/xfdesktop4/debian/patches/07_fix-italian-typos.patch (from rev 2222, desktop/trunk/xfdesktop4/debian/patches/07_fix-italian-typos.patch)
===================================================================
--- desktop/trunk/xfdesktop4/debian/patches/07_fix-italian-typos.patch (rev 0)
+++ desktop/trunk/xfdesktop4/debian/patches/07_fix-italian-typos.patch 2009-02-26 23:15:23 UTC (rev 2753)
@@ -0,0 +1,14 @@
+--- 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/trunk/xfdesktop4/debian/patches/series
===================================================================
--- desktop/trunk/xfdesktop4/debian/patches/series 2009-02-26 20:16:50 UTC (rev 2752)
+++ desktop/trunk/xfdesktop4/debian/patches/series 2009-02-26 23:15:23 UTC (rev 2753)
@@ -1,2 +1,6 @@
01_show-backdrop-by-default.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
Modified: desktop/trunk/xfdesktop4/debian/rules
===================================================================
--- desktop/trunk/xfdesktop4/debian/rules 2009-02-26 20:16:50 UTC (rev 2752)
+++ desktop/trunk/xfdesktop4/debian/rules 2009-02-26 23:15:23 UTC (rev 2753)
@@ -2,6 +2,7 @@
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_BUILD_OPTIONS=nostrip
CFLAGS = -Wall -g
@@ -42,6 +43,13 @@
[ ! -f Makefile ] || $(MAKE) distclean
+ifneq "$(wildcard /usr/share/misc/config.sub)" ""
+ cp -f /usr/share/misc/config.sub config.sub
+endif
+ifneq "$(wildcard /usr/share/misc/config.guess)" ""
+ cp -f /usr/share/misc/config.guess config.guess
+endif
+
dh_clean
install: build
Modified: desktop/trunk/xfprint4/debian/changelog
===================================================================
--- desktop/trunk/xfprint4/debian/changelog 2009-02-26 20:16:50 UTC (rev 2752)
+++ desktop/trunk/xfprint4/debian/changelog 2009-02-26 23:15:23 UTC (rev 2753)
@@ -1,15 +1,3 @@
-xfprint4 (4.4.3-1) UNRELEASED; urgency=low
-
- * new upstream bugfix release
- * debian/rules:
- - stop messing with config.{guess,sub}. Fix FTBFS on powerpc and arm
- buildds.
- * debian/patches:
- - 03_check-default-printer dropped. merged upstream.
-
-
- -- Yves-Alexis Perez <corsac at debian.org> Tue, 28 Oct 2008 07:34:43 +0100
-
xfprint4 (4.4.2-6) unstable; urgency=low
* debian/control:
Copied: desktop/trunk/xfprint4/debian/patches/03_check-default-printer.patch (from rev 2222, desktop/trunk/xfprint4/debian/patches/03_check-default-printer.patch)
===================================================================
--- desktop/trunk/xfprint4/debian/patches/03_check-default-printer.patch (rev 0)
+++ desktop/trunk/xfprint4/debian/patches/03_check-default-printer.patch 2009-02-26 23:15:23 UTC (rev 2753)
@@ -0,0 +1,13 @@
+Index: xfce_4_4/xfprint/print_dialog.c
+===================================================================
+--- xfce_4_4/xfprint/print_dialog.c (revision 26587)
++++ xfce_4_4/xfprint/print_dialog.c (revision 26588)
+@@ -406,7 +406,7 @@
+ PRINTER_NAME_COLUMN, printer_data->name,
+ PRINTER_ALIAS_COLUMN, printer_data->alias ? printer_data->alias : "", -1);
+
+- if (!default_printer_found && g_ascii_strcasecmp (default_printer->name, printer_data->name) == 0) {
++ if (default_printer && !default_printer_found && g_ascii_strcasecmp (default_printer->name, printer_data->name) == 0) {
+ default_printer_found = TRUE;
+ gtk_combo_box_set_active_iter (GTK_COMBO_BOX (priv->combobox_printer), &iter);
+ }
Modified: desktop/trunk/xfprint4/debian/patches/series
===================================================================
--- desktop/trunk/xfprint4/debian/patches/series 2009-02-26 20:16:50 UTC (rev 2752)
+++ desktop/trunk/xfprint4/debian/patches/series 2009-02-26 23:15:23 UTC (rev 2753)
@@ -1,2 +1,3 @@
01_debug-lpr-command.patch
02_refresh-new-settings.patch
+03_check-default-printer.patch
Modified: desktop/trunk/xfprint4/debian/rules
===================================================================
--- desktop/trunk/xfprint4/debian/rules 2009-02-26 20:16:50 UTC (rev 2752)
+++ desktop/trunk/xfprint4/debian/rules 2009-02-26 23:15:23 UTC (rev 2753)
@@ -26,6 +26,13 @@
build: build-stamp
build-stamp: config.status
+ifneq "$(wildcard /usr/share/misc/config.sub)" ""
+ cp -f /usr/share/misc/config.sub config.sub
+endif
+ifneq "$(wildcard /usr/share/misc/config.guess)" ""
+ cp -f /usr/share/misc/config.guess config.guess
+endif
+
dh_testdir
$(MAKE)
touch build-stamp
@@ -38,6 +45,13 @@
[ ! -f Makefile ] || $(MAKE) distclean
+ifneq "$(wildcard /usr/share/misc/config.sub)" ""
+ rm -f config.sub
+endif
+ifneq "$(wildcard /usr/share/misc/config.guess)" ""
+ rm -f config.guess
+endif
+
dh_clean
install: build
Modified: desktop/trunk/xfwm4/debian/changelog
===================================================================
--- desktop/trunk/xfwm4/debian/changelog 2009-02-26 20:16:50 UTC (rev 2752)
+++ desktop/trunk/xfwm4/debian/changelog 2009-02-26 23:15:23 UTC (rev 2753)
@@ -1,34 +1,11 @@
-xfwm4 (4.4.3-1) UNRELEASED; urgency=low
-
- * new upstream bugfix release, fix:
- - bug in overlays counting causing xscreensaver window to remain
- invisible. (r26973, Xfce #3849) closes: #483070
- - loosen the rule that prevents an application from iconifying itself when
- skip_taskbar is set (r28012, Xfce #4434). closes: #491817
- - fix support for win-gravity WM hint (r27454, Xfce #3634) closes: #448443
- * debian/rules:
- - stop messing with config.{guess,sub}.
- * debian/control:
- - update standards version to 3.8.0.
- - add build-dep on intltool.
- * debian/patches:
- - 01_filter-grab-ungrab-events removed, merged upstream.
- - 02_exit-on-selectionclear as well.
- - 03_fix-compositing-overlay itou.
- - 04_fix-automaximize-on-move again.
- - 05_awn-focus too.
- *
-
- -- Yves-Alexis Perez <corsac at debian.org> Tue, 28 Oct 2008 13:05:08 +0100
-
xfwm4 (4.4.2-5) unstable; urgency=low
* switch to triggers:
- debian/{postinst,prerm}: remove xfce-mcs-manager refresh.
- debian/control: version the Recommends: on xfce4-mcs-manager.
* debian/control:
- remove Martin Loschwitz from Uploaders.
- - drop Conflcts/Replaces against old xfwm4-themes not in Etch.
+ - remove Martin Loschwitz from Uploaders.
+ - drop Conflicts/Replaces against old xfwm4-themes not in Etch.
-- Yves-Alexis Perez <corsac at debian.org> Sun, 18 May 2008 19:58:55 +0200
Modified: desktop/trunk/xfwm4/debian/control
===================================================================
--- desktop/trunk/xfwm4/debian/control 2009-02-26 20:16:50 UTC (rev 2752)
+++ desktop/trunk/xfwm4/debian/control 2009-02-26 23:15:23 UTC (rev 2753)
@@ -3,10 +3,8 @@
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 (>= 4.1.26), libgtk2.0-dev (>= 2.10.6), libxft-dev,
- xfce4-mcs-manager-dev (>= 4.4.2), quilt, libxdamage-dev, libxrender-dev,
- libxcomposite-dev, libxfixes-dev, chrpath, intltool
-Standards-Version: 3.8.0
+Build-Depends: debhelper (>= 4.1.26), libgtk2.0-dev (>= 2.10.6), libxft-dev, xfce4-mcs-manager-dev (>= 4.4.2), quilt, libxdamage-dev, libxrender-dev, libxcomposite-dev, libxfixes-dev, chrpath
+Standards-Version: 3.7.3
Homepage: http://www.xfce.org/
Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfwm4/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/xfwm4/
Copied: desktop/trunk/xfwm4/debian/patches (from rev 2222, desktop/trunk/xfwm4/debian/patches)
Modified: desktop/trunk/xfwm4/debian/rules
===================================================================
--- desktop/trunk/xfwm4/debian/rules 2009-02-26 20:16:50 UTC (rev 2752)
+++ desktop/trunk/xfwm4/debian/rules 2009-02-26 23:15:23 UTC (rev 2753)
@@ -43,6 +43,11 @@
-rm -f configure-stamp build-stamp
[ ! -f Makefile ] || $(MAKE) distclean
+ -test -r /usr/share/misc/config.sub && \
+ cp -f /usr/share/misc/config.sub config.sub
+ -test -r /usr/share/misc/config.guess && \
+ cp -f /usr/share/misc/config.guess config.guess
+
dh_clean
install: build
Modified: desktop/trunk/xfwm4-themes/debian/changelog
===================================================================
--- desktop/trunk/xfwm4-themes/debian/changelog 2009-02-26 20:16:50 UTC (rev 2752)
+++ desktop/trunk/xfwm4-themes/debian/changelog 2009-02-26 23:15:23 UTC (rev 2753)
@@ -1,14 +1,11 @@
-xfwm4-themes (4.4.3-1) UNRELEASED; urgency=low
+xfwm4-themes (4.4.2-2) UNRELEASED; urgency=low
- * new upstream bugfix release
* debian/control:
- update my email address.
+ - update standards version.
- add Homepage: field.
- - update standards version to 3.8.0.
- * debian/rules:
- - stop messing with config.{guess,sub}.
- -- Yves-Alexis Perez <corsac at debian.org> Tue, 28 Oct 2008 07:37:03 +0100
+ -- Yves-Alexis Perez <corsac at debian.org> Mon, 28 Apr 2008 10:20:27 +0200
xfwm4-themes (4.4.2-1) unstable; urgency=low
Modified: desktop/trunk/xfwm4-themes/debian/control
===================================================================
--- desktop/trunk/xfwm4-themes/debian/control 2009-02-26 20:16:50 UTC (rev 2752)
+++ desktop/trunk/xfwm4-themes/debian/control 2009-02-26 23:15:23 UTC (rev 2753)
@@ -4,7 +4,7 @@
Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
Uploaders: Martin Loschwitz <madkiss at debian.org>, Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>, Yves-Alexis Perez <corsac at debian.org>
Build-Depends: debhelper (>> 4.0.0)
-Standards-Version: 3.8.0
+Standards-Version: 3.7.3
Homepage: http://www.xfce.org/
Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfwm4-themes/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/xfwm4-themes/
Modified: desktop/trunk/xfwm4-themes/debian/rules
===================================================================
--- desktop/trunk/xfwm4-themes/debian/rules 2009-02-26 20:16:50 UTC (rev 2752)
+++ desktop/trunk/xfwm4-themes/debian/rules 2009-02-26 23:15:23 UTC (rev 2753)
@@ -30,6 +30,12 @@
rm -f build-stamp
[ ! -f Makefile ] || $(MAKE) distclean
+ifneq "$(wildcard /usr/share/misc/config.sub)" ""
+ cp -f /usr/share/misc/config.sub config.sub
+endif
+ifneq "$(wildcard /usr/share/misc/config.guess)" ""
+ cp -f /usr/share/misc/config.guess config.guess
+endif
dh_clean
More information about the Pkg-xfce-commits
mailing list