[Glibc-bsd-commits] r4960 - in trunk: . freebsd-buildutils/debian xserver-xorg-video-nv xserver-xorg-video-nv/debian xserver-xorg-video-nv/debian/patches xserver-xorg-video-nv/debian/xsfbs
Robert Millan
rmh at alioth.debian.org
Wed Sep 25 11:00:53 UTC 2013
Author: rmh
Date: 2013-09-25 11:00:52 +0000 (Wed, 25 Sep 2013)
New Revision: 4960
Added:
trunk/xserver-xorg-video-nv/
trunk/xserver-xorg-video-nv/debian/
trunk/xserver-xorg-video-nv/debian/README.source
trunk/xserver-xorg-video-nv/debian/changelog
trunk/xserver-xorg-video-nv/debian/compat
trunk/xserver-xorg-video-nv/debian/control
trunk/xserver-xorg-video-nv/debian/copyright
trunk/xserver-xorg-video-nv/debian/patches/
trunk/xserver-xorg-video-nv/debian/patches/01_fix_linking.diff
trunk/xserver-xorg-video-nv/debian/patches/series
trunk/xserver-xorg-video-nv/debian/rules
trunk/xserver-xorg-video-nv/debian/watch
trunk/xserver-xorg-video-nv/debian/xserver-xorg-video-nv.install
trunk/xserver-xorg-video-nv/debian/xserver-xorg-video-nv.links
trunk/xserver-xorg-video-nv/debian/xsfbs/
trunk/xserver-xorg-video-nv/debian/xsfbs/repack.sh
trunk/xserver-xorg-video-nv/debian/xsfbs/xsfbs.mk
trunk/xserver-xorg-video-nv/debian/xsfbs/xsfbs.sh
Modified:
trunk/freebsd-buildutils/debian/rules
Log:
Import xserver-xorg-video-nv into SVN
Modified: trunk/freebsd-buildutils/debian/rules
===================================================================
--- trunk/freebsd-buildutils/debian/rules 2013-09-21 18:22:23 UTC (rev 4959)
+++ trunk/freebsd-buildutils/debian/rules 2013-09-25 11:00:52 UTC (rev 4960)
@@ -67,6 +67,7 @@
for i in \
share/mk \
usr.bin/cksum \
+ usr.bin/elfdump \
usr.bin/file2c \
usr.bin/lex \
contrib/flex \
Added: trunk/xserver-xorg-video-nv/debian/README.source
===================================================================
--- trunk/xserver-xorg-video-nv/debian/README.source (rev 0)
+++ trunk/xserver-xorg-video-nv/debian/README.source 2013-09-25 11:00:52 UTC (rev 4960)
@@ -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.
Added: trunk/xserver-xorg-video-nv/debian/changelog
===================================================================
--- trunk/xserver-xorg-video-nv/debian/changelog (rev 0)
+++ trunk/xserver-xorg-video-nv/debian/changelog 2013-09-25 11:00:52 UTC (rev 4960)
@@ -0,0 +1,394 @@
+xserver-xorg-video-nv (1:2.1.20-1) unstable; urgency=low
+
+ * New upstream release. (Closes: #683409)
+
+ -- Robert Millan <rmh at debian.org> Fri, 03 Aug 2012 19:47:00 +0200
+
+xserver-xorg-video-nv (1:2.1.17-4) unstable; urgency=low
+
+ * Reupload for the sake of non-KMS architectures.
+ * Tentatively set debian-bsd as maintainer. XSF is welcome to takeover if
+ they want to (see #612189, and the discussion in
+ http://lists.debian.org/debian-x/2012/07/msg00343.html).
+ * Move to non-free repository. (Closes: #383465)
+
+ -- Robert Millan <rmh at debian.org> Sat, 21 Jul 2012 16:21:33 +0200
+
+xserver-xorg-video-nv (1:2.1.17-3) unstable; urgency=low
+
+ * Add patch to link against libpciaccess and libdrm, to ensure correct
+ dependencies.
+ * Make the libdrm-dev build-dep !hurd-i386.
+
+ -- Julien Cristau <jcristau at debian.org> Sat, 15 May 2010 13:38:58 +0200
+
+xserver-xorg-video-nv (1:2.1.17-2) unstable; urgency=low
+
+ * Merge upstream's master as of 17ab5dbea6. This includes the “Refuse to
+ bind to a device which has kernel modesetting active.” commit, which
+ makes sure nv doesn't break console output when nouveau's KMS is
+ active.
+ * Add libdrm-dev and x11proto-xf86dri-dev to Build-Depends to enable the
+ appropriate codepath.
+ * Add myself to Uploaders.
+ * Use new xsfbs and ${xviddriver:Depends} variable (bumping the
+ xserver-xorg-dev version in Build-Depends accordingly).
+
+ -- Cyril Brulebois <kibi at debian.org> Sun, 18 Apr 2010 12:13:58 +0200
+
+xserver-xorg-video-nv (1:2.1.17-1) 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
+
+ [ Brice Goglin ]
+ * New upstream release.
+ + Fix support for Xserver 1.7, closes: #568170.
+ + Add support for ION boards, closes: #540500.
+ * Bump Standards-Version to 3.8.4, no changes needed.
+
+ -- Brice Goglin <bgoglin at debian.org> Tue, 09 Mar 2010 07:19:12 +0100
+
+xserver-xorg-video-nv (1:2.1.15-1) experimental; urgency=low
+
+ [ Timo Aaltonen ]
+ * New upstream release.
+ * Bump Standards-Version to 3.8.3.
+ * Build against Xserver 1.7.
+
+ [ Cyril Brulebois ]
+ * Upload to experimental.
+
+ -- Cyril Brulebois <kibi at debian.org> Sun, 06 Dec 2009 02:35:34 +0100
+
+xserver-xorg-video-nv (1:2.1.14-2) unstable; urgency=low
+
+ * Add README.source, bump Standards-Version to 3.8.2.
+ * Drop obsolete patch dependency from the build make target,
+ causing FTBFS since quilt has been removed from Build-depends,
+ closes: #539051.
+
+ -- Brice Goglin <bgoglin at debian.org> Wed, 29 Jul 2009 01:55:30 +0200
+
+xserver-xorg-video-nv (1:2.1.14-1) unstable; urgency=low
+
+ [ David Nusinow ]
+ * 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.
+
+ [ Brice Goglin ]
+ * New upstream release.
+
+ -- Brice Goglin <bgoglin at debian.org> Sun, 19 Jul 2009 21:58:45 +0200
+
+xserver-xorg-video-nv (1:2.1.13-1) unstable; urgency=low
+
+ * New upstream release.
+ * Upload to unstable.
+
+ -- Julien Cristau <jcristau at debian.org> Thu, 09 Apr 2009 10:42:43 +0100
+
+xserver-xorg-video-nv (1:2.1.12-2) experimental; urgency=low
+
+ * Build against Xserver 1.6rc1.
+
+ -- Brice Goglin <bgoglin at debian.org> Sun, 01 Feb 2009 19:38:09 +0100
+
+xserver-xorg-video-nv (1:2.1.12-1) experimental; urgency=low
+
+ * New upstream release.
+ * Switch to running autoreconf on build. Build-dep on xutils-dev, automake
+ and libtool.
+ * Add support for parallel builds.
+ * Build against xserver 1.5.
+
+ -- Julien Cristau <jcristau at debian.org> Fri, 05 Sep 2008 01:41:02 +0200
+
+xserver-xorg-video-nv (1:2.1.10-3) experimental; urgency=low
+
+ * Build against xserver 1.5 rc5.
+
+ -- Julien Cristau <jcristau at debian.org> Mon, 14 Jul 2008 01:49:15 +0200
+
+xserver-xorg-video-nv (1:2.1.10-2) UNRELEASED; urgency=low
+
+ [ Chris Lamb ]
+ * Update copyright holders in debian/copyright.
+
+ [ Julien Cristau ]
+ * Install README.G80 in the package.
+
+ -- Chris Lamb <chris at chris-lamb.co.uk> Thu, 03 Jul 2008 02:30:36 +0100
+
+xserver-xorg-video-nv (1:2.1.10-1) unstable; urgency=low
+
+ * New upstream release, closes: #484875.
+ * 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 for dpkg-shlibdeps --warnings.
+
+ -- Brice Goglin <bgoglin at debian.org> Tue, 01 Jul 2008 07:18:05 +0200
+
+xserver-xorg-video-nv (1:2.1.9-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Brice Goglin <bgoglin at debian.org> Sat, 10 May 2008 16:22:38 +0200
+
+xserver-xorg-video-nv (1:2.1.8-3) unstable; urgency=low
+
+ [ Timo Aaltonen ]
+ * Fix the PCI ID one-liner to use 'sort -u'.
+
+ [ Julien Cristau ]
+ * Drop the XS- prefix from Vcs-* control fields.
+
+ -- Julien Cristau <jcristau at debian.org> Thu, 27 Mar 2008 22:12:36 +0100
+
+xserver-xorg-video-nv (1:2.1.8-2) unstable; urgency=low
+
+ * Add patch from Timo Aaltonen to include some missing PCI ID's
+ * Bump standards version to 3.7.3. No changes needed.
+ * Exclude .la files on dh_install
+
+ -- David Nusinow <dnusinow at debian.org> Wed, 26 Mar 2008 20:59:15 -0400
+
+xserver-xorg-video-nv (1:2.1.8-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Brice Goglin <bgoglin at debian.org> Mon, 10 Mar 2008 23:19:29 +0100
+
+xserver-xorg-video-nv (1:2.1.7-1) unstable; urgency=low
+
+ * New upstream release.
+ + Delay after disabling cursor to avoid wedging the cursor hardware
+ on GeForce 6150, closes: #439194.
+
+ -- Brice Goglin <bgoglin at debian.org> Sat, 26 Jan 2008 12:37:08 +0100
+
+xserver-xorg-video-nv (1:2.1.6-1) unstable; urgency=low
+
+ * New upstream release.
+ + Pull upstream commits up to d483ecd851bb84014f1fa86f0ada4540b3ad801e
+ for 8800 GT support and one bug fix.
+ + Unwedge the hardware if the BIOS left it stuck, closes: #444743.
+
+ -- Brice Goglin <bgoglin at debian.org> Sun, 18 Nov 2007 12:26:47 +0100
+
+xserver-xorg-video-nv (1:2.1.5-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Julien Cristau <jcristau at debian.org> Sat, 22 Sep 2007 09:54:06 +0200
+
+xserver-xorg-video-nv (1:2.1.3-5) unstable; urgency=low
+
+ * Upload to unstable
+
+ -- David Nusinow <dnusinow at debian.org> Sun, 16 Sep 2007 15:43:46 -0400
+
+xserver-xorg-video-nv (1:2.1.3-4) experimental; urgency=low
+
+ * Build against xserver 1.4.
+ * Add upstream URL to debian/copyright.
+ * Add myself to Uploaders.
+
+ -- Brice Goglin <bgoglin at debian.org> Thu, 13 Sep 2007 23:00:29 +0200
+
+xserver-xorg-video-nv (1:2.1.3-3) experimental; urgency=low
+
+ * Add quilt to build-depends
+
+ -- David Nusinow <dnusinow at debian.org> Sun, 19 Aug 2007 15:02:48 -0400
+
+xserver-xorg-video-nv (1:2.1.3-2) experimental; urgency=low
+
+ * Build against X server 1.3.99.0 (build-dep on it)
+ * Add 01_gen_pci_ids.diff. This will ship a set of pci ids that this driver
+ supports so that the server can automatically load it under the right
+ conditions.
+ + Enable our patch system in debian/rules
+ + autoreconf because this patch touches src/Makefile.am
+
+ -- David Nusinow <dnusinow at debian.org> Sun, 19 Aug 2007 12:20:31 -0400
+
+xserver-xorg-video-nv (1:2.1.3-1) unstable; urgency=low
+
+ [ Julien Cristau ]
+ * New upstream release.
+ * Add myself to Uploaders and remove Branden with his permission.
+
+ [ Brice Goglin ]
+ * Update to a non-buggy xsfbs patching.
+
+ -- Julien Cristau <jcristau at debian.org> Thu, 16 Aug 2007 03:05:31 +0200
+
+xserver-xorg-video-nv (1:2.1.2-2) unstable; urgency=low
+
+ * Pull upstream commit ec78618d, to "fix a minor GeForceFX + flatpanel +
+ video overlay corruption issue" (closes: #425279).
+
+ -- Julien Cristau <jcristau at debian.org> Tue, 10 Jul 2007 21:22:10 +0200
+
+xserver-xorg-video-nv (1:2.1.2-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Julien Cristau <jcristau at debian.org> Tue, 10 Jul 2007 20:04:13 +0200
+
+xserver-xorg-video-nv (1:2.1.1-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Brice Goglin <Brice.Goglin at ens-lyon.org> Mon, 02 Jul 2007 22:34:40 +0200
+
+xserver-xorg-video-nv (1:2.1.0-1) unstable; urgency=low
+
+ [ Brice Goglin ]
+ * New upstream release.
+
+ -- Julien Cristau <jcristau at debian.org> Thu, 21 Jun 2007 23:56:15 +0100
+
+xserver-xorg-video-nv (1:2.0.96-1) experimental; urgency=low
+
+ [ Timo Aaltonen ]
+ * Replaces/Conflicts: xserver-xorg-driver-nv.
+
+ [ Julien Cristau ]
+ * Install the upstream changelog (closes: #420006). Thanks, Bastian
+ Kleineidam!
+
+ [ Brice Goglin ]
+ * New upstream release.
+ * Bump Build-depends on x11proto-randr-dev to >= 1.2.
+ * 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-nv
+ module in the long description.
+ * Remove Fabio from uploaders with his permission. He's always welcome back.
+
+ -- Julien Cristau <jcristau at debian.org> Sat, 09 Jun 2007 04:01:39 +0200
+
+xserver-xorg-video-nv (1:2.0.2-1) unstable; urgency=low
+
+ * New upstream release
+ * Update debian copyright to the new COPYING file
+ * Update standards version to 3.7.2.2. No changes needed.
+
+ -- David Nusinow <dnusinow at debian.org> Wed, 18 Apr 2007 23:27:40 -0400
+
+xserver-xorg-video-nv (1:1.2.2.1-1) experimental; urgency=low
+
+ * New upstream version plus a git update that removes the riva128 module and
+ links support in to nv_drv.so directly
+ * Generate server dependencies automatically from the ABI
+
+ -- David Nusinow <dnusinow at debian.org> Thu, 22 Feb 2007 21:33:15 -0500
+
+xserver-xorg-video-nv (1:1.2.0-4) UNRELEASED; urgency=low
+
+ * 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.
+
+ -- Julien Cristau <julien.cristau at ens-lyon.org> Tue, 7 Nov 2006 07:30:42 +0100
+
+xserver-xorg-video-nv (1:1.2.0-3) unstable; urgency=low
+
+ [ Steve Langasek ]
+ * Upload to unstable
+
+ -- David Nusinow <dnusinow at debian.org> Mon, 18 Sep 2006 19:57:45 -0400
+
+xserver-xorg-video-nv (1:1.2.0-2) experimental; urgency=low
+
+ [ David Nusinow ]
+ * Actually bump debhelper compat to 5 rather than just the build-depends
+ * Bump xserver (build-)depends epochs to 2: to deal with botched
+ server upload
+
+ [ Drew Parsons ]
+ * Provides: xserver-xorg-video-1.0 not xserver-xorg-video.
+
+ -- David Nusinow <dnusinow at debian.org> Tue, 22 Aug 2006 23:46:36 +0000
+
+xserver-xorg-video-nv (1:1.2.0-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
+
+ -- David Nusinow <dnusinow at debian.org> Tue, 15 Aug 2006 00:00:03 +0000
+
+xserver-xorg-video-nv (1:1.0.1.5-2) unstable; urgency=low
+
+ * Upload to modular
+
+ -- David Nusinow <dnusinow at debian.org> Sun, 26 Mar 2006 20:25:48 -0500
+
+xserver-xorg-video-nv (1:1.0.1.5-1) experimental; urgency=low
+
+ * First upload to Debian
+ * Add copyright info
+ * Change source package, package, and provides names to denote the
+ type of driver and that they are for xserver-xorg
+
+ -- David Nusinow <dnusinow at debian.org> Thu, 19 Jan 2006 20:29:12 -0500
+
+xserver-xorg-driver-nv (1:1.0.1.5-0ubuntu1) dapper; urgency=low
+
+ * New upstream release.
+ * Add provides on xserver-xorg-driver.
+
+ -- Daniel Stone <daniel.stone at ubuntu.com> Wed, 4 Jan 2006 20:00:36 +1100
+
+xserver-xorg-driver-nv (1:1.0.1.4-0ubuntu1) dapper; urgency=low
+
+ * New upstream release.
+
+ -- Daniel Stone <daniel.stone at ubuntu.com> Mon, 19 Dec 2005 09:09:26 +1100
+
+xserver-xorg-driver-nv (1:1.0.1.3-0ubuntu1) dapper; urgency=low
+
+ * New upstream release.
+
+ -- Daniel Stone <daniel.stone at ubuntu.com> Mon, 12 Dec 2005 13:05:27 +1100
+
+xserver-xorg-driver-nv (1:1.0.1.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 <daniel.stone at ubuntu.com> Mon, 5 Dec 2005 12:56:00 +1100
+
+xserver-xorg-driver-nv (1:1.0.1.2-0ubuntu1) dapper; urgency=low
+
+ * New upstream release.
+
+ -- Daniel Stone <daniel.stone at ubuntu.com> Tue, 22 Nov 2005 13:33:44 +1100
+
+xserver-xorg-driver-nv (1:1.0.1.1-1) dapper; urgency=low
+
+ * New upstream release.
+
+ -- Daniel Stone <daniel.stone at ubuntu.com> Tue, 25 Oct 2005 17:08:20 +1000
+
+xserver-xorg-driver-nv (1:1.0.1-1) breezy; urgency=low
+
+ * First xserver-xorg-driver-nv release.
+
+ -- Daniel Stone <daniel.stone at ubuntu.com> Wed, 6 Jul 2005 15:48:17 +1000
Added: trunk/xserver-xorg-video-nv/debian/compat
===================================================================
--- trunk/xserver-xorg-video-nv/debian/compat (rev 0)
+++ trunk/xserver-xorg-video-nv/debian/compat 2013-09-25 11:00:52 UTC (rev 4960)
@@ -0,0 +1 @@
+5
Added: trunk/xserver-xorg-video-nv/debian/control
===================================================================
--- trunk/xserver-xorg-video-nv/debian/control (rev 0)
+++ trunk/xserver-xorg-video-nv/debian/control 2013-09-25 11:00:52 UTC (rev 4960)
@@ -0,0 +1,43 @@
+Source: xserver-xorg-video-nv
+Section: non-free/x11
+Priority: optional
+Maintainer: GNU/kFreeBSD Maintainers <debian-bsd at lists.debian.org>
+Uploaders: Robert Millan <rmh at debian.org>
+Build-Depends:
+ debhelper (>= 5.0.0),
+ pkg-config,
+ xserver-xorg-dev (>= 2:1.7.6.901),
+ x11proto-video-dev,
+ x11proto-core-dev,
+ x11proto-fonts-dev,
+ x11proto-randr-dev (>= 1.2),
+ x11proto-render-dev,
+ x11proto-xext-dev,
+ dpkg-dev (>= 1.14.17),
+ automake,
+ libtool,
+ xutils-dev,
+ libdrm-dev (>= 2.4.3) [!hurd-i386],
+ x11proto-xf86dri-dev,
+ quilt,
+Standards-Version: 3.8.4
+Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-nv
+Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-nv.git
+
+Package: xserver-xorg-video-nv
+Architecture: kfreebsd-any hurd-any
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${xviddriver:Depends}
+Provides: ${xviddriver:Provides}, xf86-video-driver-riva128
+Conflicts: xserver-xorg-video-riva128, xserver-xorg-driver-nv
+Replaces: xserver-xorg (<< 6.8.2-35), xserver-xorg-video-riva128, xserver-xorg-driver-nv
+Description: X.Org X server -- NV display driver
+ This driver for the X.Org X server (see xserver-xorg for a further description)
+ provides support for NVIDIA Riva, TNT, GeForce, and Quadro cards.
+ .
+ Note that this is not the same as the binary-only 'nvidia' driver, which
+ adds 3D support, but is binary-only and not supported.
+ .
+ More information about X.Org can be found at:
+ <URL:http://www.X.org>
+ .
+ This package is built from the X.org xf86-video-nv driver module.
Added: trunk/xserver-xorg-video-nv/debian/copyright
===================================================================
--- trunk/xserver-xorg-video-nv/debian/copyright (rev 0)
+++ trunk/xserver-xorg-video-nv/debian/copyright 2013-09-25 11:00:52 UTC (rev 4960)
@@ -0,0 +1,41 @@
+This package was downloaded from
+http://xorg.freedesktop.org/releases/individual/driver/
+
+ Copyright (C) 1993-2007 NVIDIA, Corporation
+ Copyright (C) 1994 X Consortium
+ Copyright (C) 1994, 1995, 1996 Video Electronics Standards
+ Copyright (C) 1996-1997 David J. McKay
+ Copyright (C) 1996 Stephen Early
+ Copyright (C) 1997 Mark Eichin
+ Copyright (C) 1997 Metro Link Incorporated
+ Copyright (C) 1998-2005, 2007 Branden Robinson
+ Copyright (C) 1999 The XFree86 Project Inc.
+ Copyright (C) 2001 Andy Ritger
+ Copyright (C) 2005 Adam Jackson
+ Copyright (C) 2005 David Nusinow
+ Copyright (C) 2005 Eugene Konev
+ Copyright (C) 2005 Sun Microsystems, Inc.
+ Copyright (C) 2005-2006 Luc Verhaegen.
+ Copyright (C) 2006 Keith Packard
+ Copyright (C) 2006 Intel Corporation
+ Copyright (C) 2006 Luc Verhaegen
+ Copyright (C) 2008 Red Hat, Inc.
+
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+
+ 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 AUTHORS OR COPYRIGHT HOLDERS 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.
Added: trunk/xserver-xorg-video-nv/debian/patches/01_fix_linking.diff
===================================================================
--- trunk/xserver-xorg-video-nv/debian/patches/01_fix_linking.diff (rev 0)
+++ trunk/xserver-xorg-video-nv/debian/patches/01_fix_linking.diff 2013-09-25 11:00:52 UTC (rev 4960)
@@ -0,0 +1,17 @@
+From: Julien Cristau <jcristau at debian.org>
+Subject: Link against the libs we use
+
+Avoids undefined references, ensures correct package dependencies.
+
+Index: xserver-xorg-video-nv/src/Makefile.am
+===================================================================
+--- xserver-xorg-video-nv.orig/src/Makefile.am
++++ xserver-xorg-video-nv/src/Makefile.am
+@@ -27,6 +27,7 @@
+ nv_drv_la_LTLIBRARIES = nv_drv.la
+ nv_drv_la_LDFLAGS = -module -avoid-version
+ nv_drv_ladir = @moduledir@/drivers
++nv_drv_la_LIBADD = $(PCIACCESS_LIBS) $(LIBDRM_LIBS) -lm
+
+ nv_drv_la_SOURCES = $(nv_sources) $(riva_sources) $(g80_sources)
+
Added: trunk/xserver-xorg-video-nv/debian/patches/series
===================================================================
--- trunk/xserver-xorg-video-nv/debian/patches/series (rev 0)
+++ trunk/xserver-xorg-video-nv/debian/patches/series 2013-09-25 11:00:52 UTC (rev 4960)
@@ -0,0 +1 @@
+01_fix_linking.diff
Added: trunk/xserver-xorg-video-nv/debian/rules
===================================================================
--- trunk/xserver-xorg-video-nv/debian/rules (rev 0)
+++ trunk/xserver-xorg-video-nv/debian/rules 2013-09-25 11:00:52 UTC (rev 4960)
@@ -0,0 +1,100 @@
+#!/usr/bin/make -f
+# debian/rules for the Debian xserver-xorg-driver-nv package.
+# Copyright © 2004 Scott James Remnant <scott at netsplit.com>
+# Copyright © 2005 Daniel Stone <daniel at fooishbar.org>
+# Copyright © 2005 David Nusinow <dnusinow at debian.org>
+
+# 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: $(STAMP_DIR)/patch
+ dh_testdir
+ autoreconf -vfi
+
+build/config.status: configure
+ dh_testdir
+ mkdir -p build
+ cd build && \
+ ../configure --prefix=/usr --mandir=\$${prefix}/share/man \
+ --infodir=\$${prefix}/share/info $(confflags) \
+ CFLAGS="$(CFLAGS)"
+
+build: build-stamp
+build-stamp: build/config.status
+ dh_testdir
+ cd build && $(MAKE)
+ >$@
+
+clean: xsfclean
+ 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 build
+ rm -f $$(find -name Makefile.in)
+ rm -f compile config.guess config.sub configure depcomp install-sh
+ rm -f ltmain.sh missing INSTALL aclocal.m4 config.h.in mkinstalldirs
+
+ dh_clean
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs
+
+ cd build && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
+
+# Build architecture-dependent files here.
+binary-arch: build install serverabi
+ dh_testdir
+ dh_testroot
+
+ dh_installdocs README.G80
+ dh_installchangelogs ChangeLog
+ dh_install --sourcedir=debian/tmp --list-missing --exclude=.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
Added: trunk/xserver-xorg-video-nv/debian/watch
===================================================================
--- trunk/xserver-xorg-video-nv/debian/watch (rev 0)
+++ trunk/xserver-xorg-video-nv/debian/watch 2013-09-25 11:00:52 UTC (rev 4960)
@@ -0,0 +1,2 @@
+version=3
+http://xorg.freedesktop.org/releases/individual/driver/ xf86-video-nv-(.*)\.tar\.gz
Added: trunk/xserver-xorg-video-nv/debian/xserver-xorg-video-nv.install
===================================================================
--- trunk/xserver-xorg-video-nv/debian/xserver-xorg-video-nv.install (rev 0)
+++ trunk/xserver-xorg-video-nv/debian/xserver-xorg-video-nv.install 2013-09-25 11:00:52 UTC (rev 4960)
@@ -0,0 +1,2 @@
+usr/lib/xorg/modules/drivers/*.so
+usr/share/man/man4/*
Added: trunk/xserver-xorg-video-nv/debian/xserver-xorg-video-nv.links
===================================================================
--- trunk/xserver-xorg-video-nv/debian/xserver-xorg-video-nv.links (rev 0)
+++ trunk/xserver-xorg-video-nv/debian/xserver-xorg-video-nv.links 2013-09-25 11:00:52 UTC (rev 4960)
@@ -0,0 +1 @@
+usr/share/bug/xserver-xorg-core/script usr/share/bug/xserver-xorg-video-nv/script
Added: trunk/xserver-xorg-video-nv/debian/xsfbs/repack.sh
===================================================================
--- trunk/xserver-xorg-video-nv/debian/xsfbs/repack.sh (rev 0)
+++ trunk/xserver-xorg-video-nv/debian/xsfbs/repack.sh 2013-09-25 11:00:52 UTC (rev 4960)
@@ -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
Added: trunk/xserver-xorg-video-nv/debian/xsfbs/xsfbs.mk
===================================================================
--- trunk/xserver-xorg-video-nv/debian/xsfbs/xsfbs.mk (rev 0)
+++ trunk/xserver-xorg-video-nv/debian/xsfbs/xsfbs.mk 2013-09-25 11:00:52 UTC (rev 4960)
@@ -0,0 +1,285 @@
+#!/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 <http://www.gnu.org/copyleft/gpl.txt>.
+
+# Originally by Stephen Early <sde1000 at debian.org>
+# Modified by Mark W. Eichin <eichin at kitten.gen.ma.us>
+# Modified by Adam Heath <doogie at debian.org>
+# Modified by Branden Robinson <branden at debian.org>
+# Modified by Fabio Massimo Di Nitto <fabbione at fabbione.net>
+# Modified by David Nusinow <dnusinow at debian.org>
+# 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)/logdir $(STAMP_DIR)/genscripts
+ >$@
+
+.PHONY: logdir
+stampdir_targets+=logdir
+logdir: $(STAMP_DIR)/logdir
+$(STAMP_DIR)/logdir: $(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)/logdir
+ 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
+ >$@
+
+# Compute dependencies for drivers
+#
+VIDEODEP = $(shell cat /usr/share/xserver-xorg/videodrvdep 2>/dev/null)
+INPUTDEP = $(shell cat /usr/share/xserver-xorg/xinputdep 2>/dev/null)
+
+# these two can be removed post-squeeze
+VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2>/dev/null)
+INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2>/dev/null)
+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 ($(VIDEODEP),)
+ @echo 'error: xserver-xorg-dev >= 1.7.6.901 needs to be installed'
+ @exit 1
+else
+ echo "xviddriver:Depends=$(VIDEODEP)" >> debian/$(PACKAGE).substvars
+ echo "xinpdriver:Depends=$(INPUTDEP)" >> debian/$(PACKAGE).substvars
+ # the following is there for compatibility...
+ echo "xviddriver:Provides=$(VIDDRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars
+ echo "xinpdriver:Provides=$(INPDRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars
+ echo "xserver:Depends=$(VIDEODEP), $(INPUTDEP)" >> debian/$(PACKAGE).substvars
+endif
+
+# vim:set noet ai sts=8 sw=8 tw=0:
Added: trunk/xserver-xorg-video-nv/debian/xsfbs/xsfbs.sh
===================================================================
--- trunk/xserver-xorg-video-nv/debian/xsfbs/xsfbs.sh (rev 0)
+++ trunk/xserver-xorg-video-nv/debian/xsfbs/xsfbs.sh 2013-09-25 11:00:52 UTC (rev 4960)
@@ -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 <<EOF
+Error: package maintainer script attempted to use shell library without
+definining \$THIS_PACKAGE shell variable. Please report the package name,
+version, and the text of this error message to the Debian Bug Tracking System.
+Visit <http://www.debian.org/Bugs/Reporting> 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 <<EOF
+Error: package maintainer script attempted to use shell library without
+definining \$THIS_SCRIPT shell variable. Please report the package name,
+version, and the text of this error message to the Debian Bug Tracking System.
+Visit <http://www.debian.org/Bugs/Reporting> 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 " \
+ "<http://www.debian.org/Bugs/Reporting> 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 " \
+ "<http://www.debian.org/Bugs/Reporting> 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.
More information about the Glibc-bsd-commits
mailing list