Author: fabbione
Date: 2004-10-30 00:30:06 -0500 (Sat, 30 Oct 2004)
New Revision: 1985
Modified:
branches/ubuntu/debian/changelog
branches/ubuntu/debian/libx11-6.preinst.in
branches/ubuntu/debian/libxt6.preinst.in
branches/ubuntu/debian/local/dexconf
Log:
Import 4.3.0.dfsg.1-6ubuntu9 release.
Modified: branches/ubuntu/debian/changelog
===================================================================
--- branches/ubuntu/debian/changelog 2004-10-30 05:13:58 UTC (rev 1984)
+++ branches/ubuntu/debian/changelog 2004-10-30 05:30:06 UTC (rev 1985)
@@ -1,3 +1,11 @@
+xfree86 (4.3.0.dfsg.1-6ubuntu9) warty; urgency=low
+
+ * Change mouse -> synaptic driver.
+
+ * Fix libx11-6 and libxt6 preinst.in files.
+
+ -- Fabio M. Di Nitto <[EMAIL PROTECTED]> Fri, 27 Aug 2004 11:10:19 +0200
+
xfree86 (4.3.0.dfsg.1-6ubuntu8) warty; urgency=low
* Re-enable horiz-sync and vert-refresh in the default config.
Modified: branches/ubuntu/debian/libx11-6.preinst.in
===================================================================
--- branches/ubuntu/debian/libx11-6.preinst.in 2004-10-30 05:13:58 UTC (rev
1984)
+++ branches/ubuntu/debian/libx11-6.preinst.in 2004-10-30 05:30:06 UTC (rev
1985)
@@ -18,38 +18,41 @@
#INCLUDE_SHELL_LIB#
if [ "$1" = "install" ] || [ "$1" = "upgrade" ]; then
- # xkb directory moved in 4.0
- MIGRATION_FILE=/var/run/libx11-6.xkb.migration
- DIR=/usr/X11R6/lib/X11/xkb
- if [ -d "$DIR" ] && [ ! -L "$DIR" ]; then
- # We do this debconf stuff in the preinst, not the postinst, because the
- # migration needs to happen *before* other packages are unpacked.
- # The question may not have been seen yet if this package wasn't
- # pre-configured. If not, we must ask now.
- run db_metaget libx11-6/migrate_xkb_dir seen
- if [ "$RET" != "true" ]; then
- run db_input low libx11-6/migrate_xkb_dir
- run db_go
- fi
- if db_get libx11-6/migrate_xkb_dir; then
- if [ "$RET" = "true" ]; then
- if migrate_dir_to_symlink "$DIR" "$(maplink "$DIR")"; then
- >"$MIGRATION_FILE"
+ # If there is no $2, this is a fresh install.
+ if [ -n "$2" ]; then
+ # xkb directory moved in 4.0
+ MIGRATION_FILE=/var/run/libx11-6.xkb.migration
+ DIR=/usr/X11R6/lib/X11/xkb
+ if [ -d "$DIR" ] && [ ! -L "$DIR" ]; then
+ # We do this debconf stuff in the preinst, not the postinst, because the
+ # migration needs to happen *before* other packages are unpacked.
+ # The question may not have been seen yet if this package wasn't
+ # pre-configured. If not, we must ask now.
+ run db_metaget libx11-6/migrate_xkb_dir seen
+ if [ "$RET" != "true" ]; then
+ run db_input low libx11-6/migrate_xkb_dir
+ run db_go
+ fi
+ if db_get libx11-6/migrate_xkb_dir; then
+ if [ "$RET" = "true" ]; then
+ if migrate_dir_to_symlink "$DIR" "$(maplink "$DIR")"; then
+ >"$MIGRATION_FILE"
+ else
+ die "failed to migrate $DIR to $(maplink "$DIR")"
+ fi
else
- die "failed to migrate $DIR to $(maplink "$DIR")"
+ die "aborting at user request"
fi
else
- die "aborting at user request"
+ internal_error "failure using db_get to retrieve" \
+ "libx11-6/migrate_xkb_dir"
fi
- else
- internal_error "failure using db_get to retrieve" \
- "libx11-6/migrate_xkb_dir"
fi
+ # Ensure the app-defaults directory is in the correct place.
+ if ! check_symlink "$DIR"; then
+ make_symlink_sane "$DIR" "$(maplink "$DIR")"
+ fi
fi
- # Ensure the app-defaults directory is in the correct place.
- if ! check_symlink "$DIR"; then
- make_symlink_sane "$DIR" "$(maplink "$DIR")"
- fi
fi
#DEBHELPER#
Modified: branches/ubuntu/debian/libxt6.preinst.in
===================================================================
--- branches/ubuntu/debian/libxt6.preinst.in 2004-10-30 05:13:58 UTC (rev
1984)
+++ branches/ubuntu/debian/libxt6.preinst.in 2004-10-30 05:30:06 UTC (rev
1985)
@@ -18,38 +18,41 @@
#INCLUDE_SHELL_LIB#
if [ "$1" = "install" ] || [ "$1" = "upgrade" ]; then
- # app-defaults directory moved in 4.0
- MIGRATION_FILE=/var/run/libxt6.app-defaults.migration
- DIR=/usr/X11R6/lib/X11/app-defaults
- if [ -d "$DIR" ] && [ ! -L "$DIR" ]; then
- # We do this debconf stuff in the preinst, not the postinst, because the
- # migration needs to happen *before* other packages are unpacked.
- # The question may not have been seen yet if this package wasn't
- # pre-configured. If not, we must ask now.
- run db_metaget libxt6/migrate_app_defaults_dir seen
- if [ "$RET" != "true" ]; then
- run db_input low libxt6/migrate_app_defaults_dir
- run db_go
- fi
- if db_get libxt6/migrate_app_defaults_dir; then
- if [ "$RET" = "true" ]; then
- if migrate_dir_to_symlink "$DIR" "$(maplink "$DIR")"; then
- >"$MIGRATION_FILE"
+ # If there is no $2, this is a fresh install.
+ if [ -n "$2" ]; then
+ # app-defaults directory moved in 4.0
+ MIGRATION_FILE=/var/run/libxt6.app-defaults.migration
+ DIR=/usr/X11R6/lib/X11/app-defaults
+ if [ -d "$DIR" ] && [ ! -L "$DIR" ]; then
+ # We do this debconf stuff in the preinst, not the postinst, because the
+ # migration needs to happen *before* other packages are unpacked.
+ # The question may not have been seen yet if this package wasn't
+ # pre-configured. If not, we must ask now.
+ run db_metaget libxt6/migrate_app_defaults_dir seen
+ if [ "$RET" != "true" ]; then
+ run db_input low libxt6/migrate_app_defaults_dir
+ run db_go
+ fi
+ if db_get libxt6/migrate_app_defaults_dir; then
+ if [ "$RET" = "true" ]; then
+ if migrate_dir_to_symlink "$DIR" "$(maplink "$DIR")"; then
+ >"$MIGRATION_FILE"
+ else
+ die "failed to migrate $DIR to $(maplink "$DIR")"
+ fi
else
- die "failed to migrate $DIR to $(maplink "$DIR")"
+ die "aborting at user request"
fi
else
- die "aborting at user request"
+ internal_error "failure using db_get to retrieve" \
+ "libxt6/migrate_app_defaults_dir"
fi
- else
- internal_error "failure using db_get to retrieve" \
- "libxt6/migrate_app_defaults_dir"
fi
+ # Ensure the app-defaults directory is in the correct place.
+ if ! check_symlink "$DIR"; then
+ make_symlink_sane "$DIR" "$(maplink "$DIR")"
+ fi
fi
- # Ensure the app-defaults directory is in the correct place.
- if ! check_symlink "$DIR"; then
- make_symlink_sane "$DIR" "$(maplink "$DIR")"
- fi
fi
#DEBHELPER#
Modified: branches/ubuntu/debian/local/dexconf
===================================================================
--- branches/ubuntu/debian/local/dexconf 2004-10-30 05:13:58 UTC (rev
1984)
+++ branches/ubuntu/debian/local/dexconf 2004-10-30 05:30:06 UTC (rev
1985)
@@ -334,7 +334,7 @@
cat >&4 <<SECTION
Section "InputDevice"
Identifier "Synaptics Touchpad"
- Driver "mouse"
+ Driver "synaptic"
Option "SendCoreEvents" "true"
Option "Device" "/dev/psaux"
Option "Protocol" "auto-dev"
