xserver-xorg-video-intel: Changes to 'debian-experimental'
debian/README.source | 24
debian/changelog | 40 +
debian/compat | 2
debian/control | 29 -
debian/patches/series | 1
debian/rules | 116 ----
debian/xserver-xorg-video-intel.NEWS | 11
debian/xserver-xorg-video-intel.docs | 2
debian/xserver-xorg-video-intel.install | 3
debian/xserver-xorg-video-intel.install.hurd-i386 | 2
debian/xserver-xorg-video-intel.manpages | 1
debian/xserver-xorg-video-intel.postinst.in | 21
debian/xserver-xorg-video-intel.postrm.in | 21
debian/xserver-xorg-video-intel.prerm.in | 21
debian/xsfbs/repack.sh | 32 -
debian/xsfbs/xsfbs.mk | 285 ----------
debian/xsfbs/xsfbs.sh | 622 ----------------------
uxa/uxa-render.c | 37 -
18 files changed, 98 insertions(+), 1172 deletions(-)
New commits:
commit c35f2c5b1eddbd5558f4ddc70e8ccbdc061aff71
Author: Cyril Brulebois <kibi@debian.org>
Date: Sun Feb 20 12:36:11 2011 +0100
Upload to experimental.
diff --git a/debian/changelog b/debian/changelog
index de0fce9..65a7924 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-xserver-xorg-video-intel (2:2.14.0-4+exp1) UNRELEASED; urgency=low
+xserver-xorg-video-intel (2:2.14.0-4+exp1) experimental; urgency=low
* Rebuild against Xserver 1.10 rc2.
- -- Cyril Brulebois <kibi@debian.org> Sun, 20 Feb 2011 12:34:18 +0100
+ -- Cyril Brulebois <kibi@debian.org> Sun, 20 Feb 2011 12:35:59 +0100
xserver-xorg-video-intel (2:2.14.0-4) unstable; urgency=low
commit 9c6b5aec2ff9ca07623869418c56c1dc9748f440
Author: Cyril Brulebois <kibi@debian.org>
Date: Sun Feb 20 12:35:20 2011 +0100
Rebuild against Xserver 1.10 rc2.
diff --git a/debian/changelog b/debian/changelog
index 52e5855..de0fce9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-intel (2:2.14.0-4+exp1) UNRELEASED; urgency=low
+
+ * Rebuild against Xserver 1.10 rc2.
+
+ -- Cyril Brulebois <kibi@debian.org> Sun, 20 Feb 2011 12:34:18 +0100
+
xserver-xorg-video-intel (2:2.14.0-4) unstable; urgency=low
* Cherry-pick from upstream:
diff --git a/debian/control b/debian/control
index ead90dd..bba98f1 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends:
debhelper (>= 8),
dh-autoreconf,
pkg-config,
- xserver-xorg-dev (>= 2:1.9.4),
+ xserver-xorg-dev (>= 2:1.9.99.902),
x11proto-core-dev,
x11proto-fonts-dev,
x11proto-xinerama-dev,
commit 3518593b72baee57a60cf4fbbcc96043230ac21d
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Feb 18 12:44:26 2011 +0100
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index b1bc602..52e5855 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-xserver-xorg-video-intel (2:2.14.0-4) UNRELEASED; urgency=low
+xserver-xorg-video-intel (2:2.14.0-4) unstable; urgency=low
* Cherry-pick from upstream:
- uxa: Fallback if the temporary is too large
* This fixes a null pointer dereference with some rendering operations
involving large pictures (Closes: #613830). Thanks, Enrico!
- -- Cyril Brulebois <kibi@debian.org> Thu, 17 Feb 2011 23:12:05 +0100
+ -- Cyril Brulebois <kibi@debian.org> Fri, 18 Feb 2011 12:44:23 +0100
xserver-xorg-video-intel (2:2.14.0-3) unstable; urgency=low
commit 15da5957bd59f02b871ad52203f0075e08a4813c
Author: Cyril Brulebois <kibi@debian.org>
Date: Thu Feb 17 23:20:24 2011 +0100
Document the cherry-pick (Closes: #613830).
diff --git a/debian/changelog b/debian/changelog
index 17a955a..b1bc602 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+xserver-xorg-video-intel (2:2.14.0-4) UNRELEASED; urgency=low
+
+ * Cherry-pick from upstream:
+ - uxa: Fallback if the temporary is too large
+ * This fixes a null pointer dereference with some rendering operations
+ involving large pictures (Closes: #613830). Thanks, Enrico!
+
+ -- Cyril Brulebois <kibi@debian.org> Thu, 17 Feb 2011 23:12:05 +0100
+
xserver-xorg-video-intel (2:2.14.0-3) unstable; urgency=low
* Switch to dh:
commit 4f08ede8515023f64b907e4a9013008fb1a5815b
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Thu Feb 17 16:48:24 2011 +0000
uxa: Fallback if the temporary is too large
If the render operation requires a temporary source Picture and the
operation is large, larger than the maximum permitted bo, then we will
fail to allocate the bo. In this case, we need to fallback and perform
the operation on the CPU rather than dereference a NULL bo.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=34399
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
(cherry picked from commit 4c66b28870b050493ad96f7b0fe2d70d7ee539c7)
diff --git a/uxa/uxa-render.c b/uxa/uxa-render.c
index 02bfa03..6bffa4d 100644
--- a/uxa/uxa-render.c
+++ b/uxa/uxa-render.c
@@ -460,12 +460,12 @@ uxa_try_driver_solid_fill(PicturePtr pSrc,
}
static PicturePtr
-uxa_picture_for_pixman_format(ScreenPtr pScreen,
+uxa_picture_for_pixman_format(ScreenPtr screen,
pixman_format_code_t format,
int width, int height)
{
- PicturePtr pPicture;
- PixmapPtr pPixmap;
+ PicturePtr picture;
+ PixmapPtr pixmap;
int error;
if (format == PIXMAN_a1)
@@ -475,24 +475,29 @@ uxa_picture_for_pixman_format(ScreenPtr pScreen,
if (PIXMAN_FORMAT_A(format) == 0)
format = PIXMAN_a8r8g8b8;
- pPixmap = (*pScreen->CreatePixmap)(pScreen, width, height,
- PIXMAN_FORMAT_DEPTH(format),
- UXA_CREATE_PIXMAP_FOR_MAP);
- if (!pPixmap)
+ pixmap = screen->CreatePixmap(screen, width, height,
+ PIXMAN_FORMAT_DEPTH(format),
+ UXA_CREATE_PIXMAP_FOR_MAP);
+ if (!pixmap)
return 0;
- pPicture = CreatePicture(0, &pPixmap->drawable,
- PictureMatchFormat(pScreen,
- PIXMAN_FORMAT_DEPTH(format),
- format),
- 0, 0, serverClient, &error);
- (*pScreen->DestroyPixmap) (pPixmap);
- if (!pPicture)
+ if (!uxa_pixmap_is_offscreen(pixmap)) {
+ screen->DestroyPixmap(pixmap);
+ return 0;
+ }
+
+ picture = CreatePicture(0, &pixmap->drawable,
+ PictureMatchFormat(screen,
+ PIXMAN_FORMAT_DEPTH(format),
+ format),
+ 0, 0, serverClient, &error);
+ screen->DestroyPixmap(pixmap);
+ if (!picture)
return 0;
- ValidatePicture(pPicture);
+ ValidatePicture(picture);
- return pPicture;
+ return picture;
}
static PicturePtr
commit 7e2ec9c5a7058ab21a71ffcd2cbe4f497550437c
Author: Cyril Brulebois <kibi@debian.org>
Date: Sat Feb 5 14:47:05 2011 +0100
Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index e1e3d25..17a955a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-intel (2:2.14.0-3) UNRELEASED; urgency=low
+xserver-xorg-video-intel (2:2.14.0-3) unstable; urgency=low
* Switch to dh:
- Use debhelper 8.
@@ -21,7 +21,7 @@ xserver-xorg-video-intel (2:2.14.0-3) UNRELEASED; urgency=low
* Wrap Depends/Provides/Recommends.
* Bump Standards-Version to 3.9.1 (no changes needed).
- -- Cyril Brulebois <kibi@debian.org> Sat, 05 Feb 2011 07:43:53 +0100
+ -- Cyril Brulebois <kibi@debian.org> Sat, 05 Feb 2011 14:47:04 +0100
xserver-xorg-video-intel (2:2.14.0-2) experimental; urgency=low
commit 61447c93fafbd48ced723d29503e99da1036b81e
Author: Cyril Brulebois <kibi@debian.org>
Date: Sat Feb 5 09:32:14 2011 +0100
Add a placeholding series file.
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..fdffa2a
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+# placeholder
commit a1d57726610e6caa03b08eef4fac6e380ecf3392
Author: Cyril Brulebois <kibi@debian.org>
Date: Sat Feb 5 08:11:33 2011 +0100
Bump Standards-Version to 3.9.1 (no changes needed).
diff --git a/debian/changelog b/debian/changelog
index 74e52c2..e1e3d25 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,7 @@ xserver-xorg-video-intel (2:2.14.0-3) UNRELEASED; urgency=low
* Update Uploaders list. Thanks, David & Brice!
* Remove long obsolete Replaces.
* Wrap Depends/Provides/Recommends.
+ * Bump Standards-Version to 3.9.1 (no changes needed).
-- Cyril Brulebois <kibi@debian.org> Sat, 05 Feb 2011 07:43:53 +0100
diff --git a/debian/control b/debian/control
index acfa1ec..ead90dd 100644
--- a/debian/control
+++ b/debian/control
@@ -33,7 +33,7 @@ Build-Depends:
libudev-dev [linux-any],
quilt,
xutils-dev (>= 1:7.5+4),
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-intel
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-intel.git
commit 9624b733a9e10700224178fcf37ee064b2f05124
Author: Cyril Brulebois <kibi@debian.org>
Date: Sat Feb 5 08:11:18 2011 +0100
Wrap Depends/Provides/Recommends.
diff --git a/debian/changelog b/debian/changelog
index ef016ba..74e52c2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,7 @@ xserver-xorg-video-intel (2:2.14.0-3) UNRELEASED; urgency=low
now Linux-only.
* Update Uploaders list. Thanks, David & Brice!
* Remove long obsolete Replaces.
+ * Wrap Depends/Provides/Recommends.
-- Cyril Brulebois <kibi@debian.org> Sat, 05 Feb 2011 07:43:53 +0100
diff --git a/debian/control b/debian/control
index a74fb06..acfa1ec 100644
--- a/debian/control
+++ b/debian/control
@@ -39,8 +39,12 @@ Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-intel.g
Package: xserver-xorg-video-intel
Architecture: amd64 i386
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${xviddriver:Depends}
-Provides: ${xviddriver:Provides}
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends},
+ ${xviddriver:Depends},
+Provides:
+ ${xviddriver:Provides}
Description: X.Org X server -- Intel i8xx, i9xx display driver
This package provides the driver for the Intel i8xx and i9xx family
of chipsets, including i810, i815, i830, i845, i855, i865, i915, i945
@@ -56,8 +60,11 @@ Description: X.Org X server -- Intel i8xx, i9xx display driver
Package: xserver-xorg-video-intel-dbg
Architecture: amd64 i386
-Depends: xserver-xorg-video-intel (= ${binary:Version}), ${shlibs:Depends}
-Recommends: intel-gpu-tools
+Depends:
+ xserver-xorg-video-intel (= ${binary:Version}),
+ ${shlibs:Depends},
+Recommends:
+ intel-gpu-tools,
Section: debug
Priority: extra
Description: X.Org X server -- Intel i8xx, i9xx display driver (debug symbols)
commit 84b9320310b839661f17a72109aa9b626f074b79
Author: Cyril Brulebois <kibi@debian.org>
Date: Sat Feb 5 08:09:51 2011 +0100
Remove long obsolete Replaces/Conflicts.
diff --git a/debian/changelog b/debian/changelog
index 6d78011..ef016ba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,7 @@ xserver-xorg-video-intel (2:2.14.0-3) UNRELEASED; urgency=low
- The .install.hurd-i386 file is no longer relevant, this package is
now Linux-only.
* Update Uploaders list. Thanks, David & Brice!
+ * Remove long obsolete Replaces.
-- Cyril Brulebois <kibi@debian.org> Sat, 05 Feb 2011 07:43:53 +0100
diff --git a/debian/control b/debian/control
index f90b884..a74fb06 100644
--- a/debian/control
+++ b/debian/control
@@ -41,8 +41,6 @@ Package: xserver-xorg-video-intel
Architecture: amd64 i386
Depends: ${shlibs:Depends}, ${misc:Depends}, ${xviddriver:Depends}
Provides: ${xviddriver:Provides}
-Replaces: xserver-xorg (<< 6.8.2-35), xserver-xorg-video-i810 (<< 2:1.9.91-1), xserver-xorg-video-i810-modesetting, xserver-xorg-video-intel-modesetting, xserver-xorg-driver-i810
-Conflicts: xserver-xorg-video-i810 (<< 2:1.9.91-1), xserver-xorg-video-i810-modesetting, xserver-xorg-video-intel-modesetting, xserver-xorg-driver-i810, 915resolution
Description: X.Org X server -- Intel i8xx, i9xx display driver
This package provides the driver for the Intel i8xx and i9xx family
of chipsets, including i810, i815, i830, i845, i855, i865, i915, i945
commit 7d288bbca5d883144855503bd9d8ef7ecfb9ce6a
Author: Cyril Brulebois <kibi@debian.org>
Date: Sat Feb 5 08:06:23 2011 +0100
Update Uploaders list. Thanks, David & Brice!
diff --git a/debian/changelog b/debian/changelog
index 993e3cf..6d78011 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,7 @@ xserver-xorg-video-intel (2:2.14.0-3) UNRELEASED; urgency=low
covered by README.Debian
- The .install.hurd-i386 file is no longer relevant, this package is
now Linux-only.
+ * Update Uploaders list. Thanks, David & Brice!
-- Cyril Brulebois <kibi@debian.org> Sat, 05 Feb 2011 07:43:53 +0100
diff --git a/debian/control b/debian/control
index 461621e..f90b884 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xserver-xorg-video-intel
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: David Nusinow <dnusinow@debian.org>, Drew Parsons <dparsons@debian.org>, Brice Goglin <bgoglin@debian.org>, Cyril Brulebois <kibi@debian.org>
+Uploaders: Drew Parsons <dparsons@debian.org>, Cyril Brulebois <kibi@debian.org>
Build-Depends:
debhelper (>= 8),
dh-autoreconf,
commit 556061afb546d4ceb8872dec3d71c78e6344c9e3
Author: Cyril Brulebois <kibi@debian.org>
Date: Sat Feb 5 08:05:50 2011 +0100
Remove leftovers.
diff --git a/debian/changelog b/debian/changelog
index 3c492e5..993e3cf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,11 @@ xserver-xorg-video-intel (2:2.14.0-3) UNRELEASED; urgency=low
switching between versions with or without KMS. Starting with squeeze,
KMS is mandatory, so stop worrying about that.
* Remove xsfbs accordingly.
+ * Remove leftovers:
+ - NEWS file is outdated, UMS is no longer available, and that's
+ covered by README.Debian
+ - The .install.hurd-i386 file is no longer relevant, this package is
+ now Linux-only.
-- Cyril Brulebois <kibi@debian.org> Sat, 05 Feb 2011 07:43:53 +0100
diff --git a/debian/xserver-xorg-video-intel.NEWS b/debian/xserver-xorg-video-intel.NEWS
deleted file mode 100644
index 18b53f7..0000000
--- a/debian/xserver-xorg-video-intel.NEWS
+++ /dev/null
@@ -1,11 +0,0 @@
-xserver-xorg-video-intel (2:2.9.1-2) unstable; urgency=low
-
- Starting with this version, the intel driver enables kernel mode setting
- (KMS) by default for 830 and later chips. This comes with a framebuffer
- driver which enables native resolution on the console. KMS also allows
- faster VT switching and mode changes, as well as e.g. DisplayPort support.
-
- In case of trouble KMS can be disabled with the 'nomodeset' kernel command
- line parameter, or by editing /etc/modprobe.d/i915-kms.conf.
-
- -- Julien Cristau <jcristau@debian.org> Tue, 16 Mar 2010 16:09:55 +0100
diff --git a/debian/xserver-xorg-video-intel.install.hurd-i386 b/debian/xserver-xorg-video-intel.install.hurd-i386
deleted file mode 100644
index a8fac35..0000000
--- a/debian/xserver-xorg-video-intel.install.hurd-i386
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/xorg/modules/drivers/*.so
-usr/share/xserver-xorg/pci/*
commit 4b30309006b5dbda3451a5acbef709fef649b295
Author: Cyril Brulebois <kibi@debian.org>
Date: Sat Feb 5 08:01:50 2011 +0100
Remove xsfbs accordingly.
diff --git a/debian/README.source b/debian/README.source
index b09a1ab..4ecd5e6 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -47,27 +47,3 @@ are involved:
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.
diff --git a/debian/changelog b/debian/changelog
index 5ddb0f2..3c492e5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ xserver-xorg-video-intel (2:2.14.0-3) UNRELEASED; urgency=low
* Get rid of maintainer scripts, since they were only used to handle
switching between versions with or without KMS. Starting with squeeze,
KMS is mandatory, so stop worrying about that.
+ * Remove xsfbs accordingly.
-- Cyril Brulebois <kibi@debian.org> Sat, 05 Feb 2011 07:43:53 +0100
diff --git a/debian/xsfbs/repack.sh b/debian/xsfbs/repack.sh
deleted file mode 100755
index 5935cc9..0000000
--- a/debian/xsfbs/repack.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/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
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
deleted file mode 100755
index 3c59c20..0000000
--- a/debian/xsfbs/xsfbs.mk
+++ /dev/null
@@ -1,285 +0,0 @@
-#!/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@debian.org>
-# Modified by Mark W. Eichin <eichin@kitten.gen.ma.us>
-# Modified by Adam Heath <doogie@debian.org>
-# Modified by Branden Robinson <branden@debian.org>
-# Modified by Fabio Massimo Di Nitto <fabbione@fabbione.net>
-# Modified by David Nusinow <dnusinow@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), xorg-driver-video
-INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI), xorg-driver-input
-
-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:
diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
deleted file mode 100644
index 813fd8d..0000000
--- a/debian/xsfbs/xsfbs.sh
+++ /dev/null
@@ -1,622 +0,0 @@
-# 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" \
Reply to: