xorg: Changes to 'ubuntu'
debian/changelog | 3 ++-
debian/control | 3 ++-
debian/x11-common.postinst.in | 12 ++++++------
debian/x11-common.postrm.in | 12 ++++++------
debian/x11-common.preinst.in | 2 +-
5 files changed, 17 insertions(+), 15 deletions(-)
New commits:
commit 45a6993026b1d4ccc67e3879c02bba7d7a8b3b7d
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Sat Sep 6 09:14:15 2008 +0300
Fix the number of arguments on x11-common.post{inst,rm}.in
diff --git a/debian/x11-common.postinst.in b/debian/x11-common.postinst.in
index 4aac838..9760ecb 100644
--- a/debian/x11-common.postinst.in
+++ b/debian/x11-common.postinst.in
@@ -24,11 +24,11 @@ XWRAPPER_CONFIG_ROSTER="$CONFIG_AUX_DIR/$XWRAPPER_CONFIG_ROSTER_BASE"
case "$1" in
configure)
if dpkg --compare-versions "$2" lt-nl "1:7.4~2ubuntu1"; then
- remove_conffile_commit xinit "/etc/X11/Xsession.d/20xorg-common_process-args"
- remove_conffile_commit xinit "/etc/X11/Xsession.d/30xorg-common_xresources"
- remove_conffile_commit xinit "/etc/X11/Xsession.d/50xorg-common_determine-startup"
- remove_conffile_commit xinit "/etc/X11/Xsession.d/90xorg-common_ssh-agent"
- remove_conffile_commit xinit "/etc/X11/Xsession.d/99xorg-common_start"
+ remove_conffile_commit "/etc/X11/Xsession.d/20xorg-common_process-args"
+ remove_conffile_commit "/etc/X11/Xsession.d/30xorg-common_xresources"
+ remove_conffile_commit "/etc/X11/Xsession.d/50xorg-common_determine-startup"
+ remove_conffile_commit "/etc/X11/Xsession.d/90xorg-common_ssh-agent"
+ remove_conffile_commit "/etc/X11/Xsession.d/99xorg-common_start"
fi
esac
diff --git a/debian/x11-common.postrm.in b/debian/x11-common.postrm.in
index 002450d..44f7595 100644
--- a/debian/x11-common.postrm.in
+++ b/debian/x11-common.postrm.in
@@ -21,11 +21,11 @@ XWRAPPER_CONFIG_ROSTER="$CONFIG_AUX_DIR/${XWRAPPER_CONFIG##*/}.roster"
case "$1" in
abort-install|abort-upgrade)
if dpkg --compare-versions "$2" lt-nl "1:7.4~2ubuntu1"; then
- remove_conffile_rollback xinit "/etc/X11/Xsession.d/20xorg-common_process-args"
- remove_conffile_rollback xinit "/etc/X11/Xsession.d/30xorg-common_xresources"
- remove_conffile_rollback xinit "/etc/X11/Xsession.d/50xorg-common_determine-startup"
- remove_conffile_rollback xinit "/etc/X11/Xsession.d/90xorg-common_ssh-agent"
- remove_conffile_rollback xinit "/etc/X11/Xsession.d/99xorg-common_start"
+ remove_conffile_rollback "/etc/X11/Xsession.d/20xorg-common_process-args"
+ remove_conffile_rollback "/etc/X11/Xsession.d/30xorg-common_xresources"
+ remove_conffile_rollback "/etc/X11/Xsession.d/50xorg-common_determine-startup"
+ remove_conffile_rollback "/etc/X11/Xsession.d/90xorg-common_ssh-agent"
+ remove_conffile_rollback "/etc/X11/Xsession.d/99xorg-common_start"
fi
esac
commit a8c9d8be59e9b42f590e358db89ceae1a4a59728
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Sat Sep 6 09:04:04 2008 +0300
control: move xfonts-scalable to Recommends
diff --git a/debian/changelog b/debian/changelog
index 0a610f1..8b98859 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,8 +14,9 @@ xorg (1:7.4~2ubuntu1) UNRELEASED; urgency=low
* x11-common.{preinst.in,postrm.in,postinstall.in}
- Remove old conffiles that used to be in our xinit but have been
left behind on upgrade. (LP: #243690)
+ * control: move xfonts-scalable to Recommends (LP: #84938)
- -- Timo Aaltonen <tepsipakki@ubuntu.com> Thu, 04 Sep 2008 13:01:47 +0300
+ -- Timo Aaltonen <tepsipakki@ubuntu.com> Thu, 04 Sep 2008 13:52:33 +0300
xorg (1:7.4~2) experimental; urgency=low
diff --git a/debian/control b/debian/control
index a491fce..284530e 100644
--- a/debian/control
+++ b/debian/control
@@ -110,7 +110,8 @@ Description: the X.Org X server -- input driver metapackage
Package: xorg
Architecture: any
-Depends: xserver-xorg, libgl1-mesa-glx | libgl1, libglu1-mesa, xfonts-base (>= 1:1.0.0-1), xfonts-100dpi (>= 1:1.0.0-1), xfonts-75dpi (>= 1:1.0.0-1), xfonts-scalable (>= 1:1.0.0-1), x11-apps, x11-session-utils, x11-utils, x11-xfs-utils, x11-xkb-utils, x11-xserver-utils, xauth, xinit, xfonts-utils, xkb-data, xterm | x-terminal-emulator, sparc-utils [sparc], x11-common, xinput
+Depends: xserver-xorg, libgl1-mesa-glx | libgl1, libglu1-mesa, xfonts-base (>= 1:1.0.0-1), xfonts-100dpi (>= 1:1.0.0-1), xfonts-75dpi (>= 1:1.0.0-1), x11-apps, x11-session-utils, x11-utils, x11-xfs-utils, x11-xkb-utils, x11-xserver-utils, xauth, xinit, xfonts-utils, xkb-data, xterm | x-terminal-emulator, sparc-utils [sparc], x11-common, xinput
+Recommends: xfonts-scalable (>= 1:1.0.0-1)
Suggests: xorg-docs
Provides: x-window-system, x-window-system-core
Description: X.Org X Window System
commit 36eacc33b2b362a51916ca66955543e286dbe695
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Thu Sep 4 13:29:31 2008 +0300
fix the package versions from previous commit..
diff --git a/debian/x11-common.postinst.in b/debian/x11-common.postinst.in
index c965428..4aac838 100644
--- a/debian/x11-common.postinst.in
+++ b/debian/x11-common.postinst.in
@@ -23,7 +23,7 @@ XWRAPPER_CONFIG_ROSTER="$CONFIG_AUX_DIR/$XWRAPPER_CONFIG_ROSTER_BASE"
case "$1" in
configure)
- if dpkg --compare-versions "$2" lt-nl "1:7.4~1ubuntu1"; then
+ if dpkg --compare-versions "$2" lt-nl "1:7.4~2ubuntu1"; then
remove_conffile_commit xinit "/etc/X11/Xsession.d/20xorg-common_process-args"
remove_conffile_commit xinit "/etc/X11/Xsession.d/30xorg-common_xresources"
remove_conffile_commit xinit "/etc/X11/Xsession.d/50xorg-common_determine-startup"
diff --git a/debian/x11-common.postrm.in b/debian/x11-common.postrm.in
index f8c7123..002450d 100644
--- a/debian/x11-common.postrm.in
+++ b/debian/x11-common.postrm.in
@@ -20,7 +20,7 @@ XWRAPPER_CONFIG_ROSTER="$CONFIG_AUX_DIR/${XWRAPPER_CONFIG##*/}.roster"
case "$1" in
abort-install|abort-upgrade)
- if dpkg --compare-versions "$2" lt-nl "1:7.4~1ubuntu1"; then
+ if dpkg --compare-versions "$2" lt-nl "1:7.4~2ubuntu1"; then
remove_conffile_rollback xinit "/etc/X11/Xsession.d/20xorg-common_process-args"
remove_conffile_rollback xinit "/etc/X11/Xsession.d/30xorg-common_xresources"
remove_conffile_rollback xinit "/etc/X11/Xsession.d/50xorg-common_determine-startup"
diff --git a/debian/x11-common.preinst.in b/debian/x11-common.preinst.in
index 141130f..8926429 100644
--- a/debian/x11-common.preinst.in
+++ b/debian/x11-common.preinst.in
@@ -23,7 +23,7 @@ XWRAPPER_CONFIG_CHECKSUM="$CONFIG_AUX_DIR/$XWRAPPER_CONFIG_CHECKSUM_BASE"
if [ "$1" = "install" ] || [ "$1" = "upgrade" ]; then
- if dpkg --compare-versions "$2" lt-nl "1:7.4~1ubuntu1"; then
+ if dpkg --compare-versions "$2" lt-nl "1:7.4~2ubuntu1"; then
remove_conffile_lookup xinit "/etc/X11/Xsession.d/20xorg-common_process-args"
remove_conffile_lookup xinit "/etc/X11/Xsession.d/30xorg-common_xresources"
remove_conffile_lookup xinit "/etc/X11/Xsession.d/50xorg-common_determine-startup"
Reply to: