[Pkg-xfce-commits] r2781 - in desktop/trunk: . exo/debian gtk2-engines-xfce/debian libxfce4util/debian libxfcegui4/debian libxfcegui4/debian/patches mousepad/debian orage/debian thunar/debian thunar/debian/patches xfce4/debian xfce4-appfinder/debian xfce4-dev-tools/debian xfce4-dev-tools/debian/patches xfce4-icon-theme/debian xfce4-mixer/debian xfce4-panel/debian xfce4-session/debian xfce4-session/debian/patches xfce4-terminal/debian xfce4-terminal/debian/patches xfce4-utils/debian xfce4-utils/debian/patches xfdesktop4/debian xfprint4/debian xfprint4/debian/patches xfwm4/debian xfwm4-themes/debian
corsac at alioth.debian.org
corsac at alioth.debian.org
Fri Feb 27 01:13:49 UTC 2009
Author: corsac
Date: 2009-02-27 01:13:49 +0000 (Fri, 27 Feb 2009)
New Revision: 2781
Added:
desktop/trunk/libxfce4menu/
desktop/trunk/libxfcegui4/debian/glade-xfce.install
desktop/trunk/libxfcegui4/debian/patches/02_fix-menu-icons.patch
desktop/trunk/thunar/debian/libthunar-vfs-1-2.lintian-overrides
desktop/trunk/xfce4-dev-tools/debian/watch
desktop/trunk/xfce4-mixer/debian/xfce4-mixer.lintian-overrides
desktop/trunk/xfce4-panel/debian/xfce4-panel.lintian-overrides
desktop/trunk/xfce4-panel/debian/xfce4-popup-windowlist.1
desktop/trunk/xfce4-session/debian/patches/02_fix-fortune-path.patch
desktop/trunk/xfce4-session/debian/xfce4-session.lintian-overrides
desktop/trunk/xfce4-settings/
desktop/trunk/xfce4-utils/debian/xfce4-utils.lintian-overrides
desktop/trunk/xfconf/
desktop/trunk/xfdesktop4/debian/xfdesktop4.lintian-overrides
Removed:
desktop/trunk/exo/debian/patches/
desktop/trunk/mousepad/debian/patches/
desktop/trunk/orage/debian/lintian
desktop/trunk/thunar/debian/lintian.libthunar-vfs-1-2
desktop/trunk/thunar/debian/patches/02_thunar-vfs-volume-hal_missing-audio-cds-for-volman.patch
desktop/trunk/thunar/debian/patches/03_use-eject-where-necessary.patch
desktop/trunk/thunar/debian/patches/04_es-l10n-typo.patch
desktop/trunk/thunar/debian/patches/05_thunar-vfs-nozombies.patch
desktop/trunk/xfce4-dev-tools/debian/patches/01-fix-bashism-in-xdt-commit.patch
desktop/trunk/xfce4-mixer/debian/lintian-override
desktop/trunk/xfce4-mixer/debian/patches/
desktop/trunk/xfce4-mixer/debian/xfce4-mixer-alsa.shlibs
desktop/trunk/xfce4-mixer/debian/xfce4-mixer-oss.shlibs
desktop/trunk/xfce4-panel/debian/lintian
desktop/trunk/xfce4-panel/debian/patches/
desktop/trunk/xfce4-session/debian/lintian
desktop/trunk/xfce4-session/debian/patches/02_use-mice-as-default-engine.patch
desktop/trunk/xfce4-session/debian/patches/03_xfce4-session-manpage-typo.patch
desktop/trunk/xfce4-session/debian/patches/04_xfce4-session-logout-manpage-typo.patch
desktop/trunk/xfce4-session/debian/patches/05_fix-resize-simple-splash-engine.patch
desktop/trunk/xfce4-session/debian/patches/06_rephrase-tip.patch
desktop/trunk/xfce4-session/debian/patches/07_startup-speed.patch
desktop/trunk/xfce4-terminal/debian/patches/03_background-activity.patch
desktop/trunk/xfce4-utils/debian/lintian-override
desktop/trunk/xfdesktop4/debian/patches/
desktop/trunk/xfdesktop4/debian/xfce4-menueditor.1
desktop/trunk/xfdesktop4/debian/xfdesktop4.lintian
desktop/trunk/xfdesktop4/debian/xfdesktop4.menu-method
desktop/trunk/xfdesktop4/debian/xfdesktop4.postrm
desktop/trunk/xfprint4/debian/patches/03_check-default-printer.patch
desktop/trunk/xfwm4/debian/patches/
Modified:
desktop/trunk/exo/debian/changelog
desktop/trunk/exo/debian/control
desktop/trunk/exo/debian/copyright
desktop/trunk/exo/debian/exo-utils.install
desktop/trunk/exo/debian/libexo-0.3-0.shlibs
desktop/trunk/exo/debian/rules
desktop/trunk/gtk2-engines-xfce/debian/changelog
desktop/trunk/gtk2-engines-xfce/debian/control
desktop/trunk/gtk2-engines-xfce/debian/copyright
desktop/trunk/gtk2-engines-xfce/debian/rules
desktop/trunk/libxfce4util/debian/changelog
desktop/trunk/libxfce4util/debian/control
desktop/trunk/libxfce4util/debian/rules
desktop/trunk/libxfcegui4/debian/changelog
desktop/trunk/libxfcegui4/debian/control
desktop/trunk/libxfcegui4/debian/libxfcegui4-4.install
desktop/trunk/libxfcegui4/debian/libxfcegui4-4.shlibs
desktop/trunk/libxfcegui4/debian/libxfcegui4-dev.install
desktop/trunk/libxfcegui4/debian/patches/series
desktop/trunk/libxfcegui4/debian/rules
desktop/trunk/mousepad/debian/changelog
desktop/trunk/mousepad/debian/control
desktop/trunk/mousepad/debian/copyright
desktop/trunk/mousepad/debian/rules
desktop/trunk/orage/debian/changelog
desktop/trunk/orage/debian/control
desktop/trunk/orage/debian/copyright
desktop/trunk/orage/debian/rules
desktop/trunk/thunar/debian/changelog
desktop/trunk/thunar/debian/control
desktop/trunk/thunar/debian/libthunar-vfs-1-2.shlibs
desktop/trunk/thunar/debian/rules
desktop/trunk/xfce4-appfinder/debian/changelog
desktop/trunk/xfce4-appfinder/debian/control
desktop/trunk/xfce4-appfinder/debian/copyright
desktop/trunk/xfce4-appfinder/debian/rules
desktop/trunk/xfce4-dev-tools/debian/changelog
desktop/trunk/xfce4-dev-tools/debian/copyright
desktop/trunk/xfce4-icon-theme/debian/changelog
desktop/trunk/xfce4-icon-theme/debian/control
desktop/trunk/xfce4-mixer/debian/changelog
desktop/trunk/xfce4-mixer/debian/compat
desktop/trunk/xfce4-mixer/debian/control
desktop/trunk/xfce4-mixer/debian/copyright
desktop/trunk/xfce4-mixer/debian/rules
desktop/trunk/xfce4-mixer/debian/xfce4-mixer.menu
desktop/trunk/xfce4-panel/debian/changelog
desktop/trunk/xfce4-panel/debian/compat
desktop/trunk/xfce4-panel/debian/control
desktop/trunk/xfce4-panel/debian/copyright
desktop/trunk/xfce4-panel/debian/rules
desktop/trunk/xfce4-panel/debian/xfce4-panel.install
desktop/trunk/xfce4-panel/debian/xfce4-panel.shlibs
desktop/trunk/xfce4-session/debian/README.Debian
desktop/trunk/xfce4-session/debian/changelog
desktop/trunk/xfce4-session/debian/compat
desktop/trunk/xfce4-session/debian/control
desktop/trunk/xfce4-session/debian/patches/series
desktop/trunk/xfce4-session/debian/rules
desktop/trunk/xfce4-terminal/debian/changelog
desktop/trunk/xfce4-terminal/debian/control
desktop/trunk/xfce4-utils/debian/changelog
desktop/trunk/xfce4-utils/debian/control
desktop/trunk/xfce4-utils/debian/copyright
desktop/trunk/xfce4-utils/debian/patches/01_xflock4-test-running-screensaver.patch
desktop/trunk/xfce4-utils/debian/rules
desktop/trunk/xfce4/debian/changelog
desktop/trunk/xfce4/debian/control
desktop/trunk/xfce4/debian/copyright
desktop/trunk/xfdesktop4/debian/README.Debian
desktop/trunk/xfdesktop4/debian/changelog
desktop/trunk/xfdesktop4/debian/control
desktop/trunk/xfdesktop4/debian/copyright
desktop/trunk/xfdesktop4/debian/rules
desktop/trunk/xfdesktop4/debian/xfdesktop4-data.install
desktop/trunk/xfdesktop4/debian/xfdesktop4.install
desktop/trunk/xfdesktop4/debian/xfdesktop4.postinst
desktop/trunk/xfprint4/debian/changelog
desktop/trunk/xfprint4/debian/control
desktop/trunk/xfprint4/debian/lintian
desktop/trunk/xfprint4/debian/patches/series
desktop/trunk/xfprint4/debian/rules
desktop/trunk/xfwm4-themes/debian/changelog
desktop/trunk/xfwm4-themes/debian/control
desktop/trunk/xfwm4-themes/debian/rules
desktop/trunk/xfwm4/debian/changelog
desktop/trunk/xfwm4/debian/control
desktop/trunk/xfwm4/debian/copyright
desktop/trunk/xfwm4/debian/lintian
desktop/trunk/xfwm4/debian/rules
Log:
merge back xfce 4.6 from svn-snapshots
Modified: desktop/trunk/exo/debian/changelog
===================================================================
--- desktop/trunk/exo/debian/changelog 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/exo/debian/changelog 2009-02-27 01:13:49 UTC (rev 2781)
@@ -1,3 +1,80 @@
+exo (0.3.100-1) UNRELEASED; urgency=low
+
+ [ Yves-Alexis Perez ]
+ [ Xfce 4.6 Alpha “Pinkie”]
+ * new upstream alpha release.
+ * debian/libexo-0.3-0.shlibs: update shlibs version accordingly.
+ * debian/patches:
+ - 01_exo-alt-eject.patch removed, included upstream.
+ - 02_exo-open.1.patch as well.
+ - 03_libexo-teardown-crypto-on-eject.patch too.
+ * debian/rules:
+ - don't mess with mcs stuff, it doesn't exist anymore.
+ - use dh_install --fail-missing.
+ - don't use quilt.make.
+ * debian/exo-utils.install:
+ - don't ship non existant mcs plugins.
+
+ [ Xfce 4.6 Beta 1 “Fuzzy”]
+ * new upstream beta release
+ * debian/control:
+ - update build-deps for Fuzzy.
+ * debian/libexo-0.3-0.shlibs:
+ - update shlibs for Fuzzy.
+ * debian/rules:
+ - stop messing with config.{guess,sub}.
+
+ [ Xfce 4.6 Beta 2 “Hopper”]
+ * new upstream beta release
+ * debian/libexo-0.3-0.shlibs: bump shlibs for beta 2.
+ * debian/control:
+ - bump build-deps for “Hopper”.
+ - add build-dep on intltool.
+
+ [ Xfce 4.6 Beta 3 “Tuco-tuco”]
+ * new upstream beta release.
+ * debian/control:
+ - update build-deps for “Tuco-Tuco”.
+ - correct deps for -dev package.
+ * debian/libexo-0.3-0.shlibs
+ - bump shlibs for 4.5.93.
+
+ [ Michael Casadevall ]
+ [ Xfce 4.6 Beta 1 “Fuzzy”]
+ * Merged exo patches from Ubuntu
+ * debian/patches:
+ - 04_fix_broken_regex.patch added, adds ^ and $ to url expressions to
+ prevent exo from mistaking a directory as an e-mail address and opening
+ the wrong helper application. Xfce Bug #4330. LP: #262125.
+ * debian/control:
+ - Added myself as an upload
+ - Added quilt as a build-dep
+
+ [ Xfce 4.6 Beta 3 “Tuco-tuco”]
+ * debian/patches
+ - 04_fix_broken_regex.patch dropped, merged upstream
+
+ [ Xfce 4.6 RC1 “Capybara” ]
+ * new upstream release candidate.
+ * debian/control:
+ - bump build-deps for Capybara.
+ - bump deps on -dev for Capybara.
+ * debian/libexo-0.3-0.shlibs:
+ - bump shlibs to 0.3.99.1.
+ * debian/copyright:
+ - update download url.
+ - update copyrights.
+
+ [ Xfce 4.6 ]
+ * new upstream release.
+ * debian/control:
+ - bump build-deps for 4.6.0.
+ - bump deps on -dev for 4.6.0..
+ * debian/libexo-0.3-0.shlibs:
+ - bump shlibs to 0.3.100.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Tue, 24 Feb 2009 22:36:58 +0100
+
exo (0.3.4-8) experimental; urgency=low
* debian/patches:
Modified: desktop/trunk/exo/debian/control
===================================================================
--- desktop/trunk/exo/debian/control 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/exo/debian/control 2009-02-27 01:13:49 UTC (rev 2781)
@@ -1,8 +1,10 @@
Source: exo
Priority: optional
Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
-Uploaders: Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>, Yves-Alexis Perez <corsac at debian.org>
-Build-Depends: debhelper (>= 5.0.0), libxfcegui4-dev (>= 4.4.2), liburi-perl, xfce4-mcs-manager-dev, chrpath, libhal-storage-dev [!hurd-i386], libnotify-dev, quilt
+Uploaders: Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>, Yves-Alexis Perez <corsac at debian.org>, Michael Casadevall <sonicmctails at gmail.com>
+Build-Depends: debhelper (>= 5.0.0), libxfcegui4-dev (>= 4.6.0),
+ liburi-perl, chrpath, libhal-storage-dev [!hurd-i386], libnotify-dev,
+ quilt, intltool
Standards-Version: 3.8.0
Section: libs
Homepage: http://libexo.os-cillation.com/
@@ -12,7 +14,8 @@
Package: libexo-0.3-dev
Section: libdevel
Architecture: any
-Depends: libexo-0.3-0 (= ${binary:Version}), libxfcegui4-dev (>= 4.4.2), libhal-storage-dev
+Depends: libexo-0.3-0 (= ${binary:Version}), libxfce4util-dev (>= 4.6.0),
+ libhal-storage-dev, libgtk2.0-dev
Description: Development files for libexo
This package contains the headers and the static library
for libexo-0.3-0.
Modified: desktop/trunk/exo/debian/copyright
===================================================================
--- desktop/trunk/exo/debian/copyright 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/exo/debian/copyright 2009-02-27 01:13:49 UTC (rev 2781)
@@ -1,7 +1,7 @@
This package was debianized by Yves-Alexis Perez <yaperez at corsac.net> on
Tue, 19 Apr 2005 21:44:36 +0200.
-It was downloaded from http://www.os-cillation.com/
+It was downloaded from http://www.xfce.org
Authors:
========
@@ -31,6 +31,10 @@
exo/exo-icon-view contains code © 2002,2004 Anders Carlsson <andersca at gnu.org>
exo/exo-md5 contains code © 2004 James M. Cape <jcape at ignore-your.tv>
exo-csource/main contains code © 2007 Nick Schermer <nick at xfce.org>
+exo/exo-icon-view.c:
+ © 2008 Jannis Pohlmann <jannis at xfce.org>
+ © 2004-2006 os-cillation e.K.
+ © 2002,2004 Anders Carlsson <andersca at gnu.org>
Licensing:
Modified: desktop/trunk/exo/debian/exo-utils.install
===================================================================
--- desktop/trunk/exo/debian/exo-utils.install 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/exo/debian/exo-utils.install 2009-02-27 01:13:49 UTC (rev 2781)
@@ -1,4 +1,3 @@
usr/bin/*
usr/share/applications
usr/share/man/*
-usr/lib/xfce4/mcs-plugins/*.so
Modified: desktop/trunk/exo/debian/libexo-0.3-0.shlibs
===================================================================
--- desktop/trunk/exo/debian/libexo-0.3-0.shlibs 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/exo/debian/libexo-0.3-0.shlibs 2009-02-27 01:13:49 UTC (rev 2781)
@@ -1,2 +1,2 @@
-libexo-0.3 0 libexo-0.3-0 (>= 0.3.4)
-libexo-hal-0.3 0 libexo-0.3-0 (>= 0.3.4)
+libexo-0.3 0 libexo-0.3-0 (>= 0.3.100)
+libexo-hal-0.3 0 libexo-0.3-0 (>= 0.3.100)
Modified: desktop/trunk/exo/debian/rules
===================================================================
--- desktop/trunk/exo/debian/rules 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/exo/debian/rules 2009-02-27 01:13:49 UTC (rev 2781)
@@ -4,7 +4,7 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-include /usr/share/quilt/quilt.make
+#include /usr/share/quilt/quilt.make
# These are used for cross-compiling and for saving the configure script
# from having to guess our platform (since we know it already)
@@ -37,7 +37,7 @@
major=`ls exo/.libs/lib*.so.* | \
awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'`
-config.status: patch configure
+config.status: configure
dh_testdir
# Add here commands to configure the package.
CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --sysconfdir=/etc --libexecdir=/usr/lib/libexo-0.3-0 --enable-final --disable-gtk-doc --disable-python --enable-notifications
@@ -47,19 +47,12 @@
build-stamp: config.status
dh_testdir
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
- cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
- cp -f /usr/share/misc/config.guess config.guess
-endif
-
# Add here commands to compile the package.
$(MAKE)
touch build-stamp
-clean: unpatch
+clean:
dh_testdir
dh_testroot
rm -f build-stamp
@@ -67,14 +60,6 @@
# Add here commands to clean up after the build process.
[ ! -f Makefile ] || $(MAKE) distclean
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
- rm -f config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
- rm -f config.guess
-endif
-
-
dh_clean
install: build
@@ -99,8 +84,6 @@
-rm -f $(CURDIR)/debian/tmp/usr/lib/python$(PYVERS)/site-packages/exo-$(EXOVERS)/_exo.a
# delete the unneeded .a and .la files
- 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
@@ -119,7 +102,6 @@
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/' \
@@ -139,7 +121,7 @@
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_install --fail-missing --sourcedir=debian/tmp
dh_link
dh_strip --dbg-package=libexo-0.3-0-dbg
dh_compress
Modified: desktop/trunk/gtk2-engines-xfce/debian/changelog
===================================================================
--- desktop/trunk/gtk2-engines-xfce/debian/changelog 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/gtk2-engines-xfce/debian/changelog 2009-02-27 01:13:49 UTC (rev 2781)
@@ -1,3 +1,36 @@
+gtk2-engines-xfce (2.6.0-1) UNRELEASED; urgency=low
+
+ [ Xfce 4.6 Beta 1 “Fuzzy”]
+ * new upstream beta release.
+ * debian/control:
+ - update standards version to 3.8.0.
+ - remove Martin Loschwitz from uploaders.
+ * debian/copyright:
+ - update dates.
+ * debian/rules:
+ - stop messing with config.{guess,sub}.
+ [ Xfce 4.6 Beta 2 “Hopper”]
+ * new upstream beta release.
+ * debian/control:
+ - update depends on xfce4-icon-theme.
+ [ Xfce 4.6 Beta 3 “Tuco-tuco”]
+ * new upstream beta release.
+ * debian/control:
+ - remove dependency on xfce4-icon-theme. Rodent is not yet XDG
+ compliant so there's no 4.5.92. We may have a situation when user
+ doesn't have any icon theme installed.
+
+ [ Xfce 4.6 RC1 “Capybara” ]
+ * new upstream release candidate.
+ * debian/copyright: update copyright dates.
+
+ [ Xfce 4.6 ]
+ * new upstream release.
+ * debian/copyright:
+ - precise that the license is GPL-2+.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Tue, 24 Feb 2009 22:49:11 +0100
+
gtk2-engines-xfce (2.4.2-2) unstable; urgency=low
* debian/copyright:
Modified: desktop/trunk/gtk2-engines-xfce/debian/control
===================================================================
--- desktop/trunk/gtk2-engines-xfce/debian/control 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/gtk2-engines-xfce/debian/control 2009-02-27 01:13:49 UTC (rev 2781)
@@ -2,16 +2,16 @@
Section: x11
Priority: optional
Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
-Uploaders: Martin Loschwitz <madkiss at debian.org>, Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>, Yves-Alexis Perez <corsac at debian.org>
+Uploaders: Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>, Yves-Alexis Perez <corsac at debian.org>
Build-Depends: debhelper (>= 4.1.26), libgtk2.0-dev (>= 2.10.1), libx11-dev (> 2:1.0.0-6), chrpath
-Standards-Version: 3.7.3
+Standards-Version: 3.8.0
Homepage: http://www.xfce.org/
Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/gtk2-engines-xfce/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/gtk2-engines-xfce/
Package: gtk2-engines-xfce
Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, xfce4-icon-theme
+Depends: ${misc:Depends}, ${shlibs:Depends}
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/trunk/gtk2-engines-xfce/debian/copyright
===================================================================
--- desktop/trunk/gtk2-engines-xfce/debian/copyright 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/gtk2-engines-xfce/debian/copyright 2009-02-27 01:13:49 UTC (rev 2781)
@@ -20,14 +20,15 @@
Alexander Larsson
Owen Taylor <otaylor at redhat.com>
-gtk2-engines-xfce is © 1999-2007 Olivier Fourdan
+gtk2-engines-xfce is © 1999-2009 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
- the Free Software Foundation; version 2 dated June, 1991.
-
- This package is distributed in the hope that it will be useful,
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program 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.
Modified: desktop/trunk/gtk2-engines-xfce/debian/rules
===================================================================
--- desktop/trunk/gtk2-engines-xfce/debian/rules 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/gtk2-engines-xfce/debian/rules 2009-02-27 01:13:49 UTC (rev 2781)
@@ -32,11 +32,6 @@
[ ! -f Makefile ] || $(MAKE) distclean
- -test -r /usr/share/misc/config.sub && \
- cp -f /usr/share/misc/config.sub config.sub
- -test -r /usr/share/misc/config.guess && \
- cp -f /usr/share/misc/config.guess config.guess
-
dh_clean
install: build
Copied: desktop/trunk/libxfce4menu (from rev 2780, desktop/branches/svn-snapshots/libxfce4menu)
Modified: desktop/trunk/libxfce4util/debian/changelog
===================================================================
--- desktop/trunk/libxfce4util/debian/changelog 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/libxfce4util/debian/changelog 2009-02-27 01:13:49 UTC (rev 2781)
@@ -1,3 +1,35 @@
+libxfce4util (4.6.0-1) UNRELEASED; urgency=low
+
+ [ Xfce 4.6 Alpha “Pinkie”]
+ * debian/rules:
+ - update shlibs.
+ - fail if dh_install misses files.
+ [ Xfce 4.6 Beta 1 “Fuzzy”]
+ * new upstream beta release.
+ * debian/control:
+ - no need to depends on gtk, libxfce4util is glib-only.
+ * debian/rules:
+ - bump shlibs for Fuzzy.
+ [ Xfce 4.6 Beta 2 “Hopper”]
+ * new upstream beta release.
+ * debian/rules:
+ - bump shlibs for 4.5.92.
+ [ Xfce 4.6 Beta 3 “Tuco-tuco”]
+ * new upstream beta release.
+ * debian/rules:
+ - bump shlibs for 4.5.93.
+ [ Xfce 4.6 RC1 “Capybara” ]
+ * new upstream release candidate.
+ * debian/rules:
+ - bump shlibs for 4.5.99.1.
+
+ [ Xfce 4.6.0 ]
+ * new upstream release \o/.
+ * debian/rules:
+ - bump shlibs for 4.6.0.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Tue, 24 Feb 2009 07:31:53 +0100
+
libxfce4util (4.4.2-3) unstable; urgency=low
* debian/control:
Modified: desktop/trunk/libxfce4util/debian/control
===================================================================
--- desktop/trunk/libxfce4util/debian/control 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/libxfce4util/debian/control 2009-02-27 01:13:49 UTC (rev 2781)
@@ -14,7 +14,7 @@
Architecture: any
Replaces: libxfce4util-0-dev
Conflicts: libxfce4util-0-dev
-Depends: libxfce4util4 (= ${binary:Version}), libglib2.0-dev, libgtk2.0-dev
+Depends: libxfce4util4 (= ${binary:Version}), libglib2.0-dev
Suggests: devhelp
Description: Development files for libxfce4util4
This package contains the headers and the static library
Modified: desktop/trunk/libxfce4util/debian/rules
===================================================================
--- desktop/trunk/libxfce4util/debian/rules 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/libxfce4util/debian/rules 2009-02-27 01:13:49 UTC (rev 2781)
@@ -42,13 +42,6 @@
[ ! -f Makefile ] || $(MAKE) distclean
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
- cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
- cp -f /usr/share/misc/config.guess config.guess
-endif
-
dh_clean
install: build
@@ -75,13 +68,13 @@
dh_installdocs NEWS TODO
dh_installman -p libxfce4util4 debian/xfce4-kiosk-query.8
- dh_install --list-missing --sourcedir=debian/tmp
+ dh_install --fail-missing --sourcedir=debian/tmp
dh_strip --dbg-package=libxfce4util4-dbg
dh_compress
dh_fixperms
- dh_makeshlibs -V 'libxfce4util4 (>= 4.4.2)'
+ dh_makeshlibs -V 'libxfce4util4 (>= 4.6.0)'
dh_installdeb
dh_shlibdeps
Modified: desktop/trunk/libxfcegui4/debian/changelog
===================================================================
--- desktop/trunk/libxfcegui4/debian/changelog 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/libxfcegui4/debian/changelog 2009-02-27 01:13:49 UTC (rev 2781)
@@ -1,3 +1,77 @@
+libxfcegui4 (4.6.0-1) UNRELEASED; urgency=low
+
+ [ Yves-Alexis Perez ]
+ [ Xfce 4.6 Alpha “Pinkie”]
+ * debian/libxfcegui4-4.shlibs: updated shlibs to 4.5.90.
+ * debian/rules:
+ - fail if dh_install misses files.
+ - switch from `pwd` to $(CURDIR)
+ - stop messing with config.{guess,sub}.
+ - don't ship glade .la files.
+ * debian/control:
+ - update standards version to 3.8.0.
+ - build-dep on intltool.
+ - build-dep on libgladeui-1-dev.
+ - add a new package glade-xfce which contains module and catalogue for
+ Xfce widgets in Glade.
+ * debian/glade-xfce.install: ship gladeui stuff in glade-xfce package.
+ [ Xfce 4.6 Beta 1 “Fuzzy”]
+ * new upstream beta release.
+ * debian/control:
+ - drop useless Conflicts/Replaces.
+ - update build-deps for Fuzzy.
+ - cleanup build-deps.
+ - make -dev package depends on libgtk2.0-dev.
+ * debian/libxfcegui4-4.shlibs: bumpd shlibs for Fuzzy.
+ * debian/rules:
+ - be explicit on configure flags.
+
+ [ Xfce 4.6 Beta 2 “Hopper”]
+ * new upstream beta release.
+ * debian/control
+ - update build-deps for “Hopper”.
+ - add build-dep on libxfconf.
+ - make -dev package depends on libxfconf-0-dev.
+ * debian/rules:
+ - remove libxfce4kbd-private.la.
+ - use sysconfdir=/etc.
+ - explicit enable of private keyboard library.
+ * debian/libxfcegui4-4.install:
+ - install xfconf config files in /etc.
+ * debian/libxfcegui4-4.shlibs:
+ - add libxfce4kbd-private to shlibs files.
+
+ [ Xfce 4.6 Beta 3 “Tuco-tuco”]
+ * new upstream beta release.
+ * debian/control:
+ - update build-deps for “Tuco-Tuco”.
+ - clean deps on -dev package to only get what pkg-config requires.
+ * debian/libxfcegui4-4.shlibs
+ - bump shlibs for “Tuco-Tuco”
+
+ [ Xfce 4.6 RC1 “Capybara”]
+ * new upstream release candidate.
+ * debian/control:
+ - update build-deps for “Capybara”
+ * debian/libxfcegui4-4.shlibs:
+ - bump shlibs to 4.5.99.1.
+
+ [ Xfce 4.6 ]
+ * new upstream release.
+ * debian/control:
+ - update build-deps for 4.6.
+ * debian/libxfcegui4-4.shlibs:
+ - bump shlibs to 4.6.0.
+
+ [ Michael Casadevall ]
+ * debian/control:
+ - Added myself to uploaders
+ * debian/patches/02_fix-menu-icons.patch:
+ - Fixes Xfce #3614 which prevents icons with dots
+ in them from properly showing up in the menu
+
+ -- Yves-Alexis Perez <corsac at debian.org> Tue, 24 Feb 2009 07:44:09 +0100
+
libxfcegui4 (4.4.2-4) unstable; urgency=low
* another “brown paper bag” release.
Modified: desktop/trunk/libxfcegui4/debian/control
===================================================================
--- desktop/trunk/libxfcegui4/debian/control 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/libxfcegui4/debian/control 2009-02-27 01:13:49 UTC (rev 2781)
@@ -2,19 +2,30 @@
Section: libs
Priority: optional
Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
-Uploaders: Martin Loschwitz <madkiss at debian.org>, Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>, Yves-Alexis Perez <corsac at debian.org>
-Build-Depends: debhelper (>> 5.0.0), libgtk2.0-dev (>= 2.10.6), bison, libxft-dev, libxfce4util-dev (>= 4.4.2), libxt-dev, libxml2-dev, libstartup-notification0-dev, chrpath, quilt
-Standards-Version: 3.7.3
+Uploaders: Martin Loschwitz <madkiss at debian.org>, Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>, Yves-Alexis Perez <corsac at debian.org>, Michael Casadevall <sonicmctails at gmail.com>
+Build-Depends: debhelper (>> 5.0.0), libgtk2.0-dev (>= 2.10.6),
+ libxfce4util-dev (>= 4.6.0), libxfconf-0-dev (>=4.6.0),
+ libstartup-notification0-dev, quilt, libglade2-dev, libgladeui-1-dev,
+ intltool, chrpath
+Standards-Version: 3.8.0
Homepage: http://www.xfce.org/
Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/libxfcegui4/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/libxfcegui4/
+Package: glade-xfce
+Section: libdevel
+Architecture: any
+Depends: ${shlibs:Depends}
+Recommends: glade, libxfcegui4-dev
+Description: glade modules for xfce
+ This package contains the modules that allow Glade to provide Xfce widgets in
+ its palette.
+
Package: libxfcegui4-dev
Section: libdevel
Architecture: any
-Depends: libxfcegui4-4 (= ${binary:Version}), libxfce4util-dev (>= 4.4.2), libxft-dev, libxt-dev, libxpm-dev, libxml2-dev, libstartup-notification0-dev
-Replaces: libxfcegui4-1-dev
-Conflicts: libxfcegui4-1-dev
+Depends: libxfcegui4-4 (= ${binary:Version}), libxfce4util-dev (>= 4.6.0),
+ libgtk2.0-dev
Suggests: devhelp
Description: Development files for libxfcegui4-4
This package contains the headers and the static library
@@ -29,8 +40,6 @@
Section: libs
Architecture: any
Depends: ${shlibs:Depends}
-Replaces: 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
Copied: desktop/trunk/libxfcegui4/debian/glade-xfce.install (from rev 2780, desktop/branches/svn-snapshots/libxfcegui4/debian/glade-xfce.install)
===================================================================
--- desktop/trunk/libxfcegui4/debian/glade-xfce.install (rev 0)
+++ desktop/trunk/libxfcegui4/debian/glade-xfce.install 2009-02-27 01:13:49 UTC (rev 2781)
@@ -0,0 +1,2 @@
+usr/share/glade3
+usr/lib/glade3
Modified: desktop/trunk/libxfcegui4/debian/libxfcegui4-4.install
===================================================================
--- desktop/trunk/libxfcegui4/debian/libxfcegui4-4.install 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/libxfcegui4/debian/libxfcegui4-4.install 2009-02-27 01:13:49 UTC (rev 2781)
@@ -1,3 +1,5 @@
usr/lib/lib*.so.*
+usr/lib/libglade/2.0/libxfce4.so
usr/share/locale/*
usr/share/icons/hicolor/*
+etc
Modified: desktop/trunk/libxfcegui4/debian/libxfcegui4-4.shlibs
===================================================================
--- desktop/trunk/libxfcegui4/debian/libxfcegui4-4.shlibs 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/libxfcegui4/debian/libxfcegui4-4.shlibs 2009-02-27 01:13:49 UTC (rev 2781)
@@ -1 +1,2 @@
-libxfcegui4 4 libxfcegui4-4 (>= 4.4.2)
+libxfcegui4 4 libxfcegui4-4 (>= 4.6.0)
+libxfce4kbd-private 5 libxfcegui4-4 (>= 4.6.0)
Modified: desktop/trunk/libxfcegui4/debian/libxfcegui4-dev.install
===================================================================
--- desktop/trunk/libxfcegui4/debian/libxfcegui4-dev.install 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/libxfcegui4/debian/libxfcegui4-dev.install 2009-02-27 01:13:49 UTC (rev 2781)
@@ -1,5 +1,6 @@
usr/include/*
usr/lib/lib*.a
usr/lib/lib*.so
+usr/lib/libglade/2.0/*.a
usr/lib/pkgconfig/*
usr/share/gtk-doc/html/libxfcegui4/*
Copied: desktop/trunk/libxfcegui4/debian/patches/02_fix-menu-icons.patch (from rev 2780, desktop/branches/svn-snapshots/libxfcegui4/debian/patches/02_fix-menu-icons.patch)
===================================================================
--- desktop/trunk/libxfcegui4/debian/patches/02_fix-menu-icons.patch (rev 0)
+++ desktop/trunk/libxfcegui4/debian/patches/02_fix-menu-icons.patch 2009-02-27 01:13:49 UTC (rev 2781)
@@ -0,0 +1,42 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_fix-menu-icons.dpatch by <gauvain at ulteo.com>
+##
+## DP: Allows the icon to show up even if there is a dot in its name
+## DP: Fixes Xfce #3614
+
+ at DPATCH@
+diff -urNad libxfcegui4-4.4.2-4ubuntu1~/libxfcegui4/icons.c libxfcegui4-4.4.2-4ubuntu1/libxfcegui4/icons.c
+--- libxfcegui4-4.4.2-4ubuntu1~/libxfcegui4/icons.c 2008-05-05 00:45:52.000000000 +0200
++++ libxfcegui4-4.4.2-4ubuntu1/libxfcegui4/icons.c 2008-05-08 21:12:07.000000000 +0200
+@@ -143,8 +143,12 @@
+ ensure_gtk_icon_theme();
+
+ /* GtkIconTheme doesn't like extensions */
+- if((p = g_strrstr(name, ".")) && strlen(p) < 6)
+- name_fixed = g_strndup(name, p-name);
++ if (g_str_has_suffix (name, ".png") || g_str_has_suffix (name, ".svg")
++ || g_str_has_suffix (name, ".xpm"))
++ {
++ if((p = g_strrstr(name, ".")) && strlen(p) < 6)
++ name_fixed = g_strndup(name, p-name);
++ }
+
+ pix = gtk_icon_theme_load_icon(icon_theme, name_fixed ? name_fixed : name,
+ size,
+@@ -221,9 +225,13 @@
+ ensure_gtk_icon_theme();
+
+ /* GtkIconTheme doesn't like extensions */
+- if((p = g_strrstr(name, ".")) && strlen(p) < 6)
+- name_fixed = g_strndup(name, p-name);
+-
++ if (g_str_has_suffix (name, ".png") || g_str_has_suffix (name, ".svg")
++ || g_str_has_suffix (name, ".xpm"))
++ {
++ if((p = g_strrstr(name, ".")) && strlen(p) < 6)
++ name_fixed = g_strndup(name, p-name);
++ }
++
+ info = gtk_icon_theme_lookup_icon(icon_theme,
+ name_fixed ? name_fixed : name,
+ size, 0);
Modified: desktop/trunk/libxfcegui4/debian/patches/series
===================================================================
--- desktop/trunk/libxfcegui4/debian/patches/series 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/libxfcegui4/debian/patches/series 2009-02-27 01:13:49 UTC (rev 2781)
@@ -1 +1,2 @@
01_xfce-exec-use-thunar.patch
+02_fix-menu-icons.patch
Modified: desktop/trunk/libxfcegui4/debian/rules
===================================================================
--- desktop/trunk/libxfcegui4/debian/rules 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/libxfcegui4/debian/rules 2009-02-27 01:13:49 UTC (rev 2781)
@@ -16,7 +16,10 @@
config.status: configure
dh_testdir
- ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --enable-xinerama --enable-final
+ ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
+ --sysconfdir=/etc --prefix=/usr --enable-final \
+ --enable-startup-notification --enable-keyboard-library \
+ --enable-gladeui --with-x
build: patch build-stamp
build-stamp: config.status
@@ -33,13 +36,6 @@
[ ! -f Makefile ] || $(MAKE) distclean
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
- cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
- cp -f /usr/share/misc/config.guess config.guess
-endif
-
dh_clean
install: build
@@ -49,11 +45,14 @@
dh_clean -k
dh_installdirs
- $(MAKE) install DESTDIR=`pwd`/debian/tmp
+ $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
- rm -f `pwd`/debian/tmp/usr/lib/libxfcegui4.la
+ rm -f $(CURDIR)/debian/tmp/usr/lib/libxfcegui4.la
+ rm -f $(CURDIR)/debian/tmp/usr/lib/libxfce4kbd-private.la
+ rm -f $(CURDIR)/debian/tmp/usr/lib/libglade/2.0/libxfce4.la
+ rm -f $(CURDIR)/debian/tmp/usr/lib/glade3/modules/libgladexfce4.la
- chrpath -d -k `pwd`/debian/tmp/usr/lib/*.so.*
+ chrpath -d -k $(CURDIR)/debian/tmp/usr/lib/*.so.*
binary-indep: build install
binary-arch: build install
@@ -64,7 +63,7 @@
dh_installchangelogs ChangeLog
dh_installdocs README
- dh_install --list-missing --sourcedir=debian/tmp
+ dh_install --fail-missing --sourcedir=debian/tmp
dh_strip --dbg-package=libxfcegui4-4-dbg
dh_compress
Modified: desktop/trunk/mousepad/debian/changelog
===================================================================
--- desktop/trunk/mousepad/debian/changelog 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/mousepad/debian/changelog 2009-02-27 01:13:49 UTC (rev 2781)
@@ -1,3 +1,20 @@
+mousepad (0.2.16-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+ * debian/control:
+ - drop Rudy Godoy and Martin Loschwitz from Uploaders.
+ - bump build-deps for Xfce 4.6.
+ - update standards version to 3.8.0.
+ - add depends on ${misc:Depends}.
+ - drop quilt from build-deps.
+ - add build-dep on intltool.
+ * debian/patches:
+ - 01_fix-recent-items-sort dropped, merged upstream.
+ * debian/rules:
+ - drop quilt rules.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Fri, 27 Feb 2009 01:24:54 +0100
+
mousepad (0.2.13-2) unstable; urgency=low
* debian/control:
Modified: desktop/trunk/mousepad/debian/control
===================================================================
--- desktop/trunk/mousepad/debian/control 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/mousepad/debian/control 2009-02-27 01:13:49 UTC (rev 2781)
@@ -2,15 +2,17 @@
Section: editors
Priority: optional
Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
-Uploaders: Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>, Rudy Godoy <rudy at kernel-panik.org>, Martin Loschwitz <madkiss at debian.org>, Yves-Alexis Perez <corsac at debian.org>
-Build-Depends: debhelper (>= 4.0.0), docbook-to-man, libxfcegui4-dev (>= 4.4.2), pkg-config, libxml-parser-perl, chrpath, quilt
-Standards-Version: 3.7.3
+Uploaders: Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>,
+ Yves-Alexis Perez <corsac at debian.org>
+Build-Depends: debhelper (>= 4.0.0), docbook-to-man,
+ libxfcegui4-dev (>= 4.6.0), pkg-config, libxml-parser-perl, chrpath, intltool
+Standards-Version: 3.8.0
Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/mousepad/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/mousepad/
Package: mousepad
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
Recommends: xfprint4
Description: simple Xfce oriented text editor
Mousepad is a graphical text editor for Xfce based on Leafpad.
Modified: desktop/trunk/mousepad/debian/copyright
===================================================================
--- desktop/trunk/mousepad/debian/copyright 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/mousepad/debian/copyright 2009-02-27 01:13:49 UTC (rev 2781)
@@ -18,7 +18,7 @@
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.
+ the Free Software Foundation; version 2 or later.
This package is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
Modified: desktop/trunk/mousepad/debian/rules
===================================================================
--- desktop/trunk/mousepad/debian/rules 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/mousepad/debian/rules 2009-02-27 01:13:49 UTC (rev 2781)
@@ -17,9 +17,9 @@
CFLAGS += -O2
endif
-include /usr/share/quilt/quilt.make
+#include /usr/share/quilt/quilt.make
-config.status: patch configure
+config.status: configure
dh_testdir
# Add here commands to configure the package.
CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --sysconfdir=/etc --enable-final
@@ -36,7 +36,7 @@
touch build-stamp
-clean: unpatch
+clean:
dh_testdir
dh_testroot
rm -f build-stamp mousepad.1
Modified: desktop/trunk/orage/debian/changelog
===================================================================
--- desktop/trunk/orage/debian/changelog 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/orage/debian/changelog 2009-02-27 01:13:49 UTC (rev 2781)
@@ -1,3 +1,51 @@
+orage (4.6.0-1) UNRELEASED; urgency=low
+
+ [ Yves-Alexis Perez ]
+ * debian/control:
+ - update build-deps to Xfce 4.6 alpha “Pinkie”.
+ - add libnotify and libdbus to build-deps.
+ [ Xfce 4.6 Beta 1 “Fuzzy”]
+ * new upstream beta release.
+ * debian/control:
+ - update build-deps for Fuzzy.
+ * debian/rules:
+ - don't try to remove non existent mcs files.
+ - don't install lintian override
+ * debian/lintian
+ - removed. now useless.
+ [ Michael Casadevall ]
+ * debian/control:
+ - dropped dependency on xfce-mcs, so we can drop it cleanly for 4.6
+
+ [ Xfce 4.6 Beta 2 “Hopper”]
+ * new upstream beta release.
+ * debian/control:
+ - update build-deps for Hopper.
+
+ [ Xfce 4.6 Beta 3 “Tuco-Tuco”]
+ * new upstream beta release.
+ * debian/control:
+ - update build-deps for Tuco-Tuco.
+ - add build-dep on intltool.
+
+ [ Xfce 4.6 RC1 “Capybara” ]
+ * new upstream release candidate.
+ * debian/control:
+ - update build-deps for “Capybara”.
+
+ [ Xfce 4.6 ]
+ * new upstream release.
+ * debian/rules:
+ - enable dbus. closes: #498611
+ * debian/control:
+ - update build-deps for 4.6.
+ - build-dep on libdbus-1-dev.
+ - add recommends on dbus-x11.
+ * debian/copyright:
+ - update licensing infos.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Wed, 25 Feb 2009 21:55:42 +0100
+
orage (4.5.14.0-1) unstable; urgency=low
* New upstream release.
@@ -15,7 +63,7 @@
- drop 03_de.po-typo, useless now.
* debian/orage.1 removed, since upstream now provides it.
- -- Yves-Alexis Perez <corsac at debian.org> Tue, 22 Jul 2008 20:05:13 +0200
+ -- Yves-Alexis Perez <corsac at debian.org> Tue, 23 Sep 2008 23:41:35 +0200
orage (4.5.12.2-6) unstable; urgency=low
Modified: desktop/trunk/orage/debian/control
===================================================================
--- desktop/trunk/orage/debian/control 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/orage/debian/control 2009-02-27 01:13:49 UTC (rev 2781)
@@ -2,8 +2,11 @@
Section: x11
Priority: optional
Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
-Uploaders: Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>, Yves-Alexis Perez <corsac at debian.org>
-Build-Depends: debhelper (>= 4.1.0), xfce4-mcs-manager-dev (>= 4.4.2), cdbs, libxml-parser-perl, libgtk2.0-dev (>= 2.10.1), xfce4-panel-dev (>= 4.4.2), chrpath
+Uploaders: Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>, Yves-Alexis Perez <corsac at debian.org>, Michael Casadevall <sonicmctails at gmail.com>
+Build-Depends: debhelper (>= 4.1.0), cdbs, libxml-parser-perl,
+ libgtk2.0-dev (>= 2.10.1), xfce4-panel-dev (>= 4.6.0), chrpath,
+ libxfcegui4-dev (>= 4.6.0), libnotify-dev, libdbus-1-dev, intltool,
+ libdbus-1-dev
Standards-Version: 3.8.0
Homepage: http://www.xfce.org/
Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/orage/
@@ -11,9 +14,9 @@
Package: orage
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, xfce4-mcs-manager
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: dbus-x11
Suggests: sox
-Conflicts: xfce-mcs-manager (<< 4.4.2-3)
Description: Calendar for Xfce Desktop Environment
This package contains a calendar for the Xfce4 desktop environment.
It integrates itself nicely into the desktop environment, is highly
Modified: desktop/trunk/orage/debian/copyright
===================================================================
--- desktop/trunk/orage/debian/copyright 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/orage/debian/copyright 2009-02-27 01:13:49 UTC (rev 2781)
@@ -10,18 +10,18 @@
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>
+© 2003-2006 Mickaël Graf <korbinus at xfce.org>
+© 2003 Benedikt Meurer <benny at xfce.org>
+© 2005-2009 Juha Kautto <juha at xfce.org>
-panel-plugin is (c) 2006-2007 Juha Kautto <juha at xfce.org>
+panel-plugin is © 2006-2007 Juha Kautto <juha at xfce.org>
License:
-Orage is licensed under the GNU General Public License. It contains libical,
-which is licensed under the Mozilla Public License and the GNU Library
-General Public License. There are a few files licensed under the BSD
-License.
+Orage is licensed under the GNU General Public License (version 2 or
+later). It contains libical, which is licensed under the Mozilla Public
+License and the GNU Library General Public License. There are a few files
+licensed under the BSD License.
Under libical directory, the copyright holders are:
Deleted: desktop/trunk/orage/debian/lintian
===================================================================
--- desktop/trunk/orage/debian/lintian 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/orage/debian/lintian 2009-02-27 01:13:49 UTC (rev 2781)
@@ -1,2 +0,0 @@
-#xfce-setting-show is part of Xfce and this .desktop has OnlyShowIn=XFCE.
-orage: desktop-command-not-in-package /usr/share/applications/xfce-xfcalendar-settings.desktop xfce-setting-show
Modified: desktop/trunk/orage/debian/rules
===================================================================
--- desktop/trunk/orage/debian/rules 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/orage/debian/rules 2009-02-27 01:13:49 UTC (rev 2781)
@@ -1,23 +1,14 @@
#!/usr/bin/make -f
-#DEB_AUTO_UPDATE_LIBTOOL := pre
-#DEB_AUTO_UPDATE_ACLOCAL := 1.8
-#DEB_AUTO_UPDATE_AUTOCONF := yes
-
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/class/autotools.mk
-DEB_CONFIGURE_EXTRA_FLAGS := --enable-final
+DEB_CONFIGURE_EXTRA_FLAGS := --enable-final --enable-dbus
install/orage::
- rm -f $(CURDIR)/debian/orage/usr/lib/xfce4/mcs-plugins/*.la
- rm -f $(CURDIR)/debian/orage/usr/lib/xfce4/mcs-plugins/*.a
-
chrpath -d -k `pwd`/debian/orage/usr/bin/* \
`pwd`/debian/orage/usr/lib/orage/xfce4/*/*
binary-post-install/orage::
dh_desktop
- install -D -p -o root -g root -m 644 debian/lintian $(CURDIR)/debian/orage/usr/share/lintian/overrides/orage
-
Modified: desktop/trunk/thunar/debian/changelog
===================================================================
--- desktop/trunk/thunar/debian/changelog 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/thunar/debian/changelog 2009-02-27 01:13:49 UTC (rev 2781)
@@ -1,10 +1,75 @@
-thunar (0.9.0-11) UNRELEASED; urgency=low
+thunar (1.0.0-1) UNRELEASED; urgency=low
+ [ Xfce 4.6 Alpha “Pinkie” ]
+ * new upstream alpha release.
* debian/control:
- - updated standards version to 3.8.0. No change needed.
+ - update standards version to 3.8.0. No change needed.
+ - updade build-deps for Xfce 4.6 Alpha.
+ - move thunar-volman from suggests to recommends.
+ - add recommends on xdg-user-dirs for Thunar to handle XDG user dirs.
+ * debian/patches:
+ - 02_thunar-vfs-volume-hal_missing-audio-cds-for-volman dropped, merged
+ upstream.
+ - 03_use-eject-where-necessary as well.
+ - 04_es-l10n-typo.patch too.
+ - 05_thunar-vfs-nozombies finally.
+ * debian/rules:
+ - fail if dh_install misses files.
+ [ Xfce 4.6 Beta 1 “Fuzzy”]
+ * new upstream beta release.
+ * debian/control:
+ - update build-deps for Fuzzy.
+ [ Xfce 4.6 Beta 2 “Hopper”]
+ * new upstream beta release.
+ * debian/control:
+ - update build-deps for Hopper.
+ * debian/libthunar-vfs-1-2.shlibs
+ - bump shlibs for Hopper.
+ * debian/patches:
+ - 02_fix-fam-closing-treeview added, fix file monitoring in treeview.
+ - 03_eject-handling added, display eject if and only if
+ is_ejectable=true. (Xfce r28895, #3978)
+ - 04_fix-listview-focus-deleted added, fix focus problem when deleting
+ a file in detailed list view. (Xfce r28902, #3884)
- -- Yves-Alexis Perez <corsac at debian.org> Tue, 12 Aug 2008 22:02:38 +0200
+ [ Xfce 4.6 Beta 3 “Tuco-tuco”]
+ * new upstream beta release.
+ - correctly close folders in treeview. closes: #478566
+ - display “eject” if and only if device has is_ejectable. closes: #500561
+ - fix focus problem when deleting in detailed list view. closes: #446810
+ * debian/control:
+ - update build-deps for “Tuco-Tuco”.
+ - add build-dep on intltool.
+ - add ${misc:Depends} to various Depends: line.
+ - add dep on libglib2.0-dev (for thunar-vfs) and libgtk2.0-dev (for
+ thunarx) to -dev package.
+ * debian/libthunar-vfs-1-2.shlibs: bump shlibs.
+ * debian/patches:
+ - 02_fix-fam-closing-treeview dropped, merged upstream.
+ - 03_eject-handling as well.
+ - 04_fix-listview-focus-deleted finally.
+ * rename lintian override file so it's taken by dh_lintian.
+ * debian/rules:
+ - don't install lintian override, it's done by dh_lintian.
+ - call dh_desktop in binary-install.
+ [ Xfce 4.6 RC1 “Capybara” ]
+ * new upstream release candidate.
+ * debian/control:
+ - update build-deps for “Capybara”.
+ * debian/libthunar-vfs-1-2.shlibs:
+ - bump shlibs to 0.9.99.1.
+
+ [ Xfce 4.6 ]
+ * new upstream release.
+ * debian/control:
+ - update build-deps for 4.6.0.
+ - add ${misc:Depends} to -dev depends.
+ * debian/libthunar-vfs-1-2.shlibs:
+ - bump shlibs to 1.0.0.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Tue, 24 Feb 2009 23:56:09 +0100
+
thunar (0.9.0-10) unstable; urgency=low
* -dev package doesn't need to depend on exo-utils, thunar does.
Modified: desktop/trunk/thunar/debian/control
===================================================================
--- desktop/trunk/thunar/debian/control 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/thunar/debian/control 2009-02-27 01:13:49 UTC (rev 2781)
@@ -3,7 +3,12 @@
Priority: optional
Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
Uploaders: Yves-Alexis Perez <corsac at debian.org>, Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>
-Build-Depends: debhelper (>= 5.0.0), autotools-dev, libcairo2-dev, libexo-0.3-dev (>= 0.3.4-8), cdbs, libxml-parser-perl, libfam-dev, libhal-storage-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], libdbus-glib-1-dev, libexif-dev, libgtk2.0-dev (>= 2.10.1), xfce4-panel-dev (>= 4.4.2), chrpath, libpcre3-dev, libjpeg62-dev
+Build-Depends: debhelper (>= 5.0.0), libcairo2-dev,
+ libexo-0.3-dev (>= 0.3.100), 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.6.0), chrpath, libpcre3-dev, libjpeg62-dev,
+ intltool
Build-Conflicts: libgamin-dev [!hurd-i386]
Standards-Version: 3.8.0
Homepage: http://thunar.xfce.org
@@ -13,7 +18,9 @@
Package: libthunar-vfs-1-dev
Section: libdevel
Architecture: any
-Depends: libthunar-vfs-1-2 (= ${binary:Version}), libexo-0.3-dev (>= 0.3.4), thunar-data (= ${source:Version})
+Depends: libthunar-vfs-1-2 (= ${binary:Version}), ${misc:Depends},
+ libexo-0.3-dev (>= 0.3.100), thunar-data (=${source:Version}),
+ libglib2.0-dev, libgtk2.0-dev
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
@@ -21,20 +28,21 @@
Package: libthunar-vfs-1-2
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}, thunar-data (= ${source:Version})
+Depends: ${shlibs:Depends}, thunar-data (= ${source:Version}), ${misc:Depends}
Replaces: libthunar-vfs-1
Description: VFS abstraction used in thunar
This package contains a library for virtual file system abstraction. It's
- used by thunar, the file manager of Xfce 4.4
+ used by thunar, the file manager of Xfce 4.6
Package: thunar
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, desktop-file-utils, shared-mime-info, thunar-data (= ${source:Version}), exo-utils
-Recommends: hal, dbus-x11, gamin, ${shlibs:Recommends}
+Recommends: hal, dbus-x11, gamin, ${shlibs:Recommends}, thunar-volman,
+ xdg-user-dirs
Conflicts: thunar-data (<= 0.9.0-5)
-Suggests: thunar-archive-plugin, thunar-media-tags-plugin, thunar-volman
+Suggests: thunar-archive-plugin, thunar-media-tags-plugin
Description: File Manager for Xfce
- Thunar is the file manager designed to be the default file manager of Xfce 4.4
+ Thunar is the file manager designed to be the default file manager of Xfce 4.6
It has been designed to be fast and easy to use.
.
A Xfce plugin can manages the trash, if xfce4-panel is installed as well.
@@ -42,6 +50,7 @@
Package: thunar-data
Architecture: all
+Depends: ${misc:Depends}
Replaces: thunar (<= 0.8.0-3)
Description: Provides thunar documentation, icons and translations
This package contains architecture-independent files for thunar.
@@ -49,7 +58,7 @@
Package: thunar-dbg
Architecture: any
Priority: extra
-Depends: ${shlibs:Depends}, thunar (= ${binary:Version})
+Depends: ${shlibs:Depends}, thunar (= ${binary:Version}), ${misc:Depends}
Description: debugging informations for thunar
This package contains debugging symbols for thunar, libthunar-vfs and
libthunar-x, the file manager and file management libraries for Xfce Desktop
Copied: desktop/trunk/thunar/debian/libthunar-vfs-1-2.lintian-overrides (from rev 2780, desktop/branches/svn-snapshots/thunar/debian/libthunar-vfs-1-2.lintian-overrides)
===================================================================
--- desktop/trunk/thunar/debian/libthunar-vfs-1-2.lintian-overrides (rev 0)
+++ desktop/trunk/thunar/debian/libthunar-vfs-1-2.lintian-overrides 2009-02-27 01:13:49 UTC (rev 2781)
@@ -0,0 +1,2 @@
+#private
+libthunar-vfs-1-2: package-name-doesnt-match-sonames libthunar-vfs-1-2 libthunarx-1-0
Modified: desktop/trunk/thunar/debian/libthunar-vfs-1-2.shlibs
===================================================================
--- desktop/trunk/thunar/debian/libthunar-vfs-1-2.shlibs 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/thunar/debian/libthunar-vfs-1-2.shlibs 2009-02-27 01:13:49 UTC (rev 2781)
@@ -1,2 +1,2 @@
-libthunar-vfs-1 2 libthunar-vfs-1-2 (>= 0.9.0)
-libthunarx-1 2 libthunar-vfs-1-2 (>= 0.9.0)
+libthunar-vfs-1 2 libthunar-vfs-1-2 (>= 1.0.0)
+libthunarx-1 2 libthunar-vfs-1-2 (>= 1.0.0)
Deleted: desktop/trunk/thunar/debian/lintian.libthunar-vfs-1-2
===================================================================
--- desktop/trunk/thunar/debian/lintian.libthunar-vfs-1-2 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/thunar/debian/lintian.libthunar-vfs-1-2 2009-02-27 01:13:49 UTC (rev 2781)
@@ -1,2 +0,0 @@
-#private
-libthunar-vfs-1: package-name-doesnt-match-sonames libthunar-vfs-1-0 libthunarx-1-0
Deleted: desktop/trunk/thunar/debian/patches/02_thunar-vfs-volume-hal_missing-audio-cds-for-volman.patch
===================================================================
--- desktop/trunk/thunar/debian/patches/02_thunar-vfs-volume-hal_missing-audio-cds-for-volman.patch 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/thunar/debian/patches/02_thunar-vfs-volume-hal_missing-audio-cds-for-volman.patch 2009-02-27 01:13:49 UTC (rev 2781)
@@ -1,83 +0,0 @@
-Index: thunar-vfs/thunar-vfs-volume-hal.c
-===================================================================
---- thunar-vfs/thunar-vfs-volume-hal.c (revision 26428)
-+++ thunar-vfs/thunar-vfs-volume-hal.c (working copy)
-@@ -1007,9 +1007,7 @@
- hv = libhal_volume_from_udi (context, udi);
-
- /* HAL might want us to ignore this volume for some reason */
-- if (G_UNLIKELY (hv != NULL
-- && (libhal_volume_should_ignore (hv)
-- || libhal_volume_get_fsusage (hv) != LIBHAL_VOLUME_USAGE_MOUNTABLE_FILESYSTEM)))
-+ if (G_UNLIKELY (hv != NULL && libhal_volume_should_ignore (hv)))
- {
- libhal_volume_free (hv);
- return;
-@@ -1020,38 +1018,42 @@
-
- if (G_LIKELY (hv != NULL))
- {
-- /* determine the UDI of the drive to which this volume belongs */
-- drive_udi = libhal_volume_get_storage_device_udi (hv);
-- if (G_LIKELY (drive_udi != NULL))
-+ /* check if we have a mountable file system here */
-+ if (libhal_volume_get_fsusage (hv) == LIBHAL_VOLUME_USAGE_MOUNTABLE_FILESYSTEM)
- {
-- /* determine the drive for the volume */
-- hd = libhal_drive_from_udi (context, drive_udi);
-- if (G_LIKELY (hd != NULL))
-+ /* determine the UDI of the drive to which this volume belongs */
-+ drive_udi = libhal_volume_get_storage_device_udi (hv);
-+ if (G_LIKELY (drive_udi != NULL))
- {
-- /* check if we already have a volume object for the UDI */
-- volume_hal = thunar_vfs_volume_manager_hal_get_volume_by_udi (manager_hal, udi);
-- if (G_LIKELY (volume_hal == NULL))
-+ /* determine the drive for the volume */
-+ hd = libhal_drive_from_udi (context, drive_udi);
-+ if (G_LIKELY (hd != NULL))
- {
-- /* otherwise, we allocate a new volume object */
-- volume_hal = g_object_new (THUNAR_VFS_TYPE_VOLUME_HAL, NULL);
-- volume_hal->udi = g_strdup (udi);
-- }
-+ /* check if we already have a volume object for the UDI */
-+ volume_hal = thunar_vfs_volume_manager_hal_get_volume_by_udi (manager_hal, udi);
-+ if (G_LIKELY (volume_hal == NULL))
-+ {
-+ /* otherwise, we allocate a new volume object */
-+ volume_hal = g_object_new (THUNAR_VFS_TYPE_VOLUME_HAL, NULL);
-+ volume_hal->udi = g_strdup (udi);
-+ }
-
-- /* update the volume object with the new data from the HAL volume/drive */
-- thunar_vfs_volume_hal_update (volume_hal, context, hv, hd);
-+ /* update the volume object with the new data from the HAL volume/drive */
-+ thunar_vfs_volume_hal_update (volume_hal, context, hv, hd);
-
-- /* add the volume object to our list if we allocated a new one */
-- if (g_list_find (THUNAR_VFS_VOLUME_MANAGER (manager_hal)->volumes, volume_hal) == NULL)
-- {
-- /* add the volume to the volume manager */
-- thunar_vfs_volume_manager_add (THUNAR_VFS_VOLUME_MANAGER (manager_hal), THUNAR_VFS_VOLUME (volume_hal));
-+ /* add the volume object to our list if we allocated a new one */
-+ if (g_list_find (THUNAR_VFS_VOLUME_MANAGER (manager_hal)->volumes, volume_hal) == NULL)
-+ {
-+ /* add the volume to the volume manager */
-+ thunar_vfs_volume_manager_add (THUNAR_VFS_VOLUME_MANAGER (manager_hal), THUNAR_VFS_VOLUME (volume_hal));
-
-- /* release the reference on the volume */
-- g_object_unref (G_OBJECT (volume_hal));
-+ /* release the reference on the volume */
-+ g_object_unref (G_OBJECT (volume_hal));
-+ }
-+
-+ /* release the HAL drive */
-+ libhal_drive_free (hd);
- }
--
-- /* release the HAL drive */
-- libhal_drive_free (hd);
- }
- }
-
Deleted: desktop/trunk/thunar/debian/patches/03_use-eject-where-necessary.patch
===================================================================
--- desktop/trunk/thunar/debian/patches/03_use-eject-where-necessary.patch 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/thunar/debian/patches/03_use-eject-where-necessary.patch 2009-02-27 01:13:49 UTC (rev 2781)
@@ -1,44 +0,0 @@
-Thunar 0.9.0 displays the "Eject" menu item only for disc volumes. Apply
-this patch to fix that issue and have Thunar display "Eject" also for
-iPods and other volumes that require eject.
-
-Index: thunar/thunar-shortcuts-view.c
-===================================================================
---- thunar/thunar-shortcuts-view.c (revision 26456)
-+++ thunar/thunar-shortcuts-view.c (revision 26459)
-@@ -834,13 +834,12 @@
- gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
- gtk_widget_show (item);
-
-- /* check if the volume is a disc */
-- if (thunar_vfs_volume_is_disc (volume))
-+ /* check if the volume is ejectable */
-+ if (thunar_vfs_volume_is_ejectable (volume))
- {
- /* append the "Eject Volume" menu action */
- item = gtk_image_menu_item_new_with_mnemonic (_("E_ject Volume"));
- g_signal_connect_swapped (G_OBJECT (item), "activate", G_CALLBACK (thunar_shortcuts_view_eject), view);
-- gtk_widget_set_sensitive (item, thunar_vfs_volume_is_ejectable (volume));
- gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
- gtk_widget_show (item);
- }
-Index: thunar/thunar-tree-view.c
-===================================================================
---- thunar/thunar-tree-view.c (revision 26456)
-+++ thunar/thunar-tree-view.c (revision 26459)
-@@ -1041,13 +1041,12 @@
- gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
- gtk_widget_show (item);
-
-- /* check if the volume is a disc */
-- if (thunar_vfs_volume_is_disc (volume))
-+ /* check if the volume is ejectable */
-+ if (thunar_vfs_volume_is_ejectable (volume))
- {
- /* append the "Eject Volume" menu action */
- item = gtk_image_menu_item_new_with_mnemonic (_("E_ject Volume"));
- g_signal_connect_swapped (G_OBJECT (item), "activate", G_CALLBACK (thunar_tree_view_action_eject), view);
-- gtk_widget_set_sensitive (item, thunar_vfs_volume_is_ejectable (volume));
- gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
- gtk_widget_show (item);
- }
Deleted: desktop/trunk/thunar/debian/patches/04_es-l10n-typo.patch
===================================================================
--- desktop/trunk/thunar/debian/patches/04_es-l10n-typo.patch 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/thunar/debian/patches/04_es-l10n-typo.patch 2009-02-27 01:13:49 UTC (rev 2781)
@@ -1,11 +0,0 @@
---- Thunar-0.9.0/po/es.po.orig 2008-02-27 15:07:41.000000000 +0100
-+++ Thunar-0.9.0/po/es.po 2008-02-27 15:07:46.000000000 +0100
-@@ -649,7 +649,7 @@
- #. create the "Custom command" expand
- #: ../thunar/thunar-chooser-dialog.c:294
- msgid "Use a _custom command:"
--msgstr "Uar una orden _personalizada:"
-+msgstr "Usar una orden _personalizada:"
-
- #: ../thunar/thunar-chooser-dialog.c:295
- msgid ""
Deleted: desktop/trunk/thunar/debian/patches/05_thunar-vfs-nozombies.patch
===================================================================
--- desktop/trunk/thunar/debian/patches/05_thunar-vfs-nozombies.patch 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/thunar/debian/patches/05_thunar-vfs-nozombies.patch 2009-02-27 01:13:49 UTC (rev 2781)
@@ -1,31 +0,0 @@
-Index: thunar-vfs/thunar-vfs-exec.c
-===================================================================
---- thunar-vfs/thunar-vfs-exec.c (revision 26428)
-+++ thunar-vfs/thunar-vfs-exec.c (working copy)
-@@ -324,8 +324,10 @@
- if (startup_data->watch_id != 0)
- g_source_remove (startup_data->watch_id);
-
-- /* close the PID */
-- g_spawn_close_pid (startup_data->pid);
-+ /* make sure we don't leave zombies (see bug #2983 for details) */
-+ g_child_watch_add_full (G_PRIORITY_LOW, startup_data->pid,
-+ (GChildWatchFunc) g_spawn_close_pid,
-+ NULL, NULL);
-
- /* release the startup data */
- _thunar_vfs_slice_free (TvsnStartupData, startup_data);
-@@ -513,7 +515,13 @@
- startup_data->pid = pid;
- }
- }
-+ else if (G_LIKELY (succeed))
-+ {
-+ /* make sure we don't leave zombies (see bug #2983 for details) */
-+ g_child_watch_add_full (G_PRIORITY_LOW, pid, (GChildWatchFunc) g_spawn_close_pid, NULL, NULL);
-
-+ }
-+
- /* release the sn display */
- if (G_LIKELY (sn_display != NULL))
- sn_display_unref (sn_display);
Modified: desktop/trunk/thunar/debian/rules
===================================================================
--- desktop/trunk/thunar/debian/rules 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/thunar/debian/rules 2009-02-27 01:13:49 UTC (rev 2781)
@@ -7,7 +7,6 @@
DEB_DH_SHLIBDEPS_ARGS_thunar = -X debian/thunar/usr/lib/thunar/xfce4/panel-plugins/thunar-tpa -- -dRecommends debian/thunar/usr/lib/thunar/xfce4/panel-plugins/thunar-tpa -dDepends
-
makebuilddir/thunar:: debian/compat
# Some systems don't have POSIX_MADV* but have MADV* defined with
# the same values anyway.
@@ -32,6 +31,9 @@
install -m 0644 $(CURDIR)/debian/gnome-obex-send.desktop $(CURDIR)/debian/tmp/usr/share/Thunar/sendto/
install -m 0644 $(CURDIR)/debian/xfprint.desktop $(CURDIR)/debian/tmp/usr/share/Thunar/sendto/
+binary-install/thunar::
+ dh_desktop
+
binary-post-install/thunar-data::
rm -rf $(CURDIR)/debian/thunar-data/usr/share/applications
rm -rf $(CURDIR)/debian/thunar-data/usr/share/xfce4/
@@ -45,7 +47,6 @@
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.libthunar-vfs-1-2 $(CURDIR)/debian/libthunar-vfs-1-2/usr/share/lintian/overrides/libthunar-vfs-1-2/lintian
cd $(CURDIR)/debian/libthunar-vfs-1-2/usr/share/doc/ && \
rm -rf libthunar-vfs-1-2 && \
ln -sf thunar-data libthunar-vfs-1-2
Modified: desktop/trunk/xfce4/debian/changelog
===================================================================
--- desktop/trunk/xfce4/debian/changelog 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/xfce4/debian/changelog 2009-02-27 01:13:49 UTC (rev 2781)
@@ -1,3 +1,48 @@
+xfce4 (4.6.0) UNRELEASED; urgency=low
+
+ [ Xfce 4.6 Alpha “Pinkie”]
+ * new upstream alpha release.
+ * debian/control:
+ - update deps to Xfce 4.6 Alpha.
+ - update standards version to 3.8.0.
+ - remove Martin Loschwitz from uploaders.
+ - remove obsolete replaces.
+ - s/meta-package/metapackage/.
+
+ [ Xfce 4.6 Beta 1 “Fuzzy”]
+ * new upstream beta release.
+ * debian/control:
+ - update deps for Fuzzy.
+
+ [ Xfce 4.6 Beta 2 “Hopper”]
+ * new upstream beta release.
+ * debian/control:
+ - update deps for Hopper.
+ - move xfce4-mixer, orage, xfce4-terminal from Reommends to Depends.
+ - add Depends: on xfce4-appfinder.
+
+ [ Xfce 4.6 Beta 3 “Tuco-Tuco”]
+ * new upstream beta release.
+ * debian/control:
+ - update deps for Tuco-Tuco.
+ - remove dep on xfce4-icon-theme which is not 4.6 compliant.
+
+ [ Xfce 4.6 RC1 “Capybara” ]
+ * new upstream release candidate.
+ * debian/control:
+ - update deps for “Capybara”.
+
+ [ Xfce 4.6 ]
+ * new upstream release.
+ * debian/control:
+ - update deps for 4.6.
+ - recommends a desktop-base version with config file for xfce4-session
+ and xfdesktop 4.6.
+ * debian/copyright:
+ - add a copyright notice for the packaging.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Thu, 26 Feb 2009 19:04:40 +0100
+
xfce4 (4.4.2.1) unstable; urgency=low
[ Yves-Alexis Perez ]
Modified: desktop/trunk/xfce4/debian/control
===================================================================
--- desktop/trunk/xfce4/debian/control 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/xfce4/debian/control 2009-02-27 01:13:49 UTC (rev 2781)
@@ -2,25 +2,39 @@
Section: x11
Priority: optional
Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
-Uploaders: Martin Loschwitz <madkiss at debian.org>, Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>, Yves-Alexis Perez <corsac at debian.org>
+Uploaders: Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>, Yves-Alexis Perez <corsac at debian.org>
Build-Depends: debhelper (>= 4.1.26)
-Standards-Version: 3.7.3
+Standards-Version: 3.8.0
Homepage: http://www.xfce.org/
Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfce4/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/xfce4/
Package: xfce4
Architecture: all
-Depends: xfwm4 (>= 4.4.2), xfce4-mcs-plugins (>= 4.4.2), xfce4-panel (>= 4.4.2), xfce4-icon-theme (>= 4.4.2), xfdesktop4 (>= 4.4.2), thunar (>= 0.8.0), xfce4-utils (>= 4.4.2), gtk2-engines-xfce (>= 2.4.2), xfce4-session (>= 4.4.2)
-Recommends: xorg, xfce4-mixer, xfprint4, orage, xfce4-terminal, desktop-base
-Replaces: xfce4-themes (<= 4.0.0+cvs.20030301-1), xfce4-dev (<< 4.0.0+cvs.20030421)
+Depends: xfwm4 (>= 4.6.0),
+ xfconf (>= 4.6.0),
+ xfce4-settings (>= 4.6.0),
+ xfce4-panel (>= 4.6.0),
+ xfdesktop4 (>= 4.6.0),
+ thunar (>= 1.0.0),
+ thunar-volman (>= 0.3.80),
+ xfce4-utils (>= 4.6.0),
+ gtk2-engines-xfce (>= 2.6.0),
+ xfce4-session (>= 4.6.0)
+ xfce4-mixer (>= 4.6.0)
+ xfce4-appfinder (>= 4.6.0)
+ xfce4-mixer (>= 4.6.0)
+ orage (>= 4.6.0)
+Recommends: xorg,
+ xfprint4,
+ desktop-base (>= 5.0.4)
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
+ This package is a metapackage; 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
package and the packages it Recommends is a great place to start.
Modified: desktop/trunk/xfce4/debian/copyright
===================================================================
--- desktop/trunk/xfce4/debian/copyright 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/xfce4/debian/copyright 2009-02-27 01:13:49 UTC (rev 2781)
@@ -3,21 +3,8 @@
Xfce is © 1996-2007 Olivier Fourdan <fourdan at xfce.org>
-Copyright:
+The packaging is © The pkg-xfce debian team and is licensed under the GNU
+GPL version 2 or later.
- 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.
-
- 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'.
Modified: desktop/trunk/xfce4-appfinder/debian/changelog
===================================================================
--- desktop/trunk/xfce4-appfinder/debian/changelog 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/xfce4-appfinder/debian/changelog 2009-02-27 01:13:49 UTC (rev 2781)
@@ -1,11 +1,43 @@
-xfce4-appfinder (4.4.2-2) UNRELEASED; urgency=low
+xfce4-appfinder (4.6.0-1) UNRELEASED; urgency=low
+ [ Xfce 4.6 Alpha “Pinkie”]
+ * new upstream alpha release.
* debian/control:
- update my email address.
- update standards version to 3.7.3
+ - update build-deps to match Xfce 4.6 Alpha
+ * debian/copyright:
+ - use © sign.
+ [ Xfce 4.6 Beta 1 “Fuzzy”]
+ * debian/control:
+ - update build-deps for Fuzzy.
+ - add build-dep on libgtk2.0-dev, libxfconf-0-dev, libthunar-vfs-1-dev.
+ * debian/rules:
+ - stop messing with config.{guess,sub}.
+ [ Xfce 4.6 Beta 2 “Hopper”]
+ * debian/control:
+ - update build-deps for Hopper.
- -- Yves-Alexis Perez <corsac at debian.org> Mon, 28 Apr 2008 10:16:40 +0200
+ [ Xfce 4.6 Beta 3 “Tuco-tuco”]
+ * new upstream beta release.
+ * debian/control:
+ - update build-deps for “Tuco-Tuco”.
+ - add build-dep on intltool.
+ [ Xfce 4.6 RC1 “Capybara” ]
+ * new upstream release candidate.
+ * debian/control:
+ - update build-deps for “Capybara”.
+
+ [ Xfce 4.6 ]
+ * new upstream release.
+ * debian/control:
+ - update build-deps for 4.6.
+ * debian/copyright:
+ - update dates, copyrights and licensing infos.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Wed, 25 Feb 2009 22:23:08 +0100
+
xfce4-appfinder (4.4.2-1) unstable; urgency=low
[ Yves-Alexis Perez ]
Modified: desktop/trunk/xfce4-appfinder/debian/control
===================================================================
--- desktop/trunk/xfce4-appfinder/debian/control 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/xfce4-appfinder/debian/control 2009-02-27 01:13:49 UTC (rev 2781)
@@ -2,9 +2,11 @@
Section: x11
Priority: optional
Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
-Uploaders: Martin Loschwitz <madkiss at debian.org>, Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>, Yves-Alexis Perez <corsac at debian.org>
-Build-Depends: debhelper (>= 4.0.0), libxfcegui4-dev (>= 4.4.2), libxfce4mcs-dev (>= 4.4.2), libxft-dev, libxml-parser-perl
-Standards-Version: 3.7.3
+Uploaders: Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>, Yves-Alexis Perez <corsac at debian.org>
+Build-Depends: debhelper (>= 4.0.0), libxfcegui4-dev (>= 4.6.0), libxft-dev,
+ libxml-parser-perl, libxfce4menu-0.1-dev, libgtk2.0-dev, libxfconf-0-dev,
+ libthunar-vfs-1-dev (>= 1.0.0), intltool
+Standards-Version: 3.8.0
Homepage: http://www.xfce.org/
Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfce4-appfinder/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/xfce4-appfinder/
Modified: desktop/trunk/xfce4-appfinder/debian/copyright
===================================================================
--- desktop/trunk/xfce4-appfinder/debian/copyright 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/xfce4-appfinder/debian/copyright 2009-02-27 01:13:49 UTC (rev 2781)
@@ -3,25 +3,9 @@
It was downloaded from http://www.xfce.org/
-Upstream author and copyright holder:
-(c) 2004-2006 Eduard Roccatello <eduard at xfce.org>.
+Files: src/*
+Copyright: © 2008 Jasper Huijsmans <jasper at xfce.org>
+License: GPL-2+
-
-Copyright:
-
- 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.
-
- 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'.
-
Modified: desktop/trunk/xfce4-appfinder/debian/rules
===================================================================
--- desktop/trunk/xfce4-appfinder/debian/rules 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/xfce4-appfinder/debian/rules 2009-02-27 01:13:49 UTC (rev 2781)
@@ -34,12 +34,6 @@
# Add here commands to clean up after the build process.
[ ! -f Makefile ] || $(MAKE) distclean
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
- cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
- cp -f /usr/share/misc/config.guess config.guess
-endif
dh_clean
Modified: desktop/trunk/xfce4-dev-tools/debian/changelog
===================================================================
--- desktop/trunk/xfce4-dev-tools/debian/changelog 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/xfce4-dev-tools/debian/changelog 2009-02-27 01:13:49 UTC (rev 2781)
@@ -1,3 +1,34 @@
+xfce4-dev-tools (4.6.0-1) UNRELEASED; urgency=low
+
+ [ Xfce 4.6 Alpha “Pinkie”]
+ * new upstream alpha release.
+
+ [ Xfce 4.6 Beta 1 “Fuzzy”]
+ * new upstream beta release.
+
+ [ Xfce 4.6 Beta 2 “Hopper”]
+ * new upstream beta release.
+ * debian/patches:
+ - 01-fix-bashism-in-xdt-commit dropped, fixed upstream.
+
+ [ Xfce 4.6 Beta 3 “Tuco-Tuco”]
+ * new upstream beta release.
+
+ [ Xfce 4.6 RC1 “Capybara” ]
+ * new upstream release candidate.
+
+ [ Xfce 4.6 ]
+ * new upstream release.
+ * debian/copyright:
+ - update dates.
+ - update licensing informations.
+
+ [ Michael Casadevall ]
+ * debian/watch:
+ - Added to help track upstream and download tarballs
+
+ -- Yves-Alexis Perez <corsac at debian.org> Wed, 25 Feb 2009 11:54:01 +0100
+
xfce4-dev-tools (4.4.0.1-6) unstable; urgency=low
* debian/patches:
Modified: desktop/trunk/xfce4-dev-tools/debian/copyright
===================================================================
--- desktop/trunk/xfce4-dev-tools/debian/copyright 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/xfce4-dev-tools/debian/copyright 2009-02-27 01:13:49 UTC (rev 2781)
@@ -4,12 +4,12 @@
It was downloaded from http://www.xfce.org/archive/xfce-4.4.2/src/
Upstream autor: Benedikt Meurer <benny at xfce.org>
-© 2002-2006 The Xfce development team
+© 2002-2009 The Xfce development team
License:
You are free to distribute this software under the terms of
-the GNU General Public License.
+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'
Deleted: desktop/trunk/xfce4-dev-tools/debian/patches/01-fix-bashism-in-xdt-commit.patch
===================================================================
--- desktop/trunk/xfce4-dev-tools/debian/patches/01-fix-bashism-in-xdt-commit.patch 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/xfce4-dev-tools/debian/patches/01-fix-bashism-in-xdt-commit.patch 2009-02-27 01:13:49 UTC (rev 2781)
@@ -1,48 +0,0 @@
-commit 4765b456f90a86ed8ab2de8ab1085f7f4c02ee96
-Author: Yves-Alexis Perez <corsac at debian.org>
-Date: Fri Jun 20 08:23:16 2008 +0200
-
- fix bashisms
- Signed-off-by: Yves-Alexis Perez <corsac at debian.org>
-
-diff --git a/scripts/xdt-commit b/scripts/xdt-commit
-index cab95ae..efcc8db 100755
---- a/scripts/xdt-commit
-+++ b/scripts/xdt-commit
-@@ -28,7 +28,7 @@
- ##
- ## Check if SVN is installed
- ##
--if ! type svn &> /dev/null; then
-+if ! type svn > /dev/nulli 2>&1; then
- echo "Subversion needs to be installed."
- exit 1
- fi
-@@ -37,7 +37,7 @@ fi
- ##
- ## Check if we are in a versioned directory
- ##
--if ! svn info &> /dev/null; then
-+if ! svn info > /dev/null 2>&1; then
- echo "Current working directory is not versioned."
- exit 1
- fi
-@@ -63,8 +63,7 @@ for CHANGELOG in $CHANGELOGS; do
- # Make sure the file exists
- if [ -f "$CHANGELOG" ]; then
- # Determine SVN status
-- STATUS=$(svn status "${CHANGELOG}")
-- STATUS=${STATUS:0:1}
-+ STATUS=$(svn status "${CHANGELOG}"|sed -e 's/^\(.\).*$/\1/')
-
- # Check if file is versioned
- if [ "$STATUS" != "?" ]; then
-@@ -75,7 +74,7 @@ for CHANGELOG in $CHANGELOGS; do
- if [ -z "$COMMIT_MSG" ]; then
- COMMIT_MSG="$MSG"
- else
-- COMMIT_MSG=$(echo "$COMMIT_MSG" $'\n' "$MSG")
-+ COMMIT_MSG=$(echo "$COMMIT_MSG" $(printf '\n') "$MSG")
- fi
- fi
- fi
Copied: desktop/trunk/xfce4-dev-tools/debian/watch (from rev 2780, desktop/branches/svn-snapshots/xfce4-dev-tools/debian/watch)
===================================================================
--- desktop/trunk/xfce4-dev-tools/debian/watch (rev 0)
+++ desktop/trunk/xfce4-dev-tools/debian/watch 2009-02-27 01:13:49 UTC (rev 2781)
@@ -0,0 +1,3 @@
+version=3
+http://www.xfce.org/archive/xfce-(.*)/src/ \
+ xfce4-dev-tools-(.*)\.tar\.bz2
Modified: desktop/trunk/xfce4-icon-theme/debian/changelog
===================================================================
--- desktop/trunk/xfce4-icon-theme/debian/changelog 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/xfce4-icon-theme/debian/changelog 2009-02-27 01:13:49 UTC (rev 2781)
@@ -1,11 +1,14 @@
-xfce4-icon-theme (4.4.2-2) UNRELEASED; urgency=low
+xfce4-icon-theme (4.5.92-1) UNRELEASED; urgency=low
+ [Xfce Beta 2 “Hopper”]
+ * new upstream beta release.
* debian/rules: don't execute arch-dep part.
* debian/control:
- update my email address.
- update standards version.
+ - update long desc for Xfce 4.6.
- -- Yves-Alexis Perez <corsac at debian.org> Mon, 28 Apr 2008 10:18:38 +0200
+ -- Yves-Alexis Perez <corsac at debian.org> Fri, 14 Nov 2008 11:53:09 +0100
xfce4-icon-theme (4.4.2-1) unstable; urgency=low
Modified: desktop/trunk/xfce4-icon-theme/debian/control
===================================================================
--- desktop/trunk/xfce4-icon-theme/debian/control 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/xfce4-icon-theme/debian/control 2009-02-27 01:13:49 UTC (rev 2781)
@@ -17,4 +17,4 @@
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.4, also known as Rodent icon theme.
+ for Xfce 4.6, also known as Rodent icon theme.
Modified: desktop/trunk/xfce4-mixer/debian/changelog
===================================================================
--- desktop/trunk/xfce4-mixer/debian/changelog 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/xfce4-mixer/debian/changelog 2009-02-27 01:13:49 UTC (rev 2781)
@@ -1,3 +1,50 @@
+xfce4-mixer (4.6.0-1) UNRELEASED; urgency=low
+
+ [ Xfce 4.6 Alpha “Pinkie”]
+ * new upstream alpha release.
+ - drop the two packages -oss and -alsa.
+ * debian/rules:
+ - remove the two-variants build.
+ - use dh_lintian.
+ - remove call to quilt.
+ * debian/patches: all patches dropped.
+ * debian/control:
+ - drop build-dep on quilt.
+ - add build-dep on libxml-parser-perl.
+ - add dep on gstreamer0.10-alsa or audiosink, and
+ gstreamer0.10-plugins-base.
+ [ Xfce 4.6 Beta 1 “Fuzzy”]
+ * new upstream beta release.
+ * debian/control:
+ - update build-deps for Fuzzy.
+ - add build-dep on libxfconf-0-dev.
+ [ Xfce 4.6 Beta 2 “Hopper”]
+ * new upstream beta release.
+ * debian/control:
+ - update build-deps for Hopper.
+
+ [ Xfce 4.6 Beta 3 “Tuco-tuco”]
+ * new upstream beta release.
+ * debian/control:
+ - update build-deps for “Tuco-Tuco”.
+ - add build-dep on intltool.
+ * debian/rules:
+ - replace dh_clean -k by dh_prep.
+
+ [ Xfce 4.6 RC1 “Capybara” ]
+ * new upstream release candidate.
+ * debian/control:
+ - update build-deps for “Capybara”.
+ - debian/copyright: update dates and copyright owners.
+
+ [ Xfce 4.6 ]
+ * new upstream release.
+ - provide a .desktop for the mixer. closes: #496773
+ * debian/control:
+ - update build-deps for 4.6.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Wed, 25 Feb 2009 22:13:50 +0100
+
xfce4-mixer (4.4.2-3) unstable; urgency=low
* switch to triggers:
Modified: desktop/trunk/xfce4-mixer/debian/compat
===================================================================
--- desktop/trunk/xfce4-mixer/debian/compat 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/xfce4-mixer/debian/compat 2009-02-27 01:13:49 UTC (rev 2781)
@@ -1 +1 @@
-4
+7
Modified: desktop/trunk/xfce4-mixer/debian/control
===================================================================
--- desktop/trunk/xfce4-mixer/debian/control 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/xfce4-mixer/debian/control 2009-02-27 01:13:49 UTC (rev 2781)
@@ -3,38 +3,26 @@
Priority: optional
Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
Uploaders: Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>, Yves-Alexis Perez <corsac at debian.org>
-Build-Depends: debhelper (>= 4.2.1), libgtk2.0-dev (>= 2.10.1), libxft-dev, xfce4-panel-dev (>= 4.4.2), libasound2-dev (>= 0.9.0) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libxml-parser-perl, chrpath, quilt, dpkg-dev (>= 1.14.4)
-Standards-Version: 3.7.3
+Build-Depends: debhelper (>= 7.0.13), pkg-config, libglib2.0-dev,
+ libgstreamer-plugins-base0.10-dev, libgtk2.0-dev,
+ libxfce4util-dev (>= 4.6.0), libxfcegui4-dev (>= 4.6.0),
+ xfce4-panel-dev (>= 4.6.0), libxml-parser-perl,
+ libxfconf-0-dev (>= 4.6.0), intltool
+Standards-Version: 3.8.0
Homepage: http://www.xfce.org/
Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfce4-mixer/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/xfce4-mixer/
Package: xfce4-mixer
Architecture: any
-Depends: ${shlibs:Depends}, xfce4-mixer-alsa (= ${binary:Version}) | xfce4-mixer-oss (= ${binary:Version})
-Conflicts: xfce4-mcs-manager (<< 4.4.2-3)
-Description: Xfce4 Mixer frontend
+Depends: ${shlibs:Depends}, gstreamer0.10-alsa | gstreamer0.10-audiosink,
+ gstreamer0.10-plugins-base
+Replaces: xfce4-mixer-alsa, xfce4-mixer-oss
+Description: Xfce mixer application
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.
+ .
+ It uses GStreamer as a backend.
-Package: xfce4-mixer-alsa
-Architecture: linux-any
-Depends: ${shlibs:Depends}
-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.
-
-Package: xfce4-mixer-oss
-Architecture: any
-Depends: ${shlibs:Depends}
-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.
Modified: desktop/trunk/xfce4-mixer/debian/copyright
===================================================================
--- desktop/trunk/xfce4-mixer/debian/copyright 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/xfce4-mixer/debian/copyright 2009-02-27 01:13:49 UTC (rev 2781)
@@ -4,38 +4,11 @@
You can fetch xfce4-mixer from the official Xfce website, which is
http://www.xfce.org/
-Upstream authors are:
+Upstream authors is Jannis Pohlmann <jannis at xfce.org>
- 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.
+File: *
+Copyright: © 2008 Jannis Pohlmann <jannis at xfce.org>
+License: GPL-2+
-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
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 dated June, 1991.
-
- 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 Lesser 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'.
-
Deleted: desktop/trunk/xfce4-mixer/debian/lintian-override
===================================================================
--- desktop/trunk/xfce4-mixer/debian/lintian-override 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/xfce4-mixer/debian/lintian-override 2009-02-27 01:13:49 UTC (rev 2781)
@@ -1,8 +0,0 @@
-# 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
-
-# xfce4-mixer is part of Xfce, but still is modular
-xfce4-mixer: desktop-command-not-in-package /usr/share/applications/xfce-mixer-settings.desktop xfce-setting-show
Modified: desktop/trunk/xfce4-mixer/debian/rules
===================================================================
--- desktop/trunk/xfce4-mixer/debian/rules 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/xfce4-mixer/debian/rules 2009-02-27 01:13:49 UTC (rev 2781)
@@ -12,34 +12,11 @@
CFLAGS += -O2
endif
-
-ifeq (linux,$(DEB_HOST_ARCH_OS))
-VARIANTS=oss alsa
-else
-VARIANTS=oss
-endif
-
-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
+config.status: configure
dh_testdir
- #configure the two variants:
- for variant in $(VARIANTS); do \
- mkdir $(CURDIR)/debian/build-$$variant && \
- cd $(CURDIR)/debian/build-$$variant && \
- $(CURDIR)/configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --enable-final --libexecdir=\$${prefix}/lib --with-sound=$$variant;\
- done
+ ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --enable-final --libexecdir=\$${prefix}/lib
touch config.status
@@ -48,55 +25,27 @@
dh_testdir
- #build the two variants:
- for variant in $(VARIANTS);do \
- cd $(CURDIR)/debian/build-$$variant/lib && $(MAKE);\
- done
+ $(MAKE)
- #make the mixer from oss variant
- cd $(CURDIR)/debian/build-oss && $(MAKE)
-
touch build-stamp
-clean: unpatch
+clean:
dh_testdir
dh_testroot
rm -f build-stamp config.status
- for variant in $(VARIANTS);do \
- rm -rf $(CURDIR)/debian/build-$$variant;\
- done
-
[ ! -f Makefile ] || $(MAKE) distclean
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
- cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
- cp -f /usr/share/misc/config.guess config.guess
-endif
-
- dh_clean $(CURDIR)/patch-stamp
-
install: build
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
+ dh_clean
dh_installdirs
- #install the two variants:
- for variant in $(VARIANTS);do \
- cd $(CURDIR)/debian/build-$$variant/lib && \
- $(MAKE) install DESTDIR=$(CURDIR)/debian/xfce4-mixer-$$variant;\
- done
-
- #install common mixer from oss variant
- cd $(CURDIR)/debian/build-oss &&\
$(MAKE) install DESTDIR=$(CURDIR)/debian/xfce4-mixer
- #and remove libs presents in alsa/oss variants:
- rm -rf $(CURDIR)/debian/xfce4-mixer/usr/lib/xfce4/modules/
# install menu pixmap
install -d $(CURDIR)/debian/xfce4-mixer/usr/share/pixmaps
@@ -104,21 +53,11 @@
$(CURDIR)/debian/xfce4-mixer/usr/share/pixmaps
- rm -f $(CURDIR)/debian/xfce4-mixer/usr/lib/xfce4/mcs-plugins/*.la
- rm -f $(CURDIR)/debian/xfce4-mixer/usr/lib/xfce4/mcs-plugins/*.a
rm -f $(CURDIR)/debian/xfce4-mixer/usr/lib/xfce4/panel-plugins/*.la
rm -f $(CURDIR)/debian/xfce4-mixer/usr/lib/xfce4/panel-plugins/*.a
rm -f $(CURDIR)/debian/xfce4-mixer*/usr/lib/xfce4/modules/*.la
rm -f $(CURDIR)/debian/xfce4-mixer*/usr/lib/xfce4/modules/*.a
- install -d $(CURDIR)/debian/xfce4-mixer/usr/share/lintian/overrides
- install -c -m 644 $(CURDIR)/debian/lintian-override \
- $(CURDIR)/debian/xfce4-mixer/usr/share/lintian/overrides/xfce4-mixer
- chrpath -d -k `pwd`/debian/xfce4-mixer*/usr/lib/xfce4/modules/*
- chrpath -r '/usr/lib/xfce4/modules' \
- `pwd`/debian/xfce4-mixer/usr/lib/xfce4/*/* \
- `pwd`/debian/xfce4-mixer/usr/bin/*
-
binary-indep: build install
binary-arch: build install
@@ -128,6 +67,7 @@
dh_installchangelogs ChangeLog
dh_installdocs README debian/NEWS.Debian
dh_installman debian/xfce4-mixer.1
+ dh_lintian
dh_strip
dh_compress
Deleted: desktop/trunk/xfce4-mixer/debian/xfce4-mixer-alsa.shlibs
===================================================================
--- desktop/trunk/xfce4-mixer/debian/xfce4-mixer-alsa.shlibs 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/xfce4-mixer/debian/xfce4-mixer-alsa.shlibs 2009-02-27 01:13:49 UTC (rev 2781)
@@ -1 +0,0 @@
-libxfce4mixer 0 xfce4-mixer
Deleted: desktop/trunk/xfce4-mixer/debian/xfce4-mixer-oss.shlibs
===================================================================
--- desktop/trunk/xfce4-mixer/debian/xfce4-mixer-oss.shlibs 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/xfce4-mixer/debian/xfce4-mixer-oss.shlibs 2009-02-27 01:13:49 UTC (rev 2781)
@@ -1 +0,0 @@
-libxfce4mixer 0 xfce4-mixer
Copied: desktop/trunk/xfce4-mixer/debian/xfce4-mixer.lintian-overrides (from rev 2780, desktop/branches/svn-snapshots/xfce4-mixer/debian/xfce4-mixer.lintian-overrides)
===================================================================
--- desktop/trunk/xfce4-mixer/debian/xfce4-mixer.lintian-overrides (rev 0)
+++ desktop/trunk/xfce4-mixer/debian/xfce4-mixer.lintian-overrides 2009-02-27 01:13:49 UTC (rev 2781)
@@ -0,0 +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/trunk/xfce4-mixer/debian/xfce4-mixer.menu
===================================================================
--- desktop/trunk/xfce4-mixer/debian/xfce4-mixer.menu 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/xfce4-mixer/debian/xfce4-mixer.menu 2009-02-27 01:13:49 UTC (rev 2781)
@@ -1,6 +1,6 @@
?package(xfce4-mixer):\
needs="X11"\
- section="Sound"\
+ section="Applications/Sound"\
title="Xfce Mixer"\
command="/usr/bin/xfce4-mixer"\
icon="/usr/share/pixmaps/xfce4-mixer.xpm"
Modified: desktop/trunk/xfce4-panel/debian/changelog
===================================================================
--- desktop/trunk/xfce4-panel/debian/changelog 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/xfce4-panel/debian/changelog 2009-02-27 01:13:49 UTC (rev 2781)
@@ -1,3 +1,62 @@
+xfce4-panel (4.6.0-1) UNRELEASED; urgency=low
+
+ [ Xfce 4.6 Alpha “Pinkie”]
+ * New upstream alpha release.
+ - plugin process are correctly terminated when removed. closes: #457395
+ * debian/rules:
+ - fail if dh_install misses files.
+ - don't mess with config.{guess,sub} anymore.
+ - call dh_lintian
+ - don't use quilt rules.
+ * debian/control:
+ - drop build-dep on quilt.
+ - update build-dep on debhelper for dh_lintian support.
+ - add build-dep on intltool.
+ - gq the long desc so they are on 80-cols.
+ * add xfce4-popup-windowlist.1, thanks to François Wendling. closes: #496862
+ * debian/xfce4-panel.shlibs: update shlibs to 4.5.90 (Xfce 4.6 Alpha).
+ [ Xfce 4.6 Beta 1 “Fuzzy”]
+ * New upstream beta release.
+ * debian/control:
+ - update build-deps for Fuzzy.
+ - remove useless intltool from build-deps.
+ - add build-dep on libxml-parser-perl.
+ * debian/xfce4-panel.shlibs: bump shlibs.
+
+ [ Xfce 4.6 Beta 2 “Hopper”]
+ * New upstream beta release.
+ * debian/control:
+ - update build-deps for Hopper.
+ * debian/xfce4-panel.shlibs:
+ - bump shlibs for Hopper.
+
+ [ Xfce 4.6 Beta 3 “Tuco-tuco”]
+ * new upstream beta release.
+ * debian/control:
+ - update build-deps for “Tuco-Tuco”.
+ - add build-dep on intltool.
+ - add dep on libxfce4util-dev and libxfcegui4-dev to xfce4-panel-dev.
+
+ [ Xfce 4.6 RC1 “Capybara” ]
+ * new upstream release candidate.
+ * debian/control:
+ - update build-deps for “Capybara”.
+ - update deps on -dev packages for “Capybara”.
+ * debian/xfce4-panel.shlibs:
+ - bump shlibs to 4.5.99.1.
+
+ [ Xfce 4.6 ]
+ * new upstream release.
+ * debian/control:
+ - update build-deps for 4.6.
+ - update deps on -dev packages for 4.6.
+ * debian/xfce4-panel.shlibs:
+ - bump shlibs to 4.6.0.
+ * debian/copyright:
+ - update copyrights, dates and format.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Tue, 24 Feb 2009 23:40:36 +0100
+
xfce4-panel (4.4.2-6) unstable; urgency=low
* switch to triggers:
Modified: desktop/trunk/xfce4-panel/debian/compat
===================================================================
--- desktop/trunk/xfce4-panel/debian/compat 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/xfce4-panel/debian/compat 2009-02-27 01:13:49 UTC (rev 2781)
@@ -1 +1 @@
-5
+6
Modified: desktop/trunk/xfce4-panel/debian/control
===================================================================
--- desktop/trunk/xfce4-panel/debian/control 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/xfce4-panel/debian/control 2009-02-27 01:13:49 UTC (rev 2781)
@@ -3,35 +3,33 @@
Priority: optional
Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
Uploaders: Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>, Yves-Alexis Perez <corsac at debian.org>
-Build-Depends: debhelper (>> 5.0.0), libgtk2.0-dev (>= 2.10.6), bison, libxft-dev, libxml2-dev, xfce4-mcs-manager-dev (>= 4.4.1), chrpath, quilt
-Standards-Version: 3.7.3
+Build-Depends: debhelper (>> 6.0.7), libgtk2.0-dev (>= 2.10.6), bison,
+ libxft-dev, libxml2-dev, chrpath, libxfce4util-dev (>= 4.6.0),
+ libxfcegui4-dev (>= 4.6.0), libexo-0.3-dev (>= 0.3.100), libwnck-dev,
+ libxml-parser-perl, intltool
+Standards-Version: 3.8.0
Homepage: http://www.xfce.org/
Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfce4-panel/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/xfce4-panel/
Package: xfce4-panel
Architecture: any
-Depends: ${shlibs:Depends}, libexo-0.3-0 (>= 0.3.2), exo-utils
-Replaces: xfce4-utils (<< 4.3.90.1-1), xfce4-mcs-plugins (= 4.3.90.2-1)
-Conflicts: xfce4-mcs-manager (<< 4.4.2-3)
+Depends: ${shlibs:Depends}, libexo-0.3-0 (>= 0.3.100), exo-utils
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.
+ 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.
Package: xfce4-panel-dev
Section: devel
Architecture: any
-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)
+Depends: xfce4-panel (= ${binary:Version}), libxml2-dev, pkg-config,
+ libxfce4util-dev (>= 4.6.0), libxfcegui4-dev (>= 4.6.0)
Description: The Xfce4 panel development files
- In this package, you can find the development files
- distributed with the Xfce4 panel, the main panel of
- Xfce4 desktop environment. The files in this package
- are mainly going to be of interest for you if you
- intend to code applications which use some of the
- Xfce4 C panel functions.
+ In this package, you can find the development files distributed with the
+ Xfce4 panel, the main panel of Xfce4 desktop environment. The files in this
+ package are mainly going to be of interest for you if you intend to code
+ applications which use some of the Xfce4 C panel functions.
Package: xfce4-panel-dbg
Architecture: any
Modified: desktop/trunk/xfce4-panel/debian/copyright
===================================================================
--- desktop/trunk/xfce4-panel/debian/copyright 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/xfce4-panel/debian/copyright 2009-02-27 01:13:49 UTC (rev 2781)
@@ -9,35 +9,73 @@
Nick Schermer <nick at xfce.org>
clock plugin is written by Jasper Huijsmans and Jannis Pohlmann
-Copyrights:
-xfce4-panel is © 2002-2007 The Xfce development team
-dz and gl traduction are © 2006 Canonical Ltd, and Rosetta Contributors
-windowlist plugin is:
- Copyright © 2003 Andre Lerche <a.lerche at gmx.net>
- Copyright © 2003 Benedikt Meurer <benny at xfce.org>
- Copyright © 2006 Jani Monoses <jani at ubuntu.com>
- Copyright © 2006 Jasper Huijsmans <jasper at xfce.org>
- Copyright © 2006 Nick Schermer <nick at xfce.org>
-action buttons,iconbox, launcher, pager, separator, systray, tasklist plugins
- are Copyright © 2005 Jasper Huijsmans
-showdesktop plugin is:
- Copyright © 2005 Jasper Huijsmans
- Copyright © 2006 Jani Monoses
+Files: libxfce4panel/*
+License: LGPL-2+
+Copyright: © 2005-2007 Jasper Huijsmans <jasper at xfce.org>
+Files: libxfce4panel/libxfce4panel.h
+Copyright: © 2008 Nick Schermer <nick at xfce.org>
+Files: libxfce4panel/libxfce4panel.symbols
+Copyright: © 2007 Nick Schermer <nick at xfce.org>
+Files: libxfce4panel/make-libxfce4panel-alias.pl
+Copyright: © 2007 Nick Schermer <nick at xfce.org>
+Copyright: © 2004 The GLib Development Team.
+Files: libxfce4panel/xfce-arrow-button.{c,h}
+Copyright: © 2004-2007 Nick Schermer <nick at xfce.org>
+Files: libxfce4panel/xfce-hvbox.{c,h}
+Copyright: © 2002 Red Hat Inc. based on GtkHBox
+Copyright: © 2006 Jani Monoses <jani at ubuntu.com>
+Copyright: © 2006-2007 Jasper Huijsmans <jasper at xfce.org>
+Files: libxfce4panel/xfce-itembar.{c,h}
+Copyright: © 2004-2007 Jasper Huijsmans <jasper at xfce.org>
+Copyright: © 1997-200 The GTK+ Team
+Files: libxfce4panel/xfce-panel-convenience.{c,h}
+Copyright: © 2006-2007 Jasper Huijsmans <jasper at xfce.org>
+Files: libxfce4panel/xfce4-panel-macros.{c,h}
+Copyright: © 2006-2007 2006-2007 Nick Schermer <nick at xfce.org>
+Files: libxfce4panel/xfce-panel-window.{c,h}
+Copyright: © 2004-2007 Jasper Huijsmans <jasper at xfce.org>
-License:
+Files: panel/*
+License: GPL-2+
+Copyright: © 2005 Jasper Huijsmans <jasper at xfce.org>
+Files: panel/frap-icon-entry.{c,h}
+Copyright: © 2004-2006 Benedikt Meurer <benny at xfce.org>
+Files: panel/panel-dialogs.c
+Copyright: © 2005-2007 Jasper Huijsmans <jasper at xfce.org>
+Copyright: © 2006 Benedikt Meurer <benny at xfce.org>
+Files: panel/panel-dnd.c
+Copyright: © 2005 Jasper Huijsmans <jasper at xfce.org>
+Copyright: © 2005 Ryan McDougall
- 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.
+dz and gl translations are © 2006 Canonical Ltd, and Rosetta Contributors
- 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.
+Files: plugins/{action,iconbox,pager,separator}/*
+Copyright: © 2005 Jasper Huijsmans
+Files: plugins/clock
+Copyright: © 2007 Nick Schermer <nick at xfce.org>
+Files: plugins/launcher
+Copyright: © 2005-2007 Jasper Huijsmans
+Copyright: © 2006-2007 Nick Schermer <nick at xfce.org>
+Copyright: © 2005-2008 Benedikt Meurer <benny at xfce.org>
+Files: plugins/showdesktop
+Copyright: © 2005 Jasper Huijsmans
+Copyright: © 2006 Jani Monoses
+Files: plugins/systray
+Copyright: © 2007 Nick Schermer <nick at xfce.org>
+Copyright: © 2002 Anders Carlsson <andersca at gnu.org>
+Copyright: © 2003-2004 Benedikt Meurer <benny at xfce.org>
+Copyright: © 2003-2006 Vincent Untz
+Copyright: © 2003-2004 Olivier Fourdan <fourdan at xfce.org>
+Files: plugins/tasklist
+Copyright: © 2005-2007 Jasper Huijsmans
+Files: plugins/windowlist
+Copyright: © 2003 Andre Lerche <a.lerche at gmx.net>
+Copyright: © 2003 Benedikt Meurer <benny at xfce.org>
+Copyright: © 2006 Jani Monoses <jani at ubuntu.com>
+Copyright: © 2006 Jasper Huijsmans <jasper at xfce.org>
+Copyright: © 2006 Nick Schermer <nick at xfce.org>
- 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'.
+The complete text of the GNU Lesser General Public License can be found in
+`/usr/share/common-licenses/LGPL'.
Deleted: desktop/trunk/xfce4-panel/debian/lintian
===================================================================
--- desktop/trunk/xfce4-panel/debian/lintian 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/xfce4-panel/debian/lintian 2009-02-27 01:13:49 UTC (rev 2781)
@@ -1,2 +0,0 @@
-#Panel includes its library
-xfce4-panel: package-name-doesnt-match-sonames libxfce4panel1
Modified: desktop/trunk/xfce4-panel/debian/rules
===================================================================
--- desktop/trunk/xfce4-panel/debian/rules 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/xfce4-panel/debian/rules 2009-02-27 01:13:49 UTC (rev 2781)
@@ -1,5 +1,5 @@
#!/usr/bin/make -f
-include /usr/share/quilt/quilt.make
+#include /usr/share/quilt/quilt.make
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
@@ -12,7 +12,7 @@
CFLAGS += -O2
endif
-config.status: patch configure
+config.status: configure
dh_testdir
./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --sysconfdir=/etc --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --enable-final --libexecdir=\$${prefix}/lib
@@ -24,7 +24,7 @@
$(MAKE)
touch build-stamp
-clean: unpatch
+clean:
dh_testdir
dh_testroot
@@ -32,13 +32,6 @@
[ ! -f Makefile ] || $(MAKE) distclean
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
- cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
- cp -f /usr/share/misc/config.guess config.guess
-endif
-
dh_clean
install: build
@@ -52,6 +45,7 @@
install -d $(CURDIR)/debian/tmp/usr/share/man/man1
install $(CURDIR)/debian/xfce4-panel.1 $(CURDIR)/debian/tmp/usr/share/man/man1
+ install $(CURDIR)/debian/xfce4-popup-windowlist.1 $(CURDIR)/debian/tmp/usr/share/man/man1
perl -i -pe 's/Exec=Terminal/Exec=exo-open --launch TerminalEmulator/' $(CURDIR)/debian/tmp/etc/xdg/xfce4/panel/launcher*
rm -f $(CURDIR)/debian/tmp/etc/xdg/xfce4/panel/launcher-8.rc
@@ -63,13 +57,8 @@
rm -f $(CURDIR)/debian/tmp/usr/lib/xfce4/mcs-plugins/*.a
rm -f $(CURDIR)/debian/tmp/usr/lib/libxfce4panel.la
- install -D -p -o root -g root -m 644 $(CURDIR)/debian/lintian \
- $(CURDIR)/debian/tmp/usr/share/lintian/overrides/xfce4-panel
+ dh_lintian
- #we don't need no empty files in our packages !
- rm -f $(CURDIR)/debian/tmp/usr/bin/xftaskbar4
- rm -f $(CURDIR)/debian/tmp/usr/bin/xfce4-iconbox
-
chrpath -d -k $(CURDIR)/debian/tmp/usr/bin/xfce4-panel \
$(CURDIR)/debian/tmp/usr/bin/xfce4-popup-windowlist \
$(CURDIR)/debian/tmp/usr/lib/xfce4/*/* \
@@ -81,10 +70,10 @@
dh_testdir
dh_testroot
- dh_install --list-missing --sourcedir=debian/tmp
+ dh_install --fail-missing --sourcedir=debian/tmp
dh_installchangelogs ChangeLog
- dh_installdocs NEWS README README.Kiosk README.Plugins
+ dh_installdocs NEWS README
dh_strip --dbg-package=xfce4-panel-dbg
dh_compress
Modified: desktop/trunk/xfce4-panel/debian/xfce4-panel.install
===================================================================
--- desktop/trunk/xfce4-panel/debian/xfce4-panel.install 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/xfce4-panel/debian/xfce4-panel.install 2009-02-27 01:13:49 UTC (rev 2781)
@@ -4,7 +4,6 @@
etc/
usr/share/applications/
usr/share/icons/hicolor/
-usr/share/lintian
usr/share/locale/
usr/share/xfce4/
usr/share/man/
Copied: desktop/trunk/xfce4-panel/debian/xfce4-panel.lintian-overrides (from rev 2780, desktop/branches/svn-snapshots/xfce4-panel/debian/xfce4-panel.lintian-overrides)
===================================================================
--- desktop/trunk/xfce4-panel/debian/xfce4-panel.lintian-overrides (rev 0)
+++ desktop/trunk/xfce4-panel/debian/xfce4-panel.lintian-overrides 2009-02-27 01:13:49 UTC (rev 2781)
@@ -0,0 +1,2 @@
+#Panel includes its library
+xfce4-panel: package-name-doesnt-match-sonames libxfce4panel1
Modified: desktop/trunk/xfce4-panel/debian/xfce4-panel.shlibs
===================================================================
--- desktop/trunk/xfce4-panel/debian/xfce4-panel.shlibs 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/xfce4-panel/debian/xfce4-panel.shlibs 2009-02-27 01:13:49 UTC (rev 2781)
@@ -1 +1 @@
-libxfce4panel 1 xfce4-panel (>= 4.4.2)
+libxfce4panel 1 xfce4-panel (>= 4.6.0)
Copied: desktop/trunk/xfce4-panel/debian/xfce4-popup-windowlist.1 (from rev 2780, desktop/branches/svn-snapshots/xfce4-panel/debian/xfce4-popup-windowlist.1)
===================================================================
--- desktop/trunk/xfce4-panel/debian/xfce4-popup-windowlist.1 (rev 0)
+++ desktop/trunk/xfce4-panel/debian/xfce4-popup-windowlist.1 2009-02-27 01:13:49 UTC (rev 2781)
@@ -0,0 +1,42 @@
+.TH "xfce4-popup-windowlist" "1" "8-28-2008"
+
+.SH "NAME"
+xfce4-popup-windowlist \- shows the Xfce window list applet popup
+
+.SH "SYNOPSIS"
+.PP
+.B xfce4-popup-windowlist
+[ \-pointer ]
+
+.SH "DESCRIPTION"
+.PP
+This manual page documents briefly the \fBxfce4-popup-windowlist\fR command.
+.PP
+\fBxfce4-popup-windowlist\fR shows the Xfce window list if at least one Xfce
+window list applet is present on one of your panel(s).
+.PP
+The default behaviour is to show the window list near the applet button. If
+you have several Xfce window list applets, only the first one you have set up
+will pop up.
+.PP
+If you want to pop up the window list without using the window list applet on
+your panel(s), see the manual page for \fBxfdesktop\fR(1).
+
+.SH "OPTIONS"
+.TP
+.BR \-pointer
+The window list appears at your current mouse position instead of its default
+position.
+
+.SH "SEE ALSO"
+.BR xfce4-popup-menu (1),
+.BR xfdesktop (1)
+
+.SH "AUTHOR"
+.PP
+.B xfce4-popup-windowlist
+.\" from source :
+is Copyright (c) 2006 Darren Salt.
+
+This manual page was written by Francois Wendling <frwendling at free.fr> for the
+Debian GNU/Linux system (but may be used by others).
Modified: desktop/trunk/xfce4-session/debian/README.Debian
===================================================================
--- desktop/trunk/xfce4-session/debian/README.Debian 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/xfce4-session/debian/README.Debian 2009-02-27 01:13:49 UTC (rev 2781)
@@ -1,3 +1,19 @@
+Running Xfce
+------------
+
+If use you a login manager like GDM, you may have two ways to start Xfce :
+
+- “Xfce Session” will run a complete xfce session, using Xfce-provided
+ scripts (/usr/bin/startxfce4 which will then run /etc/xdg/xfce4/xinitrc
+ or $HOME/.config/xfce4/xinitrc).
+- “Default session” will run whatever is the default session manager on
+ your system. This is the /usr/bin/x-session-manager alternatives, meaning
+ you can tune it with update-alternatives (8). If you only have Xfce
+ installed on your system, it will default to xfce4-session, meaning
+ you'll be able to have an Xfce running chosing that option, but it'll be a
+ minimal one because all the preparation made in /etc/xdg/xfce4/xinitrc
+ before running xfce4-session won't be done.
+
Managing shutdown
-----------------
Modified: desktop/trunk/xfce4-session/debian/changelog
===================================================================
--- desktop/trunk/xfce4-session/debian/changelog 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/xfce4-session/debian/changelog 2009-02-27 01:13:49 UTC (rev 2781)
@@ -1,11 +1,76 @@
-xfce4-session (4.4.2-7) UNRELEASED; urgency=low
+xfce4-session (4.6.0-1) UNRELEASED; urgency=low
+ [ Xfce 4.6 Alpha “Pinkie”]
+ * new upstream alpha release.
+ - xfce4-session now has a way to edit autostarted apps. closes: #507948
+ * debian/control:
+ - update build deps for Xfce 4.6 alpha.
+ - update standards version to 3.8.0.
+ - replace recommends on xbase-clients by x11-xserver-utils.
+ - swap calls to dh_makeshlibs and dh_installdeb.
+ - remove dep on xfce4-mcs-manager and replace it by xfconf,
+ xfce4-settings.
+ - explicitely add build-dep on libdbus-glib-1-dev.
* debian/patches:
- - 07_startup-speed added, speed up startup by not waiting for forks().
- - series edited to correctly include 06_rephrase-tip.
+ - 06_rephrase-tips removed.
+ - 07_parallel-startup added, taken from upstream r28005.
- -- Yves-Alexis Perez <corsac at debian.org> Wed, 20 Aug 2008 09:26:13 +0200
+ [ Xfce 4.6 Beta 1 “Fuzzy”]
+ * new upstream beta release
+ * debian/control:
+ - update build-deps for Fuzzy.
+ - add build dep on libxfconf-0-dev, libglade2-dev.
+ - update build-dep on debhelper for a version with dh_lintian
+ * debian/patches:
+ - 02_use-mice-as-default-engine dropped.
+ - 07_parallel-startup removed, included upstream.
+ - other patches reordered.
+ * debian/xfce4-session.xml:
+ - ship a xfconf config file for selecting the simple engine, put it in
+ desktop-base dirs until we can ship it in desktop-base package.
+ * debian/rules:
+ - don't manually install lintian overrides, use dh_lintian
+ * debian/lintian:
+ - renamed to debian/xfce4-session.lintian-overrides.
+ - updated to match Fuzzy.
+ [ Xfce 4.6 Beta 2 “Hopper”]
+ * new upstream beta release
+ * debian/control:
+ - update build-deps for Hopper.
+ * debian/xfce4-session.xml:
+ - now that simple engine configuration is handled is xfconf, provide a
+ desktop-base config file.
+ * debian/patches:
+ - 03_fix-suspend-errors-at-resume added, fix errors when resuming.
+ * debian/xfce4-session.lintian-overrides:
+ - update link for beta2.
+
+ [ Xfce 4.6 Beta 3 “Tuco-tuco”]
+ * new upstream beta release.
+ * debian/control:
+ - update build-deps for “Tuco-Tuco”.
+ * debian/patches:
+ - 02_xfce4-session-logout-manpage-typo dropped.
+ - 03_fix-suspend-errors-at-resume as well.
+
+ [ Xfce 4.6 RC1 “Capybara” ]
+ * new upstream release candidate.
+ * debian/control:
+ - update build-deps for “Capybara”.
+
+ [ Xfce 4.6 ]
+ * new upstream release.
+ * debian/control:
+ - update build-deps for 4.6.
+ * debian/README.Debian: add precisions about choices in GDM.
+ * debian/patches:
+ - 02_fix-fortune-path added, fix fortune call path. closes: #497199
+ * debian/xfce4-session.xml removed, will be shipped in desktop-base.
+ * debian/rules: don't install xfce4-session.xml
+
+ -- Yves-Alexis Perez <corsac at debian.org> Thu, 26 Feb 2009 14:57:01 +0100
+
xfce4-session (4.4.2-6) unstable; urgency=low
* debian/{postinst,prerm}: have them back, they manage the x-session-manager
Modified: desktop/trunk/xfce4-session/debian/compat
===================================================================
--- desktop/trunk/xfce4-session/debian/compat 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/xfce4-session/debian/compat 2009-02-27 01:13:49 UTC (rev 2781)
@@ -1 +1 @@
-4
+6
Modified: desktop/trunk/xfce4-session/debian/control
===================================================================
--- desktop/trunk/xfce4-session/debian/control 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/xfce4-session/debian/control 2009-02-27 01:13:49 UTC (rev 2781)
@@ -3,19 +3,22 @@
Priority: optional
Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
Uploaders: Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>, Yves-Alexis Perez <corsac at debian.org>
-Build-Depends: debhelper (>= 4.0.0), xfce4-mcs-manager-dev (>= 4.4.2), xbase-clients, libxml-parser-perl, chrpath, quilt, fortune-mod, libdbus-1-dev
-Standards-Version: 3.7.3
+Build-Depends: debhelper (>= 6.0.7), libx11-dev, libxml-parser-perl, chrpath,
+ quilt, fortune-mod, libdbus-1-dev, libdbus-glib-1-dev,
+ libxfce4util-dev (>= 4.6.0), libxfcegui4-dev (>= 4.6.0), libwnck-dev,
+ x11-xserver-utils, libxfconf-0-dev (>= 4.6.0), libglade2-dev,
+ intltool (>= 0.31)
+Standards-Version: 3.8.0
Homepage: http://www.xfce.org/
Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfce4-session/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/xfce4-session/
Package: xfce4-session
Architecture: any
-Depends: ${shlibs:Depends}, fortune-mod, xfce4-mcs-manager
-Recommends: xbase-clients, xfwm4, xfce4-utils, xfdesktop4, xfce4-panel, hal, dbus-x11
+Depends: ${shlibs:Depends}, fortune-mod, xfce4-settings, xfconf
+Recommends: xfwm4, xfce4-utils, xfdesktop4, xfce4-panel, hal, dbus-x11, x11-xserver-utils
Suggests: sudo
Provides: x-session-manager
-Conflicts: xfce-mcs-manager (<< 4.4.2-3)
Description: Xfce4 Session Manager
xfce4-session is an X11-compliant "session manager" designed for use with
the Xfce4 Desktop Environment. On log out, the session manager saves the
Deleted: desktop/trunk/xfce4-session/debian/lintian
===================================================================
--- desktop/trunk/xfce4-session/debian/lintian 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/xfce4-session/debian/lintian 2009-02-27 01:13:49 UTC (rev 2781)
@@ -1,11 +0,0 @@
-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 usr/sbin/balou-export-theme
-xfce4-session: binary-without-manpage usr/sbin/balou-install-theme
-xfce4-session: binary-without-manpage usr/sbin/xfsm-shutdown-helper
-# We depend on xfce-mcs-manager
-xfce4-session: desktop-command-not-in-package /usr/share/applications/xfce-session-settings.desktop xfce-setting-show
-xfce4-session: desktop-command-not-in-package /usr/share/applications/xfce-splash-settings.desktop xfce-setting-show
Copied: desktop/trunk/xfce4-session/debian/patches/02_fix-fortune-path.patch (from rev 2780, desktop/branches/svn-snapshots/xfce4-session/debian/patches/02_fix-fortune-path.patch)
===================================================================
--- desktop/trunk/xfce4-session/debian/patches/02_fix-fortune-path.patch (rev 0)
+++ desktop/trunk/xfce4-session/debian/patches/02_fix-fortune-path.patch 2009-02-27 01:13:49 UTC (rev 2781)
@@ -0,0 +1,18 @@
+diff --git a/xfce4-tips/main.c b/xfce4-tips/main.c
+index 0961879..4f88935 100644
+--- a/xfce4-tips/main.c
++++ b/xfce4-tips/main.c
+@@ -115,11 +115,11 @@ next_cb(GtkWidget *btn, GtkTextBuffer *textbuf)
+
+ switch (option) {
+ case OPTION_TIPS:
+- strcpy(buffer, "fortune " TIPSDIR "/tips");
++ strcpy(buffer, "/usr/games/fortune " TIPSDIR "/tips");
+ break;
+
+ case OPTION_FORTUNES:
+- strcpy(buffer, "fortune");
++ strcpy(buffer, "/usr/games/fortune");
+ break;
+ }
+
Deleted: desktop/trunk/xfce4-session/debian/patches/02_use-mice-as-default-engine.patch
===================================================================
--- desktop/trunk/xfce4-session/debian/patches/02_use-mice-as-default-engine.patch 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/xfce4-session/debian/patches/02_use-mice-as-default-engine.patch 2009-02-27 01:13:49 UTC (rev 2781)
@@ -1,30 +0,0 @@
---- xfce4-session/xfce4-session/main.c.orig 2006-11-04 19:42:52.000000000 +0100
-+++ xfce4-session/xfce4-session/main.c 2006-12-18 10:52:41.000000000 +0100
-@@ -61,6 +61,7 @@
- #include <xfce4-session/xfsm-manager.h>
- #include <xfce4-session/xfsm-startup.h>
-
-+#define DEFAULT_SPLASH_ENGINE "mice"
-
- void
- setup_environment (void)
-@@ -134,7 +135,7 @@
- gint n;
-
- xfce_rc_set_group (rc, "Splash Screen");
-- engine = xfce_rc_read_entry (rc, "Engine", NULL);
-+ engine = xfce_rc_read_entry (rc, "Engine", DEFAULT_SPLASH_ENGINE);
-
- splash_screen = xfsm_splash_screen_new (dpy, engine);
- xfsm_splash_screen_next (splash_screen, _("Loading desktop settings"));
---- xfce4-session/xfce4-session.rc.orig 2006-11-04 19:42:56.000000000 +0100
-+++ xfce4-session/xfce4-session.rc 2006-12-18 11:58:25.000000000 +0100
-@@ -44,8 +44,3 @@
- Client2_PerScreen=False
- Client3_Command=xfdesktop
- Client3_PerScreen=False
--
--
--# Default splash screen selection.
--[Splash Screen]
--Engine=mice
Deleted: desktop/trunk/xfce4-session/debian/patches/03_xfce4-session-manpage-typo.patch
===================================================================
--- desktop/trunk/xfce4-session/debian/patches/03_xfce4-session-manpage-typo.patch 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/xfce4-session/debian/patches/03_xfce4-session-manpage-typo.patch 2009-02-27 01:13:49 UTC (rev 2781)
@@ -1,28 +0,0 @@
---- 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
Deleted: desktop/trunk/xfce4-session/debian/patches/04_xfce4-session-logout-manpage-typo.patch
===================================================================
--- desktop/trunk/xfce4-session/debian/patches/04_xfce4-session-logout-manpage-typo.patch 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/xfce4-session/debian/patches/04_xfce4-session-logout-manpage-typo.patch 2009-02-27 01:13:49 UTC (rev 2781)
@@ -1,16 +0,0 @@
---- 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.
-
-
Deleted: desktop/trunk/xfce4-session/debian/patches/05_fix-resize-simple-splash-engine.patch
===================================================================
--- desktop/trunk/xfce4-session/debian/patches/05_fix-resize-simple-splash-engine.patch 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/xfce4-session/debian/patches/05_fix-resize-simple-splash-engine.patch 2009-02-27 01:13:49 UTC (rev 2781)
@@ -1,22 +0,0 @@
-Index: xfce4-session/engines/simple/simple.c
-===================================================================
---- xfce4-session/engines/simple/simple.c (revision 26398)
-+++ xfce4-session/engines/simple/simple.c (revision 26399)
-@@ -429,7 +429,7 @@
-
- entry = gtk_entry_new ();
- gtk_table_attach (GTK_TABLE (table), entry, 0, 1, 1, 2,
-- GTK_FILL, GTK_FILL, 0, 0);
-+ GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
- gtk_widget_show (entry);
-
- image = gtk_image_new_from_stock (GTK_STOCK_OPEN, GTK_ICON_SIZE_BUTTON);
-@@ -437,7 +437,7 @@
- button = gtk_button_new ();
- gtk_container_add (GTK_CONTAINER (button), image);
- gtk_table_attach (GTK_TABLE (table), button, 1, 2, 1, 2,
-- GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
-+ GTK_FILL, GTK_FILL, 0, 0);
- gtk_widget_show (button);
-
- path = xfsm_splash_rc_read_entry (config->rc, "Image", NULL);
Deleted: desktop/trunk/xfce4-session/debian/patches/06_rephrase-tip.patch
===================================================================
--- desktop/trunk/xfce4-session/debian/patches/06_rephrase-tip.patch 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/xfce4-session/debian/patches/06_rephrase-tip.patch 2009-02-27 01:13:49 UTC (rev 2781)
@@ -1,24 +0,0 @@
-diff --git a/xfce4-tips/data/tips b/xfce4-tips/data/tips
-index 0eed74f..d0f09fb 100644
---- a/xfce4-tips/data/tips
-+++ b/xfce4-tips/data/tips
-@@ -88,13 +88,13 @@ corresponding workspace
- The Thunar file manager can be driven with the keyboard.
- Have a look at Xfce 4 manual to learn more about its commands.
- %
--xfprint4 provides a graphical frontend for printing. It supports either
--CUPS, BSD-LPR or a file as destination, and printers are retrieved from
--the printing system you choosed.
-+xfprint4 provides a graphical frontend for printing. It supports CUPS,
-+BSD-LPR or a file as the destination, and printers are retrieved from
-+the chosen printing system.
-
--Just configure your printer with the xfprint-manager application, then
--use drag and drop to xfprint4 icon on the panel (or the 'xfprint4 file'
--command) to print.
-+Just configure your printer with the xfprint-manager application, then
-+use drag and drop to the xfprint4 icon on the panel (or the 'xfprint4
-+file' command) to print.
- %
- Select the "Always on top" option in the Xfce Panel settings dialog if
- your want the panel to always stay above all other windows, and keep its
Deleted: desktop/trunk/xfce4-session/debian/patches/07_startup-speed.patch
===================================================================
--- desktop/trunk/xfce4-session/debian/patches/07_startup-speed.patch 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/xfce4-session/debian/patches/07_startup-speed.patch 2009-02-27 01:13:49 UTC (rev 2781)
@@ -1,28 +0,0 @@
-diff -purN xfce4-session-4.4.2/xfce4-session/xfsm-manager.c
-xfce4-session-4.4.2.new/xfce4-session/xfsm-manager.c
---- xfce4-session-4.4.2/xfce4-session/xfsm-manager.c 2007-11-17 11:31:07.000000000 -0800
-+++ xfce4-session-4.4.2.new/xfce4-session/xfsm-manager.c 2008-07-26 08:58:18.000000000 -0700
-@@ -454,7 +454,9 @@ xfsm_manager_startup_continue (const gch
- return;
- }
-
-- startup_done = xfsm_startup_continue (previous_id);
-+ startup_done = FALSE;
-+ while (!startup_done)
-+ startup_done = xfsm_startup_continue (previous_id);
-
- if (startup_done)
- {
-diff -purN xfce4-session-4.4.2/xfce4-session/xfsm-startup.c
-xfce4-session-4.4.2.new/xfce4-session/xfsm-startup.c
---- xfce4-session-4.4.2/xfce4-session/xfsm-startup.c 2007-11-17 11:31:07.000000000 -0800
-+++ xfce4-session-4.4.2.new/xfce4-session/xfsm-startup.c 2008-07-25 23:30:57.000000000 -0700
-@@ -374,7 +374,7 @@ xfsm_startup_autostart_xdg (void)
- terminal = xfce_rc_read_bool_entry (rc, "Terminal", FALSE);
-
- /* try to launch the command */
-- if (!xfce_exec (exec, terminal, startup_notify, &error))
-+ if (!xfce_exec (exec, terminal, 0, &error))
- {
- g_warning ("Unable to launch \"%s\" (specified by %s): %s", exec, files[n], error->message);
- g_error_free (error);
Modified: desktop/trunk/xfce4-session/debian/patches/series
===================================================================
--- desktop/trunk/xfce4-session/debian/patches/series 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/xfce4-session/debian/patches/series 2009-02-27 01:13:49 UTC (rev 2781)
@@ -1,7 +1,2 @@
01_correct_shadows.patch
-02_use-mice-as-default-engine.patch
-03_xfce4-session-manpage-typo.patch
-04_xfce4-session-logout-manpage-typo.patch
-05_fix-resize-simple-splash-engine.patch
-06_rephrase-tip.patch
-07_startup-speed.patch
+02_fix-fortune-path.patch
Modified: desktop/trunk/xfce4-session/debian/rules
===================================================================
--- desktop/trunk/xfce4-session/debian/rules 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/xfce4-session/debian/rules 2009-02-27 01:13:49 UTC (rev 2781)
@@ -58,14 +58,7 @@
# Add here commands to clean up after the build process.
[ ! -f Makefile ] || $(MAKE) distclean
-#ifneq "$(wildcard /usr/share/misc/config.sub)" ""
-# cp -f /usr/share/misc/config.sub config.sub
-#endif
-#ifneq "$(wildcard /usr/share/misc/config.guess)" ""
-# cp -f /usr/share/misc/config.guess config.guess
-#endif
-
dh_clean
install: build
@@ -73,28 +66,25 @@
dh_testroot
dh_clean -k
dh_installdirs
+ dh_lintian
# Add here commands to install the package into debian/xfce4-session.
$(MAKE) install DESTDIR=$(CURDIR)/debian/xfce4-session
- install -p -o root -g root -m 644 debian/lintian $(CURDIR)/debian/xfce4-session/usr/share/lintian/overrides/xfce4-session
- rm -f $(CURDIR)/debian/xfce4-session/usr/lib/xfce4/mcs-plugins/*.la
- rm -f $(CURDIR)/debian/xfce4-session/usr/lib/xfce4/mcs-plugins/*.a
rm -f $(CURDIR)/debian/xfce4-session/usr/lib/xfce4/splash/engines/*.la
rm -f $(CURDIR)/debian/xfce4-session/usr/lib/*.la
- #Don't ship systemwide defaults as they will override desktop-base
- #settings. We'll need something cleaner for post-etch.
- #rm -f $(CURDIR)/debian/xfce4-session/etc/xdg/xfce4-session/xfce4-session.rc
-
chrpath -d -k `pwd`/debian/xfce4-session/usr/bin/* \
`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
+ # Ship an xfconf config file selecting the simple engine for desktop-base
+ # install -D -p -o root -g root -m 644 debian/xfce4-session.xml $(CURDIR)/debian/xfce4-session/usr/share/desktop-base/profiles/xdg-config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml
+
+
# Build architecture-independent files here.
binary-indep: build install
# We have nothing to do by default.
@@ -110,8 +100,8 @@
dh_strip
dh_compress
dh_fixperms
- dh_installdeb
dh_makeshlibs
+ dh_installdeb
dh_shlibdeps -l`pwd`/debian/xfce4-session/usr/lib
dh_gencontrol
dh_md5sums
Copied: desktop/trunk/xfce4-session/debian/xfce4-session.lintian-overrides (from rev 2780, desktop/branches/svn-snapshots/xfce4-session/debian/xfce4-session.lintian-overrides)
===================================================================
--- desktop/trunk/xfce4-session/debian/xfce4-session.lintian-overrides (rev 0)
+++ desktop/trunk/xfce4-session/debian/xfce4-session.lintian-overrides 2009-02-27 01:13:49 UTC (rev 2781)
@@ -0,0 +1,6 @@
+xfce4-session: non-dev-pkg-with-shlib-symlink usr/lib/libxfsm-4.6.so.0.0.0 usr/lib/libxfsm-4.6.so
+xfce4-session: package-name-doesnt-match-sonames libxfsm-4.6-0
+# These are all private
+xfce4-session: binary-without-manpage usr/sbin/balou-export-theme
+xfce4-session: binary-without-manpage usr/sbin/balou-install-theme
+xfce4-session: binary-without-manpage usr/sbin/xfsm-shutdown-helper
Copied: desktop/trunk/xfce4-settings (from rev 2780, desktop/branches/svn-snapshots/xfce4-settings)
Modified: desktop/trunk/xfce4-terminal/debian/changelog
===================================================================
--- desktop/trunk/xfce4-terminal/debian/changelog 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/xfce4-terminal/debian/changelog 2009-02-27 01:13:49 UTC (rev 2781)
@@ -1,9 +1,18 @@
-xfce4-terminal (0.2.8-6) UNRELEASED; urgency=low
+xfce4-terminal (0.2.10-1) UNRELEASED; urgency=low
- * debian/control: replace dbus by dbus-x11 in Recommends:, to make sure
- people using dbus have a session bus available.
+ * New upstream release.
+ * debian/control:
+ - replace dbus by dbus-x11 in Recommends:, to make sure
+ people using dbus have a session bus available.
+ - update standards version to 3.8.0.
+ - add build-dep on intltool.
+ - bump build-dep for Xfce 4.6.0.
+ - drop Rudy Godoy and Martin Loschwitz from Uploaders. Thanks to them!
+ - add ${misc:Depends} to depends.
+ * debian/patches:
+ - 03_background-activity dropped, merged upstream.
- -- Yves-Alexis Perez <corsac at debian.org> Fri, 25 Apr 2008 08:38:41 +0200
+ -- Yves-Alexis Perez <corsac at debian.org> Thu, 26 Feb 2009 07:55:08 +0100
xfce4-terminal (0.2.8-5) unstable; urgency=low
Modified: desktop/trunk/xfce4-terminal/debian/control
===================================================================
--- desktop/trunk/xfce4-terminal/debian/control 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/xfce4-terminal/debian/control 2009-02-27 01:13:49 UTC (rev 2781)
@@ -2,9 +2,12 @@
Section: x11
Priority: optional
Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
-Uploaders: Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>, Rudy Godoy <rudy at kernel-panik.org>, Martin Loschwitz <madkiss at debian.org>, Yves-Alexis Perez <corsac at debian.org>
-Build-Depends: debhelper (>= 4.1.0), libdbus-glib-1-dev, libexo-0.3-dev (>= 0.3.4), libvte-dev (>= 1:0.14), libxml-perl, libstartup-notification0-dev, cdbs, chrpath
-Standards-Version: 3.7.3
+Uploaders: Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>,
+ Yves-Alexis Perez <corsac at debian.org>
+Build-Depends: debhelper (>= 4.1.0), libdbus-glib-1-dev,
+ libexo-0.3-dev (>= 0.3.100), libvte-dev (>= 1:0.14), libxml-perl,
+ libstartup-notification0-dev, cdbs, chrpath, intltool
+Standards-Version: 3.8.0
Homepage: http://terminal.os-cillation.com/
Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfce4-terminal/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/xfce4-terminal/
@@ -12,7 +15,7 @@
Package: xfce4-terminal
Architecture: any
Conflicts: terminal
-Depends: ${shlibs:Depends}, exo-utils
+Depends: ${shlibs:Depends}, ${misc:Depends}, exo-utils
Provides: x-terminal-emulator
Recommends: dbus-x11
Description: Xfce terminal emulator
Deleted: desktop/trunk/xfce4-terminal/debian/patches/03_background-activity.patch
===================================================================
--- desktop/trunk/xfce4-terminal/debian/patches/03_background-activity.patch 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/xfce4-terminal/debian/patches/03_background-activity.patch 2009-02-27 01:13:49 UTC (rev 2781)
@@ -1,498 +0,0 @@
-diff --git a/terminal/terminal-preferences-dialog.c b/terminal/terminal-preferences-dialog.c
-index bccf1a1..51422f9 100644
---- a/terminal/terminal-preferences-dialog.c
-+++ b/terminal/terminal-preferences-dialog.c
-@@ -768,6 +768,52 @@ terminal_preferences_dialog_init (TerminalPreferencesDialog *dialog)
- g_free (name);
- }
-
-+ frame = g_object_new (GTK_TYPE_FRAME, "border-width", 0, "shadow-type", GTK_SHADOW_NONE, NULL);
-+ gtk_box_pack_start (GTK_BOX (box), frame, FALSE, TRUE, 0);
-+ gtk_widget_show (frame);
-+
-+ label = g_object_new (GTK_TYPE_LABEL, "label", _("<b>Tab activity</b>"), "use-markup", TRUE, NULL);
-+ gtk_frame_set_label_widget (GTK_FRAME (frame), label);
-+ gtk_widget_show (label);
-+
-+ table = gtk_table_new (2, 1, FALSE);
-+ gtk_table_set_row_spacings (GTK_TABLE (table), 6);
-+ gtk_table_set_col_spacings (GTK_TABLE (table), 12);
-+ gtk_container_set_border_width (GTK_CONTAINER (table), 12);
-+ gtk_container_add (GTK_CONTAINER (frame), table);
-+ gtk_widget_show (table);
-+
-+ label = g_object_new (GTK_TYPE_LABEL,
-+ "label", _("T_ab activity color:"),
-+ "use-underline", TRUE,
-+ "xalign", 0.0,
-+ NULL);
-+ gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1, GTK_FILL, GTK_FILL, 0, 0);
-+ gtk_widget_show (label);
-+
-+ align = gtk_alignment_new (0.0, 0.5, 0.0, 0.0);
-+ gtk_table_attach (GTK_TABLE (table), align, 1, 2, 0, 1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
-+ gtk_widget_show (align);
-+
-+ hbox = gtk_hbox_new (FALSE, 0);
-+ gtk_container_add (GTK_CONTAINER (align), hbox);
-+ gtk_widget_show (hbox);
-+
-+ button = g_object_new (GTK_TYPE_COLOR_BUTTON, "title", _("Choose tab activity color"), NULL);
-+ exo_mutual_binding_new (G_OBJECT (dialog->preferences), "tab-activity-color", G_OBJECT (button), "color");
-+ gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
-+ gtk_label_set_mnemonic_widget (GTK_LABEL (label), button);
-+ gtk_widget_show (button);
-+
-+ /* set Atk name/description and label relation for the button */
-+ object = gtk_widget_get_accessible (button);
-+ atk_object_set_name (object, _("Color Selector"));
-+ atk_object_set_description (object, _("Open a dialog to specify the color"));
-+ relations = atk_object_ref_relation_set (gtk_widget_get_accessible (label));
-+ relation = atk_relation_new (&object, 1, ATK_RELATION_LABEL_FOR);
-+ atk_relation_set_add (relations, relation);
-+ g_object_unref (G_OBJECT (relation));
-+
- icon = gtk_widget_render_icon (GTK_WIDGET (dialog->icon_bar),
- TERMINAL_STOCK_COLORS,
- GTK_ICON_SIZE_DIALOG,
-@@ -982,6 +1028,46 @@ terminal_preferences_dialog_init (TerminalPreferencesDialog *dialog)
- /* set Atk label relation for the entry */
- terminal_gtk_label_set_a11y_relation (GTK_LABEL (label), entry);
-
-+/* start */
-+ frame = g_object_new (GTK_TYPE_FRAME, "border-width", 0, "shadow-type", GTK_SHADOW_NONE, NULL);
-+ gtk_box_pack_start (GTK_BOX (box), frame, FALSE, TRUE, 0);
-+ gtk_widget_show (frame);
-+
-+ label = g_object_new (GTK_TYPE_LABEL, "label", _("<b>Tab activity indicator</b>"), "use-markup", TRUE, NULL);
-+ gtk_frame_set_label_widget (GTK_FRAME (frame), label);
-+ gtk_widget_show (label);
-+
-+ vbox = gtk_vbox_new (FALSE, 6);
-+ gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
-+ gtk_container_add (GTK_CONTAINER (frame), vbox);
-+ gtk_widget_show (vbox);
-+
-+ hbox = gtk_hbox_new (FALSE, 6);
-+ gtk_container_set_border_width (GTK_CONTAINER (hbox), 0);
-+ gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
-+ gtk_widget_show (hbox);
-+
-+ label = gtk_label_new (_("Reset tab activity indicator after"));
-+ g_object_set (G_OBJECT (label), "wrap", TRUE, "xalign", 0.0, NULL);
-+ gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
-+ gtk_widget_show (label);
-+
-+ button = gtk_spin_button_new_with_range (0.0, 30.0, 1.0);
-+ gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(button), TRUE);
-+ exo_mutual_binding_new (G_OBJECT (dialog->preferences), "tab-activity-timeout", G_OBJECT (button), "value");
-+ gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
-+ gtk_label_set_mnemonic_widget (GTK_LABEL (label), button);
-+ gtk_widget_show (button);
-+
-+ /* set Atk label relation for the button */
-+ terminal_gtk_label_set_a11y_relation (GTK_LABEL (label), button);
-+
-+ label = gtk_label_new (_("seconds"));
-+ g_object_set (G_OBJECT (label), "wrap", TRUE, "xalign", 0.0, NULL);
-+ gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
-+ gtk_widget_show (label);
-+
-+/*end */
- icon = gtk_widget_render_icon (GTK_WIDGET (dialog->icon_bar),
- TERMINAL_STOCK_ADVANCED,
- GTK_ICON_SIZE_DIALOG,
-diff --git a/terminal/terminal-preferences.c b/terminal/terminal-preferences.c
-index bb6f6c0..311efe0 100644
---- a/terminal/terminal-preferences.c
-+++ b/terminal/terminal-preferences.c
-@@ -130,6 +130,8 @@ enum
- PROP_TERM,
- PROP_VTE_WORKAROUND_TITLE_BUG,
- PROP_WORD_CHARS,
-+ PROP_TAB_ACTIVITY_COLOR,
-+ PROP_TAB_ACTIVITY_TIMEOUT,
- N_PROPERTIES,
- };
-
-@@ -910,6 +912,27 @@ terminal_preferences_class_init (TerminalPreferencesClass *klass)
- EXO_PARAM_READWRITE));
-
- /**
-+ * TerminalPreferences:tab-activity-color:
-+ **/
-+ g_object_class_install_property (gobject_class,
-+ PROP_TAB_ACTIVITY_COLOR,
-+ g_param_spec_string ("tab-activity-color",
-+ "tab-activity-color",
-+ "tab-activity-color",
-+ "#afff00000000",
-+ EXO_PARAM_READWRITE));
-+ /**
-+ * TerminalPreferences:tab-activity-timeout:
-+ **/
-+ g_object_class_install_property (gobject_class,
-+ PROP_TAB_ACTIVITY_TIMEOUT,
-+ g_param_spec_double ("tab-activity-timeout",
-+ "tab-activity-timeout",
-+ "tab-activity-timeout",
-+ 0.0, 30.0, 2.0,
-+ EXO_PARAM_READWRITE));
-+
-+ /**
- * TerminalPreferences:command-update-records:
- **/
- g_object_class_install_property (gobject_class,
-@@ -1640,5 +1663,16 @@ terminal_preferences_get (void)
- return preferences;
- }
-
-+void
-+query_color (TerminalPreferences *preferences,
-+ const gchar *property,
-+ GdkColor *color_return)
-+{
-+ gchar *spec;
-+
-+ g_object_get (G_OBJECT (preferences), property, &spec, NULL);
-+ gdk_color_parse (spec, color_return);
-+ g_free (spec);
-+}
-
-
-diff --git a/terminal/terminal-preferences.h b/terminal/terminal-preferences.h
-index f053a78..f102718 100644
---- a/terminal/terminal-preferences.h
-+++ b/terminal/terminal-preferences.h
-@@ -83,6 +83,11 @@ GType terminal_preferences_get_type (void) G_GNUC_CONST;
-
- TerminalPreferences *terminal_preferences_get (void);
-
-+void query_color (TerminalPreferences *preferences,
-+ const gchar *property,
-+ GdkColor *color_return);
-+
-+
- G_END_DECLS;
-
- #endif /* !__TERMINAL_PREFERENCES_H__ */
-diff --git a/terminal/terminal-screen.c b/terminal/terminal-screen.c
-index 886b8d7..dc17195 100644
---- a/terminal/terminal-screen.c
-+++ b/terminal/terminal-screen.c
-@@ -44,6 +44,7 @@
- #include <terminal/terminal-private.h>
- #include <terminal/terminal-screen.h>
- #include <terminal/terminal-widget.h>
-+#include <terminal/terminal-window.h>
-
- #if defined(GDK_WINDOWING_X11)
- #include <gdk/gdkx.h>
-@@ -56,6 +57,7 @@ enum
- PROP_0,
- PROP_CUSTOM_TITLE,
- PROP_TITLE,
-+ PROP_ACTIVITY,
- };
-
- enum
-@@ -107,6 +109,8 @@ static void terminal_screen_vte_selection_changed (VteTerminal
- TerminalScreen *screen);
- static void terminal_screen_vte_window_title_changed (VteTerminal *terminal,
- TerminalScreen *screen);
-+static void terminal_screen_vte_window_contents_changed (VteTerminal *terminal,
-+ TerminalScreen *screen);
- static gboolean terminal_screen_timer_background (gpointer user_data);
- static void terminal_screen_timer_background_destroy (gpointer user_data);
-
-@@ -138,6 +142,9 @@ struct _TerminalScreen
-
- guint background_timer_id;
- guint launch_idle_id;
-+
-+ gboolean activity;
-+ guint reset_activity_cb;
- };
-
-
-@@ -188,6 +195,17 @@ terminal_screen_class_init (TerminalScreenClass *klass)
- G_PARAM_READABLE));
-
- /**
-+ * TerminalScreen:activity:
-+ **/
-+ g_object_class_install_property (gobject_class,
-+ PROP_ACTIVITY,
-+ g_param_spec_boolean ("activity",
-+ "activity",
-+ "activity",
-+ FALSE,
-+ G_PARAM_READWRITE));
-+
-+ /**
- * TerminalScreen::get-context-menu
- **/
- screen_signals[GET_CONTEXT_MENU] =
-@@ -227,6 +245,7 @@ terminal_screen_init (TerminalScreen *screen)
- "signal::context-menu", G_CALLBACK (terminal_screen_vte_get_context_menu), screen,
- "signal::selection-changed", G_CALLBACK (terminal_screen_vte_selection_changed), screen,
- "signal::window-title-changed", G_CALLBACK (terminal_screen_vte_window_title_changed), screen,
-+ "signal::contents-changed", G_CALLBACK (terminal_screen_vte_window_contents_changed), screen,
- "swapped-signal::size-allocate", G_CALLBACK (terminal_screen_timer_background), screen,
- "swapped-signal::style-set", G_CALLBACK (terminal_screen_update_colors), screen,
- NULL);
-@@ -340,6 +359,10 @@ terminal_screen_get_property (GObject *object,
- g_value_take_string (value, terminal_screen_get_title (screen));
- break;
-
-+ case PROP_ACTIVITY:
-+ g_value_set_boolean (value, screen->activity);
-+ break;
-+
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
- break;
-@@ -362,6 +385,10 @@ terminal_screen_set_property (GObject *object,
- terminal_screen_set_custom_title (screen, g_value_get_string (value));
- break;
-
-+ case PROP_ACTIVITY:
-+ screen->activity = g_value_get_boolean (value);
-+ break;
-+
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
- break;
-@@ -597,22 +624,6 @@ terminal_screen_update_binding_delete (TerminalScreen *screen)
- }
- }
-
--
--
--static void
--query_color (TerminalPreferences *preferences,
-- const gchar *property,
-- GdkColor *color_return)
--{
-- gchar *spec;
--
-- g_object_get (G_OBJECT (preferences), property, &spec, NULL);
-- gdk_color_parse (spec, color_return);
-- g_free (spec);
--}
--
--
--
- static void
- terminal_screen_update_colors (TerminalScreen *screen)
- {
-@@ -843,7 +854,38 @@ terminal_screen_vte_window_title_changed (VteTerminal *terminal,
- g_object_notify (G_OBJECT (screen), "title");
- }
-
-+static gboolean terminal_screen_reset_activity(TerminalScreen *screen)
-+{
-+ screen->activity = FALSE;
-+ screen->reset_activity_cb = 0;
-+ g_object_notify (G_OBJECT (screen), "activity");
-+ return FALSE;
-+}
-+
-+static void
-+terminal_screen_vte_window_contents_changed (VteTerminal *terminal,
-+ TerminalScreen *screen)
-+{
-+ gdouble timeout_seconds = 2.0;
-+
-+ _terminal_return_if_fail (VTE_IS_TERMINAL (terminal));
-+ _terminal_return_if_fail (TERMINAL_IS_SCREEN (screen));
-+
-+ if (terminal_window_is_screen_active (screen))
-+ return;
-
-+ g_object_get (G_OBJECT (screen->preferences), "tab-activity-timeout", &timeout_seconds, NULL);
-+ if (timeout_seconds < 1.0)
-+ return;
-+
-+ screen->activity = TRUE;
-+ g_object_notify (G_OBJECT (screen), "activity");
-+ if (screen->reset_activity_cb != 0) {
-+ g_source_remove(screen->reset_activity_cb);
-+ }
-+ screen->reset_activity_cb = g_timeout_add_seconds ((gint)timeout_seconds,
-+ (GSourceFunc)terminal_screen_reset_activity, screen);
-+}
-
- static gboolean
- terminal_screen_timer_background (gpointer user_data)
-@@ -1226,8 +1268,6 @@ terminal_screen_get_title (TerminalScreen *screen)
- return title;
- }
-
--
--
- /**
- * terminal_screen_get_working_directory:
- * @screen : A #TerminalScreen.
-diff --git a/terminal/terminal-tab-header.c b/terminal/terminal-tab-header.c
-index aebe338..9ddd5b7 100644
---- a/terminal/terminal-tab-header.c
-+++ b/terminal/terminal-tab-header.c
-@@ -27,6 +27,7 @@
- #include <terminal/terminal-preferences.h>
- #include <terminal/terminal-stock.h>
- #include <terminal/terminal-tab-header.h>
-+#include <terminal/terminal-screen.h>
-
-
-
-@@ -35,6 +36,7 @@ enum
- PROP_0,
- PROP_TAB_POS,
- PROP_TITLE,
-+ PROP_ACTIVITY,
- };
-
- enum
-@@ -135,6 +137,17 @@ terminal_tab_header_class_init (TerminalTabHeaderClass *klass)
- G_PARAM_READWRITE));
-
- /**
-+ * TerminalTabHeader:activity:
-+ **/
-+ g_object_class_install_property (gobject_class,
-+ PROP_ACTIVITY,
-+ g_param_spec_boolean ("activity",
-+ "activity",
-+ "activity",
-+ FALSE,
-+ G_PARAM_READWRITE));
-+
-+ /**
- * TerminalTabHeader::close-tab:
- **/
- header_signals[CLOSE_TAB] =
-@@ -248,6 +261,10 @@ terminal_tab_header_get_property (GObject *object,
- g_object_get_property (G_OBJECT (header->label), "label", value);
- break;
-
-+ case PROP_ACTIVITY:
-+ g_object_get_property (G_OBJECT (header), "activity", value);
-+ break;
-+
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
- break;
-@@ -265,7 +282,9 @@ terminal_tab_header_set_property (GObject *object,
- TerminalTabHeader *header = TERMINAL_TAB_HEADER (object);
- GtkPositionType position;
- const gchar *title;
--
-+ gboolean act = FALSE;
-+ GdkColor act_color;
-+
- switch (prop_id)
- {
- case PROP_TAB_POS:
-@@ -296,6 +315,13 @@ terminal_tab_header_set_property (GObject *object,
- gtk_label_set_text (GTK_LABEL (header->label), title);
- break;
-
-+ case PROP_ACTIVITY:
-+ act = g_value_get_boolean(value);
-+ query_color (header->preferences, "tab-activity-color", &act_color);
-+ /* strangely, inactive tab are in state ACTIVE */
-+ gtk_widget_modify_fg(header->label, GTK_STATE_ACTIVE, act ? &act_color:NULL);
-+ break;
-+
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
- break;
-diff --git a/terminal/terminal-window.c b/terminal/terminal-window.c
-index d62632f..69d58b2 100644
---- a/terminal/terminal-window.c
-+++ b/terminal/terminal-window.c
-@@ -845,8 +845,8 @@ terminal_window_page_notified (GtkNotebook *notebook,
- title = terminal_screen_get_title (terminal);
- gtk_window_set_title (GTK_WINDOW (window), title);
- g_free (title);
--
- terminal_window_update_actions (window);
-+ g_object_set (G_OBJECT (terminal), "activity", FALSE, NULL);
- }
- }
-
-@@ -1022,8 +1022,6 @@ terminal_window_screen_removed (GtkNotebook *notebook,
- }
- }
-
--
--
- static void
- terminal_window_action_new_tab (GtkAction *action,
- TerminalWindow *window)
-@@ -1512,11 +1510,13 @@ terminal_window_add (TerminalWindow *window,
-
- header = terminal_tab_header_new ();
- exo_binding_new (G_OBJECT (screen), "title", G_OBJECT (header), "title");
-+ exo_binding_new (G_OBJECT (screen), "activity", G_OBJECT (header), "activity");
- exo_binding_new (G_OBJECT (window->notebook), "tab-pos", G_OBJECT (header), "tab-pos");
- g_signal_connect_swapped (G_OBJECT (header), "close-tab", G_CALLBACK (gtk_widget_destroy), screen);
- g_signal_connect_swapped (G_OBJECT (header), "detach-tab", G_CALLBACK (terminal_window_detach_screen), window);
- g_signal_connect_swapped (G_OBJECT (header), "set-title", G_CALLBACK (gtk_action_activate), action);
- g_object_set_data_full (G_OBJECT (header), I_("terminal-window-screen"), g_object_ref (G_OBJECT (screen)), (GDestroyNotify) g_object_unref);
-+ g_object_set_data_full (G_OBJECT (screen), I_("terminal-window"), g_object_ref (G_OBJECT (window)), (GDestroyNotify) g_object_unref);
- gtk_widget_show (header);
-
- page = gtk_notebook_append_page (GTK_NOTEBOOK (window->notebook),
-@@ -1603,6 +1603,29 @@ terminal_window_get_active (TerminalWindow *window)
- return NULL;
- }
-
-+/**
-+ * terminal_window_is_screen_active:
-+ * @screen : a #TerminalScreen.
-+ *
-+ * Return value: TRUE if @screen is active.
-+ **/
-+gboolean
-+terminal_window_is_screen_active (TerminalScreen *screen)
-+{
-+ TerminalWindow *window = NULL;
-+ GtkNotebook *notebook;
-+ gint page_num;
-+
-+ window = g_object_get_data (G_OBJECT (screen), I_("terminal-window"));
-+ _terminal_return_val_if_fail (TERMINAL_IS_WINDOW (window), FALSE);
-+ notebook = GTK_NOTEBOOK (window->notebook);
-+ page_num = gtk_notebook_get_current_page (notebook);
-+ if (G_LIKELY (page_num >= 0))
-+ return (TERMINAL_SCREEN (gtk_notebook_get_nth_page (notebook, page_num)) == screen);
-+ else
-+ return FALSE;
-+}
-+
-
-
- /**
-diff --git a/terminal/terminal-window.h b/terminal/terminal-window.h
-index 8546bfa..7923524 100644
---- a/terminal/terminal-window.h
-+++ b/terminal/terminal-window.h
-@@ -23,6 +23,7 @@
- #define __TERMINAL_WINDOW_H__
-
- #include <terminal/terminal-screen.h>
-+#include <terminal/terminal-options.h>
-
- G_BEGIN_DECLS;
-
-@@ -67,6 +68,8 @@ void terminal_window_set_startup_id (TerminalWindow *window
-
- GList *terminal_window_get_restart_command (TerminalWindow *window);
-
-+gboolean terminal_window_is_screen_active (TerminalScreen *screen);
-+
- G_END_DECLS;
-
- #endif /* !__TERMINAL_WINDOW_H__ */
Modified: desktop/trunk/xfce4-utils/debian/changelog
===================================================================
--- desktop/trunk/xfce4-utils/debian/changelog 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/xfce4-utils/debian/changelog 2009-02-27 01:13:49 UTC (rev 2781)
@@ -1,3 +1,51 @@
+xfce4-utils (4.6.0-1) UNRELEASED; urgency=low
+
+ [ Xfce 4.6 Alpha “Pinkie”]
+ * New upstream alpha release.
+ * debian/control:
+ - drop xfce-mcs-manager from (build-)depends.
+ - update standards version to 3.8.0.
+ - update build-dep on debhelper for dh_lintian support.
+ - add a Recommends: on xinput for migration script.
+ - add build-dep on intltool.
+ - add Recommends: on xdg-user-dirs so it can be used at startup.
+ - add Depends: on libxml-parser-perl for migration script.
+ * debian/rules:
+ - stop messing with config.{sub,guess}.
+ - use dh_lintian.
+ - don't manually install xfce.desktop in /u/s/xsessions, it's already done.
+ - configure libexecdir so it ends in /usr/lib.
+ [ Xfce 4.6 Beta 1 “Fuzzy”]
+ * new upstream beta release.
+ * debian/control:
+ - update build-deps for Fuzzy.
+ - add explicit build-dep on libgtk2.0-dev.
+ [ Xfce 4.6 Beta 2 “Hopper”]
+ * new upstream beta release.
+ * debian/control:
+ - update build-deps for Hopper.
+
+ [ Xfce 4.6 Beta 3 “Tuco-tuco”]
+ * new upstream beta release.
+ * debian/control:
+ - update build-deps for “Tuco-Tuco”.
+
+ [ Xfce 4.6 RC1 “Capybara” ]
+ * new upstream release candidate.
+ * debian/control:
+ - update build-deps for “Capybara”.
+ * debian/patches/01_xflock4-test-running-screensaver.patch:
+ - refresh patch to force blank mode in xlock, as it's known to be quite
+ insecure anyway.
+
+ [ Xfce 4.6 ]
+ * new upstream release.
+ * debian/control:
+ - update build-deps for 4.6.
+ * debian/copyright: update dates, copyright owners and format.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Tue, 24 Feb 2009 10:43:45 +0100
+
xfce4-utils (4.4.2-8) unstable; urgency=low
* debian/{postinst,prerm} dropped, we don't install any mcs plugin anyway.
Modified: desktop/trunk/xfce4-utils/debian/control
===================================================================
--- desktop/trunk/xfce4-utils/debian/control 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/xfce4-utils/debian/control 2009-02-27 01:13:49 UTC (rev 2781)
@@ -3,16 +3,19 @@
Priority: optional
Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
Uploaders: Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>, Yves-Alexis Perez <corsac at debian.org>
-Build-Depends: debhelper (>= 4.1.26), libgtk2.0-dev (>= 2.10.6), libxft-dev, xfce4-mcs-manager-dev (>= 4.4.2), chrpath, quilt, libdbus-glib-1-dev, libdbus-1-dev
-Standards-Version: 3.7.3
+Build-Depends: debhelper (>= 6.0.7), libxfce4util-dev (>= 4.6.0),
+ libxfcegui4-dev (>= 4.6.0), quilt, chrpath, intltool,
+ libgtk2.0-dev (>= 2.10.0)
+Standards-Version: 3.8.0
Homepage: http://www.xfce.org/
Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfce4-utils/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/xfce4-utils/
Package: xfce4-utils
Architecture: any
-Depends: ${shlibs:Depends}, xterm|x-terminal-emulator, x11-xserver-utils, xinit, exo-utils
-Recommends: xfwm4, xfce4-panel, thunar, xscreensaver | xlockmore | xlockmore-gl, dbus-x11
+Depends: ${shlibs:Depends}, xterm|x-terminal-emulator, x11-xserver-utils, xinit, exo-utils, libxml-parser-perl
+Recommends: xfwm4, xfce4-panel, thunar, xscreensaver | xlockmore |
+ xlockmore-gl, dbus-x11, xinput, xdg-user-dirs
Suggests: xfce4-session
Description: Various tools for Xfce
This package contains xfrun4, xfterm4, xflock4, xfmountdev4, xfbrowser4,
Modified: desktop/trunk/xfce4-utils/debian/copyright
===================================================================
--- desktop/trunk/xfce4-utils/debian/copyright 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/xfce4-utils/debian/copyright 2009-02-27 01:13:49 UTC (rev 2781)
@@ -11,30 +11,43 @@
Brian J. Tarricone <bjt23 at cornell.edu>
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)
+Files: xfrun/*
+Copyright: © 2006 Brian J. Tarricone <bjt23 at cornell.edu>
+License: GPL-2+
+Files: xfrun/xfrun-dialog.c
+Copyright: © 2006 Brian J. Tarricone <bjt23 at cornell.edu>
+Copyright: © 2008 Stefan Stuhr <xfce4devlist at sstuhr.dk>
-xfce4-user-guide is: (c) 2006 Jasper Huijsmans
+File: xfce4-about/*
+Copyright: © 1999 Olivier Fourdan (fourdan at xfce.org)
+Copyright: © 2002 Xavier MAILLARD (zedek at fxgsproject.org)
+Copyright: © 2003 Jasper Huijsmans (huysmans at users.sourceforge.net)
+Copyright: © 2003,2006 Benedikt Meurer (benny at xfce.org)
+Copyright: © 2005,2006 Jean-François Wauthy (pollux at xfce.org)
+License: GPL-2+
-Licensing:
+Files: scripts/startxfce4*
+Copyright: © 1996-2003 Olivier Fourdan (fourdan at xfce.org)
+License: GPL-2+
+Files: scripts/xfhelp4*
+Copyright: © 1999 Olivier Fourdan (fourdan at xfce.org)
+Copyright: © 2003 Jasper Huijsmans (jasper at xfce.org)
+License: GPL-2+
+Files: scripts/xflock4
+Copyright: © 1999, 2003 Olivier Fourdan (fourdan at xfce.org)
+Files: scripts/xfmountdev4
+Copyright: © 1999 Olivier Fourdan (fourdan at xfce.org)
+License: GPL-2+
+Files: scripts/xfconf-migration-4.6.pl*
+Copyright: © 2008 Brian Tarricone <bjt23 at cornell.edu>
+License: GPL-2
- 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.
+Files: doc/xfce4-user-guide/*
+Copyright: © 2006 Jasper Huijsmans
+License: GPL-2+
- 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'.
+The text of the GNU General Public License version 2 can be found in
+`/usr/share/common-licenses/GPL-2'.
Deleted: desktop/trunk/xfce4-utils/debian/lintian-override
===================================================================
--- desktop/trunk/xfce4-utils/debian/lintian-override 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/xfce4-utils/debian/lintian-override 2009-02-27 01:13:49 UTC (rev 2781)
@@ -1,4 +0,0 @@
-# usr/share/xfce4/COPYING is necessary
-
-xfce4-utils binary: extra-license-file usr/share/xfce4/COPYING
-xfce4-utils binary: extra-license-file usr/share/xfce4/COPYING.vi
Modified: desktop/trunk/xfce4-utils/debian/patches/01_xflock4-test-running-screensaver.patch
===================================================================
--- desktop/trunk/xfce4-utils/debian/patches/01_xflock4-test-running-screensaver.patch 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/xfce4-utils/debian/patches/01_xflock4-test-running-screensaver.patch 2009-02-27 01:13:49 UTC (rev 2781)
@@ -1,6 +1,8 @@
---- xfce4-utils-4.4.2/scripts/xflock4.orig 2007-11-17 20:31:32.000000000 +0100
-+++ xfce4-utils-4.4.2/scripts/xflock4 2008-01-08 23:49:22.000000000 +0100
-@@ -19,9 +19,9 @@
+diff --git a/scripts/xflock4 b/scripts/xflock4
+index 369ec33..a59d89b 100644
+--- a/scripts/xflock4
++++ b/scripts/xflock4
+@@ -19,11 +19,11 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
@@ -11,4 +13,7 @@
+elif ps aux | grep gnome-[s]creensaver > /dev/null 2>&1; then
gnome-screensaver-command --lock
else
- xlock $*
+- xlock $*
++ xlock -mode blank $*
+ fi
+ exit 0
Modified: desktop/trunk/xfce4-utils/debian/rules
===================================================================
--- desktop/trunk/xfce4-utils/debian/rules 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/xfce4-utils/debian/rules 2009-02-27 01:13:49 UTC (rev 2781)
@@ -17,7 +17,7 @@
config.status: patch configure
dh_testdir
- ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --sysconfdir=/etc --with-browser=sensible-browser --enable-final --with-vendor-info=Debian --with-x
+ ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --libexecdir=\$${prefix}/lib --sysconfdir=/etc --with-browser=sensible-browser --enable-final --with-vendor-info=Debian --with-x
build: build-stamp
build-stamp: config.status
@@ -34,10 +34,6 @@
-rm -f configure-stamp build-stamp
[ ! -f Makefile ] || $(MAKE) distclean
- -test -r /usr/share/misc/config.sub && \
- cp -f /usr/share/misc/config.sub config.sub
- -test -r /usr/share/misc/config.guess && \
- cp -f /usr/share/misc/config.guess config.guess
dh_clean
@@ -56,9 +52,6 @@
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/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
@@ -69,9 +62,8 @@
rm -f `pwd`/debian/xfce4-utils/usr/lib/xfce4/mcs-plugins/*.la
rm -f `pwd`/debian/xfce4-utils/usr/lib/xfce4/mcs-plugins/*.a
- install -d `pwd`/debian/xfce4-utils/usr/share/lintian/overrides
- install -m 644 $(CURDIR)/debian/lintian-override \
- `pwd`/debian/xfce4-utils/usr/share/lintian/overrides/xfce4-utils
+ dh_lintian
+
install -m 644 `pwd`/debian/Debian \
`pwd`/debian/xfce4-utils/usr/share/xfce4/
Copied: desktop/trunk/xfce4-utils/debian/xfce4-utils.lintian-overrides (from rev 2780, desktop/branches/svn-snapshots/xfce4-utils/debian/xfce4-utils.lintian-overrides)
===================================================================
--- desktop/trunk/xfce4-utils/debian/xfce4-utils.lintian-overrides (rev 0)
+++ desktop/trunk/xfce4-utils/debian/xfce4-utils.lintian-overrides 2009-02-27 01:13:49 UTC (rev 2781)
@@ -0,0 +1,4 @@
+# usr/share/xfce4/COPYING is necessary
+
+xfce4-utils binary: extra-license-file usr/share/xfce4/COPYING
+xfce4-utils binary: extra-license-file usr/share/xfce4/COPYING.vi
Copied: desktop/trunk/xfconf (from rev 2780, desktop/branches/svn-snapshots/xfconf)
Modified: desktop/trunk/xfdesktop4/debian/README.Debian
===================================================================
--- desktop/trunk/xfdesktop4/debian/README.Debian 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/xfdesktop4/debian/README.Debian 2009-02-27 01:13:49 UTC (rev 2781)
@@ -1,3 +1,17 @@
+Menu
+====
+
+Xfdesktop now supports XDG (freedesktop) compliant menus.
+/etc/xdg/xfce4/desktop/*xml* conffiles are now useless and will be removed if
+they have not been modified. If they have been, you should take care of
+merging back the changes using freedesktop compliant menus.
+
+Xfdesktop4 doesn't yet support the <MergeFile> element so Debian menu can't be
+included directly. When the support will be there, user wanting a Debian menu
+inside the Xfce menu should install menu and menu-xdg packages.
+
+-- Yves-Alexis Perez <corsac at debian.org> Sat, 04 Oct 2008 16:36:24 +0200
+
Trash applet panel plugin
=========================
@@ -6,15 +20,3 @@
about this.
-- Yves-Alexis Perez <corsac at corsac.net> Sun, 10 Dec 2006 15:04:18 +0100
-
-User changes
-============
-
-The menus in /etc/X11/xfce4/menu.xml* are all conffiles so you are allowed
-to modify them. However, this is discouraged and you are encouraged to check
-out the Debian Menu System to add things to that either as a local user or
-system wide.
-
-See http://www.debian.org/doc/packaging-manuals/menu.html/
-
--- Simon Huggins <huggie at earth.li> Sun, 25 Apr 2004 19:49:49 +0100
Modified: desktop/trunk/xfdesktop4/debian/changelog
===================================================================
--- desktop/trunk/xfdesktop4/debian/changelog 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/xfdesktop4/debian/changelog 2009-02-27 01:13:49 UTC (rev 2781)
@@ -1,12 +1,94 @@
-xfdesktop4 (4.4.2-8) UNRELEASED; urgency=low
+xfdesktop4 (4.6.0-1) UNRELEASED; urgency=low
+ [ Xfce 4.6 Alpha “Pinkie”]
+ * new upstream alpha release.
+ - Debian menu is now translatable through menu-xdg. closes: #370712, #254004
+ - menu implementation correclty handle Exec= lines . closes: #449077
+ * debian/control:
+ - update standards version to 3.8.0. No change needed.
+ - update build-deps for Xfce 4.6 Alpha.
+ - remove useless conflicts.
+ - add build-dep on intltool.
+ - add Recommends: on xdg-user-dirs to handle XDG folders.
+ * debian/rules:
+ - don't install useless lintian override file
+ - fail if dh_install misses files.
+ - stop messing with config.{guess,sub}.
+ - rename generic xfce4-terminal.desktop file so it doesnt conflicts with
+ Terminal.
+ - force configure flags
+ * debian/lintian: dropped, now useless
* debian/patches:
- - 07_fix-italian-typos added, thanks David Paleino. closes: #483709
+ - 01_show-backdrop-by-default dropped due to upstream changes.
+ - 03_fix-memory-leak dropped, included upstream.
+ - 04_fix-CRITICAL-register-message-startup too.
+ - 05_simplify-free-code as well.
+ - 07_fix-italian-typos merged too. closes: #483709
+ - 06_fix-size-warning-amd64 added.
+ * debian/xfdesktop-data.install:
+ - add /usr/share/desktop-directories files.
+ - add /usr/share/applications files.
+ * debian/xfce4-menueditor.1 dropped, xfce4-menueditor is not part of
+ xfdesktop4 anymore.
+ * debian/xfdesktop4.menu-method dropped, xfdesktop now supports XDG menus,
+ so we can use debian-menu.menu directly if present.
+ * debian/README.Debian:
+ - remove deprecated comments about user changes to menu files
+ - add a note about new menu systems and conffiles handling.
+ [ Xfce 4.6 Beta 1 “Fuzzy”]
+ * new upstream beta release.
* debian/control:
- - updated standards version to 3.8.0. No change needed.
+ - update build-deps for Fuzzy.
+ - drop build-dep on quilt.
+ - add conflict for previous xfdesktop4(-data) packages.
+ * debian/patches:
+ - 02_use_eject_where_needed dropped, merged upstream.
+ - 06_fix-size-warning-amd64 as well.
+ * debian/rules:
+ - remove quilt stuff.
+ [ Xfce 4.6 Beta 2 “Hopper”]
+ * new upstream beta release.
+ * debian/control:
+ - update build-deps for Hopper.
+ - use Replaces: to handle .desktop files move from -data to xfdesktop4.
+ * debian/xfdesktop4.postrm dropped, now useless.
+ * debian/xfdesktop4.postinst:
+ - use set -e to catch errors.
+ - use dpkg-query instead of /var/lib/dpkg/status in rm_conffile.
+ - rm_conffile of /etc/xdg/xfce4/desktop/menudefs.hook.
+ * debian/xfdesktop4.install, debian/xfdesktop4-data.install
+ - ship .desktop files along with the binaries.
- -- Yves-Alexis Perez <corsac at debian.org> Tue, 12 Aug 2008 22:03:52 +0200
+ [ Xfce 4.6 Beta 3 “Tuco-tuco”]
+ * new upstream beta release.
+ * debian/control:
+ - update build-deps for “Tuco-Tuco”.
+ [ Xfce 4.6 RC1 “Capybara” ]
+ * new upstream release candidate.
+ * debian/control:
+ - update build-deps for “Capybara”.
+ - add Recommends: on gamin. closes: #513373
+ - add build-dep on libdbus-glib-1-dev.
+ - improve short and long descriptions.
+
+ [ Xfce 4.6 ]
+ * new upstream release.
+ * debian/control:
+ - update build-deps for 4.6.
+ - bump debhelper build-dep for dh_lintian.
+ * debian/copyright:
+ - update dates, copyrights and license informations.
+ * debian/xfdesktop4.lintian-overrides:
+ - add overrides for “desktop-entry-lacks-main-category” for generic
+ application launchers.
+ - add overrides for “desktop-command-not-in-package” for the associated
+ commands.
+ * debian/rules:
+ - use dh_lintian to install overrides.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Thu, 26 Feb 2009 01:12:26 +0100
+
xfdesktop4 (4.4.2-7) unstable; urgency=low
* switch to triggers:
Modified: desktop/trunk/xfdesktop4/debian/control
===================================================================
--- desktop/trunk/xfdesktop4/debian/control 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/xfdesktop4/debian/control 2009-02-27 01:13:49 UTC (rev 2781)
@@ -3,7 +3,10 @@
Priority: optional
Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
Uploaders: Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>, Yves-Alexis Perez <corsac at debian.org>
-Build-Depends: debhelper (>= 5.0.0), libgtk2.0-dev (>= 2.10.1), libxft-dev, libxml2-dev, xfce4-panel-dev (>= 4.4.2), libexo-0.3-dev (>= 0.3.4-8), libthunar-vfs-1-dev (>= 0.8.0), chrpath, libdbus-glib-1-dev, quilt
+Build-Depends: debhelper (>= 6.0.7~), libgtk2.0-dev (>= 2.10.1), libxft-dev,
+ libxml2-dev, xfce4-panel-dev (>= 4.6.0), libexo-0.3-dev (>= 0.3.100),
+ libthunar-vfs-1-dev (>= 1.0.0), chrpath, libwnck-dev, libxfconf-0-dev,
+ libglade2-dev, libxfce4menu-0.1-dev, intltool, libdbus-glib-1-dev
Standards-Version: 3.8.0
Homepage: http://www.xfce.org/
Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfdesktop4/
@@ -11,21 +14,21 @@
Package: xfdesktop4-data
Architecture: all
-Replaces: xfdesktop4 (<= 4.4.1-2)
-Description: Provides xfdesktop4 desktop background and root menu (common files)
+Description: xfce desktop background, icons and root menu (common files)
This package contains architecture-independent files for xfdesktop4.
Package: xfdesktop4
Architecture: any
-Depends: ${shlibs:Depends}, xfce4-mcs-manager (>= 4.4.2-3), xfce4-utils, xfdesktop4-data (= ${source:Version}), exo-utils
-Recommends: dbus-x11, librsvg2-common
+Depends: ${shlibs:Depends}, xfdesktop4-data (= ${source:Version}), exo-utils
+Replaces: xfdesktop4-data (< 4.5.92)
+Recommends: dbus-x11, librsvg2-common, xdg-user-dirs, gamin, xfce4-utils
Suggests: menu
-Conflicts: menu (<<2.1.12)
-Description: Provides desktop background and root menu
- This package contains a tool that allows you to switch the background image
- and a root menu. Additionally, it contains dialogs to change the number
- of available desktop workspaces and their names. It also contains a panel
- plugin to display the menu on the panel
+Description: xfce desktop background, icons and root menu manager
+ xfdesktop4 sets the background image, provides a right-click menu to
+ launch applications and can optionally show files (including application
+ launchers) or iconified windows. It includes gradient support for
+ background color, saturation support for background image, real multiscreen
+ and xinerama support.
Package: xfdesktop4-dbg
Architecture: any
Modified: desktop/trunk/xfdesktop4/debian/copyright
===================================================================
--- desktop/trunk/xfdesktop4/debian/copyright 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/xfdesktop4/debian/copyright 2009-02-27 01:13:49 UTC (rev 2781)
@@ -8,40 +8,88 @@
Jasper Huijsmans <huysmans at users.sourceforge.net>
Brian Tarricone <bjt23 at cornell.edu>
-Copyright holders are:
+Files: common/desktop-menu-stub.c
+Copyright: © 2004 Brian Tarricone <bjt23 at cornell.edu>
+License: GPL-2+
+Files: common/desktop-menu-utils.{c,h}
+Copyright: © 2004-2007 Brian Tarricone <bjt23 at cornell.edu>
+Copyright: © 2003 Benedikt Meurer (benedikt.meurer at unix-ag.uni-siegen.de)
+Copyright: © 2002 Jasper Huijsmans (huysmans at users.sourceforge.net)
+License: GPL-2+
+Files: modules/menu/*
+Copyright: © 2002-2003 Jasper Huijsmans (huysmans at users.sourceforge.net)
+Copyright: © 2003 Biju Chacko (botsie at users.sourceforge.net)
+Copyright: © 2004 Danny Milosavljevic <danny.milo at gmx.net>
+Copyright: © 2004-2008 Brian Tarricone <bjt23 at cornell.edu>
+License: GPL-2+
+Files: panel-plugin/*
+Copyright: © 2004 Brian Tarricone, <bjt23 at cornell.edu>
+License: GPL-2+
+Files: settings/*
+Copyright: © 2008 Stephan Arts <stephan at xfce.org>
+Copyright: © 2008 Brian Tarricone <bjt23 at cornell.edu>
+Copyright: © 2008 Jérôme Guelfucci <jerome.guelfucci at gmail.com>
+License: GPL-2+
+Files: src/*
+Copyright: © 2006 Brian Tarricone, <bjt23 at cornell.edu>
+License: GPL-2+
+Files: src/main.c
+Copyright: © 2004-2008 Brian Tarricone, <bjt23 at cornell.edu>
+Copyright: © 2003 Benedikt Meurer <benedikt.meurer at unix-ag.uni-siegen.de>
+Copyright: © 2004 Nils Rennebarth
+License: GPL-2+
+Files: src/menu.{c,h}
+Copyright: © 2004-2008 Brian Tarricone, <bjt23 at cornell.edu>
+Copyright: © 2002-2003 Jasper Huijsmans (huysmans at users.sourceforge.net)
+Copyright: © 2003 Benedikt Meurer <benedikt.meurer at unix-ag.uni-siegen.de>
+License: GPL-2+
+Files: src/windowlist.{c,h}
+Copyright: © 2004-2008 Brian Tarricone, <bjt23 at cornell.edu>
+Copyright: © 2002-2003 Jasper Huijsmans (huysmans at users.sourceforge.net)
+Copyright: © 2003 Benedikt Meurer <benedikt.meurer at unix-ag.uni-siegen.de>
+License: GPL-2+
+Files: src/xfce-backdrop.{c,h}
+Copyright: © 2004 Brian Tarricone, <bjt23 at cornell.edu>
+Copyright: © 2002-2003 Jasper Huijsmans (huysmans at users.sourceforge.net)
+Copyright: © 2003 Benedikt Meurer <benedikt.meurer at unix-ag.uni-siegen.de>
+License: GPL-2+
+Files: src/xfce-desktop.{c,h}
+Copyright: © 2004-2007 Brian Tarricone, <bjt23 at cornell.edu>
+Copyright: © 2002-2003 Jasper Huijsmans (huysmans at users.sourceforge.net)
+Copyright: © 2003 Benedikt Meurer <benedikt.meurer at unix-ag.uni-siegen.de>
+License: GPL-2+
+Files: src/xfdesktop-clipboard-manager.{c,h}
+Copyright: © 2005-2006 Benedikt Meurer <benedikt.meurer at unix-ag.uni-siegen.de>
+License: GPL-2+
+Files: src/xfdesktop-dbus-bindings-{filemanager,trash}.xml
+Copyright: © 2006 Benedikt Meurer <benedikt.meurer at unix-ag.uni-siegen.de>
+License: GPL-2+
+Files: src/xfdesktop-file-icon-manager.c
+Copyright: © 2006 Benedikt Meurer <benedikt.meurer at unix-ag.uni-siegen.de>
+License: GPL-2+
+Files: src/xfdesktop-icon.c
+Copyright: © 2006-2007 Brian Tarricone, <bjt23 at cornell.edu>
+License: GPL-2+
+Files: src/xfdesktop-icon-view.c
+Copyright: © 2006-2008 Brian Tarricone, <bjt23 at cornell.edu>
+Copyright: © 2000 Eazel, Inc. (copied from Nautilus)
+License: GPL-2+
+Files: src/xfdesktop-{regular-file,special-file,volume}-icon.c
+Copyright: © 2006 Benedikt Meurer, <benny at xfce.org>
+License: GPL-2+
-© 2004-2006 Brian Tarricone
-© 2003 Benedikt Meurer
-© 2002-2003 Jasper Huijsmans
-
src/xfdesktop-icon-view.c contains code from Nautilus: © 2000 Eazel, Inc
settings/appearance-settings.c has code from gnome theme-switcher applet
© Jonathan Blandford <jrb at gnome.org>
Translations are © 2003-2006 The Xfce development team except:
gl.po: © 2006 Canonical Ltd, and Rosetta Contributors 2006
+French translation is © 2007 Maximilian Schleiss <maxschleiss at bluewin.ch>
Manual is:
© 2004-2007 Brian Tarricone
© 2004 Jasper Huijsmans
© 2004 François Le Clainche <fleclainche at wanadoo.fr>
-French translation is © 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.
-
- 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'.
Modified: desktop/trunk/xfdesktop4/debian/rules
===================================================================
--- desktop/trunk/xfdesktop4/debian/rules 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/xfdesktop4/debian/rules 2009-02-27 01:13:49 UTC (rev 2781)
@@ -2,7 +2,6 @@
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-DEB_BUILD_OPTIONS=nostrip
CFLAGS = -Wall -g
@@ -12,21 +11,10 @@
CFLAGS += -O2
endif
-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
-config.status: configure patch-stamp
-
dh_testdir
- ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man --disable-rpath --libexecdir=\$${prefix}/lib --enable-final
+ ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man --disable-rpath --libexecdir=\$${prefix}/lib --enable-final --enable-thunarx --enable-exo --enable-desktop-menu-dir-monitor
build: build-stamp
build-stamp: config.status
@@ -35,7 +23,7 @@
$(MAKE)
touch build-stamp
-clean: unpatch
+clean:
dh_testdir
dh_testroot
@@ -43,13 +31,6 @@
[ ! -f Makefile ] || $(MAKE) distclean
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
- cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
- cp -f /usr/share/misc/config.guess config.guess
-endif
-
dh_clean
install: build
@@ -58,17 +39,13 @@
dh_testroot
dh_clean -k
dh_installdirs
+ dh_lintian
$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
- rm -f $(CURDIR)/debian/tmp/usr/lib/xfce4/mcs-plugins/*.la
- rm -f $(CURDIR)/debian/tmp/usr/lib/xfce4/mcs-plugins/*.a
rm -f $(CURDIR)/debian/tmp/usr/lib/xfce4/modules/*.la
rm -f $(CURDIR)/debian/tmp/usr/lib/xfce4/modules/*.a
- # lintian override file
- install -D -p -o root -g root -m 644 $(CURDIR)/debian/xfdesktop4.lintian \
- $(CURDIR)/debian/tmp/usr/share/lintian/overrides/xfdesktop4
chrpath -d -k $(CURDIR)/debian/tmp/usr/bin/* \
@@ -81,23 +58,19 @@
dh_testdir
dh_testroot
- # use correct Debian defaults
- for f in $(CURDIR)/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 $(CURDIR)/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
-
+ # rename the generic terminal file
+ mv $(CURDIR)/debian/tmp/usr/share/applications/xfce4-terminal.desktop \
+ $(CURDIR)/debian/tmp/usr/share/applications/xfce4-term.desktop
+ sed -i 's/xfce4-terminal/xfce4-term/' \
+ $(CURDIR)/debian/tmp/etc/xdg/menus/xfce-applications.menu
+
dh_installdocs README TODO
dh_installmenu
dh_installman -a
dh_installchangelogs ChangeLog
- dh_install
+ dh_install --sourcedir=debian/tmp --fail-missing
# why oh why is this necessary?
rm -rf $(CURDIR)/debian/xfdesktop4-data/usr/share/man
Deleted: desktop/trunk/xfdesktop4/debian/xfce4-menueditor.1
===================================================================
--- desktop/trunk/xfdesktop4/debian/xfce4-menueditor.1 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/xfdesktop4/debian/xfce4-menueditor.1 2009-02-27 01:13:49 UTC (rev 2781)
@@ -1,21 +0,0 @@
-.\" Copyright (C) 2004 Simon Huggins
-.TH XFCE4-MENUEDITOR "1" "Juen 2005" "xfce4-menueditor 0.1" "User Commands"
-.SH NAME
-xfce4-menueditor \- Xfce 4 Menu Editor
-.SH SYNOPSIS
-.B xfce4-menueditor [FILE]
-.SH DESCRIPTION
-.PP
-Edits the Xfce menu or an optional other FILE instead.
-
-You may prefer in Debian to use the Debian menu system which you should install
-and is detailed in /usr/share/doc/menu
-.SH SEE ALSO
-Upstream documentation in /usr/share/xfce4/doc/C/xfdesktop.html
-.SH "REPORTING BUGS"
-Report bugs to http://bugs.debian.org/
-.SH COPYRIGHT
-Copyright \(co 2005 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/trunk/xfdesktop4/debian/xfdesktop4-data.install
===================================================================
--- desktop/trunk/xfdesktop4/debian/xfdesktop4-data.install 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/xfdesktop4/debian/xfdesktop4-data.install 2009-02-27 01:13:49 UTC (rev 2781)
@@ -1,6 +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
+usr/share/icons
+usr/share/locale
+usr/share/man
+usr/share/pixmaps
+usr/share/xfce4
+usr/share/desktop-directories
Modified: desktop/trunk/xfdesktop4/debian/xfdesktop4.install
===================================================================
--- desktop/trunk/xfdesktop4/debian/xfdesktop4.install 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/xfdesktop4/debian/xfdesktop4.install 2009-02-27 01:13:49 UTC (rev 2781)
@@ -1,5 +1,4 @@
-debian/tmp/etc
-debian/tmp/usr/bin
-debian/tmp/usr/lib
-debian/tmp/usr/share/applications
-debian/tmp/usr/share/lintian
+etc
+usr/bin
+usr/lib
+usr/share/applications
Deleted: desktop/trunk/xfdesktop4/debian/xfdesktop4.lintian
===================================================================
--- desktop/trunk/xfdesktop4/debian/xfdesktop4.lintian 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/xfdesktop4/debian/xfdesktop4.lintian 2009-02-27 01:13:49 UTC (rev 2781)
@@ -1,2 +0,0 @@
-# xfdesktop4 depends on xfce4-ms-manager where is xfce-setting-show
-xfdesktop4: desktop-command-not-in-package /usr/share/applications/xfce-backdrop-settings.desktop xfce-setting-show
Copied: desktop/trunk/xfdesktop4/debian/xfdesktop4.lintian-overrides (from rev 2780, desktop/branches/svn-snapshots/xfdesktop4/debian/xfdesktop4.lintian-overrides)
===================================================================
--- desktop/trunk/xfdesktop4/debian/xfdesktop4.lintian-overrides (rev 0)
+++ desktop/trunk/xfdesktop4/debian/xfdesktop4.lintian-overrides 2009-02-27 01:13:49 UTC (rev 2781)
@@ -0,0 +1,17 @@
+# Those are part of a common Xfce desktop
+xfdesktop4: desktop-command-not-in-package /usr/share/applications/xfce4-about-xfce.desktop xfce4-about
+xfdesktop4: desktop-command-not-in-package /usr/share/applications/xfce4-file-manager.desktop Thunar
+xfdesktop4: desktop-command-not-in-package /usr/share/applications/xfce4-help.desktop xfhelp4
+xfdesktop4: desktop-command-not-in-package /usr/share/applications/xfce4-logout.desktop xfce4-session-logout
+xfdesktop4: desktop-command-not-in-package /usr/share/applications/xfce4-run-program.desktop xfrun4
+xfdesktop4: desktop-command-not-in-package /usr/share/applications/xfce4-term.desktop exo-open
+xfdesktop4: desktop-command-not-in-package /usr/share/applications/xfce4-web-browser.desktop exo-open
+# Those are private but are still places in /usr/share/applications for the
+# moment
+xfdesktop4: desktop-entry-lacks-main-category /usr/share/applications/xfce4-about-xfce.desktop
+xfdesktop4: desktop-entry-lacks-main-category /usr/share/applications/xfce4-file-manager.desktop
+xfdesktop4: desktop-entry-lacks-main-category /usr/share/applications/xfce4-help.desktop
+xfdesktop4: desktop-entry-lacks-main-category /usr/share/applications/xfce4-logout.desktop
+xfdesktop4: desktop-entry-lacks-main-category /usr/share/applications/xfce4-run-program.desktop
+xfdesktop4: desktop-entry-lacks-main-category /usr/share/applications/xfce4-term.desktop
+xfdesktop4: desktop-entry-lacks-main-category /usr/share/applications/xfce4-web-browser.desktop
Deleted: desktop/trunk/xfdesktop4/debian/xfdesktop4.menu-method
===================================================================
--- desktop/trunk/xfdesktop4/debian/xfdesktop4.menu-method 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/xfdesktop4/debian/xfdesktop4.menu-method 2009-02-27 01:13:49 UTC (rev 2781)
@@ -1,39 +0,0 @@
-#!/usr/bin/install-menu
-#
-# Generates Xfce menus for all registered applications.
-#
-compat="menu-1"
-
-!include menu.h
-
-outputencoding="UTF-8"
-
-genmenu="menudefs.hook"
-rootprefix="/etc/xdg/xfce4/desktop"
-userprefix=".config/xfce4/desktop/"
-preoutput="<!-- Automatically generated file. Do not edit (see /usr/share/doc/menu/html/index.html) -->\n<xfdesktop-menu>"
-postoutput="</xfdesktop-menu>"
-treewalk="M)"
-postrun="if [ \"/etc/xdg/xfce4/desktop/menu.xml\" != \"" prefix() \
- "/menu.xml\" ]; then cp /etc/xdg/xfce4/desktop/menu.xml " prefix() \
- "/menu.xml; fi"
-
-function charreplace($str,$toreplace,$with,$lastchar)=replacewith(escwith($str,$toreplace,$with),$toreplace,$lastchar)
-
-function xmlesc($str)= replace(replace(replace(replace($str, \
- "&","&"), \
- "\"","""), \
- "<","<"), \
- ">",">")
-
-function xmltitle()= replace(xmlesc(title()), "/", "-")
-
-supported
- x11= nstring(level(), " ") "<app name=\"" xmltitle() "\" cmd=\"" xmlesc($command) "\" icon=\"" icon() "\"/>\n"
- text= nstring(level(), " ") "<app name=\"" xmltitle() "\" cmd=\""xmlesc($command) "\" term=\"yes\" icon=\"" icon() "\" />\n"
- xfce4= nstring(level(), " ") "<builtin name=\"" xmltitle() "\" cmd=\"" xmlesc($command) "\"/>\n"
-endsupported
-
-startmenu= ""
-submenutitle= nstring(level(), " ") "<menu name=\"" xmltitle() "\" visible=\"yes\">\n"
-endmenu= ifneq( level(), "0", nstring(level(), " ") "</menu>\n" )
Modified: desktop/trunk/xfdesktop4/debian/xfdesktop4.postinst
===================================================================
--- desktop/trunk/xfdesktop4/debian/xfdesktop4.postinst 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/xfdesktop4/debian/xfdesktop4.postinst 2009-02-27 01:13:49 UTC (rev 2781)
@@ -1,14 +1,87 @@
#!/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
-fi
+set -e
+# Remove a no-longer used conffile
+rm_conffile() {
+ CONFFILE="$1"
+
+ if [ -e "$CONFFILE" ]; then
+ md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`"
+ old_md5sum="`dpkg-query -W -f='${Conffiles}' $PKGNAME | sed -n -e \"\\\\' $CONFFILE '{s/ obsolete$//;s/.* //p}\"`"
+
+ if [ "$md5sum" != "$old_md5sum" ]; then
+ echo "Obsolete conffile $CONFFILE has been modified by you."
+ echo "Saving as $CONFFILE.dpkg-bak ..."
+ mv -f "$CONFFILE" "$CONFFILE".dpkg-bak
+ else
+ echo "Removing obsolete conffile $CONFFILE ..."
+ rm -f "$CONFFILE"
+ fi
+ fi
+}
+
+case "$1" in
+install|upgrade)
+ if dpkg --compare-versions "$2" le "4.4.2"; then
+ rm_conffile "/etc/menu-methods/xfdesktop4"
+ rm_conffile "/etc/xdg/xfce4/desktop/menudefs.hook"
+ rm_conffile "/etc/xdg/xfce4/desktop/menu.xml"
+ rm_conffile "/etc/xdg/xfce4/desktop/menu.xml.be"
+ rm_conffile "/etc/xdg/xfce4/desktop/menu.xml.ca"
+ rm_conffile "/etc/xdg/xfce4/desktop/menu.xml.cs"
+ rm_conffile "/etc/xdg/xfce4/desktop/menu.xml.da"
+ rm_conffile "/etc/xdg/xfce4/desktop/menu.xml.de"
+ rm_conffile "/etc/xdg/xfce4/desktop/menu.xml.el"
+ rm_conffile "/etc/xdg/xfce4/desktop/menu.xml.es"
+ rm_conffile "/etc/xdg/xfce4/desktop/menu.xml.et"
+ rm_conffile "/etc/xdg/xfce4/desktop/menu.xml.eu"
+ rm_conffile "/etc/xdg/xfce4/desktop/menu.xml.fi"
+ rm_conffile "/etc/xdg/xfce4/desktop/menu.xml.fr"
+ rm_conffile "/etc/xdg/xfce4/desktop/menu.xml.he"
+ rm_conffile "/etc/xdg/xfce4/desktop/menu.xml.hu"
+ rm_conffile "/etc/xdg/xfce4/desktop/menu.xml.it"
+ rm_conffile "/etc/xdg/xfce4/desktop/menu.xml.ja"
+ rm_conffile "/etc/xdg/xfce4/desktop/menu.xml.ko"
+ rm_conffile "/etc/xdg/xfce4/desktop/menu.xml.nb_NO"
+ rm_conffile "/etc/xdg/xfce4/desktop/menu.xml.nl"
+ rm_conffile "/etc/xdg/xfce4/desktop/menu.xml.pa"
+ rm_conffile "/etc/xdg/xfce4/desktop/menu.xml.pl"
+ rm_conffile "/etc/xdg/xfce4/desktop/menu.xml.pt_BR"
+ rm_conffile "/etc/xdg/xfce4/desktop/menu.xml.ro"
+ rm_conffile "/etc/xdg/xfce4/desktop/menu.xml.ru"
+ rm_conffile "/etc/xdg/xfce4/desktop/menu.xml.sk"
+ rm_conffile "/etc/xdg/xfce4/desktop/menu.xml.sv"
+ rm_conffile "/etc/xdg/xfce4/desktop/menu.xml.tr"
+ rm_conffile "/etc/xdg/xfce4/desktop/menu.xml.uk"
+ rm_conffile "/etc/xdg/xfce4/desktop/menu.xml.vi"
+ rm_conffile "/etc/xdg/xfce4/desktop/menu.xml.zh_TW"
+ rm_conffile "/etc/xdg/xfce4/desktop/xfce-registered-categories.xml"
+ rm_conffile "/etc/xdg/xfce4/desktop/xfce-registered-categories.xml.ca"
+ rm_conffile "/etc/xdg/xfce4/desktop/xfce-registered-categories.xml.cs"
+ rm_conffile "/etc/xdg/xfce4/desktop/xfce-registered-categories.xml.de"
+ rm_conffile "/etc/xdg/xfce4/desktop/xfce-registered-categories.xml.el"
+ rm_conffile "/etc/xdg/xfce4/desktop/xfce-registered-categories.xml.es"
+ rm_conffile "/etc/xdg/xfce4/desktop/xfce-registered-categories.xml.eu"
+ rm_conffile "/etc/xdg/xfce4/desktop/xfce-registered-categories.xml.fi"
+ rm_conffile "/etc/xdg/xfce4/desktop/xfce-registered-categories.xml.fr"
+ rm_conffile "/etc/xdg/xfce4/desktop/xfce-registered-categories.xml.he"
+ rm_conffile "/etc/xdg/xfce4/desktop/xfce-registered-categories.xml.hu"
+ rm_conffile "/etc/xdg/xfce4/desktop/xfce-registered-categories.xml.it"
+ rm_conffile "/etc/xdg/xfce4/desktop/xfce-registered-categories.xml.ja"
+ rm_conffile "/etc/xdg/xfce4/desktop/xfce-registered-categories.xml.nb_NO"
+ rm_conffile "/etc/xdg/xfce4/desktop/xfce-registered-categories.xml.nl"
+ rm_conffile "/etc/xdg/xfce4/desktop/xfce-registered-categories.xml.pl"
+ rm_conffile "/etc/xdg/xfce4/desktop/xfce-registered-categories.xml.pt_BR"
+ rm_conffile "/etc/xdg/xfce4/desktop/xfce-registered-categories.xml.ro"
+ rm_conffile "/etc/xdg/xfce4/desktop/xfce-registered-categories.xml.ru"
+ rm_conffile "/etc/xdg/xfce4/desktop/xfce-registered-categories.xml.sk"
+ rm_conffile "/etc/xdg/xfce4/desktop/xfce-registered-categories.xml.sv"
+ rm_conffile "/etc/xdg/xfce4/desktop/xfce-registered-categories.xml.tr"
+ rm_conffile "/etc/xdg/xfce4/desktop/xfce-registered-categories.xml.zh_CN"
+ rm_conffile "/etc/xdg/xfce4/desktop/xfce-registered-categories.xml.zh_TW"
+ fi
+esac
+
+
#DEBHELPER#
Deleted: desktop/trunk/xfdesktop4/debian/xfdesktop4.postrm
===================================================================
--- desktop/trunk/xfdesktop4/debian/xfdesktop4.postrm 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/xfdesktop4/debian/xfdesktop4.postrm 2009-02-27 01:13:49 UTC (rev 2781)
@@ -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#
Modified: desktop/trunk/xfprint4/debian/changelog
===================================================================
--- desktop/trunk/xfprint4/debian/changelog 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/xfprint4/debian/changelog 2009-02-27 01:13:49 UTC (rev 2781)
@@ -1,3 +1,42 @@
+xfprint4 (4.6.0-1) UNRELEASED; urgency=low
+
+ [ Xfce 4.6 Alpha “Pinkie”]
+ * new upstream alpha release.
+ * debian/control:
+ - update build deps for Xfce 4.6 Alpha.
+ * debian/rules:
+ - remove references to mcs.
+ * debian/patches:
+ - 03_check-default-printer dropped, merged upstream.
+ * debian/control: don't mess at all with config.{sub,guess}.
+ [ Xfce 4.6 Beta 1 “Fuzzy”]
+ * new upstream beta-release.
+ * debian/control:
+ - update build-deps for Fuzzy.
+ [ Xfce 4.6 Beta 2 “Hopper”]
+ * new upstream beta-release.
+ * debian/control:
+ - update build-deps for Hopper.
+
+ [ Xfce 4.6 Beta 3 “Tuco-tuco”]
+ * new upstream beta release.
+ * debian/control:
+ - update build-deps for “Tuco-Tuco”.
+
+ [ Xfce 4.6 RC1 “Capybara” ]
+ * new upstream release candidate.
+ * debian/control:
+ - update build-deps for “Capybara”.
+
+ [ Xfce 4.6 ]
+ * new upstream release candidate.
+ * debian/control:
+ - update build-deps for 4.6.
+ * debian/rules:
+ - clean out commented stuff from 4.3.99.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Wed, 25 Feb 2009 08:06:10 +0100
+
xfprint4 (4.4.2-6) unstable; urgency=low
* debian/control:
Modified: desktop/trunk/xfprint4/debian/control
===================================================================
--- desktop/trunk/xfprint4/debian/control 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/xfprint4/debian/control 2009-02-27 01:13:49 UTC (rev 2781)
@@ -3,7 +3,9 @@
Priority: optional
Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
Uploaders: Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>, Yves-Alexis Perez <corsac at debian.org>
-Build-Depends: debhelper (>> 4.0.0), libgtk2.0-dev (>= 2.10.6), libxft-dev, xfce4-mcs-manager-dev (>= 4.4.2), a2ps, lpr, libcups2-dev, chrpath, sharutils, quilt
+Build-Depends: debhelper (>> 4.0.0), libgtk2.0-dev (>= 2.10.6), libxft-dev,
+ a2ps, lpr, libcups2-dev, chrpath, sharutils, quilt,
+ libxfcegui4-dev (>= 4.6.0), libxfconf-0-dev, intltool
Standards-Version: 3.8.0
Homepage: http://www.xfce.org/
Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfprint4/
@@ -11,7 +13,7 @@
Package: xfprint4
Architecture: any
-Depends: ${shlibs:Depends}, xfce4-mcs-manager (>= 4.4.2-3), a2ps
+Depends: ${shlibs:Depends}, a2ps
Suggests: psutils
Description: Printer GUI for Xfce4
xfprint4 is a printer manager for the Xfce4 desktop environment. It allows
Modified: desktop/trunk/xfprint4/debian/lintian
===================================================================
--- desktop/trunk/xfprint4/debian/lintian 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/xfprint4/debian/lintian 2009-02-27 01:13:49 UTC (rev 2781)
@@ -1,4 +1,2 @@
#xfprint4 includes its library
xfprint4: package-name-doesnt-match-sonames libxfprint0
-# we depend on xfce-mcs-manager
-xfprint4: desktop-command-not-in-package /usr/share/applications/xfce-xfprint-settings.desktop xfce-setting-show
Deleted: desktop/trunk/xfprint4/debian/patches/03_check-default-printer.patch
===================================================================
--- desktop/trunk/xfprint4/debian/patches/03_check-default-printer.patch 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/xfprint4/debian/patches/03_check-default-printer.patch 2009-02-27 01:13:49 UTC (rev 2781)
@@ -1,13 +0,0 @@
-Index: xfce_4_4/xfprint/print_dialog.c
-===================================================================
---- xfce_4_4/xfprint/print_dialog.c (revision 26587)
-+++ xfce_4_4/xfprint/print_dialog.c (revision 26588)
-@@ -406,7 +406,7 @@
- PRINTER_NAME_COLUMN, printer_data->name,
- PRINTER_ALIAS_COLUMN, printer_data->alias ? printer_data->alias : "", -1);
-
-- if (!default_printer_found && g_ascii_strcasecmp (default_printer->name, printer_data->name) == 0) {
-+ if (default_printer && !default_printer_found && g_ascii_strcasecmp (default_printer->name, printer_data->name) == 0) {
- default_printer_found = TRUE;
- gtk_combo_box_set_active_iter (GTK_COMBO_BOX (priv->combobox_printer), &iter);
- }
Modified: desktop/trunk/xfprint4/debian/patches/series
===================================================================
--- desktop/trunk/xfprint4/debian/patches/series 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/xfprint4/debian/patches/series 2009-02-27 01:13:49 UTC (rev 2781)
@@ -1,3 +1,2 @@
01_debug-lpr-command.patch
02_refresh-new-settings.patch
-03_check-default-printer.patch
Modified: desktop/trunk/xfprint4/debian/rules
===================================================================
--- desktop/trunk/xfprint4/debian/rules 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/xfprint4/debian/rules 2009-02-27 01:13:49 UTC (rev 2781)
@@ -25,13 +25,6 @@
build: build-stamp
build-stamp: config.status
-
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
- cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
- cp -f /usr/share/misc/config.guess config.guess
-endif
dh_testdir
$(MAKE)
@@ -45,13 +38,6 @@
[ ! -f Makefile ] || $(MAKE) distclean
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
- rm -f config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
- rm -f config.guess
-endif
-
dh_clean
install: build
@@ -76,23 +62,9 @@
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
-
- #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
- #End remove
-
-
chrpath -d -k `pwd`/debian/xfprint4/usr/lib/*.so.* \
`pwd`/debian/xfprint4/usr/bin/* \
- `pwd`/debian/xfprint4/usr/lib/xfce4/xfprint-plugins/* \
- `pwd`/debian/xfprint4/usr/lib/xfce4/mcs-plugins/*
+ `pwd`/debian/xfprint4/usr/lib/xfce4/xfprint-plugins/*
binary-indep: build install
binary-arch: build install
Modified: desktop/trunk/xfwm4/debian/changelog
===================================================================
--- desktop/trunk/xfwm4/debian/changelog 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/xfwm4/debian/changelog 2009-02-27 01:13:49 UTC (rev 2781)
@@ -1,3 +1,73 @@
+xfwm4 (4.6.0-1) UNRELEASED; urgency=low
+
+ [ Yves-Alexis Perez ]
+ [ Xfce 4.6 Alpha “Pinkie”]
+ * new upstream alpha release.
+ * debian/control:
+ - update standards version to 3.8.0.
+ - update build dep for Xfce 4.6 Alpha release.
+ - remove build dep on quilt.
+ - add build dep on intltool.
+ * debian/patches:
+ - 01_filter-grab-ungrab-events dropped, merged upstream.
+ - 02_exit-on-selectionclear too.
+ - 03_fix-compositing-overlay as well.
+ - 04_fix-automaximize-on-move ...
+ - 05_awn-focus.patch finally.
+ * debian/rules, debian/lintian:
+ - remove all references to mcs.
+ - remove references to quilt.
+ - stop messing with config.{guess,sub}.
+ [ Xfce 4.6 Beta 1 “Fuzzy”]
+ * new upstream beta release.
+ * debian/control:
+ - update build-deps for Fuzzy.
+ [ Xfce 4.6 Beta 2 “Hopper”]
+ * new upstream beta release.
+ * debian/control:
+ - update build-deps for Hopper.
+ * debian/patches:
+ - 01_fix-maximize-bug, fix maximization bug. closes: #508352
+
+ [ Xfce 4.6 Beta 3 “Tuco-tuco”]
+ * new upstream beta release.
+ * debian/control:
+ - update build-deps for “Tuco-Tuco”.
+ * debian/rules:
+ - replace dh_clean -k by dh_prep.
+ - install NEWS file.
+
+ [ Xfce 4.6 RC1 “Capybara” ]
+ * new upstream release candidate.
+ * debian/control:
+ - update build-deps for “Capybara”.
+
+ [ Xfce 4.6 ]
+ * new upstream release.
+ - fix various compositing issues. closes: #483070
+ - fix support for win_gravity wm hint. closes: #448443
+ - fix iconification with skip_taskbar. closes: #491817
+ * debian/control:
+ - update build-deps for 4.6.
+ - bump build-dep on debhelper for dh_prep.
+ - drop build-dep on quilt, now useless.
+ * debian/copyright:
+ - update dates, copyrights and licensing informations.
+ * debian/patches:
+ - 01_fix-maximize-bug dropped, merged upstream.
+ * debian/rules:
+ - remove calls to quilt patch rules
+
+ [ Michael Casadevall ]
+ [ Xfce 4.6 Beta 1 "Fuzzy" ]
+ * debian/rules:
+ - Added --libexecdir=\$${prefix}/lib to compily with Debian policy
+ * debian/control:
+ - Added myself to uploaders
+
+
+ -- Yves-Alexis Perez <corsac at debian.org> Thu, 26 Feb 2009 14:49:33 +0100
+
xfwm4 (4.4.2-5) unstable; urgency=low
* switch to triggers:
Modified: desktop/trunk/xfwm4/debian/control
===================================================================
--- desktop/trunk/xfwm4/debian/control 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/xfwm4/debian/control 2009-02-27 01:13:49 UTC (rev 2781)
@@ -2,9 +2,12 @@
Section: x11
Priority: optional
Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
-Uploaders: Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>, Yves-Alexis Perez <corsac at debian.org>
-Build-Depends: debhelper (>= 4.1.26), libgtk2.0-dev (>= 2.10.6), libxft-dev, xfce4-mcs-manager-dev (>= 4.4.2), quilt, libxdamage-dev, libxrender-dev, libxcomposite-dev, libxfixes-dev, chrpath
-Standards-Version: 3.7.3
+Uploaders: Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>, Yves-Alexis Perez <corsac at debian.org>, Michael Casadevall <sonicmctails at gmail.com>
+Build-Depends: debhelper (>= 7), libgtk2.0-dev (>= 2.10.6),
+ libxft-dev, libxdamage-dev, libxrender-dev, libxcomposite-dev,
+ libxfixes-dev, chrpath, libglade2-dev, libxfce4util-dev (>= 4.6.0),
+ libxfcegui4-dev (>= 4.6.0), libxfconf-0-dev, libwnck-dev, intltool
+Standards-Version: 3.8.0
Homepage: http://www.xfce.org/
Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfwm4/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/xfwm4/
@@ -12,7 +15,7 @@
Package: xfwm4
Architecture: any
Depends: ${shlibs:Depends}
-Recommends: xfwm4-themes, xfce4-mcs-manager (>= 4.4.2-3), librsvg2-common
+Recommends: xfwm4-themes, librsvg2-common
Suggests: xfce4
Provides: x-window-manager
Description: window manager of the Xfce project
Modified: desktop/trunk/xfwm4/debian/copyright
===================================================================
--- desktop/trunk/xfwm4/debian/copyright 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/xfwm4/debian/copyright 2009-02-27 01:13:49 UTC (rev 2781)
@@ -20,35 +20,42 @@
--------------------
Fredrik Hoglund (fredrik at kde.org)
+Files: *
+Copyright: © 2009 Olivier Fourdan <ofourdan at xfce.org>
+License: GPL-2+
+Files: settings-dialogs/tweaks-settings.c
+Copyright: © 2008 Stephan Arts <stephan at xfce.org>
+Copyright: © 2008 Jannis Pohlmann <jannis at xfce.org>
+Copyright: © 2008 Olivier Fourdan <olivier at xfce.org>
+License: GPL-2+
+Files: settings-dialogs/workspace-settings.c
+Copyright: © 2008 Stephan Arts <stephan at xfce.org>
+Copyright: © 2008 Jannis Pohlmann <jannis at xfce.org>
+Copyright: © 2008 Olivier Fourdan <olivier at xfce.org>
+Copyright: © 2008 Mike Massonnet <mmassonnet at xfce.org>
+Copyright: © 2008 Brian Tarricone <bjt23 at cornell.edu>
+License: GPL-2+
+Files: settings-dialogs/xfce-settings.c
+Copyright: © 2008 Stephan Arts <stephan at xfce.org>
+Copyright: © 2008 Jannis Pohlmann <jannis at xfce.org>
+License: GPL-2+
+Files: settings-dialogs/xfce-settings.h
+Copyright: © 2008 Jannis Pohlmann <jannis at xfce.org>
+License: GPL-2+
-xfwm4 is © 2002-2008 Olivier Fourdan
-mypixmap.c contains code (c) 2001 Ken Lynch
-original xpm load routines are from gdk-pixbuf:
- © 1999 Mark Crichton
- © 1999 The Free Software Foundation
-mcs-plugin is © 2002-2003 Jasper Huijsmans, with:
- xfwm4_shortcuteditor © 2004 Jean François Wauthy
+Files: src/*
+Copyright: © 2002-2009 Olivier Fourdan <ofourdan at xfce.org>
+Copyright: © 2001 Ken Lynch
+License: GPL-2+
+Files: src/mypixmap.c
+Copyright: © 2002-2009 Olivier Fourdan <ofourdan at xfce.org>
+Copyright: © 2001 Ken Lynch
+Copyright: © 1999 Mark Crichton <crichton at gimp.org>
+License: GPL-2+, BSD
+Files: src/stock_icons.c
+Copyright: © 2002-2009 Olivier Fourdan <ofourdan at xfce.org>
+Copyright: © 2002 Havoc Pennington
+Copyright: © 2002 2002 Jorn Baayen <jorn at nl.linux.org>
-Translations are © 2002-2006 The Xfce development team except:
- gl.po © 2006 Canonical Ltd, and Rosetta Contributors 2006
-
-Manual is:
-© 2004 François Le Clainche
-© 2004 Jasper Huijsmans
-Copyright:
-
- 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.
-
- 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'.
Modified: desktop/trunk/xfwm4/debian/lintian
===================================================================
--- desktop/trunk/xfwm4/debian/lintian 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/xfwm4/debian/lintian 2009-02-27 01:13:49 UTC (rev 2781)
@@ -1,4 +1,2 @@
-#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
Modified: desktop/trunk/xfwm4/debian/rules
===================================================================
--- desktop/trunk/xfwm4/debian/rules 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/xfwm4/debian/rules 2009-02-27 01:13:49 UTC (rev 2781)
@@ -9,22 +9,11 @@
CFLAGS += -O2
endif
-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: configure-stamp
configure-stamp:
dh_testdir
- ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --enable-final --enable-compositor
+ ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --enable-final --enable-compositor --libexecdir=\$${prefix}/lib
touch configure-stamp
build: build-stamp
@@ -34,38 +23,27 @@
$(MAKE)
touch build-stamp
-clean: clean-patched unpatch
-clean-patched:
+clean:
dh_testdir
dh_testroot
-rm -f configure-stamp build-stamp
- [ ! -f Makefile ] || $(MAKE) distclean
- -test -r /usr/share/misc/config.sub && \
- cp -f /usr/share/misc/config.sub config.sub
- -test -r /usr/share/misc/config.guess && \
- cp -f /usr/share/misc/config.guess config.guess
-
dh_clean
install: build
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
$(MAKE) install DESTDIR=`pwd`/debian/xfwm4
- rm -f `pwd`/debian/xfwm4/usr/lib/xfce4/mcs-plugins/*.la
- rm -f `pwd`/debian/xfwm4/usr/lib/xfce4/mcs-plugins/*.a
-
install -d `pwd`/debian/xfwm4/usr/share/man/man1
install `pwd`/debian/xfwm4.1 `pwd`/debian/xfwm4/usr/share/man/man1
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
@@ -77,7 +55,7 @@
dh_testdir
dh_testroot
- dh_installdocs -a README TODO
+ dh_installdocs -a README TODO NEWS
dh_installmenu -a
dh_installchangelogs ChangeLog -a
Modified: desktop/trunk/xfwm4-themes/debian/changelog
===================================================================
--- desktop/trunk/xfwm4-themes/debian/changelog 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/xfwm4-themes/debian/changelog 2009-02-27 01:13:49 UTC (rev 2781)
@@ -1,12 +1,44 @@
-xfwm4-themes (4.4.2-2) UNRELEASED; urgency=low
+xfwm4-themes (4.6.0-1) UNRELEASED; urgency=low
+ [ Xfce 4.6 Alpha “Pinkie” ]
+ * new upstream alpha version.
* debian/control:
- update my email address.
- update standards version.
- add Homepage: field.
+ * debian/control:
+ - update build-deps for Xfce 4.6 Alpha.
+ - remove now useless conflicts.
+ - update standards version to 3.8.0.
+ [ Xfce 4.6 Beta 1 “Fuzzy”]
+ * new upstream beta release.
+ * debian/control:
+ - update dep for Fuzzy.
+ - remove Martin Loschwitz from uploaders.
+ * debian/rules:
+ - stop messing with config.{guess,sub}.
+ [ Xfce 4.6 Beta 2 “Hopper”]
+ * new upstream beta release.
+ * debian/control:
+ - update dep for Hopper.
- -- Yves-Alexis Perez <corsac at debian.org> Mon, 28 Apr 2008 10:20:27 +0200
+ [ Xfce 4.6 Beta 3 “Tuco-tuco”]
+ * new upstream beta release.
+ * debian/control:
+ - update deps for “Tuco-Tuco”.
+ [ Xfce 4.6 RC1 “Capybara” ]
+ * new upstream release candidate.
+ * debian/control:
+ - update deps for “Capybara”.
+
+ [ Xfce 4.6 ]
+ * new upstream release.
+ * debian/control:
+ - update deps for 4.6.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Thu, 26 Feb 2009 01:09:00 +0100
+
xfwm4-themes (4.4.2-1) unstable; urgency=low
[ Yves-Alexis Perez ]
Modified: desktop/trunk/xfwm4-themes/debian/control
===================================================================
--- desktop/trunk/xfwm4-themes/debian/control 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/xfwm4-themes/debian/control 2009-02-27 01:13:49 UTC (rev 2781)
@@ -2,17 +2,16 @@
Section: x11
Priority: optional
Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
-Uploaders: Martin Loschwitz <madkiss at debian.org>, Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>, Yves-Alexis Perez <corsac at debian.org>
+Uploaders: Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>, Yves-Alexis Perez <corsac at debian.org>
Build-Depends: debhelper (>> 4.0.0)
-Standards-Version: 3.7.3
+Standards-Version: 3.8.0
Homepage: http://www.xfce.org/
Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfwm4-themes/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/xfwm4-themes/
Package: xfwm4-themes
Architecture: all
-Depends: xfwm4 (>= 4.4.2)
-Replaces: xfwm4 (<< 4.3.90.1)
+Depends: xfwm4 (>= 4.6.0)
Description: Theme files for xfwm4
This package contains several theme files for xfwm4,
the window manager of the Xfce4 project. If you are
Modified: desktop/trunk/xfwm4-themes/debian/rules
===================================================================
--- desktop/trunk/xfwm4-themes/debian/rules 2009-02-27 00:39:40 UTC (rev 2780)
+++ desktop/trunk/xfwm4-themes/debian/rules 2009-02-27 01:13:49 UTC (rev 2781)
@@ -30,12 +30,6 @@
rm -f build-stamp
[ ! -f Makefile ] || $(MAKE) distclean
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
- cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
- cp -f /usr/share/misc/config.guess config.guess
-endif
dh_clean
More information about the Pkg-xfce-commits
mailing list