debian/changelog | 8 ++ debian/scripts/vars.ppc64el | 8 ++ debian/x11-common.postinst.in | 7 -- debian/xserver-xorg.postinst.in | 115 ---------------------------------------- debian/xserver-xorg.postrm.in | 8 -- debian/xserver-xorg.preinst.in | 8 -- 6 files changed, 16 insertions(+), 138 deletions(-)
New commits: commit 766eeba91e6554bd54773305c2c9c4d3ae90a3a5 Author: Julien Cristau <[email protected]> Date: Mon Mar 31 23:04:14 2014 +0200 Remove support for upgrades from pre-squeeze versions from maintainer scripts. diff --git a/debian/changelog b/debian/changelog index 4677f90..b746ebd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ xorg (1:7.7+7) UNRELEASED; urgency=medium * Add minimal ppc64el support (closes: #742731). Thanks, Breno Leitao! + * Remove support for upgrades from pre-squeeze versions from maintainer + scripts. -- Julien Cristau <[email protected]> Mon, 31 Mar 2014 22:53:43 +0200 diff --git a/debian/x11-common.postinst.in b/debian/x11-common.postinst.in index acafc39..7d2e10c 100644 --- a/debian/x11-common.postinst.in +++ b/debian/x11-common.postinst.in @@ -71,13 +71,6 @@ if dpkg --compare-versions "$2" lt-nl 1:7.6~3; then rmdir "$CONFIG_AUX_DIR" 2>/dev/null || : fi -if dpkg --compare-versions "$2" lt-nl 1:7.4+2; then - db_unregister x11-common/xwrapper/nice_value || : - db_unregister x11-common/xwrapper/nice_value/error || : - db_unregister x11-common/upgrade_issues || : - db_unregister x11-common/x11r6_bin_not_empty || : -fi - #DEBHELPER# exit 0 diff --git a/debian/xserver-xorg.postinst.in b/debian/xserver-xorg.postinst.in index e595e94..3cc91c0 100644 --- a/debian/xserver-xorg.postinst.in +++ b/debian/xserver-xorg.postinst.in @@ -8,9 +8,6 @@ set -e -# source debconf library -. /usr/share/debconf/confmodule - THIS_PACKAGE=xserver-xorg THIS_SCRIPT=postinst @@ -20,12 +17,6 @@ if [ -e /etc/default/xorg ]; then . /etc/default/xorg fi -# the error-out function -bomb () { - echo "$PROGNAME: error: $*" | fold -s -w "${COLUMNS:-80}" >&2 - exit 1 -} - debug_echo () { # Syntax: debug_echo message ... if [ -n "$DEBUG_XORG_DEBCONF" ] || [ "$DEBCONF_DEBUG" = "user" ] \ @@ -64,112 +55,6 @@ elif [ `readlink "$SERVER_SYMLINK"` = "/bin/true" ]; then ln -s "$THIS_SERVER" "$SERVER_SYMLINK" fi -if [ -n "$UPGRADE" ]; then - if dpkg --compare-versions "$2" le "1:7.3+5"; then - # Clean up our old crap - for QUESTION in "shared/default-x-server" \ - "xserver-xorg/autodetect_mouse" \ - "xserver-xorg/autodetect_monitor" \ - "xserver-xorg/autodetect_video_card" \ - "xserver-xorg/config/device/identifier" \ - "xserver-xorg/config/monitor/selection-method" \ - "xserver-xorg/config/monitor/screen-size" \ - "xserver-xorg/config/monitor/mode-list" \ - "xserver-xorg/config/monitor/default-identifier" \ - "xserver-xorg/config/monitor/horiz-sync" \ - "xserver-xorg/config/monitor/vert-refresh" \ - "xserver-xorg/config/monitor/range_input_error" \ - "xserver-xorg/config/display/modes" \ - "xserver-xorg/config/device/video_ram" \ - "xserver-xorg/config/display/default_depth" \ - "xserver-xorg/config/inputdevice/mouse/port" \ - "xserver-xorg/config/inputdevice/mouse/protocol" \ - "xserver-xorg/config/inputdevice/mouse/emulate3buttons" \ - "xserver-xorg/config/modules" \ - "xserver-xorg/config/monitor/default-identifier" \ - "xserver-xorg/config/monitor/identifier" \ - "xserver-xorg/config/write_files_section" \ - "xserver-xorg/multiple_possible_x-drivers"; do - db_unregister "$QUESTION" || true - done - fi - if dpkg --compare-versions "$2" lt-nl 1:7.4; then - for QUESTION in \ - xserver-xorg/config/null_string_error \ - xserver-xorg/config/doublequote_in_string_error \ - xserver-xorg/config/nonnumeric_string_error \ - xserver-xorg/config/device/use_fbdev \ - xserver-xorg/config/device/driver \ - xserver-xorg/config/inputdevice/keyboard/rules \ - xserver-xorg/config/inputdevice/keyboard/model \ - xserver-xorg/config/inputdevice/keyboard/layout \ - xserver-xorg/config/inputdevice/keyboard/variant \ - xserver-xorg/config/inputdevice/keyboard/options \ - xserver-xorg/autodetect_keyboard; do - db_unregister $QUESTION || true - done - fi - if dpkg --compare-versions "$2" lt-nl 1:7.4+2; then - db_unregister xserver-xorg/config/device/bus_id || true - db_unregister xserver-xorg/config/device/bus_id_error || true - rm -f "$XORGCONFIG_ROSTER" "$XORGCONFIG_CHECKSUM" - rm -f "$SERVER_SYMLINK_CHECKSUM" "$SERVER_SYMLINK_ROSTER" - fi -fi - -if dpkg --compare-versions "$2" lt-nl "1:7.4~3"; then - # We're upgrading from pre-7.4. We need to replace i810 with intel, and - # via with openchrome. - if [ -e "$XORGCONFIG" ]; then - LC_ALL=C sed -e' - /^[[:space:]]*Section[[:space:]]\+"Device"[[:space:]]*$/I,/^[[:space:]]*EndSection[[:space:]]*$/I { - /^[[:space:]]*Driver[[:space:]]\+"i810"/I s/i810/intel/I - /^[[:space:]]*Driver[[:space:]]\+"via"/I s/via/openchrome/I - } - ' $XORGCONFIG > ${XORGCONFIG}.madwizard-new - if ! cmp -s $XORGCONFIG ${XORGCONFIG}.madwizard-new; then - chown --reference=$XORGCONFIG ${XORGCONFIG}.madwizard-new - chmod --reference=$XORGCONFIG ${XORGCONFIG}.madwizard-new - mv ${XORGCONFIG}.madwizard-new $XORGCONFIG - else - rm ${XORGCONFIG}.madwizard-new - fi - fi -fi - -get_hal_pid() { - dbus-send --system --dest=org.freedesktop.DBus --print-reply \ - /org/freedesktop/DBus org.freedesktop.DBus.GetConnectionUnixProcessID \ - string:org.freedesktop.Hal 2>/dev/null | awk '/uint32/ {print $2}' -} - -restart_hal() { - # restart hald if it was running before - pid=$(get_hal_pid) - if [ -n "$pid" ]; then - kill $pid 2>/dev/null || true - lshal >/dev/null || true # will trigger through D-Bus activation - fi -} - -case "$1" in - configure) - if dpkg --compare-versions "$2" lt-nl "1:7.3+11"; then - remove_conffile_commit "/etc/init.d/xserver-xorg" - fi - if dpkg --compare-versions "$2" lt-nl "1:7.3+13"; then - update-rc.d xserver-xorg remove || true - fi - if dpkg --compare-versions "$2" lt "1:7.5~3"; then - if [ `uname -s` = "GNU/kFreeBSD" ]; then - restart_hal - fi - fi - ;; -esac - -db_stop - exit 0 # vim:set ai et sts=2 sw=2 tw=0: diff --git a/debian/xserver-xorg.postrm.in b/debian/xserver-xorg.postrm.in index 652629b..cfb545b 100644 --- a/debian/xserver-xorg.postrm.in +++ b/debian/xserver-xorg.postrm.in @@ -38,14 +38,6 @@ if [ "$1" = "purge" ]; then done fi -case "$1" in - abort-install|abort-upgrade) - if dpkg --compare-versions "$2" lt-nl "1:7.3+11"; then - remove_conffile_rollback "/etc/init.d/xserver-xorg" - fi - ;; -esac - #DEBHELPER# exit 0 diff --git a/debian/xserver-xorg.preinst.in b/debian/xserver-xorg.preinst.in index ac45c24..d507b68 100644 --- a/debian/xserver-xorg.preinst.in +++ b/debian/xserver-xorg.preinst.in @@ -25,14 +25,6 @@ if [ "$1" = "install" ] || [ "$1" = "upgrade" ]; then fi fi -case "$1" in - install|upgrade) - if dpkg --compare-versions "$2" lt-nl "1:7.3+11"; then - remove_conffile_lookup xserver-xorg "/etc/init.d/xserver-xorg" - fi - ;; -esac - #DEBHELPER# exit 0 commit 7075405c91a15eb289ec86f8af9151611401ce10 Author: Julien Cristau <[email protected]> Date: Mon Mar 31 22:55:14 2014 +0200 Add minimal ppc64el support (closes: #742731). Thanks, Breno Leitao! diff --git a/debian/changelog b/debian/changelog index 52448f7..4677f90 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xorg (1:7.7+7) UNRELEASED; urgency=medium + + * Add minimal ppc64el support (closes: #742731). Thanks, Breno Leitao! + + -- Julien Cristau <[email protected]> Mon, 31 Mar 2014 22:53:43 +0200 + xorg (1:7.7+6) unstable; urgency=medium * Move x11-xfs-utils from Depends to Suggests (closes: #736556). diff --git a/debian/scripts/vars.ppc64el b/debian/scripts/vars.ppc64el new file mode 100644 index 0000000..54348df --- /dev/null +++ b/debian/scripts/vars.ppc64el @@ -0,0 +1,8 @@ +XSERVER_XORG_VIDEO_DEPENDS="\ + xserver-xorg-video-fbdev, \ + xserver-xorg-video-modesetting, \ +" + +XSERVER_XORG_INPUT_DEPENDS="\ + xserver-xorg-input-evdev, \ +" -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: https://lists.debian.org/[email protected]
