Sun Oct 21 09:58:06 UTC 2007

Author: corsac-guest
Date: 2007-10-21 09:58:05 +0000 (Sun, 21 Oct 2007)
New Revision: 1398

Added:
   desktop/branches/etch-backports/exo/debian/exo-eject.1
   desktop/branches/etch-backports/exo/debian/exo-mount.1
   desktop/branches/etch-backports/exo/debian/exo-unmount.1
   desktop/branches/etch-backports/mousepad/
   desktop/branches/etch-backports/thunar/debian/libthunar-vfs-1-2.postinst
   desktop/branches/etch-backports/thunar/debian/libthunar-vfs-1-dev.postinst
   desktop/branches/etch-backports/thunar/debian/thunar-data.docs
   desktop/branches/etch-backports/thunar/debian/thunar-data.install
   desktop/branches/etch-backports/thunar/debian/thunar.1
   desktop/branches/etch-backports/thunar/debian/thunar.manpages
   desktop/branches/etch-backports/thunar/debian/thunar.postinst
   desktop/branches/etch-backports/xfce4-dev-tools/
   desktop/branches/etch-backports/xfce4-panel/debian/patches/
   desktop/branches/etch-backports/xfce4-session/debian/README.Debian
   desktop/branches/etch-backports/xfce4-session/debian/debian-tips
   desktop/branches/etch-backports/xfce4-session/debian/patches/03_xfce4-session-manpage-typo.patch
   desktop/branches/etch-backports/xfce4-session/debian/patches/04_xfce4-session-logout-manpage-typo.patch
   desktop/branches/etch-backports/xfce4-session/debian/xfce4-autostart-editor.1
   desktop/branches/etch-backports/xfce4-session/debian/xfce4-tips.1
   desktop/branches/etch-backports/xfce4-terminal/
   desktop/branches/etch-backports/xfce4-utils/debian/xfbrowser4.1
   desktop/branches/etch-backports/xfdesktop4/debian/docs
   desktop/branches/etch-backports/xfdesktop4/debian/xfdesktop4-data.install
   desktop/branches/etch-backports/xfdesktop4/debian/xfdesktop4.install
   desktop/branches/etch-backports/xfdesktop4/debian/xfdesktop4.manpages
   desktop/branches/etch-backports/xfdesktop4/debian/xfdesktop4.menu
   desktop/branches/etch-backports/xfdesktop4/debian/xfdesktop4.postinst
   desktop/branches/etch-backports/xfdesktop4/debian/xfdesktop4.postrm
   desktop/branches/etch-backports/xfdesktop4/debian/xfdesktop4.prerm
   desktop/branches/etch-backports/xfprint4/debian/lintian
   desktop/branches/etch-backports/xfprint4/debian/xfprint4-manager.1
   desktop/branches/etch-backports/xfwm4-themes/debian/README.Debian
   desktop/branches/etch-backports/xfwm4/debian/lintian
   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
   desktop/branches/etch-backports/xfwm4/debian/patches/series
Removed:
   desktop/branches/etch-backports/dbh/
   desktop/branches/etch-backports/thunar/debian/Thunar.1
   desktop/branches/etch-backports/thunar/debian/docs
   desktop/branches/etch-backports/thunar/debian/thunar.1
   desktop/branches/etch-backports/xfdesktop4/debian/menu
   desktop/branches/etch-backports/xfdesktop4/debian/postinst
   desktop/branches/etch-backports/xfdesktop4/debian/postrm
   desktop/branches/etch-backports/xfdesktop4/debian/prerm
   desktop/branches/etch-backports/xffm4/
   desktop/branches/etch-backports/xfprint4/debian/xfprint-manager.1
   desktop/branches/etch-backports/xfwm4/debian/patches/00list
   desktop/branches/etch-backports/xfwm4/debian/patches/01_xfwm4-mouse-grab-fix.dpatch
   desktop/branches/etch-backports/xfwm4/debian/patches/xfwm4-mouse-grab-fix.patch
Modified:
   desktop/branches/etch-backports/exo/debian/changelog
   desktop/branches/etch-backports/exo/debian/control
   desktop/branches/etch-backports/exo/debian/copyright
   desktop/branches/etch-backports/exo/debian/libexo-0.3-0.install
   desktop/branches/etch-backports/exo/debian/libexo-0.3-0.postinst
   desktop/branches/etch-backports/exo/debian/libexo-0.3-0.shlibs
   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/copyright
   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/copyright
   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/copyright
   desktop/branches/etch-backports/libxfce4util/debian/libxfce4util4.install
   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/copyright
   desktop/branches/etch-backports/libxfcegui4/debian/libxfcegui4-4.shlibs
   desktop/branches/etch-backports/libxfcegui4/debian/rules
   desktop/branches/etch-backports/mousepad/debian/
   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/orage/debian/postinst
   desktop/branches/etch-backports/thunar/debian/README.Debian
   desktop/branches/etch-backports/thunar/debian/changelog
   desktop/branches/etch-backports/thunar/debian/control
   desktop/branches/etch-backports/thunar/debian/copyright
   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.install
   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/copyright
   desktop/branches/etch-backports/xfce-mcs-manager/debian/xfce-mcs-manager.1
   desktop/branches/etch-backports/xfce-mcs-manager/debian/xfce-setting-show.1
   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/copyright
   desktop/branches/etch-backports/xfce-mcs-plugins/debian/postinst
   desktop/branches/etch-backports/xfce-mcs-plugins/debian/prerm
   desktop/branches/etch-backports/xfce4-appfinder/debian/changelog
   desktop/branches/etch-backports/xfce4-appfinder/debian/control
   desktop/branches/etch-backports/xfce4-appfinder/debian/copyright
   desktop/branches/etch-backports/xfce4-appfinder/debian/menu
   desktop/branches/etch-backports/xfce4-dev-tools/debian/
   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/copyright
   desktop/branches/etch-backports/xfce4-mixer/debian/changelog
   desktop/branches/etch-backports/xfce4-mixer/debian/control
   desktop/branches/etch-backports/xfce4-mixer/debian/copyright
   desktop/branches/etch-backports/xfce4-mixer/debian/lintian-override
   desktop/branches/etch-backports/xfce4-mixer/debian/postinst
   desktop/branches/etch-backports/xfce4-mixer/debian/prerm
   desktop/branches/etch-backports/xfce4-mixer/debian/rules
   desktop/branches/etch-backports/xfce4-mixer/debian/xfce4-mixer.menu
   desktop/branches/etch-backports/xfce4-panel/debian/changelog
   desktop/branches/etch-backports/xfce4-panel/debian/control
   desktop/branches/etch-backports/xfce4-panel/debian/copyright
   desktop/branches/etch-backports/xfce4-panel/debian/rules
   desktop/branches/etch-backports/xfce4-panel/debian/xfce4-panel-dev.install
   desktop/branches/etch-backports/xfce4-panel/debian/xfce4-panel.1
   desktop/branches/etch-backports/xfce4-panel/debian/xfce4-panel.install
   desktop/branches/etch-backports/xfce4-panel/debian/xfce4-panel.postinst
   desktop/branches/etch-backports/xfce4-panel/debian/xfce4-panel.prerm
   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/copyright
   desktop/branches/etch-backports/xfce4-session/debian/lintian
   desktop/branches/etch-backports/xfce4-session/debian/patches/series
   desktop/branches/etch-backports/xfce4-session/debian/postinst
   desktop/branches/etch-backports/xfce4-session/debian/prerm
   desktop/branches/etch-backports/xfce4-session/debian/rules
   desktop/branches/etch-backports/xfce4-terminal/debian/
   desktop/branches/etch-backports/xfce4-utils/debian/changelog
   desktop/branches/etch-backports/xfce4-utils/debian/control
   desktop/branches/etch-backports/xfce4-utils/debian/copyright
   desktop/branches/etch-backports/xfce4-utils/debian/menu
   desktop/branches/etch-backports/xfce4-utils/debian/postinst
   desktop/branches/etch-backports/xfce4-utils/debian/prerm
   desktop/branches/etch-backports/xfce4-utils/debian/rules
   desktop/branches/etch-backports/xfce4-utils/debian/startxfce4.1
   desktop/branches/etch-backports/xfce4-utils/debian/xfce4-utils.1
   desktop/branches/etch-backports/xfce4-utils/debian/xfterm4.1
   desktop/branches/etch-backports/xfce4/debian/README.Debian
   desktop/branches/etch-backports/xfce4/debian/changelog
   desktop/branches/etch-backports/xfce4/debian/control
   desktop/branches/etch-backports/xfdesktop4/debian/changelog
   desktop/branches/etch-backports/xfdesktop4/debian/control
   desktop/branches/etch-backports/xfdesktop4/debian/copyright
   desktop/branches/etch-backports/xfdesktop4/debian/rules
   desktop/branches/etch-backports/xfprint4/debian/changelog
   desktop/branches/etch-backports/xfprint4/debian/control
   desktop/branches/etch-backports/xfprint4/debian/copyright
   desktop/branches/etch-backports/xfprint4/debian/menu
   desktop/branches/etch-backports/xfprint4/debian/postinst
   desktop/branches/etch-backports/xfprint4/debian/prerm
   desktop/branches/etch-backports/xfprint4/debian/rules
   desktop/branches/etch-backports/xfprint4/debian/xfprint4.1
   desktop/branches/etch-backports/xfwm4-themes/debian/changelog
   desktop/branches/etch-backports/xfwm4-themes/debian/control
   desktop/branches/etch-backports/xfwm4/debian/changelog
   desktop/branches/etch-backports/xfwm4/debian/control
   desktop/branches/etch-backports/xfwm4/debian/copyright
   desktop/branches/etch-backports/xfwm4/debian/postinst
   desktop/branches/etch-backports/xfwm4/debian/prerm
   desktop/branches/etch-backports/xfwm4/debian/rules
   desktop/branches/etch-backports/xfwm4/debian/xfwm4.1
   desktop/branches/etch-backports/xfwm4/debian/xfwm4.menu
Log:
merge changes from trunk


Modified: desktop/branches/etch-backports/exo/debian/changelog
===================================================================

--- desktop/branches/etch-backports/exo/debian/changelog	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/exo/debian/changelog	2007-10-21 09:58:05 UTC (rev 1398)
@@ -1,3 +1,62 @@
+exo (0.3.2-6) UNRELEASED; urgency=low
+
+  * debian/control: Move fake Homepage field to a real one now dpkg
+    supports it.
+
+ -- Simon Huggins <huggie at earth.li>  Sat, 20 Oct 2007 12:47:10 +0100
+
+exo (0.3.2-5) unstable; urgency=low
+
+  (Simon Huggins)
+  * Use ${binary:Version} so we are binNMU safe.
+
+  (Yves-Alexis Perez)
+  * debian/control: condition build-dep on libhal-storage-dev so package can
+    be built on hurd-i386.                                    closes: #430858
+  * debian/libexo-0.3-0.postinst: use kill -s so we don't have problem on hurd.
+
+ -- Yves-Alexis Perez <corsac at corsac.net>  Mon, 17 Sep 2007 23:20:12 +0200
+
+exo (0.3.2-4) unstable; urgency=low
+
+  * Add muttng handler just like the mutt handler             closes: #402824
+  * Depend on liburi-perl for mailto: handling                closes: #421662
+
+ -- Simon Huggins <huggie at earth.li>  Tue, 22 May 2007 12:40:34 +0100
+
+exo (0.3.2-3) unstable; urgency=low
+
+  * Upload to unstable. 
+
+ -- Yves-Alexis Perez <corsac at corsac.net>  Sun, 15 Apr 2007 15:21:10 +0100
+
+exo (0.3.2-2) experimental; urgency=low
+
+  (Yves-Alexis Perez)
+  * debian/rules:
+    - don't ship unused .la files.
+    - ship manfiles for exo-(un|)mount and exo-eject.
+  * debian/libexo-0.3-0.install: ship pixmaps.
+  * debian/copyright: updated copyright holders and added documentation
+    license.
+
+  (Emanuele Rocca)
+  * Meaningful whatis entries added to exo-mount(1), exo-umount(1) and
+    exo-eject(1).
+
+ -- Yves-Alexis Perez <corsac at corsac.net>  Sun, 08 Apr 2007 15:30:01 +0200
+
+exo (0.3.2-1) experimental; urgency=low
+
+  * New upstream release.
+  * debian/control:
+    - updated build-deps against Xfce 4.4.
+    - added build-dep on libhal-storage-dev to enable volume management with
+      thunar-volman.
+    - added dep on libhal-storage-dev for libexo-0.3-dev.
+
+ -- Yves-Alexis Perez <corsac at corsac.net>  Wed, 24 Jan 2007 23:59:38 +0100
+
 exo (0.3.1.12rc2-1) unstable; urgency=low
 
   * New upstream release.

Modified: desktop/branches/etch-backports/exo/debian/control
===================================================================
--- desktop/branches/etch-backports/exo/debian/control	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/exo/debian/control	2007-10-21 09:58:05 UTC (rev 1398)
@@ -1,29 +1,28 @@
 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>, Jani Monoses <jani at ubuntu.com>
-Build-Depends: debhelper (>= 4.0.0), libxfcegui4-dev (>= 4.3.99.2), liburi-perl, xfce4-mcs-manager-dev, 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 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]
 Standards-Version: 3.7.2
 Section: libs
+Homepage: http://libexo.os-cillation.com/
 
 Package: libexo-0.3-dev
 Section: libdevel
 Architecture: any
-Depends: libexo-0.3-0 (= ${Source-Version}), libxfcegui4-dev (>= 4.3.99.2)
+Depends: libexo-0.3-0 (= ${binary:Version}), libxfcegui4-dev (>= 4.4.1), libhal-storage-dev
 Conflicts: libexo0.3-dev
 Replaces: libexo0.3-dev
 Description: Development files for libexo
  This package contains the headers and the static library
  for libexo-0.3-0.
- .
- Homepage: http://libexo.os-cillation.com/
 
 Package: libexo-0.3-0
 Conflicts: libexo0.3-0
 Replaces: libexo0.3-0
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, liburi-perl
 Description: Library with extensions for Xfce
  libexo is a library for Xfce that contains a bunch of additional widgets and 
  a framework for editable toolbars (an improved version of the framework 
@@ -35,5 +34,3 @@
  While Xfce ships with quite a few libraries that are primarily targeted at 
  desktop development, libexo is targeted at application development, with a 
  focus on applications for Xfce.
- .
- Homepage: http://libexo.os-cillation.com/

Modified: desktop/branches/etch-backports/exo/debian/copyright
===================================================================
--- desktop/branches/etch-backports/exo/debian/copyright	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/exo/debian/copyright	2007-10-21 09:58:05 UTC (rev 1398)
@@ -5,10 +5,395 @@
 
 Upstream Author is Benedikt Meurer <benny at xfce.org>
 
-This software is copyright (c) 2004-2005 by Benedikt Meurer, os-cillation.
+The exo-binding module is based on the GObject Binding Properties library
+written by Victor Porton <porton at ex-code.com>
 
+Parts of this library are based on code from libegg, Gtk+, the GNOME project
+and the ROX Filer.
+
+This software is copyright (c) 2004-2007 by Benedikt Meurer, os-cillation.
+
+The documentation is released under the GNU Free Documentation License, version 
+1.1 or later, with no invariant sections, using the following statement:
+
+  Permission is granted to copy, distribute and/or modify this document
+  under the terms of the GNU Free Documentation License, Version 1.1 or
+  any later version published by the Free Software Foundation; with no
+  Invariant Sections, with no Front-Cover Texts, and with no Back-Cover
+  Texts. 
+
 You are free to distribute this software under the terms of
 the GNU General Public License.
 On Debian systems, the complete text of the GNU General Public
 License can be found in the file `/usr/share/common-licenses/GPL'.
 
+GFDL:
+=====
+
+		GNU Free Documentation License
+		  Version 1.2, November 2002
+
+
+ Copyright (C) 2000,2001,2002  Free Software Foundation, Inc.
+     51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+0. PREAMBLE
+
+The purpose of this License is to make a manual, textbook, or other
+functional and useful document "free" in the sense of freedom: to
+assure everyone the effective freedom to copy and redistribute it,
+with or without modifying it, either commercially or noncommercially.
+Secondarily, this License preserves for the author and publisher a way
+to get credit for their work, while not being considered responsible
+for modifications made by others.
+
+This License is a kind of "copyleft", which means that derivative
+works of the document must themselves be free in the same sense.  It
+complements the GNU General Public License, which is a copyleft
+license designed for free software.
+
+We have designed this License in order to use it for manuals for free
+software, because free software needs free documentation: a free
+program should come with manuals providing the same freedoms that the
+software does.  But this License is not limited to software manuals;
+it can be used for any textual work, regardless of subject matter or
+whether it is published as a printed book.  We recommend this License
+principally for works whose purpose is instruction or reference.
+
+
+1. APPLICABILITY AND DEFINITIONS
+
+This License applies to any manual or other work, in any medium, that
+contains a notice placed by the copyright holder saying it can be
+distributed under the terms of this License.  Such a notice grants a
+world-wide, royalty-free license, unlimited in duration, to use that
+work under the conditions stated herein.  The "Document", below,
+refers to any such manual or work.  Any member of the public is a
+licensee, and is addressed as "you".  You accept the license if you
+copy, modify or distribute the work in a way requiring permission
+under copyright law.
+
+A "Modified Version" of the Document means any work containing the
+Document or a portion of it, either copied verbatim, or with
+modifications and/or translated into another language.
+
+A "Secondary Section" is a named appendix or a front-matter section of
+the Document that deals exclusively with the relationship of the
+publishers or authors of the Document to the Document's overall subject
+(or to related matters) and contains nothing that could fall directly
+within that overall subject.  (Thus, if the Document is in part a
+textbook of mathematics, a Secondary Section may not explain any
+mathematics.)  The relationship could be a matter of historical
+connection with the subject or with related matters, or of legal,
+commercial, philosophical, ethical or political position regarding
+them.
+
+The "Invariant Sections" are certain Secondary Sections whose titles
+are designated, as being those of Invariant Sections, in the notice
+that says that the Document is released under this License.  If a
+section does not fit the above definition of Secondary then it is not
+allowed to be designated as Invariant.  The Document may contain zero
+Invariant Sections.  If the Document does not identify any Invariant
+Sections then there are none.
+
+The "Cover Texts" are certain short passages of text that are listed,
+as Front-Cover Texts or Back-Cover Texts, in the notice that says that
+the Document is released under this License.  A Front-Cover Text may
+be at most 5 words, and a Back-Cover Text may be at most 25 words.
+
+A "Transparent" copy of the Document means a machine-readable copy,
+represented in a format whose specification is available to the
+general public, that is suitable for revising the document
+straightforwardly with generic text editors or (for images composed of
+pixels) generic paint programs or (for drawings) some widely available
+drawing editor, and that is suitable for input to text formatters or
+for automatic translation to a variety of formats suitable for input
+to text formatters.  A copy made in an otherwise Transparent file
+format whose markup, or absence of markup, has been arranged to thwart
+or discourage subsequent modification by readers is not Transparent.
+An image format is not Transparent if used for any substantial amount
+of text.  A copy that is not "Transparent" is called "Opaque".
+
+Examples of suitable formats for Transparent copies include plain
+ASCII without markup, Texinfo input format, LaTeX input format, SGML
+or XML using a publicly available DTD, and standard-conforming simple
+HTML, PostScript or PDF designed for human modification.  Examples of
+transparent image formats include PNG, XCF and JPG.  Opaque formats
+include proprietary formats that can be read and edited only by
+proprietary word processors, SGML or XML for which the DTD and/or
+processing tools are not generally available, and the
+machine-generated HTML, PostScript or PDF produced by some word
+processors for output purposes only.
+
+The "Title Page" means, for a printed book, the title page itself,
+plus such following pages as are needed to hold, legibly, the material
+this License requires to appear in the title page.  For works in
+formats which do not have any title page as such, "Title Page" means
+the text near the most prominent appearance of the work's title,
+preceding the beginning of the body of the text.
+
+A section "Entitled XYZ" means a named subunit of the Document whose
+title either is precisely XYZ or contains XYZ in parentheses following
+text that translates XYZ in another language.  (Here XYZ stands for a
+specific section name mentioned below, such as "Acknowledgements",
+"Dedications", "Endorsements", or "History".)  To "Preserve the Title"
+of such a section when you modify the Document means that it remains a
+section "Entitled XYZ" according to this definition.
+
+The Document may include Warranty Disclaimers next to the notice which
+states that this License applies to the Document.  These Warranty
+Disclaimers are considered to be included by reference in this
+License, but only as regards disclaiming warranties: any other
+implication that these Warranty Disclaimers may have is void and has
+no effect on the meaning of this License.
+
+
+2. VERBATIM COPYING
+
+You may copy and distribute the Document in any medium, either
+commercially or noncommercially, provided that this License, the
+copyright notices, and the license notice saying this License applies
+to the Document are reproduced in all copies, and that you add no other
+conditions whatsoever to those of this License.  You may not use
+technical measures to obstruct or control the reading or further
+copying of the copies you make or distribute.  However, you may accept
+compensation in exchange for copies.  If you distribute a large enough
+number of copies you must also follow the conditions in section 3.
+
+You may also lend copies, under the same conditions stated above, and
+you may publicly display copies.
+
+
+3. COPYING IN QUANTITY
+
+If you publish printed copies (or copies in media that commonly have
+printed covers) of the Document, numbering more than 100, and the
+Document's license notice requires Cover Texts, you must enclose the
+copies in covers that carry, clearly and legibly, all these Cover
+Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on
+the back cover.  Both covers must also clearly and legibly identify
+you as the publisher of these copies.  The front cover must present
+the full title with all words of the title equally prominent and
+visible.  You may add other material on the covers in addition.
+Copying with changes limited to the covers, as long as they preserve
+the title of the Document and satisfy these conditions, can be treated
+as verbatim copying in other respects.
+
+If the required texts for either cover are too voluminous to fit
+legibly, you should put the first ones listed (as many as fit
+reasonably) on the actual cover, and continue the rest onto adjacent
+pages.
+
+If you publish or distribute Opaque copies of the Document numbering
+more than 100, you must either include a machine-readable Transparent
+copy along with each Opaque copy, or state in or with each Opaque copy
+a computer-network location from which the general network-using
+public has access to download using public-standard network protocols
+a complete Transparent copy of the Document, free of added material.
+If you use the latter option, you must take reasonably prudent steps,
+when you begin distribution of Opaque copies in quantity, to ensure
+that this Transparent copy will remain thus accessible at the stated
+location until at least one year after the last time you distribute an
+Opaque copy (directly or through your agents or retailers) of that
+edition to the public.
+
+It is requested, but not required, that you contact the authors of the
+Document well before redistributing any large number of copies, to give
+them a chance to provide you with an updated version of the Document.
+
+
+4. MODIFICATIONS
+
+You may copy and distribute a Modified Version of the Document under
+the conditions of sections 2 and 3 above, provided that you release
+the Modified Version under precisely this License, with the Modified
+Version filling the role of the Document, thus licensing distribution
+and modification of the Modified Version to whoever possesses a copy
+of it.  In addition, you must do these things in the Modified Version:
+
+A. Use in the Title Page (and on the covers, if any) a title distinct
+   from that of the Document, and from those of previous versions
+   (which should, if there were any, be listed in the History section
+   of the Document).  You may use the same title as a previous version
+   if the original publisher of that version gives permission.
+B. List on the Title Page, as authors, one or more persons or entities
+   responsible for authorship of the modifications in the Modified
+   Version, together with at least five of the principal authors of the
+   Document (all of its principal authors, if it has fewer than five),
+   unless they release you from this requirement.
+C. State on the Title page the name of the publisher of the
+   Modified Version, as the publisher.
+D. Preserve all the copyright notices of the Document.
+E. Add an appropriate copyright notice for your modifications
+   adjacent to the other copyright notices.
+F. Include, immediately after the copyright notices, a license notice
+   giving the public permission to use the Modified Version under the
+   terms of this License, in the form shown in the Addendum below.
+G. Preserve in that license notice the full lists of Invariant Sections
+   and required Cover Texts given in the Document's license notice.
+H. Include an unaltered copy of this License.
+I. Preserve the section Entitled "History", Preserve its Title, and add
+   to it an item stating at least the title, year, new authors, and
+   publisher of the Modified Version as given on the Title Page.  If
+   there is no section Entitled "History" in the Document, create one
+   stating the title, year, authors, and publisher of the Document as
+   given on its Title Page, then add an item describing the Modified
+   Version as stated in the previous sentence.
+J. Preserve the network location, if any, given in the Document for
+   public access to a Transparent copy of the Document, and likewise
+   the network locations given in the Document for previous versions
+   it was based on.  These may be placed in the "History" section.
+   You may omit a network location for a work that was published at
+   least four years before the Document itself, or if the original
+   publisher of the version it refers to gives permission.
+K. For any section Entitled "Acknowledgements" or "Dedications",
+   Preserve the Title of the section, and preserve in the section all
+   the substance and tone of each of the contributor acknowledgements
+   and/or dedications given therein.
+L. Preserve all the Invariant Sections of the Document,
+   unaltered in their text and in their titles.  Section numbers
+   or the equivalent are not considered part of the section titles.
+M. Delete any section Entitled "Endorsements".  Such a section
+   may not be included in the Modified Version.
+N. Do not retitle any existing section to be Entitled "Endorsements"
+   or to conflict in title with any Invariant Section.
+O. Preserve any Warranty Disclaimers.
+
+If the Modified Version includes new front-matter sections or
+appendices that qualify as Secondary Sections and contain no material
+copied from the Document, you may at your option designate some or all
+of these sections as invariant.  To do this, add their titles to the
+list of Invariant Sections in the Modified Version's license notice.
+These titles must be distinct from any other section titles.
+
+You may add a section Entitled "Endorsements", provided it contains
+nothing but endorsements of your Modified Version by various
+parties--for example, statements of peer review or that the text has
+been approved by an organization as the authoritative definition of a
+standard.
+
+You may add a passage of up to five words as a Front-Cover Text, and a
+passage of up to 25 words as a Back-Cover Text, to the end of the list
+of Cover Texts in the Modified Version.  Only one passage of
+Front-Cover Text and one of Back-Cover Text may be added by (or
+through arrangements made by) any one entity.  If the Document already
+includes a cover text for the same cover, previously added by you or
+by arrangement made by the same entity you are acting on behalf of,
+you may not add another; but you may replace the old one, on explicit
+permission from the previous publisher that added the old one.
+
+The author(s) and publisher(s) of the Document do not by this License
+give permission to use their names for publicity for or to assert or
+imply endorsement of any Modified Version.
+
+
+5. COMBINING DOCUMENTS
+
+You may combine the Document with other documents released under this
+License, under the terms defined in section 4 above for modified
+versions, provided that you include in the combination all of the
+Invariant Sections of all of the original documents, unmodified, and
+list them all as Invariant Sections of your combined work in its
+license notice, and that you preserve all their Warranty Disclaimers.
+
+The combined work need only contain one copy of this License, and
+multiple identical Invariant Sections may be replaced with a single
+copy.  If there are multiple Invariant Sections with the same name but
+different contents, make the title of each such section unique by
+adding at the end of it, in parentheses, the name of the original
+author or publisher of that section if known, or else a unique number.
+Make the same adjustment to the section titles in the list of
+Invariant Sections in the license notice of the combined work.
+
+In the combination, you must combine any sections Entitled "History"
+in the various original documents, forming one section Entitled
+"History"; likewise combine any sections Entitled "Acknowledgements",
+and any sections Entitled "Dedications".  You must delete all sections
+Entitled "Endorsements".
+
+
+6. COLLECTIONS OF DOCUMENTS
+
+You may make a collection consisting of the Document and other documents
+released under this License, and replace the individual copies of this
+License in the various documents with a single copy that is included in
+the collection, provided that you follow the rules of this License for
+verbatim copying of each of the documents in all other respects.
+
+You may extract a single document from such a collection, and distribute
+it individually under this License, provided you insert a copy of this
+License into the extracted document, and follow this License in all
+other respects regarding verbatim copying of that document.
+
+
+7. AGGREGATION WITH INDEPENDENT WORKS
+
+A compilation of the Document or its derivatives with other separate
+and independent documents or works, in or on a volume of a storage or
+distribution medium, is called an "aggregate" if the copyright
+resulting from the compilation is not used to limit the legal rights
+of the compilation's users beyond what the individual works permit.
+When the Document is included in an aggregate, this License does not
+apply to the other works in the aggregate which are not themselves
+derivative works of the Document.
+
+If the Cover Text requirement of section 3 is applicable to these
+copies of the Document, then if the Document is less than one half of
+the entire aggregate, the Document's Cover Texts may be placed on
+covers that bracket the Document within the aggregate, or the
+electronic equivalent of covers if the Document is in electronic form.
+Otherwise they must appear on printed covers that bracket the whole
+aggregate.
+
+
+8. TRANSLATION
+
+Translation is considered a kind of modification, so you may
+distribute translations of the Document under the terms of section 4.
+Replacing Invariant Sections with translations requires special
+permission from their copyright holders, but you may include
+translations of some or all Invariant Sections in addition to the
+original versions of these Invariant Sections.  You may include a
+translation of this License, and all the license notices in the
+Document, and any Warranty Disclaimers, provided that you also include
+the original English version of this License and the original versions
+of those notices and disclaimers.  In case of a disagreement between
+the translation and the original version of this License or a notice
+or disclaimer, the original version will prevail.
+
+If a section in the Document is Entitled "Acknowledgements",
+"Dedications", or "History", the requirement (section 4) to Preserve
+its Title (section 1) will typically require changing the actual
+title.
+
+
+9. TERMINATION
+
+You may not copy, modify, sublicense, or distribute the Document except
+as expressly provided for under this License.  Any other attempt to
+copy, modify, sublicense or distribute the Document is void, and will
+automatically terminate your rights under this License.  However,
+parties who have received copies, or rights, from you under this
+License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+
+10. FUTURE REVISIONS OF THIS LICENSE
+
+The Free Software Foundation may publish new, revised versions
+of the GNU Free Documentation License from time to time.  Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.  See
+http://www.gnu.org/copyleft/.
+
+Each version of the License is given a distinguishing version number.
+If the Document specifies that a particular numbered version of this
+License "or any later version" applies to it, you have the option of
+following the terms and conditions either of that specified version or
+of any later version that has been published (not as a draft) by the
+Free Software Foundation.  If the Document does not specify a version
+number of this License, you may choose any version ever published (not
+as a draft) by the Free Software Foundation.

Copied: desktop/branches/etch-backports/exo/debian/exo-eject.1 (from rev 1397, desktop/trunk/exo/debian/exo-eject.1)
===================================================================
--- desktop/branches/etch-backports/exo/debian/exo-eject.1	                        (rev 0)
+++ desktop/branches/etch-backports/exo/debian/exo-eject.1	2007-10-21 09:58:05 UTC (rev 1398)
@@ -0,0 +1,52 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.36.
+.TH EXO-EJECT "1" "January 2007" "exo-eject 0.3.2" "User Commands"
+.SH NAME
+exo-eject \- eject volumes based on their HAL UDIs or their device files
+.SH DESCRIPTION
+.SS "Usage:"
+.IP
+exo\-eject [OPTION...] Xfce mount
+.SS "Help Options:"
+.TP
+\-?, \fB\-\-help\fR
+Show help options
+.TP
+\fB\-\-help\-all\fR
+Show all help options
+.TP
+\fB\-\-help\-gtk\fR
+Show GTK+ Options
+.SS "Application Options:"
+.TP
+\fB\-e\fR, \fB\-\-eject\fR
+Eject rather than mount
+.TP
+\fB\-u\fR, \fB\-\-unmount\fR
+Unmount rather than mount
+.TP
+\fB\-h\fR, \fB\-\-hal\-udi\fR
+Mount by HAL device UDI
+.TP
+\fB\-d\fR, \fB\-\-device\fR
+Mount by device file
+.TP
+\fB\-n\fR, \fB\-\-no\-ui\fR
+Don't show any dialogs
+.TP
+\fB\-v\fR, \fB\-\-version\fR
+Print version information and exit
+.TP
+\fB\-\-display\fR=\fIDISPLAY\fR
+X display to use
+.SH AUTHOR
+Written by Benedikt Meurer <benny at xfce.org>.
+.PP
+exo\-eject comes with ABSOLUTELY NO WARRANTY,
+You may redistribute copies of exo\-eject under the terms of
+the GNU Lesser General Public License which can be found in the
+exo source package.
+.PP
+Please report bugs to <http://bugzilla.xfce.org/>.
+.SH COPYRIGHT
+Copyright \(co 2006-2007
+        os-cillation e.K. All rights reserved.

Copied: desktop/branches/etch-backports/exo/debian/exo-mount.1 (from rev 1397, desktop/trunk/exo/debian/exo-mount.1)
===================================================================
--- desktop/branches/etch-backports/exo/debian/exo-mount.1	                        (rev 0)
+++ desktop/branches/etch-backports/exo/debian/exo-mount.1	2007-10-21 09:58:05 UTC (rev 1398)
@@ -0,0 +1,52 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.36.
+.TH EXO-MOUNT "1" "January 2007" "exo-mount 0.3.2" "User Commands"
+.SH NAME
+exo-mount \- mount volumes based on their HAL UDIs or their device files
+.SH DESCRIPTION
+.SS "Usage:"
+.IP
+exo\-mount [OPTION...] Xfce mount
+.SS "Help Options:"
+.TP
+\-?, \fB\-\-help\fR
+Show help options
+.TP
+\fB\-\-help\-all\fR
+Show all help options
+.TP
+\fB\-\-help\-gtk\fR
+Show GTK+ Options
+.SS "Application Options:"
+.TP
+\fB\-e\fR, \fB\-\-eject\fR
+Eject rather than mount
+.TP
+\fB\-u\fR, \fB\-\-unmount\fR
+Unmount rather than mount
+.TP
+\fB\-h\fR, \fB\-\-hal\-udi\fR
+Mount by HAL device UDI
+.TP
+\fB\-d\fR, \fB\-\-device\fR
+Mount by device file
+.TP
+\fB\-n\fR, \fB\-\-no\-ui\fR
+Don't show any dialogs
+.TP
+\fB\-v\fR, \fB\-\-version\fR
+Print version information and exit
+.TP
+\fB\-\-display\fR=\fIDISPLAY\fR
+X display to use
+.SH AUTHOR
+Written by Benedikt Meurer <benny at xfce.org>.
+.PP
+exo\-mount comes with ABSOLUTELY NO WARRANTY,
+You may redistribute copies of exo\-mount under the terms of
+the GNU Lesser General Public License which can be found in the
+exo source package.
+.PP
+Please report bugs to <http://bugzilla.xfce.org/>.
+.SH COPYRIGHT
+Copyright \(co 2006-2007
+        os-cillation e.K. All rights reserved.

Copied: desktop/branches/etch-backports/exo/debian/exo-unmount.1 (from rev 1397, desktop/trunk/exo/debian/exo-unmount.1)
===================================================================
--- desktop/branches/etch-backports/exo/debian/exo-unmount.1	                        (rev 0)
+++ desktop/branches/etch-backports/exo/debian/exo-unmount.1	2007-10-21 09:58:05 UTC (rev 1398)
@@ -0,0 +1,52 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.36.
+.TH EXO-UNMOUNT "1" "January 2007" "exo-unmount 0.3.2" "User Commands"
+.SH NAME
+exo-unmount \- umount volumes based on their HAL UDIs or their device files
+.SH DESCRIPTION
+.SS "Usage:"
+.IP
+exo\-unmount [OPTION...] Xfce mount
+.SS "Help Options:"
+.TP
+\-?, \fB\-\-help\fR
+Show help options
+.TP
+\fB\-\-help\-all\fR
+Show all help options
+.TP
+\fB\-\-help\-gtk\fR
+Show GTK+ Options
+.SS "Application Options:"
+.TP
+\fB\-e\fR, \fB\-\-eject\fR
+Eject rather than mount
+.TP
+\fB\-u\fR, \fB\-\-unmount\fR
+Unmount rather than mount
+.TP
+\fB\-h\fR, \fB\-\-hal\-udi\fR
+Mount by HAL device UDI
+.TP
+\fB\-d\fR, \fB\-\-device\fR
+Mount by device file
+.TP
+\fB\-n\fR, \fB\-\-no\-ui\fR
+Don't show any dialogs
+.TP
+\fB\-v\fR, \fB\-\-version\fR
+Print version information and exit
+.TP
+\fB\-\-display\fR=\fIDISPLAY\fR
+X display to use
+.SH AUTHOR
+Written by Benedikt Meurer <benny at xfce.org>.
+.PP
+exo\-unmount comes with ABSOLUTELY NO WARRANTY,
+You may redistribute copies of exo\-unmount under the terms of
+the GNU Lesser General Public License which can be found in the
+exo source package.
+.PP
+Please report bugs to <http://bugzilla.xfce.org/>.
+.SH COPYRIGHT
+Copyright \(co 2006-2007
+        os-cillation e.K. All rights reserved.

Modified: desktop/branches/etch-backports/exo/debian/libexo-0.3-0.install
===================================================================
--- desktop/branches/etch-backports/exo/debian/libexo-0.3-0.install	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/exo/debian/libexo-0.3-0.install	2007-10-21 09:58:05 UTC (rev 1398)
@@ -8,4 +8,5 @@
 usr/share/icons
 usr/share/locale/*/*/*.mo
 usr/share/man/*
+usr/share/pixmaps
 usr/share/xfce4

Modified: desktop/branches/etch-backports/exo/debian/libexo-0.3-0.postinst
===================================================================
--- desktop/branches/etch-backports/exo/debian/libexo-0.3-0.postinst	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/exo/debian/libexo-0.3-0.postinst	2007-10-21 09:58:05 UTC (rev 1398)
@@ -3,8 +3,7 @@
 if [ "$1" = "configure" ]; then
 	# Get xfce-mcs-manager to reinit
 	#Hurd doesnt have pkill so we use another way
-	#pkill -USR1 -f xfce-mcs-manager || true
-	/bin/kill -USR1 `pidof xfce-mcs-manager` >/dev/null 2>&1|| true
+	kill -s USR1 `pidof xfce-mcs-manager` >/dev/null 2>&1|| true
 
 fi
 #DEBHELPER#

Modified: desktop/branches/etch-backports/exo/debian/libexo-0.3-0.shlibs
===================================================================
--- desktop/branches/etch-backports/exo/debian/libexo-0.3-0.shlibs	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/exo/debian/libexo-0.3-0.shlibs	2007-10-21 09:58:05 UTC (rev 1398)
@@ -1 +1,2 @@
-libexo-0.3 0 libexo-0.3-0 (>= 0.3.1.12rc2-1)
+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)

Modified: desktop/branches/etch-backports/exo/debian/rules
===================================================================
--- desktop/branches/etch-backports/exo/debian/rules	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/exo/debian/rules	2007-10-21 09:58:05 UTC (rev 1398)
@@ -89,8 +89,10 @@
 	-rm -f $(CURDIR)/debian/tmp/usr/lib/python$(PYVERS)/site-packages/exo-$(EXOVERS)/_exo.a
 
 	# delete the unneeded .a and .la files
-	rm -rf debian/tmp/usr/lib/xfce4/mcs-plugins/*.a
-	rm -rf debian/tmp/usr/lib/xfce4/mcs-plugins/*.la
+	rm -f debian/tmp/usr/lib/xfce4/mcs-plugins/*.a
+	rm -f debian/tmp/usr/lib/xfce4/mcs-plugins/*.la
+	rm -f debian/tmp/usr/lib/libexo-hal-0.3.la
+	rm -f debian/tmp/usr/lib/libexo-0.3.la
 
 	# Debianise
 	sed -i -e 's/^WebBrowser=.*/WebBrowser=debian-sensible-browser/' \
@@ -103,10 +105,17 @@
 	chrpath -d -k debian/tmp/usr/bin/exo-csource \
 		debian/tmp/usr/bin/exo-desktop-item-edit \
 		debian/tmp/usr/bin/exo-open \
+		debian/tmp/usr/bin/exo-mount \
 		debian/tmp/usr/lib/libexo-0.3-0/exo-helper-0.3 \
 		debian/tmp/usr/lib/libexo-0.3*.so.* \
+		debian/tmp/usr/lib/libexo-hal-0.3*.so.* \
 		debian/tmp/usr/lib/xfce4/mcs-plugins/*
 
+	# Create a muttng helper from the mutt one
+	sed -e 's/utt/uttng/;s/Icon=muttng/Icon=mutt/' \
+		<debian/tmp/usr/share/xfce4/helpers/mutt.desktop \
+		>debian/tmp/usr/share/xfce4/helpers/muttng.desktop
+
 # Build architecture-independent files here.
 binary-indep: build install
 
@@ -117,7 +126,8 @@
 	dh_installchangelogs ChangeLog
 	dh_installdocs
 	dh_installman -p$(LIBRARY_PKGNAME) debian/exo-preferred-applications.1\
-		debian/exo-desktop-item-edit.1
+		debian/exo-desktop-item-edit.1 debian/exo-mount.1 \
+		debian/exo-unmount.1 debian/exo-eject.1
 	dh_installexamples
 	dh_install --list-missing --sourcedir=debian/tmp
 	dh_link

Modified: desktop/branches/etch-backports/gtk2-engines-xfce/debian/changelog
===================================================================
--- desktop/branches/etch-backports/gtk2-engines-xfce/debian/changelog	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/gtk2-engines-xfce/debian/changelog	2007-10-21 09:58:05 UTC (rev 1398)
@@ -1,9 +1,37 @@
-gtk2-engines-xfce (2.3.99.2-2) UNRELEASED; urgency=low
+gtk2-engines-xfce (2.4.1-2) UNRELEASED; urgency=low
 
+  [ Mike Massonnet (mmassonnet) ]
   * Fix typo in the description of the package.
 
- -- Mike Massonnet (mmassonnet) <mmassonnet at gmail.com>  Tue, 07 Aug 2007 11:54:43 +0200
+  [ Simon Huggins ]
+  * debian/control: Move fake Homepage field to a real one now dpkg
+    supports it.
 
+ -- Simon Huggins <huggie at earth.li>  Sat, 20 Oct 2007 12:47:10 +0100
+
+gtk2-engines-xfce (2.4.1-1) unstable; urgency=low
+
+  * New upstream release. 
+  * debian/copyright: updated copyright holders.
+
+ -- Yves-Alexis Perez <corsac at corsac.net>  Sun, 15 Apr 2007 15:28:17 +0100
+
+gtk2-engines-xfce (2.4.0-1) experimental; urgency=low
+
+  * (Yves-Alexis Perez)
+    - New upstream release
+
+  * (Emanuele Rocca)  
+    - Convert the package to the new Gtk modules handling.      closes: #406874
+    - Bump up the libgtk2.0-dev build-dep to >= 2.10.1-1.
+    - Call dh_gtkmodules.
+    - Add ${misc:Depends}.
+    - Use the correct gtk version number in debian/rules.
+    
+    Thanks to LoÃ¯c Minier for the patch.
+
+ -- Emanuele Rocca <ema at debian.org>  Wed, 24 Jan 2007 23:43:52 +0100
+
 gtk2-engines-xfce (2.3.99.2-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-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/gtk2-engines-xfce/debian/control	2007-10-21 09:58:05 UTC (rev 1398)
@@ -3,12 +3,13 @@
 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 (>= 2.4.1-3), libx11-dev (> 2:1.0.0-6), chrpath
+Build-Depends: debhelper (>= 4.1.26), libgtk2.0-dev (>= 2.10.1-1), libx11-dev (> 2:1.0.0-6), chrpath
 Standards-Version: 3.7.2
+Homepage: http://www.xfce.org/
 
 Package: gtk2-engines-xfce
 Architecture: any
-Depends: ${shlibs:Depends}, xfce4-icon-theme
+Depends: ${misc:Depends}, ${shlibs:Depends}, xfce4-icon-theme
 Suggests: xfce4-panel
 Description: A GTK+-2.0 theme engine for Xfce
  This package contains an Xfce engine for GTK2.0 which makes you able

Modified: desktop/branches/etch-backports/gtk2-engines-xfce/debian/copyright
===================================================================
--- desktop/branches/etch-backports/gtk2-engines-xfce/debian/copyright	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/gtk2-engines-xfce/debian/copyright	2007-10-21 09:58:05 UTC (rev 1398)
@@ -12,8 +12,16 @@
    Portions based on Notif theme
    Portions based on Notif2 theme
    Portions based on original GTK theme
+   Portions based on Smooth theme by Andrew Johnson <ajgenius at ajgenius.us>
+   Portions based on IceGradient theme by  Tim Gerla <timg at means.net>
+       Tomas <C3><96>gren <stric at ing.umu.se>
+       JM Perez <jose.perez at upcnet.es>
+   Portions based on Wonderland theme by Garrett LeSage
+    Alexander Larsson
+    Owen Taylor <otaylor at redhat.com>
 
-Copyright:
+gtk2-engines-xfce is (c) 1999-2007 Olivier Fourdan
+License:
 
    This package is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

Modified: desktop/branches/etch-backports/gtk2-engines-xfce/debian/rules
===================================================================
--- desktop/branches/etch-backports/gtk2-engines-xfce/debian/rules	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/gtk2-engines-xfce/debian/rules	2007-10-21 09:58:05 UTC (rev 1398)
@@ -53,10 +53,10 @@
 	done
 
 	#Don't ship .la files:
-	rm -f `pwd`/debian/gtk2-engines-xfce/usr/lib/gtk-2.0/2.4.0/engines/libxfce.a
-	rm -f `pwd`/debian/gtk2-engines-xfce/usr/lib/gtk-2.0/2.4.0/engines/libxfce.la
+	rm -f `pwd`/debian/gtk2-engines-xfce/usr/lib/gtk-2.0/2.10.0/engines/libxfce.a
+	rm -f `pwd`/debian/gtk2-engines-xfce/usr/lib/gtk-2.0/2.10.0/engines/libxfce.la
 
-	chrpath -d -k `pwd`/debian/gtk2-engines-xfce/usr/lib/gtk-2.0/2.4.0/engines/libxfce.so
+	chrpath -d -k `pwd`/debian/gtk2-engines-xfce/usr/lib/gtk-2.0/2.10.0/engines/libxfce.so
 
 binary-indep: build install
 
@@ -68,6 +68,8 @@
 	dh_installdocs
 	dh_installchangelogs ChangeLog
 
+	dh_gtkmodules
+
 	dh_strip
 	dh_compress
 

Modified: desktop/branches/etch-backports/libxfce4mcs/debian/changelog
===================================================================
--- desktop/branches/etch-backports/libxfce4mcs/debian/changelog	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/libxfce4mcs/debian/changelog	2007-10-21 09:58:05 UTC (rev 1398)
@@ -1,3 +1,37 @@
+libxfce4mcs (4.4.1-2) UNRELEASED; urgency=low
+
+  * Use ${binary:Version} so we are binNMU safe.
+  * debian/control: Move fake Homepage field to a real one now dpkg
+    supports it.
+
+ -- Simon Huggins <huggie at earth.li>  Sat, 20 Oct 2007 12:47:10 +0100
+
+libxfce4mcs (4.4.1-1) unstable; urgency=low
+
+  * New upstream release. 
+  * debian/copyright: added Benedikt Meurer in copyright holders.
+
+ -- Yves-Alexis Perez <corsac at corsac.net>  Sun, 15 Apr 2007 15:28:17 +0100
+
+libxfce4mcs (4.4.0-2) experimental; urgency=low
+
+  * debian/rules: don't ship unused .la files. 
+
+ -- Yves-Alexis Perez <corsac at corsac.net>  Thu, 25 Jan 2007 01:29:42 +0100
+
+libxfce4mcs (4.4.0-1) experimental; urgency=low
+
+  (Yves-Alexis Perez)
+  * New upstream release.
+  * debian/control: 
+    - updated build-deps against Xfce 4.4.
+    - removed Jani from uploaders. 
+  (Emanuele Rocca)
+  * Added Suggests: devhelp.
+  * Reference manual mentioned in the long description.
+
+ -- Yves-Alexis Perez <corsac at corsac.net>  Wed, 24 Jan 2007 22:50:32 +0100
+
 libxfce4mcs (4.3.99.2-1) unstable; urgency=low
 
   * New upstream release.

Modified: desktop/branches/etch-backports/libxfce4mcs/debian/control
===================================================================
--- desktop/branches/etch-backports/libxfce4mcs/debian/control	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/libxfce4mcs/debian/control	2007-10-21 09:58:05 UTC (rev 1398)
@@ -2,9 +2,10 @@
 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>, Jani Monoses <jani at ubuntu.com>
-Build-Depends: debhelper (>= 4.0.0), libglib2.0-dev, libxfce4util-dev (>= 4.3.99.2), 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 corsac.net>
+Build-Depends: debhelper (>= 4.0.0), libglib2.0-dev, libxfce4util-dev (>= 4.4.1), libxt-dev, chrpath
 Standards-Version: 3.7.2
+Homepage: http://www.xfce.org/
 
 Package: libxfce4mcs-manager3
 Section: libs
@@ -18,8 +19,6 @@
  .
  If you intend to use Xfce4, you definitely want to install
  this package.
- .
- Homepage: http://www.xfce.org/
 
 Package: libxfce4mcs-client3
 Section: libs
@@ -33,19 +32,19 @@
  .
  If you intend to use Xfce4, you definitely want to install
  this package.
- .
- Homepage: http://www.xfce.org/
 
 Package: libxfce4mcs-dev
 Section: libdevel
 Architecture: any
-Depends: libxfce4mcs-manager3 (= ${Source-Version}), libxfce4mcs-client3 (= ${Source-Version}), libxfce4util-dev (>= 4.3.99.2)
+Depends: libxfce4mcs-manager3 (= ${binary:Version}), libxfce4mcs-client3 (= ${binary:Version}), libxfce4util-dev (>= 4.4.1)
 Replaces: libxfce4mcs-0-dev
 Conflicts: libxfce4mcs-0-dev
+Suggests: devhelp
 Description: Development files for libxfce4mcs-client and -manager
  This package contains the development files libxfce4mcs-client
  and libxfce4mcs-manager which are the main parts of the Xfce4
  configuration system. If you want to develop applications that
  use one of these two libraries, you want to install this package.
  .
- Homepage: http://www.xfce.org/
+ The libxfce4mcs Reference Manual is also included and it can be 
+ consulted with Devhelp or a web browser.

Modified: desktop/branches/etch-backports/libxfce4mcs/debian/copyright
===================================================================
--- desktop/branches/etch-backports/libxfce4mcs/debian/copyright	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/libxfce4mcs/debian/copyright	2007-10-21 09:58:05 UTC (rev 1398)
@@ -7,6 +7,7 @@
 Upstream authors are:
 			Olivier Fourdan <fourdan at xfce.org>
 			Jasper Huijsmans <jasper at moongroup.com>
+			Benedikt Meurer <benny at xfce.org>
 
 Additionally, portions based on xsettings sample implementation by Owen 
 Taylor are included.

Modified: desktop/branches/etch-backports/libxfce4mcs/debian/libxfce4mcs-client3.shlibs
===================================================================
--- desktop/branches/etch-backports/libxfce4mcs/debian/libxfce4mcs-client3.shlibs	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/libxfce4mcs/debian/libxfce4mcs-client3.shlibs	2007-10-21 09:58:05 UTC (rev 1398)
@@ -1 +1 @@
-libxfce4mcs-client 3 libxfce4mcs-client3 (>= 4.3.99.2)
+libxfce4mcs-client 3 libxfce4mcs-client3 (>= 4.4.1)

Modified: desktop/branches/etch-backports/libxfce4mcs/debian/libxfce4mcs-manager3.shlibs
===================================================================
--- desktop/branches/etch-backports/libxfce4mcs/debian/libxfce4mcs-manager3.shlibs	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/libxfce4mcs/debian/libxfce4mcs-manager3.shlibs	2007-10-21 09:58:05 UTC (rev 1398)
@@ -1 +1 @@
-libxfce4mcs-manager 3 libxfce4mcs-manager3 (>= 4.3.99.2)
+libxfce4mcs-manager 3 libxfce4mcs-manager3 (>= 4.4.1)

Modified: desktop/branches/etch-backports/libxfce4mcs/debian/rules
===================================================================
--- desktop/branches/etch-backports/libxfce4mcs/debian/rules	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/libxfce4mcs/debian/rules	2007-10-21 09:58:05 UTC (rev 1398)
@@ -52,6 +52,9 @@
 
 	$(MAKE) install DESTDIR=`pwd`/debian/tmp-install
 
+	rm -f debian/tmp-install/usr/lib/libxfce4mcs-manager.la
+	rm -f debian/tmp-install/usr/lib/libxfce4mcs-client.la
+
 	chrpath -d -k `pwd`/debian/tmp-install/usr/lib/*.so.*
 
 	dh_install --list-missing --sourcedir=debian/tmp-install

Modified: desktop/branches/etch-backports/libxfce4util/debian/changelog
===================================================================
--- desktop/branches/etch-backports/libxfce4util/debian/changelog	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/libxfce4util/debian/changelog	2007-10-21 09:58:05 UTC (rev 1398)
@@ -1,3 +1,34 @@
+libxfce4util (4.4.1-2) UNRELEASED; urgency=low
+
+  * Use ${binary:Version} so we are binNMU safe.
+  * debian/control: Move fake Homepage field to a real one now dpkg
+    supports it.
+
+ -- Simon Huggins <huggie at earth.li>  Sat, 20 Oct 2007 12:47:11 +0100
+
+libxfce4util (4.4.1-1) unstable; urgency=low
+
+  * New upstream release. 
+  * debian/copyright: updated copyright holders.
+
+ -- Yves-Alexis Perez <corsac at corsac.net>  Sun, 15 Apr 2007 15:28:17 +0100
+
+libxfce4util (4.4.0-2) experimental; urgency=low
+
+  * debian/rules: remove /usr/lib/libxfce4util.la from package.
+  * debian/libxfce4util4.install: ship locales.
+
+ -- Yves-Alexis Perez <corsac at corsac.net>  Thu, 25 Jan 2007 01:08:59 +0100
+
+libxfce4util (4.4.0-1) experimental; urgency=low
+
+  * (Yves-Alexis Perez) 
+    - New upstream release. 
+  * (Emanuele Rocca)
+    - debian/control: Added a note about the manual and suggest devhelp.
+
+ -- Yves-Alexis Perez <corsac at corsac.net>  Wed, 24 Jan 2007 22:32:30 +0100
+
 libxfce4util (4.3.99.2-1) unstable; urgency=low
 
   * New upstream release.
@@ -123,7 +154,7 @@
 libxfce4util (4.0.3-1) unstable; urgency=low
 
   * New upstream release
-  * Add libgtk2.0-dev to Depends: closes #220410
+  * Add libgtk2.0-dev to Depends: closes: #220410
   * Add Daniel Silverstone <dsilvers at debian.org> to Uploaders as approved by
     madkiss
   * Thanks to Daniel for checking and uploading these packages

Modified: desktop/branches/etch-backports/libxfce4util/debian/control
===================================================================
--- desktop/branches/etch-backports/libxfce4util/debian/control	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/libxfce4util/debian/control	2007-10-21 09:58:05 UTC (rev 1398)
@@ -5,20 +5,23 @@
 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, chrpath, quilt
 Standards-Version: 3.7.2
+Homepage: http://www.xfce.org/
 
 Package: libxfce4util-dev
 Section: libdevel
 Architecture: any
 Replaces: libxfce4util-0-dev
 Conflicts: libxfce4util-0-dev
-Depends: libxfce4util4 (= ${Source-Version}), libglib2.0-dev, libgtk2.0-dev
+Depends: libxfce4util4 (= ${binary:Version}), libglib2.0-dev, libgtk2.0-dev
+Suggests: devhelp
 Description: Development files for libxfce4util4
  This package contains the headers and the static library
  for libxfce4util4. If you intend to code applications
  for the Xfce4 desktop environment, you need to install 
  this package.
  .
- Homepage: http://www.xfce.org/
+ The libxfce4util4 Reference Manual is also included and 
+ it can be consulted using Devhelp or a web browser.
 
 Package: libxfce4util4
 Section: libs
@@ -30,5 +33,3 @@
  This package contains libxfce4util4, the basic utility
  function library for Xfce4. If you intend to run Xfce4,
  you need this library.
- .
- Homepage: http://www.xfce.org/

Modified: desktop/branches/etch-backports/libxfce4util/debian/copyright
===================================================================
--- desktop/branches/etch-backports/libxfce4util/debian/copyright	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/libxfce4util/debian/copyright	2007-10-21 09:58:05 UTC (rev 1398)
@@ -4,10 +4,16 @@
 libxfce4util can be downloaded from the official Xfce4 website, which is
 http://www.xfce.org/
 
-Upstream author: Benedikt Meurer <benedikt.meurer at unix-ag.uni-siegen.de>
+Upstream author and copyright holders are: 
+2002-2007 Benedikt Meurer <benny at xfce.org>
+2004 Jasper Huijsmans <jasper at xfce.org>
+2003 Olivier Fourdan <fourdan at xfce.org>
 
-Copyright:
+Maarten Boekhold <boekhold at emirates.net.ae>, cygwin patches.
 
+libxfce4util/abicheck.sh contains code (c) 2004 The GLib Development Team.
+License:
+
     This package is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
     License as published by the Free Software Foundation; either

Modified: desktop/branches/etch-backports/libxfce4util/debian/libxfce4util4.install
===================================================================
--- desktop/branches/etch-backports/libxfce4util/debian/libxfce4util4.install	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/libxfce4util/debian/libxfce4util4.install	2007-10-21 09:58:05 UTC (rev 1398)
@@ -1,2 +1,3 @@
 usr/lib/lib*.so.*
 usr/sbin/xfce4-kiosk-query
+usr/share/locale/

Modified: desktop/branches/etch-backports/libxfce4util/debian/rules
===================================================================
--- desktop/branches/etch-backports/libxfce4util/debian/rules	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/libxfce4util/debian/rules	2007-10-21 09:58:05 UTC (rev 1398)
@@ -60,6 +60,8 @@
 	
 	$(MAKE) install DESTDIR=`pwd`/debian/tmp
 
+	rm -f `pwd`/debian/tmp/usr/lib/libxfce4util.la
+
 	chrpath -d -k `pwd`/debian/tmp/usr/lib/*.so.* \
 		`pwd`/debian/tmp/usr/sbin/*
 
@@ -79,7 +81,7 @@
 	dh_compress
 	dh_fixperms
 
-	dh_makeshlibs -V 'libxfce4util4 (>= 4.3.99.2)'
+	dh_makeshlibs -V 'libxfce4util4 (>= 4.4.1)'
 	dh_installdeb
 
 	dh_shlibdeps

Modified: desktop/branches/etch-backports/libxfcegui4/debian/changelog
===================================================================
--- desktop/branches/etch-backports/libxfcegui4/debian/changelog	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/libxfcegui4/debian/changelog	2007-10-21 09:58:05 UTC (rev 1398)
@@ -1,3 +1,45 @@
+libxfcegui4 (4.4.1-2) UNRELEASED; urgency=low
+
+  * Use ${binary:Version} so we are binNMU safe.
+  * debian/control: Move fake Homepage field to a real one now dpkg
+    supports it.
+
+ -- Simon Huggins <huggie at earth.li>  Sat, 20 Oct 2007 12:47:11 +0100
+
+libxfcegui4 (4.4.1-1) unstable; urgency=low
+
+  * New upstream release. 
+  * debian/control: version build-dep against gtk 2.10.
+  * debian/copyright: updated copyright holders.
+
+ -- Yves-Alexis Perez <corsac at corsac.net>  Sun, 15 Apr 2007 15:28:17 +0100
+
+libxfcegui4 (4.4.0-2) experimental; urgency=low
+
+  * debian/rules: don't ship /usr/lib/libxfcegui4.la in package. 
+
+ -- Yves-Alexis Perez <corsac at corsac.net>  Thu, 25 Jan 2007 01:23:00 +0100
+
+libxfcegui4 (4.4.0-1) experimental; urgency=low
+  
+  (Yves-Alexis Perez)
+  * New upstream release.
+  * debian/control:
+    - updated build-deps against Xfce 4.4.
+    - conflicts against xfce4-panel (<< 4.4.0) because xfce-man.png switched
+      from panel to lib.
+    - conflicts against xfce4-mcs-plugins (<< 4.4.0) because
+      xfce4-filemanager.svg switched from mcs-plugins to lib.
+    - dropped totally dbh deps as it's not used anymore.
+
+  (Emanuele Rocca)
+  * debian/control:
+    - Added Suggests: devhelp.
+    - Reference manual mentioned in the long description.
+    - s/libxfcegui4-3/libxfcegui4-4/
+
+ -- Yves-Alexis Perez <corsac at corsac.net>  Wed, 24 Jan 2007 23:05:42 +0100
+
 libxfcegui4 (4.3.99.2-1) unstable; urgency=low
 
   * New upstream release.

Modified: desktop/branches/etch-backports/libxfcegui4/debian/control
===================================================================
--- desktop/branches/etch-backports/libxfcegui4/debian/control	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/libxfcegui4/debian/control	2007-10-21 09:58:05 UTC (rev 1398)
@@ -3,33 +3,34 @@
 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.3.99.2), libxt-dev, libdbh1.0-dev (>= 1.0.20-1), libxml2-dev, libstartup-notification0-dev, chrpath
+Build-Depends: debhelper (>> 4.0.0), libgtk2.0-dev (>= 2.10.6), bison, libxft-dev, libxfce4util-dev (>= 4.4.1), libxt-dev, libxml2-dev, libstartup-notification0-dev, chrpath
 Standards-Version: 3.7.2
+Homepage: http://www.xfce.org/
 
 Package: libxfcegui4-dev
 Section: libdevel
 Architecture: any
-Depends: libxfcegui4-4 (= ${Source-Version}), libxfce4util-dev (>= 4.3.99.2), libxft-dev, libxt-dev, libxpm-dev, libdbh1.0-dev (>= 1.0.20-1), libxml2-dev, libstartup-notification0-dev
+Depends: libxfcegui4-4 (= ${binary:Version}), libxfce4util-dev (>= 4.4.1), libxft-dev, libxt-dev, libxpm-dev, libxml2-dev, libstartup-notification0-dev
 Replaces: libxfcegui4-1-dev
 Conflicts: libxfcegui4-1-dev
-Description: Development files for libxfcegui4-3
+Suggests: devhelp
+Description: Development files for libxfcegui4-4
  This package contains the headers and the static library
- for libxfcegui4-3. If you intend to code applications 
+ for libxfcegui4-4. If you intend to code applications 
  which use some of these functions (probably Xfce4-based
  applications), then you have to install this package.
  .
- Homepage: http://www.xfce.org/
+ The libxfcegui4 Reference Manual is also included and it can be 
+ consulted with Devhelp or a web browser.
 
 Package: libxfcegui4-4
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
 Replaces: libxfcegui4-1, libxfcegui4-3
-Conflicts: libxfcegui4-1, libxfcegui4-3
+Conflicts: libxfcegui4-1, libxfcegui4-3, xfce4-panel (<< 4.4.0), xfce4-mcs-plugins (<< 4.4.0)
 Description: Basic GUI C functions for Xfce4
  This package contains a library which provides the very
  basic GUI functions used by the Xfce4 desktop suite. If
  you intend to run Xfce4, then you need to install this 
  package.
- .
- Homepage: http://www.xfce.org/

Modified: desktop/branches/etch-backports/libxfcegui4/debian/copyright
===================================================================
--- desktop/branches/etch-backports/libxfcegui4/debian/copyright	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/libxfcegui4/debian/copyright	2007-10-21 09:58:05 UTC (rev 1398)
@@ -3,16 +3,21 @@
 
 This library can be fetched from http://www.xfce4.org/
 
-Upstream Authors: Olivier Fourdan <fourdan at xfce.org>
-		  Jasper Huijsmans <huysmans at users.sourceforge.net>
+Upstream Authors and copyright holders: 
+Olivier Fourdan <fourdan at xfce.org>
+Jasper Huijsmans <huysmans at users.sourceforge.net>
+Benedikt Meurer <benny at xfce.org>
+Brian Tarricone <bjt23 at cornell.edu>
 
 Portions of code were taken from the following projects:
 
-		  libwnck by Havoc Pennington <hp at redhat.com>
-                  preview_file_selector widget from gnome by Rachel Hestilow <hestilow at ximian.com>
-                  default icon from FreeIcons theme set by tmielnik75
+  libwnck by Havoc Pennington <hp at redhat.com>
+  preview_file_selector widget from gnome by 
+    Rachel Hestilow <hestilow at ximian.com>
+  default icon from FreeIcons theme set by tmielnik75
+  urgency notification based on Matthew Eaton's patch for libwnck
 
-Copyright:
+License:
 
     This package is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public

Modified: desktop/branches/etch-backports/libxfcegui4/debian/libxfcegui4-4.shlibs
===================================================================
--- desktop/branches/etch-backports/libxfcegui4/debian/libxfcegui4-4.shlibs	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/libxfcegui4/debian/libxfcegui4-4.shlibs	2007-10-21 09:58:05 UTC (rev 1398)
@@ -1 +1 @@
-libxfcegui4 4 libxfcegui4-4 (>= 4.3.99.2)
+libxfcegui4 4 libxfcegui4-4 (>= 4.4.1)

Modified: desktop/branches/etch-backports/libxfcegui4/debian/rules
===================================================================
--- desktop/branches/etch-backports/libxfcegui4/debian/rules	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/libxfcegui4/debian/rules	2007-10-21 09:58:05 UTC (rev 1398)
@@ -49,6 +49,8 @@
 
 	$(MAKE) install DESTDIR=`pwd`/debian/tmp
 
+	rm -f `pwd`/debian/tmp/usr/lib/libxfcegui4.la
+
 	chrpath -d -k `pwd`/debian/tmp/usr/lib/*.so.*
 
 binary-indep: build install

Copied: desktop/branches/etch-backports/mousepad (from rev 1397, desktop/trunk/mousepad)

Modified: desktop/branches/etch-backports/orage/debian/changelog
===================================================================
--- desktop/branches/etch-backports/orage/debian/changelog	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/orage/debian/changelog	2007-10-21 09:58:05 UTC (rev 1398)
@@ -1,3 +1,28 @@
+orage (4.4.1-2) UNRELEASED; urgency=low
+
+  * debian/control: Move fake Homepage field to a real one now dpkg
+    supports it.
+
+ -- Simon Huggins <huggie at earth.li>  Sat, 20 Oct 2007 12:47:11 +0100
+
+orage (4.4.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/postinst: use posix kill -s to avoid problems on hurd.
+
+ -- Yves-Alexis Perez <corsac at corsac.net>  Mon, 17 Sep 2007 23:30:32 +0200
+
+orage (4.4.0-1) experimental; urgency=low
+  
+  (Yves-Alexis Perez)
+  * New upstream release.
+  * debian/control: updated build-deps against Xfce 4.4.
+
+  (Emanuele Rocca)
+  * Added versioned build-dep against libgtk2.0-dev (>= 2.10.1).
+
+ -- Yves-Alexis Perez <corsac at corsac.net>  Sun, 04 Feb 2007 13:31:23 +0100
+
 orage (4.3.99.2-1) unstable; urgency=low
 
   * New upstream release.

Modified: desktop/branches/etch-backports/orage/debian/control
===================================================================
--- desktop/branches/etch-backports/orage/debian/control	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/orage/debian/control	2007-10-21 09:58:05 UTC (rev 1398)
@@ -3,8 +3,9 @@
 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.3.99.2), cdbs, libxml-parser-perl, xfce4-panel-dev (>= 4.3.99.2), chrpath
+Build-Depends: debhelper (>= 4.1.0), xfce4-mcs-manager-dev (>= 4.4.1), cdbs, libxml-parser-perl, libgtk2.0-dev (>= 2.10.1), xfce4-panel-dev (>= 4.4.1), chrpath
 Standards-Version: 3.7.2
+Homepage: http://www.xfce.org/
 
 Package: orage
 Architecture: any
@@ -17,6 +18,3 @@
  configurable and supports alerts based on dates. If you are looking
  for a good graphical calendar, you will probably want to try out
  orage. It stores its data in iCal format.
- .
- Homepage: http://www.xfce.org/
-

Modified: desktop/branches/etch-backports/orage/debian/copyright
===================================================================
--- desktop/branches/etch-backports/orage/debian/copyright	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/orage/debian/copyright	2007-10-21 09:58:05 UTC (rev 1398)
@@ -3,8 +3,19 @@
 
 It was downloaded from http://foo-projects.org/~korbinus/orage/
 
-Copyright Holder: Mickaël Graf <korbinus at xfce.org>
+Upstream authors:
+Mickael Graf <korbinus at xfce.org>
+Juha Kautto <juha at xfce.org>
+Benedikt Meurer <benny at xfce.org>
+Edscott Wilson Garcia <edscott at xfce.org>
 
+Copyright Holders: 
+(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>
+
+panel-plugin is (c) 2006-2007 Juha Kautto <juha at xfce.org>
+
 License:
 
 Orage is licensed under the GNU General Public License. It contains libical, 

Modified: desktop/branches/etch-backports/orage/debian/postinst
===================================================================
--- desktop/branches/etch-backports/orage/debian/postinst	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/orage/debian/postinst	2007-10-21 09:58:05 UTC (rev 1398)
@@ -2,7 +2,7 @@
 
 if [ "$1" = "configure" ]; then
 	# Get xfce-mcs-manager to reinit
-	/bin/kill -USR1 `pidof xfce-mcs-manager` >/dev/null 2>&1|| true
+	kill -s USR1 `pidof xfce-mcs-manager` >/dev/null 2>&1|| true
 
 fi
 

Modified: desktop/branches/etch-backports/thunar/debian/README.Debian
===================================================================
--- desktop/branches/etch-backports/thunar/debian/README.Debian	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/thunar/debian/README.Debian	2007-10-21 09:58:05 UTC (rev 1398)
@@ -1,12 +1,10 @@
 thunar for Debian
 -----------------
 
-This version is an svn snapshot of Thunar, and thus can have lots of bugs. 
-It's proposed for testing purposes. Don't forget to report bugs.
+In order to use volume management features (i.e. mounting external disks/USB
+sticks/cameras etc) you should install hal and dbus.
 
-In order to use volume management features, you should install hal, 
-dbus-1-utils and pmount packages. 
+You also need to add yourself to the plugdev group and you may need to
+restart dbus after doing so if it is already running.
 
-You also need to add yourself to the plugdev group, so you can use pmount.
-
- -- Yves-Alexis Perez <corsac at corsac.net>, Mon, 06 Mar 2006 12:46:52 +0100
+ -- Xfce Packagers <pkg-xfce-devel at lists.alioth.debian.org>

Deleted: desktop/branches/etch-backports/thunar/debian/Thunar.1
===================================================================
--- desktop/branches/etch-backports/thunar/debian/Thunar.1	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/thunar/debian/Thunar.1	2007-10-21 09:58:05 UTC (rev 1398)
@@ -1 +0,0 @@
-.so man1/thunar.1

Modified: desktop/branches/etch-backports/thunar/debian/changelog
===================================================================
--- desktop/branches/etch-backports/thunar/debian/changelog	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/thunar/debian/changelog	2007-10-21 09:58:05 UTC (rev 1398)
@@ -1,9 +1,66 @@
-thunar (0.5.0rc2-2) UNRELEASED; urgency=low
+thunar (0.8.0-7) UNRELEASED; urgency=low
 
-  * debian/control: recommends dbus.				closes: #402419
+  * debian/thunar.menu: switch to new menu policy. 
 
- -- Yves-Alexis Perez <corsac at corsac.net>  Mon, 11 Dec 2006 23:32:21 +0100
+ -- Yves-Alexis Perez <corsac at corsac.net>  Wed, 08 Aug 2007 08:06:05 +0200
 
+thunar (0.8.0-6) unstable; urgency=low
+
+  (Yves-Alexis Perez)
+  * debian/control: build against libpcre3-dev to enable regexp in thunar mass
+    renamer.                                                    closes: #434230
+  (Simon Huggins)
+  * Fix doc symlinks in packages.
+
+ -- Yves-Alexis Perez <corsac at corsac.net>  Tue, 07 Aug 2007 12:33:14 +0100
+
+thunar (0.8.0-5) unstable; urgency=low
+
+  * Upload to unstable now it's through NEW.
+
+ -- Simon Huggins <huggie at earth.li>  Wed, 27 Jun 2007 12:41:14 +0100
+
+thunar (0.8.0-4) experimental; urgency=low
+
+  * Split out the architecture independent files.
+  * Use ${binary:Version} so that we can be binNMU'd safely.
+
+ -- Simon Huggins <huggie at earth.li>  Fri, 25 May 2007 16:06:19 +0100
+
+thunar (0.8.0-3) unstable; urgency=low
+
+  * debian/control: Suggests thunar-volman
+  * debian/control: Ship README.Debian again                    closes: #415487
+
+ -- Simon Huggins <huggie at earth.li>  Tue, 22 May 2007 14:19:39 +0100
+
+thunar (0.8.0-2) unstable; urgency=low
+
+  * debian/copyright: updated copyright holders and license for documentation. 
+
+ -- Yves-Alexis Perez <corsac at corsac.net>  Sun, 15 Apr 2007 15:28:17 +0100
+
+thunar (0.8.0-1) experimental; urgency=low
+  
+  (Yves-Alexis Perez)
+  * New upstream release.
+    - zn_CH translation updated.				closes: #406634
+  * debian/control:
+    - updated build-deps against Xfce 4.4.
+    - recommends dbus.						closes: #402419
+    - recommends gamin
+    - drop recommends on pmount as mount is now managed trough hal.
+    - build-dep against libfam-dev instead of libgamin-dev so users can then
+    choose.
+  * remove Thunar.1 from package as it's now shipped upstream. Provide a
+    symbolic link from thunar.1 to Thunar.1.
+  * debian/thunar.install: ship everything in /usr/share/
+
+  (Emanuele Rocca)
+  * Added versioned build-dep on libgtk2.0-dev (>= 2.10.1).
+
+ -- Yves-Alexis Perez <corsac at corsac.net>  Sun, 28 Jan 2007 15:50:35 +0100
+
 thunar (0.5.0rc2-1) unstable; urgency=low
 
   * New upstream release.

Modified: desktop/branches/etch-backports/thunar/debian/control
===================================================================
--- desktop/branches/etch-backports/thunar/debian/control	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/thunar/debian/control	2007-10-21 09:58:05 UTC (rev 1398)
@@ -3,13 +3,14 @@
 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.1.12rc2), cdbs, libxml-parser-perl, libfam-dev, libhal-storage-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], libdbus-glib-1-dev, libexif-dev, xfce4-panel-dev (>= 4.3.99.2), chrpath
+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 (>= 2.10.1), xfce4-panel-dev (>= 4.4.1), chrpath, libpcre3-dev
+Build-Conflicts: libgamin-dev
 Standards-Version: 3.7.2
 
 Package: libthunar-vfs-1-dev
 Section: libdevel
 Architecture: any
-Depends: libthunar-vfs-1-2 (= ${Source-Version}), libexo-0.3-dev (>= 0.3.1.12rc2)
+Depends: libthunar-vfs-1-2 (= ${binary:Version}), libexo-0.3-dev (>= 0.3.2)
 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
@@ -26,14 +27,19 @@
 
 Package: thunar
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, desktop-file-utils, shared-mime-info
-Recommends: hal, pmount, dbus
+Depends: ${shlibs:Depends}, ${misc:Depends}, desktop-file-utils, shared-mime-info, thunar-data (= ${source:Version})
+Recommends: hal, dbus, gamin
 Conflicts: libthunar-vfs-1 (<= 0.2.0alpha-r19548-3)
 Replaces: libthunar-vfs-dev (<= 0.3.0beta1-2)
-Suggests: thunar-archive-plugin, thunar-media-tags-plugin
+Suggests: thunar-archive-plugin, thunar-media-tags-plugin, thunar-volman
 Description: File Manager for Xfce
  Thunar is the file manager designed to be the default file manager of Xfce 4.4
  It has been designed to be fast and easy to use.
- .
- Please read README.Debian concerning volume management stuff.
+  .
+  Please read README.Debian for volume management stuff.
 
+Package: thunar-data
+Architecture: all
+Replaces: thunar (<= 0.8.0-3)
+Description: Provides thunar documentation, icons and translations
+ This package contains architecture-independent files for thunar.

Modified: desktop/branches/etch-backports/thunar/debian/copyright
===================================================================
--- desktop/branches/etch-backports/thunar/debian/copyright	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/thunar/debian/copyright	2007-10-21 09:58:05 UTC (rev 1398)
@@ -3,11 +3,11 @@
 
 It was downloaded from http://thunar.xfce.org/download/releases/pre-alpha/
 
-Copyright Holder: Benedikt Meurer <benny at xfce.org>
+Copyright Holders: 
+==================
 
-Licenses: 
-GNU/LGPL for files under thunarx, thunar-vfs , tdb folders
-GNU/GPL for the others
+2004-2007 Benedikt Meurer <benny at xfce.org>
+2005 Jeffs Franks <jcfranks at xfce.org>
 
 thunarx is copyrighted:
 
@@ -28,7 +28,393 @@
 Copyright (c) 2000-2003 Jeremy Allison <jeremy at valinux.com>
 Copyright (c) 2001      Andrew Esh
 
+Licenses: 
+=========
+
+GNU/LGPL for files under thunarx, thunar-vfs , tdb folders
+GNU/GPL for the others
+
 On Debian systems, the complete text of the GNU General Public
 License can be found in the file `/usr/share/common-licenses/GPL'
 The complete text of the GNU Library General Public License can be
 found in the file `/usr/share/common-licenses/LGPL'
+
+GNU/FDL v1.1 or later for documentation, with no invariant sections, using the 
+following statement:
+
+  Permission is granted to copy, distribute and/or modify this document
+  under the terms of the GNU Free Documentation License, Version 1.1 or
+  any later version published by the Free Software Foundation; with no
+  Invariant Sections, with no Front-Cover Texts, and with no Back-Cover
+  Texts.
+
+GFDL v1.2:
+==========
+
+		GNU Free Documentation License
+		  Version 1.2, November 2002
+
+
+ Copyright (C) 2000,2001,2002  Free Software Foundation, Inc.
+     51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+0. PREAMBLE
+
+The purpose of this License is to make a manual, textbook, or other
+functional and useful document "free" in the sense of freedom: to
+assure everyone the effective freedom to copy and redistribute it,
+with or without modifying it, either commercially or noncommercially.
+Secondarily, this License preserves for the author and publisher a way
+to get credit for their work, while not being considered responsible
+for modifications made by others.
+
+This License is a kind of "copyleft", which means that derivative
+works of the document must themselves be free in the same sense.  It
+complements the GNU General Public License, which is a copyleft
+license designed for free software.
+
+We have designed this License in order to use it for manuals for free
+software, because free software needs free documentation: a free
+program should come with manuals providing the same freedoms that the
+software does.  But this License is not limited to software manuals;
+it can be used for any textual work, regardless of subject matter or
+whether it is published as a printed book.  We recommend this License
+principally for works whose purpose is instruction or reference.
+
+
+1. APPLICABILITY AND DEFINITIONS
+
+This License applies to any manual or other work, in any medium, that
+contains a notice placed by the copyright holder saying it can be
+distributed under the terms of this License.  Such a notice grants a
+world-wide, royalty-free license, unlimited in duration, to use that
+work under the conditions stated herein.  The "Document", below,
+refers to any such manual or work.  Any member of the public is a
+licensee, and is addressed as "you".  You accept the license if you
+copy, modify or distribute the work in a way requiring permission
+under copyright law.
+
+A "Modified Version" of the Document means any work containing the
+Document or a portion of it, either copied verbatim, or with
+modifications and/or translated into another language.
+
+A "Secondary Section" is a named appendix or a front-matter section of
+the Document that deals exclusively with the relationship of the
+publishers or authors of the Document to the Document's overall subject
+(or to related matters) and contains nothing that could fall directly
+within that overall subject.  (Thus, if the Document is in part a
+textbook of mathematics, a Secondary Section may not explain any
+mathematics.)  The relationship could be a matter of historical
+connection with the subject or with related matters, or of legal,
+commercial, philosophical, ethical or political position regarding
+them.
+
+The "Invariant Sections" are certain Secondary Sections whose titles
+are designated, as being those of Invariant Sections, in the notice
+that says that the Document is released under this License.  If a
+section does not fit the above definition of Secondary then it is not
+allowed to be designated as Invariant.  The Document may contain zero
+Invariant Sections.  If the Document does not identify any Invariant
+Sections then there are none.
+
+The "Cover Texts" are certain short passages of text that are listed,
+as Front-Cover Texts or Back-Cover Texts, in the notice that says that
+the Document is released under this License.  A Front-Cover Text may
+be at most 5 words, and a Back-Cover Text may be at most 25 words.
+
+A "Transparent" copy of the Document means a machine-readable copy,
+represented in a format whose specification is available to the
+general public, that is suitable for revising the document
+straightforwardly with generic text editors or (for images composed of
+pixels) generic paint programs or (for drawings) some widely available
+drawing editor, and that is suitable for input to text formatters or
+for automatic translation to a variety of formats suitable for input
+to text formatters.  A copy made in an otherwise Transparent file
+format whose markup, or absence of markup, has been arranged to thwart
+or discourage subsequent modification by readers is not Transparent.
+An image format is not Transparent if used for any substantial amount
+of text.  A copy that is not "Transparent" is called "Opaque".
+
+Examples of suitable formats for Transparent copies include plain
+ASCII without markup, Texinfo input format, LaTeX input format, SGML
+or XML using a publicly available DTD, and standard-conforming simple
+HTML, PostScript or PDF designed for human modification.  Examples of
+transparent image formats include PNG, XCF and JPG.  Opaque formats
+include proprietary formats that can be read and edited only by
+proprietary word processors, SGML or XML for which the DTD and/or
+processing tools are not generally available, and the
+machine-generated HTML, PostScript or PDF produced by some word
+processors for output purposes only.
+
+The "Title Page" means, for a printed book, the title page itself,
+plus such following pages as are needed to hold, legibly, the material
+this License requires to appear in the title page.  For works in
+formats which do not have any title page as such, "Title Page" means
+the text near the most prominent appearance of the work's title,
+preceding the beginning of the body of the text.
+
+A section "Entitled XYZ" means a named subunit of the Document whose
+title either is precisely XYZ or contains XYZ in parentheses following
+text that translates XYZ in another language.  (Here XYZ stands for a
+specific section name mentioned below, such as "Acknowledgements",
+"Dedications", "Endorsements", or "History".)  To "Preserve the Title"
+of such a section when you modify the Document means that it remains a
+section "Entitled XYZ" according to this definition.
+
+The Document may include Warranty Disclaimers next to the notice which
+states that this License applies to the Document.  These Warranty
+Disclaimers are considered to be included by reference in this
+License, but only as regards disclaiming warranties: any other
+implication that these Warranty Disclaimers may have is void and has
+no effect on the meaning of this License.
+
+
+2. VERBATIM COPYING
+
+You may copy and distribute the Document in any medium, either
+commercially or noncommercially, provided that this License, the
+copyright notices, and the license notice saying this License applies
+to the Document are reproduced in all copies, and that you add no other
+conditions whatsoever to those of this License.  You may not use
+technical measures to obstruct or control the reading or further
+copying of the copies you make or distribute.  However, you may accept
+compensation in exchange for copies.  If you distribute a large enough
+number of copies you must also follow the conditions in section 3.
+
+You may also lend copies, under the same conditions stated above, and
+you may publicly display copies.
+
+
+3. COPYING IN QUANTITY
+
+If you publish printed copies (or copies in media that commonly have
+printed covers) of the Document, numbering more than 100, and the
+Document's license notice requires Cover Texts, you must enclose the
+copies in covers that carry, clearly and legibly, all these Cover
+Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on
+the back cover.  Both covers must also clearly and legibly identify
+you as the publisher of these copies.  The front cover must present
+the full title with all words of the title equally prominent and
+visible.  You may add other material on the covers in addition.
+Copying with changes limited to the covers, as long as they preserve
+the title of the Document and satisfy these conditions, can be treated
+as verbatim copying in other respects.
+
+If the required texts for either cover are too voluminous to fit
+legibly, you should put the first ones listed (as many as fit
+reasonably) on the actual cover, and continue the rest onto adjacent
+pages.
+
+If you publish or distribute Opaque copies of the Document numbering
+more than 100, you must either include a machine-readable Transparent
+copy along with each Opaque copy, or state in or with each Opaque copy
+a computer-network location from which the general network-using
+public has access to download using public-standard network protocols
+a complete Transparent copy of the Document, free of added material.
+If you use the latter option, you must take reasonably prudent steps,
+when you begin distribution of Opaque copies in quantity, to ensure
+that this Transparent copy will remain thus accessible at the stated
+location until at least one year after the last time you distribute an
+Opaque copy (directly or through your agents or retailers) of that
+edition to the public.
+
+It is requested, but not required, that you contact the authors of the
+Document well before redistributing any large number of copies, to give
+them a chance to provide you with an updated version of the Document.
+
+
+4. MODIFICATIONS
+
+You may copy and distribute a Modified Version of the Document under
+the conditions of sections 2 and 3 above, provided that you release
+the Modified Version under precisely this License, with the Modified
+Version filling the role of the Document, thus licensing distribution
+and modification of the Modified Version to whoever possesses a copy
+of it.  In addition, you must do these things in the Modified Version:
+
+A. Use in the Title Page (and on the covers, if any) a title distinct
+   from that of the Document, and from those of previous versions
+   (which should, if there were any, be listed in the History section
+   of the Document).  You may use the same title as a previous version
+   if the original publisher of that version gives permission.
+B. List on the Title Page, as authors, one or more persons or entities
+   responsible for authorship of the modifications in the Modified
+   Version, together with at least five of the principal authors of the
+   Document (all of its principal authors, if it has fewer than five),
+   unless they release you from this requirement.
+C. State on the Title page the name of the publisher of the
+   Modified Version, as the publisher.
+D. Preserve all the copyright notices of the Document.
+E. Add an appropriate copyright notice for your modifications
+   adjacent to the other copyright notices.
+F. Include, immediately after the copyright notices, a license notice
+   giving the public permission to use the Modified Version under the
+   terms of this License, in the form shown in the Addendum below.
+G. Preserve in that license notice the full lists of Invariant Sections
+   and required Cover Texts given in the Document's license notice.
+H. Include an unaltered copy of this License.
+I. Preserve the section Entitled "History", Preserve its Title, and add
+   to it an item stating at least the title, year, new authors, and
+   publisher of the Modified Version as given on the Title Page.  If
+   there is no section Entitled "History" in the Document, create one
+   stating the title, year, authors, and publisher of the Document as
+   given on its Title Page, then add an item describing the Modified
+   Version as stated in the previous sentence.
+J. Preserve the network location, if any, given in the Document for
+   public access to a Transparent copy of the Document, and likewise
+   the network locations given in the Document for previous versions
+   it was based on.  These may be placed in the "History" section.
+   You may omit a network location for a work that was published at
+   least four years before the Document itself, or if the original
+   publisher of the version it refers to gives permission.
+K. For any section Entitled "Acknowledgements" or "Dedications",
+   Preserve the Title of the section, and preserve in the section all
+   the substance and tone of each of the contributor acknowledgements
+   and/or dedications given therein.
+L. Preserve all the Invariant Sections of the Document,
+   unaltered in their text and in their titles.  Section numbers
+   or the equivalent are not considered part of the section titles.
+M. Delete any section Entitled "Endorsements".  Such a section
+   may not be included in the Modified Version.
+N. Do not retitle any existing section to be Entitled "Endorsements"
+   or to conflict in title with any Invariant Section.
+O. Preserve any Warranty Disclaimers.
+
+If the Modified Version includes new front-matter sections or
+appendices that qualify as Secondary Sections and contain no material
+copied from the Document, you may at your option designate some or all
+of these sections as invariant.  To do this, add their titles to the
+list of Invariant Sections in the Modified Version's license notice.
+These titles must be distinct from any other section titles.
+
+You may add a section Entitled "Endorsements", provided it contains
+nothing but endorsements of your Modified Version by various
+parties--for example, statements of peer review or that the text has
+been approved by an organization as the authoritative definition of a
+standard.
+
+You may add a passage of up to five words as a Front-Cover Text, and a
+passage of up to 25 words as a Back-Cover Text, to the end of the list
+of Cover Texts in the Modified Version.  Only one passage of
+Front-Cover Text and one of Back-Cover Text may be added by (or
+through arrangements made by) any one entity.  If the Document already
+includes a cover text for the same cover, previously added by you or
+by arrangement made by the same entity you are acting on behalf of,
+you may not add another; but you may replace the old one, on explicit
+permission from the previous publisher that added the old one.
+
+The author(s) and publisher(s) of the Document do not by this License
+give permission to use their names for publicity for or to assert or
+imply endorsement of any Modified Version.
+
+
+5. COMBINING DOCUMENTS
+
+You may combine the Document with other documents released under this
+License, under the terms defined in section 4 above for modified
+versions, provided that you include in the combination all of the
+Invariant Sections of all of the original documents, unmodified, and
+list them all as Invariant Sections of your combined work in its
+license notice, and that you preserve all their Warranty Disclaimers.
+
+The combined work need only contain one copy of this License, and
+multiple identical Invariant Sections may be replaced with a single
+copy.  If there are multiple Invariant Sections with the same name but
+different contents, make the title of each such section unique by
+adding at the end of it, in parentheses, the name of the original
+author or publisher of that section if known, or else a unique number.
+Make the same adjustment to the section titles in the list of
+Invariant Sections in the license notice of the combined work.
+
+In the combination, you must combine any sections Entitled "History"
+in the various original documents, forming one section Entitled
+"History"; likewise combine any sections Entitled "Acknowledgements",
+and any sections Entitled "Dedications".  You must delete all sections
+Entitled "Endorsements".
+
+
+6. COLLECTIONS OF DOCUMENTS
+
+You may make a collection consisting of the Document and other documents
+released under this License, and replace the individual copies of this
+License in the various documents with a single copy that is included in
+the collection, provided that you follow the rules of this License for
+verbatim copying of each of the documents in all other respects.
+
+You may extract a single document from such a collection, and distribute
+it individually under this License, provided you insert a copy of this
+License into the extracted document, and follow this License in all
+other respects regarding verbatim copying of that document.
+
+
+7. AGGREGATION WITH INDEPENDENT WORKS
+
+A compilation of the Document or its derivatives with other separate
+and independent documents or works, in or on a volume of a storage or
+distribution medium, is called an "aggregate" if the copyright
+resulting from the compilation is not used to limit the legal rights
+of the compilation's users beyond what the individual works permit.
+When the Document is included in an aggregate, this License does not
+apply to the other works in the aggregate which are not themselves
+derivative works of the Document.
+
+If the Cover Text requirement of section 3 is applicable to these
+copies of the Document, then if the Document is less than one half of
+the entire aggregate, the Document's Cover Texts may be placed on
+covers that bracket the Document within the aggregate, or the
+electronic equivalent of covers if the Document is in electronic form.
+Otherwise they must appear on printed covers that bracket the whole
+aggregate.
+
+
+8. TRANSLATION
+
+Translation is considered a kind of modification, so you may
+distribute translations of the Document under the terms of section 4.
+Replacing Invariant Sections with translations requires special
+permission from their copyright holders, but you may include
+translations of some or all Invariant Sections in addition to the
+original versions of these Invariant Sections.  You may include a
+translation of this License, and all the license notices in the
+Document, and any Warranty Disclaimers, provided that you also include
+the original English version of this License and the original versions
+of those notices and disclaimers.  In case of a disagreement between
+the translation and the original version of this License or a notice
+or disclaimer, the original version will prevail.
+
+If a section in the Document is Entitled "Acknowledgements",
+"Dedications", or "History", the requirement (section 4) to Preserve
+its Title (section 1) will typically require changing the actual
+title.
+
+
+9. TERMINATION
+
+You may not copy, modify, sublicense, or distribute the Document except
+as expressly provided for under this License.  Any other attempt to
+copy, modify, sublicense or distribute the Document is void, and will
+automatically terminate your rights under this License.  However,
+parties who have received copies, or rights, from you under this
+License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+
+10. FUTURE REVISIONS OF THIS LICENSE
+
+The Free Software Foundation may publish new, revised versions
+of the GNU Free Documentation License from time to time.  Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.  See
+http://www.gnu.org/copyleft/.
+
+Each version of the License is given a distinguishing version number.
+If the Document specifies that a particular numbered version of this
+License "or any later version" applies to it, you have the option of
+following the terms and conditions either of that specified version or
+of any later version that has been published (not as a draft) by the
+Free Software Foundation.  If the Document does not specify a version
+number of this License, you may choose any version ever published (not
+as a draft) by the Free Software Foundation.

Deleted: desktop/branches/etch-backports/thunar/debian/docs
===================================================================
--- desktop/branches/etch-backports/thunar/debian/docs	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/thunar/debian/docs	2007-10-21 09:58:05 UTC (rev 1398)
@@ -1,2 +0,0 @@
-FAQ
-HACKING

Copied: desktop/branches/etch-backports/thunar/debian/libthunar-vfs-1-2.postinst (from rev 1397, desktop/trunk/thunar/debian/libthunar-vfs-1-2.postinst)
===================================================================
--- desktop/branches/etch-backports/thunar/debian/libthunar-vfs-1-2.postinst	                        (rev 0)
+++ desktop/branches/etch-backports/thunar/debian/libthunar-vfs-1-2.postinst	2007-10-21 09:58:05 UTC (rev 1398)
@@ -0,0 +1,11 @@
+#!/bin/sh -e
+
+if [ "$1" = "configure" ]; then
+	# Frob /usr/share/doc so we don't needlessly duplicate things
+	rmdir /usr/share/doc/libthunar-vfs-1-2 2>/dev/null || true
+	cd /usr/share/doc && ln -sf thunar-data libthunar-vfs-1-2
+fi
+
+#DEBHELPER#
+
+exit 0

Modified: desktop/branches/etch-backports/thunar/debian/libthunar-vfs-1-2.shlibs
===================================================================
--- desktop/branches/etch-backports/thunar/debian/libthunar-vfs-1-2.shlibs	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/thunar/debian/libthunar-vfs-1-2.shlibs	2007-10-21 09:58:05 UTC (rev 1398)
@@ -1,2 +1,2 @@
-libthunar-vfs-1 2 libthunar-vfs-1-2 (>= 0.5.0rc2-1)
-libthunarx-1 2 libthunar-vfs-1-2 (>= 0.5.0rc2-1)
+libthunar-vfs-1 2 libthunar-vfs-1-2 (>= 0.8.0-1)
+libthunarx-1 2 libthunar-vfs-1-2 (>= 0.8.0-1)

Copied: desktop/branches/etch-backports/thunar/debian/libthunar-vfs-1-dev.postinst (from rev 1397, desktop/trunk/thunar/debian/libthunar-vfs-1-dev.postinst)
===================================================================
--- desktop/branches/etch-backports/thunar/debian/libthunar-vfs-1-dev.postinst	                        (rev 0)
+++ desktop/branches/etch-backports/thunar/debian/libthunar-vfs-1-dev.postinst	2007-10-21 09:58:05 UTC (rev 1398)
@@ -0,0 +1,11 @@
+#!/bin/sh -e
+
+if [ "$1" = "configure" ]; then
+	# Frob /usr/share/doc so we don't needlessly duplicate things
+	rmdir /usr/share/doc/libthunar-vfs-1-dev 2>/dev/null || true
+	cd /usr/share/doc && ln -sf thunar-data libthunar-vfs-1-dev
+fi
+
+#DEBHELPER#
+
+exit 0

Modified: desktop/branches/etch-backports/thunar/debian/rules
===================================================================
--- desktop/branches/etch-backports/thunar/debian/rules	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/thunar/debian/rules	2007-10-21 09:58:05 UTC (rev 1398)
@@ -13,8 +13,6 @@
 	
 
 install/thunar::
-	cd $(CURDIR)/debian/tmp/usr/share/doc/ \
-	&& mv Thunar thunar
 	rm -f $(CURDIR)/debian/tmp/usr/lib/*.la 
 	rm -f $(CURDIR)/debian/tmp/usr/lib/*/*.la 
 	chrpath -d -k $(CURDIR)/debian/tmp/usr/bin/Thunar \
@@ -23,8 +21,25 @@
 		$(CURDIR)/debian/tmp/usr/lib/thunarx-1/thunar-apr.so \
 		$(CURDIR)/debian/tmp/usr/lib/thunar/xfce4/panel-plugins/thunar-tpa
 
+install/thunar-data::
+	cd $(CURDIR)/debian/tmp/usr/share/doc/ && mv Thunar thunar-data
+	rm -rf $(CURDIR)/debian/tmp/usr/share/man
+
+# The symlinks below aren't enough for dpkg to replace a directory with a
+# symlink but they mean it's part of the package.
+
 binary-post-install/thunar::
-	dh_installman -pthunar debian/thunar.1 debian/Thunar.1
+	rm -rf $(CURDIR)/debian/thunar/usr/share/doc/thunar
+	cd $(CURDIR)/debian/thunar/usr/share/doc/ && \
+		rm -rf thunar && ln  -sf thunar-data thunar
 
 binary-post-install/libthunar-vfs-1-2::
 	install -D -p -o root -g root -m 644 debian/lintian $(CURDIR)/debian/libthunar-vfs-1/usr/share/lintian/overrides/libthunar-vfs-1
+	cd $(CURDIR)/debian/libthunar-vfs-1-2/usr/share/doc/ && \
+		rm -rf libthunar-vfs-1-2 && \
+		ln  -sf thunar-data libthunar-vfs-1-2
+
+binary-post-install/libthunar-vfs-1-dev::
+	cd $(CURDIR)/debian/libthunar-vfs-1-dev/usr/share/doc/ && \
+		rm -rf libthunar-vfs-1-dev && \
+		ln  -sf thunar-data libthunar-vfs-1-dev

Copied: desktop/branches/etch-backports/thunar/debian/thunar-data.docs (from rev 1397, desktop/trunk/thunar/debian/thunar-data.docs)
===================================================================
--- desktop/branches/etch-backports/thunar/debian/thunar-data.docs	                        (rev 0)
+++ desktop/branches/etch-backports/thunar/debian/thunar-data.docs	2007-10-21 09:58:05 UTC (rev 1398)
@@ -0,0 +1,3 @@
+debian/README.Debian
+FAQ
+HACKING

Copied: desktop/branches/etch-backports/thunar/debian/thunar-data.install (from rev 1397, desktop/trunk/thunar/debian/thunar-data.install)
===================================================================
--- desktop/branches/etch-backports/thunar/debian/thunar-data.install	                        (rev 0)
+++ desktop/branches/etch-backports/thunar/debian/thunar-data.install	2007-10-21 09:58:05 UTC (rev 1398)
@@ -0,0 +1,2 @@
+debian/tmp/etc/*
+debian/tmp/usr/share/*

Deleted: desktop/branches/etch-backports/thunar/debian/thunar.1
===================================================================
--- desktop/branches/etch-backports/thunar/debian/thunar.1	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/thunar/debian/thunar.1	2007-10-21 09:58:05 UTC (rev 1398)
@@ -1,53 +0,0 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.36.
-.TH THUNAR "1" "September 2006" "Thunar 0.4.0rc1 (Xfce 4.3.99.1)" "User Commands"
-.SH NAME
-Thunar \- Light gtk2 file manager
-.SH DESCRIPTION
-.SS "Usage:"
-.IP
-thunar [OPTION...] [FILES...]
-.SS "Help Options:"
-.TP
-\-?, \fB\-\-help\fR
-Show help options
-.TP
-\fB\-\-help\-all\fR
-Show all help options
-.TP
-\fB\-\-help\-gtk\fR
-Show GTK+ Options
-.SS "Application Options:"
-.TP
-\fB\-B\fR, \fB\-\-bulk\-rename\fR
-Open the bulk rename dialog
-.TP
-\fB\-\-daemon\fR
-Run in daemon mode
-.TP
-\fB\-q\fR, \fB\-\-quit\fR
-Quit a running Thunar instance
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Print version information and exit
-.TP
-\fB\-\-display\fR=\fIDISPLAY\fR
-X display to use
-.SH AUTHOR
-Written by Benedikt Meurer <benny at xfce.org>.
-.PP
-Please report bugs to <http://bugzilla.xfce.org/>.
-.SH COPYRIGHT
-Copyright \(co 2004-2006
-        The Thunar development team. All rights reserved.
-.SH "SEE ALSO"
-The full documentation for
-.B Thunar
-is maintained as a Texinfo manual.  If the
-.B info
-and
-.B Thunar
-programs are properly installed at your site, the command
-.IP
-.B info Thunar
-.PP
-should give you access to the complete manual.

Copied: desktop/branches/etch-backports/thunar/debian/thunar.1 (from rev 1397, desktop/trunk/thunar/debian/thunar.1)
===================================================================
--- desktop/branches/etch-backports/thunar/debian/thunar.1	                        (rev 0)
+++ desktop/branches/etch-backports/thunar/debian/thunar.1	2007-10-21 09:58:05 UTC (rev 1398)
@@ -0,0 +1 @@
+.so man1/Thunar.1

Modified: desktop/branches/etch-backports/thunar/debian/thunar.install
===================================================================
--- desktop/branches/etch-backports/thunar/debian/thunar.install	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/thunar/debian/thunar.install	2007-10-21 09:58:05 UTC (rev 1398)
@@ -1,11 +1,2 @@
 debian/tmp/usr/bin/*
-debian/tmp/etc/*
-debian/tmp/usr/share/applications/*
-debian/tmp/usr/share/dbus-1/*
-debian/tmp/usr/share/doc/*
-debian/tmp/usr/share/icons/*
-debian/tmp/usr/share/locale/*/*/*.mo
-debian/tmp/usr/share/pixmaps/*
 debian/tmp/usr/lib/thunar/*
-debian/tmp/usr/share/xfce4/*
-debian/tmp/usr/share/Thunar

Copied: desktop/branches/etch-backports/thunar/debian/thunar.manpages (from rev 1397, desktop/trunk/thunar/debian/thunar.manpages)
===================================================================
--- desktop/branches/etch-backports/thunar/debian/thunar.manpages	                        (rev 0)
+++ desktop/branches/etch-backports/thunar/debian/thunar.manpages	2007-10-21 09:58:05 UTC (rev 1398)
@@ -0,0 +1,2 @@
+debian/thunar.1
+docs/Thunar.1

Modified: desktop/branches/etch-backports/thunar/debian/thunar.menu
===================================================================
--- desktop/branches/etch-backports/thunar/debian/thunar.menu	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/thunar/debian/thunar.menu	2007-10-21 09:58:05 UTC (rev 1398)
@@ -1,2 +1,2 @@
-?package(thunar):needs="X11" section="Apps/Tools"\
+?package(thunar):needs="X11" section="Applications/File Manager"\
   title="Thunar" longtitle="Xfce4 File Manager" hints="File manager" command="/usr/bin/thunar"

Copied: desktop/branches/etch-backports/thunar/debian/thunar.postinst (from rev 1397, desktop/trunk/thunar/debian/thunar.postinst)
===================================================================
--- desktop/branches/etch-backports/thunar/debian/thunar.postinst	                        (rev 0)
+++ desktop/branches/etch-backports/thunar/debian/thunar.postinst	2007-10-21 09:58:05 UTC (rev 1398)
@@ -0,0 +1,11 @@
+#!/bin/sh -e
+
+if [ "$1" = "configure" ]; then
+	# Frob /usr/share/doc so we don't needlessly duplicate things
+	rmdir /usr/share/doc/thunar 2>/dev/null || true
+	cd /usr/share/doc && ln -sf thunar-data thunar
+fi
+
+#DEBHELPER#
+
+exit 0

Modified: desktop/branches/etch-backports/xfce-mcs-manager/debian/changelog
===================================================================
--- desktop/branches/etch-backports/xfce-mcs-manager/debian/changelog	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/xfce-mcs-manager/debian/changelog	2007-10-21 09:58:05 UTC (rev 1398)
@@ -1,3 +1,43 @@
+xfce-mcs-manager (4.4.1-2) UNRELEASED; urgency=low
+
+  [ Yves-Alexis Perez ]
+  * 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.
+
+  [ Simon Huggins ]
+  * debian/control: Move fake Homepage field to a real one now dpkg
+    supports it.
+
+ -- Simon Huggins <huggie at earth.li>  Sat, 20 Oct 2007 12:47:13 +0100
+
+xfce-mcs-manager (4.4.1-1) unstable; urgency=low
+
+  * New upstream release. 
+  * debian/copyright: update copyright holders.
+
+ -- Yves-Alexis Perez <corsac at corsac.net>  Sun, 15 Apr 2007 15:28:17 +0100
+
+xfce-mcs-manager (4.4.0-3) experimental; urgency=low
+
+  * debian/control: added versioned build-dep on libgtk to let the package
+    build correctly on experimental.
+
+ -- Yves-Alexis Perez <corsac at corsac.net>  Wed,  7 Feb 2007 22:56:11 +0100
+
+xfce-mcs-manager (4.4.0-2) experimental; urgency=low
+
+  * debian/control: add versioned dependency on hicolor-icon-theme (>=0.10) 
+
+ -- Yves-Alexis Perez <corsac at corsac.net>  Fri, 26 Jan 2007 11:15:39 +0100
+
+xfce-mcs-manager (4.4.0-1) experimental; urgency=low
+
+  * New upstream release.
+  * debian/control: updated build-deps against Xfce 4.4.
+
+ -- Yves-Alexis Perez <corsac at corsac.net>  Wed, 24 Jan 2007 23:40:38 +0100
+
 xfce-mcs-manager (4.3.99.2-1) unstable; urgency=low
 
   * New upstream release.

Modified: desktop/branches/etch-backports/xfce-mcs-manager/debian/control
===================================================================
--- desktop/branches/etch-backports/xfce-mcs-manager/debian/control	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/xfce-mcs-manager/debian/control	2007-10-21 09:58:05 UTC (rev 1398)
@@ -3,12 +3,13 @@
 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.3.99.2), libxfcegui4-dev (>= 4.3.99.2), libxft-dev, dpatch, chrpath
+Build-Depends: debhelper (>= 4.1.25), libgtk2.0-dev (>= 2.10.1), libxfce4mcs-dev (>= 4.4.1), libxfcegui4-dev (>= 4.4.1), libxft-dev, dpatch, chrpath
 Standards-Version: 3.7.2
+Homepage: http://www.xfce.org/
 
 Package: xfce4-mcs-manager
 Architecture: any
-Depends: ${shlibs:Depends}, hicolor-icon-theme
+Depends: ${shlibs:Depends}, hicolor-icon-theme (>= 0.10)
 Recommends: xfce4-mcs-plugins, xfce4-icon-theme
 Description: Settings manager for Xfce4
  This package contains xfce-mcs-manager, a tool that can be
@@ -16,18 +17,14 @@
  Additionally, it contains xfce-setting-show which can give
  you a short and quick overview over your settings. If you
  intend to install Xfce4, you most probably want this package.
- .
- Homepage: http://www.xfce.org/
- 
+
 Package: xfce4-mcs-manager-dev
 Architecture: any
 Section: devel
-Depends: libxfce4mcs-dev (>= 4.3.99.2), libxfcegui4-dev (>= 4.3.99.2)
+Depends: libxfce4mcs-dev (>= 4.4.1), libxfcegui4-dev (>= 4.4.1)
 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 
  GUI for Xfce4 desktop environment.  If you intend to develop 
  applications which use the xfce-mcs-manager, you will have to 
  install this package.
- .
- Homepage: http://www.xfce.org/

Modified: desktop/branches/etch-backports/xfce-mcs-manager/debian/copyright
===================================================================
--- desktop/branches/etch-backports/xfce-mcs-manager/debian/copyright	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/xfce-mcs-manager/debian/copyright	2007-10-21 09:58:05 UTC (rev 1398)
@@ -7,13 +7,26 @@
 Upstream authors are:
 			Olivier Fourdan <fourdan at xfce.org>
 			Jasper Huijsmans <jasper at moongroup.com>
+			Benedikt Meurer <benny at xfce.org>
 
 Additionally, portions based on gnome capplets by Jonathan Blandford 
 <jrb at gnome.org> and plugin icons from GNOME icons collection are
 included.
 
-Copyright:
+Copyright holders:
+(c) 2002 Jasper Huijsmans <jasper at xfce.org>
+(c) 2003-2006 Benedikt Meurer <benny at xfce.org>
+(c) 2002-2004 Olivier Fourdan <fourdan at xfce.org>
 
+translations are Copyright (C) 2003-2006 The Xfce development team
+except dz.po & gl.po
+
+Manual is 
+(c) 2004 FranÃ§ois Le Clainche
+(c) 2004 Jasper Huijsmans
+French translation is (c) 2005 Marie-Claude Collilieux <m.collilieux at free.fr>
+
+
    This package is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; version 2 dated June, 1991.

Modified: desktop/branches/etch-backports/xfce-mcs-manager/debian/xfce-mcs-manager.1
===================================================================
--- desktop/branches/etch-backports/xfce-mcs-manager/debian/xfce-mcs-manager.1	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/xfce-mcs-manager/debian/xfce-mcs-manager.1	2007-10-21 09:58:05 UTC (rev 1398)
@@ -10,7 +10,7 @@
 .SH SEE ALSO
 Upstream documentation in /usr/share/xfce4/doc/C/xfce-mcs-manager.html
 .SH "REPORTING BUGS"
-Report bugs to <madkiss at madkiss.org>.
+Report bugs to http://bugs.debian.org
 .SH COPYRIGHT
 Copyright \(co 2004 Simon Huggins
 .br

Modified: desktop/branches/etch-backports/xfce-mcs-manager/debian/xfce-setting-show.1
===================================================================
--- desktop/branches/etch-backports/xfce-mcs-manager/debian/xfce-setting-show.1	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/xfce-mcs-manager/debian/xfce-setting-show.1	2007-10-21 09:58:05 UTC (rev 1398)
@@ -10,7 +10,7 @@
 .SH SEE ALSO
 Upstream documentation in /usr/share/xfce4/doc/C/xfce-mcs-manager.html
 .SH "REPORTING BUGS"
-Report bugs to <madkiss at madkiss.org>.
+Report bugs to http://bugs.debian.org
 .SH COPYRIGHT
 Copyright \(co 2004 Simon Huggins
 .br

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-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/xfce-mcs-manager/debian/xfce4-mcs-manager.menu	2007-10-21 09:58:05 UTC (rev 1398)
@@ -1,5 +1,5 @@
 ?package(xfce4-mcs-manager): needs="X11"\
- section="Apps/Tools"\
+ section="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-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/xfce-mcs-plugins/debian/changelog	2007-10-21 09:58:05 UTC (rev 1398)
@@ -1,3 +1,26 @@
+xfce-mcs-plugins (4.4.1-2) UNRELEASED; 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.
+
+ -- Simon Huggins <huggie at earth.li>  Sat, 20 Oct 2007 12:47:14 +0100
+
+xfce-mcs-plugins (4.4.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/copyright: update copyright holders.
+  * debian/postinst: use posix kill -s to avoid problems on hurd. 
+
+ -- Yves-Alexis Perez <corsac at corsac.net>  Mon, 17 Sep 2007 23:34:08 +0200
+
+xfce-mcs-plugins (4.4.0-1) experimental; urgency=low
+
+  * New upstream release.
+  * debian/control: updated build-deps against Xfce 4.4.
+
+ -- Yves-Alexis Perez <corsac at corsac.net>  Sun, 04 Feb 2007 23:29:01 +0100
+
 xfce-mcs-plugins (4.3.99.2-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-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/xfce-mcs-plugins/debian/control	2007-10-21 09:58:05 UTC (rev 1398)
@@ -3,15 +3,14 @@
 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.3.99.2), libxft-dev, libxrandr-dev, libxrender-dev, libxxf86vm-dev, chrpath
+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
 Standards-Version: 3.7.2
+Homepage: http://www.xfce.org/
 
 Package: xfce4-mcs-plugins
 Architecture: any
-Depends: ${shlibs:Depends}, xfce4-mcs-manager (>= 4.3.99.2)
+Depends: ${shlibs:Depends}, xfce4-mcs-manager (>= 4.4.1)
 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 
  package, e.g. GTK settings, mouse settings and keyboard settings.
- .
- Homepage: http://www.xfce.org/

Modified: desktop/branches/etch-backports/xfce-mcs-plugins/debian/copyright
===================================================================
--- desktop/branches/etch-backports/xfce-mcs-plugins/debian/copyright	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/xfce-mcs-plugins/debian/copyright	2007-10-21 09:58:05 UTC (rev 1398)
@@ -1,17 +1,33 @@
 This package was debianized by Martin Loschwitz <madkiss at madkiss.org> on
 Sun, 16 Feb 2003 11:32:19 +0100.
 
-You can fetch the source for this package from CVS only right now.
-Instructions about how to do this can be found on 
+Upstream release has been downloaded from http://www.xfce.org
 
-	http://sourceforge.net/cvs/?group_id=19869
-	
 Upstream authors are:
   Olivier Fourdan <fourdan at xfce.org>
   Jasper Huijsmans <jasper at moongroup.com>
+  Benedikt Meurer <benny at xfce.org>
   portions based on gnome capplets by Jonathan Blandford <jrb at gnome.org>
   plugin icons are from GNOME icons collection
 
+Software is (c) 2002-2006 The Xfce development team, except:
+plugins/screensaver_plugin: (c) 2004 Danny Milosavljevic <danny_milo at yahoo.com>
+plugins/display_plugin: (c) 2003-2006 Benedikt Meurer <benny at xfce.org>
+plugins/mouse_plugin: 
+  (c) 2002 Olivier Fourdan
+  (c) 2005 Pasi Orovuo <pasi.ov at gmail.com>
+  (c) 2005 Brian Tarricone <bjt23 at cornell.edu>
+plugins/fm_plugin: (c) 2006 Benedikt Meurer <benny at xfce.org>
+plugins/keyboard_plugin: (c) 2006 Jean-Francois Wauthy <pollux at xfce.org>
+po/dz.po: (c) 2006 Canonical Ltd, and Rosetta Contributors 2006
+po/gl.po: (c) 2006 Canonical Ltd, and Rosetta Contributors 2006
+
+Manual is 
+  (c) 2004 FranÃ§ois Le Clainche
+  (c) 2004 Benedikt Meurer
+  (c) 2004 Jasper Huijsmans
+French translation is (c) 2005 Marie-Claude Collilieux
+
 Copyright:
 
    This package is free software; you can redistribute it and/or modify

Modified: desktop/branches/etch-backports/xfce-mcs-plugins/debian/postinst
===================================================================
--- desktop/branches/etch-backports/xfce-mcs-plugins/debian/postinst	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/xfce-mcs-plugins/debian/postinst	2007-10-21 09:58:05 UTC (rev 1398)
@@ -2,9 +2,7 @@
 
 if [ "$1" = "configure" ]; then
 	# Get xfce-mcs-manager to reinit
-	# hurd doesnt have procps so we do it another way
-	#pkill -USR1 -f xfce-mcs-manager || true
-	/bin/kill -USR1 `pidof xfce-mcs-manager` >/dev/null 2>&1|| true
+	kill -s USR1 `pidof xfce-mcs-manager` >/dev/null 2>&1|| true
 
 fi
 

Modified: desktop/branches/etch-backports/xfce-mcs-plugins/debian/prerm
===================================================================
--- desktop/branches/etch-backports/xfce-mcs-plugins/debian/prerm	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/xfce-mcs-plugins/debian/prerm	2007-10-21 09:58:05 UTC (rev 1398)
@@ -2,7 +2,7 @@
 
 if [ "$1" = "remove" ]; then
 	# Get xfce-mcs-manager to reinit
-	pkill -USR1 -f xfce-mcs-manager || true
+	kill -s USR1 `pidof xfce-mcs-manager` >/dev/null 2>&1 || true
 fi
 
 #DEBHELPER#

Modified: desktop/branches/etch-backports/xfce4/debian/README.Debian
===================================================================
--- desktop/branches/etch-backports/xfce4/debian/README.Debian	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/xfce4/debian/README.Debian	2007-10-21 09:58:05 UTC (rev 1398)
@@ -1,8 +1,14 @@
+First steps with Xfce
+---------------------
+
+For those using a login manager (gdm, kdm, ...) simply choosing "Xfce Session"
+is enough.
+
+Users that prefer to start X from the console can use startxfce4 or startx.
+See the relevant manual pages for more information.
+
+To adjust what is run, you can copy /etc/xdg/xfce4/xinitrc under your home
+directory in .config/xfce4/ and then hack it to match your wishes.
+
 Once you've installed this package, all the documentation will end up in
 /usr/share/xfce4/doc/C
-
-The easiest way to start is to use xfce4-session as your session manager.
-If you prefer to startx manually then read the manpage for xfce4_setup which
-should give you a working .xsession.
-
--- Simon Huggins <huggie at earth.li>  Tue, 09 Mar 2004 09:42:36 +0000

Modified: desktop/branches/etch-backports/xfce4/debian/changelog
===================================================================
--- desktop/branches/etch-backports/xfce4/debian/changelog	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/xfce4/debian/changelog	2007-10-21 09:58:05 UTC (rev 1398)
@@ -1,9 +1,41 @@
-xfce4 (4.3.99.2) UNRELEASED; urgency=low
+xfce4 (4.4.1.1) UNRELEASED; urgency=low
 
+  [ Yves-Alexis Perez ]
+  * 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.
+
+  [ Simon Huggins ]
+  * debian/control: Move fake Homepage field to a real one now dpkg
+    supports it.
+
+ -- Simon Huggins <huggie at earth.li>  Sat, 20 Oct 2007 12:47:12 +0100
+
+xfce4 (4.4.1) unstable; urgency=low
+
+  * New upstream release, translations and bugfixes.
+    see http://www.xfce.org/documentation/changelogs/4.4.1
+
+ -- Yves-Alexis Perez <corsac at corsac.net>  Sun, 15 Apr 2007 15:28:17 +0100
+
+xfce4 (4.4.0) experimental; urgency=low
+
+  (Yves-Alexis Perez)
+  * New upstream final release.                                 closes: #408760
+  (Emanuele Rocca)
+  * README.Debian rewritten.                                    closes: #373279
+
+ -- Yves-Alexis Perez <corsac at corsac.net>  Sun, 04 Feb 2007 14:58:06 +0100
+
+xfce4 (4.3.99.2) unstable; urgency=low
+
   * New upstream release candidate.
-  * debian/control: recommends desktop-base.
+  * debian/control
+    - recommends desktop-base.
+    - updated description (thanks Mike Massonnet).		closes: #405403
 
- -- Yves-Alexis Perez <corsac at corsac.net>  Mon, 27 Nov 2006 22:45:56 +0100
+ -- Yves-Alexis Perez <corsac at corsac.net>  Thu,  4 Jan 2007 15:22:02 +0100
 
 xfce4 (4.3.99.1) unstable; urgency=low
 

Modified: desktop/branches/etch-backports/xfce4/debian/control
===================================================================
--- desktop/branches/etch-backports/xfce4/debian/control	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/xfce4/debian/control	2007-10-21 09:58:05 UTC (rev 1398)
@@ -5,14 +5,19 @@
 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)
 Standards-Version: 3.7.2
+Homepage: http://www.xfce.org/
 
 Package: xfce4
 Architecture: all
-Depends: xfwm4 (>= 4.3.99.2), xfwm4-themes (>= 4.3.99.2), xfce4-mcs-plugins (>= 4.3.99.2), xfce4-panel (>= 4.3.99.2), xfce4-icon-theme (>= 4.3.99.2), xfdesktop4 (>= 4.3.99.1), thunar (>= 0.4.0rc1), xfce4-utils (>= 4.3.99.2), gtk2-engines-xfce (>= 2.3.99.2), xfce4-session (>= 4.3.99.1)
-Recommends: xfce4-mixer, xfprint4, orage, xfce4-terminal, xfmedia, desktop-base
+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)
+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)
-Suggests: x-window-system-core
-Description: meta-package for xfce4 dependencies
+Description: Meta-package for the Xfce Lightweight Desktop Environment
+ Xfce is a lightweight desktop environment for unix-like operating systems.  
+ It aims to be fast and lightweight, while still being visually appealing and 
+ easy to use.  Designed for productivity, it loads and executes applications 
+ fast, while conserving system resources. 
+ .
  This package is a meta-package;  it depends on the core packages of the
  Xfce4 desktop environment and recommends some extra Xfce4 packages.  If you
  intend to use Xfce4 and want the full experience then installing this

Modified: desktop/branches/etch-backports/xfce4-appfinder/debian/changelog
===================================================================
--- desktop/branches/etch-backports/xfce4-appfinder/debian/changelog	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/xfce4-appfinder/debian/changelog	2007-10-21 09:58:05 UTC (rev 1398)
@@ -1,3 +1,28 @@
+xfce4-appfinder (4.4.1-2) UNRELEASED; urgency=low
+
+  [ Yves-Alexis Perez ]
+  * debian/menu: switch to new menu policy.
+
+  [ Simon Huggins ]
+  * debian/control: Move fake Homepage field to a real one now dpkg
+    supports it.
+
+ -- Simon Huggins <huggie at earth.li>  Sat, 20 Oct 2007 12:47:11 +0100
+
+xfce4-appfinder (4.4.1-1) unstable; urgency=low
+
+  * New upstream release. 
+  * debian/copyright: update copyright holder.
+
+ -- Yves-Alexis Perez <corsac at corsac.net>  Sun, 15 Apr 2007 15:28:17 +0100
+
+xfce4-appfinder (4.4.0-1) experimental; urgency=low
+
+  * New upstream release.
+  * debian/control: updated build-deps against Xfce 4.4.
+
+ -- Yves-Alexis Perez <corsac at corsac.net>  Thu, 25 Jan 2007 00:20:42 +0100
+
 xfce4-appfinder (4.3.99.2-1) unstable; urgency=low
 
   * New upstream release.

Modified: desktop/branches/etch-backports/xfce4-appfinder/debian/control
===================================================================
--- desktop/branches/etch-backports/xfce4-appfinder/debian/control	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/xfce4-appfinder/debian/control	2007-10-21 09:58:05 UTC (rev 1398)
@@ -3,8 +3,9 @@
 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.3.99.2), libxfce4mcs-dev (>= 4.3.99.2), libxft-dev, libxml-parser-perl
+Build-Depends: debhelper (>= 4.0.0), libxfcegui4-dev (>= 4.4.1), libxfce4mcs-dev (>= 4.4.1), libxft-dev, libxml-parser-perl
 Standards-Version: 3.7.2
+Homepage: http://www.xfce.org/
 
 Package: xfce4-appfinder
 Architecture: any
@@ -12,5 +13,3 @@
 Description: Application finder for the Xfce4 Desktop Environment
  This is an application finder for the Xfce4 Desktop Environment.
  It will search for installed applications on your system.
- .
- Homepage: http://www.xfce.org/

Modified: desktop/branches/etch-backports/xfce4-appfinder/debian/copyright
===================================================================
--- desktop/branches/etch-backports/xfce4-appfinder/debian/copyright	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/xfce4-appfinder/debian/copyright	2007-10-21 09:58:05 UTC (rev 1398)
@@ -3,8 +3,10 @@
 
 It was downloaded from http://www.xfce.org/
 
-Upstream author is Eduard Roccatello <eduard at xfce.org>.
+Upstream author and copyright holder:
+(c) 2004-2006 Eduard Roccatello <eduard at xfce.org>.
 
+
 Copyright:
 
    This package is free software; you can redistribute it and/or modify

Modified: desktop/branches/etch-backports/xfce4-appfinder/debian/menu
===================================================================
--- desktop/branches/etch-backports/xfce4-appfinder/debian/menu	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/xfce4-appfinder/debian/menu	2007-10-21 09:58:05 UTC (rev 1398)
@@ -1,6 +1,6 @@
 ?package(xfce4-appfinder):\
  needs="X11"\
- section="Apps/Tools"\
+ section="System/Administration"\
  command="xfce4-appfinder"\
  title="Xfce Application Finder"\
  longtitle="An application finder for the Xfce4 desktop environment"\

Copied: desktop/branches/etch-backports/xfce4-dev-tools (from rev 1397, desktop/trunk/xfce4-dev-tools)

Modified: desktop/branches/etch-backports/xfce4-icon-theme/debian/changelog
===================================================================
--- desktop/branches/etch-backports/xfce4-icon-theme/debian/changelog	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/xfce4-icon-theme/debian/changelog	2007-10-21 09:58:05 UTC (rev 1398)
@@ -1,3 +1,25 @@
+xfce4-icon-theme (4.4.1-2) UNRELEASED; urgency=low
+
+  * debian/control: Move fake Homepage field to a real one now dpkg
+    supports it.
+
+ -- Simon Huggins <huggie at earth.li>  Sat, 20 Oct 2007 12:47:12 +0100
+
+xfce4-icon-theme (4.4.1-1) unstable; urgency=low
+
+  * New upstream release. 
+  * debian/copyright: updated authors and copyright holders.
+
+ -- Yves-Alexis Perez <corsac at corsac.net>  Sun, 15 Apr 2007 15:28:17 +0100
+
+xfce4-icon-theme (4.4.0-1) experimental; urgency=low
+
+  * New upstream release.
+  * debian/control: recommends librsvg2-common instead of librsvg2-2 because
+    icons are loaded by gdk.
+
+ -- Yves-Alexis Perez <corsac at corsac.net>  Wed, 24 Jan 2007 23:49:14 +0100
+
 xfce4-icon-theme (4.3.99.2-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-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/xfce4-icon-theme/debian/control	2007-10-21 09:58:05 UTC (rev 1398)
@@ -5,15 +5,14 @@
 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)
 Standards-Version: 3.7.2
+Homepage: http://www.xfce.org/
 
 Package: xfce4-icon-theme
 Architecture: all
 Depends: hicolor-icon-theme (>= 0.5)
 Conflicts: rodent-icon-theme
 Replaces: rodent-icon-theme
-Recommends: gtk2-engines-xfce, librsvg2-2
+Recommends: gtk2-engines-xfce, librsvg2-common
 Description: Xfce Standard icon theme
  This package contains xfce4-icon-theme which is the default icon theme
- for Xfce 4.2, also known as Rodent icon theme.
- .
- Homepage: http://www.xfce.org/
+ for Xfce 4.4, also known as Rodent icon theme.

Modified: desktop/branches/etch-backports/xfce4-icon-theme/debian/copyright
===================================================================
--- desktop/branches/etch-backports/xfce4-icon-theme/debian/copyright	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/xfce4-icon-theme/debian/copyright	2007-10-21 09:58:05 UTC (rev 1398)
@@ -3,8 +3,12 @@
 
 It was downloaded from http://www.xfce.org/
 
-Upstream Author is François Le Clainche <fleclainche at wanadoo.fr>.
+Upstream authors are:
+FranÃ§ois Le Clainche <fleclainche at wanadoo.fr>.
+Edscott Wilson GarcÃa <edscott at xfce.org>
 
+Copyright (C)  2004-2006 The Xfce development team.
+
 Copyright:
 
    This package is free software; you can redistribute it and/or modify

Modified: desktop/branches/etch-backports/xfce4-mixer/debian/changelog
===================================================================
--- desktop/branches/etch-backports/xfce4-mixer/debian/changelog	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/xfce4-mixer/debian/changelog	2007-10-21 09:58:05 UTC (rev 1398)
@@ -1,10 +1,56 @@
-xfce4-mixer (4.3.99.2-2) UNRELEASED; urgency=low
+xfce4-mixer (4.4.1-4) UNRELEASED; urgency=low
 
+  [ Yves-Alexis Perez ]
+  * debian/xfce4-mixer.menu: switch to new menu policy.
+  * debian/postinst: use posix kill -s to avoid problems on hurd.
+
+  [ 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.
+
+ -- Simon Huggins <huggie at earth.li>  Sat, 20 Oct 2007 12:47:12 +0100
+
+xfce4-mixer (4.4.1-3) unstable; urgency=low
+
+  * Really build-dep on the fixed dpkg-dev for dpkg-architecture that works
+    again (0.14.4 != 1.14.4).
+
+ -- Simon Huggins <huggie at earth.li>  Sat, 26 May 2007 09:19:48 +0100
+
+xfce4-mixer (4.4.1-2) unstable; urgency=low
+
+  (Yves-Alexis Perez)
+  * Remove config.status from top src dir so that the clean target works
+    correctly.                                                  closes: #424119 
+
+  (Simon Huggins)
+  * Build-dep on the fixed dpkg-dev for dpkg-architecture that works again.
+  * Use ${binary:Version} so we are binNMU safe.
+
+ -- Yves-Alexis Perez <corsac at corsac.net>  Fri, 25 May 2007 07:55:19 +0100
+
+xfce4-mixer (4.4.1-1) unstable; urgency=low
+
+  * New upstream release. 
+  * debian/copyright: updated copyright holders.
+
+ -- Yves-Alexis Perez <corsac at corsac.net>  Sun, 15 Apr 2007 15:28:17 +0100
+
+xfce4-mixer (4.4.0-1) experimental; urgency=low
+  
+  (Yves-Alexis Perez)
+  * New upstream release.
+  * debian/control: updated build-deps against Xfce 4.4.
   * Build only oss variant on non linux archs. Thanks Petr Salinger for the
     patch.							closes: #404122
 
- -- Yves-Alexis Perez <corsac at corsac.net>  Thu, 21 Dec 2006 23:52:45 +0100
+  (Emanuele Rocca)
+  * Bump up the libgtk2.0-dev build-dep to >= 2.10.1-1.
+  * binary-or-shlib-defines-rpath lintian override added.
 
+ -- Yves-Alexis Perez <corsac at corsac.net>  Sat, 27 Jan 2007 18:00:22 +0100
+
 xfce4-mixer (4.3.99.2-1) unstable; urgency=low
 
   * New upstream release.

Modified: desktop/branches/etch-backports/xfce4-mixer/debian/control
===================================================================
--- desktop/branches/etch-backports/xfce4-mixer/debian/control	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/xfce4-mixer/debian/control	2007-10-21 09:58:05 UTC (rev 1398)
@@ -3,41 +3,35 @@
 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.3.99.2), libasound2-dev (>= 0.9.0) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libxml-parser-perl, chrpath, quilt
+Build-Depends: debhelper (>= 4.2.1-1), libgtk2.0-dev (>= 2.10.1-1), libxft-dev, xfce4-panel-dev (>= 4.4.1), libasound2-dev (>= 0.9.0) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libxml-parser-perl, chrpath, quilt, dpkg-dev (>= 1.14.4)
 Standards-Version: 3.7.2
+Homepage: http://www.xfce.org/
 
 Package: xfce4-mixer
 Architecture: any
-Depends: ${shlibs:Depends}, xfce4-mixer-alsa (= ${Source-Version}) | xfce4-mixer-oss (= ${Source-Version})
+Depends: ${shlibs:Depends}, xfce4-mixer-alsa (= ${binary:Version}) | xfce4-mixer-oss (= ${binary:Version})
 Description: Xfce4 Mixer frontend
  This is the frontend for mixer settings delivered together
  with the Xfce4 desktop environment. It does the same jobs
  other mixer frontends do but is integrated into the Xfce4
  desktop as a plugin for the Xfce4 main panel.
- .
- Homepage: http://www.xfce.org/
 
 Package: xfce4-mixer-alsa
 Architecture: linux-any
 Depends: ${shlibs:Depends}
-Recommends: xfce4-mixer (= ${Source-Version})
+Recommends: xfce4-mixer (= ${binary:Version})
 Replaces: xfce4-mixer-oss
 Conflicts: xfce4-mixer-oss, xfce4-mixer (<= 4.2.3-1)
 Suggests: alsa-utils
 Description: Xfce4 Mixer ALSA backend
  This is the ALSA backend for xfce4-mixer.
- .
- Homepage: http://www.xfce.org/
 
-
 Package: xfce4-mixer-oss
 Architecture: any
 Depends: ${shlibs:Depends}
-Recommends: xfce4-mixer (= ${Source-Version})
+Recommends: xfce4-mixer (= ${binary:Version})
 Replaces: xfce4-mixer-alsa
 Conflicts: xfce4-mixer-alsa, xfce4-mixer (<= 4.2.3-1)
 Suggests: alsa-utils
 Description: Xfce4 Mixer OSS backend
  This is the OSS backend for xfce4-mixer.
- .
- Homepage: http://www.xfce.org/

Modified: desktop/branches/etch-backports/xfce4-mixer/debian/copyright
===================================================================
--- desktop/branches/etch-backports/xfce4-mixer/debian/copyright	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/xfce4-mixer/debian/copyright	2007-10-21 09:58:05 UTC (rev 1398)
@@ -1,17 +1,26 @@
 This package was debianized by Martin Loschwitz <madkiss at debian.org> on
 Sun, 20 Jul 2003 16:35:47 +0200.
 
-You can fetch xfce4-mixer from the official XFce4 website, which is
+You can fetch xfce4-mixer from the official Xfce website, which is
 http://www.xfce.org/
 
 Upstream authors are:
 
-		Danny Milosavljevic <danny_milo at yahoo.com>
-		Benedikt Meurer <Benedikt.Meurer at unix-ag.uni-siegen.de>
+		Danny Milosavljevic <dannym at xfce.org>
+		Benedikt Meurer <benny at xfce.org>
 	
 Code for building alsa/oss packages is inspired by os-works debian packages
 (http://www.os-works.com) by Benedikt Meurer.
-		
+
+xfce4-mixer is Copyright 2003-2006 The Xfce development team.
+include/vc.h, lib/vc.c, lib/vc_oss.c, (c) 2003 Benedikt Meurer, Danny 
+  Milosavljevic
+lib/vc_sun.c (c) 2004 Benedikt Meurer, Danny Milosavljevic
+lib/vc_sgi.c (c) 2005 Danny Milosavljevic
+lib/trans.c  (c) 2004-2005 Danny Milosavljevic
+lib/vc_alsa.c, lib/vc_alsa_fallback.c (c) 2003 Danny Milosavljevic
+src/disclosure-widget.c (c) 2002 Iain Holmes.
+
 Copyright:
 
    This package is free software; you can redistribute it and/or modify

Modified: desktop/branches/etch-backports/xfce4-mixer/debian/lintian-override
===================================================================
--- desktop/branches/etch-backports/xfce4-mixer/debian/lintian-override	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/xfce4-mixer/debian/lintian-override	2007-10-21 09:58:05 UTC (rev 1398)
@@ -1,5 +1,5 @@
 # These are private libs so this isn't really evil
-
 xfce4-mixer binary: binary-or-shlib-defines-rpath ./usr/lib/xfce4/panel-plugins/libmixer.so /usr/lib/xfce4/modules
 xfce4-mixer binary: binary-or-shlib-defines-rpath ./usr/lib/xfce4/mcs-plugins/sound_settings.so /usr/lib/xfce4/modules
 xfce4-mixer binary: binary-or-shlib-defines-rpath ./usr/bin/xfce4-mixer /usr/lib/xfce4/modules
+xfce4-mixer binary: binary-or-shlib-defines-rpath ./usr/lib/xfce4/panel-plugins/xfce4-mixer-plugin /usr/lib/xfce4/modules

Modified: desktop/branches/etch-backports/xfce4-mixer/debian/postinst
===================================================================
--- desktop/branches/etch-backports/xfce4-mixer/debian/postinst	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/xfce4-mixer/debian/postinst	2007-10-21 09:58:05 UTC (rev 1398)
@@ -2,9 +2,7 @@
 
 if [ "$1" = "configure" ]; then
 	# Get xfce-mcs-manager to reinit
-	# hurd doesnt have procps so we do that another way
-	#pkill -USR1 -f xfce-mcs-manager || true
-	/bin/kill -USR1 `pidof xfce-mcs-manager` >/dev/null 2>&1|| true
+	kill -s USR1 `pidof xfce-mcs-manager` >/dev/null 2>&1|| true
 
 fi
 

Modified: desktop/branches/etch-backports/xfce4-mixer/debian/prerm
===================================================================
--- desktop/branches/etch-backports/xfce4-mixer/debian/prerm	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/xfce4-mixer/debian/prerm	2007-10-21 09:58:05 UTC (rev 1398)
@@ -2,7 +2,7 @@
 
 if [ "$1" = "remove" ]; then
 	# Get xfce-mcs-manager to reinit
-	pkill -USR1 -f xfce-mcs-manager || true
+	kill -s USR1 `pidof xfce-mcs-manager` >/dev/null 2>&1 || true
 fi
 
 #DEBHELPER#

Modified: desktop/branches/etch-backports/xfce4-mixer/debian/rules
===================================================================
--- desktop/branches/etch-backports/xfce4-mixer/debian/rules	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/xfce4-mixer/debian/rules	2007-10-21 09:58:05 UTC (rev 1398)
@@ -62,7 +62,7 @@
 	
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp 
+	rm -f build-stamp config.status
 	
 	for variant in $(VARIANTS);do \
 	rm -rf $(CURDIR)/debian/build-$$variant;\

Modified: desktop/branches/etch-backports/xfce4-mixer/debian/xfce4-mixer.menu
===================================================================
--- desktop/branches/etch-backports/xfce4-mixer/debian/xfce4-mixer.menu	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/xfce4-mixer/debian/xfce4-mixer.menu	2007-10-21 09:58:05 UTC (rev 1398)
@@ -1,6 +1,6 @@
 ?package(xfce4-mixer):\
  needs="X11"\
- section="Apps/Tools"\
+ section="Sound"\
  title="Xfce Mixer"\
  command="/usr/bin/xfce4-mixer"\
  icon="/usr/share/pixmaps/xfce4-mixer.xpm"

Modified: desktop/branches/etch-backports/xfce4-panel/debian/changelog
===================================================================
--- desktop/branches/etch-backports/xfce4-panel/debian/changelog	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/xfce4-panel/debian/changelog	2007-10-21 09:58:05 UTC (rev 1398)
@@ -1,3 +1,52 @@
+xfce4-panel (4.4.1-3) UNRELEASED; urgency=low
+
+  * debian/control: Move fake Homepage field to a real one now dpkg
+    supports it.
+
+ -- Simon Huggins <huggie at earth.li>  Sat, 20 Oct 2007 12:47:12 +0100
+
+xfce4-panel (4.4.1-2) unstable; urgency=low
+
+  [ Simon Huggins ]
+  * Use ${binary:Version} so we are binNMU safe.
+  * debian/xfce4-panel.prerm: Use kill -s to keep Hurd and lintian happy at
+    the same time.
+
+  [ Yves-Alexis Perez ]
+  * debian/xfce4-panel.1: update bug reporting in manpage.
+  * debian/xfce4-panel.postinst: use posix kill -s              closes: #374618
+  * debian/patches: added 02_fix-segfault-gtk2.11.patch, fix segfault when
+    removing a panel.                                           closes: #446536
+
+  [ Emanuele Rocca ]
+  * debian/rules: do not ignore make errors in the clean target.
+
+ -- Yves-Alexis Perez <corsac at corsac.net>  Mon, 15 Oct 2007 22:54:48 +0200
+
+xfce4-panel (4.4.1-1) unstable; urgency=low
+
+  * New upstream release. 
+  * debian/patch: added patch to reduce margin size of launchers.
+  * debian/control: added versionned build-dep against gtk 2.10.
+  * debian/copyright: updated copyright holders.
+
+ -- Yves-Alexis Perez <corsac at corsac.net>  Sun, 15 Apr 2007 15:28:17 +0100
+
+xfce4-panel (4.4.0-2) experimental; urgency=low
+
+  * debian/rules: remove /usr/lib/libxfce4panel.la from the package.
+  * debian/xfce4-panel.install: ship xfce4-panel-manager.desktop in
+    /usr/share/applications.
+
+ -- Yves-Alexis Perez <corsac at corsac.net>  Thu, 25 Jan 2007 00:50:58 +0100
+
+xfce4-panel (4.4.0-1) experimental; urgency=low
+
+  * New upstream release.
+  * debian/control: updated build-deps against Xfce 4.4.
+
+ -- Yves-Alexis Perez <corsac at corsac.net>  Thu, 25 Jan 2007 00:06:03 +0100
+
 xfce4-panel (4.3.99.2-1) unstable; urgency=low
 
   * New upstream release.

Modified: desktop/branches/etch-backports/xfce4-panel/debian/control
===================================================================
--- desktop/branches/etch-backports/xfce4-panel/debian/control	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/xfce4-panel/debian/control	2007-10-21 09:58:05 UTC (rev 1398)
@@ -3,25 +3,24 @@
 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, libxml2-dev, xfce4-mcs-manager-dev (>= 4.3.99.2), chrpath
+Build-Depends: debhelper (>> 4.0.0), libgtk2.0-dev (>= 2.10.6), bison, libxft-dev, libxml2-dev, xfce4-mcs-manager-dev (>= 4.4.1), chrpath, quilt
 Standards-Version: 3.7.2
+Homepage: http://www.xfce.org/
 
 Package: xfce4-panel
 Architecture: any
-Depends: ${shlibs:Depends}, libexo-0.3-0 (>= 0.3.1.12rc2)
+Depends: ${shlibs:Depends}, libexo-0.3-0 (>= 0.3.2)
 Replaces: xfce4 (<< 4.0.0.final-1), xfce4-iconbox, xfce4-showdesktop-plugin, xfce4-systray, xfce4-windowlist-plugin, xfce4-utils (<< 4.3.90.1-1), xfce4-trigger-launcher, xfce4-mcs-plugins (= 4.3.90.2-1)
 Conflicts: xfce4 (<< 4.0.0.final-1), xfce4-themes, xfce4-iconbox, xfce4-showdesktop-plugin, xfce4-systray, xfce4-windowlist-plugin, xfce4-trigger-launcher
 Description: The Xfce4 desktop environment panel
  This is the panel provided by the Xfce4 desktop project.
  If you want a multi-functional panel that can even handle
  plugins and the like, xfce4-panel might be worth a try.
- .
- Homepage: http://www.xfce.org/
 
 Package: xfce4-panel-dev
 Section: devel
 Architecture: any
-Depends: xfce4-panel (= ${Source-Version}), libxml2-dev, xfce4-mcs-manager-dev (>= 4.3.99.2)
+Depends: xfce4-panel (= ${binary:Version}), libxml2-dev, xfce4-mcs-manager-dev (>= 4.4.1)
 Replaces: xfce4-dev (<= 4.0.0.final-1)
 Conflicts: xfce4-dev (<= 4.0.0.final-1)
 Description: The Xfce4 panel development files
@@ -31,5 +30,3 @@
  are mainly going to be of interest for you if you
  intend to code applications which use some of the
  Xfce4 C panel functions.
- .
- Homepage: http://www.xfce.org/

Modified: desktop/branches/etch-backports/xfce4-panel/debian/copyright
===================================================================
--- desktop/branches/etch-backports/xfce4-panel/debian/copyright	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/xfce4-panel/debian/copyright	2007-10-21 09:58:05 UTC (rev 1398)
@@ -4,11 +4,28 @@
 You can fetch xfce4-panel from the official Xfce4 website which is
 http://www.xfce.org/
 
-Upstream author is Jasper Huijsmans, portions of code were taken from
-other people.
+Upstream author are:
+Jasper Huijsmans <jasper at xfce.org>
+Nick Schermer <nick at xfce.org>
+clock plugin is written by Jasper Huijsmans and Jannis Pohlmann
 
-Copyright:
+Copyrights:
+xfce4-panel is (c) 2002-2007 The Xfce development team
+dz and gl traduction are (c) 2006 Canonical Ltd, and Rosetta Contributors
+windowlist plugin is:
+  Copyright (c) 2003 Andre Lerche <a.lerche at gmx.net>
+  Copyright (c) 2003 Benedikt Meurer <benny at xfce.org>
+  Copyright (c) 2006 Jani Monoses <jani at ubuntu.com> 
+  Copyright (c) 2006 Jasper Huijsmans <jasper at xfce.org>
+  Copyright (c) 2006 Nick Schermer <nick at xfce.org>
+action buttons,iconbox, launcher, pager, separator, systray, tasklist plugins 
+  are Copyright (c) 2005 Jasper Huijsmans
+showdesktop plugin is:
+  Copyright (c) 2005 Jasper Huijsmans
+  Copyright (c) 2006 Jani Monoses
 
+License:
+
    This package is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; version 2 dated June, 1991.

Copied: desktop/branches/etch-backports/xfce4-panel/debian/patches (from rev 1397, desktop/trunk/xfce4-panel/debian/patches)

Modified: desktop/branches/etch-backports/xfce4-panel/debian/rules
===================================================================
--- desktop/branches/etch-backports/xfce4-panel/debian/rules	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/xfce4-panel/debian/rules	2007-10-21 09:58:05 UTC (rev 1398)
@@ -11,7 +11,19 @@
 	CFLAGS += -O2
 endif
 
-config.status: configure
+patch: patch-stamp
+patch-stamp:
+	dh_testdir
+	QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
+	touch patch-stamp
+
+unpatch:
+	dh_testdir
+	QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
+	rm -rf .pc patch-stamp
+
+
+config.status: configure patch-stamp
 	
 	dh_testdir
 	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --sysconfdir=/etc --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --enable-final --libexecdir=\$${prefix}/lib
@@ -23,13 +35,14 @@
 	$(MAKE)
 	touch build-stamp
 
-clean:
+clean: unpatch
 	
 	dh_testdir
 	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
@@ -57,6 +70,7 @@
 	rm -f `pwd`/debian/tmp/usr/lib/xfce4/panel-plugins/*.a
 	rm -f `pwd`/debian/tmp/usr/lib/xfce4/mcs-plugins/*.la
 	rm -f `pwd`/debian/tmp/usr/lib/xfce4/mcs-plugins/*.a
+	rm -f `pwd`/debian/tmp/usr/lib/libxfce4panel.la
 
 	install -D -p -o root -g root -m 644 `pwd`/debian/lintian \
 	$(CURDIR)/debian/tmp/usr/share/lintian/overrides/xfce4-panel

Modified: desktop/branches/etch-backports/xfce4-panel/debian/xfce4-panel-dev.install
===================================================================
--- desktop/branches/etch-backports/xfce4-panel/debian/xfce4-panel-dev.install	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/xfce4-panel/debian/xfce4-panel-dev.install	2007-10-21 09:58:05 UTC (rev 1398)
@@ -1,4 +1,4 @@
 usr/include/
 usr/lib/pkgconfig/
+usr/lib/lib*.so
 usr/share/gtk-doc/
-usr/lib/lib*.so

Modified: desktop/branches/etch-backports/xfce4-panel/debian/xfce4-panel.1
===================================================================
--- desktop/branches/etch-backports/xfce4-panel/debian/xfce4-panel.1	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/xfce4-panel/debian/xfce4-panel.1	2007-10-21 09:58:05 UTC (rev 1398)
@@ -10,7 +10,7 @@
 .SH SEE ALSO
 Upstream documentation in /usr/share/xfce4/doc/C/xfce4-panel.html
 .SH "REPORTING BUGS"
-Report bugs to <madkiss at madkiss.org>.
+Report bugs to http://bugs.debian.org
 .SH COPYRIGHT
 Copyright \(co 2004 Simon Huggins
 .br

Modified: desktop/branches/etch-backports/xfce4-panel/debian/xfce4-panel.install
===================================================================
--- desktop/branches/etch-backports/xfce4-panel/debian/xfce4-panel.install	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/xfce4-panel/debian/xfce4-panel.install	2007-10-21 09:58:05 UTC (rev 1398)
@@ -1,9 +1,10 @@
-usr/share/locale/
-usr/share/xfce4/
-usr/share/man/
 usr/bin/
 usr/lib/lib*.so.*
 usr/lib/xfce4/
 etc/
+usr/share/applications/
 usr/share/icons/hicolor/
 usr/share/lintian
+usr/share/locale/
+usr/share/xfce4/
+usr/share/man/

Modified: desktop/branches/etch-backports/xfce4-panel/debian/xfce4-panel.postinst
===================================================================
--- desktop/branches/etch-backports/xfce4-panel/debian/xfce4-panel.postinst	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/xfce4-panel/debian/xfce4-panel.postinst	2007-10-21 09:58:05 UTC (rev 1398)
@@ -2,10 +2,9 @@
 
 if [ "$1" = "configure" ]; then
 	# Get xfce-mcs-manager to reinit
-	# hurd doesnt have procps so we do it another way
-	#pkill -USR1 -f xfce-mcs-manager || true
-	/bin/kill -USR1 `pidof xfce-mcs-manager` >/dev/null 2>&1|| true
+	kill -s USR1 `pidof xfce-mcs-manager` >/dev/null 2>&1|| true
 
+
 	# Run ldconfig to update shared library system
 	ldconfig
 fi

Modified: desktop/branches/etch-backports/xfce4-panel/debian/xfce4-panel.prerm
===================================================================
--- desktop/branches/etch-backports/xfce4-panel/debian/xfce4-panel.prerm	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/xfce4-panel/debian/xfce4-panel.prerm	2007-10-21 09:58:05 UTC (rev 1398)
@@ -2,7 +2,7 @@
 
 if [ "$1" = "remove" ]; then
 	# Get xfce-mcs-manager to reinit
-	pkill -USR1 -f xfce-mcs-manager || true
+	kill -s USR1 `pidof xfce-mcs-manager` >/dev/null 2>&1 || true
 fi
 
 #DEBHELPER#

Modified: desktop/branches/etch-backports/xfce4-panel/debian/xfce4-panel.shlibs
===================================================================
--- desktop/branches/etch-backports/xfce4-panel/debian/xfce4-panel.shlibs	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/xfce4-panel/debian/xfce4-panel.shlibs	2007-10-21 09:58:05 UTC (rev 1398)
@@ -1 +1 @@
-libxfce4panel 1 xfce4-panel (>= 4.3.99.2)
+libxfce4panel 1 xfce4-panel (>= 4.4.1)

Copied: desktop/branches/etch-backports/xfce4-session/debian/README.Debian (from rev 1397, desktop/trunk/xfce4-session/debian/README.Debian)
===================================================================
--- desktop/branches/etch-backports/xfce4-session/debian/README.Debian	                        (rev 0)
+++ desktop/branches/etch-backports/xfce4-session/debian/README.Debian	2007-10-21 09:58:05 UTC (rev 1398)
@@ -0,0 +1,9 @@
+Managing shutdown
+-----------------
+
+There are two ways to enable user to shutdown the computer from Xfce:
+
+ - use sudo, and allow user to run /usr/sbin/xfsm-shutdown-helper in sudoers
+ - use dbus and hal
+   - hal and dbus should be installed, up and running
+   - user should be in powerdev group

Modified: desktop/branches/etch-backports/xfce4-session/debian/changelog
===================================================================
--- desktop/branches/etch-backports/xfce4-session/debian/changelog	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/xfce4-session/debian/changelog	2007-10-21 09:58:05 UTC (rev 1398)
@@ -1,5 +1,45 @@
-xfce4-session (4.3.99.2-3) UNRELEASED; urgency=low
+xfce4-session (4.4.1-2) unstable; urgency=low
 
+  [ Yves-Alexis Perez ]
+  * debian/control: build against dbus to enable users to shutdown through hal.
+    See README.Debian for more details.                         closes: #431886
+  * debian/postinst: use posix kill -s to avoid problems on hurd.
+
+  [ Simon Huggins ]
+  * debian/prerm: Use kill -s to keep Hurd and lintian happy at the same time.
+  * debian/patches/03*: Add patch to -session.1 manpage for typos
+                                                                closes: #351424
+  * debian/patches/04*: Add patch to -session-logout.1 manpage for typos
+                                                                closes: #381398
+  * debian/control: Move fake Homepage field to a real one now dpkg
+    supports it.
+
+ -- Simon Huggins <huggie at earth.li>  Sat, 20 Oct 2007 12:47:13 +0100
+
+xfce4-session (4.4.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/copyright: update licenses & copyright holders.
+
+ -- Yves-Alexis Perez <corsac at corsac.net>  Sun, 15 Apr 2007 15:28:17 +0100
+
+xfce4-session (4.4.0-1) experimental; urgency=low
+  
+  (Yves-Alexis Perez)
+  * New upstream release.
+  * debian/control: updated build-deps against Xfce 4.4.
+
+  (Emanuele Rocca)
+  * xfce4-autostart-editor(1) and xfce4-tips(1) added.
+  * Wrote a couple of Debian related tips in debian/debian-tips.
+    Build-depend on fortune-mod to update tips.dat at build time.
+  * libxfsm-4.2-0 is a private library, added lintian override for
+    'package-name-doesnt-match-sonames'.
+
+ -- Yves-Alexis Perez <corsac at corsac.net>  Sun, 04 Feb 2007 13:15:38 +0100
+
+xfce4-session (4.3.99.2-3) unstable; urgency=low
+
   * Ship a xfce4-session.rc for failsafe session but use a default splash
     engine if none is configured.				closes: #402708
 

Modified: desktop/branches/etch-backports/xfce4-session/debian/control
===================================================================
--- desktop/branches/etch-backports/xfce4-session/debian/control	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/xfce4-session/debian/control	2007-10-21 09:58:05 UTC (rev 1398)
@@ -3,13 +3,14 @@
 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.3.99.2), xbase-clients, libxml-parser-perl, chrpath, quilt
+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
 Standards-Version: 3.7.2
+Homepage: http://www.xfce.org/
 
 Package: xfce4-session
 Architecture: any
 Depends: ${shlibs:Depends}, fortune-mod
-Recommends: xbase-clients, xfwm4, xfce4-utils, xfdesktop4, xfce4-panel
+Recommends: xbase-clients, xfwm4, xfce4-utils, xfdesktop4, xfce4-panel, hal
 Suggests: sudo
 Provides: x-session-manager
 Conflicts: xfce4-toys, desktop-base (<< 0.3.20)
@@ -19,5 +20,3 @@
  the Xfce4 Desktop Environment. On log out, the session manager saves the
  state of all your running applications. When you log back in, the session
  manager restores the same applications with the same window positions.
- .
- Homepage: http://www.xfce.org/

Modified: desktop/branches/etch-backports/xfce4-session/debian/copyright
===================================================================
--- desktop/branches/etch-backports/xfce4-session/debian/copyright	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/xfce4-session/debian/copyright	2007-10-21 09:58:05 UTC (rev 1398)
@@ -4,31 +4,408 @@
 You can fetch xfce4-session from the official Xfce4 website which is
 http://www.xfce.org
 
-Upstream Author: Benedikt Meurer <benny at xfce.org>
+Upstream Author are: 
+Benedikt Meurer <benny at xfce.org>
+Oliver M. Bolzer <oliver at debian.org>
+Francois Le Clainche <fleclainche at wanadoo.fr>
+Maarten Boekhold <boekhold at emirates.net.ae>
+Brian Tarricone <kelnos at xfce.org>
+Jani Monoses <jani at ubuntu.com>
 
-Copyright:
+Copyright holders:
 
- Copyright (c) 2003 Benedikt Meurer (benedikt.meurer at unix-ag.uni-siegen.de)
- All rights reserved.
+ xfce4-session: (c) 2003-2006 Benedikt Meurer <benny at xfce.org>
+ xfce4-session/xfsm-legacy.c: (c) 2000 Matthias Ettrich <ettrich at kde.org>
+ xfce4-session/xfsm-manager.c: (c) 2000 Matthias Ettrich <ettrich at kde.org>
 
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
+ xfce4-session/xfsm-compat-gnome.c
+ xfce4-session/xfsm-compat-gnome.h
+ parts of libxfsm/xfsm-util.c, xfce4-session/xfsm-dns.c, 
+ xfce4-session/xfsm-legacy.c and xfce4-session/xfsm-manager.c are taken from
+ gnome-session, which is: (c) 1998,99,2000 Free Software Foundation, Inc.
 
- 1. Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
+License:
 
- THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+You are free to distribute this software under the terms of
+the GNU General Public License version 2 or later.
+On Debian systems, the complete text of the GNU General Public
+License can be found in the file `/usr/share/common-licenses/GPL'.
 
+Documentation is under GNU Free Documentation License v1.1 or later, without
+any invariant sections, using the following statement:
+
+  Permission is granted to copy, distribute and/or modify this document
+  under the terms of the GNU Free Documentation License, Version 1.1 or
+  any later version published by the Free Software Foundation; with no
+  Invariant Sections, with no Front-Cover Texts, and with no Back-Cover
+  Texts.
+
+Complete GFDL text follows:
+
+		GNU Free Documentation License
+		  Version 1.2, November 2002
+
+
+ Copyright (C) 2000,2001,2002  Free Software Foundation, Inc.
+     51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+0. PREAMBLE
+
+The purpose of this License is to make a manual, textbook, or other
+functional and useful document "free" in the sense of freedom: to
+assure everyone the effective freedom to copy and redistribute it,
+with or without modifying it, either commercially or noncommercially.
+Secondarily, this License preserves for the author and publisher a way
+to get credit for their work, while not being considered responsible
+for modifications made by others.
+
+This License is a kind of "copyleft", which means that derivative
+works of the document must themselves be free in the same sense.  It
+complements the GNU General Public License, which is a copyleft
+license designed for free software.
+
+We have designed this License in order to use it for manuals for free
+software, because free software needs free documentation: a free
+program should come with manuals providing the same freedoms that the
+software does.  But this License is not limited to software manuals;
+it can be used for any textual work, regardless of subject matter or
+whether it is published as a printed book.  We recommend this License
+principally for works whose purpose is instruction or reference.
+
+
+1. APPLICABILITY AND DEFINITIONS
+
+This License applies to any manual or other work, in any medium, that
+contains a notice placed by the copyright holder saying it can be
+distributed under the terms of this License.  Such a notice grants a
+world-wide, royalty-free license, unlimited in duration, to use that
+work under the conditions stated herein.  The "Document", below,
+refers to any such manual or work.  Any member of the public is a
+licensee, and is addressed as "you".  You accept the license if you
+copy, modify or distribute the work in a way requiring permission
+under copyright law.
+
+A "Modified Version" of the Document means any work containing the
+Document or a portion of it, either copied verbatim, or with
+modifications and/or translated into another language.
+
+A "Secondary Section" is a named appendix or a front-matter section of
+the Document that deals exclusively with the relationship of the
+publishers or authors of the Document to the Document's overall subject
+(or to related matters) and contains nothing that could fall directly
+within that overall subject.  (Thus, if the Document is in part a
+textbook of mathematics, a Secondary Section may not explain any
+mathematics.)  The relationship could be a matter of historical
+connection with the subject or with related matters, or of legal,
+commercial, philosophical, ethical or political position regarding
+them.
+
+The "Invariant Sections" are certain Secondary Sections whose titles
+are designated, as being those of Invariant Sections, in the notice
+that says that the Document is released under this License.  If a
+section does not fit the above definition of Secondary then it is not
+allowed to be designated as Invariant.  The Document may contain zero
+Invariant Sections.  If the Document does not identify any Invariant
+Sections then there are none.
+
+The "Cover Texts" are certain short passages of text that are listed,
+as Front-Cover Texts or Back-Cover Texts, in the notice that says that
+the Document is released under this License.  A Front-Cover Text may
+be at most 5 words, and a Back-Cover Text may be at most 25 words.
+
+A "Transparent" copy of the Document means a machine-readable copy,
+represented in a format whose specification is available to the
+general public, that is suitable for revising the document
+straightforwardly with generic text editors or (for images composed of
+pixels) generic paint programs or (for drawings) some widely available
+drawing editor, and that is suitable for input to text formatters or
+for automatic translation to a variety of formats suitable for input
+to text formatters.  A copy made in an otherwise Transparent file
+format whose markup, or absence of markup, has been arranged to thwart
+or discourage subsequent modification by readers is not Transparent.
+An image format is not Transparent if used for any substantial amount
+of text.  A copy that is not "Transparent" is called "Opaque".
+
+Examples of suitable formats for Transparent copies include plain
+ASCII without markup, Texinfo input format, LaTeX input format, SGML
+or XML using a publicly available DTD, and standard-conforming simple
+HTML, PostScript or PDF designed for human modification.  Examples of
+transparent image formats include PNG, XCF and JPG.  Opaque formats
+include proprietary formats that can be read and edited only by
+proprietary word processors, SGML or XML for which the DTD and/or
+processing tools are not generally available, and the
+machine-generated HTML, PostScript or PDF produced by some word
+processors for output purposes only.
+
+The "Title Page" means, for a printed book, the title page itself,
+plus such following pages as are needed to hold, legibly, the material
+this License requires to appear in the title page.  For works in
+formats which do not have any title page as such, "Title Page" means
+the text near the most prominent appearance of the work's title,
+preceding the beginning of the body of the text.
+
+A section "Entitled XYZ" means a named subunit of the Document whose
+title either is precisely XYZ or contains XYZ in parentheses following
+text that translates XYZ in another language.  (Here XYZ stands for a
+specific section name mentioned below, such as "Acknowledgements",
+"Dedications", "Endorsements", or "History".)  To "Preserve the Title"
+of such a section when you modify the Document means that it remains a
+section "Entitled XYZ" according to this definition.
+
+The Document may include Warranty Disclaimers next to the notice which
+states that this License applies to the Document.  These Warranty
+Disclaimers are considered to be included by reference in this
+License, but only as regards disclaiming warranties: any other
+implication that these Warranty Disclaimers may have is void and has
+no effect on the meaning of this License.
+
+
+2. VERBATIM COPYING
+
+You may copy and distribute the Document in any medium, either
+commercially or noncommercially, provided that this License, the
+copyright notices, and the license notice saying this License applies
+to the Document are reproduced in all copies, and that you add no other
+conditions whatsoever to those of this License.  You may not use
+technical measures to obstruct or control the reading or further
+copying of the copies you make or distribute.  However, you may accept
+compensation in exchange for copies.  If you distribute a large enough
+number of copies you must also follow the conditions in section 3.
+
+You may also lend copies, under the same conditions stated above, and
+you may publicly display copies.
+
+
+3. COPYING IN QUANTITY
+
+If you publish printed copies (or copies in media that commonly have
+printed covers) of the Document, numbering more than 100, and the
+Document's license notice requires Cover Texts, you must enclose the
+copies in covers that carry, clearly and legibly, all these Cover
+Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on
+the back cover.  Both covers must also clearly and legibly identify
+you as the publisher of these copies.  The front cover must present
+the full title with all words of the title equally prominent and
+visible.  You may add other material on the covers in addition.
+Copying with changes limited to the covers, as long as they preserve
+the title of the Document and satisfy these conditions, can be treated
+as verbatim copying in other respects.
+
+If the required texts for either cover are too voluminous to fit
+legibly, you should put the first ones listed (as many as fit
+reasonably) on the actual cover, and continue the rest onto adjacent
+pages.
+
+If you publish or distribute Opaque copies of the Document numbering
+more than 100, you must either include a machine-readable Transparent
+copy along with each Opaque copy, or state in or with each Opaque copy
+a computer-network location from which the general network-using
+public has access to download using public-standard network protocols
+a complete Transparent copy of the Document, free of added material.
+If you use the latter option, you must take reasonably prudent steps,
+when you begin distribution of Opaque copies in quantity, to ensure
+that this Transparent copy will remain thus accessible at the stated
+location until at least one year after the last time you distribute an
+Opaque copy (directly or through your agents or retailers) of that
+edition to the public.
+
+It is requested, but not required, that you contact the authors of the
+Document well before redistributing any large number of copies, to give
+them a chance to provide you with an updated version of the Document.
+
+
+4. MODIFICATIONS
+
+You may copy and distribute a Modified Version of the Document under
+the conditions of sections 2 and 3 above, provided that you release
+the Modified Version under precisely this License, with the Modified
+Version filling the role of the Document, thus licensing distribution
+and modification of the Modified Version to whoever possesses a copy
+of it.  In addition, you must do these things in the Modified Version:
+
+A. Use in the Title Page (and on the covers, if any) a title distinct
+   from that of the Document, and from those of previous versions
+   (which should, if there were any, be listed in the History section
+   of the Document).  You may use the same title as a previous version
+   if the original publisher of that version gives permission.
+B. List on the Title Page, as authors, one or more persons or entities
+   responsible for authorship of the modifications in the Modified
+   Version, together with at least five of the principal authors of the
+   Document (all of its principal authors, if it has fewer than five),
+   unless they release you from this requirement.
+C. State on the Title page the name of the publisher of the
+   Modified Version, as the publisher.
+D. Preserve all the copyright notices of the Document.
+E. Add an appropriate copyright notice for your modifications
+   adjacent to the other copyright notices.
+F. Include, immediately after the copyright notices, a license notice
+   giving the public permission to use the Modified Version under the
+   terms of this License, in the form shown in the Addendum below.
+G. Preserve in that license notice the full lists of Invariant Sections
+   and required Cover Texts given in the Document's license notice.
+H. Include an unaltered copy of this License.
+I. Preserve the section Entitled "History", Preserve its Title, and add
+   to it an item stating at least the title, year, new authors, and
+   publisher of the Modified Version as given on the Title Page.  If
+   there is no section Entitled "History" in the Document, create one
+   stating the title, year, authors, and publisher of the Document as
+   given on its Title Page, then add an item describing the Modified
+   Version as stated in the previous sentence.
+J. Preserve the network location, if any, given in the Document for
+   public access to a Transparent copy of the Document, and likewise
+   the network locations given in the Document for previous versions
+   it was based on.  These may be placed in the "History" section.
+   You may omit a network location for a work that was published at
+   least four years before the Document itself, or if the original
+   publisher of the version it refers to gives permission.
+K. For any section Entitled "Acknowledgements" or "Dedications",
+   Preserve the Title of the section, and preserve in the section all
+   the substance and tone of each of the contributor acknowledgements
+   and/or dedications given therein.
+L. Preserve all the Invariant Sections of the Document,
+   unaltered in their text and in their titles.  Section numbers
+   or the equivalent are not considered part of the section titles.
+M. Delete any section Entitled "Endorsements".  Such a section
+   may not be included in the Modified Version.
+N. Do not retitle any existing section to be Entitled "Endorsements"
+   or to conflict in title with any Invariant Section.
+O. Preserve any Warranty Disclaimers.
+
+If the Modified Version includes new front-matter sections or
+appendices that qualify as Secondary Sections and contain no material
+copied from the Document, you may at your option designate some or all
+of these sections as invariant.  To do this, add their titles to the
+list of Invariant Sections in the Modified Version's license notice.
+These titles must be distinct from any other section titles.
+
+You may add a section Entitled "Endorsements", provided it contains
+nothing but endorsements of your Modified Version by various
+parties--for example, statements of peer review or that the text has
+been approved by an organization as the authoritative definition of a
+standard.
+
+You may add a passage of up to five words as a Front-Cover Text, and a
+passage of up to 25 words as a Back-Cover Text, to the end of the list
+of Cover Texts in the Modified Version.  Only one passage of
+Front-Cover Text and one of Back-Cover Text may be added by (or
+through arrangements made by) any one entity.  If the Document already
+includes a cover text for the same cover, previously added by you or
+by arrangement made by the same entity you are acting on behalf of,
+you may not add another; but you may replace the old one, on explicit
+permission from the previous publisher that added the old one.
+
+The author(s) and publisher(s) of the Document do not by this License
+give permission to use their names for publicity for or to assert or
+imply endorsement of any Modified Version.
+
+
+5. COMBINING DOCUMENTS
+
+You may combine the Document with other documents released under this
+License, under the terms defined in section 4 above for modified
+versions, provided that you include in the combination all of the
+Invariant Sections of all of the original documents, unmodified, and
+list them all as Invariant Sections of your combined work in its
+license notice, and that you preserve all their Warranty Disclaimers.
+
+The combined work need only contain one copy of this License, and
+multiple identical Invariant Sections may be replaced with a single
+copy.  If there are multiple Invariant Sections with the same name but
+different contents, make the title of each such section unique by
+adding at the end of it, in parentheses, the name of the original
+author or publisher of that section if known, or else a unique number.
+Make the same adjustment to the section titles in the list of
+Invariant Sections in the license notice of the combined work.
+
+In the combination, you must combine any sections Entitled "History"
+in the various original documents, forming one section Entitled
+"History"; likewise combine any sections Entitled "Acknowledgements",
+and any sections Entitled "Dedications".  You must delete all sections
+Entitled "Endorsements".
+
+
+6. COLLECTIONS OF DOCUMENTS
+
+You may make a collection consisting of the Document and other documents
+released under this License, and replace the individual copies of this
+License in the various documents with a single copy that is included in
+the collection, provided that you follow the rules of this License for
+verbatim copying of each of the documents in all other respects.
+
+You may extract a single document from such a collection, and distribute
+it individually under this License, provided you insert a copy of this
+License into the extracted document, and follow this License in all
+other respects regarding verbatim copying of that document.
+
+
+7. AGGREGATION WITH INDEPENDENT WORKS
+
+A compilation of the Document or its derivatives with other separate
+and independent documents or works, in or on a volume of a storage or
+distribution medium, is called an "aggregate" if the copyright
+resulting from the compilation is not used to limit the legal rights
+of the compilation's users beyond what the individual works permit.
+When the Document is included in an aggregate, this License does not
+apply to the other works in the aggregate which are not themselves
+derivative works of the Document.
+
+If the Cover Text requirement of section 3 is applicable to these
+copies of the Document, then if the Document is less than one half of
+the entire aggregate, the Document's Cover Texts may be placed on
+covers that bracket the Document within the aggregate, or the
+electronic equivalent of covers if the Document is in electronic form.
+Otherwise they must appear on printed covers that bracket the whole
+aggregate.
+
+
+8. TRANSLATION
+
+Translation is considered a kind of modification, so you may
+distribute translations of the Document under the terms of section 4.
+Replacing Invariant Sections with translations requires special
+permission from their copyright holders, but you may include
+translations of some or all Invariant Sections in addition to the
+original versions of these Invariant Sections.  You may include a
+translation of this License, and all the license notices in the
+Document, and any Warranty Disclaimers, provided that you also include
+the original English version of this License and the original versions
+of those notices and disclaimers.  In case of a disagreement between
+the translation and the original version of this License or a notice
+or disclaimer, the original version will prevail.
+
+If a section in the Document is Entitled "Acknowledgements",
+"Dedications", or "History", the requirement (section 4) to Preserve
+its Title (section 1) will typically require changing the actual
+title.
+
+
+9. TERMINATION
+
+You may not copy, modify, sublicense, or distribute the Document except
+as expressly provided for under this License.  Any other attempt to
+copy, modify, sublicense or distribute the Document is void, and will
+automatically terminate your rights under this License.  However,
+parties who have received copies, or rights, from you under this
+License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+
+10. FUTURE REVISIONS OF THIS LICENSE
+
+The Free Software Foundation may publish new, revised versions
+of the GNU Free Documentation License from time to time.  Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.  See
+http://www.gnu.org/copyleft/.
+
+Each version of the License is given a distinguishing version number.
+If the Document specifies that a particular numbered version of this
+License "or any later version" applies to it, you have the option of
+following the terms and conditions either of that specified version or
+of any later version that has been published (not as a draft) by the
+Free Software Foundation.  If the Document does not specify a version
+number of this License, you may choose any version ever published (not
+as a draft) by the Free Software Foundation.

Copied: desktop/branches/etch-backports/xfce4-session/debian/debian-tips (from rev 1397, desktop/trunk/xfce4-session/debian/debian-tips)
===================================================================
--- desktop/branches/etch-backports/xfce4-session/debian/debian-tips	                        (rev 0)
+++ desktop/branches/etch-backports/xfce4-session/debian/debian-tips	2007-10-21 09:58:05 UTC (rev 1398)
@@ -0,0 +1,8 @@
+The Debian Xfce packages you're using right now are brought to you by the
+Debian Xfce Group. 
+
+See http://pkg-xfce.alioth.debian.org for more information.
+%
+On Debian systems you can get a selection of panel plugins installing the
+xfce4-goodies package.
+%

Modified: desktop/branches/etch-backports/xfce4-session/debian/lintian
===================================================================
--- desktop/branches/etch-backports/xfce4-session/debian/lintian	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/xfce4-session/debian/lintian	2007-10-21 09:58:05 UTC (rev 1398)
@@ -1,9 +1,8 @@
 xfce4-session: no-shlibs-control-file usr/lib/libxfsm-4.2.so.0.0.1
 xfce4-session: postinst-must-call-ldconfig usr/lib/libxfsm-4.2.so.0.0.1
 xfce4-session: non-dev-pkg-with-shlib-symlink usr/lib/libxfsm-4.2.so.0.0.1 usr/lib/libxfsm-4.2.so
+xfce4-session: package-name-doesnt-match-sonames libxfsm-4.2-0
 # These are all private
 xfce4-session: binary-without-manpage xfsm-shutdown-helper
 xfce4-session: binary-without-manpage balou-install-theme
 xfce4-session: binary-without-manpage balou-export-theme
-xfce4-session: binary-without-manpage xfce4-tips
-xfce4-session: binary-without-manpage xfce4-autostart-editor

Copied: desktop/branches/etch-backports/xfce4-session/debian/patches/03_xfce4-session-manpage-typo.patch (from rev 1397, desktop/trunk/xfce4-session/debian/patches/03_xfce4-session-manpage-typo.patch)
===================================================================
--- desktop/branches/etch-backports/xfce4-session/debian/patches/03_xfce4-session-manpage-typo.patch	                        (rev 0)
+++ desktop/branches/etch-backports/xfce4-session/debian/patches/03_xfce4-session-manpage-typo.patch	2007-10-21 09:58:05 UTC (rev 1398)
@@ -0,0 +1,28 @@
+--- a/xfce4-session/xfce4-session.1.orig	2005-11-27 05:53:02.000000000 -0500
++++ b/xfce4-session/xfce4-session.1	2006-02-04 15:02:36.000000000 -0500
+@@ -10,14 +10,14 @@
+ command.
+ .PP
+ The \fBxfce4-session\fP program starts up the Xfce Desktop Environment and
+-is typicaly executed by your login manager (e.g. xdm, gdm, kdm, wdm or from
++is typically executed by your login manager (e.g. xdm, gdm, kdm, wdm or from
+ your X startup scripts). It will load your last session or a default session
+ that includes the standard Xfce programs if no saved session is available.
+ 
+ \fBxfce4-session\fP is an standard X11R6 session manager that can manage
+ any X11R6 SM compliant program, including GNOME and KDE programs.
+ 
+-\fBxfce4-session\fP uses the contens of the ~/.cache/sessions/ directory
++\fBxfce4-session\fP uses the contents of the ~/.cache/sessions/ directory
+ for starting previously saved sessions.
+ 
+ 
+@@ -26,7 +26,7 @@
+ .TP
+ .B \-\-disable\-tcp
+ Disable binding to TCP ports in the ICE layer. This is not possible on every
+-plattform. If you use this option on a plattform that does not support it,
++platform. If you use this option on a platform that does not support it,
+ \fBxfce4-session\fP will print a warning message and ignore the setting.
+ .TP
+ .B \-\-help

Copied: desktop/branches/etch-backports/xfce4-session/debian/patches/04_xfce4-session-logout-manpage-typo.patch (from rev 1397, desktop/trunk/xfce4-session/debian/patches/04_xfce4-session-logout-manpage-typo.patch)
===================================================================
--- desktop/branches/etch-backports/xfce4-session/debian/patches/04_xfce4-session-logout-manpage-typo.patch	                        (rev 0)
+++ desktop/branches/etch-backports/xfce4-session/debian/patches/04_xfce4-session-logout-manpage-typo.patch	2007-10-21 09:58:05 UTC (rev 1398)
@@ -0,0 +1,16 @@
+--- a/xfce4-session-logout/xfce4-session-logout.1.orig	2006-05-30 15:02:15.000000000 -0400
++++ b/xfce4-session-logout/xfce4-session-logout.1	2006-08-04 00:09:45.000000000 -0400
+@@ -5,11 +5,7 @@
+ .B xfce4-session-logout
+ .br
+ .SH DESCRIPTION
+-This manual page documents briefly the
+-.B xfce4-session-logout
+-command.
+-.PP
+-The \fBxfce4-session-logout\fP command allows you to programmatically
++The \fBxfce4-session-logout\fP command allows you to
+ logout from your Xfce session. It requests the session manager to display
+ the logout confirmation screen.
+ 
+

Modified: desktop/branches/etch-backports/xfce4-session/debian/patches/series
===================================================================
--- desktop/branches/etch-backports/xfce4-session/debian/patches/series	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/xfce4-session/debian/patches/series	2007-10-21 09:58:05 UTC (rev 1398)
@@ -1,2 +1,4 @@
 01_correct_shadows.patch
 02_use-mice-as-default-engine.patch
+03_xfce4-session-manpage-typo.patch
+04_xfce4-session-logout-manpage-typo.patch

Modified: desktop/branches/etch-backports/xfce4-session/debian/postinst
===================================================================
--- desktop/branches/etch-backports/xfce4-session/debian/postinst	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/xfce4-session/debian/postinst	2007-10-21 09:58:05 UTC (rev 1398)
@@ -7,9 +7,7 @@
     x-session-manager.1.gz /usr/share/man/man1/xfce4-session.1.gz 
 
   	# Get xfce-mcs-manager to reinit
-  	# hurd doesnt have procps so we do it another way
-  	#pkill -USR1 -f xfce-mcs-manager || true
-        /bin/kill -USR1 `pidof xfce-mcs-manager` >/dev/null 2>&1|| true
+	kill -s USR1 `pidof xfce-mcs-manager` >/dev/null 2>&1|| true
 	
 fi
 

Modified: desktop/branches/etch-backports/xfce4-session/debian/prerm
===================================================================
--- desktop/branches/etch-backports/xfce4-session/debian/prerm	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/xfce4-session/debian/prerm	2007-10-21 09:58:05 UTC (rev 1398)
@@ -6,7 +6,7 @@
 
 if [ "$1" = "remove" ]; then
   # Get xfce-mcs-manager to reinit
-  pkill -USR1 -f xfce-mcs-manager || true
+  kill -s USR1 `pidof xfce-mcs-manager` >/dev/null 2>&1 || true
 fi
 
 #DEBHELPER#

Modified: desktop/branches/etch-backports/xfce4-session/debian/rules
===================================================================
--- desktop/branches/etch-backports/xfce4-session/debian/rules	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/xfce4-session/debian/rules	2007-10-21 09:58:05 UTC (rev 1398)
@@ -90,6 +90,10 @@
 		`pwd`/debian/xfce4-session/usr/sbin/xfsm-shutdown-helper \
 		`pwd`/debian/xfce4-session/usr/lib/xfce4/*/*so \
 		`pwd`/debian/xfce4-session/usr/lib/xfce4/splash/engines/*so
+	
+	cat debian/debian-tips >> `pwd`/debian/xfce4-session/usr/share/xfce4/tips/tips
+	strfile `pwd`/debian/xfce4-session/usr/share/xfce4/tips/tips \
+		`pwd`/debian/xfce4-session/usr/share/xfce4/tips/tips.dat
 
 # Build architecture-independent files here.
 binary-indep: build install
@@ -101,6 +105,7 @@
 	dh_testroot
 	dh_installchangelogs ChangeLog
 	dh_installdocs BUGS NEWS README TODO doc/README.Kiosk doc/FAQ
+	dh_installman debian/xfce4-autostart-editor.1 debian/xfce4-tips.1
 	dh_link
 	dh_strip
 	dh_compress

Copied: desktop/branches/etch-backports/xfce4-session/debian/xfce4-autostart-editor.1 (from rev 1397, desktop/trunk/xfce4-session/debian/xfce4-autostart-editor.1)
===================================================================
--- desktop/branches/etch-backports/xfce4-session/debian/xfce4-autostart-editor.1	                        (rev 0)
+++ desktop/branches/etch-backports/xfce4-session/debian/xfce4-autostart-editor.1	2007-10-21 09:58:05 UTC (rev 1398)
@@ -0,0 +1,18 @@
+.\" Copyright (C) 2007 Emanuele Rocca
+.TH XFCE4-AUTOSTART-EDITOR "1" "January 2007" "xfce4-autostart-editor" "User Commands"
+.SH NAME
+xfce4-autostart-editor \- XFce 4 Autostart Editor
+.SH SYNOPSIS
+.B xfce4-autostart-editor
+.SH DESCRIPTION
+.PP
+Starts the XFce 4 Autostart Editor, which allows to edit the list of
+autostarted applications.
+.SH SEE ALSO
+Upstream documentation in /usr/share/xfce4/doc/C/xfce4-session.html
+.SH COPYRIGHT
+Copyright \(co 2007 Emanuele Rocca
+.br
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+

Copied: desktop/branches/etch-backports/xfce4-session/debian/xfce4-tips.1 (from rev 1397, desktop/trunk/xfce4-session/debian/xfce4-tips.1)
===================================================================
--- desktop/branches/etch-backports/xfce4-session/debian/xfce4-tips.1	                        (rev 0)
+++ desktop/branches/etch-backports/xfce4-session/debian/xfce4-tips.1	2007-10-21 09:58:05 UTC (rev 1398)
@@ -0,0 +1,21 @@
+.\" Copyright (C) 2007 Emanuele Rocca
+.TH XFCE4-TIPS "1" "January 2007" "xfce4-tips" "User Commands"
+.SH NAME
+xfce4-tips \- XFce 4 Tips
+.SH SYNOPSIS
+.B xfce4-tips
+.SH DESCRIPTION
+.PP
+This command displays some usage tips about XFce.
+.SH FILES
+.TP
+.I /usr/share/xfce4/tips/tips
+List of tips.
+.SH SEE ALSO
+Upstream documentation in /usr/share/xfce4/doc/C/index.html
+.SH COPYRIGHT
+Copyright \(co 2007 Emanuele Rocca
+.br
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+

Copied: desktop/branches/etch-backports/xfce4-terminal (from rev 1397, desktop/trunk/xfce4-terminal)

Modified: desktop/branches/etch-backports/xfce4-utils/debian/changelog
===================================================================
--- desktop/branches/etch-backports/xfce4-utils/debian/changelog	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/xfce4-utils/debian/changelog	2007-10-21 09:58:05 UTC (rev 1398)
@@ -1,3 +1,50 @@
+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
+
+ -- Simon Huggins <huggie at earth.li>  Sun, 21 Oct 2007 09:12:27 +0100
+
+xfce4-utils (4.4.1-2) unstable; urgency=low
+
+  (Yves-Alexis Perez)
+  * debian/xfterm4.1, debian/xfce4-utils.1: update bug reporting address in
+    manpage.
+  * debian/menu: switch to new menu policy.
+  * debian/postinst: use posix kill -s to avoid problems on hurd. 
+  (Simon Huggins)
+  * debian/rules: fixup mistake in startxfce4 that stops local panel plugins
+    working                                                     closes: #427918
+  * Recommend a screensaver so that xflock4 works (first reported by Cyril
+    Brulebois in 2006 and shamefully not fixed til now, sorry)  closes: #430288
+
+ -- Yves-Alexis Perez <corsac at corsac.net>  Mon, 08 Oct 2007 14:46:40 +0100
+
+xfce4-utils (4.4.1-1) unstable; urgency=low
+
+  * New upstream release. 
+  * debian/control: added versionned build-dep against gtk2.10.
+  * debian/startxfce4.1: correct path.							closes: #416943
+  * documentation provided is now for 4.4.						closes: #372846
+  * debian/copyright: update copyright holders.
+
+ -- Yves-Alexis Perez <corsac at corsac.net>  Sun, 15 Apr 2007 15:28:17 +0100
+
+xfce4-utils (4.4.0-1) experimental; urgency=low
+
+  (Yves-Alexis Perez)
+  * New upstream release.
+  * debian/control: updated build deps against Xfce 4.4.
+  * Provide a missing manpage for xfbrowser4.
+  * Use iceweasel instead of firefox in the static browser list of xfbrowser4.
+
+  (Emanuele Rocca)
+  * Empty TODO file removed.
+
+ -- Yves-Alexis Perez <corsac at corsac.net>  Thu, 25 Jan 2007 00:12:53 +0100
+
 xfce4-utils (4.3.99.2-1) unstable; urgency=low
 
   * New upstream release.

Modified: desktop/branches/etch-backports/xfce4-utils/debian/control
===================================================================
--- desktop/branches/etch-backports/xfce4-utils/debian/control	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/xfce4-utils/debian/control	2007-10-21 09:58:05 UTC (rev 1398)
@@ -3,13 +3,14 @@
 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.3.99.2), dpatch, chrpath
+Build-Depends: debhelper (>= 4.1.26), libgtk2.0-dev (>= 2.10.6), libxft-dev, xfce4-mcs-manager-dev (>= 4.4.1), dpatch, chrpath
 Standards-Version: 3.7.2
+Homepage: http://www.xfce.org/
 
 Package: xfce4-utils
 Architecture: any
 Depends: ${shlibs:Depends}, xterm|x-terminal-emulator
-Recommends: xfwm4, xfce4-panel, thunar
+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,
@@ -19,4 +20,3 @@
  .
  If you want to use xfmountdev4, be sure to install Thunar before because it's
  called by it.
- Homepage: http://www.xfce.org/

Modified: desktop/branches/etch-backports/xfce4-utils/debian/copyright
===================================================================
--- desktop/branches/etch-backports/xfce4-utils/debian/copyright	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/xfce4-utils/debian/copyright	2007-10-21 09:58:05 UTC (rev 1398)
@@ -3,11 +3,26 @@
 
 It was downloaded from http://xfce.sourceforge.net/ 
 
-Upstream Author are Jasper Huijsmans <huysmans at users.sourceforge.net> and
-		    Olivier Fourdan <fourdan at xfce.org>
+Upstream Author are:
+Jasper Huijsmans <huysmans at users.sourceforge.net> and
+Olivier Fourdan <fourdan at xfce.org>
+Benedikt Meurer <benny at xfce.org>
+Xavier Maillard <zedek at fxgsproject.org>
+Brian J. Tarricone <bjt23 at cornell.edu>
 
-Copyright:
+Copyright holders:
+xfrun: Copyright (c) 2006 Brian J. Tarricone <bjt23 at cornell.edu>
+xfce4-about: Copyright (C) 1999-2007 Olivier Fourdan (fourdan at xfce.org)
+xfhelp4: Copyright (C) 1999 Olivier Fourdan (fourdan at xfce.org)
+         Copyright (C) 2003 Jasper Huijsmans (jasper at xfce.org)
+startxfce4: Copyright (C) 1996-2003 Olivier Fourdan (fourdan at xfce.org)
+xflock4: Copyright (C) 1999, 2003 Olivier Fourdan (fourdan at xfce.org)
+xfmountdev4: Copyright (C) 1999 Olivier Fourdan (fourdan at xfce.org)
 
+xfce4-user-guide is: (c) 2006 Jasper Huijsmans
+
+Licensing:
+
    This package is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; version 2 dated June, 1991.

Modified: desktop/branches/etch-backports/xfce4-utils/debian/menu
===================================================================
--- desktop/branches/etch-backports/xfce4-utils/debian/menu	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/xfce4-utils/debian/menu	2007-10-21 09:58:05 UTC (rev 1398)
@@ -1,12 +1,12 @@
-?package(xfce4-utils): needs="X11" section="Apps/Tools" command="xfrun4" \
-  title="XFrun4" longtitle="XFce application start tool" hints="Start tool"
-?package(xfce4-utils): needs="text" section="Apps/Tools" command="xfterm4" \
-  title="XFrun4" longtitle="Launch script for terminal" hints="Start terminal"
-?package(xfce4-utils): needs="text" section="Apps/Tools" command="xflock4" \
-  title="XFTaskbar4" longtitle="Locks the screen" hints="Screenlock"
-?package(xfce4-utils): needs="text" section="Apps/Tools" command="xfmountdev4" \
-  title="XFrun4" longtitle="script to mount a device" hints="Mount device"
-?package(xfce4-utils): needs="X11" section="Apps/Tools" command="xfhelp4" \
-  title="XFTaskbar4" longtitle="Shows help on XFce4" hints="Help"
-?package(xfce4-utils): needs="X11" section="Apps/Tools" command="xfce4-about" \
-  title="XFrun4" longtitle="Shows infos on XFce4" hints="About Xfce4"
+?package(xfce4-utils): needs="X11" section="Applications/System/Administration" \
+    command="xfrun4" title="XFrun4" longtitle="XFce application start tool" \
+    hints="Start tool"
+?package(xfce4-utils): needs="text" section="Applications/Terminal Emulators" \
+    command="xfterm4" title="Xfterm4" \
+    longtitle="Launch script for terminal" hints="Start terminal"
+?package(xfce4-utils): needs="text" section="Screen/Locking" command="xflock4" \
+  title="Xflock4" longtitle="Locks the screen" hints="Screenlock"
+?package(xfce4-utils): needs="X11" section="Help" command="xfhelp4" \
+  title="Xfhelp4" longtitle="Shows help on XFce4" hints="Help"
+?package(xfce4-utils): needs="X11" section="Help" command="xfce4-about" \
+  title="Xfce4-about" longtitle="Shows infos on XFce4" hints="About Xfce4"

Modified: desktop/branches/etch-backports/xfce4-utils/debian/postinst
===================================================================
--- desktop/branches/etch-backports/xfce4-utils/debian/postinst	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/xfce4-utils/debian/postinst	2007-10-21 09:58:05 UTC (rev 1398)
@@ -2,9 +2,7 @@
 
 if [ "$1" = "configure" ]; then
 	# Get xfce-mcs-manager to reinit
-	# hurd doesnt have procps so we do it another way
-	#pkill -USR1 -f xfce-mcs-manager || true
-	/bin/kill -USR1 `pidof xfce-mcs-manager` >/dev/null 2>&1|| true
+	kill -s USR1 `pidof xfce-mcs-manager` >/dev/null 2>&1|| true
 fi
 
 #DEBHELPER#

Modified: desktop/branches/etch-backports/xfce4-utils/debian/prerm
===================================================================
--- desktop/branches/etch-backports/xfce4-utils/debian/prerm	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/xfce4-utils/debian/prerm	2007-10-21 09:58:05 UTC (rev 1398)
@@ -2,7 +2,7 @@
 
 if [ "$1" = "remove" ]; then
 	# Get xfce-mcs-manager to reinit
-	pkill -USR1 -f xfce-mcs-manager || true
+	kill -s USR1 `pidof xfce-mcs-manager` >/dev/null 2>&1 || true
 fi
 
 #DEBHELPER#

Modified: desktop/branches/etch-backports/xfce4-utils/debian/rules
===================================================================
--- desktop/branches/etch-backports/xfce4-utils/debian/rules	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/xfce4-utils/debian/rules	2007-10-21 09:58:05 UTC (rev 1398)
@@ -56,14 +56,19 @@
 	install `pwd`/debian/xfterm4.1 `pwd`/debian/xfce4-utils/usr/share/man/man1/xfterm4.1
 	install `pwd`/debian/xfce4-utils.1 `pwd`/debian/xfce4-utils/usr/share/man/man1/xfce4-utils.1
 	install `pwd`/debian/startxfce4.1 `pwd`/debian/xfce4-utils/usr/share/man/man1/startxfce4.1
+	install `pwd`/debian/xfbrowser4.1 `pwd`/debian/xfce4-utils/usr/share/man/man1/xfbrowser4.1
 
 	install -d `pwd`/debian/xfce4-utils/usr/share/xsessions
 	install -m 644 `pwd`/gdm/xfce.desktop `pwd`/debian/xfce4-utils/usr/share/xsessions/xfce4.desktop
 
-	
 	perl -i -pe 's/TERMCMD=xterm/TERMCMD=x-terminal-emulator/' `pwd`/debian/xfce4-utils/usr/bin/xfterm4
 
 	perl -i -pe 's/FILEMAN=xftree4/FILEMAN=thunar/' `pwd`/debian/xfce4-utils/usr/bin/xfmountdev4
+
+	perl -i -pe 's/firefox/iceweasel/g' `pwd`/debian/xfce4-utils/usr/bin/xfbrowser4
+
+	# temp fix before upstream fix it for #427918
+	perl -i -pe 's/XDG_DATA_DIRS="usr/XDG_DATA_DIRS="\/usr/' `pwd`/debian/xfce4-utils/usr/bin/startxfce4
 	
 	rm -f `pwd`/debian/xfce4-utils/usr/lib/xfce4/mcs-plugins/*.la
 	rm -f `pwd`/debian/xfce4-utils/usr/lib/xfce4/mcs-plugins/*.a
@@ -84,7 +89,7 @@
 	dh_testdir
 	dh_testroot
 	
-	dh_installdocs TODO README AUTHORS NEWS
+	dh_installdocs README AUTHORS NEWS
 	dh_installmenu
 
 	dh_link

Modified: desktop/branches/etch-backports/xfce4-utils/debian/startxfce4.1
===================================================================
--- desktop/branches/etch-backports/xfce4-utils/debian/startxfce4.1	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/xfce4-utils/debian/startxfce4.1	2007-10-21 09:58:05 UTC (rev 1398)
@@ -16,7 +16,7 @@
 You may want to modify the default
 .B xinitrc
 file. In order to do that, copy 
-.I /etc/X11/xdg/xfce4/xinitrc
+.I /etc/xdg/xfce4/xinitrc
 to
 .I ~/.config/xfce4/xinitrc
 and modify that file.

Copied: desktop/branches/etch-backports/xfce4-utils/debian/xfbrowser4.1 (from rev 1397, desktop/trunk/xfce4-utils/debian/xfbrowser4.1)
===================================================================
--- desktop/branches/etch-backports/xfce4-utils/debian/xfbrowser4.1	                        (rev 0)
+++ desktop/branches/etch-backports/xfce4-utils/debian/xfbrowser4.1	2007-10-21 09:58:05 UTC (rev 1398)
@@ -0,0 +1,19 @@
+.\" Copyright (C) 2007 Yves-Alexis Perez
+.TH XFBROWSER4 "1" "January 2005" "xfce4_setup 0.1" "User Commands"
+.SH NAME
+xfbrowser4 \- wrapper script to run user defined browser
+.SH SYNOPSIS
+.B xfbrowser4
+.SH DESCRIPTION
+.PP
+Try to find and run an user-defined browser via $BROWSER variable, preferred
+applications settings (in Xfce) or default to a static browser list.
+.SH AUTHOR
+Written by Yves-Alexis Perez
+.SH "REPORTING BUGS"
+Report bugs to http://bugs.debian.org
+.SH COPYRIGHT
+Copyright \(co 2007 Yves-Alexis Perez
+.br
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

Modified: desktop/branches/etch-backports/xfce4-utils/debian/xfce4-utils.1
===================================================================
--- desktop/branches/etch-backports/xfce4-utils/debian/xfce4-utils.1	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/xfce4-utils/debian/xfce4-utils.1	2007-10-21 09:58:05 UTC (rev 1398)
@@ -10,7 +10,7 @@
 .SH "SEE ALSO"
 See /usr/share/xfce4/doc/C/xfce-utils.html for more information
 .SH "REPORTING BUGS"
-Report bugs to <madkiss at madkiss.org>.
+Report bugs to http://bugs.debian.org
 .SH COPYRIGHT
 Copyright \(co 2004 Simon Huggins
 .br

Modified: desktop/branches/etch-backports/xfce4-utils/debian/xfterm4.1
===================================================================
--- desktop/branches/etch-backports/xfce4-utils/debian/xfterm4.1	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/xfce4-utils/debian/xfterm4.1	2007-10-21 09:58:05 UTC (rev 1398)
@@ -16,7 +16,7 @@
 .SH AUTHOR
 Written by Simon Huggins
 .SH "REPORTING BUGS"
-Report bugs to <madkiss at madkiss.org>.
+Report bugs to http://bugs.debian.org
 .SH COPYRIGHT
 Copyright \(co 2004 Simon Huggins
 .br

Modified: desktop/branches/etch-backports/xfdesktop4/debian/changelog
===================================================================
--- desktop/branches/etch-backports/xfdesktop4/debian/changelog	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/xfdesktop4/debian/changelog	2007-10-21 09:58:05 UTC (rev 1398)
@@ -1,3 +1,63 @@
+xfdesktop4 (4.4.1-6) UNRELEASED; urgency=low
+
+  [ Yves-Alexis Perez ]
+  * 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.
+
+  [ 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.
+
+ -- Simon Huggins <huggie at earth.li>  Sat, 20 Oct 2007 12:47:14 +0100
+
+xfdesktop4 (4.4.1-5) unstable; urgency=low
+
+  * Don't ship the manpage in the -data deb as planned        closes: #431122
+
+ -- Simon Huggins <huggie at earth.li>  Sat, 30 Jun 2007 01:36:49 +0100
+
+xfdesktop4 (4.4.1-4) unstable; urgency=low
+
+  * Upload to unstable now it's through NEW.
+
+ -- Simon Huggins <huggie at earth.li>  Wed, 27 Jun 2007 12:41:39 +0100
+
+xfdesktop4 (4.4.1-3) experimental; urgency=low
+
+  * Split out architecture independent files to xfdesktop4-data based on a
+    patch by Darren Salt                                       closes: #379814
+
+ -- Simon Huggins <huggie at earth.li>  Fri, 25 May 2007 16:08:15 +0100
+
+xfdesktop4 (4.4.1-2) unstable; urgency=high
+
+  * Remove duplicated copies of content in menu.xml.it and
+    xfce-registered-categories.xml.it                          closes: #420872
+
+ -- Simon Huggins <huggie at earth.li>  Thu, 26 Apr 2007 10:29:41 +0100
+
+xfdesktop4 (4.4.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/copyright: updated copyright holders. 
+
+ -- Yves-Alexis Perez <corsac at corsac.net>  Sun, 15 Apr 2007 15:28:17 +0100
+
+xfdesktop4 (4.4.0-1) experimental; urgency=low
+  
+  (Yves-Alexis Perez)
+  * New upstream release.
+  * debian/control: 
+    - updated build-deps against Xfce 4.4.
+    - added recommendation on librsvg2-common so people can use svg backgrounds.
+
+  (Emanuele Rocca)
+  * Added versioned build-dependencies on libgtk2.0-dev and libexo-0.3-dev. 
+
+ -- Yves-Alexis Perez <corsac at corsac.net>  Sun, 04 Feb 2007 14:37:47 +0100
+
 xfdesktop4 (4.3.99.2-1) unstable; urgency=low
 
   * New upstream release.

Modified: desktop/branches/etch-backports/xfdesktop4/debian/control
===================================================================
--- desktop/branches/etch-backports/xfdesktop4/debian/control	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/xfdesktop4/debian/control	2007-10-21 09:58:05 UTC (rev 1398)
@@ -3,13 +3,20 @@
 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.3.99.2), libthunar-vfs-1-dev (>= 0.4.0rc1-1), chrpath, libdbus-glib-1-dev, quilt
+Build-Depends: debhelper (>= 4.1.26), libgtk2.0-dev (>= 2.10.1-1), 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
 Standards-Version: 3.7.2
+Homepage: http://www.xfce.org/
 
+Package: xfdesktop4-data
+Architecture: all
+Replaces: xfdesktop4 (<= 4.4.1-2)
+Description: Provides xfdesktop4 desktop background and root menu (common files)
+ This package contains architecture-independent files for xfdesktop4.
+
 Package: xfdesktop4
 Architecture: any
-Depends: ${shlibs:Depends}, xfce4-mcs-manager, xfce4-utils
-Recommends: dbus
+Depends: ${shlibs:Depends}, xfce4-mcs-manager, xfce4-utils, xfdesktop4-data (= ${source:Version})
+Recommends: dbus, librsvg2-common
 Suggests: menu
 Conflicts: menu (<<2.1.12)
 Description: Provides desktop background and root menu
@@ -17,5 +24,3 @@
  and a root menu.  Additionally, it contains dialogs to change the  number
  of available desktop workspaces and their names.  It also contains a panel
  plugin to display the menu on the panel
- .
- Homepage: http://www.xfce.org/

Modified: desktop/branches/etch-backports/xfdesktop4/debian/copyright
===================================================================
--- desktop/branches/etch-backports/xfdesktop4/debian/copyright	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/xfdesktop4/debian/copyright	2007-10-21 09:58:05 UTC (rev 1398)
@@ -1,13 +1,35 @@
 This package was debianized by Martin Loschwitz <madkiss at madkiss.org> on
 Sun, 19 Jan 2003 16:29:34 +0100.
 
-You can fetch xfdesktop from CVS only right now. Instructions can be
-found at http://xfce.sourceforge.net/
+Upstream release is available from http://www.xfce.org
 
-Upstream author is Benedikt Meurer <bm at os-cillation.de>
+Upstream author are:
+Benedikt Meurer <benny at xfce.org>
+Jasper Huijsmans <huysmans at users.sourceforge.net>
+Brian Tarricone <bjt23 at cornell.edu>
 
-Copyright:
+Copyright holders are:
 
+(c) 2004-2006 Brian Tarricone
+(c) 2003 Benedikt Meurer
+(c) 2002-2003 Jasper Huijsmans
+
+src/xfdesktop-icon-view.c contains code from Nautilus: (c) 2000 Eazel, Inc
+settings/appearance-settings.c has code from gnome theme-switcher applet
+  (c) Jonathan Blandford <jrb at gnome.org>
+
+Translations are (c) 2003-2006 The Xfce development team except:
+gl.po: (c) 2006 Canonical Ltd, and Rosetta Contributors 2006
+
+Manual is:
+(c) 2004-2007 Brian Tarricone
+(c) 2004 Jasper Huijsmans
+(c) 2004 FranÃ§ois Le Clainche <fleclainche at wanadoo.fr>
+
+French translation is (c) 2007 Maximilian Schleiss <maxschleiss at bluewin.ch>
+
+Licensing:
+
    This package is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; version 2 dated June, 1991.

Copied: desktop/branches/etch-backports/xfdesktop4/debian/docs (from rev 1397, desktop/trunk/xfdesktop4/debian/docs)
===================================================================
--- desktop/branches/etch-backports/xfdesktop4/debian/docs	                        (rev 0)
+++ desktop/branches/etch-backports/xfdesktop4/debian/docs	2007-10-21 09:58:05 UTC (rev 1398)
@@ -0,0 +1 @@
+doc/README.kiosk

Deleted: desktop/branches/etch-backports/xfdesktop4/debian/menu
===================================================================
--- desktop/branches/etch-backports/xfdesktop4/debian/menu	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/xfdesktop4/debian/menu	2007-10-21 09:58:05 UTC (rev 1398)
@@ -1,2 +0,0 @@
-?package(xfdesktop4): needs="X11" section="Apps/Tools" command="xfdesktop" \
-  title="Xfdesktop" longtitle="Xfce configuration interface" hints="Configuration Interface"

Deleted: desktop/branches/etch-backports/xfdesktop4/debian/postinst
===================================================================
--- desktop/branches/etch-backports/xfdesktop4/debian/postinst	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/xfdesktop4/debian/postinst	2007-10-21 09:58:05 UTC (rev 1398)
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-if [ "$1" = "configure" ]; then 
-	if [ ! -f /etc/xdg/xfce4/desktop/menudefs.hook ]; then
-		cat >/etc/xdg/xfce4/desktop/menudefs.hook <<EOF
-<!--
-	This file is deliberately empty.  Run update-menus to populate it
-	with the debian menu
--->
-EOF
-	fi
-
-	# Get xfce-mcs-manager to reinit
-	# hurd doesnt have procps so we do it another way
-	#pkill -USR1 -f xfce-mcs-manager || true
-	/bin/kill -USR1 `pidof xfce-mcs-manager` > /dev/null 2>&1|| true
-
-fi
-
-#DEBHELPER#

Deleted: desktop/branches/etch-backports/xfdesktop4/debian/postrm
===================================================================
--- desktop/branches/etch-backports/xfdesktop4/debian/postrm	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/xfdesktop4/debian/postrm	2007-10-21 09:58:05 UTC (rev 1398)
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-if [ "$1" = "purge" ]; then
-  rm -rf /etc/xdg/xfce4/desktop/menudefs.hook
-  rm -rf /etc/xdg/xfce4/desktop/notforuse.xml
-fi
-
-#DEBHELPER#

Deleted: desktop/branches/etch-backports/xfdesktop4/debian/prerm
===================================================================
--- desktop/branches/etch-backports/xfdesktop4/debian/prerm	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/xfdesktop4/debian/prerm	2007-10-21 09:58:05 UTC (rev 1398)
@@ -1,10 +0,0 @@
-#!/bin/sh -e
-
-if [ "$1" = "remove" ]; then
-	# Get xfce-mcs-manager to reinit
-	pkill -USR1 -f xfce-mcs-manager || true
-fi
-
-#DEBHELPER#
-
-exit 0

Modified: desktop/branches/etch-backports/xfdesktop4/debian/rules
===================================================================
--- desktop/branches/etch-backports/xfdesktop4/debian/rules	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/xfdesktop4/debian/rules	2007-10-21 09:58:05 UTC (rev 1398)
@@ -56,17 +56,17 @@
 	dh_testdir
 	dh_testroot
 	dh_clean -k
-	dh_installdirs
+	dh_installdirs 
 
-	$(MAKE) install DESTDIR=`pwd`/debian/xfdesktop4
+	$(MAKE) install DESTDIR=`pwd`/debian/tmp
 
-	rm -f `pwd`/debian/xfdesktop4/usr/lib/xfce4/mcs-plugins/*.la
-	rm -f `pwd`/debian/xfdesktop4/usr/lib/xfce4/mcs-plugins/*.a
-	rm -f `pwd`/debian/xfdesktop4/usr/lib/xfce4/modules/*.la
-	rm -f `pwd`/debian/xfdesktop4/usr/lib/xfce4/modules/*.a
+	rm -f `pwd`/debian/tmp/usr/lib/xfce4/mcs-plugins/*.la
+	rm -f `pwd`/debian/tmp/usr/lib/xfce4/mcs-plugins/*.a
+	rm -f `pwd`/debian/tmp/usr/lib/xfce4/modules/*.la
+	rm -f `pwd`/debian/tmp/usr/lib/xfce4/modules/*.a
 
-	chrpath -d -k `pwd`/debian/xfdesktop4/usr/bin/* \
-		`pwd`/debian/xfdesktop4/usr/lib/xfce4/*/*
+	chrpath -d -k `pwd`/debian/tmp/usr/bin/* \
+		`pwd`/debian/tmp/usr/lib/xfce4/*/*
 
 binary-indep: build install
 
@@ -76,16 +76,27 @@
 	dh_testroot
 
 	# use correct Debian defaults
-	for f in `pwd`/debian/xfdesktop4/etc/xdg/xfce4/desktop/menu.xml*; do \
-	   	perl -0777 -i -pe 's/cmd="xfterm4"/cmd="x-terminal-emulator"/; s/cmd="mozilla"/cmd="sensible-browser"/; s/(<include type="system" style="simple" unique="true"\/>)/$$1\n<separator\/>\n<menu name="Debian"><include type="file" src="menudefs.hook" \/><\/menu>\n/; s/xffm/thunar/g' $$f; \
+	for f in `pwd`/debian/tmp/etc/xdg/xfce4/desktop/menu.xml*; do \
+	   	perl -0777 -i -pe 's/cmd="xfterm4"/cmd="exo-open --launch TerminalEmulator"/; s/cmd="mozilla"/cmd="sensible-browser"/; s/(<include type="system" style="simple" unique="true"\/>)/$$1\n<separator\/>\n<menu name="Debian"><include type="file" src="menudefs.hook" \/><\/menu>\n/; s/xffm/thunar/g' $$f; \
 	done
 
+	# Remove the duplicated copies of XML in the Italian menu files.
+	for f in `pwd`/debian/tmp/etc/xdg/xfce4/desktop/*.xml.it; do \
+	   	perl -i -ne 'BEGIN { $$state = 0; } if (/xml version="1.0"/) { $$state++; } if ($$state < 2) { print; }' $$f; \
+	done
+
 	dh_installdocs README TODO
 	dh_installmenu
-	dh_installman debian/xfce4-menueditor.1
-	dh_installman debian/xfce4-popup-menu.1
+	dh_installman -a
 	
 	dh_installchangelogs ChangeLog
+
+	dh_install
+	# why oh why is this necessary?
+	rm -rf `pwd`/debian/xfdesktop4-data/usr/share/man
+
+	rm -rf `pwd`/debian/xfdesktop4/usr/share/doc/xfdesktop4
+	ln -s xfdesktop4-data `pwd`/debian/xfdesktop4/usr/share/doc/xfdesktop4
 	dh_link
 	
 	dh_strip
@@ -96,7 +107,7 @@
 
 	dh_shlibdeps
 	dh_gencontrol
-	
+
 	dh_md5sums
 	dh_builddeb
 

Copied: desktop/branches/etch-backports/xfdesktop4/debian/xfdesktop4-data.install (from rev 1397, desktop/trunk/xfdesktop4/debian/xfdesktop4-data.install)
===================================================================
--- desktop/branches/etch-backports/xfdesktop4/debian/xfdesktop4-data.install	                        (rev 0)
+++ desktop/branches/etch-backports/xfdesktop4/debian/xfdesktop4-data.install	2007-10-21 09:58:05 UTC (rev 1398)
@@ -0,0 +1,6 @@
+debian/tmp/usr/share/icons
+debian/tmp/usr/share/locale
+debian/tmp/usr/share/man
+debian/tmp/usr/share/pixmaps
+debian/tmp/usr/share/xfce4-menueditor
+debian/tmp/usr/share/xfce4

Copied: desktop/branches/etch-backports/xfdesktop4/debian/xfdesktop4.install (from rev 1397, desktop/trunk/xfdesktop4/debian/xfdesktop4.install)
===================================================================
--- desktop/branches/etch-backports/xfdesktop4/debian/xfdesktop4.install	                        (rev 0)
+++ desktop/branches/etch-backports/xfdesktop4/debian/xfdesktop4.install	2007-10-21 09:58:05 UTC (rev 1398)
@@ -0,0 +1,4 @@
+debian/tmp/etc
+debian/tmp/usr/bin
+debian/tmp/usr/lib
+debian/tmp/usr/share/applications

Copied: desktop/branches/etch-backports/xfdesktop4/debian/xfdesktop4.manpages (from rev 1397, desktop/trunk/xfdesktop4/debian/xfdesktop4.manpages)
===================================================================
--- desktop/branches/etch-backports/xfdesktop4/debian/xfdesktop4.manpages	                        (rev 0)
+++ desktop/branches/etch-backports/xfdesktop4/debian/xfdesktop4.manpages	2007-10-21 09:58:05 UTC (rev 1398)
@@ -0,0 +1,2 @@
+debian/*.1
+xfdesktop.1

Copied: desktop/branches/etch-backports/xfdesktop4/debian/xfdesktop4.menu (from rev 1397, desktop/trunk/xfdesktop4/debian/xfdesktop4.menu)
===================================================================
--- desktop/branches/etch-backports/xfdesktop4/debian/xfdesktop4.menu	                        (rev 0)
+++ desktop/branches/etch-backports/xfdesktop4/debian/xfdesktop4.menu	2007-10-21 09:58:05 UTC (rev 1398)
@@ -0,0 +1,3 @@
+?package(xfdesktop4): needs="X11" section="Applications/File Manager" \
+    command="xfdesktop" title="Xfdesktop" longtitle="Xfce desktop manager" \
+    hints="Xfce Desktop"

Copied: desktop/branches/etch-backports/xfdesktop4/debian/xfdesktop4.postinst (from rev 1397, desktop/trunk/xfdesktop4/debian/xfdesktop4.postinst)
===================================================================
--- desktop/branches/etch-backports/xfdesktop4/debian/xfdesktop4.postinst	                        (rev 0)
+++ desktop/branches/etch-backports/xfdesktop4/debian/xfdesktop4.postinst	2007-10-21 09:58:05 UTC (rev 1398)
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+if [ "$1" = "configure" ]; then 
+	if [ ! -f /etc/xdg/xfce4/desktop/menudefs.hook ]; then
+		cat >/etc/xdg/xfce4/desktop/menudefs.hook <<EOF
+<!--
+	This file is deliberately empty.  Run update-menus to populate it
+	with the debian menu
+-->
+EOF
+	fi
+
+	# Get xfce-mcs-manager to reinit
+	kill -s USR1 `pidof xfce-mcs-manager` > /dev/null 2>&1|| true
+
+fi
+
+#DEBHELPER#

Copied: desktop/branches/etch-backports/xfdesktop4/debian/xfdesktop4.postrm (from rev 1397, desktop/trunk/xfdesktop4/debian/xfdesktop4.postrm)
===================================================================
--- desktop/branches/etch-backports/xfdesktop4/debian/xfdesktop4.postrm	                        (rev 0)
+++ desktop/branches/etch-backports/xfdesktop4/debian/xfdesktop4.postrm	2007-10-21 09:58:05 UTC (rev 1398)
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+if [ "$1" = "purge" ]; then
+  rm -rf /etc/xdg/xfce4/desktop/menudefs.hook
+  rm -rf /etc/xdg/xfce4/desktop/notforuse.xml
+fi
+
+#DEBHELPER#

Copied: desktop/branches/etch-backports/xfdesktop4/debian/xfdesktop4.prerm (from rev 1397, desktop/trunk/xfdesktop4/debian/xfdesktop4.prerm)
===================================================================
--- desktop/branches/etch-backports/xfdesktop4/debian/xfdesktop4.prerm	                        (rev 0)
+++ desktop/branches/etch-backports/xfdesktop4/debian/xfdesktop4.prerm	2007-10-21 09:58:05 UTC (rev 1398)
@@ -0,0 +1,10 @@
+#!/bin/sh -e
+
+if [ "$1" = "remove" ]; then
+	# Get xfce-mcs-manager to reinit
+	kill -s USR1 `pidof xfce-mcs-manager` >/dev/null 2>&1 || true
+fi
+
+#DEBHELPER#
+
+exit 0

Modified: desktop/branches/etch-backports/xfprint4/debian/changelog
===================================================================
--- desktop/branches/etch-backports/xfprint4/debian/changelog	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/xfprint4/debian/changelog	2007-10-21 09:58:05 UTC (rev 1398)
@@ -1,10 +1,48 @@
-xfprint4 (4.3.99.2-1) UNRELEASED; urgency=low
+xfprint4 (4.4.1-3) UNRELEASED; urgency=low
 
+  * debian/control: Move fake Homepage field to a real one now dpkg
+    supports it.
+
+ -- Simon Huggins <huggie at earth.li>  Sat, 20 Oct 2007 12:47:14 +0100
+
+xfprint4 (4.4.1-2) unstable; urgency=low
+
+  [ Yves-Alexis Perez ]
+  * debian/menu: switch to new menu policy.
+  * debian/rules:
+    - don't recreate icon at build time.           closes: #442770
+    - don't ignore all errors for distclean rule.
+  * debian/postinst: use posix kill -s to avoid problems on hurd.
+
+  [ Simon Huggins ]
+  * debian/prerm: Use kill -s to keep Hurd and lintian happy at the same time.
+
+ -- Simon Huggins <huggie at earth.li>  Mon, 08 Oct 2007 18:46:22 +0100
+
+xfprint4 (4.4.1-1) unstable; urgency=low
+
   * New upstream release.
-  * debian/control: updated build-deps against Xfce 4.4RC2 (4.3.99.2).
+  * debian/control: add versionned build-dep against gtk 2.10.
+  * debian/copyright: updated copyright holders. 
 
- -- Yves-Alexis Perez <corsac at corsac.net>  Thu, 16 Nov 2006 16:27:09 +0100
+ -- Yves-Alexis Perez <corsac at corsac.net>  Sun, 15 Apr 2007 15:28:17 +0100
 
+xfprint4 (4.4.0-1) experimental; urgency=low
+  
+  (Yves-Alexis Perez)
+  * New upstream release.
+  * debian/control: 
+    - updated build-deps against Xfce 4.4.
+    - removed suggestion on a2ps as it's not needed anymore.
+
+  (Emanuele Rocca)
+  * xfprint-manager(1) renamed to xfprint4-manager to reflect the actual
+    command name. xfprint4(1) modified accordingly.
+  * Section "REPORTING BUGS" removed from xfprint4(1) and xfprint4-manager(1).
+  * Lintian override added: package-name-doesnt-match-sonames libxfprint0.
+
+ -- Yves-Alexis Perez <corsac at corsac.net>  Sun, 28 Jan 2007 21:33:04 +0100
+
 xfprint4 (4.3.99.1-1) unstable; urgency=low
 
   * New upstream release.

Modified: desktop/branches/etch-backports/xfprint4/debian/control
===================================================================
--- desktop/branches/etch-backports/xfprint4/debian/control	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/xfprint4/debian/control	2007-10-21 09:58:05 UTC (rev 1398)
@@ -3,17 +3,16 @@
 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.3.99.2), a2ps, lpr, libcupsys2-dev, chrpath, sharutils
+Build-Depends: debhelper (>> 4.0.0), libgtk2.0-dev (>= 2.10.6), libxft-dev, xfce4-mcs-manager-dev (>= 4.4.1), a2ps, lpr, libcupsys2-dev, chrpath, sharutils
 Standards-Version: 3.7.2
+Homepage: http://www.xfce.org/
 
 Package: xfprint4
 Architecture: any
 Depends: ${shlibs:Depends}
-Suggests: a2ps, psutils
+Suggests: psutils
 Description: Printer GUI for Xfce4
  xfprint4 is a printer manager for the Xfce4 desktop environment. It allows
  you to manage your print job or to print a file by drag'n'drop. You do not
  have to have this package installed, but if you are using xfce4 it is a
  nice GUI to manage your printer jobs.
- .
- Homepage: http://www.xfce.org/

Modified: desktop/branches/etch-backports/xfprint4/debian/copyright
===================================================================
--- desktop/branches/etch-backports/xfprint4/debian/copyright	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/xfprint4/debian/copyright	2007-10-21 09:58:05 UTC (rev 1398)
@@ -1,35 +1,39 @@
 This package was debianized by Martin Loschwitz <madkiss at debian.org> on
 Tue, 22 Apr 2003 17:45:34 +0200.
 
-You can fetch xfprint from:
-http://www.us.xfce.org/archive/xfce-4.2.2/src/xfprint-4.2.2.tar.gz
+Upstream release can be downloaded from http://www.xfce.org
 
-Upstream Author is Jean-FranÃ§ois Wauthy <pollux at xfce.org>
+Upstream Author are:
+Jean-FranÃ§ois Wauthy <pollux at xfce.org>
+Benedikt Meurer <benedikt.meurer at unix-ag.uni-siegen.de>
 
 Copyright:
 
 Copyright (c) 2003 Benedikt Meurer <benedikt.meurer at unix-ag.uni-siegen.de>
-Copyright (c) 2004 2005 Jean-FranÃ§ois Wauthy <pollux at xfce.org>
-All rights reserved.
+Copyright (c) 2004-2006 Jean-FranÃ§ois Wauthy <pollux at xfce.org>
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
+Translations are (c) 2003-2006 The Xfce development team except:
+gl.po: (c) 2006 Canonical Ltd, and Rosetta Contributors 2006
 
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
+Manual is
+(c) 2004 Jean FranÃ§ois Wauthy <pollux at xfce.org>
+French translation is (c) 2005 Marie-Claude Collilieux
+Licensing:
 
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
+   This package is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 or later.
 
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+   This package is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this package; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+   MA 02110-1301, USA.
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+

Copied: desktop/branches/etch-backports/xfprint4/debian/lintian (from rev 1397, desktop/trunk/xfprint4/debian/lintian)
===================================================================
--- desktop/branches/etch-backports/xfprint4/debian/lintian	                        (rev 0)
+++ desktop/branches/etch-backports/xfprint4/debian/lintian	2007-10-21 09:58:05 UTC (rev 1398)
@@ -0,0 +1,4 @@
+#xfprint4 includes its library
+xfprint4: package-name-doesnt-match-sonames libxfprint0
+#X-XFCE is a private category
+xfprint4: desktop-entry-invalid-category X-XFCE

Modified: desktop/branches/etch-backports/xfprint4/debian/menu
===================================================================
--- desktop/branches/etch-backports/xfprint4/debian/menu	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/xfprint4/debian/menu	2007-10-21 09:58:05 UTC (rev 1398)
@@ -1,2 +1,3 @@
-?package(xfprint4): needs="X11" section="Apps/Tools" command="xfprint4" \
-  title="xfprint4" longtitle="Xfce4 printer manager" hints="printer manager"
+?package(xfprint4): needs="X11" section="Applications/System/Administration" \
+    command="xfprint4" title="xfprint4" longtitle="Xfce4 printer manager" \
+    hints="printer manager"

Modified: desktop/branches/etch-backports/xfprint4/debian/postinst
===================================================================
--- desktop/branches/etch-backports/xfprint4/debian/postinst	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/xfprint4/debian/postinst	2007-10-21 09:58:05 UTC (rev 1398)
@@ -2,9 +2,7 @@
 
 if [ "$1" = "configure" ]; then
 	# Get xfce-mcs-manager to reinit
-	# hurd doesnt have procps so we do it another way
-	#pkill -USR1 -f xfce-mcs-manager || true
-	/bin/kill -USR1 `pidof xfce-mcs-manager` >/dev/null 2>&1|| true
+	kill -s USR1 `pidof xfce-mcs-manager` >/dev/null 2>&1|| true
 
 fi
 

Modified: desktop/branches/etch-backports/xfprint4/debian/prerm
===================================================================
--- desktop/branches/etch-backports/xfprint4/debian/prerm	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/xfprint4/debian/prerm	2007-10-21 09:58:05 UTC (rev 1398)
@@ -2,7 +2,7 @@
 
 if [ "$1" = "remove" ]; then
 	# Get xfce-mcs-manager to reinit
-	pkill -USR1 -f xfce-mcs-manager || true
+	kill -s USR1 `pidof xfce-mcs-manager` >/dev/null 2>&1 || true
 fi
 
 #DEBHELPER#

Modified: desktop/branches/etch-backports/xfprint4/debian/rules
===================================================================
--- desktop/branches/etch-backports/xfprint4/debian/rules	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/xfprint4/debian/rules	2007-10-21 09:58:05 UTC (rev 1398)
@@ -34,7 +34,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
@@ -62,18 +62,21 @@
 
 	install -d `pwd`/debian/xfprint4/usr/share/man/man1
 	install `pwd`/debian/xfprint4.1 `pwd`/debian/xfprint4/usr/share/man/man1
-	install `pwd`/debian/xfprint-manager.1 `pwd`/debian/xfprint4/usr/share/man/man1
+	install `pwd`/debian/xfprint4-manager.1 `pwd`/debian/xfprint4/usr/share/man/man1
 
+	install -D -p -o root -g root -m 644 `pwd`/debian/lintian \
+	`pwd`/debian/xfprint4/usr/share/lintian/overrides/xfprint4
+
 	#Remove after 4.3.99.2
-	uudecode -o `pwd`/debian/printer.png `pwd`/debian/printer-24x24.png.uu
-	install -D -m 664 `pwd`/debian/printer.png `pwd`/debian/xfprint4/usr/share/icons/hicolor/24x24/devices/printer.png
-	uudecode -o `pwd`/debian/printer.png `pwd`/debian/printer-48x48.png.uu
-	install -D -m 664 `pwd`/debian/printer.png `pwd`/debian/xfprint4/usr/share/icons/hicolor/48x48/devices/printer.png
+	#uudecode -o `pwd`/debian/printer.png `pwd`/debian/printer-24x24.png.uu
+	#install -D -m 664 `pwd`/debian/printer.png `pwd`/debian/xfprint4/usr/share/icons/hicolor/24x24/devices/printer.png
+	#uudecode -o `pwd`/debian/printer.png `pwd`/debian/printer-48x48.png.uu
+	#install -D -m 664 `pwd`/debian/printer.png `pwd`/debian/xfprint4/usr/share/icons/hicolor/48x48/devices/printer.png
 
-	install -D -m 664 `pwd`/debian/printer.svg `pwd`/debian/xfprint4/usr/share/icons/hicolor/scalable/devices/printer.svg
+	#install -D -m 664 `pwd`/debian/printer.svg `pwd`/debian/xfprint4/usr/share/icons/hicolor/scalable/devices/printer.svg
 
-	sed -i -e 's/Icon=xfprint/Icon=printer/' \
-		$(CURDIR)/debian/xfprint4/usr/share/applications/*.desktop
+	#sed -i -e 's/Icon=xfprint/Icon=printer/' \
+	#	$(CURDIR)/debian/xfprint4/usr/share/applications/*.desktop
 	#End remove
 
 

Deleted: desktop/branches/etch-backports/xfprint4/debian/xfprint-manager.1
===================================================================
--- desktop/branches/etch-backports/xfprint4/debian/xfprint-manager.1	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/xfprint4/debian/xfprint-manager.1	2007-10-21 09:58:05 UTC (rev 1398)
@@ -1,20 +0,0 @@
-.\" Copyright (C) 2004 Simon Huggins
-.TH XFPRINT-MANAGER "1" "November 2004" "xfprint-manager 0.1" "User Commands"
-.SH NAME
-xfprint-manager \- XFce 4 Printer queue manager
-.SH SYNOPSIS
-.B xfprint-manager
-.SH DESCRIPTION
-.PP
-Allows you to manager XFce 4 printer queues as used by xfprint4
-.SH SEE ALSO
-\fBxfprint4\fR(1)
-.SH AUTHOR
-Written by Simon Huggins
-.SH "REPORTING BUGS"
-Report bugs to <madkiss at madkiss.org>.
-.SH COPYRIGHT
-Copyright \(co 2004 Simon Huggins
-.br
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

Copied: desktop/branches/etch-backports/xfprint4/debian/xfprint4-manager.1 (from rev 1397, desktop/trunk/xfprint4/debian/xfprint4-manager.1)
===================================================================
--- desktop/branches/etch-backports/xfprint4/debian/xfprint4-manager.1	                        (rev 0)
+++ desktop/branches/etch-backports/xfprint4/debian/xfprint4-manager.1	2007-10-21 09:58:05 UTC (rev 1398)
@@ -0,0 +1,18 @@
+.\" Copyright (C) 2004 Simon Huggins
+.TH XFPRINT4-MANAGER "1" "November 2004" "xfprint4-manager 0.1" "User Commands"
+.SH NAME
+xfprint4-manager \- XFce 4 Printer queue manager
+.SH SYNOPSIS
+.B xfprint4-manager
+.SH DESCRIPTION
+.PP
+Allows you to manage XFce 4 printer queues as used by xfprint4
+.SH SEE ALSO
+\fBxfprint4\fR(1)
+.SH AUTHOR
+Written by Simon Huggins
+.SH COPYRIGHT
+Copyright \(co 2004 Simon Huggins
+.br
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

Modified: desktop/branches/etch-backports/xfprint4/debian/xfprint4.1
===================================================================
--- desktop/branches/etch-backports/xfprint4/debian/xfprint4.1	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/xfprint4/debian/xfprint4.1	2007-10-21 09:58:05 UTC (rev 1398)
@@ -6,15 +6,13 @@
 .B xfprint4 file
 .SH DESCRIPTION
 .PP
-Prints files once queues are setup by xfprint-manager
+Prints files once queues are setup by xfprint4-manager.
 .br
-Files can also be dragged onto xfprint on the XFce panel in order to print them
+Files can also be dragged onto xfprint on the XFce panel in order to print them.
 .SH SEE ALSO
-\fBxfprint-manager\fR(1)
+\fBxfprint4-manager\fR(1)
 .SH AUTHOR
 Written by Simon Huggins
-.SH "REPORTING BUGS"
-Report bugs to <madkiss at madkiss.org>.
 .SH COPYRIGHT
 Copyright \(co 2004 Simon Huggins
 .br

Modified: desktop/branches/etch-backports/xfwm4/debian/changelog
===================================================================
--- desktop/branches/etch-backports/xfwm4/debian/changelog	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/xfwm4/debian/changelog	2007-10-21 09:58:05 UTC (rev 1398)
@@ -1,3 +1,54 @@
+xfwm4 (4.4.1-4) UNRELEASED; 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.
+
+ -- Simon Huggins <huggie at earth.li>  Sat, 20 Oct 2007 12:47:14 +0100
+
+xfwm4 (4.4.1-3) unstable; urgency=high
+
+  * debian/xfwm4.1: update bugs reporting in manpage.
+  * debian/xfwm4.menu: switch to new menu policy.
+  * debian/postinst: use posix kill -s to avoid problems on hurd.
+  * debian/rules: enable output of distclean target.
+  * debian/lintian: ignore safe lintian warnings.
+  * debian/patches/02_fix-xfwm-hang.patch added to fix deadlock with gtk 2.12
+    urgency=high because gtk 2.12 entered archive so we need to reach testing
+    before it does.
+
+ -- Yves-Alexis Perez <corsac at corsac.net>  Fri, 21 Sep 2007 08:43:40 +0200
+
+xfwm4 (4.4.1-2) unstable; urgency=low
+
+  * debian/patches: 01_xfwm4-fix-transient-windows.patch added to correct
+    behavior with transient windows.                            closes: #367616
+  * switch from dpatch to quilt. 
+
+ -- Yves-Alexis Perez <corsac at corsac.net>  Tue, 26 Jun 2007 23:41:22 +0200
+
+xfwm4 (4.4.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/control: added versionned build-dep against gtk 2.10.
+  * debian/copyright: update copyright holders. 
+
+ -- Yves-Alexis Perez <corsac at corsac.net>  Sun, 15 Apr 2007 15:28:17 +0100
+
+xfwm4 (4.4.0-1) experimental; urgency=low
+
+  (Yves-Alexis Perez)
+  * New upstream release.                     closes: #390462, #379442, #380639
+  * debian/control:
+    - updated build-deps against Xfce 4.4.
+    - recommends librsvg2-common so svg icons are preferred over png ones. 
+
+  (Emanuele Rocca)
+  * debian/rules: s/theme=microdeck2/theme=curve/ removed to keep upstream's
+    /usr/share/xfwm4/defaults
+
+ -- Yves-Alexis Perez <corsac at corsac.net>  Mon, 29 Jan 2007 12:08:33 +0100
+
 xfwm4 (4.3.99.2-1) unstable; urgency=low
 
   * New upstream release.

Modified: desktop/branches/etch-backports/xfwm4/debian/control
===================================================================
--- desktop/branches/etch-backports/xfwm4/debian/control	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/xfwm4/debian/control	2007-10-21 09:58:05 UTC (rev 1398)
@@ -3,13 +3,14 @@
 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.3.99.2), dpatch, libxdamage-dev, libxrender-dev, libxcomposite-dev, libxfixes-dev, chrpath
+Build-Depends: debhelper (>= 4.1.26), libgtk2.0-dev (>= 2.10.6), libxft-dev, xfce4-mcs-manager-dev (>= 4.4.1), quilt, libxdamage-dev, libxrender-dev, libxcomposite-dev, libxfixes-dev, chrpath
 Standards-Version: 3.7.2
+Homepage: http://www.xfce.org/
 
 Package: xfwm4
 Architecture: any
 Depends: ${shlibs:Depends}
-Recommends: xfwm4-themes, xfce4-mcs-manager
+Recommends: xfwm4-themes, xfce4-mcs-manager, librsvg2-common
 Suggests: xfce4
 Provides: x-window-manager
 Replaces: xfwm4-themes (<< 4.0.0.final-1)
@@ -23,5 +24,3 @@
  complies to the standards defined at http://www.freedesktop.org/. Without
  xfce4 installed this only gives you a window manager not the full
  environment.
- .
- Homepage: http://www.xfce.org/

Modified: desktop/branches/etch-backports/xfwm4/debian/copyright
===================================================================
--- desktop/branches/etch-backports/xfwm4/debian/copyright	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/xfwm4/debian/copyright	2007-10-21 09:58:05 UTC (rev 1398)
@@ -20,6 +20,21 @@
    --------------------
    Fredrik Hoglund (fredrik at kde.org)
 
+
+xfwm4 is (c) 2002-2006 Olivier Fourdan
+mypixmap.c contains code (c) 2001 Ken Lynch
+original xpm load routines are from gdk-pixbuf:
+  (c) 1999 Mark Crichton
+  (c) 1999 The Free Software Foundation
+mcs-plugin is (c) 2002-2003 Jasper Huijsmans, with:
+  xfwm4_shortcuteditor (c) 2004 Jean FranÃ§ois Wauthy
+
+Translations are (c) 2002-2006 The Xfce development team except:
+  gl.po (c) 2006 Canonical Ltd, and Rosetta Contributors 2006
+
+Manual is:
+(c) 2004 FranÃ§ois Le Clainche
+(c) 2004 Jasper Huijsmans
 Copyright:
 
    This package is free software; you can redistribute it and/or modify

Copied: desktop/branches/etch-backports/xfwm4/debian/lintian (from rev 1397, desktop/trunk/xfwm4/debian/lintian)
===================================================================
--- desktop/branches/etch-backports/xfwm4/debian/lintian	                        (rev 0)
+++ desktop/branches/etch-backports/xfwm4/debian/lintian	2007-10-21 09:58:05 UTC (rev 1398)
@@ -0,0 +1,4 @@
+#xfwm4 use xfce-mcs-manager to manage its settings.
+xfwm4: desktop-command-not-in-package
+#Xfce doesn't have its FD.O category yet.
+xfwm4: desktop-entry-invalid-category

Deleted: desktop/branches/etch-backports/xfwm4/debian/patches/00list
===================================================================

Copied: desktop/branches/etch-backports/xfwm4/debian/patches/01_xfwm4-fix-transient-windows.patch (from rev 1397, desktop/trunk/xfwm4/debian/patches/01_xfwm4-fix-transient-windows.patch)
===================================================================
--- desktop/branches/etch-backports/xfwm4/debian/patches/01_xfwm4-fix-transient-windows.patch	                        (rev 0)
+++ desktop/branches/etch-backports/xfwm4/debian/patches/01_xfwm4-fix-transient-windows.patch	2007-10-21 09:58:05 UTC (rev 1398)
@@ -0,0 +1,204 @@
+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/01_xfwm4-mouse-grab-fix.dpatch
===================================================================
--- desktop/branches/etch-backports/xfwm4/debian/patches/01_xfwm4-mouse-grab-fix.dpatch	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/xfwm4/debian/patches/01_xfwm4-mouse-grab-fix.dpatch	2007-10-21 09:58:05 UTC (rev 1398)
@@ -1,59 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_xfwm4-mouse-grab-fix.dpatch by  <corsac at corsac.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Patch to fix mouse grab
-
- at DPATCH@
-
-diff -Naur xfwm4-r22409/src/client.c xfwm4-mouse-grab-fix/src/client.c
---- xfwm4-r22409/src/client.c	2006-07-11 23:47:05.000000000 +0200
-+++ xfwm4-mouse-grab-fix/src/client.c	2006-07-12 09:24:35.000000000 +0200
-@@ -3732,7 +3732,7 @@
-     }
-     clientConfigure (c, &wc, changes, NO_CFG_FLAG);
- 
--    myScreenUngrabKeyboard (screen_info, myDisplayGetCurrentTime (display_info));
-+    myScreenUngrabKeyboard (screen_info, CurrentTime);
-     if (!passdata.released)
-     {
-         /* If this is a drag-move, wait for the button to be released.
-@@ -3742,7 +3742,7 @@
-         gtk_main ();
-         eventFilterPop (display_info->xfilter);
-     }
--    myScreenUngrabPointer (screen_info, myDisplayGetCurrentTime (display_info));
-+    myScreenUngrabPointer (screen_info, CurrentTime);
-     if (passdata.grab && screen_info->params->box_move)
-     {
-         myDisplayUngrabServer (display_info);
-@@ -4243,7 +4243,7 @@
-     wc.height = c->height;
-     clientConfigure (c, &wc, CWX | CWY | CWHeight | CWWidth, CFG_NOTIFY);
- 
--    myScreenUngrabKeyboard (screen_info, myDisplayGetCurrentTime (display_info));
-+    myScreenUngrabKeyboard (screen_info, CurrentTime);
-     if (!passdata.released)
-     {
-         /* If this is a drag-resize, wait for the button to be released.
-@@ -4253,7 +4253,7 @@
-         gtk_main ();
-         eventFilterPop (display_info->xfilter);
-     }
--    myScreenUngrabPointer (screen_info, myDisplayGetCurrentTime (display_info));
-+    myScreenUngrabPointer (screen_info, CurrentTime);
-     if (passdata.grab && screen_info->params->box_resize)
-     {
-         myDisplayUngrabServer (display_info);
-@@ -4445,8 +4445,8 @@
-         tabwinDestroy (passdata.tabwin);
-         g_free (passdata.tabwin);
-     }
--    myScreenUngrabKeyboard (screen_info, myDisplayGetCurrentTime (display_info));
--    myScreenUngrabPointer (screen_info, myDisplayGetCurrentTime (display_info));
-+    myScreenUngrabKeyboard (screen_info, CurrentTime);
-+    myScreenUngrabPointer (screen_info, CurrentTime);
- 
-     if (passdata.c)
-     {
-

Copied: desktop/branches/etch-backports/xfwm4/debian/patches/02_fix-xfwm4-hang.patch (from rev 1397, desktop/trunk/xfwm4/debian/patches/02_fix-xfwm4-hang.patch)
===================================================================
--- desktop/branches/etch-backports/xfwm4/debian/patches/02_fix-xfwm4-hang.patch	                        (rev 0)
+++ desktop/branches/etch-backports/xfwm4/debian/patches/02_fix-xfwm4-hang.patch	2007-10-21 09:58:05 UTC (rev 1398)
@@ -0,0 +1,157 @@
+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

Copied: desktop/branches/etch-backports/xfwm4/debian/patches/series (from rev 1397, desktop/trunk/xfwm4/debian/patches/series)
===================================================================
--- desktop/branches/etch-backports/xfwm4/debian/patches/series	                        (rev 0)
+++ desktop/branches/etch-backports/xfwm4/debian/patches/series	2007-10-21 09:58:05 UTC (rev 1398)
@@ -0,0 +1,2 @@
+01_xfwm4-fix-transient-windows.patch
+02_fix-xfwm4-hang.patch

Deleted: desktop/branches/etch-backports/xfwm4/debian/patches/xfwm4-mouse-grab-fix.patch
===================================================================
--- desktop/branches/etch-backports/xfwm4/debian/patches/xfwm4-mouse-grab-fix.patch	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/xfwm4/debian/patches/xfwm4-mouse-grab-fix.patch	2007-10-21 09:58:05 UTC (rev 1398)
@@ -1,51 +0,0 @@
-diff -Naur xfwm4-r22409/src/client.c xfwm4-mouse-grab-fix/src/client.c
---- xfwm4-r22409/src/client.c	2006-07-11 23:47:05.000000000 +0200
-+++ xfwm4-mouse-grab-fix/src/client.c	2006-07-12 09:24:35.000000000 +0200
-@@ -3732,7 +3732,7 @@
-     }
-     clientConfigure (c, &wc, changes, NO_CFG_FLAG);
- 
--    myScreenUngrabKeyboard (screen_info, myDisplayGetCurrentTime (display_info));
-+    myScreenUngrabKeyboard (screen_info, CurrentTime);
-     if (!passdata.released)
-     {
-         /* If this is a drag-move, wait for the button to be released.
-@@ -3742,7 +3742,7 @@
-         gtk_main ();
-         eventFilterPop (display_info->xfilter);
-     }
--    myScreenUngrabPointer (screen_info, myDisplayGetCurrentTime (display_info));
-+    myScreenUngrabPointer (screen_info, CurrentTime);
-     if (passdata.grab && screen_info->params->box_move)
-     {
-         myDisplayUngrabServer (display_info);
-@@ -4243,7 +4243,7 @@
-     wc.height = c->height;
-     clientConfigure (c, &wc, CWX | CWY | CWHeight | CWWidth, CFG_NOTIFY);
- 
--    myScreenUngrabKeyboard (screen_info, myDisplayGetCurrentTime (display_info));
-+    myScreenUngrabKeyboard (screen_info, CurrentTime);
-     if (!passdata.released)
-     {
-         /* If this is a drag-resize, wait for the button to be released.
-@@ -4253,7 +4253,7 @@
-         gtk_main ();
-         eventFilterPop (display_info->xfilter);
-     }
--    myScreenUngrabPointer (screen_info, myDisplayGetCurrentTime (display_info));
-+    myScreenUngrabPointer (screen_info, CurrentTime);
-     if (passdata.grab && screen_info->params->box_resize)
-     {
-         myDisplayUngrabServer (display_info);
-@@ -4445,8 +4445,8 @@
-         tabwinDestroy (passdata.tabwin);
-         g_free (passdata.tabwin);
-     }
--    myScreenUngrabKeyboard (screen_info, myDisplayGetCurrentTime (display_info));
--    myScreenUngrabPointer (screen_info, myDisplayGetCurrentTime (display_info));
-+    myScreenUngrabKeyboard (screen_info, CurrentTime);
-+    myScreenUngrabPointer (screen_info, CurrentTime);
- 
-     if (passdata.c)
-     {
-

Modified: desktop/branches/etch-backports/xfwm4/debian/postinst
===================================================================
--- desktop/branches/etch-backports/xfwm4/debian/postinst	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/xfwm4/debian/postinst	2007-10-21 09:58:05 UTC (rev 1398)
@@ -9,9 +9,7 @@
 	x-window-manager.1.gz /usr/share/man/man1/xfwm4.1.gz
 	
 	# Get xfce-mcs-manager to reinit
-	# hurd doesnt have procps so we do it another way
-	#pkill -USR1 -f xfce-mcs-manager || true
-	/bin/kill -USR1 `pidof xfce-mcs-manager` >/dev/null 2>&1|| true
+	kill -s USR1 `pidof xfce-mcs-manager` >/dev/null 2>&1|| true
 
 fi
 

Modified: desktop/branches/etch-backports/xfwm4/debian/prerm
===================================================================
--- desktop/branches/etch-backports/xfwm4/debian/prerm	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/xfwm4/debian/prerm	2007-10-21 09:58:05 UTC (rev 1398)
@@ -6,7 +6,7 @@
   update-alternatives --remove x-window-manager /usr/bin/xfwm4
 
   # Get xfce-mcs-manager to reinit
-  pkill -USR1 -f xfce-mcs-manager || true
+  kill -s USR1 `pidof xfce-mcs-manager` >/dev/null 2>&1 || true
 fi
 
 #DEBHELPER#

Modified: desktop/branches/etch-backports/xfwm4/debian/rules
===================================================================
--- desktop/branches/etch-backports/xfwm4/debian/rules	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/xfwm4/debian/rules	2007-10-21 09:58:05 UTC (rev 1398)
@@ -9,8 +9,17 @@
 	CFLAGS += -O2
 endif
 
-include /usr/share/dpatch/dpatch.make
+patch: patch-stamp
+patch-stamp:
+	dh_testdir
+	QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
+	touch patch-stamp
 
+unpatch:
+	dh_testdir
+	QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
+	rm -rf .pc patch-stamp
+
 configure: patch configure-stamp
 configure-stamp:
 
@@ -33,7 +42,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 && \
@@ -58,6 +67,10 @@
 	chrpath -d -k `pwd`/debian/xfwm4/usr/bin/* \
 		`pwd`/debian/xfwm4/usr/lib/xfce4/mcs-plugins/*
 
+	install -D -p -o root -g root -m 644 `pwd`/debian/lintian \
+	  `pwd`/debian/xfwm4/usr/share/lintian/overrides/xfwm4
+
+
 binary-indep: build install
 binary-arch: build install
 	
@@ -67,10 +80,6 @@
 	dh_installdocs -a README TODO
 	dh_installmenu -a
 
-	# set xfce theme as default
-	cat `pwd`/debian/xfwm4/usr/share/xfwm4/defaults | sed 's/theme=microdeck2/theme=curve/' > `pwd`/debian/xfwm4/usr/share/xfwm4/defaults.new
-	mv `pwd`/debian/xfwm4/usr/share/xfwm4/defaults.new `pwd`/debian/xfwm4/usr/share/xfwm4/defaults
-
 	dh_installchangelogs ChangeLog -a
 	dh_strip -a
 	dh_compress -a

Modified: desktop/branches/etch-backports/xfwm4/debian/xfwm4.1
===================================================================
--- desktop/branches/etch-backports/xfwm4/debian/xfwm4.1	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/xfwm4/debian/xfwm4.1	2007-10-21 09:58:05 UTC (rev 1398)
@@ -10,7 +10,7 @@
 .SH SEE ALSO
 Upstream documentation in /usr/share/xfce4/doc/C/xfwm4.html
 .SH "REPORTING BUGS"
-Report bugs to <madkiss at madkiss.org>.
+Report bugs to http://bugs.debian.org
 .SH COPYRIGHT
 Copyright \(co 2004 Simon Huggins
 .br

Modified: desktop/branches/etch-backports/xfwm4/debian/xfwm4.menu
===================================================================
--- desktop/branches/etch-backports/xfwm4/debian/xfwm4.menu	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/xfwm4/debian/xfwm4.menu	2007-10-21 09:58:05 UTC (rev 1398)
@@ -1,2 +1,2 @@
-?package(xfwm4): needs="wm" section="WindowManagers" command="xfwm4" \
+?package(xfwm4): needs="wm" section="Window Managers" command="xfwm4" \
   title="XFwm" longtitle="Xfce Window Manager" hints="Window manager"

Copied: desktop/branches/etch-backports/xfwm4-themes/debian/README.Debian (from rev 1397, desktop/trunk/xfwm4-themes/debian/README.Debian)
===================================================================
--- desktop/branches/etch-backports/xfwm4-themes/debian/README.Debian	                        (rev 0)
+++ desktop/branches/etch-backports/xfwm4-themes/debian/README.Debian	2007-10-21 09:58:05 UTC (rev 1398)
@@ -0,0 +1,10 @@
+README.Debian for xfwm4-themes
+------------------------------
+
+The themes provided by xfwm4-themes are installed under /usr/share/themes/.  
+
+To access them, you need to open the settings manager (either via the Xfce menu
+or running xfce-setting-show from the command line) and then clicking on
+"Window Manager".
+
+Other themes are under Settings -> User Interface.

Modified: desktop/branches/etch-backports/xfwm4-themes/debian/changelog
===================================================================
--- desktop/branches/etch-backports/xfwm4-themes/debian/changelog	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/xfwm4-themes/debian/changelog	2007-10-21 09:58:05 UTC (rev 1398)
@@ -1,3 +1,22 @@
+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.
+  * debian/control: updated dep against Xfce 4.4.
+
+ -- Yves-Alexis Perez <corsac at corsac.net>  Sun, 21 Jan 2007 18:22:48 +0100
+
+xfwm4-themes (4.3.99.2-2) unstable; urgency=low
+
+  * Added README.Debian, explaining how to use themes.          closes: #286250
+
+ -- Emanuele Rocca <ema at debian.org>  Mon,  8 Jan 2007 22:39:35 +0100
+
 xfwm4-themes (4.3.99.2-1) unstable; urgency=low
 
   * New upstream release.

Modified: desktop/branches/etch-backports/xfwm4-themes/debian/control
===================================================================
--- desktop/branches/etch-backports/xfwm4-themes/debian/control	2007-10-21 09:36:57 UTC (rev 1397)
+++ desktop/branches/etch-backports/xfwm4-themes/debian/control	2007-10-21 09:58:05 UTC (rev 1398)
@@ -8,7 +8,7 @@
 
 Package: xfwm4-themes
 Architecture: all
-Depends: xfwm4 (>= 4.3.99.2)
+Depends: xfwm4 (>= 4.4.1)
 Replaces: xfwm4 (<< 4.3.90.1)
 Description: Theme files for xfwm4
  This package contains several theme files for xfwm4,


