[Pkg-xfce-commits] r2961 - desktop/trunk/xfce4-session/debian

corsac at alioth.debian.org corsac at alioth.debian.org
Sun Mar 15 14:28:17 UTC 2009 

Author: corsac
Date: 2009-03-15 14:28:16 +0000 (Sun, 15 Mar 2009)
New Revision: 2961

Added:
   desktop/trunk/xfce4-session/debian/xfce4-session-settings.1
Modified:
   desktop/trunk/xfce4-session/debian/changelog
   desktop/trunk/xfce4-session/debian/compat
   desktop/trunk/xfce4-session/debian/control
   desktop/trunk/xfce4-session/debian/rules
Log:
* debian/control:
  - update standards version to 3.8.1.
  - update debhelper build-dep to 7.
* debian/rules:
  - add -Wl,-z,defs -Wl,--as-needed to LDFLAGS
  - replace dh_clean -k by dh_prep.
* debian/compat bumped to 7.
* add manpage for xfce4-session-settings.

Modified: desktop/trunk/xfce4-session/debian/changelog
===================================================================
--- desktop/trunk/xfce4-session/debian/changelog	2009-03-15 14:15:41 UTC (rev 2960)
+++ desktop/trunk/xfce4-session/debian/changelog	2009-03-15 14:28:16 UTC (rev 2961)
@@ -2,8 +2,16 @@
 
   * Upload to unstable, and mark fixed bugs as such:
     - now display suspend/hibernate at session logout.          closes: #490659
+  * debian/control:
+    - update standards version to 3.8.1.
+    - update debhelper build-dep to 7.
+  * debian/rules:
+    - add -Wl,-z,defs -Wl,--as-needed to LDFLAGS
+    - replace dh_clean -k by dh_prep.
+  * debian/compat bumped to 7.
+  * add manpage for xfce4-session-settings.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Sat, 07 Mar 2009 18:28:45 +0100
+ -- Yves-Alexis Perez <corsac at debian.org>  Sun, 15 Mar 2009 15:24:50 +0100
 
 xfce4-session (4.6.0-1) experimental; urgency=low
 

Modified: desktop/trunk/xfce4-session/debian/compat
===================================================================
--- desktop/trunk/xfce4-session/debian/compat	2009-03-15 14:15:41 UTC (rev 2960)
+++ desktop/trunk/xfce4-session/debian/compat	2009-03-15 14:28:16 UTC (rev 2961)
@@ -1 +1 @@
-6
+7

Modified: desktop/trunk/xfce4-session/debian/control
===================================================================
--- desktop/trunk/xfce4-session/debian/control	2009-03-15 14:15:41 UTC (rev 2960)
+++ desktop/trunk/xfce4-session/debian/control	2009-03-15 14:28:16 UTC (rev 2961)
@@ -3,12 +3,12 @@
 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 (>= 6.0.7), libx11-dev, libxml-parser-perl, chrpath,
+Build-Depends: debhelper (>= 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
+Standards-Version: 3.8.1
 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/

Modified: desktop/trunk/xfce4-session/debian/rules
===================================================================
--- desktop/trunk/xfce4-session/debian/rules	2009-03-15 14:15:41 UTC (rev 2960)
+++ desktop/trunk/xfce4-session/debian/rules	2009-03-15 14:28:16 UTC (rev 2961)
@@ -13,6 +13,7 @@
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
 
+LDFLAGS+=-Wl,-z,defs -Wl,--as-needed
 CFLAGS = -Wall -g
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -37,8 +38,7 @@
 
 config.status: configure patch-stamp
 	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/sbin --enable-final --with-shutdown-style=hal
+	./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/sbin --enable-final --with-shutdown-style=hal
 
 
 build: build-stamp
@@ -64,7 +64,7 @@
 install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k 
+	dh_prep
 	dh_installdirs
 	dh_lintian
 
@@ -81,10 +81,6 @@
 	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.
@@ -95,7 +91,8 @@
 	dh_testroot
 	dh_installchangelogs ChangeLog
 	dh_installdocs BUGS NEWS README TODO doc/README.Kiosk doc/FAQ
-	dh_installman debian/xfce4-autostart-editor.1 debian/xfce4-tips.1
+	dh_installman debian/xfce4-autostart-editor.1 debian/xfce4-tips.1 \
+    debian/xfce4-session-settings.1
 	dh_link
 	dh_strip
 	dh_compress

Added: desktop/trunk/xfce4-session/debian/xfce4-session-settings.1
===================================================================
--- desktop/trunk/xfce4-session/debian/xfce4-session-settings.1	                        (rev 0)
+++ desktop/trunk/xfce4-session/debian/xfce4-session-settings.1	2009-03-15 14:28:16 UTC (rev 2961)
@@ -0,0 +1,33 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.36.
+.TH XFCE4-SESSION-SETTINGS "1" "March 2009" "xfce4-session-settings 4.6.0 (Xfce 4.6.0)" "User Commands"
+.SH NAME
+xfce4-session-settings \- Session settings for Xfce
+.SH DESCRIPTION
+.SS "Usage:"
+.IP
+xfce4\-session\-settings [OPTION...]
+.SS "Help Options:"
+.TP
+\-?, \fB\-\-help\fR
+Show help options
+.TP
+\fB\-\-help\-all\fR
+Show all help options
+.TP
+\fB\-\-help\-gtk\fR
+Show GTK+ Options
+.SS "Application Options:"
+.TP
+\fB\-s\fR, \fB\-\-socket\-id\fR=\fISOCKET\fR ID
+Settings manager socket
+.TP
+\fB\-V\fR, \fB\-\-version\fR
+Version information
+.TP
+\fB\-\-display\fR=\fIDISPLAY\fR
+X display to use
+.SH COPYRIGHT
+Copyright \(co 2004-2008
+        The Xfce development team. All rights reserved.
+.PP
+Please report bugs to <http://bugs.xfce.org/>.

More information about the Pkg-xfce-commits mailing list