--- xinit-1.3.4.orig/debian/NEWS +++ xinit-1.3.4/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 http://wiki.debian.org/XStrikeForce/HowToRandR12 + + -- Brice Goglin Thu, 17 Jan 2008 20:49:45 +0100 --- xinit-1.3.4.orig/debian/README.source +++ xinit-1.3.4/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.3.4.orig/debian/changelog +++ xinit-1.3.4/debian/changelog @@ -0,0 +1,504 @@ +xinit (1.3.4-3ubuntu0.1) xenial; urgency=medium + + * postinst: Check that xinitrc exists before trying to chmod it. (LP: + #1562033) + + -- Timo Aaltonen Fri, 22 Apr 2016 06:53:18 +0300 + +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.3.4.orig/debian/compat +++ xinit-1.3.4/debian/compat @@ -0,0 +1 @@ +9 --- xinit-1.3.4.orig/debian/control +++ xinit-1.3.4/debian/control @@ -0,0 +1,32 @@ +Source: xinit +Section: x11 +Priority: optional +Maintainer: Debian X Strike Force +Uploaders: Cyril Brulebois +Build-Depends: + debhelper (>= 9), + dh-autoreconf, + pkg-config, + libx11-dev (>= 2:1.0.0), + quilt, + automake, + x11proto-core-dev (>= 7.0.17), + xutils-dev (>= 1:7.7+3), +Standards-Version: 3.9.6 +Vcs-Git: git://anonscm.debian.org/pkg-xorg/app/xinit +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-xorg/app/xinit.git + +Package: xinit +Architecture: any +Depends: + ${shlibs:Depends}, + ${misc:Depends}, + coreutils (>= 7.4-1), + 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.3.4.orig/debian/copyright +++ xinit-1.3.4/debian/copyright @@ -0,0 +1,24 @@ +This package was downloaded from +http://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.3.4.orig/debian/local/xserverrc +++ xinit-1.3.4/debian/local/xserverrc @@ -0,0 +1,3 @@ +#!/bin/sh + +exec /usr/bin/X -nolisten tcp "$@" --- xinit-1.3.4.orig/debian/patches/001_debian_xinitrc.diff +++ xinit-1.3.4/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.3.4.orig/debian/patches/02_startx_hostname.diff +++ xinit-1.3.4/debian/patches/02_startx_hostname.diff @@ -0,0 +1,32 @@ +--- + startx.cpp | 15 +++++++-------- + 1 file changed, 7 insertions(+), 8 deletions(-) + +--- a/startx.cpp ++++ b/startx.cpp +@@ -245,18 +245,17 @@ if [ x"$enable_xauth" = x1 ] ; then + removelist= + + XCOMM set up default Xauth info for this machine +- case `uname` in +- Linux*) ++ ++ XCOMM check for GNU hostname ++ if hostname --version > /dev/null 2>&1; then + if [ -z "`hostname --version 2>&1 | grep GNU`" ]; then + hostname=`hostname -f` +- else +- hostname=`hostname` + fi +- ;; +- *) ++ fi ++ ++ if [ -z "$hostname" ]; then + hostname=`hostname` +- ;; +- esac ++ fi + + authdisplay=${display:-:0} + #if defined(HAS_COOKIE_MAKER) && defined(MK_COOKIE) --- xinit-1.3.4.orig/debian/patches/03_debian_startx_manpage.diff +++ xinit-1.3.4/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 +@@ -93,6 +93,28 @@ looks for the following files, in order: + .. + .if !'x.__SCOMAN__'x.' .ig + .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 looks for a file called +@@ -135,38 +157,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.3.4.orig/debian/patches/06_move_serverauthfile_into_tmp.diff +++ xinit-1.3.4/debian/patches/06_move_serverauthfile_into_tmp.diff @@ -0,0 +1,18 @@ +Move startx auth files in /tmp so they are removed on reboot. +http://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 +@@ -274,7 +274,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 KILL BUS TERM + xauth -q -f "$xserverauthfile" << EOF + add :$dummy . $mcookie --- xinit-1.3.4.orig/debian/patches/07_Pass-keeptty-on-current-tty.patch +++ xinit-1.3.4/debian/patches/07_Pass-keeptty-on-current-tty.patch @@ -0,0 +1,32 @@ +From bd6cacdd36615e9b8136aeb86c3924a404785977 Mon Sep 17 00:00:00 2001 +From: Hans de Goede +Date: Tue, 20 Jan 2015 16:18:34 +0100 +Subject: startx: Pass -keeptty when telling the server to start on the current + tty + +Detaching from the tty causes systemd-logind to refuse service to the xserver, +the xserver already tries to detect that it is being asked to run on the +current tty and then automatically enables -keeptty, but this code fails if +all of stdin, stdout and stderr are redirected to a file. So explicitly tell +the xserver to not detach when we're telling it to run on the current tty. + +BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=1177513 +Signed-off-by: Hans de Goede +Acked-by: Peter Hutterer + +diff --git a/startx.cpp b/startx.cpp +index 1c6fce0..45d7bd9 100644 +--- a/startx.cpp ++++ b/startx.cpp +@@ -195,7 +195,7 @@ if [ x"$server" = x ]; then + tty=$(tty) + if expr match "$tty" '^/dev/tty[0-9]\+$' > /dev/null; then + tty_num=$(echo "$tty" | grep -oE '[0-9]+$') +- vtarg="vt$tty_num" ++ vtarg="vt$tty_num -keeptty" + fi + #endif + +-- +cgit v0.10.2 + --- xinit-1.3.4.orig/debian/patches/08_pick-free-display.patch +++ xinit-1.3.4/debian/patches/08_pick-free-display.patch @@ -0,0 +1,31 @@ +commit e07fa99039c0f63ed8f0b142e546ef102321fca0 +Author: Hans de Goede +Date: Fri Mar 20 14:25:44 2015 +0100 + + startx: Fix startx picking an already used display number when -nolock is used + + Currently startx relies on /tmp/.X?-lock being present for automatically + picking a free display number. This does not work if -nolock is used when + starting the server, or if the server is started with -displayfd as -displayfd + implies -nolock. + + This is becoming a problem now that -displayfd is getting used by + display-managers (e.g. gdm), this fixes this by also checking for + /tmp/.X11-unix/X? + + Signed-off-by: Hans de Goede + Reviewed-by: Peter Hutterer + +diff --git a/startx.cpp b/startx.cpp +index cc8be90..a9d477b 100644 +--- a/startx.cpp ++++ b/startx.cpp +@@ -120,7 +120,7 @@ enable_xauth=1 + XCOMM Automatically determine an unused $DISPLAY + d=0 + while true ; do +- [ -e /tmp/.X$d-lock ] || break ++ [ -e "/tmp/.X$d-lock" -o -S "/tmp/.X11-unix/X$d" ] || break + d=$(($d + 1)) + done + defaultdisplay=":$d" --- xinit-1.3.4.orig/debian/patches/series +++ xinit-1.3.4/debian/patches/series @@ -0,0 +1,6 @@ +001_debian_xinitrc.diff +02_startx_hostname.diff +03_debian_startx_manpage.diff +06_move_serverauthfile_into_tmp.diff +07_Pass-keeptty-on-current-tty.patch +08_pick-free-display.patch --- xinit-1.3.4.orig/debian/rules +++ xinit-1.3.4/debian/rules @@ -0,0 +1,23 @@ +#!/usr/bin/make -f +# debian/rules for the Debian xutils package. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +%: + dh $@ --with autoreconf,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_install: + dh_install --list-missing + +override_dh_fixperms: + dh_fixperms + chmod 0755 debian/xinit/etc/X11/xinit/xinitrc + chmod 0755 debian/xinit/etc/X11/xinit/xserverrc --- xinit-1.3.4.orig/debian/watch +++ xinit-1.3.4/debian/watch @@ -0,0 +1,3 @@ +#git=git://anongit.freedesktop.org/xorg/app/xinit +version=3 +http://xorg.freedesktop.org/releases/individual/app/xinit-([\d\.]+)\.tar\.gz --- xinit-1.3.4.orig/debian/xinit.install +++ xinit-1.3.4/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.3.4.orig/debian/xinit.postinst +++ xinit-1.3.4/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