[Pkg-xfce-commits] r1491 - in desktop/branches/etch-backports: exo/debian gtk2-engines-xfce/debian libxfce4mcs/debian libxfce4util/debian libxfcegui4/debian mousepad/debian orage/debian thunar/debian thunar/debian/patches xfce-mcs-manager/debian xfce-mcs-plugins/debian xfce4/debian xfce4-appfinder/debian xfce4-dev-tools/debian xfce4-icon-theme/debian xfce4-mixer/debian xfce4-mixer/debian/patches xfce4-panel/debian xfce4-session/debian xfce4-terminal/debian xfce4-terminal/debian/patches xfce4-utils/debian xfdesktop4/debian xfprint4/debian xfwm4/debian xfwm4/debian/patches xfwm4-themes/debian

corsac at alioth.debian.org corsac at alioth.debian.org
Wed Dec 19 11:42:42 UTC 2007


Author: corsac
Date: 2007-12-19 11:42:42 +0000 (Wed, 19 Dec 2007)
New Revision: 1491

Added:
   desktop/branches/etch-backports/thunar/debian/patches/02_thunar-vfs-volume-hal_missing-audio-cds-for-volman.patch
   desktop/branches/etch-backports/thunar/debian/patches/03_use-eject-where-necessary.patch
   desktop/branches/etch-backports/xfce4-mixer/debian/patches/02_mixer-block-menu.patch
   desktop/branches/etch-backports/xfce4-mixer/debian/xfce4-mixer-alsa.shlibs
   desktop/branches/etch-backports/xfce4-mixer/debian/xfce4-mixer-oss.shlibs
   desktop/branches/etch-backports/xfce4-terminal/debian/patches/02_dont-refresh-prefs-too-much.patch
Removed:
   desktop/branches/etch-backports/exo/debian/dirs
   desktop/branches/etch-backports/xfce4-panel/debian/patches/
   desktop/branches/etch-backports/xfce4-terminal/debian/patches/01_CVE-2007-3770.patch
   desktop/branches/etch-backports/xfwm4/debian/patches/01_xfwm4-fix-transient-windows.patch
   desktop/branches/etch-backports/xfwm4/debian/patches/02_fix-xfwm4-hang.patch
Modified:
   desktop/branches/etch-backports/exo/debian/changelog
   desktop/branches/etch-backports/exo/debian/control
   desktop/branches/etch-backports/exo/debian/libexo-0.3-0.shlibs
   desktop/branches/etch-backports/exo/debian/libexo-0.3-dev.install
   desktop/branches/etch-backports/exo/debian/rules
   desktop/branches/etch-backports/gtk2-engines-xfce/debian/changelog
   desktop/branches/etch-backports/gtk2-engines-xfce/debian/control
   desktop/branches/etch-backports/gtk2-engines-xfce/debian/rules
   desktop/branches/etch-backports/libxfce4mcs/debian/changelog
   desktop/branches/etch-backports/libxfce4mcs/debian/control
   desktop/branches/etch-backports/libxfce4mcs/debian/libxfce4mcs-client3.shlibs
   desktop/branches/etch-backports/libxfce4mcs/debian/libxfce4mcs-manager3.shlibs
   desktop/branches/etch-backports/libxfce4mcs/debian/rules
   desktop/branches/etch-backports/libxfce4util/debian/changelog
   desktop/branches/etch-backports/libxfce4util/debian/control
   desktop/branches/etch-backports/libxfce4util/debian/rules
   desktop/branches/etch-backports/libxfcegui4/debian/changelog
   desktop/branches/etch-backports/libxfcegui4/debian/control
   desktop/branches/etch-backports/libxfcegui4/debian/libxfcegui4-4.shlibs
   desktop/branches/etch-backports/libxfcegui4/debian/rules
   desktop/branches/etch-backports/mousepad/debian/changelog
   desktop/branches/etch-backports/mousepad/debian/control
   desktop/branches/etch-backports/orage/debian/changelog
   desktop/branches/etch-backports/orage/debian/control
   desktop/branches/etch-backports/orage/debian/copyright
   desktop/branches/etch-backports/thunar/debian/changelog
   desktop/branches/etch-backports/thunar/debian/control
   desktop/branches/etch-backports/thunar/debian/libthunar-vfs-1-2.shlibs
   desktop/branches/etch-backports/thunar/debian/rules
   desktop/branches/etch-backports/thunar/debian/thunar.menu
   desktop/branches/etch-backports/xfce-mcs-manager/debian/changelog
   desktop/branches/etch-backports/xfce-mcs-manager/debian/control
   desktop/branches/etch-backports/xfce-mcs-manager/debian/rules
   desktop/branches/etch-backports/xfce-mcs-manager/debian/xfce4-mcs-manager.menu
   desktop/branches/etch-backports/xfce-mcs-plugins/debian/changelog
   desktop/branches/etch-backports/xfce-mcs-plugins/debian/control
   desktop/branches/etch-backports/xfce-mcs-plugins/debian/rules
   desktop/branches/etch-backports/xfce4-appfinder/debian/changelog
   desktop/branches/etch-backports/xfce4-appfinder/debian/control
   desktop/branches/etch-backports/xfce4-appfinder/debian/rules
   desktop/branches/etch-backports/xfce4-dev-tools/debian/changelog
   desktop/branches/etch-backports/xfce4-dev-tools/debian/control
   desktop/branches/etch-backports/xfce4-icon-theme/debian/changelog
   desktop/branches/etch-backports/xfce4-icon-theme/debian/control
   desktop/branches/etch-backports/xfce4-icon-theme/debian/rules
   desktop/branches/etch-backports/xfce4-mixer/debian/NEWS.Debian
   desktop/branches/etch-backports/xfce4-mixer/debian/changelog
   desktop/branches/etch-backports/xfce4-mixer/debian/control
   desktop/branches/etch-backports/xfce4-mixer/debian/patches/series
   desktop/branches/etch-backports/xfce4-mixer/debian/rules
   desktop/branches/etch-backports/xfce4-panel/debian/changelog
   desktop/branches/etch-backports/xfce4-panel/debian/control
   desktop/branches/etch-backports/xfce4-panel/debian/xfce4-panel.shlibs
   desktop/branches/etch-backports/xfce4-session/debian/changelog
   desktop/branches/etch-backports/xfce4-session/debian/control
   desktop/branches/etch-backports/xfce4-session/debian/rules
   desktop/branches/etch-backports/xfce4-terminal/debian/changelog
   desktop/branches/etch-backports/xfce4-terminal/debian/control
   desktop/branches/etch-backports/xfce4-utils/debian/Debian
   desktop/branches/etch-backports/xfce4-utils/debian/changelog
   desktop/branches/etch-backports/xfce4-utils/debian/control
   desktop/branches/etch-backports/xfce4-utils/debian/rules
   desktop/branches/etch-backports/xfce4/debian/changelog
   desktop/branches/etch-backports/xfce4/debian/control
   desktop/branches/etch-backports/xfce4/debian/rules
   desktop/branches/etch-backports/xfdesktop4/debian/changelog
   desktop/branches/etch-backports/xfdesktop4/debian/control
   desktop/branches/etch-backports/xfdesktop4/debian/rules
   desktop/branches/etch-backports/xfdesktop4/debian/xfdesktop4.menu
   desktop/branches/etch-backports/xfprint4/debian/changelog
   desktop/branches/etch-backports/xfprint4/debian/control
   desktop/branches/etch-backports/xfwm4-themes/debian/changelog
   desktop/branches/etch-backports/xfwm4-themes/debian/control
   desktop/branches/etch-backports/xfwm4-themes/debian/rules
   desktop/branches/etch-backports/xfwm4/debian/changelog
   desktop/branches/etch-backports/xfwm4/debian/control
   desktop/branches/etch-backports/xfwm4/debian/patches/series
   desktop/branches/etch-backports/xfwm4/debian/rules
Log:
prepare 4.4.2 etch backports


Modified: desktop/branches/etch-backports/exo/debian/changelog
===================================================================
--- desktop/branches/etch-backports/exo/debian/changelog	2007-12-18 23:12:39 UTC (rev 1490)
+++ desktop/branches/etch-backports/exo/debian/changelog	2007-12-19 11:42:42 UTC (rev 1491)
@@ -1,13 +1,24 @@
-exo (0.3.2-6~bpo40+1) UNRELEASED; urgency=low
+exo (0.3.4-1~bpo40+1) UNRELEASED; urgency=low
 
+  * rebuild for etch backports.
+  * debian/libexo-0.3-dev.install: ship exo gtk-doc again
+  * debian/dirs removed, useless. 
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Wed, 19 Dec 2007 11:46:55 +0100
+
+exo (0.3.4-1) unstable; urgency=low
+
   [ Simon Huggins ]
   * debian/control: Move fake Homepage field to a real one now dpkg
     supports it.
+  * Add Vcs-* headers to debian/control
 
   [ Yves-Alexis Perez ]
-  * build for etch-backports.
+  * debian/control: bump build deps to Xfce 4.4.2
+  * debian/rules: don't ignore all make errors at clean stage.
+  * new upstrem release.
 
- -- Yves-Alexis Perez <corsac at corsac.net>  Sun, 21 Oct 2007 13:40:41 +0200
+ -- Yves-Alexis Perez <corsac at corsac.net>  Sun, 02 Dec 2007 15:04:47 +0100
 
 exo (0.3.2-5) unstable; urgency=low
 

Modified: desktop/branches/etch-backports/exo/debian/control
===================================================================
--- desktop/branches/etch-backports/exo/debian/control	2007-12-18 23:12:39 UTC (rev 1490)
+++ desktop/branches/etch-backports/exo/debian/control	2007-12-19 11:42:42 UTC (rev 1491)
@@ -1,16 +1,18 @@
 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>, Rudy Godoy <rudy at kernel-panik.org>, Martin Loschwitz <madkiss at debian.org>, Yves-Alexis Perez <corsac at corsac.net>
-Build-Depends: debhelper (>= 4.0.0), libxfcegui4-dev (>= 4.4.1), liburi-perl, xfce4-mcs-manager-dev, chrpath, libhal-storage-dev [!hurd-i386]
+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), libxfcegui4-dev (>= 4.4.2), liburi-perl, xfce4-mcs-manager-dev, chrpath, libhal-storage-dev [!hurd-i386]
 Standards-Version: 3.7.2
 Section: libs
 Homepage: http://libexo.os-cillation.com/
+Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/exo/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/exo/
 
 Package: libexo-0.3-dev
 Section: libdevel
 Architecture: any
-Depends: libexo-0.3-0 (= ${binary:Version}), libxfcegui4-dev (>= 4.4.1), libhal-storage-dev
+Depends: libexo-0.3-0 (= ${binary:Version}), libxfcegui4-dev (>= 4.4.2), libhal-storage-dev
 Conflicts: libexo0.3-dev
 Replaces: libexo0.3-dev
 Description: Development files for libexo

Deleted: desktop/branches/etch-backports/exo/debian/dirs
===================================================================
--- desktop/branches/etch-backports/exo/debian/dirs	2007-12-18 23:12:39 UTC (rev 1490)
+++ desktop/branches/etch-backports/exo/debian/dirs	2007-12-19 11:42:42 UTC (rev 1491)
@@ -1 +0,0 @@
-usr/bin

Modified: desktop/branches/etch-backports/exo/debian/libexo-0.3-0.shlibs
===================================================================
--- desktop/branches/etch-backports/exo/debian/libexo-0.3-0.shlibs	2007-12-18 23:12:39 UTC (rev 1490)
+++ desktop/branches/etch-backports/exo/debian/libexo-0.3-0.shlibs	2007-12-19 11:42:42 UTC (rev 1491)
@@ -1,2 +1,2 @@
-libexo-0.3 0 libexo-0.3-0 (>= 0.3.2-1)
-libexo-hal-0.3 0 libexo-0.3-0 (>= 0.3.2-1)
+libexo-0.3 0 libexo-0.3-0 (>= 0.3.4)
+libexo-hal-0.3 0 libexo-0.3-0 (>= 0.3.4)

Modified: desktop/branches/etch-backports/exo/debian/libexo-0.3-dev.install
===================================================================
--- desktop/branches/etch-backports/exo/debian/libexo-0.3-dev.install	2007-12-18 23:12:39 UTC (rev 1490)
+++ desktop/branches/etch-backports/exo/debian/libexo-0.3-dev.install	2007-12-19 11:42:42 UTC (rev 1491)
@@ -2,4 +2,4 @@
 usr/lib/pkgconfig/*
 usr/lib/lib*.a
 usr/lib/lib*.so
-usr/share/gtk-doc/html/exo-0.3/*
+usr/share/gtk-doc/html/exo/*

Modified: desktop/branches/etch-backports/exo/debian/rules
===================================================================
--- desktop/branches/etch-backports/exo/debian/rules	2007-12-18 23:12:39 UTC (rev 1490)
+++ desktop/branches/etch-backports/exo/debian/rules	2007-12-19 11:42:42 UTC (rev 1491)
@@ -56,7 +56,7 @@
 	rm -f build-stamp 
 
 	# Add here commands to clean up after the build process.
-	-$(MAKE) distclean
+	[ ! -f Makefile ] || $(MAKE) distclean
 ifneq "$(wildcard /usr/share/misc/config.sub)" ""
 	cp -f /usr/share/misc/config.sub config.sub
 endif

Modified: desktop/branches/etch-backports/gtk2-engines-xfce/debian/changelog
===================================================================
--- desktop/branches/etch-backports/gtk2-engines-xfce/debian/changelog	2007-12-18 23:12:39 UTC (rev 1490)
+++ desktop/branches/etch-backports/gtk2-engines-xfce/debian/changelog	2007-12-19 11:42:42 UTC (rev 1491)
@@ -1,5 +1,11 @@
-gtk2-engines-xfce (2.4.1-2~bpo40+1) UNRELEASED; urgency=low
+gtk2-engines-xfce (2.4.2-1~bpo40+1) UNRELEASED; urgency=low
 
+  * rebuild for etch-backports
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Wed, 19 Dec 2007 11:39:23 +0100
+
+gtk2-engines-xfce (2.4.2-1) unstable; urgency=low
+
   [ Mike Massonnet (mmassonnet) ]
   * Fix typo in the description of the package.
 
@@ -8,14 +14,14 @@
     supports it.
 
   [ Yves-Alexis Perez ]
-  * build for etch-backports.
-  * debian/control: remove gtk 2.10 build-dep.
-  * debian/rules:
-    - drop dh_gtkengines call.
-    - remove .la files in gtk 2.8 folder.
+  * New upstrean release.
+  * debian/rules: don't ignore all make errors at clean stage.
 
- -- Yves-Alexis Perez <corsac at corsac.net>  Sun, 21 Oct 2007 13:13:13 +0200
+  [ Simon Huggins ]
+  * Add Vcs-* headers to debian/control
 
+ -- Simon Huggins <huggie at earth.li>  Tue, 27 Nov 2007 16:39:16 +0000
+
 gtk2-engines-xfce (2.4.1-1) unstable; urgency=low
 
   * New upstream release. 

Modified: desktop/branches/etch-backports/gtk2-engines-xfce/debian/control
===================================================================
--- desktop/branches/etch-backports/gtk2-engines-xfce/debian/control	2007-12-18 23:12:39 UTC (rev 1490)
+++ desktop/branches/etch-backports/gtk2-engines-xfce/debian/control	2007-12-19 11:42:42 UTC (rev 1491)
@@ -2,10 +2,12 @@
 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 corsac.net>
+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, libx11-dev (> 2:1.0.0-6), chrpath
 Standards-Version: 3.7.2
 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/
 
 Package: gtk2-engines-xfce
 Architecture: any
@@ -15,5 +17,3 @@
  This package contains an Xfce engine for GTK2.0 which makes you able
  to use various GTK2.0 themes with Xfce. It also contains some ready
  themes, but you are of course free to design your own.
- .
- Homepage: http://www.xfce.org/

Modified: desktop/branches/etch-backports/gtk2-engines-xfce/debian/rules
===================================================================
--- desktop/branches/etch-backports/gtk2-engines-xfce/debian/rules	2007-12-18 23:12:39 UTC (rev 1490)
+++ desktop/branches/etch-backports/gtk2-engines-xfce/debian/rules	2007-12-19 11:42:42 UTC (rev 1491)
@@ -30,8 +30,8 @@
 	dh_testroot
 	rm -f configure-stamp build-stamp 
 
-	-$(MAKE) distclean
-	
+	[ ! -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 && \

Modified: desktop/branches/etch-backports/libxfce4mcs/debian/changelog
===================================================================
--- desktop/branches/etch-backports/libxfce4mcs/debian/changelog	2007-12-18 23:12:39 UTC (rev 1490)
+++ desktop/branches/etch-backports/libxfce4mcs/debian/changelog	2007-12-19 11:42:42 UTC (rev 1491)
@@ -1,14 +1,24 @@
-libxfce4mcs (4.4.1-2~bpo40+1) UNRELEASED; urgency=low
+libxfce4mcs (4.4.2-1~bpo40+1) UNRELEASED; urgency=low
 
+  * rebuild for etch-backports
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Tue, 18 Dec 2007 22:30:35 +0100
+
+libxfce4mcs (4.4.2-1) unstable; urgency=low
+
   [ Simon Huggins ]
   * Use ${binary:Version} so we are binNMU safe.
   * debian/control: Move fake Homepage field to a real one now dpkg
     supports it.
+  * Add Vcs-* headers to debian/control
 
   [ Yves-Alexis Perez ]
-  * build for etch-backports.
+  * New upstream release.
+  * debian/rules: 
+    - don't ignore all make errors at clean stage.
+    - fix parallel builds.
 
- -- Yves-Alexis Perez <corsac at corsac.net>  Sun, 21 Oct 2007 13:32:37 +0200
+ -- Yves-Alexis Perez <corsac at corsac.net>  Sun, 02 Dec 2007 11:25:57 +0100
 
 libxfce4mcs (4.4.1-1) unstable; urgency=low
 

Modified: desktop/branches/etch-backports/libxfce4mcs/debian/control
===================================================================
--- desktop/branches/etch-backports/libxfce4mcs/debian/control	2007-12-18 23:12:39 UTC (rev 1490)
+++ desktop/branches/etch-backports/libxfce4mcs/debian/control	2007-12-19 11:42:42 UTC (rev 1491)
@@ -2,10 +2,12 @@
 Priority: optional
 Section: x11
 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 corsac.net>
-Build-Depends: debhelper (>= 4.0.0), libglib2.0-dev, libxfce4util-dev (>= 4.4.1), libxt-dev, chrpath
+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), libglib2.0-dev, libxfce4util-dev (>= 4.4.2), libxt-dev, chrpath
 Standards-Version: 3.7.2
 Homepage: http://www.xfce.org/
+Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/libxfce4mcs/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/libxfce4mcs/
 
 Package: libxfce4mcs-manager3
 Section: libs
@@ -36,7 +38,7 @@
 Package: libxfce4mcs-dev
 Section: libdevel
 Architecture: any
-Depends: libxfce4mcs-manager3 (= ${binary:Version}), libxfce4mcs-client3 (= ${binary:Version}), libxfce4util-dev (>= 4.4.1)
+Depends: libxfce4mcs-manager3 (= ${binary:Version}), libxfce4mcs-client3 (= ${binary:Version}), libxfce4util-dev (>= 4.4.2)
 Replaces: libxfce4mcs-0-dev
 Conflicts: libxfce4mcs-0-dev
 Suggests: devhelp

Modified: desktop/branches/etch-backports/libxfce4mcs/debian/libxfce4mcs-client3.shlibs
===================================================================
--- desktop/branches/etch-backports/libxfce4mcs/debian/libxfce4mcs-client3.shlibs	2007-12-18 23:12:39 UTC (rev 1490)
+++ desktop/branches/etch-backports/libxfce4mcs/debian/libxfce4mcs-client3.shlibs	2007-12-19 11:42:42 UTC (rev 1491)
@@ -1 +1 @@
-libxfce4mcs-client 3 libxfce4mcs-client3 (>= 4.4.1)
+libxfce4mcs-client 3 libxfce4mcs-client3 (>= 4.4.2)

Modified: desktop/branches/etch-backports/libxfce4mcs/debian/libxfce4mcs-manager3.shlibs
===================================================================
--- desktop/branches/etch-backports/libxfce4mcs/debian/libxfce4mcs-manager3.shlibs	2007-12-18 23:12:39 UTC (rev 1490)
+++ desktop/branches/etch-backports/libxfce4mcs/debian/libxfce4mcs-manager3.shlibs	2007-12-19 11:42:42 UTC (rev 1491)
@@ -1 +1 @@
-libxfce4mcs-manager 3 libxfce4mcs-manager3 (>= 4.4.1)
+libxfce4mcs-manager 3 libxfce4mcs-manager3 (>= 4.4.2)

Modified: desktop/branches/etch-backports/libxfce4mcs/debian/rules
===================================================================
--- desktop/branches/etch-backports/libxfce4mcs/debian/rules	2007-12-18 23:12:39 UTC (rev 1490)
+++ desktop/branches/etch-backports/libxfce4mcs/debian/rules	2007-12-19 11:42:42 UTC (rev 1491)
@@ -11,15 +11,13 @@
 	CFLAGS += -O2
 endif
 
-configure: configure-stamp
-configure-stamp:
+config.status: configure
 
 	dh_testdir
 	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --disable-rpath --enable-static=yes --enable-final
-	touch configure-stamp
 	
-build: configure build-stamp
-build-stamp:
+build: build-stamp
+build-stamp: config.status
 
 	dh_testdir
 	$(MAKE)
@@ -31,7 +29,7 @@
 	dh_testroot
 	rm -f build-stamp configure-stamp
 
-	-$(MAKE) distclean
+	[ ! -f Makefile ] || $(MAKE) distclean
 
 ifneq "$(wildcard /usr/share/misc/config.sub)" ""
 	cp -f /usr/share/misc/config.sub config.sub

Modified: desktop/branches/etch-backports/libxfce4util/debian/changelog
===================================================================
--- desktop/branches/etch-backports/libxfce4util/debian/changelog	2007-12-18 23:12:39 UTC (rev 1490)
+++ desktop/branches/etch-backports/libxfce4util/debian/changelog	2007-12-19 11:42:42 UTC (rev 1491)
@@ -1,15 +1,25 @@
-libxfce4util (4.4.1-2~bpo40+1) UNRELEASED; urgency=low
+libxfce4util (4.4.2-1~bpo40+1) UNRELEASED; urgency=low
 
+  * rebuild for etch-backports.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Tue, 18 Dec 2007 22:31:27 +0100
+
+libxfce4util (4.4.2-1) unstable; urgency=low
+
   [ Simon Huggins ]
   * Use ${binary:Version} so we are binNMU safe.
   * debian/control: Move fake Homepage field to a real one now dpkg
     supports it.
 
   [ Yves-Alexis Perez ]
-  * build for etch-backports.
+  * New upstream release.
+  * debian/rules: don't ignore all make errors at clean stage.
 
- -- Yves-Alexis Perez <corsac at corsac.net>  Sun, 21 Oct 2007 13:22:00 +0200
+  [ Simon Huggins ]
+  * Add Vcs-* headers to debian/control
 
+ -- Simon Huggins <huggie at earth.li>  Tue, 27 Nov 2007 16:39:16 +0000
+
 libxfce4util (4.4.1-1) unstable; urgency=low
 
   * New upstream release. 

Modified: desktop/branches/etch-backports/libxfce4util/debian/control
===================================================================
--- desktop/branches/etch-backports/libxfce4util/debian/control	2007-12-18 23:12:39 UTC (rev 1490)
+++ desktop/branches/etch-backports/libxfce4util/debian/control	2007-12-19 11:42:42 UTC (rev 1491)
@@ -2,10 +2,12 @@
 Priority: optional
 Section: libs
 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 corsac.net>
+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), libglib2.0-dev, chrpath, quilt
 Standards-Version: 3.7.2
 Homepage: http://www.xfce.org/
+Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/libxfce4util/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/libxfce4util/
 
 Package: libxfce4util-dev
 Section: libdevel

Modified: desktop/branches/etch-backports/libxfce4util/debian/rules
===================================================================
--- desktop/branches/etch-backports/libxfce4util/debian/rules	2007-12-18 23:12:39 UTC (rev 1490)
+++ desktop/branches/etch-backports/libxfce4util/debian/rules	2007-12-19 11:42:42 UTC (rev 1491)
@@ -40,7 +40,7 @@
 	dh_testroot
 	rm -f build-stamp 
 
-	-$(MAKE) distclean
+	[ ! -f Makefile ] || $(MAKE) distclean
 
 ifneq "$(wildcard /usr/share/misc/config.sub)" ""
 	cp -f /usr/share/misc/config.sub config.sub
@@ -81,7 +81,7 @@
 	dh_compress
 	dh_fixperms
 
-	dh_makeshlibs -V 'libxfce4util4 (>= 4.4.1)'
+	dh_makeshlibs -V 'libxfce4util4 (>= 4.4.2)'
 	dh_installdeb
 
 	dh_shlibdeps

Modified: desktop/branches/etch-backports/libxfcegui4/debian/changelog
===================================================================
--- desktop/branches/etch-backports/libxfcegui4/debian/changelog	2007-12-18 23:12:39 UTC (rev 1490)
+++ desktop/branches/etch-backports/libxfcegui4/debian/changelog	2007-12-19 11:42:42 UTC (rev 1491)
@@ -1,16 +1,26 @@
-libxfcegui4 (4.4.1-2~bpo40+1) UNRELEASED; urgency=low
+libxfcegui4 (4.4.2-1~bpo40+1) UNRELEASED; urgency=low
 
+  * rebuild for etch-backports
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Tue, 18 Dec 2007 22:33:51 +0100
+
+libxfcegui4 (4.4.2-1) unstable; urgency=low
+
   [ Simon Huggins ]
   * Use ${binary:Version} so we are binNMU safe.
   * debian/control: Move fake Homepage field to a real one now dpkg
     supports it.
 
   [ Yves-Alexis Perez ]
-  * build for etch-backports.
-  * debian/control: drop gtk 2.10 dependency. 
+  * New upstream release.
+    - fix window opening on wrong screen.                       closes: #443690
+  * debian/rules: don't ignore all make errors at clean stage.
 
- -- Yves-Alexis Perez <corsac at corsac.net>  Sun, 21 Oct 2007 13:28:09 +0200
+  [ Simon Huggins ]
+  * Add Vcs-* headers to debian/control
 
+ -- Yves-Alexis Perez <corsac at corsac.net>  Thu, 29 Nov 2007 08:00:36 +0100
+
 libxfcegui4 (4.4.1-1) unstable; urgency=low
 
   * New upstream release. 

Modified: desktop/branches/etch-backports/libxfcegui4/debian/control
===================================================================
--- desktop/branches/etch-backports/libxfcegui4/debian/control	2007-12-18 23:12:39 UTC (rev 1490)
+++ desktop/branches/etch-backports/libxfcegui4/debian/control	2007-12-19 11:42:42 UTC (rev 1491)
@@ -2,15 +2,17 @@
 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 corsac.net>
-Build-Depends: debhelper (>> 4.0.0), libgtk2.0-dev, bison, libxft-dev, libxfce4util-dev (>= 4.4.1), libxt-dev, libxml2-dev, libstartup-notification0-dev, chrpath
+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), libgtk2.0-dev, bison, libxft-dev, libxfce4util-dev (>= 4.4.2), libxt-dev, libxml2-dev, libstartup-notification0-dev, chrpath
 Standards-Version: 3.7.2
 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/
 
 Package: libxfcegui4-dev
 Section: libdevel
 Architecture: any
-Depends: libxfcegui4-4 (= ${binary:Version}), libxfce4util-dev (>= 4.4.1), libxft-dev, libxt-dev, libxpm-dev, libxml2-dev, libstartup-notification0-dev
+Depends: libxfcegui4-4 (= ${binary:Version}), libxfce4util-dev (>= 4.4.2), libxft-dev, libxt-dev, libxpm-dev, libxml2-dev, libstartup-notification0-dev
 Replaces: libxfcegui4-1-dev
 Conflicts: libxfcegui4-1-dev
 Suggests: devhelp

Modified: desktop/branches/etch-backports/libxfcegui4/debian/libxfcegui4-4.shlibs
===================================================================
--- desktop/branches/etch-backports/libxfcegui4/debian/libxfcegui4-4.shlibs	2007-12-18 23:12:39 UTC (rev 1490)
+++ desktop/branches/etch-backports/libxfcegui4/debian/libxfcegui4-4.shlibs	2007-12-19 11:42:42 UTC (rev 1491)
@@ -1 +1 @@
-libxfcegui4 4 libxfcegui4-4 (>= 4.4.1)
+libxfcegui4 4 libxfcegui4-4 (>= 4.4.2)

Modified: desktop/branches/etch-backports/libxfcegui4/debian/rules
===================================================================
--- desktop/branches/etch-backports/libxfcegui4/debian/rules	2007-12-18 23:12:39 UTC (rev 1490)
+++ desktop/branches/etch-backports/libxfcegui4/debian/rules	2007-12-19 11:42:42 UTC (rev 1491)
@@ -29,7 +29,7 @@
 	dh_testroot
 	rm -f build-stamp 
 
-	-$(MAKE) distclean
+	[ ! -f Makefile ] || $(MAKE) distclean
 
 ifneq "$(wildcard /usr/share/misc/config.sub)" ""
 	cp -f /usr/share/misc/config.sub config.sub

Modified: desktop/branches/etch-backports/mousepad/debian/changelog
===================================================================
--- desktop/branches/etch-backports/mousepad/debian/changelog	2007-12-18 23:12:39 UTC (rev 1490)
+++ desktop/branches/etch-backports/mousepad/debian/changelog	2007-12-19 11:42:42 UTC (rev 1491)
@@ -1,14 +1,29 @@
-mousepad (0.2.12-2~bpo40+1) UNRELEASED; urgency=low
+mousepad (0.2.13-1~bpo40+1) UNRELEASED; urgency=low
 
+  * rebuild for etch-backports.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Tue, 18 Dec 2007 22:35:54 +0100
+
+mousepad (0.2.13-1) unstable; urgency=low
+
   [ Yves-Alexis Perez ]
+  * New upstream release.
+
+  [ Simon Huggins ]
+  * Add Vcs-* headers to debian/control
+
+ -- Simon Huggins <huggie at earth.li>  Tue, 27 Nov 2007 16:39:17 +0000
+
+mousepad (0.2.12-2) unstable; urgency=low
+
+  [ Yves-Alexis Perez ]
   * Corrected manpage mousepad(1) shipped with the package.     closes: #355254
-  * debian/menu: switch to new menu policy.
-  * build for etch-backports.
-
+  * debian/menu: switch to new menu policy. 
+  
   [ Emanuele Rocca ]
   * debian/rules: do not ignore make clean errors in the clean target.
 
- -- Yves-Alexis Perez <corsac at corsac.net>  Sun, 21 Oct 2007 20:34:58 +0200
+ -- Yves-Alexis Perez <corsac at corsac.net>  Mon, 10 Sep 2007 21:30:22 +0200
 
 mousepad (0.2.12-1) unstable; urgency=low
 

Modified: desktop/branches/etch-backports/mousepad/debian/control
===================================================================
--- desktop/branches/etch-backports/mousepad/debian/control	2007-12-18 23:12:39 UTC (rev 1490)
+++ desktop/branches/etch-backports/mousepad/debian/control	2007-12-19 11:42:42 UTC (rev 1491)
@@ -2,9 +2,11 @@
 Section: editors
 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 corsac.net>
-Build-Depends: debhelper (>= 4.0.0), docbook-to-man, libxfcegui4-dev (>= 4.4.1), pkg-config, libxml-parser-perl, chrpath
+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
 Standards-Version: 3.7.2
+Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/mousepad/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/mousepad/
 
 Package: mousepad
 Architecture: any

Modified: desktop/branches/etch-backports/orage/debian/changelog
===================================================================
--- desktop/branches/etch-backports/orage/debian/changelog	2007-12-18 23:12:39 UTC (rev 1490)
+++ desktop/branches/etch-backports/orage/debian/changelog	2007-12-19 11:42:42 UTC (rev 1491)
@@ -1,15 +1,26 @@
-orage (4.4.1-2) UNRELEASED; urgency=low
+orage (4.4.2-1~bpo40+1) UNRELEASED; urgency=low
 
+  * rebuild for etch-backports.
+  * debian/copyright converted to utf8.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Wed, 19 Dec 2007 11:40:10 +0100
+
+orage (4.4.2-1) unstable; urgency=low
+
   [ Simon Huggins ]
   * debian/control: Move fake Homepage field to a real one now dpkg
     supports it.
 
   [ Yves-Alexis Perez ]
-  * build for etch-backports.
-  * debian/control: drop gtk 2.10 build-dep.
+  * debian/control: suggest sox if people want to use the 'play' command when
+    an alarm ring.                                              closes: #448053
+  * New upstream release.
 
- -- Yves-Alexis Perez <corsac at corsac.net>  Sun, 21 Oct 2007 19:57:14 +0200
+  [ Simon Huggins ]
+  * Add Vcs-* headers to debian/control
 
+ -- Simon Huggins <huggie at earth.li>  Tue, 27 Nov 2007 16:39:17 +0000
+
 orage (4.4.1-1) unstable; urgency=low
 
   * New upstream release.

Modified: desktop/branches/etch-backports/orage/debian/control
===================================================================
--- desktop/branches/etch-backports/orage/debian/control	2007-12-18 23:12:39 UTC (rev 1490)
+++ desktop/branches/etch-backports/orage/debian/control	2007-12-19 11:42:42 UTC (rev 1491)
@@ -2,14 +2,17 @@
 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 corsac.net>
-Build-Depends: debhelper (>= 4.1.0), xfce4-mcs-manager-dev (>= 4.4.1), cdbs, libxml-parser-perl, libgtk2.0-dev, xfce4-panel-dev (>= 4.4.1), chrpath
+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.0), xfce4-mcs-manager-dev (>= 4.4.2), cdbs, libxml-parser-perl, libgtk2.0-dev, xfce4-panel-dev (>= 4.4.2), chrpath
 Standards-Version: 3.7.2
 Homepage: http://www.xfce.org/
+Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/orage/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/orage/
 
 Package: orage
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Suggests: sox
 Conflicts: xfcalendar
 Replaces: xfcalendar
 Description: Calendar for Xfce Desktop Environment

Modified: desktop/branches/etch-backports/orage/debian/copyright
===================================================================
--- desktop/branches/etch-backports/orage/debian/copyright	2007-12-18 23:12:39 UTC (rev 1490)
+++ desktop/branches/etch-backports/orage/debian/copyright	2007-12-19 11:42:42 UTC (rev 1491)
@@ -10,7 +10,7 @@
 Edscott Wilson Garcia <edscott at xfce.org>
 
 Copyright Holders: 
-(c) 2003-2006 Mickaël Graf <korbinus at xfce.org>
+(c) 2003-2006 Mickaël Graf <korbinus at xfce.org>
 (c) 2003 Benedikt Meurer <benny at xfce.org>
 (c) 2005 Juha Kautto <juha at xfce.org>
 

Modified: desktop/branches/etch-backports/thunar/debian/changelog
===================================================================
--- desktop/branches/etch-backports/thunar/debian/changelog	2007-12-18 23:12:39 UTC (rev 1490)
+++ desktop/branches/etch-backports/thunar/debian/changelog	2007-12-19 11:42:42 UTC (rev 1491)
@@ -1,11 +1,43 @@
-thunar (0.8.0-7~bpo40+1) UNRELEASED; urgency=low
+thunar (0.9.0-2~bpo40+1) UNRELEASED; urgency=low
 
+  * rebuild for etch-backports.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Wed, 19 Dec 2007 11:40:37 +0100
+
+thunar (0.9.0-2) unstable; urgency=low
+
+  * debian/control:
+    - explicitely enable options for ./configure.
+    - update standard versions.
+  * debian/patches:
+    - 03_use-eject-where-necessary added, taken from upstream. closes:  #455866
+  * debian/copyright: remove complete GFDL text and add a link to
+    common-licenses.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Wed, 12 Dec 2007 23:55:13 +0100
+
+thunar (0.9.0-1) unstable; urgency=low
+
+  [ Yves-Alexis Perez ]
+  * new upstream release.
+    - ogg files now correctly detected as audio files.          closes: #446369
+    - date format is now configurable.                          closes: #392079
   * debian/thunar.menu: switch to new menu policy.
-  * build for etch-backports. 
-  * debian/control: drop gtk 2.10 build dep.
+  * debian/control:
+    - bump build-dep to Xfce 4.4.2.
+    - add build-dep on libjpeg62-dev to build thumbnails correctly even for
+      larges images.                                            closes: #444070
+  * debian/patches:
+    - added 02_thunar-vfs-volume-hal_missing-audio-cds-for-volman.
+  * debian/copyright: updated download url.
 
- -- Yves-Alexis Perez <corsac at corsac.net>  Sun, 21 Oct 2007 19:49:40 +0200
+  [ Simon Huggins ]
+  * Add Vcs-* headers to debian/control
+  * Make libthunar-vfs-1-2 and -dev depend on thunar-data so their doc
+    symlinks work.
 
+ -- Yves-Alexis Perez <corsac at corsac.net>  Tue, 04 Dec 2007 13:05:14 +0100
+
 thunar (0.8.0-6) unstable; urgency=low
 
   (Yves-Alexis Perez)

Modified: desktop/branches/etch-backports/thunar/debian/control
===================================================================
--- desktop/branches/etch-backports/thunar/debian/control	2007-12-18 23:12:39 UTC (rev 1490)
+++ desktop/branches/etch-backports/thunar/debian/control	2007-12-19 11:42:42 UTC (rev 1491)
@@ -2,15 +2,17 @@
 Section: x11
 Priority: optional
 Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
-Uploaders: Yves-Alexis Perez <corsac at corsac.net>, 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>
-Build-Depends: debhelper (>= 4.1.0), autotools-dev, libcairo2-dev, libexo-0.3-dev (>= 0.3.2), cdbs, libxml-parser-perl, libfam-dev, libhal-storage-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], libdbus-glib-1-dev, libexif-dev, libgtk2.0-dev, xfce4-panel-dev (>= 4.4.1), chrpath, libpcre3-dev
+Uploaders: Yves-Alexis Perez <corsac at debian.org>, 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>
+Build-Depends: debhelper (>= 4.1.0), autotools-dev, libcairo2-dev, libexo-0.3-dev (>= 0.3.2), cdbs, libxml-parser-perl, libfam-dev, libhal-storage-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], libdbus-glib-1-dev, libexif-dev, libgtk2.0-dev, xfce4-panel-dev (>= 4.4.2), chrpath, libpcre3-dev
 Build-Conflicts: libgamin-dev
-Standards-Version: 3.7.2
+Standards-Version: 3.7.3
+Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/thunar/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/thunar/
 
 Package: libthunar-vfs-1-dev
 Section: libdevel
 Architecture: any
-Depends: libthunar-vfs-1-2 (= ${binary:Version}), libexo-0.3-dev (>= 0.3.2)
+Depends: libthunar-vfs-1-2 (= ${binary:Version}), libexo-0.3-dev (>= 0.3.4), thunar-data (= ${source:Version})
 Description: Development files for libthunar-vfs
  This package contains the headers and the static library for libthunar-vfs, 
  the virtual file system abstraction used by thunar
@@ -18,7 +20,7 @@
 Package: libthunar-vfs-1-2
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, thunar-data (= ${source:Version})
 Conflicts: thunar (<=  0.2.0alpha-r19548-3)
 Replaces: libthunar-vfs-1
 Description: VFS abstraction used in thunar

Modified: desktop/branches/etch-backports/thunar/debian/libthunar-vfs-1-2.shlibs
===================================================================
--- desktop/branches/etch-backports/thunar/debian/libthunar-vfs-1-2.shlibs	2007-12-18 23:12:39 UTC (rev 1490)
+++ desktop/branches/etch-backports/thunar/debian/libthunar-vfs-1-2.shlibs	2007-12-19 11:42:42 UTC (rev 1491)
@@ -1,2 +1,2 @@
-libthunar-vfs-1 2 libthunar-vfs-1-2 (>= 0.8.0-1)
-libthunarx-1 2 libthunar-vfs-1-2 (>= 0.8.0-1)
+libthunar-vfs-1 2 libthunar-vfs-1-2 (>= 0.9.0)
+libthunarx-1 2 libthunar-vfs-1-2 (>= 0.9.0)

Copied: desktop/branches/etch-backports/thunar/debian/patches/02_thunar-vfs-volume-hal_missing-audio-cds-for-volman.patch (from rev 1489, desktop/trunk/thunar/debian/patches/02_thunar-vfs-volume-hal_missing-audio-cds-for-volman.patch)
===================================================================
--- desktop/branches/etch-backports/thunar/debian/patches/02_thunar-vfs-volume-hal_missing-audio-cds-for-volman.patch	                        (rev 0)
+++ desktop/branches/etch-backports/thunar/debian/patches/02_thunar-vfs-volume-hal_missing-audio-cds-for-volman.patch	2007-12-19 11:42:42 UTC (rev 1491)
@@ -0,0 +1,83 @@
+Index: thunar-vfs/thunar-vfs-volume-hal.c
+===================================================================
+--- thunar-vfs/thunar-vfs-volume-hal.c	(revision 26428)
++++ thunar-vfs/thunar-vfs-volume-hal.c	(working copy)
+@@ -1007,9 +1007,7 @@
+   hv = libhal_volume_from_udi (context, udi);
+ 
+   /* HAL might want us to ignore this volume for some reason */
+-  if (G_UNLIKELY (hv != NULL
+-        && (libhal_volume_should_ignore (hv)
+-          || libhal_volume_get_fsusage (hv) != LIBHAL_VOLUME_USAGE_MOUNTABLE_FILESYSTEM)))
++  if (G_UNLIKELY (hv != NULL && libhal_volume_should_ignore (hv)))
+     {
+       libhal_volume_free (hv);
+       return;
+@@ -1020,38 +1018,42 @@
+ 
+   if (G_LIKELY (hv != NULL))
+     {
+-      /* determine the UDI of the drive to which this volume belongs */
+-      drive_udi = libhal_volume_get_storage_device_udi (hv);
+-      if (G_LIKELY (drive_udi != NULL))
++      /* check if we have a mountable file system here */
++      if (libhal_volume_get_fsusage (hv) == LIBHAL_VOLUME_USAGE_MOUNTABLE_FILESYSTEM)
+         {
+-          /* determine the drive for the volume */
+-          hd = libhal_drive_from_udi (context, drive_udi);
+-          if (G_LIKELY (hd != NULL))
++          /* determine the UDI of the drive to which this volume belongs */
++          drive_udi = libhal_volume_get_storage_device_udi (hv);
++          if (G_LIKELY (drive_udi != NULL))
+             {
+-              /* check if we already have a volume object for the UDI */
+-              volume_hal = thunar_vfs_volume_manager_hal_get_volume_by_udi (manager_hal, udi);
+-              if (G_LIKELY (volume_hal == NULL))
++              /* determine the drive for the volume */
++              hd = libhal_drive_from_udi (context, drive_udi);
++              if (G_LIKELY (hd != NULL))
+                 {
+-                  /* otherwise, we allocate a new volume object */
+-                  volume_hal = g_object_new (THUNAR_VFS_TYPE_VOLUME_HAL, NULL);
+-                  volume_hal->udi = g_strdup (udi);
+-                }
++                  /* check if we already have a volume object for the UDI */
++                  volume_hal = thunar_vfs_volume_manager_hal_get_volume_by_udi (manager_hal, udi);
++                  if (G_LIKELY (volume_hal == NULL))
++                    {
++                      /* otherwise, we allocate a new volume object */
++                      volume_hal = g_object_new (THUNAR_VFS_TYPE_VOLUME_HAL, NULL);
++                      volume_hal->udi = g_strdup (udi);
++                    }
+ 
+-              /* update the volume object with the new data from the HAL volume/drive */
+-              thunar_vfs_volume_hal_update (volume_hal, context, hv, hd);
++                  /* update the volume object with the new data from the HAL volume/drive */
++                  thunar_vfs_volume_hal_update (volume_hal, context, hv, hd);
+ 
+-              /* add the volume object to our list if we allocated a new one */
+-              if (g_list_find (THUNAR_VFS_VOLUME_MANAGER (manager_hal)->volumes, volume_hal) == NULL)
+-                {
+-                  /* add the volume to the volume manager */
+-                  thunar_vfs_volume_manager_add (THUNAR_VFS_VOLUME_MANAGER (manager_hal), THUNAR_VFS_VOLUME (volume_hal));
++                  /* add the volume object to our list if we allocated a new one */
++                  if (g_list_find (THUNAR_VFS_VOLUME_MANAGER (manager_hal)->volumes, volume_hal) == NULL)
++                    {
++                      /* add the volume to the volume manager */
++                      thunar_vfs_volume_manager_add (THUNAR_VFS_VOLUME_MANAGER (manager_hal), THUNAR_VFS_VOLUME (volume_hal));
+ 
+-                  /* release the reference on the volume */
+-                  g_object_unref (G_OBJECT (volume_hal));
++                      /* release the reference on the volume */
++                      g_object_unref (G_OBJECT (volume_hal));
++                    }
++
++                  /* release the HAL drive */
++                  libhal_drive_free (hd);
+                 }
+-
+-              /* release the HAL drive */
+-              libhal_drive_free (hd);
+             }
+         }
+ 

Copied: desktop/branches/etch-backports/thunar/debian/patches/03_use-eject-where-necessary.patch (from rev 1489, desktop/trunk/thunar/debian/patches/03_use-eject-where-necessary.patch)
===================================================================
--- desktop/branches/etch-backports/thunar/debian/patches/03_use-eject-where-necessary.patch	                        (rev 0)
+++ desktop/branches/etch-backports/thunar/debian/patches/03_use-eject-where-necessary.patch	2007-12-19 11:42:42 UTC (rev 1491)
@@ -0,0 +1,44 @@
+Thunar 0.9.0 displays the "Eject" menu item only for disc volumes. Apply
+this patch to fix that issue and have Thunar display "Eject" also for
+iPods and other volumes that require eject.
+
+Index: thunar/thunar-shortcuts-view.c
+===================================================================
+--- thunar/thunar-shortcuts-view.c	(revision 26456)
++++ thunar/thunar-shortcuts-view.c	(revision 26459)
+@@ -834,13 +834,12 @@
+       gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+       gtk_widget_show (item);
+ 
+-      /* check if the volume is a disc */
+-      if (thunar_vfs_volume_is_disc (volume))
++      /* check if the volume is ejectable */
++      if (thunar_vfs_volume_is_ejectable (volume))
+         {
+           /* append the "Eject Volume" menu action */
+           item = gtk_image_menu_item_new_with_mnemonic (_("E_ject Volume"));
+           g_signal_connect_swapped (G_OBJECT (item), "activate", G_CALLBACK (thunar_shortcuts_view_eject), view);
+-          gtk_widget_set_sensitive (item, thunar_vfs_volume_is_ejectable (volume));
+           gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+           gtk_widget_show (item);
+         }
+Index: thunar/thunar-tree-view.c
+===================================================================
+--- thunar/thunar-tree-view.c	(revision 26456)
++++ thunar/thunar-tree-view.c	(revision 26459)
+@@ -1041,13 +1041,12 @@
+       gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+       gtk_widget_show (item);
+ 
+-      /* check if the volume is a disc */
+-      if (thunar_vfs_volume_is_disc (volume))
++      /* check if the volume is ejectable */
++      if (thunar_vfs_volume_is_ejectable (volume))
+         {
+           /* append the "Eject Volume" menu action */
+           item = gtk_image_menu_item_new_with_mnemonic (_("E_ject Volume"));
+           g_signal_connect_swapped (G_OBJECT (item), "activate", G_CALLBACK (thunar_tree_view_action_eject), view);
+-          gtk_widget_set_sensitive (item, thunar_vfs_volume_is_ejectable (volume));
+           gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+           gtk_widget_show (item);
+         }

Modified: desktop/branches/etch-backports/thunar/debian/rules
===================================================================
--- desktop/branches/etch-backports/thunar/debian/rules	2007-12-18 23:12:39 UTC (rev 1490)
+++ desktop/branches/etch-backports/thunar/debian/rules	2007-12-19 11:42:42 UTC (rev 1491)
@@ -3,7 +3,7 @@
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/class/autotools.mk
 
-DEB_CONFIGURE_EXTRA_FLAGS := --enable-final --disable-gnome-thumbnailers
+DEB_CONFIGURE_EXTRA_FLAGS := --enable-final --disable-gnome-thumbnailers --enable-dbus --enable-startup-notification --enable-apr-plugin --enable-exif --enable-pcre --enable-sbr-plugin --enable-tpa-plugin --enable-uca-plugin
 
 makebuilddir/thunar:: debian/compat
 	# Some systems don't have POSIX_MADV* but have MADV* defined with

Modified: desktop/branches/etch-backports/thunar/debian/thunar.menu
===================================================================
--- desktop/branches/etch-backports/thunar/debian/thunar.menu	2007-12-18 23:12:39 UTC (rev 1490)
+++ desktop/branches/etch-backports/thunar/debian/thunar.menu	2007-12-19 11:42:42 UTC (rev 1491)
@@ -1,2 +1,2 @@
-?package(thunar):needs="X11" section="Applications/File Manager"\
+?package(thunar):needs="X11" section="Applications/File Management"\
   title="Thunar" longtitle="Xfce4 File Manager" hints="File manager" command="/usr/bin/thunar"

Modified: desktop/branches/etch-backports/xfce-mcs-manager/debian/changelog
===================================================================
--- desktop/branches/etch-backports/xfce-mcs-manager/debian/changelog	2007-12-18 23:12:39 UTC (rev 1490)
+++ desktop/branches/etch-backports/xfce-mcs-manager/debian/changelog	2007-12-19 11:42:42 UTC (rev 1491)
@@ -1,17 +1,28 @@
-xfce-mcs-manager (4.4.1-2~bpo40+1) UNRELEASED; urgency=low
+xfce-mcs-manager (4.4.2-1~bpo40+1) UNRELEASED; urgency=low
 
+  * rebuild for etch-backports.
+  * debian/rules: don't patch.
+  * debian/control: remove build-dep on dpatch.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Wed, 19 Dec 2007 08:37:03 +0100
+
+xfce-mcs-manager (4.4.2-1) unstable; urgency=low
+
   [ Yves-Alexis Perez ]
+  * New upstream release.
   * debian/xfce-mcs-manager.1, debian/xfce-setting-show.1:
     Update bug reporting address in manpage.
   * debian/xfce4-mcs-manager.menu: update to new menu policy.
-  * build for etch-backports.
-  * debian/control: drop gtk 2.10 build-dep.
+  * debian/rules: 
+    - don't ignore all make errors at clean stage.
+    - fix parallel builds.
 
   [ Simon Huggins ]
   * debian/control: Move fake Homepage field to a real one now dpkg
     supports it.
+  * Add Vcs-* headers to debian/control
 
- -- Yves-Alexis Perez <corsac at corsac.net>  Sun, 21 Oct 2007 13:35:36 +0200
+ -- Yves-Alexis Perez <corsac at corsac.net>  Sun, 02 Dec 2007 11:29:15 +0100
 
 xfce-mcs-manager (4.4.1-1) unstable; urgency=low
 

Modified: desktop/branches/etch-backports/xfce-mcs-manager/debian/control
===================================================================
--- desktop/branches/etch-backports/xfce-mcs-manager/debian/control	2007-12-18 23:12:39 UTC (rev 1490)
+++ desktop/branches/etch-backports/xfce-mcs-manager/debian/control	2007-12-19 11:42:42 UTC (rev 1491)
@@ -2,10 +2,12 @@
 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 corsac.net>
-Build-Depends: debhelper (>= 4.1.25), libgtk2.0-dev, libxfce4mcs-dev (>= 4.4.1), libxfcegui4-dev (>= 4.4.1), libxft-dev, dpatch, chrpath
+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.25), libgtk2.0-dev, libxfce4mcs-dev (>= 4.4.2), libxfcegui4-dev (>= 4.4.2), libxft-dev, chrpath
 Standards-Version: 3.7.2
 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/
 
 Package: xfce4-mcs-manager
 Architecture: any
@@ -21,7 +23,7 @@
 Package: xfce4-mcs-manager-dev
 Architecture: any
 Section: devel
-Depends: libxfce4mcs-dev (>= 4.4.1), libxfcegui4-dev (>= 4.4.1)
+Depends: libxfce4mcs-dev (>= 4.4.2), libxfcegui4-dev (>= 4.4.2)
 Description: Development files and static plugins
  This package contains the header-files and the static versions
  of the plugins for xfce-mcs-manager which is a configuration 

Modified: desktop/branches/etch-backports/xfce-mcs-manager/debian/rules
===================================================================
--- desktop/branches/etch-backports/xfce-mcs-manager/debian/rules	2007-12-18 23:12:39 UTC (rev 1490)
+++ desktop/branches/etch-backports/xfce-mcs-manager/debian/rules	2007-12-19 11:42:42 UTC (rev 1491)
@@ -1,5 +1,4 @@
 #!/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)
@@ -12,25 +11,25 @@
 	CFLAGS += -O2
 endif
 
-config.status: patch configure
+config.status: configure
 	
 	dh_testdir
 	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --disable-rpath --enable-final
 	touch config.status
 	
-build: config.status build-stamp
-build-stamp:
+build: build-stamp
+build-stamp: config.status
 
 	dh_testdir
 	$(MAKE)
 	touch build-stamp
 	
-clean: unpatch
+clean:
 
 	dh_testdir
 	dh_testroot
 
-	-$(MAKE) distclean
+	[ ! -f Makefile ] || $(MAKE) distclean
 
 	rm -rf build-stamp config.status debian/tmp-install
 

Modified: desktop/branches/etch-backports/xfce-mcs-manager/debian/xfce4-mcs-manager.menu
===================================================================
--- desktop/branches/etch-backports/xfce-mcs-manager/debian/xfce4-mcs-manager.menu	2007-12-18 23:12:39 UTC (rev 1490)
+++ desktop/branches/etch-backports/xfce-mcs-manager/debian/xfce4-mcs-manager.menu	2007-12-19 11:42:42 UTC (rev 1491)
@@ -1,5 +1,5 @@
 ?package(xfce4-mcs-manager): needs="X11"\
- section="System/Administration"\
+ section="Applications/System/Administration"\
  command="xfce-setting-show"\
  title="Xfce-setting-show"\
  longtitle="Configure The Xfce Desktop"\

Modified: desktop/branches/etch-backports/xfce-mcs-plugins/debian/changelog
===================================================================
--- desktop/branches/etch-backports/xfce-mcs-plugins/debian/changelog	2007-12-18 23:12:39 UTC (rev 1490)
+++ desktop/branches/etch-backports/xfce-mcs-plugins/debian/changelog	2007-12-19 11:42:42 UTC (rev 1491)
@@ -1,15 +1,25 @@
-xfce-mcs-plugins (4.4.1-2~bpo40+1) UNRELEASED; urgency=low
+xfce-mcs-plugins (4.4.2-1~bpo40+1) UNRELEASED; urgency=low
 
+  * rebuild for etch-backports.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Tue, 18 Dec 2007 22:49:36 +0100
+
+xfce-mcs-plugins (4.4.2-1) unstable; urgency=low
+
   [ Simon Huggins ]
   * Use kill -s to keep Hurd and lintian happy at the same time.
   * debian/control: Move fake Homepage field to a real one now dpkg
     supports it.
 
   [ Yves-Alexis Perez ]
-  * build for etch-backports.
+  * New upstream release.
+  * debian/rules: don't ignore all make errors at clean stage.
 
- -- Yves-Alexis Perez <corsac at corsac.net>  Sun, 21 Oct 2007 13:38:29 +0200
+  [ Simon Huggins ]
+  * Add Vcs-* headers to debian/control
 
+ -- Simon Huggins <huggie at earth.li>  Tue, 27 Nov 2007 16:39:20 +0000
+
 xfce-mcs-plugins (4.4.1-1) unstable; urgency=low
 
   * New upstream release.

Modified: desktop/branches/etch-backports/xfce-mcs-plugins/debian/control
===================================================================
--- desktop/branches/etch-backports/xfce-mcs-plugins/debian/control	2007-12-18 23:12:39 UTC (rev 1490)
+++ desktop/branches/etch-backports/xfce-mcs-plugins/debian/control	2007-12-19 11:42:42 UTC (rev 1491)
@@ -2,14 +2,16 @@
 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 corsac.net>
-Build-Depends: debhelper (>= 4.1.26), libgtk2.0-dev, xfce4-mcs-manager-dev (>= 4.4.1), libxft-dev, libxrandr-dev, libxrender-dev, libxxf86vm-dev, chrpath
+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, xfce4-mcs-manager-dev (>= 4.4.2), libxft-dev, libxrandr-dev, libxrender-dev, libxxf86vm-dev, chrpath
 Standards-Version: 3.7.2
 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/
 
 Package: xfce4-mcs-plugins
 Architecture: any
-Depends: ${shlibs:Depends}, xfce4-mcs-manager (>= 4.4.1)
+Depends: ${shlibs:Depends}, xfce4-mcs-manager (>= 4.4.2)
 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 

Modified: desktop/branches/etch-backports/xfce-mcs-plugins/debian/rules
===================================================================
--- desktop/branches/etch-backports/xfce-mcs-plugins/debian/rules	2007-12-18 23:12:39 UTC (rev 1490)
+++ desktop/branches/etch-backports/xfce-mcs-plugins/debian/rules	2007-12-19 11:42:42 UTC (rev 1491)
@@ -29,7 +29,7 @@
 	dh_testroot
 	rm -f build-stamp 
 
-	-$(MAKE) distclean
+	[ ! -f Makefile ] || $(MAKE) distclean
 
 ifneq "$(wildcard /usr/share/misc/config.sub)" ""
 	cp -f /usr/share/misc/config.sub config.sub

Modified: desktop/branches/etch-backports/xfce4/debian/changelog
===================================================================
--- desktop/branches/etch-backports/xfce4/debian/changelog	2007-12-18 23:12:39 UTC (rev 1490)
+++ desktop/branches/etch-backports/xfce4/debian/changelog	2007-12-19 11:42:42 UTC (rev 1491)
@@ -1,17 +1,27 @@
-xfce4 (4.4.1.1~bpo40+1) UNRELEASED; urgency=low
+xfce4 (4.4.2~bpo40+1) UNRELEASED; urgency=low
 
+  * rebuild for etch-backports.
+  * debian/rules: don't execute arch-dep part.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Wed, 19 Dec 2007 08:03:09 +0100
+
+xfce4 (4.4.2) unstable; urgency=low
+
   [ Yves-Alexis Perez ]
+  * New upstream release.                                       closes: #454294
+    - There's now a UI setting to set DPI.                      closes: #284229
   * Use xorg instead of x-window-system-core, deprecated.
   * Recommends xorg instead of suggesting it so users installing with aptitude
     will get it automagically.
   * Remove xfmedia from Recommends.
-  * build for etch-backports.
+  * xfwm4 already Recommends xfwm4-themes so no need to depend on it.
 
   [ Simon Huggins ]
   * debian/control: Move fake Homepage field to a real one now dpkg
     supports it.
+  * Add Vcs-* headers to debian/control
 
- -- Yves-Alexis Perez <corsac at corsac.net>  Sun, 21 Oct 2007 20:47:57 +0200
+ -- Yves-Alexis Perez <corsac at corsac.net>  Tue, 04 Dec 2007 17:12:13 +0100
 
 xfce4 (4.4.1) unstable; urgency=low
 

Modified: desktop/branches/etch-backports/xfce4/debian/control
===================================================================
--- desktop/branches/etch-backports/xfce4/debian/control	2007-12-18 23:12:39 UTC (rev 1490)
+++ desktop/branches/etch-backports/xfce4/debian/control	2007-12-19 11:42:42 UTC (rev 1491)
@@ -2,14 +2,16 @@
 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 corsac.net>
+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.7.2
 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/
 
 Package: xfce4
 Architecture: all
-Depends: xfwm4 (>= 4.4.1), xfwm4-themes (>= 4.4.1), xfce4-mcs-plugins (>= 4.4.1), xfce4-panel (>= 4.4.1), xfce4-icon-theme (>= 4.4.1), xfdesktop4 (>= 4.4.1), thunar (>= 0.8.0), xfce4-utils (>= 4.4.1), gtk2-engines-xfce (>= 2.4.1), xfce4-session (>= 4.4.1)
+Depends: xfwm4 (>= 4.4.2), xfce4-mcs-plugins (>= 4.4.2), xfce4-panel (>= 4.4.2), xfce4-icon-theme (>= 4.4.2), xfdesktop4 (>= 4.4.2), thunar (>= 0.8.0), xfce4-utils (>= 4.4.2), gtk2-engines-xfce (>= 2.4.2), xfce4-session (>= 4.4.2)
 Recommends: xorg, xfce4-mixer, xfprint4, orage, xfce4-terminal, desktop-base
 Replaces: xfce4-themes (<= 4.0.0+cvs.20030301-1), xfce4-dev (<< 4.0.0+cvs.20030421)
 Description: Meta-package for the Xfce Lightweight Desktop Environment

Modified: desktop/branches/etch-backports/xfce4/debian/rules
===================================================================
--- desktop/branches/etch-backports/xfce4/debian/rules	2007-12-18 23:12:39 UTC (rev 1490)
+++ desktop/branches/etch-backports/xfce4/debian/rules	2007-12-19 11:42:42 UTC (rev 1491)
@@ -24,7 +24,5 @@
 	dh_md5sums -i
 	dh_builddeb -i
 
-binary-arch: build
-	
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install 

Modified: desktop/branches/etch-backports/xfce4-appfinder/debian/changelog
===================================================================
--- desktop/branches/etch-backports/xfce4-appfinder/debian/changelog	2007-12-18 23:12:39 UTC (rev 1490)
+++ desktop/branches/etch-backports/xfce4-appfinder/debian/changelog	2007-12-19 11:42:42 UTC (rev 1491)
@@ -1,14 +1,22 @@
-xfce4-appfinder (4.4.1-2~bpo40+1) UNRELEASED; urgency=low
+xfce4-appfinder (4.4.2-1~bpo40+1) UNRELEASED; urgency=low
 
+  * rebuild for etch-backports.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Tue, 18 Dec 2007 22:39:43 +0100
+
+xfce4-appfinder (4.4.2-1) unstable; urgency=low
+
   [ Yves-Alexis Perez ]
+  * New upstream release.
   * debian/menu: switch to new menu policy.
-  * build for etch-backports.
+  * debian/rules: don't ignore all make errors at clean stage.
 
   [ Simon Huggins ]
   * debian/control: Move fake Homepage field to a real one now dpkg
     supports it.
+  * Add Vcs-* headers to debian/control
 
- -- Yves-Alexis Perez <corsac at corsac.net>  Sun, 21 Oct 2007 13:52:23 +0200
+ -- Simon Huggins <huggie at earth.li>  Tue, 27 Nov 2007 16:39:17 +0000
 
 xfce4-appfinder (4.4.1-1) unstable; urgency=low
 

Modified: desktop/branches/etch-backports/xfce4-appfinder/debian/control
===================================================================
--- desktop/branches/etch-backports/xfce4-appfinder/debian/control	2007-12-18 23:12:39 UTC (rev 1490)
+++ desktop/branches/etch-backports/xfce4-appfinder/debian/control	2007-12-19 11:42:42 UTC (rev 1491)
@@ -2,10 +2,12 @@
 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 corsac.net>
-Build-Depends: debhelper (>= 4.0.0), libxfcegui4-dev (>= 4.4.1), libxfce4mcs-dev (>= 4.4.1), libxft-dev, libxml-parser-perl
+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.2
 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/
 
 Package: xfce4-appfinder
 Architecture: any

Modified: desktop/branches/etch-backports/xfce4-appfinder/debian/rules
===================================================================
--- desktop/branches/etch-backports/xfce4-appfinder/debian/rules	2007-12-18 23:12:39 UTC (rev 1490)
+++ desktop/branches/etch-backports/xfce4-appfinder/debian/rules	2007-12-19 11:42:42 UTC (rev 1491)
@@ -33,7 +33,7 @@
 	rm -f build-stamp 
 
 	# Add here commands to clean up after the build process.
-	-$(MAKE) distclean
+	[ ! -f Makefile ] || $(MAKE) distclean
 ifneq "$(wildcard /usr/share/misc/config.sub)" ""
 	cp -f /usr/share/misc/config.sub config.sub
 endif

Modified: desktop/branches/etch-backports/xfce4-dev-tools/debian/changelog
===================================================================
--- desktop/branches/etch-backports/xfce4-dev-tools/debian/changelog	2007-12-18 23:12:39 UTC (rev 1490)
+++ desktop/branches/etch-backports/xfce4-dev-tools/debian/changelog	2007-12-19 11:42:42 UTC (rev 1491)
@@ -1,9 +1,19 @@
-xfce4-dev-tools (4.4.0-1~bpo40+1) UNRELEASED; urgency=low
+xfce4-dev-tools (4.4.0.1-1~bpo40+1) UNRELEASED; urgency=low
 
-  * build for etch-backports.
+  * rebuild for etch-backports.
 
- -- Yves-Alexis Perez <corsac at corsac.net>  Sun, 21 Oct 2007 20:45:48 +0200
+ -- Yves-Alexis Perez <corsac at debian.org>  Wed, 19 Dec 2007 11:32:27 +0100
 
+xfce4-dev-tools (4.4.0.1-1) unstable; urgency=low
+
+  [ Yves-Alexis Perez ]
+  * New upstream release.
+
+  [ Simon Huggins ]
+  * Add Vcs-* headers to debian/control
+
+ -- Simon Huggins <huggie at earth.li>  Tue, 27 Nov 2007 16:39:18 +0000
+
 xfce4-dev-tools (4.4.0-1) unstable; urgency=low
 
   * New upstream release.

Modified: desktop/branches/etch-backports/xfce4-dev-tools/debian/control
===================================================================
--- desktop/branches/etch-backports/xfce4-dev-tools/debian/control	2007-12-18 23:12:39 UTC (rev 1490)
+++ desktop/branches/etch-backports/xfce4-dev-tools/debian/control	2007-12-19 11:42:42 UTC (rev 1491)
@@ -2,9 +2,11 @@
 Section: devel
 Priority: optional
 Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
-Uploaders: Yves-Alexis Perez <corsac at corsac.net>, 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>
+Uploaders: Yves-Alexis Perez <corsac at debian.org>, 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>
 Build-Depends: debhelper (>= 4.1.0), autotools-dev, cdbs
 Standards-Version: 3.7.2
+Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfce4-dev-tools/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/xfce4-dev-tools/
 
 Package: xfce4-dev-tools
 Architecture: any

Modified: desktop/branches/etch-backports/xfce4-icon-theme/debian/changelog
===================================================================
--- desktop/branches/etch-backports/xfce4-icon-theme/debian/changelog	2007-12-18 23:12:39 UTC (rev 1490)
+++ desktop/branches/etch-backports/xfce4-icon-theme/debian/changelog	2007-12-19 11:42:42 UTC (rev 1491)
@@ -1,14 +1,25 @@
-xfce4-icon-theme (4.4.1-2~bpo40+1) UNRELEASED; urgency=low
+xfce4-icon-theme (4.4.2-1~bpo40+1) UNRELEASED; urgency=low
 
+  * rebuild for etch-backports.
+  * debian/rules: don't execute arch-dep part.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Wed, 19 Dec 2007 08:05:02 +0100
+
+xfce4-icon-theme (4.4.2-1) unstable; urgency=low
+
   [ Simon Huggins ]
   * debian/control: Move fake Homepage field to a real one now dpkg
     supports it.
 
   [ Yves-Alexis Perez ]
-  * build for etch-backports.
+  * New upstream release.
+  * debian/rules: don't ignore all make errors at clean stage.
 
- -- Yves-Alexis Perez <corsac at corsac.net>  Sun, 21 Oct 2007 13:20:59 +0200
+  [ Simon Huggins ]
+  * Add Vcs-* headers to debian/control
 
+ -- Simon Huggins <huggie at earth.li>  Tue, 27 Nov 2007 16:39:18 +0000
+
 xfce4-icon-theme (4.4.1-1) unstable; urgency=low
 
   * New upstream release. 

Modified: desktop/branches/etch-backports/xfce4-icon-theme/debian/control
===================================================================
--- desktop/branches/etch-backports/xfce4-icon-theme/debian/control	2007-12-18 23:12:39 UTC (rev 1490)
+++ desktop/branches/etch-backports/xfce4-icon-theme/debian/control	2007-12-19 11:42:42 UTC (rev 1491)
@@ -2,10 +2,12 @@
 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 corsac.net>
+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.7.2
 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/
 
 Package: xfce4-icon-theme
 Architecture: all

Modified: desktop/branches/etch-backports/xfce4-icon-theme/debian/rules
===================================================================
--- desktop/branches/etch-backports/xfce4-icon-theme/debian/rules	2007-12-18 23:12:39 UTC (rev 1490)
+++ desktop/branches/etch-backports/xfce4-icon-theme/debian/rules	2007-12-19 11:42:42 UTC (rev 1491)
@@ -33,7 +33,7 @@
 	rm -f build-stamp 
 
 	# Add here commands to clean up after the build process.
-	-$(MAKE) distclean
+	[ ! -f Makefile ] || $(MAKE) distclean
 ifneq "$(wildcard /usr/share/misc/config.sub)" ""
 	cp -f /usr/share/misc/config.sub config.sub
 endif
@@ -71,10 +71,6 @@
 
 # Build architecture-independent files here.
 binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
 	dh_testdir
 	dh_testroot
 	dh_installchangelogs ChangeLog

Modified: desktop/branches/etch-backports/xfce4-mixer/debian/NEWS.Debian
===================================================================
--- desktop/branches/etch-backports/xfce4-mixer/debian/NEWS.Debian	2007-12-18 23:12:39 UTC (rev 1490)
+++ desktop/branches/etch-backports/xfce4-mixer/debian/NEWS.Debian	2007-12-19 11:42:42 UTC (rev 1491)
@@ -8,4 +8,4 @@
     The default is to go with -alsa. If you use oss, install xfce4-mixer-oss 
     instead.
 
-  -- Emanuele Rocca <ema at debian.org>  Tue, 03 Jan 2006 14:39:00 +0100
+ -- Emanuele Rocca <ema at debian.org>  Tue, 03 Jan 2006 14:39:00 +0100

Modified: desktop/branches/etch-backports/xfce4-mixer/debian/changelog
===================================================================
--- desktop/branches/etch-backports/xfce4-mixer/debian/changelog	2007-12-18 23:12:39 UTC (rev 1490)
+++ desktop/branches/etch-backports/xfce4-mixer/debian/changelog	2007-12-19 11:42:42 UTC (rev 1491)
@@ -1,19 +1,25 @@
-xfce4-mixer (4.4.1-4~bpo40+1) UNRELEASED; urgency=low
+xfce4-mixer (4.4.2-1~bpo40+1) UNRELEASED; urgency=low
 
+  * etch-backports.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Tue, 18 Dec 2007 22:42:07 +0100
+
+xfce4-mixer (4.4.2-1) unstable; urgency=low
+
   [ Yves-Alexis Perez ]
+  * New upstream release.
   * debian/xfce4-mixer.menu: switch to new menu policy.
   * debian/postinst: use posix kill -s to avoid problems on hurd.
-  * build for etch-backports.
-  * debian/control: 
-    - drop build dep on gtk 2.10
-    - drop build dep on dpkg-dev >= 1.14
+  * debian/rules: don't ignore all make errors at clean time.
 
   [ Simon Huggins ]
   * debian/prerm: Use kill -s to keep Hurd and lintian happy at the same time.
   * debian/control: Move fake Homepage field to a real one now dpkg
     supports it.
+  * Add fake shlibs to pacify newer dpkg-shlibs
+  * Add Vcs-* headers to debian/control
 
- -- Yves-Alexis Perez <corsac at corsac.net>  Sun, 21 Oct 2007 15:37:01 +0200
+ -- Simon Huggins <huggie at earth.li>  Tue, 27 Nov 2007 16:39:18 +0000
 
 xfce4-mixer (4.4.1-3) unstable; urgency=low
 

Modified: desktop/branches/etch-backports/xfce4-mixer/debian/control
===================================================================
--- desktop/branches/etch-backports/xfce4-mixer/debian/control	2007-12-18 23:12:39 UTC (rev 1490)
+++ desktop/branches/etch-backports/xfce4-mixer/debian/control	2007-12-19 11:42:42 UTC (rev 1491)
@@ -2,10 +2,12 @@
 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 corsac.net>
-Build-Depends: debhelper (>= 4.2.1-1), libgtk2.0-dev, libxft-dev, xfce4-panel-dev (>= 4.4.1), libasound2-dev (>= 0.9.0) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libxml-parser-perl, chrpath, quilt
+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.2.1-1), libgtk2.0-dev, libxft-dev, xfce4-panel-dev (>= 4.4.2), libasound2-dev (>= 0.9.0) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libxml-parser-perl, chrpath, quilt
 Standards-Version: 3.7.2
 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/
 
 Package: xfce4-mixer
 Architecture: any

Copied: desktop/branches/etch-backports/xfce4-mixer/debian/patches/02_mixer-block-menu.patch (from rev 1489, desktop/trunk/xfce4-mixer/debian/patches/02_mixer-block-menu.patch)
===================================================================
--- desktop/branches/etch-backports/xfce4-mixer/debian/patches/02_mixer-block-menu.patch	                        (rev 0)
+++ desktop/branches/etch-backports/xfce4-mixer/debian/patches/02_mixer-block-menu.patch	2007-12-19 11:42:42 UTC (rev 1491)
@@ -0,0 +1,28 @@
+Index: panel-plugin/plugin.c
+===================================================================
+--- xfce4-mixer/panel-plugin/plugin.c	(révision 26127)
++++ xfce4-mixer/panel-plugin/plugin.c	(copie de travail)
+@@ -127,6 +127,8 @@
+ {
+     t_mixer *mixer = (t_mixer *) user_data;
+ 
++    xfce_panel_plugin_unblock_menu (mixer->temp_plugin);
++
+     xfce_mixer_prefbox_save_preferences (mixer->prefbox, mixer->prefs);
+  
+     mixer_write_config(mixer->temp_plugin, mixer);
+@@ -149,11 +151,13 @@
+ 
+     mixer = (t_mixer *) user_data;
+     
++    xfce_panel_plugin_block_menu (plugin);
++
+     /* TODO TRANSLATE TITLE OR SOMETHING */
+ 
+     dialog = GTK_DIALOG (
+              gtk_dialog_new_with_buttons (xfce_panel_plugin_get_name (plugin), 
+-                                          GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(plugin))), 
++                                          NULL, 
+                                           GTK_DIALOG_DESTROY_WITH_PARENT,
+                                           GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, 
+                                           NULL));

Modified: desktop/branches/etch-backports/xfce4-mixer/debian/patches/series
===================================================================
--- desktop/branches/etch-backports/xfce4-mixer/debian/patches/series	2007-12-18 23:12:39 UTC (rev 1490)
+++ desktop/branches/etch-backports/xfce4-mixer/debian/patches/series	2007-12-19 11:42:42 UTC (rev 1491)
@@ -1 +1,2 @@
 01_xfce4-mixer-panel-plugin_border.patch
+02_mixer-block-menu.patch

Modified: desktop/branches/etch-backports/xfce4-mixer/debian/rules
===================================================================
--- desktop/branches/etch-backports/xfce4-mixer/debian/rules	2007-12-18 23:12:39 UTC (rev 1490)
+++ desktop/branches/etch-backports/xfce4-mixer/debian/rules	2007-12-19 11:42:42 UTC (rev 1491)
@@ -68,7 +68,7 @@
 	rm -rf $(CURDIR)/debian/build-$$variant;\
 	done
 
-	-$(MAKE) distclean
+	[ ! -f Makefile ] || $(MAKE) distclean
 
 ifneq "$(wildcard /usr/share/misc/config.sub)" ""
 	cp -f /usr/share/misc/config.sub config.sub

Copied: desktop/branches/etch-backports/xfce4-mixer/debian/xfce4-mixer-alsa.shlibs (from rev 1489, desktop/trunk/xfce4-mixer/debian/xfce4-mixer-alsa.shlibs)
===================================================================
--- desktop/branches/etch-backports/xfce4-mixer/debian/xfce4-mixer-alsa.shlibs	                        (rev 0)
+++ desktop/branches/etch-backports/xfce4-mixer/debian/xfce4-mixer-alsa.shlibs	2007-12-19 11:42:42 UTC (rev 1491)
@@ -0,0 +1 @@
+libxfce4mixer 0 xfce4-mixer

Copied: desktop/branches/etch-backports/xfce4-mixer/debian/xfce4-mixer-oss.shlibs (from rev 1489, desktop/trunk/xfce4-mixer/debian/xfce4-mixer-oss.shlibs)
===================================================================
--- desktop/branches/etch-backports/xfce4-mixer/debian/xfce4-mixer-oss.shlibs	                        (rev 0)
+++ desktop/branches/etch-backports/xfce4-mixer/debian/xfce4-mixer-oss.shlibs	2007-12-19 11:42:42 UTC (rev 1491)
@@ -0,0 +1 @@
+libxfce4mixer 0 xfce4-mixer

Modified: desktop/branches/etch-backports/xfce4-panel/debian/changelog
===================================================================
--- desktop/branches/etch-backports/xfce4-panel/debian/changelog	2007-12-18 23:12:39 UTC (rev 1490)
+++ desktop/branches/etch-backports/xfce4-panel/debian/changelog	2007-12-19 11:42:42 UTC (rev 1491)
@@ -1,15 +1,25 @@
-xfce4-panel (4.4.1-3~bpo40+1) UNRELEASED; urgency=low
+xfce4-panel (4.4.2-1~bpo40+1) UNRELEASED; urgency=low
 
+  * rebuild for etch-backports.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Tue, 18 Dec 2007 22:43:44 +0100
+
+xfce4-panel (4.4.2-1) unstable; urgency=low
+
   [ Simon Huggins ]
   * debian/control: Move fake Homepage field to a real one now dpkg
     supports it.
 
   [ Yves-Alexis Perez ]
-  * build for etch-backports.
-  * debian/control: drop gtk 2.10 build-dep. 
+  * New upstream release.
+  * debian/patches:
+    - removed 02_fix-segfault-gtk2.11.patch, included upstream.
 
- -- Yves-Alexis Perez <corsac at corsac.net>  Sun, 21 Oct 2007 13:44:49 +0200
+  [ Simon Huggins ]
+  * Add Vcs-* headers to debian/control
 
+ -- Simon Huggins <huggie at earth.li>  Tue, 27 Nov 2007 16:39:19 +0000
+
 xfce4-panel (4.4.1-2) unstable; urgency=low
 
   [ Simon Huggins ]

Modified: desktop/branches/etch-backports/xfce4-panel/debian/control
===================================================================
--- desktop/branches/etch-backports/xfce4-panel/debian/control	2007-12-18 23:12:39 UTC (rev 1490)
+++ desktop/branches/etch-backports/xfce4-panel/debian/control	2007-12-19 11:42:42 UTC (rev 1491)
@@ -2,10 +2,12 @@
 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 corsac.net>
+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), libgtk2.0-dev, bison, libxft-dev, libxml2-dev, xfce4-mcs-manager-dev (>= 4.4.1), chrpath, quilt
 Standards-Version: 3.7.2
 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/
 
 Package: xfce4-panel
 Architecture: any

Modified: desktop/branches/etch-backports/xfce4-panel/debian/xfce4-panel.shlibs
===================================================================
--- desktop/branches/etch-backports/xfce4-panel/debian/xfce4-panel.shlibs	2007-12-18 23:12:39 UTC (rev 1490)
+++ desktop/branches/etch-backports/xfce4-panel/debian/xfce4-panel.shlibs	2007-12-19 11:42:42 UTC (rev 1491)
@@ -1 +1 @@
-libxfce4panel 1 xfce4-panel (>= 4.4.1)
+libxfce4panel 1 xfce4-panel (>= 4.4.2)

Modified: desktop/branches/etch-backports/xfce4-session/debian/changelog
===================================================================
--- desktop/branches/etch-backports/xfce4-session/debian/changelog	2007-12-18 23:12:39 UTC (rev 1490)
+++ desktop/branches/etch-backports/xfce4-session/debian/changelog	2007-12-19 11:42:42 UTC (rev 1491)
@@ -1,3 +1,21 @@
+xfce4-session (4.4.2-1~bpo40+1) UNRELEASED; urgency=low
+
+  * rebuild for etch-backports.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Tue, 18 Dec 2007 22:44:52 +0100
+
+xfce4-session (4.4.2-1) unstable; urgency=low
+
+  [ Yves-Alexis Perez ]
+  * New upstream release.
+  * debian/rules: don't ignore all make errors at clean stage.
+
+  [ Simon Huggins ]
+  * Fix shlibs for newer dpkg
+  * Add Vcs-* headers to debian/control
+
+ -- Simon Huggins <huggie at earth.li>  Tue, 27 Nov 2007 16:39:19 +0000
+
 xfce4-session (4.4.1-2) unstable; urgency=low
 
   [ Yves-Alexis Perez ]

Modified: desktop/branches/etch-backports/xfce4-session/debian/control
===================================================================
--- desktop/branches/etch-backports/xfce4-session/debian/control	2007-12-18 23:12:39 UTC (rev 1490)
+++ desktop/branches/etch-backports/xfce4-session/debian/control	2007-12-19 11:42:42 UTC (rev 1491)
@@ -2,10 +2,12 @@
 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 corsac.net>
-Build-Depends: debhelper (>= 4.0.0), xfce4-mcs-manager-dev (>= 4.4.1), xbase-clients, libxml-parser-perl, chrpath, quilt, fortune-mod, libdbus-1-dev
+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), xfce4-mcs-manager-dev (>= 4.4.2), xbase-clients, libxml-parser-perl, chrpath, quilt, fortune-mod, libdbus-1-dev
 Standards-Version: 3.7.2
 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/
 
 Package: xfce4-session
 Architecture: any

Modified: desktop/branches/etch-backports/xfce4-session/debian/rules
===================================================================
--- desktop/branches/etch-backports/xfce4-session/debian/rules	2007-12-18 23:12:39 UTC (rev 1490)
+++ desktop/branches/etch-backports/xfce4-session/debian/rules	2007-12-19 11:42:42 UTC (rev 1491)
@@ -57,7 +57,7 @@
 	rm -f build-stamp 
 
 	# Add here commands to clean up after the build process.
-	-$(MAKE) distclean
+	[ ! -f Makefile ] || $(MAKE) distclean
 #ifneq "$(wildcard /usr/share/misc/config.sub)" ""
 #	cp -f /usr/share/misc/config.sub config.sub
 #endif
@@ -111,6 +111,7 @@
 	dh_compress
 	dh_fixperms
 	dh_installdeb
+	dh_makeshlibs
 	dh_shlibdeps -l`pwd`/debian/xfce4-session/usr/lib
 	dh_gencontrol
 	dh_md5sums

Modified: desktop/branches/etch-backports/xfce4-terminal/debian/changelog
===================================================================
--- desktop/branches/etch-backports/xfce4-terminal/debian/changelog	2007-12-18 23:12:39 UTC (rev 1490)
+++ desktop/branches/etch-backports/xfce4-terminal/debian/changelog	2007-12-19 11:42:42 UTC (rev 1491)
@@ -1,24 +1,39 @@
-xfce4-terminal (0.2.6-6) UNRELEASED; urgency=low
+xfce4-terminal (0.2.8-2) unstable; urgency=low
 
+  * Bump build-dep on exo, as it requires 0.3.4.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Tue, 11 Dec 2007 20:15:38 +0100
+
+xfce4-terminal (0.2.8-1) unstable; urgency=low
+
   [ Simon Huggins ]
-  * debian/control: Move fake Homepage field to a real one now dpkg
-    supports it.
+  * Add Vcs-* headers to debian/control
 
   [ Yves-Alexis Perez ]
-  * build for etch-backports.
-  * debian/control: drop versioned build-dep on vte.
+  * new upstream release.
+  * debian/patches:
+    - dropped 01_CVE-2007-3770, merged upstream.
 
- -- Yves-Alexis Perez <corsac at corsac.net>  Sun, 21 Oct 2007 20:12:00 +0200
+ -- Yves-Alexis Perez <corsac at corsac.net>  Sun, 02 Dec 2007 22:40:32 +0100
 
 xfce4-terminal (0.2.6-5) unstable; urgency=low
 
-  * debian/rules: 
-    - transform program name to xfce4-terminal at configure time 
+  [ Yves-Alexis Perez ]
+  * debian/rules:
+    - transform program name to xfce4-terminal at configure time
     - rename Terminal.desktop to xfce4-terminal to avoid conflict with
-      Terminal.app.                                            closes: #446329 
+      Terminal.app.                                            closes: #446329
+  * debian/patches:
+    - added 02_dont-refresh-prefs-too-much: dont poll preferences once per
+    second.
 
- -- Yves-Alexis Perez <corsac at corsac.net>  Sat, 13 Oct 2007 14:37:00 +0200
+  [ Simon Huggins ]
+  * debian/control: Move fake Homepage field to a real one now dpkg
+    supports it.
+  * debian/rules: Fix up rename so that help works again.
 
+ -- Yves-Alexis Perez <corsac at corsac.net>  Mon, 05 Nov 2007 15:31:26 +0100
+
 xfce4-terminal (0.2.6-4) unstable; urgency=low
   
   (David Paleino)

Modified: desktop/branches/etch-backports/xfce4-terminal/debian/control
===================================================================
--- desktop/branches/etch-backports/xfce4-terminal/debian/control	2007-12-18 23:12:39 UTC (rev 1490)
+++ desktop/branches/etch-backports/xfce4-terminal/debian/control	2007-12-19 11:42:42 UTC (rev 1491)
@@ -2,10 +2,12 @@
 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>, Rudy Godoy <rudy at kernel-panik.org>, Martin Loschwitz <madkiss at debian.org>, Yves-Alexis Perez <corsac at corsac.net>, David Paleino <d.paleino at gmail.com>
+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>, David Paleino <d.paleino at gmail.com>
 Build-Depends: debhelper (>= 4.1.0), libdbus-glib-1-dev, libexo-0.3-dev (>= 0.3.2), libvte-dev, libxml-perl, libstartup-notification0-dev, cdbs, chrpath
 Standards-Version: 3.7.2
 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/
 
 Package: xfce4-terminal
 Architecture: any

Deleted: desktop/branches/etch-backports/xfce4-terminal/debian/patches/01_CVE-2007-3770.patch
===================================================================
--- desktop/branches/etch-backports/xfce4-terminal/debian/patches/01_CVE-2007-3770.patch	2007-12-18 23:12:39 UTC (rev 1490)
+++ desktop/branches/etch-backports/xfce4-terminal/debian/patches/01_CVE-2007-3770.patch	2007-12-19 11:42:42 UTC (rev 1491)
@@ -1,187 +0,0 @@
---- helpers/opera-browser.desktop.in
-+++ helpers/opera-browser.desktop.in
-@@ -5,4 +5,4 @@
- Type=Application
- X-Terminal-Binaries=opera;
- X-Terminal-Category=WebBrowser
--X-Terminal-Command=%B -remote "openURL(%u,new-window)" || %B "%u"
-+X-Terminal-Command=%B -remote openURL\(%u,new-window\) || %B %u
---- helpers/evolution.desktop.in
-+++ helpers/evolution.desktop.in
-@@ -5,4 +5,4 @@
- Type=Application
- X-Terminal-Binaries=evolution-2.2;evolution-2.0;evolution-1.6;evolution-1.5;evolution-1.4;evolution;
- X-Terminal-Category=MailReader
--X-Terminal-Command=%B "mailto:%u"
-+X-Terminal-Command=%B mailto:%u
---- helpers/mozilla-mailer.desktop.in
-+++ helpers/mozilla-mailer.desktop.in
-@@ -5,4 +5,4 @@
- Type=Application
- X-Terminal-Binaries=mozilla;mozilla-gtk2;mozilla-gtk;
- X-Terminal-Category=MailReader
--X-Terminal-Command=%B -remote "mailto(%u)" || %B -compose "mailto:%u"
-+X-Terminal-Command=%B -remote mailto\(%u\) || %B -compose mailto:%u
---- helpers/exo-open-mailer.desktop.in
-+++ helpers/exo-open-mailer.desktop.in
-@@ -5,4 +5,4 @@
- Type=Application
- X-Terminal-Binaries=exo-open
- X-Terminal-Category=MailReader
--X-Terminal-Command=%B --launch MailReader "%u"
-+X-Terminal-Command=%B --launch MailReader %u
---- helpers/kmail.desktop.in
-+++ helpers/kmail.desktop.in
-@@ -5,4 +5,4 @@
- Type=Application
- X-Terminal-Binaries=kmail;
- X-Terminal-Category=MailReader
--X-Terminal-Command=%B "%u"
-+X-Terminal-Command=%B %u
---- helpers/exo-open-browser.desktop.in
-+++ helpers/exo-open-browser.desktop.in
-@@ -5,4 +5,4 @@
- Type=Application
- X-Terminal-Binaries=exo-open
- X-Terminal-Category=WebBrowser
--X-Terminal-Command=%B --launch WebBrowser "%u"
-+X-Terminal-Command=%B --launch WebBrowser %u
---- helpers/epiphany.desktop.in
-+++ helpers/epiphany.desktop.in
-@@ -5,4 +5,4 @@
- Type=Application
- X-Terminal-Binaries=epiphany;
- X-Terminal-Category=WebBrowser
--X-Terminal-Command=%B "%u"
-+X-Terminal-Command=%B %u
---- helpers/galeon.desktop.in
-+++ helpers/galeon.desktop.in
-@@ -5,4 +5,4 @@
- Type=Application
- X-Terminal-Binaries=galeon;
- X-Terminal-Category=WebBrowser
--X-Terminal-Command=%B "%u"
-+X-Terminal-Command=%B %u
---- helpers/konqueror.desktop.in
-+++ helpers/konqueror.desktop.in
-@@ -5,6 +5,6 @@
- Type=Application
- X-Terminal-Binaries=konqueror;
- X-Terminal-Category=WebBrowser
--X-Terminal-Command=%B "%u"
-+X-Terminal-Command=%B %u
- 
- 
---- helpers/balsa.desktop.in
-+++ helpers/balsa.desktop.in
-@@ -5,4 +5,4 @@
- Type=Application
- X-Terminal-Binaries=balsa
- X-Terminal-Category=MailReader
--X-Terminal-Command=%B -m "mailto:%u"
-+X-Terminal-Command=%B -m mailto:%u
---- helpers/sylpheed-claws.desktop.in
-+++ helpers/sylpheed-claws.desktop.in
-@@ -7,4 +7,4 @@
- StartupNotify=true
- X-Terminal-Binaries=sylpheed-claws;
- X-Terminal-Category=MailReader
--X-Terminal-Command=%B --compose "%u"
-+X-Terminal-Command=%B --compose %u
---- helpers/sensible-browser.desktop.in
-+++ helpers/sensible-browser.desktop.in
-@@ -5,4 +5,4 @@
- Type=Application
- X-Terminal-Binaries=sensible-browser
- X-Terminal-Category=WebBrowser
--X-Terminal-Command=%B "%u"
-+X-Terminal-Command=%B %u
---- helpers/firefox.desktop.in
-+++ helpers/firefox.desktop.in
-@@ -5,4 +5,4 @@
- Type=Application
- X-Terminal-Binaries=firefox;firefox-gtk2;firefox-gtk;mozilla-firefox;
- X-Terminal-Category=WebBrowser
--X-Terminal-Command=%B -remote "openURL(%u)" || %B "%u"
-+X-Terminal-Command=%B -remote openURL\(%u\) || %B %u
---- helpers/mozilla-browser.desktop.in
-+++ helpers/mozilla-browser.desktop.in
-@@ -5,4 +5,4 @@
- Type=Application
- X-Terminal-Binaries=mozilla;mozilla-gtk2;mozilla-gtk;
- X-Terminal-Category=WebBrowser
--X-Terminal-Command=%B -remote "openURL(%u,new-window)" || %B "%u"
-+X-Terminal-Command=%B -remote openURL\(%u,new-window\) || %B %u
---- helpers/opera-mailer.desktop.in
-+++ helpers/opera-mailer.desktop.in
-@@ -5,4 +5,4 @@
- Type=Application
- X-Terminal-Binaries=opera;
- X-Terminal-Category=MailReader
--X-Terminal-Command=%B -remote "openURL(mailto:%u)" || %B "mailto:%u"
-+X-Terminal-Command=%B -remote openURL\(mailto:%u\) || %B mailto:%u
---- helpers/mutt.desktop.in
-+++ helpers/mutt.desktop.in
-@@ -5,4 +5,4 @@
- Type=Application
- X-Terminal-Binaries=mutt;
- X-Terminal-Category=MailReader
--X-Terminal-Command=Terminal -x %B "%u"
-+X-Terminal-Command=Terminal -x %B %u
---- helpers/thunderbird.desktop.in
-+++ helpers/thunderbird.desktop.in
-@@ -5,4 +5,4 @@
- Type=Application
- X-Terminal-Binaries=thunderbird;thunderbird-gtk2;thunderbird-gtk;mozilla-thunderbird;
- X-Terminal-Category=MailReader
--X-Terminal-Command=%B -remote "mailto(%u)" || %B -compose "mailto:%u"
-+X-Terminal-Command=%B -remote mailto\(%u\) || %B -compose mailto:%u
---- helpers/lynx.desktop.in
-+++ helpers/lynx.desktop.in
-@@ -5,4 +5,4 @@
- Type=Application
- X-Terminal-Binaries=lynx;
- X-Terminal-Category=WebBrowser
--X-Terminal-Command=Terminal -x %B "%u"
-+X-Terminal-Command=Terminal -x %B %u
---- terminal/terminal-helper.c
-+++ terminal/terminal-helper.c
-@@ -349,6 +349,7 @@
-   gchar       *argv[4];
-   gchar       *command;
-   gchar       *t;
-+  gchar       *escaped;
-   guint        n;
- 
-   g_return_if_fail (TERMINAL_IS_HELPER (helper));
-@@ -359,6 +360,8 @@
-     if (s[0] == '%' && g_ascii_tolower (s[1]) == 'u')
-       ++n;
- 
-+  escaped = g_shell_quote (uri);
-+
-   if (n > 0)
-     {
-       command = g_new (gchar, strlen (helper->command) + n * strlen (uri) + 1);
-@@ -366,7 +369,7 @@
-         {
-           if (s[0] == '%' && g_ascii_tolower (s[1]) == 'u')
-             {
--              for (u = uri; *u != '\0'; )
-+              for (u = escaped; *u != '\0'; )
-                 *t++ = *u++;
-               s += 2;
-             }
-@@ -379,9 +382,11 @@
-     }
-   else
-     {
--      command = g_strconcat (helper->command, " ", uri, NULL);
-+      command = g_strconcat (helper->command, " ", escaped, NULL);
-     }
- 
-+  g_free (escaped);
-+
-   argv[0] = "/bin/sh";
-   argv[1] = "-c";
-   argv[2] = command;

Copied: desktop/branches/etch-backports/xfce4-terminal/debian/patches/02_dont-refresh-prefs-too-much.patch (from rev 1489, desktop/trunk/xfce4-terminal/debian/patches/02_dont-refresh-prefs-too-much.patch)
===================================================================
--- desktop/branches/etch-backports/xfce4-terminal/debian/patches/02_dont-refresh-prefs-too-much.patch	                        (rev 0)
+++ desktop/branches/etch-backports/xfce4-terminal/debian/patches/02_dont-refresh-prefs-too-much.patch	2007-12-19 11:42:42 UTC (rev 1491)
@@ -0,0 +1,12 @@
+diff -ur Terminal-0.2.6.orig/terminal/terminal-monitor.c Terminal-0.2.6/terminal/terminal-monitor.c
+--- Terminal-0.2.6.orig/terminal/terminal-monitor.c	2007-01-20 15:30:51.000000000 +0100
++++ Terminal-0.2.6/terminal/terminal-monitor.c	2007-11-05 15:15:49.000000000 +0100
+@@ -339,7 +339,7 @@
+ 
+   if (G_UNLIKELY (monitor->idle_id == 0))
+     {
+-      monitor->idle_id = g_timeout_add_full (G_PRIORITY_LOW, 1000, terminal_monitor_idle,
++      monitor->idle_id = g_timeout_add_full (G_PRIORITY_LOW, 60*1000, terminal_monitor_idle,
+                                              monitor, terminal_monitor_idle_destroy);
+     }
+ }

Modified: desktop/branches/etch-backports/xfce4-utils/debian/Debian
===================================================================
--- desktop/branches/etch-backports/xfce4-utils/debian/Debian	2007-12-18 23:12:39 UTC (rev 1490)
+++ desktop/branches/etch-backports/xfce4-utils/debian/Debian	2007-12-19 11:42:42 UTC (rev 1491)
@@ -3,7 +3,7 @@
 Co maintainers are:
 
 Simon Huggins <huggie at earth.li>
-Yves-Alexis Perez <corsac at corsac.net>
+Yves-Alexis Perez <corsac at debian.org>
 Emanuele Rocca <ema at debian.org>
 
 Bugs should be reported to Debian BTS at: http://bugs.debian.org or using

Modified: desktop/branches/etch-backports/xfce4-utils/debian/changelog
===================================================================
--- desktop/branches/etch-backports/xfce4-utils/debian/changelog	2007-12-18 23:12:39 UTC (rev 1490)
+++ desktop/branches/etch-backports/xfce4-utils/debian/changelog	2007-12-19 11:42:42 UTC (rev 1491)
@@ -1,17 +1,52 @@
-xfce4-utils (4.4.1-3~bpo40+1) unstable; urgency=low
+xfce4-utils (4.4.2-3~bpo40+1) UNRELEASED; urgency=low
 
+  * rebuild for etch-backports.
+  * debian/control: remove build-dep on dpatch.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Wed, 19 Dec 2007 08:17:01 +0100
+
+xfce4-utils (4.4.2-3) unstable; urgency=low
+
+  * The “brown paper bag” release.
+  * debian/control: depend on x11-xserver-utils and not x11-servers-utils…
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Sat, 08 Dec 2007 22:43:10 +0100
+
+xfce4-utils (4.4.2-2) unstable; urgency=low
+
+  * debian/control:
+    - rewrite long description (include startxfce4)
+    - updated standard versions to 3.7.3.
+    - add dependencies on xinit and x11-server-utils because startxfce4 need
+      them.                                                     closes: #454985
+    - add my debian.org email address to uploader field.
+    - drop dpatch build-dep as we don't have patches anymore.
+  * debian/rules: remove dpatch rules include.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Sat, 08 Dec 2007 19:09:48 +0100
+
+xfce4-utils (4.4.2-1) unstable; urgency=low
+
+  [ Yves-Alexis Perez ]
+  * New upstream release.
+  * debian/rules: 
+    - don't ignore all make errors at clean stage.
+    - fix parallel builds.
+
   [ Simon Huggins ]
+  * Add Vcs-* headers to debian/control
+
+ -- Yves-Alexis Perez <corsac at corsac.net>  Sun, 02 Dec 2007 11:31:33 +0100
+
+xfce4-utils (4.4.1-3) unstable; urgency=low
+
   * Use kill -s to keep Hurd and lintian happy at the same time.
   * debian/control: Move fake Homepage field to a real one now dpkg
     supports it.
   * debian/menu: Remove leftover \                              closes: #447282
 
-  [ Yves-Alexis Perez ]
-  * build for etch-backports.
-  * debian/control: drop gtk 2.10 build-dep. 
+ -- Simon Huggins <huggie at earth.li>  Sun, 21 Oct 2007 09:12:27 +0100
 
- -- Yves-Alexis Perez <corsac at corsac.net>  Sun, 21 Oct 2007 13:49:06 +0200
-
 xfce4-utils (4.4.1-2) unstable; urgency=low
 
   (Yves-Alexis Perez)

Modified: desktop/branches/etch-backports/xfce4-utils/debian/control
===================================================================
--- desktop/branches/etch-backports/xfce4-utils/debian/control	2007-12-18 23:12:39 UTC (rev 1490)
+++ desktop/branches/etch-backports/xfce4-utils/debian/control	2007-12-19 11:42:42 UTC (rev 1491)
@@ -2,21 +2,22 @@
 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 corsac.net>
-Build-Depends: debhelper (>= 4.1.26), libgtk2.0-dev, libxft-dev, xfce4-mcs-manager-dev (>= 4.4.1), dpatch, chrpath
-Standards-Version: 3.7.2
+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, libxft-dev, xfce4-mcs-manager-dev (>= 4.4.2), chrpath
+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/
 
 Package: xfce4-utils
 Architecture: any
-Depends: ${shlibs:Depends}, xterm|x-terminal-emulator
+Depends: ${shlibs:Depends}, xterm|x-terminal-emulator, x11-xserver-utils, xinit
 Recommends: xfwm4, xfce4-panel, thunar, xscreensaver | xlockmore | xlockmore-gl
 Suggests: xfce4-session
 Description: Various tools for Xfce
- This package contains xfrun4, xftaskbar4, xfterm4, xflock4, xfmountdev4,
- xfhelp4, xfce4-about, seven tools for xfce, the main panel of Xfce project.
- Xfce is a desktop environment reminiscent of CDE that uses the GTK+ library
- and isn't resource-hungry.
+ This package contains xfrun4, xfterm4, xflock4, xfmountdev4, xfbrowser4,
+ startxfce4, xfhelp4, xfce4-about, eight tools for Xfce.  Xfce is a desktop
+ environment that uses the GTK+ library and isn't resource-hungry.
  .
  If you want to use xfmountdev4, be sure to install Thunar before because it's
  called by it.

Modified: desktop/branches/etch-backports/xfce4-utils/debian/rules
===================================================================
--- desktop/branches/etch-backports/xfce4-utils/debian/rules	2007-12-18 23:12:39 UTC (rev 1490)
+++ desktop/branches/etch-backports/xfce4-utils/debian/rules	2007-12-19 11:42:42 UTC (rev 1491)
@@ -12,17 +12,15 @@
 endif
 
 # dpatch stuff
-include /usr/share/dpatch/dpatch.make
+#include /usr/share/dpatch/dpatch.make
 
-configure: configure-stamp
-configure-stamp: 
+config.status: configure
 	
 	dh_testdir
 	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --sysconfdir=/etc  --with-browser=sensible-browser --enable-final --with-vendor-info=Debian
-	touch configure-stamp
 
-build: patch configure-stamp build-stamp
-build-stamp:
+build: build-stamp
+build-stamp: config.status
 
 	dh_testdir
 	$(MAKE)
@@ -35,7 +33,7 @@
 	
 	-rm -f configure-stamp build-stamp 
 
-	-$(MAKE) distclean
+	[ ! -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 && \

Modified: desktop/branches/etch-backports/xfdesktop4/debian/changelog
===================================================================
--- desktop/branches/etch-backports/xfdesktop4/debian/changelog	2007-12-18 23:12:39 UTC (rev 1490)
+++ desktop/branches/etch-backports/xfdesktop4/debian/changelog	2007-12-19 11:42:42 UTC (rev 1491)
@@ -1,19 +1,25 @@
-xfdesktop4 (4.4.1-6~bpo40+1) UNRELEASED; urgency=low
+xfdesktop4 (4.4.2-1~bpo40+1) UNRELEASED; urgency=low
 
+  * rebuild for etch-backports.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Wed, 19 Dec 2007 00:22:10 +0100
+
+xfdesktop4 (4.4.2-1) unstable; urgency=low
+
   [ Yves-Alexis Perez ]
+  * New upstream release.
   * debian/xfdesktop4.menu: switch to new debian policy.
   * use exo-open to run terminal from menu so we respect user choice.
   * debian/xfdesktop4.postinst: use posix kill -s to avoid problems on hurd.
-  * debian/control: drop gtk 2.10 build-dep.
-  * build for etch-backports.
+  * debian/rules: don't ignore all make errors at clean stage.
 
-
   [ Simon Huggins ]
   * debian/prerm: Use kill -s to keep Hurd and lintian happy at the same time.
   * debian/control: Move fake Homepage field to a real one now dpkg
     supports it.
+  * Add Vcs-* headers to debian/control
 
- -- Yves-Alexis Perez <corsac at corsac.net>  Sun, 21 Oct 2007 20:01:51 +0200
+ -- Yves-Alexis Perez <corsac at corsac.net>  Wed, 28 Nov 2007 07:56:19 +0100
 
 xfdesktop4 (4.4.1-5) unstable; urgency=low
 

Modified: desktop/branches/etch-backports/xfdesktop4/debian/control
===================================================================
--- desktop/branches/etch-backports/xfdesktop4/debian/control	2007-12-18 23:12:39 UTC (rev 1490)
+++ desktop/branches/etch-backports/xfdesktop4/debian/control	2007-12-19 11:42:42 UTC (rev 1491)
@@ -2,10 +2,12 @@
 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 corsac.net>
-Build-Depends: debhelper (>= 4.1.26), libgtk2.0-dev, libxft-dev, libxml2-dev, xfce4-panel-dev (>= 4.4.1), libexo-0.3-dev (>= 0.3.2), libthunar-vfs-1-dev (>= 0.8.0), chrpath, libdbus-glib-1-dev, quilt
+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, libxft-dev, libxml2-dev, xfce4-panel-dev (>= 4.4.2), libexo-0.3-dev (>= 0.3.4), libthunar-vfs-1-dev (>= 0.8.0), chrpath, libdbus-glib-1-dev, quilt
 Standards-Version: 3.7.2
 Homepage: http://www.xfce.org/
+Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfdesktop4/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/xfdesktop4/
 
 Package: xfdesktop4-data
 Architecture: all

Modified: desktop/branches/etch-backports/xfdesktop4/debian/rules
===================================================================
--- desktop/branches/etch-backports/xfdesktop4/debian/rules	2007-12-18 23:12:39 UTC (rev 1490)
+++ desktop/branches/etch-backports/xfdesktop4/debian/rules	2007-12-19 11:42:42 UTC (rev 1491)
@@ -40,7 +40,7 @@
 	dh_testroot
 	rm -f build-stamp 
 
-	-$(MAKE) distclean
+	[ ! -f Makefile ] || $(MAKE) distclean
 
 ifneq "$(wildcard /usr/share/misc/config.sub)" ""
 	cp -f /usr/share/misc/config.sub config.sub

Modified: desktop/branches/etch-backports/xfdesktop4/debian/xfdesktop4.menu
===================================================================
--- desktop/branches/etch-backports/xfdesktop4/debian/xfdesktop4.menu	2007-12-18 23:12:39 UTC (rev 1490)
+++ desktop/branches/etch-backports/xfdesktop4/debian/xfdesktop4.menu	2007-12-19 11:42:42 UTC (rev 1491)
@@ -1,3 +1,3 @@
-?package(xfdesktop4): needs="X11" section="Applications/File Manager" \
+?package(xfdesktop4): needs="X11" section="Applications/File Management" \
     command="xfdesktop" title="Xfdesktop" longtitle="Xfce desktop manager" \
     hints="Xfce Desktop"

Modified: desktop/branches/etch-backports/xfprint4/debian/changelog
===================================================================
--- desktop/branches/etch-backports/xfprint4/debian/changelog	2007-12-18 23:12:39 UTC (rev 1490)
+++ desktop/branches/etch-backports/xfprint4/debian/changelog	2007-12-19 11:42:42 UTC (rev 1491)
@@ -1,15 +1,23 @@
-xfprint4 (4.4.1-3~bpo40+1) UNRELEASED; urgency=low
+xfprint4 (4.4.2-1~bpo40+1) UNRELEASED; urgency=low
 
+  * rebuild for etch-backports.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Tue, 18 Dec 2007 22:51:58 +0100
+
+xfprint4 (4.4.2-1) unstable; urgency=low
+
   [ Simon Huggins ]
   * debian/control: Move fake Homepage field to a real one now dpkg
     supports it.
 
   [ Yves-Alexis Perez ]
-  * build for etch-backports.
-  * debian/control: drop gtk 2.10 build-dep. 
+  * New upstream release.
 
- -- Yves-Alexis Perez <corsac at corsac.net>  Sun, 21 Oct 2007 16:17:11 +0200
+  [ Simon Huggins ]
+  * Add Vcs-* headers to debian/control
 
+ -- Simon Huggins <huggie at earth.li>  Tue, 27 Nov 2007 16:39:20 +0000
+
 xfprint4 (4.4.1-2) unstable; urgency=low
 
   [ Yves-Alexis Perez ]

Modified: desktop/branches/etch-backports/xfprint4/debian/control
===================================================================
--- desktop/branches/etch-backports/xfprint4/debian/control	2007-12-18 23:12:39 UTC (rev 1490)
+++ desktop/branches/etch-backports/xfprint4/debian/control	2007-12-19 11:42:42 UTC (rev 1491)
@@ -2,10 +2,12 @@
 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 corsac.net>
-Build-Depends: debhelper (>> 4.0.0), libgtk2.0-dev, libxft-dev, xfce4-mcs-manager-dev (>= 4.4.1), a2ps, lpr, libcupsys2-dev, chrpath, sharutils
+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), libgtk2.0-dev, libxft-dev, xfce4-mcs-manager-dev (>= 4.4.2), a2ps, lpr, libcupsys2-dev, chrpath, sharutils
 Standards-Version: 3.7.2
 Homepage: http://www.xfce.org/
+Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfprint4/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/xfprint4/
 
 Package: xfprint4
 Architecture: any

Modified: desktop/branches/etch-backports/xfwm4/debian/changelog
===================================================================
--- desktop/branches/etch-backports/xfwm4/debian/changelog	2007-12-18 23:12:39 UTC (rev 1490)
+++ desktop/branches/etch-backports/xfwm4/debian/changelog	2007-12-19 11:42:42 UTC (rev 1491)
@@ -1,15 +1,25 @@
-xfwm4 (4.4.1-4) UNRELEASED; urgency=low
+xfwm4 (4.4.2-1~bpo40+1) UNRELEASED; urgency=low
 
+  * rebuild for etch-backports.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Tue, 18 Dec 2007 22:52:54 +0100
+
+xfwm4 (4.4.2-1) unstable; urgency=low
+
   [ Simon Huggins ]
   * Use kill -s to keep Hurd and lintian happy at the same time.
   * debian/control: Move fake Homepage field to a real one now dpkg
     supports it.
+  * Add Vcs-* headers to debian/control
 
   [ Yves-Alexis Perez ]
-  * build for etch-backports.
-  * debian/control: drop gtk 2.10 build-dep.
+  * New upstream release.
+  * debian/patches:
+   - 01_xfwm4-fix-transient-windows.patch removed, included upstream.
+   - 02_fix-xfwm4-hang.patch removed, included upstream.
+  * debian/rules: fix parallel builds.
 
- -- Yves-Alexis Perez <corsac at corsac.net>  Sun, 21 Oct 2007 16:20:59 +0200
+ -- Yves-Alexis Perez <corsac at corsac.net>  Sun, 02 Dec 2007 11:33:02 +0100
 
 xfwm4 (4.4.1-3) unstable; urgency=high
 

Modified: desktop/branches/etch-backports/xfwm4/debian/control
===================================================================
--- desktop/branches/etch-backports/xfwm4/debian/control	2007-12-18 23:12:39 UTC (rev 1490)
+++ desktop/branches/etch-backports/xfwm4/debian/control	2007-12-19 11:42:42 UTC (rev 1491)
@@ -2,10 +2,12 @@
 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 corsac.net>
-Build-Depends: debhelper (>= 4.1.26), libgtk2.0-dev, libxft-dev, xfce4-mcs-manager-dev (>= 4.4.1), quilt, libxdamage-dev, libxrender-dev, libxcomposite-dev, libxfixes-dev, chrpath
+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, libxft-dev, xfce4-mcs-manager-dev (>= 4.4.2), quilt, libxdamage-dev, libxrender-dev, libxcomposite-dev, libxfixes-dev, chrpath
 Standards-Version: 3.7.2
 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/
 
 Package: xfwm4
 Architecture: any

Deleted: desktop/branches/etch-backports/xfwm4/debian/patches/01_xfwm4-fix-transient-windows.patch
===================================================================
--- desktop/branches/etch-backports/xfwm4/debian/patches/01_xfwm4-fix-transient-windows.patch	2007-12-18 23:12:39 UTC (rev 1490)
+++ desktop/branches/etch-backports/xfwm4/debian/patches/01_xfwm4-fix-transient-windows.patch	2007-12-19 11:42:42 UTC (rev 1491)
@@ -1,204 +0,0 @@
-Index: xfwm4/src/client.c
-===================================================================
---- xfwm4/src/client.c	(revision 25862)
-+++ xfwm4/src/client.c	(revision 25863)
-@@ -2376,7 +2376,7 @@
- }
- 
- static void
--clientShowSingle (Client * c, gboolean change_state)
-+clientShowSingle (Client * c, gboolean deiconify)
- {
-     ScreenInfo *screen_info;
-     DisplayInfo *display_info;
-@@ -2398,7 +2398,7 @@
-         /* Adjust to urgency state as the window is visible */
-         clientUpdateUrgency (c);
-     }
--    if (change_state)
-+    if (deiconify)
-     {
-         FLAG_UNSET (c->flags, CLIENT_FLAG_ICONIFIED);
-         setWMState (display_info, c->window, NormalState);
-@@ -2407,16 +2407,14 @@
- }
- 
- void
--clientShow (Client * c, gboolean change_state)
-+clientShow (Client * c, gboolean deiconify)
- {
-     Client *c2;
-     GList *list_of_windows;
-     GList *index;
- 
-     g_return_if_fail (c != NULL);
--    TRACE ("entering clientShow \"%s\" (0x%lx) [with %s]",
--           c->name, c->window,
--           change_state ? "state change" : "no state change");
-+    TRACE ("entering clientShow \"%s\" (0x%lx)", c->name, c->window);
- 
-     list_of_windows = clientListTransientOrModal (c);
-     for (index = g_list_last (list_of_windows); index; index = g_list_previous (index))
-@@ -2428,7 +2426,7 @@
-         {
-             continue;
-         }
--        clientShowSingle (c2, change_state);
-+        clientShowSingle (c2, deiconify);
-     }
-     g_list_free (list_of_windows);
- 
-@@ -2437,7 +2435,7 @@
- }
- 
- static void
--clientHideSingle (Client * c, gboolean change_state)
-+clientHideSingle (Client * c, gboolean iconify)
- {
-     ScreenInfo *screen_info;
-     DisplayInfo *display_info;
-@@ -2458,7 +2456,7 @@
-     }
-     XUnmapWindow (display_info->dpy, c->window);
-     XUnmapWindow (display_info->dpy, c->frame);
--    if (change_state)
-+    if (iconify)
-     {
-         FLAG_SET (c->flags, CLIENT_FLAG_ICONIFIED);
-         setWMState (display_info, c->window, IconicState);
-@@ -2467,14 +2465,14 @@
- }
- 
- void
--clientHide (Client * c, int ws, gboolean change_state)
-+clientHide (Client * c, int ws, gboolean iconify)
- {
-     Client *c2;
-     GList *list_of_windows;
-     GList *index;
- 
-     g_return_if_fail (c != NULL);
--    TRACE ("entering clientHide");
-+    TRACE ("entering clientHide \"%s\" (0x%lx)", c->name, c->window);
- 
-     list_of_windows = clientListTransientOrModal (c);
-     for (index = list_of_windows; index; index = g_list_next (index))
-@@ -2500,7 +2498,12 @@
-              */
-             continue;
-         }
--        clientHideSingle (c2, change_state);
-+
-+        if (FLAG_TEST (c2->flags, CLIENT_FLAG_STICKY) && !iconify)
-+        {
-+            continue;
-+        }
-+        clientHideSingle (c2, iconify);
-     }
-     g_list_free (list_of_windows);
- 
-Index: xfwm4/src/netwm.c
-===================================================================
---- xfwm4/src/netwm.c	(revision 25862)
-+++ xfwm4/src/netwm.c	(revision 25863)
-@@ -844,53 +844,56 @@
-     display_info = screen_info->display_info;
-     val = 0;
- 
--    /* This is to make sure that transient are shown with their "ancestor" window */
--    c2 = clientGetTransient (c);
--    if (c2)
-+    if (!FLAG_TEST (c->xfwm_flags, XFWM_FLAG_SESSION_MANAGED)
-+        &&  !FLAG_TEST (c->xfwm_flags, XFWM_FLAG_WORKSPACE_SET))
-     {
-         FLAG_SET (c->xfwm_flags, XFWM_FLAG_WORKSPACE_SET);
--        c->win_workspace = c2->win_workspace;
--        if (FLAG_TEST (c2->flags, CLIENT_FLAG_STICKY))
-+        c->win_workspace = c->screen_info->current_ws;
-+    }
-+    if (getHint (display_info, c->window, NET_WM_DESKTOP, &val))
-+    {
-+        TRACE ("atom net_wm_desktop detected");
-+        if (val == (int) ALL_WORKSPACES)
-         {
--            FLAG_SET (c->flags, CLIENT_FLAG_STICKY);
--            c->win_state |= WIN_STATE_STICKY;
-+            if (FLAG_TEST (c->xfwm_flags, XFWM_FLAG_HAS_STICK) && !FLAG_TEST (c->flags, CLIENT_FLAG_STICKY))
-+            {
-+                TRACE ("atom net_wm_desktop specifies window \"%s\" is sticky", c->name);
-+                FLAG_SET (c->flags, CLIENT_FLAG_STICKY);
-+                c->win_state |= WIN_STATE_STICKY;
-+            }
-+            c->win_workspace = c->screen_info->current_ws;
-         }
-+        else
-+        {
-+            TRACE ("atom net_wm_desktop specifies window \"%s\" is on desk %i", c->name, (int) val);
-+            c->win_workspace = (int) val;
-+        }
-+        FLAG_SET (c->xfwm_flags, XFWM_FLAG_WORKSPACE_SET);
-     }
--    else
-+    else if (getHint (display_info, c->window, WIN_WORKSPACE, &val))
-     {
--        if (!FLAG_TEST (c->xfwm_flags, XFWM_FLAG_SESSION_MANAGED)
--            &&  !FLAG_TEST (c->xfwm_flags, XFWM_FLAG_WORKSPACE_SET))
-+        TRACE ("atom win_workspace specifies window \"%s\" is on desk %i", c->name, (int) val);
-+        c->win_workspace = (int) val;
-+        FLAG_SET (c->xfwm_flags, XFWM_FLAG_WORKSPACE_SET);
-+    }
-+
-+    /* This is to make sure that transient are shown with their "ancestor" window */
-+    if (!FLAG_TEST (c->flags, CLIENT_FLAG_STICKY))
-+    {
-+        c2 = clientGetTransient (c);
-+        if (c2)
-         {
-             FLAG_SET (c->xfwm_flags, XFWM_FLAG_WORKSPACE_SET);
--            c->win_workspace = c->screen_info->current_ws;
--        }
--        if (getHint (display_info, c->window, NET_WM_DESKTOP, &val))
--        {
--            TRACE ("atom net_wm_desktop detected");
--            if (val == (int) ALL_WORKSPACES)
-+            c->win_workspace = c2->win_workspace;
-+            if (FLAG_TEST (c2->flags, CLIENT_FLAG_STICKY))
-             {
--                if (FLAG_TEST (c->xfwm_flags, XFWM_FLAG_HAS_STICK) && !FLAG_TEST (c->flags, CLIENT_FLAG_STICKY))
--                {
--                    TRACE ("atom net_wm_desktop specifies window \"%s\" is sticky", c->name);
--                    FLAG_SET (c->flags, CLIENT_FLAG_STICKY);
--                    c->win_state |= WIN_STATE_STICKY;
--                }
-+                FLAG_SET (c->flags, CLIENT_FLAG_STICKY);
-+                c->win_state |= WIN_STATE_STICKY;
-                 c->win_workspace = c->screen_info->current_ws;
-             }
--            else
--            {
--                TRACE ("atom net_wm_desktop specifies window \"%s\" is on desk %i", c->name, (int) val);
--                c->win_workspace = (int) val;
--            }
--            FLAG_SET (c->xfwm_flags, XFWM_FLAG_WORKSPACE_SET);
-         }
--        else if (getHint (display_info, c->window, WIN_WORKSPACE, &val))
--        {
--            TRACE ("atom win_workspace specifies window \"%s\" is on desk %i", c->name, (int) val);
--            c->win_workspace = (int) val;
--            FLAG_SET (c->xfwm_flags, XFWM_FLAG_WORKSPACE_SET);
--        }
-     }
-+
-     TRACE ("initial desktop for window \"%s\" is %i", c->name, c->win_workspace);
-     if (c->win_workspace > c->screen_info->workspace_count - 1)
-     {
-@@ -1259,8 +1262,7 @@
-             c->initial_layer = c2->win_layer;
-             TRACE ("Applied layer is %i", c->initial_layer);
-         }
--        FLAG_UNSET (c->xfwm_flags, XFWM_FLAG_HAS_HIDE | XFWM_FLAG_HAS_STICK);
--        FLAG_UNSET (c->flags, CLIENT_FLAG_STICKY);
-+        FLAG_UNSET (c->xfwm_flags, XFWM_FLAG_HAS_HIDE);
-     }
-     if ((old_type != c->type) || (c->initial_layer != c->win_layer))
-     {

Deleted: desktop/branches/etch-backports/xfwm4/debian/patches/02_fix-xfwm4-hang.patch
===================================================================
--- desktop/branches/etch-backports/xfwm4/debian/patches/02_fix-xfwm4-hang.patch	2007-12-18 23:12:39 UTC (rev 1490)
+++ desktop/branches/etch-backports/xfwm4/debian/patches/02_fix-xfwm4-hang.patch	2007-12-19 11:42:42 UTC (rev 1491)
@@ -1,157 +0,0 @@
-Index: xfwm4/src/display.c
-===================================================================
---- xfwm4/src/display.c	(revision 25820)
-+++ xfwm4/src/display.c	(working copy)
-@@ -178,6 +178,19 @@
-                           FALSE, display_info->atoms) != 0);
- }
- 
-+static void
-+myDisplayCreateTimestampWin (DisplayInfo *display_info)
-+{
-+    XSetWindowAttributes attributes;
-+
-+    attributes.event_mask = PropertyChangeMask;
-+    attributes.override_redirect = TRUE;
-+    display_info->timestamp_win = 
-+        XCreateWindow (display_info->dpy, DefaultRootWindow (display_info->dpy),
-+                       -100, -100, 10, 10, 0, 0, CopyFromParent, CopyFromParent,
-+                       CWEventMask | CWOverrideRedirect, &attributes);
-+}
-+
- DisplayInfo *
- myDisplayInit (GdkDisplay *gdisplay)
- {
-@@ -309,6 +322,8 @@
-     display->resize_cursor[CORNER_COUNT + SIDE_BOTTOM] =
-         XCreateFontCursor (display->dpy, XC_bottom_side);
- 
-+    myDisplayCreateTimestampWin (display);
-+
-     display->xfilter = NULL;
-     display->screens = NULL;
-     display->clients = NULL;
-@@ -340,6 +355,8 @@
-     display->move_cursor = None;
-     XFreeCursor (display->dpy, display->root_cursor);
-     display->root_cursor = None;
-+    XDestroyWindow (display->dpy, display->timestamp_win);
-+    display->timestamp_win = None;
- 
-     if (display->hostname)
-     {
-Index: xfwm4/src/display.h
-===================================================================
---- xfwm4/src/display.h	(revision 25820)
-+++ xfwm4/src/display.h	(working copy)
-@@ -226,6 +226,7 @@
-     gboolean quit;
-     gboolean reload;
- 
-+    Window timestamp_win;
-     Cursor busy_cursor;
-     Cursor move_cursor;
-     Cursor root_cursor;
-Index: xfwm4/src/client.c
-===================================================================
---- xfwm4/src/client.c	(revision 25820)
-+++ xfwm4/src/client.c	(working copy)
-@@ -4868,21 +4868,19 @@
- 
-     if (passdata.c)
-     {
--        GdkPixbuf *icon;
--
-         TRACE ("entering cycle loop");
-         passdata.wireframe = wireframeCreate (passdata.c);
--        icon = getAppIcon (display_info, passdata.c->window, 32, 32);
-         passdata.tabwin = tabwinCreate (passdata.c->screen_info->gscr, c,
-                                         passdata.c, passdata.cycle_range,
-                                         screen_info->params->cycle_workspaces);
-         eventFilterPush (display_info->xfilter, clientCycleEventFilter, &passdata);
-         gtk_main ();
-         eventFilterPop (display_info->xfilter);
--        wireframeDelete (screen_info, passdata.wireframe);
-         TRACE ("leaving cycle loop");
-         tabwinDestroy (passdata.tabwin);
-         g_free (passdata.tabwin);
-+        wireframeDelete (screen_info, passdata.wireframe);
-+        updateXserverTime (display_info);
-     }
- 
-     if (passdata.c)
-Index: xfwm4/src/hints.c
-===================================================================
---- xfwm4/src/hints.c	(revision 25820)
-+++ xfwm4/src/hints.c	(working copy)
-@@ -1167,27 +1167,18 @@
-     return setXAtomManagerOwner(display_info, display_info->atoms[atom_id], root, w);
- }
- 
--
--static Bool
--checkPropEvent (Display *display, XEvent *xevent, XPointer arg)
-+void
-+updateXserverTime (DisplayInfo *display_info)
- {
--    DisplayInfo *display_info;
-     ScreenInfo *screen_info;
-+    char c = '\0';
- 
--    display_info = (DisplayInfo *) arg;
--    g_return_val_if_fail (display_info, FALSE);
-+    g_return_if_fail (display_info);
- 
--    screen_info = myDisplayGetDefaultScreen (display_info);
--    g_return_val_if_fail (screen_info, FALSE);
--
--    if ((xevent->type == PropertyNotify) &&
--        (xevent->xproperty.window == screen_info->xfwm4_win) &&
--        (xevent->xproperty.atom == display_info->atoms[XFWM4_TIMESTAMP_PROP]))
--    {
--        return TRUE;
--    }
--
--    return FALSE;
-+    XChangeProperty (display_info->dpy, display_info->timestamp_win,
-+                     display_info->atoms[XFWM4_TIMESTAMP_PROP],
-+                     display_info->atoms[XFWM4_TIMESTAMP_PROP],
-+                     8, PropModeReplace, (unsigned char *) &c, 1);
- }
- 
- Time
-@@ -1196,7 +1187,6 @@
-     ScreenInfo *screen_info;
-     XEvent xevent;
-     Time timestamp;
--    char c = '\0';
- 
-     g_return_val_if_fail (display_info, (Time) CurrentTime);
-     timestamp = myDisplayGetCurrentTime (display_info);
-@@ -1206,12 +1196,8 @@
-         g_return_val_if_fail (screen_info,  (Time) CurrentTime);
- 
-         TRACE ("getXServerTime: Using X server roundtrip");
--        XChangeProperty (display_info->dpy, screen_info->xfwm4_win, 
--                         display_info->atoms[XFWM4_TIMESTAMP_PROP],
--                         display_info->atoms[XFWM4_TIMESTAMP_PROP],
--                         8, PropModeReplace, (unsigned char *) &c, 1);
--        XIfEvent (display_info->dpy, &xevent, checkPropEvent, (XPointer) display_info);
--
-+        updateXserverTime (display_info);
-+        XWindowEvent (display_info->dpy, display_info->timestamp_win, PropertyChangeMask, &xevent);
-         timestamp = (Time) myDisplayUpdateCurrentTime (display_info, &xevent);
-     }
- 
-Index: xfwm4/src/hints.h
-===================================================================
---- xfwm4/src/hints.h	(revision 25820)
-+++ xfwm4/src/hints.h	(working copy)
-@@ -269,6 +269,7 @@
-                                                                  int, 
-                                                                  Window , 
-                                                                  Window);
-+void                     updateXserverTime                      (DisplayInfo *);
- Time                     getXServerTime                         (DisplayInfo *);
- 
- #ifdef ENABLE_KDE_SYSTRAY_PROXY

Modified: desktop/branches/etch-backports/xfwm4/debian/patches/series
===================================================================
--- desktop/branches/etch-backports/xfwm4/debian/patches/series	2007-12-18 23:12:39 UTC (rev 1490)
+++ desktop/branches/etch-backports/xfwm4/debian/patches/series	2007-12-19 11:42:42 UTC (rev 1491)
@@ -1,2 +0,0 @@
-01_xfwm4-fix-transient-windows.patch
-02_fix-xfwm4-hang.patch

Modified: desktop/branches/etch-backports/xfwm4/debian/rules
===================================================================
--- desktop/branches/etch-backports/xfwm4/debian/rules	2007-12-18 23:12:39 UTC (rev 1490)
+++ desktop/branches/etch-backports/xfwm4/debian/rules	2007-12-19 11:42:42 UTC (rev 1491)
@@ -27,8 +27,8 @@
 	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --enable-final --enable-compositor
 	touch configure-stamp
 
-build: configure build-stamp
-build-stamp:
+build: build-stamp
+build-stamp: configure
 	
 	dh_testdir
 	$(MAKE)

Modified: desktop/branches/etch-backports/xfwm4-themes/debian/changelog
===================================================================
--- desktop/branches/etch-backports/xfwm4-themes/debian/changelog	2007-12-18 23:12:39 UTC (rev 1490)
+++ desktop/branches/etch-backports/xfwm4-themes/debian/changelog	2007-12-19 11:42:42 UTC (rev 1491)
@@ -1,10 +1,26 @@
-xfwm4-themes (4.4.1-1~bpo40+1) unstable; urgency=low
+xfwm4-themes (4.4.2-1~bpo40+1) UNRELEASED; urgency=low
 
+  * rebuild for etch-backports.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Tue, 18 Dec 2007 22:53:29 +0100
+
+xfwm4-themes (4.4.2-1) unstable; urgency=low
+
+  [ Yves-Alexis Perez ]
   * New upstream release.
-  * build for etch-backports. 
+  * debian/rules: don't ignore all make errors at clean stage.
 
- -- Yves-Alexis Perez <corsac at corsac.net>  Sun, 21 Oct 2007 18:34:29 +0200
+  [ Simon Huggins ]
+  * Add Vcs-* headers to debian/control
 
+ -- Simon Huggins <huggie at earth.li>  Tue, 27 Nov 2007 16:39:21 +0000
+
+xfwm4-themes (4.4.1-1) unstable; urgency=low
+
+  * New upstream release. 
+
+ -- Yves-Alexis Perez <corsac at corsac.net>  Sun, 15 Apr 2007 15:28:17 +0100
+
 xfwm4-themes (4.4.0-1) experimental; urgency=low
 
   * New upstream release.

Modified: desktop/branches/etch-backports/xfwm4-themes/debian/control
===================================================================
--- desktop/branches/etch-backports/xfwm4-themes/debian/control	2007-12-18 23:12:39 UTC (rev 1490)
+++ desktop/branches/etch-backports/xfwm4-themes/debian/control	2007-12-19 11:42:42 UTC (rev 1491)
@@ -2,13 +2,15 @@
 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 corsac.net>
+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.7.2
+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/
 
 Package: xfwm4-themes
 Architecture: all
-Depends: xfwm4 (>= 4.4.1)
+Depends: xfwm4 (>= 4.4.2)
 Replaces: xfwm4 (<< 4.3.90.1)
 Description: Theme files for xfwm4
  This package contains several theme files for xfwm4,

Modified: desktop/branches/etch-backports/xfwm4-themes/debian/rules
===================================================================
--- desktop/branches/etch-backports/xfwm4-themes/debian/rules	2007-12-18 23:12:39 UTC (rev 1490)
+++ desktop/branches/etch-backports/xfwm4-themes/debian/rules	2007-12-19 11:42:42 UTC (rev 1491)
@@ -29,7 +29,7 @@
 	dh_testroot
 	rm -f build-stamp 
 
-	-$(MAKE) distclean
+	[ ! -f Makefile ] || $(MAKE) distclean
 ifneq "$(wildcard /usr/share/misc/config.sub)" ""
 	cp -f /usr/share/misc/config.sub config.sub
 endif




More information about the Pkg-xfce-commits mailing list