[Git][xorg-team/xorg][ubuntu] 27 commits: Remove constraints unnecessary since buster (oldstable)
"Timo Aaltonen (@tjaalton)" <[email protected]>
| Newsgroups | gmane.linux.debian.devel.x |
|---|---|
| Message-ID | <[email protected]> |
Timo Aaltonen pushed to branch ubuntu at X Strike Force / xorg Commits: 835d4c95 by Debian Janitor at 2022-10-13T08:40:16+00:00 Remove constraints unnecessary since buster (oldstable) * Build-Depends: Drop versioned constraint on dpkg. * x11-common: Drop versioned constraint on lsb-base in Depends. * xserver-xorg: Drop versioned constraint on xkb-data and xserver-xorg-core in Depends. * xorg: Drop versioned constraint on xfonts-100dpi, xfonts-75dpi, xfonts-base and xfonts-scalable in Depends. Changes-By: deb-scrub-obsolete - - - - - 2e175516 by Jochen Sprickerhof at 2022-12-06T21:30:28+01:00 Rely on command -v to check for an executable command -v could prefer shell builtins that don't have a full path (true instead of bin/true). Resulting in a failing Xsession for example with: /etc/X11/Xsession true As command -v already checks if the command is executable, we can remove the extra check. Closes: #1012474 Regression of 3d6bd60 - - - - - 8471210b by Debian Janitor at 2022-12-07T10:43:27+00:00 Trim trailing whitespace. Changes-By: lintian-brush Fixes: lintian: trailing-whitespace See-also: https://lintian.debian.org/tags/trailing-whitespace.html - - - - - d2f46367 by Debian Janitor at 2022-12-07T10:43:27+00:00 Upgrade to newer source format 3.0 (native). Changes-By: lintian-brush Fixes: lintian: missing-debian-source-format See-also: https://lintian.debian.org/tags/missing-debian-source-format.html Fixes: lintian: older-source-format See-also: https://lintian.debian.org/tags/older-source-format.html - - - - - 4e1a1b0c by Debian Janitor at 2022-12-07T10:43:27+00:00 Bump debhelper from old 12 to 13. Changes-By: lintian-brush Fixes: lintian: package-uses-old-debhelper-compat-version See-also: https://lintian.debian.org/tags/package-uses-old-debhelper-compat-version.html - - - - - 97f71aa6 by Debian Janitor at 2022-12-07T10:43:27+00:00 Update renamed lintian tag names in lintian overrides. Changes-By: lintian-brush Fixes: lintian: renamed-tag See-also: https://lintian.debian.org/tags/renamed-tag.html - - - - - 7bbfbbf1 by Debian Janitor at 2022-12-07T10:43:27+00:00 Use canonical URL in Vcs-Git. Changes-By: lintian-brush Fixes: lintian: vcs-field-not-canonical See-also: https://lintian.debian.org/tags/vcs-field-not-canonical.html - - - - - a1846ef8 by Debian Janitor at 2022-12-07T10:43:27+00:00 Update standards version to 4.6.1, no changes needed. Changes-By: lintian-brush Fixes: lintian: out-of-date-standards-version See-also: https://lintian.debian.org/tags/out-of-date-standards-version.html - - - - - eab8611f by Debian Janitor at 2022-12-07T10:43:27+00:00 Remove field Section on binary packages xbase-clients, xutils that duplicates source. Changes-By: lintian-brush Fixes: lintian: installable-field-mirrors-source See-also: https://lintian.debian.org/tags/installable-field-mirrors-source.html - - - - - cefe4b96 by Timo Aaltonen at 2023-05-31T13:57:00+03:00 control: Drop libdmx-dev from xorg-dev depends. - - - - - f04cfbe7 by Timo Aaltonen at 2024-05-04T18:58:24+03:00 close a bug - - - - - 5e3afeaa by Emilio Pozuelo Monfort at 2025-01-24T09:48:09+01:00 Ack 1:7.7+23.1 NMU - - - - - 521ff15b by Emilio Pozuelo Monfort at 2025-01-24T09:52:39+01:00 Ack 1:7.7+23.2 NMU - - - - - 18858104 by Emilio Pozuelo Monfort at 2025-01-24T09:54:28+01:00 Only depend on the vesa driver on x86 platforms - - - - - 67e6b6ae by Emilio Pozuelo Monfort at 2025-01-24T10:02:11+01:00 rules: drop duplicate call to dh_fixperms - - - - - 718cddfd by Emilio Pozuelo Monfort at 2025-01-24T10:02:32+01:00 Release to sid - - - - - 01901a40 by Timo Aaltonen at 2025-06-13T11:03:36+03:00 sync from plucky - - - - - fed88c3a by Timo Aaltonen at 2025-06-13T11:19:28+03:00 Merge branch 'debian-unstable' into ubuntu - - - - - 79a1235d by Timo Aaltonen at 2025-06-13T12:48:00+03:00 release to questing - - - - - 51301f83 by Jochen Sprickerhof at 2025-08-07T15:09:16+02:00 20x11-common_process-args: Only use the first word for command -v Ref: https://bugs.launchpad.net/ubuntu/+source/unity/+bug/2116224 Regression of 2e17551 - - - - - e9243067 by Timo Aaltonen at 2025-09-01T10:25:53+03:00 releasing package xorg version 1:7.7+25 - - - - - f1270f84 by Timo Aaltonen at 2025-10-14T08:43:08+03:00 control: Drop vmware from video-all. (Closes: #1117840) - - - - - 019fe6a6 by Timo Aaltonen at 2025-10-21T09:14:17+03:00 releasing package xorg version 1:7.7+26 - - - - - 26f4c672 by Jeremy Bícha at 2025-11-07T14:42:22-05:00 Update Vcs fields - - - - - 2e046210 by Timo Aaltonen at 2026-02-27T20:17:52+02:00 import 1:7.7+24ubuntu2 - - - - - 351666ef by Timo Aaltonen at 2026-02-27T20:18:04+02:00 Merge branch 'debian-unstable' into ubuntu - - - - - e5f52162 by Timo Aaltonen at 2026-02-27T20:19:21+02:00 releasing package xorg version 1:7.7+26ubuntu1 - - - - - 7 changed files: - debian/changelog - debian/control - debian/local/Xsession.d/20x11-common_process-args - debian/rules - + debian/source/format - debian/x11-common.lintian-overrides - debian/xserver-xorg.lintian-overrides Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,87 @@ +xorg (1:7.7+26ubuntu1) resolute; urgency=medium + + * Merge from Debian. + + -- Timo Aaltonen <[email protected]> Fri, 27 Feb 2026 20:18:59 +0200 + +xorg (1:7.7+26) unstable; urgency=medium + + * control: Drop vmware from video-all. (Closes: #1117840) + + -- Timo Aaltonen <[email protected]> Tue, 21 Oct 2025 09:13:51 +0300 + +xorg (1:7.7+25) unstable; urgency=medium + + [ Jochen Sprickerhof ] + * 20x11-common_process-args: Only use the first word for command -v + (Closes: #1094494) + + -- Timo Aaltonen <[email protected]> Mon, 01 Sep 2025 10:07:30 +0300 + +xorg (1:7.7+24ubuntu2) resolute; urgency=medium + + * No-change mass rebuild for Ubuntu 26.04 (LP: #2132257) + + -- Sebastien Bacher <[email protected]> Mon, 02 Feb 2026 21:53:39 +0100 + +xorg (1:7.7+24ubuntu1) questing; urgency=medium + + * Merge from Debian. + + -- Timo Aaltonen <[email protected]> Fri, 13 Jun 2025 12:47:30 +0300 + +xorg (1:7.7+24) unstable; urgency=medium + + [ Debian Janitor ] + * Remove constraints unnecessary since buster (oldstable): + + Build-Depends: Drop versioned constraint on dpkg. + + x11-common: Drop versioned constraint on lsb-base in Depends. + + xserver-xorg: Drop versioned constraint on xkb-data and xserver-xorg-core + in Depends. + + xorg: Drop versioned constraint on xfonts-100dpi, xfonts-75dpi, + xfonts-base and xfonts-scalable in Depends. + * Trim trailing whitespace. + * Upgrade to newer source format 3.0 (native). + * Bump debhelper from old 12 to 13. + * Update renamed lintian tag names in lintian overrides. + * Use canonical URL in Vcs-Git. + * Update standards version to 4.6.1, no changes needed. + * Remove field Section on binary packages xbase-clients, xutils that + duplicates source. + + [ Emilio Pozuelo Monfort ] + * Only depend on the vesa driver on x86 platforms. + * rules: drop duplicate call to dh_fixperms. + + -- Emilio Pozuelo Monfort <[email protected]> Fri, 24 Jan 2025 10:02:23 +0100 + +xorg (1:7.7+23.2) unstable; urgency=medium + + * Non-maintainer upload. + * Make xorg build without root. (Closes: #1089479) + + -- Niels Thykier <[email protected]> Sat, 28 Dec 2024 15:03:28 +0000 + +xorg (1:7.7+23.1) unstable; urgency=medium + + * Non-maintainer upload. + * Drop libdmx-dev from xorg-dev meta-package. (Closes: #1070350) + + -- Chris Hofstaedtler <[email protected]> Mon, 08 Jul 2024 14:45:55 +0200 + +xorg (1:7.7+23ubuntu4) plucky; urgency=medium + + [ Niels Thykier ] + * Make xorg build without root. (Closes: #1089479) (LP: #2106247) + + -- Alessandro Astone <[email protected]> Fri, 04 Apr 2025 17:30:00 +0200 + +xorg (1:7.7+23ubuntu3) noble; urgency=high + + * No change rebuild for 64-bit time_t and frame pointers. + + -- Julian Andres Klode <[email protected]> Mon, 08 Apr 2024 18:23:20 +0200 + xorg (1:7.7+23ubuntu2) jammy; urgency=high * No change rebuild for ppc64el baseline bump. @@ -358,10 +442,10 @@ xorg (1:7.6+12) unstable; urgency=high xorg (1:7.6+11) unstable; urgency=low * Team upload. - * debian/local/Xsession.d/35x11-common_xhost-local: add a new script - to the default X session. It will give access to the running X - server to the logged on user. This is useful for gdm3 which does not - give access to $XAUTHORITY outside the session, but can also be of + * debian/local/Xsession.d/35x11-common_xhost-local: add a new script + to the default X session. It will give access to the running X + server to the logged on user. This is useful for gdm3 which does not + give access to $XAUTHORITY outside the session, but can also be of use for other display managers. Closes: #586685. -- Josselin Mouette <[email protected]> Sat, 28 Jan 2012 12:42:38 +0100 @@ -741,7 +825,7 @@ xorg (1:7.4+4) unstable; urgency=low * Bump debhelper compat to v7. No changes necessary. * Rename stamps to take advantage of dh_clean v7 handling them automatically * Bump standards version to 3.8.2. No changes necessary. - + -- David Nusinow <[email protected]> Thu, 13 Aug 2009 21:19:12 -0400 xorg (1:7.4+3) unstable; urgency=low @@ -755,7 +839,7 @@ xorg (1:7.4+3) unstable; urgency=low xorg (1:7.4+2) unstable; urgency=low [ David Nusinow ] - * Don't discuss removal of xserver-xorg in its description. + * Don't discuss removal of xserver-xorg in its description. It remains tied to -core at this point. (closes: #523630). * Add libgl1-mesa-dri to the depends of the xorg package to ensure that it gets pulled in even if Recommends are disabled @@ -860,7 +944,7 @@ xorg (1:7.4+1) unstable; urgency=low * Upload to unstable. [ David Nusinow ] - * Add an example xorg.conf to /usr/share/doc/xserver-xorg/examples. + * Add an example xorg.conf to /usr/share/doc/xserver-xorg/examples. This will give people something to copy from and modify for their own configurations @@ -1262,7 +1346,7 @@ xorg (1:7.3+5) unstable; urgency=low xorg (1:7.3+4) unstable; urgency=low * Don't try and reset monitor identifier question, it doesn't exist now - * Don't bother at all with default-x-server question. + * Don't bother at all with default-x-server question. Closes: #448863, #374578 + Remove it from the xserver-xorg postinst. Now instead of a complicated md5sum, only create the symlink if nothing exists there. @@ -1835,7 +1919,7 @@ xorg (1:7.1.0-3) unstable; urgency=low - Simplified Chinese. Closes: #390956 [ David Nusinow ] - * Make /dev/input/mice the default mouse port in the xserver-xorg.templates + * Make /dev/input/mice the default mouse port in the xserver-xorg.templates file. Also provide the devices in this file rather than as a variable in the config script. Closes: #385078 * Have dexconf actually use the mouse protocol and port selected during @@ -2197,7 +2281,7 @@ xorg (1:7.0.16) unstable; urgency=low -- David Nusinow <[email protected]> Wed, 3 May 2006 00:21:11 -0400 xorg (1:7.0.15) unstable; urgency=low - + * The "Happy Birthday Steve!" release [ Christian Perrier ] @@ -2525,7 +2609,7 @@ xorg (7.0.0-0ubuntu10) dapper; urgency=low xserver-xorg-input-all * Add zlib1g-dev to the dependency list of xlibs-dev and remove xlibs-static-dev, since the latter no longer exists. - + -- Tollef Fog Heen <[email protected]> Fri, 20 Jan 2006 11:25:57 +0100 xorg (7.0.0-0ubuntu9) dapper; urgency=low @@ -2658,4 +2742,3 @@ Old Changelog: CAN-2004-0106, CAN-2003-0690, CAN-2003-0730, CAN-2003-0690, CAN-2003-0063, CAN-2003-0071, CAN-2004-0093, CAN-2004-0094, CAN-2004-0093, CAN-2004-0094. These should all be moved to their respective source packages. -daniels - ===================================== debian/control ===================================== @@ -3,21 +3,21 @@ Section: x11 Priority: optional Maintainer: Ubuntu X-SWAT <[email protected]> XSBC-Original-Maintainer: Debian X Strike Force <[email protected]> -Standards-Version: 4.5.0 +Rules-Requires-Root: no +Standards-Version: 4.6.1 Build-Depends: - dpkg (>= 1.16.1), - debhelper-compat (= 12), + debhelper-compat (= 13), po-debconf, # xsf-docs: asciidoc, -Vcs-Git: https://salsa.debian.org/xorg-team/debian/xorg -Vcs-Browser: https://salsa.debian.org/xorg-team/debian/xorg +Vcs-Git: https://salsa.debian.org/xorg-team/xorg.git +Vcs-Browser: https://salsa.debian.org/xorg-team/xorg Homepage: https://www.x.org/ Package: x11-common Architecture: all Multi-Arch: foreign -Depends: ${misc:Depends}, lsb-base (>= 1.3-9ubuntu2) +Depends: ${misc:Depends}, lsb-base Description: X Window System (X.Org) infrastructure x11-common contains the filesystem infrastructure required for further installation of the X Window System in any configuration; it does not @@ -33,12 +33,12 @@ Description: X Window System (X.Org) infrastructure Package: xserver-xorg Architecture: any Depends: - xserver-xorg-core (>= 2:1.17.2-2), + xserver-xorg-core, xserver-xorg-legacy [!linux-any], xserver-xorg-input-all | xorg-driver-input, ${shlibs:Depends}, ${misc:Depends}, - xkb-data (>= 1.4), + xkb-data, x11-xkb-utils, python3-apport, Recommends: @@ -59,8 +59,7 @@ Depends: xserver-xorg-video-fbdev [!s390x], xserver-xorg-video-dummy [s390x], xserver-xorg-video-nouveau [amd64 arm64 armhf i386 powerpc x32], - xserver-xorg-video-vesa [!s390x], - xserver-xorg-video-vmware [amd64 hurd-i386 i386 x32], + xserver-xorg-video-vesa [any-amd64 any-i386], ${misc:Depends}, Recommends: xserver-xorg-video-intel [amd64 i386 kfreebsd-any x32], @@ -94,7 +93,7 @@ Depends: libgl1 [!armhf], libgl1-mesa-dri [!armhf], libglu1-mesa [!armhf], - xfonts-base (>= 1:1.0.0-1), + xfonts-base, x11-apps, x11-session-utils, x11-utils, @@ -105,16 +104,16 @@ Depends: xfonts-utils, xkb-data, xorg-docs-core, - gnome-terminal | xterm | x-terminal-emulator, + xterm | x-terminal-emulator, ${misc:Depends}, xinput, Recommends: - xfonts-scalable (>= 1:1.0.0-1), + xfonts-scalable, Provides: x-window-system, x-window-system-core Suggests: xorg-docs, - xfonts-100dpi (>= 1:1.0.0-1), - xfonts-75dpi (>= 1:1.0.0-1), + xfonts-100dpi, + xfonts-75dpi, x11-xfs-utils, Description: X.Org X Window System This metapackage provides the components for a standalone @@ -130,7 +129,6 @@ Description: X.Org X Window System Package: xorg-dev Architecture: all Depends: - libdmx-dev, libfontenc-dev, libfs-dev, libice-dev, @@ -178,7 +176,6 @@ Description: X.Org X Window System development libraries Debian developers to have their package depend on. Package: xbase-clients -Section: x11 Architecture: all Depends: x11-apps, @@ -204,7 +201,6 @@ Description: miscellaneous X clients - metapackage packages. Package: xutils -Section: x11 Architecture: all Depends: x11-utils, ===================================== debian/local/Xsession.d/20x11-common_process-args ===================================== @@ -33,14 +33,8 @@ case $# in ;; *) # Specific program was requested. - STARTUP_FULL_PATH=$(command -v "${1%% *}" || true) - if [ -n "$STARTUP_FULL_PATH" ] && [ -e "$STARTUP_FULL_PATH" ]; then - if [ -x "$STARTUP_FULL_PATH" ]; then - STARTUP="$1" - else - message "unable to launch \"$1\" X session ---" \ - "\"$1\" not executable; falling back to default session." - fi + if command -v "${1%% *}" >/dev/null; then + STARTUP="$1" else message "unable to launch \"$1\" X session ---" \ "\"$1\" not found; falling back to default session." ===================================== debian/rules ===================================== @@ -15,18 +15,14 @@ override_dh_auto_clean: override_dh_auto_build: $(MAKE) -C xsf-docs -override_dh_install: +execute_before_dh_install: $(MAKE) -C xsf-docs install DESTDIR=$(CURDIR)/debian/xserver-xorg/usr/share/doc/xorg - dh_install override_dh_installinit-indep: dh_installinit -px11-common -override_dh_fixperms-indep: - dh_fixperms - chown root:root debian/x11-common/etc/X11/Xreset +execute_after_dh_fixperms-indep: chmod 755 debian/x11-common/etc/X11/Xreset - chown root:root debian/x11-common/etc/X11/Xsession chmod 755 debian/x11-common/etc/X11/Xsession # vim:set noet ai sts=8 sw=8 tw=0: ===================================== debian/source/format ===================================== @@ -0,0 +1 @@ +3.0 (native) ===================================== debian/x11-common.lintian-overrides ===================================== @@ -1,4 +1,4 @@ # it's a symlink -x11-common: binary-without-manpage usr/bin/X11 +x11-common: no-manual-page usr/bin/X11 # yes, we know x11-common: symlink-is-self-recursive usr/bin/X11 . ===================================== debian/xserver-xorg.lintian-overrides ===================================== @@ -1,3 +1,3 @@ # the X manpage is in xorg-docs -xserver-xorg: binary-without-manpage usr/bin/X -xserver-xorg: setuid-gid-binary usr/bin/X 6755 root/root +xserver-xorg: no-manual-page usr/bin/X +xserver-xorg: elevated-privileges usr/bin/X 6755 root/root View it on GitLab: https://salsa.debian.org/xorg-team/xorg/-/compare/500010094b137552f696642f30aa7f4aad663e64...e5f521624cd112b973cefa471e860fc87d2789d3 -- View it on GitLab: https://salsa.debian.org/xorg-team/xorg/-/compare/500010094b137552f696642f30aa7f4aad663e64...e5f521624cd112b973cefa471e860fc87d2789d3 You're receiving this email because of your account on salsa.debian.org.