--- xinit-1.4.2.orig/.gitlab-ci.yml +++ xinit-1.4.2/.gitlab-ci.yml @@ -0,0 +1,98 @@ +# vim: set expandtab shiftwidth=2 tabstop=8 textwidth=0 filetype=yaml: +# +# This CI uses the freedesktop.org ci-templates. +# Please see the ci-templates documentation for details: +# https://freedesktop.pages.freedesktop.org/ci-templates/ + +.templates_sha: &template_sha 34f4ade99434043f88e164933f570301fd18b125 # see https://docs.gitlab.com/ee/ci/yaml/#includefile + + +include: + # Arch container builder template + - project: 'freedesktop/ci-templates' + ref: *template_sha + file: '/templates/arch.yml' + - project: 'freedesktop/ci-templates' + ref: *template_sha + file: '/templates/ci-fairy.yml' + - template: Security/SAST.gitlab-ci.yml + + +stages: + - prep # prep work like rebuilding the container images if there is a change + - build # for actually building and testing things in a container + - test + - deploy + + +variables: + FDO_UPSTREAM_REPO: 'xorg/app/xinit' + # The tag should be updated each time the list of packages is updated. + # Changing a tag forces the associated image to be rebuilt. + # Note: the tag has no meaning, we use a date format purely for readability + FDO_DISTRIBUTION_TAG: '2021-12-06.0' + FDO_DISTRIBUTION_PACKAGES: 'git gcc pkgconf autoconf automake make xorg-util-macros xorgproto libx11 util-linux' + + +# +# Verify that commit messages are as expected +# +check-commits: + extends: + - .fdo.ci-fairy + stage: prep + script: + - ci-fairy check-commits --junit-xml=results.xml + except: + - master@xorg/app/xinit + variables: + GIT_DEPTH: 100 + artifacts: + reports: + junit: results.xml + +# +# Verify that the merge request has the allow-collaboration checkbox ticked +# +check-merge-request: + extends: + - .fdo.ci-fairy + stage: deploy + script: + - ci-fairy check-merge-request --require-allow-collaboration --junit-xml=results.xml + artifacts: + when: on_failure + reports: + junit: results.xml + allow_failure: true + + +# +# Build a container with the given tag and the packages pre-installed. +# This only happens if when the tag changes, otherwise the existing image is +# re-used. +# +container-prep: + extends: + - .fdo.container-build@arch + stage: prep + variables: + GIT_STRATEGY: none + + +# +# The default build, runs on the image built above. +# +build: + stage: build + extends: + - .fdo.distribution-image@arch + script: + - autoreconf -ivf + - mkdir _builddir + - pushd _builddir > /dev/null + - ../configure --disable-silent-rules + - make + - make check +# - make distcheck - currently fails on non-MacOS machines + - popd > /dev/null --- xinit-1.4.2.orig/ChangeLog +++ xinit-1.4.2/ChangeLog @@ -1,241 +1,3 @@ -commit f9786fb5a7e526035699f3d4d6661468ab20e689 -Author: Alan Coopersmith -Date: Sat Dec 3 14:05:44 2022 -0800 - - xinit 1.4.2 - - Signed-off-by: Alan Coopersmith - -commit 4f22f255e58fda758fcdd85f8554c4ef274600e8 -Author: Alan Coopersmith -Date: Wed Nov 9 12:22:19 2022 -0800 - - man page: Update remote display example from rsh to ssh - - Signed-off-by: Alan Coopersmith - -commit 4e66c0bf2b5751e113ad3aba79891608f7e883e2 -Author: Tim Egenton -Date: Tue Dec 7 09:15:18 2021 -0500 - - startx: Source XINITRC and XSERVERRC variables - - Fix issue #14 - - Check XINITRC and XSERVERRC, if those files do not exist then just use - ~/.xinitrc and ~/.xserverc as normal. - - Signed-off-by: Tim Egenton - -commit 0ea1ec1ed445235cdba9e54e71023d5a82feed6b -Author: Arthur Williams -Date: Fri Oct 14 20:59:54 2022 -0700 - - Don't wait for X to finish starting if it has died - - On my setup, when X first starts there aren't any screens available so - it immediately dies. Half a second later, screens become available but - xinit would still be waiting for the dead X process to signal that it - is ready. It'll take 15s for it to timeout and respawn X. - - This patch makes xinit listen for its child's death and if X dies, it'll - immediately stop waiting for it to finish starting and attempt to start - it again. - -commit 60389ce90f552d9dfef8facf0efaf48efa59d93c -Author: Alan Coopersmith -Date: Thu Jul 28 17:30:21 2022 -0700 - - gitlab CI: stop requiring Signed-off-by in commits - - Signed-off-by: Alan Coopersmith - -commit d190145b94d00efe8a52c01c1675c308baa335cc -Author: Dominik 'Rathann' Mierzejewski -Date: Thu Jun 9 11:21:17 2022 +0200 - - stop unsetting DBUS_SESSION_BUS_ADDRESS variable - - It's not necessary as we no longer support running startx from an - existing X session. - - Fixes #9. - - Signed-off-by: Dominik Mierzejewski - -commit 6bdce31401e3caf10242f1e8a4855b2c8e90ea13 -Author: Jeremy Huddleston Sequoia -Date: Sun Jun 19 20:09:55 2022 -0700 - - darwin: Wait for font_cache to complete to avoid a race with `xset fb=` - - Partially fixes: https://github.com/XQuartz/XQuartz/issues/216 - Signed-off-by: Jeremy Huddleston Sequoia - -commit bf1d55c1aeef4d4755e1dbaf05cd625e48780bfb -Author: nia -Date: Thu Apr 7 22:33:28 2022 +0200 - - startx: don't attempt to catch SIGKILL - - Most shells ignore attempts to catch SIGKILL. Some, such as NetBSD's - /bin/sh, print an annoying message helpfully reminding you - that it isn't possible to catch SIGKILL whenever X starts. - - Signed-off-by: Nia Alarie - -commit 71a8997cad602ef0adc9fed110e8a04d2a8fc8dc -Author: Alan Coopersmith -Date: Mon Dec 6 14:37:17 2021 -0800 - - Build xz tarballs instead of bzip2 - - Signed-off-by: Alan Coopersmith - -commit 366a03498d51958757cf03aa1ebbdf06db4eb2de -Author: Alan Coopersmith -Date: Mon Dec 6 14:37:14 2021 -0800 - - gitlab CI: add a basic build test - - Signed-off-by: Alan Coopersmith - -commit bdf2af54a800470990a66d11b14589e19fa568ac -Author: Arthur Williams -Date: Fri Jun 4 21:44:03 2021 -0700 - - Remove non-portable grep usage from startx - - startx uses non-portable grep flags (-o). grep isn't even needed for - this and has been replaced with substring removal. - - Closes #6 - -commit ae77976adaae9948e3e8d7a673dc88df4e31de46 -Author: Jeremy Huddleston Sequoia -Date: Mon Mar 15 17:37:53 2021 -0700 - - darwin: Specify +extension GLX when the user requests IGLX support - - Fixes: https://github.com/XQuartz/XQuartz/issues/54 - Signed-off-by: Jeremy Huddleston Sequoia - -commit 8caf10c018d77a097015798b604be8817f526274 -Author: Jeremy Huddleston Sequoia -Date: Wed Mar 10 13:50:09 2021 -0800 - - darwin: Ensure we launch the user startx from $HOME - - Fixes: https://github.com/XQuartz/XQuartz/issues/114 - Signed-off-by: Jeremy Huddleston Sequoia - -commit db21df4054e3351d14eb7dc1c3216cd23a61cee4 -Author: Jeremy Huddleston Sequoia -Date: Wed Mar 10 13:46:23 2021 -0800 - - darwin: Drop support for macOS 10.7 and earlier - - Signed-off-by: Jeremy Huddleston Sequoia - -commit e2430bcb8327682340d985f89ad5137efa2f0d4f -Author: Rickie Schroeder <1187-Gregg16@users.noreply.gitlab.freedesktop.org> -Date: Fri Aug 28 13:34:05 2020 +0000 - - startx: use uname -n instead of hostname - - startx calls hostname to obtain the hostname, but this is not defined by POSIX, so not guaranteed to work. The script already does some checks to deal with different hostname implementations on Linux. - - Using uname -n instead fixes this in a portable way. - -commit 91d2aba6364ec6685411595ccafea69fe9d20d6c -Author: Alan Coopersmith -Date: Thu Jul 23 09:26:21 2020 -0700 - - Fix spelling/wording issues - - Found by using: - codespell --builtin clear,rare,usage,informal,code,names - - Signed-off-by: Alan Coopersmith - -commit 4f54d1843a780a71c3be0b56fe2ad2ddfcbaf928 -Author: Matt Turner -Date: Sun Mar 8 15:16:36 2020 -0700 - - man: Restore non-SCO UNIX bits of the man page - - It looks to me like commit 5268936259c5 (Remove SCO support for - SHELL_CMD and startx man page.) removed the wrong bits of the man page. - - This commit replaces the SCO UNIX bits of the man page with the non-SCO - UNIX bits. - - Signed-off-by: Matt Turner - -commit 9a8b937bcfd84575e13039f316cbcb14c9729df4 -Author: Alan Coopersmith -Date: Sun Mar 3 11:56:43 2019 -0800 - - xinit 1.4.1 - - Signed-off-by: Alan Coopersmith - -commit b3dc751212e5f2f6b5d263e009cc2b85e56bfdbf -Author: Tobias Stoeckmann -Date: Thu Feb 7 20:54:37 2019 +0100 - - Buffer overflow with many arguments. - - Command line arguments are copied into clientargv and serverargv without - verifying that enough space is available. A high amount of arguments can - therefore trigger a buffer overflow like this: - - $ xinit $(seq 1 500) - - Signed-off-by: Tobias Stoeckmann - Reviewed-by: Walter Harms wharms@bfs,de - -commit f727023c1a75dcc467dd99a3db69a5834a0718f0 -Author: Alan Coopersmith -Date: Wed Nov 21 17:06:34 2018 -0800 - - Update configure.ac bug URL for gitlab migration - - Signed-off-by: Alan Coopersmith - -commit ce311771ca86a4134511aecda5601d7c76d763dd -Author: Alan Coopersmith -Date: Fri Nov 16 22:19:18 2018 -0800 - - Update README for gitlab migration - - Signed-off-by: Alan Coopersmith - -commit 752ef176eb99f6315be27f00896b37ce217758b9 -Author: Laurent Bigonville -Date: Fri Sep 12 15:35:49 2014 +0200 - - Fix some miscellaneous stuffs in the manpages - - See: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=726962 - https://bugs.freedesktop.org/show_bug.cgi?id=83797 - - Signed-off-by: Alan Coopersmith - -commit aac8e17d28665dd35a73ee188c007f0b0f9cd9fe -Author: Jon TURNEY -Date: Mon Oct 26 13:55:35 2009 +0000 - - Make text about supplying X server arguments via startx more generic - - Make text about supplying X server arguments via startx more generic, - rather than assuming the started server will be Xorg, and hence will - take Xorg's arguments. - - Signed-off-by: Jon TURNEY - Reviewed-by: Alan Coopersmith - Signed-off-by: Alan Coopersmith - commit 2df7937c6d57a4f44288d13fc50218fe088c4185 Author: Alan Coopersmith Date: Fri Mar 9 17:44:47 2018 -0800 @@ -1471,7 +1233,7 @@ when the structure of the component changes. Do not edit defaults. commit d243b9943879ec2790d65785805aefdfbb64a378 -Author: Rémi Cardona +Author: Rémi Cardona Date: Sat Nov 14 14:51:59 2009 +0100 xinit 1.2.0 @@ -1517,7 +1279,7 @@ Tested-by: Jon TURNEY commit c2a5751175b11d3206805468aae1ddecd02c4a98 -Author: Rémi Cardona +Author: Rémi Cardona Date: Sat Oct 3 11:50:12 2009 +0200 make XINITDIR configurable at build-time, default is unchanged @@ -2501,7 +2263,7 @@ correctly commit d731a249d0c1c7f9eb77828c0d6e79cfdaf75589 -Author: Søren Sandmann Pedersen +Author: Søren Sandmann Pedersen Date: Tue Jul 5 21:12:01 2005 +0000 Build system for xinit --- xinit-1.4.2.orig/debian/NEWS +++ xinit-1.4.2/debian/NEWS @@ -0,0 +1,12 @@ +xinit (1.0.7-2) unstable; urgency=low + + * The /etc/X11/xinit/xserverrc script has been changed so that xinit and + startx do not pass -dpi 100 to the X server anymore. xserver-xorg-core + now uses 96 instead of 75 by default, it should be fine for most people. + In case of problem, the DisplaySize option be used in the Monitor + section of your /etc/X11/xorg.conf to force another DPI. If you + have multiple RandR 1.2 outputs, DisplaySize should be specified + in each Monitor section. + See https://wiki.debian.org/XStrikeForce/HowToRandR12 + + -- Brice Goglin Thu, 17 Jan 2008 20:49:45 +0100 --- xinit-1.4.2.orig/debian/README.source +++ xinit-1.4.2/debian/README.source @@ -0,0 +1,73 @@ +------------------------------------------------------ +Quick Guide To Patching This Package For The Impatient +------------------------------------------------------ + +1. Make sure you have quilt installed +2. Unpack the package as usual with "dpkg-source -x" +3. Run the "patch" target in debian/rules +4. Create a new patch with "quilt new" (see quilt(1)) +5. Edit all the files you want to include in the patch with "quilt edit" + (see quilt(1)). +6. Write the patch with "quilt refresh" (see quilt(1)) +7. Run the "clean" target in debian/rules + +Alternatively, instead of using quilt directly, you can drop the patch in to +debian/patches and add the name of the patch to debian/patches/series. + +------------------------------------ +Guide To The X Strike Force Packages +------------------------------------ + +The X Strike Force team maintains X packages in git repositories on +git.debian.org in the pkg-xorg subdirectory. Most upstream packages +are actually maintained in git repositories as well, so they often +just need to be pulled into git.debian.org in a "upstream-*" branch. +Otherwise, the upstream sources are manually installed in the Debian +git repository. + +The .orig.tar.gz upstream source file could be generated using this +"upstream-*" branch in the Debian git repository but it is actually +copied from upstream tarballs directly. + +Due to X.org being highly modular, packaging all X.org applications +as their own independent packages would have created too many Debian +packages. For this reason, some X.org applications have been grouped +into larger packages: xutils, xutils-dev, x11-apps, x11-session-utils, +x11-utils, x11-xfs-utils, x11-xkb-utils, x11-xserver-utils. +Most packages, including the X.org server itself and all libraries +and drivers are, however maintained independently. + +The Debian packaging is added by creating the "debian-*" git branch +which contains the aforementioned "upstream-*" branch plus the debian/ +repository files. +When a patch has to be applied to the Debian package, two solutions +are involved: +* If the patch is available in one of the upstream branches, it + may be git'cherry-picked into the Debian repository. In this + case, it appears directly in the .diff.gz. +* Otherwise, the patch is added to debian/patches/ which is managed + with quilt as documented in /usr/share/doc/quilt/README.source. + +quilt is actually invoked by the Debian X packaging through a larger +set of scripts called XSFBS. XSFBS brings some other X specific +features such as managing dependencies and conflicts due to the video +and input driver ABIs. +XSFBS itself is maintained in a separate repository at + git://git.debian.org/pkg-xorg/xsfbs.git +and it is pulled inside the other Debian X repositories when needed. + +The XSFBS patching system requires a build dependency on quilt. Also +a dependency on $(STAMP_DIR)/patch has to be added to debian/rules +so that the XSFBS patching occurs before the actual build. So the +very first target of the build (likely the one running autoreconf) +should depend on $(STAMP_DIR)/patch. It should also not depend on +anything so that parallel builds are correctly supported (nothing +should probably run while patching is being done). And finally, the +clean target should depend on the xsfclean target so that patches +are unapplied on clean. + +When the upstream sources contain some DFSG-nonfree files, they are +listed in text files in debian/prune/ in the "debian-*" branch of +the Debian repository. XSFBS' scripts then take care of removing +these listed files during the build so as to generate a modified +DFSG-free .orig.tar.gz tarball. --- xinit-1.4.2.orig/debian/changelog +++ xinit-1.4.2/debian/changelog @@ -0,0 +1,538 @@ +xinit (1.4.2-1) unstable; urgency=medium + + [ Debian Janitor ] + * Bump debhelper from deprecated 9 to 13. + + debian/rules: Rely on default use of dh_missing rather than using + dh_install --list-missing. + * Set debhelper-compat version in Build-Depends. + * Drop unnecessary dependency on dh-autoreconf. + * Remove constraints unnecessary since buster (oldstable): + + Build-Depends: Drop versioned constraint on libx11-dev (>= 2:1.0.0). + + Build-Depends: Replace dependency on transitional package + x11proto-core-dev (>= 7.0.17) with replacement x11proto-dev. + + Build-Depends: Drop versioned constraint on xutils-dev (>= 1:7.7+3). + + xinit: Drop dependency on essential package coreutils (>= 7.4-1) in + Depends. + + [ Timo Aaltonen ] + * New upstream version. + * control: Bump policy to 4.6.2. + * patches: Refreshed, 02_startx_hostname.diff dropped. + + -- Timo Aaltonen Tue, 14 Nov 2023 18:12:32 +0200 + +xinit (1.4.0-1) unstable; urgency=medium + + [ Timo Aaltonen ] + * postinst: Check that xinitrc exists before trying to chmod it. (LP: + #1562033) + + [ Julien Cristau ] + * Update Vcs-* control fields for move to salsa. + * Remove Cyril from Uploaders. + * Switch wiki.debian.org, bugs.debian.org and xorg.freedesktop.org URLs in + packaging to https. + * Let uscan verify tarball signatures. + * New upstream release. + + 07_Pass-keeptty-on-current-tty.patch, 08_pick-free-display.patch: + delete, applied upstream + + -- Julien Cristau Mon, 19 Mar 2018 08:41:43 +0100 + +xinit (1.3.4-3) unstable; urgency=medium + + * Team upload. + * d/p/08_pick-free-display.patch: Properly pick a free display number if + -nolock or -displayfd is used to start X (like GDM is now doing) + * debian/rules: Make /etc/X11/xinit/xserverrc executable again, this got + lost during the xsfbs -> dh7 switch + + -- Laurent Bigonville Mon, 19 Oct 2015 03:54:32 +0200 + +xinit (1.3.4-2) unstable; urgency=medium + + * Team upload. + * Remove xsfbs and switch to dh7 + * Make /etc/X11/xinit/xinitrc executable on upgrade too (Closes: #790433) + * debian/control: Bump Standards-Version to 3.9.6 (no further changes) + * d/p/07_Pass-keeptty-on-current-tty.patch: Pass -keeptty when telling the + server to start on the current tty (Closes: #801529) + + -- Laurent Bigonville Mon, 19 Oct 2015 03:13:52 +0200 + +xinit (1.3.4-1) unstable; urgency=medium + + * Team upload. + * New upstream release. + - Drop d/p/07-Pass-files-to-cpp-via-CLI-arg-instead-of-stdin-to-wo.patch, + d/p/08-Bump-required-util-macros-version-to-1.19.patch, + d/p/09-Replace-RAWCPPFLAGS-with-TRADITIONALCPPFLAGS-when-pr.patch, + d/p/10-startx-Under-Linux-start-X-on-the-current-VT.patch, + d/p/11-startx-Pass-vtX-as-long-as-the-user-did-not-specify-.patch: + Merged upstream + - debian/patches/001_debian_xinitrc.diff: Refreshed + * Fix debian/patches/03_debian_startx_manpage.diff, a Debian specific note + was not shown anymore + * debian/rules: Make /etc/X11/xinit/xinitrc executable to make lintian happy + and also to fix LP: #491696 + + -- Laurent Bigonville Fri, 12 Sep 2014 16:00:29 +0200 + +xinit (1.3.3-1) unstable; urgency=medium + + * Team upload. + * New upstream release. + * debian/patches/001_debian_xinitrc.diff: Refreshed + * d/p/07-Pass-files-to-cpp-via-CLI-arg-instead-of-stdin-to-wo.patch: Remove + empty lines when building with cpp >= 4.8 + * 08-Bump-required-util-macros-version-to-1.19.patch, + 09-Replace-RAWCPPFLAGS-with-TRADITIONALCPPFLAGS-when-pr.patch: Use + TRADITIONALCPPFLAGS instead of RAWCPPFLAGS so macros like "__linux__" are + properly defined + * 10-startx-Under-Linux-start-X-on-the-current-VT.patch, + 11-startx-Pass-vtX-as-long-as-the-user-did-not-specify-.patch: By default + start the server on the current VT, this is necessary to avoid logind to + see the startx session as inactive (Closes: #743015 LP: #1247484) + * debian/control: Bump Standards-Version to 3.9.5 (no further changes) + * debian/control: Use the canonical for the VCS-* fields + * debian/rules: Include buildflags.mk to pass the hardening flags + + -- Laurent Bigonville Fri, 05 Sep 2014 22:21:04 +0200 + +xinit (1.3.2-1) unstable; urgency=low + + * New upstream release. Visible change: + - startx: Choose an unused $DISPLAY by default on all platforms + + -- Cyril Brulebois Sat, 16 Jun 2012 20:53:25 +0000 + +xinit (1.3.1-1) unstable; urgency=low + + * New upstream release. + * Update Uploaders list. Thanks, David & Brice! + * Wrap Depends/Recommends. + * Get rid of obsolete Replaces on xbase-clients from before lenny. + * Update 03_debian_startx_manpage.diff, startx.man moved below man/. + * Bump Standards-Version to 3.9.2 (no changes). + + -- Cyril Brulebois Mon, 25 Jul 2011 10:47:00 +0200 + +xinit (1.3.0-1) unstable; urgency=low + + * New upstream release. + * Refresh patch: 001_debian_xinitrc.diff (context tweak). + * Refresh other patches: line offsets. + * Add myself to Uploaders. + + -- Cyril Brulebois Wed, 03 Nov 2010 03:20:59 +0100 + +xinit (1.2.0-2) unstable; urgency=low + + [ Julien Cristau ] + * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no + good reason. Thanks, Colin Watson! + * Remove myself from Uploaders + * Drop 04_startx_paths.diff, pass --with-xinitdir=/etc/X11/xinit to + configure instead. As a side effect, this fixes the paths in the manpage + (closes: #526843). + * Drop 05_use_bash.diff. This was working around a bashism fixed 4 years + ago (closes: #479352). + * Pass --with-xterm=/usr/bin/xterm to configure (closes: #557138). + + [ Sven Joachim ] + * Depend on coreutils (>= 7.4-1) for mktemp's --tmpdir option + (Closes: #559852). + * Remove unneeded dh_makeshlibs call from debian/rules. + * Update xsfbs to 81fc271788605b52e85c2d11635a0371fb44605e. + + -- Julien Cristau Sat, 05 Jun 2010 20:04:38 +0200 + +xinit (1.2.0-1) unstable; urgency=low + + [ Brice Goglin ] + * New upstream release. + + Pass xinit error codes through startx, closes: #514922. + + Fix startx mis-parsing initial client and server arguments + which begin with / or ./, closes: #511717. + * Add README.source, bump Standards-Version to 3.8.3. + * Use updated xsfbs, closes: #538604. + * Refresh patches. + + [ Julien Cristau ] + * debian/local/xserverrc: pass our command line arguments to the X server + (closes: #549377). + * 06_move_serverauthfile_into_tmp.diff: use mktemp --tmpdir to honour + $TMPDIR (closes: #480958). + + -- Brice Goglin Sun, 06 Dec 2009 23:32:47 +0100 + +xinit (1.1.1-1) unstable; urgency=low + + * New upstream release. + * Add dependency on x11-common and xauth (closes: #512094), recommends on + xserver-xorg | xserver and xterm | x-session-manager | x-window-manager | + x-terminal-emulator (closes: #512095). Thanks, Márton Németh! + * Stop depending on cpp (this used to be necessary for xrdb, but isn't now + that the xbase-clients package has been split). + * Drop patch 07_startx_serverrc_fix.diff, included upstream. + * Update 06_move_serverauthfile_into_tmp.diff for new upstream. + * Run autoreconf on build; add build-deps on automake and xutils-dev. + * Handle parallel builds. + + -- Julien Cristau Sun, 15 Feb 2009 22:41:14 +0100 + +xinit (1.0.9-2) unstable; urgency=low + + * Fix startx. Patch from Jeremy Huddleston (closes: #482425). + + -- Julien Cristau Wed, 28 May 2008 14:27:01 +0200 + +xinit (1.0.9-1) unstable; urgency=low + + * New upstream release. + + -- Brice Goglin Wed, 21 May 2008 23:28:57 +0200 + +xinit (1.0.8-1) unstable; urgency=low + + * New upstream release + * Update our patches: + + 001_debian_xinitrc.diff: fixup + + 02_startx_hostname.diff: fixup + + 04_startx_paths.diff: refresh + + 06_move_serverauthfile_into_tmp.diff: fixup + * Don't build-depend on packages with a -1 debian revision. + * Bump Standards-Version to 3.7.3. + * Drop the XS- prefix from Vcs-* control fields. + * Don't pre-depend on x11-common, that's not needed as we don't install + anything under /usr/{lib,include}/X11. + + -- Julien Cristau Wed, 19 Mar 2008 00:32:09 +0100 + +xinit (1.0.7-2) unstable; urgency=low + + * Stop passing -dpi 100 to the X server in /etc/X11/xinit/xserverrc + and add a NEWS entry about it, closes: #452168. + + -- Brice Goglin Thu, 17 Jan 2008 20:49:40 +0100 + +xinit (1.0.7-1) unstable; urgency=low + + * New upstream release. + * Refresh 03_debian_startx_manpage.diff and + 06_move_serverauthfile_into_tmp.diff. + + -- Brice Goglin Sun, 18 Nov 2007 15:35:33 +0100 + +xinit (1.0.5-1) unstable; urgency=low + + * New upstream release. + * Add 06_move_serverauthfile_into_tmp.diff so that startx auth files + are removed on reboot, thanks Luca Capello, closes: #357736. + * Add myself to Uploaders, and remove Branden with his permission. + + -- Brice Goglin Fri, 14 Sep 2007 22:51:49 +0200 + +xinit (1.0.4-2) experimental; urgency=low + + * Add upstream URL in debian/copyright; thanks, Jörg Jaspert. + + -- Julien Cristau Tue, 26 Jun 2007 22:19:34 +0100 + +xinit (1.0.4-1) experimental; urgency=low + + [ Timo Aaltonen ] + * Split xbase-clients, new versioning using the module version. + * debian/control: + - Rename Package and Source. + - Remove unnecessary Build-Deps. + - Modify description. + - Replaces: xbase-clients (<= 1:7.2.ds2-3) to make upgrades smoother. + * debian/copyright: Leave only copyright notices that relate to + this package. + * debian/xinit.install, rules: Edit to reflect new packaging. + * debian/xinit.dirs: Remove. + * debian/patches: + - Delete patches which do not relate to this package. + - 05_use_bash.diff: fix a shell usage error (LP: #31241), + (Freedesktop: #4449) + + [ Julien Cristau ] + * New upstream release. + * Install the upstream changelog. + * Add watch file. + + -- Julien Cristau Sat, 02 Jun 2007 15:42:01 +0200 + +xbase-clients (1:7.2.ds2-3) unstable; urgency=low + + * Add patch to xsm's configure.ac to not override the user-provided RSH + variable, so we can drop the openssh build-dep (closes: #362787). + + -- Julien Cristau Wed, 09 May 2007 16:26:06 +0200 + +xbase-clients (1:7.2.ds2-2) unstable; urgency=low + + [ Julien Cristau ] + * Autoreconf with patches applied. + * Add build-dep on libxinerama-dev, so xdpyinfo is built with support for + the xinerama extension. + * Add patch 17_xmodmap_manpage.diff to make xmodmap(1) refer to + /usr/share/X11/XKeysymDB instead of /usr/lib/X11/XKeysymDB + (closes: #394077). Thanks, Joachim Breitner! + * Document each app's build-dependencies in debian/control for reference. + * Update long description: XKB configuration data is in xkb-data, bitmap + images in xbitmaps. + * Add XS-Vcs-* in debian/control. + * Upload to unstable. + + [ Brice Goglin ] + * Restore Depends: on cpp (got lost during modularization) + since xrdb needs it to process .Xdefaults. + Thanks Marcus C. Gottwald (closes: #413298). + * Remove mention of xf86cfg in package description. + Thanks Daniel Leidert (really closes: #362066). + + -- Julien Cristau Fri, 20 Apr 2007 22:00:14 +0200 + +xbase-clients (1:7.2.ds2-1) experimental; urgency=low + + * Update to xrandr 1.2.0. + * Build-dep on libxrandr 1.2.0. + * New patch to install beforelight's app-defaults file correctly. + + -- Julien Cristau Mon, 19 Feb 2007 10:46:11 +0100 + +xbase-clients (1:7.2.ds1-2) experimental; urgency=low + + * Build-dep on libpng12-dev instead of libpng-dev. xcursorgen requires + libpng12.pc, which is not available in libpng14-dev, despite it providing + libpng-dev and libpng12-dev, *sigh*. + + -- Julien Cristau Mon, 12 Feb 2007 05:35:18 +0100 + +xbase-clients (1:7.2.ds1-1) experimental; urgency=low + + * Patch setxkbmap(1) to refer to the correct location for xkb files, thanks + to Celejar for noticing. + * Update to appres 1.0.1. + * Update to beforelight 1.0.2. + * Update to bitmap 1.0.3. + * Update to editres 1.0.3. + * Update to setxkbmap 1.0.3. + * Update to xauth 1.0.2. + * Update to xdbedizzy 1.0.2. + + patch 16_xdbedizzy_fix_crash.diff dropped, included upstream. + + patch pkgconfig_naughtiness dropped, now unnecessary. + * Update to xedit 1.0.2. + * Update to xev 1.0.2. + * Update to xf86dga 1.0.2. + + relevant part dropped from 14_SECURITY_setuid.diff. + * Update to xfontsel 1.0.2. + * Update to xinit 1.0.3. + + relevant part dropped from 14_SECURITY_setuid.diff. + * Update to xkbcomp 1.0.3. + * Update to xlsfonts 1.0.2. + * Update to xmodmap 1.0.2. + * Update to xprop 1.0.2. + * Update to xrdb 1.0.3. + * Update to xsetpointer 1.0.1. + + Add build-dep on x11proto-input-dev >= 1.4. + * Update to xtrap 1.0.2. + * Modify patch 08_xlsfonts_do_not_spew_usage_on_connection_error.diff to + apply to xprop, xwd and xwininfo as well, since they all use a copy of + dsimple.c. + * Change my email address in debian/control. + + -- Julien Cristau Sun, 11 Feb 2007 15:42:54 +0100 + +xbase-clients (1:7.1.ds1-2) unstable; urgency=low + + * Add patch by Eugene Konev to fix xdbedizzy crash (closes: #365291). + + -- Julien Cristau Fri, 12 Jan 2007 17:54:07 +0100 + +xbase-clients (1:7.1.ds1-1) unstable; urgency=low + + * Add patch by Eugene Konev to fix xmore crash (closes: #365292). + * Remove version string from subdirectory names, thus new tarball, and + update patches to match. + * Define MANCONF when configuring xman, to make it look for man pages in the + right path instead of in /usr/man (closes: 404757). + * Remove Fabio from Uploaders with his permission, and add myself. + + -- Julien Cristau Mon, 8 Jan 2007 00:50:31 +0100 + +xbase-clients (1:7.1.ds-3) unstable; urgency=low + + [ Branden Robinson ] + * Patch xprop to stop segfaulting when deleted atoms are requested. + Committed upstream as git 47514347db811d002e7f3ca05d390565bc3ee5e5. + (Closes: #197526) + + [ Denis Barbier ] + * Acknowledge NMU, thanks dann frazier. (closes: #363198) + * The rsh program is required to build xsm. Replace Build-Depends: ssh | rsh + by Build-Depends: openssh-client | ssh + * Fix debian/rules so that xkbcomp look for XKB files in /usr/share/X11/xkb. + Thanks Steinar H. Gunderson (closes: #381884) + All XKB related programs share now the same build system, so factor + commands in debian/rules. + + -- Denis Barbier Sat, 12 Aug 2006 15:08:47 +0200 + +xbase-clients (1:7.1.ds-2.1) unstable; urgency=low + + * Non-maintainer upload. + * Fix implicit pointer conversion in xconsole.c (closes: #363198) + (Was fixed in 1:7.1.ds-1.1 NMU, but silently dropped in 1:7.1.ds-2 MU) + + -- dann frazier Sat, 29 Jul 2006 13:59:40 -0600 + +xbase-clients (1:7.1.ds-2) unstable; urgency=high + + * Security update. Fix for setuid privledge escalation vulernabilities in + xinit, xf86dga, and xload. See + http://lists.freedesktop.org/archives/xorg/2006-June/016146.html for the + full advisory. This package applies the patches for the 7.0 release of + those apps. + + -- David Nusinow Fri, 30 Jun 2006 01:10:17 -0400 + +xbase-clients (1:7.1.ds-1) unstable; urgency=low + + [ Steve Langasek ] + * Drop broken build-dependency on xprint-utils, no thanks to anonymous + someone. + * Pass --disable-xprint to invocations of configure instead, which is + the real fix for the symptoms described: we want the xbase-clients + package to consistently build *without* xprint support, instead of + autodetecting (and possibly failing) based on whether libxp-dev is + installed. Properly closes: #366275. + * Also call PKG_PROG_PKG_CONFIG explicitly from xdbebizzy's + configure.ac, since otherwise --disable-xprint leaves us without + PKG_CONFIG defined. + + [ David Nusinow ] + * This update should include all the apps released with X11R7.1. Version the + package to match this. + * Update bitmap to 1.0.2 + * Update xcursorgen to 1.0.1 + * Autoreconf everything in order to ensure that manpages have the proper + section + * Update 11_xkb_documentation_updates.diff to not use __manpagesuffix__ + imakeism + * Bump standards version to 3.7.2.0 + * Bump debhelper compat to 5 + + -- David Nusinow Sun, 11 Jun 2006 21:51:54 -0400 + +xbase-clients (1:7.0.1-2) unstable; urgency=low + + * Add xprint-utils to build-depends. Thanks anonymous someone. + (closes: #366275) + + -- David Nusinow Sun, 14 May 2006 22:57:13 -0400 + +xbase-clients (1:7.0.1-1) unstable; urgency=low + + * Move xserverrc back to this package from xserver-xorg-core. Thanks + Benjamin Mesing. (closes: #365022) + * Update smproxy to version 1.0.2 + * Update xhost to version 1.0.1 + * Update fstobdf to version 1.0.2 + * Update xdriinfo to version 1.0.1 + * Update xinit to version 1.0.2 + * Remove obsolete patch 03_startx_dummy.diff + * Update xkbevd to version 1.0.2 + * Update xman to version 1.0.2 + * Update xrefresh to version 1.0.2 + * Update xwininfo to version 1.0.2 + * Update xclock to version 1.0.2 + * Update xconsole to version 1.0.2 + * Update xkbcomp to version 1.0.2 + * Update xmodmap to version 1.0.1 + * Update xrandr to version 1.0.2 + * Update xrdb to version 1.0.2 + * Update xset to version 1.0.2 + + -- David Nusinow Tue, 2 May 2006 22:58:57 -0400 + +xbase-clients (1:7.0.0-5) unstable; urgency=low + + * Patch startx so that it points to /etc/X11/xinit for xserverrc and + xinitrc. Thanks Vasilis Vasaitis and Bastian Kleineidam. + * Move xserverrc back to /etc/X11/xinit + * Use --list-missing with dh_install + + -- David Nusinow Tue, 25 Apr 2006 21:37:22 -0400 + +xbase-clients (1:7.0.0-4) unstable; urgency=low + + * Add quilt to build-depends. + + -- David Nusinow Sat, 15 Apr 2006 19:49:02 -0400 + +xbase-clients (1:7.0.0-3) unstable; urgency=low + + * Remove mention of xorgconfig and xorgcfg in package description. Thanks + Daniel Leidert. (closes: #362066) + * Add 12_startx_paths.diff to use X11R7 paths for startx and xinit. Thanks + Arjan Opmeer. (closes: #357713) + * Add libxi-dev to build-depends + * Make xbase-clients explicitly pre-depend on x11-common >= 1:7.0.0, rather + than implicitly. Thanks Vasilis Vasaitis. (closes: #357713) + + -- David Nusinow Thu, 13 Apr 2006 22:39:46 -0400 + +xbase-clients (1:7.0.0-2) unstable; urgency=low + + * Upload to unstable + * Add build-depends on libgl1-mesa-dev, versioned build-depneds on + libdrender-dev, and re-version build-depend on libxft-dev. Thanks Frank + Lichtenheld. (closes: #361821) + + -- David Nusinow Mon, 10 Apr 2006 19:49:23 -0400 + +xbase-clients (1:7.0.0-1) experimental; urgency=low + + [ Denis Barbier ] + * Set XKB base path to /usr/share/X11/xkb. + + [ David Nusinow ] + * Update to x11perf 1.4.1 and setxkbmap 1.0.2 upstream releases + * Bump version number to match upstream's current katamari release + + -- David Nusinow Thu, 16 Mar 2006 23:06:15 -0500 + +xbase-clients (1:1.0.1-2) experimental; urgency=low + + * Add an empty /var/lib/xkb directory so that the server loads the correct + keymaps. Thanks Silvestre Zabala, Eugene Konev, and Daniel Stone. + (closes: #354130) + * Port patches from trunk + + general/014_startx_hostname_fix.diff + + general/015_startx_dummy_fix.diff + + general/073_xev_flush_standard_output.diff + + general/025c_bitmap_manpage_typo.diff + + general/025d_xedit_manpage_typos.diff + + general/025e_xvinfo_manpage_typo.diff + + general/099r_xlsfonts_do_not_spew_usage_on_connection_error.diff + + debian/902_debian_startx_manpage.diff + + debian/916_add_XKBPATH_env_variable.diff + + general/051_xkb_documentation_updates.diff + * Suggest mesa-utils, where glxinfo and glxgears have been moved. + Thanks Mike Hommey. (closes: #354246) + + -- David Nusinow Sat, 4 Mar 2006 18:59:20 -0500 + +xbase-clients (1:1.0.1-1) experimental; urgency=low + + [ David Nusinow ] + * First modular upload to Debian + + [ Eugene Konev ] + * Divide packages that we process in debian/rules by category so we can pass + the xkb packages the proper configure flags + + -- David Nusinow Sun, 19 Feb 2006 19:46:46 -0500 --- xinit-1.4.2.orig/debian/control +++ xinit-1.4.2/debian/control @@ -0,0 +1,29 @@ +Source: xinit +Section: x11 +Priority: optional +Maintainer: Debian X Strike Force +Build-Depends: + debhelper-compat (= 13), + pkg-config, + libx11-dev, + quilt, + automake, + x11proto-dev, + xutils-dev, +Standards-Version: 4.6.2 +Vcs-Git: https://salsa.debian.org/xorg-team/app/xinit.git +Vcs-Browser: https://salsa.debian.org/xorg-team/app/xinit + +Package: xinit +Architecture: any +Depends: + ${shlibs:Depends}, + ${misc:Depends}, + x11-common, + xauth, +Recommends: + xserver-xorg | xserver, + xterm | x-session-manager | x-window-manager | x-terminal-emulator, +Description: X server initialisation tool + xinit and startx are programs which facilitate starting an X server, and + loading a base X session. --- xinit-1.4.2.orig/debian/copyright +++ xinit-1.4.2/debian/copyright @@ -0,0 +1,24 @@ +This package was downloaded from +https://xorg.freedesktop.org/releases/individual/app/ + +Copyright 1986, 1998 The Open Group + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the name of The Open Group shall not be +used in advertising or otherwise to promote the sale, use or other dealings +in this Software without prior written authorization from The Open Group. --- xinit-1.4.2.orig/debian/local/xserverrc +++ xinit-1.4.2/debian/local/xserverrc @@ -0,0 +1,3 @@ +#!/bin/sh + +exec /usr/bin/X -nolisten tcp "$@" --- xinit-1.4.2.orig/debian/patches/001_debian_xinitrc.diff +++ xinit-1.4.2/debian/patches/001_debian_xinitrc.diff @@ -0,0 +1,63 @@ +--- a/xinitrc.cpp ++++ b/xinitrc.cpp +@@ -1,55 +1,8 @@ + XCOMM!SHELL_CMD + +-userresources=$HOME/.Xresources +-usermodmap=$HOME/.Xmodmap +-sysresources=XINITDIR/.Xresources +-sysmodmap=XINITDIR/.Xmodmap ++XCOMM /etc/X11/xinit/xinitrc ++XCOMM ++XCOMM global xinitrc file, used by all X sessions started by xinit (startx) + +-XCOMM merge in defaults and keymaps +- +-if [ -f $sysresources ]; then +-#ifdef __APPLE__ +- if [ -x /usr/bin/cpp ] ; then +- XRDB -merge $sysresources +- else +- XRDB -nocpp -merge $sysresources +- fi +-#else +- XRDB -merge $sysresources +-#endif +-fi +- +-if [ -f $sysmodmap ]; then +- XMODMAP $sysmodmap +-fi +- +-if [ -f "$userresources" ]; then +-#ifdef __APPLE__ +- if [ -x /usr/bin/cpp ] ; then +- XRDB -merge "$userresources" +- else +- XRDB -nocpp -merge "$userresources" +- fi +-#else +- XRDB -merge "$userresources" +-#endif +-fi +- +-if [ -f "$usermodmap" ]; then +- XMODMAP "$usermodmap" +-fi +- +-XCOMM start some nice programs +- +-if [ -d XINITDIR/xinitrc.d ] ; then +- for f in XINITDIR/xinitrc.d/?*.sh ; do +- [ -x "$f" ] && . "$f" +- done +- unset f +-fi +- +-TWM & +-XCLOCK -geometry 50x50-1+1 & +-XTERM -geometry 80x50+494+51 & +-XTERM -geometry 80x20+494-0 & +-exec XTERM -geometry 80x66+0+0 -name login ++XCOMM invoke global X session script ++. /etc/X11/Xsession --- xinit-1.4.2.orig/debian/patches/03_debian_startx_manpage.diff +++ xinit-1.4.2/debian/patches/03_debian_startx_manpage.diff @@ -0,0 +1,77 @@ +Fix the startx manpage to be more correct for our setup; this patch by Branden +Robinson. + +--- + startx.man | 54 ++++++++++++++++++++++-------------------------------- + 1 file changed, 22 insertions(+), 32 deletions(-) + +--- a/man/startx.man ++++ b/man/startx.man +@@ -69,6 +69,28 @@ startx \-\^\- \-dpi 100 + startx \-\^\- \-layout Multihead + .RE + .PP ++Note that in the Debian system, what many people traditionally put in the ++.I .xinitrc ++file should go in ++.I .xsession ++instead; this permits the same X environment to be presented whether ++.IR startx , ++.IR xdm , ++or ++.I xinit ++is used to start the X session. All discussion of the ++.I .xinitrc ++file in the ++.IR xinit (1) ++manual page applies equally well to ++.IR .xsession. ++Keep in mind that ++.I .xinitrc ++is used only by ++.IR xinit (1) ++and completely ignored by ++.IR xdm (1). ++.PP + To determine the client to run, + .B startx + first checks the environment variable +@@ -116,38 +138,6 @@ and + files are found in the + .I __xinitdir__ + directory. +-.PP +-The +-.I .xinitrc +-is typically a shell script which starts many clients according to the +-user's preference. When this shell script exits, +-.B startx +-kills the server and performs any other session shutdown needed. +-Most of the clients started by +-.I .xinitrc +-should be run in the background. The last client should run in the +-foreground; when it exits, the session will exit. People often choose +-a session manager, window manager, or \fIxterm\fP as the ''magic'' client. +-.SH EXAMPLE +-.PP +-Below is a sample \fI\.xinitrc\fP that starts several applications and +-leaves the window manager running as the ''last'' application. Assuming that +-the window manager has been configured properly, the user +-then chooses the ''Exit'' menu item to shut down X. +-.sp +-.in +4 +-.nf +-xrdb \-load $HOME/.Xresources +-xsetroot \-solid gray & +-xbiff \-geometry \-430+5 & +-oclock \-geometry 75x75\-0\-0 & +-xload \-geometry \-80\-0 & +-xterm \-geometry +0+60 \-ls & +-xterm \-geometry +0\-100 & +-xconsole \-geometry \-0+0 \-fn 5x7 & +-exec twm +-.fi +-.in -4 + .SH "ENVIRONMENT VARIABLES" + .TP 25 + DISPLAY --- xinit-1.4.2.orig/debian/patches/06_move_serverauthfile_into_tmp.diff +++ xinit-1.4.2/debian/patches/06_move_serverauthfile_into_tmp.diff @@ -0,0 +1,18 @@ +Move startx auth files in /tmp so they are removed on reboot. +https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=357736 +The trap patch didn't seem to work on reboot. +--- + startx.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/startx.cpp ++++ b/startx.cpp +@@ -272,7 +272,7 @@ if [ x"$enable_xauth" = x1 ] ; then + dummy=0 + + XCOMM create a file with auth information for the server. ':0' is a dummy. +- xserverauthfile=$HOME/.serverauth.$$ ++ xserverauthfile=`mktemp --tmpdir serverauth.XXXXXXXXXX` + trap "rm -f '$xserverauthfile'" HUP INT QUIT ILL TRAP BUS TERM + xauth -q -f "$xserverauthfile" << EOF + add :$dummy . $mcookie --- xinit-1.4.2.orig/debian/patches/series +++ xinit-1.4.2/debian/patches/series @@ -0,0 +1,3 @@ +001_debian_xinitrc.diff +03_debian_startx_manpage.diff +06_move_serverauthfile_into_tmp.diff --- xinit-1.4.2.orig/debian/rules +++ xinit-1.4.2/debian/rules @@ -0,0 +1,20 @@ +#!/usr/bin/make -f +# debian/rules for the Debian xutils package. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +%: + dh $@ --with quilt + +override_dh_auto_configure: + dh_auto_configure -- --with-xinitdir=/etc/X11/xinit \ + --with-xterm=/usr/bin/xterm + +override_dh_auto_install: + dh_auto_install --destdir=debian/tmp + +override_dh_fixperms: + dh_fixperms + chmod 0755 debian/xinit/etc/X11/xinit/xinitrc + chmod 0755 debian/xinit/etc/X11/xinit/xserverrc --- xinit-1.4.2.orig/debian/upstream/signing-key.asc +++ xinit-1.4.2/debian/upstream/signing-key.asc @@ -0,0 +1,59 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQGiBEab+moRBACDH5yKqS3wcc5bdxY7PBNuwKvF5TKMfagmSvuRDtZjjIIWaA/n +Z1KboV9Gq5g7kP7+Kfu+Qgd8u65eVsWwmPW10fXvj3aCU53glx2EdGdrHcgiyH2g +EQfPiyBw+trIppWFRV0IDXSLMA1FNC92t2nSG/VFHaPTVwcgkIRSfcXDvwCglGdE +a6f4uLqoNHP+m4yYnzapFuMD/R4+2AJDAvEWKDdYCGZzlawjAmmWyXrmT7/C/mx9 +8qUR473l4buXjHgDkkXXlHqdzil1vK85PhrKzNJDCCmlHUJNz+QwiAMOLwpD+kwV +Pb57RG7y+a5JQ5+jtVw4RlUxZIk/wj2An9YBO3A5vR7PdjM32ZJCN2+aM4dYfNzQ +xQKTA/47icvBaBVTl9rztjg2pd2Aqpc1P/GsIYLGj7XjnnJvGAENBHSH1QjpZMJG +CTS9oJ+B0/wrIr+pA+MdFgYAb6ojMQJOO6UChjWWSGjMFcs/CeXhxlLBido3DtAE +TbNTwO6OEfAvdosvTdhJFnwvZlJ+zZGGy5CrF2Fd9PUe9tmASbQoQWxhbiBDb29w +ZXJzbWl0aCA8YWxhbmNAZnJlZWRlc2t0b3Aub3JnPohoBBMRAgAoAhsDBgsJCAcD +AgYVCAIJCgsEFgIDAQIeAQIXgAUCUXnRYgUJFEPYeAAKCRCi+54IHy0TDonxAKCP +cAgXNojuujUg5Wqi6v0RBFVSUgCggq1SsVEdq9NDWvXvkeGyNaBivSK0K0FsYW4g +Q29vcGVyc21pdGggPGFsYW4uY29vcGVyc21pdGhAc3VuLmNvbT6IZgQTEQIAJgIb +AwYLCQgHAwIEFQIIAwQWAgMBAh4BAheABQJRedFiBQkUQ9h4AAoJEKL7nggfLRMO +6sUAn0jl3h9rY4OJ13Lu7nsKclyhDpOqAKCFgTmaDGRuDRxloLg9jftrn7a7vrQu +QWxhbiBDb29wZXJzbWl0aCA8YWxhbi5jb29wZXJzbWl0aEBvcmFjbGUuY29tPohr +BBMRAgArAhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAIZAQUCUXnRYgUJFEPY +eAAKCRCi+54IHy0TDtBZAJ9IgVVNoFIPRjTsNjcSFaLznuDRJgCcC/WgV312IrxS +Q8PRAyEgozSB9Ke5Ag0ERpv6bxAIAJp5aUlho5rUhpS6ik7spsAQFPRuycPKMNu0 +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 +=tc6G +-----END PGP PUBLIC KEY BLOCK----- --- xinit-1.4.2.orig/debian/watch +++ xinit-1.4.2/debian/watch @@ -0,0 +1,4 @@ +#git=git://anongit.freedesktop.org/xorg/app/xinit +version=3 +opts=pgpsigurlmangle=s/$/.sig/ \ +https://xorg.freedesktop.org/releases/individual/app/xinit-([\d\.]+)\.tar\.gz --- xinit-1.4.2.orig/debian/xinit.install +++ xinit-1.4.2/debian/xinit.install @@ -0,0 +1,4 @@ +usr/bin/* +usr/share/man/man1/* +etc/X11/xinit/xinitrc +debian/local/xserverrc etc/X11/xinit/ --- xinit-1.4.2.orig/debian/xinit.postinst +++ xinit-1.4.2/debian/xinit.postinst @@ -0,0 +1,32 @@ +#!/bin/sh +# postinst script for xinit +# +# see: dh_installdeb(1) + +set -e + +case "$1" in + configure) + if dpkg --compare-versions "$2" lt-nl "1.3.4-2~"; then + if ! dpkg-statoverride --list /etc/X11/xinit/xinitrc >/dev/null 2>&1 && \ + [ -e /etc/X11/xinit/xinitrc ]; then + chmod 0755 /etc/X11/xinit/xinitrc + fi + fi + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0