[Pkg-xfce-commits] r1551 - desktop/trunk/xfce4-utils/debian

[corsac at alioth.debian.org]

Author: corsac
Date: 2008-01-25 22:54:44 +0000 (Fri, 25 Jan 2008)
New Revision: 1551

Modified:
   desktop/trunk/xfce4-utils/debian/changelog
   desktop/trunk/xfce4-utils/debian/control
   desktop/trunk/xfce4-utils/debian/rules
Log:
* debian/rules:
  - include quilt patch system.
  - activate x support at configure time.
  - remove checks for terminal at install.
* debian/control:
  - dep on exo-utils as we use some tools in this package.
  - build-dep against libdbus-1-dev and libdbus-glib-1-dev to add dbus
    support to xfrun. Add dbus to Recommends: accordingly.

Modified: desktop/trunk/xfce4-utils/debian/changelog
===================================================================
--- desktop/trunk/xfce4-utils/debian/changelog	2008-01-25 22:54:21 UTC (rev 1550)
+++ desktop/trunk/xfce4-utils/debian/changelog	2008-01-25 22:54:44 UTC (rev 1551)
@@ -4,12 +4,17 @@
   * debian/patches:
     - 01_xflock4-test-running-screensaver added, test the running screensaver
       instead of the installed ones.
-  * debian/rules: include quilt patch system.
-  * debian/control: 
+  * debian/rules:
+    - include quilt patch system.
+    - activate x support at configure time.
+    - remove checks for terminal at install.
+  * debian/control:
     - build-dep on quilt.
-    - dep on exo-utils as we use some tools on this package.
+    - dep on exo-utils as we use some tools in this package.
+    - build-dep against libdbus-1-dev and libdbus-glib-1-dev to add dbus
+      support to xfrun. Add dbus to Recommends: accordingly.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Fri, 11 Jan 2008 22:49:36 +0100
+ -- Yves-Alexis Perez <corsac at debian.org>  Fri, 25 Jan 2008 17:22:46 +0100
 
 xfce4-utils (4.4.2-3) unstable; urgency=low
 

Modified: desktop/trunk/xfce4-utils/debian/control
===================================================================
--- desktop/trunk/xfce4-utils/debian/control	2008-01-25 22:54:21 UTC (rev 1550)
+++ desktop/trunk/xfce4-utils/debian/control	2008-01-25 22:54:44 UTC (rev 1551)
@@ -3,7 +3,7 @@
 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.1.26), libgtk2.0-dev (>= 2.10.6), libxft-dev, xfce4-mcs-manager-dev (>= 4.4.2), chrpath, quilt
+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
 Homepage: http://www.xfce.org/
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfce4-utils/
@@ -12,7 +12,7 @@
 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
+Recommends: xfwm4, xfce4-panel, thunar, xscreensaver | xlockmore | xlockmore-gl, dbus
 Suggests: xfce4-session
 Description: Various tools for Xfce
  This package contains xfrun4, xfterm4, xflock4, xfmountdev4, xfbrowser4,

Modified: desktop/trunk/xfce4-utils/debian/rules
===================================================================
--- desktop/trunk/xfce4-utils/debian/rules	2008-01-25 22:54:21 UTC (rev 1550)
+++ desktop/trunk/xfce4-utils/debian/rules	2008-01-25 22:54:44 UTC (rev 1551)
@@ -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
+	./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
 
 build: build-stamp
 build-stamp: config.status
@@ -59,8 +59,6 @@
 	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/TERMCMD=xterm/TERMCMD=x-terminal-emulator/' `pwd`/debian/xfce4-utils/usr/bin/xfterm4
-
 	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