[Pkg-xfce-commits] r6627 - desktop/branches/experimental/xfce4-session/debian

Thu Apr 5 10:54:47 UTC 2012

Author: mrpouit-guest
Date: 2012-04-05 22:54:47 +0000 (Thu, 05 Apr 2012)
New Revision: 6627

Added:
   desktop/branches/experimental/xfce4-session/debian/startxfce4.1
Removed:
   desktop/branches/experimental/xfce4-session/debian/xfce4-tips.1
Modified:
   desktop/branches/experimental/xfce4-session/debian/changelog
   desktop/branches/experimental/xfce4-session/debian/control
   desktop/branches/experimental/xfce4-session/debian/manpages
   desktop/branches/experimental/xfce4-session/debian/rules
Log:
* debian/control:
  - drop xfce4-dev-tools, libtool and xfce4-panel-dev from Build-Depends.
  - bump xfce4-settings' dep to >= 4.9.0.
  - drop xfce4-utils and ${shlibs:Recommends} from Recommends.
* debian/rules:
  - clean up, no need to run xdt-autogen.
  - tell dh_install to ignore .la files.
  - drop overrides for shlibdeps and makeshlibs, the panel plugin isn't
    built anymore.
* debian/xfce4-tips.1: dropped.
* debian/startxfce4.1: added, stolen from xfce4-utils.

Modified: desktop/branches/experimental/xfce4-session/debian/changelog
===================================================================

--- desktop/branches/experimental/xfce4-session/debian/changelog	2012-04-05 22:25:19 UTC (rev 6626)
+++ desktop/branches/experimental/xfce4-session/debian/changelog	2012-04-05 22:54:47 UTC (rev 6627)
@@ -6,7 +6,17 @@
       ('--force' has been changed to '--replace').
     - 06_no-settings-helper-in-490.patch: added, do not launch x-s-h.
     - series: refreshed.
-  * debian/control: bump xfce4-settings' dep to >= 4.9.0.
+  * debian/control:
+    - drop xfce4-dev-tools, libtool and xfce4-panel-dev from Build-Depends.
+    - bump xfce4-settings' dep to >= 4.9.0.
+    - drop xfce4-utils and ${shlibs:Recommends} from Recommends.
+  * debian/rules:
+    - clean up, no need to run xdt-autogen.
+    - tell dh_install to ignore .la files.
+    - drop overrides for shlibdeps and makeshlibs, the panel plugin isn't
+      built anymore.
+  * debian/xfce4-tips.1: dropped.
+  * debian/startxfce4.1: added, stolen from xfce4-utils.
 
   [ Yves-Alexis Perez ]
   * New upstream development release.

Modified: desktop/branches/experimental/xfce4-session/debian/control
===================================================================
--- desktop/branches/experimental/xfce4-session/debian/control	2012-04-05 22:25:19 UTC (rev 6626)
+++ desktop/branches/experimental/xfce4-session/debian/control	2012-04-05 22:54:47 UTC (rev 6627)
@@ -4,10 +4,10 @@
 Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
 Uploaders: Yves-Alexis Perez <corsac at debian.org>, Lionel Le Folgoc <mrpouit at gmail.com>
 Build-Depends: debhelper (>= 9), libx11-dev, libxml-parser-perl,
- libdbus-1-dev, libdbus-glib-1-dev, xfce4-panel-dev (>= 4.8.0),
- libxfce4util6-dev, libxfce4ui-1-dev (>= 4.9.0), libwnck-dev, 
- x11-xserver-utils, libxfconf-0-dev (>= 4.8.0), libglade2-dev, 
- intltool (>= 0.31), dpkg-dev (>= 1.16.1), xfce4-dev-tools, libtool
+ libdbus-1-dev, libdbus-glib-1-dev, libxfce4util6-dev,
+ libxfce4ui-1-dev (>= 4.9.0), libwnck-dev, x11-xserver-utils,
+ libxfconf-0-dev (>= 4.8.0), libglade2-dev, intltool (>= 0.31),
+ dpkg-dev (>= 1.16.1)
 Standards-Version: 3.9.3
 Homepage: http://www.xfce.org/
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfce4-session/
@@ -20,8 +20,7 @@
 Depends: ${shlibs:Depends}, ${misc:Depends}, xfce4-settings (>= 4.9.0), xfconf
 Breaks: xfce4-utils
 Replaces: xfce4-utils
-Recommends: xfwm4, xfce4-utils, xfdesktop4, ${shlibs:Recommends}, consolekit, upower,
- dbus-x11, x11-xserver-utils
+Recommends: xfwm4, xfdesktop4, consolekit, upower, dbus-x11, x11-xserver-utils
 Provides: x-session-manager
 Description: Xfce4 Session Manager
  xfce4-session is an X11-compliant "session manager" designed for use with

Modified: desktop/branches/experimental/xfce4-session/debian/manpages
===================================================================
--- desktop/branches/experimental/xfce4-session/debian/manpages	2012-04-05 22:25:19 UTC (rev 6626)
+++ desktop/branches/experimental/xfce4-session/debian/manpages	2012-04-05 22:54:47 UTC (rev 6627)
@@ -1,2 +1 @@
-debian/xfce4-tips.1
-debian/xfce4-session-settings.1
+debian/*.1

Modified: desktop/branches/experimental/xfce4-session/debian/rules
===================================================================
--- desktop/branches/experimental/xfce4-session/debian/rules	2012-04-05 22:25:19 UTC (rev 6626)
+++ desktop/branches/experimental/xfce4-session/debian/rules	2012-04-05 22:54:47 UTC (rev 6627)
@@ -3,31 +3,10 @@
 export DEB_LDFLAGS_MAINT_APPEND=-Wl,-z,defs -Wl,--as-needed -Wl,-O1
 export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,+bindnow
 
-override_dh_auto_configure:
-	NOCONFIGURE=1 xdt-autogen
-	dh_auto_configure
-	find .pc -type f -name '*.c' -exec echo '{}' >> po/POTFILES.skip \;
-
-override_dh_auto_clean:
-	rm -f po/POTFILES.skip
-	dh_auto_clean
-
 override_dh_install:
-	rm -f debian/tmp/usr/lib/*/xfce4/session/splash-engines/*.la
-	rm -f debian/tmp/usr/lib/*/*.la
-	rm -f debian/tmp/usr/lib/*/xfce4/panel/plugins/libxfsm-logout-plugin.*a
-	
-	rm -f debian/tmp/etc/xdg/autostart/xfce4-tips-autostart.desktop
 	chmod 755 debian/tmp/etc/xdg/xfce4/xinitrc
-	dh_install --fail-missing
+	dh_install --fail-missing -X .la
 
-override_dh_shlibdeps:
-	dh_shlibdeps -X debian/xfce4-session/usr/lib/*/xfce4/panel/plugins/libxfsm-logout-plugin.so -- \
-    -dRecommends debian/xfce4-session/usr/lib/*/xfce4/panel/plugins/libxfsm-logout-plugin.so -dDepends
-
-override_dh_makeshlibs:
-	dh_makeshlibs -X debian/xfce4-session/usr/lib/*/xfce4/panel/plugins/libxfsm-logout-plugin.so
-
 override_dh_strip:
 	dh_strip --dbg-package=xfce4-session-dbg
 

Added: desktop/branches/experimental/xfce4-session/debian/startxfce4.1
===================================================================
--- desktop/branches/experimental/xfce4-session/debian/startxfce4.1	                        (rev 0)
+++ desktop/branches/experimental/xfce4-session/debian/startxfce4.1	2012-04-05 22:54:47 UTC (rev 6627)
@@ -0,0 +1,41 @@
+.\" Copyright (c) 2005 Emanuele Rocca
+.TH STARTXFCE4 "1" "June 2005" "startxfce4" "User Commands"
+.SH NAME
+startxfce4 \- initialize an Xfce session
+.SH SYNOPSIS
+.B startxfce4
+.SH DESCRIPTION
+.PP
+.B startxfce4 
+is a script responsible for starting an Xfce session. It runs
+.B xinit 
+passing the file specified in the 
+.B FILES
+subsection as an argument.
+.P
+You may want to modify the default
+.B xinitrc
+file. In order to do that, copy 
+.I /etc/xdg/xfce4/xinitrc
+to
+.I ~/.config/xfce4/xinitrc
+and modify that file.
+.SH FILES
+.PP
+.IP ~/.config/xfce4/xinitrc
+User configuration file
+.IP /etc/xdg/xfce4/xinitrc
+System wide configuration file
+.SH SEE ALSO
+.PP
+.BR xfce4-session (1),
+.BR xinit (1),
+.BR dbus-launch (1),
+.BR ssh-agent (1),
+.BR file:///usr/share/xfce4/doc/C/xfce4-use.html#xfce4-getting-started
+.SH COPYRIGHT
+Copyright \(co 2005 Emanuele Rocca
+.br
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+

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


