[Pkg-xfce-commits] r5167 - desktop/trunk/xfce4-settings/debian
Yves-Alexis Perez
corsac at alioth.debian.org
Wed Mar 30 04:47:06 UTC 2011
Author: corsac
Date: 2011-03-30 16:47:04 +0000 (Wed, 30 Mar 2011)
New Revision: 5167
Added:
desktop/trunk/xfce4-settings/debian/patches/
Removed:
desktop/trunk/xfce4-settings/debian/patches/
Modified:
desktop/trunk/xfce4-settings/debian/changelog
desktop/trunk/xfce4-settings/debian/control
desktop/trunk/xfce4-settings/debian/copyright
desktop/trunk/xfce4-settings/debian/rules
Log:
merge xfce4-settings from experimental 4.8 branch
Modified: desktop/trunk/xfce4-settings/debian/changelog
===================================================================
--- desktop/trunk/xfce4-settings/debian/changelog 2011-03-30 16:38:55 UTC (rev 5166)
+++ desktop/trunk/xfce4-settings/debian/changelog 2011-03-30 16:47:04 UTC (rev 5167)
@@ -1,3 +1,43 @@
+xfce4-settings (4.8.1-2) experimental; urgency=low
+
+ [ Lionel Le Folgoc ]
+ * debian/control: recommends xfce4-volumed instead of aumix (not in the
+ default keyboard shortcuts anymore).
+
+ [ Yves-Alexis Perez ]
+ * debian/control:
+ - update xfconf build-dep to 4.8.0.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Mon, 07 Mar 2011 08:06:16 +0100
+
+xfce4-settings (4.8.1-1) experimental; urgency=low
+
+ [ Yves-Alexis Perez ]
+ * New upstream development release.
+ - add xrandr 1.2 support Closes: #529212
+ * debian/patches:
+ - 02-Port-to-libxklavier-5.0-API dropped, included upstream.
+ * debian/control:
+ - bump exo build-dep to exo-1 0.5.1.
+ - switch libxfcegui4 build-dep to libxfce4ui.
+ - build-conflicts with libxfcegui4-dev to be sure to pick kbd headers from
+ libxfce4ui-dev.
+ - add build-dep on hardening-includes
+ * debian/rules:
+ - add hardening flags to {C,LD}FLAGS.
+ * debian/copyright updated for new release.
+
+ [ Lionel Le Folgoc ]
+ * New upstream bugfix release.
+ * debian/control:
+ - bumped Standards-Version to 3.9.1, no further change
+ - removed some trailing spaces.
+ * debian/rules:
+ - call dpkg-buildflags
+ - link with --as-needed.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Sun, 06 Feb 2011 17:06:23 +0100
+
xfce4-settings (4.6.5-2) unstable; urgency=low
* debian/patches:
@@ -49,6 +89,34 @@
-- Yves-Alexis Perez <corsac at debian.org> Sat, 02 Jan 2010 16:20:25 +0100
+
+xfce4-settings (4.6.4-2) unstable; urgency=low
+
+ * debian/patches/0001-Port-to-libxklavier-5.0-API.patch added.
+ * debian/patches/series: enable this patch.
+ * debian/control: b-dep on quilt (>= 0.46-7), bump libxklavier-dev b-dep
+ to >= 5.0, add myself to Uploaders.
+ * debian/rules: pass --with quilt.
+ * bump Standards-Version to 3.8.4, no changes.
+
+ -- Lionel Le Folgoc <mrpouit at gmail.com> Sat, 10 Apr 2010 17:39:38 +0100
+
+xfce4-settings (4.6.4-1) unstable; urgency=low
+
+ [ Lionel Le Folgoc ]
+ * debian/control: fix typo in Vcs-* fields.
+
+ [ Yves-Alexis Perez ]
+ * New upstream release.
+ * debian/patches:
+ - 01_xi2-support dropped, included upstream.
+ * debian/control:
+ - dump quilt build-dep.
+ * debian/rules:
+ - dump quilt addon.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Sat, 02 Jan 2010 16:20:25 +0100
+
xfce4-settings (4.6.3-3) unstable; urgency=low
* debian/control:
Modified: desktop/trunk/xfce4-settings/debian/control
===================================================================
--- desktop/trunk/xfce4-settings/debian/control 2011-03-30 16:38:55 UTC (rev 5166)
+++ desktop/trunk/xfce4-settings/debian/control 2011-03-30 16:47:04 UTC (rev 5167)
@@ -4,11 +4,12 @@
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>, Lionel Le Folgoc <mrpouit at gmail.com>
-Build-Depends: debhelper (>= 7.0.50), libxfce4util-dev (>= 4.6.0),
- libxfcegui4-dev (>= 4.6.0), libexo-0.3-dev (>= 0.3.100), libglade2-dev,
- libxfconf-0-dev, libwnck-dev, libxklavier-dev (>= 5.0), libnotify-dev,
- intltool (>= 0.31)
-Standards-Version: 3.8.4
+Build-Depends: debhelper (>= 7.0.50~), libxfce4util-dev (>= 4.8.0),
+ libxfce4ui-1-dev (>= 4.8.0), libexo-1-dev (>= 0.6.0),
+ libxfconf-0-dev (>= 4.8.0), libwnck-dev, libxklavier-dev (>= 5.0),
+ libnotify-dev, intltool (>= 0.31), hardening-includes
+Build-Conflicts: libxfcegui4-dev (<< 4.7.0)
+Standards-Version: 3.9.1
Homepage: http://www.xfce.org
Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfce4-settings
Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/xfce4-settings/
@@ -17,7 +18,7 @@
Section: xfce
Architecture: any
Depends: ${shlibs:Depends}, xfconf, ${misc:Depends}
-Recommends: aumix, x11-utils, tango-icon-theme
+Recommends: xfce4-volumed, x11-utils
Conflicts: xfce4-mcs-plugins
Replaces: xfce4-mcs-manager, xfce4-mcs-plugins
Description: graphical application for managing Xfce settings
@@ -27,9 +28,9 @@
It contains multiple tools:
- xfce4-settings-manager (which replaces the old mcs settings manager),
which executes the various (provided) settings dialogs
- - xfce4-settings-helper: a daemon which provides special features, like
- keyboard shortcuts, AccessX notification and update of keyboard and
+ - xfce4-settings-helper: a daemon which provides special features, like
+ keyboard shortcuts, AccessX notification and update of keyboard and
mouse-pointer data
- xfce4-settings-editor, a tool for editing ALL settings within xfconf, the
- graphical counterpart of xfconf-query.
+ graphical counterpart of xfconf-query.
- xfsettingsd, a daemon for exporting XSettings to applications.
Modified: desktop/trunk/xfce4-settings/debian/copyright
===================================================================
--- desktop/trunk/xfce4-settings/debian/copyright 2011-03-30 16:38:55 UTC (rev 5166)
+++ desktop/trunk/xfce4-settings/debian/copyright 2011-03-30 16:47:04 UTC (rev 5167)
@@ -9,61 +9,130 @@
Brian J. Tarricone <bjt23 at cornell.edu>
Jannis Pohlmann <jannis at xfce.org>
+Files: dialogs/accessibility-settings/main.c
+ xfce4-settings-editor/main.c
+ xfce4-settings-editor/main_window.h
+ xfce4-settings-helper/accessibility.c
+ xfce4-settings-helper/accessibility.h
+ xfce4-settings-helper/keyboards.c
+ xfce4-settings-helper/keyboards.h
+ xfsettingsd/main.c
+ xfsettingsd/registry.h
+Copyright: 2008, Stephan Arts <stephan at xfce.org>
+License: GPL-2+
-dialogs/*:
- License: GPL-2+
-dialogs/accessibility-settings/*:
- © 2008 Stephan Arts <stephan at xfce.org>
-dialogs/appearance-settings/*:
- © 2008 Stephan Arts <stephan at xfce.org>
- © 2008 Jannis Pohlmann <jannis at xfce.org>
-dialogs/appearance-settings/images.h:
-dialogs/display-settings/*:
-dialogs/mouse-settings/*:
- © 2008 Nick Schermer <nick at xfce.org>
-dialogs/keyboard-settings/*:
- © 2008 Jannis Pohlmann <jannis at xfce.org>
-dialogs/keyboard-settings/xfce-keyboard-settings.c:
- © 2008 Jannis Pohlmann <jannis at xfce.org>
- © 2007 Gauvain Pocentek <gauvainpocentek at gmail.com>
+Files: dialogs/keyboard-settings/command-dialog.c
+ dialogs/keyboard-settings/command-dialog.h
+ dialogs/keyboard-settings/main.c
+ dialogs/keyboard-settings/xfce-keyboard-settings.h
+ xfce4-settings-helper/keyboard-shortcuts.c
+ xfce4-settings-helper/keyboard-shortcuts.h
+Copyright: 2008, Jannis Pohlmann <jannis at xfce.org>
+License: GPL-2+
-xfce4-settings-editor/*:
- © 2008 Stephan Arts <stephan at xfce.org>
- License: GPL-2+
+Files: xfce4-settings-helper/workspaces.c
+ xfce4-settings-helper/workspaces.h
+ xfce4-settings-manager/main.c
+ xfce4-settings-manager/xfce-settings-manager-dialog.c
+ xfce4-settings-manager/xfce-settings-manager-dialog.h
+Copyright: 2008, Brian Tarricone <bjt23 at cornell.edu>
+License: GPL-2
-xfce4-settings-helper/*:
- License: GPL-2+
-xfce4-settings-helper/keyboard-shortcuts.[ch]:
- © 2008 Jannis Pohlmann <jannis at xfce.org>
-xfce4-settings-helper/{displays,pointers}.[ch]:
- © 2008 Nick Schermer <nick at xfce.org>
-xfce4-settings-helper/{accessbility,keyboards}.[ch]:
- © 2008 Stephan Arts <stephan at xfce.org>
-xfce4-settings-helper/keyboard-layout.[ch]:
- © 2008 Olivier Fourdan <olivier at xfce.org>
-xfce4-settings-helper/main.c:
- © 2008 Stephan Arts <stephan at xfce.org>
- © 2008 Nick Schermer <nick at xfce.org>
- © 2008 Jannis Pohlmann <jannis at xfce.org>
-xfce4-settings-helper/workspaces.[ch]:
- © 2008 Brian Tarricone <bjt23 at cornell.edu>
- License: GPL-2
+Files: dialogs/appearance-settings/images.h
+ dialogs/mouse-settings/main.c
+ xfce4-settings-helper/displays.h
+ xfce4-settings-helper/pointers.c
+ xfce4-settings-helper/pointers.h
+Copyright: 2008, Nick Schermer <nick at xfce.org>
+License: GPL-2+
-xfce4-settings-manager/*:
- License: GPL-2
-xfce4-settings-manager/main.c:
-xfce4-settings-manager/xfce-settings-manager-dialog.[ch]:
- © 2008 Brian Tarricone <bjt23 at cornell.edu>
-xfce4-settings-manager/xfce-text-renderer.[ch]:
- © 2005-2006 Benedikt Meurer <benny at xfce.org>
- © 2008 Jannis Pohlmann <jannis at xfce.org>
- License: GPL-2+
+Files: dialogs/display-settings/main.c
+ dialogs/display-settings/xfce-randr.c
+ dialogs/display-settings/xfce-randr.h
+ xfce4-settings-helper/displays.c
+Copyright: 2008, Nick Schermer <nick at xfce.org>
+ 2010, Lionel Le Folgoc <lionel at lefolgoc.net>
+License: GPL-2+
-xfsettingsd/*:
- © 2008 Stephan Arts <stephan at xfce.org>
- License: GPL-2+
-xfsettingsd/registry.c:
- © 2001 Red Hat, Inc.
+Files: xfce4-settings-manager/xfce-text-renderer.c
+ xfce4-settings-manager/xfce-text-renderer.h
+Copyright: 2005, Benedikt Meurer <benny at xfce.org>
+ 2005-2006, Benedikt Meurer <benny at xfce.org>
+ 2008, Jannis Pohlmann <jannis at xfce.org>
+License: GPL-2+
+Files: xfce4-settings-helper/keyboard-layout.c
+ xfce4-settings-helper/keyboard-layout.h
+Copyright: 2008, Olivier Fourdan <olivier at xfce.org>
+License: GPL-2+
+
+Files: dialogs/display-settings/display-name.c
+ dialogs/display-settings/edid-parse.c
+Copyright: 2007, Red Hat, Inc
+License: MIT/X11 (BSD like)
+
+Files: xfce4-settings-helper/clipboard-manager.c
+Copyright: 2007, Anders Carlsson
+ 2007, Matthias Clasen
+ 2007, Rodrigo Moya
+ 2007, William Jon McCann <mccann at jhu.edu>
+ 2009-2011, Mike Massonnet <mmassonnet at xfce.org>
+License: GPL-2+
+
+Files: dialogs/keyboard-settings/xfce-keyboard-settings.c
+Copyright: 2007, Gauvain Pocentek <gauvainpocentek at gmail.com>
+ 2008, Jannis Pohlmann <jannis at xfce.org>
+License: GPL-2+
+
+Files: xfce4-settings-helper/main.c
+Copyright: 2008, Jannis Pohlmann <jannis at xfce.org>
+ 2008, Nick Schermer <nick at xfce.org>
+ 2008, Stephan Arts <stephan at xfce.org>
+License: GPL-2+
+
+Files: dialogs/appearance-settings/main.c
+Copyright: 2008, Jannis Pohlmann <jannis at xfce.org>
+ 2008, Stephan Arts <stephan at xfce.org>
+License: GPL-2+
+
+Files: xfce4-settings-editor/main_window.c
+Copyright: 2008, Stephan Arts <stephan at xfce.org>
+ 2009-2010, JÃrôme Guelfucci <jeromeg at xfce.org>
+License: GPL-2+
+
+Files: xfsettingsd/registry.c
+Copyright: 2001, Red Hat, Inc
+License: GPL-2+
+
+Files: xfce4-settings-helper/clipboard-manager.h
+Copyright: 2007, William Jon McCann <mccann at jhu.edu>
+License: GPL-2+
+
+Files: dialogs/display-settings/edid.h
+Copyright: 2007-2008, Red Hat, Inc
+License: LGPL-2+
+
On Debian systems, the complete text of the GNU General Public License (version
-2) can be found in the file `/usr/share/common-licenses/GPL-2'.
+2 or later) can be found in the file `/usr/share/common-licenses/GPL'. The
+complete text of the GNU Lesser General Public License (version 2 or later) can
+be found in the file `/usr/share/common-licenses/LGPL'.
+
+The MIT/X11 license text is:
+
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of this software and associated documentation files (the "Software"),
+ to deal in the Software without restriction, including without limitation
+ on the rights to use, copy, modify, merge, publish, distribute, sub
+ license, and/or sell copies of the Software, and to permit persons to whom
+ the Software is furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice (including the next
+ paragraph) shall be included in all copies or substantial portions of the
+ Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+ THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
Modified: desktop/trunk/xfce4-settings/debian/rules
===================================================================
--- desktop/trunk/xfce4-settings/debian/rules 2011-03-30 16:38:55 UTC (rev 5166)
+++ desktop/trunk/xfce4-settings/debian/rules 2011-03-30 16:47:04 UTC (rev 5167)
@@ -1,5 +1,15 @@
#!/usr/bin/make -f
+include /usr/share/hardening-includes/hardening.make
+
+CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
+LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
+LDFLAGS+=$(HARDENING_LDFLAGS) -Wl,-z,defs -Wl,--as-needed -Wl,-O1
+CFLAGS+=$(HARDENING_CFLAGS)
+
+export CFLAGS LDFLAGS
+
+
override_dh_auto_configure:
dh_auto_configure -- --enable-libnotify --enable-xcursor \
--enable-libxklavier --enable-xsettings-daemon --enable-sound-settings\
More information about the Pkg-xfce-commits
mailing list