Author: dnusinow
Date: 2005-09-03 15:48:30 -0500 (Sat, 03 Sep 2005)
New Revision: 593
Removed:
branches/6.9/debian/patches/general/000k_Xvfb_re-enable_backing_store.diff
Modified:
branches/6.9/debian/changelog
branches/6.9/debian/patches/series
branches/6.9/debian/rules
Log:
* Merge missed portions on patch target in debian/rules
* Remove 000k_Xvfb_re-enable_backing_store.diff, as it is obsolete
* Fix NONDBG_PACKAGES assignment in debian/rules
Modified: branches/6.9/debian/changelog
===================================================================
--- branches/6.9/debian/changelog 2005-09-03 19:29:26 UTC (rev 592)
+++ branches/6.9/debian/changelog 2005-09-03 20:48:30 UTC (rev 593)
@@ -28,6 +28,7 @@
+ general/000_stolen_from_drm.diff
+ general/000_stolen_from_Mesa_6.2_branch.diff
+ general/000_stolen_from_Mesa_6.2_branch_vb_cull.diff
+ + general/000k_Xvfb_re-enable_backing_store.diff
+ general/013_novtswitch.diff
+ general/018_sharevts_option.diff
+ general/024d_radeon_fix_gcc4_build.diff
Deleted:
branches/6.9/debian/patches/general/000k_Xvfb_re-enable_backing_store.diff
===================================================================
--- branches/6.9/debian/patches/general/000k_Xvfb_re-enable_backing_store.diff
2005-09-03 19:29:26 UTC (rev 592)
+++ branches/6.9/debian/patches/general/000k_Xvfb_re-enable_backing_store.diff
2005-09-03 20:48:30 UTC (rev 593)
@@ -1,27 +0,0 @@
-$Id$
-
-Fix VSW5 (and therefore LSB 3.0) test failures by re-enabling backing store in
-the Xvfb X server. The test harness relies on the existence of backing store
-in the virtual X server it uses to run tests in.
-
-2005-04-11 Egbert Eich <eich-at-freedesktop-dot-org>
-
- * programs/Xserver/hw/vfb/InitOutput.c: (vfbScreenInit):
- Reenable BackingStore in Xvfb.
- [revision 1.9]
-
-Backported from freedesktop.org CVS xorg trunk.
-
-Index: xc/programs/Xserver/hw/vfb/InitOutput.c
-===================================================================
---- xc/programs/Xserver/hw/vfb/InitOutput.c.orig 2005-09-01
14:51:47.878090262 -0500
-+++ xc/programs/Xserver/hw/vfb/InitOutput.c 2005-09-01 14:52:18.927803396
-0500
-@@ -910,7 +910,7 @@
-
- if (!ret) return FALSE;
-
-- /* miInitializeBackingStore(pScreen); */
-+ miInitializeBackingStore(pScreen);
-
- /*
- * Circumvent the backing store that was just initialised. This amounts
Modified: branches/6.9/debian/patches/series
===================================================================
--- branches/6.9/debian/patches/series 2005-09-03 19:29:26 UTC (rev 592)
+++ branches/6.9/debian/patches/series 2005-09-03 20:48:30 UTC (rev 593)
@@ -1,6 +1,5 @@
general/000_backport_from_author_xterm.diff -p0
general/000_stolen_from_linuxwacom_wacom_driver.diff -p0
-general/000k_Xvfb_re-enable_backing_store.diff -p0
general/001_kernel_version_in_banner.diff -p0
general/002a_xterm_no_overstrike_bold_fonts.diff -p0
general/002_xdm_fixes.diff -p0
Modified: branches/6.9/debian/rules
===================================================================
--- branches/6.9/debian/rules 2005-09-03 19:29:26 UTC (rev 592)
+++ branches/6.9/debian/rules 2005-09-03 20:48:30 UTC (rev 593)
@@ -44,7 +44,7 @@
# Get all our packages, which we'll later iterate through in order to properly
# create the debugging packages. This exclused arch-independant packages and
# metapackages
-NONDBG_PACKAGES:=$(shell awk '/^Package/{print $$2}' debian/control | grep -v
'dbg' | grep -v '^xfonts' | grep -v '^xspecs$' | grep -v '^x-dev$' | grep -v
'^x11-common$' | grep -v '^xlibs$' | grep -v '^xlibs-data$' | grep -v
'^xlibs-dev$' | grep -v '^xlibs-pic$' | grep -v '^x-window-system$' | grep -v
'^xfree86-common$' | sed 's/Package: //')
+NONDBG_PACKAGES:=$(shell awk '/^Package/{print $$2}' debian/control | grep -v
'dbg' | grep -v '^xfonts' | grep -v '^xspecs$$' | grep -v '^x-dev$$' | grep -v
'^x11-common$$' | grep -v '^xlibs$$' | grep -v '^xlibs-data$$' | grep -v
'^xlibs-dev$$' | grep -v '^xlibs-pic$$' | grep -v '^x-window-system$$' | grep
-v '^xfree86-common$$' | sed 's/Package: //')
# Figure out who's building this package.
BUILDER:=$(shell echo $${DEBEMAIL:-$${EMAIL:-$$(echo [EMAIL PROTECTED](cat
/etc/mailname 2>/dev/null))}})
@@ -204,10 +204,8 @@
if quilt push -a -v >$(STAMP_DIR)/log/patch 2>&1; then \
echo "successful."; \
else \
- if [ ! grep '^File series fully applied' $(STAMP_DIR)/log/patch >
/dev/null ]; then \
- echo "failed! (check $(STAMP_DIR)/log/patch for details)"; \
- exit 1; \
- fi; \
+ echo "failed! (check $(STAMP_DIR)/log/patch for details)"; \
+ exit 1; \
fi; \
>$@
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
