beryl-core: Changes to 'debian-unstable'

[Shawn Starr <spstarr-guest@alioth.debian.org>]

 debian/patches/fix |   93 -----------------------------------------------------
 1 files changed, 93 deletions(-)

New commits:
commit c8e7690699ee4d22594e86dae59aead0d791f606
Author: Shawn Starr <spstarr@segfault.sh0n.net>
Date:   Wed Jan 10 22:24:05 2007 -0500

    Remove this file. It was a small addition to fix the patch for beryl 0.1.4

diff --git a/debian/patches/fix b/debian/patches/fix
deleted file mode 100644
index 0a4ace8..0000000
--- a/debian/patches/fix
+++ /dev/null
@@ -1,93 +0,0 @@
-diff -Nrup beryl-core-0.1.3/src/main.c beryl-core-0.1.3.d/src/main.c
---- beryl-core-0.1.3/src/main.c	2006-12-07 17:16:52.000000000 -0500
-+++ beryl-core-0.1.3.d/src/main.c	2006-12-09 19:01:27.000000000 -0500
-@@ -94,9 +94,9 @@ usage (void)
- 	printf (_("Usage: %9s "
- 		"[--display DISPLAY] "
- 		"[--screen n]\n                 "
--		"[--strict-binding | --xgl-binding]\n                 "
--		"[--indirect-rendering | --xgl-rendering]\n                 "
--		"[--force-nvidia | --force-xgl | --force-aiglx]\n                 "
-+		"[--strict-binding]\n                 "
-+		"[--indirect-rendering]\n                 "
-+		"[--force-nvidia | --force-aiglx]\n                 "
- 		"[--no-replace | --replace] "
- #if XCOMPOSITE_MINOR >= 3 || XCOMPOSITE_MAJOR > 0
- 		"[--use-cow | --no-cow] "
-@@ -169,50 +169,6 @@ detect_nvidia (void)
-     }
- 
- }
--static void
--detect_xgl (Bool onlyShm)
--{
--    pid_t p = fork ();
--    if (p)
--    {
--        int stat;
--        waitpid (p, &stat, 0);
--        if (!WIFEXITED (stat))
--        {
--            fprintf (stderr,
--                     _("Something went wrong with Xgl detection, giving up."));
--            exit (1);
--        }
--        else
--        {
--            if (WEXITSTATUS (stat))
--            {
--                //no XGL
--                printf (_("XGL Absent, checking for NVIDIA\n"));
--                if (!onlyShm)
--					detect_nvidia();
--            }
--            else
--            {
--                noShm = TRUE;
--                useCow = FALSE;
--                if (!onlyShm)
--                {
--                    indirectRendering = FALSE;
--                    useCow = FALSE;
--                    strictBinding = FALSE;
--                    printf (_("XGL Present\n"));
--                }
--            }
--        }
--    }
--    else
--    {
--        execl ("/bin/sh", "sh", "-c", "xvinfo | grep -q -i Xgl",
--               (char *)NULL);
--        exit (1);
--    }
--}
- 
- static inline void init_variables(void) 
- {
-@@ -265,14 +221,11 @@ int main (int argc, char **argv)
- 		{"screen",1,0,OPT_SCREEN},
- 		{"skip-gl-yield",0,&skipGlYield,TRUE},
- 		{"force-nvidia",0,0,OPT_FORCE_NVIDIA},
--		{"force-xgl",0,0,OPT_FORCE_XGL},
- 		{"force-aiglx",0,0,OPT_FORCE_AIGLX},
- 		{"use-tfp",0,&copyTexture,FALSE},
- 		{"use-copy",0,0,OPT_USE_COPY},
- 		{"indirect-rendering",0,&indirectRendering,TRUE},
--		{"xgl-rendering",0,&indirectRendering,FALSE},
- 		{"strict-binding",0,&strictBinding,TRUE},
--		{"xgl-binding",0,&strictBinding,FALSE}, 
- 		{"use-cow",0,&useCow,TRUE},
- 		{"no-cow",0,&useCow,FALSE},
- 		{"no-replace",0,&replaceCurrentWm,FALSE},
-@@ -348,10 +301,6 @@ int main (int argc, char **argv)
- 		if (nPlugin < 256) 
- 			plugin[nPlugin++] = argv[optind++];
- 
--	if (!skipTests && !forceNvidia && !forceXgl && !forceAiglx) 
--		detect_xgl (checkXglShm);
--    
--
-     if (isNVTFP && !skipGlYield)
-     {
-         char * newargs[argc+2];