[Pkg-xfce-commits] r8826 - in /desktop/trunk/xfdesktop4: ./ debian/changelog debian/control debian/copyright debian/patches/series debian/rules debian/xfdesktop-settings.1

Yves-Alexis Perez corsac at moszumanska.debian.org
Wed Mar 4 20:45:04 UTC 2015 

Author: corsac
Date: Wed Mar  4 20:45:04 2015
New Revision: 8826

URL: http://svn.debian.org/wsvn/pkg-xfce/?sc=1&rev=8826
Log:
merge changes from experimental

Added:
    desktop/trunk/xfdesktop4/debian/patches/series
      - copied unchanged from r8810, desktop/branches/experimental/xfdesktop4/debian/patches/series
Modified:
    desktop/trunk/xfdesktop4/   (props changed)
    desktop/trunk/xfdesktop4/debian/changelog
    desktop/trunk/xfdesktop4/debian/control
    desktop/trunk/xfdesktop4/debian/copyright
    desktop/trunk/xfdesktop4/debian/rules
    desktop/trunk/xfdesktop4/debian/xfdesktop-settings.1

Propchange: desktop/trunk/xfdesktop4/
------------------------------------------------------------------------------
--- svn:mergeinfo	(original)
+++ svn:mergeinfo	Wed Mar  4 20:45:04 2015
@@ -1 +1 @@
-/desktop/branches/experimental/xfdesktop4:6488-7429
+/desktop/branches/experimental/xfdesktop4:6488-7429,7962-8810

Modified: desktop/trunk/xfdesktop4/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/xfdesktop4/debian/changelog?rev=8826&op=diff
==============================================================================
--- desktop/trunk/xfdesktop4/debian/changelog	(original)
+++ desktop/trunk/xfdesktop4/debian/changelog	Wed Mar  4 20:45:04 2015
@@ -1,3 +1,78 @@
+xfdesktop4 (4.12.0-1) UNRELEASED; urgency=medium
+
+  * New upstream release
+  * Bump standards version to 3.9.6.
+
+ -- Mateusz Łukasik <mati75 at linuxmint.pl>  Sun, 01 Mar 2015 13:52:09 +0100
+
+xfdesktop4 (4.11.8-1) experimental; urgency=medium
+
+  [ Jackson Doak ]
+  * New upstream release
+    - Don't show infobar when there's only 1 workspace. LP: #1365382
+
+  [ Yves-Alexis Perez ]
+  * debian/control:
+    - update libxfce4ui build-dep to 4.11.1.
+    - fix spelling error in xfdesktop4-dbg synopsis.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Mon, 15 Sep 2014 19:04:46 +0200
+
+xfdesktop4 (4.11.6-1) experimental; urgency=medium
+
+  * New upstream development release.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Tue, 08 Apr 2014 07:49:31 +0200
+
+xfdesktop4 (4.11.5-1) experimental; urgency=medium
+
+  * New upstream development release.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Tue, 01 Apr 2014 23:20:47 +0200
+
+xfdesktop4 (4.11.4-1) experimental; urgency=medium
+
+  [ Jackson Doak ]
+  * New upstream bugfix release
+  * Drop git-fix-segfault-on-session-start.patch, fixed upstream
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Tue, 18 Mar 2014 22:01:11 +0100
+
+xfdesktop4 (4.11.3-2) experimental; urgency=medium
+
+  [ Jackson Doak ]
+  * Add git-fix-segfault-on-session-start.patch. LP: #1282509
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Fri, 28 Feb 2014 21:52:55 +0100
+
+xfdesktop4 (4.11.3-1) experimental; urgency=medium
+
+  * New upstream development release.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Wed, 19 Feb 2014 20:34:01 +0100
+
+xfdesktop4 (4.11.2-1) experimental; urgency=low
+
+  [ Evgeni Golov ]
+  * Correct Vcs-* URLs to point to anonscm.debian.org
+
+  [ Jackson Doak ]
+  * debian/control: 
+    - Bump standards-version to 3.9.5
+    - Recommend tumbler for thumbnailing support
+  * debian/rules: Use --disable-silent-rules
+  * debian/copyright: Use debian format 1.0
+  * Update debian/xfdesktop-settings.1
+
+  [ Lionel Le Folgoc ]
+  * New upstream development release.
+
+  [ Yves-Alexis Perez ]
+  * debian/rules:
+    - drop configure option --enable-exo, now useless.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Thu, 16 Jan 2014 22:55:26 +0100
+
 xfdesktop4 (4.10.3-1) UNRELEASED; urgency=low
 
   [ Evgeni Golov ]

Modified: desktop/trunk/xfdesktop4/debian/control
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/xfdesktop4/debian/control?rev=8826&op=diff
==============================================================================
--- desktop/trunk/xfdesktop4/debian/control	(original)
+++ desktop/trunk/xfdesktop4/debian/control	Wed Mar  4 20:45:04 2015
@@ -5,7 +5,7 @@
 Uploaders: Yves-Alexis Perez <corsac at debian.org>, 
  Lionel Le Folgoc <mrpouit at gmail.com>
 Build-Depends: debhelper (>= 9), libglib2.0-dev, libgtk2.0-dev, 
- libxfce4util-dev (>= 4.10.0), libxfce4ui-1-dev (>= 4.10.0), libwnck-dev,
+ libxfce4util-dev (>= 4.10.0), libxfce4ui-1-dev (>= 4.11.1), libwnck-dev,
  libxfconf-0-dev (>= 4.10.0), intltool, libdbus-glib-1-dev (>= 0.84),
  libthunarx-2-dev (>= 1.4.0), libexo-1-dev (>= 0.7.0), 
  libgarcon-1-0-dev (>= 0.2.0), libnotify-dev (>= 0.4.0), dpkg-dev (>= 1.16.1)
@@ -41,6 +41,6 @@
 Architecture: any
 Priority: extra
 Depends: ${shlibs:Depends}, ${misc:Depends}, xfdesktop4 (= ${binary:Version})
-Description: debugging informations for xfdesktop4
+Description: debugging information for xfdesktop4
  This package contains debugging symbols for xfdesktop4, the desktop manager
  for Xfce 4 Desktop Environment.

Modified: desktop/trunk/xfdesktop4/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/xfdesktop4/debian/copyright?rev=8826&op=diff
==============================================================================
--- desktop/trunk/xfdesktop4/debian/copyright	(original)
+++ desktop/trunk/xfdesktop4/debian/copyright	Wed Mar  4 20:45:04 2015
@@ -1,12 +1,12 @@
-This package was debianized by Martin Loschwitz <madkiss at madkiss.org> on
-Sun, 19 Jan 2003 16:29:34 +0100.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: xfdesktop4
+Source: http://www.xfce.org
 
-Upstream release is available from http://www.xfce.org
-
-Upstream author are:
-Benedikt Meurer <benny at xfce.org>
-Jasper Huijsmans <huysmans at users.sourceforge.net>
-Brian Tarricone <bjt23 at cornell.edu>
+Files: *
+Copyright: Benedikt Meurer <benny at xfce.org>,
+ Jasper Huijsmans <huysmans at users.sourceforge.net>,
+ Brian Tarricone <bjt23 at cornell.edu>
+License: GPL-2+
 
 Files: src/xfce-backdrop.h
  src/xfce-desktop.h
@@ -19,7 +19,6 @@
  src/xfdesktop-file-utils.h
  src/xfdesktop-icon-view-manager.c
  src/xfdesktop-icon-view-manager.h
- src/xfdesktop-icon-view.c
  src/xfdesktop-icon-view.h
  src/xfdesktop-icon.c
  src/xfdesktop-icon.h
@@ -30,11 +29,16 @@
  src/xfdesktop-window-icon-manager.h
  src/xfdesktop-window-icon.c
  src/xfdesktop-window-icon.h
-Copyright: 2004, Brian Tarricone, <bjt23 at cornell.edu>
- 2004-2007, Brian Tarricone, <bjt23 at cornell.edu>
- 2006, Brian Tarricone, <bjt23 at cornell.edu>
- 2006-2007, Brian Tarricone, <bjt23 at cornell.edu>
- 2006-2009, Brian Tarricone, <bjt23 at cornell.edu>
+Copyright: 2004, Brian Tarricone <bjt23 at cornell.edu>
+ 2004-2007, Brian Tarricone <bjt23 at cornell.edu>
+ 2006, Brian Tarricone <bjt23 at cornell.edu>
+ 2006-2007, Brian Tarricone <bjt23 at cornell.edu>
+ 2006-2009, Brian Tarricone <bjt23 at cornell.edu>
+License: GPL-2+
+
+Files: src/xfdesktop-icon-view.c
+Copyright: 2006-2009 Brian Tarricone <bjt23 at cornell.edu>,
+ 2000 Eazel, Inc
 License: GPL-2+
 
 Files: common/xfdesktop-common.h
@@ -44,16 +48,16 @@
  src/xfce-desktop.c
 Copyright: 2002-2003, Jasper Huijsmans (huysmans at users.sourceforge.net)
  2003, Benedikt Meurer <benedikt.meurer at unix-ag.uni-siegen.de>
- 2004, Brian Tarricone, <bjt23 at cornell.edu>
- 2004-2007, Brian Tarricone, <bjt23 at cornell.edu>
+ 2004, Brian Tarricone <bjt23 at cornell.edu>
+ 2004-2007, Brian Tarricone <bjt23 at cornell.edu>
 License: GPL-2+
 
 Files: src/xfdesktop-file-icon-manager.c
  src/xfdesktop-regular-file-icon.c
  src/xfdesktop-special-file-icon.c
  src/xfdesktop-volume-icon.c
-Copyright: 2006, Benedikt Meurer, <benny at xfce.org>
- 2006, Brian Tarricone, <bjt23 at cornell.edu>
+Copyright: 2006, Benedikt Meurer <benny at xfce.org>
+ 2006, Brian Tarricone <bjt23 at cornell.edu>
 License: GPL-2+
 
 Files: src/xfdesktop-clipboard-manager.c
@@ -107,18 +111,42 @@
 Copyright: 2002-2003, Jasper Huijsmans (huysmans at users.sourceforge.net)
 License: GPL-2+
 
-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>
+Files: po/*
+Copyright: 2003-2006 The Xfce development team
+License: GPL-2+
 
-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>
+Files: po/gl.po
+Copyright: 2006 Canonical Ltd,
+ Rosetta Contributors 2006
+License: GPL-2+
 
-Manual is:
-© 2004-2007 Brian Tarricone
-© 2004 Jasper Huijsmans
-© 2004 François Le Clainche <fleclainche at wanadoo.fr>
+Files: po/fr.po
+Copyright: 2007 Maximilian Schleiss <maxschleiss at bluewin.ch>
+License: GPL-2+
 
-On Debian systems, the complete text of the GNU General Public License 
-can be found in `/usr/share/common-licenses/GPL'.
+License: GPL-2+
+ This program 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; 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.
+ .
+ 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 full text of the GNU General Public
+ License version 2 can be found in the file
+ `/usr/share/common-licenses/GPL-2'.
+
+License: LGPL-2+
+ On Debian systems, the complete text of the GNU Library 
+ General Public License (version 2) can be found in 
+ `/usr/share/common-licenses/GPL-2'.

Modified: desktop/trunk/xfdesktop4/debian/rules
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/xfdesktop4/debian/rules?rev=8826&op=diff
==============================================================================
--- desktop/trunk/xfdesktop4/debian/rules	(original)
+++ desktop/trunk/xfdesktop4/debian/rules	Wed Mar  4 20:45:04 2015
@@ -4,8 +4,9 @@
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
 override_dh_auto_configure:
-	dh_auto_configure -- --enable-thunarx --enable-exo \
-	 	--docdir=\$${prefix}/share/doc/xfdesktop4-data
+	dh_auto_configure -- --enable-thunarx \
+	 	--docdir=\$${prefix}/share/doc/xfdesktop4-data \
+		--disable-silent-rules
 
 override_dh_install:
 	dh_install --fail-missing

Modified: desktop/trunk/xfdesktop4/debian/xfdesktop-settings.1
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/xfdesktop4/debian/xfdesktop-settings.1?rev=8826&op=diff
==============================================================================
--- desktop/trunk/xfdesktop4/debian/xfdesktop-settings.1	(original)
+++ desktop/trunk/xfdesktop4/debian/xfdesktop-settings.1	Wed Mar  4 20:45:04 2015
@@ -1,5 +1,4 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.36.
-.TH XFDESKTOP-SETTINGS "1" "March 2009" "xfdesktop-settings 4.6.0 (Xfce 4.6.0)" "User Commands"
+.TH XFDESKTOP-SETTINGS "1" "September 2013" "xfdesktop-settings 4.10.2 (Xfce 4.10)" "User Commands"
 .SH NAME
 xfdesktop-settings \- Desktop settings for Xfce
 .SH DESCRIPTION
@@ -8,7 +7,7 @@
 xfdesktop\-settings [OPTION...]
 .SS "Help Options:"
 .TP
-\-?, \fB\-\-help\fR
+\fB\-h\fR, \fB\-\-help\fR
 Show help options
 .TP
 \fB\-\-help\-all\fR
@@ -16,6 +15,26 @@
 .TP
 \fB\-\-help\-gtk\fR
 Show GTK+ Options
+.PP
+GTK+ Options
+.TP
+\fB\-\-class\fR=\fICLASS\fR
+Program class as used by the window manager
+.TP
+\fB\-\-name\fR=\fINAME\fR
+Program name as used by the window manager
+.TP
+\fB\-\-screen\fR=\fISCREEN\fR
+X screen to use
+.TP
+\fB\-\-sync\fR
+Make X calls synchronous
+.TP
+\fB\-\-gtk\-module\fR=\fIMODULES\fR
+Load additional GTK+ modules
+.TP
+\fB\-\-g\-fatal\-warnings\fR
+Make all warnings fatal
 .SS "Application Options:"
 .TP
 \fB\-s\fR, \fB\-\-socket\-id\fR=\fISOCKET\fR ID
@@ -27,7 +46,8 @@
 \fB\-\-display\fR=\fIDISPLAY\fR
 X display to use
 .SH COPYRIGHT
-Copyright \(co 2004-2008
-        The Xfce development team. All rights reserved.
+Copyright \(co 2004\-2008
+.IP
+The Xfce development team. All rights reserved.
 .PP
 Please report bugs to <http://bugzilla.xfce.org/>.

More information about the Pkg-xfce-commits mailing list