--- xserver-xorg-video-s3-0.6.3.orig/autogen.sh +++ xserver-xorg-video-s3-0.6.3/autogen.sh @@ -0,0 +1,12 @@ +#! /bin/sh + +srcdir=`dirname $0` +test -z "$srcdir" && srcdir=. + +ORIGDIR=`pwd` +cd $srcdir + +autoreconf -v --install || exit 1 +cd $ORIGDIR || exit $? + +$srcdir/configure --enable-maintainer-mode "$@" --- xserver-xorg-video-s3-0.6.3.orig/ChangeLog +++ xserver-xorg-video-s3-0.6.3/ChangeLog @@ -1,133 +1,474 @@ -2009-06-25 Evgeny M. zubok +commit d096fd94d8064a08895d34f978830240bfdc9616 +Author: Dave Airlie +Date: Thu Jul 30 12:04:29 2009 +1000 - * src/s3_driver.c: - Revert the old behaviour when the BIOS settings are used for - intialization of DRAM/VRAM timings, i. e. we don't touch the - timings during initialization phase until any memory option (like - slow_edodram) is specified. - - Add manual page. + s3: bump for release 0.6.3 -2009-05-25 Evgeny M. Zubok - - * src/s3_driver.c: - * src/s3_video.c: - - Enable Xv extension for Trio64V+ (thanks to Egor Ivanov for - testing on real hardware) and Trio64UV+ (Tested only on Trio64V2 by - overriding Chipset with "Trio64UV+" but not on real hardware). +commit 3e974443b5b2906d1b82b7c27c83062715f925e9 +Author: Dave Airlie +Date: Tue Jul 28 15:22:41 2009 +1000 - S3 Trio64V+ now using NewMMIO. Trio64V+ chips have the same ChipId - as Trio32/64 but only with chip revision greater or eq 0x40. So if - you have problems with NewMMIO, you may override ChipRev in "Device" - section of your xorg.conf: "ChipRev" 0x00. Note: disabling the NewMMIO - also disables overlay video (Xv) because it isn't implemented for - Old MMIO yet. - -2009-05-04 Evgeny M. Zubok + s3: change to using ABI version check - * src/s3_driver.c: - * src/s3_shadow.c: +commit f047dffb193ffc52a358bfb0a3ae595acf4726b2 +Author: Dave Airlie +Date: Tue Jul 28 10:49:36 2009 +1000 - Add shadowFB option. It can be used to speedup drawing when - hardware acceleration is undesirable or unavailable (for colour depth - 24 with 24 bpp framebuffer, for example). shadowFB is disabled by - default. Enabling shadowFB option disables HW acceleration. Thanks - to Egor Ivanov for initial porting of shadowFB from s3virge. + s3: fixup resources under pci access - Interlace mode support. +commit b8d3e448a8debbc2c77dee8e590a564a010ede59 +Author: Dave Airlie +Date: Tue Jul 28 10:48:48 2009 +1000 - Close bug #14999. - -2008-07-06 Evgeny M. Zubok + s3: remove unneeded include - * src/s3_video.c: +commit c5c69f9de5d11fd2cadc4ccf00bcf2e8cf65f2eb +Author: Dave Airlie +Date: Tue Jul 28 10:03:14 2009 +1000 - Streams Processor initialization. + s3: switch to using config pci entity instead of active - XVideo support for 16, 24 and 32 bpp (only for TRIO64V2). +commit c41a1188ce53b8975e6d5c34c54a77a3f3c291bc +Author: Adam Hoka +Date: Sun Jul 5 22:01:46 2009 +0200 - * src/s3_driver.c: + Handle libpciaccess errors more gently and report any problems + encountered in Xorg.log (server crash versus log entry). + + This fixes PR 22510. Report and fix by Adam Hoka , + many thanks. + + Reviewed-by: Matthieu Herrb + Signed-off-by: Marc Balmer - Add XVideo option (enabled by default). +commit aa955eda7b6fddd12b163ee66367ecc998f82ae0 +Author: Adam Jackson +Date: Thu Jul 2 11:33:54 2009 -0400 - Replace "swcursor" by "hwcursor" option (HW cursor - not implemented yet for all chipsets). + s3 0.6.2 - Close bug #5527: 24-bit colour depth support (24bpp and - 32bpp framebuffer) for TRIOs. Acceleration doesn't work - with packed colour mode (24 bpp FB) but works with 32bpp - framebuffer mode (hardware limitation? -- need data). +commit 2b83d07b90efd15756cf8c4c80f7f60c0e7cee2a +Author: Evgeny M. Zubok +Date: Thu Jun 25 19:48:34 2009 +0400 - Fix system hang-up when switching between console and X session. + Revert the using of BIOS defaults for the VRAM/DRAM timings - Some minor changes of driver messages. +commit bf6bdcc1220f3ed8c636e869c4b13e27923a139e +Author: Evgeny M. Zubok +Date: Thu Jun 25 01:57:06 2009 +0400 -2008-02-23 Evgeny M. Zubok + Add manual page. - * src/s3_driver.c: Add DPMS support for S3 Trio64V2 and possibly - others (need testing): S3 Trio64UV+. S3 Aurora64V+ and S3 Trio32/64 - * src/s3_Trio64DAC: Change clocks for S3 Trio64V2 to make - the 1024x768@16bpp mode work. - Thanks to Richard Driscoll for these patches. - -2006-04-07 Adam Jackson +commit 003d36e18e32b656c1dc309c5238fa5b4804c58e +Author: Adam Jackson +Date: Thu May 28 15:14:38 2009 -0400 - * configure.ac: - * src/s3.h: - Bump to 0.4.1 for Xv changes. + Remove useless loader symbol lists. -2006-04-07 Aaron Plattner +commit 061d5f51141323ea2f4e8e597e3d4bd7e3b7cbfa +Author: Evgeny M. Zubok +Date: Mon May 25 14:34:27 2009 +0400 - * src/s3_video.c: (S3PutImage): - Add a DrawablePtr argument to the XV functions to pave the way for - redirected video. + Trio64V+ now using NewMMIO. Enable Xv for Trio64V+ and Trio64UV+ -2006-04-07 Adam Jackson +commit a1d6d9bec68c3bf47af69b73c875836bc46db3a1 +Author: Evgeny M. Zubok +Date: Mon May 4 15:10:17 2009 +0400 - * configure.ac: - * src/s3.h: - * src/s3_IBMRGB.c: - * src/s3_Ti.c: - * src/s3_Trio64DAC.c: - * src/s3_bios.c: - * src/s3_cursor.c: - * src/s3_dga.c: - * src/s3_driver.c: - * src/s3_video.c: - Unlibcwrap. Bump server version requirement. Bump to 0.4.0. + shadowFB option. Interlace mode support. Close bug #14999. -2005-12-20 Kevin E. Martin +commit dd2e8e7a5f0bbb0f6fc3cb32161a0024545179bc +Author: Alan Coopersmith +Date: Wed Apr 29 18:48:52 2009 -0700 - * configure.ac: - Update package version for X11R7 release. + Raise minimum xorg-server required to 1.4 for miGetPointerPosition + + Signed-off-by: Alan Coopersmith -2005-12-14 Kevin E. Martin +commit 1fdb00594ed3ea18cb24e19f23813e9cc495fda3 +Author: Alan Coopersmith +Date: Fri Jan 30 20:59:25 2009 -0800 - * configure.ac: - Update package version number for final X11R7 release candidate. + Add README with pointers to mailing list, bugzilla & git repos -2005-12-03 Kevin E. Martin +commit 695868128746b7d8545fd78d1c42ebc2eac00a75 +Author: Dave Airlie +Date: Mon Dec 22 15:30:39 2008 +1000 - * configure.ac: - Update package version number for X11R7 RC3 release. + s3: fix build by including inputstr.h -2005-12-01 Kevin E. Martin +commit 51e77345fdb5423db233f26d6af4af36887c7059 +Author: Dave Airlie +Date: Mon Dec 22 15:25:45 2008 +1000 - * configure.ac: - Remove extraneous AC_MSG_RESULT. + s3 0.6.1 -2005-11-29 Adam Jackson +commit 115436e1ec83e43b1e7727903036720cb109abef +Author: Andrew Randrianasulu +Date: Mon Nov 24 12:46:48 2008 -0500 - * configure.ac: - Only build dlloader modules by default. + Fix typo in map setup + + fixes bug 18688 -2005-11-09 Kevin E. Martin +commit ef1ca4800ee75044243d0eb2346240c50c28f0aa +Author: Adam Jackson +Date: Fri Aug 15 14:07:28 2008 -0400 - * configure.ac: - Update package version number for X11R7 RC2 release. + Uninclude xf86Version.h -2005-11-01 Kevin E. Martin +commit 565c1ad65277080968c188a635dfd743be7ea2a3 +Author: Paulo Cesar Pereira de Andrade +Date: Thu Jul 17 18:54:17 2008 -0300 - * configure.ac: - Update pkgcheck dependencies to work with separate build roots. + Correct unresolved symbol and incorrect assignment. + + Function miPointerPosition is deprecated and not available anymore. + Correct "if (test = value)" -> "if (test == value)". + +commit 2128de2ad9fa67537d8ed56ff173b8a7b0422e0e +Author: Evgeny M. Zubok +Date: Mon Jul 7 14:31:10 2008 -0400 + + S3: various fixes + + * src/s3_video.c: + + Streams Processor initialization. + + XVideo support for 16, 24 and 32 bpp (only for TRIO64V2). + + * src/s3_driver.c: + + Add XVideo option (enabled by default). + + Replace "swcursor" by "hwcursor" option (HW cursor + not implemented yet for all chipsets). + + Close bug #5527: 24-bit colour depth support (24bpp and + 32bpp framebuffer) for TRIO64V2. Acceleration doesn't work + with packed colour mode (24 bpp FB) but works with 32bpp + framebuffer mode (hardware limitation? -- need data). + + Fix system hang-up when switching between console and X session. + + Some minor changes of driver messages. + +commit 7edc59e33bfa152e124bc8dd25f7fc4b22e44bd8 +Author: Adam Jackson +Date: Wed Mar 19 15:00:28 2008 -0400 + + s3 0.6.0 + +commit 081bf87a55b65f12d0339b4f48a13b8113661dc7 +Author: Adam Jackson +Date: Wed Mar 19 14:55:06 2008 -0400 + + Fix distcheck + +commit 773959298037b5b86e87d0fed530f1924d5d2208 +Author: Adam Jackson +Date: Wed Mar 19 14:53:10 2008 -0400 + + Death to RCS tags. + +commit a0d6e3ff590f3704918339dc2b9aa0f820b24b75 +Author: Dave Airlie +Date: Mon Mar 10 11:47:10 2008 +1000 + + s3: pciaccess conversion + +commit 7985d0148c766475c04f8481b0a9ddcea807d990 +Author: Evgeny M. Zubok +Date: Mon Feb 25 11:52:09 2008 -0500 + + Add non-vbe DPMS support for TRIOs, adjust max clock on Trio64V2 + +commit 4cf015311015b0e2267d7195c3795a337a466508 +Author: Brice Goglin +Date: Tue Aug 7 12:50:34 2007 +0200 + + Define VERSION* using PACKAGE_VERSION* + +commit 9465c594e919bd2ac3e41ac96e72a432daf81fa7 +Author: Alan Coopersmith +Date: Tue Jan 9 19:33:45 2007 -0800 + + Was previously done in monolith Imakefile as: + SpecialCObjectRule(s3_video,$(_NOOP_), -DS3_NEWMMIO) + + Needed to get definitions of GET_PSTREAM_*, GET_SSTREAM_*, etc. + +commit 3470935b099daed7ed2a31791267b9087672f3f7 +Author: Alan Coopersmith +Date: Tue Jan 9 19:30:36 2007 -0800 + + renamed: .cvsignore -> .gitignore + +commit 658f0fcdb9d6494c99dcb9bf61b8f8d3ba830618 +Author: Alex Deucher +Date: Mon Nov 27 14:20:10 2006 -0500 + + bump version for release + +commit d4ce4d3f91690a61511b2d13943e5d0073917377 +Author: Evgeny M. Zubok +Date: Sat Nov 25 23:35:28 2006 -0500 + + full fix for older cards. + +commit 1f2426bf8aad082f6f232d3b8c497acdd9892810 +Author: Evgeny M. Zubok +Date: Thu Nov 23 13:36:04 2006 -0500 + + Make S3 driver work again. Bug 7112. + +commit 921ff3112b0fa7ca95e9ef16d4ac980f86138594 +Author: Adam Jackson +Date: Sat Apr 8 01:39:50 2006 +0000 + + Bump to 0.4.1 for Xv changes. + +commit 0dd4f7377699b4d31a0cf34cc95a0bc8ae9a9391 +Author: Aaron Plattner +Date: Fri Apr 7 23:11:42 2006 +0000 + + Add a DrawablePtr argument to the XV functions to pave the way for + redirected video. + +commit df44e7c257fdf15aa30c6b49d3a6116c01e396e4 +Author: Adam Jackson +Date: Fri Apr 7 19:51:30 2006 +0000 + + Unlibcwrap. Bump server version requirement. Bump to 0.4.0. + +commit 6adde374f8c1a1fd6573262d83e2810e5193c538 +Author: Kevin E Martin +Date: Wed Dec 21 02:30:01 2005 +0000 + + Update package version for X11R7 release. + +commit c5d01fca0fb8c72dd69766eae41659bf4e6cb50e +Author: Adam Jackson +Date: Mon Dec 19 16:25:54 2005 +0000 + + Stub COPYING files + +commit 18c0c40ce5f8142db7b12835f3c4dadcbbd063d5 +Author: Kevin E Martin +Date: Thu Dec 15 00:24:18 2005 +0000 + + Update package version number for final X11R7 release candidate. + +commit d992241a8afda96025bae85fcc6d26132c5372ae +Author: Kevin E Martin +Date: Sat Dec 3 05:49:34 2005 +0000 + + Update package version number for X11R7 RC3 release. + +commit 8d185b334f89baccc9d1ba288c43099d420162bd +Author: Kevin E Martin +Date: Fri Dec 2 02:16:09 2005 +0000 + + Remove extraneous AC_MSG_RESULT. + +commit a8e40603f6f12adc12c85c3f6e2e16df661381ab +Author: Adam Jackson +Date: Tue Nov 29 23:30:02 2005 +0000 + + Only build dlloader modules by default. + +commit be33c9a629feb4795006550e916cb1f27b4da69f +Author: Eric Anholt +Date: Mon Nov 21 10:49:17 2005 +0000 + + Add .cvsignores for drivers. + +commit 610b28959e0222e652c826aebae4de4bd08b60da +Author: Kevin E Martin +Date: Wed Nov 9 21:15:20 2005 +0000 + + Update package version number for X11R7 RC2 release. + +commit 74b42054bf14a29df6629b4f3b295dd4f1f448ed +Author: Kevin E Martin +Date: Tue Nov 1 15:08:54 2005 +0000 + + Update pkgcheck depedencies to work with separate build roots. + +commit fe34c3a53ea040fb07de1edb0d0b5efba271c2ad +Author: Kevin E Martin +Date: Wed Oct 19 02:48:04 2005 +0000 + + Update package version number for RC1 release. + +commit 8af9770f05b485d9016a2f46a65423075091bc9b +Author: Alan Coopersmith +Date: Mon Oct 17 00:09:04 2005 +0000 + + Use sed & cpp to substitute variables in driver man pages + +commit 527b5f01b56106ee43e1fdfec34a8da4a9cd250f +Author: Daniel Stone +Date: Thu Aug 18 09:03:48 2005 +0000 + + Update autogen.sh to one that does objdir != srcdir. + +commit 1304f6f06236eac7fc8b1c426ee3c67c88a9e4e5 +Author: Kevin E Martin +Date: Fri Jul 29 21:22:44 2005 +0000 + + Various changes preparing packages for RC0: + - Verify and update package version numbers as needed + - Implement versioning scheme + - Change bug address to point to bugzilla bug entry form + - Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to + reenable it) + - Fix makedepend to use pkgconfig and pass distcheck + - Update build script to build macros first + - Update modular Xorg version + +commit 7a4f0abfbb2d38e58b402d64c73c5e8b8f7ceed5 +Author: Søren Sandmann Pedersen +Date: Tue Jul 26 18:46:49 2005 +0000 + + Build system for s3 + +commit f53881d942bcd463127d2e5bef18e6e422d361c4 +Author: Adam Jackson +Date: Mon Jul 11 02:29:58 2005 +0000 + + Prep for modular builds by adding guarded #include "config.h" everywhere. + +commit b826671f9e2dc702ab8537deb33f51fa7ede9c57 +Author: Daniel Stone +Date: Fri Jul 1 22:43:12 2005 +0000 + + Change all misc.h and os.h references to . + +commit 807527511814ff314c16d3c611d58a10d21c3369 +Author: Adam Jackson +Date: Sat Jun 25 21:16:55 2005 +0000 + + Bug #3626: _X_EXPORT tags for video and input drivers. + +commit 74df74c1f8b49e71e495af5ccad77600fd783f23 +Author: Daniel Stone +Date: Wed Apr 20 12:25:29 2005 +0000 + + Fix includes right throughout the Xserver tree: + change "foo.h" to for core headers, e.g. X.h, Xpoll.h; + change "foo.h", "extensions/foo.h" and "X11/foo.h" to + for extension headers, e.g. Xv.h; + change "foo.[ch]" to for Xtrans files. + +commit 0147cb45138ccd06477dc7f973ae20c1405f2bf5 +Author: Alex Deucher +Date: Sun Oct 17 20:29:32 2004 +0000 + + - Add interlaced support to S3 driver (bug 332, Leo Savernik) + - EmulateWheelTimeout (bug 323, Mathias Fröhlich) + - single button double-click (bug 322, Rob Brown) + +commit b66a0081cec6427604758371907ac6c7dca532a3 +Author: Adam Jackson +Date: Fri Sep 17 03:04:53 2004 +0000 + + Bug #1192: Remove cfb support from drivers where its use is an option. + Delete xf24_32bpp, as s3virge was the last user. Fix up some comments + to refer to fb rather than cfb. + +commit 73537025414eb20771ee2337cf60016daafc0fc9 +Author: Adam Jackson +Date: Mon Aug 16 09:13:14 2004 +0000 + + Bug #1087: Make sure all the *Weak symbols are documented in the import + list, so the loader knows not to complain about unresolved symbols when + an optional module isn't loaded. This typically manifests as warnings + about fbdevHW symbols when the user isn't using the framebuffer + console. + +commit c431a14b6be0d9071b0fc95121260b33ab598f75 +Author: Adam Jackson +Date: Tue Aug 3 02:44:21 2004 +0000 + + Bug #962: Remove LoaderSymbol calls introduced by the dlloader work so + DoLoadableServer NO builds work again. + +commit d5c13acdc525296f3dd7b7fc99737be2423c1a01 +Author: Adam Jackson +Date: Fri Jul 30 20:30:54 2004 +0000 + + Bug #400 (partial): Driver fixes for the dlloader. When using dlloader, all + framebuffer formats except cfb and the overlay modes should work, and + r128 and radeon need to be loaded from the ati driver (both issues to + be fixed soon). Tested on i740, s3virge, mach64, tdfx, vesa, and vga + drivers. elfloader users shouldn't be affected. + +commit 1c466ae7996c3b3e7d3dba87458a056452bd3601 +Author: Eric Anholt +Date: Wed Jun 16 09:23:31 2004 +0000 + + DRI XFree86-4_3_99_12-merge import + +commit b1069acf6e9345c44f2a3cf7378590162e947042 +Author: Egbert Eich +Date: Wed May 26 16:24:09 2004 +0000 + + Fixing setting of physical framebuffer base for several drivers. C&T + driver: Fixed setting of minimal clocks for HiQV chipsets. Neomagic + driver: improved support for lowres double scan modes. + +commit 143b16b20caba7c6f61784752b2ce766441ce170 +Author: Egbert Eich +Date: Fri Apr 23 19:43:14 2004 +0000 + + Merging XORG-CURRENT into trunk + +commit c690296c3a9ea42e3beb8b97b2fe4654b5f0b7f7 +Author: Egbert Eich +Date: Sun Mar 14 08:33:31 2004 +0000 + + Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004 + +commit 55979da7b2d78bc8a2e85d0544d49801640e2617 +Author: Egbert Eich +Date: Wed Mar 3 12:12:23 2004 +0000 + + Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004 + +commit 05d3ef930b8b6dfde1eb4a272ad97e44625d9faf +Author: Egbert Eich +Date: Thu Feb 26 13:35:54 2004 +0000 + + readding XFree86's cvs IDs + +commit ce44f2000de918df33fa355aaccf3f4aaa82762c +Author: Egbert Eich +Date: Thu Feb 26 09:23:23 2004 +0000 + + Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004 + +commit 44cec492e6684d44e3ddcee0570bf3c72b9e07e3 +Author: Kaleb Keithley +Date: Thu Dec 4 22:03:18 2003 +0000 + + XFree86 4.3.99.901 (RC 1) + +commit 22ef8a01ef4b9d7d9ce62e3646a8309f0d789e1f +Author: Kaleb Keithley +Date: Tue Nov 25 19:28:38 2003 +0000 + + XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks + +commit 7a758184cd0a922e87909ccc54375a52bed792b8 +Author: Kaleb Keithley +Date: Fri Nov 14 16:48:55 2003 +0000 + + XFree86 4.3.0.1 + +commit b8772dfb095f92bdedafae787f74a099182a4594 +Author: Kaleb Keithley +Date: Fri Nov 14 16:48:55 2003 +0000 + + Initial revision --- xserver-xorg-video-s3-0.6.3.orig/debian/xserver-xorg-video-s3.links +++ xserver-xorg-video-s3-0.6.3/debian/xserver-xorg-video-s3.links @@ -0,0 +1 @@ +usr/share/bug/xserver-xorg-core/script usr/share/bug/xserver-xorg-video-s3/script --- xserver-xorg-video-s3-0.6.3.orig/debian/copyright +++ xserver-xorg-video-s3-0.6.3/debian/copyright @@ -0,0 +1,25 @@ +This package was downloaded from +http://xorg.freedesktop.org/releases/individual/driver/ + + Copyright 2001 Ani Joshi + + XFree86 4.x driver for S3 chipsets + + +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 and +that the name of Ani Joshi not be used in advertising or +publicity pertaining to distribution of the software without specific, +written prior permission. Ani Joshi makes no representations +about the suitability of this software for any purpose. It is provided +"as-is" without express or implied warranty. + +ANI JOSHI DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +EVENT SHALL ANI JOSHI BE LIABLE FOR ANY SPECIAL, INDIRECT OR +CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +PERFORMANCE OF THIS SOFTWARE. --- xserver-xorg-video-s3-0.6.3.orig/debian/README.source +++ xserver-xorg-video-s3-0.6.3/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 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. --- xserver-xorg-video-s3-0.6.3.orig/debian/compat +++ xserver-xorg-video-s3-0.6.3/debian/compat @@ -0,0 +1 @@ +5 --- xserver-xorg-video-s3-0.6.3.orig/debian/control +++ xserver-xorg-video-s3-0.6.3/debian/control @@ -0,0 +1,41 @@ +Source: xserver-xorg-video-s3 +Section: x11 +Priority: optional +Maintainer: Debian X Strike Force +Uploaders: David Nusinow , Julien Cristau , Brice Goglin +Build-Depends: + debhelper (>= 5.0.0), + pkg-config, + xserver-xorg-dev (>= 2:1.7), + x11proto-video-dev, + x11proto-core-dev, + x11proto-fonts-dev, + x11proto-randr-dev, + x11proto-render-dev, + x11proto-xext-dev, + dpkg-dev (>= 1.14.17), + automake, + libtool, + xutils-dev +Standards-Version: 3.8.3 +Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-s3 +Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-s3.git + +Package: xserver-xorg-video-s3 +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends} +Provides: ${xviddriver:Provides} +Replaces: xserver-xorg (<< 6.8.2-35), xserver-xorg-driver-s3 +Conflicts: xserver-xorg-driver-s3 +Description: X.Org X server -- legacy S3 display driver + This package provides the driver for certain legacy S3 video card chipsets, + including the Trio64 and 96x cards. It does not provide support for + ViRGE/Trio3D or Savage chipsets; support for these cards is provided by + xserver-xorg-video-s3virge and xserver-xorg-driver-savage, respectively. + . + More information about X.Org can be found at: + + + + . + This package is built from the X.org xf86-video-s3 driver module. --- xserver-xorg-video-s3-0.6.3.orig/debian/watch +++ xserver-xorg-video-s3-0.6.3/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://xorg.freedesktop.org/releases/individual/driver/ xf86-video-s3-(.*)\.tar\.gz --- xserver-xorg-video-s3-0.6.3.orig/debian/changelog +++ xserver-xorg-video-s3-0.6.3/debian/changelog @@ -0,0 +1,226 @@ +xserver-xorg-video-s3 (1:0.6.3-1) experimental; urgency=low + + [ Brice Goglin ] + * Remove 01_gen_pci_ids.diff. The X server now uses an internal table to + choose a driver during autoconfiguration. + + Disable patch system and remove quilt from build-deps. + + [ Timo Aaltonen ] + * New upstream release. + * Bump Standards-Version to 3.8.3. + * Build against Xserver 1.7. + + [ Cyril Brulebois ] + * Upload to experimental. + + -- Cyril Brulebois Sun, 06 Dec 2009 02:00:55 +0100 + +xserver-xorg-video-s3 (1:0.6.2-1) unstable; urgency=low + + * Add README.source, bump Standards-Version to 3.8.2. + * New upstream release. + + Fix 24bits support (for Virtual PC 2007), closes: #470408. + * Install the s3.4 manpage, closes: #374059. + + -- Brice Goglin Mon, 20 Jul 2009 18:42:04 +0200 + +xserver-xorg-video-s3 (1:0.6.1-2) unstable; urgency=low + + * Upload to unstable. + + -- Julien Cristau Thu, 09 Apr 2009 11:10:16 +0100 + +xserver-xorg-video-s3 (1:0.6.1-1) experimental; urgency=low + + * New upstream release. + * Build against xserver 1.6 rc1. + * Allow parallel builds. + * Run autoreconf on build; add build-deps on automake, libtool and + xutils-dev. + * Add myself to Uploaders. + + -- Brice Goglin Wed, 04 Feb 2009 07:47:57 +0100 + +xserver-xorg-video-s3 (1:0.6.0-2) experimental; urgency=low + + * Build against xserver 1.5. + + -- Julien Cristau Fri, 05 Sep 2008 02:00:17 +0200 + +xserver-xorg-video-s3 (1:0.6.0-1) unstable; urgency=low + + [ Brice Goglin ] + * Add upstream URL to debian/copyright. + + [ Julien Cristau ] + * New upstream release. + * Refresh 01_gen_pci_ids.diff. + * Remove Branden from Uploaders with his permission. + * Bump Standards-Version to 3.7.3. + * Drop the XS- prefix from Vcs-* control fields. + * Add myself to Uploaders. + * Run dpkg-shlibdeps with --warnings=6. Drivers reference symbols from + /usr/bin/Xorg and other modules, and that's not a bug, so we want + dpkg-shlibdeps to shut up about symbols it can't find. Build-depend on + dpkg-dev >= 1.14.17. + + -- Julien Cristau Fri, 06 Jun 2008 11:57:22 +0200 + +xserver-xorg-video-s3 (1:0.5.0-4) unstable; urgency=low + + * Upload to unstable + + -- David Nusinow Sun, 16 Sep 2007 15:43:47 -0400 + +xserver-xorg-video-s3 (1:0.5.0-3) experimental; urgency=low + + * Build against xserver 1.4 and build-dep on it as well + * Add 01_gen_pci_ids.diff. This patch provides a set of PCI id's supported + by this driver so that the server can automatically load it + + -- David Nusinow Thu, 13 Sep 2007 20:50:28 -0400 + +xserver-xorg-video-s3 (1:0.5.0-2) unstable; urgency=low + + [ Timo Aaltonen ] + * Replaces/Conflicts: xserver-xorg-driver-s3. + + [ Brice Goglin ] + * Install the upstream changelog. + * Bump Build-Depends: xserver-xorg-dev to >= 2:1.2.99.902 + (needed to let xsfbs get access to serverminver). + * Add XS-Vcs-*. + * Add a link to www.X.org and a reference to the xf86-video-s3 + module in the long description. + + -- Julien Cristau Wed, 02 May 2007 14:58:44 +0200 + +xserver-xorg-video-s3 (1:0.5.0-1) experimental; urgency=low + + * New upstream release plus fixes from upstream + * Remove obsolete 01_enable_new_mmio.diff + * Generate server dependencies automatically from the ABI + + -- David Nusinow Wed, 28 Feb 2007 23:21:48 -0500 + +xserver-xorg-video-s3 (1:0.4.1-5) unstable; urgency=low + + [ Julien Cristau ] + * Add link to xserver-xorg-core bug script, so that bugreports contain + the user's config and log files. + * Bump dependency on xserver-xorg-core to >= 2:1.1.1-11, as previous + versions don't have the bug script. + + [ David Nusinow ] + * Replace old 01_enable_new_mmio.diff with new patch that doesn't break old + chips that don't have the new mmio scheme. Thanks Eugene Konev for + pointing out the problem and Evgeny M. Zubok for writing the patch. + Closes: #377386 + + -- David Nusinow Sat, 25 Nov 2006 14:07:01 -0500 + +xserver-xorg-video-s3 (1:0.4.1-4) unstable; urgency=low + + [ Drew Parsons ] + * Provides: xserver-xorg-video-1.0. Closes: #362883. + + [ David Nusinow ] + * Add 01_enable_new_mmio.diff for a define that was lost in the move to 7.1. + Thanks Anton Martchukov for the report and Evgeny M. Zubok for the patch. + Closes: #377386 + * Remove Fabio from uploaders with his permission. He's always welcome back. + * Bump standards version to 3.7.2.2. No changes necessary. + * Exclude s3_drv.la from dh_install + + -- David Nusinow Sat, 7 Oct 2006 22:37:01 -0400 + +xserver-xorg-video-s3 (1:0.4.1-3) unstable; urgency=low + + [ Steve Langasek ] + * Upload to unstable + + -- David Nusinow Mon, 18 Sep 2006 19:57:47 -0400 + +xserver-xorg-video-s3 (1:0.4.1-2) experimental; urgency=low + + [ Drew Parsons ] + * Provides: xserver-xorg-video-1.0 not xserver-xorg-video. + + [ David Nusinow ] + * Bump xserver (build-)depends epochs to 2: to deal with botched + server upload + + -- David Nusinow Tue, 22 Aug 2006 23:46:37 +0000 + +xserver-xorg-video-s3 (1:0.4.1-1) experimental; urgency=low + + [ Andres Salomon ] + * Test for obj-$(DEB_BUILD_GNU_TYPE) before creating it during build; + idempotency fix. + * Run dh_install w/ --list-missing. + + [ David Nusinow ] + * New upstream release + * Bump dependency on xserver-xorg-core to >= 1:1.1.1. Do the same thing for + the build-dep on xserver-xorg-dev. + * Bump debhelper compat to 5 + * Don't try to install manpages, there aren't any + + -- David Nusinow Tue, 15 Aug 2006 00:37:53 +0000 + +xserver-xorg-video-s3 (1:0.3.5.4-3) unstable; urgency=low + + * Correctly name the .install file. Thanks Frank Gevaerts. (closes: #362471) + + -- David Nusinow Thu, 13 Apr 2006 19:06:21 -0400 + +xserver-xorg-video-s3 (1:0.3.5.4-2) unstable; urgency=low + + * Upload to modular + + -- David Nusinow Sun, 26 Mar 2006 20:25:51 -0500 + +xserver-xorg-video-s3 (1:0.3.5.4-1) experimental; urgency=low + + * First upload to Debian + * Change source package, package, and provides names to denote the + type of driver and that they are for xserver-xorg + + -- David Nusinow Fri, 13 Jan 2006 00:39:41 -0500 + +xserver-xorg-driver-s3 (1:0.3.5.4-0ubuntu1) dapper; urgency=low + + * New upstream release. + + -- Daniel Stone Mon, 19 Dec 2005 09:11:26 +1100 + +xserver-xorg-driver-s3 (1:0.3.5.3-0ubuntu1) dapper; urgency=low + + * New upstream release. + + -- Daniel Stone Mon, 12 Dec 2005 13:12:37 +1100 + +xserver-xorg-driver-s3 (1:0.3.5.2-0ubuntu2) dapper; urgency=low + + * Add missing Build-Depends (x11proto-core-dev, x11proto-fonts-dev, + x11proto-randr-dev, x11proto-render-dev, x11proto-xext-dev). + + -- Daniel Stone Mon, 5 Dec 2005 12:56:48 +1100 + +xserver-xorg-driver-s3 (1:0.3.5.2-0ubuntu1) dapper; urgency=low + + * New upstream release. + + -- Daniel Stone Tue, 22 Nov 2005 13:05:54 +1100 + +xserver-xorg-driver-s3 (1:0.3.5.1-1) dapper; urgency=low + + * New upstream release. + + -- Daniel Stone Tue, 25 Oct 2005 17:09:19 +1000 + +xserver-xorg-driver-s3 (1:0.3.5-1) breezy; urgency=low + + * First xserver-xorg-driver-s3 release. + + -- Daniel Stone Wed, 6 Jul 2005 15:48:17 +1000 --- xserver-xorg-video-s3-0.6.3.orig/debian/xserver-xorg-video-s3.install +++ xserver-xorg-video-s3-0.6.3/debian/xserver-xorg-video-s3.install @@ -0,0 +1,2 @@ +usr/lib/xorg/modules/drivers/*.so +usr/share/man/man4/* --- xserver-xorg-video-s3-0.6.3.orig/debian/rules +++ xserver-xorg-video-s3-0.6.3/debian/rules @@ -0,0 +1,98 @@ +#!/usr/bin/make -f +# debian/rules for the Debian xserver-xorg-driver-s3 package. +# Copyright © 2004 Scott James Remnant +# Copyright © 2005 Daniel Stone +# Copyright © 2005 David Nusinow + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +include debian/xsfbs/xsfbs.mk + +CFLAGS = -Wall -g +ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif +ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) + NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) + MAKEFLAGS += -j$(NUMJOBS) +endif + +DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE)) + confflags += --build=$(DEB_HOST_GNU_TYPE) +else + confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) +endif + +# kbd_drv.a isn't phenomenally useful; kbd_drv.so more so +confflags += --disable-static + +configure: + autoreconf -vfi + +obj-$(DEB_BUILD_GNU_TYPE)/config.status: configure + mkdir -p obj-$(DEB_BUILD_GNU_TYPE) + cd obj-$(DEB_BUILD_GNU_TYPE) && \ + ../configure --prefix=/usr --mandir=\$${prefix}/share/man \ + --infodir=\$${prefix}/share/info $(confflags) \ + CFLAGS="$(CFLAGS)" + +build: build-stamp +build-stamp: obj-$(DEB_BUILD_GNU_TYPE)/config.status + dh_testdir + cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) + >$@ + +clean: + dh_testdir + dh_testroot + rm -f build-stamp + + rm -f config.cache config.log config.status + rm -f */config.cache */config.log */config.status + rm -f conftest* */conftest* + rm -rf autom4te.cache */autom4te.cache + rm -rf obj-* + rm -f $$(find -name Makefile.in) + rm -f aclocal.m4 config.guess config.h.in config.sub configure + rm -f depcomp install-sh ltmain.sh missing mkinstalldirs + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install + +# Build architecture-dependent files here. +binary-arch: build install serverabi + dh_testdir + dh_testroot + + dh_installdocs + dh_installchangelogs ChangeLog + dh_install --sourcedir=debian/tmp --list-missing --exclude=s3_drv.la + dh_link + dh_strip + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps -- --warnings=6 + dh_gencontrol + dh_md5sums + dh_builddeb + +# Build architecture-independent files here. +binary-indep: build install +# Nothing to do + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install --- xserver-xorg-video-s3-0.6.3.orig/debian/xsfbs/xsfbs.mk +++ xserver-xorg-video-s3-0.6.3/debian/xsfbs/xsfbs.mk @@ -0,0 +1,276 @@ +#!/usr/bin/make -f + +# Debian X Strike Force Build System (XSFBS): Make portion + +# Copyright 1996 Stephen Early +# Copyright 1997 Mark Eichin +# Copyright 1998-2005, 2007 Branden Robinson +# Copyright 2005 David Nusinow +# +# Licensed under the GNU General Public License, version 2. See the file +# /usr/share/common-licenses/GPL or . + +# Originally by Stephen Early +# Modified by Mark W. Eichin +# Modified by Adam Heath +# Modified by Branden Robinson +# Modified by Fabio Massimo Di Nitto +# Modified by David Nusinow +# Acknowledgements to Manoj Srivastava. + +# Pass $(DH_OPTIONS) into the environment for debhelper's benefit. +export DH_OPTIONS + +# force quilt to not use ~/.quiltrc and to use debian/patches +QUILT = QUILT_PATCHES=debian/patches quilt --quiltrc /dev/null + +# Set up parameters for the upstream build environment. + +# Determine (source) package name from Debian changelog. +SOURCE_NAME:=$(shell dpkg-parsechangelog -ldebian/changelog \ + | grep '^Source:' | awk '{print $$2}') + +# Determine package version from Debian changelog. +SOURCE_VERSION:=$(shell dpkg-parsechangelog -ldebian/changelog \ + | grep '^Version:' | awk '{print $$2}') + +# Determine upstream version number. +UPSTREAM_VERSION:=$(shell echo $(SOURCE_VERSION) | sed 's/-.*//') + +# Determine the source version without the epoch for make-orig-tar-gz +NO_EPOCH_VER:=$(shell echo $(UPSTREAM_VERSION) | sed 's/^.://') + +# Figure out who's building this package. +BUILDER:=$(shell echo $${DEBEMAIL:-$${EMAIL:-$$(echo $$LOGNAME@$$(cat /etc/mailname 2>/dev/null))}}) + +# Find out if this is an official build; an official build has nothing but +# digits, dots, and/or the codename of a release in the Debian part of the +# version number. Anything else indicates an unofficial build. +OFFICIAL_BUILD:=$(shell VERSION=$(SOURCE_VERSION); if ! expr "$$(echo $${VERSION\#\#*-} | sed 's/\(woody\|sarge\|etch\|lenny\)//g')" : ".*[^0-9.].*" >/dev/null 2>&1; then echo yes; fi) + +# Set up parameters for the Debian build environment. + +# Determine our architecture. +BUILD_ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH) +# Work around some old-time dpkg braindamage. +BUILD_ARCH:=$(subst i486,i386,$(BUILD_ARCH)) +# The DEB_HOST_ARCH variable may be set per the Debian cross-compilation policy. +ifdef DEB_HOST_ARCH + ARCH:=$(DEB_HOST_ARCH) +else + # dpkg-cross sets the ARCH environment variable; if set, use it. + ifdef ARCH + ARCH:=$(ARCH) + else + ARCH:=$(BUILD_ARCH) + endif +endif + +# $(STAMP_DIR) houses stamp files for complex targets. +STAMP_DIR:=stampdir + +# $(DEBTREEDIR) is where all install rules are told (via $(DESTDIR)) to place +# their files. +DEBTREEDIR:=$(CURDIR)/debian/tmp + +# All "important" targets have four lines: +# 1) A target name that is invoked by a package-building tool or the user. +# This consists of a dependency on a "$(STAMP_DIR)/"-prefixed counterpart. +# 2) A line delcaring 1) as a phony target (".PHONY:"). +# 3) A "$(STAMP_DIR)/"-prefixed target which does the actual work, and may +# depend on other targets. +# 4) A line declaring 3) as a member of the $(stampdir_targets) variable; the +# "$(STAMP_DIR)/" prefix is omitted. +# +# This indirection is needed so that the "stamp" files that signify when a rule +# is done can be located in a separate "stampdir". Recall that make has no way +# to know when a goal has been met for a phony target (like "build" or +# "install"). +# +# At the end of each "$(STAMP_DIR)/" target, be sure to run the command ">$@" +# so that the target will not be run again. Removing the file will make Make +# run the target over. + +# All phony targets should be declared as dependencies of .PHONY, even if they +# do not have "($STAMP_DIR)/"-prefixed counterparts. + +# Define a harmless default rule to keep things from going nuts by accident. +.PHONY: default +default: + +# Set up the $(STAMP_DIR) directory. +.PHONY: stampdir +stampdir_targets+=stampdir +stampdir: $(STAMP_DIR)/stampdir +$(STAMP_DIR)/stampdir: + mkdir $(STAMP_DIR) + >$@ + +# Set up the package build directory as quilt expects to find it. +.PHONY: prepare +stampdir_targets+=prepare +prepare: $(STAMP_DIR)/prepare +$(STAMP_DIR)/prepare: $(STAMP_DIR)/log $(STAMP_DIR)/genscripts + >$@ + +.PHONY: log +stampdir_targets+=log +log: $(STAMP_DIR)/log +$(STAMP_DIR)/log: $(STAMP_DIR)/stampdir + mkdir -p $(STAMP_DIR)/log + +# Apply all patches to the upstream source. +.PHONY: patch +stampdir_targets+=patch +patch: $(STAMP_DIR)/patch +$(STAMP_DIR)/patch: $(STAMP_DIR)/prepare + if ! [ `which quilt` ]; then \ + echo "Couldn't find quilt. Please install it or add it to the build-depends for this package."; \ + exit 1; \ + fi; \ + if $(QUILT) next >/dev/null 2>&1; then \ + echo -n "Applying patches..."; \ + if $(QUILT) push -a -v >$(STAMP_DIR)/log/patch 2>&1; then \ + cat $(STAMP_DIR)/log/patch; \ + echo "successful."; \ + else \ + cat $(STAMP_DIR)/log/patch; \ + echo "failed! (check $(STAMP_DIR)/log/patch for details)"; \ + exit 1; \ + fi; \ + else \ + echo "No patches to apply"; \ + fi; \ + >$@ + +# Revert all patches to the upstream source. +.PHONY: unpatch +unpatch: $(STAMP_DIR)/log + rm -f $(STAMP_DIR)/patch + @echo -n "Unapplying patches..."; \ + if $(QUILT) applied >/dev/null 2>/dev/null; then \ + if $(QUILT) pop -a -v >$(STAMP_DIR)/log/unpatch 2>&1; then \ + cat $(STAMP_DIR)/log/unpatch; \ + echo "successful."; \ + else \ + cat $(STAMP_DIR)/log/unpatch; \ + echo "failed! (check $(STAMP_DIR)/log/unpatch for details)"; \ + exit 1; \ + fi; \ + else \ + echo "nothing to do."; \ + fi + +# Clean the generated maintainer scripts. +.PHONY: cleanscripts +cleanscripts: + rm -f $(STAMP_DIR)/genscripts + rm -f debian/*.config \ + debian/*.postinst \ + debian/*.postrm \ + debian/*.preinst \ + debian/*.prerm + +# Clean the package build tree. +.PHONY: xsfclean +xsfclean: cleanscripts unpatch + dh_testdir + rm -rf .pc + rm -rf $(STAMP_DIR) + dh_clean + +# Remove files from the upstream source tree that we don't need, or which have +# licensing problems. It must be run before creating the .orig.tar.gz. +# +# Note: This rule is for Debian package maintainers' convenience, and is not +# needed for conventional build scenarios. +.PHONY: prune-upstream-tree +prune-upstream-tree: + # Ensure we're in the correct directory. + dh_testdir + grep -rvh '^#' debian/prune/ | xargs --no-run-if-empty rm -rf + +# Verify that there are no offsets or fuzz in the patches we apply. +# +# Note: This rule is for Debian package maintainers' convenience, and is not +# needed for conventional build scenarios. +.PHONY: patch-audit +patch-audit: prepare unpatch + @echo -n "Auditing patches..."; \ + >$(STAMP_DIR)/log/patch; \ + FUZZY=; \ + while [ -n "$$($(QUILT) next)" ]; do \ + RESULT=$$($(QUILT) push -v | tee -a $(STAMP_DIR)/log/patch | grep ^Hunk | sed 's/^Hunk.*\(succeeded\|FAILED\).*/\1/');\ + case "$$RESULT" in \ + succeeded) \ + echo "fuzzy patch: $$($(QUILT) top)" \ + | tee -a $(STAMP_DIR)/log/$$($(QUILT) top); \ + FUZZY=yes; \ + ;; \ + FAILED) \ + echo "broken patch: $$($(QUILT) next)" \ + | tee -a $(STAMP_DIR)/log/$$($(QUILT) next); \ + exit 1; \ + ;; \ + esac; \ + done; \ + if [ -n "$$FUZZY" ]; then \ + echo "there were fuzzy patches; please fix."; \ + exit 1; \ + else \ + echo "done."; \ + fi + +# Generate the maintainer scripts. +.PHONY: genscripts +stampdir_targets+=genscripts +genscripts: $(STAMP_DIR)/genscripts +$(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir + for FILE in debian/*.config.in \ + debian/*.postinst.in \ + debian/*.postrm.in \ + debian/*.preinst.in \ + debian/*.prerm.in; do \ + if [ -e "$$FILE" ]; then \ + MAINTSCRIPT=$$(echo $$FILE | sed 's/.in$$//'); \ + sed -n '1,/^#INCLUDE_SHELL_LIB#$$/p' <$$FILE \ + | sed -e '/^#INCLUDE_SHELL_LIB#$$/d' >$$MAINTSCRIPT.tmp; \ + cat debian/xsfbs/xsfbs.sh >>$$MAINTSCRIPT.tmp; \ + sed -n '/^#INCLUDE_SHELL_LIB#$$/,$$p' <$$FILE \ + | sed -e '/^#INCLUDE_SHELL_LIB#$$/d' >>$$MAINTSCRIPT.tmp; \ + sed -e 's/@SOURCE_VERSION@/$(SOURCE_VERSION)/' \ + -e 's/@OFFICIAL_BUILD@/$(OFFICIAL_BUILD)/' \ + <$$MAINTSCRIPT.tmp >$$MAINTSCRIPT; \ + rm $$MAINTSCRIPT.tmp; \ + fi; \ + done + # Validate syntax of generated shell scripts. + #sh debian/scripts/validate-posix-sh debian/*.config \ + # debian/*.postinst \ + # debian/*.postrm \ + # debian/*.preinst \ + # debian/*.prerm + >$@ + +SERVERMINVERS = $(shell cat /usr/share/xserver-xorg/serverminver 2>/dev/null) +VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2>/dev/null) +INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2>/dev/null) +SERVER_DEPENDS = xserver-xorg-core (>= $(SERVERMINVERS)) +VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI) +INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI) +ifeq ($(PACKAGE),) +PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }' < debian/control) +endif + +.PHONY: serverabi +serverabi: install +ifeq ($(SERVERMINVERS),) + @echo error: xserver-xorg-dev needs to be installed + @exit 1 +else + echo "xserver:Depends=$(SERVER_DEPENDS)" >> debian/$(PACKAGE).substvars + echo "xviddriver:Provides=$(VIDDRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars + echo "xinpdriver:Provides=$(INPDRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars +endif + +# vim:set noet ai sts=8 sw=8 tw=0: --- xserver-xorg-video-s3-0.6.3.orig/debian/xsfbs/repack.sh +++ xserver-xorg-video-s3-0.6.3/debian/xsfbs/repack.sh @@ -0,0 +1,32 @@ +#!/bin/sh + +set -e + +if ! [ -d debian/prune ]; then + exit 0 +fi + +if [ "x$1" != x--upstream-version ]; then + exit 1 +fi + +version="$2" +filename="$3" + +if [ -z "$version" ] || ! [ -f "$filename" ]; then + exit 1 +fi + +dir="$(pwd)" +tempdir="$(mktemp -d)" + +cd "$tempdir" +tar xf "$dir/$filename" +cat "$dir"/debian/prune/* | while read file; do rm -f */$file; done + +tar czf "$dir/$filename" * +cd "$dir" +rm -rf "$tempdir" +echo "Done pruning upstream tarball" + +exit 0 --- xserver-xorg-video-s3-0.6.3.orig/debian/xsfbs/xsfbs.sh +++ xserver-xorg-video-s3-0.6.3/debian/xsfbs/xsfbs.sh @@ -0,0 +1,622 @@ +# This is the X Strike Force shell library for X Window System package +# maintainer scripts. It serves to define shell functions commonly used by +# such packages, and performs some error checking necessary for proper operation +# of those functions. By itself, it does not "do" much; the maintainer scripts +# invoke the functions defined here to accomplish package installation and +# removal tasks. + +# If you are reading this within a Debian package maintainer script (e.g., +# /var/lib/dpkg/info/PACKAGE.{config,preinst,postinst,prerm,postrm}), you can +# skip past this library by scanning forward in this file to the string +# "GOBSTOPPER". + +SOURCE_VERSION=@SOURCE_VERSION@ +OFFICIAL_BUILD=@OFFICIAL_BUILD@ + +# Use special abnormal exit codes so that problems with this library are more +# easily tracked down. +SHELL_LIB_INTERNAL_ERROR=86 +SHELL_LIB_THROWN_ERROR=74 +SHELL_LIB_USAGE_ERROR=99 + +# old -> new variable names +if [ -z "$DEBUG_XORG_PACKAGE" ] && [ -n "$DEBUG_XFREE86_PACKAGE" ]; then + DEBUG_XORG_PACKAGE="$DEBUG_XFREE86_PACKAGE" +fi +if [ -z "$DEBUG_XORG_DEBCONF" ] && [ -n "$DEBUG_XFREE86_DEBCONF" ]; then + DEBUG_XORG_DEBCONF="$DEBUG_XFREE86_DEBCONF" +fi + +# initial sanity checks +if [ -z "$THIS_PACKAGE" ]; then + cat >&2 < on the World Wide Web for +instructions, read the file /usr/share/doc/debian/bug-reporting.txt from the +"doc-debian" package, or install the "reportbug" package and use the command of +the same name to file a report against version $SOURCE_VERSION of this package. +EOF + exit $SHELL_LIB_USAGE_ERROR +fi + +if [ -z "$THIS_SCRIPT" ]; then + cat >&2 < on the World Wide Web for +instructions, read the file /usr/share/doc/debian/bug-reporting.txt from the +"doc-debian" package, or install the "reportbug" package and use the command of +the same name to file a report against version $SOURCE_VERSION of the +"$THIS_PACKAGE" package. +EOF + exit $SHELL_LIB_USAGE_ERROR +fi + +if [ "$1" = "reconfigure" ] || [ -n "$DEBCONF_RECONFIGURE" ]; then + RECONFIGURE="true" +else + RECONFIGURE= +fi + +if ([ "$1" = "install" ] || [ "$1" = "configure" ]) && [ -z "$2" ]; then + FIRSTINST="yes" +fi + +if [ -z "$RECONFIGURE" ] && [ -z "$FIRSTINST" ]; then + UPGRADE="yes" +fi + +trap "message;\ + message \"Received signal. Aborting $THIS_PACKAGE package $THIS_SCRIPT script.\";\ + message;\ + exit 1" HUP INT QUIT TERM + +reject_nondigits () { + # syntax: reject_nondigits [ operand ... ] + # + # scan operands (typically shell variables whose values cannot be trusted) for + # characters other than decimal digits and barf if any are found + while [ -n "$1" ]; do + # does the operand contain anything but digits? + if ! expr "$1" : "[[:digit:]]\+$" > /dev/null 2>&1; then + # can't use die(), because it wraps message() which wraps this function + echo "$THIS_PACKAGE $THIS_SCRIPT error: reject_nondigits() encountered" \ + "possibly malicious garbage \"$1\"" >&2 + exit $SHELL_LIB_THROWN_ERROR + fi + shift + done +} + +reject_unlikely_path_chars () { + # syntax: reject_unlikely_path_chars [ operand ... ] + # + # scan operands (typically shell variables whose values cannot be trusted) for + # characters unlikely to be seen in a path and which the shell might + # interpret and barf if any are found + while [ -n "$1" ]; do + # does the operand contain any funny characters? + if expr "$1" : '.*[!$&()*;<>?|].*' > /dev/null 2>&1; then + # can't use die(), because I want to avoid forward references + echo "$THIS_PACKAGE $THIS_SCRIPT error: reject_unlikely_path_chars()" \ + "encountered possibly malicious garbage \"$1\"" >&2 + exit $SHELL_LIB_THROWN_ERROR + fi + shift + done +} + +# Query the terminal to establish a default number of columns to use for +# displaying messages to the user. This is used only as a fallback in the +# event the COLUMNS variable is not set. ($COLUMNS can react to SIGWINCH while +# the script is running, and this cannot, only being calculated once.) +DEFCOLUMNS=$(stty size 2> /dev/null | awk '{print $2}') || true +if ! expr "$DEFCOLUMNS" : "[[:digit:]]\+$" > /dev/null 2>&1; then + DEFCOLUMNS=80 +fi + +message () { + # pretty-print messages of arbitrary length + reject_nondigits "$COLUMNS" + echo "$*" | fmt -t -w ${COLUMNS:-$DEFCOLUMNS} >&2 +} + +observe () { + # syntax: observe message ... + # + # issue observational message suitable for logging someday when support for + # it exists in dpkg + if [ -n "$DEBUG_XORG_PACKAGE" ]; then + message "$THIS_PACKAGE $THIS_SCRIPT note: $*" + fi +} + +warn () { + # syntax: warn message ... + # + # issue warning message suitable for logging someday when support for + # it exists in dpkg; also send to standard error + message "$THIS_PACKAGE $THIS_SCRIPT warning: $*" +} + +die () { + # syntax: die message ... + # + # exit script with error message + message "$THIS_PACKAGE $THIS_SCRIPT error: $*" + exit $SHELL_LIB_THROWN_ERROR +} + +internal_error () { + # exit script with error; essentially a "THIS SHOULD NEVER HAPPEN" message + message "internal error: $*" + if [ -n "$OFFICIAL_BUILD" ]; then + message "Please report a bug in the $THIS_SCRIPT script of the" \ + "$THIS_PACKAGE package, version $SOURCE_VERSION to the Debian Bug" \ + "Tracking System. Include all messages above that mention the" \ + "$THIS_PACKAGE package. Visit " \ + " on the World Wide Web for" \ + "instructions, read the file" \ + "/usr/share/doc/debian/bug-reporting.txt from the doc-debian" \ + "package, or install the reportbug package and use the command of" \ + "the same name to file a report." + fi + exit $SHELL_LIB_INTERNAL_ERROR +} + +usage_error () { + message "usage error: $*" + message "Please report a bug in the $THIS_SCRIPT script of the" \ + "$THIS_PACKAGE package, version $SOURCE_VERSION to the Debian Bug" \ + "Tracking System. Include all messages above that mention the" \ + "$THIS_PACKAGE package. Visit " \ + " on the World Wide Web for" \ + "instructions, read the file" \ + "/usr/share/doc/debian/bug-reporting.txt from the doc-debian" \ + "package, or install the reportbug package and use the command of" \ + "the same name to file a report." + exit $SHELL_LIB_USAGE_ERROR +} + +font_update () { + # run $UPDATECMDS in $FONTDIRS + + local dir cmd shortcmd x_font_dir_prefix + + x_font_dir_prefix="/usr/share/fonts/X11" + + if [ -z "$UPDATECMDS" ]; then + usage_error "font_update() called but \$UPDATECMDS not set" + fi + if [ -z "$FONTDIRS" ]; then + usage_error "font_update() called but \$FONTDIRS not set" + fi + + reject_unlikely_path_chars "$UPDATECMDS" + reject_unlikely_path_chars "$FONTDIRS" + + for dir in $FONTDIRS; do + if [ -d "$x_font_dir_prefix/$dir" ]; then + for cmd in $UPDATECMDS; do + if which "$cmd" > /dev/null 2>&1; then + shortcmd=${cmd##*/} + observe "running $shortcmd in $dir font directory" + cmd_opts= + if [ "$shortcmd" = "update-fonts-alias" ]; then + cmd_opts=--x11r7-layout + fi + if [ "$shortcmd" = "update-fonts-dir" ]; then + cmd_opts=--x11r7-layout + fi + if [ "$shortcmd" = "update-fonts-scale" ]; then + cmd_opts=--x11r7-layout + fi + $cmd $cmd_opts $dir || warn "$cmd $cmd_opts $dir" \ + "failed; font directory data may not" \ + "be up to date" + else + warn "$cmd not found; not updating corresponding $dir font" \ + "directory data" + fi + done + else + warn "$dir is not a directory; not updating font directory data" + fi + done +} + +remove_conffile_prepare () { + # syntax: remove_conffile_prepare filename official_md5sum ... + # + # Check a conffile "filename" against a list of canonical MD5 checksums. + # If the file's current MD5 checksum matches one of the "official_md5sum" + # operands provided, then prepare the conffile for removal from the system. + # We defer actual deletion until the package is configured so that we can + # roll this operation back if package installation fails. + # + # Call this function from a preinst script in the event $1 is "upgrade" or + # "install" and verify $2 to ensure the package is being upgraded from a + # version (or installed over a version removed-but-not-purged) prior to the + # one in which the conffile was obsoleted. + + local conffile current_checksum + + # validate arguments + if [ $# -lt 2 ]; then + usage_error "remove_conffile_prepare() called with wrong number of" \ + "arguments; expected at least 2, got $#" + exit $SHELL_LIB_USAGE_ERROR + fi + + conffile="$1" + shift + + # does the conffile even exist? + if [ -e "$conffile" ]; then + # calculate its checksum + current_checksum=$(md5sum < "$conffile" | sed 's/[[:space:]].*//') + # compare it to each supplied checksum + while [ -n "$1" ]; do + if [ "$current_checksum" = "$1" ]; then + # we found a match; move the confffile and stop looking + observe "preparing obsolete conffile $conffile for removal" + mv "$conffile" "$conffile.$THIS_PACKAGE-tmp" + break + fi + shift + done + fi +} + +remove_conffile_lookup () { + # syntax: remove_conffile_lookup package filename + # + # Lookup the md5sum of a conffile in dpkg's database, and prepare for removal + # if it matches the actual file's md5sum. + # + # Call this function when you would call remove_conffile_prepare but only + # want to check against dpkg's status database instead of known checksums. + + local package conffile old_md5sum + + # validate arguments + if [ $# -ne 2 ]; then + usage_error "remove_conffile_lookup() called with wrong number of" \ + "arguments; expected 1, got $#" + exit $SHELL_LIB_USAGE_ERROR + fi + + package="$1" + conffile="$2" + + if ! [ -e "$conffile" ]; then + return + fi + old_md5sum="$(dpkg-query -W -f='${Conffiles}' "$package" | \ + awk '{ if (match($0, "^ '"$conffile"' ")) print $2}')" + if [ -n "$old_md5sum" ]; then + remove_conffile_prepare "$conffile" "$old_md5sum" + fi +} + +remove_conffile_commit () { + # syntax: remove_conffile_commit filename + # + # Complete the removal of a conffile "filename" that has become obsolete. + # + # Call this function from a postinst script after having used + # remove_conffile_prepare() in the preinst. + + local conffile + + # validate arguments + if [ $# -ne 1 ]; then + usage_error "remove_conffile_commit() called with wrong number of" \ + "arguments; expected 1, got $#" + exit $SHELL_LIB_USAGE_ERROR + fi + + conffile="$1" + + # if the temporary file created by remove_conffile_prepare() exists, remove it + if [ -e "$conffile.$THIS_PACKAGE-tmp" ]; then + observe "committing removal of obsolete conffile $conffile" + rm "$conffile.$THIS_PACKAGE-tmp" + fi +} + +remove_conffile_rollback () { + # syntax: remove_conffile_rollback filename + # + # Roll back the removal of a conffile "filename". + # + # Call this function from a postrm script in the event $1 is "abort-upgrade" + # or "abort-install" is after having used remove_conffile_prepare() in the + # preinst. + + local conffile + + # validate arguments + if [ $# -ne 1 ]; then + usage_error "remove_conffile_rollback() called with wrong number of" \ + "arguments; expected 1, got $#" + exit $SHELL_LIB_USAGE_ERROR + fi + + conffile="$1" + + # if the temporary file created by remove_conffile_prepare() exists, move it + # back + if [ -e "$conffile.$THIS_PACKAGE-tmp" ]; then + observe "rolling back removal of obsolete conffile $conffile" + mv "$conffile.$THIS_PACKAGE-tmp" "$conffile" + fi +} + +replace_conffile_with_symlink_prepare () { + # syntax: replace_conffile_with_symlink_prepare oldfilename newfilename \ + # official_md5sum ... + # + # Check a conffile "oldfilename" against a list of canonical MD5 checksums. + # If the file's current MD5 checksum matches one of the "official_md5sum" + # operands provided, then prepare the conffile for removal from the system. + # We defer actual deletion until the package is configured so that we can + # roll this operation back if package installation fails. Otherwise copy it + # to newfilename and let dpkg handle it through conffiles mechanism. + # + # Call this function from a preinst script in the event $1 is "upgrade" or + # "install" and verify $2 to ensure the package is being upgraded from a + # version (or installed over a version removed-but-not-purged) prior to the + # one in which the conffile was obsoleted. + + local conffile current_checksum + + # validate arguments + if [ $# -lt 3 ]; then + usage_error "replace_conffile_with_symlink_prepare() called with wrong" \ + " number of arguments; expected at least 3, got $#" + exit $SHELL_LIB_USAGE_ERROR + fi + + oldconffile="$1" + shift + newconffile="$1" + shift + + remove_conffile_prepare "$_oldconffile" "$@" + # If $oldconffile still exists, then md5sums didn't match. + # Copy it to new one. + if [ -f "$oldconffile" ]; then + cp "$oldconffile" "$newconffile" + fi + +} + +replace_conffile_with_symlink_commit () { + # syntax: replace_conffile_with_symlink_commit oldfilename + # + # Complete the removal of a conffile "oldfilename" that has been + # replaced by a symlink. + # + # Call this function from a postinst script after having used + # replace_conffile_with_symlink_prepare() in the preinst. + + local conffile + + # validate arguments + if [ $# -ne 1 ]; then + usage_error "replace_conffile_with_symlink_commit() called with wrong" \ + "number of arguments; expected 1, got $#" + exit $SHELL_LIB_USAGE_ERROR + fi + + conffile="$1" + + remove_conffile_commit "$conffile" +} + +replace_conffile_with_symlink_rollback () { + # syntax: replace_conffile_with_symlink_rollback oldfilename newfilename + # + # Roll back the replacing of a conffile "oldfilename" with symlink to + # "newfilename". + # + # Call this function from a postrm script in the event $1 is "abort-upgrade" + # or "abort-install" and verify $2 to ensure the package failed to upgrade + # from a version (or install over a version removed-but-not-purged) prior + # to the one in which the conffile was obsoleted. + # You should have used replace_conffile_with_symlink_prepare() in the + # preinst. + + local conffile + + # validate arguments + if [ $# -ne 2 ]; then + usage_error "replace_conffile_with_symlink_rollback() called with wrong" \ + "number of arguments; expected 2, got $#" + exit $SHELL_LIB_USAGE_ERROR + fi + + oldconffile="$1" + newconffile="$2" + + remove_conffile_rollback "$_oldconffile" + if [ -f "$newconffile" ]; then + rm "$newconffile" + fi +} + +run () { + # syntax: run command [ argument ... ] + # + # Run specified command with optional arguments and report its exit status. + # Useful for commands whose exit status may be nonzero, but still acceptable, + # or commands whose failure is not fatal to us. + # + # NOTE: Do *not* use this function with db_get or db_metaget commands; in + # those cases the return value of the debconf command *must* be checked + # before the string returned by debconf is used for anything. + + local retval + + # validate arguments + if [ $# -lt 1 ]; then + usage_error "run() called with wrong number of arguments; expected at" \ + "least 1, got $#" + exit $SHELL_LIB_USAGE_ERROR + fi + + "$@" || retval=$? + + if [ ${retval:-0} -ne 0 ]; then + observe "command \"$*\" exited with status $retval" + fi +} + +make_symlink_sane () { + # syntax: make_symlink_sane symlink target + # + # Ensure that the symbolic link symlink exists, and points to target. + # + # If symlink does not exist, create it and point it at target. + # + # If symlink exists but is not a symbolic link, back it up. + # + # If symlink exists, is a symbolic link, but points to the wrong location, fix + # it. + # + # If symlink exists, is a symbolic link, and already points to target, do + # nothing. + # + # This function wouldn't be needed if ln had an -I, --idempotent option. + + # Validate arguments. + if [ $# -ne 2 ]; then + usage_error "make_symlink_sane() called with wrong number of arguments;" \ + "expected 2, got $#" + exit $SHELL_LIB_USAGE_ERROR + fi + + # We could just use the positional parameters as-is, but that makes things + # harder to follow. + local symlink target + + symlink="$1" + target="$2" + + if [ -L "$symlink" ] && [ "$(readlink "$symlink")" = "$target" ]; then + observe "link from $symlink to $target already exists" + else + observe "creating symbolic link from $symlink to $target" + mkdir -p "${target%/*}" "${symlink%/*}" + ln -s -b -S ".dpkg-old" "$target" "$symlink" + fi +} + +migrate_dir_to_symlink () { + # syntax: migrate_dir_to_symlink old_location new_location + # + # Per Debian Policy section 6.5.4, "A directory will never be replaced by a + # symbolic link to a directory or vice versa; instead, the existing state + # (symlink or not) will be left alone and dpkg will follow the symlink if + # there is one." + # + # We have to do it ourselves. + # + # This function moves the contents of old_location, a directory, into + # new_location, a directory, then makes old_location a symbolic link to + # new_location. + # + # old_location need not exist, but if it does, it must be a directory (or a + # symlink to a directory). If it is not, it is backed up. If new_location + # exists already and is not a directory, it is backed up. + # + # This function should be called from a package's preinst so that other + # packages unpacked after this one --- but before this package's postinst runs + # --- are unpacked into new_location even if their payloads contain + # old_location filespecs. + + # Validate arguments. + if [ $# -ne 2 ]; then + usage_error "migrate_dir_to_symlink() called with wrong number of" + "arguments; expected 2, got $#" + exit $SHELL_LIB_USAGE_ERROR + fi + + # We could just use the positional parameters as-is, but that makes things + # harder to follow. + local new old + + old="$1" + new="$2" + + # Is old location a symlink? + if [ -L "$old" ]; then + # Does it already point to new location? + if [ "$(readlink "$old")" = "$new" ]; then + # Nothing to do; migration has already been done. + observe "migration of $old to $new already done" + return 0 + else + # Back it up. + warn "backing up symbolic link $old as $old.dpkg-old" + mv -b "$old" "$old.dpkg-old" + fi + fi + + # Does old location exist, but is not a directory? + if [ -e "$old" ] && ! [ -d "$old" ]; then + # Back it up. + warn "backing up non-directory $old as $old.dpkg-old" + mv -b "$old" "$old.dpkg-old" + fi + + observe "migrating $old to $new" + + # Is new location a symlink? + if [ -L "$new" ]; then + # Does it point the wrong way, i.e., back to where we're migrating from? + if [ "$(readlink "$new")" = "$old" ]; then + # Get rid of it. + observe "removing symbolic link $new which points to $old" + rm "$new" + else + # Back it up. + warn "backing up symbolic link $new as $new.dpkg-old" + mv -b "$new" "$new.dpkg-old" + fi + fi + + # Does new location exist, but is not a directory? + if [ -e "$new" ] && ! [ -d "$new" ]; then + warn "backing up non-directory $new as $new.dpkg-old" + mv -b "$new" "$new.dpkg-old" + fi + + # Create new directory if it does not yet exist. + if ! [ -e "$new" ]; then + observe "creating $new" + mkdir -p "$new" + fi + + # Copy files in old location to new location. Back up any filenames that + # already exist in the new location with the extension ".dpkg-old". + observe "copying files from $old to $new" + if ! (cd "$old" && cp -a -b -S ".dpkg-old" . "$new"); then + die "error(s) encountered while copying files from $old to $new" + fi + + # Remove files at old location. + observe "removing $old" + rm -r "$old" + + # Create symlink from old location to new location. + make_symlink_sane "$old" "$new" +} + +# vim:set ai et sw=2 ts=2 tw=80: + +# GOBSTOPPER: The X Strike Force shell library ends here.