x11-session-utils: Changes to 'debian-unstable'
debian/changelog | 4 ++--
debian/control | 14 +++++++-------
debian/rules | 2 +-
debian/x11-session-utils.install | 5 +++++
debian/xsm.install | 5 -----
5 files changed, 15 insertions(+), 15 deletions(-)
New commits:
commit 4aecc282a816564154fdccc8ba4cbfd94a811ca0
Author: Timo Aaltonen <tjaalton@deckard.hut.fi>
Date: Sat Jun 9 01:59:16 2007 +0300
Add xsm to Conflicts/Replaces to allow upgrades on Ubuntu.
Also, fix various files due to the renaming.
diff --git a/debian/changelog b/debian/changelog
index 2cec160..749378f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,7 +11,7 @@ x11-session-utils (0.1) UNRELEASED; urgency=low
- Modify description.
- Replaces: xbase-clients (<= 1:7.2.ds2-3), xutils (<=1:7.1.ds.3-1)
to make upgrades smoother.
- - C/R: smproxy to work around old Ubuntu packaging.
+ - C/R: smproxy, xsm to work around old Ubuntu packaging.
* debian/copyright: Leave only copyright notices that relate to
this package. FIXME:*rstart missing*
* debian/xsm.install, rules: Edit to reflect new packaging.
@@ -19,7 +19,7 @@ x11-session-utils (0.1) UNRELEASED; urgency=low
* debian/local/: Remove.
* debian/patches: Delete patches which do not relate to this package.
- -- Timo Aaltonen <tjaalton@cc.hut.fi> Sat, 9 Jun 2007 00:49:43 +0300
+ -- Timo Aaltonen <tjaalton@cc.hut.fi> Sat, 9 Jun 2007 01:49:06 +0300
xbase-clients (1:7.2.ds2-3) unstable; urgency=low
diff --git a/debian/control b/debian/control
index cfc9faf..04db65b 100644
--- a/debian/control
+++ b/debian/control
@@ -1,4 +1,4 @@
-Source: xsm
+Source: x11-session-utils
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
@@ -11,16 +11,16 @@ Build-Depends: debhelper (>= 5.0.0), pkg-config, libxaw7-dev (>= 1:1.0.1-1), lib
# smproxy: libxt-dev, libxmu-dev
# xsm: openssh-client | ssh, libxaw7-dev, libxt-dev
Standards-Version: 3.7.2.0
-XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/app/xsm
-XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/xsm.git
+XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/app/x11-session-utils
+XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/x11-session-utils.git
-Package: xsm
+Package: x11-session-utils
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, cpp
Pre-Depends: x11-common (>= 1:7.0.0)
-Conflicts: smproxy
-Replaces: xbase-clients (<= 1:7.2.ds2-3), xutils (<= 1:7.1.ds.3-1), smproxy
-Description: X session manager
+Conflicts: smproxy, xsm (<= 1:1.0.1-1)
+Replaces: xbase-clients (<= 1:7.2.ds2-3), xutils (<= 1:7.1.ds.3-1), smproxy, xsm (<= 1:1.0.1-1)
+Description: X session utilities
This package provides the X session manager and related tools:
- rstart;
- smproxy, a session manager proxy for X clients that do not use the X
diff --git a/debian/rules b/debian/rules
index b86288f..2018fec 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,7 +8,7 @@
#export DH_VERBOSE=1
# set this to the name of the main shlib's binary package
-PACKAGE = xbase-clients
+PACKAGE = x11-session-utils
include debian/xsfbs/xsfbs.mk
diff --git a/debian/x11-session-utils.install b/debian/x11-session-utils.install
new file mode 100644
index 0000000..7eeaca4
--- /dev/null
+++ b/debian/x11-session-utils.install
@@ -0,0 +1,5 @@
+usr/bin/*
+usr/share/man/man1/*
+usr/lib/X11/xsm/system.xsm
+etc/X11/app-defaults/*
+usr/lib/X11/rstart/*
diff --git a/debian/xsm.install b/debian/xsm.install
deleted file mode 100644
index 7eeaca4..0000000
--- a/debian/xsm.install
+++ /dev/null
@@ -1,5 +0,0 @@
-usr/bin/*
-usr/share/man/man1/*
-usr/lib/X11/xsm/system.xsm
-etc/X11/app-defaults/*
-usr/lib/X11/rstart/*
Reply to: